From 964ae8cc391520440cf5aa13e2b9cc34850ea6c2 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Tue, 26 Feb 2019 19:01:41 +0100 Subject: New upstream version 1.14.6 --- Makefile.am | 40 +- Makefile.in | 364 ++--- NEWS | 34 + clients/cli/connections.c | 58 +- clients/cli/devices.c | 155 ++- clients/cli/utils.c | 2 + clients/common/meson.build | 14 +- clients/common/nm-meta-setting-desc.c | 129 +- clients/common/settings-docs.h | 10 +- clients/common/settings-docs.h.in | 10 +- clients/tests/test-client.py | 4 +- configure | 26 +- configure.ac | 2 +- docs/api/html/NetworkManager.conf.html | 37 +- docs/api/html/NetworkManager.html | 4 +- docs/api/html/ch01.html | 4 +- docs/api/html/dbus-secret-agent.html | 4 +- docs/api/html/dbus-types.html | 4 +- docs/api/html/dbus-vpn-plugin.html | 4 +- docs/api/html/dbus-vpn-types.html | 4 +- ...org.freedesktop.NetworkManager.AccessPoint.html | 4 +- ...rg.freedesktop.NetworkManager.AgentManager.html | 4 +- ...-org.freedesktop.NetworkManager.Checkpoint.html | 4 +- ...eedesktop.NetworkManager.Connection.Active.html | 4 +- ...org.freedesktop.NetworkManager.DHCP4Config.html | 4 +- ...org.freedesktop.NetworkManager.DHCP6Config.html | 4 +- ...org.freedesktop.NetworkManager.Device.Adsl.html | 4 +- ...reedesktop.NetworkManager.Device.Bluetooth.html | 4 +- ...org.freedesktop.NetworkManager.Device.Bond.html | 4 +- ...g.freedesktop.NetworkManager.Device.Bridge.html | 4 +- ...rg.freedesktop.NetworkManager.Device.Dummy.html | 4 +- ....freedesktop.NetworkManager.Device.Generic.html | 4 +- ...freedesktop.NetworkManager.Device.IPTunnel.html | 4 +- ...eedesktop.NetworkManager.Device.Infiniband.html | 4 +- ...g.freedesktop.NetworkManager.Device.Lowpan.html | 4 +- ...g.freedesktop.NetworkManager.Device.Macsec.html | 4 +- ....freedesktop.NetworkManager.Device.Macvlan.html | 4 +- ...rg.freedesktop.NetworkManager.Device.Modem.html | 4 +- ...freedesktop.NetworkManager.Device.OlpcMesh.html | 4 +- ...reedesktop.NetworkManager.Device.OvsBridge.html | 4 +- ...desktop.NetworkManager.Device.OvsInterface.html | 4 +- ....freedesktop.NetworkManager.Device.OvsPort.html | 4 +- ...-org.freedesktop.NetworkManager.Device.Ppp.html | 4 +- ...eedesktop.NetworkManager.Device.Statistics.html | 4 +- ...org.freedesktop.NetworkManager.Device.Team.html | 4 +- ...-org.freedesktop.NetworkManager.Device.Tun.html | 4 +- ...org.freedesktop.NetworkManager.Device.Veth.html | 4 +- ...org.freedesktop.NetworkManager.Device.Vlan.html | 4 +- ...rg.freedesktop.NetworkManager.Device.Vxlan.html | 4 +- ...reedesktop.NetworkManager.Device.WireGuard.html | 4 +- ...rg.freedesktop.NetworkManager.Device.Wired.html | 4 +- ...freedesktop.NetworkManager.Device.Wireless.html | 4 +- ...org.freedesktop.NetworkManager.Device.Wpan.html | 4 +- ...dbus-org.freedesktop.NetworkManager.Device.html | 4 +- ...-org.freedesktop.NetworkManager.DnsManager.html | 4 +- ...s-org.freedesktop.NetworkManager.IP4Config.html | 4 +- ...s-org.freedesktop.NetworkManager.IP6Config.html | 4 +- .../gdbus-org.freedesktop.NetworkManager.PPP.html | 4 +- ...org.freedesktop.NetworkManager.SecretAgent.html | 4 +- ...desktop.NetworkManager.Settings.Connection.html | 4 +- ...us-org.freedesktop.NetworkManager.Settings.html | 4 +- ....freedesktop.NetworkManager.VPN.Connection.html | 4 +- ...-org.freedesktop.NetworkManager.VPN.Plugin.html | 4 +- .../html/gdbus-org.freedesktop.NetworkManager.html | 4 +- docs/api/html/index.html | 6 +- docs/api/html/ix01.html | 1406 ++++++++++---------- docs/api/html/license.html | 4 +- docs/api/html/manpages.html | 4 +- docs/api/html/nm-dbus-types.html | 4 +- docs/api/html/nm-initrd-generator.html | 4 +- docs/api/html/nm-online.html | 4 +- docs/api/html/nm-openvswitch.html | 12 +- docs/api/html/nm-settings-ifcfg-rh.html | 4 +- docs/api/html/nm-settings-keyfile.html | 4 +- docs/api/html/nm-settings.html | 14 +- docs/api/html/nm-vpn-dbus-types.html | 4 +- docs/api/html/nmcli-examples.html | 30 +- docs/api/html/nmcli.html | 4 +- docs/api/html/nmtui.html | 4 +- docs/api/html/ref-dbus-access-points.html | 4 +- docs/api/html/ref-dbus-active-connections.html | 4 +- docs/api/html/ref-dbus-agent-manager.html | 4 +- docs/api/html/ref-dbus-checkpoint.html | 4 +- docs/api/html/ref-dbus-devices.html | 4 +- docs/api/html/ref-dbus-dhcp4-configs.html | 4 +- docs/api/html/ref-dbus-dhcp6-configs.html | 4 +- docs/api/html/ref-dbus-dns-manager.html | 4 +- docs/api/html/ref-dbus-ip4-configs.html | 4 +- docs/api/html/ref-dbus-ip6-configs.html | 4 +- docs/api/html/ref-dbus-manager.html | 4 +- docs/api/html/ref-dbus-settings-manager.html | 4 +- docs/api/html/ref-dbus-settings.html | 4 +- docs/api/html/ref-settings.html | 4 +- docs/api/html/secret-agents.html | 4 +- docs/api/html/secrets-flags.html | 4 +- docs/api/html/settings-6lowpan.html | 4 +- docs/api/html/settings-802-11-olpc-mesh.html | 4 +- .../html/settings-802-11-wireless-security.html | 4 +- docs/api/html/settings-802-11-wireless.html | 4 +- docs/api/html/settings-802-1x.html | 4 +- docs/api/html/settings-802-3-ethernet.html | 4 +- docs/api/html/settings-adsl.html | 4 +- docs/api/html/settings-bluetooth.html | 4 +- docs/api/html/settings-bond.html | 4 +- docs/api/html/settings-bridge-port.html | 4 +- docs/api/html/settings-bridge.html | 4 +- docs/api/html/settings-cdma.html | 4 +- docs/api/html/settings-connection.html | 6 +- docs/api/html/settings-dcb.html | 4 +- docs/api/html/settings-dummy.html | 4 +- docs/api/html/settings-ethtool.html | 4 +- docs/api/html/settings-generic.html | 4 +- docs/api/html/settings-gsm.html | 4 +- docs/api/html/settings-infiniband.html | 4 +- docs/api/html/settings-ip-tunnel.html | 4 +- docs/api/html/settings-ipv4.html | 6 +- docs/api/html/settings-ipv6.html | 6 +- docs/api/html/settings-macsec.html | 4 +- docs/api/html/settings-macvlan.html | 4 +- docs/api/html/settings-match.html | 4 +- docs/api/html/settings-ovs-bridge.html | 4 +- docs/api/html/settings-ovs-interface.html | 4 +- docs/api/html/settings-ovs-patch.html | 4 +- docs/api/html/settings-ovs-port.html | 4 +- docs/api/html/settings-ppp.html | 4 +- docs/api/html/settings-pppoe.html | 4 +- docs/api/html/settings-proxy.html | 4 +- docs/api/html/settings-serial.html | 4 +- docs/api/html/settings-sriov.html | 8 +- docs/api/html/settings-tc.html | 4 +- docs/api/html/settings-team-port.html | 4 +- docs/api/html/settings-team.html | 4 +- docs/api/html/settings-tun.html | 4 +- docs/api/html/settings-user.html | 4 +- docs/api/html/settings-vlan.html | 4 +- docs/api/html/settings-vpn.html | 4 +- docs/api/html/settings-vxlan.html | 4 +- docs/api/html/settings-wimax.html | 4 +- docs/api/html/settings-wpan.html | 4 +- docs/api/html/spec.html | 4 +- docs/api/html/vpn-plugins.html | 4 +- docs/api/network-manager-docs.xml | 9 - docs/api/settings-spec.xml | 10 +- docs/api/version.xml | 2 +- docs/libnm-glib/html/NMAccessPoint.html | 28 +- docs/libnm-glib/html/NMActiveConnection.html | 32 +- docs/libnm-glib/html/NMClient.html | 30 +- docs/libnm-glib/html/NMDHCP4Config.html | 4 +- docs/libnm-glib/html/NMDHCP6Config.html | 4 +- docs/libnm-glib/html/NMDevice.html | 40 +- docs/libnm-glib/html/NMDeviceAdsl.html | 4 +- docs/libnm-glib/html/NMDeviceBond.html | 4 +- docs/libnm-glib/html/NMDeviceBridge.html | 4 +- docs/libnm-glib/html/NMDeviceBt.html | 12 +- docs/libnm-glib/html/NMDeviceEthernet.html | 4 +- docs/libnm-glib/html/NMDeviceGeneric.html | 4 +- docs/libnm-glib/html/NMDeviceInfiniband.html | 4 +- docs/libnm-glib/html/NMDeviceModem.html | 12 +- docs/libnm-glib/html/NMDeviceOlpcMesh.html | 4 +- docs/libnm-glib/html/NMDeviceTeam.html | 4 +- docs/libnm-glib/html/NMDeviceVlan.html | 4 +- docs/libnm-glib/html/NMDeviceWifi.html | 12 +- docs/libnm-glib/html/NMDeviceWimax.html | 4 +- docs/libnm-glib/html/NMIP4Config.html | 4 +- docs/libnm-glib/html/NMIP6Config.html | 8 +- docs/libnm-glib/html/NMObject.html | 4 +- docs/libnm-glib/html/NMRemoteConnection.html | 12 +- docs/libnm-glib/html/NMRemoteSettings.html | 36 +- docs/libnm-glib/html/NMSecretAgent.html | 32 +- docs/libnm-glib/html/NMVPNConnection.html | 8 +- docs/libnm-glib/html/NMWimaxNsp.html | 12 +- docs/libnm-glib/html/annotation-glossary.html | 4 +- docs/libnm-glib/html/api-index-full.html | 4 +- docs/libnm-glib/html/ch02.html | 4 +- docs/libnm-glib/html/index.html | 6 +- docs/libnm-glib/html/libnm-glib-NMVPNPlugin.html | 12 +- .../html/libnm-glib-NMVpnPluginUiWidget.html | 20 +- docs/libnm-glib/html/libnm-glib-nm-types.html | 4 +- .../html/libnm-glib-nm-vpn-plugin-utils.html | 8 +- docs/libnm-glib/html/object-tree.html | 6 +- docs/libnm-glib/html/ref-overview.html | 4 +- docs/libnm-glib/version.xml | 2 +- docs/libnm-util/html/NMConnection.html | 6 +- docs/libnm-util/html/NMSetting.html | 4 +- docs/libnm-util/html/NMSetting8021x.html | 4 +- docs/libnm-util/html/NMSettingAdsl.html | 4 +- docs/libnm-util/html/NMSettingBluetooth.html | 4 +- docs/libnm-util/html/NMSettingBond.html | 4 +- docs/libnm-util/html/NMSettingBridge.html | 4 +- docs/libnm-util/html/NMSettingBridgePort.html | 4 +- docs/libnm-util/html/NMSettingCdma.html | 4 +- docs/libnm-util/html/NMSettingConnection.html | 4 +- docs/libnm-util/html/NMSettingDcb.html | 4 +- docs/libnm-util/html/NMSettingGeneric.html | 4 +- docs/libnm-util/html/NMSettingGsm.html | 4 +- docs/libnm-util/html/NMSettingIP4Config.html | 4 +- docs/libnm-util/html/NMSettingIP6Config.html | 4 +- docs/libnm-util/html/NMSettingInfiniband.html | 4 +- docs/libnm-util/html/NMSettingOlpcMesh.html | 4 +- docs/libnm-util/html/NMSettingPPP.html | 4 +- docs/libnm-util/html/NMSettingPPPOE.html | 4 +- docs/libnm-util/html/NMSettingSerial.html | 4 +- docs/libnm-util/html/NMSettingTeam.html | 4 +- docs/libnm-util/html/NMSettingTeamPort.html | 4 +- docs/libnm-util/html/NMSettingVPN.html | 4 +- docs/libnm-util/html/NMSettingVlan.html | 4 +- docs/libnm-util/html/NMSettingWimax.html | 4 +- docs/libnm-util/html/NMSettingWired.html | 4 +- docs/libnm-util/html/NMSettingWireless.html | 4 +- .../libnm-util/html/NMSettingWirelessSecurity.html | 4 +- docs/libnm-util/html/annotation-glossary.html | 4 +- docs/libnm-util/html/api-index-full.html | 4 +- docs/libnm-util/html/ch01.html | 4 +- docs/libnm-util/html/index.html | 6 +- .../libnm-util/html/libnm-util-NetworkManager.html | 4 +- .../html/libnm-util-NetworkManagerVPN.html | 4 +- docs/libnm-util/html/libnm-util-nm-utils.html | 4 +- docs/libnm-util/html/object-tree.html | 4 +- docs/libnm-util/version.xml | 2 +- docs/libnm/html/NMAccessPoint.html | 10 +- docs/libnm/html/NMActiveConnection.html | 4 +- docs/libnm/html/NMCheckpoint.html | 4 +- docs/libnm/html/NMClient.html | 4 +- docs/libnm/html/NMConnection.html | 6 +- docs/libnm/html/NMDevice.html | 10 +- docs/libnm/html/NMDeviceAdsl.html | 4 +- docs/libnm/html/NMDeviceBond.html | 4 +- docs/libnm/html/NMDeviceBridge.html | 4 +- docs/libnm/html/NMDeviceBt.html | 4 +- docs/libnm/html/NMDeviceDummy.html | 4 +- docs/libnm/html/NMDeviceEthernet.html | 4 +- docs/libnm/html/NMDeviceGeneric.html | 4 +- docs/libnm/html/NMDeviceIPTunnel.html | 4 +- docs/libnm/html/NMDeviceInfiniband.html | 4 +- docs/libnm/html/NMDeviceMacsec.html | 4 +- docs/libnm/html/NMDeviceMacvlan.html | 4 +- docs/libnm/html/NMDeviceModem.html | 4 +- docs/libnm/html/NMDeviceOlpcMesh.html | 4 +- docs/libnm/html/NMDeviceOvsBridge.html | 4 +- docs/libnm/html/NMDeviceOvsInterface.html | 4 +- docs/libnm/html/NMDeviceOvsPort.html | 4 +- docs/libnm/html/NMDevicePpp.html | 4 +- docs/libnm/html/NMDeviceTeam.html | 4 +- docs/libnm/html/NMDeviceTun.html | 4 +- docs/libnm/html/NMDeviceVlan.html | 4 +- docs/libnm/html/NMDeviceVxlan.html | 4 +- docs/libnm/html/NMDeviceWifi.html | 4 +- docs/libnm/html/NMDeviceWimax.html | 4 +- docs/libnm/html/NMDeviceWireGuard.html | 4 +- docs/libnm/html/NMDhcpConfig.html | 4 +- docs/libnm/html/NMIPConfig.html | 4 +- docs/libnm/html/NMObject.html | 4 +- docs/libnm/html/NMRemoteConnection.html | 4 +- docs/libnm/html/NMSecretAgentOld.html | 4 +- docs/libnm/html/NMSetting.html | 4 +- docs/libnm/html/NMSetting6Lowpan.html | 4 +- docs/libnm/html/NMSetting8021x.html | 4 +- docs/libnm/html/NMSettingAdsl.html | 4 +- docs/libnm/html/NMSettingBluetooth.html | 4 +- docs/libnm/html/NMSettingBond.html | 4 +- docs/libnm/html/NMSettingBridge.html | 4 +- docs/libnm/html/NMSettingBridgePort.html | 4 +- docs/libnm/html/NMSettingCdma.html | 4 +- docs/libnm/html/NMSettingConnection.html | 10 +- docs/libnm/html/NMSettingDcb.html | 4 +- docs/libnm/html/NMSettingDummy.html | 4 +- docs/libnm/html/NMSettingEthtool.html | 4 +- docs/libnm/html/NMSettingGeneric.html | 6 +- docs/libnm/html/NMSettingGsm.html | 4 +- docs/libnm/html/NMSettingIP4Config.html | 14 +- docs/libnm/html/NMSettingIP6Config.html | 7 +- docs/libnm/html/NMSettingIPConfig.html | 4 +- docs/libnm/html/NMSettingIPTunnel.html | 4 +- docs/libnm/html/NMSettingInfiniband.html | 4 +- docs/libnm/html/NMSettingMacsec.html | 4 +- docs/libnm/html/NMSettingMacvlan.html | 4 +- docs/libnm/html/NMSettingMatch.html | 4 +- docs/libnm/html/NMSettingOlpcMesh.html | 4 +- docs/libnm/html/NMSettingOvsBridge.html | 4 +- docs/libnm/html/NMSettingOvsInterface.html | 4 +- docs/libnm/html/NMSettingOvsPatch.html | 4 +- docs/libnm/html/NMSettingOvsPort.html | 4 +- docs/libnm/html/NMSettingPpp.html | 4 +- docs/libnm/html/NMSettingPppoe.html | 4 +- docs/libnm/html/NMSettingProxy.html | 4 +- docs/libnm/html/NMSettingSerial.html | 4 +- docs/libnm/html/NMSettingSriov.html | 4 +- docs/libnm/html/NMSettingTCConfig.html | 4 +- docs/libnm/html/NMSettingTeam.html | 4 +- docs/libnm/html/NMSettingTeamPort.html | 4 +- docs/libnm/html/NMSettingTun.html | 4 +- docs/libnm/html/NMSettingUser.html | 4 +- docs/libnm/html/NMSettingVlan.html | 4 +- docs/libnm/html/NMSettingVpn.html | 4 +- docs/libnm/html/NMSettingVxlan.html | 4 +- docs/libnm/html/NMSettingWimax.html | 4 +- docs/libnm/html/NMSettingWired.html | 4 +- docs/libnm/html/NMSettingWireless.html | 4 +- docs/libnm/html/NMSettingWirelessSecurity.html | 4 +- docs/libnm/html/NMSettingWpan.html | 4 +- docs/libnm/html/NMSimpleConnection.html | 4 +- docs/libnm/html/NMVpnConnection.html | 4 +- docs/libnm/html/NMVpnEditor.html | 6 +- docs/libnm/html/NMVpnEditorPlugin.html | 4 +- docs/libnm/html/NMWimaxNsp.html | 10 +- docs/libnm/html/annotation-glossary.html | 4 +- docs/libnm/html/api-index-full.html | 130 +- docs/libnm/html/ch02.html | 4 +- docs/libnm/html/ch03.html | 4 +- docs/libnm/html/ch04.html | 4 +- docs/libnm/html/ch05.html | 4 +- docs/libnm/html/ch06.html | 4 +- docs/libnm/html/index.html | 6 +- docs/libnm/html/libnm-nm-dbus-interface.html | 4 +- docs/libnm/html/libnm-nm-device-6lowpan.html | 4 +- docs/libnm/html/libnm-nm-device-wpan.html | 4 +- docs/libnm/html/libnm-nm-errors.html | 8 +- docs/libnm/html/libnm-nm-utils.html | 4 +- docs/libnm/html/libnm-nm-version.html | 4 +- docs/libnm/html/libnm-nm-vpn-plugin-info.html | 4 +- docs/libnm/html/libnm-nm-vpn-plugin-old.html | 4 +- docs/libnm/html/libnm-nm-vpn-service-plugin.html | 4 +- docs/libnm/html/object-tree.html | 4 +- docs/libnm/html/ref-overview.html | 4 +- docs/libnm/html/usage.html | 6 +- docs/libnm/libnm-docs.xml | 7 - docs/libnm/version.xml | 2 +- docs/meson.build | 2 +- examples/nm-conf.d/31-mac-addr-change.conf | 7 +- libnm-core/nm-connection.c | 24 + libnm-core/nm-connection.h | 2 + libnm-core/nm-core-internal.h | 60 +- libnm-core/nm-crypto.c | 15 +- libnm-core/nm-keyfile.c | 2 +- libnm-core/nm-setting-bridge-port.c | 11 +- libnm-core/nm-setting-connection.c | 4 +- libnm-core/nm-setting-ip4-config.c | 11 +- libnm-core/nm-setting-ip6-config.c | 3 +- libnm-core/nm-setting-macsec.c | 30 +- libnm-core/nm-setting-sriov.c | 12 +- libnm-core/nm-setting.c | 14 +- libnm-core/nm-utils.c | 369 +++-- libnm-core/tests/test-general.c | 206 ++- libnm/meson.build | 2 +- libnm/nm-access-point.c | 2 +- libnm/nm-device-tun.c | 1 + libnm/nm-device.c | 2 +- libnm/nm-manager.c | 16 +- libnm/nm-property-docs.xml | 10 +- libnm/nm-remote-connection.c | 2 +- libnm/nm-settings-docs.xml | 10 +- libnm/nm-wimax-nsp.c | 2 +- man/NetworkManager.8 | 6 +- man/NetworkManager.conf.5 | 34 +- man/NetworkManager.conf.xml | 25 +- man/nm-initrd-generator.8 | 6 +- man/nm-online.1 | 6 +- man/nm-openvswitch.7 | 6 +- man/nm-settings-ifcfg-rh.5 | 6 +- man/nm-settings-ifcfg-rh.xml | 2 +- man/nm-settings-keyfile.5 | 6 +- man/nm-settings-keyfile.xml | 2 +- man/nm-settings.5 | 16 +- man/nm-settings.xml | 12 +- man/nmcli-examples.7 | 35 +- man/nmcli-examples.xml | 17 + man/nmcli.1 | 6 +- man/nmtui.1 | 6 +- meson.build | 2 +- meson_options.txt | 1 - shared/nm-utils/nm-hash-utils.c | 57 +- shared/nm-utils/nm-hash-utils.h | 62 +- shared/nm-utils/nm-jansson.h | 3 + shared/nm-utils/nm-macros-internal.h | 13 + shared/nm-utils/nm-shared-utils.c | 23 +- shared/nm-utils/nm-shared-utils.h | 42 + shared/nm-utils/nm-test-utils.h | 36 + shared/nm-utils/nm-udev-utils.c | 31 +- shared/nm-version-macros.h | 3 +- shared/nm-version-macros.h.in | 1 + src/NetworkManagerUtils.c | 4 +- src/NetworkManagerUtils.h | 1 + src/devices/bluetooth/nm-device-bt.c | 2 +- src/devices/nm-device-bridge.c | 101 +- src/devices/nm-device-ethernet.c | 5 +- src/devices/nm-device-infiniband.c | 1 + src/devices/nm-device-ip-tunnel.c | 1 + src/devices/nm-device-macvlan.c | 1 + src/devices/nm-device-wpan.c | 1 + src/devices/nm-device.c | 441 +++--- src/devices/nm-device.h | 2 + src/devices/nm-lldp-listener.c | 4 +- src/devices/ovs/nm-ovsdb.c | 78 +- src/devices/tests/test-lldp.c | 5 +- src/devices/wifi/nm-device-olpc-mesh.c | 19 +- src/devices/wwan/nm-device-modem.c | 38 +- src/dhcp/nm-dhcp-client.c | 75 +- src/dhcp/nm-dhcp-client.h | 13 +- src/dhcp/nm-dhcp-dhclient-utils.c | 36 +- src/dhcp/nm-dhcp-dhclient-utils.h | 5 +- src/dhcp/nm-dhcp-dhclient.c | 98 +- src/dhcp/nm-dhcp-dhcpcanon.c | 19 +- src/dhcp/nm-dhcp-dhcpcd.c | 5 +- src/dhcp/nm-dhcp-manager.c | 90 +- src/dhcp/nm-dhcp-manager.h | 2 + src/dhcp/nm-dhcp-systemd.c | 302 ++--- src/dhcp/nm-dhcp-utils.c | 4 +- src/dhcp/tests/test-dhcp-dhclient.c | 69 +- src/dns/nm-dns-dnsmasq.c | 13 +- src/dns/nm-dns-manager.c | 163 ++- src/dns/nm-dns-manager.h | 6 + src/dnsmasq/nm-dnsmasq-manager.c | 2 + src/initrd/meson.build | 32 + src/initrd/tests/meson.build | 23 + src/ndisc/nm-ndisc.h | 1 + src/nm-config-data.c | 6 +- src/nm-config-data.h | 9 + src/nm-connectivity.h | 15 + src/nm-core-utils.c | 984 ++++++++++---- src/nm-core-utils.h | 82 +- src/nm-dbus-manager.c | 26 +- src/nm-ip4-config.c | 24 +- src/nm-ip6-config.c | 24 +- src/nm-manager.c | 14 +- src/nm-policy.c | 11 +- src/nm-test-utils-core.h | 4 +- src/platform/nm-fake-platform.c | 1 + src/platform/nm-linux-platform.c | 23 +- src/platform/nm-platform-utils.c | 1 + src/platform/nm-platform.c | 49 +- src/platform/nm-platform.h | 21 +- src/platform/nmp-object.c | 1 + src/platform/tests/test-common.c | 2 - src/platform/tests/test-common.h | 3 + src/platform/wifi/nm-wifi-utils-nl80211.c | 1 + src/platform/wpan/nm-wpan-utils.c | 2 + src/settings/nm-settings-connection.c | 22 +- .../plugins/ibft/tests/iscsiadm-test-bad-dns1 | 21 + .../plugins/ibft/tests/iscsiadm-test-bad-dns2 | 21 + .../plugins/ibft/tests/iscsiadm-test-bad-entry | 20 + .../plugins/ibft/tests/iscsiadm-test-bad-gateway | 21 + .../plugins/ibft/tests/iscsiadm-test-bad-ipaddr | 21 + .../plugins/ibft/tests/iscsiadm-test-bad-record | 18 + src/settings/plugins/ibft/tests/iscsiadm-test-dhcp | 33 + .../plugins/ibft/tests/iscsiadm-test-static | 35 + src/settings/plugins/ibft/tests/iscsiadm-test-vlan | 19 + .../plugins/ifcfg-rh/nms-ifcfg-rh-reader.c | 31 +- .../plugins/ifcfg-rh/nms-ifcfg-rh-writer.c | 9 +- .../plugins/ifupdown/nms-ifupdown-plugin.c | 6 +- src/supplicant/nm-supplicant-config.c | 46 +- src/supplicant/nm-supplicant-interface.c | 36 +- src/supplicant/tests/test-supplicant-config.c | 4 +- src/systemd/meson.build | 3 +- src/systemd/nm-sd-utils.c | 61 + src/systemd/nm-sd-utils.h | 38 + src/systemd/src/basic/path-util.c | 2 - .../src/libsystemd-network/dhcp-identifier.c | 8 +- .../src/libsystemd-network/dhcp-identifier.h | 2 +- src/systemd/src/libsystemd-network/dhcp6-option.c | 78 +- .../src/libsystemd-network/sd-dhcp-client.c | 31 +- src/systemd/src/libsystemd-network/sd-dhcp-lease.c | 2 + .../src/libsystemd-network/sd-dhcp6-client.c | 25 +- src/tests/config/test-config.c | 19 + src/tests/test-general.c | 253 +++- src/tests/test-ip6-config.c | 1 + src/tests/test-systemd.c | 46 + src/vpn/nm-vpn-connection.c | 40 +- tools/check-docs.sh | 79 +- tools/check-settings-docs.sh | 19 + tools/create-exports-NetworkManager.sh | 2 +- tools/meson-post-install.sh | 2 +- tools/test-networkmanager-service.py | 12 +- 472 files changed, 5908 insertions(+), 3463 deletions(-) create mode 100644 src/initrd/meson.build create mode 100644 src/initrd/tests/meson.build create mode 100755 src/settings/plugins/ibft/tests/iscsiadm-test-bad-dns1 create mode 100755 src/settings/plugins/ibft/tests/iscsiadm-test-bad-dns2 create mode 100755 src/settings/plugins/ibft/tests/iscsiadm-test-bad-entry create mode 100755 src/settings/plugins/ibft/tests/iscsiadm-test-bad-gateway create mode 100755 src/settings/plugins/ibft/tests/iscsiadm-test-bad-ipaddr create mode 100755 src/settings/plugins/ibft/tests/iscsiadm-test-bad-record create mode 100755 src/settings/plugins/ibft/tests/iscsiadm-test-dhcp create mode 100755 src/settings/plugins/ibft/tests/iscsiadm-test-static create mode 100755 src/settings/plugins/ibft/tests/iscsiadm-test-vlan create mode 100644 src/systemd/nm-sd-utils.c create mode 100644 src/systemd/nm-sd-utils.h create mode 100755 tools/check-settings-docs.sh diff --git a/Makefile.am b/Makefile.am index 1e100f60..e1b442e9 100644 --- a/Makefile.am +++ b/Makefile.am @@ -167,7 +167,9 @@ DISTCHECK_CONFIGURE_FLAGS = \ --with-wext=no \ --enable-ifcfg-rh \ --enable-ifupdown \ - --disable-dependency-tracking + --enable-config-plugin-ibft \ + --disable-dependency-tracking \ + $(NULL) dist-configure-check: @echo "*** 'make dist' requires '--enable-gtk-doc --enable-introspection --with-libnm-glib'. ***" @@ -427,7 +429,7 @@ EXTRA_DIST += \ introspection/meson.build check-docs: - $(srcdir)/tools/check-docs.sh "$(srcdir)" + $(srcdir)/tools/check-docs.sh "$(srcdir)" "$(builddir)" check_local += check-docs @@ -1390,6 +1392,8 @@ src_libsystemd_nm_la_libadd = \ src_libsystemd_nm_la_SOURCES = \ src/systemd/nm-sd.c \ src/systemd/nm-sd.h \ + src/systemd/nm-sd-utils.c \ + src/systemd/nm-sd-utils.h \ src/systemd/sd-adapt/nm-sd-adapt.c \ src/systemd/sd-adapt/nm-sd-adapt.h \ src/systemd/sd-adapt/architecture.h \ @@ -1942,6 +1946,8 @@ src_initrd_tests_test_ibft_reader_LDADD = \ $(GLIB_LIBS) EXTRA_DIST += \ + src/initrd/meson.build \ + src/initrd/tests/meson.build \ src/initrd/tests/sysfs/class/net/eth0/address \ src/initrd/tests/sysfs/class/net/eth2/address \ src/initrd/tests/sysfs/firmware/ibft/ethernet0/prefix-len \ @@ -2392,6 +2398,13 @@ src_settings_plugins_ibft_tests_test_ibft_LDADD = \ $(src_settings_plugins_ibft_tests_test_ibft_OBJECTS): $(libnm_core_lib_h_pub_mkenums) +check-local-symbols-settings-ibft: src/settings/plugins/ibft/libnm-settings-plugin-ibft.la + $(call check_so_symbols,$(builddir)/src/settings/plugins/ibft/.libs/libnm-settings-plugin-ibft.so) + +check_local += check-local-symbols-settings-ibft + +endif + EXTRA_DIST += \ src/settings/plugins/ibft/tests/iscsiadm-test-dhcp \ src/settings/plugins/ibft/tests/iscsiadm-test-static \ @@ -2401,16 +2414,7 @@ EXTRA_DIST += \ src/settings/plugins/ibft/tests/iscsiadm-test-bad-dns2 \ src/settings/plugins/ibft/tests/iscsiadm-test-bad-entry \ src/settings/plugins/ibft/tests/iscsiadm-test-bad-record \ - src/settings/plugins/ibft/tests/iscsiadm-test-vlan - -check-local-symbols-settings-ibft: src/settings/plugins/ibft/libnm-settings-plugin-ibft.la - $(call check_so_symbols,$(builddir)/src/settings/plugins/ibft/.libs/libnm-settings-plugin-ibft.so) - -check_local += check-local-symbols-settings-ibft - -endif - -EXTRA_DIST += \ + src/settings/plugins/ibft/tests/iscsiadm-test-vlan \ src/settings/plugins/ibft/meson.build \ src/settings/plugins/ibft/tests/meson.build @@ -3697,16 +3701,7 @@ $(clients_common_settings_doc_h): clients/common/settings-docs.xsl libnm/nm-prop $(AM_V_GEN) $(XSLTPROC) --output $@ $< $(word 2,$^) DISTCLEANFILES += $(clients_common_settings_doc_h) check-local-settings-docs: $(clients_common_settings_doc_h) - @if test -z "$$NMTST_NO_CHECK_SETTINGS_DOCS" ; then \ - if ! cmp -s "$(srcdir)/$(clients_common_settings_doc_h).in" "$(builddir)/$(clients_common_settings_doc_h)" ; then \ - if test "$$NM_TEST_REGENERATE" == 1 ; then \ - cp -f "$(builddir)/$(clients_common_settings_doc_h)" "$(srcdir)/$(clients_common_settings_doc_h).in"; \ - else \ - echo "The generated file \"$(builddir)/$(clients_common_settings_doc_h)\" differs from the source file \"$(srcdir)/$(clients_common_settings_doc_h).in\". You probably should copy the generated file over to the source file. You can skip this test by setting \$$NMTST_NO_CHECK_SETTINGS_DOCS=yes". You can also automatically copy the file by rerunning the test with \$$NM_TEST_REGENERATE=1 ; \ - false; \ - fi; \ - fi;\ - fi + $(srcdir)/tools/check-settings-docs.sh "$(srcdir)" "$(builddir)" "$(clients_common_settings_doc_h)" check_local += check-local-settings-docs else $(clients_common_settings_doc_h): $(clients_common_settings_doc_h).in clients/common/.dirstamp @@ -5048,6 +5043,7 @@ EXTRA_DIST += \ \ tools/check-docs.sh \ tools/check-exports.sh \ + tools/check-settings-docs.sh \ tools/create-exports-NetworkManager.sh \ tools/debug-helper.py \ tools/meson-post-install.sh \ diff --git a/Makefile.in b/Makefile.in index 5da627b4..d4b9349b 100644 --- a/Makefile.in +++ b/Makefile.in @@ -196,141 +196,130 @@ TESTS = $(am__EXEEXT_14) @CONFIG_PLUGIN_IBFT_TRUE@am__append_22 = src/settings/plugins/ibft/libnm-settings-plugin-ibft.la @CONFIG_PLUGIN_IBFT_TRUE@am__append_23 = src/settings/plugins/ibft/libnms-ibft-core.la @CONFIG_PLUGIN_IBFT_TRUE@am__append_24 = src/settings/plugins/ibft/tests/test-ibft -@CONFIG_PLUGIN_IBFT_TRUE@am__append_25 = \ -@CONFIG_PLUGIN_IBFT_TRUE@ src/settings/plugins/ibft/tests/iscsiadm-test-dhcp \ -@CONFIG_PLUGIN_IBFT_TRUE@ src/settings/plugins/ibft/tests/iscsiadm-test-static \ -@CONFIG_PLUGIN_IBFT_TRUE@ src/settings/plugins/ibft/tests/iscsiadm-test-bad-ipaddr \ -@CONFIG_PLUGIN_IBFT_TRUE@ src/settings/plugins/ibft/tests/iscsiadm-test-bad-gateway \ -@CONFIG_PLUGIN_IBFT_TRUE@ src/settings/plugins/ibft/tests/iscsiadm-test-bad-dns1 \ -@CONFIG_PLUGIN_IBFT_TRUE@ src/settings/plugins/ibft/tests/iscsiadm-test-bad-dns2 \ -@CONFIG_PLUGIN_IBFT_TRUE@ src/settings/plugins/ibft/tests/iscsiadm-test-bad-entry \ -@CONFIG_PLUGIN_IBFT_TRUE@ src/settings/plugins/ibft/tests/iscsiadm-test-bad-record \ -@CONFIG_PLUGIN_IBFT_TRUE@ src/settings/plugins/ibft/tests/iscsiadm-test-vlan - -@CONFIG_PLUGIN_IBFT_TRUE@am__append_26 = check-local-symbols-settings-ibft +@CONFIG_PLUGIN_IBFT_TRUE@am__append_25 = check-local-symbols-settings-ibft ############################################################################### # src/settings/plugins/ifcfg-rh ############################################################################### -@CONFIG_PLUGIN_IFCFG_RH_TRUE@am__append_27 = src/settings/plugins/ifcfg-rh/libnm-settings-plugin-ifcfg-rh.la -@CONFIG_PLUGIN_IFCFG_RH_TRUE@am__append_28 = \ +@CONFIG_PLUGIN_IFCFG_RH_TRUE@am__append_26 = src/settings/plugins/ifcfg-rh/libnm-settings-plugin-ifcfg-rh.la +@CONFIG_PLUGIN_IFCFG_RH_TRUE@am__append_27 = \ @CONFIG_PLUGIN_IFCFG_RH_TRUE@ src/settings/plugins/ifcfg-rh/libnmdbus-ifcfg-rh.la \ @CONFIG_PLUGIN_IFCFG_RH_TRUE@ src/settings/plugins/ifcfg-rh/libnms-ifcfg-rh-core.la -@CONFIG_PLUGIN_IFCFG_RH_TRUE@am__append_29 = $(nodist_src_settings_plugins_ifcfg_rh_libnmdbus_ifcfg_rh_la_SOURCES) -@CONFIG_PLUGIN_IFCFG_RH_TRUE@am__append_30 = check-local-symbols-settings-ifcfg-rh +@CONFIG_PLUGIN_IFCFG_RH_TRUE@am__append_28 = $(nodist_src_settings_plugins_ifcfg_rh_libnmdbus_ifcfg_rh_la_SOURCES) +@CONFIG_PLUGIN_IFCFG_RH_TRUE@am__append_29 = check-local-symbols-settings-ifcfg-rh ############################################################################### # src/settings/plugins/ifcfg-rh/tests ############################################################################### -@CONFIG_PLUGIN_IFCFG_RH_TRUE@am__append_31 = src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh -@CONFIG_PLUGIN_IFCFG_RH_TRUE@am__append_32 = \ +@CONFIG_PLUGIN_IFCFG_RH_TRUE@am__append_30 = src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh +@CONFIG_PLUGIN_IFCFG_RH_TRUE@am__append_31 = \ @CONFIG_PLUGIN_IFCFG_RH_TRUE@ src/settings/plugins/ifcfg-rh/nm-ifup \ @CONFIG_PLUGIN_IFCFG_RH_TRUE@ src/settings/plugins/ifcfg-rh/nm-ifdown -@CONFIG_PLUGIN_IFCFG_RH_TRUE@am__append_33 = install-data-hook-ifcfg-rh +@CONFIG_PLUGIN_IFCFG_RH_TRUE@am__append_32 = install-data-hook-ifcfg-rh ############################################################################### -@CONFIG_PLUGIN_IFCFG_RH_TRUE@am__append_34 = src/settings/plugins/ifcfg-rh/nm-ifcfg-rh.conf +@CONFIG_PLUGIN_IFCFG_RH_TRUE@am__append_33 = src/settings/plugins/ifcfg-rh/nm-ifcfg-rh.conf ############################################################################### # src/settings/plugins/ifupdown ############################################################################### -@CONFIG_PLUGIN_IFUPDOWN_TRUE@am__append_35 = src/settings/plugins/ifupdown/libnm-settings-plugin-ifupdown.la -@CONFIG_PLUGIN_IFUPDOWN_TRUE@am__append_36 = src/settings/plugins/ifupdown/libnms-ifupdown-core.la -@CONFIG_PLUGIN_IFUPDOWN_TRUE@am__append_37 = check-local-symbols-settings-ifupdown +@CONFIG_PLUGIN_IFUPDOWN_TRUE@am__append_34 = src/settings/plugins/ifupdown/libnm-settings-plugin-ifupdown.la +@CONFIG_PLUGIN_IFUPDOWN_TRUE@am__append_35 = src/settings/plugins/ifupdown/libnms-ifupdown-core.la +@CONFIG_PLUGIN_IFUPDOWN_TRUE@am__append_36 = check-local-symbols-settings-ifupdown ############################################################################### -@CONFIG_PLUGIN_IFUPDOWN_TRUE@am__append_38 = src/settings/plugins/ifupdown/tests/test-ifupdown +@CONFIG_PLUGIN_IFUPDOWN_TRUE@am__append_37 = src/settings/plugins/ifupdown/tests/test-ifupdown ############################################################################### # src/devices/bluetooth ############################################################################### -@WITH_MODEM_MANAGER_1_TRUE@am__append_39 = \ +@WITH_MODEM_MANAGER_1_TRUE@am__append_38 = \ @WITH_MODEM_MANAGER_1_TRUE@ src/devices/wwan/libnm-wwan.la \ @WITH_MODEM_MANAGER_1_TRUE@ src/devices/wwan/libnm-device-plugin-wwan.la \ @WITH_MODEM_MANAGER_1_TRUE@ src/devices/bluetooth/libnm-device-plugin-bluetooth.la -@WITH_MODEM_MANAGER_1_TRUE@@WITH_OFONO_TRUE@am__append_40 = \ +@WITH_MODEM_MANAGER_1_TRUE@@WITH_OFONO_TRUE@am__append_39 = \ @WITH_MODEM_MANAGER_1_TRUE@@WITH_OFONO_TRUE@ src/devices/wwan/nm-modem-ofono.c \ @WITH_MODEM_MANAGER_1_TRUE@@WITH_OFONO_TRUE@ src/devices/wwan/nm-modem-ofono.h -@WITH_MODEM_MANAGER_1_TRUE@am__append_41 = check-local-devices-wwan \ +@WITH_MODEM_MANAGER_1_TRUE@am__append_40 = check-local-devices-wwan \ @WITH_MODEM_MANAGER_1_TRUE@ check-local-devices-bluetooth -@WITH_BLUEZ5_DUN_TRUE@@WITH_MODEM_MANAGER_1_TRUE@am__append_42 = $(BLUEZ5_CFLAGS) -@WITH_BLUEZ5_DUN_TRUE@@WITH_MODEM_MANAGER_1_TRUE@am__append_43 = \ +@WITH_BLUEZ5_DUN_TRUE@@WITH_MODEM_MANAGER_1_TRUE@am__append_41 = $(BLUEZ5_CFLAGS) +@WITH_BLUEZ5_DUN_TRUE@@WITH_MODEM_MANAGER_1_TRUE@am__append_42 = \ @WITH_BLUEZ5_DUN_TRUE@@WITH_MODEM_MANAGER_1_TRUE@ src/devices/bluetooth/nm-bluez5-dun.c \ @WITH_BLUEZ5_DUN_TRUE@@WITH_MODEM_MANAGER_1_TRUE@ src/devices/bluetooth/nm-bluez5-dun.h -@WITH_BLUEZ5_DUN_TRUE@@WITH_MODEM_MANAGER_1_TRUE@am__append_44 = $(BLUEZ5_LIBS) +@WITH_BLUEZ5_DUN_TRUE@@WITH_MODEM_MANAGER_1_TRUE@am__append_43 = $(BLUEZ5_LIBS) ############################################################################### # src/devices/wifi ############################################################################### -@WITH_WIFI_TRUE@am__append_45 = src/devices/wifi/libnm-device-plugin-wifi.la -@WITH_IWD_TRUE@@WITH_WIFI_TRUE@am__append_46 = \ +@WITH_WIFI_TRUE@am__append_44 = src/devices/wifi/libnm-device-plugin-wifi.la +@WITH_IWD_TRUE@@WITH_WIFI_TRUE@am__append_45 = \ @WITH_IWD_TRUE@@WITH_WIFI_TRUE@ src/devices/wifi/nm-device-iwd.c \ @WITH_IWD_TRUE@@WITH_WIFI_TRUE@ src/devices/wifi/nm-device-iwd.h \ @WITH_IWD_TRUE@@WITH_WIFI_TRUE@ src/devices/wifi/nm-iwd-manager.c \ @WITH_IWD_TRUE@@WITH_WIFI_TRUE@ src/devices/wifi/nm-iwd-manager.h -@WITH_WIFI_TRUE@am__append_47 = check-local-devices-wifi -@WITH_WIFI_TRUE@am__append_48 = src/devices/wifi/tests/test-general +@WITH_WIFI_TRUE@am__append_46 = check-local-devices-wifi +@WITH_WIFI_TRUE@am__append_47 = src/devices/wifi/tests/test-general ############################################################################### # src/devices/team ############################################################################### -@WITH_TEAMDCTL_TRUE@am__append_49 = src/devices/team/libnm-device-plugin-team.la -@WITH_TEAMDCTL_TRUE@am__append_50 = check-local-devices-team -@WITH_OPENVSWITCH_TRUE@am__append_51 = src/devices/ovs/libnm-device-plugin-ovs.la -@HAVE_INTROSPECTION_TRUE@am__append_52 = $(clients_common_settings_doc_h) -@HAVE_INTROSPECTION_TRUE@am__append_53 = check-local-settings-docs -@HAVE_INTROSPECTION_TRUE@am__append_54 = clients/common/libnmc.la -@HAVE_INTROSPECTION_FALSE@am__append_55 = clients/common/libnmc.la -@HAVE_INTROSPECTION_TRUE@am__append_56 = clients/common/tests/test-general -@BUILD_NMCLI_TRUE@@HAVE_INTROSPECTION_FALSE@am__append_57 = clients/common/tests/test-general +@WITH_TEAMDCTL_TRUE@am__append_48 = src/devices/team/libnm-device-plugin-team.la +@WITH_TEAMDCTL_TRUE@am__append_49 = check-local-devices-team +@WITH_OPENVSWITCH_TRUE@am__append_50 = src/devices/ovs/libnm-device-plugin-ovs.la +@HAVE_INTROSPECTION_TRUE@am__append_51 = $(clients_common_settings_doc_h) +@HAVE_INTROSPECTION_TRUE@am__append_52 = check-local-settings-docs +@HAVE_INTROSPECTION_TRUE@am__append_53 = clients/common/libnmc.la +@HAVE_INTROSPECTION_FALSE@am__append_54 = clients/common/libnmc.la +@HAVE_INTROSPECTION_TRUE@am__append_55 = clients/common/tests/test-general +@BUILD_NMCLI_TRUE@@HAVE_INTROSPECTION_FALSE@am__append_56 = clients/common/tests/test-general ############################################################################### # clients/cli ############################################################################### -@BUILD_NMCLI_TRUE@am__append_58 = clients/cli/nmcli -@BUILD_NMCLI_TRUE@@WITH_POLKIT_AGENT_TRUE@am__append_59 = $(POLKIT_CFLAGS) -@BUILD_NMCLI_TRUE@@WITH_POLKIT_AGENT_TRUE@am__append_60 = \ +@BUILD_NMCLI_TRUE@am__append_57 = clients/cli/nmcli +@BUILD_NMCLI_TRUE@@WITH_POLKIT_AGENT_TRUE@am__append_58 = $(POLKIT_CFLAGS) +@BUILD_NMCLI_TRUE@@WITH_POLKIT_AGENT_TRUE@am__append_59 = \ @BUILD_NMCLI_TRUE@@WITH_POLKIT_AGENT_TRUE@ clients/common/nm-polkit-listener.c \ @BUILD_NMCLI_TRUE@@WITH_POLKIT_AGENT_TRUE@ clients/common/nm-polkit-listener.h -@BUILD_NMCLI_TRUE@@WITH_POLKIT_AGENT_TRUE@am__append_61 = $(POLKIT_LIBS) -@BUILD_NMCLI_TRUE@am__append_62 = install-data-hook-nmcli -@BUILD_NMCLI_TRUE@am__append_63 = uninstall-hook-nmcli +@BUILD_NMCLI_TRUE@@WITH_POLKIT_AGENT_TRUE@am__append_60 = $(POLKIT_LIBS) +@BUILD_NMCLI_TRUE@am__append_61 = install-data-hook-nmcli +@BUILD_NMCLI_TRUE@am__append_62 = uninstall-hook-nmcli ############################################################################### # clients/tui ############################################################################### -@BUILD_NMTUI_TRUE@am__append_64 = clients/tui/newt/libnmt-newt.a -@BUILD_NMTUI_TRUE@am__append_65 = clients/tui/nmtui -@BUILD_NMTUI_TRUE@am__append_66 = install-exec-hook-nmtui -@BUILD_NMTUI_TRUE@am__append_67 = uninstall-hook-nmtui -@HAVE_SYSTEMD_TRUE@am__append_68 = data/org.freedesktop.NetworkManager.service +@BUILD_NMTUI_TRUE@am__append_63 = clients/tui/newt/libnmt-newt.a +@BUILD_NMTUI_TRUE@am__append_64 = clients/tui/nmtui +@BUILD_NMTUI_TRUE@am__append_65 = install-exec-hook-nmtui +@BUILD_NMTUI_TRUE@am__append_66 = uninstall-hook-nmtui +@HAVE_SYSTEMD_TRUE@am__append_67 = data/org.freedesktop.NetworkManager.service ############################################################################### # libnm-util ############################################################################### -@WITH_LEGACY_LIBRARIES_TRUE@am__append_69 = libnm-util/libnm-util.la \ +@WITH_LEGACY_LIBRARIES_TRUE@am__append_68 = libnm-util/libnm-util.la \ @WITH_LEGACY_LIBRARIES_TRUE@ libnm-glib/libnm-glib.la \ @WITH_LEGACY_LIBRARIES_TRUE@ libnm-glib/libnm-glib-vpn.la -@WITH_LEGACY_LIBRARIES_TRUE@am__append_70 = \ +@WITH_LEGACY_LIBRARIES_TRUE@am__append_69 = \ @WITH_LEGACY_LIBRARIES_TRUE@ $(libnm_util_lib_h_pub_mkenums) \ @WITH_LEGACY_LIBRARIES_TRUE@ $(libnm_util_lib_c_mkenums) \ @WITH_LEGACY_LIBRARIES_TRUE@ $(libnm_glib_lib_h_pub_mkenums) \ @WITH_LEGACY_LIBRARIES_TRUE@ $(libnm_glib_lib_c_mkenums) \ @WITH_LEGACY_LIBRARIES_TRUE@ $(libnm_glib_vpn_h_mkenums) \ @WITH_LEGACY_LIBRARIES_TRUE@ $(libnm_glib_vpn_c_mkenums) -@WITH_GNUTLS_TRUE@@WITH_LEGACY_LIBRARIES_TRUE@am__append_71 = $(GNUTLS_CFLAGS) -@WITH_GNUTLS_TRUE@@WITH_LEGACY_LIBRARIES_TRUE@am__append_72 = libnm-util/crypto_gnutls.c -@WITH_GNUTLS_TRUE@@WITH_LEGACY_LIBRARIES_TRUE@am__append_73 = $(GNUTLS_LIBS) -@WITH_LEGACY_LIBRARIES_TRUE@@WITH_NSS_TRUE@am__append_74 = $(NSS_CFLAGS) -@WITH_LEGACY_LIBRARIES_TRUE@@WITH_NSS_TRUE@am__append_75 = libnm-util/crypto_nss.c -@WITH_LEGACY_LIBRARIES_TRUE@@WITH_NSS_TRUE@am__append_76 = $(NSS_LIBS) -@WITH_LEGACY_LIBRARIES_TRUE@am__append_77 = \ +@WITH_GNUTLS_TRUE@@WITH_LEGACY_LIBRARIES_TRUE@am__append_70 = $(GNUTLS_CFLAGS) +@WITH_GNUTLS_TRUE@@WITH_LEGACY_LIBRARIES_TRUE@am__append_71 = libnm-util/crypto_gnutls.c +@WITH_GNUTLS_TRUE@@WITH_LEGACY_LIBRARIES_TRUE@am__append_72 = $(GNUTLS_LIBS) +@WITH_LEGACY_LIBRARIES_TRUE@@WITH_NSS_TRUE@am__append_73 = $(NSS_CFLAGS) +@WITH_LEGACY_LIBRARIES_TRUE@@WITH_NSS_TRUE@am__append_74 = libnm-util/crypto_nss.c +@WITH_LEGACY_LIBRARIES_TRUE@@WITH_NSS_TRUE@am__append_75 = $(NSS_LIBS) +@WITH_LEGACY_LIBRARIES_TRUE@am__append_76 = \ @WITH_LEGACY_LIBRARIES_TRUE@ libnm-util/crypto_gnutls.c \ @WITH_LEGACY_LIBRARIES_TRUE@ libnm-util/crypto_nss.c \ @WITH_LEGACY_LIBRARIES_TRUE@ libnm-util/COPYING \ @@ -349,26 +338,26 @@ TESTS = $(am__EXEEXT_14) @WITH_LEGACY_LIBRARIES_TRUE@ libnm-glib/nm-glib-enum-types.c.template \ @WITH_LEGACY_LIBRARIES_TRUE@ libnm-glib/nm-glib-enum-types.h.template \ @WITH_LEGACY_LIBRARIES_TRUE@ libnm-glib/meson.build -@WITH_LEGACY_LIBRARIES_TRUE@am__append_78 = libnm-util/libtest-crypto.la -@WITH_GNUTLS_TRUE@@WITH_LEGACY_LIBRARIES_TRUE@am__append_79 = libnm-util/crypto_gnutls.c -@WITH_GNUTLS_TRUE@@WITH_LEGACY_LIBRARIES_TRUE@am__append_80 = $(GNUTLS_LIBS) -@WITH_LEGACY_LIBRARIES_TRUE@@WITH_NSS_TRUE@am__append_81 = libnm-util/crypto_nss.c -@WITH_LEGACY_LIBRARIES_TRUE@@WITH_NSS_TRUE@am__append_82 = $(NSS_LIBS) -@WITH_LEGACY_LIBRARIES_TRUE@am__append_83 = libnm-util/libnm-util.pc \ +@WITH_LEGACY_LIBRARIES_TRUE@am__append_77 = libnm-util/libtest-crypto.la +@WITH_GNUTLS_TRUE@@WITH_LEGACY_LIBRARIES_TRUE@am__append_78 = libnm-util/crypto_gnutls.c +@WITH_GNUTLS_TRUE@@WITH_LEGACY_LIBRARIES_TRUE@am__append_79 = $(GNUTLS_LIBS) +@WITH_LEGACY_LIBRARIES_TRUE@@WITH_NSS_TRUE@am__append_80 = libnm-util/crypto_nss.c +@WITH_LEGACY_LIBRARIES_TRUE@@WITH_NSS_TRUE@am__append_81 = $(NSS_LIBS) +@WITH_LEGACY_LIBRARIES_TRUE@am__append_82 = libnm-util/libnm-util.pc \ @WITH_LEGACY_LIBRARIES_TRUE@ libnm-glib/libnm-glib.pc \ @WITH_LEGACY_LIBRARIES_TRUE@ libnm-glib/libnm-glib-vpn.pc -@WITH_LEGACY_LIBRARIES_TRUE@am__append_84 = libnm-util/libnm-util.pc \ +@WITH_LEGACY_LIBRARIES_TRUE@am__append_83 = libnm-util/libnm-util.pc \ @WITH_LEGACY_LIBRARIES_TRUE@ libnm-glib/libnm-glib.pc \ @WITH_LEGACY_LIBRARIES_TRUE@ libnm-glib/libnm-glib.pc -@HAVE_INTROSPECTION_TRUE@@WITH_LEGACY_LIBRARIES_TRUE@am__append_85 = libnm-util/NetworkManager-1.0.gir \ +@HAVE_INTROSPECTION_TRUE@@WITH_LEGACY_LIBRARIES_TRUE@am__append_84 = libnm-util/NetworkManager-1.0.gir \ @HAVE_INTROSPECTION_TRUE@@WITH_LEGACY_LIBRARIES_TRUE@ libnm-glib/NMClient-1.0.gir -@WITH_LEGACY_LIBRARIES_TRUE@am__append_86 = \ +@WITH_LEGACY_LIBRARIES_TRUE@am__append_85 = \ @WITH_LEGACY_LIBRARIES_TRUE@ check-local-exports-libnm-util \ @WITH_LEGACY_LIBRARIES_TRUE@ check-local-exports-libnm-glib -@WITH_LEGACY_LIBRARIES_TRUE@am__append_87 = libnm-util/libnm-util.la \ +@WITH_LEGACY_LIBRARIES_TRUE@am__append_86 = libnm-util/libnm-util.la \ @WITH_LEGACY_LIBRARIES_TRUE@ libnm-glib/libnm-glib.la \ @WITH_LEGACY_LIBRARIES_TRUE@ libnm-glib/libnm-glib-vpn.la -@WITH_LEGACY_LIBRARIES_TRUE@am__append_88 = \ +@WITH_LEGACY_LIBRARIES_TRUE@am__append_87 = \ @WITH_LEGACY_LIBRARIES_TRUE@ libnm-util/tests/test-settings-defaults \ @WITH_LEGACY_LIBRARIES_TRUE@ libnm-util/tests/test-crypto \ @WITH_LEGACY_LIBRARIES_TRUE@ libnm-util/tests/test-secrets \ @@ -376,57 +365,57 @@ TESTS = $(am__EXEEXT_14) @WITH_LEGACY_LIBRARIES_TRUE@ libnm-util/tests/test-setting-8021x \ @WITH_LEGACY_LIBRARIES_TRUE@ libnm-util/tests/test-setting-dcb -@WITH_LEGACY_LIBRARIES_TRUE@am__append_89 = libnm-util/tests/test-libnm-linking \ +@WITH_LEGACY_LIBRARIES_TRUE@am__append_88 = libnm-util/tests/test-libnm-linking \ @WITH_LEGACY_LIBRARIES_TRUE@ libnm-glib/libnm-glib-test \ @WITH_LEGACY_LIBRARIES_TRUE@ libnm-glib/tests/test-nm-client -@WITH_LEGACY_LIBRARIES_TRUE@am__append_90 = libnm-glib/libdeprecated-nm-glib.la -@WITH_LEGACY_LIBRARIES_TRUE@am__append_91 = \ +@WITH_LEGACY_LIBRARIES_TRUE@am__append_89 = libnm-glib/libdeprecated-nm-glib.la +@WITH_LEGACY_LIBRARIES_TRUE@am__append_90 = \ @WITH_LEGACY_LIBRARIES_TRUE@ libnm-glib/nm-vpn-plugin-glue.h \ @WITH_LEGACY_LIBRARIES_TRUE@ libnm-glib/nm-secret-agent-glue.h -@HAVE_INTROSPECTION_TRUE@@WITH_LEGACY_LIBRARIES_TRUE@am__append_92 = check-local-libnm-glib-nm-client -@HAVE_INTROSPECTION_TRUE@@WITH_LEGACY_LIBRARIES_TRUE@am__append_93 = libnm-glib/tests/test-remote-settings-client -@HAVE_INTROSPECTION_FALSE@@WITH_LEGACY_LIBRARIES_TRUE@am__append_94 = libnm-glib/tests/test-remote-settings-client -@HAVE_INTROSPECTION_TRUE@am__append_95 = $(man_nm_settings_xml) -@WITH_OPENVSWITCH_TRUE@am__append_96 = man/nm-openvswitch.7 +@HAVE_INTROSPECTION_TRUE@@WITH_LEGACY_LIBRARIES_TRUE@am__append_91 = check-local-libnm-glib-nm-client +@HAVE_INTROSPECTION_TRUE@@WITH_LEGACY_LIBRARIES_TRUE@am__append_92 = libnm-glib/tests/test-remote-settings-client +@HAVE_INTROSPECTION_FALSE@@WITH_LEGACY_LIBRARIES_TRUE@am__append_93 = libnm-glib/tests/test-remote-settings-client +@HAVE_INTROSPECTION_TRUE@am__append_94 = $(man_nm_settings_xml) +@WITH_OPENVSWITCH_TRUE@am__append_95 = man/nm-openvswitch.7 +@WITH_OPENVSWITCH_FALSE@am__append_96 = man/nm-openvswitch.7 @WITH_OPENVSWITCH_FALSE@am__append_97 = man/nm-openvswitch.7 -@WITH_OPENVSWITCH_FALSE@am__append_98 = man/nm-openvswitch.7 -@CONFIG_PLUGIN_IFCFG_RH_TRUE@am__append_99 = man/nm-settings-ifcfg-rh.5 +@CONFIG_PLUGIN_IFCFG_RH_TRUE@am__append_98 = man/nm-settings-ifcfg-rh.5 +@CONFIG_PLUGIN_IFCFG_RH_FALSE@am__append_99 = man/nm-settings-ifcfg-rh.5 @CONFIG_PLUGIN_IFCFG_RH_FALSE@am__append_100 = man/nm-settings-ifcfg-rh.5 -@CONFIG_PLUGIN_IFCFG_RH_FALSE@am__append_101 = man/nm-settings-ifcfg-rh.5 -@HAVE_DOCS_TRUE@am__append_102 = install-data-hook-man -@HAVE_DOCS_TRUE@am__append_103 = uninstall-hook-man -@HAVE_DOCS_TRUE@am__append_104 = $(man_pages) $(man_pages_autogen) -@BUILD_DOCS_TRUE@am__append_105 = $(man_pages) $(man_pages_autogen) +@HAVE_DOCS_TRUE@am__append_101 = install-data-hook-man +@HAVE_DOCS_TRUE@am__append_102 = uninstall-hook-man +@HAVE_DOCS_TRUE@am__append_103 = $(man_pages) $(man_pages_autogen) +@BUILD_DOCS_TRUE@am__append_104 = $(man_pages) $(man_pages_autogen) ############################################################################### # vapi ############################################################################### -@ENABLE_VAPIGEN_TRUE@am__append_106 = \ +@ENABLE_VAPIGEN_TRUE@am__append_105 = \ @ENABLE_VAPIGEN_TRUE@ vapi/libnm.vapi -@ENABLE_VAPIGEN_TRUE@@WITH_LEGACY_LIBRARIES_TRUE@am__append_107 = \ +@ENABLE_VAPIGEN_TRUE@@WITH_LEGACY_LIBRARIES_TRUE@am__append_106 = \ @ENABLE_VAPIGEN_TRUE@@WITH_LEGACY_LIBRARIES_TRUE@ vapi/libnm-util.vapi \ @ENABLE_VAPIGEN_TRUE@@WITH_LEGACY_LIBRARIES_TRUE@ vapi/libnm-glib.vapi -@ENABLE_VAPIGEN_TRUE@am__append_108 = \ +@ENABLE_VAPIGEN_TRUE@am__append_107 = \ @ENABLE_VAPIGEN_TRUE@ $(VAPIGEN_VAPIS) \ @ENABLE_VAPIGEN_TRUE@ $(VAPIGEN_VAPIS:.vapi=.deps) -@ENABLE_VAPIGEN_TRUE@am__append_109 = $(VAPIGEN_VAPIS) +@ENABLE_VAPIGEN_TRUE@am__append_108 = $(VAPIGEN_VAPIS) ############################################################################### -@ENABLE_TESTS_TRUE@am__append_110 = $(check_programs) $(check_programs_norun) -@ENABLE_TESTS_TRUE@am__append_111 = $(check_ltlibraries) -@ENABLE_TESTS_FALSE@am__append_112 = $(check_programs) $(check_programs_norun) -@ENABLE_TESTS_FALSE@am__append_113 = $(check_ltlibraries) -@WITH_QT_TRUE@am__append_114 = \ +@ENABLE_TESTS_TRUE@am__append_109 = $(check_programs) $(check_programs_norun) +@ENABLE_TESTS_TRUE@am__append_110 = $(check_ltlibraries) +@ENABLE_TESTS_FALSE@am__append_111 = $(check_programs) $(check_programs_norun) +@ENABLE_TESTS_FALSE@am__append_112 = $(check_ltlibraries) +@WITH_QT_TRUE@am__append_113 = \ @WITH_QT_TRUE@ examples/C/qt/add-connection-wired \ @WITH_QT_TRUE@ examples/C/qt/list-connections \ @WITH_QT_TRUE@ examples/C/qt/change-ipv4-addresses \ @WITH_QT_TRUE@ examples/C/qt/monitor-nm-running -@WITH_QT_TRUE@am__append_115 = \ +@WITH_QT_TRUE@am__append_114 = \ @WITH_QT_TRUE@ examples/C/qt/monitor-nm-running.moc subdir = . @@ -1647,6 +1636,7 @@ am__DEPENDENCIES_6 = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) src_libsystemd_nm_la_DEPENDENCIES = $(am__DEPENDENCIES_6) am_src_libsystemd_nm_la_OBJECTS = \ src/systemd/libsystemd_nm_la-nm-sd.lo \ + src/systemd/libsystemd_nm_la-nm-sd-utils.lo \ src/systemd/sd-adapt/libsystemd_nm_la-nm-sd-adapt.lo \ src/systemd/src/basic/libsystemd_nm_la-alloc-util.lo \ src/systemd/src/basic/libsystemd_nm_la-env-util.lo \ @@ -3229,6 +3219,7 @@ am__depfiles_remade = clients/$(DEPDIR)/nm_online-nm-online.Po \ src/supplicant/$(DEPDIR)/libNetworkManager_la-nm-supplicant-manager.Plo \ src/supplicant/$(DEPDIR)/libNetworkManager_la-nm-supplicant-settings-verify.Plo \ src/supplicant/tests/$(DEPDIR)/test_supplicant_config-test-supplicant-config.Po \ + src/systemd/$(DEPDIR)/libsystemd_nm_la-nm-sd-utils.Plo \ src/systemd/$(DEPDIR)/libsystemd_nm_la-nm-sd.Plo \ src/systemd/sd-adapt/$(DEPDIR)/libsystemd_nm_la-nm-sd-adapt.Plo \ src/systemd/src/basic/$(DEPDIR)/libsystemd_nm_la-alloc-util.Plo \ @@ -4206,43 +4197,43 @@ noinst_LTLIBRARIES = introspection/libnmdbus.la \ libnm/libnm-utils.la src/libNetworkManagerBase.la \ src/libNetworkManager.la src/libsystemd-nm.la \ shared/libcsiphash.la shared/libnacd.la \ - src/initrd/libnmi-core.la $(am__append_23) $(am__append_28) \ - $(am__append_36) dispatcher/libnm-dispatcher-core.la \ - $(am__append_90) $(am__append_111) -check_LTLIBRARIES = $(am__append_113) -noinst_LIBRARIES = $(am__append_64) + src/initrd/libnmi-core.la $(am__append_23) $(am__append_27) \ + $(am__append_35) dispatcher/libnm-dispatcher-core.la \ + $(am__append_89) $(am__append_110) +check_LTLIBRARIES = $(am__append_112) +noinst_LIBRARIES = $(am__append_63) noinst_DATA = $(am__append_14) -dist_libexec_SCRIPTS = $(am__append_32) +dist_libexec_SCRIPTS = $(am__append_31) ############################################################################### -lib_LTLIBRARIES = libnm/libnm.la $(am__append_69) +lib_LTLIBRARIES = libnm/libnm.la $(am__append_68) plugin_LTLIBRARIES = $(core_plugins) ############################################################################### # src/devices/adsl ############################################################################### -core_plugins = $(am__append_20) $(am__append_22) $(am__append_27) \ - $(am__append_35) src/devices/adsl/libnm-device-plugin-adsl.la \ - $(am__append_39) $(am__append_45) $(am__append_49) \ - $(am__append_51) -service_DATA = $(am__append_68) -man_MANS = $(am__append_104) +core_plugins = $(am__append_20) $(am__append_22) $(am__append_26) \ + $(am__append_34) src/devices/adsl/libnm-device-plugin-adsl.la \ + $(am__append_38) $(am__append_44) $(am__append_48) \ + $(am__append_50) +service_DATA = $(am__append_67) +man_MANS = $(am__append_103) examples_DATA = data/server.conf CLEANFILES = $(introspection_sources) $(DBUS_INTERFACE_DOCS) \ - $(am__append_13) src/NetworkManager.ver $(am__append_29) \ + $(am__append_13) src/NetworkManager.ver $(am__append_28) \ $(dispatcher_nmdbus_dispatcher_sources) \ dispatcher/org.freedesktop.nm_dispatcher.service \ clients/tests/test-client.log data/NetworkManager.service \ data/NetworkManager-wait-online.service \ data/NetworkManager-dispatcher.service \ data/org.freedesktop.NetworkManager.service data/server.conf \ - $(am__append_91) $(am__append_95) man/common.ent \ - $(am__append_105) $(am__append_109) $(GLIB_GENERATED) \ + $(am__append_90) $(am__append_94) man/common.ent \ + $(am__append_104) $(am__append_108) $(GLIB_GENERATED) \ $(INTROSPECTION_GIRS) $(typelib_DATA) cscope.in.out cscope.out \ - cscope.po.out $(NULL) $(am__append_115) + cscope.po.out $(NULL) $(am__append_114) DISTCLEANFILES = config-extra.h intltool-extract intltool-merge \ intltool-update $(polkit_policy_DATA) libnm/libnm.pc \ - $(am__append_52) $(am__append_84) + $(am__append_51) $(am__append_83) # test-cert.p12 created with: # @@ -4296,7 +4287,8 @@ EXTRA_DIST = $(dbusinterfaces_DATA) introspection/meson.build \ libnm/nm-enum-types.c.template libnm/nm-enum-types.h.template \ libnm/meson.build libnm/tests/meson.build \ shared/c-list/src/c-list.h src/systemd/meson.build \ - src/platform/linux/nl802154.h \ + src/platform/linux/nl802154.h src/initrd/meson.build \ + src/initrd/tests/meson.build \ src/initrd/tests/sysfs/class/net/eth0/address \ src/initrd/tests/sysfs/class/net/eth2/address \ src/initrd/tests/sysfs/firmware/ibft/ethernet0/prefix-len \ @@ -4532,7 +4524,16 @@ EXTRA_DIST = $(dbusinterfaces_DATA) introspection/meson.build \ src/settings/plugins/keyfile/tests/keyfiles/test-ca-cert.pem \ src/settings/plugins/keyfile/tests/keyfiles/test-key-and-cert.pem \ src/settings/plugins/keyfile/tests/meson.build \ - $(am__append_25) src/settings/plugins/ibft/meson.build \ + src/settings/plugins/ibft/tests/iscsiadm-test-dhcp \ + src/settings/plugins/ibft/tests/iscsiadm-test-static \ + src/settings/plugins/ibft/tests/iscsiadm-test-bad-ipaddr \ + src/settings/plugins/ibft/tests/iscsiadm-test-bad-gateway \ + src/settings/plugins/ibft/tests/iscsiadm-test-bad-dns1 \ + src/settings/plugins/ibft/tests/iscsiadm-test-bad-dns2 \ + src/settings/plugins/ibft/tests/iscsiadm-test-bad-entry \ + src/settings/plugins/ibft/tests/iscsiadm-test-bad-record \ + src/settings/plugins/ibft/tests/iscsiadm-test-vlan \ + src/settings/plugins/ibft/meson.build \ src/settings/plugins/ibft/tests/meson.build \ src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-System_test-bridge-component-a.cexpected \ src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-System_test-bridge-component-b.cexpected \ @@ -4804,8 +4805,8 @@ EXTRA_DIST = $(dbusinterfaces_DATA) introspection/meson.build \ data/org.freedesktop.NetworkManager.service.in \ data/84-nm-drivers.rules data/85-nm-unmanaged.rules \ data/90-nm-thunderbolt.rules data/server.conf.in \ - data/meson.build $(am__append_77) libnm-glib/tests/meson.build \ - $(am__append_97) $(am__append_100) man/common.ent.in \ + data/meson.build $(am__append_76) libnm-glib/tests/meson.build \ + $(am__append_96) $(am__append_99) man/common.ent.in \ $(man_nm_settings_xml) $(addsuffix .xsl,$(basename \ $(man_nm_settings_xml))) $(man_pages) $(addsuffix \ .xml,$(basename $(man_pages))) $(man_pages_autogen) \ @@ -4838,6 +4839,7 @@ EXTRA_DIST = $(dbusinterfaces_DATA) introspection/meson.build \ shared/nm-utils/nm-vpn-plugin-utils.h \ shared/nm-utils/unaligned.h shared/nm-version-macros.h.in \ shared/meson.build tools/check-docs.sh tools/check-exports.sh \ + tools/check-settings-docs.sh \ tools/create-exports-NetworkManager.sh tools/debug-helper.py \ tools/meson-post-install.sh tools/run-nm-test.sh \ tools/test-networkmanager-service.py \ @@ -4895,16 +4897,16 @@ EXTRA_DIST = $(dbusinterfaces_DATA) introspection/meson.build \ examples/shell/get-hostname.sh examples/shell/list-devices.sh \ examples/shell/disconnect-device.sh \ examples/shell/active-wifi.sh $(NULL) -EXTRA_LTLIBRARIES = $(am__append_55) +EXTRA_LTLIBRARIES = $(am__append_54) dist_hook = dist-hook-settings-ifcfg-rh-alias-files dist_dependencies = libnm-core/nm-vpn-dbus-types.xml \ - libnm-core/nm-dbus-types.xml $(am__append_87) $(am__append_98) \ - $(am__append_101) $(man_pages) $(man_pages_autogen) + libnm-core/nm-dbus-types.xml $(am__append_86) $(am__append_97) \ + $(am__append_100) $(man_pages) $(man_pages_autogen) dist_configure_check = $(am__append_3) $(am__append_4) -install_data_hook = $(am__append_33) install-data-hook-dispatcher \ - $(am__append_62) $(am__append_102) -install_exec_hook = $(am__append_66) -uninstall_hook = $(am__append_63) $(am__append_67) $(am__append_103) +install_data_hook = $(am__append_32) install-data-hook-dispatcher \ + $(am__append_61) $(am__append_101) +install_exec_hook = $(am__append_65) +uninstall_hook = $(am__append_62) $(am__append_66) $(am__append_102) BUILT_SOURCES = libnm-core/nm-vpn-dbus-types.xml \ libnm-core/nm-dbus-types.xml $(gir_DATA) $(typelib_DATA) GLIB_GENERATED = $(libnm_core_lib_h_pub_mkenums) \ @@ -4912,12 +4914,12 @@ GLIB_GENERATED = $(libnm_core_lib_h_pub_mkenums) \ libnm-core/tests/nm-core-tests-enum-types.h \ libnm-core/tests/nm-core-tests-enum-types.c \ $(libnm_lib_h_pub_mkenums) $(libnm_lib_c_mkenums) \ - $(am__append_70) + $(am__append_69) man_pages = man/NetworkManager.8 man/NetworkManager.conf.5 \ man/nm-online.1 man/nm-initrd-generator.8 man/nmcli-examples.7 \ - man/nmcli.1 man/nmtui.1 $(am__append_96) + man/nmcli.1 man/nmtui.1 $(am__append_95) man_pages_autogen = man/nm-settings-keyfile.5 man/nm-settings.5 \ - $(am__append_99) + $(am__append_98) ############################################################################### @@ -4951,8 +4953,8 @@ check_programs = libnm-core/tests/test-compare \ src/dhcp/tests/test-dhcp-dhclient \ src/dhcp/tests/test-dhcp-utils \ src/settings/plugins/keyfile/tests/test-keyfile \ - $(am__append_24) $(am__append_31) $(am__append_38) \ - $(am__append_48) src/dnsmasq/tests/test-dnsmasq-utils \ + $(am__append_24) $(am__append_30) $(am__append_37) \ + $(am__append_47) src/dnsmasq/tests/test-dnsmasq-utils \ src/platform/tests/test-link-fake \ src/platform/tests/test-link-linux \ src/platform/tests/test-address-fake \ @@ -4971,18 +4973,18 @@ check_programs = libnm-core/tests/test-compare \ src/tests/test-ip6-config src/tests/test-dcb \ src/tests/test-systemd src/tests/test-wired-defname \ src/tests/test-utils dispatcher/tests/test-dispatcher-envp \ - $(am__append_56) $(am__append_57) $(am__append_88) \ - $(am__append_93) + $(am__append_55) $(am__append_56) $(am__append_87) \ + $(am__append_92) check_programs_norun = $(am__append_17) src/platform/tests/monitor \ - src/ndisc/tests/test-ndisc-linux $(am__append_89) \ - $(am__append_94) examples/C/glib/add-connection-gdbus \ + src/ndisc/tests/test-ndisc-linux $(am__append_88) \ + $(am__append_93) examples/C/glib/add-connection-gdbus \ examples/C/glib/add-connection-libnm \ examples/C/glib/get-active-connections-gdbus \ examples/C/glib/get-ap-info-libnm \ examples/C/glib/list-connections-gdbus \ examples/C/glib/list-connections-libnm \ examples/C/glib/monitor-nm-running-gdbus \ - examples/C/glib/monitor-nm-state-gdbus $(am__append_114) + examples/C/glib/monitor-nm-state-gdbus $(am__append_113) ############################################################################### @@ -4992,18 +4994,18 @@ check_programs_norun = $(am__append_17) src/platform/tests/monitor \ check_ltlibraries = $(am__append_9) $(am__append_10) \ libnm/tests/libnm-vpn-plugin-utils-test.la \ src/libNetworkManagerTest.la clients/common/libnmc-base.la \ - $(am__append_54) $(am__append_78) -check_local = check-docs check-local-exports-libnm $(am__append_26) \ - $(am__append_30) $(am__append_37) check-local-devices-adsl \ - $(am__append_41) $(am__append_47) $(am__append_50) \ - $(am__append_53) check-local-clients-tests-test-client \ - $(am__append_86) $(am__append_92) -VAPIGEN_VAPIS = $(am__append_106) $(am__append_107) -dbusservice_DATA = $(am__append_34) dispatcher/nm-dispatcher.conf \ + $(am__append_53) $(am__append_77) +check_local = check-docs check-local-exports-libnm $(am__append_25) \ + $(am__append_29) $(am__append_36) check-local-devices-adsl \ + $(am__append_40) $(am__append_46) $(am__append_49) \ + $(am__append_52) check-local-clients-tests-test-client \ + $(am__append_85) $(am__append_91) +VAPIGEN_VAPIS = $(am__append_105) $(am__append_106) +dbusservice_DATA = $(am__append_33) dispatcher/nm-dispatcher.conf \ src/org.freedesktop.NetworkManager.conf dbusactivation_DATA = \ dispatcher/org.freedesktop.nm_dispatcher.service -INTROSPECTION_GIRS = $(am__append_12) $(am__append_85) +INTROSPECTION_GIRS = $(am__append_12) $(am__append_84) INTROSPECTION_SCANNER_ARGS = INTROSPECTION_COMPILER_ARGS = # Pass SANITIZER_ENV where a command that uses built libraries is @@ -5015,11 +5017,11 @@ libnminclude_HEADERS = $(libnm_core_lib_h_pub_real) \ nodist_libnminclude_HEADERS = $(libnm_core_lib_h_pub_mkenums) \ $(libnm_lib_h_pub_mkenums) pkgconfigdir = $(libdir)/pkgconfig -pkgconfig_DATA = $(am__append_5) libnm/libnm.pc $(am__append_83) +pkgconfig_DATA = $(am__append_5) libnm/libnm.pc $(am__append_82) pppd_plugindir = $(PPPD_PLUGIN_DIR) pppd_plugin_LTLIBRARIES = $(am__append_21) vapidir = $(datadir)/vala/vapi -vapi_DATA = $(am__append_108) +vapi_DATA = $(am__append_107) examplesdir = $(docdir)/examples rundir = $(runstatedir)/NetworkManager statedir = $(localstatedir)/lib/NetworkManager @@ -5057,7 +5059,9 @@ DISTCHECK_CONFIGURE_FLAGS = \ --with-wext=no \ --enable-ifcfg-rh \ --enable-ifupdown \ - --disable-dependency-tracking + --enable-config-plugin-ibft \ + --disable-dependency-tracking \ + $(NULL) ############################################################################### @@ -5884,6 +5888,8 @@ src_libsystemd_nm_la_libadd = \ src_libsystemd_nm_la_SOURCES = \ src/systemd/nm-sd.c \ src/systemd/nm-sd.h \ + src/systemd/nm-sd-utils.c \ + src/systemd/nm-sd-utils.h \ src/systemd/sd-adapt/nm-sd-adapt.c \ src/systemd/sd-adapt/nm-sd-adapt.h \ src/systemd/sd-adapt/architecture.h \ @@ -6609,7 +6615,7 @@ src_devices_adsl_libnm_device_plugin_adsl_la_LIBADD = \ @WITH_MODEM_MANAGER_1_TRUE@ src/devices/wwan/nm-modem-manager.h \ @WITH_MODEM_MANAGER_1_TRUE@ src/devices/wwan/nm-modem.c \ @WITH_MODEM_MANAGER_1_TRUE@ src/devices/wwan/nm-modem.h \ -@WITH_MODEM_MANAGER_1_TRUE@ $(am__append_40) +@WITH_MODEM_MANAGER_1_TRUE@ $(am__append_39) @WITH_MODEM_MANAGER_1_TRUE@src_devices_wwan_libnm_wwan_la_CPPFLAGS = $(src_devices_wwan_cppflags) @WITH_MODEM_MANAGER_1_TRUE@src_devices_wwan_libnm_wwan_la_LDFLAGS = \ @WITH_MODEM_MANAGER_1_TRUE@ -avoid-version \ @@ -6651,17 +6657,17 @@ src_devices_adsl_libnm_device_plugin_adsl_la_LIBADD = \ @WITH_MODEM_MANAGER_1_TRUE@ src/devices/bluetooth/nm-bt-error.c \ @WITH_MODEM_MANAGER_1_TRUE@ src/devices/bluetooth/nm-device-bt.c \ @WITH_MODEM_MANAGER_1_TRUE@ src/devices/bluetooth/nm-device-bt.h \ -@WITH_MODEM_MANAGER_1_TRUE@ $(am__append_43) +@WITH_MODEM_MANAGER_1_TRUE@ $(am__append_42) @WITH_MODEM_MANAGER_1_TRUE@src_devices_bluetooth_libnm_device_plugin_bluetooth_la_CPPFLAGS = \ @WITH_MODEM_MANAGER_1_TRUE@ $(src_cppflags_device_plugin) \ -@WITH_MODEM_MANAGER_1_TRUE@ $(am__append_42) +@WITH_MODEM_MANAGER_1_TRUE@ $(am__append_41) @WITH_MODEM_MANAGER_1_TRUE@src_devices_bluetooth_libnm_device_plugin_bluetooth_la_LDFLAGS = \ @WITH_MODEM_MANAGER_1_TRUE@ -module -avoid-version \ @WITH_MODEM_MANAGER_1_TRUE@ -Wl,--version-script="$(srcdir)/linker-script-devices.ver" @WITH_MODEM_MANAGER_1_TRUE@src_devices_bluetooth_libnm_device_plugin_bluetooth_la_LIBADD = \ @WITH_MODEM_MANAGER_1_TRUE@ src/devices/wwan/libnm-wwan.la \ -@WITH_MODEM_MANAGER_1_TRUE@ $(GLIB_LIBS) $(am__append_44) +@WITH_MODEM_MANAGER_1_TRUE@ $(GLIB_LIBS) $(am__append_43) @WITH_WIFI_TRUE@src_devices_wifi_libnm_device_plugin_wifi_la_SOURCES = \ @WITH_WIFI_TRUE@ src/devices/wifi/nm-wifi-factory.c \ @WITH_WIFI_TRUE@ src/devices/wifi/nm-device-wifi.c \ @@ -6674,7 +6680,7 @@ src_devices_adsl_libnm_device_plugin_adsl_la_LIBADD = \ @WITH_WIFI_TRUE@ src/devices/wifi/nm-wifi-common.h \ @WITH_WIFI_TRUE@ src/devices/wifi/nm-device-olpc-mesh.c \ @WITH_WIFI_TRUE@ src/devices/wifi/nm-device-olpc-mesh.h \ -@WITH_WIFI_TRUE@ $(am__append_46) +@WITH_WIFI_TRUE@ $(am__append_45) @WITH_WIFI_TRUE@src_devices_wifi_libnm_device_plugin_wifi_la_CPPFLAGS = $(src_cppflags_device_plugin) @WITH_WIFI_TRUE@src_devices_wifi_libnm_device_plugin_wifi_la_LDFLAGS = \ @WITH_WIFI_TRUE@ -module -avoid-version \ @@ -7092,15 +7098,15 @@ clients_common_tests_test_general_LDADD = \ @BUILD_NMCLI_TRUE@ clients/cli/nmcli.h \ @BUILD_NMCLI_TRUE@ clients/cli/polkit-agent.c \ @BUILD_NMCLI_TRUE@ clients/cli/polkit-agent.h $(NULL) \ -@BUILD_NMCLI_TRUE@ $(am__append_60) +@BUILD_NMCLI_TRUE@ $(am__append_59) @BUILD_NMCLI_TRUE@clients_cli_nmcli_CPPFLAGS = \ @BUILD_NMCLI_TRUE@ -I$(srcdir)/clients/cli $(clients_cppflags) \ @BUILD_NMCLI_TRUE@ -DG_LOG_DOMAIN=\""nmcli"\" $(NULL) \ -@BUILD_NMCLI_TRUE@ $(am__append_59) +@BUILD_NMCLI_TRUE@ $(am__append_58) @BUILD_NMCLI_TRUE@clients_cli_nmcli_LDADD = libnm/libnm.la \ @BUILD_NMCLI_TRUE@ clients/common/libnmc-base.la \ @BUILD_NMCLI_TRUE@ clients/common/libnmc.la $(GLIB_LIBS) \ -@BUILD_NMCLI_TRUE@ $(READLINE_LIBS) $(am__append_61) +@BUILD_NMCLI_TRUE@ $(READLINE_LIBS) $(am__append_60) @BUILD_NMCLI_TRUE@clients_cli_nmcli_LDFLAGS = \ @BUILD_NMCLI_TRUE@ -Wl,--version-script="$(srcdir)/linker-script-binary.ver" \ @BUILD_NMCLI_TRUE@ $(SANITIZER_EXEC_LDFLAGS) @@ -7300,8 +7306,8 @@ data_edit = sed \ @WITH_LEGACY_LIBRARIES_TRUE@ -DG_LOG_DOMAIN=\""libnm-util"\" \ @WITH_LEGACY_LIBRARIES_TRUE@ -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIBNM_UTIL \ @WITH_LEGACY_LIBRARIES_TRUE@ $(GLIB_CFLAGS) $(DBUS_CFLAGS) \ -@WITH_LEGACY_LIBRARIES_TRUE@ $(UUID_CFLAGS) $(am__append_71) \ -@WITH_LEGACY_LIBRARIES_TRUE@ $(am__append_74) +@WITH_LEGACY_LIBRARIES_TRUE@ $(UUID_CFLAGS) $(am__append_70) \ +@WITH_LEGACY_LIBRARIES_TRUE@ $(am__append_73) @WITH_LEGACY_LIBRARIES_TRUE@libnm_util_lib_h_pub_real = \ @WITH_LEGACY_LIBRARIES_TRUE@ shared/nm-version-macros.h \ @WITH_LEGACY_LIBRARIES_TRUE@ libnm-util/NetworkManager.h \ @@ -7389,7 +7395,7 @@ data_edit = sed \ @WITH_LEGACY_LIBRARIES_TRUE@ libnm-util/nm-setting-vpn.c \ @WITH_LEGACY_LIBRARIES_TRUE@ libnm-util/nm-utils.c \ @WITH_LEGACY_LIBRARIES_TRUE@ libnm-util/nm-value-transforms.c \ -@WITH_LEGACY_LIBRARIES_TRUE@ $(am__append_72) $(am__append_75) +@WITH_LEGACY_LIBRARIES_TRUE@ $(am__append_71) $(am__append_74) @WITH_LEGACY_LIBRARIES_TRUE@libnm_util_lib_c_mkenums = \ @WITH_LEGACY_LIBRARIES_TRUE@ libnm-util/nm-utils-enum-types.c @@ -7406,19 +7412,19 @@ data_edit = sed \ @WITH_LEGACY_LIBRARIES_TRUE@nm_utils_enum_types_sources = $(filter-out libnm-util/NetworkManager%,$(libnm_util_lib_h_pub_real)) @WITH_LEGACY_LIBRARIES_TRUE@libnm_util_libnm_util_la_LIBADD = \ @WITH_LEGACY_LIBRARIES_TRUE@ $(GLIB_LIBS) $(DBUS_LIBS) \ -@WITH_LEGACY_LIBRARIES_TRUE@ $(UUID_LIBS) $(am__append_73) \ -@WITH_LEGACY_LIBRARIES_TRUE@ $(am__append_76) +@WITH_LEGACY_LIBRARIES_TRUE@ $(UUID_LIBS) $(am__append_72) \ +@WITH_LEGACY_LIBRARIES_TRUE@ $(am__append_75) @WITH_LEGACY_LIBRARIES_TRUE@libnm_util_libnm_util_la_LDFLAGS = \ @WITH_LEGACY_LIBRARIES_TRUE@ -Wl,--version-script=$(srcdir)/libnm-util/libnm-util.ver \ @WITH_LEGACY_LIBRARIES_TRUE@ -version-info "9:0:7" @WITH_LEGACY_LIBRARIES_TRUE@libnm_util_libtest_crypto_la_SOURCES = \ @WITH_LEGACY_LIBRARIES_TRUE@ libnm-util/crypto.c \ -@WITH_LEGACY_LIBRARIES_TRUE@ $(am__append_79) $(am__append_81) +@WITH_LEGACY_LIBRARIES_TRUE@ $(am__append_78) $(am__append_80) @WITH_LEGACY_LIBRARIES_TRUE@libnm_util_libtest_crypto_la_CPPFLAGS = $(libnm_util_cppflags) @WITH_LEGACY_LIBRARIES_TRUE@libnm_util_libtest_crypto_la_LIBADD = \ -@WITH_LEGACY_LIBRARIES_TRUE@ $(GLIB_LIBS) $(am__append_80) \ -@WITH_LEGACY_LIBRARIES_TRUE@ $(am__append_82) +@WITH_LEGACY_LIBRARIES_TRUE@ $(GLIB_LIBS) $(am__append_79) \ +@WITH_LEGACY_LIBRARIES_TRUE@ $(am__append_81) @HAVE_INTROSPECTION_TRUE@@WITH_LEGACY_LIBRARIES_TRUE@libnm_util_NetworkManager_1_0_gir_INCLUDES = GObject-2.0 DBusGLib-1.0 @HAVE_INTROSPECTION_TRUE@@WITH_LEGACY_LIBRARIES_TRUE@libnm_util_NetworkManager_1_0_gir_PACKAGES = gobject-2.0 dbus-glib-1 @HAVE_INTROSPECTION_TRUE@@WITH_LEGACY_LIBRARIES_TRUE@libnm_util_NetworkManager_1_0_gir_EXPORT_PACKAGES = libnm-util @@ -9652,6 +9658,9 @@ src/systemd/$(DEPDIR)/$(am__dirstamp): @: > src/systemd/$(DEPDIR)/$(am__dirstamp) src/systemd/libsystemd_nm_la-nm-sd.lo: src/systemd/$(am__dirstamp) \ src/systemd/$(DEPDIR)/$(am__dirstamp) +src/systemd/libsystemd_nm_la-nm-sd-utils.lo: \ + src/systemd/$(am__dirstamp) \ + src/systemd/$(DEPDIR)/$(am__dirstamp) src/systemd/sd-adapt/$(am__dirstamp): @$(MKDIR_P) src/systemd/sd-adapt @: > src/systemd/sd-adapt/$(am__dirstamp) @@ -11478,6 +11487,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@src/supplicant/$(DEPDIR)/libNetworkManager_la-nm-supplicant-manager.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@src/supplicant/$(DEPDIR)/libNetworkManager_la-nm-supplicant-settings-verify.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@src/supplicant/tests/$(DEPDIR)/test_supplicant_config-test-supplicant-config.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@src/systemd/$(DEPDIR)/libsystemd_nm_la-nm-sd-utils.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@src/systemd/$(DEPDIR)/libsystemd_nm_la-nm-sd.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@src/systemd/sd-adapt/$(DEPDIR)/libsystemd_nm_la-nm-sd-adapt.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@src/systemd/src/basic/$(DEPDIR)/libsystemd_nm_la-alloc-util.Plo@am__quote@ # am--include-marker @@ -14638,6 +14648,13 @@ src/systemd/libsystemd_nm_la-nm-sd.lo: src/systemd/nm-sd.c @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libsystemd_nm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/systemd/libsystemd_nm_la-nm-sd.lo `test -f 'src/systemd/nm-sd.c' || echo '$(srcdir)/'`src/systemd/nm-sd.c +src/systemd/libsystemd_nm_la-nm-sd-utils.lo: src/systemd/nm-sd-utils.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libsystemd_nm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/systemd/libsystemd_nm_la-nm-sd-utils.lo -MD -MP -MF src/systemd/$(DEPDIR)/libsystemd_nm_la-nm-sd-utils.Tpo -c -o src/systemd/libsystemd_nm_la-nm-sd-utils.lo `test -f 'src/systemd/nm-sd-utils.c' || echo '$(srcdir)/'`src/systemd/nm-sd-utils.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) src/systemd/$(DEPDIR)/libsystemd_nm_la-nm-sd-utils.Tpo src/systemd/$(DEPDIR)/libsystemd_nm_la-nm-sd-utils.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='src/systemd/nm-sd-utils.c' object='src/systemd/libsystemd_nm_la-nm-sd-utils.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libsystemd_nm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/systemd/libsystemd_nm_la-nm-sd-utils.lo `test -f 'src/systemd/nm-sd-utils.c' || echo '$(srcdir)/'`src/systemd/nm-sd-utils.c + src/systemd/sd-adapt/libsystemd_nm_la-nm-sd-adapt.lo: src/systemd/sd-adapt/nm-sd-adapt.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libsystemd_nm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/systemd/sd-adapt/libsystemd_nm_la-nm-sd-adapt.lo -MD -MP -MF src/systemd/sd-adapt/$(DEPDIR)/libsystemd_nm_la-nm-sd-adapt.Tpo -c -o src/systemd/sd-adapt/libsystemd_nm_la-nm-sd-adapt.lo `test -f 'src/systemd/sd-adapt/nm-sd-adapt.c' || echo '$(srcdir)/'`src/systemd/sd-adapt/nm-sd-adapt.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) src/systemd/sd-adapt/$(DEPDIR)/libsystemd_nm_la-nm-sd-adapt.Tpo src/systemd/sd-adapt/$(DEPDIR)/libsystemd_nm_la-nm-sd-adapt.Plo @@ -19341,6 +19358,7 @@ distclean: distclean-recursive -rm -f src/supplicant/$(DEPDIR)/libNetworkManager_la-nm-supplicant-manager.Plo -rm -f src/supplicant/$(DEPDIR)/libNetworkManager_la-nm-supplicant-settings-verify.Plo -rm -f src/supplicant/tests/$(DEPDIR)/test_supplicant_config-test-supplicant-config.Po + -rm -f src/systemd/$(DEPDIR)/libsystemd_nm_la-nm-sd-utils.Plo -rm -f src/systemd/$(DEPDIR)/libsystemd_nm_la-nm-sd.Plo -rm -f src/systemd/sd-adapt/$(DEPDIR)/libsystemd_nm_la-nm-sd-adapt.Plo -rm -f src/systemd/src/basic/$(DEPDIR)/libsystemd_nm_la-alloc-util.Plo @@ -20028,6 +20046,7 @@ maintainer-clean: maintainer-clean-recursive -rm -f src/supplicant/$(DEPDIR)/libNetworkManager_la-nm-supplicant-manager.Plo -rm -f src/supplicant/$(DEPDIR)/libNetworkManager_la-nm-supplicant-settings-verify.Plo -rm -f src/supplicant/tests/$(DEPDIR)/test_supplicant_config-test-supplicant-config.Po + -rm -f src/systemd/$(DEPDIR)/libsystemd_nm_la-nm-sd-utils.Plo -rm -f src/systemd/$(DEPDIR)/libsystemd_nm_la-nm-sd.Plo -rm -f src/systemd/sd-adapt/$(DEPDIR)/libsystemd_nm_la-nm-sd-adapt.Plo -rm -f src/systemd/src/basic/$(DEPDIR)/libsystemd_nm_la-alloc-util.Plo @@ -20280,7 +20299,7 @@ $(dispatcher_nm_dispatcher_OBJECTS): $(introspection_sources) $(libnm_libnm_la_OBJECTS): $(introspection_sources) check-docs: - $(srcdir)/tools/check-docs.sh "$(srcdir)" + $(srcdir)/tools/check-docs.sh "$(srcdir)" "$(builddir)" libnm-core/nm-core-enum-types.h.stamp: libnm-core/.dirstamp libnm-core/nm-core-enum-types.c.stamp: libnm-core/.dirstamp @@ -20562,16 +20581,7 @@ $(clients_common_libnmc_base_la_OBJECTS): clients/common/.dirstamp @HAVE_INTROSPECTION_TRUE@$(clients_common_settings_doc_h): clients/common/settings-docs.xsl libnm/nm-property-docs.xml clients/common/.dirstamp @HAVE_INTROSPECTION_TRUE@ $(AM_V_GEN) $(XSLTPROC) --output $@ $< $(word 2,$^) @HAVE_INTROSPECTION_TRUE@check-local-settings-docs: $(clients_common_settings_doc_h) -@HAVE_INTROSPECTION_TRUE@ @if test -z "$$NMTST_NO_CHECK_SETTINGS_DOCS" ; then \ -@HAVE_INTROSPECTION_TRUE@ if ! cmp -s "$(srcdir)/$(clients_common_settings_doc_h).in" "$(builddir)/$(clients_common_settings_doc_h)" ; then \ -@HAVE_INTROSPECTION_TRUE@ if test "$$NM_TEST_REGENERATE" == 1 ; then \ -@HAVE_INTROSPECTION_TRUE@ cp -f "$(builddir)/$(clients_common_settings_doc_h)" "$(srcdir)/$(clients_common_settings_doc_h).in"; \ -@HAVE_INTROSPECTION_TRUE@ else \ -@HAVE_INTROSPECTION_TRUE@ echo "The generated file \"$(builddir)/$(clients_common_settings_doc_h)\" differs from the source file \"$(srcdir)/$(clients_common_settings_doc_h).in\". You probably should copy the generated file over to the source file. You can skip this test by setting \$$NMTST_NO_CHECK_SETTINGS_DOCS=yes". You can also automatically copy the file by rerunning the test with \$$NM_TEST_REGENERATE=1 ; \ -@HAVE_INTROSPECTION_TRUE@ false; \ -@HAVE_INTROSPECTION_TRUE@ fi; \ -@HAVE_INTROSPECTION_TRUE@ fi;\ -@HAVE_INTROSPECTION_TRUE@ fi +@HAVE_INTROSPECTION_TRUE@ $(srcdir)/tools/check-settings-docs.sh "$(srcdir)" "$(builddir)" "$(clients_common_settings_doc_h)" @HAVE_INTROSPECTION_FALSE@$(clients_common_settings_doc_h): $(clients_common_settings_doc_h).in clients/common/.dirstamp @HAVE_INTROSPECTION_FALSE@ $(AM_V_GEN) cp "$(srcdir)/$(clients_common_settings_doc_h).in" "$(builddir)/$(clients_common_settings_doc_h)" @HAVE_INTROSPECTION_FALSE@check-local-settings-docs: diff --git a/NEWS b/NEWS index e625c3a7..30ebe5e5 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,37 @@ +=============================================== +NetworkManager-1.14.6 +Overview of changes since NetworkManager-1.14.4 +=============================================== + +This is a new stable release of NetworkManager. Notable changes include: + +* Fix memory corruption in internal DHCPv6 client (CVE-2018-15688). +* No longer limit number of search entires in resolv.conf to 6. +* Support restricting NetworkManager.conf device configuration based on used DHCP + plugin. +* Add "${MAC}" specifier for connection.stable-id. This uses the current MAC + address for seeding the stable generation of MAC address, DHCP client-id + or IPv6 stable-privacy interface identifier. +* Support special value "duid" for "ipv4.dhcp-client-id". This generates an + RFC4361-compliant client-id like the internal DHCP client used to do by default. + Previously, there was no explicit name for such a client-id and it was not + usable with dhclient DHCP plugin. This also generates the same client-id as + systemd-networkd does by default. +* Support and use a new kind of secret-key in "/var/lib/NetworkManager/secret_key". + The secret-key represents the identity of the machine that is used for various + purposes like generating IPv6 stable privacy addesses. It is now combined + with "/etc/machine-id" so that changing only the machine-id results in new identifiers. + That matters for example when cloning a virtual machine. Previously, the user + hard to prune NetworkManager's secret-key to get a new identity, now regenerating + machine-id suffices. Secret-keys generated by earlier versions of NetworkManager are + not affected and keep their previous behavior. +* Fix the DHCP client-ids based on the MAC address of IPoIB/infiniband devices. +* Fix restoring IP configuration after interface went down. +* No longer let NetworkManager touch rp_filter setting. The rp_filter sysctl must now + be set outside of NetworkManager according to the admin's preference. Note that a strict + rp_filter may break valid use-cases and interacts badly with connectivity checking. +* Various bug fixes and improvements. + =============================================== NetworkManager-1.14.4 Overview of changes since NetworkManager-1.14.2 diff --git a/clients/cli/connections.c b/clients/cli/connections.c index bcd257ac..8a10691e 100644 --- a/clients/cli/connections.c +++ b/clients/cli/connections.c @@ -6534,6 +6534,12 @@ static gboolean nmc_editor_cb_called; static GError *nmc_editor_error; static MonitorACInfo *nmc_editor_monitor_ac; +static void +editor_connection_changed_cb (NMConnection *connection, gboolean *changed) +{ + *changed = TRUE; +} + /* * Store 'error' to shared 'nmc_editor_error' and monitoring info to * 'nmc_editor_monitor_ac' and signal the condition so that @@ -6579,8 +6585,8 @@ static gboolean progress_activation_editor_cb (gpointer user_data) { MonitorACInfo *info = (MonitorACInfo *) user_data; - gs_unref_object NMDevice *device = info->device; - gs_unref_object NMActiveConnection *ac = info->ac; + NMDevice *device = info->device; + NMActiveConnection *ac = info->ac; NMActiveConnectionState ac_state; NMDeviceState dev_state; @@ -6613,11 +6619,13 @@ progress_activation_editor_cb (gpointer user_data) nm_object_get_path (NM_OBJECT (connection))); } - return TRUE; + return G_SOURCE_CONTINUE; finish: + nm_g_object_unref (device); + nm_g_object_unref (ac); info->monitor_id = 0; - return FALSE; + return G_SOURCE_REMOVE; } static void @@ -7127,6 +7135,16 @@ menu_switch_to_level1 (const NmcConfig *nmc_config, menu_ctx->valid_props_str = g_strjoinv (", ", menu_ctx->valid_props); } +static gboolean +editor_save_timeout (gpointer user_data) +{ + gboolean *timeout = user_data; + + *timeout = TRUE; + + return G_SOURCE_REMOVE; +} + static gboolean editor_menu_main (NmCli *nmc, NMConnection *connection, const char *connection_type) { @@ -7646,6 +7664,10 @@ editor_menu_main (NmCli *nmc, NMConnection *connection, const char *connection_t /* Save the connection */ if (nm_connection_verify (connection, &err1)) { gboolean persistent = TRUE; + gboolean connection_changed; + nm_auto_unref_gsource GSource *source = NULL; + gboolean timeout = FALSE; + gulong handler_id = 0; /* parse argument */ if (cmd_arg) { @@ -7674,23 +7696,44 @@ editor_menu_main (NmCli *nmc, NMConnection *connection, const char *connection_t connection, add_connection_editor_cb, info); + connection_changed = TRUE; } else { /* Save/update already saved (existing) connection */ nm_connection_replace_settings_from_connection (NM_CONNECTION (rem_con), connection); update_connection (persistent, rem_con, update_connection_editor_cb, NULL); + + handler_id = g_signal_connect (rem_con, + NM_CONNECTION_CHANGED, + G_CALLBACK (editor_connection_changed_cb), + &connection_changed); + connection_changed = FALSE; } - //FIXME: add also a timeout for cases the callback is not called - while (!nmc_editor_cb_called) + source = g_timeout_source_new (10 * NM_UTILS_MSEC_PER_SECOND); + g_source_set_callback (source, editor_save_timeout, &timeout, NULL); + g_source_attach (source, g_main_loop_get_context (loop)); + + while (!nmc_editor_cb_called && !timeout) g_main_context_iteration (NULL, TRUE); + while (!connection_changed && !timeout) + g_main_context_iteration (NULL, TRUE); + + if (handler_id) + g_signal_handler_disconnect (rem_con, handler_id); + g_source_destroy (source); + if (nmc_editor_error) { g_print (_("Error: Failed to save '%s' (%s) connection: %s\n"), nm_connection_get_id (connection), nm_connection_get_uuid (connection), nmc_editor_error->message); g_error_free (nmc_editor_error); + } else if (timeout) { + g_print (_("Error: Timeout saving '%s' (%s) connection\n"), + nm_connection_get_id (connection), + nm_connection_get_uuid (connection)); } else { g_print (!rem_con ? _("Connection '%s' (%s) successfully saved.\n") : @@ -7713,9 +7756,10 @@ editor_menu_main (NmCli *nmc, NMConnection *connection, const char *connection_t if (menu_ctx.curr_setting) s_name = g_strdup (nm_setting_get_name (menu_ctx.curr_setting)); - /* Update settings in the local connection */ + /* Update settings and secrets in the local connection */ nm_connection_replace_settings_from_connection (connection, NM_CONNECTION (con_tmp)); + update_secrets_in_connection (con_tmp, connection); /* Also update setting for menu context and TAB-completion */ menu_ctx.curr_setting = s_name ? nm_connection_get_setting_by_name (connection, s_name) : NULL; diff --git a/clients/cli/devices.c b/clients/cli/devices.c index 029ca671..5aaf4ef8 100644 --- a/clients/cli/devices.c +++ b/clients/cli/devices.c @@ -2094,6 +2094,7 @@ typedef struct { GSList *queue; guint timeout_id; gboolean cmd_disconnect; + GCancellable *cancellable; } DeviceCbInfo; static void device_cb_info_finish (DeviceCbInfo *info, NMDevice *device); @@ -2166,7 +2167,10 @@ device_cb_info_finish (DeviceCbInfo *info, NMDevice *device) if (info->timeout_id) g_source_remove (info->timeout_id); + g_signal_handlers_disconnect_by_func (info->nmc->client, device_removed_cb, info); + nm_clear_g_cancellable (&info->cancellable); + g_slice_free (DeviceCbInfo, info); quit (); } @@ -2343,11 +2347,14 @@ disconnect_device_cb (GObject *object, GAsyncResult *result, gpointer user_data) { NMDevice *device = NM_DEVICE (object); DeviceCbInfo *info = (DeviceCbInfo *) user_data; - NmCli *nmc = info->nmc; + NmCli *nmc; NMDeviceState state; GError *error = NULL; if (!nm_device_disconnect_finish (device, result, &error)) { + if (g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED)) + return; + nmc = info->nmc; g_string_printf (nmc->return_text, _("Error: not all devices disconnected.")); g_printerr (_("Error: Device '%s' (%s) disconnecting failed: %s\n"), nm_device_get_iface (device), @@ -2357,6 +2364,7 @@ disconnect_device_cb (GObject *object, GAsyncResult *result, gpointer user_data) nmc->return_value = NMC_RESULT_ERROR_DEV_DISCONNECT; device_cb_info_finish (info, device); } else { + nmc = info->nmc; state = nm_device_get_state (device); if (nmc->nowait_flag || state <= NM_DEVICE_STATE_DISCONNECTED) { /* Don't want to wait or device already disconnected */ @@ -2393,6 +2401,7 @@ do_devices_disconnect (NmCli *nmc, int argc, char **argv) info = g_slice_new0 (DeviceCbInfo); info->nmc = nmc; info->cmd_disconnect = TRUE; + info->cancellable = g_cancellable_new (); if (nmc->timeout > 0) info->timeout_id = g_timeout_add_seconds (nmc->timeout, device_op_timeout_cb, info); @@ -2410,7 +2419,7 @@ do_devices_disconnect (NmCli *nmc, int argc, char **argv) G_CALLBACK (disconnect_state_cb), info); /* Now disconnect the device */ - nm_device_disconnect_async (device, NULL, disconnect_device_cb, info); + nm_device_disconnect_async (device, info->cancellable, disconnect_device_cb, info); } out: @@ -2795,7 +2804,7 @@ show_access_point_info (NMDeviceWifi *wifi, NmCli *nmc, NmcOutputData *out) aps = sort_access_points (nm_device_wifi_get_access_points (wifi)); g_ptr_array_foreach (aps, fill_output_access_point, &info); - g_ptr_array_free (aps, FALSE); + g_ptr_array_free (aps, TRUE); } print_data_prepare_width (out->output_data); @@ -2870,28 +2879,38 @@ wifi_print_aps (NMDeviceWifi *wifi, typedef struct { NmCli *nmc; - NMDeviceWifi *wifi; - const NMMetaAbstractInfo *const*tmpl; - + NMDevice **devices; + const NMMetaAbstractInfo *const *tmpl; const char *bssid_user; + GArray *out_indices; +} ScanInfo; + +typedef struct { + ScanInfo *scan_info; + NMDeviceWifi *wifi; gulong last_scan_id; guint timeout_id; GCancellable *scan_cancellable; - GArray *out_indices; } WifiListData; static void wifi_list_finish (WifiListData *data) { - NmCli *nmc = data->nmc; - - wifi_print_aps (data->wifi, data->nmc, data->out_indices, - data->tmpl, data->bssid_user); + ScanInfo *info = data->scan_info; + NmCli *nmc = info->nmc; + guint i; - if (--nmc->should_wait == 0) { + if (--info->nmc->should_wait == 0) { + for (i = 0; info->devices[i]; i++) { + wifi_print_aps (NM_DEVICE_WIFI (info->devices[i]), + info->nmc, + info->out_indices, + info->tmpl, + info->bssid_user); + } if (nmc->return_value == NMC_RESULT_ERROR_NOT_FOUND) { g_string_printf (nmc->return_text, _("Error: Access point with bssid '%s' not found."), - data->bssid_user); + data->scan_info->bssid_user); } g_main_loop_quit (loop); } @@ -2899,9 +2918,15 @@ wifi_list_finish (WifiListData *data) g_signal_handler_disconnect (data->wifi, data->last_scan_id); nm_clear_g_source (&data->timeout_id); nm_clear_g_cancellable (&data->scan_cancellable); - g_array_unref (data->out_indices); - g_object_unref (data->wifi); g_slice_free (WifiListData, data); + + if (info->nmc->should_wait == 0) { + for (i = 0; info->devices[i]; i++) + g_object_unref (info->devices[i]); + g_free (info->devices); + g_array_unref (info->out_indices); + g_free (info); + } } static void @@ -2945,49 +2970,6 @@ wifi_list_scan_timeout (gpointer user_data) return G_SOURCE_REMOVE; } -static void -wifi_list_aps (NMDeviceWifi *wifi, - NmCli *nmc, - GArray *out_indices, - const NMMetaAbstractInfo *const*tmpl, - const char *bssid_user, - gint64 rescan_cutoff) -{ - gboolean needs_rescan; - WifiListData *data; - - needs_rescan = rescan_cutoff < 0 || (rescan_cutoff > 0 && nm_device_wifi_get_last_scan (wifi) < rescan_cutoff); - - /* FIXME: nmcli should either - * - don't request any new scan for any device and print the full AP list right - * away. - * - or, when requesting a scan on one or more devices, don't print the result - * before all requests complete. - * - * Otherwise: - * - the printed output is not self consistent. E.g. it will print the result - * on one device at a certain time, while printing the result for another - * device at a later point in time. - * - the order in which we print the AP list per-device, is unstable. */ - if (needs_rescan) { - data = g_slice_new0 (WifiListData); - data->nmc = nmc; - data->wifi = g_object_ref (wifi); - data->tmpl = tmpl; - data->out_indices = g_array_ref (out_indices);; - data->bssid_user = bssid_user; - data->last_scan_id = g_signal_connect (wifi, "notify::" NM_DEVICE_WIFI_LAST_SCAN, - G_CALLBACK (wifi_last_scan_updated), data); - data->scan_cancellable = g_cancellable_new (); - data->timeout_id = g_timeout_add_seconds (15, wifi_list_scan_timeout, data); - nm_device_wifi_request_scan_async (wifi, data->scan_cancellable, wifi_list_rescan_cb, data); - - nmc->should_wait++; - } else { - wifi_print_aps (wifi, nmc, out_indices, tmpl, bssid_user); - } -} - static void complete_aps (NMDevice **devices, const char *ifname, const char *bssid_prefix, const char *ssid_prefix) @@ -3017,12 +2999,15 @@ do_device_wifi_list (NmCli *nmc, int argc, char **argv) const char *bssid_user = NULL; const char *rescan = NULL; gs_free NMDevice **devices = NULL; - guint i; const char *fields_str = NULL; const NMMetaAbstractInfo *const*tmpl; gs_unref_array GArray *out_indices = NULL; int option; guint64 rescan_cutoff; + NMDeviceWifi *wifi; + ScanInfo *scan_info = NULL; + WifiListData *data; + guint i, j; devices = nmc_get_devices_sorted (nmc->client); @@ -3110,7 +3095,8 @@ do_device_wifi_list (NmCli *nmc, int argc, char **argv) } if (NM_IS_DEVICE_WIFI (device)) { - wifi_list_aps (NM_DEVICE_WIFI (device), nmc, out_indices, tmpl, bssid_user, rescan_cutoff); + devices[0] = device; + devices[1] = NULL; } else { if ( nm_device_get_device_type (device) == NM_DEVICE_TYPE_GENERIC && g_strcmp0 (nm_device_get_type_description (device), "wifi") == 0) { @@ -3124,13 +3110,52 @@ do_device_wifi_list (NmCli *nmc, int argc, char **argv) } return NMC_RESULT_ERROR_UNKNOWN; } + } + + /* Filter out non-wifi devices */ + for (i = 0, j = 0; devices[i]; i++) { + if (NM_IS_DEVICE_WIFI (devices[i])) + devices[j++] = devices[i]; + } + devices[j] = NULL; + + /* Start a new scan for devices that need it */ + for (i = 0; devices[i]; i++) { + wifi = (NMDeviceWifi *) devices[i]; + g_object_ref (wifi); + + if ( rescan_cutoff == 0 + || (rescan_cutoff > 0 && nm_device_wifi_get_last_scan (wifi) >= rescan_cutoff)) + continue; + + if (!scan_info) { + scan_info = g_new0 (ScanInfo, 1); + scan_info->out_indices = g_array_ref (out_indices); + scan_info->tmpl = tmpl; + scan_info->bssid_user = bssid_user; + scan_info->nmc = nmc; + } + + nmc->should_wait++; + data = g_slice_new0 (WifiListData); + data->wifi = wifi; + data->scan_info = scan_info; + data->last_scan_id = g_signal_connect (wifi, "notify::" NM_DEVICE_WIFI_LAST_SCAN, + G_CALLBACK (wifi_last_scan_updated), data); + data->scan_cancellable = g_cancellable_new (); + data->timeout_id = g_timeout_add_seconds (15, wifi_list_scan_timeout, data); + nm_device_wifi_request_scan_async (wifi, data->scan_cancellable, wifi_list_rescan_cb, data); + } + + if (scan_info) { + scan_info->devices = g_steal_pointer (&devices); } else { + /* Print results right away if no scan is pending */ for (i = 0; devices[i]; i++) { - NMDevice *dev = devices[i]; - - if (NM_IS_DEVICE_WIFI (dev)) { - wifi_list_aps (NM_DEVICE_WIFI (dev), nmc, out_indices, tmpl, bssid_user, rescan_cutoff); - } + wifi_print_aps (NM_DEVICE_WIFI (devices[i]), + nmc, out_indices, + tmpl, bssid_user); + g_object_unref (devices[i]); } } diff --git a/clients/cli/utils.c b/clients/cli/utils.c index e21c108d..feb67221 100644 --- a/clients/cli/utils.c +++ b/clients/cli/utils.c @@ -919,6 +919,8 @@ nmc_empty_output_fields (NmcOutputData *output_data) /* Empty output_data array */ if (output_data->output_data->len > 0) g_ptr_array_remove_range (output_data->output_data, 0, output_data->output_data->len); + + g_ptr_array_unref (output_data->output_data); } /*****************************************************************************/ diff --git a/clients/common/meson.build b/clients/common/meson.build index 0db2868e..30fd2cfa 100644 --- a/clients/common/meson.build +++ b/clients/common/meson.build @@ -37,15 +37,11 @@ if enable_introspection command: [xsltproc, '--output', '@OUTPUT@', join_paths(meson.current_source_dir(), 'settings-docs.xsl'), '@INPUT@'] ) - # FIXME: if enabled the check happens even if the settings_docs_source is not set - ''' - if get_option('check_settings_docs') - res = run_command(find_program('cmp'), '-s', settings_docs + '.in', settings_docs_source.full_path()) - if res.returncode() != 0 - message('The generated file ' + settings_docs_source.full_path() + ' differs from the source file ' + settings_docs + '.in' + '. You probably should copy the generated file over to the source file. You can skip this test by setting -Dcheck_settings_docs=false') - endif - endif - ''' + test( + 'check-settings-docs', + find_program(join_paths(meson.source_root(), 'tools', 'check-settings-docs.sh')), + args: [meson.source_root(), meson.build_root(), 'clients/common/' + settings_docs] + ) else settings_docs_source = configure_file( input: settings_docs + '.in', diff --git a/clients/common/nm-meta-setting-desc.c b/clients/common/nm-meta-setting-desc.c index d291732a..d13ee4ce 100644 --- a/clients/common/nm-meta-setting-desc.c +++ b/clients/common/nm-meta-setting-desc.c @@ -283,7 +283,7 @@ _dump_team_link_watcher (NMTeamLinkWatcher *watcher) } /* NM_TEAM_LINK_WATCHER_NSNA_PING and NM_TEAM_LINK_WATCHER_ARP_PING */ DUMP_WATCHER_INT (w_dump, watcher, "init-wait", init_wait); - DUMP_WATCHER_INT (w_dump, watcher, "initerval", interval); + DUMP_WATCHER_INT (w_dump, watcher, "interval", interval); DUMP_WATCHER_INT (w_dump, watcher, "missed-max", missed_max); #undef DUMP_WATCHER_INT g_string_append_printf (w_dump, " target-host=%s", @@ -2190,7 +2190,7 @@ _get_fcn_802_1x_phase2_private_key (ARGS_GET_FCN) strv = nm_utils_strsplit_set (value, " \t,", FALSE); \ if (strv) { \ for (i = 0; strv[i]; i++) \ - set_func (NM_SETTING_802_1X (setting), strv[i++]); \ + set_func (NM_SETTING_802_1X (setting), strv[i]); \ } \ return TRUE; \ } @@ -3349,7 +3349,7 @@ DEFINE_REMOVER_INDEX_OR_VALUE (_remove_fcn_ipv4_config_dns, _validate_and_remove_ipv4_dns) static gboolean -_set_fcn_ip4_config_dns_search (ARGS_SET_FCN) +_set_fcn_ip_config_dns_search (ARGS_SET_FCN) { gs_free const char **strv = NULL; gsize i; @@ -3368,9 +3368,9 @@ _set_fcn_ip4_config_dns_search (ARGS_SET_FCN) } static gboolean -_validate_and_remove_ipv4_dns_search (NMSettingIPConfig *setting, - const char *dns_search, - GError **error) +_validate_and_remove_ip_dns_search (NMSettingIPConfig *setting, + const char *dns_search, + GError **error) { gboolean ret; @@ -3381,33 +3381,36 @@ _validate_and_remove_ipv4_dns_search (NMSettingIPConfig *setting, dns_search); return ret; } -DEFINE_REMOVER_INDEX_OR_VALUE (_remove_fcn_ipv4_config_dns_search, +DEFINE_REMOVER_INDEX_OR_VALUE (_remove_fcn_ip_config_dns_search, NM_SETTING_IP_CONFIG, nm_setting_ip_config_get_num_dns_searches, nm_setting_ip_config_remove_dns_search, - _validate_and_remove_ipv4_dns_search) + _validate_and_remove_ip_dns_search) static gboolean -_set_fcn_ip4_config_dns_options (ARGS_SET_FCN) +_set_fcn_ip_config_dns_options (ARGS_SET_FCN) { gs_free const char **strv = NULL; + NMSettingIPConfig *s_ip; gsize i; nm_assert (!error || !*error); + s_ip = NM_SETTING_IP_CONFIG (setting); - nm_setting_ip_config_clear_dns_options (NM_SETTING_IP_CONFIG (setting), TRUE); strv = nm_utils_strsplit_set (value, " \t,", FALSE); if (strv) { - for (i = 0; strv[i]; i++) - nm_setting_ip_config_add_dns_option (NM_SETTING_IP_CONFIG (setting), strv[i]); + for (i = 0; strv[i]; i++) { + nm_setting_ip_config_remove_dns_option_by_value (s_ip, strv[i]); + nm_setting_ip_config_add_dns_option (s_ip, strv[i]); + } } return TRUE; } static gboolean -_validate_and_remove_ipv4_dns_option (NMSettingIPConfig *setting, - const char *dns_option, - GError **error) +_validate_and_remove_ip_dns_option (NMSettingIPConfig *setting, + const char *dns_option, + GError **error) { gboolean ret; @@ -3418,11 +3421,11 @@ _validate_and_remove_ipv4_dns_option (NMSettingIPConfig *setting, dns_option); return ret; } -DEFINE_REMOVER_INDEX_OR_VALUE (_remove_fcn_ipv4_config_dns_options, +DEFINE_REMOVER_INDEX_OR_VALUE (_remove_fcn_ip_config_dns_options, NM_SETTING_IP_CONFIG, nm_setting_ip_config_get_num_dns_options, nm_setting_ip_config_remove_dns_option, - _validate_and_remove_ipv4_dns_option) + _validate_and_remove_ip_dns_option) static gboolean _set_fcn_ip4_config_addresses (ARGS_SET_FCN) @@ -3592,82 +3595,6 @@ DEFINE_REMOVER_INDEX_OR_VALUE (_remove_fcn_ipv6_config_dns, nm_setting_ip_config_remove_dns, _validate_and_remove_ipv6_dns) -static gboolean -_set_fcn_ip6_config_dns_search (ARGS_SET_FCN) -{ - gs_free const char **strv = NULL; - gsize i; - - nm_assert (!error || !*error); - - strv = nm_utils_strsplit_set (value, " \t,", FALSE); - if (!verify_string_list (strv, property_info->property_name, nmc_util_is_domain, error)) - return FALSE; - - if (strv) { - for (i = 0; strv[i]; i++) - nm_setting_ip_config_add_dns_search (NM_SETTING_IP_CONFIG (setting), strv[i]); - } - return TRUE; -} - -static gboolean -_validate_and_remove_ipv6_dns_search (NMSettingIPConfig *setting, - const char *dns_search, - GError **error) -{ - gboolean ret; - - ret = nm_setting_ip_config_remove_dns_search_by_value (setting, dns_search); - if (!ret) - g_set_error (error, 1, 0, - _("the property doesn't contain DNS search domain '%s'"), - dns_search); - return ret; -} -DEFINE_REMOVER_INDEX_OR_VALUE (_remove_fcn_ipv6_config_dns_search, - NM_SETTING_IP_CONFIG, - nm_setting_ip_config_get_num_dns_searches, - nm_setting_ip_config_remove_dns_search, - _validate_and_remove_ipv6_dns_search) - -static gboolean -_set_fcn_ip6_config_dns_options (ARGS_SET_FCN) -{ - gs_free const char **strv = NULL; - gsize i; - - nm_assert (!error || !*error); - - nm_setting_ip_config_clear_dns_options (NM_SETTING_IP_CONFIG (setting), TRUE); - strv = nm_utils_strsplit_set (value, " \t,", FALSE); - if (strv) { - for (i = 0; strv[i]; i++) - nm_setting_ip_config_add_dns_option (NM_SETTING_IP_CONFIG (setting), strv[i]); - } - return TRUE; -} - -static gboolean -_validate_and_remove_ipv6_dns_option (NMSettingIPConfig *setting, - const char *dns_option, - GError **error) -{ - gboolean ret; - - ret = nm_setting_ip_config_remove_dns_option_by_value (setting, dns_option); - if (!ret) - g_set_error (error, 1, 0, - _("the property doesn't contain DNS option '%s'"), - dns_option); - return ret; -} -DEFINE_REMOVER_INDEX_OR_VALUE (_remove_fcn_ipv6_config_dns_options, - NM_SETTING_IP_CONFIG, - nm_setting_ip_config_get_num_dns_options, - nm_setting_ip_config_remove_dns_option, - _validate_and_remove_ipv6_dns_option) - static gboolean _dns_options_is_default (NMSettingIPConfig *setting) { @@ -6183,15 +6110,15 @@ static const NMMetaPropertyInfo *const property_infos_IP4_CONFIG[] = { PROPERTY_INFO (NM_SETTING_IP_CONFIG_DNS_SEARCH, DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_DNS_SEARCH, .property_type = DEFINE_PROPERTY_TYPE ( .get_fcn = _get_fcn_gobject, - .set_fcn = _set_fcn_ip4_config_dns_search, - .remove_fcn = _remove_fcn_ipv4_config_dns_search, + .set_fcn = _set_fcn_ip_config_dns_search, + .remove_fcn = _remove_fcn_ip_config_dns_search, ), ), PROPERTY_INFO (NM_SETTING_IP_CONFIG_DNS_OPTIONS, DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_DNS_OPTIONS, .property_type = DEFINE_PROPERTY_TYPE ( .get_fcn = _get_fcn_nmc_with_default, - .set_fcn = _set_fcn_ip4_config_dns_options, - .remove_fcn = _remove_fcn_ipv4_config_dns_options, + .set_fcn = _set_fcn_ip_config_dns_options, + .remove_fcn = _remove_fcn_ip_config_dns_options, ), .property_typ_data = DEFINE_PROPERTY_TYP_DATA_SUBTYPE (get_with_default, .fcn = GET_FCN_WITH_DEFAULT (NMSettingIPConfig, _dns_options_is_default), @@ -6346,15 +6273,15 @@ static const NMMetaPropertyInfo *const property_infos_IP6_CONFIG[] = { PROPERTY_INFO (NM_SETTING_IP_CONFIG_DNS_SEARCH, DESCRIBE_DOC_NM_SETTING_IP6_CONFIG_DNS_SEARCH, .property_type = DEFINE_PROPERTY_TYPE ( .get_fcn = _get_fcn_gobject, - .set_fcn = _set_fcn_ip6_config_dns_search, - .remove_fcn = _remove_fcn_ipv6_config_dns_search, + .set_fcn = _set_fcn_ip_config_dns_search, + .remove_fcn = _remove_fcn_ip_config_dns_search, ), ), PROPERTY_INFO (NM_SETTING_IP_CONFIG_DNS_OPTIONS, DESCRIBE_DOC_NM_SETTING_IP6_CONFIG_DNS_OPTIONS, .property_type = DEFINE_PROPERTY_TYPE ( .get_fcn = _get_fcn_nmc_with_default, - .set_fcn = _set_fcn_ip6_config_dns_options, - .remove_fcn = _remove_fcn_ipv6_config_dns_options, + .set_fcn = _set_fcn_ip_config_dns_options, + .remove_fcn = _remove_fcn_ip_config_dns_options, ), .property_typ_data = DEFINE_PROPERTY_TYP_DATA_SUBTYPE (get_with_default, .fcn = GET_FCN_WITH_DEFAULT (NMSettingIPConfig, _dns_options_is_default), diff --git a/clients/common/settings-docs.h b/clients/common/settings-docs.h index f07769c0..bc56edae 100644 --- a/clients/common/settings-docs.h +++ b/clients/common/settings-docs.h @@ -144,7 +144,7 @@ #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_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 as DHCP client identifier with ipv4.dhcp-client-id=stable and to derive the DHCP DUID with ipv6.dhcp-duid=stable-[llt,ll,uuid]. 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 '$' character is treated special to perform dynamic substitutions at runtime. Currently supported are \"${CONNECTION}\", \"${DEVICE}\", \"${BOOT}\", \"${RANDOM}\". These effectively create unique IDs per-connection, per-device, per-boot, or every time. Note that \"${DEVICE}\" corresponds the the interface name 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.") +#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 as DHCP client identifier with ipv4.dhcp-client-id=stable and to derive the DHCP DUID with ipv6.dhcp-duid=stable-[llt,ll,uuid]. 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 '$' 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 the 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.") #define DESCRIBE_DOC_NM_SETTING_CONNECTION_TIMESTAMP N_("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).") #define DESCRIBE_DOC_NM_SETTING_CONNECTION_TYPE N_("Base type of the connection. For hardware-dependent connections, should contain the setting name of the hardware-type specific setting (ie, \"802-3-ethernet\" or \"802-11-wireless\" or \"bluetooth\", etc), and for non-hardware dependent connections like VPN or otherwise, should contain the setting name of that setting type (ie, \"vpn\" or \"bridge\", etc).") #define DESCRIBE_DOC_NM_SETTING_CONNECTION_UUID N_("A universally unique identifier for the connection, for example generated with libuuid. It should be assigned when the connection is created, and never changed as long as the connection still applies to the same network. For example, it should not be changed when the \"id\" property or NMSettingIP4Config changes, but might need to be re-created when the Wi-Fi SSID, mobile broadband network provider, or \"type\" property changes. The UUID must be in the format \"2815492f-7e56-435e-b2e9-246bd7cdc664\" (ie, contains only hexadecimal characters and \"-\").") @@ -197,7 +197,7 @@ #define DESCRIBE_DOC_NM_SETTING_IP_TUNNEL_TTL N_("The TTL to assign to tunneled packets. 0 is a special value meaning that packets inherit the TTL value.") #define DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_ADDRESSES N_("Array of IP addresses.") #define DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_DAD_TIMEOUT N_("Timeout in milliseconds used to check for the presence of duplicate IP addresses on the network. If an address conflict is detected, the activation will fail. A zero value means that no duplicate address detection is performed, -1 means the default value (either configuration ipvx.dad-timeout override or zero). A value greater than zero is a timeout in milliseconds. The property is currently implemented only for IPv4.") -#define DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_DHCP_CLIENT_ID N_("A string sent to the DHCP server to identify the local machine which the DHCP server may use to customize the DHCP lease and options. When the property is a hex string ('aa:bb:cc') it is interpreted as a binary client ID, in which case the first byte is assumed to be the 'type' field as per RFC 2132 section 9.14 and the remaining bytes may be an hardware address (e.g. '01:xx:xx:xx:xx:xx:xx' where 1 is the Ethernet ARP type and the rest is a MAC address). If the property is not a hex string it is considered as a non-hardware-address client ID and the 'type' field is set to 0. The special values \"mac\" and \"perm-mac\" are supported, which use the current or permanent MAC address of the device to generate a client identifier with type ethernet (01). Currently, these options only work for ethernet type of links. The special value \"stable\" is supported to generate a type 0 client identifier based on the stable-id (see connection.stable-id) and a per-host key. If unset, a globally configured default is used. If still unset, the client-id from the last lease is reused.") +#define DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_DHCP_CLIENT_ID N_("A string sent to the DHCP server to identify the local machine which the DHCP server may use to customize the DHCP lease and options. When the property is a hex string ('aa:bb:cc') it is interpreted as a binary client ID, in which case the first byte is assumed to be the 'type' field as per RFC 2132 section 9.14 and the remaining bytes may be an hardware address (e.g. '01:xx:xx:xx:xx:xx:xx' where 1 is the Ethernet ARP type and the rest is a MAC address). If the property is not a hex string it is considered as a non-hardware-address client ID and the 'type' field is set to 0. The special values \"mac\" and \"perm-mac\" are supported, which use the current or permanent MAC address of the device to generate a client identifier with type ethernet (01). Currently, these options only work for ethernet type of links. The special value \"duid\" generates a RFC4361-compliant client identifier based on a hash of the interface name as IAID and /etc/machine-id. The special value \"stable\" is supported to generate a type 0 client identifier based on the stable-id (see connection.stable-id) and a per-host key. If you set the stable-id, you may want to include the \"${DEVICE}\" or \"${MAC}\" specifier to get a per-device key. If unset, a globally configured default is used. If still unset, the default depends on the DHCP plugin.") #define DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_DHCP_FQDN N_("If the \"dhcp-send-hostname\" property is TRUE, then the specified FQDN will be sent to the DHCP server when acquiring a lease. This property and \"dhcp-hostname\" are mutually exclusive and cannot be set at the same time.") #define DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_DHCP_HOSTNAME N_("If the \"dhcp-send-hostname\" property is TRUE, then the specified name will be sent to the DHCP server when acquiring a lease. This property and \"dhcp-fqdn\" are mutually exclusive and cannot be set at the same time.") #define DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_DHCP_SEND_HOSTNAME N_("If TRUE, a hostname is sent to the DHCP server when acquiring a lease. Some DHCP servers use this hostname to update DNS databases, essentially providing a static hostname for the computer. If the \"dhcp-hostname\" property is NULL and this property is TRUE, the current persistent hostname of the computer is sent.") @@ -218,7 +218,7 @@ #define DESCRIBE_DOC_NM_SETTING_IP6_CONFIG_ADDR_GEN_MODE N_("Configure method for creating the address for use with RFC4862 IPv6 Stateless Address Autoconfiguration. The permitted values are: NM_SETTING_IP6_CONFIG_ADDR_GEN_MODE_EUI64 (0) or NM_SETTING_IP6_CONFIG_ADDR_GEN_MODE_STABLE_PRIVACY (1). If the property is set to EUI64, the addresses will be generated using the interface tokens derived from hardware address. This makes the host part of the address to stay constant, making it possible to track host's presence when it changes networks. The address changes when the interface hardware is replaced. The value of stable-privacy enables use of cryptographically secure hash of a secret host-specific key along with the connection's stable-id and the network address as specified by RFC7217. This makes it impossible to use the address track host's presence, and makes the address stable when the network interface hardware is replaced. On D-Bus, the absence of an addr-gen-mode setting equals enabling stable-privacy. For keyfile plugin, the absence of the setting on disk means EUI64 so that the property doesn't change on upgrade from older versions. Note that this setting is distinct from the Privacy Extensions as configured by \"ip6-privacy\" property and it does not affect the temporary addresses configured with this option.") #define DESCRIBE_DOC_NM_SETTING_IP6_CONFIG_ADDRESSES N_("Array of IP addresses.") #define DESCRIBE_DOC_NM_SETTING_IP6_CONFIG_DAD_TIMEOUT N_("Timeout in milliseconds used to check for the presence of duplicate IP addresses on the network. If an address conflict is detected, the activation will fail. A zero value means that no duplicate address detection is performed, -1 means the default value (either configuration ipvx.dad-timeout override or zero). A value greater than zero is a timeout in milliseconds. The property is currently implemented only for IPv4.") -#define DESCRIBE_DOC_NM_SETTING_IP6_CONFIG_DHCP_DUID N_("A string containing the DHCPv6 Unique Identifier (DUID) used by the dhcp client to identify itself to DHCPv6 servers (RFC 3315). The DUID is carried in the Client Identifier option. If the property is a hex string ('aa:bb:cc') it is interpreted as a binary DUID and filled as an opaque value in the Client Identifier option. The special value \"lease\" will retrieve the DUID previously used from the lease file belonging to the connection. If no DUID is found and \"dhclient\" is the configured dhcp client, the DUID is searched in the system-wide dhclient lease file. If still no DUID is found, or another dhcp client is used, a global and permanent DUID-UUID (RFC 6355) will be generated based on the machine-id. The special values \"llt\" and \"ll\" will generate a DUID of type LLT or LL (see RFC 3315) based on the current MAC address of the device. In order to try providing a stable DUID-LLT, the time field will contain a constant timestamp that is used globally (for all profiles) and persisted to disk. The special values \"stable-llt\", \"stable-ll\" and \"stable-uuid\" will generate a DUID of the corresponding type, derived from the connection's stable-id and a per-host unique key. So, the link-layer address of \"stable-ll\" and \"stable-llt\" will be a generated address derived from the stable id. The DUID-LLT time value in the \"stable-llt\" option will be picked among a static timespan of three years (the upper bound of the interval is the same constant timestamp used in \"llt\"). When the property is unset, the global value provided for \"ipv6.dhcp-duid\" is used. If no global value is provided, the default \"lease\" value is assumed.") +#define DESCRIBE_DOC_NM_SETTING_IP6_CONFIG_DHCP_DUID N_("A string containing the DHCPv6 Unique Identifier (DUID) used by the dhcp client to identify itself to DHCPv6 servers (RFC 3315). The DUID is carried in the Client Identifier option. If the property is a hex string ('aa:bb:cc') it is interpreted as a binary DUID and filled as an opaque value in the Client Identifier option. The special value \"lease\" will retrieve the DUID previously used from the lease file belonging to the connection. If no DUID is found and \"dhclient\" is the configured dhcp client, the DUID is searched in the system-wide dhclient lease file. If still no DUID is found, or another dhcp client is used, a global and permanent DUID-UUID (RFC 6355) will be generated based on the machine-id. The special values \"llt\" and \"ll\" will generate a DUID of type LLT or LL (see RFC 3315) based on the current MAC address of the device. In order to try providing a stable DUID-LLT, the time field will contain a constant timestamp that is used globally (for all profiles) and persisted to disk. The special values \"stable-llt\", \"stable-ll\" and \"stable-uuid\" will generate a DUID of the corresponding type, derived from the connection's stable-id and a per-host unique key. You may want to include the \"${DEVICE}\" or \"${MAC}\" specifier in the stable-id, in case this profile gets activated on multiple devices. So, the link-layer address of \"stable-ll\" and \"stable-llt\" will be a generated address derived from the stable id. The DUID-LLT time value in the \"stable-llt\" option will be picked among a static timespan of three years (the upper bound of the interval is the same constant timestamp used in \"llt\"). When the property is unset, the global value provided for \"ipv6.dhcp-duid\" is used. If no global value is provided, the default \"lease\" value is assumed.") #define DESCRIBE_DOC_NM_SETTING_IP6_CONFIG_DHCP_HOSTNAME N_("If the \"dhcp-send-hostname\" property is TRUE, then the specified name will be sent to the DHCP server when acquiring a lease. This property and \"dhcp-fqdn\" are mutually exclusive and cannot be set at the same time.") #define DESCRIBE_DOC_NM_SETTING_IP6_CONFIG_DHCP_SEND_HOSTNAME N_("If TRUE, a hostname is sent to the DHCP server when acquiring a lease. Some DHCP servers use this hostname to update DNS databases, essentially providing a static hostname for the computer. If the \"dhcp-hostname\" property is NULL and this property is TRUE, the current persistent hostname of the computer is sent.") #define DESCRIBE_DOC_NM_SETTING_IP6_CONFIG_DHCP_TIMEOUT N_("A timeout for a DHCP transaction in seconds.") @@ -296,8 +296,8 @@ #define DESCRIBE_DOC_NM_SETTING_SERIAL_SEND_DELAY N_("Time to delay between each byte sent to the modem, in microseconds.") #define DESCRIBE_DOC_NM_SETTING_SERIAL_STOPBITS N_("Number of stop bits for communication on the serial port. Either 1 or 2. The 1 in \"8n1\" for example.") #define DESCRIBE_DOC_NM_SETTING_SRIOV_AUTOPROBE_DRIVERS N_("Whether to autoprobe virtual functions by a compatible driver. If set to NM_TERNARY_TRUE (1), the kernel will try to bind VFs to a compatible driver and if this succeeds a new network interface will be instantiated for each VF. If set to NM_TERNARY_FALSE (0), VFs will not be claimed and no network interfaces will be created for them. When set to NM_TERNARY_DEFAULT (-1), the global default is used; in case the global default is unspecified it is assumed to be NM_TERNARY_TRUE (1).") -#define DESCRIBE_DOC_NM_SETTING_SRIOV_TOTAL_VFS N_("The total number of virtual functions to create.") -#define DESCRIBE_DOC_NM_SETTING_SRIOV_VFS N_("Array of virtual function descriptors. Each VF descriptor is a dictionary mapping attribute names to GVariant values. The 'index' entry is mandatory for each VF. When represented as string a VF is in the form: \"INDEX [ATTR=VALUE[ ATTR=VALUE]...]\". for example: \"2 mac=00:11:22:33:44:55 spoof-check=true\". The \"vlans\" attribute is represented as a semicolor-separated list of VLAN descriptors, where each descriptor has the form \"ID[.PRIORITY[.PROTO]]\". PROTO can be either 'q' for 802.1Q (the default) or 'ad' for 802.1ad.") +#define DESCRIBE_DOC_NM_SETTING_SRIOV_TOTAL_VFS N_("The total number of virtual functions to create. Note that when the sriov setting is present NetworkManager enforces the number of virtual functions on the interface also when it is zero. To prevent any changes to SR-IOV parameters don't add a sriov setting to the connection.") +#define DESCRIBE_DOC_NM_SETTING_SRIOV_VFS N_("Array of virtual function descriptors. Each VF descriptor is a dictionary mapping attribute names to GVariant values. The 'index' entry is mandatory for each VF. When represented as string a VF is in the form: \"INDEX [ATTR=VALUE[ ATTR=VALUE]...]\". for example: \"2 mac=00:11:22:33:44:55 spoof-check=true\". Multiple VFs can be specified using a comma as separator. Currently the following attributes are supported: mac, spoof-check, trust, min-tx-rate, max-tx-rate, vlans. The \"vlans\" attribute is represented as a semicolon-separated list of VLAN descriptors, where each descriptor has the form \"ID[.PRIORITY[.PROTO]]\". PROTO can be either 'q' for 802.1Q (the default) or 'ad' for 802.1ad.") #define DESCRIBE_DOC_NM_SETTING_TC_CONFIG_QDISCS N_("Array of TC queueing disciplines.") #define DESCRIBE_DOC_NM_SETTING_TC_CONFIG_TFILTERS N_("Array of TC traffic filters.") #define DESCRIBE_DOC_NM_SETTING_TEAM_CONFIG N_("The JSON configuration for the team network interface. The property should contain raw JSON configuration data suitable for teamd, because the value is passed directly to teamd. If not specified, the default configuration is used. See man teamd.conf for the format details.") diff --git a/clients/common/settings-docs.h.in b/clients/common/settings-docs.h.in index f07769c0..bc56edae 100644 --- a/clients/common/settings-docs.h.in +++ b/clients/common/settings-docs.h.in @@ -144,7 +144,7 @@ #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_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 as DHCP client identifier with ipv4.dhcp-client-id=stable and to derive the DHCP DUID with ipv6.dhcp-duid=stable-[llt,ll,uuid]. 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 '$' character is treated special to perform dynamic substitutions at runtime. Currently supported are \"${CONNECTION}\", \"${DEVICE}\", \"${BOOT}\", \"${RANDOM}\". These effectively create unique IDs per-connection, per-device, per-boot, or every time. Note that \"${DEVICE}\" corresponds the the interface name 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.") +#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 as DHCP client identifier with ipv4.dhcp-client-id=stable and to derive the DHCP DUID with ipv6.dhcp-duid=stable-[llt,ll,uuid]. 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 '$' 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 the 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.") #define DESCRIBE_DOC_NM_SETTING_CONNECTION_TIMESTAMP N_("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).") #define DESCRIBE_DOC_NM_SETTING_CONNECTION_TYPE N_("Base type of the connection. For hardware-dependent connections, should contain the setting name of the hardware-type specific setting (ie, \"802-3-ethernet\" or \"802-11-wireless\" or \"bluetooth\", etc), and for non-hardware dependent connections like VPN or otherwise, should contain the setting name of that setting type (ie, \"vpn\" or \"bridge\", etc).") #define DESCRIBE_DOC_NM_SETTING_CONNECTION_UUID N_("A universally unique identifier for the connection, for example generated with libuuid. It should be assigned when the connection is created, and never changed as long as the connection still applies to the same network. For example, it should not be changed when the \"id\" property or NMSettingIP4Config changes, but might need to be re-created when the Wi-Fi SSID, mobile broadband network provider, or \"type\" property changes. The UUID must be in the format \"2815492f-7e56-435e-b2e9-246bd7cdc664\" (ie, contains only hexadecimal characters and \"-\").") @@ -197,7 +197,7 @@ #define DESCRIBE_DOC_NM_SETTING_IP_TUNNEL_TTL N_("The TTL to assign to tunneled packets. 0 is a special value meaning that packets inherit the TTL value.") #define DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_ADDRESSES N_("Array of IP addresses.") #define DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_DAD_TIMEOUT N_("Timeout in milliseconds used to check for the presence of duplicate IP addresses on the network. If an address conflict is detected, the activation will fail. A zero value means that no duplicate address detection is performed, -1 means the default value (either configuration ipvx.dad-timeout override or zero). A value greater than zero is a timeout in milliseconds. The property is currently implemented only for IPv4.") -#define DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_DHCP_CLIENT_ID N_("A string sent to the DHCP server to identify the local machine which the DHCP server may use to customize the DHCP lease and options. When the property is a hex string ('aa:bb:cc') it is interpreted as a binary client ID, in which case the first byte is assumed to be the 'type' field as per RFC 2132 section 9.14 and the remaining bytes may be an hardware address (e.g. '01:xx:xx:xx:xx:xx:xx' where 1 is the Ethernet ARP type and the rest is a MAC address). If the property is not a hex string it is considered as a non-hardware-address client ID and the 'type' field is set to 0. The special values \"mac\" and \"perm-mac\" are supported, which use the current or permanent MAC address of the device to generate a client identifier with type ethernet (01). Currently, these options only work for ethernet type of links. The special value \"stable\" is supported to generate a type 0 client identifier based on the stable-id (see connection.stable-id) and a per-host key. If unset, a globally configured default is used. If still unset, the client-id from the last lease is reused.") +#define DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_DHCP_CLIENT_ID N_("A string sent to the DHCP server to identify the local machine which the DHCP server may use to customize the DHCP lease and options. When the property is a hex string ('aa:bb:cc') it is interpreted as a binary client ID, in which case the first byte is assumed to be the 'type' field as per RFC 2132 section 9.14 and the remaining bytes may be an hardware address (e.g. '01:xx:xx:xx:xx:xx:xx' where 1 is the Ethernet ARP type and the rest is a MAC address). If the property is not a hex string it is considered as a non-hardware-address client ID and the 'type' field is set to 0. The special values \"mac\" and \"perm-mac\" are supported, which use the current or permanent MAC address of the device to generate a client identifier with type ethernet (01). Currently, these options only work for ethernet type of links. The special value \"duid\" generates a RFC4361-compliant client identifier based on a hash of the interface name as IAID and /etc/machine-id. The special value \"stable\" is supported to generate a type 0 client identifier based on the stable-id (see connection.stable-id) and a per-host key. If you set the stable-id, you may want to include the \"${DEVICE}\" or \"${MAC}\" specifier to get a per-device key. If unset, a globally configured default is used. If still unset, the default depends on the DHCP plugin.") #define DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_DHCP_FQDN N_("If the \"dhcp-send-hostname\" property is TRUE, then the specified FQDN will be sent to the DHCP server when acquiring a lease. This property and \"dhcp-hostname\" are mutually exclusive and cannot be set at the same time.") #define DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_DHCP_HOSTNAME N_("If the \"dhcp-send-hostname\" property is TRUE, then the specified name will be sent to the DHCP server when acquiring a lease. This property and \"dhcp-fqdn\" are mutually exclusive and cannot be set at the same time.") #define DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_DHCP_SEND_HOSTNAME N_("If TRUE, a hostname is sent to the DHCP server when acquiring a lease. Some DHCP servers use this hostname to update DNS databases, essentially providing a static hostname for the computer. If the \"dhcp-hostname\" property is NULL and this property is TRUE, the current persistent hostname of the computer is sent.") @@ -218,7 +218,7 @@ #define DESCRIBE_DOC_NM_SETTING_IP6_CONFIG_ADDR_GEN_MODE N_("Configure method for creating the address for use with RFC4862 IPv6 Stateless Address Autoconfiguration. The permitted values are: NM_SETTING_IP6_CONFIG_ADDR_GEN_MODE_EUI64 (0) or NM_SETTING_IP6_CONFIG_ADDR_GEN_MODE_STABLE_PRIVACY (1). If the property is set to EUI64, the addresses will be generated using the interface tokens derived from hardware address. This makes the host part of the address to stay constant, making it possible to track host's presence when it changes networks. The address changes when the interface hardware is replaced. The value of stable-privacy enables use of cryptographically secure hash of a secret host-specific key along with the connection's stable-id and the network address as specified by RFC7217. This makes it impossible to use the address track host's presence, and makes the address stable when the network interface hardware is replaced. On D-Bus, the absence of an addr-gen-mode setting equals enabling stable-privacy. For keyfile plugin, the absence of the setting on disk means EUI64 so that the property doesn't change on upgrade from older versions. Note that this setting is distinct from the Privacy Extensions as configured by \"ip6-privacy\" property and it does not affect the temporary addresses configured with this option.") #define DESCRIBE_DOC_NM_SETTING_IP6_CONFIG_ADDRESSES N_("Array of IP addresses.") #define DESCRIBE_DOC_NM_SETTING_IP6_CONFIG_DAD_TIMEOUT N_("Timeout in milliseconds used to check for the presence of duplicate IP addresses on the network. If an address conflict is detected, the activation will fail. A zero value means that no duplicate address detection is performed, -1 means the default value (either configuration ipvx.dad-timeout override or zero). A value greater than zero is a timeout in milliseconds. The property is currently implemented only for IPv4.") -#define DESCRIBE_DOC_NM_SETTING_IP6_CONFIG_DHCP_DUID N_("A string containing the DHCPv6 Unique Identifier (DUID) used by the dhcp client to identify itself to DHCPv6 servers (RFC 3315). The DUID is carried in the Client Identifier option. If the property is a hex string ('aa:bb:cc') it is interpreted as a binary DUID and filled as an opaque value in the Client Identifier option. The special value \"lease\" will retrieve the DUID previously used from the lease file belonging to the connection. If no DUID is found and \"dhclient\" is the configured dhcp client, the DUID is searched in the system-wide dhclient lease file. If still no DUID is found, or another dhcp client is used, a global and permanent DUID-UUID (RFC 6355) will be generated based on the machine-id. The special values \"llt\" and \"ll\" will generate a DUID of type LLT or LL (see RFC 3315) based on the current MAC address of the device. In order to try providing a stable DUID-LLT, the time field will contain a constant timestamp that is used globally (for all profiles) and persisted to disk. The special values \"stable-llt\", \"stable-ll\" and \"stable-uuid\" will generate a DUID of the corresponding type, derived from the connection's stable-id and a per-host unique key. So, the link-layer address of \"stable-ll\" and \"stable-llt\" will be a generated address derived from the stable id. The DUID-LLT time value in the \"stable-llt\" option will be picked among a static timespan of three years (the upper bound of the interval is the same constant timestamp used in \"llt\"). When the property is unset, the global value provided for \"ipv6.dhcp-duid\" is used. If no global value is provided, the default \"lease\" value is assumed.") +#define DESCRIBE_DOC_NM_SETTING_IP6_CONFIG_DHCP_DUID N_("A string containing the DHCPv6 Unique Identifier (DUID) used by the dhcp client to identify itself to DHCPv6 servers (RFC 3315). The DUID is carried in the Client Identifier option. If the property is a hex string ('aa:bb:cc') it is interpreted as a binary DUID and filled as an opaque value in the Client Identifier option. The special value \"lease\" will retrieve the DUID previously used from the lease file belonging to the connection. If no DUID is found and \"dhclient\" is the configured dhcp client, the DUID is searched in the system-wide dhclient lease file. If still no DUID is found, or another dhcp client is used, a global and permanent DUID-UUID (RFC 6355) will be generated based on the machine-id. The special values \"llt\" and \"ll\" will generate a DUID of type LLT or LL (see RFC 3315) based on the current MAC address of the device. In order to try providing a stable DUID-LLT, the time field will contain a constant timestamp that is used globally (for all profiles) and persisted to disk. The special values \"stable-llt\", \"stable-ll\" and \"stable-uuid\" will generate a DUID of the corresponding type, derived from the connection's stable-id and a per-host unique key. You may want to include the \"${DEVICE}\" or \"${MAC}\" specifier in the stable-id, in case this profile gets activated on multiple devices. So, the link-layer address of \"stable-ll\" and \"stable-llt\" will be a generated address derived from the stable id. The DUID-LLT time value in the \"stable-llt\" option will be picked among a static timespan of three years (the upper bound of the interval is the same constant timestamp used in \"llt\"). When the property is unset, the global value provided for \"ipv6.dhcp-duid\" is used. If no global value is provided, the default \"lease\" value is assumed.") #define DESCRIBE_DOC_NM_SETTING_IP6_CONFIG_DHCP_HOSTNAME N_("If the \"dhcp-send-hostname\" property is TRUE, then the specified name will be sent to the DHCP server when acquiring a lease. This property and \"dhcp-fqdn\" are mutually exclusive and cannot be set at the same time.") #define DESCRIBE_DOC_NM_SETTING_IP6_CONFIG_DHCP_SEND_HOSTNAME N_("If TRUE, a hostname is sent to the DHCP server when acquiring a lease. Some DHCP servers use this hostname to update DNS databases, essentially providing a static hostname for the computer. If the \"dhcp-hostname\" property is NULL and this property is TRUE, the current persistent hostname of the computer is sent.") #define DESCRIBE_DOC_NM_SETTING_IP6_CONFIG_DHCP_TIMEOUT N_("A timeout for a DHCP transaction in seconds.") @@ -296,8 +296,8 @@ #define DESCRIBE_DOC_NM_SETTING_SERIAL_SEND_DELAY N_("Time to delay between each byte sent to the modem, in microseconds.") #define DESCRIBE_DOC_NM_SETTING_SERIAL_STOPBITS N_("Number of stop bits for communication on the serial port. Either 1 or 2. The 1 in \"8n1\" for example.") #define DESCRIBE_DOC_NM_SETTING_SRIOV_AUTOPROBE_DRIVERS N_("Whether to autoprobe virtual functions by a compatible driver. If set to NM_TERNARY_TRUE (1), the kernel will try to bind VFs to a compatible driver and if this succeeds a new network interface will be instantiated for each VF. If set to NM_TERNARY_FALSE (0), VFs will not be claimed and no network interfaces will be created for them. When set to NM_TERNARY_DEFAULT (-1), the global default is used; in case the global default is unspecified it is assumed to be NM_TERNARY_TRUE (1).") -#define DESCRIBE_DOC_NM_SETTING_SRIOV_TOTAL_VFS N_("The total number of virtual functions to create.") -#define DESCRIBE_DOC_NM_SETTING_SRIOV_VFS N_("Array of virtual function descriptors. Each VF descriptor is a dictionary mapping attribute names to GVariant values. The 'index' entry is mandatory for each VF. When represented as string a VF is in the form: \"INDEX [ATTR=VALUE[ ATTR=VALUE]...]\". for example: \"2 mac=00:11:22:33:44:55 spoof-check=true\". The \"vlans\" attribute is represented as a semicolor-separated list of VLAN descriptors, where each descriptor has the form \"ID[.PRIORITY[.PROTO]]\". PROTO can be either 'q' for 802.1Q (the default) or 'ad' for 802.1ad.") +#define DESCRIBE_DOC_NM_SETTING_SRIOV_TOTAL_VFS N_("The total number of virtual functions to create. Note that when the sriov setting is present NetworkManager enforces the number of virtual functions on the interface also when it is zero. To prevent any changes to SR-IOV parameters don't add a sriov setting to the connection.") +#define DESCRIBE_DOC_NM_SETTING_SRIOV_VFS N_("Array of virtual function descriptors. Each VF descriptor is a dictionary mapping attribute names to GVariant values. The 'index' entry is mandatory for each VF. When represented as string a VF is in the form: \"INDEX [ATTR=VALUE[ ATTR=VALUE]...]\". for example: \"2 mac=00:11:22:33:44:55 spoof-check=true\". Multiple VFs can be specified using a comma as separator. Currently the following attributes are supported: mac, spoof-check, trust, min-tx-rate, max-tx-rate, vlans. The \"vlans\" attribute is represented as a semicolon-separated list of VLAN descriptors, where each descriptor has the form \"ID[.PRIORITY[.PROTO]]\". PROTO can be either 'q' for 802.1Q (the default) or 'ad' for 802.1ad.") #define DESCRIBE_DOC_NM_SETTING_TC_CONFIG_QDISCS N_("Array of TC queueing disciplines.") #define DESCRIBE_DOC_NM_SETTING_TC_CONFIG_TFILTERS N_("Array of TC traffic filters.") #define DESCRIBE_DOC_NM_SETTING_TEAM_CONFIG N_("The JSON configuration for the team network interface. The property should contain raw JSON configuration data suitable for teamd, because the value is passed directly to teamd. If not specified, the default configuration is used. See man teamd.conf for the format details.") diff --git a/clients/tests/test-client.py b/clients/tests/test-client.py index e8f1f7f2..d92d499c 100755 --- a/clients/tests/test-client.py +++ b/clients/tests/test-client.py @@ -744,8 +744,8 @@ class TestNmcli(NmTestBase): skip_test_for_l10n_diff.append(n['test_name']) continue print("\n\n\nThe file '%s' does not have the expected content:" % (filename)) - print("ACTUAL OUTPUT:\n[[%s]]\n" % (results_expect[i])) - print("EXPECT OUTPUT:\n[[%s]]\n" % (n['content'])) + print("ACTUAL OUTPUT:\n[[%s]]\n" % (n['content'])) + print("EXPECT OUTPUT:\n[[%s]]\n" % (results_expect[i])) print("Let the test write the file by rerunning with NM_TEST_REGENERATE=1") print("See howto in %s for details.\n" % (PathConfiguration.canonical_script_filename())) self.fail("Unexpected output of command, expected %s. Rerun test with NM_TEST_REGENERATE=1 to regenerate files" % (filename)) diff --git a/configure b/configure index 59fcebd8..cdb1ad85 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for NetworkManager 1.14.4. +# Generated by GNU Autoconf 2.69 for NetworkManager 1.14.6. # # Report bugs to . # @@ -591,8 +591,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='NetworkManager' PACKAGE_TARNAME='NetworkManager' -PACKAGE_VERSION='1.14.4' -PACKAGE_STRING='NetworkManager 1.14.4' +PACKAGE_VERSION='1.14.6' +PACKAGE_STRING='NetworkManager 1.14.6' PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=NetworkManager' PACKAGE_URL='' @@ -1727,7 +1727,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures NetworkManager 1.14.4 to adapt to many kinds of systems. +\`configure' configures NetworkManager 1.14.6 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1797,7 +1797,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of NetworkManager 1.14.4:";; + short | recursive ) echo "Configuration of NetworkManager 1.14.6:";; esac cat <<\_ACEOF @@ -2136,7 +2136,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -NetworkManager configure 1.14.4 +NetworkManager configure 1.14.6 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2909,7 +2909,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by NetworkManager $as_me 1.14.4, which was +It was created by NetworkManager $as_me 1.14.6, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -3779,7 +3779,7 @@ fi # Define the identity of the package. PACKAGE='NetworkManager' - VERSION='1.14.4' + VERSION='1.14.6' cat >>confdefs.h <<_ACEOF @@ -17963,8 +17963,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu NM_MAJOR_VERSION=1 NM_MINOR_VERSION=14 -NM_MICRO_VERSION=4 -NM_VERSION=1.14.4 +NM_MICRO_VERSION=6 +NM_VERSION=1.14.6 @@ -17972,7 +17972,7 @@ NM_VERSION=1.14.4 -NM_GIT_SHA=66cad942f2404a5bac0df1a623fb5d72ab8f4d20 +NM_GIT_SHA=dc56a21ed6a21565d979887ba9ebc0334e791c47 if test """" != "no-config-h" ; then @@ -28929,7 +28929,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by NetworkManager $as_me 1.14.4, which was +This file was extended by NetworkManager $as_me 1.14.6, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -28995,7 +28995,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -NetworkManager config.status 1.14.4 +NetworkManager config.status 1.14.6 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index f101594f..1f9dcb3c 100644 --- a/configure.ac +++ b/configure.ac @@ -8,7 +8,7 @@ dnl "shared/nm-version-macros.h.in" dnl - update number in meson.build m4_define([nm_major_version], [1]) m4_define([nm_minor_version], [14]) -m4_define([nm_micro_version], [4]) +m4_define([nm_micro_version], [6]) m4_define([nm_version], [nm_major_version.nm_minor_version.nm_micro_version]) diff --git a/docs/api/html/NetworkManager.conf.html b/docs/api/html/NetworkManager.conf.html index 0e6bec04..4fbf45e6 100644 --- a/docs/api/html/NetworkManager.conf.html +++ b/docs/api/html/NetworkManager.conf.html @@ -8,7 +8,7 @@ - + @@ -603,6 +603,14 @@ ipv6.ip6-privacy=0 +

802-1x.auth-timeout

+ + + +

cdma.mtu

+ + +

connection.auth-retries

If left unspecified, the default value is 3 tries before failing the connection.

@@ -644,6 +652,10 @@ ipv6.ip6-privacy=0 +

gsm.mtu

+ + +

infiniband.mtu

If configured explicitly to 0, the MTU is not reconfigured during device activation unless it is required due to IPv6 constraints. If left unspecified, a DHCP/IPv6 SLAAC provided value is used or the MTU is left unspecified on activation.

@@ -742,6 +754,10 @@ ipv6.ip6-privacy=0

If left unspecified, the default value "optional" will be used.

+ +

wifi.wake-on-wlan

+ +

@@ -1164,6 +1180,8 @@ enable=env:TAG1 be used to negate the match. Note that if one except-predicate matches, the entire configuration will be disabled. In other words, a except predicate always wins over other predicates. + If the setting only consists of "except:" matches and none of the + negative conditions are satisfied, the configuration is still enabled. 

 # enable the configuration either when the environment variable
@@ -1351,10 +1369,21 @@ enable=nm-version-min:1.3,nm-version-min:1.2.6,nm-version-min:1.0.16
           

 
 
+
dhcp-plugin:DHCP

+
Match the configured DHCP plugin "main.dhcp".
+          

+
+
 
except:SPEC

-
Negative match of a device. SPEC must be explicitly qualified with
+
+
Negative match of a device. SPEC must be explicitly qualified with
              a prefix such as interface-name:. A negative match has higher priority then the positive
-             matches above.

+             matches above.

+
If there is a list consisting only of negative matches, the behavior is the same as if there
+             is also match-all. That means, if none of all the negative matches is satisfied, the overall result is
+             still a positive match. That means, "except:interface-name:eth0" is the same as
+             "*,except:interface-name:eth0".

+
 
 
 
SPEC[,;]SPEC

@@ -1401,6 +1430,6 @@ interface-name:vboxnet*,except:interface-name:vboxnet2
 
 
 

-
Generated by GTK-Doc V1.29.1

+
Generated by GTK-Doc V1.29
 
 
\ No newline at end of file
diff --git a/docs/api/html/NetworkManager.html b/docs/api/html/NetworkManager.html
index 0b0a254e..fbb7dd99 100644
--- a/docs/api/html/NetworkManager.html
+++ b/docs/api/html/NetworkManager.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -552,6 +552,6 @@
 
 
 

-
Generated by GTK-Doc V1.29.1

+
Generated by GTK-Doc V1.29
 
 
\ No newline at end of file
diff --git a/docs/api/html/ch01.html b/docs/api/html/ch01.html
index 12c58ba1..93f348c9 100644
--- a/docs/api/html/ch01.html
+++ b/docs/api/html/ch01.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -158,6 +158,6 @@
 
 
 

-
Generated by GTK-Doc V1.29.1

+
Generated by GTK-Doc V1.29
 
 
\ No newline at end of file
diff --git a/docs/api/html/dbus-secret-agent.html b/docs/api/html/dbus-secret-agent.html
index 7683a141..28324ed8 100644
--- a/docs/api/html/dbus-secret-agent.html
+++ b/docs/api/html/dbus-secret-agent.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -27,6 +27,6 @@
 
 
 

-
Generated by GTK-Doc V1.29.1

+
Generated by GTK-Doc V1.29
 
 
\ No newline at end of file
diff --git a/docs/api/html/dbus-types.html b/docs/api/html/dbus-types.html
index f08150e1..0a82e9fa 100644
--- a/docs/api/html/dbus-types.html
+++ b/docs/api/html/dbus-types.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -27,6 +27,6 @@
 
 
 

-
Generated by GTK-Doc V1.29.1

+
Generated by GTK-Doc V1.29
 
 
\ No newline at end of file
diff --git a/docs/api/html/dbus-vpn-plugin.html b/docs/api/html/dbus-vpn-plugin.html
index 6168ab68..b7303cb1 100644
--- a/docs/api/html/dbus-vpn-plugin.html
+++ b/docs/api/html/dbus-vpn-plugin.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -27,6 +27,6 @@
 
 
 

-
Generated by GTK-Doc V1.29.1

+
Generated by GTK-Doc V1.29
 
 
\ No newline at end of file
diff --git a/docs/api/html/dbus-vpn-types.html b/docs/api/html/dbus-vpn-types.html
index 47e006c3..ce721563 100644
--- a/docs/api/html/dbus-vpn-types.html
+++ b/docs/api/html/dbus-vpn-types.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -27,6 +27,6 @@
 
 
 

-
Generated by GTK-Doc V1.29.1

+
Generated by GTK-Doc V1.29
 
 
\ No newline at end of file
diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.AccessPoint.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.AccessPoint.html
index 6efba716..d1232d30 100644
--- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.AccessPoint.html
+++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.AccessPoint.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -186,6 +186,6 @@ LastSeen  readable   i
 
 
 

-
Generated by GTK-Doc V1.29.1

+
Generated by GTK-Doc V1.29
 
 
\ No newline at end of file
diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.AgentManager.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.AgentManager.html
index 0a0d0ecc..7c16d0b3 100644
--- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.AgentManager.html
+++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.AgentManager.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -105,6 +105,6 @@ Unregister ();
 
 
 

-
Generated by GTK-Doc V1.29.1

+
Generated by GTK-Doc V1.29
 
 
\ No newline at end of file
diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Checkpoint.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Checkpoint.html
index 1443baa3..bc6f21f5 100644
--- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Checkpoint.html
+++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Checkpoint.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -105,6 +105,6 @@ RollbackTimeout  readable   u
 
 
 

-
Generated by GTK-Doc V1.29.1

+
Generated by GTK-Doc V1.29
 
 
\ No newline at end of file
diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Connection.Active.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Connection.Active.html
index 2cf0226c..df0af7a0 100644
--- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Connection.Active.html
+++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Connection.Active.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -297,6 +297,6 @@ Master  readable   o
 
 
 

-
Generated by GTK-Doc V1.29.1

+
Generated by GTK-Doc V1.29
 
 
\ No newline at end of file
diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.DHCP4Config.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.DHCP4Config.html
index 3d71cb67..e10510ce 100644
--- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.DHCP4Config.html
+++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.DHCP4Config.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -84,6 +84,6 @@ Options  readable   a{sv}
 
 
 

-
Generated by GTK-Doc V1.29.1

+
Generated by GTK-Doc V1.29
 
 
\ No newline at end of file
diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.DHCP6Config.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.DHCP6Config.html
index b00cde4f..287a6c59 100644
--- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.DHCP6Config.html
+++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.DHCP6Config.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -84,6 +84,6 @@ Options  readable   a{sv}
 
 
 

-
Generated by GTK-Doc V1.29.1

+
Generated by GTK-Doc V1.29
 
 
\ No newline at end of file
diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Adsl.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Adsl.html
index 286b5e3d..5570fcab 100644
--- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Adsl.html
+++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Adsl.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -83,6 +83,6 @@ Carrier  readable   b
 
 
 

-
Generated by GTK-Doc V1.29.1

+
Generated by GTK-Doc V1.29
 
 
\ No newline at end of file
diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Bluetooth.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Bluetooth.html
index 3756c9ab..cdb44393 100644
--- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Bluetooth.html
+++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Bluetooth.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -105,6 +105,6 @@ BtCapabilities  readable   u
 
 
 

-
Generated by GTK-Doc V1.29.1

+
Generated by GTK-Doc V1.29
 
 
\ No newline at end of file
diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Bond.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Bond.html
index b85a1b91..5a7cebd0 100644
--- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Bond.html
+++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Bond.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -105,6 +105,6 @@ Slaves  readable   ao
 
 
 

-
Generated by GTK-Doc V1.29.1

+
Generated by GTK-Doc V1.29
 
 
\ No newline at end of file
diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Bridge.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Bridge.html
index 45ad5504..256362e0 100644
--- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Bridge.html
+++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Bridge.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -105,6 +105,6 @@ Slaves  readable   ao
 
 
 

-
Generated by GTK-Doc V1.29.1

+
Generated by GTK-Doc V1.29
 
 
\ No newline at end of file
diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Dummy.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Dummy.html
index 282e2942..cf8c4383 100644
--- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Dummy.html
+++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Dummy.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -83,6 +83,6 @@ HwAddress  readable   s
 
 
 

-
Generated by GTK-Doc V1.29.1

+
Generated by GTK-Doc V1.29
 
 
\ No newline at end of file
diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Generic.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Generic.html
index abc8ef24..3a339492 100644
--- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Generic.html
+++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Generic.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -93,6 +93,6 @@ TypeDescription  readable   s
 
 
 

-
Generated by GTK-Doc V1.29.1

+
Generated by GTK-Doc V1.29
 
 
\ No newline at end of file
diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.IPTunnel.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.IPTunnel.html
index 33bcfb12..241a1634 100644
--- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.IPTunnel.html
+++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.IPTunnel.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -197,6 +197,6 @@ Flags  readable   u
 
 
 

-
Generated by GTK-Doc V1.29.1

+
Generated by GTK-Doc V1.29
 
 
\ No newline at end of file
diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Infiniband.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Infiniband.html
index 62e1228b..b9128792 100644
--- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Infiniband.html
+++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Infiniband.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -94,6 +94,6 @@ Carrier  readable   b
 
 
 

-
Generated by GTK-Doc V1.29.1

+
Generated by GTK-Doc V1.29
 
 
\ No newline at end of file
diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Lowpan.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Lowpan.html
index f9455e94..b95bc1ab 100644
--- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Lowpan.html
+++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Lowpan.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -65,6 +65,6 @@ Parent  readable   o
 
 
 

-
Generated by GTK-Doc V1.29.1

+
Generated by GTK-Doc V1.29
 
 
\ No newline at end of file
diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Macsec.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Macsec.html
index 1685907b..4fb5a435 100644
--- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Macsec.html
+++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Macsec.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -209,6 +209,6 @@ ReplayProtect  readable   b
 
 
 

-
Generated by GTK-Doc V1.29.1

+
Generated by GTK-Doc V1.29
 
 
\ No newline at end of file
diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Macvlan.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Macvlan.html
index b104efb1..23d67da2 100644
--- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Macvlan.html
+++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Macvlan.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -113,6 +113,6 @@ Tap  readable   b
 
 
 

-
Generated by GTK-Doc V1.29.1

+
Generated by GTK-Doc V1.29
 
 
\ No newline at end of file
diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Modem.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Modem.html
index 8cd060fe..57ffe215 100644
--- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Modem.html
+++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Modem.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -101,6 +101,6 @@ CurrentCapabilities  readable   u
 
 
 

-
Generated by GTK-Doc V1.29.1

+
Generated by GTK-Doc V1.29
 
 
\ No newline at end of file
diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.OlpcMesh.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.OlpcMesh.html
index b7fb2c2c..ade3b84e 100644
--- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.OlpcMesh.html
+++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.OlpcMesh.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -103,6 +103,6 @@ ActiveChannel  readable   u
 
 
 

-
Generated by GTK-Doc V1.29.1

+
Generated by GTK-Doc V1.29
 
 
\ No newline at end of file
diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.OvsBridge.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.OvsBridge.html
index d78f141c..49e9e402 100644
--- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.OvsBridge.html
+++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.OvsBridge.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -86,6 +86,6 @@ Slaves  readable   ao
 
 
 

-
Generated by GTK-Doc V1.29.1

+
Generated by GTK-Doc V1.29
 
 
\ No newline at end of file
diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.OvsInterface.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.OvsInterface.html
index 10791932..177d6de9 100644
--- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.OvsInterface.html
+++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.OvsInterface.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -65,6 +65,6 @@ PropertiesChanged (a{sv} properties);
 
 
 

-
Generated by GTK-Doc V1.29.1

+
Generated by GTK-Doc V1.29
 
 
\ No newline at end of file
diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.OvsPort.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.OvsPort.html
index 390a5467..d5909eb7 100644
--- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.OvsPort.html
+++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.OvsPort.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -86,6 +86,6 @@ Slaves  readable   ao
 
 
 

-
Generated by GTK-Doc V1.29.1

+
Generated by GTK-Doc V1.29
 
 
\ No newline at end of file
diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Ppp.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Ppp.html
index 91ecabc1..389bb106 100644
--- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Ppp.html
+++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Ppp.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -65,6 +65,6 @@ PropertiesChanged (a{sv} properties);
 
 
 

-
Generated by GTK-Doc V1.29.1

+
Generated by GTK-Doc V1.29
 
 
\ No newline at end of file
diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Statistics.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Statistics.html
index 7e0b47e4..ed1b80c0 100644
--- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Statistics.html
+++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Statistics.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -106,6 +106,6 @@ RxBytes  readable   t
 
 
 

-
Generated by GTK-Doc V1.29.1

+
Generated by GTK-Doc V1.29
 
 
\ No newline at end of file
diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Team.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Team.html
index a8f1bb17..d82c27ca 100644
--- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Team.html
+++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Team.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -115,6 +115,6 @@ Config  readable   s
 
 
 

-
Generated by GTK-Doc V1.29.1

+
Generated by GTK-Doc V1.29
 
 
\ No newline at end of file
diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Tun.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Tun.html
index a8e1f0af..926df18e 100644
--- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Tun.html
+++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Tun.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -146,6 +146,6 @@ HwAddress  readable   s
 
 
 

-
Generated by GTK-Doc V1.29.1

+
Generated by GTK-Doc V1.29
 
 
\ No newline at end of file
diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Veth.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Veth.html
index 4319d5c5..6bd6f3cf 100644
--- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Veth.html
+++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Veth.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -83,6 +83,6 @@ Peer  readable   o
 
 
 

-
Generated by GTK-Doc V1.29.1

+
Generated by GTK-Doc V1.29
 
 
\ No newline at end of file
diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Vlan.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Vlan.html
index 74c5ad8b..6182c837 100644
--- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Vlan.html
+++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Vlan.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -114,6 +114,6 @@ VlanId  readable   u
 
 
 

-
Generated by GTK-Doc V1.29.1

+
Generated by GTK-Doc V1.29
 
 
\ No newline at end of file
diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Vxlan.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Vxlan.html
index 89bf0592..2131bd9f 100644
--- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Vxlan.html
+++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Vxlan.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -250,6 +250,6 @@ L3miss  readable   b
 
 
 

-
Generated by GTK-Doc V1.29.1

+
Generated by GTK-Doc V1.29
 
 
\ No newline at end of file
diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.WireGuard.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.WireGuard.html
index cf0fa84e..eae61221 100644
--- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.WireGuard.html
+++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.WireGuard.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -76,6 +76,6 @@ FwMark  readable   u
 
 
 

-
Generated by GTK-Doc V1.29.1

+
Generated by GTK-Doc V1.29
 
 
\ No newline at end of file
diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Wired.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Wired.html
index 14073c38..585359ba 100644
--- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Wired.html
+++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Wired.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -124,6 +124,6 @@ Carrier  readable   b
 
 
 

-
Generated by GTK-Doc V1.29.1

+
Generated by GTK-Doc V1.29
 
 
\ No newline at end of file
diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Wireless.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Wireless.html
index 95372d62..1531b2df 100644
--- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Wireless.html
+++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Wireless.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -272,6 +272,6 @@ LastScan  readable   x
 
 
 

-
Generated by GTK-Doc V1.29.1

+
Generated by GTK-Doc V1.29
 
 
\ No newline at end of file
diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Wpan.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Wpan.html
index b9d346ce..906cea86 100644
--- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Wpan.html
+++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Wpan.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -55,6 +55,6 @@ HwAddress  readable   s
 
 
 

-
Generated by GTK-Doc V1.29.1

+
Generated by GTK-Doc V1.29
 
 
\ No newline at end of file
diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.html
index 075d320f..f4d02ea3 100644
--- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.html
+++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -536,6 +536,6 @@ Real  readable   b
 
 
 

-
Generated by GTK-Doc V1.29.1

+
Generated by GTK-Doc V1.29
 
 
\ No newline at end of file
diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.DnsManager.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.DnsManager.html
index 86f56b3a..e7461f6d 100644
--- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.DnsManager.html
+++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.DnsManager.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -82,6 +82,6 @@ Configuration  readable   aa{sv}
 
 
 

-
Generated by GTK-Doc V1.29.1

+
Generated by GTK-Doc V1.29
 
 
\ No newline at end of file
diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.IP4Config.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.IP4Config.html
index 1425a3b9..5e2c5365 100644
--- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.IP4Config.html
+++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.IP4Config.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -220,6 +220,6 @@ WinsServerData  readable   as
 
 
 

-
Generated by GTK-Doc V1.29.1

+
Generated by GTK-Doc V1.29
 
 
\ No newline at end of file
diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.IP6Config.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.IP6Config.html
index 91c463c3..6db0d972 100644
--- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.IP6Config.html
+++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.IP6Config.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -179,6 +179,6 @@ DnsPriority  readable   i
 
 
 

-
Generated by GTK-Doc V1.29.1

+
Generated by GTK-Doc V1.29
 
 
\ No newline at end of file
diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.PPP.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.PPP.html
index b1b982d0..011cb2be 100644
--- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.PPP.html
+++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.PPP.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -147,6 +147,6 @@ SetIfindex (IN  i ifindex);
 
 
 

-
Generated by GTK-Doc V1.29.1

+
Generated by GTK-Doc V1.29
 
 
\ No newline at end of file
diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.SecretAgent.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.SecretAgent.html
index 8a5fa174..31212e42 100644
--- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.SecretAgent.html
+++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.SecretAgent.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -197,6 +197,6 @@ DeleteSecrets (IN  a{sa{sv}} connection,
 
 
 

-
Generated by GTK-Doc V1.29.1

+
Generated by GTK-Doc V1.29
 
 
\ No newline at end of file
diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Settings.Connection.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Settings.Connection.html
index 6dc617a7..030af0d6 100644
--- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Settings.Connection.html
+++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Settings.Connection.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -348,6 +348,6 @@ Filename  readable   s
 
 
 

-
Generated by GTK-Doc V1.29.1

+
Generated by GTK-Doc V1.29
 
 
\ No newline at end of file
diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Settings.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Settings.html
index d80737ef..c40fc600 100644
--- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Settings.html
+++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Settings.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -359,6 +359,6 @@ CanModify  readable   b
 
 
 

-
Generated by GTK-Doc V1.29.1

+
Generated by GTK-Doc V1.29
 
 
\ No newline at end of file
diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.VPN.Connection.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.VPN.Connection.html
index f44bb97b..fc963b27 100644
--- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.VPN.Connection.html
+++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.VPN.Connection.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -124,6 +124,6 @@ Banner  readable   s
 
 
 

-
Generated by GTK-Doc V1.29.1

+
Generated by GTK-Doc V1.29
 
 
\ No newline at end of file
diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.VPN.Plugin.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.VPN.Plugin.html
index 9bc4cd0b..fe92f5a9 100644
--- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.VPN.Plugin.html
+++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.VPN.Plugin.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -415,6 +415,6 @@ State  readable   u
 
 
 

-
Generated by GTK-Doc V1.29.1

+
Generated by GTK-Doc V1.29
 
 
\ No newline at end of file
diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.html
index 483ec9d4..64ea7e6b 100644
--- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.html
+++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -957,6 +957,6 @@ GlobalDnsConfiguration  readwrite  a{sv}
 
 
 

-
Generated by GTK-Doc V1.29.1

+
Generated by GTK-Doc V1.29
 
 
\ No newline at end of file
diff --git a/docs/api/html/index.html b/docs/api/html/index.html
index af91d732..c572f5e3 100644
--- a/docs/api/html/index.html
+++ b/docs/api/html/index.html
@@ -7,7 +7,7 @@
 
 
 
-
+
 
 
 
@@ -16,7 +16,7 @@
 

 

 

-      for NetworkManager 1.14.4
+      for NetworkManager 1.14.6
 
       The latest version of this documentation can be found on-line at
       https://developer.gnome.org/NetworkManager/stable/.
@@ -416,6 +416,6 @@
 

 

 

-
Generated by GTK-Doc V1.29.1

+
Generated by GTK-Doc V1.29
 
 
\ No newline at end of file
diff --git a/docs/api/html/ix01.html b/docs/api/html/ix01.html
index 0f00c0f4..a17c94e0 100644
--- a/docs/api/html/ix01.html
+++ b/docs/api/html/ix01.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -26,1524 +26,1524 @@
 

 
Symbols

 

-
org.freedesktop.NetworkManager.AccessPoint, org.freedesktop.NetworkManager.AccessPoint
+
org.freedesktop.NetworkManager.AccessPoint, org.freedesktop.NetworkManager.AccessPoint
 

-
org.freedesktop.NetworkManager.AccessPoint::PropertiesChanged, The "PropertiesChanged" signal
+
org.freedesktop.NetworkManager.AccessPoint::PropertiesChanged, The "PropertiesChanged" signal
 

-
org.freedesktop.NetworkManager.AccessPoint:Flags, The "Flags" property
+
org.freedesktop.NetworkManager.AccessPoint:Flags, The "Flags" property
 

-
org.freedesktop.NetworkManager.AccessPoint:Frequency, The "Frequency" property
+
org.freedesktop.NetworkManager.AccessPoint:Frequency, The "Frequency" property
 

-
org.freedesktop.NetworkManager.AccessPoint:HwAddress, The "HwAddress" property
+
org.freedesktop.NetworkManager.AccessPoint:HwAddress, The "HwAddress" property
 

-
org.freedesktop.NetworkManager.AccessPoint:LastSeen, The "LastSeen" property
+
org.freedesktop.NetworkManager.AccessPoint:LastSeen, The "LastSeen" property
 

-
org.freedesktop.NetworkManager.AccessPoint:MaxBitrate, The "MaxBitrate" property
+
org.freedesktop.NetworkManager.AccessPoint:MaxBitrate, The "MaxBitrate" property
 

-
org.freedesktop.NetworkManager.AccessPoint:Mode, The "Mode" property
+
org.freedesktop.NetworkManager.AccessPoint:Mode, The "Mode" property
 

-
org.freedesktop.NetworkManager.AccessPoint:RsnFlags, The "RsnFlags" property
+
org.freedesktop.NetworkManager.AccessPoint:RsnFlags, The "RsnFlags" property
 

-
org.freedesktop.NetworkManager.AccessPoint:Ssid, The "Ssid" property
+
org.freedesktop.NetworkManager.AccessPoint:Ssid, The "Ssid" property
 

-
org.freedesktop.NetworkManager.AccessPoint:Strength, The "Strength" property
+
org.freedesktop.NetworkManager.AccessPoint:Strength, The "Strength" property
 

-
org.freedesktop.NetworkManager.AccessPoint:WpaFlags, The "WpaFlags" property
+
org.freedesktop.NetworkManager.AccessPoint:WpaFlags, The "WpaFlags" property
 

-
org.freedesktop.NetworkManager.AgentManager, org.freedesktop.NetworkManager.AgentManager
+
org.freedesktop.NetworkManager.AgentManager, org.freedesktop.NetworkManager.AgentManager
 

-
org.freedesktop.NetworkManager.AgentManager.Register(), The Register() method
+
org.freedesktop.NetworkManager.AgentManager.Register(), The Register() method
 

-
org.freedesktop.NetworkManager.AgentManager.RegisterWithCapabilities(), The RegisterWithCapabilities() method
+
org.freedesktop.NetworkManager.AgentManager.RegisterWithCapabilities(), The RegisterWithCapabilities() method
 

-
org.freedesktop.NetworkManager.AgentManager.Unregister(), The Unregister() method
+
org.freedesktop.NetworkManager.AgentManager.Unregister(), The Unregister() method
 

-
org.freedesktop.NetworkManager.Device, org.freedesktop.NetworkManager.Device
+
org.freedesktop.NetworkManager.Device, org.freedesktop.NetworkManager.Device
 

-
org.freedesktop.NetworkManager.Device.Adsl, org.freedesktop.NetworkManager.Device.Adsl
+
org.freedesktop.NetworkManager.Device.Adsl, org.freedesktop.NetworkManager.Device.Adsl
 

-
org.freedesktop.NetworkManager.Device.Adsl::PropertiesChanged, The "PropertiesChanged" signal
+
org.freedesktop.NetworkManager.Device.Adsl::PropertiesChanged, The "PropertiesChanged" signal
 

-
org.freedesktop.NetworkManager.Device.Adsl:Carrier, The "Carrier" property
+
org.freedesktop.NetworkManager.Device.Adsl:Carrier, The "Carrier" property
 

-
org.freedesktop.NetworkManager.Device.Bluetooth, org.freedesktop.NetworkManager.Device.Bluetooth
+
org.freedesktop.NetworkManager.Device.Bluetooth, org.freedesktop.NetworkManager.Device.Bluetooth
 

-
org.freedesktop.NetworkManager.Device.Bluetooth::PropertiesChanged, The "PropertiesChanged" signal
+
org.freedesktop.NetworkManager.Device.Bluetooth::PropertiesChanged, The "PropertiesChanged" signal
 

-
org.freedesktop.NetworkManager.Device.Bluetooth:BtCapabilities, The "BtCapabilities" property
+
org.freedesktop.NetworkManager.Device.Bluetooth:BtCapabilities, The "BtCapabilities" property
 

-
org.freedesktop.NetworkManager.Device.Bluetooth:HwAddress, The "HwAddress" property
+
org.freedesktop.NetworkManager.Device.Bluetooth:HwAddress, The "HwAddress" property
 

-
org.freedesktop.NetworkManager.Device.Bluetooth:Name, The "Name" property
+
org.freedesktop.NetworkManager.Device.Bluetooth:Name, The "Name" property
 

-
org.freedesktop.NetworkManager.Device.Bond, org.freedesktop.NetworkManager.Device.Bond
+
org.freedesktop.NetworkManager.Device.Bond, org.freedesktop.NetworkManager.Device.Bond
 

-
org.freedesktop.NetworkManager.Device.Bond::PropertiesChanged, The "PropertiesChanged" signal
+
org.freedesktop.NetworkManager.Device.Bond::PropertiesChanged, The "PropertiesChanged" signal
 

-
org.freedesktop.NetworkManager.Device.Bond:Carrier, The "Carrier" property
+
org.freedesktop.NetworkManager.Device.Bond:Carrier, The "Carrier" property
 

-
org.freedesktop.NetworkManager.Device.Bond:HwAddress, The "HwAddress" property
+
org.freedesktop.NetworkManager.Device.Bond:HwAddress, The "HwAddress" property
 

-
org.freedesktop.NetworkManager.Device.Bond:Slaves, The "Slaves" property
+
org.freedesktop.NetworkManager.Device.Bond:Slaves, The "Slaves" property
 

-
org.freedesktop.NetworkManager.Device.Bridge, org.freedesktop.NetworkManager.Device.Bridge
+
org.freedesktop.NetworkManager.Device.Bridge, org.freedesktop.NetworkManager.Device.Bridge
 

-
org.freedesktop.NetworkManager.Device.Bridge::PropertiesChanged, The "PropertiesChanged" signal
+
org.freedesktop.NetworkManager.Device.Bridge::PropertiesChanged, The "PropertiesChanged" signal
 

-
org.freedesktop.NetworkManager.Device.Bridge:Carrier, The "Carrier" property
+
org.freedesktop.NetworkManager.Device.Bridge:Carrier, The "Carrier" property
 

-
org.freedesktop.NetworkManager.Device.Bridge:HwAddress, The "HwAddress" property
+
org.freedesktop.NetworkManager.Device.Bridge:HwAddress, The "HwAddress" property
 

-
org.freedesktop.NetworkManager.Device.Bridge:Slaves, The "Slaves" property
+
org.freedesktop.NetworkManager.Device.Bridge:Slaves, The "Slaves" property
 

-
org.freedesktop.NetworkManager.Device.Delete(), The Delete() method
+
org.freedesktop.NetworkManager.Device.Delete(), The Delete() method
 

-
org.freedesktop.NetworkManager.Device.Disconnect(), The Disconnect() method
+
org.freedesktop.NetworkManager.Device.Disconnect(), The Disconnect() method
 

-
org.freedesktop.NetworkManager.Device.Dummy, org.freedesktop.NetworkManager.Device.Dummy
+
org.freedesktop.NetworkManager.Device.Dummy, org.freedesktop.NetworkManager.Device.Dummy
 

-
org.freedesktop.NetworkManager.Device.Dummy::PropertiesChanged, The "PropertiesChanged" signal
+
org.freedesktop.NetworkManager.Device.Dummy::PropertiesChanged, The "PropertiesChanged" signal
 

-
org.freedesktop.NetworkManager.Device.Dummy:HwAddress, The "HwAddress" property
+
org.freedesktop.NetworkManager.Device.Dummy:HwAddress, The "HwAddress" property
 

-
org.freedesktop.NetworkManager.Device.Generic, org.freedesktop.NetworkManager.Device.Generic
+
org.freedesktop.NetworkManager.Device.Generic, org.freedesktop.NetworkManager.Device.Generic
 

-
org.freedesktop.NetworkManager.Device.Generic::PropertiesChanged, The "PropertiesChanged" signal
+
org.freedesktop.NetworkManager.Device.Generic::PropertiesChanged, The "PropertiesChanged" signal
 

-
org.freedesktop.NetworkManager.Device.Generic:HwAddress, The "HwAddress" property
+
org.freedesktop.NetworkManager.Device.Generic:HwAddress, The "HwAddress" property
 

-
org.freedesktop.NetworkManager.Device.Generic:TypeDescription, The "TypeDescription" property
+
org.freedesktop.NetworkManager.Device.Generic:TypeDescription, The "TypeDescription" property
 

-
org.freedesktop.NetworkManager.Device.GetAppliedConnection(), The GetAppliedConnection() method
+
org.freedesktop.NetworkManager.Device.GetAppliedConnection(), The GetAppliedConnection() method
 

-
org.freedesktop.NetworkManager.Device.Infiniband, org.freedesktop.NetworkManager.Device.Infiniband
+
org.freedesktop.NetworkManager.Device.Infiniband, org.freedesktop.NetworkManager.Device.Infiniband
 

-
org.freedesktop.NetworkManager.Device.Infiniband::PropertiesChanged, The "PropertiesChanged" signal
+
org.freedesktop.NetworkManager.Device.Infiniband::PropertiesChanged, The "PropertiesChanged" signal
 

-
org.freedesktop.NetworkManager.Device.Infiniband:Carrier, The "Carrier" property
+
org.freedesktop.NetworkManager.Device.Infiniband:Carrier, The "Carrier" property
 

-
org.freedesktop.NetworkManager.Device.Infiniband:HwAddress, The "HwAddress" property
+
org.freedesktop.NetworkManager.Device.Infiniband:HwAddress, The "HwAddress" property
 

-
org.freedesktop.NetworkManager.Device.IPTunnel, org.freedesktop.NetworkManager.Device.IPTunnel
+
org.freedesktop.NetworkManager.Device.IPTunnel, org.freedesktop.NetworkManager.Device.IPTunnel
 

-
org.freedesktop.NetworkManager.Device.IPTunnel::PropertiesChanged, The "PropertiesChanged" signal
+
org.freedesktop.NetworkManager.Device.IPTunnel::PropertiesChanged, The "PropertiesChanged" signal
 

-
org.freedesktop.NetworkManager.Device.IPTunnel:EncapsulationLimit, The "EncapsulationLimit" property
+
org.freedesktop.NetworkManager.Device.IPTunnel:EncapsulationLimit, The "EncapsulationLimit" property
 

-
org.freedesktop.NetworkManager.Device.IPTunnel:Flags, The "Flags" property
+
org.freedesktop.NetworkManager.Device.IPTunnel:Flags, The "Flags" property
 

-
org.freedesktop.NetworkManager.Device.IPTunnel:FlowLabel, The "FlowLabel" property
+
org.freedesktop.NetworkManager.Device.IPTunnel:FlowLabel, The "FlowLabel" property
 

-
org.freedesktop.NetworkManager.Device.IPTunnel:InputKey, The "InputKey" property
+
org.freedesktop.NetworkManager.Device.IPTunnel:InputKey, The "InputKey" property
 

-
org.freedesktop.NetworkManager.Device.IPTunnel:Local, The "Local" property
+
org.freedesktop.NetworkManager.Device.IPTunnel:Local, The "Local" property
 

-
org.freedesktop.NetworkManager.Device.IPTunnel:Mode, The "Mode" property
+
org.freedesktop.NetworkManager.Device.IPTunnel:Mode, The "Mode" property
 

-
org.freedesktop.NetworkManager.Device.IPTunnel:OutputKey, The "OutputKey" property
+
org.freedesktop.NetworkManager.Device.IPTunnel:OutputKey, The "OutputKey" property
 

-
org.freedesktop.NetworkManager.Device.IPTunnel:Parent, The "Parent" property
+
org.freedesktop.NetworkManager.Device.IPTunnel:Parent, The "Parent" property
 

-
org.freedesktop.NetworkManager.Device.IPTunnel:PathMtuDiscovery, The "PathMtuDiscovery" property
+
org.freedesktop.NetworkManager.Device.IPTunnel:PathMtuDiscovery, The "PathMtuDiscovery" property
 

-
org.freedesktop.NetworkManager.Device.IPTunnel:Remote, The "Remote" property
+
org.freedesktop.NetworkManager.Device.IPTunnel:Remote, The "Remote" property
 

-
org.freedesktop.NetworkManager.Device.IPTunnel:Tos, The "Tos" property
+
org.freedesktop.NetworkManager.Device.IPTunnel:Tos, The "Tos" property
 

-
org.freedesktop.NetworkManager.Device.IPTunnel:Ttl, The "Ttl" property
+
org.freedesktop.NetworkManager.Device.IPTunnel:Ttl, The "Ttl" property
 

-
org.freedesktop.NetworkManager.Device.Lowpan, org.freedesktop.NetworkManager.Device.Lowpan
+
org.freedesktop.NetworkManager.Device.Lowpan, org.freedesktop.NetworkManager.Device.Lowpan
 

-
org.freedesktop.NetworkManager.Device.Lowpan:HwAddress, The "HwAddress" property
+
org.freedesktop.NetworkManager.Device.Lowpan:HwAddress, The "HwAddress" property
 

-
org.freedesktop.NetworkManager.Device.Lowpan:Parent, The "Parent" property
+
org.freedesktop.NetworkManager.Device.Lowpan:Parent, The "Parent" property
 

-
org.freedesktop.NetworkManager.Device.Macsec, org.freedesktop.NetworkManager.Device.Macsec
+
org.freedesktop.NetworkManager.Device.Macsec, org.freedesktop.NetworkManager.Device.Macsec
 

-
org.freedesktop.NetworkManager.Device.Macsec::PropertiesChanged, The "PropertiesChanged" signal
+
org.freedesktop.NetworkManager.Device.Macsec::PropertiesChanged, The "PropertiesChanged" signal
 

-
org.freedesktop.NetworkManager.Device.Macsec:CipherSuite, The "CipherSuite" property
+
org.freedesktop.NetworkManager.Device.Macsec:CipherSuite, The "CipherSuite" property
 

-
org.freedesktop.NetworkManager.Device.Macsec:EncodingSa, The "EncodingSa" property
+
org.freedesktop.NetworkManager.Device.Macsec:EncodingSa, The "EncodingSa" property
 

-
org.freedesktop.NetworkManager.Device.Macsec:Encrypt, The "Encrypt" property
+
org.freedesktop.NetworkManager.Device.Macsec:Encrypt, The "Encrypt" property
 

-
org.freedesktop.NetworkManager.Device.Macsec:Es, The "Es" property
+
org.freedesktop.NetworkManager.Device.Macsec:Es, The "Es" property
 

-
org.freedesktop.NetworkManager.Device.Macsec:IcvLength, The "IcvLength" property
+
org.freedesktop.NetworkManager.Device.Macsec:IcvLength, The "IcvLength" property
 

-
org.freedesktop.NetworkManager.Device.Macsec:IncludeSci, The "IncludeSci" property
+
org.freedesktop.NetworkManager.Device.Macsec:IncludeSci, The "IncludeSci" property
 

-
org.freedesktop.NetworkManager.Device.Macsec:Parent, The "Parent" property
+
org.freedesktop.NetworkManager.Device.Macsec:Parent, The "Parent" property
 

-
org.freedesktop.NetworkManager.Device.Macsec:Protect, The "Protect" property
+
org.freedesktop.NetworkManager.Device.Macsec:Protect, The "Protect" property
 

-
org.freedesktop.NetworkManager.Device.Macsec:ReplayProtect, The "ReplayProtect" property
+
org.freedesktop.NetworkManager.Device.Macsec:ReplayProtect, The "ReplayProtect" property
 

-
org.freedesktop.NetworkManager.Device.Macsec:Scb, The "Scb" property
+
org.freedesktop.NetworkManager.Device.Macsec:Scb, The "Scb" property
 

-
org.freedesktop.NetworkManager.Device.Macsec:Sci, The "Sci" property
+
org.freedesktop.NetworkManager.Device.Macsec:Sci, The "Sci" property
 

-
org.freedesktop.NetworkManager.Device.Macsec:Validation, The "Validation" property
+
org.freedesktop.NetworkManager.Device.Macsec:Validation, The "Validation" property
 

-
org.freedesktop.NetworkManager.Device.Macsec:Window, The "Window" property
+
org.freedesktop.NetworkManager.Device.Macsec:Window, The "Window" property
 

-
org.freedesktop.NetworkManager.Device.Macvlan, org.freedesktop.NetworkManager.Device.Macvlan
+
org.freedesktop.NetworkManager.Device.Macvlan, org.freedesktop.NetworkManager.Device.Macvlan
 

-
org.freedesktop.NetworkManager.Device.Macvlan::PropertiesChanged, The "PropertiesChanged" signal
+
org.freedesktop.NetworkManager.Device.Macvlan::PropertiesChanged, The "PropertiesChanged" signal
 

-
org.freedesktop.NetworkManager.Device.Macvlan:Mode, The "Mode" property
+
org.freedesktop.NetworkManager.Device.Macvlan:Mode, The "Mode" property
 

-
org.freedesktop.NetworkManager.Device.Macvlan:NoPromisc, The "NoPromisc" property
+
org.freedesktop.NetworkManager.Device.Macvlan:NoPromisc, The "NoPromisc" property
 

-
org.freedesktop.NetworkManager.Device.Macvlan:Parent, The "Parent" property
+
org.freedesktop.NetworkManager.Device.Macvlan:Parent, The "Parent" property
 

-
org.freedesktop.NetworkManager.Device.Macvlan:Tap, The "Tap" property
+
org.freedesktop.NetworkManager.Device.Macvlan:Tap, The "Tap" property
 

-
org.freedesktop.NetworkManager.Device.Modem, org.freedesktop.NetworkManager.Device.Modem
+
org.freedesktop.NetworkManager.Device.Modem, org.freedesktop.NetworkManager.Device.Modem
 

-
org.freedesktop.NetworkManager.Device.Modem::PropertiesChanged, The "PropertiesChanged" signal
+
org.freedesktop.NetworkManager.Device.Modem::PropertiesChanged, The "PropertiesChanged" signal
 

-
org.freedesktop.NetworkManager.Device.Modem:CurrentCapabilities, The "CurrentCapabilities" property
+
org.freedesktop.NetworkManager.Device.Modem:CurrentCapabilities, The "CurrentCapabilities" property
 

-
org.freedesktop.NetworkManager.Device.Modem:ModemCapabilities, The "ModemCapabilities" property
+
org.freedesktop.NetworkManager.Device.Modem:ModemCapabilities, The "ModemCapabilities" property
 

-
org.freedesktop.NetworkManager.Device.OlpcMesh, org.freedesktop.NetworkManager.Device.OlpcMesh
+
org.freedesktop.NetworkManager.Device.OlpcMesh, org.freedesktop.NetworkManager.Device.OlpcMesh
 

-
org.freedesktop.NetworkManager.Device.OlpcMesh::PropertiesChanged, The "PropertiesChanged" signal
+
org.freedesktop.NetworkManager.Device.OlpcMesh::PropertiesChanged, The "PropertiesChanged" signal
 

-
org.freedesktop.NetworkManager.Device.OlpcMesh:ActiveChannel, The "ActiveChannel" property
+
org.freedesktop.NetworkManager.Device.OlpcMesh:ActiveChannel, The "ActiveChannel" property
 

-
org.freedesktop.NetworkManager.Device.OlpcMesh:Companion, The "Companion" property
+
org.freedesktop.NetworkManager.Device.OlpcMesh:Companion, The "Companion" property
 

-
org.freedesktop.NetworkManager.Device.OlpcMesh:HwAddress, The "HwAddress" property
+
org.freedesktop.NetworkManager.Device.OlpcMesh:HwAddress, The "HwAddress" property
 

-
org.freedesktop.NetworkManager.Device.OvsBridge, org.freedesktop.NetworkManager.Device.OvsBridge
+
org.freedesktop.NetworkManager.Device.OvsBridge, org.freedesktop.NetworkManager.Device.OvsBridge
 

-
org.freedesktop.NetworkManager.Device.OvsBridge::PropertiesChanged, The "PropertiesChanged" signal
+
org.freedesktop.NetworkManager.Device.OvsBridge::PropertiesChanged, The "PropertiesChanged" signal
 

-
org.freedesktop.NetworkManager.Device.OvsBridge:Slaves, The "Slaves" property
+
org.freedesktop.NetworkManager.Device.OvsBridge:Slaves, The "Slaves" property
 

-
org.freedesktop.NetworkManager.Device.OvsInterface, org.freedesktop.NetworkManager.Device.OvsInterface
+
org.freedesktop.NetworkManager.Device.OvsInterface, org.freedesktop.NetworkManager.Device.OvsInterface
 

-
org.freedesktop.NetworkManager.Device.OvsInterface::PropertiesChanged, The "PropertiesChanged" signal
+
org.freedesktop.NetworkManager.Device.OvsInterface::PropertiesChanged, The "PropertiesChanged" signal
 

-
org.freedesktop.NetworkManager.Device.OvsPort, org.freedesktop.NetworkManager.Device.OvsPort
+
org.freedesktop.NetworkManager.Device.OvsPort, org.freedesktop.NetworkManager.Device.OvsPort
 

-
org.freedesktop.NetworkManager.Device.OvsPort::PropertiesChanged, The "PropertiesChanged" signal
+
org.freedesktop.NetworkManager.Device.OvsPort::PropertiesChanged, The "PropertiesChanged" signal
 

-
org.freedesktop.NetworkManager.Device.OvsPort:Slaves, The "Slaves" property
+
org.freedesktop.NetworkManager.Device.OvsPort:Slaves, The "Slaves" property
 

-
org.freedesktop.NetworkManager.Device.Ppp, org.freedesktop.NetworkManager.Device.Ppp
+
org.freedesktop.NetworkManager.Device.Ppp, org.freedesktop.NetworkManager.Device.Ppp
 

-
org.freedesktop.NetworkManager.Device.Ppp::PropertiesChanged, The "PropertiesChanged" signal
+
org.freedesktop.NetworkManager.Device.Ppp::PropertiesChanged, The "PropertiesChanged" signal
 

-
org.freedesktop.NetworkManager.Device.Reapply(), The Reapply() method
+
org.freedesktop.NetworkManager.Device.Reapply(), The Reapply() method
 

-
org.freedesktop.NetworkManager.Device.Statistics, org.freedesktop.NetworkManager.Device.Statistics
+
org.freedesktop.NetworkManager.Device.Statistics, org.freedesktop.NetworkManager.Device.Statistics
 

-
org.freedesktop.NetworkManager.Device.Statistics::PropertiesChanged, The "PropertiesChanged" signal
+
org.freedesktop.NetworkManager.Device.Statistics::PropertiesChanged, The "PropertiesChanged" signal
 

-
org.freedesktop.NetworkManager.Device.Statistics:RefreshRateMs, The "RefreshRateMs" property
+
org.freedesktop.NetworkManager.Device.Statistics:RefreshRateMs, The "RefreshRateMs" property
 

-
org.freedesktop.NetworkManager.Device.Statistics:RxBytes, The "RxBytes" property
+
org.freedesktop.NetworkManager.Device.Statistics:RxBytes, The "RxBytes" property
 

-
org.freedesktop.NetworkManager.Device.Statistics:TxBytes, The "TxBytes" property
+
org.freedesktop.NetworkManager.Device.Statistics:TxBytes, The "TxBytes" property
 

-
org.freedesktop.NetworkManager.Device.Team, org.freedesktop.NetworkManager.Device.Team
+
org.freedesktop.NetworkManager.Device.Team, org.freedesktop.NetworkManager.Device.Team
 

-
org.freedesktop.NetworkManager.Device.Team::PropertiesChanged, The "PropertiesChanged" signal
+
org.freedesktop.NetworkManager.Device.Team::PropertiesChanged, The "PropertiesChanged" signal
 

-
org.freedesktop.NetworkManager.Device.Team:Carrier, The "Carrier" property
+
org.freedesktop.NetworkManager.Device.Team:Carrier, The "Carrier" property
 

-
org.freedesktop.NetworkManager.Device.Team:Config, The "Config" property
+
org.freedesktop.NetworkManager.Device.Team:Config, The "Config" property
 

-
org.freedesktop.NetworkManager.Device.Team:HwAddress, The "HwAddress" property
+
org.freedesktop.NetworkManager.Device.Team:HwAddress, The "HwAddress" property
 

-
org.freedesktop.NetworkManager.Device.Team:Slaves, The "Slaves" property
+
org.freedesktop.NetworkManager.Device.Team:Slaves, The "Slaves" property
 

-
org.freedesktop.NetworkManager.Device.Tun, org.freedesktop.NetworkManager.Device.Tun
+
org.freedesktop.NetworkManager.Device.Tun, org.freedesktop.NetworkManager.Device.Tun
 

-
org.freedesktop.NetworkManager.Device.Tun::PropertiesChanged, The "PropertiesChanged" signal
+
org.freedesktop.NetworkManager.Device.Tun::PropertiesChanged, The "PropertiesChanged" signal
 

-
org.freedesktop.NetworkManager.Device.Tun:Group, The "Group" property
+
org.freedesktop.NetworkManager.Device.Tun:Group, The "Group" property
 

-
org.freedesktop.NetworkManager.Device.Tun:HwAddress, The "HwAddress" property
+
org.freedesktop.NetworkManager.Device.Tun:HwAddress, The "HwAddress" property
 

-
org.freedesktop.NetworkManager.Device.Tun:Mode, The "Mode" property
+
org.freedesktop.NetworkManager.Device.Tun:Mode, The "Mode" property
 

-
org.freedesktop.NetworkManager.Device.Tun:MultiQueue, The "MultiQueue" property
+
org.freedesktop.NetworkManager.Device.Tun:MultiQueue, The "MultiQueue" property
 

-
org.freedesktop.NetworkManager.Device.Tun:NoPi, The "NoPi" property
+
org.freedesktop.NetworkManager.Device.Tun:NoPi, The "NoPi" property
 

-
org.freedesktop.NetworkManager.Device.Tun:Owner, The "Owner" property
+
org.freedesktop.NetworkManager.Device.Tun:Owner, The "Owner" property
 

-
org.freedesktop.NetworkManager.Device.Tun:VnetHdr, The "VnetHdr" property
+
org.freedesktop.NetworkManager.Device.Tun:VnetHdr, The "VnetHdr" property
 

-
org.freedesktop.NetworkManager.Device.Veth, org.freedesktop.NetworkManager.Device.Veth
+
org.freedesktop.NetworkManager.Device.Veth, org.freedesktop.NetworkManager.Device.Veth
 

-
org.freedesktop.NetworkManager.Device.Veth::PropertiesChanged, The "PropertiesChanged" signal
+
org.freedesktop.NetworkManager.Device.Veth::PropertiesChanged, The "PropertiesChanged" signal
 

-
org.freedesktop.NetworkManager.Device.Veth:Peer, The "Peer" property
+
org.freedesktop.NetworkManager.Device.Veth:Peer, The "Peer" property
 

-
org.freedesktop.NetworkManager.Device.Vlan, org.freedesktop.NetworkManager.Device.Vlan
+
org.freedesktop.NetworkManager.Device.Vlan, org.freedesktop.NetworkManager.Device.Vlan
 

-
org.freedesktop.NetworkManager.Device.Vlan::PropertiesChanged, The "PropertiesChanged" signal
+
org.freedesktop.NetworkManager.Device.Vlan::PropertiesChanged, The "PropertiesChanged" signal
 

-
org.freedesktop.NetworkManager.Device.Vlan:Carrier, The "Carrier" property
+
org.freedesktop.NetworkManager.Device.Vlan:Carrier, The "Carrier" property
 

-
org.freedesktop.NetworkManager.Device.Vlan:HwAddress, The "HwAddress" property
+
org.freedesktop.NetworkManager.Device.Vlan:HwAddress, The "HwAddress" property
 

-
org.freedesktop.NetworkManager.Device.Vlan:Parent, The "Parent" property
+
org.freedesktop.NetworkManager.Device.Vlan:Parent, The "Parent" property
 

-
org.freedesktop.NetworkManager.Device.Vlan:VlanId, The "VlanId" property
+
org.freedesktop.NetworkManager.Device.Vlan:VlanId, The "VlanId" property
 

-
org.freedesktop.NetworkManager.Device.Vxlan, org.freedesktop.NetworkManager.Device.Vxlan
+
org.freedesktop.NetworkManager.Device.Vxlan, org.freedesktop.NetworkManager.Device.Vxlan
 

-
org.freedesktop.NetworkManager.Device.Vxlan::PropertiesChanged, The "PropertiesChanged" signal
+
org.freedesktop.NetworkManager.Device.Vxlan::PropertiesChanged, The "PropertiesChanged" signal
 

-
org.freedesktop.NetworkManager.Device.Vxlan:Ageing, The "Ageing" property
+
org.freedesktop.NetworkManager.Device.Vxlan:Ageing, The "Ageing" property
 

-
org.freedesktop.NetworkManager.Device.Vxlan:DstPort, The "DstPort" property
+
org.freedesktop.NetworkManager.Device.Vxlan:DstPort, The "DstPort" property
 

-
org.freedesktop.NetworkManager.Device.Vxlan:Group, The "Group" property
+
org.freedesktop.NetworkManager.Device.Vxlan:Group, The "Group" property
 

-
org.freedesktop.NetworkManager.Device.Vxlan:HwAddress, The "HwAddress" property
+
org.freedesktop.NetworkManager.Device.Vxlan:HwAddress, The "HwAddress" property
 

-
org.freedesktop.NetworkManager.Device.Vxlan:Id, The "Id" property
+
org.freedesktop.NetworkManager.Device.Vxlan:Id, The "Id" property
 

-
org.freedesktop.NetworkManager.Device.Vxlan:L2miss, The "L2miss" property
+
org.freedesktop.NetworkManager.Device.Vxlan:L2miss, The "L2miss" property
 

-
org.freedesktop.NetworkManager.Device.Vxlan:L3miss, The "L3miss" property
+
org.freedesktop.NetworkManager.Device.Vxlan:L3miss, The "L3miss" property
 

-
org.freedesktop.NetworkManager.Device.Vxlan:Learning, The "Learning" property
+
org.freedesktop.NetworkManager.Device.Vxlan:Learning, The "Learning" property
 

-
org.freedesktop.NetworkManager.Device.Vxlan:Limit, The "Limit" property
+
org.freedesktop.NetworkManager.Device.Vxlan:Limit, The "Limit" property
 

-
org.freedesktop.NetworkManager.Device.Vxlan:Local, The "Local" property
+
org.freedesktop.NetworkManager.Device.Vxlan:Local, The "Local" property
 

-
org.freedesktop.NetworkManager.Device.Vxlan:Parent, The "Parent" property
+
org.freedesktop.NetworkManager.Device.Vxlan:Parent, The "Parent" property
 

-
org.freedesktop.NetworkManager.Device.Vxlan:Proxy, The "Proxy" property
+
org.freedesktop.NetworkManager.Device.Vxlan:Proxy, The "Proxy" property
 

-
org.freedesktop.NetworkManager.Device.Vxlan:Rsc, The "Rsc" property
+
org.freedesktop.NetworkManager.Device.Vxlan:Rsc, The "Rsc" property
 

-
org.freedesktop.NetworkManager.Device.Vxlan:SrcPortMax, The "SrcPortMax" property
+
org.freedesktop.NetworkManager.Device.Vxlan:SrcPortMax, The "SrcPortMax" property
 

-
org.freedesktop.NetworkManager.Device.Vxlan:SrcPortMin, The "SrcPortMin" property
+
org.freedesktop.NetworkManager.Device.Vxlan:SrcPortMin, The "SrcPortMin" property
 

-
org.freedesktop.NetworkManager.Device.Vxlan:Tos, The "Tos" property
+
org.freedesktop.NetworkManager.Device.Vxlan:Tos, The "Tos" property
 

-
org.freedesktop.NetworkManager.Device.Vxlan:Ttl, The "Ttl" property
+
org.freedesktop.NetworkManager.Device.Vxlan:Ttl, The "Ttl" property
 

-
org.freedesktop.NetworkManager.Device.WireGuard, org.freedesktop.NetworkManager.Device.WireGuard
+
org.freedesktop.NetworkManager.Device.WireGuard, org.freedesktop.NetworkManager.Device.WireGuard
 

-
org.freedesktop.NetworkManager.Device.WireGuard:FwMark, The "FwMark" property
+
org.freedesktop.NetworkManager.Device.WireGuard:FwMark, The "FwMark" property
 

-
org.freedesktop.NetworkManager.Device.WireGuard:ListenPort, The "ListenPort" property
+
org.freedesktop.NetworkManager.Device.WireGuard:ListenPort, The "ListenPort" property
 

-
org.freedesktop.NetworkManager.Device.WireGuard:PublicKey, The "PublicKey" property
+
org.freedesktop.NetworkManager.Device.WireGuard:PublicKey, The "PublicKey" property
 

-
org.freedesktop.NetworkManager.Device.Wpan, org.freedesktop.NetworkManager.Device.Wpan
+
org.freedesktop.NetworkManager.Device.Wpan, org.freedesktop.NetworkManager.Device.Wpan
 

-
org.freedesktop.NetworkManager.Device.Wpan:HwAddress, The "HwAddress" property
+
org.freedesktop.NetworkManager.Device.Wpan:HwAddress, The "HwAddress" property
 

-
org.freedesktop.NetworkManager.Device::StateChanged, The "StateChanged" signal
+
org.freedesktop.NetworkManager.Device::StateChanged, The "StateChanged" signal
 

-
org.freedesktop.NetworkManager.Device:ActiveConnection, The "ActiveConnection" property
+
org.freedesktop.NetworkManager.Device:ActiveConnection, The "ActiveConnection" property
 

-
org.freedesktop.NetworkManager.Device:Autoconnect, The "Autoconnect" property
+
org.freedesktop.NetworkManager.Device:Autoconnect, The "Autoconnect" property
 

-
org.freedesktop.NetworkManager.Device:AvailableConnections, The "AvailableConnections" property
+
org.freedesktop.NetworkManager.Device:AvailableConnections, The "AvailableConnections" property
 

-
org.freedesktop.NetworkManager.Device:Capabilities, The "Capabilities" property
+
org.freedesktop.NetworkManager.Device:Capabilities, The "Capabilities" property
 

-
org.freedesktop.NetworkManager.Device:DeviceType, The "DeviceType" property
+
org.freedesktop.NetworkManager.Device:DeviceType, The "DeviceType" property
 

-
org.freedesktop.NetworkManager.Device:Dhcp4Config, The "Dhcp4Config" property
+
org.freedesktop.NetworkManager.Device:Dhcp4Config, The "Dhcp4Config" property
 

-
org.freedesktop.NetworkManager.Device:Dhcp6Config, The "Dhcp6Config" property
+
org.freedesktop.NetworkManager.Device:Dhcp6Config, The "Dhcp6Config" property
 

-
org.freedesktop.NetworkManager.Device:Driver, The "Driver" property
+
org.freedesktop.NetworkManager.Device:Driver, The "Driver" property
 

-
org.freedesktop.NetworkManager.Device:DriverVersion, The "DriverVersion" property
+
org.freedesktop.NetworkManager.Device:DriverVersion, The "DriverVersion" property
 

-
org.freedesktop.NetworkManager.Device:FirmwareMissing, The "FirmwareMissing" property
+
org.freedesktop.NetworkManager.Device:FirmwareMissing, The "FirmwareMissing" property
 

-
org.freedesktop.NetworkManager.Device:FirmwareVersion, The "FirmwareVersion" property
+
org.freedesktop.NetworkManager.Device:FirmwareVersion, The "FirmwareVersion" property
 

-
org.freedesktop.NetworkManager.Device:Interface, The "Interface" property
+
org.freedesktop.NetworkManager.Device:Interface, The "Interface" property
 

-
org.freedesktop.NetworkManager.Device:Ip4Address, The "Ip4Address" property
+
org.freedesktop.NetworkManager.Device:Ip4Address, The "Ip4Address" property
 

-
org.freedesktop.NetworkManager.Device:Ip4Config, The "Ip4Config" property
+
org.freedesktop.NetworkManager.Device:Ip4Config, The "Ip4Config" property
 

-
org.freedesktop.NetworkManager.Device:Ip6Config, The "Ip6Config" property
+
org.freedesktop.NetworkManager.Device:Ip6Config, The "Ip6Config" property
 

-
org.freedesktop.NetworkManager.Device:IpInterface, The "IpInterface" property
+
org.freedesktop.NetworkManager.Device:IpInterface, The "IpInterface" property
 

-
org.freedesktop.NetworkManager.Device:LldpNeighbors, The "LldpNeighbors" property
+
org.freedesktop.NetworkManager.Device:LldpNeighbors, The "LldpNeighbors" property
 

-
org.freedesktop.NetworkManager.Device:Managed, The "Managed" property
+
org.freedesktop.NetworkManager.Device:Managed, The "Managed" property
 

-
org.freedesktop.NetworkManager.Device:Metered, The "Metered" property
+
org.freedesktop.NetworkManager.Device:Metered, The "Metered" property
 

-
org.freedesktop.NetworkManager.Device:Mtu, The "Mtu" property
+
org.freedesktop.NetworkManager.Device:Mtu, The "Mtu" property
 

-
org.freedesktop.NetworkManager.Device:NmPluginMissing, The "NmPluginMissing" property
+
org.freedesktop.NetworkManager.Device:NmPluginMissing, The "NmPluginMissing" property
 

-
org.freedesktop.NetworkManager.Device:PhysicalPortId, The "PhysicalPortId" property
+
org.freedesktop.NetworkManager.Device:PhysicalPortId, The "PhysicalPortId" property
 

-
org.freedesktop.NetworkManager.Device:Real, The "Real" property
+
org.freedesktop.NetworkManager.Device:Real, The "Real" property
 

-
org.freedesktop.NetworkManager.Device:State, The "State" property
+
org.freedesktop.NetworkManager.Device:State, The "State" property
 

-
org.freedesktop.NetworkManager.Device:StateReason, The "StateReason" property
+
org.freedesktop.NetworkManager.Device:StateReason, The "StateReason" property
 

-
org.freedesktop.NetworkManager.Device:Udi, The "Udi" property
+
org.freedesktop.NetworkManager.Device:Udi, The "Udi" property
 

-
org.freedesktop.NetworkManager.DnsManager, org.freedesktop.NetworkManager.DnsManager
+
org.freedesktop.NetworkManager.DnsManager, org.freedesktop.NetworkManager.DnsManager
 

-
org.freedesktop.NetworkManager.DnsManager:Configuration, The "Configuration" property
+
org.freedesktop.NetworkManager.DnsManager:Configuration, The "Configuration" property
 

-
org.freedesktop.NetworkManager.DnsManager:Mode, The "Mode" property
+
org.freedesktop.NetworkManager.DnsManager:Mode, The "Mode" property
 

-
org.freedesktop.NetworkManager.DnsManager:RcManager, The "RcManager" property
+
org.freedesktop.NetworkManager.DnsManager:RcManager, The "RcManager" property
 

-
org.freedesktop.NetworkManager.IP4Config, org.freedesktop.NetworkManager.IP4Config
+
org.freedesktop.NetworkManager.IP4Config, org.freedesktop.NetworkManager.IP4Config
 

-
org.freedesktop.NetworkManager.IP4Config::PropertiesChanged, The "PropertiesChanged" signal
+
org.freedesktop.NetworkManager.IP4Config::PropertiesChanged, The "PropertiesChanged" signal
 

-
org.freedesktop.NetworkManager.IP4Config:AddressData, The "AddressData" property
+
org.freedesktop.NetworkManager.IP4Config:AddressData, The "AddressData" property
 

-
org.freedesktop.NetworkManager.IP4Config:Addresses, The "Addresses" property
+
org.freedesktop.NetworkManager.IP4Config:Addresses, The "Addresses" property
 

-
org.freedesktop.NetworkManager.IP4Config:DnsOptions, The "DnsOptions" property
+
org.freedesktop.NetworkManager.IP4Config:DnsOptions, The "DnsOptions" property
 

-
org.freedesktop.NetworkManager.IP4Config:DnsPriority, The "DnsPriority" property
+
org.freedesktop.NetworkManager.IP4Config:DnsPriority, The "DnsPriority" property
 

-
org.freedesktop.NetworkManager.IP4Config:Domains, The "Domains" property
+
org.freedesktop.NetworkManager.IP4Config:Domains, The "Domains" property
 

-
org.freedesktop.NetworkManager.IP4Config:Gateway, The "Gateway" property
+
org.freedesktop.NetworkManager.IP4Config:Gateway, The "Gateway" property
 

-
org.freedesktop.NetworkManager.IP4Config:NameserverData, The "NameserverData" property
+
org.freedesktop.NetworkManager.IP4Config:NameserverData, The "NameserverData" property
 

-
org.freedesktop.NetworkManager.IP4Config:Nameservers, The "Nameservers" property
+
org.freedesktop.NetworkManager.IP4Config:Nameservers, The "Nameservers" property
 

-
org.freedesktop.NetworkManager.IP4Config:RouteData, The "RouteData" property
+
org.freedesktop.NetworkManager.IP4Config:RouteData, The "RouteData" property
 

-
org.freedesktop.NetworkManager.IP4Config:Routes, The "Routes" property
+
org.freedesktop.NetworkManager.IP4Config:Routes, The "Routes" property
 

-
org.freedesktop.NetworkManager.IP4Config:Searches, The "Searches" property
+
org.freedesktop.NetworkManager.IP4Config:Searches, The "Searches" property
 

-
org.freedesktop.NetworkManager.IP4Config:WinsServerData, The "WinsServerData" property
+
org.freedesktop.NetworkManager.IP4Config:WinsServerData, The "WinsServerData" property
 

-
org.freedesktop.NetworkManager.IP4Config:WinsServers, The "WinsServers" property
+
org.freedesktop.NetworkManager.IP4Config:WinsServers, The "WinsServers" property
 

-
org.freedesktop.NetworkManager.IP6Config, org.freedesktop.NetworkManager.IP6Config
+
org.freedesktop.NetworkManager.IP6Config, org.freedesktop.NetworkManager.IP6Config
 

-
org.freedesktop.NetworkManager.IP6Config::PropertiesChanged, The "PropertiesChanged" signal
+
org.freedesktop.NetworkManager.IP6Config::PropertiesChanged, The "PropertiesChanged" signal
 

-
org.freedesktop.NetworkManager.IP6Config:AddressData, The "AddressData" property
+
org.freedesktop.NetworkManager.IP6Config:AddressData, The "AddressData" property
 

-
org.freedesktop.NetworkManager.IP6Config:Addresses, The "Addresses" property
+
org.freedesktop.NetworkManager.IP6Config:Addresses, The "Addresses" property
 

-
org.freedesktop.NetworkManager.IP6Config:DnsOptions, The "DnsOptions" property
+
org.freedesktop.NetworkManager.IP6Config:DnsOptions, The "DnsOptions" property
 

-
org.freedesktop.NetworkManager.IP6Config:DnsPriority, The "DnsPriority" property
+
org.freedesktop.NetworkManager.IP6Config:DnsPriority, The "DnsPriority" property
 

-
org.freedesktop.NetworkManager.IP6Config:Domains, The "Domains" property
+
org.freedesktop.NetworkManager.IP6Config:Domains, The "Domains" property
 

-
org.freedesktop.NetworkManager.IP6Config:Gateway, The "Gateway" property
+
org.freedesktop.NetworkManager.IP6Config:Gateway, The "Gateway" property
 

-
org.freedesktop.NetworkManager.IP6Config:Nameservers, The "Nameservers" property
+
org.freedesktop.NetworkManager.IP6Config:Nameservers, The "Nameservers" property
 

-
org.freedesktop.NetworkManager.IP6Config:RouteData, The "RouteData" property
+
org.freedesktop.NetworkManager.IP6Config:RouteData, The "RouteData" property
 

-
org.freedesktop.NetworkManager.IP6Config:Routes, The "Routes" property
+
org.freedesktop.NetworkManager.IP6Config:Routes, The "Routes" property
 

-
org.freedesktop.NetworkManager.IP6Config:Searches, The "Searches" property
+
org.freedesktop.NetworkManager.IP6Config:Searches, The "Searches" property
 

-
org.freedesktop.NetworkManager.SecretAgent, org.freedesktop.NetworkManager.SecretAgent
+
org.freedesktop.NetworkManager.SecretAgent, org.freedesktop.NetworkManager.SecretAgent
 

-
org.freedesktop.NetworkManager.SecretAgent.CancelGetSecrets(), The CancelGetSecrets() method
+
org.freedesktop.NetworkManager.SecretAgent.CancelGetSecrets(), The CancelGetSecrets() method
 

-
org.freedesktop.NetworkManager.SecretAgent.DeleteSecrets(), The DeleteSecrets() method
+
org.freedesktop.NetworkManager.SecretAgent.DeleteSecrets(), The DeleteSecrets() method
 

-
org.freedesktop.NetworkManager.SecretAgent.GetSecrets(), The GetSecrets() method
+
org.freedesktop.NetworkManager.SecretAgent.GetSecrets(), The GetSecrets() method
 

-
org.freedesktop.NetworkManager.SecretAgent.SaveSecrets(), The SaveSecrets() method
+
org.freedesktop.NetworkManager.SecretAgent.SaveSecrets(), The SaveSecrets() method
 

-
org.freedesktop.NetworkManager.Settings, org.freedesktop.NetworkManager.Settings
+
org.freedesktop.NetworkManager.Settings, org.freedesktop.NetworkManager.Settings
 

-
org.freedesktop.NetworkManager.Settings.AddConnection(), The AddConnection() method
+
org.freedesktop.NetworkManager.Settings.AddConnection(), The AddConnection() method
 

-
org.freedesktop.NetworkManager.Settings.AddConnectionUnsaved(), The AddConnectionUnsaved() method
+
org.freedesktop.NetworkManager.Settings.AddConnectionUnsaved(), The AddConnectionUnsaved() method
 

-
org.freedesktop.NetworkManager.Settings.Connection, org.freedesktop.NetworkManager.Settings.Connection
+
org.freedesktop.NetworkManager.Settings.Connection, org.freedesktop.NetworkManager.Settings.Connection
 

-
org.freedesktop.NetworkManager.Settings.Connection.ClearSecrets(), The ClearSecrets() method
+
org.freedesktop.NetworkManager.Settings.Connection.ClearSecrets(), The ClearSecrets() method
 

-
org.freedesktop.NetworkManager.Settings.Connection.Delete(), The Delete() method
+
org.freedesktop.NetworkManager.Settings.Connection.Delete(), The Delete() method
 

-
org.freedesktop.NetworkManager.Settings.Connection.GetSecrets(), The GetSecrets() method
+
org.freedesktop.NetworkManager.Settings.Connection.GetSecrets(), The GetSecrets() method
 

-
org.freedesktop.NetworkManager.Settings.Connection.GetSettings(), The GetSettings() method
+
org.freedesktop.NetworkManager.Settings.Connection.GetSettings(), The GetSettings() method
 

-
org.freedesktop.NetworkManager.Settings.Connection.Save(), The Save() method
+
org.freedesktop.NetworkManager.Settings.Connection.Save(), The Save() method
 

-
org.freedesktop.NetworkManager.Settings.Connection.Update(), The Update() method
+
org.freedesktop.NetworkManager.Settings.Connection.Update(), The Update() method
 

-
org.freedesktop.NetworkManager.Settings.Connection.Update2(), The Update2() method
+
org.freedesktop.NetworkManager.Settings.Connection.Update2(), The Update2() method
 

-
org.freedesktop.NetworkManager.Settings.Connection.UpdateUnsaved(), The UpdateUnsaved() method
+
org.freedesktop.NetworkManager.Settings.Connection.UpdateUnsaved(), The UpdateUnsaved() method
 

-
org.freedesktop.NetworkManager.Settings.Connection::PropertiesChanged, The "PropertiesChanged" signal
+
org.freedesktop.NetworkManager.Settings.Connection::PropertiesChanged, The "PropertiesChanged" signal
 

-
org.freedesktop.NetworkManager.Settings.Connection::Removed, The "Removed" signal
+
org.freedesktop.NetworkManager.Settings.Connection::Removed, The "Removed" signal
 

-
org.freedesktop.NetworkManager.Settings.Connection::Updated, The "Updated" signal
+
org.freedesktop.NetworkManager.Settings.Connection::Updated, The "Updated" signal
 

-
org.freedesktop.NetworkManager.Settings.Connection:Filename, The "Filename" property
+
org.freedesktop.NetworkManager.Settings.Connection:Filename, The "Filename" property
 

-
org.freedesktop.NetworkManager.Settings.Connection:Flags, The "Flags" property
+
org.freedesktop.NetworkManager.Settings.Connection:Flags, The "Flags" property
 

-
org.freedesktop.NetworkManager.Settings.Connection:Unsaved, The "Unsaved" property
+
org.freedesktop.NetworkManager.Settings.Connection:Unsaved, The "Unsaved" property
 

-
org.freedesktop.NetworkManager.Settings.GetConnectionByUuid(), The GetConnectionByUuid() method
+
org.freedesktop.NetworkManager.Settings.GetConnectionByUuid(), The GetConnectionByUuid() method
 

-
org.freedesktop.NetworkManager.Settings.ListConnections(), The ListConnections() method
+
org.freedesktop.NetworkManager.Settings.ListConnections(), The ListConnections() method
 

-
org.freedesktop.NetworkManager.Settings.LoadConnections(), The LoadConnections() method
+
org.freedesktop.NetworkManager.Settings.LoadConnections(), The LoadConnections() method
 

-
org.freedesktop.NetworkManager.Settings.ReloadConnections(), The ReloadConnections() method
+
org.freedesktop.NetworkManager.Settings.ReloadConnections(), The ReloadConnections() method
 

-
org.freedesktop.NetworkManager.Settings.SaveHostname(), The SaveHostname() method
+
org.freedesktop.NetworkManager.Settings.SaveHostname(), The SaveHostname() method
 

-
org.freedesktop.NetworkManager.Settings::ConnectionRemoved, The "ConnectionRemoved" signal
+
org.freedesktop.NetworkManager.Settings::ConnectionRemoved, The "ConnectionRemoved" signal
 

-
org.freedesktop.NetworkManager.Settings::NewConnection, The "NewConnection" signal
+
org.freedesktop.NetworkManager.Settings::NewConnection, The "NewConnection" signal
 

-
org.freedesktop.NetworkManager.Settings::PropertiesChanged, The "PropertiesChanged" signal
+
org.freedesktop.NetworkManager.Settings::PropertiesChanged, The "PropertiesChanged" signal
 

-
org.freedesktop.NetworkManager.Settings:CanModify, The "CanModify" property
+
org.freedesktop.NetworkManager.Settings:CanModify, The "CanModify" property
 

-
org.freedesktop.NetworkManager.Settings:Connections, The "Connections" property
+
org.freedesktop.NetworkManager.Settings:Connections, The "Connections" property
 

-
org.freedesktop.NetworkManager.Settings:Hostname, The "Hostname" property
+
org.freedesktop.NetworkManager.Settings:Hostname, The "Hostname" property
 

 

 

 

 
A

 

-
org.freedesktop.NetworkManager.Connection.Active, org.freedesktop.NetworkManager.Connection.Active
+
org.freedesktop.NetworkManager.Connection.Active, org.freedesktop.NetworkManager.Connection.Active
 

-
org.freedesktop.NetworkManager.Connection.Active::PropertiesChanged, The "PropertiesChanged" signal
+
org.freedesktop.NetworkManager.Connection.Active::PropertiesChanged, The "PropertiesChanged" signal
 

-
org.freedesktop.NetworkManager.Connection.Active::StateChanged, The "StateChanged" signal
+
org.freedesktop.NetworkManager.Connection.Active::StateChanged, The "StateChanged" signal
 

-
org.freedesktop.NetworkManager.Connection.Active:Connection, The "Connection" property
+
org.freedesktop.NetworkManager.Connection.Active:Connection, The "Connection" property
 

-
org.freedesktop.NetworkManager.Connection.Active:Default, The "Default" property
+
org.freedesktop.NetworkManager.Connection.Active:Default, The "Default" property
 

-
org.freedesktop.NetworkManager.Connection.Active:Default6, The "Default6" property
+
org.freedesktop.NetworkManager.Connection.Active:Default6, The "Default6" property
 

-
org.freedesktop.NetworkManager.Connection.Active:Devices, The "Devices" property
+
org.freedesktop.NetworkManager.Connection.Active:Devices, The "Devices" property
 

-
org.freedesktop.NetworkManager.Connection.Active:Dhcp4Config, The "Dhcp4Config" property
+
org.freedesktop.NetworkManager.Connection.Active:Dhcp4Config, The "Dhcp4Config" property
 

-
org.freedesktop.NetworkManager.Connection.Active:Dhcp6Config, The "Dhcp6Config" property
+
org.freedesktop.NetworkManager.Connection.Active:Dhcp6Config, The "Dhcp6Config" property
 

-
org.freedesktop.NetworkManager.Connection.Active:Id, The "Id" property
+
org.freedesktop.NetworkManager.Connection.Active:Id, The "Id" property
 

-
org.freedesktop.NetworkManager.Connection.Active:Ip4Config, The "Ip4Config" property
+
org.freedesktop.NetworkManager.Connection.Active:Ip4Config, The "Ip4Config" property
 

-
org.freedesktop.NetworkManager.Connection.Active:Ip6Config, The "Ip6Config" property
+
org.freedesktop.NetworkManager.Connection.Active:Ip6Config, The "Ip6Config" property
 

-
org.freedesktop.NetworkManager.Connection.Active:Master, The "Master" property
+
org.freedesktop.NetworkManager.Connection.Active:Master, The "Master" property
 

-
org.freedesktop.NetworkManager.Connection.Active:SpecificObject, The "SpecificObject" property
+
org.freedesktop.NetworkManager.Connection.Active:SpecificObject, The "SpecificObject" property
 

-
org.freedesktop.NetworkManager.Connection.Active:State, The "State" property
+
org.freedesktop.NetworkManager.Connection.Active:State, The "State" property
 

-
org.freedesktop.NetworkManager.Connection.Active:StateFlags, The "StateFlags" property
+
org.freedesktop.NetworkManager.Connection.Active:StateFlags, The "StateFlags" property
 

-
org.freedesktop.NetworkManager.Connection.Active:Type, The "Type" property
+
org.freedesktop.NetworkManager.Connection.Active:Type, The "Type" property
 

-
org.freedesktop.NetworkManager.Connection.Active:Uuid, The "Uuid" property
+
org.freedesktop.NetworkManager.Connection.Active:Uuid, The "Uuid" property
 

-
org.freedesktop.NetworkManager.Connection.Active:Vpn, The "Vpn" property
+
org.freedesktop.NetworkManager.Connection.Active:Vpn, The "Vpn" property
 

-
addr-gen-mode, ipv6
+
addr-gen-mode, ipv6
 

-
address-data, ipv4, ipv6
+
address-data, ipv4, ipv6
 

-
addresses, ipv4, ipv6
+
addresses, ipv4, ipv6
 

-
ageing, vxlan
+
ageing, vxlan
 

-
ageing-time, bridge
+
ageing-time, bridge
 

-
altsubject-matches, 802-1x
+
altsubject-matches, 802-1x
 

-
anonymous-identity, 802-1x
+
anonymous-identity, 802-1x
 

-
apn, gsm
+
apn, gsm
 

-
app-fcoe-flags, dcb
+
app-fcoe-flags, dcb
 

-
app-fcoe-mode, dcb
+
app-fcoe-mode, dcb
 

-
app-fcoe-priority, dcb
+
app-fcoe-priority, dcb
 

-
app-fip-flags, dcb
+
app-fip-flags, dcb
 

-
app-fip-priority, dcb
+
app-fip-priority, dcb
 

-
app-iscsi-flags, dcb
+
app-iscsi-flags, dcb
 

-
app-iscsi-priority, dcb
+
app-iscsi-priority, dcb
 

-
assigned-mac-address, 802-3-ethernet, 802-11-wireless
+
assigned-mac-address, 802-3-ethernet, 802-11-wireless
 

-
auth-alg, 802-11-wireless-security
+
auth-alg, 802-11-wireless-security
 

-
auth-retries, connection
+
auth-retries, connection
 

-
auth-timeout, 802-1x
+
auth-timeout, 802-1x
 

-
auto-negotiate, 802-3-ethernet
+
auto-negotiate, 802-3-ethernet
 

-
autoconnect, connection
+
autoconnect, connection
 

-
autoconnect-priority, connection
+
autoconnect-priority, connection
 

-
autoconnect-retries, connection
+
autoconnect-retries, connection
 

-
autoconnect-slaves, connection
+
autoconnect-slaves, connection
 

-
autoprobe-drivers, sriov
+
autoprobe-drivers, sriov
 

 

 

 

 
B

 

-
band, 802-11-wireless
+
band, 802-11-wireless
 

-
baud, ppp, serial
+
baud, ppp, serial
 

-
bdaddr, bluetooth
+
bdaddr, bluetooth
 

-
bits, serial
+
bits, serial
 

-
bond-downdelay, ovs-port
+
bond-downdelay, ovs-port
 

-
bond-mode, ovs-port
+
bond-mode, ovs-port
 

-
bond-updelay, ovs-port
+
bond-updelay, ovs-port
 

-
browser-only, proxy
+
browser-only, proxy
 

-
bssid, 802-11-wireless
+
bssid, 802-11-wireless
 

 

 

 

 
C

 

-
ca-cert, 802-1x
+
ca-cert, 802-1x
 

-
ca-cert-password, 802-1x
+
ca-cert-password, 802-1x
 

-
ca-cert-password-flags, 802-1x
+
ca-cert-password-flags, 802-1x
 

-
ca-path, 802-1x
+
ca-path, 802-1x
 

-
channel, 802-11-olpc-mesh, 802-11-wireless
+
channel, 802-11-olpc-mesh, 802-11-wireless
 

-
org.freedesktop.NetworkManager.Checkpoint, org.freedesktop.NetworkManager.Checkpoint
+
org.freedesktop.NetworkManager.Checkpoint, org.freedesktop.NetworkManager.Checkpoint
 

-
org.freedesktop.NetworkManager.Checkpoint::PropertiesChanged, The "PropertiesChanged" signal
+
org.freedesktop.NetworkManager.Checkpoint::PropertiesChanged, The "PropertiesChanged" signal
 

-
org.freedesktop.NetworkManager.Checkpoint:Created, The "Created" property
+
org.freedesktop.NetworkManager.Checkpoint:Created, The "Created" property
 

-
org.freedesktop.NetworkManager.Checkpoint:Devices, The "Devices" property
+
org.freedesktop.NetworkManager.Checkpoint:Devices, The "Devices" property
 

-
org.freedesktop.NetworkManager.Checkpoint:RollbackTimeout, The "RollbackTimeout" property
+
org.freedesktop.NetworkManager.Checkpoint:RollbackTimeout, The "RollbackTimeout" property
 

-
client-cert, 802-1x
+
client-cert, 802-1x
 

-
client-cert-password, 802-1x
+
client-cert-password, 802-1x
 

-
client-cert-password-flags, 802-1x
+
client-cert-password-flags, 802-1x
 

-
cloned-mac-address, 802-3-ethernet, 802-11-wireless
+
cloned-mac-address, 802-3-ethernet, 802-11-wireless
 

-
config, team, team-port
+
config, team, team-port
 

-
crtscts, ppp
+
crtscts, ppp
 

 

 

 

 
D

 

-
dad-timeout, ipv4, ipv6
+
dad-timeout, ipv4, ipv6
 

-
data, user, vpn
+
data, user, vpn
 

-
destination-port, vxlan
+
destination-port, vxlan
 

-
device-id, gsm
+
device-id, gsm
 

-
org.freedesktop.NetworkManager.Device.Wired, org.freedesktop.NetworkManager.Device.Wired
+
org.freedesktop.NetworkManager.Device.Wired, org.freedesktop.NetworkManager.Device.Wired
 

-
org.freedesktop.NetworkManager.Device.Wired::PropertiesChanged, The "PropertiesChanged" signal
+
org.freedesktop.NetworkManager.Device.Wired::PropertiesChanged, The "PropertiesChanged" signal
 

-
org.freedesktop.NetworkManager.Device.Wired:Carrier, The "Carrier" property
+
org.freedesktop.NetworkManager.Device.Wired:Carrier, The "Carrier" property
 

-
org.freedesktop.NetworkManager.Device.Wired:HwAddress, The "HwAddress" property
+
org.freedesktop.NetworkManager.Device.Wired:HwAddress, The "HwAddress" property
 

-
org.freedesktop.NetworkManager.Device.Wired:PermHwAddress, The "PermHwAddress" property
+
org.freedesktop.NetworkManager.Device.Wired:PermHwAddress, The "PermHwAddress" property
 

-
org.freedesktop.NetworkManager.Device.Wired:S390Subchannels, The "S390Subchannels" property
+
org.freedesktop.NetworkManager.Device.Wired:S390Subchannels, The "S390Subchannels" property
 

-
org.freedesktop.NetworkManager.Device.Wired:Speed, The "Speed" property
+
org.freedesktop.NetworkManager.Device.Wired:Speed, The "Speed" property
 

-
org.freedesktop.NetworkManager.Device.Wireless, org.freedesktop.NetworkManager.Device.Wireless
+
org.freedesktop.NetworkManager.Device.Wireless, org.freedesktop.NetworkManager.Device.Wireless
 

-
org.freedesktop.NetworkManager.Device.Wireless.GetAccessPoints(), The GetAccessPoints() method
+
org.freedesktop.NetworkManager.Device.Wireless.GetAccessPoints(), The GetAccessPoints() method
 

-
org.freedesktop.NetworkManager.Device.Wireless.GetAllAccessPoints(), The GetAllAccessPoints() method
+
org.freedesktop.NetworkManager.Device.Wireless.GetAllAccessPoints(), The GetAllAccessPoints() method
 

-
org.freedesktop.NetworkManager.Device.Wireless.RequestScan(), The RequestScan() method
+
org.freedesktop.NetworkManager.Device.Wireless.RequestScan(), The RequestScan() method
 

-
org.freedesktop.NetworkManager.Device.Wireless::AccessPointAdded, The "AccessPointAdded" signal
+
org.freedesktop.NetworkManager.Device.Wireless::AccessPointAdded, The "AccessPointAdded" signal
 

-
org.freedesktop.NetworkManager.Device.Wireless::AccessPointRemoved, The "AccessPointRemoved" signal
+
org.freedesktop.NetworkManager.Device.Wireless::AccessPointRemoved, The "AccessPointRemoved" signal
 

-
org.freedesktop.NetworkManager.Device.Wireless::PropertiesChanged, The "PropertiesChanged" signal
+
org.freedesktop.NetworkManager.Device.Wireless::PropertiesChanged, The "PropertiesChanged" signal
 

-
org.freedesktop.NetworkManager.Device.Wireless:AccessPoints, The "AccessPoints" property
+
org.freedesktop.NetworkManager.Device.Wireless:AccessPoints, The "AccessPoints" property
 

-
org.freedesktop.NetworkManager.Device.Wireless:ActiveAccessPoint, The "ActiveAccessPoint" property
+
org.freedesktop.NetworkManager.Device.Wireless:ActiveAccessPoint, The "ActiveAccessPoint" property
 

-
org.freedesktop.NetworkManager.Device.Wireless:Bitrate, The "Bitrate" property
+
org.freedesktop.NetworkManager.Device.Wireless:Bitrate, The "Bitrate" property
 

-
org.freedesktop.NetworkManager.Device.Wireless:HwAddress, The "HwAddress" property
+
org.freedesktop.NetworkManager.Device.Wireless:HwAddress, The "HwAddress" property
 

-
org.freedesktop.NetworkManager.Device.Wireless:LastScan, The "LastScan" property
+
org.freedesktop.NetworkManager.Device.Wireless:LastScan, The "LastScan" property
 

-
org.freedesktop.NetworkManager.Device.Wireless:Mode, The "Mode" property
+
org.freedesktop.NetworkManager.Device.Wireless:Mode, The "Mode" property
 

-
org.freedesktop.NetworkManager.Device.Wireless:PermHwAddress, The "PermHwAddress" property
+
org.freedesktop.NetworkManager.Device.Wireless:PermHwAddress, The "PermHwAddress" property
 

-
org.freedesktop.NetworkManager.Device.Wireless:WirelessCapabilities, The "WirelessCapabilities" property
+
org.freedesktop.NetworkManager.Device.Wireless:WirelessCapabilities, The "WirelessCapabilities" property
 

-
dhcp-anycast-address, 802-11-olpc-mesh
+
dhcp-anycast-address, 802-11-olpc-mesh
 

-
dhcp-client-id, ipv4
+
dhcp-client-id, ipv4
 

-
dhcp-duid, ipv6
+
dhcp-duid, ipv6
 

-
dhcp-fqdn, ipv4
+
dhcp-fqdn, ipv4
 

-
dhcp-hostname, ipv4, ipv6
+
dhcp-hostname, ipv4, ipv6
 

-
dhcp-send-hostname, ipv4, ipv6
+
dhcp-send-hostname, ipv4, ipv6
 

-
dhcp-timeout, ipv4, ipv6
+
dhcp-timeout, ipv4, ipv6
 

-
org.freedesktop.NetworkManager.DHCP4Config, org.freedesktop.NetworkManager.DHCP4Config
+
org.freedesktop.NetworkManager.DHCP4Config, org.freedesktop.NetworkManager.DHCP4Config
 

-
org.freedesktop.NetworkManager.DHCP4Config::PropertiesChanged, The "PropertiesChanged" signal
+
org.freedesktop.NetworkManager.DHCP4Config::PropertiesChanged, The "PropertiesChanged" signal
 

-
org.freedesktop.NetworkManager.DHCP4Config:Options, The "Options" property
+
org.freedesktop.NetworkManager.DHCP4Config:Options, The "Options" property
 

-
org.freedesktop.NetworkManager.DHCP6Config, org.freedesktop.NetworkManager.DHCP6Config
+
org.freedesktop.NetworkManager.DHCP6Config, org.freedesktop.NetworkManager.DHCP6Config
 

-
org.freedesktop.NetworkManager.DHCP6Config::PropertiesChanged, The "PropertiesChanged" signal
+
org.freedesktop.NetworkManager.DHCP6Config::PropertiesChanged, The "PropertiesChanged" signal
 

-
org.freedesktop.NetworkManager.DHCP6Config:Options, The "Options" property
+
org.freedesktop.NetworkManager.DHCP6Config:Options, The "Options" property
 

-
dns, ipv4, ipv6
+
dns, ipv4, ipv6
 

-
dns-options, ipv4, ipv6
+
dns-options, ipv4, ipv6
 

-
dns-priority, ipv4, ipv6
+
dns-priority, ipv4, ipv6
 

-
dns-search, ipv4, ipv6
+
dns-search, ipv4, ipv6
 

-
domain-suffix-match, 802-1x
+
domain-suffix-match, 802-1x
 

-
duplex, 802-3-ethernet
+
duplex, 802-3-ethernet
 

 

 

 

 
E

 

-
eap, 802-1x
+
eap, 802-1x
 

-
egress-priority-map, vlan
+
egress-priority-map, vlan
 

-
encapsulation, adsl
+
encapsulation, adsl
 

-
encapsulation-limit, ip-tunnel
+
encapsulation-limit, ip-tunnel
 

-
encrypt, macsec
+
encrypt, macsec
 

 

 

 

 
F

 

-
fail-mode, ovs-bridge
+
fail-mode, ovs-bridge
 

-
fils, 802-11-wireless-security
+
fils, 802-11-wireless-security
 

-
flags, ip-tunnel, vlan
+
flags, ip-tunnel, vlan
 

-
flow-label, ip-tunnel
+
flow-label, ip-tunnel
 

-
forward-delay, bridge
+
forward-delay, bridge
 

 

 

 

 
G

 

-
gateway, ipv4, ipv6
+
gateway, ipv4, ipv6
 

-
gateway-ping-timeout, connection
+
gateway-ping-timeout, connection
 

-
generate-mac-address-mask, 802-3-ethernet, 802-11-wireless
+
generate-mac-address-mask, 802-3-ethernet, 802-11-wireless
 

-
group, tun, 802-11-wireless-security
+
group, tun, 802-11-wireless-security
 

-
group-forward-mask, bridge
+
group-forward-mask, bridge
 

 

 

 

 
H

 

-
hairpin-mode, bridge-port
+
hairpin-mode, bridge-port
 

-
hello-time, bridge
+
hello-time, bridge
 

-
hidden, 802-11-wireless
+
hidden, 802-11-wireless
 

-
home-only, gsm
+
home-only, gsm
 

 

 

 

 
I

 

-
id, connection, vlan, vxlan
+
id, connection, vlan, vxlan
 

-
identity, 802-1x
+
identity, 802-1x
 

-
ignore-auto-dns, ipv4, ipv6
+
ignore-auto-dns, ipv4, ipv6
 

-
ignore-auto-routes, ipv4, ipv6
+
ignore-auto-routes, ipv4, ipv6
 

-
ingress-priority-map, vlan
+
ingress-priority-map, vlan
 

-
input-key, ip-tunnel
+
input-key, ip-tunnel
 

-
interface-name, connection, bond, bridge, match, team, vlan
+
interface-name, connection, bond, bridge, match, team, vlan
 

-
ip6-privacy, ipv6
+
ip6-privacy, ipv6
 

 

 

 

 
K

-
key-mgmt, 802-11-wireless-security
+
key-mgmt, 802-11-wireless-security
 

 

 

 
L

 

-
l2-miss, vxlan
+
l2-miss, vxlan
 

-
l3-miss, vxlan
+
l3-miss, vxlan
 

-
lacp, ovs-port
+
lacp, ovs-port
 

-
lacp-key, team-port
+
lacp-key, team-port
 

-
lacp-prio, team-port
+
lacp-prio, team-port
 

-
lcp-echo-failure, ppp
+
lcp-echo-failure, ppp
 

-
lcp-echo-interval, ppp
+
lcp-echo-interval, ppp
 

-
leap-password, 802-11-wireless-security
+
leap-password, 802-11-wireless-security
 

-
leap-password-flags, 802-11-wireless-security
+
leap-password-flags, 802-11-wireless-security
 

-
leap-username, 802-11-wireless-security
+
leap-username, 802-11-wireless-security
 

-
learning, vxlan
+
learning, vxlan
 

-
limit, vxlan
+
limit, vxlan
 

-
link-watchers, team, team-port
+
link-watchers, team, team-port
 

-
lldp, connection
+
lldp, connection
 

-
llmnr, connection
+
llmnr, connection
 

-
local, ip-tunnel, vxlan
+
local, ip-tunnel, vxlan
 

 

 

 

 
M

 

-
mac-address, bridge, infiniband, wimax, 802-3-ethernet, 802-11-wireless, wpan
+
mac-address, bridge, infiniband, wimax, 802-3-ethernet, 802-11-wireless, wpan
 

-
mac-address-blacklist, 802-3-ethernet, 802-11-wireless
+
mac-address-blacklist, 802-3-ethernet, 802-11-wireless
 

-
mac-address-randomization, 802-11-wireless
+
mac-address-randomization, 802-11-wireless
 

-
org.freedesktop.NetworkManager, org.freedesktop.NetworkManager
+
org.freedesktop.NetworkManager, org.freedesktop.NetworkManager
 

-
org.freedesktop.NetworkManager.ActivateConnection(), The ActivateConnection() method
+
org.freedesktop.NetworkManager.ActivateConnection(), The ActivateConnection() method
 

-
org.freedesktop.NetworkManager.AddAndActivateConnection(), The AddAndActivateConnection() method
+
org.freedesktop.NetworkManager.AddAndActivateConnection(), The AddAndActivateConnection() method
 

-
org.freedesktop.NetworkManager.CheckConnectivity(), The CheckConnectivity() method
+
org.freedesktop.NetworkManager.CheckConnectivity(), The CheckConnectivity() method
 

-
org.freedesktop.NetworkManager.CheckpointAdjustRollbackTimeout(), The CheckpointAdjustRollbackTimeout() method
+
org.freedesktop.NetworkManager.CheckpointAdjustRollbackTimeout(), The CheckpointAdjustRollbackTimeout() method
 

-
org.freedesktop.NetworkManager.CheckpointCreate(), The CheckpointCreate() method
+
org.freedesktop.NetworkManager.CheckpointCreate(), The CheckpointCreate() method
 

-
org.freedesktop.NetworkManager.CheckpointDestroy(), The CheckpointDestroy() method
+
org.freedesktop.NetworkManager.CheckpointDestroy(), The CheckpointDestroy() method
 

-
org.freedesktop.NetworkManager.CheckpointRollback(), The CheckpointRollback() method
+
org.freedesktop.NetworkManager.CheckpointRollback(), The CheckpointRollback() method
 

-
org.freedesktop.NetworkManager.DeactivateConnection(), The DeactivateConnection() method
+
org.freedesktop.NetworkManager.DeactivateConnection(), The DeactivateConnection() method
 

-
org.freedesktop.NetworkManager.Enable(), The Enable() method
+
org.freedesktop.NetworkManager.Enable(), The Enable() method
 

-
org.freedesktop.NetworkManager.GetAllDevices(), The GetAllDevices() method
+
org.freedesktop.NetworkManager.GetAllDevices(), The GetAllDevices() method
 

-
org.freedesktop.NetworkManager.GetDeviceByIpIface(), The GetDeviceByIpIface() method
+
org.freedesktop.NetworkManager.GetDeviceByIpIface(), The GetDeviceByIpIface() method
 

-
org.freedesktop.NetworkManager.GetDevices(), The GetDevices() method
+
org.freedesktop.NetworkManager.GetDevices(), The GetDevices() method
 

-
org.freedesktop.NetworkManager.GetLogging(), The GetLogging() method
+
org.freedesktop.NetworkManager.GetLogging(), The GetLogging() method
 

-
org.freedesktop.NetworkManager.GetPermissions(), The GetPermissions() method
+
org.freedesktop.NetworkManager.GetPermissions(), The GetPermissions() method
 

-
org.freedesktop.NetworkManager.Reload(), The Reload() method
+
org.freedesktop.NetworkManager.Reload(), The Reload() method
 

-
org.freedesktop.NetworkManager.SetLogging(), The SetLogging() method
+
org.freedesktop.NetworkManager.SetLogging(), The SetLogging() method
 

-
org.freedesktop.NetworkManager.Sleep(), The Sleep() method
+
org.freedesktop.NetworkManager.Sleep(), The Sleep() method
 

-
org.freedesktop.NetworkManager.state(), The state() method
+
org.freedesktop.NetworkManager.state(), The state() method
 

-
org.freedesktop.NetworkManager::CheckPermissions, The "CheckPermissions" signal
+
org.freedesktop.NetworkManager::CheckPermissions, The "CheckPermissions" signal
 

-
org.freedesktop.NetworkManager::DeviceAdded, The "DeviceAdded" signal
+
org.freedesktop.NetworkManager::DeviceAdded, The "DeviceAdded" signal
 

-
org.freedesktop.NetworkManager::DeviceRemoved, The "DeviceRemoved" signal
+
org.freedesktop.NetworkManager::DeviceRemoved, The "DeviceRemoved" signal
 

-
org.freedesktop.NetworkManager::PropertiesChanged, The "PropertiesChanged" signal
+
org.freedesktop.NetworkManager::PropertiesChanged, The "PropertiesChanged" signal
 

-
org.freedesktop.NetworkManager::StateChanged, The "StateChanged" signal
+
org.freedesktop.NetworkManager::StateChanged, The "StateChanged" signal
 

-
org.freedesktop.NetworkManager:ActivatingConnection, The "ActivatingConnection" property
+
org.freedesktop.NetworkManager:ActivatingConnection, The "ActivatingConnection" property
 

-
org.freedesktop.NetworkManager:ActiveConnections, The "ActiveConnections" property
+
org.freedesktop.NetworkManager:ActiveConnections, The "ActiveConnections" property
 

-
org.freedesktop.NetworkManager:AllDevices, The "AllDevices" property
+
org.freedesktop.NetworkManager:AllDevices, The "AllDevices" property
 

-
org.freedesktop.NetworkManager:Capabilities, The "Capabilities" property
+
org.freedesktop.NetworkManager:Capabilities, The "Capabilities" property
 

-
org.freedesktop.NetworkManager:Checkpoints, The "Checkpoints" property
+
org.freedesktop.NetworkManager:Checkpoints, The "Checkpoints" property
 

-
org.freedesktop.NetworkManager:Connectivity, The "Connectivity" property
+
org.freedesktop.NetworkManager:Connectivity, The "Connectivity" property
 

-
org.freedesktop.NetworkManager:ConnectivityCheckAvailable, The "ConnectivityCheckAvailable" property
+
org.freedesktop.NetworkManager:ConnectivityCheckAvailable, The "ConnectivityCheckAvailable" property
 

-
org.freedesktop.NetworkManager:ConnectivityCheckEnabled, The "ConnectivityCheckEnabled" property
+
org.freedesktop.NetworkManager:ConnectivityCheckEnabled, The "ConnectivityCheckEnabled" property
 

-
org.freedesktop.NetworkManager:Devices, The "Devices" property
+
org.freedesktop.NetworkManager:Devices, The "Devices" property
 

-
org.freedesktop.NetworkManager:GlobalDnsConfiguration, The "GlobalDnsConfiguration" property
+
org.freedesktop.NetworkManager:GlobalDnsConfiguration, The "GlobalDnsConfiguration" property
 

-
org.freedesktop.NetworkManager:Metered, The "Metered" property
+
org.freedesktop.NetworkManager:Metered, The "Metered" property
 

-
org.freedesktop.NetworkManager:NetworkingEnabled, The "NetworkingEnabled" property
+
org.freedesktop.NetworkManager:NetworkingEnabled, The "NetworkingEnabled" property
 

-
org.freedesktop.NetworkManager:PrimaryConnection, The "PrimaryConnection" property
+
org.freedesktop.NetworkManager:PrimaryConnection, The "PrimaryConnection" property
 

-
org.freedesktop.NetworkManager:PrimaryConnectionType, The "PrimaryConnectionType" property
+
org.freedesktop.NetworkManager:PrimaryConnectionType, The "PrimaryConnectionType" property
 

-
org.freedesktop.NetworkManager:Startup, The "Startup" property
+
org.freedesktop.NetworkManager:Startup, The "Startup" property
 

-
org.freedesktop.NetworkManager:State, The "State" property
+
org.freedesktop.NetworkManager:State, The "State" property
 

-
org.freedesktop.NetworkManager:Version, The "Version" property
+
org.freedesktop.NetworkManager:Version, The "Version" property
 

-
org.freedesktop.NetworkManager:WimaxEnabled, The "WimaxEnabled" property
+
org.freedesktop.NetworkManager:WimaxEnabled, The "WimaxEnabled" property
 

-
org.freedesktop.NetworkManager:WimaxHardwareEnabled, The "WimaxHardwareEnabled" property
+
org.freedesktop.NetworkManager:WimaxHardwareEnabled, The "WimaxHardwareEnabled" property
 

-
org.freedesktop.NetworkManager:WirelessEnabled, The "WirelessEnabled" property
+
org.freedesktop.NetworkManager:WirelessEnabled, The "WirelessEnabled" property
 

-
org.freedesktop.NetworkManager:WirelessHardwareEnabled, The "WirelessHardwareEnabled" property
+
org.freedesktop.NetworkManager:WirelessHardwareEnabled, The "WirelessHardwareEnabled" property
 

-
org.freedesktop.NetworkManager:WwanEnabled, The "WwanEnabled" property
+
org.freedesktop.NetworkManager:WwanEnabled, The "WwanEnabled" property
 

-
org.freedesktop.NetworkManager:WwanHardwareEnabled, The "WwanHardwareEnabled" property
+
org.freedesktop.NetworkManager:WwanHardwareEnabled, The "WwanHardwareEnabled" property
 

-
master, connection
+
master, connection
 

-
max-age, bridge
+
max-age, bridge
 

-
may-fail, ipv4, ipv6
+
may-fail, ipv4, ipv6
 

-
mcast-rejoin-count, team
+
mcast-rejoin-count, team
 

-
mcast-rejoin-interval, team
+
mcast-rejoin-interval, team
 

-
mcast-snooping-enable, ovs-bridge
+
mcast-snooping-enable, ovs-bridge
 

-
mdns, connection
+
mdns, connection
 

-
metered, connection
+
metered, connection
 

-
method, ipv4, ipv6, proxy
+
method, ipv4, ipv6, proxy
 

-
mka-cak, macsec
+
mka-cak, macsec
 

-
mka-cak-flags, macsec
+
mka-cak-flags, macsec
 

-
mka-ckn, macsec
+
mka-ckn, macsec
 

-
mode, ip-tunnel, macsec, macvlan, tun, 802-11-wireless
+
mode, ip-tunnel, macsec, macvlan, tun, 802-11-wireless
 

-
mppe-stateful, ppp
+
mppe-stateful, ppp
 

-
mru, ppp
+
mru, ppp
 

-
mtu, cdma, gsm, infiniband, ip-tunnel, ppp, 802-3-ethernet, 802-11-wireless
+
mtu, cdma, gsm, infiniband, ip-tunnel, ppp, 802-3-ethernet, 802-11-wireless
 

-
multi-connect, connection
+
multi-connect, connection
 

-
multi-queue, tun
+
multi-queue, tun
 

-
multicast-snooping, bridge
+
multicast-snooping, bridge
 

 

 

 

 
N

 

-
network-id, gsm
+
network-id, gsm
 

-
network-name, wimax
+
network-name, wimax
 

-
never-default, ipv4, ipv6
+
never-default, ipv4, ipv6
 

-
NM80211ApFlags, enum NM80211ApFlags
+
NM80211ApFlags, enum NM80211ApFlags
 

-
NM80211ApSecurityFlags, enum NM80211ApSecurityFlags
+
NM80211ApSecurityFlags, enum NM80211ApSecurityFlags
 

-
NM80211Mode, enum NM80211Mode
+
NM80211Mode, enum NM80211Mode
 

-
NMActivationStateFlags, enum NMActivationStateFlags
+
NMActivationStateFlags, enum NMActivationStateFlags
 

-
NMActiveConnectionState, enum NMActiveConnectionState
+
NMActiveConnectionState, enum NMActiveConnectionState
 

-
NMActiveConnectionStateReason, enum NMActiveConnectionStateReason
+
NMActiveConnectionStateReason, enum NMActiveConnectionStateReason
 

-
NMBluetoothCapabilities, enum NMBluetoothCapabilities
+
NMBluetoothCapabilities, enum NMBluetoothCapabilities
 

-
NMCapability, enum NMCapability
+
NMCapability, enum NMCapability
 

-
NMCheckpointCreateFlags, enum NMCheckpointCreateFlags
+
NMCheckpointCreateFlags, enum NMCheckpointCreateFlags
 

-
NMConnectionMultiConnect, enum NMConnectionMultiConnect
+
NMConnectionMultiConnect, enum NMConnectionMultiConnect
 

-
NMConnectivityState, enum NMConnectivityState
+
NMConnectivityState, enum NMConnectivityState
 

-
NMDeviceCapabilities, enum NMDeviceCapabilities
+
NMDeviceCapabilities, enum NMDeviceCapabilities
 

-
NMDeviceModemCapabilities, enum NMDeviceModemCapabilities
+
NMDeviceModemCapabilities, enum NMDeviceModemCapabilities
 

-
NMDeviceState, enum NMDeviceState
+
NMDeviceState, enum NMDeviceState
 

-
NMDeviceStateReason, enum NMDeviceStateReason
+
NMDeviceStateReason, enum NMDeviceStateReason
 

-
NMDeviceType, enum NMDeviceType
+
NMDeviceType, enum NMDeviceType
 

-
NMDeviceWifiCapabilities, enum NMDeviceWifiCapabilities
+
NMDeviceWifiCapabilities, enum NMDeviceWifiCapabilities
 

-
NMIPTunnelMode, enum NMIPTunnelMode
+
NMIPTunnelMode, enum NMIPTunnelMode
 

-
NMMetered, enum NMMetered
+
NMMetered, enum NMMetered
 

-
NMRollbackResult, enum NMRollbackResult
+
NMRollbackResult, enum NMRollbackResult
 

-
NMSecretAgentCapabilities, enum NMSecretAgentCapabilities
+
NMSecretAgentCapabilities, enum NMSecretAgentCapabilities
 

-
NMSecretAgentGetSecretsFlags, enum NMSecretAgentGetSecretsFlags
+
NMSecretAgentGetSecretsFlags, enum NMSecretAgentGetSecretsFlags
 

-
NMSettingsConnectionFlags, enum NMSettingsConnectionFlags
+
NMSettingsConnectionFlags, enum NMSettingsConnectionFlags
 

-
NMSettingsUpdate2Flags, enum NMSettingsUpdate2Flags
+
NMSettingsUpdate2Flags, enum NMSettingsUpdate2Flags
 

-
NMState, enum NMState
+
NMState, enum NMState
 

-
NMTernary, enum NMTernary
+
NMTernary, enum NMTernary
 

-
NMVpnConnectionState, enum NMVpnConnectionState
+
NMVpnConnectionState, enum NMVpnConnectionState
 

-
NMVpnConnectionStateReason, enum NMVpnConnectionStateReason
+
NMVpnConnectionStateReason, enum NMVpnConnectionStateReason
 

-
NMVpnPluginFailure, enum NMVpnPluginFailure
+
NMVpnPluginFailure, enum NMVpnPluginFailure
 

-
NMVpnServiceState, enum NMVpnServiceState
+
NMVpnServiceState, enum NMVpnServiceState
 

-
NMWimaxNspNetworkType, enum NMWimaxNspNetworkType
+
NMWimaxNspNetworkType, enum NMWimaxNspNetworkType
 

-
no-vj-comp, ppp
+
no-vj-comp, ppp
 

-
noauth, ppp
+
noauth, ppp
 

-
nobsdcomp, ppp
+
nobsdcomp, ppp
 

-
nodeflate, ppp
+
nodeflate, ppp
 

-
notify-peers-count, team
+
notify-peers-count, team
 

-
notify-peers-interval, team
+
notify-peers-interval, team
 

-
number, cdma, gsm
+
number, cdma, gsm
 

 

 

 

 
O

 

-
options, bond
+
options, bond
 

-
output-key, ip-tunnel
+
output-key, ip-tunnel
 

-
owner, tun
+
owner, tun
 

 

 

 

 
P

 

-
p-key, infiniband
+
p-key, infiniband
 

-
pac-file, 802-1x
+
pac-file, 802-1x
 

-
pac-script, proxy
+
pac-script, proxy
 

-
pac-url, proxy
+
pac-url, proxy
 

-
pairwise, 802-11-wireless-security
+
pairwise, 802-11-wireless-security
 

-
pan-id, wpan
+
pan-id, wpan
 

-
parent, 6lowpan, infiniband, ip-tunnel, macsec, macvlan, pppoe, vlan, vxlan
+
parent, 6lowpan, infiniband, ip-tunnel, macsec, macvlan, pppoe, vlan, vxlan
 

-
parity, serial
+
parity, serial
 

-
password, 802-1x, adsl, cdma, gsm, pppoe
+
password, 802-1x, adsl, cdma, gsm, pppoe
 

-
password-flags, 802-1x, adsl, cdma, gsm, pppoe
+
password-flags, 802-1x, adsl, cdma, gsm, pppoe
 

-
password-raw, 802-1x
+
password-raw, 802-1x
 

-
password-raw-flags, 802-1x
+
password-raw-flags, 802-1x
 

-
path-cost, bridge-port
+
path-cost, bridge-port
 

-
path-mtu-discovery, ip-tunnel
+
path-mtu-discovery, ip-tunnel
 

-
peer, ovs-patch
+
peer, ovs-patch
 

-
permissions, connection
+
permissions, connection
 

-
persistent, vpn
+
persistent, vpn
 

-
phase1-auth-flags, 802-1x
+
phase1-auth-flags, 802-1x
 

-
phase1-fast-provisioning, 802-1x
+
phase1-fast-provisioning, 802-1x
 

-
phase1-peaplabel, 802-1x
+
phase1-peaplabel, 802-1x
 

-
phase1-peapver, 802-1x
+
phase1-peapver, 802-1x
 

-
phase2-altsubject-matches, 802-1x
+
phase2-altsubject-matches, 802-1x
 

-
phase2-auth, 802-1x
+
phase2-auth, 802-1x
 

-
phase2-autheap, 802-1x
+
phase2-autheap, 802-1x
 

-
phase2-ca-cert, 802-1x
+
phase2-ca-cert, 802-1x
 

-
phase2-ca-cert-password, 802-1x
+
phase2-ca-cert-password, 802-1x
 

-
phase2-ca-cert-password-flags, 802-1x
+
phase2-ca-cert-password-flags, 802-1x
 

-
phase2-ca-path, 802-1x
+
phase2-ca-path, 802-1x
 

-
phase2-client-cert, 802-1x
+
phase2-client-cert, 802-1x
 

-
phase2-client-cert-password, 802-1x
+
phase2-client-cert-password, 802-1x
 

-
phase2-client-cert-password-flags, 802-1x
+
phase2-client-cert-password-flags, 802-1x
 

-
phase2-domain-suffix-match, 802-1x
+
phase2-domain-suffix-match, 802-1x
 

-
phase2-private-key, 802-1x
+
phase2-private-key, 802-1x
 

-
phase2-private-key-password, 802-1x
+
phase2-private-key-password, 802-1x
 

-
phase2-private-key-password-flags, 802-1x
+
phase2-private-key-password-flags, 802-1x
 

-
phase2-subject-match, 802-1x
+
phase2-subject-match, 802-1x
 

-
pi, tun
+
pi, tun
 

-
pin, 802-1x, gsm
+
pin, 802-1x, gsm
 

-
pin-flags, 802-1x, gsm
+
pin-flags, 802-1x, gsm
 

-
pmf, 802-11-wireless-security
+
pmf, 802-11-wireless-security
 

-
port, macsec, 802-3-ethernet
+
port, macsec, 802-3-ethernet
 

-
powersave, 802-11-wireless
+
powersave, 802-11-wireless
 

-
org.freedesktop.NetworkManager.PPP, org.freedesktop.NetworkManager.PPP
+
org.freedesktop.NetworkManager.PPP, org.freedesktop.NetworkManager.PPP
 

-
org.freedesktop.NetworkManager.PPP.NeedSecrets(), The NeedSecrets() method
+
org.freedesktop.NetworkManager.PPP.NeedSecrets(), The NeedSecrets() method
 

-
org.freedesktop.NetworkManager.PPP.SetIfindex(), The SetIfindex() method
+
org.freedesktop.NetworkManager.PPP.SetIfindex(), The SetIfindex() method
 

-
org.freedesktop.NetworkManager.PPP.SetIp4Config(), The SetIp4Config() method
+
org.freedesktop.NetworkManager.PPP.SetIp4Config(), The SetIp4Config() method
 

-
org.freedesktop.NetworkManager.PPP.SetIp6Config(), The SetIp6Config() method
+
org.freedesktop.NetworkManager.PPP.SetIp6Config(), The SetIp6Config() method
 

-
org.freedesktop.NetworkManager.PPP.SetState(), The SetState() method
+
org.freedesktop.NetworkManager.PPP.SetState(), The SetState() method
 

-
prio, team-port
+
prio, team-port
 

-
priority, bridge, bridge-port
+
priority, bridge, bridge-port
 

-
priority-bandwidth, dcb
+
priority-bandwidth, dcb
 

-
priority-flow-control, dcb
+
priority-flow-control, dcb
 

-
priority-flow-control-flags, dcb
+
priority-flow-control-flags, dcb
 

-
priority-group-bandwidth, dcb
+
priority-group-bandwidth, dcb
 

-
priority-group-flags, dcb
+
priority-group-flags, dcb
 

-
priority-group-id, dcb
+
priority-group-id, dcb
 

-
priority-strict-bandwidth, dcb
+
priority-strict-bandwidth, dcb
 

-
priority-traffic-class, dcb
+
priority-traffic-class, dcb
 

-
private-key, 802-1x
+
private-key, 802-1x
 

-
private-key-password, 802-1x
+
private-key-password, 802-1x
 

-
private-key-password-flags, 802-1x
+
private-key-password-flags, 802-1x
 

-
promiscuous, macvlan
+
promiscuous, macvlan
 

-
proto, 802-11-wireless-security
+
proto, 802-11-wireless-security
 

-
protocol, adsl
+
protocol, adsl
 

-
proxy, vxlan
+
proxy, vxlan
 

-
psk, 802-11-wireless-security
+
psk, 802-11-wireless-security
 

-
psk-flags, 802-11-wireless-security
+
psk-flags, 802-11-wireless-security
 

 

 

 

 
Q

 

-
qdiscs, tc
+
qdiscs, tc
 

-
queue-id, team-port
+
queue-id, team-port
 

 

 

 

 
R

 

-
rate, 802-11-wireless
+
rate, 802-11-wireless
 

-
read-only, connection
+
read-only, connection
 

-
refuse-chap, ppp
+
refuse-chap, ppp
 

-
refuse-eap, ppp
+
refuse-eap, ppp
 

-
refuse-mschap, ppp
+
refuse-mschap, ppp
 

-
refuse-mschapv2, ppp
+
refuse-mschapv2, ppp
 

-
refuse-pap, ppp
+
refuse-pap, ppp
 

-
remote, ip-tunnel, vxlan
+
remote, ip-tunnel, vxlan
 

-
require-mppe, ppp
+
require-mppe, ppp
 

-
require-mppe-128, ppp
+
require-mppe-128, ppp
 

-
route-data, ipv4, ipv6
+
route-data, ipv4, ipv6
 

-
route-metric, ipv4, ipv6
+
route-metric, ipv4, ipv6
 

-
route-table, ipv4, ipv6
+
route-table, ipv4, ipv6
 

-
routes, ipv4, ipv6
+
routes, ipv4, ipv6
 

-
rsc, vxlan
+
rsc, vxlan
 

-
rstp-enable, ovs-bridge
+
rstp-enable, ovs-bridge
 

-
runner, team
+
runner, team
 

-
runner-active, team
+
runner-active, team
 

-
runner-agg-select-policy, team
+
runner-agg-select-policy, team
 

-
runner-fast-rate, team
+
runner-fast-rate, team
 

-
runner-hwaddr-policy, team
+
runner-hwaddr-policy, team
 

-
runner-min-ports, team
+
runner-min-ports, team
 

-
runner-sys-prio, team
+
runner-sys-prio, team
 

-
runner-tx-balancer, team
+
runner-tx-balancer, team
 

-
runner-tx-balancer-interval, team
+
runner-tx-balancer-interval, team
 

-
runner-tx-hash, team
+
runner-tx-hash, team
 

 

 

 

 
S

 

-
s390-nettype, 802-3-ethernet
+
s390-nettype, 802-3-ethernet
 

-
s390-options, 802-3-ethernet
+
s390-options, 802-3-ethernet
 

-
s390-subchannels, 802-3-ethernet
+
s390-subchannels, 802-3-ethernet
 

-
secondaries, connection
+
secondaries, connection
 

-
secrets, vpn
+
secrets, vpn
 

-
security, 802-11-wireless
+
security, 802-11-wireless
 

-
seen-bssids, 802-11-wireless
+
seen-bssids, 802-11-wireless
 

-
send-delay, serial
+
send-delay, serial
 

-
send-sci, macsec
+
send-sci, macsec
 

-
service, pppoe
+
service, pppoe
 

-
service-type, vpn
+
service-type, vpn
 

-
short-address, wpan
+
short-address, wpan
 

-
sim-id, gsm
+
sim-id, gsm
 

-
sim-operator-id, gsm
+
sim-operator-id, gsm
 

-
slave-type, connection
+
slave-type, connection
 

-
source-port-max, vxlan
+
source-port-max, vxlan
 

-
source-port-min, vxlan
+
source-port-min, vxlan
 

-
speed, 802-3-ethernet
+
speed, 802-3-ethernet
 

-
ssid, 802-11-olpc-mesh, 802-11-wireless
+
ssid, 802-11-olpc-mesh, 802-11-wireless
 

-
stable-id, connection
+
stable-id, connection
 

-
sticky, team-port
+
sticky, team-port
 

-
stopbits, serial
+
stopbits, serial
 

-
stp, bridge
+
stp, bridge
 

-
stp-enable, ovs-bridge
+
stp-enable, ovs-bridge
 

-
subject-match, 802-1x
+
subject-match, 802-1x
 

-
system-ca-certs, 802-1x
+
system-ca-certs, 802-1x
 

 

 

 

 
T

 

-
tag, ovs-port
+
tag, ovs-port
 

-
tap, macvlan
+
tap, macvlan
 

-
tfilters, tc
+
tfilters, tc
 

-
timeout, vpn
+
timeout, vpn
 

-
timestamp, connection
+
timestamp, connection
 

-
token, ipv6
+
token, ipv6
 

-
tos, ip-tunnel, vxlan
+
tos, ip-tunnel, vxlan
 

-
total-vfs, sriov
+
total-vfs, sriov
 

-
transport-mode, infiniband
+
transport-mode, infiniband
 

-
ttl, ip-tunnel, vxlan
+
ttl, ip-tunnel, vxlan
 

-
tx-power, 802-11-wireless
+
tx-power, 802-11-wireless
 

-
type, connection, bluetooth, ovs-interface
+
type, connection, bluetooth, ovs-interface
 

 

 

 

 
U

 

-
user-name, vpn
+
user-name, vpn
 

-
username, adsl, cdma, gsm, pppoe
+
username, adsl, cdma, gsm, pppoe
 

-
uuid, connection
+
uuid, connection
 

 

 

 

 
V

 

-
validation, macsec
+
validation, macsec
 

-
vci, adsl
+
vci, adsl
 

-
vfs, sriov
+
vfs, sriov
 

-
vlan-mode, ovs-port
+
vlan-mode, ovs-port
 

-
vnet-hdr, tun
+
vnet-hdr, tun
 

-
vpi, adsl
+
vpi, adsl
 

-
org.freedesktop.NetworkManager.VPN.Connection, org.freedesktop.NetworkManager.VPN.Connection
+
org.freedesktop.NetworkManager.VPN.Connection, org.freedesktop.NetworkManager.VPN.Connection
 

-
org.freedesktop.NetworkManager.VPN.Connection::PropertiesChanged, The "PropertiesChanged" signal
+
org.freedesktop.NetworkManager.VPN.Connection::PropertiesChanged, The "PropertiesChanged" signal
 

-
org.freedesktop.NetworkManager.VPN.Connection::VpnStateChanged, The "VpnStateChanged" signal
+
org.freedesktop.NetworkManager.VPN.Connection::VpnStateChanged, The "VpnStateChanged" signal
 

-
org.freedesktop.NetworkManager.VPN.Connection:Banner, The "Banner" property
+
org.freedesktop.NetworkManager.VPN.Connection:Banner, The "Banner" property
 

-
org.freedesktop.NetworkManager.VPN.Connection:VpnState, The "VpnState" property
+
org.freedesktop.NetworkManager.VPN.Connection:VpnState, The "VpnState" property
 

-
org.freedesktop.NetworkManager.VPN.Plugin, org.freedesktop.NetworkManager.VPN.Plugin
+
org.freedesktop.NetworkManager.VPN.Plugin, org.freedesktop.NetworkManager.VPN.Plugin
 

-
org.freedesktop.NetworkManager.VPN.Plugin.Connect(), The Connect() method
+
org.freedesktop.NetworkManager.VPN.Plugin.Connect(), The Connect() method
 

-
org.freedesktop.NetworkManager.VPN.Plugin.ConnectInteractive(), The ConnectInteractive() method
+
org.freedesktop.NetworkManager.VPN.Plugin.ConnectInteractive(), The ConnectInteractive() method
 

-
org.freedesktop.NetworkManager.VPN.Plugin.Disconnect(), The Disconnect() method
+
org.freedesktop.NetworkManager.VPN.Plugin.Disconnect(), The Disconnect() method
 

-
org.freedesktop.NetworkManager.VPN.Plugin.NeedSecrets(), The NeedSecrets() method
+
org.freedesktop.NetworkManager.VPN.Plugin.NeedSecrets(), The NeedSecrets() method
 

-
org.freedesktop.NetworkManager.VPN.Plugin.NewSecrets(), The NewSecrets() method
+
org.freedesktop.NetworkManager.VPN.Plugin.NewSecrets(), The NewSecrets() method
 

-
org.freedesktop.NetworkManager.VPN.Plugin.SetConfig(), The SetConfig() method
+
org.freedesktop.NetworkManager.VPN.Plugin.SetConfig(), The SetConfig() method
 

-
org.freedesktop.NetworkManager.VPN.Plugin.SetFailure(), The SetFailure() method
+
org.freedesktop.NetworkManager.VPN.Plugin.SetFailure(), The SetFailure() method
 

-
org.freedesktop.NetworkManager.VPN.Plugin.SetIp4Config(), The SetIp4Config() method
+
org.freedesktop.NetworkManager.VPN.Plugin.SetIp4Config(), The SetIp4Config() method
 

-
org.freedesktop.NetworkManager.VPN.Plugin.SetIp6Config(), The SetIp6Config() method
+
org.freedesktop.NetworkManager.VPN.Plugin.SetIp6Config(), The SetIp6Config() method
 

-
org.freedesktop.NetworkManager.VPN.Plugin::Config, The "Config" signal
+
org.freedesktop.NetworkManager.VPN.Plugin::Config, The "Config" signal
 

-
org.freedesktop.NetworkManager.VPN.Plugin::Failure, The "Failure" signal
+
org.freedesktop.NetworkManager.VPN.Plugin::Failure, The "Failure" signal
 

-
org.freedesktop.NetworkManager.VPN.Plugin::Ip4Config, The "Ip4Config" signal
+
org.freedesktop.NetworkManager.VPN.Plugin::Ip4Config, The "Ip4Config" signal
 

-
org.freedesktop.NetworkManager.VPN.Plugin::Ip6Config, The "Ip6Config" signal
+
org.freedesktop.NetworkManager.VPN.Plugin::Ip6Config, The "Ip6Config" signal
 

-
org.freedesktop.NetworkManager.VPN.Plugin::LoginBanner, The "LoginBanner" signal
+
org.freedesktop.NetworkManager.VPN.Plugin::LoginBanner, The "LoginBanner" signal
 

-
org.freedesktop.NetworkManager.VPN.Plugin::SecretsRequired, The "SecretsRequired" signal
+
org.freedesktop.NetworkManager.VPN.Plugin::SecretsRequired, The "SecretsRequired" signal
 

-
org.freedesktop.NetworkManager.VPN.Plugin::StateChanged, The "StateChanged" signal
+
org.freedesktop.NetworkManager.VPN.Plugin::StateChanged, The "StateChanged" signal
 

-
org.freedesktop.NetworkManager.VPN.Plugin:State, The "State" property
+
org.freedesktop.NetworkManager.VPN.Plugin:State, The "State" property
 

 

 

 

 
W

 

-
wake-on-lan, 802-3-ethernet
+
wake-on-lan, 802-3-ethernet
 

-
wake-on-lan-password, 802-3-ethernet
+
wake-on-lan-password, 802-3-ethernet
 

-
wake-on-wlan, 802-11-wireless
+
wake-on-wlan, 802-11-wireless
 

-
wep-key-flags, 802-11-wireless-security
+
wep-key-flags, 802-11-wireless-security
 

-
wep-key-type, 802-11-wireless-security
+
wep-key-type, 802-11-wireless-security
 

-
wep-key0, 802-11-wireless-security
+
wep-key0, 802-11-wireless-security
 

-
wep-key1, 802-11-wireless-security
+
wep-key1, 802-11-wireless-security
 

-
wep-key2, 802-11-wireless-security
+
wep-key2, 802-11-wireless-security
 

-
wep-key3, 802-11-wireless-security
+
wep-key3, 802-11-wireless-security
 

-
wep-tx-keyidx, 802-11-wireless-security
+
wep-tx-keyidx, 802-11-wireless-security
 

-
wps-method, 802-11-wireless-security
+
wps-method, 802-11-wireless-security
 

 

 

 

 
Z

-
zone, connection
+
zone, connection
 

 

 
 
 

-
Generated by GTK-Doc V1.29.1

+
Generated by GTK-Doc V1.29
 
 
\ No newline at end of file
diff --git a/docs/api/html/license.html b/docs/api/html/license.html
index f828c141..39058e5e 100644
--- a/docs/api/html/license.html
+++ b/docs/api/html/license.html
@@ -7,7 +7,7 @@
 
 
 
-
+
 
 
 
@@ -379,6 +379,6 @@ Public License instead of this License.
     

 
 

-
Generated by GTK-Doc V1.29.1

+
Generated by GTK-Doc V1.29
 
 
\ No newline at end of file
diff --git a/docs/api/html/manpages.html b/docs/api/html/manpages.html
index f435b770..5282cd2a 100644
--- a/docs/api/html/manpages.html
+++ b/docs/api/html/manpages.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -62,6 +62,6 @@
 
 
 

-
Generated by GTK-Doc V1.29.1

+
Generated by GTK-Doc V1.29
 
 
\ No newline at end of file
diff --git a/docs/api/html/nm-dbus-types.html b/docs/api/html/nm-dbus-types.html
index bf403344..8f687d6b 100644
--- a/docs/api/html/nm-dbus-types.html
+++ b/docs/api/html/nm-dbus-types.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -4341,6 +4341,6 @@
 
 
 

-
Generated by GTK-Doc V1.29.1

+
Generated by GTK-Doc V1.29
 
 
\ No newline at end of file
diff --git a/docs/api/html/nm-initrd-generator.html b/docs/api/html/nm-initrd-generator.html
index 4dd3becb..5a27d453 100644
--- a/docs/api/html/nm-initrd-generator.html
+++ b/docs/api/html/nm-initrd-generator.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -102,6 +102,6 @@
 
 
 

-
Generated by GTK-Doc V1.29.1

+
Generated by GTK-Doc V1.29
 
 
\ No newline at end of file
diff --git a/docs/api/html/nm-online.html b/docs/api/html/nm-online.html
index baea91db..036fbb5d 100644
--- a/docs/api/html/nm-online.html
+++ b/docs/api/html/nm-online.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -115,6 +115,6 @@
 
 
 

-
Generated by GTK-Doc V1.29.1

+
Generated by GTK-Doc V1.29
 
 
\ No newline at end of file
diff --git a/docs/api/html/nm-openvswitch.html b/docs/api/html/nm-openvswitch.html
index 55dabb58..bfe89e2f 100644
--- a/docs/api/html/nm-openvswitch.html
+++ b/docs/api/html/nm-openvswitch.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -96,7 +96,7 @@
 

 
Examples

 

-
Example 14. Creating a Bridge with a single internal Interface

+
Example 15. Creating a Bridge with a single internal Interface

 

 
$ nmcli conn add type ovs-bridge conn.interface bridge0
 Connection 'ovs-bridge-bridge0' (d10fc64d-1d48-4394-a1b8-e1aea72f27d5) successfully added.
@@ -113,7 +113,7 @@ Connection 'ovs-interface-iface0' (3640d2a1-a2fd-4718-92f1-cffadb5b6cdc) success
 

 

 

-
Example 15. Adding a Linux interface to a Bridge

+
Example 16. Adding a Linux interface to a Bridge

 

 
$ nmcli conn add type ovs-port conn.interface port1 master bridge0
 Connection 'ovs-port-port1' (67d041eb-8e7b-4458-afee-a1d07c9c4552) successfully added.
@@ -124,7 +124,7 @@ Connection 'ovs-slave-eth0' (d459c45c-cf78-4c1c-b4b7-505e71379624) successfully
 

 

 

-
Example 16. Creating a VLAN

+
Example 17. Creating a VLAN

 

 
$ nmcli conn add type ovs-port conn.interface port2 master bridge0 ovs-port.tag 120
 Connection 'ovs-port-port2' (3994c093-4ef7-4549-a4fd-627b831c3cb8) successfully added.
@@ -135,7 +135,7 @@ Connection 'ovs-slave-eth1' (099be06e-71ad-484d-8d5a-fcadc5f207f5) successfully
 

 

 

-
Example 17. Creating a Bond

+
Example 18. Creating a Bond

 

 
$ nmcli conn add type ovs-port conn.interface bond0 master bridge0
 Connection 'ovs-port-bond0' (d154ebf9-e999-4e1b-a084-a3de53d25d8a) successfully added.
@@ -172,6 +172,6 @@ Connection 'ovs-slave-eth3' (8dedeecb-ed12-482b-b77a-24a4fb835136) successfully
 

 

 

-
Generated by GTK-Doc V1.29.1

+
Generated by GTK-Doc V1.29

 
 
\ No newline at end of file
diff --git a/docs/api/html/nm-settings-ifcfg-rh.html b/docs/api/html/nm-settings-ifcfg-rh.html
index 2019af29..3e56950b 100644
--- a/docs/api/html/nm-settings-ifcfg-rh.html
+++ b/docs/api/html/nm-settings-ifcfg-rh.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -2295,6 +2295,6 @@ Allowed values: default, never, always
 
 
 

-
Generated by GTK-Doc V1.29.1

+
Generated by GTK-Doc V1.29
 
 
\ No newline at end of file
diff --git a/docs/api/html/nm-settings-keyfile.html b/docs/api/html/nm-settings-keyfile.html
index e4b34928..d883a4fb 100644
--- a/docs/api/html/nm-settings-keyfile.html
+++ b/docs/api/html/nm-settings-keyfile.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -543,6 +543,6 @@ Example: mac-address-blacklist= 00:22:68:12:79:A6;00:22:68:12:79
 
 
 

-
Generated by GTK-Doc V1.29.1

+
Generated by GTK-Doc V1.29
 
 
\ No newline at end of file
diff --git a/docs/api/html/nm-settings.html b/docs/api/html/nm-settings.html
index 2f317601..9293e903 100644
--- a/docs/api/html/nm-settings.html
+++ b/docs/api/html/nm-settings.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -241,7 +241,7 @@
 stable-id
 string
  
-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 as DHCP client identifier with ipv4.dhcp-client-id=stable and to derive the DHCP DUID with ipv6.dhcp-duid=stable-[llt,ll,uuid]. 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 '$' character is treated special to perform dynamic substitutions at runtime. Currently supported are "${CONNECTION}", "${DEVICE}", "${BOOT}", "${RANDOM}". These effectively create unique IDs per-connection, per-device, per-boot, or every time. Note that "${DEVICE}" corresponds the the interface name 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.
+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 as DHCP client identifier with ipv4.dhcp-client-id=stable and to derive the DHCP DUID with ipv6.dhcp-duid=stable-[llt,ll,uuid]. 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 '$' 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 the 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.
 
 
 
@@ -1356,7 +1356,7 @@
 dhcp-client-id
 string
  
-A string sent to the DHCP server to identify the local machine which the DHCP server may use to customize the DHCP lease and options. When the property is a hex string ('aa:bb:cc') it is interpreted as a binary client ID, in which case the first byte is assumed to be the 'type' field as per RFC 2132 section 9.14 and the remaining bytes may be an hardware address (e.g. '01:xx:xx:xx:xx:xx:xx' where 1 is the Ethernet ARP type and the rest is a MAC address). If the property is not a hex string it is considered as a non-hardware-address client ID and the 'type' field is set to 0. The special values "mac" and "perm-mac" are supported, which use the current or permanent MAC address of the device to generate a client identifier with type ethernet (01). Currently, these options only work for ethernet type of links. The special value "stable" is supported to generate a type 0 client identifier based on the stable-id (see connection.stable-id) and a per-host key. If unset, a globally configured default is used. If still unset, the client-id from the last lease is reused.
+A string sent to the DHCP server to identify the local machine which the DHCP server may use to customize the DHCP lease and options. When the property is a hex string ('aa:bb:cc') it is interpreted as a binary client ID, in which case the first byte is assumed to be the 'type' field as per RFC 2132 section 9.14 and the remaining bytes may be an hardware address (e.g. '01:xx:xx:xx:xx:xx:xx' where 1 is the Ethernet ARP type and the rest is a MAC address). If the property is not a hex string it is considered as a non-hardware-address client ID and the 'type' field is set to 0. The special values "mac" and "perm-mac" are supported, which use the current or permanent MAC address of the device to generate a client identifier with type ethernet (01). Currently, these options only work for ethernet type of links. The special value "duid" generates a RFC4361-compliant client identifier based on a hash of the interface name as IAID and /etc/machine-id. The special value "stable" is supported to generate a type 0 client identifier based on the stable-id (see connection.stable-id) and a per-host key. If you set the stable-id, you may want to include the "${DEVICE}" or "${MAC}" specifier to get a per-device key. If unset, a globally configured default is used. If still unset, the default depends on the DHCP plugin.
 
 
 
@@ -1538,7 +1538,7 @@
 dhcp-duid
 string
  
-A string containing the DHCPv6 Unique Identifier (DUID) used by the dhcp client to identify itself to DHCPv6 servers (RFC 3315). The DUID is carried in the Client Identifier option. If the property is a hex string ('aa:bb:cc') it is interpreted as a binary DUID and filled as an opaque value in the Client Identifier option. The special value "lease" will retrieve the DUID previously used from the lease file belonging to the connection. If no DUID is found and "dhclient" is the configured dhcp client, the DUID is searched in the system-wide dhclient lease file. If still no DUID is found, or another dhcp client is used, a global and permanent DUID-UUID (RFC 6355) will be generated based on the machine-id. The special values "llt" and "ll" will generate a DUID of type LLT or LL (see RFC 3315) based on the current MAC address of the device. In order to try providing a stable DUID-LLT, the time field will contain a constant timestamp that is used globally (for all profiles) and persisted to disk. The special values "stable-llt", "stable-ll" and "stable-uuid" will generate a DUID of the corresponding type, derived from the connection's stable-id and a per-host unique key. So, the link-layer address of "stable-ll" and "stable-llt" will be a generated address derived from the stable id. The DUID-LLT time value in the "stable-llt" option will be picked among a static timespan of three years (the upper bound of the interval is the same constant timestamp used in "llt"). When the property is unset, the global value provided for "ipv6.dhcp-duid" is used. If no global value is provided, the default "lease" value is assumed.
+A string containing the DHCPv6 Unique Identifier (DUID) used by the dhcp client to identify itself to DHCPv6 servers (RFC 3315). The DUID is carried in the Client Identifier option. If the property is a hex string ('aa:bb:cc') it is interpreted as a binary DUID and filled as an opaque value in the Client Identifier option. The special value "lease" will retrieve the DUID previously used from the lease file belonging to the connection. If no DUID is found and "dhclient" is the configured dhcp client, the DUID is searched in the system-wide dhclient lease file. If still no DUID is found, or another dhcp client is used, a global and permanent DUID-UUID (RFC 6355) will be generated based on the machine-id. The special values "llt" and "ll" will generate a DUID of type LLT or LL (see RFC 3315) based on the current MAC address of the device. In order to try providing a stable DUID-LLT, the time field will contain a constant timestamp that is used globally (for all profiles) and persisted to disk. The special values "stable-llt", "stable-ll" and "stable-uuid" will generate a DUID of the corresponding type, derived from the connection's stable-id and a per-host unique key. You may want to include the "${DEVICE}" or "${MAC}" specifier in the stable-id, in case this profile gets activated on multiple devices. So, the link-layer address of "stable-ll" and "stable-llt" will be a generated address derived from the stable id. The DUID-LLT time value in the "stable-llt" option will be picked among a static timespan of three years (the upper bound of the interval is the same constant timestamp used in "llt"). When the property is unset, the global value provided for "ipv6.dhcp-duid" is used. If no global value is provided, the default "lease" value is assumed.
 
 
 
@@ -2491,14 +2491,14 @@
 total-vfs
 uint32
 0
-The total number of virtual functions to create.
+The total number of virtual functions to create. Note that when the sriov setting is present NetworkManager enforces the number of virtual functions on the interface also when it is zero. To prevent any changes to SR-IOV parameters don't add a sriov setting to the connection.
 
 
 
 vfs
 array of vardict
 []
-Array of virtual function descriptors. Each VF descriptor is a dictionary mapping attribute names to GVariant values. The 'index' entry is mandatory for each VF. When represented as string a VF is in the form: "INDEX [ATTR=VALUE[ ATTR=VALUE]...]". for example: "2 mac=00:11:22:33:44:55 spoof-check=true". The "vlans" attribute is represented as a semicolor-separated list of VLAN descriptors, where each descriptor has the form "ID[.PRIORITY[.PROTO]]". PROTO can be either 'q' for 802.1Q (the default) or 'ad' for 802.1ad.
+Array of virtual function descriptors. Each VF descriptor is a dictionary mapping attribute names to GVariant values. The 'index' entry is mandatory for each VF. When represented as string a VF is in the form: "INDEX [ATTR=VALUE[ ATTR=VALUE]...]". for example: "2 mac=00:11:22:33:44:55 spoof-check=true". Multiple VFs can be specified using a comma as separator. Currently the following attributes are supported: mac, spoof-check, trust, min-tx-rate, max-tx-rate, vlans. The "vlans" attribute is represented as a semicolon-separated list of VLAN descriptors, where each descriptor has the form "ID[.PRIORITY[.PROTO]]". PROTO can be either 'q' for 802.1Q (the default) or 'ad' for 802.1ad.
 
 
 
@@ -3652,6 +3652,6 @@
 
 
 

-
Generated by GTK-Doc V1.29.1

+
Generated by GTK-Doc V1.29
 
 
\ No newline at end of file
diff --git a/docs/api/html/nm-vpn-dbus-types.html b/docs/api/html/nm-vpn-dbus-types.html
index 0105d221..dbbaeb4e 100644
--- a/docs/api/html/nm-vpn-dbus-types.html
+++ b/docs/api/html/nm-vpn-dbus-types.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -555,6 +555,6 @@
 
 
 

-
Generated by GTK-Doc V1.29.1

+
Generated by GTK-Doc V1.29
 
 
\ No newline at end of file
diff --git a/docs/api/html/nmcli-examples.html b/docs/api/html/nmcli-examples.html
index 12afb409..0a84e48c 100644
--- a/docs/api/html/nmcli-examples.html
+++ b/docs/api/html/nmcli-examples.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -279,7 +279,27 @@ IP4:192.168.1.12/24:192.168.1.1::192.168.1.1::

-

Example 11. Escaping colon characters in tabular mode

+

Example 11. Adding an Ethernet connection and configuring SR-IOV VFs

+
+
$ nmcli con add type ethernet con-name EthernetPF ifname em1
+$ nmcli con modify EthernetPF sriov.total-vfs 3 sriov.autoprobe-drivers false
+$ nmcli con modify EthernetPF sriov.vfs '0 mac=00:11:22:33:44:55 vlans=10, 1 trust=true spoof-check=false'
+$ nmcli con modify EthernetPF +sriov.vfs '2 max-tx-rate=20'
+

+ This example demonstrates adding an Ethernet connection for + physical function (PF) ens4 and + configuring 3 SR-IOV virtual functions (VFs) on it. The first + VF is configured with MAC address 00:11:22:33:44:55 and VLAN + 10, the second one has the trust and + spoof-check features respectively enabled + and disabled. VF number 2 has a maximux transmission rate of + 20Mbps. The kernel is instructed to not automatically + instantiate a network interface for the VFs. +

+
+
+
+

Example 12. Escaping colon characters in tabular mode

$ nmcli -t -f general -e yes -m tab dev show eth0
 GENERAL:eth0:ethernet:Intel Corporation:82567LM Gigabit Network Connection:
@@ -294,7 +314,7 @@ nager/ActiveConnection/9

-

Example 12. nmcli usage in a NetworkManager dispatcher script to make Ethernet and Wi-Fi mutually exclusive

+

Example 13. nmcli usage in a NetworkManager dispatcher script to make Ethernet and Wi-Fi mutually exclusive

 #!/bin/bash
@@ -332,7 +352,7 @@ fi

Example sessions of interactive connection editor

-

Example 13. Adding an ethernet connection profile in interactive editor (a)

+

Example 14. Adding an ethernet connection profile in interactive editor (a)

$ nmcli connection edit type ethernet
 
@@ -583,6 +603,6 @@ Connection 'ethernet-4' (de89cdeb-a3e1-4d53-8fa0-c22546c775f4) successfully
-
Generated by GTK-Doc V1.29.1
+
Generated by GTK-Doc V1.29
\ No newline at end of file diff --git a/docs/api/html/nmcli.html b/docs/api/html/nmcli.html index 623a1b38..4014c714 100644 --- a/docs/api/html/nmcli.html +++ b/docs/api/html/nmcli.html @@ -8,7 +8,7 @@ - + @@ -2545,6 +2545,6 @@ It's equivalent to the +bond.options 'option=value'
-
Generated by GTK-Doc V1.29.1
+
Generated by GTK-Doc V1.29 \ No newline at end of file diff --git a/docs/api/html/nmtui.html b/docs/api/html/nmtui.html index ec41641b..749cf67c 100644 --- a/docs/api/html/nmtui.html +++ b/docs/api/html/nmtui.html @@ -8,7 +8,7 @@ - + @@ -83,6 +83,6 @@
-
Generated by GTK-Doc V1.29.1
+
Generated by GTK-Doc V1.29 \ No newline at end of file diff --git a/docs/api/html/ref-dbus-access-points.html b/docs/api/html/ref-dbus-access-points.html index dadd0e53..b5d99bca 100644 --- a/docs/api/html/ref-dbus-access-points.html +++ b/docs/api/html/ref-dbus-access-points.html @@ -8,7 +8,7 @@ - + @@ -27,6 +27,6 @@
-
Generated by GTK-Doc V1.29.1
+
Generated by GTK-Doc V1.29 \ No newline at end of file diff --git a/docs/api/html/ref-dbus-active-connections.html b/docs/api/html/ref-dbus-active-connections.html index 1b7e9311..0a681208 100644 --- a/docs/api/html/ref-dbus-active-connections.html +++ b/docs/api/html/ref-dbus-active-connections.html @@ -8,7 +8,7 @@ - + @@ -32,6 +32,6 @@
-
Generated by GTK-Doc V1.29.1
+
Generated by GTK-Doc V1.29 \ No newline at end of file diff --git a/docs/api/html/ref-dbus-agent-manager.html b/docs/api/html/ref-dbus-agent-manager.html index 1d21328f..aaa9067b 100644 --- a/docs/api/html/ref-dbus-agent-manager.html +++ b/docs/api/html/ref-dbus-agent-manager.html @@ -8,7 +8,7 @@ - + @@ -27,6 +27,6 @@
-
Generated by GTK-Doc V1.29.1
+
Generated by GTK-Doc V1.29 \ No newline at end of file diff --git a/docs/api/html/ref-dbus-checkpoint.html b/docs/api/html/ref-dbus-checkpoint.html index ccac4fe2..fd25cc3a 100644 --- a/docs/api/html/ref-dbus-checkpoint.html +++ b/docs/api/html/ref-dbus-checkpoint.html @@ -8,7 +8,7 @@ - + @@ -27,6 +27,6 @@
-
Generated by GTK-Doc V1.29.1
+
Generated by GTK-Doc V1.29 \ No newline at end of file diff --git a/docs/api/html/ref-dbus-devices.html b/docs/api/html/ref-dbus-devices.html index b6fec15d..ee7f14ad 100644 --- a/docs/api/html/ref-dbus-devices.html +++ b/docs/api/html/ref-dbus-devices.html @@ -8,7 +8,7 @@ - + @@ -113,6 +113,6 @@
-
Generated by GTK-Doc V1.29.1
+
Generated by GTK-Doc V1.29 \ No newline at end of file diff --git a/docs/api/html/ref-dbus-dhcp4-configs.html b/docs/api/html/ref-dbus-dhcp4-configs.html index d71b71ec..9fb7a90f 100644 --- a/docs/api/html/ref-dbus-dhcp4-configs.html +++ b/docs/api/html/ref-dbus-dhcp4-configs.html @@ -8,7 +8,7 @@ - + @@ -27,6 +27,6 @@
-
Generated by GTK-Doc V1.29.1
+
Generated by GTK-Doc V1.29 \ No newline at end of file diff --git a/docs/api/html/ref-dbus-dhcp6-configs.html b/docs/api/html/ref-dbus-dhcp6-configs.html index ef3f88f5..a0e62c4e 100644 --- a/docs/api/html/ref-dbus-dhcp6-configs.html +++ b/docs/api/html/ref-dbus-dhcp6-configs.html @@ -8,7 +8,7 @@ - + @@ -27,6 +27,6 @@
-
Generated by GTK-Doc V1.29.1
+
Generated by GTK-Doc V1.29 \ No newline at end of file diff --git a/docs/api/html/ref-dbus-dns-manager.html b/docs/api/html/ref-dbus-dns-manager.html index 944fd9fb..593f16ae 100644 --- a/docs/api/html/ref-dbus-dns-manager.html +++ b/docs/api/html/ref-dbus-dns-manager.html @@ -8,7 +8,7 @@ - + @@ -27,6 +27,6 @@
-
Generated by GTK-Doc V1.29.1
+
Generated by GTK-Doc V1.29 \ No newline at end of file diff --git a/docs/api/html/ref-dbus-ip4-configs.html b/docs/api/html/ref-dbus-ip4-configs.html index e6a256dc..dd91e4b5 100644 --- a/docs/api/html/ref-dbus-ip4-configs.html +++ b/docs/api/html/ref-dbus-ip4-configs.html @@ -8,7 +8,7 @@ - + @@ -27,6 +27,6 @@
-
Generated by GTK-Doc V1.29.1
+
Generated by GTK-Doc V1.29 \ No newline at end of file diff --git a/docs/api/html/ref-dbus-ip6-configs.html b/docs/api/html/ref-dbus-ip6-configs.html index 91ab1037..604fd372 100644 --- a/docs/api/html/ref-dbus-ip6-configs.html +++ b/docs/api/html/ref-dbus-ip6-configs.html @@ -8,7 +8,7 @@ - + @@ -27,6 +27,6 @@
-
Generated by GTK-Doc V1.29.1
+
Generated by GTK-Doc V1.29 \ No newline at end of file diff --git a/docs/api/html/ref-dbus-manager.html b/docs/api/html/ref-dbus-manager.html index 3779d3fa..963de31f 100644 --- a/docs/api/html/ref-dbus-manager.html +++ b/docs/api/html/ref-dbus-manager.html @@ -8,7 +8,7 @@ - + @@ -27,6 +27,6 @@
-
Generated by GTK-Doc V1.29.1
+
Generated by GTK-Doc V1.29 \ No newline at end of file diff --git a/docs/api/html/ref-dbus-settings-manager.html b/docs/api/html/ref-dbus-settings-manager.html index 1ce186fc..941d4c7b 100644 --- a/docs/api/html/ref-dbus-settings-manager.html +++ b/docs/api/html/ref-dbus-settings-manager.html @@ -8,7 +8,7 @@ - + @@ -27,6 +27,6 @@
-
Generated by GTK-Doc V1.29.1
+
Generated by GTK-Doc V1.29 \ No newline at end of file diff --git a/docs/api/html/ref-dbus-settings.html b/docs/api/html/ref-dbus-settings.html index 83678e96..c43b2e6f 100644 --- a/docs/api/html/ref-dbus-settings.html +++ b/docs/api/html/ref-dbus-settings.html @@ -8,7 +8,7 @@ - + @@ -27,6 +27,6 @@
-
Generated by GTK-Doc V1.29.1
+
Generated by GTK-Doc V1.29 \ No newline at end of file diff --git a/docs/api/html/ref-settings.html b/docs/api/html/ref-settings.html index 13ea502f..c777b6b4 100644 --- a/docs/api/html/ref-settings.html +++ b/docs/api/html/ref-settings.html @@ -8,7 +8,7 @@ - + @@ -172,6 +172,6 @@

-
Generated by GTK-Doc V1.29.1
+
Generated by GTK-Doc V1.29 \ No newline at end of file diff --git a/docs/api/html/secret-agents.html b/docs/api/html/secret-agents.html index 13d08184..a08ed533 100644 --- a/docs/api/html/secret-agents.html +++ b/docs/api/html/secret-agents.html @@ -8,7 +8,7 @@ - + @@ -33,6 +33,6 @@
-
Generated by GTK-Doc V1.29.1
+
Generated by GTK-Doc V1.29 \ No newline at end of file diff --git a/docs/api/html/secrets-flags.html b/docs/api/html/secrets-flags.html index 8849aec6..cbae0eba 100644 --- a/docs/api/html/secrets-flags.html +++ b/docs/api/html/secrets-flags.html @@ -8,7 +8,7 @@ - + @@ -58,6 +58,6 @@

-
Generated by GTK-Doc V1.29.1
+
Generated by GTK-Doc V1.29 \ No newline at end of file diff --git a/docs/api/html/settings-6lowpan.html b/docs/api/html/settings-6lowpan.html index 2877accb..ad65fe2e 100644 --- a/docs/api/html/settings-6lowpan.html +++ b/docs/api/html/settings-6lowpan.html @@ -8,7 +8,7 @@ - + @@ -64,6 +64,6 @@
-
Generated by GTK-Doc V1.29.1
+
Generated by GTK-Doc V1.29 \ No newline at end of file diff --git a/docs/api/html/settings-802-11-olpc-mesh.html b/docs/api/html/settings-802-11-olpc-mesh.html index 8ff8b9f9..847ac54e 100644 --- a/docs/api/html/settings-802-11-olpc-mesh.html +++ b/docs/api/html/settings-802-11-olpc-mesh.html @@ -8,7 +8,7 @@ - + @@ -78,6 +78,6 @@
-
Generated by GTK-Doc V1.29.1
+
Generated by GTK-Doc V1.29 \ No newline at end of file diff --git a/docs/api/html/settings-802-11-wireless-security.html b/docs/api/html/settings-802-11-wireless-security.html index 0127ef12..3859ff6b 100644 --- a/docs/api/html/settings-802-11-wireless-security.html +++ b/docs/api/html/settings-802-11-wireless-security.html @@ -8,7 +8,7 @@ - + @@ -180,6 +180,6 @@
-
Generated by GTK-Doc V1.29.1
+
Generated by GTK-Doc V1.29 \ No newline at end of file diff --git a/docs/api/html/settings-802-11-wireless.html b/docs/api/html/settings-802-11-wireless.html index 4d2dc820..ee09bc6e 100644 --- a/docs/api/html/settings-802-11-wireless.html +++ b/docs/api/html/settings-802-11-wireless.html @@ -8,7 +8,7 @@ - + @@ -174,6 +174,6 @@
-
Generated by GTK-Doc V1.29.1
+
Generated by GTK-Doc V1.29 \ No newline at end of file diff --git a/docs/api/html/settings-802-1x.html b/docs/api/html/settings-802-1x.html index b7d266bf..08c348b3 100644 --- a/docs/api/html/settings-802-1x.html +++ b/docs/api/html/settings-802-1x.html @@ -8,7 +8,7 @@ - + @@ -324,6 +324,6 @@
-
Generated by GTK-Doc V1.29.1
+
Generated by GTK-Doc V1.29 \ No newline at end of file diff --git a/docs/api/html/settings-802-3-ethernet.html b/docs/api/html/settings-802-3-ethernet.html index 89de90da..a954bbf0 100644 --- a/docs/api/html/settings-802-3-ethernet.html +++ b/docs/api/html/settings-802-3-ethernet.html @@ -8,7 +8,7 @@ - + @@ -150,6 +150,6 @@
-
Generated by GTK-Doc V1.29.1
+
Generated by GTK-Doc V1.29 \ No newline at end of file diff --git a/docs/api/html/settings-adsl.html b/docs/api/html/settings-adsl.html index 93eb0504..f3bc2f1c 100644 --- a/docs/api/html/settings-adsl.html +++ b/docs/api/html/settings-adsl.html @@ -8,7 +8,7 @@ - + @@ -102,6 +102,6 @@
-
Generated by GTK-Doc V1.29.1
+
Generated by GTK-Doc V1.29 \ No newline at end of file diff --git a/docs/api/html/settings-bluetooth.html b/docs/api/html/settings-bluetooth.html index 943bc428..2cabe4db 100644 --- a/docs/api/html/settings-bluetooth.html +++ b/docs/api/html/settings-bluetooth.html @@ -8,7 +8,7 @@ - + @@ -72,6 +72,6 @@
-
Generated by GTK-Doc V1.29.1
+
Generated by GTK-Doc V1.29 \ No newline at end of file diff --git a/docs/api/html/settings-bond.html b/docs/api/html/settings-bond.html index 362e6132..425a8db5 100644 --- a/docs/api/html/settings-bond.html +++ b/docs/api/html/settings-bond.html @@ -8,7 +8,7 @@ - + @@ -72,6 +72,6 @@
-
Generated by GTK-Doc V1.29.1
+
Generated by GTK-Doc V1.29 \ No newline at end of file diff --git a/docs/api/html/settings-bridge-port.html b/docs/api/html/settings-bridge-port.html index 1e1aec94..598a99eb 100644 --- a/docs/api/html/settings-bridge-port.html +++ b/docs/api/html/settings-bridge-port.html @@ -8,7 +8,7 @@ - + @@ -78,6 +78,6 @@
-
Generated by GTK-Doc V1.29.1
+
Generated by GTK-Doc V1.29 \ No newline at end of file diff --git a/docs/api/html/settings-bridge.html b/docs/api/html/settings-bridge.html index a12d87a1..830fe274 100644 --- a/docs/api/html/settings-bridge.html +++ b/docs/api/html/settings-bridge.html @@ -8,7 +8,7 @@ - + @@ -120,6 +120,6 @@
-
Generated by GTK-Doc V1.29.1
+
Generated by GTK-Doc V1.29 \ No newline at end of file diff --git a/docs/api/html/settings-cdma.html b/docs/api/html/settings-cdma.html index 72373c45..1ba7b975 100644 --- a/docs/api/html/settings-cdma.html +++ b/docs/api/html/settings-cdma.html @@ -8,7 +8,7 @@ - + @@ -90,6 +90,6 @@
-
Generated by GTK-Doc V1.29.1
+
Generated by GTK-Doc V1.29 \ No newline at end of file diff --git a/docs/api/html/settings-connection.html b/docs/api/html/settings-connection.html index d8da2c8c..0da3cf89 100644 --- a/docs/api/html/settings-connection.html +++ b/docs/api/html/settings-connection.html @@ -8,7 +8,7 @@ - + @@ -165,7 +165,7 @@ 
stable-id
string

-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 as DHCP client identifier with ipv4.dhcp-client-id=stable and to derive the DHCP DUID with ipv6.dhcp-duid=stable-[llt,ll,uuid]. 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 '$' character is treated special to perform dynamic substitutions at runtime. Currently supported are "${CONNECTION}", "${DEVICE}", "${BOOT}", "${RANDOM}". These effectively create unique IDs per-connection, per-device, per-boot, or every time. Note that "${DEVICE}" corresponds the the interface name 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.
+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 as DHCP client identifier with ipv4.dhcp-client-id=stable and to derive the DHCP DUID with ipv6.dhcp-duid=stable-[llt,ll,uuid]. 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 '$' 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 the 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.
 
 
 
timestamp

@@ -198,6 +198,6 @@
 
 
 

-
Generated by GTK-Doc V1.29.1

+
Generated by GTK-Doc V1.29
 
 
\ No newline at end of file
diff --git a/docs/api/html/settings-dcb.html b/docs/api/html/settings-dcb.html
index 73289d0b..f41141f6 100644
--- a/docs/api/html/settings-dcb.html
+++ b/docs/api/html/settings-dcb.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -150,6 +150,6 @@
 
 
 

-
Generated by GTK-Doc V1.29.1

+
Generated by GTK-Doc V1.29
 
 
\ No newline at end of file
diff --git a/docs/api/html/settings-dummy.html b/docs/api/html/settings-dummy.html
index a4a98da7..5e0951b3 100644
--- a/docs/api/html/settings-dummy.html
+++ b/docs/api/html/settings-dummy.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -59,6 +59,6 @@
 
 
 

-
Generated by GTK-Doc V1.29.1

+
Generated by GTK-Doc V1.29
 
 
\ No newline at end of file
diff --git a/docs/api/html/settings-ethtool.html b/docs/api/html/settings-ethtool.html
index 518886d6..c76c1b50 100644
--- a/docs/api/html/settings-ethtool.html
+++ b/docs/api/html/settings-ethtool.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -59,6 +59,6 @@
 
 
 

-
Generated by GTK-Doc V1.29.1

+
Generated by GTK-Doc V1.29
 
 
\ No newline at end of file
diff --git a/docs/api/html/settings-generic.html b/docs/api/html/settings-generic.html
index 5ae9d55d..5c8dc6a5 100644
--- a/docs/api/html/settings-generic.html
+++ b/docs/api/html/settings-generic.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -59,6 +59,6 @@
 
 
 

-
Generated by GTK-Doc V1.29.1

+
Generated by GTK-Doc V1.29
 
 
\ No newline at end of file
diff --git a/docs/api/html/settings-gsm.html b/docs/api/html/settings-gsm.html
index 5fef63a7..75ea0ef2 100644
--- a/docs/api/html/settings-gsm.html
+++ b/docs/api/html/settings-gsm.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -138,6 +138,6 @@
 
 
 

-
Generated by GTK-Doc V1.29.1

+
Generated by GTK-Doc V1.29
 
 
\ No newline at end of file
diff --git a/docs/api/html/settings-infiniband.html b/docs/api/html/settings-infiniband.html
index af0ee798..831da8af 100644
--- a/docs/api/html/settings-infiniband.html
+++ b/docs/api/html/settings-infiniband.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -90,6 +90,6 @@
 
 
 

-
Generated by GTK-Doc V1.29.1

+
Generated by GTK-Doc V1.29
 
 
\ No newline at end of file
diff --git a/docs/api/html/settings-ip-tunnel.html b/docs/api/html/settings-ip-tunnel.html
index 764b36e7..ee47fde9 100644
--- a/docs/api/html/settings-ip-tunnel.html
+++ b/docs/api/html/settings-ip-tunnel.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -138,6 +138,6 @@
 
 
 

-
Generated by GTK-Doc V1.29.1

+
Generated by GTK-Doc V1.29
 
 
\ No newline at end of file
diff --git a/docs/api/html/settings-ipv4.html b/docs/api/html/settings-ipv4.html
index f1755230..ae58a2d6 100644
--- a/docs/api/html/settings-ipv4.html
+++ b/docs/api/html/settings-ipv4.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -75,7 +75,7 @@
 
dhcp-client-id

 
string

 

-A string sent to the DHCP server to identify the local machine which the DHCP server may use to customize the DHCP lease and options. When the property is a hex string ('aa:bb:cc') it is interpreted as a binary client ID, in which case the first byte is assumed to be the 'type' field as per RFC 2132 section 9.14 and the remaining bytes may be an hardware address (e.g. '01:xx:xx:xx:xx:xx:xx' where 1 is the Ethernet ARP type and the rest is a MAC address). If the property is not a hex string it is considered as a non-hardware-address client ID and the 'type' field is set to 0. The special values "mac" and "perm-mac" are supported, which use the current or permanent MAC address of the device to generate a client identifier with type ethernet (01). Currently, these options only work for ethernet type of links. The special value "stable" is supported to generate a type 0 client identifier based on the stable-id (see connection.stable-id) and a per-host key. If unset, a globally configured default is used. If still unset, the client-id from the last lease is reused.
+A string sent to the DHCP server to identify the local machine which the DHCP server may use to customize the DHCP lease and options. When the property is a hex string ('aa:bb:cc') it is interpreted as a binary client ID, in which case the first byte is assumed to be the 'type' field as per RFC 2132 section 9.14 and the remaining bytes may be an hardware address (e.g. '01:xx:xx:xx:xx:xx:xx' where 1 is the Ethernet ARP type and the rest is a MAC address). If the property is not a hex string it is considered as a non-hardware-address client ID and the 'type' field is set to 0. The special values "mac" and "perm-mac" are supported, which use the current or permanent MAC address of the device to generate a client identifier with type ethernet (01). Currently, these options only work for ethernet type of links. The special value "duid" generates a RFC4361-compliant client identifier based on a hash of the interface name as IAID and /etc/machine-id. The special value "stable" is supported to generate a type 0 client identifier based on the stable-id (see connection.stable-id) and a per-host key. If you set the stable-id, you may want to include the "${DEVICE}" or "${MAC}" specifier to get a per-device key. If unset, a globally configured default is used. If still unset, the default depends on the DHCP plugin.
 
 
 
dhcp-fqdn

@@ -192,6 +192,6 @@
 
 
 

-
Generated by GTK-Doc V1.29.1

+
Generated by GTK-Doc V1.29
 
 
\ No newline at end of file
diff --git a/docs/api/html/settings-ipv6.html b/docs/api/html/settings-ipv6.html
index 71fe91ae..776b5022 100644
--- a/docs/api/html/settings-ipv6.html
+++ b/docs/api/html/settings-ipv6.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -81,7 +81,7 @@
 
dhcp-duid

 
string

 

-A string containing the DHCPv6 Unique Identifier (DUID) used by the dhcp client to identify itself to DHCPv6 servers (RFC 3315). The DUID is carried in the Client Identifier option. If the property is a hex string ('aa:bb:cc') it is interpreted as a binary DUID and filled as an opaque value in the Client Identifier option. The special value "lease" will retrieve the DUID previously used from the lease file belonging to the connection. If no DUID is found and "dhclient" is the configured dhcp client, the DUID is searched in the system-wide dhclient lease file. If still no DUID is found, or another dhcp client is used, a global and permanent DUID-UUID (RFC 6355) will be generated based on the machine-id. The special values "llt" and "ll" will generate a DUID of type LLT or LL (see RFC 3315) based on the current MAC address of the device. In order to try providing a stable DUID-LLT, the time field will contain a constant timestamp that is used globally (for all profiles) and persisted to disk. The special values "stable-llt", "stable-ll" and "stable-uuid" will generate a DUID of the corresponding type, derived from the connection's stable-id and a per-host unique key. So, the link-layer address of "stable-ll" and "stable-llt" will be a generated address derived from the stable id. The DUID-LLT time value in the "stable-llt" option will be picked among a static timespan of three years (the upper bound of the interval is the same constant timestamp used in "llt"). When the property is unset, the global value provided for "ipv6.dhcp-duid" is used. If no global value is provided, the default "lease" value is assumed.
+A string containing the DHCPv6 Unique Identifier (DUID) used by the dhcp client to identify itself to DHCPv6 servers (RFC 3315). The DUID is carried in the Client Identifier option. If the property is a hex string ('aa:bb:cc') it is interpreted as a binary DUID and filled as an opaque value in the Client Identifier option. The special value "lease" will retrieve the DUID previously used from the lease file belonging to the connection. If no DUID is found and "dhclient" is the configured dhcp client, the DUID is searched in the system-wide dhclient lease file. If still no DUID is found, or another dhcp client is used, a global and permanent DUID-UUID (RFC 6355) will be generated based on the machine-id. The special values "llt" and "ll" will generate a DUID of type LLT or LL (see RFC 3315) based on the current MAC address of the device. In order to try providing a stable DUID-LLT, the time field will contain a constant timestamp that is used globally (for all profiles) and persisted to disk. The special values "stable-llt", "stable-ll" and "stable-uuid" will generate a DUID of the corresponding type, derived from the connection's stable-id and a per-host unique key. You may want to include the "${DEVICE}" or "${MAC}" specifier in the stable-id, in case this profile gets activated on multiple devices. So, the link-layer address of "stable-ll" and "stable-llt" will be a generated address derived from the stable id. The DUID-LLT time value in the "stable-llt" option will be picked among a static timespan of three years (the upper bound of the interval is the same constant timestamp used in "llt"). When the property is unset, the global value provided for "ipv6.dhcp-duid" is used. If no global value is provided, the default "lease" value is assumed.
 
 
 
dhcp-hostname

@@ -204,6 +204,6 @@
 
 
 

-
Generated by GTK-Doc V1.29.1

+
Generated by GTK-Doc V1.29
 
 
\ No newline at end of file
diff --git a/docs/api/html/settings-macsec.html b/docs/api/html/settings-macsec.html
index a465e240..f3e2c564 100644
--- a/docs/api/html/settings-macsec.html
+++ b/docs/api/html/settings-macsec.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -114,6 +114,6 @@
 
 
 

-
Generated by GTK-Doc V1.29.1

+
Generated by GTK-Doc V1.29
 
 
\ No newline at end of file
diff --git a/docs/api/html/settings-macvlan.html b/docs/api/html/settings-macvlan.html
index fa8665d6..ff792011 100644
--- a/docs/api/html/settings-macvlan.html
+++ b/docs/api/html/settings-macvlan.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -84,6 +84,6 @@
 
 
 

-
Generated by GTK-Doc V1.29.1

+
Generated by GTK-Doc V1.29
 
 
\ No newline at end of file
diff --git a/docs/api/html/settings-match.html b/docs/api/html/settings-match.html
index f47231ae..994ece60 100644
--- a/docs/api/html/settings-match.html
+++ b/docs/api/html/settings-match.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -64,6 +64,6 @@
 
 
 

-
Generated by GTK-Doc V1.29.1

+
Generated by GTK-Doc V1.29
 
 
\ No newline at end of file
diff --git a/docs/api/html/settings-ovs-bridge.html b/docs/api/html/settings-ovs-bridge.html
index 23c1056f..c46a2f17 100644
--- a/docs/api/html/settings-ovs-bridge.html
+++ b/docs/api/html/settings-ovs-bridge.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -84,6 +84,6 @@
 
 
 

-
Generated by GTK-Doc V1.29.1

+
Generated by GTK-Doc V1.29
 
 
\ No newline at end of file
diff --git a/docs/api/html/settings-ovs-interface.html b/docs/api/html/settings-ovs-interface.html
index 9fa8f619..7eb583e0 100644
--- a/docs/api/html/settings-ovs-interface.html
+++ b/docs/api/html/settings-ovs-interface.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -64,6 +64,6 @@
 
 
 

-
Generated by GTK-Doc V1.29.1

+
Generated by GTK-Doc V1.29
 
 
\ No newline at end of file
diff --git a/docs/api/html/settings-ovs-patch.html b/docs/api/html/settings-ovs-patch.html
index 98894261..e3f41bd3 100644
--- a/docs/api/html/settings-ovs-patch.html
+++ b/docs/api/html/settings-ovs-patch.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -64,6 +64,6 @@
 
 
 

-
Generated by GTK-Doc V1.29.1

+
Generated by GTK-Doc V1.29
 
 
\ No newline at end of file
diff --git a/docs/api/html/settings-ovs-port.html b/docs/api/html/settings-ovs-port.html
index 691ff15e..73889a89 100644
--- a/docs/api/html/settings-ovs-port.html
+++ b/docs/api/html/settings-ovs-port.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -96,6 +96,6 @@
 
 
 

-
Generated by GTK-Doc V1.29.1

+
Generated by GTK-Doc V1.29
 
 
\ No newline at end of file
diff --git a/docs/api/html/settings-ppp.html b/docs/api/html/settings-ppp.html
index e0fcb005..1d0ac104 100644
--- a/docs/api/html/settings-ppp.html
+++ b/docs/api/html/settings-ppp.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -168,6 +168,6 @@
 
 
 

-
Generated by GTK-Doc V1.29.1

+
Generated by GTK-Doc V1.29
 
 
\ No newline at end of file
diff --git a/docs/api/html/settings-pppoe.html b/docs/api/html/settings-pppoe.html
index b5128547..41264737 100644
--- a/docs/api/html/settings-pppoe.html
+++ b/docs/api/html/settings-pppoe.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -90,6 +90,6 @@
 
 
 

-
Generated by GTK-Doc V1.29.1

+
Generated by GTK-Doc V1.29
 
 
\ No newline at end of file
diff --git a/docs/api/html/settings-proxy.html b/docs/api/html/settings-proxy.html
index 15ae132c..4b87ede1 100644
--- a/docs/api/html/settings-proxy.html
+++ b/docs/api/html/settings-proxy.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -84,6 +84,6 @@
 
 
 

-
Generated by GTK-Doc V1.29.1

+
Generated by GTK-Doc V1.29
 
 
\ No newline at end of file
diff --git a/docs/api/html/settings-serial.html b/docs/api/html/settings-serial.html
index d65344f7..e503f732 100644
--- a/docs/api/html/settings-serial.html
+++ b/docs/api/html/settings-serial.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -90,6 +90,6 @@
 
 
 

-
Generated by GTK-Doc V1.29.1

+
Generated by GTK-Doc V1.29
 
 
\ No newline at end of file
diff --git a/docs/api/html/settings-sriov.html b/docs/api/html/settings-sriov.html
index 19bfa689..b5ecc029 100644
--- a/docs/api/html/settings-sriov.html
+++ b/docs/api/html/settings-sriov.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -63,13 +63,13 @@
 
total-vfs

 
uint32

 
0

-The total number of virtual functions to create.
+The total number of virtual functions to create. Note that when the sriov setting is present NetworkManager enforces the number of virtual functions on the interface also when it is zero. To prevent any changes to SR-IOV parameters don't add a sriov setting to the connection.
 
 
 
vfs

 
array of vardict

 
[]

-Array of virtual function descriptors. Each VF descriptor is a dictionary mapping attribute names to GVariant values. The 'index' entry is mandatory for each VF. When represented as string a VF is in the form: "INDEX [ATTR=VALUE[ ATTR=VALUE]...]". for example: "2 mac=00:11:22:33:44:55 spoof-check=true". The "vlans" attribute is represented as a semicolor-separated list of VLAN descriptors, where each descriptor has the form "ID[.PRIORITY[.PROTO]]". PROTO can be either 'q' for 802.1Q (the default) or 'ad' for 802.1ad.
+Array of virtual function descriptors. Each VF descriptor is a dictionary mapping attribute names to GVariant values. The 'index' entry is mandatory for each VF. When represented as string a VF is in the form: "INDEX [ATTR=VALUE[ ATTR=VALUE]...]". for example: "2 mac=00:11:22:33:44:55 spoof-check=true". Multiple VFs can be specified using a comma as separator. Currently the following attributes are supported: mac, spoof-check, trust, min-tx-rate, max-tx-rate, vlans. The "vlans" attribute is represented as a semicolon-separated list of VLAN descriptors, where each descriptor has the form "ID[.PRIORITY[.PROTO]]". PROTO can be either 'q' for 802.1Q (the default) or 'ad' for 802.1ad.
 
 
 
@@ -78,6 +78,6 @@
 
 
 

-
Generated by GTK-Doc V1.29.1

+
Generated by GTK-Doc V1.29
 
 
\ No newline at end of file
diff --git a/docs/api/html/settings-tc.html b/docs/api/html/settings-tc.html
index 2dccdd6a..6de65275 100644
--- a/docs/api/html/settings-tc.html
+++ b/docs/api/html/settings-tc.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -72,6 +72,6 @@
 
 
 

-
Generated by GTK-Doc V1.29.1

+
Generated by GTK-Doc V1.29
 
 
\ No newline at end of file
diff --git a/docs/api/html/settings-team-port.html b/docs/api/html/settings-team-port.html
index 714eb592..c0698945 100644
--- a/docs/api/html/settings-team-port.html
+++ b/docs/api/html/settings-team-port.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -102,6 +102,6 @@
 
 
 

-
Generated by GTK-Doc V1.29.1

+
Generated by GTK-Doc V1.29
 
 
\ No newline at end of file
diff --git a/docs/api/html/settings-team.html b/docs/api/html/settings-team.html
index 9589bcbb..4711e700 100644
--- a/docs/api/html/settings-team.html
+++ b/docs/api/html/settings-team.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -162,6 +162,6 @@
 
 
 

-
Generated by GTK-Doc V1.29.1

+
Generated by GTK-Doc V1.29
 
 
\ No newline at end of file
diff --git a/docs/api/html/settings-tun.html b/docs/api/html/settings-tun.html
index 6c33ae93..14f1c2ea 100644
--- a/docs/api/html/settings-tun.html
+++ b/docs/api/html/settings-tun.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -96,6 +96,6 @@
 
 
 

-
Generated by GTK-Doc V1.29.1

+
Generated by GTK-Doc V1.29
 
 
\ No newline at end of file
diff --git a/docs/api/html/settings-user.html b/docs/api/html/settings-user.html
index c2852485..0e409100 100644
--- a/docs/api/html/settings-user.html
+++ b/docs/api/html/settings-user.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -64,6 +64,6 @@
 
 
 

-
Generated by GTK-Doc V1.29.1

+
Generated by GTK-Doc V1.29
 
 
\ No newline at end of file
diff --git a/docs/api/html/settings-vlan.html b/docs/api/html/settings-vlan.html
index 5eb1ba8c..f975022c 100644
--- a/docs/api/html/settings-vlan.html
+++ b/docs/api/html/settings-vlan.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -96,6 +96,6 @@
 
 
 

-
Generated by GTK-Doc V1.29.1

+
Generated by GTK-Doc V1.29
 
 
\ No newline at end of file
diff --git a/docs/api/html/settings-vpn.html b/docs/api/html/settings-vpn.html
index f3720792..1a964dd6 100644
--- a/docs/api/html/settings-vpn.html
+++ b/docs/api/html/settings-vpn.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -96,6 +96,6 @@
 
 
 

-
Generated by GTK-Doc V1.29.1

+
Generated by GTK-Doc V1.29
 
 
\ No newline at end of file
diff --git a/docs/api/html/settings-vxlan.html b/docs/api/html/settings-vxlan.html
index 4867b0ab..14f48141 100644
--- a/docs/api/html/settings-vxlan.html
+++ b/docs/api/html/settings-vxlan.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -156,6 +156,6 @@
 
 
 

-
Generated by GTK-Doc V1.29.1

+
Generated by GTK-Doc V1.29
 
 
\ No newline at end of file
diff --git a/docs/api/html/settings-wimax.html b/docs/api/html/settings-wimax.html
index af9c07a4..b00506af 100644
--- a/docs/api/html/settings-wimax.html
+++ b/docs/api/html/settings-wimax.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -72,6 +72,6 @@
 
 
 

-
Generated by GTK-Doc V1.29.1

+
Generated by GTK-Doc V1.29
 
 
\ No newline at end of file
diff --git a/docs/api/html/settings-wpan.html b/docs/api/html/settings-wpan.html
index bc07cadc..62f851ae 100644
--- a/docs/api/html/settings-wpan.html
+++ b/docs/api/html/settings-wpan.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -78,6 +78,6 @@
 
 
 

-
Generated by GTK-Doc V1.29.1

+
Generated by GTK-Doc V1.29
 
 
\ No newline at end of file
diff --git a/docs/api/html/spec.html b/docs/api/html/spec.html
index 9fafa20d..aa6c22b5 100644
--- a/docs/api/html/spec.html
+++ b/docs/api/html/spec.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -180,6 +180,6 @@
     

 
 

-
Generated by GTK-Doc V1.29.1

+
Generated by GTK-Doc V1.29
 
 
\ No newline at end of file
diff --git a/docs/api/html/vpn-plugins.html b/docs/api/html/vpn-plugins.html
index 440f513d..f2993ec5 100644
--- a/docs/api/html/vpn-plugins.html
+++ b/docs/api/html/vpn-plugins.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -37,6 +37,6 @@
 
 
 

-
Generated by GTK-Doc V1.29.1

+
Generated by GTK-Doc V1.29
 
 
\ No newline at end of file
diff --git a/docs/api/network-manager-docs.xml b/docs/api/network-manager-docs.xml
index 5679f4b4..06ac3741 100644
--- a/docs/api/network-manager-docs.xml
+++ b/docs/api/network-manager-docs.xml
@@ -257,15 +257,6 @@
       Types
       
     
-
-    
-
   
 
   
diff --git a/docs/api/settings-spec.xml b/docs/api/settings-spec.xml
index e967773a..d31d299e 100644
--- a/docs/api/settings-spec.xml
+++ b/docs/api/settings-spec.xml
@@ -22,7 +22,7 @@
     read-onlyread-onlybooleanFALSEFALSE 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.
     secondariessecondariesarray of string[]List of connection UUIDs that should be activated when the base connection itself is activated. Currently only VPN connections are supported.
     slave-typeslave-typestringSetting name of the device type of this slave's master connection (eg, "bond"), or NULL if this connection is not a slave.
-    stable-idstable-idstringThis 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 as DHCP client identifier with ipv4.dhcp-client-id=stable and to derive the DHCP DUID with ipv6.dhcp-duid=stable-[llt,ll,uuid]. 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 '$' character is treated special to perform dynamic substitutions at runtime. Currently supported are "${CONNECTION}", "${DEVICE}", "${BOOT}", "${RANDOM}". These effectively create unique IDs per-connection, per-device, per-boot, or every time. Note that "${DEVICE}" corresponds the the interface name 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.
+    stable-idstable-idstringThis 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 as DHCP client identifier with ipv4.dhcp-client-id=stable and to derive the DHCP DUID with ipv6.dhcp-duid=stable-[llt,ll,uuid]. 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 '$' 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 the 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.
     timestamptimestampuint640The 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).
     typetypestringBase type of the connection. For hardware-dependent connections, should contain the setting name of the hardware-type specific setting (ie, "802-3-ethernet" or "802-11-wireless" or "bluetooth", etc), and for non-hardware dependent connections like VPN or otherwise, should contain the setting name of that setting type (ie, "vpn" or "bridge", etc).
     uuiduuidstringA universally unique identifier for the connection, for example generated with libuuid.  It should be assigned when the connection is created, and never changed as long as the connection still applies to the same network.  For example, it should not be changed when the "id" property or NMSettingIP4Config changes, but might need to be re-created when the Wi-Fi SSID, mobile broadband network provider, or "type" property changes. The UUID must be in the format "2815492f-7e56-435e-b2e9-246bd7cdc664" (ie, contains only hexadecimal characters and "-").
@@ -197,7 +197,7 @@
     address-dataaddress-dataarray of vardictArray of IPv4 addresses. Each address dictionary contains at least 'address' and 'prefix' entries, containing the IP address as a string, and the prefix length as a uint32. Additional attributes may also exist on some addresses.
     addressesaddressesarray of array of uint32[]Deprecated in favor of the 'address-data' and 'gateway' properties, but this can be used for backward-compatibility with older daemons. Note that if you send this property the daemon will ignore 'address-data' and 'gateway'.  Array of IPv4 address structures.  Each IPv4 address structure is composed of 3 32-bit values; the first being the IPv4 address (network byte order), the second the prefix (1 - 32), and last the IPv4 gateway (network byte order). The gateway may be left as 0 if no gateway exists for that subnet.
     dad-timeoutdad-timeoutint32-1Timeout in milliseconds used to check for the presence of duplicate IP addresses on the network.  If an address conflict is detected, the activation will fail.  A zero value means that no duplicate address detection is performed, -1 means the default value (either configuration ipvx.dad-timeout override or zero).  A value greater than zero is a timeout in milliseconds. The property is currently implemented only for IPv4.
-    dhcp-client-iddhcp-client-idstringA string sent to the DHCP server to identify the local machine which the DHCP server may use to customize the DHCP lease and options. When the property is a hex string ('aa:bb:cc') it is interpreted as a binary client ID, in which case the first byte is assumed to be the 'type' field as per RFC 2132 section 9.14 and the remaining bytes may be an hardware address (e.g. '01:xx:xx:xx:xx:xx:xx' where 1 is the Ethernet ARP type and the rest is a MAC address). If the property is not a hex string it is considered as a non-hardware-address client ID and the 'type' field is set to 0. The special values "mac" and "perm-mac" are supported, which use the current or permanent MAC address of the device to generate a client identifier with type ethernet (01). Currently, these options only work for ethernet type of links. The special value "stable" is supported to generate a type 0 client identifier based on the stable-id (see connection.stable-id) and a per-host key. If unset, a globally configured default is used. If still unset, the client-id from the last lease is reused.
+    dhcp-client-iddhcp-client-idstringA string sent to the DHCP server to identify the local machine which the DHCP server may use to customize the DHCP lease and options. When the property is a hex string ('aa:bb:cc') it is interpreted as a binary client ID, in which case the first byte is assumed to be the 'type' field as per RFC 2132 section 9.14 and the remaining bytes may be an hardware address (e.g. '01:xx:xx:xx:xx:xx:xx' where 1 is the Ethernet ARP type and the rest is a MAC address). If the property is not a hex string it is considered as a non-hardware-address client ID and the 'type' field is set to 0. The special values "mac" and "perm-mac" are supported, which use the current or permanent MAC address of the device to generate a client identifier with type ethernet (01). Currently, these options only work for ethernet type of links. The special value "duid" generates a RFC4361-compliant client identifier based on a hash of the interface name as IAID and /etc/machine-id. The special value "stable" is supported to generate a type 0 client identifier based on the stable-id (see connection.stable-id) and a per-host key. If you set the stable-id, you may want to include the "${DEVICE}" or "${MAC}" specifier to get a per-device key. If unset, a globally configured default is used. If still unset, the default depends on the DHCP plugin.
     dhcp-fqdndhcp-fqdnstringIf the "dhcp-send-hostname" property is TRUE, then the specified FQDN will be sent to the DHCP server when acquiring a lease. This property and "dhcp-hostname" are mutually exclusive and cannot be set at the same time.
     dhcp-hostnamedhcp-hostnamestringIf the "dhcp-send-hostname" property is TRUE, then the specified name will be sent to the DHCP server when acquiring a lease. This property and "dhcp-fqdn" are mutually exclusive and cannot be set at the same time.
     dhcp-send-hostnamedhcp-send-hostnamebooleanTRUEIf TRUE, a hostname is sent to the DHCP server when acquiring a lease. Some DHCP servers use this hostname to update DNS databases, essentially providing a static hostname for the computer.  If the "dhcp-hostname" property is NULL and this property is TRUE, the current persistent hostname of the computer is sent.
@@ -224,7 +224,7 @@
     address-dataaddress-dataarray of vardictArray of IPv6 addresses. Each address dictionary contains at least 'address' and 'prefix' entries, containing the IP address as a string, and the prefix length as a uint32. Additional attributes may also exist on some addresses.
     addressesaddressesarray of legacy IPv6 address struct (a(ayuay))[]Deprecated in favor of the 'address-data' and 'gateway' properties, but this can be used for backward-compatibility with older daemons. Note that if you send this property the daemon will ignore 'address-data' and 'gateway'.  Array of IPv6 address structures.  Each IPv6 address structure is composed of an IPv6 address, a prefix length (1 - 128), and an IPv6 gateway address. The gateway may be zeroed out if no gateway exists for that subnet.
     dad-timeoutdad-timeoutint32-1Timeout in milliseconds used to check for the presence of duplicate IP addresses on the network.  If an address conflict is detected, the activation will fail.  A zero value means that no duplicate address detection is performed, -1 means the default value (either configuration ipvx.dad-timeout override or zero).  A value greater than zero is a timeout in milliseconds. The property is currently implemented only for IPv4.
-    dhcp-duiddhcp-duidstringA string containing the DHCPv6 Unique Identifier (DUID) used by the dhcp client to identify itself to DHCPv6 servers (RFC 3315). The DUID is carried in the Client Identifier option. If the property is a hex string ('aa:bb:cc') it is interpreted as a binary DUID and filled as an opaque value in the Client Identifier option. The special value "lease" will retrieve the DUID previously used from the lease file belonging to the connection. If no DUID is found and "dhclient" is the configured dhcp client, the DUID is searched in the system-wide dhclient lease file. If still no DUID is found, or another dhcp client is used, a global and permanent DUID-UUID (RFC 6355) will be generated based on the machine-id. The special values "llt" and "ll" will generate a DUID of type LLT or LL (see RFC 3315) based on the current MAC address of the device. In order to try providing a stable DUID-LLT, the time field will contain a constant timestamp that is used globally (for all profiles) and persisted to disk. The special values "stable-llt", "stable-ll" and "stable-uuid" will generate a DUID of the corresponding type, derived from the connection's stable-id and a per-host unique key. So, the link-layer address of "stable-ll" and "stable-llt" will be a generated address derived from the stable id. The DUID-LLT time value in the "stable-llt" option will be picked among a static timespan of three years (the upper bound of the interval is the same constant timestamp used in "llt"). When the property is unset, the global value provided for "ipv6.dhcp-duid" is used. If no global value is provided, the default "lease" value is assumed.
+    dhcp-duiddhcp-duidstringA string containing the DHCPv6 Unique Identifier (DUID) used by the dhcp client to identify itself to DHCPv6 servers (RFC 3315). The DUID is carried in the Client Identifier option. If the property is a hex string ('aa:bb:cc') it is interpreted as a binary DUID and filled as an opaque value in the Client Identifier option. The special value "lease" will retrieve the DUID previously used from the lease file belonging to the connection. If no DUID is found and "dhclient" is the configured dhcp client, the DUID is searched in the system-wide dhclient lease file. If still no DUID is found, or another dhcp client is used, a global and permanent DUID-UUID (RFC 6355) will be generated based on the machine-id. The special values "llt" and "ll" will generate a DUID of type LLT or LL (see RFC 3315) based on the current MAC address of the device. In order to try providing a stable DUID-LLT, the time field will contain a constant timestamp that is used globally (for all profiles) and persisted to disk. The special values "stable-llt", "stable-ll" and "stable-uuid" will generate a DUID of the corresponding type, derived from the connection's stable-id and a per-host unique key. You may want to include the "${DEVICE}" or "${MAC}" specifier in the stable-id, in case this profile gets activated on multiple devices. So, the link-layer address of "stable-ll" and "stable-llt" will be a generated address derived from the stable id. The DUID-LLT time value in the "stable-llt" option will be picked among a static timespan of three years (the upper bound of the interval is the same constant timestamp used in "llt"). When the property is unset, the global value provided for "ipv6.dhcp-duid" is used. If no global value is provided, the default "lease" value is assumed.
     dhcp-hostnamedhcp-hostnamestringIf the "dhcp-send-hostname" property is TRUE, then the specified name will be sent to the DHCP server when acquiring a lease. This property and "dhcp-fqdn" are mutually exclusive and cannot be set at the same time.
     dhcp-send-hostnamedhcp-send-hostnamebooleanTRUEIf TRUE, a hostname is sent to the DHCP server when acquiring a lease. Some DHCP servers use this hostname to update DNS databases, essentially providing a static hostname for the computer.  If the "dhcp-hostname" property is NULL and this property is TRUE, the current persistent hostname of the computer is sent.
     dhcp-timeoutdhcp-timeoutint320A timeout for a DHCP transaction in seconds.
@@ -375,8 +375,8 @@
             Properties
         Key NameValue TypeDefault ValueValue Descriptionautoprobe-driversautoprobe-driversNMTernary (int32)Whether to autoprobe virtual functions by a compatible driver. If set to NM_TERNARY_TRUE (1), the kernel will try to bind VFs to a compatible driver and if this succeeds a new network interface will be instantiated for each VF. If set to NM_TERNARY_FALSE (0), VFs will not be claimed and no network interfaces will be created for them. When set to NM_TERNARY_DEFAULT (-1), the global default is used; in case the global default is unspecified it is assumed to be NM_TERNARY_TRUE (1).
-    total-vfstotal-vfsuint320The total number of virtual functions to create.
-    vfsvfsarray of vardict[]Array of virtual function descriptors. Each VF descriptor is a dictionary mapping attribute names to GVariant values. The 'index' entry is mandatory for each VF. When represented as string a VF is in the form: "INDEX [ATTR=VALUE[ ATTR=VALUE]...]". for example: "2 mac=00:11:22:33:44:55 spoof-check=true". The "vlans" attribute is represented as a semicolor-separated list of VLAN descriptors, where each descriptor has the form "ID[.PRIORITY[.PROTO]]". PROTO can be either 'q' for 802.1Q (the default) or 'ad' for 802.1ad.
+    total-vfstotal-vfsuint320The total number of virtual functions to create. Note that when the sriov setting is present NetworkManager enforces the number of virtual functions on the interface also when it is zero. To prevent any changes to SR-IOV parameters don't add a sriov setting to the connection.
+    vfsvfsarray of vardict[]Array of virtual function descriptors. Each VF descriptor is a dictionary mapping attribute names to GVariant values. The 'index' entry is mandatory for each VF. When represented as string a VF is in the form: "INDEX [ATTR=VALUE[ ATTR=VALUE]...]". for example: "2 mac=00:11:22:33:44:55 spoof-check=true". Multiple VFs can be specified using a comma as separator. Currently the following attributes are supported: mac, spoof-check, trust, min-tx-rate, max-tx-rate, vlans. The "vlans" attribute is represented as a semicolon-separated list of VLAN descriptors, where each descriptor has the form "ID[.PRIORITY[.PROTO]]". PROTO can be either 'q' for 802.1Q (the default) or 'ad' for 802.1ad.

     
   

   tcLinux Traffic Control Settings.
             Properties
diff --git a/docs/api/version.xml b/docs/api/version.xml
index 4e00d0ac..c6ba3bc1 100644
--- a/docs/api/version.xml
+++ b/docs/api/version.xml
@@ -1 +1 @@
-1.14.4
+1.14.6
diff --git a/docs/libnm-glib/html/NMAccessPoint.html b/docs/libnm-glib/html/NMAccessPoint.html
index eb0dee41..2999503d 100644
--- a/docs/libnm-glib/html/NMAccessPoint.html
+++ b/docs/libnm-glib/html/NMAccessPoint.html
@@ -8,7 +8,7 @@
 <link rel="up" href="ch02.html" title="libnm-glib API Reference">
 <link rel="prev" href="NMWimaxNsp.html" title="NMWimaxNsp">
 <link rel="next" href="NMIP4Config.html" title="NMIP4Config">
-<meta name="generator" content="GTK-Doc V1.29.1 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.29 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -51,7 +51,7 @@
 </tr>
 <tr>
 <td class="function_type">
-<a href="/usr/share/gtk-doc/html/libnm/libnm-nm-dbus-interface.html#NM80211ApFlags"><span class="returnvalue">NM80211ApFlags</span></a>
+<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManager.html#NM80211ApFlags"><span class="returnvalue">NM80211ApFlags</span></a>
 </td>
 <td class="function_name">
 <a class="link" href="NMAccessPoint.html#nm-access-point-get-flags" title="nm_access_point_get_flags ()">nm_access_point_get_flags</a> <span class="c_punctuation">()</span>
@@ -59,7 +59,7 @@
 </tr>
 <tr>
 <td class="function_type">
-<a href="/usr/share/gtk-doc/html/libnm/libnm-nm-dbus-interface.html#NM80211ApSecurityFlags"><span class="returnvalue">NM80211ApSecurityFlags</span></a>
+<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManager.html#NM80211ApSecurityFlags"><span class="returnvalue">NM80211ApSecurityFlags</span></a>
 </td>
 <td class="function_name">
 <a class="link" href="NMAccessPoint.html#nm-access-point-get-wpa-flags" title="nm_access_point_get_wpa_flags ()">nm_access_point_get_wpa_flags</a> <span class="c_punctuation">()</span>
@@ -67,7 +67,7 @@
 </tr>
 <tr>
 <td class="function_type">
-<a href="/usr/share/gtk-doc/html/libnm/libnm-nm-dbus-interface.html#NM80211ApSecurityFlags"><span class="returnvalue">NM80211ApSecurityFlags</span></a>
+<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManager.html#NM80211ApSecurityFlags"><span class="returnvalue">NM80211ApSecurityFlags</span></a>
 </td>
 <td class="function_name">
 <a class="link" href="NMAccessPoint.html#nm-access-point-get-rsn-flags" title="nm_access_point_get_rsn_flags ()">nm_access_point_get_rsn_flags</a> <span class="c_punctuation">()</span>
@@ -97,7 +97,7 @@
 </tr>
 <tr>
 <td class="function_type">
-<a href="/usr/share/gtk-doc/html/libnm/libnm-nm-dbus-interface.html#NM80211Mode"><span class="returnvalue">NM80211Mode</span></a>
+<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManager.html#NM80211Mode"><span class="returnvalue">NM80211Mode</span></a>
 </td>
 <td class="function_name">
 <a class="link" href="NMAccessPoint.html#nm-access-point-get-mode" title="nm_access_point_get_mode ()">nm_access_point_get_mode</a> <span class="c_punctuation">()</span>
@@ -327,7 +327,7 @@ nm_access_point_new (<em class="parameter"><code><a href="/usr/share/gtk-doc/htm
 <hr>
 <div class="refsect2">
 <a name="nm-access-point-get-flags"></a><h3>nm_access_point_get_flags ()</h3>
-<pre class="programlisting"><a href="/usr/share/gtk-doc/html/libnm/libnm-nm-dbus-interface.html#NM80211ApFlags"><span class="returnvalue">NM80211ApFlags</span></a>
+<pre class="programlisting"><a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManager.html#NM80211ApFlags"><span class="returnvalue">NM80211ApFlags</span></a>
 nm_access_point_get_flags (<em class="parameter"><code><a class="link" href="NMAccessPoint.html" title="NMAccessPoint"><span class="type">NMAccessPoint</span></a> *ap</code></em>);</pre>
 <p>Gets the flags of the access point.</p>
 <div class="refsect3">
@@ -353,7 +353,7 @@ nm_access_point_get_flags (<em class="parameter"><code><a class="link" href="NMA
 <hr>
 <div class="refsect2">
 <a name="nm-access-point-get-wpa-flags"></a><h3>nm_access_point_get_wpa_flags ()</h3>
-<pre class="programlisting"><a href="/usr/share/gtk-doc/html/libnm/libnm-nm-dbus-interface.html#NM80211ApSecurityFlags"><span class="returnvalue">NM80211ApSecurityFlags</span></a>
+<pre class="programlisting"><a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManager.html#NM80211ApSecurityFlags"><span class="returnvalue">NM80211ApSecurityFlags</span></a>
 nm_access_point_get_wpa_flags (<em class="parameter"><code><a class="link" href="NMAccessPoint.html" title="NMAccessPoint"><span class="type">NMAccessPoint</span></a> *ap</code></em>);</pre>
 <p>Gets the WPA (version 1) flags of the access point.</p>
 <div class="refsect3">
@@ -379,7 +379,7 @@ nm_access_point_get_wpa_flags (<em class="parameter"><code><a class="link" href=
 <hr>
 <div class="refsect2">
 <a name="nm-access-point-get-rsn-flags"></a><h3>nm_access_point_get_rsn_flags ()</h3>
-<pre class="programlisting"><a href="/usr/share/gtk-doc/html/libnm/libnm-nm-dbus-interface.html#NM80211ApSecurityFlags"><span class="returnvalue">NM80211ApSecurityFlags</span></a>
+<pre class="programlisting"><a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManager.html#NM80211ApSecurityFlags"><span class="returnvalue">NM80211ApSecurityFlags</span></a>
 nm_access_point_get_rsn_flags (<em class="parameter"><code><a class="link" href="NMAccessPoint.html" title="NMAccessPoint"><span class="type">NMAccessPoint</span></a> *ap</code></em>);</pre>
 <p>Gets the RSN (Robust Secure Network, ie WPA version 2) flags of the access
 point.</p>
@@ -486,7 +486,7 @@ nm_access_point_get_frequency (<em class="parameter"><code><a class="link" href=
 <hr>
 <div class="refsect2">
 <a name="nm-access-point-get-mode"></a><h3>nm_access_point_get_mode ()</h3>
-<pre class="programlisting"><a href="/usr/share/gtk-doc/html/libnm/libnm-nm-dbus-interface.html#NM80211Mode"><span class="returnvalue">NM80211Mode</span></a>
+<pre class="programlisting"><a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManager.html#NM80211Mode"><span class="returnvalue">NM80211Mode</span></a>
 nm_access_point_get_mode (<em class="parameter"><code><a class="link" href="NMAccessPoint.html" title="NMAccessPoint"><span class="type">NMAccessPoint</span></a> *ap</code></em>);</pre>
 <p>Gets the mode of the access point.</p>
 <div class="refsect3">
@@ -622,7 +622,7 @@ filter that list with this function.</p>
 <tr>
 <td class="parameter_name"><p>connections</p></td>
 <td class="parameter_description"><p>a list of
-<span class="type">NMConnection</span> objects to filter. </p></td>
+<a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html#NMConnection-struct"><span class="type">NMConnection</span></a> objects to filter. </p></td>
 <td class="parameter_annotations"><span class="annotation">[<acronym title="Generics and defining elements of containers and arrays."><span class="acronym">element-type</span></acronym> NMConnection]</span></td>
 </tr>
 </tbody>
@@ -631,7 +631,7 @@ filter that list with this function.</p>
 <div class="refsect3">
 <a name="nm-access-point-filter-connections.returns"></a><h4>Returns</h4>
 <p>a
-list of <span class="type">NMConnection</span> objects that could be activated with the given <em class="parameter"><code>ap</code></em>
+list of <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html#NMConnection-struct"><span class="type">NMConnection</span></a> objects that could be activated with the given <em class="parameter"><code>ap</code></em>
 .
 The elements of the list are owned by their creator and should not be freed
 by the caller, but the returned list itself is owned by the caller and should
@@ -644,7 +644,7 @@ be freed with <a href="https://developer.gnome.org/glib/unstable/glib-Singly-Lin
 <a name="nm-access-point-connection-valid"></a><h3>nm_access_point_connection_valid ()</h3>
 <pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
 nm_access_point_connection_valid (<em class="parameter"><code><a class="link" href="NMAccessPoint.html" title="NMAccessPoint"><span class="type">NMAccessPoint</span></a> *ap</code></em>,
-                                  <em class="parameter"><code><span class="type">NMConnection</span> *connection</code></em>);</pre>
+                                  <em class="parameter"><code><a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html#NMConnection-struct"><span class="type">NMConnection</span></a> *connection</code></em>);</pre>
 <p>Validates a given connection against a given Wi-Fi access point to ensure that
 the connection may be activated with that AP.  The connection must match the
 <em class="parameter"><code>ap</code></em>
@@ -667,7 +667,7 @@ against</p></td>
 </tr>
 <tr>
 <td class="parameter_name"><p>connection</p></td>
-<td class="parameter_description"><p>an <span class="type">NMConnection</span> to validate against <em class="parameter"><code>ap</code></em>
+<td class="parameter_description"><p>an <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html#NMConnection-struct"><span class="type">NMConnection</span></a> to validate against <em class="parameter"><code>ap</code></em>
 </p></td>
 <td class="parameter_annotations"> </td>
 </tr>
@@ -880,6 +880,6 @@ coordinator of the wireless network allowing clients to connect) or
 </div>
 </div>
 <div class="footer">
-<hr>Generated by GTK-Doc V1.29.1</div>
+<hr>Generated by GTK-Doc V1.29</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm-glib/html/NMActiveConnection.html b/docs/libnm-glib/html/NMActiveConnection.html
index e597dc86..1f4692e0 100644
--- a/docs/libnm-glib/html/NMActiveConnection.html
+++ b/docs/libnm-glib/html/NMActiveConnection.html
@@ -8,7 +8,7 @@
 <link rel="up" href="ch02.html" title="libnm-glib API Reference">
 <link rel="prev" href="NMClient.html" title="NMClient">
 <link rel="next" href="NMDevice.html" title="NMDevice">
-<meta name="generator" content="GTK-Doc V1.29.1 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.29 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -93,7 +93,7 @@
 </tr>
 <tr>
 <td class="function_type">
-<a href="/usr/share/gtk-doc/html/libnm/libnm-nm-dbus-interface.html#NMActiveConnectionState"><span class="returnvalue">NMActiveConnectionState</span></a>
+<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManager.html#NMActiveConnectionState"><span class="returnvalue">NMActiveConnectionState</span></a>
 </td>
 <td class="function_name">
 <a class="link" href="NMActiveConnection.html#nm-active-connection-get-state" title="nm_active_connection_get_state ()">nm_active_connection_get_state</a> <span class="c_punctuation">()</span>
@@ -386,7 +386,7 @@ nm_active_connection_new (<em class="parameter"><code><a href="/usr/share/gtk-do
 <a name="nm-active-connection-get-connection"></a><h3>nm_active_connection_get_connection ()</h3>
 <pre class="programlisting">const <span class="returnvalue">char</span> *
 nm_active_connection_get_connection (<em class="parameter"><code><a class="link" href="NMActiveConnection.html" title="NMActiveConnection"><span class="type">NMActiveConnection</span></a> *connection</code></em>);</pre>
-<p>Gets the <span class="type">NMConnection</span>'s DBus object path.  This is often used with
+<p>Gets the <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html#NMConnection-struct"><span class="type">NMConnection</span></a>'s DBus object path.  This is often used with
 <a class="link" href="NMRemoteSettings.html#nm-remote-settings-get-connection-by-path" title="nm_remote_settings_get_connection_by_path ()"><code class="function">nm_remote_settings_get_connection_by_path()</code></a> to retrieve the
 <a class="link" href="NMRemoteConnection.html" title="NMRemoteConnection"><span class="type">NMRemoteConnection</span></a> object that describes the connection.</p>
 <div class="refsect3">
@@ -406,7 +406,7 @@ nm_active_connection_get_connection (<em class="parameter"><code><a class="link"
 </div>
 <div class="refsect3">
 <a name="nm-active-connection-get-connection.returns"></a><h4>Returns</h4>
-<p> the object path of the <span class="type">NMConnection</span> which this <a class="link" href="NMActiveConnection.html" title="NMActiveConnection"><span class="type">NMActiveConnection</span></a>
+<p> the object path of the <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html#NMConnection-struct"><span class="type">NMConnection</span></a> which this <a class="link" href="NMActiveConnection.html" title="NMActiveConnection"><span class="type">NMActiveConnection</span></a>
 is an active instance of.  This is the internal string used by the
 connection, and must not be modified.</p>
 </div>
@@ -416,7 +416,7 @@ connection, and must not be modified.</p>
 <a name="nm-active-connection-get-id"></a><h3>nm_active_connection_get_id ()</h3>
 <pre class="programlisting">const <span class="returnvalue">char</span> *
 nm_active_connection_get_id (<em class="parameter"><code><a class="link" href="NMActiveConnection.html" title="NMActiveConnection"><span class="type">NMActiveConnection</span></a> *connection</code></em>);</pre>
-<p>Gets the <span class="type">NMConnection</span>'s ID.</p>
+<p>Gets the <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html#NMConnection-struct"><span class="type">NMConnection</span></a>'s ID.</p>
 <div class="refsect3">
 <a name="nm-active-connection-get-id.parameters"></a><h4>Parameters</h4>
 <div class="informaltable"><table class="informaltable" width="100%" border="0">
@@ -434,7 +434,7 @@ nm_active_connection_get_id (<em class="parameter"><code><a class="link" href="N
 </div>
 <div class="refsect3">
 <a name="nm-active-connection-get-id.returns"></a><h4>Returns</h4>
-<p> the ID of the <span class="type">NMConnection</span> that backs the <a class="link" href="NMActiveConnection.html" title="NMActiveConnection"><span class="type">NMActiveConnection</span></a>.
+<p> the ID of the <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html#NMConnection-struct"><span class="type">NMConnection</span></a> that backs the <a class="link" href="NMActiveConnection.html" title="NMActiveConnection"><span class="type">NMActiveConnection</span></a>.
 This is the internal string used by the connection, and must not be modified.</p>
 </div>
 <p class="since">Since: 0.9.10</p>
@@ -444,7 +444,7 @@ This is the internal string used by the connection, and must not be modified.</p
 <a name="nm-active-connection-get-uuid"></a><h3>nm_active_connection_get_uuid ()</h3>
 <pre class="programlisting">const <span class="returnvalue">char</span> *
 nm_active_connection_get_uuid (<em class="parameter"><code><a class="link" href="NMActiveConnection.html" title="NMActiveConnection"><span class="type">NMActiveConnection</span></a> *connection</code></em>);</pre>
-<p>Gets the <span class="type">NMConnection</span>'s UUID.</p>
+<p>Gets the <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html#NMConnection-struct"><span class="type">NMConnection</span></a>'s UUID.</p>
 <div class="refsect3">
 <a name="nm-active-connection-get-uuid.parameters"></a><h4>Parameters</h4>
 <div class="informaltable"><table class="informaltable" width="100%" border="0">
@@ -462,7 +462,7 @@ nm_active_connection_get_uuid (<em class="parameter"><code><a class="link" href=
 </div>
 <div class="refsect3">
 <a name="nm-active-connection-get-uuid.returns"></a><h4>Returns</h4>
-<p> the UUID of the <span class="type">NMConnection</span> that backs the <a class="link" href="NMActiveConnection.html" title="NMActiveConnection"><span class="type">NMActiveConnection</span></a>.
+<p> the UUID of the <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html#NMConnection-struct"><span class="type">NMConnection</span></a> that backs the <a class="link" href="NMActiveConnection.html" title="NMActiveConnection"><span class="type">NMActiveConnection</span></a>.
 This is the internal string used by the connection, and must not be modified.</p>
 </div>
 </div>
@@ -472,7 +472,7 @@ This is the internal string used by the connection, and must not be modified.</p
 <pre class="programlisting">const <span class="returnvalue">char</span> *
 nm_active_connection_get_connection_type
                                (<em class="parameter"><code><a class="link" href="NMActiveConnection.html" title="NMActiveConnection"><span class="type">NMActiveConnection</span></a> *connection</code></em>);</pre>
-<p>Gets the <span class="type">NMConnection</span>'s type.</p>
+<p>Gets the <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html#NMConnection-struct"><span class="type">NMConnection</span></a>'s type.</p>
 <div class="refsect3">
 <a name="nm-active-connection-get-connection-type.parameters"></a><h4>Parameters</h4>
 <div class="informaltable"><table class="informaltable" width="100%" border="0">
@@ -490,7 +490,7 @@ nm_active_connection_get_connection_type
 </div>
 <div class="refsect3">
 <a name="nm-active-connection-get-connection-type.returns"></a><h4>Returns</h4>
-<p> the type of the <span class="type">NMConnection</span> that backs the <a class="link" href="NMActiveConnection.html" title="NMActiveConnection"><span class="type">NMActiveConnection</span></a>.
+<p> the type of the <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html#NMConnection-struct"><span class="type">NMConnection</span></a> that backs the <a class="link" href="NMActiveConnection.html" title="NMActiveConnection"><span class="type">NMActiveConnection</span></a>.
 This is the internal string used by the connection, and must not be modified.</p>
 </div>
 <p class="since">Since: 0.9.10</p>
@@ -554,7 +554,7 @@ This is the internal copy used by the connection, and must not be modified. </p>
 <hr>
 <div class="refsect2">
 <a name="nm-active-connection-get-state"></a><h3>nm_active_connection_get_state ()</h3>
-<pre class="programlisting"><a href="/usr/share/gtk-doc/html/libnm/libnm-nm-dbus-interface.html#NMActiveConnectionState"><span class="returnvalue">NMActiveConnectionState</span></a>
+<pre class="programlisting"><a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManager.html#NMActiveConnectionState"><span class="returnvalue">NMActiveConnectionState</span></a>
 nm_active_connection_get_state (<em class="parameter"><code><a class="link" href="NMActiveConnection.html" title="NMActiveConnection"><span class="type">NMActiveConnection</span></a> *connection</code></em>);</pre>
 <p>Gets the active connection's state.</p>
 <div class="refsect3">
@@ -655,7 +655,7 @@ nm_active_connection_get_ip4_config (<em class="parameter"><code><a class="link"
 <div class="refsect3">
 <a name="nm-active-connection-get-ip4-config.returns"></a><h4>Returns</h4>
 <p>the <a class="link" href="NMIP4Config.html" title="NMIP4Config"><span class="type">NMIP4Config</span></a>, or <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> if the
-connection is not in the <a href="/usr/share/gtk-doc/html/libnm/libnm-nm-dbus-interface.html#NM-ACTIVE-CONNECTION-STATE-ACTIVATED:CAPS"><code class="literal">NM_ACTIVE_CONNECTION_STATE_ACTIVATED</code></a>
+connection is not in the <a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManager.html#NM-ACTIVE-CONNECTION-STATE-ACTIVATED:CAPS"><code class="literal">NM_ACTIVE_CONNECTION_STATE_ACTIVATED</code></a>
 state. </p>
 <p><span class="annotation">[<acronym title="Don't free data after the code is done."><span class="acronym">transfer none</span></acronym>]</span></p>
 </div>
@@ -687,7 +687,7 @@ nm_active_connection_get_dhcp4_config (<em class="parameter"><code><a class="lin
 <a name="nm-active-connection-get-dhcp4-config.returns"></a><h4>Returns</h4>
 <p>the <a class="link" href="NMDHCP4Config.html" title="NMDHCP4Config"><span class="type">NMDHCP4Config</span></a>, or <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> if the
 connection does not use DHCP, or is not in the
-<a href="/usr/share/gtk-doc/html/libnm/libnm-nm-dbus-interface.html#NM-ACTIVE-CONNECTION-STATE-ACTIVATED:CAPS"><code class="literal">NM_ACTIVE_CONNECTION_STATE_ACTIVATED</code></a> state. </p>
+<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManager.html#NM-ACTIVE-CONNECTION-STATE-ACTIVATED:CAPS"><code class="literal">NM_ACTIVE_CONNECTION_STATE_ACTIVATED</code></a> state. </p>
 <p><span class="annotation">[<acronym title="Don't free data after the code is done."><span class="acronym">transfer none</span></acronym>]</span></p>
 </div>
 <p class="since">Since: 0.9.10</p>
@@ -743,7 +743,7 @@ nm_active_connection_get_ip6_config (<em class="parameter"><code><a class="link"
 <div class="refsect3">
 <a name="nm-active-connection-get-ip6-config.returns"></a><h4>Returns</h4>
 <p>the <a class="link" href="NMIP6Config.html" title="NMIP6Config"><span class="type">NMIP6Config</span></a>, or <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> if the
-connection is not in the <a href="/usr/share/gtk-doc/html/libnm/libnm-nm-dbus-interface.html#NM-ACTIVE-CONNECTION-STATE-ACTIVATED:CAPS"><code class="literal">NM_ACTIVE_CONNECTION_STATE_ACTIVATED</code></a>
+connection is not in the <a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManager.html#NM-ACTIVE-CONNECTION-STATE-ACTIVATED:CAPS"><code class="literal">NM_ACTIVE_CONNECTION_STATE_ACTIVATED</code></a>
 state. </p>
 <p><span class="annotation">[<acronym title="Don't free data after the code is done."><span class="acronym">transfer none</span></acronym>]</span></p>
 </div>
@@ -775,7 +775,7 @@ nm_active_connection_get_dhcp6_config (<em class="parameter"><code><a class="lin
 <a name="nm-active-connection-get-dhcp6-config.returns"></a><h4>Returns</h4>
 <p>the <a class="link" href="NMDHCP6Config.html" title="NMDHCP6Config"><span class="type">NMDHCP6Config</span></a>, or <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> if the
 connection does not use DHCPv6, or is not in the
-<a href="/usr/share/gtk-doc/html/libnm/libnm-nm-dbus-interface.html#NM-ACTIVE-CONNECTION-STATE-ACTIVATED:CAPS"><code class="literal">NM_ACTIVE_CONNECTION_STATE_ACTIVATED</code></a> state. </p>
+<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManager.html#NM-ACTIVE-CONNECTION-STATE-ACTIVATED:CAPS"><code class="literal">NM_ACTIVE_CONNECTION_STATE_ACTIVATED</code></a> state. </p>
 <p><span class="annotation">[<acronym title="Don't free data after the code is done."><span class="acronym">transfer none</span></acronym>]</span></p>
 </div>
 <p class="since">Since: 0.9.10</p>
@@ -1026,6 +1026,6 @@ nm_active_connection_get_vpn (<em class="parameter"><code><a class="link" href="
 </div>
 </div>
 <div class="footer">
-<hr>Generated by GTK-Doc V1.29.1</div>
+<hr>Generated by GTK-Doc V1.29</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm-glib/html/NMClient.html b/docs/libnm-glib/html/NMClient.html
index 168910d1..e5532f16 100644
--- a/docs/libnm-glib/html/NMClient.html
+++ b/docs/libnm-glib/html/NMClient.html
@@ -8,7 +8,7 @@
 <link rel="up" href="ch02.html" title="libnm-glib API Reference">
 <link rel="prev" href="ch02.html" title="libnm-glib API Reference">
 <link rel="next" href="NMActiveConnection.html" title="NMActiveConnection">
-<meta name="generator" content="GTK-Doc V1.29.1 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.29 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -241,7 +241,7 @@
 </tr>
 <tr>
 <td class="function_type">
-<a href="/usr/share/gtk-doc/html/libnm/libnm-nm-dbus-interface.html#NMState"><span class="returnvalue">NMState</span></a>
+<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManager.html#NMState"><span class="returnvalue">NMState</span></a>
 </td>
 <td class="function_name">
 <a class="link" href="NMClient.html#nm-client-get-state" title="nm_client_get_state ()">nm_client_get_state</a> <span class="c_punctuation">()</span>
@@ -304,7 +304,7 @@
 </tr>
 <tr>
 <td class="function_type">
-<a href="/usr/share/gtk-doc/html/libnm/libnm-nm-dbus-interface.html#NMConnectivityState"><span class="returnvalue">NMConnectivityState</span></a>
+<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManager.html#NMConnectivityState"><span class="returnvalue">NMConnectivityState</span></a>
 </td>
 <td class="function_name">
 <a class="link" href="NMClient.html#nm-client-get-connectivity" title="nm_client_get_connectivity ()">nm_client_get_connectivity</a> <span class="c_punctuation">()</span>
@@ -312,7 +312,7 @@
 </tr>
 <tr>
 <td class="function_type">
-<a href="/usr/share/gtk-doc/html/libnm/libnm-nm-dbus-interface.html#NMConnectivityState"><span class="returnvalue">NMConnectivityState</span></a>
+<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManager.html#NMConnectivityState"><span class="returnvalue">NMConnectivityState</span></a>
 </td>
 <td class="function_name">
 <a class="link" href="NMClient.html#nm-client-check-connectivity" title="nm_client_check_connectivity ()">nm_client_check_connectivity</a> <span class="c_punctuation">()</span>
@@ -328,7 +328,7 @@
 </tr>
 <tr>
 <td class="function_type">
-<a href="/usr/share/gtk-doc/html/libnm/libnm-nm-dbus-interface.html#NMConnectivityState"><span class="returnvalue">NMConnectivityState</span></a>
+<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManager.html#NMConnectivityState"><span class="returnvalue">NMConnectivityState</span></a>
 </td>
 <td class="function_name">
 <a class="link" href="NMClient.html#nm-client-check-connectivity-finish" title="nm_client_check_connectivity_finish ()">nm_client_check_connectivity_finish</a> <span class="c_punctuation">()</span>
@@ -861,7 +861,7 @@ or <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#
 <a name="nm-client-activate-connection"></a><h3>nm_client_activate_connection ()</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>
 nm_client_activate_connection (<em class="parameter"><code><a class="link" href="NMClient.html" title="NMClient"><span class="type">NMClient</span></a> *client</code></em>,
-                               <em class="parameter"><code><span class="type">NMConnection</span> *connection</code></em>,
+                               <em class="parameter"><code><a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html#NMConnection-struct"><span class="type">NMConnection</span></a> *connection</code></em>,
                                <em class="parameter"><code><a class="link" href="NMDevice.html" title="NMDevice"><span class="type">NMDevice</span></a> *device</code></em>,
                                <em class="parameter"><code>const <span class="type">char</span> *specific_object</code></em>,
                                <em class="parameter"><code><a class="link" href="NMClient.html#NMClientActivateFn" title="NMClientActivateFn ()"><span class="type">NMClientActivateFn</span></a> callback</code></em>,
@@ -899,7 +899,7 @@ track the activation to its completion.</p>
 </tr>
 <tr>
 <td class="parameter_name"><p>connection</p></td>
-<td class="parameter_description"><p>an <span class="type">NMConnection</span>. </p></td>
+<td class="parameter_description"><p>an <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html#NMConnection-struct"><span class="type">NMConnection</span></a>. </p></td>
 <td class="parameter_annotations"><span class="annotation">[<acronym title="NULL is OK, both for passing and for returning."><span class="acronym">allow-none</span></acronym>]</span></td>
 </tr>
 <tr>
@@ -948,7 +948,7 @@ details of the newly added connection. </p></td>
 <a name="nm-client-add-and-activate-connection"></a><h3>nm_client_add_and_activate_connection ()</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>
 nm_client_add_and_activate_connection (<em class="parameter"><code><a class="link" href="NMClient.html" title="NMClient"><span class="type">NMClient</span></a> *client</code></em>,
-                                       <em class="parameter"><code><span class="type">NMConnection</span> *partial</code></em>,
+                                       <em class="parameter"><code><a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html#NMConnection-struct"><span class="type">NMConnection</span></a> *partial</code></em>,
                                        <em class="parameter"><code><a class="link" href="NMDevice.html" title="NMDevice"><span class="type">NMDevice</span></a> *device</code></em>,
                                        <em class="parameter"><code>const <span class="type">char</span> *specific_object</code></em>,
                                        <em class="parameter"><code><a class="link" href="NMClient.html#NMClientAddActivateFn" title="NMClientAddActivateFn ()"><span class="type">NMClientAddActivateFn</span></a> callback</code></em>,
@@ -977,7 +977,7 @@ track the activation to its completion.</p>
 </tr>
 <tr>
 <td class="parameter_name"><p>partial</p></td>
-<td class="parameter_description"><p>an <span class="type">NMConnection</span> to add; the connection may be
+<td class="parameter_description"><p>an <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html#NMConnection-struct"><span class="type">NMConnection</span></a> to add; the connection may be
 partially filled (or even <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>) and will be completed by NetworkManager
 using the given <em class="parameter"><code>device</code></em>
 and <em class="parameter"><code>specific_object</code></em>
@@ -1379,7 +1379,7 @@ nm_client_get_version (<em class="parameter"><code><a class="link" href="NMClien
 <hr>
 <div class="refsect2">
 <a name="nm-client-get-state"></a><h3>nm_client_get_state ()</h3>
-<pre class="programlisting"><a href="/usr/share/gtk-doc/html/libnm/libnm-nm-dbus-interface.html#NMState"><span class="returnvalue">NMState</span></a>
+<pre class="programlisting"><a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManager.html#NMState"><span class="returnvalue">NMState</span></a>
 nm_client_get_state (<em class="parameter"><code><a class="link" href="NMClient.html" title="NMClient"><span class="type">NMClient</span></a> *client</code></em>);</pre>
 <p>Gets the current daemon state.</p>
 <div class="refsect3">
@@ -1399,7 +1399,7 @@ nm_client_get_state (<em class="parameter"><code><a class="link" href="NMClient.
 </div>
 <div class="refsect3">
 <a name="nm-client-get-state.returns"></a><h4>Returns</h4>
-<p> the current <a href="/usr/share/gtk-doc/html/libnm/libnm-nm-dbus-interface.html#NMState"><code class="literal">NMState</code></a></p>
+<p> the current <a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManager.html#NMState"><code class="literal">NMState</code></a></p>
 </div>
 </div>
 <hr>
@@ -1649,7 +1649,7 @@ domains separated by ",". (<a href="https://developer.gnome.org/glib/unstable/gl
 <hr>
 <div class="refsect2">
 <a name="nm-client-get-connectivity"></a><h3>nm_client_get_connectivity ()</h3>
-<pre class="programlisting"><a href="/usr/share/gtk-doc/html/libnm/libnm-nm-dbus-interface.html#NMConnectivityState"><span class="returnvalue">NMConnectivityState</span></a>
+<pre class="programlisting"><a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManager.html#NMConnectivityState"><span class="returnvalue">NMConnectivityState</span></a>
 nm_client_get_connectivity (<em class="parameter"><code><a class="link" href="NMClient.html" title="NMClient"><span class="type">NMClient</span></a> *client</code></em>);</pre>
 <p>Gets the current network connectivity state. Contrast
 <a class="link" href="NMClient.html#nm-client-check-connectivity" title="nm_client_check_connectivity ()"><code class="function">nm_client_check_connectivity()</code></a> and
@@ -1679,7 +1679,7 @@ connectivity state first before returning any information.</p>
 <hr>
 <div class="refsect2">
 <a name="nm-client-check-connectivity"></a><h3>nm_client_check_connectivity ()</h3>
-<pre class="programlisting"><a href="/usr/share/gtk-doc/html/libnm/libnm-nm-dbus-interface.html#NMConnectivityState"><span class="returnvalue">NMConnectivityState</span></a>
+<pre class="programlisting"><a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManager.html#NMConnectivityState"><span class="returnvalue">NMConnectivityState</span></a>
 nm_client_check_connectivity (<em class="parameter"><code><a class="link" href="NMClient.html" title="NMClient"><span class="type">NMClient</span></a> *client</code></em>,
                               <em class="parameter"><code><a href="https://developer.gnome.org/gio/unstable/GCancellable.html#GCancellable-struct"><span class="type">GCancellable</span></a> *cancellable</code></em>,
                               <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> **error</code></em>);</pre>
@@ -1772,7 +1772,7 @@ re-checking, and <a class="link" href="NMClient.html#nm-client-check-connectivit
 <hr>
 <div class="refsect2">
 <a name="nm-client-check-connectivity-finish"></a><h3>nm_client_check_connectivity_finish ()</h3>
-<pre class="programlisting"><a href="/usr/share/gtk-doc/html/libnm/libnm-nm-dbus-interface.html#NMConnectivityState"><span class="returnvalue">NMConnectivityState</span></a>
+<pre class="programlisting"><a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManager.html#NMConnectivityState"><span class="returnvalue">NMConnectivityState</span></a>
 nm_client_check_connectivity_finish (<em class="parameter"><code><a class="link" href="NMClient.html" title="NMClient"><span class="type">NMClient</span></a> *client</code></em>,
                                      <em class="parameter"><code><a href="https://developer.gnome.org/gio/unstable/GAsyncResult.html#GAsyncResult-struct"><span class="type">GAsyncResult</span></a> *result</code></em>,
                                      <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> **error</code></em>);</pre>
@@ -2562,6 +2562,6 @@ user_function (<a class="link" href="NMClient.html" title="NMClient"><span class
 </div>
 </div>
 <div class="footer">
-<hr>Generated by GTK-Doc V1.29.1</div>
+<hr>Generated by GTK-Doc V1.29</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm-glib/html/NMDHCP4Config.html b/docs/libnm-glib/html/NMDHCP4Config.html
index 7c9e7054..29f9307f 100644
--- a/docs/libnm-glib/html/NMDHCP4Config.html
+++ b/docs/libnm-glib/html/NMDHCP4Config.html
@@ -8,7 +8,7 @@
 <link rel="up" href="ch02.html" title="libnm-glib API Reference">
 <link rel="prev" href="NMIP6Config.html" title="NMIP6Config">
 <link rel="next" href="NMDHCP6Config.html" title="NMDHCP6Config">
-<meta name="generator" content="GTK-Doc V1.29.1 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.29 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -224,6 +224,6 @@ configuration, and must not be modified.</p>
 </div>
 </div>
 <div class="footer">
-<hr>Generated by GTK-Doc V1.29.1</div>
+<hr>Generated by GTK-Doc V1.29</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm-glib/html/NMDHCP6Config.html b/docs/libnm-glib/html/NMDHCP6Config.html
index d31ecd57..161a6233 100644
--- a/docs/libnm-glib/html/NMDHCP6Config.html
+++ b/docs/libnm-glib/html/NMDHCP6Config.html
@@ -8,7 +8,7 @@
 <link rel="up" href="ch02.html" title="libnm-glib API Reference">
 <link rel="prev" href="NMDHCP4Config.html" title="NMDHCP4Config">
 <link rel="next" href="NMObject.html" title="NMObject">
-<meta name="generator" content="GTK-Doc V1.29.1 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.29 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -224,6 +224,6 @@ configuration, and must not be modified.</p>
 </div>
 </div>
 <div class="footer">
-<hr>Generated by GTK-Doc V1.29.1</div>
+<hr>Generated by GTK-Doc V1.29</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm-glib/html/NMDevice.html b/docs/libnm-glib/html/NMDevice.html
index d8785659..294b776e 100644
--- a/docs/libnm-glib/html/NMDevice.html
+++ b/docs/libnm-glib/html/NMDevice.html
@@ -8,7 +8,7 @@
 <link rel="up" href="ch02.html" title="libnm-glib API Reference">
 <link rel="prev" href="NMActiveConnection.html" title="NMActiveConnection">
 <link rel="next" href="NMDeviceEthernet.html" title="NMDeviceEthernet">
-<meta name="generator" content="GTK-Doc V1.29.1 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.29 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -74,7 +74,7 @@
 </tr>
 <tr>
 <td class="function_type">
-<a href="/usr/share/gtk-doc/html/libnm/libnm-nm-dbus-interface.html#NMDeviceType"><span class="returnvalue">NMDeviceType</span></a>
+<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManager.html#NMDeviceType"><span class="returnvalue">NMDeviceType</span></a>
 </td>
 <td class="function_name">
 <a class="link" href="NMDevice.html#nm-device-get-device-type" title="nm_device_get_device_type ()">nm_device_get_device_type</a> <span class="c_punctuation">()</span>
@@ -124,7 +124,7 @@
 </tr>
 <tr>
 <td class="function_type">
-<a href="/usr/share/gtk-doc/html/libnm/libnm-nm-dbus-interface.html#NMDeviceCapabilities"><span class="returnvalue">NMDeviceCapabilities</span></a>
+<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManager.html#NMDeviceCapabilities"><span class="returnvalue">NMDeviceCapabilities</span></a>
 </td>
 <td class="function_name">
 <a class="link" href="NMDevice.html#nm-device-get-capabilities" title="nm_device_get_capabilities ()">nm_device_get_capabilities</a> <span class="c_punctuation">()</span>
@@ -204,7 +204,7 @@
 </tr>
 <tr>
 <td class="function_type">
-<a href="/usr/share/gtk-doc/html/libnm/libnm-nm-dbus-interface.html#NMDeviceState"><span class="returnvalue">NMDeviceState</span></a>
+<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManager.html#NMDeviceState"><span class="returnvalue">NMDeviceState</span></a>
 </td>
 <td class="function_name">
 <a class="link" href="NMDevice.html#nm-device-get-state" title="nm_device_get_state ()">nm_device_get_state</a> <span class="c_punctuation">()</span>
@@ -212,7 +212,7 @@
 </tr>
 <tr>
 <td class="function_type">
-<a href="/usr/share/gtk-doc/html/libnm/libnm-nm-dbus-interface.html#NMDeviceState"><span class="returnvalue">NMDeviceState</span></a>
+<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManager.html#NMDeviceState"><span class="returnvalue">NMDeviceState</span></a>
 </td>
 <td class="function_name">
 <a class="link" href="NMDevice.html#nm-device-get-state-reason" title="nm_device_get_state_reason ()">nm_device_get_state_reason</a> <span class="c_punctuation">()</span>
@@ -766,7 +766,7 @@ used by the device, and must not be modified.</p>
 <hr>
 <div class="refsect2">
 <a name="nm-device-get-device-type"></a><h3>nm_device_get_device_type ()</h3>
-<pre class="programlisting"><a href="/usr/share/gtk-doc/html/libnm/libnm-nm-dbus-interface.html#NMDeviceType"><span class="returnvalue">NMDeviceType</span></a>
+<pre class="programlisting"><a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManager.html#NMDeviceType"><span class="returnvalue">NMDeviceType</span></a>
 nm_device_get_device_type (<em class="parameter"><code><a class="link" href="NMDevice.html" title="NMDevice"><span class="type">NMDevice</span></a> *device</code></em>);</pre>
 <p>Returns the numeric type of the <a class="link" href="NMDevice.html" title="NMDevice"><span class="type">NMDevice</span></a>, ie Ethernet, Wi-Fi, etc.</p>
 <div class="refsect3">
@@ -960,7 +960,7 @@ This is the internal string used by the device, and must not be modified.</p>
 <hr>
 <div class="refsect2">
 <a name="nm-device-get-capabilities"></a><h3>nm_device_get_capabilities ()</h3>
-<pre class="programlisting"><a href="/usr/share/gtk-doc/html/libnm/libnm-nm-dbus-interface.html#NMDeviceCapabilities"><span class="returnvalue">NMDeviceCapabilities</span></a>
+<pre class="programlisting"><a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManager.html#NMDeviceCapabilities"><span class="returnvalue">NMDeviceCapabilities</span></a>
 nm_device_get_capabilities (<em class="parameter"><code><a class="link" href="NMDevice.html" title="NMDevice"><span class="type">NMDevice</span></a> *device</code></em>);</pre>
 <p>Gets the device' capabilities.</p>
 <div class="refsect3">
@@ -1249,7 +1249,7 @@ using DHCP. </p>
 <hr>
 <div class="refsect2">
 <a name="nm-device-get-state"></a><h3>nm_device_get_state ()</h3>
-<pre class="programlisting"><a href="/usr/share/gtk-doc/html/libnm/libnm-nm-dbus-interface.html#NMDeviceState"><span class="returnvalue">NMDeviceState</span></a>
+<pre class="programlisting"><a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManager.html#NMDeviceState"><span class="returnvalue">NMDeviceState</span></a>
 nm_device_get_state (<em class="parameter"><code><a class="link" href="NMDevice.html" title="NMDevice"><span class="type">NMDevice</span></a> *device</code></em>);</pre>
 <p>Gets the current <a class="link" href="NMDevice.html" title="NMDevice"><span class="type">NMDevice</span></a> state.</p>
 <div class="refsect3">
@@ -1275,9 +1275,9 @@ nm_device_get_state (<em class="parameter"><code><a class="link" href="NMDevice.
 <hr>
 <div class="refsect2">
 <a name="nm-device-get-state-reason"></a><h3>nm_device_get_state_reason ()</h3>
-<pre class="programlisting"><a href="/usr/share/gtk-doc/html/libnm/libnm-nm-dbus-interface.html#NMDeviceState"><span class="returnvalue">NMDeviceState</span></a>
+<pre class="programlisting"><a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManager.html#NMDeviceState"><span class="returnvalue">NMDeviceState</span></a>
 nm_device_get_state_reason (<em class="parameter"><code><a class="link" href="NMDevice.html" title="NMDevice"><span class="type">NMDevice</span></a> *device</code></em>,
-                            <em class="parameter"><code><a href="/usr/share/gtk-doc/html/libnm/libnm-nm-dbus-interface.html#NMDeviceStateReason"><span class="type">NMDeviceStateReason</span></a> *reason</code></em>);</pre>
+                            <em class="parameter"><code><a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManager.html#NMDeviceStateReason"><span class="type">NMDeviceStateReason</span></a> *reason</code></em>);</pre>
 <p>Gets the current <a class="link" href="NMDevice.html" title="NMDevice"><span class="type">NMDevice</span></a> state (return value) and the reason for entering
 the state (<em class="parameter"><code>reason</code></em>
  argument).</p>
@@ -1297,7 +1297,7 @@ the state (<em class="parameter"><code>reason</code></em>
 </tr>
 <tr>
 <td class="parameter_name"><p>reason</p></td>
-<td class="parameter_description"><p>location to store reason (<a href="/usr/share/gtk-doc/html/libnm/libnm-nm-dbus-interface.html#NMDeviceStateReason"><span class="type">NMDeviceStateReason</span></a>), or <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>. </p></td>
+<td class="parameter_description"><p>location to store reason (<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManager.html#NMDeviceStateReason"><span class="type">NMDeviceStateReason</span></a>), or <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>. </p></td>
 <td class="parameter_annotations"><span class="annotation">[<acronym title="Parameter for returning results. Default is transfer full."><span class="acronym">out</span></acronym>][<acronym title="NULL is OK, both for passing and for returning."><span class="acronym">allow-none</span></acronym>]</span></td>
 </tr>
 </tbody>
@@ -1725,7 +1725,7 @@ incompatible with the device. To get the full list of connections see
 </tr>
 <tr>
 <td class="parameter_name"><p>connections</p></td>
-<td class="parameter_description"><p>a list of <span class="type">NMConnection</span> objects to filter. </p></td>
+<td class="parameter_description"><p>a list of <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html#NMConnection-struct"><span class="type">NMConnection</span></a> objects to filter. </p></td>
 <td class="parameter_annotations"><span class="annotation">[<acronym title="Generics and defining elements of containers and arrays."><span class="acronym">element-type</span></acronym> NMConnection]</span></td>
 </tr>
 </tbody>
@@ -1734,7 +1734,7 @@ incompatible with the device. To get the full list of connections see
 <div class="refsect3">
 <a name="nm-device-filter-connections.returns"></a><h4>Returns</h4>
 <p>a
-list of <span class="type">NMConnection</span> objects that could be activated with the given <em class="parameter"><code>device</code></em>
+list of <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html#NMConnection-struct"><span class="type">NMConnection</span></a> objects that could be activated with the given <em class="parameter"><code>device</code></em>
 .
 The elements of the list are owned by their creator and should not be freed
 by the caller, but the returned list itself is owned by the caller and should
@@ -1747,7 +1747,7 @@ be freed with <a href="https://developer.gnome.org/glib/unstable/glib-Singly-Lin
 <a name="nm-device-connection-valid"></a><h3>nm_device_connection_valid ()</h3>
 <pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
 nm_device_connection_valid (<em class="parameter"><code><a class="link" href="NMDevice.html" title="NMDevice"><span class="type">NMDevice</span></a> *device</code></em>,
-                            <em class="parameter"><code><span class="type">NMConnection</span> *connection</code></em>);</pre>
+                            <em class="parameter"><code><a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html#NMConnection-struct"><span class="type">NMConnection</span></a> *connection</code></em>);</pre>
 <p>Validates a given connection for a given <a class="link" href="NMDevice.html" title="NMDevice"><span class="type">NMDevice</span></a> object and returns
 whether the connection may be activated with the device. For example if
 <em class="parameter"><code>device</code></em>
@@ -1773,7 +1773,7 @@ against</p></td>
 </tr>
 <tr>
 <td class="parameter_name"><p>connection</p></td>
-<td class="parameter_description"><p>an <span class="type">NMConnection</span> to validate against <em class="parameter"><code>device</code></em>
+<td class="parameter_description"><p>an <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html#NMConnection-struct"><span class="type">NMConnection</span></a> to validate against <em class="parameter"><code>device</code></em>
 </p></td>
 <td class="parameter_annotations"> </td>
 </tr>
@@ -1791,7 +1791,7 @@ if is incompatible with the device's capabilities and characteristics.</p>
 <a name="nm-device-connection-compatible"></a><h3>nm_device_connection_compatible ()</h3>
 <pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
 nm_device_connection_compatible (<em class="parameter"><code><a class="link" href="NMDevice.html" title="NMDevice"><span class="type">NMDevice</span></a> *device</code></em>,
-                                 <em class="parameter"><code><span class="type">NMConnection</span> *connection</code></em>,
+                                 <em class="parameter"><code><a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html#NMConnection-struct"><span class="type">NMConnection</span></a> *connection</code></em>,
                                  <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> **error</code></em>);</pre>
 <p>Validates a given connection for a given <a class="link" href="NMDevice.html" title="NMDevice"><span class="type">NMDevice</span></a> object and returns
 whether the connection may be activated with the device. For example if
@@ -1821,7 +1821,7 @@ against</p></td>
 </tr>
 <tr>
 <td class="parameter_name"><p>connection</p></td>
-<td class="parameter_description"><p>an <span class="type">NMConnection</span> to validate against <em class="parameter"><code>device</code></em>
+<td class="parameter_description"><p>an <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html#NMConnection-struct"><span class="type">NMConnection</span></a> to validate against <em class="parameter"><code>device</code></em>
 </p></td>
 <td class="parameter_annotations"> </td>
 </tr>
@@ -1844,7 +1844,7 @@ if is incompatible with the device's capabilities and characteristics.</p>
 <a name="nm-device-get-setting-type"></a><h3>nm_device_get_setting_type ()</h3>
 <pre class="programlisting"><a href="https://developer.gnome.org/gobject/unstable/gobject-Type-Information.html#GType"><span class="returnvalue">GType</span></a>
 nm_device_get_setting_type (<em class="parameter"><code><a class="link" href="NMDevice.html" title="NMDevice"><span class="type">NMDevice</span></a> *device</code></em>);</pre>
-<p>Gets the (primary) <a href="/usr/share/gtk-doc/html/libnm/NMSetting.html#NMSetting-struct"><span class="type">NMSetting</span></a> subtype associated with connections
+<p>Gets the (primary) <a href="/usr/share/gtk-doc/html/libnm-util/NMSetting.html#NMSetting-struct"><span class="type">NMSetting</span></a> subtype associated with connections
 that can be used on <em class="parameter"><code>device</code></em>
 .</p>
 <div class="refsect3">
@@ -1865,7 +1865,7 @@ that can be used on <em class="parameter"><code>device</code></em>
 <div class="refsect3">
 <a name="nm-device-get-setting-type.returns"></a><h4>Returns</h4>
 <p> <em class="parameter"><code>device</code></em>
-'s associated <a href="/usr/share/gtk-doc/html/libnm/NMSetting.html#NMSetting-struct"><span class="type">NMSetting</span></a> type</p>
+'s associated <a href="/usr/share/gtk-doc/html/libnm-util/NMSetting.html#NMSetting-struct"><span class="type">NMSetting</span></a> type</p>
 </div>
 <p class="since">Since: 0.9.10</p>
 </div>
@@ -2316,6 +2316,6 @@ user_function (<a class="link" href="NMDevice.html" title="NMDevice"><span class
 </div>
 </div>
 <div class="footer">
-<hr>Generated by GTK-Doc V1.29.1</div>
+<hr>Generated by GTK-Doc V1.29</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm-glib/html/NMDeviceAdsl.html b/docs/libnm-glib/html/NMDeviceAdsl.html
index 13ee03a6..88e3d14b 100644
--- a/docs/libnm-glib/html/NMDeviceAdsl.html
+++ b/docs/libnm-glib/html/NMDeviceAdsl.html
@@ -8,7 +8,7 @@
 <link rel="up" href="ch02.html" title="libnm-glib API Reference">
 <link rel="prev" href="NMDeviceWimax.html" title="NMDeviceWimax">
 <link rel="next" href="NMDeviceBond.html" title="NMDeviceBond">
-<meta name="generator" content="GTK-Doc V1.29.1 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.29 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -254,6 +254,6 @@ nm_device_adsl_get_carrier (<em class="parameter"><code><a class="link" href="NM
 </div>
 </div>
 <div class="footer">
-<hr>Generated by GTK-Doc V1.29.1</div>
+<hr>Generated by GTK-Doc V1.29</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm-glib/html/NMDeviceBond.html b/docs/libnm-glib/html/NMDeviceBond.html
index 943873ac..58272974 100644
--- a/docs/libnm-glib/html/NMDeviceBond.html
+++ b/docs/libnm-glib/html/NMDeviceBond.html
@@ -8,7 +8,7 @@
 <link rel="up" href="ch02.html" title="libnm-glib API Reference">
 <link rel="prev" href="NMDeviceAdsl.html" title="NMDeviceAdsl">
 <link rel="next" href="NMDeviceBridge.html" title="NMDeviceBridge">
-<meta name="generator" content="GTK-Doc V1.29.1 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.29 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -384,6 +384,6 @@ copy used by the device, and must not be modified. </p>
 </div>
 </div>
 <div class="footer">
-<hr>Generated by GTK-Doc V1.29.1</div>
+<hr>Generated by GTK-Doc V1.29</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm-glib/html/NMDeviceBridge.html b/docs/libnm-glib/html/NMDeviceBridge.html
index 20c13434..6d19527f 100644
--- a/docs/libnm-glib/html/NMDeviceBridge.html
+++ b/docs/libnm-glib/html/NMDeviceBridge.html
@@ -8,7 +8,7 @@
 <link rel="up" href="ch02.html" title="libnm-glib API Reference">
 <link rel="prev" href="NMDeviceBond.html" title="NMDeviceBond">
 <link rel="next" href="NMDeviceTeam.html" title="NMDeviceTeam">
-<meta name="generator" content="GTK-Doc V1.29.1 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.29 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -391,6 +391,6 @@ copy used by the device, and must not be modified. </p>
 </div>
 </div>
 <div class="footer">
-<hr>Generated by GTK-Doc V1.29.1</div>
+<hr>Generated by GTK-Doc V1.29</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm-glib/html/NMDeviceBt.html b/docs/libnm-glib/html/NMDeviceBt.html
index 1ba9f49d..4d2fa8ba 100644
--- a/docs/libnm-glib/html/NMDeviceBt.html
+++ b/docs/libnm-glib/html/NMDeviceBt.html
@@ -8,7 +8,7 @@
 <link rel="up" href="ch02.html" title="libnm-glib API Reference">
 <link rel="prev" href="NMDeviceModem.html" title="NMDeviceModem">
 <link rel="next" href="NMDeviceWimax.html" title="NMDeviceWimax">
-<meta name="generator" content="GTK-Doc V1.29.1 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.29 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -73,7 +73,7 @@
 </tr>
 <tr>
 <td class="function_type">
-<a href="/usr/share/gtk-doc/html/libnm/libnm-nm-dbus-interface.html#NMBluetoothCapabilities"><span class="returnvalue">NMBluetoothCapabilities</span></a>
+<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManager.html#NMBluetoothCapabilities"><span class="returnvalue">NMBluetoothCapabilities</span></a>
 </td>
 <td class="function_name">
 <a class="link" href="NMDeviceBt.html#nm-device-bt-get-capabilities" title="nm_device_bt_get_capabilities ()">nm_device_bt_get_capabilities</a> <span class="c_punctuation">()</span>
@@ -256,7 +256,7 @@ nm_device_bt_get_name (<em class="parameter"><code><a class="link" href="NMDevic
 <hr>
 <div class="refsect2">
 <a name="nm-device-bt-get-capabilities"></a><h3>nm_device_bt_get_capabilities ()</h3>
-<pre class="programlisting"><a href="/usr/share/gtk-doc/html/libnm/libnm-nm-dbus-interface.html#NMBluetoothCapabilities"><span class="returnvalue">NMBluetoothCapabilities</span></a>
+<pre class="programlisting"><a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManager.html#NMBluetoothCapabilities"><span class="returnvalue">NMBluetoothCapabilities</span></a>
 nm_device_bt_get_capabilities (<em class="parameter"><code><a class="link" href="NMDeviceBt.html" title="NMDeviceBt"><span class="type">NMDeviceBt</span></a> *device</code></em>);</pre>
 <p>Returns the Bluetooth device's usable capabilities.</p>
 <div class="refsect3">
@@ -276,7 +276,7 @@ nm_device_bt_get_capabilities (<em class="parameter"><code><a class="link" href=
 </div>
 <div class="refsect3">
 <a name="nm-device-bt-get-capabilities.returns"></a><h4>Returns</h4>
-<p> a combination of <a href="/usr/share/gtk-doc/html/libnm/libnm-nm-dbus-interface.html#NMBluetoothCapabilities"><span class="type">NMBluetoothCapabilities</span></a></p>
+<p> a combination of <a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManager.html#NMBluetoothCapabilities"><span class="type">NMBluetoothCapabilities</span></a></p>
 </div>
 </div>
 </div>
@@ -369,7 +369,7 @@ nm_device_bt_get_capabilities (<em class="parameter"><code><a class="link" href=
 <div class="refsect2">
 <a name="NMDeviceBt--bt-capabilities"></a><h3>The <code class="literal">“bt-capabilities”</code> property</h3>
 <pre class="programlisting">  “bt-capabilities”          <a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a></pre>
-<p>The device's bluetooth capabilities, a combination of <a href="/usr/share/gtk-doc/html/libnm/libnm-nm-dbus-interface.html#NMBluetoothCapabilities"><span class="type">NMBluetoothCapabilities</span></a>.</p>
+<p>The device's bluetooth capabilities, a combination of <a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManager.html#NMBluetoothCapabilities"><span class="type">NMBluetoothCapabilities</span></a>.</p>
 <p>Flags: Read</p>
 <p>Default value: 0</p>
 </div>
@@ -392,6 +392,6 @@ nm_device_bt_get_capabilities (<em class="parameter"><code><a class="link" href=
 </div>
 </div>
 <div class="footer">
-<hr>Generated by GTK-Doc V1.29.1</div>
+<hr>Generated by GTK-Doc V1.29</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm-glib/html/NMDeviceEthernet.html b/docs/libnm-glib/html/NMDeviceEthernet.html
index 90e02e86..8465051d 100644
--- a/docs/libnm-glib/html/NMDeviceEthernet.html
+++ b/docs/libnm-glib/html/NMDeviceEthernet.html
@@ -8,7 +8,7 @@
 <link rel="up" href="ch02.html" title="libnm-glib API Reference">
 <link rel="prev" href="NMDevice.html" title="NMDevice">
 <link rel="next" href="NMDeviceWifi.html" title="NMDeviceWifi">
-<meta name="generator" content="GTK-Doc V1.29.1 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.29 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -444,6 +444,6 @@ nm_device_ethernet_get_carrier (<em class="parameter"><code><a class="link" href
 </div>
 </div>
 <div class="footer">
-<hr>Generated by GTK-Doc V1.29.1</div>
+<hr>Generated by GTK-Doc V1.29</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm-glib/html/NMDeviceGeneric.html b/docs/libnm-glib/html/NMDeviceGeneric.html
index 678207cb..dc3348b9 100644
--- a/docs/libnm-glib/html/NMDeviceGeneric.html
+++ b/docs/libnm-glib/html/NMDeviceGeneric.html
@@ -8,7 +8,7 @@
 <link rel="up" href="ch02.html" title="libnm-glib API Reference">
 <link rel="prev" href="NMDeviceTeam.html" title="NMDeviceTeam">
 <link rel="next" href="NMDeviceInfiniband.html" title="NMDeviceInfiniband">
-<meta name="generator" content="GTK-Doc V1.29.1 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.29 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -285,6 +285,6 @@ if not known.</p>
 </div>
 </div>
 <div class="footer">
-<hr>Generated by GTK-Doc V1.29.1</div>
+<hr>Generated by GTK-Doc V1.29</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm-glib/html/NMDeviceInfiniband.html b/docs/libnm-glib/html/NMDeviceInfiniband.html
index 9be78665..f81faa4f 100644
--- a/docs/libnm-glib/html/NMDeviceInfiniband.html
+++ b/docs/libnm-glib/html/NMDeviceInfiniband.html
@@ -8,7 +8,7 @@
 <link rel="up" href="ch02.html" title="libnm-glib API Reference">
 <link rel="prev" href="NMDeviceGeneric.html" title="NMDeviceGeneric">
 <link rel="next" href="NMDeviceVlan.html" title="NMDeviceVlan">
-<meta name="generator" content="GTK-Doc V1.29.1 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.29 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -328,6 +328,6 @@ nm_device_infiniband_get_carrier (<em class="parameter"><code><a class="link" hr
 </div>
 </div>
 <div class="footer">
-<hr>Generated by GTK-Doc V1.29.1</div>
+<hr>Generated by GTK-Doc V1.29</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm-glib/html/NMDeviceModem.html b/docs/libnm-glib/html/NMDeviceModem.html
index f2d288f6..75ec49a7 100644
--- a/docs/libnm-glib/html/NMDeviceModem.html
+++ b/docs/libnm-glib/html/NMDeviceModem.html
@@ -8,7 +8,7 @@
 <link rel="up" href="ch02.html" title="libnm-glib API Reference">
 <link rel="prev" href="NMDeviceWifi.html" title="NMDeviceWifi">
 <link rel="next" href="NMDeviceBt.html" title="NMDeviceBt">
-<meta name="generator" content="GTK-Doc V1.29.1 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.29 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -51,7 +51,7 @@
 </tr>
 <tr>
 <td class="function_type">
-<a href="/usr/share/gtk-doc/html/libnm/libnm-nm-dbus-interface.html#NMDeviceModemCapabilities"><span class="returnvalue">NMDeviceModemCapabilities</span></a>
+<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManager.html#NMDeviceModemCapabilities"><span class="returnvalue">NMDeviceModemCapabilities</span></a>
 </td>
 <td class="function_name">
 <a class="link" href="NMDeviceModem.html#nm-device-modem-get-modem-capabilities" title="nm_device_modem_get_modem_capabilities ()">nm_device_modem_get_modem_capabilities</a> <span class="c_punctuation">()</span>
@@ -59,7 +59,7 @@
 </tr>
 <tr>
 <td class="function_type">
-<a href="/usr/share/gtk-doc/html/libnm/libnm-nm-dbus-interface.html#NMDeviceModemCapabilities"><span class="returnvalue">NMDeviceModemCapabilities</span></a>
+<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManager.html#NMDeviceModemCapabilities"><span class="returnvalue">NMDeviceModemCapabilities</span></a>
 </td>
 <td class="function_name">
 <a class="link" href="NMDeviceModem.html#nm-device-modem-get-current-capabilities" title="nm_device_modem_get_current_capabilities ()">nm_device_modem_get_current_capabilities</a> <span class="c_punctuation">()</span>
@@ -143,7 +143,7 @@ nm_device_modem_error_quark (<em class="parameter"><code><span class="type">void
 <hr>
 <div class="refsect2">
 <a name="nm-device-modem-get-modem-capabilities"></a><h3>nm_device_modem_get_modem_capabilities ()</h3>
-<pre class="programlisting"><a href="/usr/share/gtk-doc/html/libnm/libnm-nm-dbus-interface.html#NMDeviceModemCapabilities"><span class="returnvalue">NMDeviceModemCapabilities</span></a>
+<pre class="programlisting"><a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManager.html#NMDeviceModemCapabilities"><span class="returnvalue">NMDeviceModemCapabilities</span></a>
 nm_device_modem_get_modem_capabilities
                                (<em class="parameter"><code><a class="link" href="NMDeviceModem.html" title="NMDeviceModem"><span class="type">NMDeviceModem</span></a> *self</code></em>);</pre>
 <p>Returns a bitfield of the generic access technology families the modem
@@ -172,7 +172,7 @@ may require a firmware reload or reinitialization.</p>
 <hr>
 <div class="refsect2">
 <a name="nm-device-modem-get-current-capabilities"></a><h3>nm_device_modem_get_current_capabilities ()</h3>
-<pre class="programlisting"><a href="/usr/share/gtk-doc/html/libnm/libnm-nm-dbus-interface.html#NMDeviceModemCapabilities"><span class="returnvalue">NMDeviceModemCapabilities</span></a>
+<pre class="programlisting"><a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManager.html#NMDeviceModemCapabilities"><span class="returnvalue">NMDeviceModemCapabilities</span></a>
 nm_device_modem_get_current_capabilities
                                (<em class="parameter"><code><a class="link" href="NMDeviceModem.html" title="NMDeviceModem"><span class="type">NMDeviceModem</span></a> *self</code></em>);</pre>
 <p>Returns a bitfield of the generic access technology families the modem
@@ -288,6 +288,6 @@ CDMA/EVDO and GSM/UMTS.</p>
 </div>
 </div>
 <div class="footer">
-<hr>Generated by GTK-Doc V1.29.1</div>
+<hr>Generated by GTK-Doc V1.29</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm-glib/html/NMDeviceOlpcMesh.html b/docs/libnm-glib/html/NMDeviceOlpcMesh.html
index 8b6f02ba..8b50abd3 100644
--- a/docs/libnm-glib/html/NMDeviceOlpcMesh.html
+++ b/docs/libnm-glib/html/NMDeviceOlpcMesh.html
@@ -8,7 +8,7 @@
 <link rel="up" href="ch02.html" title="libnm-glib API Reference">
 <link rel="prev" href="NMDeviceVlan.html" title="NMDeviceVlan">
 <link rel="next" href="NMWimaxNsp.html" title="NMWimaxNsp">
-<meta name="generator" content="GTK-Doc V1.29.1 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.29 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -373,6 +373,6 @@ nm_device_olpc_mesh_get_active_channel
 </div>
 </div>
 <div class="footer">
-<hr>Generated by GTK-Doc V1.29.1</div>
+<hr>Generated by GTK-Doc V1.29</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm-glib/html/NMDeviceTeam.html b/docs/libnm-glib/html/NMDeviceTeam.html
index 07f14b2c..a3da63c4 100644
--- a/docs/libnm-glib/html/NMDeviceTeam.html
+++ b/docs/libnm-glib/html/NMDeviceTeam.html
@@ -8,7 +8,7 @@
 <link rel="up" href="ch02.html" title="libnm-glib API Reference">
 <link rel="prev" href="NMDeviceBridge.html" title="NMDeviceBridge">
 <link rel="next" href="NMDeviceGeneric.html" title="NMDeviceGeneric">
-<meta name="generator" content="GTK-Doc V1.29.1 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.29 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -387,6 +387,6 @@ copy used by the device, and must not be modified. </p>
 </div>
 </div>
 <div class="footer">
-<hr>Generated by GTK-Doc V1.29.1</div>
+<hr>Generated by GTK-Doc V1.29</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm-glib/html/NMDeviceVlan.html b/docs/libnm-glib/html/NMDeviceVlan.html
index bbf4fda8..96f5529f 100644
--- a/docs/libnm-glib/html/NMDeviceVlan.html
+++ b/docs/libnm-glib/html/NMDeviceVlan.html
@@ -8,7 +8,7 @@
 <link rel="up" href="ch02.html" title="libnm-glib API Reference">
 <link rel="prev" href="NMDeviceInfiniband.html" title="NMDeviceInfiniband">
 <link rel="next" href="NMDeviceOlpcMesh.html" title="NMDeviceOlpcMesh">
-<meta name="generator" content="GTK-Doc V1.29.1 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.29 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -451,6 +451,6 @@ nm_device_vlan_get_vlan_id (<em class="parameter"><code><a class="link" href="NM
 </div>
 </div>
 <div class="footer">
-<hr>Generated by GTK-Doc V1.29.1</div>
+<hr>Generated by GTK-Doc V1.29</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm-glib/html/NMDeviceWifi.html b/docs/libnm-glib/html/NMDeviceWifi.html
index 096d6e78..4fbea127 100644
--- a/docs/libnm-glib/html/NMDeviceWifi.html
+++ b/docs/libnm-glib/html/NMDeviceWifi.html
@@ -8,7 +8,7 @@
 <link rel="up" href="ch02.html" title="libnm-glib API Reference">
 <link rel="prev" href="NMDeviceEthernet.html" title="NMDeviceEthernet">
 <link rel="next" href="NMDeviceModem.html" title="NMDeviceModem">
-<meta name="generator" content="GTK-Doc V1.29.1 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.29 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -74,7 +74,7 @@
 </tr>
 <tr>
 <td class="function_type">
-<a href="/usr/share/gtk-doc/html/libnm/libnm-nm-dbus-interface.html#NM80211Mode"><span class="returnvalue">NM80211Mode</span></a>
+<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManager.html#NM80211Mode"><span class="returnvalue">NM80211Mode</span></a>
 </td>
 <td class="function_name">
 <a class="link" href="NMDeviceWifi.html#nm-device-wifi-get-mode" title="nm_device_wifi_get_mode ()">nm_device_wifi_get_mode</a> <span class="c_punctuation">()</span>
@@ -90,7 +90,7 @@
 </tr>
 <tr>
 <td class="function_type">
-<a href="/usr/share/gtk-doc/html/libnm/libnm-nm-dbus-interface.html#NMDeviceWifiCapabilities"><span class="returnvalue">NMDeviceWifiCapabilities</span></a>
+<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManager.html#NMDeviceWifiCapabilities"><span class="returnvalue">NMDeviceWifiCapabilities</span></a>
 </td>
 <td class="function_name">
 <a class="link" href="NMDeviceWifi.html#nm-device-wifi-get-capabilities" title="nm_device_wifi_get_capabilities ()">nm_device_wifi_get_capabilities</a> <span class="c_punctuation">()</span>
@@ -374,7 +374,7 @@ device, and must not be modified.</p>
 <hr>
 <div class="refsect2">
 <a name="nm-device-wifi-get-mode"></a><h3>nm_device_wifi_get_mode ()</h3>
-<pre class="programlisting"><a href="/usr/share/gtk-doc/html/libnm/libnm-nm-dbus-interface.html#NM80211Mode"><span class="returnvalue">NM80211Mode</span></a>
+<pre class="programlisting"><a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManager.html#NM80211Mode"><span class="returnvalue">NM80211Mode</span></a>
 nm_device_wifi_get_mode (<em class="parameter"><code><a class="link" href="NMDeviceWifi.html" title="NMDeviceWifi"><span class="type">NMDeviceWifi</span></a> *device</code></em>);</pre>
 <p>Gets the <a class="link" href="NMDeviceWifi.html" title="NMDeviceWifi"><span class="type">NMDeviceWifi</span></a> mode.</p>
 <div class="refsect3">
@@ -426,7 +426,7 @@ nm_device_wifi_get_bitrate (<em class="parameter"><code><a class="link" href="NM
 <hr>
 <div class="refsect2">
 <a name="nm-device-wifi-get-capabilities"></a><h3>nm_device_wifi_get_capabilities ()</h3>
-<pre class="programlisting"><a href="/usr/share/gtk-doc/html/libnm/libnm-nm-dbus-interface.html#NMDeviceWifiCapabilities"><span class="returnvalue">NMDeviceWifiCapabilities</span></a>
+<pre class="programlisting"><a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManager.html#NMDeviceWifiCapabilities"><span class="returnvalue">NMDeviceWifiCapabilities</span></a>
 nm_device_wifi_get_capabilities (<em class="parameter"><code><a class="link" href="NMDeviceWifi.html" title="NMDeviceWifi"><span class="type">NMDeviceWifi</span></a> *device</code></em>);</pre>
 <p>Gets the Wi-Fi capabilities of the <a class="link" href="NMDeviceWifi.html" title="NMDeviceWifi"><span class="type">NMDeviceWifi</span></a>.</p>
 <div class="refsect3">
@@ -843,6 +843,6 @@ user_function (<a class="link" href="NMDeviceWifi.html" title="NMDeviceWifi"><sp
 </div>
 </div>
 <div class="footer">
-<hr>Generated by GTK-Doc V1.29.1</div>
+<hr>Generated by GTK-Doc V1.29</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm-glib/html/NMDeviceWimax.html b/docs/libnm-glib/html/NMDeviceWimax.html
index b21a0471..291d7835 100644
--- a/docs/libnm-glib/html/NMDeviceWimax.html
+++ b/docs/libnm-glib/html/NMDeviceWimax.html
@@ -8,7 +8,7 @@
 <link rel="up" href="ch02.html" title="libnm-glib API Reference">
 <link rel="prev" href="NMDeviceBt.html" title="NMDeviceBt">
 <link rel="next" href="NMDeviceAdsl.html" title="NMDeviceAdsl">
-<meta name="generator" content="GTK-Doc V1.29.1 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.29 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -919,6 +919,6 @@ user_function (<a class="link" href="NMDeviceWimax.html" title="NMDeviceWimax"><
 </div>
 </div>
 <div class="footer">
-<hr>Generated by GTK-Doc V1.29.1</div>
+<hr>Generated by GTK-Doc V1.29</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm-glib/html/NMIP4Config.html b/docs/libnm-glib/html/NMIP4Config.html
index 3efc49e8..b1981465 100644
--- a/docs/libnm-glib/html/NMIP4Config.html
+++ b/docs/libnm-glib/html/NMIP4Config.html
@@ -8,7 +8,7 @@
 <link rel="up" href="ch02.html" title="libnm-glib API Reference">
 <link rel="prev" href="NMAccessPoint.html" title="NMAccessPoint">
 <link rel="next" href="NMIP6Config.html" title="NMIP6Config">
-<meta name="generator" content="GTK-Doc V1.29.1 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.29 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -538,6 +538,6 @@ modified. </p>
 </div>
 </div>
 <div class="footer">
-<hr>Generated by GTK-Doc V1.29.1</div>
+<hr>Generated by GTK-Doc V1.29</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm-glib/html/NMIP6Config.html b/docs/libnm-glib/html/NMIP6Config.html
index f2c77b3b..bb3771dc 100644
--- a/docs/libnm-glib/html/NMIP6Config.html
+++ b/docs/libnm-glib/html/NMIP6Config.html
@@ -8,7 +8,7 @@
 <link rel="up" href="ch02.html" title="libnm-glib API Reference">
 <link rel="prev" href="NMIP4Config.html" title="NMIP4Config">
 <link rel="next" href="NMDHCP4Config.html" title="NMDHCP4Config">
-<meta name="generator" content="GTK-Doc V1.29.1 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.29 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -519,7 +519,7 @@ This is the internal copy used by the configuration, and must not be modified. <
 <a name="NMIP6Config--addresses"></a><h3>The <code class="literal">“addresses”</code> property</h3>
 <pre class="programlisting">  “addresses”                <span class="type">NMIP6AddressObjectArray</span> *</pre>
 <p>The <a href="https://developer.gnome.org/glib/unstable/glib-Pointer-Arrays.html#GPtrArray"><span class="type">GPtrArray</span></a> containing the IPv6 addresses;  use
-<code class="function">nm_utils_ip6_addresses_from_gvalue()</code> to return a <a href="https://developer.gnome.org/glib/unstable/glib-Singly-Linked-Lists.html#GSList"><span class="type">GSList</span></a> of
+<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-nm-utils.html#nm-utils-ip6-addresses-from-gvalue"><code class="function">nm_utils_ip6_addresses_from_gvalue()</code></a> to return a <a href="https://developer.gnome.org/glib/unstable/glib-Singly-Linked-Lists.html#GSList"><span class="type">GSList</span></a> of
 <span class="type">NMSettingIP6Address</span> objects that is more usable than the raw data.</p>
 <p>Flags: Read</p>
 </div>
@@ -552,7 +552,7 @@ contain the addresses of nameservers of the configuration.</p>
 <a name="NMIP6Config--routes"></a><h3>The <code class="literal">“routes”</code> property</h3>
 <pre class="programlisting">  “routes”                   <span class="type">NMIP6RouteObjectArray</span> *</pre>
 <p>The <a href="https://developer.gnome.org/glib/unstable/glib-Pointer-Arrays.html#GPtrArray"><span class="type">GPtrArray</span></a> containing the IPv6 routes;  use
-<code class="function">nm_utils_ip6_routes_from_gvalue()</code> to return a <a href="https://developer.gnome.org/glib/unstable/glib-Singly-Linked-Lists.html#GSList"><span class="type">GSList</span></a> of
+<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-nm-utils.html#nm-utils-ip6-routes-from-gvalue"><code class="function">nm_utils_ip6_routes_from_gvalue()</code></a> to return a <a href="https://developer.gnome.org/glib/unstable/glib-Singly-Linked-Lists.html#GSList"><span class="type">GSList</span></a> of
 <span class="type">NMSettingIP6Address</span> objects that is more usable than the raw data.</p>
 <p>Flags: Read</p>
 </div>
@@ -567,6 +567,6 @@ contain the addresses of nameservers of the configuration.</p>
 </div>
 </div>
 <div class="footer">
-<hr>Generated by GTK-Doc V1.29.1</div>
+<hr>Generated by GTK-Doc V1.29</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm-glib/html/NMObject.html b/docs/libnm-glib/html/NMObject.html
index 0c85c095..3d9be2b9 100644
--- a/docs/libnm-glib/html/NMObject.html
+++ b/docs/libnm-glib/html/NMObject.html
@@ -8,7 +8,7 @@
 <link rel="up" href="ch02.html" title="libnm-glib API Reference">
 <link rel="prev" href="NMDHCP6Config.html" title="NMDHCP6Config">
 <link rel="next" href="NMRemoteConnection.html" title="NMRemoteConnection">
-<meta name="generator" content="GTK-Doc V1.29.1 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.29 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -336,6 +336,6 @@ during property handling of <em class="parameter"><code>master_object</code></em
 </div>
 </div>
 <div class="footer">
-<hr>Generated by GTK-Doc V1.29.1</div>
+<hr>Generated by GTK-Doc V1.29</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm-glib/html/NMRemoteConnection.html b/docs/libnm-glib/html/NMRemoteConnection.html
index d8e0404f..9e7e0c41 100644
--- a/docs/libnm-glib/html/NMRemoteConnection.html
+++ b/docs/libnm-glib/html/NMRemoteConnection.html
@@ -8,7 +8,7 @@
 <link rel="up" href="ch02.html" title="libnm-glib API Reference">
 <link rel="prev" href="NMObject.html" title="NMObject">
 <link rel="next" href="NMRemoteSettings.html" title="NMRemoteSettings">
-<meta name="generator" content="GTK-Doc V1.29.1 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.29 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -229,7 +229,7 @@
 <div class="refsect1">
 <a name="NMRemoteConnection.object-hierarchy"></a><h2>Object Hierarchy</h2>
 <pre class="screen">    <a href="https://developer.gnome.org/gobject/unstable/gobject-The-Base-Object-Type.html#GObject-struct">GObject</a>
-    <span class="lineart">╰──</span> NMConnection
+    <span class="lineart">╰──</span> <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html#NMConnection-struct">NMConnection</a>
         <span class="lineart">╰──</span> NMRemoteConnection
 </pre>
 </div>
@@ -548,7 +548,7 @@ nm_remote_connection_get_secrets (<em class="parameter"><code><a class="link" hr
 </tr>
 <tr>
 <td class="parameter_name"><p>setting_name</p></td>
-<td class="parameter_description"><p>the <a href="/usr/share/gtk-doc/html/libnm/NMSetting.html#NMSetting-struct"><span class="type">NMSetting</span></a> object name to get secrets for</p></td>
+<td class="parameter_description"><p>the <a href="/usr/share/gtk-doc/html/libnm-util/NMSetting.html#NMSetting-struct"><span class="type">NMSetting</span></a> object name to get secrets for</p></td>
 <td class="parameter_annotations"> </td>
 </tr>
 <tr>
@@ -716,7 +716,7 @@ invisible to the current user.</p>
 <tbody>
 <tr>
 <td class="parameter_name"><p>connection</p></td>
-<td class="parameter_description"><p>a <span class="type">NMConnection</span></p></td>
+<td class="parameter_description"><p>a <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html#NMConnection-struct"><span class="type">NMConnection</span></a></p></td>
 <td class="parameter_annotations"> </td>
 </tr>
 <tr>
@@ -748,7 +748,7 @@ still visible to the user.</p>
 <tbody>
 <tr>
 <td class="parameter_name"><p>connection</p></td>
-<td class="parameter_description"><p>a <span class="type">NMConnection</span></p></td>
+<td class="parameter_description"><p>a <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html#NMConnection-struct"><span class="type">NMConnection</span></a></p></td>
 <td class="parameter_annotations"> </td>
 </tr>
 <tr>
@@ -773,6 +773,6 @@ user_function (<a class="link" href="NMRemoteConnection.html" title="NMRemoteCon
 </div>
 </div>
 <div class="footer">
-<hr>Generated by GTK-Doc V1.29.1</div>
+<hr>Generated by GTK-Doc V1.29</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm-glib/html/NMRemoteSettings.html b/docs/libnm-glib/html/NMRemoteSettings.html
index a69f46c5..b233a26c 100644
--- a/docs/libnm-glib/html/NMRemoteSettings.html
+++ b/docs/libnm-glib/html/NMRemoteSettings.html
@@ -8,7 +8,7 @@
 <link rel="up" href="ch02.html" title="libnm-glib API Reference">
 <link rel="prev" href="NMRemoteConnection.html" title="NMRemoteConnection">
 <link rel="next" href="libnm-glib-nm-types.html" title="nm-types">
-<meta name="generator" content="GTK-Doc V1.29.1 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.29 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -284,13 +284,13 @@
 which stores network configuration and allows authenticated clients to
 add, delete, and modify that configuration.  The data required to connect
 to a specific network is called a "connection" and encapsulated by the
-<span class="type">NMConnection</span> object.  Once a connection is known to NetworkManager, having
+<a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html#NMConnection-struct"><span class="type">NMConnection</span></a> object.  Once a connection is known to NetworkManager, having
 either been added by a user or read from on-disk storage, the
 <a class="link" href="NMRemoteSettings.html" title="NMRemoteSettings"><span class="type">NMRemoteSettings</span></a> object creates a <a class="link" href="NMRemoteConnection.html" title="NMRemoteConnection"><span class="type">NMRemoteConnection</span></a> object which
 represents this stored connection.  Use the <a class="link" href="NMRemoteConnection.html" title="NMRemoteConnection"><span class="type">NMRemoteConnection</span></a> object to
 perform any operations like modification or deletion.</p>
 <p>To add a new network connection to the NetworkManager settings service, first
-build up a template <span class="type">NMConnection</span> object.  Since this connection is not yet
+build up a template <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html#NMConnection-struct"><span class="type">NMConnection</span></a> object.  Since this connection is not yet
 added to NetworkManager, it is known only to your program and is not yet
 an <a class="link" href="NMRemoteConnection.html" title="NMRemoteConnection"><span class="type">NMRemoteConnection</span></a>.  Then ask <a class="link" href="NMRemoteSettings.html" title="NMRemoteSettings"><span class="type">NMRemoteSettings</span></a> to add your connection.
 When the connection is added successfully, the supplied callback is called
@@ -368,7 +368,7 @@ the stored object known to NetworkManager.</p>
 <span class="normal">   </span><span class="keyword">if</span><span class="normal"> </span><span class="symbol">(</span><span class="normal">error</span><span class="symbol">)</span>
 <span class="normal">       </span><span class="function"><a href="https://developer.gnome.org/glib/unstable/glib-Warnings-and-Assertions.html#g-print">g_print</a></span><span class="normal"> </span><span class="symbol">(</span><span class="string">"Error adding connection: %s"</span><span class="symbol">,</span><span class="normal"> error</span><span class="symbol">-></span><span class="normal">message</span><span class="symbol">);</span>
 <span class="normal">   </span><span class="keyword">else</span><span class="normal"> </span><span class="cbracket">{</span>
-<span class="normal">       </span><span class="function"><a href="https://developer.gnome.org/glib/unstable/glib-Warnings-and-Assertions.html#g-print">g_print</a></span><span class="normal"> </span><span class="symbol">(</span><span class="string">"Added: %s</span><span class="specialchar">\n</span><span class="string">"</span><span class="symbol">,</span><span class="normal"> </span><span class="function"><a href="/usr/share/gtk-doc/html/libnm/NMConnection.html#nm-connection-get-path">nm_connection_get_path</a></span><span class="normal"> </span><span class="symbol">(</span><span class="function">NM_CONNECTION</span><span class="normal"> </span><span class="symbol">(</span><span class="normal">remote</span><span class="symbol">)));</span>
+<span class="normal">       </span><span class="function"><a href="https://developer.gnome.org/glib/unstable/glib-Warnings-and-Assertions.html#g-print">g_print</a></span><span class="normal"> </span><span class="symbol">(</span><span class="string">"Added: %s</span><span class="specialchar">\n</span><span class="string">"</span><span class="symbol">,</span><span class="normal"> </span><span class="function"><a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html#nm-connection-get-path">nm_connection_get_path</a></span><span class="normal"> </span><span class="symbol">(</span><span class="function">NM_CONNECTION</span><span class="normal"> </span><span class="symbol">(</span><span class="normal">remote</span><span class="symbol">)));</span>
 <span class="normal">       </span><span class="comment">/* Use 'remote' with nm_remote_connection_commit_changes() to save</span>
 <span class="comment">        * changes and nm_remote_connection_delete() to delete the connection */</span>
 <span class="normal">   </span><span class="cbracket">}</span>
@@ -383,28 +383,28 @@ the stored object known to NetworkManager.</p>
 <span class="normal">   </span><span class="type">char</span><span class="normal"> </span><span class="symbol">*</span><span class="normal">uuid</span><span class="symbol">;</span>
 <span class="normal">   </span><span class="usertype">gboolean</span><span class="normal"> success</span><span class="symbol">;</span>
 
-<span class="normal">   connection </span><span class="symbol">=</span><span class="normal"> </span><span class="function">nm_connection_new</span><span class="normal"> </span><span class="symbol">();</span>
+<span class="normal">   connection </span><span class="symbol">=</span><span class="normal"> </span><span class="function"><a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html#nm-connection-new">nm_connection_new</a></span><span class="normal"> </span><span class="symbol">();</span>
 
 <span class="normal">   </span><span class="comment">/* Build up the 'connection' setting */</span>
-<span class="normal">   s_con </span><span class="symbol">=</span><span class="normal"> </span><span class="symbol">(</span><span class="normal"><a href="/usr/share/gtk-doc/html/libnm/NMSettingConnection.html#NMSettingConnection-struct">NMSettingConnection</a> </span><span class="symbol">*)</span><span class="normal"> </span><span class="function"><a href="/usr/share/gtk-doc/html/libnm/NMSettingConnection.html#nm-setting-connection-new">nm_setting_connection_new</a></span><span class="normal"> </span><span class="symbol">();</span>
-<span class="normal">   uuid </span><span class="symbol">=</span><span class="normal"> </span><span class="function"><a href="/usr/share/gtk-doc/html/libnm/libnm-nm-utils.html#nm-utils-uuid-generate">nm_utils_uuid_generate</a></span><span class="normal"> </span><span class="symbol">();</span>
+<span class="normal">   s_con </span><span class="symbol">=</span><span class="normal"> </span><span class="symbol">(</span><span class="normal"><a href="/usr/share/gtk-doc/html/libnm-util/NMSettingConnection.html#NMSettingConnection-struct">NMSettingConnection</a> </span><span class="symbol">*)</span><span class="normal"> </span><span class="function"><a href="/usr/share/gtk-doc/html/libnm-util/NMSettingConnection.html#nm-setting-connection-new">nm_setting_connection_new</a></span><span class="normal"> </span><span class="symbol">();</span>
+<span class="normal">   uuid </span><span class="symbol">=</span><span class="normal"> </span><span class="function"><a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-nm-utils.html#nm-utils-uuid-generate">nm_utils_uuid_generate</a></span><span class="normal"> </span><span class="symbol">();</span>
 <span class="normal">   </span><span class="function"><a href="https://developer.gnome.org/gobject/unstable/gobject-The-Base-Object-Type.html#g-object-set">g_object_set</a></span><span class="normal"> </span><span class="symbol">(</span><span class="function"><a href="https://developer.gnome.org/gobject/unstable/gobject-The-Base-Object-Type.html#G-OBJECT:CAPS">G_OBJECT</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">s_con</span><span class="symbol">),</span>
-<span class="normal">                 <a href="/usr/share/gtk-doc/html/libnm/NMSettingConnection.html#NM-SETTING-CONNECTION-UUID:CAPS">NM_SETTING_CONNECTION_UUID</a></span><span class="symbol">,</span><span class="normal"> uuid</span><span class="symbol">,</span>
-<span class="normal">                 <a href="/usr/share/gtk-doc/html/libnm/NMSettingConnection.html#NM-SETTING-CONNECTION-ID:CAPS">NM_SETTING_CONNECTION_ID</a></span><span class="symbol">,</span><span class="normal"> human_name</span><span class="symbol">,</span>
-<span class="normal">                 <a href="/usr/share/gtk-doc/html/libnm/NMSettingConnection.html#NM-SETTING-CONNECTION-TYPE:CAPS">NM_SETTING_CONNECTION_TYPE</a></span><span class="symbol">,</span><span class="normal"> <a href="/usr/share/gtk-doc/html/libnm/NMSettingWired.html#NM-SETTING-WIRED-SETTING-NAME:CAPS">NM_SETTING_WIRED_SETTING_NAME</a></span><span class="symbol">,</span>
+<span class="normal">                 <a href="/usr/share/gtk-doc/html/libnm-util/NMSettingConnection.html#NM-SETTING-CONNECTION-UUID:CAPS">NM_SETTING_CONNECTION_UUID</a></span><span class="symbol">,</span><span class="normal"> uuid</span><span class="symbol">,</span>
+<span class="normal">                 <a href="/usr/share/gtk-doc/html/libnm-util/NMSettingConnection.html#NM-SETTING-CONNECTION-ID:CAPS">NM_SETTING_CONNECTION_ID</a></span><span class="symbol">,</span><span class="normal"> human_name</span><span class="symbol">,</span>
+<span class="normal">                 <a href="/usr/share/gtk-doc/html/libnm-util/NMSettingConnection.html#NM-SETTING-CONNECTION-TYPE:CAPS">NM_SETTING_CONNECTION_TYPE</a></span><span class="symbol">,</span><span class="normal"> <a href="/usr/share/gtk-doc/html/libnm-util/NMSettingWired.html#NM-SETTING-WIRED-SETTING-NAME:CAPS">NM_SETTING_WIRED_SETTING_NAME</a></span><span class="symbol">,</span>
 <span class="normal">                 <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS">NULL</a></span><span class="symbol">);</span>
 <span class="normal">   </span><span class="function"><a href="https://developer.gnome.org/glib/unstable/glib-Memory-Allocation.html#g-free">g_free</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">uuid</span><span class="symbol">);</span>
-<span class="normal">   </span><span class="function"><a href="/usr/share/gtk-doc/html/libnm/NMConnection.html#nm-connection-add-setting">nm_connection_add_setting</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">connection</span><span class="symbol">,</span><span class="normal"> </span><span class="function">NM_SETTING</span><span class="normal"> </span><span class="symbol">(</span><span class="normal">s_con</span><span class="symbol">));</span>
+<span class="normal">   </span><span class="function"><a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html#nm-connection-add-setting">nm_connection_add_setting</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">connection</span><span class="symbol">,</span><span class="normal"> </span><span class="function">NM_SETTING</span><span class="normal"> </span><span class="symbol">(</span><span class="normal">s_con</span><span class="symbol">));</span>
 
 <span class="normal">   </span><span class="comment">/* Add the required 'wired' setting as this is a wired connection */</span>
-<span class="normal">   </span><span class="function"><a href="/usr/share/gtk-doc/html/libnm/NMConnection.html#nm-connection-add-setting">nm_connection_add_setting</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">connection</span><span class="symbol">,</span><span class="normal"> </span><span class="function"><a href="/usr/share/gtk-doc/html/libnm/NMSettingWired.html#nm-setting-wired-new">nm_setting_wired_new</a></span><span class="normal"> </span><span class="symbol">());</span>
+<span class="normal">   </span><span class="function"><a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html#nm-connection-add-setting">nm_connection_add_setting</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">connection</span><span class="symbol">,</span><span class="normal"> </span><span class="function"><a href="/usr/share/gtk-doc/html/libnm-util/NMSettingWired.html#nm-setting-wired-new">nm_setting_wired_new</a></span><span class="normal"> </span><span class="symbol">());</span>
 
 <span class="normal">   </span><span class="comment">/* Add an 'ipv4' setting using AUTO configuration (eg DHCP) */</span>
-<span class="normal">   s_ip4 </span><span class="symbol">=</span><span class="normal"> </span><span class="symbol">(</span><span class="normal"><a href="/usr/share/gtk-doc/html/libnm/NMSettingIP4Config.html#NMSettingIP4Config-struct">NMSettingIP4Config</a> </span><span class="symbol">*)</span><span class="normal"> </span><span class="function"><a href="/usr/share/gtk-doc/html/libnm/NMSettingIP4Config.html#nm-setting-ip4-config-new">nm_setting_ip4_config_new</a></span><span class="normal"> </span><span class="symbol">();</span>
+<span class="normal">   s_ip4 </span><span class="symbol">=</span><span class="normal"> </span><span class="symbol">(</span><span class="normal"><a href="/usr/share/gtk-doc/html/libnm/NMSettingIP4Config.html#NMSettingIP4Config-struct">NMSettingIP4Config</a> </span><span class="symbol">*)</span><span class="normal"> </span><span class="function"><a href="/usr/share/gtk-doc/html/libnm-util/NMSettingIP4Config.html#nm-setting-ip4-config-new">nm_setting_ip4_config_new</a></span><span class="normal"> </span><span class="symbol">();</span>
 <span class="normal">   </span><span class="function"><a href="https://developer.gnome.org/gobject/unstable/gobject-The-Base-Object-Type.html#g-object-set">g_object_set</a></span><span class="normal"> </span><span class="symbol">(</span><span class="function"><a href="https://developer.gnome.org/gobject/unstable/gobject-The-Base-Object-Type.html#G-OBJECT:CAPS">G_OBJECT</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">s_ip4</span><span class="symbol">),</span>
-<span class="normal">                 NM_SETTING_IP4_CONFIG_METHOD</span><span class="symbol">,</span><span class="normal"> <a href="/usr/share/gtk-doc/html/libnm/NMSettingIP4Config.html#NM-SETTING-IP4-CONFIG-METHOD-AUTO:CAPS">NM_SETTING_IP4_CONFIG_METHOD_AUTO</a></span><span class="symbol">,</span>
+<span class="normal">                 <a href="/usr/share/gtk-doc/html/libnm-util/NMSettingIP4Config.html#NM-SETTING-IP4-CONFIG-METHOD:CAPS">NM_SETTING_IP4_CONFIG_METHOD</a></span><span class="symbol">,</span><span class="normal"> <a href="/usr/share/gtk-doc/html/libnm-util/NMSettingIP4Config.html#NM-SETTING-IP4-CONFIG-METHOD-AUTO:CAPS">NM_SETTING_IP4_CONFIG_METHOD_AUTO</a></span><span class="symbol">,</span>
 <span class="normal">                 <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS">NULL</a></span><span class="symbol">);</span>
-<span class="normal">   </span><span class="function"><a href="/usr/share/gtk-doc/html/libnm/NMConnection.html#nm-connection-add-setting">nm_connection_add_setting</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">connection</span><span class="symbol">,</span><span class="normal"> </span><span class="function">NM_SETTING</span><span class="normal"> </span><span class="symbol">(</span><span class="normal">s_ip4</span><span class="symbol">));</span>
+<span class="normal">   </span><span class="function"><a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html#nm-connection-add-setting">nm_connection_add_setting</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">connection</span><span class="symbol">,</span><span class="normal"> </span><span class="function">NM_SETTING</span><span class="normal"> </span><span class="symbol">(</span><span class="normal">s_ip4</span><span class="symbol">));</span>
 
 <span class="normal">   </span><span class="comment">/* Ask NetworkManager to store the connection */</span>
 <span class="normal">   success </span><span class="symbol">=</span><span class="normal"> </span><span class="function"><a href="NMRemoteSettings.html#nm-remote-settings-add-connection">nm_remote_settings_add_connection</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">settings</span><span class="symbol">,</span><span class="normal"> connection</span><span class="symbol">,</span><span class="normal"> added_cb</span><span class="symbol">,</span><span class="normal"> loop</span><span class="symbol">);</span>
@@ -725,7 +725,7 @@ not known. </p>
 <a name="nm-remote-settings-add-connection"></a><h3>nm_remote_settings_add_connection ()</h3>
 <pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
 nm_remote_settings_add_connection (<em class="parameter"><code><a class="link" href="NMRemoteSettings.html" title="NMRemoteSettings"><span class="type">NMRemoteSettings</span></a> *settings</code></em>,
-                                   <em class="parameter"><code><span class="type">NMConnection</span> *connection</code></em>,
+                                   <em class="parameter"><code><a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html#NMConnection-struct"><span class="type">NMConnection</span></a> *connection</code></em>,
                                    <em class="parameter"><code><a class="link" href="NMRemoteSettings.html#NMRemoteSettingsAddConnectionFunc" title="NMRemoteSettingsAddConnectionFunc ()"><span class="type">NMRemoteSettingsAddConnectionFunc</span></a> callback</code></em>,
                                    <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> user_data</code></em>);</pre>
 <p>Requests that the remote settings service add the given settings to a new
@@ -785,7 +785,7 @@ added, not the object itself</p></td>
 <pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
 nm_remote_settings_add_connection_unsaved
                                (<em class="parameter"><code><a class="link" href="NMRemoteSettings.html" title="NMRemoteSettings"><span class="type">NMRemoteSettings</span></a> *settings</code></em>,
-                                <em class="parameter"><code><span class="type">NMConnection</span> *connection</code></em>,
+                                <em class="parameter"><code><a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html#NMConnection-struct"><span class="type">NMConnection</span></a> *connection</code></em>,
                                 <em class="parameter"><code><a class="link" href="NMRemoteSettings.html#NMRemoteSettingsAddConnectionFunc" title="NMRemoteSettingsAddConnectionFunc ()"><span class="type">NMRemoteSettingsAddConnectionFunc</span></a> callback</code></em>,
                                 <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> user_data</code></em>);</pre>
 <p>Requests that the remote settings service add the given settings to a new
@@ -1133,6 +1133,6 @@ user_function (<a class="link" href="NMRemoteSettings.html" title="NMRemoteSetti
 </div>
 </div>
 <div class="footer">
-<hr>Generated by GTK-Doc V1.29.1</div>
+<hr>Generated by GTK-Doc V1.29</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm-glib/html/NMSecretAgent.html b/docs/libnm-glib/html/NMSecretAgent.html
index c4340fc1..0c2bc341 100644
--- a/docs/libnm-glib/html/NMSecretAgent.html
+++ b/docs/libnm-glib/html/NMSecretAgent.html
@@ -8,7 +8,7 @@
 <link rel="up" href="ch02.html" title="libnm-glib API Reference">
 <link rel="prev" href="libnm-glib-nm-types.html" title="nm-types">
 <link rel="next" href="NMVPNConnection.html" title="NMVPNConnection">
-<meta name="generator" content="GTK-Doc V1.29.1 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.29 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -241,7 +241,7 @@ nm_secret_agent_error_quark (<em class="parameter"><code><span class="type">void
 <a name="NMSecretAgentGetSecretsFunc"></a><h3>NMSecretAgentGetSecretsFunc ()</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>
 <span class="c_punctuation">(</span>*NMSecretAgentGetSecretsFunc<span class="c_punctuation">)</span> (<em class="parameter"><code><a class="link" href="NMSecretAgent.html" title="NMSecretAgent"><span class="type">NMSecretAgent</span></a> *agent</code></em>,
-                                <em class="parameter"><code><span class="type">NMConnection</span> *connection</code></em>,
+                                <em class="parameter"><code><a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html#NMConnection-struct"><span class="type">NMConnection</span></a> *connection</code></em>,
                                 <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Hash-Tables.html#GHashTable"><span class="type">GHashTable</span></a> *secrets</code></em>,
                                 <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> *error</code></em>,
                                 <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> user_data</code></em>);</pre>
@@ -277,13 +277,13 @@ something like this:</p>
 <span class="usertype">NMSettingWirelessSecurity</span><span class="normal"> </span><span class="symbol">*</span><span class="normal">s_wsec</span><span class="symbol">;</span>
 <span class="usertype">GHashTable</span><span class="normal"> </span><span class="symbol">*</span><span class="normal">secrets_hash</span><span class="symbol">;</span>
 
-<span class="normal">secrets </span><span class="symbol">=</span><span class="normal"> </span><span class="function">nm_connection_new</span><span class="normal"> </span><span class="symbol">();</span>
-<span class="normal">s_wsec </span><span class="symbol">=</span><span class="normal"> </span><span class="symbol">(</span><span class="normal"><a href="/usr/share/gtk-doc/html/libnm/NMSettingWirelessSecurity.html#NMSettingWirelessSecurity-struct">NMSettingWirelessSecurity</a> </span><span class="symbol">*)</span><span class="normal"> </span><span class="function"><a href="/usr/share/gtk-doc/html/libnm/NMSettingWirelessSecurity.html#nm-setting-wireless-security-new">nm_setting_wireless_security_new</a></span><span class="normal"> </span><span class="symbol">();</span>
+<span class="normal">secrets </span><span class="symbol">=</span><span class="normal"> </span><span class="function"><a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html#nm-connection-new">nm_connection_new</a></span><span class="normal"> </span><span class="symbol">();</span>
+<span class="normal">s_wsec </span><span class="symbol">=</span><span class="normal"> </span><span class="symbol">(</span><span class="normal"><a href="/usr/share/gtk-doc/html/libnm/NMSettingWirelessSecurity.html#NMSettingWirelessSecurity-struct">NMSettingWirelessSecurity</a> </span><span class="symbol">*)</span><span class="normal"> </span><span class="function"><a href="/usr/share/gtk-doc/html/libnm-util/NMSettingWirelessSecurity.html#nm-setting-wireless-security-new">nm_setting_wireless_security_new</a></span><span class="normal"> </span><span class="symbol">();</span>
 <span class="function"><a href="https://developer.gnome.org/gobject/unstable/gobject-The-Base-Object-Type.html#g-object-set">g_object_set</a></span><span class="normal"> </span><span class="symbol">(</span><span class="function"><a href="https://developer.gnome.org/gobject/unstable/gobject-The-Base-Object-Type.html#G-OBJECT:CAPS">G_OBJECT</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">s_wsec</span><span class="symbol">),</span>
-<span class="normal">              <a href="/usr/share/gtk-doc/html/libnm/NMSettingWirelessSecurity.html#NM-SETTING-WIRELESS-SECURITY-PSK:CAPS">NM_SETTING_WIRELESS_SECURITY_PSK</a></span><span class="symbol">,</span><span class="normal"> </span><span class="string">"my really cool PSK"</span><span class="symbol">,</span>
+<span class="normal">              <a href="/usr/share/gtk-doc/html/libnm-util/NMSettingWirelessSecurity.html#NM-SETTING-WIRELESS-SECURITY-PSK:CAPS">NM_SETTING_WIRELESS_SECURITY_PSK</a></span><span class="symbol">,</span><span class="normal"> </span><span class="string">"my really cool PSK"</span><span class="symbol">,</span>
 <span class="normal">              <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS">NULL</a></span><span class="symbol">);</span>
-<span class="function"><a href="/usr/share/gtk-doc/html/libnm/NMConnection.html#nm-connection-add-setting">nm_connection_add_setting</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">secrets</span><span class="symbol">,</span><span class="normal"> </span><span class="function">NM_SETTING</span><span class="normal"> </span><span class="symbol">(</span><span class="normal">s_wsec</span><span class="symbol">));</span>
-<span class="normal">secrets_hash </span><span class="symbol">=</span><span class="normal"> </span><span class="function">nm_connection_to_hash</span><span class="normal"> </span><span class="symbol">(</span><span class="normal">secrets</span><span class="symbol">,</span><span class="normal"> NM_SETTING_HASH_FLAG_ALL</span><span class="symbol">);</span>
+<span class="function"><a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html#nm-connection-add-setting">nm_connection_add_setting</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">secrets</span><span class="symbol">,</span><span class="normal"> </span><span class="function">NM_SETTING</span><span class="normal"> </span><span class="symbol">(</span><span class="normal">s_wsec</span><span class="symbol">));</span>
+<span class="normal">secrets_hash </span><span class="symbol">=</span><span class="normal"> </span><span class="function"><a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html#nm-connection-to-hash">nm_connection_to_hash</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">secrets</span><span class="symbol">,</span><span class="normal"> <a href="/usr/share/gtk-doc/html/libnm-util/NMSetting.html#NM-SETTING-HASH-FLAG-ALL:CAPS">NM_SETTING_HASH_FLAG_ALL</a></span><span class="symbol">);</span>
 
 <span class="symbol">(</span><span class="normal">call the NMSecretAgentGetSecretsFunc </span><span class="usertype">with</span><span class="normal"> secrets_hash</span><span class="symbol">)</span>
 
@@ -320,9 +320,9 @@ has returned. </p></td>
 <tr>
 <td class="parameter_name"><p>secrets</p></td>
 <td class="parameter_description"><p>the <a href="https://developer.gnome.org/glib/unstable/glib-Hash-Tables.html#GHashTable"><span class="type">GHashTable</span></a> containing
-the requested secrets in the same format as an <span class="type">NMConnection</span> hash (as
-created by <code class="function">nm_connection_to_hash()</code> for example).  Each key in <em class="parameter"><code>secrets</code></em>
-should be the name of a <a href="/usr/share/gtk-doc/html/libnm/NMSetting.html#NMSetting-struct"><span class="type">NMSetting</span></a> object (like "802-11-wireless-security")
+the requested secrets in the same format as an <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html#NMConnection-struct"><span class="type">NMConnection</span></a> hash (as
+created by <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html#nm-connection-to-hash"><code class="function">nm_connection_to_hash()</code></a> for example).  Each key in <em class="parameter"><code>secrets</code></em>
+should be the name of a <a href="/usr/share/gtk-doc/html/libnm-util/NMSetting.html#NMSetting-struct"><span class="type">NMSetting</span></a> object (like "802-11-wireless-security")
 and each value should be a <a href="https://developer.gnome.org/glib/unstable/glib-Hash-Tables.html#GHashTable"><span class="type">GHashTable</span></a>.  The sub-hashes map string:<a href="https://developer.gnome.org/gobject/unstable/gobject-Generic-values.html#GValue-struct"><span class="type">GValue</span></a>
 where the string is the setting property name (like "psk") and the value
 is the secret. </p></td>
@@ -347,7 +347,7 @@ is the secret. </p></td>
 <a name="NMSecretAgentSaveSecretsFunc"></a><h3>NMSecretAgentSaveSecretsFunc ()</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>
 <span class="c_punctuation">(</span>*NMSecretAgentSaveSecretsFunc<span class="c_punctuation">)</span> (<em class="parameter"><code><a class="link" href="NMSecretAgent.html" title="NMSecretAgent"><span class="type">NMSecretAgent</span></a> *agent</code></em>,
-                                 <em class="parameter"><code><span class="type">NMConnection</span> *connection</code></em>,
+                                 <em class="parameter"><code><a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html#NMConnection-struct"><span class="type">NMConnection</span></a> *connection</code></em>,
                                  <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> *error</code></em>,
                                  <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> user_data</code></em>);</pre>
 <p>Called as a result of a request by NM to save secrets.  When the
@@ -394,7 +394,7 @@ has returned. </p></td>
 <a name="NMSecretAgentDeleteSecretsFunc"></a><h3>NMSecretAgentDeleteSecretsFunc ()</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>
 <span class="c_punctuation">(</span>*NMSecretAgentDeleteSecretsFunc<span class="c_punctuation">)</span> (<em class="parameter"><code><a class="link" href="NMSecretAgent.html" title="NMSecretAgent"><span class="type">NMSecretAgent</span></a> *agent</code></em>,
-                                   <em class="parameter"><code><span class="type">NMConnection</span> *connection</code></em>,
+                                   <em class="parameter"><code><a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html#NMConnection-struct"><span class="type">NMConnection</span></a> *connection</code></em>,
                                    <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> *error</code></em>,
                                    <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> user_data</code></em>);</pre>
 <p>Called as a result of a request by NM to delete secrets.  When the
@@ -526,7 +526,7 @@ nm_secret_agent_get_registered (<em class="parameter"><code><a class="link" href
 <a name="nm-secret-agent-get-secrets"></a><h3>nm_secret_agent_get_secrets ()</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>
 nm_secret_agent_get_secrets (<em class="parameter"><code><a class="link" href="NMSecretAgent.html" title="NMSecretAgent"><span class="type">NMSecretAgent</span></a> *self</code></em>,
-                             <em class="parameter"><code><span class="type">NMConnection</span> *connection</code></em>,
+                             <em class="parameter"><code><a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html#NMConnection-struct"><span class="type">NMConnection</span></a> *connection</code></em>,
                              <em class="parameter"><code>const <span class="type">char</span> *setting_name</code></em>,
                              <em class="parameter"><code>const <span class="type">char</span> **hints</code></em>,
                              <em class="parameter"><code><a class="link" href="NMSecretAgent.html#NMSecretAgentGetSecretsFlags" title="enum NMSecretAgentGetSecretsFlags"><span class="type">NMSecretAgentGetSecretsFlags</span></a> flags</code></em>,
@@ -538,7 +538,7 @@ nm_secret_agent_get_secrets (<em class="parameter"><code><a class="link" href="N
 <a name="nm-secret-agent-save-secrets"></a><h3>nm_secret_agent_save_secrets ()</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>
 nm_secret_agent_save_secrets (<em class="parameter"><code><a class="link" href="NMSecretAgent.html" title="NMSecretAgent"><span class="type">NMSecretAgent</span></a> *self</code></em>,
-                              <em class="parameter"><code><span class="type">NMConnection</span> *connection</code></em>,
+                              <em class="parameter"><code><a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html#NMConnection-struct"><span class="type">NMConnection</span></a> *connection</code></em>,
                               <em class="parameter"><code><a class="link" href="NMSecretAgent.html#NMSecretAgentSaveSecretsFunc" title="NMSecretAgentSaveSecretsFunc ()"><span class="type">NMSecretAgentSaveSecretsFunc</span></a> callback</code></em>,
                               <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> user_data</code></em>);</pre>
 </div>
@@ -547,7 +547,7 @@ nm_secret_agent_save_secrets (<em class="parameter"><code><a class="link" href="
 <a name="nm-secret-agent-delete-secrets"></a><h3>nm_secret_agent_delete_secrets ()</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>
 nm_secret_agent_delete_secrets (<em class="parameter"><code><a class="link" href="NMSecretAgent.html" title="NMSecretAgent"><span class="type">NMSecretAgent</span></a> *self</code></em>,
-                                <em class="parameter"><code><span class="type">NMConnection</span> *connection</code></em>,
+                                <em class="parameter"><code><a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html#NMConnection-struct"><span class="type">NMConnection</span></a> *connection</code></em>,
                                 <em class="parameter"><code><a class="link" href="NMSecretAgent.html#NMSecretAgentDeleteSecretsFunc" title="NMSecretAgentDeleteSecretsFunc ()"><span class="type">NMSecretAgentDeleteSecretsFunc</span></a> callback</code></em>,
                                 <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> user_data</code></em>);</pre>
 </div>
@@ -839,6 +839,6 @@ request was successful.</p>
 </div>
 </div>
 <div class="footer">
-<hr>Generated by GTK-Doc V1.29.1</div>
+<hr>Generated by GTK-Doc V1.29</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm-glib/html/NMVPNConnection.html b/docs/libnm-glib/html/NMVPNConnection.html
index 2b9f6af5..1d2f6259 100644
--- a/docs/libnm-glib/html/NMVPNConnection.html
+++ b/docs/libnm-glib/html/NMVPNConnection.html
@@ -8,7 +8,7 @@
 <link rel="up" href="ch02.html" title="libnm-glib API Reference">
 <link rel="prev" href="NMSecretAgent.html" title="NMSecretAgent">
 <link rel="next" href="libnm-glib-NMVPNPlugin.html" title="NMVPNPlugin">
-<meta name="generator" content="GTK-Doc V1.29.1 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.29 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -52,7 +52,7 @@
 </tr>
 <tr>
 <td class="function_type">
-<span class="returnvalue">NMVPNConnectionState</span>
+<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManagerVPN.html#NMVPNConnectionState"><span class="returnvalue">NMVPNConnectionState</span></a>
 </td>
 <td class="function_name">
 <a class="link" href="NMVPNConnection.html#nm-vpn-connection-get-vpn-state" title="nm_vpn_connection_get_vpn_state ()">nm_vpn_connection_get_vpn_state</a> <span class="c_punctuation">()</span>
@@ -175,7 +175,7 @@ nm_vpn_connection_new (<em class="parameter"><code><a href="/usr/share/gtk-doc/h
 <hr>
 <div class="refsect2">
 <a name="nm-vpn-connection-get-vpn-state"></a><h3>nm_vpn_connection_get_vpn_state ()</h3>
-<pre class="programlisting"><span class="returnvalue">NMVPNConnectionState</span>
+<pre class="programlisting"><a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManagerVPN.html#NMVPNConnectionState"><span class="returnvalue">NMVPNConnectionState</span></a>
 nm_vpn_connection_get_vpn_state (<em class="parameter"><code><a class="link" href="NMVPNConnection.html" title="NMVPNConnection"><span class="type">NMVPNConnection</span></a> *vpn</code></em>);</pre>
 <p>Gets the current <a class="link" href="NMVPNConnection.html" title="NMVPNConnection"><span class="type">NMVPNConnection</span></a> state.</p>
 <div class="refsect3">
@@ -273,6 +273,6 @@ user_function (<a class="link" href="NMVPNConnection.html" title="NMVPNConnectio
 </div>
 </div>
 <div class="footer">
-<hr>Generated by GTK-Doc V1.29.1</div>
+<hr>Generated by GTK-Doc V1.29</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm-glib/html/NMWimaxNsp.html b/docs/libnm-glib/html/NMWimaxNsp.html
index 08127602..60714cc5 100644
--- a/docs/libnm-glib/html/NMWimaxNsp.html
+++ b/docs/libnm-glib/html/NMWimaxNsp.html
@@ -8,7 +8,7 @@
 <link rel="up" href="ch02.html" title="libnm-glib API Reference">
 <link rel="prev" href="NMDeviceOlpcMesh.html" title="NMDeviceOlpcMesh">
 <link rel="next" href="NMAccessPoint.html" title="NMAccessPoint">
-<meta name="generator" content="GTK-Doc V1.29.1 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.29 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -297,7 +297,7 @@ returned connections will match the <em class="parameter"><code>nsp</code></em>
 <tr>
 <td class="parameter_name"><p>connections</p></td>
 <td class="parameter_description"><p>a list of
-<span class="type">NMConnection</span> objects to filter. </p></td>
+<a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html#NMConnection-struct"><span class="type">NMConnection</span></a> objects to filter. </p></td>
 <td class="parameter_annotations"><span class="annotation">[<acronym title="Generics and defining elements of containers and arrays."><span class="acronym">element-type</span></acronym> NMConnection]</span></td>
 </tr>
 </tbody>
@@ -306,7 +306,7 @@ returned connections will match the <em class="parameter"><code>nsp</code></em>
 <div class="refsect3">
 <a name="nm-wimax-nsp-filter-connections.returns"></a><h4>Returns</h4>
 <p>a
-list of <span class="type">NMConnection</span> objects that could be activated with the given <em class="parameter"><code>nsp</code></em>
+list of <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html#NMConnection-struct"><span class="type">NMConnection</span></a> objects that could be activated with the given <em class="parameter"><code>nsp</code></em>
 .
 The elements of the list are owned by their creator and should not be freed
 by the caller, but the returned list itself is owned by the caller and should
@@ -319,7 +319,7 @@ be freed with <a href="https://developer.gnome.org/glib/unstable/glib-Singly-Lin
 <a name="nm-wimax-nsp-connection-valid"></a><h3>nm_wimax_nsp_connection_valid ()</h3>
 <pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
 nm_wimax_nsp_connection_valid (<em class="parameter"><code><a class="link" href="NMWimaxNsp.html" title="NMWimaxNsp"><span class="type">NMWimaxNsp</span></a> *nsp</code></em>,
-                               <em class="parameter"><code><span class="type">NMConnection</span> *connection</code></em>);</pre>
+                               <em class="parameter"><code><a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html#NMConnection-struct"><span class="type">NMConnection</span></a> *connection</code></em>);</pre>
 <p>Validates a given connection against a given WiMAX NSP to ensure that the
 connection may be activated with that NSP.  The connection must match the
 <em class="parameter"><code>nsp</code></em>
@@ -341,7 +341,7 @@ against</p></td>
 </tr>
 <tr>
 <td class="parameter_name"><p>connection</p></td>
-<td class="parameter_description"><p>an <span class="type">NMConnection</span> to validate against <em class="parameter"><code>nsp</code></em>
+<td class="parameter_description"><p>an <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html#NMConnection-struct"><span class="type">NMConnection</span></a> to validate against <em class="parameter"><code>nsp</code></em>
 </p></td>
 <td class="parameter_annotations"> </td>
 </tr>
@@ -449,6 +449,6 @@ against</p></td>
 </div>
 </div>
 <div class="footer">
-<hr>Generated by GTK-Doc V1.29.1</div>
+<hr>Generated by GTK-Doc V1.29</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm-glib/html/annotation-glossary.html b/docs/libnm-glib/html/annotation-glossary.html
index 7aea09d6..fb9333ea 100644
--- a/docs/libnm-glib/html/annotation-glossary.html
+++ b/docs/libnm-glib/html/annotation-glossary.html
@@ -7,7 +7,7 @@
 <link rel="home" href="index.html" title="libnm-glib Reference Manual">
 <link rel="up" href="index.html" title="libnm-glib Reference Manual">
 <link rel="prev" href="api-index-full.html" title="API Index">
-<meta name="generator" content="GTK-Doc V1.29.1 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.29 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -61,6 +61,6 @@
 <dd class="glossdef"><p>Override the parsed C type with given type.</p></dd>
 </div>
 <div class="footer">
-<hr>Generated by GTK-Doc V1.29.1</div>
+<hr>Generated by GTK-Doc V1.29</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm-glib/html/api-index-full.html b/docs/libnm-glib/html/api-index-full.html
index ebb7c720..23775949 100644
--- a/docs/libnm-glib/html/api-index-full.html
+++ b/docs/libnm-glib/html/api-index-full.html
@@ -8,7 +8,7 @@
 <link rel="up" href="index.html" title="libnm-glib Reference Manual">
 <link rel="prev" href="object-tree.html" title="Object Hierarchy">
 <link rel="next" href="annotation-glossary.html" title="Annotation Glossary">
-<meta name="generator" content="GTK-Doc V1.29.1 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.29 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -2696,6 +2696,6 @@
 <dd></dd>
 </div>
 <div class="footer">
-<hr>Generated by GTK-Doc V1.29.1</div>
+<hr>Generated by GTK-Doc V1.29</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm-glib/html/ch02.html b/docs/libnm-glib/html/ch02.html
index 48e9fd5e..4f572730 100644
--- a/docs/libnm-glib/html/ch02.html
+++ b/docs/libnm-glib/html/ch02.html
@@ -8,7 +8,7 @@
 <link rel="up" href="index.html" title="libnm-glib Reference Manual">
 <link rel="prev" href="ref-overview.html" title="Object Overview">
 <link rel="next" href="NMClient.html" title="NMClient">
-<meta name="generator" content="GTK-Doc V1.29.1 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.29 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -119,6 +119,6 @@
 </dl></div>
 </div>
 <div class="footer">
-<hr>Generated by GTK-Doc V1.29.1</div>
+<hr>Generated by GTK-Doc V1.29</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm-glib/html/index.html b/docs/libnm-glib/html/index.html
index 296f4837..2d5f53a4 100644
--- a/docs/libnm-glib/html/index.html
+++ b/docs/libnm-glib/html/index.html
@@ -6,7 +6,7 @@
 <meta name="generator" content="DocBook XSL Stylesheets Vsnapshot">
 <link rel="home" href="index.html" title="libnm-glib Reference Manual">
 <link rel="next" href="ref-overview.html" title="Object Overview">
-<meta name="generator" content="GTK-Doc V1.29.1 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.29 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -15,7 +15,7 @@
 <div>
 <div><table class="navigation" id="top" width="100%" cellpadding="2" cellspacing="0"><tr><th valign="middle"><p class="title">libnm-glib Reference Manual</p></th></tr></table></div>
 <div><p class="releaseinfo">
-      for libnm-glib 1.14.4
+      for libnm-glib 1.14.6
 
       The latest version of this documentation can be found on-line at
       <a class="ulink" href="https://developer.gnome.org/libnm-glib/stable/" target="_top">https://developer.gnome.org/libnm-glib/stable/</a>.
@@ -150,6 +150,6 @@
 </dl></div>
 </div>
 <div class="footer">
-<hr>Generated by GTK-Doc V1.29.1</div>
+<hr>Generated by GTK-Doc V1.29</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm-glib/html/libnm-glib-NMVPNPlugin.html b/docs/libnm-glib/html/libnm-glib-NMVPNPlugin.html
index 44c0aaf6..1fc290e3 100644
--- a/docs/libnm-glib/html/libnm-glib-NMVPNPlugin.html
+++ b/docs/libnm-glib/html/libnm-glib-NMVPNPlugin.html
@@ -8,7 +8,7 @@
 <link rel="up" href="ch02.html" title="libnm-glib API Reference">
 <link rel="prev" href="NMVPNConnection.html" title="NMVPNConnection">
 <link rel="next" href="libnm-glib-NMVpnPluginUiWidget.html" title="NMVpnPluginUiWidget">
-<meta name="generator" content="GTK-Doc V1.29.1 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.29 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -57,7 +57,7 @@
 </tr>
 <tr>
 <td class="function_type">
-<span class="returnvalue">NMVPNServiceState</span>
+<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManagerVPN.html#NMVPNServiceState"><span class="returnvalue">NMVPNServiceState</span></a>
 </td>
 <td class="function_name">
 <a class="link" href="libnm-glib-NMVPNPlugin.html#nm-vpn-plugin-get-state" title="nm_vpn_plugin_get_state ()">nm_vpn_plugin_get_state</a> <span class="c_punctuation">()</span>
@@ -172,7 +172,7 @@ nm_vpn_plugin_get_connection (<em class="parameter"><code><span class="type">NMV
 <hr>
 <div class="refsect2">
 <a name="nm-vpn-plugin-get-state"></a><h3>nm_vpn_plugin_get_state ()</h3>
-<pre class="programlisting"><span class="returnvalue">NMVPNServiceState</span>
+<pre class="programlisting"><a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManagerVPN.html#NMVPNServiceState"><span class="returnvalue">NMVPNServiceState</span></a>
 nm_vpn_plugin_get_state (<em class="parameter"><code><span class="type">NMVPNPlugin</span> *plugin</code></em>);</pre>
 </div>
 <hr>
@@ -180,7 +180,7 @@ nm_vpn_plugin_get_state (<em class="parameter"><code><span class="type">NMVPNPlu
 <a name="nm-vpn-plugin-set-state"></a><h3>nm_vpn_plugin_set_state ()</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>
 nm_vpn_plugin_set_state (<em class="parameter"><code><span class="type">NMVPNPlugin</span> *plugin</code></em>,
-                         <em class="parameter"><code><span class="type">NMVPNServiceState</span> state</code></em>);</pre>
+                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManagerVPN.html#NMVPNServiceState"><span class="type">NMVPNServiceState</span></a> state</code></em>);</pre>
 </div>
 <hr>
 <div class="refsect2">
@@ -235,7 +235,7 @@ nm_vpn_plugin_set_login_banner (<em class="parameter"><code><span class="type">N
 <a name="nm-vpn-plugin-failure"></a><h3>nm_vpn_plugin_failure ()</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>
 nm_vpn_plugin_failure (<em class="parameter"><code><span class="type">NMVPNPlugin</span> *plugin</code></em>,
-                       <em class="parameter"><code><span class="type">NMVPNPluginFailure</span> reason</code></em>);</pre>
+                       <em class="parameter"><code><a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManagerVPN.html#NMVPNPluginFailure"><span class="type">NMVPNPluginFailure</span></a> reason</code></em>);</pre>
 </div>
 <hr>
 <div class="refsect2">
@@ -381,6 +381,6 @@ nm_vpn_plugin_disconnect (<em class="parameter"><code><span class="type">NMVPNPl
 </div>
 </div>
 <div class="footer">
-<hr>Generated by GTK-Doc V1.29.1</div>
+<hr>Generated by GTK-Doc V1.29</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm-glib/html/libnm-glib-NMVpnPluginUiWidget.html b/docs/libnm-glib/html/libnm-glib-NMVpnPluginUiWidget.html
index 65bafac0..83b2e40b 100644
--- a/docs/libnm-glib/html/libnm-glib-NMVpnPluginUiWidget.html
+++ b/docs/libnm-glib/html/libnm-glib-NMVpnPluginUiWidget.html
@@ -8,7 +8,7 @@
 <link rel="up" href="ch02.html" title="libnm-glib API Reference">
 <link rel="prev" href="libnm-glib-NMVPNPlugin.html" title="NMVPNPlugin">
 <link rel="next" href="libnm-glib-nm-vpn-plugin-utils.html" title="nm-vpn-plugin-utils">
-<meta name="generator" content="GTK-Doc V1.29.1 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.29 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -73,7 +73,7 @@
 </tr>
 <tr>
 <td class="function_type">
-<span class="returnvalue">NMConnection</span> *
+<a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html#NMConnection-struct"><span class="returnvalue">NMConnection</span></a> *
 </td>
 <td class="function_name">
 <a class="link" href="libnm-glib-NMVpnPluginUiWidget.html#nm-vpn-plugin-ui-interface-import" title="nm_vpn_plugin_ui_interface_import ()">nm_vpn_plugin_ui_interface_import</a> <span class="c_punctuation">()</span>
@@ -254,7 +254,7 @@ nm_vpn_plugin_ui_factory (<em class="parameter"><code><a href="https://developer
 <a name="nm-vpn-plugin-ui-interface-ui-factory"></a><h3>nm_vpn_plugin_ui_interface_ui_factory ()</h3>
 <pre class="programlisting"><span class="returnvalue">NMVpnPluginUiWidgetInterface</span> *
 nm_vpn_plugin_ui_interface_ui_factory (<em class="parameter"><code><span class="type">NMVpnPluginUiInterface</span> *iface</code></em>,
-                                       <em class="parameter"><code><span class="type">NMConnection</span> *connection</code></em>,
+                                       <em class="parameter"><code><a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html#NMConnection-struct"><span class="type">NMConnection</span></a> *connection</code></em>,
                                        <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> **error</code></em>);</pre>
 </div>
 <hr>
@@ -267,7 +267,7 @@ nm_vpn_plugin_ui_interface_get_capabilities
 <hr>
 <div class="refsect2">
 <a name="nm-vpn-plugin-ui-interface-import"></a><h3>nm_vpn_plugin_ui_interface_import ()</h3>
-<pre class="programlisting"><span class="returnvalue">NMConnection</span> *
+<pre class="programlisting"><a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html#NMConnection-struct"><span class="returnvalue">NMConnection</span></a> *
 nm_vpn_plugin_ui_interface_import (<em class="parameter"><code><span class="type">NMVpnPluginUiInterface</span> *iface</code></em>,
                                    <em class="parameter"><code>const <span class="type">char</span> *path</code></em>,
                                    <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> **error</code></em>);</pre>
@@ -278,7 +278,7 @@ nm_vpn_plugin_ui_interface_import (<em class="parameter"><code><span class="type
 <pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
 nm_vpn_plugin_ui_interface_export (<em class="parameter"><code><span class="type">NMVpnPluginUiInterface</span> *iface</code></em>,
                                    <em class="parameter"><code>const <span class="type">char</span> *path</code></em>,
-                                   <em class="parameter"><code><span class="type">NMConnection</span> *connection</code></em>,
+                                   <em class="parameter"><code><a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html#NMConnection-struct"><span class="type">NMConnection</span></a> *connection</code></em>,
                                    <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> **error</code></em>);</pre>
 </div>
 <hr>
@@ -287,7 +287,7 @@ nm_vpn_plugin_ui_interface_export (<em class="parameter"><code><span class="type
 <pre class="programlisting"><span class="returnvalue">char</span> *
 nm_vpn_plugin_ui_interface_get_suggested_name
                                (<em class="parameter"><code><span class="type">NMVpnPluginUiInterface</span> *iface</code></em>,
-                                <em class="parameter"><code><span class="type">NMConnection</span> *connection</code></em>);</pre>
+                                <em class="parameter"><code><a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html#NMConnection-struct"><span class="type">NMConnection</span></a> *connection</code></em>);</pre>
 </div>
 <hr>
 <div class="refsect2">
@@ -295,7 +295,7 @@ nm_vpn_plugin_ui_interface_get_suggested_name
 <pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
 nm_vpn_plugin_ui_interface_delete_connection
                                (<em class="parameter"><code><span class="type">NMVpnPluginUiInterface</span> *iface</code></em>,
-                                <em class="parameter"><code><span class="type">NMConnection</span> *connection</code></em>,
+                                <em class="parameter"><code><a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html#NMConnection-struct"><span class="type">NMConnection</span></a> *connection</code></em>,
                                 <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> **error</code></em>);</pre>
 <div class="warning"><p><code class="literal">nm_vpn_plugin_ui_interface_delete_connection</code> is deprecated and should not be used in newly-written code.</p></div>
 </div>
@@ -312,7 +312,7 @@ nm_vpn_plugin_ui_widget_interface_get_widget
 <pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
 nm_vpn_plugin_ui_widget_interface_update_connection
                                (<em class="parameter"><code><span class="type">NMVpnPluginUiWidgetInterface</span> *iface</code></em>,
-                                <em class="parameter"><code><span class="type">NMConnection</span> *connection</code></em>,
+                                <em class="parameter"><code><a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html#NMConnection-struct"><span class="type">NMConnection</span></a> *connection</code></em>,
                                 <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> **error</code></em>);</pre>
 </div>
 <hr>
@@ -321,7 +321,7 @@ nm_vpn_plugin_ui_widget_interface_update_connection
 <pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
 nm_vpn_plugin_ui_widget_interface_save_secrets
                                (<em class="parameter"><code><span class="type">NMVpnPluginUiWidgetInterface</span> *iface</code></em>,
-                                <em class="parameter"><code><span class="type">NMConnection</span> *connection</code></em>,
+                                <em class="parameter"><code><a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html#NMConnection-struct"><span class="type">NMConnection</span></a> *connection</code></em>,
                                 <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> **error</code></em>);</pre>
 <div class="warning"><p><code class="literal">nm_vpn_plugin_ui_widget_interface_save_secrets</code> is deprecated and should not be used in newly-written code.</p></div>
 </div>
@@ -547,6 +547,6 @@ plugin's VPN service daemon</p>
 </div>
 </div>
 <div class="footer">
-<hr>Generated by GTK-Doc V1.29.1</div>
+<hr>Generated by GTK-Doc V1.29</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm-glib/html/libnm-glib-nm-types.html b/docs/libnm-glib/html/libnm-glib-nm-types.html
index 946aa088..99b8552d 100644
--- a/docs/libnm-glib/html/libnm-glib-nm-types.html
+++ b/docs/libnm-glib/html/libnm-glib-nm-types.html
@@ -8,7 +8,7 @@
 <link rel="up" href="ch02.html" title="libnm-glib API Reference">
 <link rel="prev" href="NMRemoteSettings.html" title="NMRemoteSettings">
 <link rel="next" href="NMSecretAgent.html" title="NMSecretAgent">
-<meta name="generator" content="GTK-Doc V1.29.1 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.29 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -43,6 +43,6 @@
 </div>
 </div>
 <div class="footer">
-<hr>Generated by GTK-Doc V1.29.1</div>
+<hr>Generated by GTK-Doc V1.29</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm-glib/html/libnm-glib-nm-vpn-plugin-utils.html b/docs/libnm-glib/html/libnm-glib-nm-vpn-plugin-utils.html
index bed5e98f..50f77b71 100644
--- a/docs/libnm-glib/html/libnm-glib-nm-vpn-plugin-utils.html
+++ b/docs/libnm-glib/html/libnm-glib-nm-vpn-plugin-utils.html
@@ -8,7 +8,7 @@
 <link rel="up" href="ch02.html" title="libnm-glib API Reference">
 <link rel="prev" href="libnm-glib-NMVpnPluginUiWidget.html" title="NMVpnPluginUiWidget">
 <link rel="next" href="object-tree.html" title="Object Hierarchy">
-<meta name="generator" content="GTK-Doc V1.29.1 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.29 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -111,11 +111,11 @@ an applet when the applet calls the authentication dialog of the VPN plugin.</p>
 <pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
 nm_vpn_plugin_utils_get_secret_flags (<em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Hash-Tables.html#GHashTable"><span class="type">GHashTable</span></a> *data</code></em>,
                                       <em class="parameter"><code>const <span class="type">char</span> *secret_name</code></em>,
-                                      <em class="parameter"><code><a href="/usr/share/gtk-doc/html/libnm/NMSetting.html#NMSettingSecretFlags"><span class="type">NMSettingSecretFlags</span></a> *out_flags</code></em>);</pre>
+                                      <em class="parameter"><code><a href="/usr/share/gtk-doc/html/libnm-util/NMSetting.html#NMSettingSecretFlags"><span class="type">NMSettingSecretFlags</span></a> *out_flags</code></em>);</pre>
 <p>Given a VPN secret key name, attempts to find the corresponding flags data
 item in <em class="parameter"><code>data</code></em>
 .  If found, converts the flags data item to
-<a href="/usr/share/gtk-doc/html/libnm/NMSetting.html#NMSettingSecretFlags"><span class="type">NMSettingSecretFlags</span></a> and returns it.</p>
+<a href="/usr/share/gtk-doc/html/libnm-util/NMSetting.html#NMSettingSecretFlags"><span class="type">NMSettingSecretFlags</span></a> and returns it.</p>
 <div class="refsect3">
 <a name="nm-vpn-plugin-utils-get-secret-flags.parameters"></a><h4>Parameters</h4>
 <div class="informaltable"><table class="informaltable" width="100%" border="0">
@@ -156,6 +156,6 @@ to flags, <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macro
 </div>
 </div>
 <div class="footer">
-<hr>Generated by GTK-Doc V1.29.1</div>
+<hr>Generated by GTK-Doc V1.29</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm-glib/html/object-tree.html b/docs/libnm-glib/html/object-tree.html
index 6125f9ee..323054d1 100644
--- a/docs/libnm-glib/html/object-tree.html
+++ b/docs/libnm-glib/html/object-tree.html
@@ -8,7 +8,7 @@
 <link rel="up" href="index.html" title="libnm-glib Reference Manual">
 <link rel="prev" href="libnm-glib-nm-vpn-plugin-utils.html" title="nm-vpn-plugin-utils">
 <link rel="next" href="api-index-full.html" title="API Index">
-<meta name="generator" content="GTK-Doc V1.29.1 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.29 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -49,12 +49,12 @@
     <span class="lineart">│</span>   <span class="lineart">├──</span> <a class="link" href="NMDHCP4Config.html" title="NMDHCP4Config">NMDHCP4Config</a>
     <span class="lineart">│</span>   <span class="lineart">╰──</span> <a class="link" href="NMDHCP6Config.html" title="NMDHCP6Config">NMDHCP6Config</a>
     <span class="lineart">├──</span> <a class="link" href="NMRemoteSettings.html" title="NMRemoteSettings">NMRemoteSettings</a>
-    <span class="lineart">├──</span> NMConnection
+    <span class="lineart">├──</span> <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html#NMConnection-struct">NMConnection</a>
     <span class="lineart">│</span>   <span class="lineart">╰──</span> <a class="link" href="NMRemoteConnection.html" title="NMRemoteConnection">NMRemoteConnection</a>
     <span class="lineart">╰──</span> <a class="link" href="NMSecretAgent.html" title="NMSecretAgent">NMSecretAgent</a>
 </pre>
 </div>
 <div class="footer">
-<hr>Generated by GTK-Doc V1.29.1</div>
+<hr>Generated by GTK-Doc V1.29</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm-glib/html/ref-overview.html b/docs/libnm-glib/html/ref-overview.html
index 4db0b2bc..c86b209a 100644
--- a/docs/libnm-glib/html/ref-overview.html
+++ b/docs/libnm-glib/html/ref-overview.html
@@ -8,7 +8,7 @@
 <link rel="up" href="index.html" title="libnm-glib Reference Manual">
 <link rel="prev" href="index.html" title="libnm-glib Reference Manual">
 <link rel="next" href="ch02.html" title="libnm-glib API Reference">
-<meta name="generator" content="GTK-Doc V1.29.1 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.29 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -41,6 +41,6 @@
     </p>
 </div>
 <div class="footer">
-<hr>Generated by GTK-Doc V1.29.1</div>
+<hr>Generated by GTK-Doc V1.29</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm-glib/version.xml b/docs/libnm-glib/version.xml
index 4e00d0ac..c6ba3bc1 100644
--- a/docs/libnm-glib/version.xml
+++ b/docs/libnm-glib/version.xml
@@ -1 +1 @@
-1.14.4
+1.14.6
diff --git a/docs/libnm-util/html/NMConnection.html b/docs/libnm-util/html/NMConnection.html
index ee6e48de..6bb4a151 100644
--- a/docs/libnm-util/html/NMConnection.html
+++ b/docs/libnm-util/html/NMConnection.html
@@ -8,7 +8,7 @@
 <link rel="up" href="ch01.html" title="libnm-util API Reference">
 <link rel="prev" href="ch01.html" title="libnm-util API Reference">
 <link rel="next" href="NMSetting.html" title="NMSetting">
-<meta name="generator" content="GTK-Doc V1.29.1 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.29 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -1730,7 +1730,7 @@ nm_connection_get_connection_type (<em class="parameter"><code><a class="link" h
 <pre class="programlisting"><span class="returnvalue">char</span> *
 nm_connection_get_virtual_device_description
                                (<em class="parameter"><code><a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a> *connection</code></em>);</pre>
-<p>Returns the name that <a href="/usr/share/gtk-doc/html/libnm/NMDevice.html#nm-device-disambiguate-names"><code class="function">nm_device_disambiguate_names()</code></a> would
+<p>Returns the name that <a href="/usr/share/gtk-doc/html/libnm-glib/NMDevice.html#nm-device-disambiguate-names"><code class="function">nm_device_disambiguate_names()</code></a> would
 return for the virtual device that would be created for <em class="parameter"><code>connection</code></em>
 .
 Eg, "VLAN (eth1.1)".</p>
@@ -2691,6 +2691,6 @@ updated</p></td>
 </div>
 </div>
 <div class="footer">
-<hr>Generated by GTK-Doc V1.29.1</div>
+<hr>Generated by GTK-Doc V1.29</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm-util/html/NMSetting.html b/docs/libnm-util/html/NMSetting.html
index cd2e8e8e..04965325 100644
--- a/docs/libnm-util/html/NMSetting.html
+++ b/docs/libnm-util/html/NMSetting.html
@@ -8,7 +8,7 @@
 <link rel="up" href="ch01.html" title="libnm-util API Reference">
 <link rel="prev" href="NMConnection.html" title="NMConnection">
 <link rel="next" href="NMSettingConnection.html" title="NMSettingConnection">
-<meta name="generator" content="GTK-Doc V1.29.1 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.29 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -1399,6 +1399,6 @@ example "ppp" or "wireless" or "wired".</p>
 </div>
 </div>
 <div class="footer">
-<hr>Generated by GTK-Doc V1.29.1</div>
+<hr>Generated by GTK-Doc V1.29</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm-util/html/NMSetting8021x.html b/docs/libnm-util/html/NMSetting8021x.html
index 909e3a34..360b7a14 100644
--- a/docs/libnm-util/html/NMSetting8021x.html
+++ b/docs/libnm-util/html/NMSetting8021x.html
@@ -8,7 +8,7 @@
 <link rel="up" href="ch01.html" title="libnm-util API Reference">
 <link rel="prev" href="NMSettingDcb.html" title="NMSettingDcb">
 <link rel="next" href="NMSettingIP4Config.html" title="NMSettingIP4Config">
-<meta name="generator" content="GTK-Doc V1.29.1 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.29 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -3963,6 +3963,6 @@ addition to any certificates specified by the <a class="link" href="NMSetting802
 </div>
 </div>
 <div class="footer">
-<hr>Generated by GTK-Doc V1.29.1</div>
+<hr>Generated by GTK-Doc V1.29</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm-util/html/NMSettingAdsl.html b/docs/libnm-util/html/NMSettingAdsl.html
index e7fb4e2f..282e91f4 100644
--- a/docs/libnm-util/html/NMSettingAdsl.html
+++ b/docs/libnm-util/html/NMSettingAdsl.html
@@ -8,7 +8,7 @@
 <link rel="up" href="ch01.html" title="libnm-util API Reference">
 <link rel="prev" href="NMSettingOlpcMesh.html" title="NMSettingOlpcMesh">
 <link rel="next" href="NMSettingDcb.html" title="NMSettingDcb">
-<meta name="generator" content="GTK-Doc V1.29.1 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.29 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -639,6 +639,6 @@ required</p>
 </div>
 </div>
 <div class="footer">
-<hr>Generated by GTK-Doc V1.29.1</div>
+<hr>Generated by GTK-Doc V1.29</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm-util/html/NMSettingBluetooth.html b/docs/libnm-util/html/NMSettingBluetooth.html
index a65fc453..d29619cc 100644
--- a/docs/libnm-util/html/NMSettingBluetooth.html
+++ b/docs/libnm-util/html/NMSettingBluetooth.html
@@ -8,7 +8,7 @@
 <link rel="up" href="ch01.html" title="libnm-util API Reference">
 <link rel="prev" href="NMSettingWirelessSecurity.html" title="NMSettingWirelessSecurity">
 <link rel="next" href="NMSettingSerial.html" title="NMSettingSerial">
-<meta name="generator" content="GTK-Doc V1.29.1 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.29 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -348,6 +348,6 @@ Area Networking connections to devices supporting the NAP profile.</p>
 </div>
 </div>
 <div class="footer">
-<hr>Generated by GTK-Doc V1.29.1</div>
+<hr>Generated by GTK-Doc V1.29</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm-util/html/NMSettingBond.html b/docs/libnm-util/html/NMSettingBond.html
index c20a1246..7d5e6731 100644
--- a/docs/libnm-util/html/NMSettingBond.html
+++ b/docs/libnm-util/html/NMSettingBond.html
@@ -8,7 +8,7 @@
 <link rel="up" href="ch01.html" title="libnm-util API Reference">
 <link rel="prev" href="NMSettingWimax.html" title="NMSettingWimax">
 <link rel="next" href="NMSettingBridge.html" title="NMSettingBridge">
-<meta name="generator" content="GTK-Doc V1.29.1 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.29 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -807,6 +807,6 @@ must be strings. Option names must contain only alphanumeric characters
 </div>
 </div>
 <div class="footer">
-<hr>Generated by GTK-Doc V1.29.1</div>
+<hr>Generated by GTK-Doc V1.29</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm-util/html/NMSettingBridge.html b/docs/libnm-util/html/NMSettingBridge.html
index a74ec94f..c0bd6cbf 100644
--- a/docs/libnm-util/html/NMSettingBridge.html
+++ b/docs/libnm-util/html/NMSettingBridge.html
@@ -8,7 +8,7 @@
 <link rel="up" href="ch01.html" title="libnm-util API Reference">
 <link rel="prev" href="NMSettingBond.html" title="NMSettingBond">
 <link rel="next" href="NMSettingBridgePort.html" title="NMSettingBridgePort">
-<meta name="generator" content="GTK-Doc V1.29.1 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.29 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -670,6 +670,6 @@ bridge.</p>
 </div>
 </div>
 <div class="footer">
-<hr>Generated by GTK-Doc V1.29.1</div>
+<hr>Generated by GTK-Doc V1.29</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm-util/html/NMSettingBridgePort.html b/docs/libnm-util/html/NMSettingBridgePort.html
index c9215ada..33e7634f 100644
--- a/docs/libnm-util/html/NMSettingBridgePort.html
+++ b/docs/libnm-util/html/NMSettingBridgePort.html
@@ -8,7 +8,7 @@
 <link rel="up" href="ch01.html" title="libnm-util API Reference">
 <link rel="prev" href="NMSettingBridge.html" title="NMSettingBridge">
 <link rel="next" href="NMSettingTeam.html" title="NMSettingTeam">
-<meta name="generator" content="GTK-Doc V1.29.1 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.29 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -377,6 +377,6 @@ port.</p>
 </div>
 </div>
 <div class="footer">
-<hr>Generated by GTK-Doc V1.29.1</div>
+<hr>Generated by GTK-Doc V1.29</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm-util/html/NMSettingCdma.html b/docs/libnm-util/html/NMSettingCdma.html
index 9c75012f..88e2602a 100644
--- a/docs/libnm-util/html/NMSettingCdma.html
+++ b/docs/libnm-util/html/NMSettingCdma.html
@@ -8,7 +8,7 @@
 <link rel="up" href="ch01.html" title="libnm-util API Reference">
 <link rel="prev" href="NMSettingSerial.html" title="NMSettingSerial">
 <link rel="next" href="NMSettingGsm.html" title="NMSettingGsm">
-<meta name="generator" content="GTK-Doc V1.29.1 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.29 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -434,6 +434,6 @@ username is required, it is specified here.</p>
 </div>
 </div>
 <div class="footer">
-<hr>Generated by GTK-Doc V1.29.1</div>
+<hr>Generated by GTK-Doc V1.29</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm-util/html/NMSettingConnection.html b/docs/libnm-util/html/NMSettingConnection.html
index e1374639..544189d9 100644
--- a/docs/libnm-util/html/NMSettingConnection.html
+++ b/docs/libnm-util/html/NMSettingConnection.html
@@ -8,7 +8,7 @@
 <link rel="up" href="ch01.html" title="libnm-util API Reference">
 <link rel="prev" href="NMSetting.html" title="NMSetting">
 <link rel="next" href="NMSettingWired.html" title="NMSettingWired">
-<meta name="generator" content="GTK-Doc V1.29.1 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.29 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -1517,6 +1517,6 @@ firewall.</p>
 </div>
 </div>
 <div class="footer">
-<hr>Generated by GTK-Doc V1.29.1</div>
+<hr>Generated by GTK-Doc V1.29</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm-util/html/NMSettingDcb.html b/docs/libnm-util/html/NMSettingDcb.html
index bd68dadf..62686c3a 100644
--- a/docs/libnm-util/html/NMSettingDcb.html
+++ b/docs/libnm-util/html/NMSettingDcb.html
@@ -8,7 +8,7 @@
 <link rel="up" href="ch01.html" title="libnm-util API Reference">
 <link rel="prev" href="NMSettingAdsl.html" title="NMSettingAdsl">
 <link rel="next" href="NMSetting8021x.html" title="NMSetting8021x">
-<meta name="generator" content="GTK-Doc V1.29.1 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.29 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -1517,6 +1517,6 @@ which the priority is mapped.</p>
 </div>
 </div>
 <div class="footer">
-<hr>Generated by GTK-Doc V1.29.1</div>
+<hr>Generated by GTK-Doc V1.29</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm-util/html/NMSettingGeneric.html b/docs/libnm-util/html/NMSettingGeneric.html
index bf5832cf..0415f38e 100644
--- a/docs/libnm-util/html/NMSettingGeneric.html
+++ b/docs/libnm-util/html/NMSettingGeneric.html
@@ -8,7 +8,7 @@
 <link rel="up" href="ch01.html" title="libnm-util API Reference">
 <link rel="prev" href="NMSettingTeamPort.html" title="NMSettingTeamPort">
 <link rel="next" href="NMSettingInfiniband.html" title="NMSettingInfiniband">
-<meta name="generator" content="GTK-Doc V1.29.1 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.29 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -186,6 +186,6 @@ is required</p>
 </div>
 </div>
 <div class="footer">
-<hr>Generated by GTK-Doc V1.29.1</div>
+<hr>Generated by GTK-Doc V1.29</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm-util/html/NMSettingGsm.html b/docs/libnm-util/html/NMSettingGsm.html
index deda2779..16173287 100644
--- a/docs/libnm-util/html/NMSettingGsm.html
+++ b/docs/libnm-util/html/NMSettingGsm.html
@@ -8,7 +8,7 @@
 <link rel="up" href="ch01.html" title="libnm-util API Reference">
 <link rel="prev" href="NMSettingCdma.html" title="NMSettingCdma">
 <link rel="next" href="NMSettingWimax.html" title="NMSettingWimax">
-<meta name="generator" content="GTK-Doc V1.29.1 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.29 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -1100,6 +1100,6 @@ username is required, it is specified here.</p>
 </div>
 </div>
 <div class="footer">
-<hr>Generated by GTK-Doc V1.29.1</div>
+<hr>Generated by GTK-Doc V1.29</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm-util/html/NMSettingIP4Config.html b/docs/libnm-util/html/NMSettingIP4Config.html
index a8124495..ba8cefd9 100644
--- a/docs/libnm-util/html/NMSettingIP4Config.html
+++ b/docs/libnm-util/html/NMSettingIP4Config.html
@@ -8,7 +8,7 @@
 <link rel="up" href="ch01.html" title="libnm-util API Reference">
 <link rel="prev" href="NMSetting8021x.html" title="NMSetting8021x">
 <link rel="next" href="NMSettingIP6Config.html" title="NMSettingIP6Config">
-<meta name="generator" content="GTK-Doc V1.29.1 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.29 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -2779,6 +2779,6 @@ methods because there is no upstream network.</p>
 </div>
 </div>
 <div class="footer">
-<hr>Generated by GTK-Doc V1.29.1</div>
+<hr>Generated by GTK-Doc V1.29</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm-util/html/NMSettingIP6Config.html b/docs/libnm-util/html/NMSettingIP6Config.html
index b635421f..fff0477e 100644
--- a/docs/libnm-util/html/NMSettingIP6Config.html
+++ b/docs/libnm-util/html/NMSettingIP6Config.html
@@ -8,7 +8,7 @@
 <link rel="up" href="ch01.html" title="libnm-util API Reference">
 <link rel="prev" href="NMSettingIP4Config.html" title="NMSettingIP4Config">
 <link rel="next" href="NMSettingPPP.html" title="NMSettingPPP">
-<meta name="generator" content="GTK-Doc V1.29.1 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.29 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -2723,6 +2723,6 @@ automatic configuration.  Routes cannot be used with the "shared" or
 </div>
 </div>
 <div class="footer">
-<hr>Generated by GTK-Doc V1.29.1</div>
+<hr>Generated by GTK-Doc V1.29</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm-util/html/NMSettingInfiniband.html b/docs/libnm-util/html/NMSettingInfiniband.html
index d6c72004..fc5a4925 100644
--- a/docs/libnm-util/html/NMSettingInfiniband.html
+++ b/docs/libnm-util/html/NMSettingInfiniband.html
@@ -8,7 +8,7 @@
 <link rel="up" href="ch01.html" title="libnm-util API Reference">
 <link rel="prev" href="NMSettingGeneric.html" title="NMSettingGeneric">
 <link rel="next" href="NMSettingVlan.html" title="NMSettingVlan">
-<meta name="generator" content="GTK-Doc V1.29.1 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.29 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -492,6 +492,6 @@ specify the base device by setting either this property or
 </div>
 </div>
 <div class="footer">
-<hr>Generated by GTK-Doc V1.29.1</div>
+<hr>Generated by GTK-Doc V1.29</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm-util/html/NMSettingOlpcMesh.html b/docs/libnm-util/html/NMSettingOlpcMesh.html
index fb009f4f..57e9fc65 100644
--- a/docs/libnm-util/html/NMSettingOlpcMesh.html
+++ b/docs/libnm-util/html/NMSettingOlpcMesh.html
@@ -8,7 +8,7 @@
 <link rel="up" href="ch01.html" title="libnm-util API Reference">
 <link rel="prev" href="NMSettingVlan.html" title="NMSettingVlan">
 <link rel="next" href="NMSettingAdsl.html" title="NMSettingAdsl">
-<meta name="generator" content="GTK-Doc V1.29.1 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.29 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -294,6 +294,6 @@ answers the request.</p>
 </div>
 </div>
 <div class="footer">
-<hr>Generated by GTK-Doc V1.29.1</div>
+<hr>Generated by GTK-Doc V1.29</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm-util/html/NMSettingPPP.html b/docs/libnm-util/html/NMSettingPPP.html
index 56a6c682..5101c737 100644
--- a/docs/libnm-util/html/NMSettingPPP.html
+++ b/docs/libnm-util/html/NMSettingPPP.html
@@ -8,7 +8,7 @@
 <link rel="up" href="ch01.html" title="libnm-util API Reference">
 <link rel="prev" href="NMSettingIP6Config.html" title="NMSettingIP6Config">
 <link rel="next" href="NMSettingPPPOE.html" title="NMSettingPPPOE">
-<meta name="generator" content="GTK-Doc V1.29.1 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.29 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -1235,6 +1235,6 @@ be set to <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macro
 </div>
 </div>
 <div class="footer">
-<hr>Generated by GTK-Doc V1.29.1</div>
+<hr>Generated by GTK-Doc V1.29</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm-util/html/NMSettingPPPOE.html b/docs/libnm-util/html/NMSettingPPPOE.html
index 23c97005..189e25ac 100644
--- a/docs/libnm-util/html/NMSettingPPPOE.html
+++ b/docs/libnm-util/html/NMSettingPPPOE.html
@@ -8,7 +8,7 @@
 <link rel="up" href="ch01.html" title="libnm-util API Reference">
 <link rel="prev" href="NMSettingPPP.html" title="NMSettingPPP">
 <link rel="next" href="NMSettingVPN.html" title="NMSettingVPN">
-<meta name="generator" content="GTK-Doc V1.29.1 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.29 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -432,6 +432,6 @@ access concentrators or a specific service is known to be required.</p>
 </div>
 </div>
 <div class="footer">
-<hr>Generated by GTK-Doc V1.29.1</div>
+<hr>Generated by GTK-Doc V1.29</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm-util/html/NMSettingSerial.html b/docs/libnm-util/html/NMSettingSerial.html
index 925f4c3d..b1f5899e 100644
--- a/docs/libnm-util/html/NMSettingSerial.html
+++ b/docs/libnm-util/html/NMSettingSerial.html
@@ -8,7 +8,7 @@
 <link rel="up" href="ch01.html" title="libnm-util API Reference">
 <link rel="prev" href="NMSettingBluetooth.html" title="NMSettingBluetooth">
 <link rel="next" href="NMSettingCdma.html" title="NMSettingCdma">
-<meta name="generator" content="GTK-Doc V1.29.1 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.29 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -492,6 +492,6 @@ The 1 in "8n1" for example.</p>
 </div>
 </div>
 <div class="footer">
-<hr>Generated by GTK-Doc V1.29.1</div>
+<hr>Generated by GTK-Doc V1.29</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm-util/html/NMSettingTeam.html b/docs/libnm-util/html/NMSettingTeam.html
index 1e87bffc..37322bb9 100644
--- a/docs/libnm-util/html/NMSettingTeam.html
+++ b/docs/libnm-util/html/NMSettingTeam.html
@@ -8,7 +8,7 @@
 <link rel="up" href="ch01.html" title="libnm-util API Reference">
 <link rel="prev" href="NMSettingBridgePort.html" title="NMSettingBridgePort">
 <link rel="next" href="NMSettingTeamPort.html" title="NMSettingTeamPort">
-<meta name="generator" content="GTK-Doc V1.29.1 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.29 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -314,6 +314,6 @@ configuration is used.  See man teamd.conf for the format details.</p>
 </div>
 </div>
 <div class="footer">
-<hr>Generated by GTK-Doc V1.29.1</div>
+<hr>Generated by GTK-Doc V1.29</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm-util/html/NMSettingTeamPort.html b/docs/libnm-util/html/NMSettingTeamPort.html
index 02a95a81..91931b13 100644
--- a/docs/libnm-util/html/NMSettingTeamPort.html
+++ b/docs/libnm-util/html/NMSettingTeamPort.html
@@ -8,7 +8,7 @@
 <link rel="up" href="ch01.html" title="libnm-util API Reference">
 <link rel="prev" href="NMSettingTeam.html" title="NMSettingTeam">
 <link rel="next" href="NMSettingGeneric.html" title="NMSettingGeneric">
-<meta name="generator" content="GTK-Doc V1.29.1 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.29 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -255,6 +255,6 @@ used. See man teamd.conf for the format details.</p>
 </div>
 </div>
 <div class="footer">
-<hr>Generated by GTK-Doc V1.29.1</div>
+<hr>Generated by GTK-Doc V1.29</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm-util/html/NMSettingVPN.html b/docs/libnm-util/html/NMSettingVPN.html
index e5741b12..be421f2f 100644
--- a/docs/libnm-util/html/NMSettingVPN.html
+++ b/docs/libnm-util/html/NMSettingVPN.html
@@ -8,7 +8,7 @@
 <link rel="up" href="ch01.html" title="libnm-util API Reference">
 <link rel="prev" href="NMSettingPPPOE.html" title="NMSettingPPPOE">
 <link rel="next" href="libnm-util-nm-utils.html" title="nm-utils">
-<meta name="generator" content="GTK-Doc V1.29.1 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.29 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -904,6 +904,6 @@ VPN connection.</p>
 </div>
 </div>
 <div class="footer">
-<hr>Generated by GTK-Doc V1.29.1</div>
+<hr>Generated by GTK-Doc V1.29</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm-util/html/NMSettingVlan.html b/docs/libnm-util/html/NMSettingVlan.html
index a33bda1c..ecd3ae9b 100644
--- a/docs/libnm-util/html/NMSettingVlan.html
+++ b/docs/libnm-util/html/NMSettingVlan.html
@@ -8,7 +8,7 @@
 <link rel="up" href="ch01.html" title="libnm-util API Reference">
 <link rel="prev" href="NMSettingInfiniband.html" title="NMSettingInfiniband">
 <link rel="next" href="NMSettingOlpcMesh.html" title="NMSettingOlpcMesh">
-<meta name="generator" content="GTK-Doc V1.29.1 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.29 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -1023,6 +1023,6 @@ with a <a class="link" href="NMSettingWired.html#NMSettingWired--mac-address" ti
 </div>
 </div>
 <div class="footer">
-<hr>Generated by GTK-Doc V1.29.1</div>
+<hr>Generated by GTK-Doc V1.29</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm-util/html/NMSettingWimax.html b/docs/libnm-util/html/NMSettingWimax.html
index ebebf56b..3d223141 100644
--- a/docs/libnm-util/html/NMSettingWimax.html
+++ b/docs/libnm-util/html/NMSettingWimax.html
@@ -8,7 +8,7 @@
 <link rel="up" href="ch01.html" title="libnm-util API Reference">
 <link rel="prev" href="NMSettingGsm.html" title="NMSettingGsm">
 <link rel="next" href="NMSettingBond.html" title="NMSettingBond">
-<meta name="generator" content="GTK-Doc V1.29.1 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.29 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -339,6 +339,6 @@ should use.</p>
 </div>
 </div>
 <div class="footer">
-<hr>Generated by GTK-Doc V1.29.1</div>
+<hr>Generated by GTK-Doc V1.29</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm-util/html/NMSettingWired.html b/docs/libnm-util/html/NMSettingWired.html
index 0b02b141..938a5366 100644
--- a/docs/libnm-util/html/NMSettingWired.html
+++ b/docs/libnm-util/html/NMSettingWired.html
@@ -8,7 +8,7 @@
 <link rel="up" href="ch01.html" title="libnm-util API Reference">
 <link rel="prev" href="NMSettingConnection.html" title="NMSettingConnection">
 <link rel="next" href="NMSettingWireless.html" title="NMSettingWireless">
-<meta name="generator" content="GTK-Doc V1.29.1 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.29 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -1328,6 +1328,6 @@ Mbit/s, ie 100 == 100Mbit/s.</p>
 </div>
 </div>
 <div class="footer">
-<hr>Generated by GTK-Doc V1.29.1</div>
+<hr>Generated by GTK-Doc V1.29</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm-util/html/NMSettingWireless.html b/docs/libnm-util/html/NMSettingWireless.html
index f2da25f8..20b3c124 100644
--- a/docs/libnm-util/html/NMSettingWireless.html
+++ b/docs/libnm-util/html/NMSettingWireless.html
@@ -8,7 +8,7 @@
 <link rel="up" href="ch01.html" title="libnm-util API Reference">
 <link rel="prev" href="NMSettingWired.html" title="NMSettingWired">
 <link rel="next" href="NMSettingWirelessSecurity.html" title="NMSettingWirelessSecurity">
-<meta name="generator" content="GTK-Doc V1.29.1 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.29 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -1543,6 +1543,6 @@ devices support setting a static transmit power.</p>
 </div>
 </div>
 <div class="footer">
-<hr>Generated by GTK-Doc V1.29.1</div>
+<hr>Generated by GTK-Doc V1.29</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm-util/html/NMSettingWirelessSecurity.html b/docs/libnm-util/html/NMSettingWirelessSecurity.html
index d080e83b..83a4be08 100644
--- a/docs/libnm-util/html/NMSettingWirelessSecurity.html
+++ b/docs/libnm-util/html/NMSettingWirelessSecurity.html
@@ -8,7 +8,7 @@
 <link rel="up" href="ch01.html" title="libnm-util API Reference">
 <link rel="prev" href="NMSettingWireless.html" title="NMSettingWireless">
 <link rel="next" href="NMSettingBluetooth.html" title="NMSettingBluetooth">
-<meta name="generator" content="GTK-Doc V1.29.1 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.29 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -1898,6 +1898,6 @@ Linksys WRT54G) number the keys 1 - 4.</p>
 </div>
 </div>
 <div class="footer">
-<hr>Generated by GTK-Doc V1.29.1</div>
+<hr>Generated by GTK-Doc V1.29</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm-util/html/annotation-glossary.html b/docs/libnm-util/html/annotation-glossary.html
index 22ec3bb7..a70e06d2 100644
--- a/docs/libnm-util/html/annotation-glossary.html
+++ b/docs/libnm-util/html/annotation-glossary.html
@@ -7,7 +7,7 @@
 <link rel="home" href="index.html" title="libnm-util Reference Manual">
 <link rel="up" href="index.html" title="libnm-util Reference Manual">
 <link rel="prev" href="api-index-full.html" title="API Index">
-<meta name="generator" content="GTK-Doc V1.29.1 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.29 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -64,6 +64,6 @@
 <dd class="glossdef"><p>Don't free data after the code is done.</p></dd>
 </div>
 <div class="footer">
-<hr>Generated by GTK-Doc V1.29.1</div>
+<hr>Generated by GTK-Doc V1.29</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm-util/html/api-index-full.html b/docs/libnm-util/html/api-index-full.html
index 8646e476..140f70f5 100644
--- a/docs/libnm-util/html/api-index-full.html
+++ b/docs/libnm-util/html/api-index-full.html
@@ -8,7 +8,7 @@
 <link rel="up" href="index.html" title="libnm-util Reference Manual">
 <link rel="prev" href="object-tree.html" title="Object Hierarchy">
 <link rel="next" href="annotation-glossary.html" title="Annotation Glossary">
-<meta name="generator" content="GTK-Doc V1.29.1 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.29 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -5335,6 +5335,6 @@ DBUS_TYPE_NM_IP_ROUTES, macro in nm-dbus-glib-types
 <dd></dd>
 </div>
 <div class="footer">
-<hr>Generated by GTK-Doc V1.29.1</div>
+<hr>Generated by GTK-Doc V1.29</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm-util/html/ch01.html b/docs/libnm-util/html/ch01.html
index a1bc76d3..86c53967 100644
--- a/docs/libnm-util/html/ch01.html
+++ b/docs/libnm-util/html/ch01.html
@@ -8,7 +8,7 @@
 <link rel="up" href="index.html" title="libnm-util Reference Manual">
 <link rel="prev" href="index.html" title="libnm-util Reference Manual">
 <link rel="next" href="NMConnection.html" title="NMConnection">
-<meta name="generator" content="GTK-Doc V1.29.1 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.29 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -122,6 +122,6 @@ that require PPP to deliver IP capability</span>
 </dl></div>
 </div>
 <div class="footer">
-<hr>Generated by GTK-Doc V1.29.1</div>
+<hr>Generated by GTK-Doc V1.29</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm-util/html/index.html b/docs/libnm-util/html/index.html
index 206b7525..77d7c18e 100644
--- a/docs/libnm-util/html/index.html
+++ b/docs/libnm-util/html/index.html
@@ -6,7 +6,7 @@
 <meta name="generator" content="DocBook XSL Stylesheets Vsnapshot">
 <link rel="home" href="index.html" title="libnm-util Reference Manual">
 <link rel="next" href="ch01.html" title="libnm-util API Reference">
-<meta name="generator" content="GTK-Doc V1.29.1 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.29 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -15,7 +15,7 @@
 <div>
 <div><table class="navigation" id="top" width="100%" cellpadding="2" cellspacing="0"><tr><th valign="middle"><p class="title">libnm-util Reference Manual</p></th></tr></table></div>
 <div><p class="releaseinfo">
-      for libnm-util 1.14.4
+      for libnm-util 1.14.6
 
       The latest version of this documentation can be found on-line at
       <a class="ulink" href="https://developer.gnome.org/libnm-util/stable/" target="_top">https://developer.gnome.org/libnm-util/stable/</a>.
@@ -152,6 +152,6 @@ that require PPP to deliver IP capability</span>
 </dl></div>
 </div>
 <div class="footer">
-<hr>Generated by GTK-Doc V1.29.1</div>
+<hr>Generated by GTK-Doc V1.29</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm-util/html/libnm-util-NetworkManager.html b/docs/libnm-util/html/libnm-util-NetworkManager.html
index cc8f74ad..aa7bd3a2 100644
--- a/docs/libnm-util/html/libnm-util-NetworkManager.html
+++ b/docs/libnm-util/html/libnm-util-NetworkManager.html
@@ -8,7 +8,7 @@
 <link rel="up" href="ch01.html" title="libnm-util API Reference">
 <link rel="prev" href="libnm-util-nm-utils.html" title="nm-utils">
 <link rel="next" href="libnm-util-NetworkManagerVPN.html" title="NetworkManagerVPN">
-<meta name="generator" content="GTK-Doc V1.29.1 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.29 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -1886,6 +1886,6 @@ network.</p>
 </div>
 </div>
 <div class="footer">
-<hr>Generated by GTK-Doc V1.29.1</div>
+<hr>Generated by GTK-Doc V1.29</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm-util/html/libnm-util-NetworkManagerVPN.html b/docs/libnm-util/html/libnm-util-NetworkManagerVPN.html
index d65162a0..2f32db96 100644
--- a/docs/libnm-util/html/libnm-util-NetworkManagerVPN.html
+++ b/docs/libnm-util/html/libnm-util-NetworkManagerVPN.html
@@ -8,7 +8,7 @@
 <link rel="up" href="ch01.html" title="libnm-util API Reference">
 <link rel="prev" href="libnm-util-NetworkManager.html" title="NetworkManager">
 <link rel="next" href="object-tree.html" title="Object Hierarchy">
-<meta name="generator" content="GTK-Doc V1.29.1 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.29 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -944,6 +944,6 @@
 </div>
 </div>
 <div class="footer">
-<hr>Generated by GTK-Doc V1.29.1</div>
+<hr>Generated by GTK-Doc V1.29</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm-util/html/libnm-util-nm-utils.html b/docs/libnm-util/html/libnm-util-nm-utils.html
index 4627f3a4..106d1c8f 100644
--- a/docs/libnm-util/html/libnm-util-nm-utils.html
+++ b/docs/libnm-util/html/libnm-util-nm-utils.html
@@ -8,7 +8,7 @@
 <link rel="up" href="ch01.html" title="libnm-util API Reference">
 <link rel="prev" href="NMSettingVPN.html" title="NMSettingVPN">
 <link rel="next" href="libnm-util-NetworkManager.html" title="NetworkManager">
-<meta name="generator" content="GTK-Doc V1.29.1 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.29 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -2498,6 +2498,6 @@ for both <a class="link" href="libnm-util-nm-utils.html#nm-utils-inet4-ntop" tit
 </div>
 </div>
 <div class="footer">
-<hr>Generated by GTK-Doc V1.29.1</div>
+<hr>Generated by GTK-Doc V1.29</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm-util/html/object-tree.html b/docs/libnm-util/html/object-tree.html
index e59857a2..da44d520 100644
--- a/docs/libnm-util/html/object-tree.html
+++ b/docs/libnm-util/html/object-tree.html
@@ -8,7 +8,7 @@
 <link rel="up" href="index.html" title="libnm-util Reference Manual">
 <link rel="prev" href="libnm-util-NetworkManagerVPN.html" title="NetworkManagerVPN">
 <link rel="next" href="api-index-full.html" title="API Index">
-<meta name="generator" content="GTK-Doc V1.29.1 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.29 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -103,6 +103,6 @@
 </pre>
 </div>
 <div class="footer">
-<hr>Generated by GTK-Doc V1.29.1</div>
+<hr>Generated by GTK-Doc V1.29</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm-util/version.xml b/docs/libnm-util/version.xml
index 4e00d0ac..c6ba3bc1 100644
--- a/docs/libnm-util/version.xml
+++ b/docs/libnm-util/version.xml
@@ -1 +1 @@
-1.14.4
+1.14.6
diff --git a/docs/libnm/html/NMAccessPoint.html b/docs/libnm/html/NMAccessPoint.html
index 8cfe207c..22f76319 100644
--- a/docs/libnm/html/NMAccessPoint.html
+++ b/docs/libnm/html/NMAccessPoint.html
@@ -8,7 +8,7 @@
 <link rel="up" href="ch04.html" title="Device and Runtime Configuration API Reference">
 <link rel="prev" href="NMVpnConnection.html" title="NMVpnConnection">
 <link rel="next" href="NMWimaxNsp.html" title="NMWimaxNsp">
-<meta name="generator" content="GTK-Doc V1.29.1 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.29 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -584,7 +584,7 @@ with this function.</p>
 </tr>
 <tr>
 <td class="parameter_name"><p>connections</p></td>
-<td class="parameter_description"><p>an array of <span class="type">NMConnections</span> to
+<td class="parameter_description"><p>an array of <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html#NMConnection-struct"><span class="type">NMConnections</span></a> to
 filter. </p></td>
 <td class="parameter_annotations"><span class="annotation">[<acronym title="Generics and defining elements of containers and arrays."><span class="acronym">element-type</span></acronym> NMConnection]</span></td>
 </tr>
@@ -594,10 +594,10 @@ filter. </p></td>
 <div class="refsect3">
 <a name="nm-access-point-filter-connections.returns"></a><h4>Returns</h4>
 <p>an array of
-<span class="type">NMConnections</span> that could be activated with the given <em class="parameter"><code>ap</code></em>
+<a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html#NMConnection-struct"><span class="type">NMConnections</span></a> that could be activated with the given <em class="parameter"><code>ap</code></em>
 .  The array should
 be freed with <a href="https://developer.gnome.org/glib/unstable/glib-Pointer-Arrays.html#g-ptr-array-unref"><code class="function">g_ptr_array_unref()</code></a> when it is no longer required. </p>
-<p><span class="annotation">[<acronym title="Free data container after the code is done."><span class="acronym">transfer container</span></acronym>][<acronym title="Generics and defining elements of containers and arrays."><span class="acronym">element-type</span></acronym> NMConnection]</span></p>
+<p><span class="annotation">[<acronym title="Free data after the code is done."><span class="acronym">transfer full</span></acronym>][<acronym title="Generics and defining elements of containers and arrays."><span class="acronym">element-type</span></acronym> NMConnection]</span></p>
 </div>
 </div>
 <hr>
@@ -814,6 +814,6 @@ coordinator of the wireless network allowing clients to connect) or
 </div>
 </div>
 <div class="footer">
-<hr>Generated by GTK-Doc V1.29.1</div>
+<hr>Generated by GTK-Doc V1.29</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm/html/NMActiveConnection.html b/docs/libnm/html/NMActiveConnection.html
index ae4f7e32..f13fe153 100644
--- a/docs/libnm/html/NMActiveConnection.html
+++ b/docs/libnm/html/NMActiveConnection.html
@@ -8,7 +8,7 @@
 <link rel="up" href="ch04.html" title="Device and Runtime Configuration API Reference">
 <link rel="prev" href="libnm-nm-device-wpan.html" title="nm-device-wpan">
 <link rel="next" href="NMVpnConnection.html" title="NMVpnConnection">
-<meta name="generator" content="GTK-Doc V1.29.1 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.29 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -1112,6 +1112,6 @@ user_function (<a class="link" href="NMActiveConnection.html" title="NMActiveCon
 </div>
 </div>
 <div class="footer">
-<hr>Generated by GTK-Doc V1.29.1</div>
+<hr>Generated by GTK-Doc V1.29</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm/html/NMCheckpoint.html b/docs/libnm/html/NMCheckpoint.html
index 5d646bab..7d0ba4d3 100644
--- a/docs/libnm/html/NMCheckpoint.html
+++ b/docs/libnm/html/NMCheckpoint.html
@@ -8,7 +8,7 @@
 <link rel="up" href="ch04.html" title="Device and Runtime Configuration API Reference">
 <link rel="prev" href="NMDhcpConfig.html" title="NMDhcpConfig">
 <link rel="next" href="ch05.html" title="Utility API Reference">
-<meta name="generator" content="GTK-Doc V1.29.1 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.29 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -199,6 +199,6 @@ nm_checkpoint_get_rollback_timeout (<em class="parameter"><code><a class="link"
 </div>
 </div>
 <div class="footer">
-<hr>Generated by GTK-Doc V1.29.1</div>
+<hr>Generated by GTK-Doc V1.29</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm/html/NMClient.html b/docs/libnm/html/NMClient.html
index cae0449c..7ccbd977 100644
--- a/docs/libnm/html/NMClient.html
+++ b/docs/libnm/html/NMClient.html
@@ -8,7 +8,7 @@
 <link rel="up" href="ch02.html" title="Client Object API Reference">
 <link rel="prev" href="ch02.html" title="Client Object API Reference">
 <link rel="next" href="NMSecretAgentOld.html" title="NMSecretAgentOld">
-<meta name="generator" content="GTK-Doc V1.29.1 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.29 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -5032,6 +5032,6 @@ user_function (<a class="link" href="NMClient.html" title="NMClient"><span class
 </div>
 </div>
 <div class="footer">
-<hr>Generated by GTK-Doc V1.29.1</div>
+<hr>Generated by GTK-Doc V1.29</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm/html/NMConnection.html b/docs/libnm/html/NMConnection.html
index 9a6eb203..00d006d0 100644
--- a/docs/libnm/html/NMConnection.html
+++ b/docs/libnm/html/NMConnection.html
@@ -8,7 +8,7 @@
 <link rel="up" href="ch03.html" title="Connection and Setting API Reference">
 <link rel="prev" href="ch03.html" title="Connection and Setting API Reference">
 <link rel="next" href="NMSimpleConnection.html" title="NMSimpleConnection">
-<meta name="generator" content="GTK-Doc V1.29.1 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.29 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -1314,7 +1314,7 @@ failed (tried to update secrets for a setting that doesn't exist, etc)</p>
 nm_connection_set_path (<em class="parameter"><code><a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a> *connection</code></em>,
                         <em class="parameter"><code>const <span class="type">char</span> *path</code></em>);</pre>
 <p>Sets the D-Bus path of the connection.  This property is not serialized, and
-is only for the reference of the caller.  Sets the <span class="type">“path”</span>
+is only for the reference of the caller.  Sets the <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html#NMConnection--path"><span class="type">“path”</span></a>
 property.</p>
 <div class="refsect3">
 <a name="nm-connection-set-path.parameters"></a><h4>Parameters</h4>
@@ -2854,6 +2854,6 @@ calling <a class="link" href="NMConnection.html#nm-connection-to-dbus" title="nm
 </div>
 </div>
 <div class="footer">
-<hr>Generated by GTK-Doc V1.29.1</div>
+<hr>Generated by GTK-Doc V1.29</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm/html/NMDevice.html b/docs/libnm/html/NMDevice.html
index 5219b910..be147615 100644
--- a/docs/libnm/html/NMDevice.html
+++ b/docs/libnm/html/NMDevice.html
@@ -8,7 +8,7 @@
 <link rel="up" href="ch04.html" title="Device and Runtime Configuration API Reference">
 <link rel="prev" href="ch04.html" title="Device and Runtime Configuration API Reference">
 <link rel="next" href="libnm-nm-device-6lowpan.html" title="nm-device-6lowpan">
-<meta name="generator" content="GTK-Doc V1.29.1 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.29 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -2422,7 +2422,7 @@ incompatible with the device. To get the full list of connections see
 </tr>
 <tr>
 <td class="parameter_name"><p>connections</p></td>
-<td class="parameter_description"><p>an array of <span class="type">NMConnections</span> to filter. </p></td>
+<td class="parameter_description"><p>an array of <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html#NMConnection-struct"><span class="type">NMConnections</span></a> to filter. </p></td>
 <td class="parameter_annotations"><span class="annotation">[<acronym title="Generics and defining elements of containers and arrays."><span class="acronym">element-type</span></acronym> NMConnection]</span></td>
 </tr>
 </tbody>
@@ -2431,10 +2431,10 @@ incompatible with the device. To get the full list of connections see
 <div class="refsect3">
 <a name="nm-device-filter-connections.returns"></a><h4>Returns</h4>
 <p>an array of
-<span class="type">NMConnections</span> that could be activated with the given <em class="parameter"><code>device</code></em>
+<a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html#NMConnection-struct"><span class="type">NMConnections</span></a> that could be activated with the given <em class="parameter"><code>device</code></em>
 .  The array
 should be freed with <a href="https://developer.gnome.org/glib/unstable/glib-Pointer-Arrays.html#g-ptr-array-unref"><code class="function">g_ptr_array_unref()</code></a> when it is no longer required. </p>
-<p><span class="annotation">[<acronym title="Free data container after the code is done."><span class="acronym">transfer container</span></acronym>][<acronym title="Generics and defining elements of containers and arrays."><span class="acronym">element-type</span></acronym> NMConnection]</span></p>
+<p><span class="annotation">[<acronym title="Free data after the code is done."><span class="acronym">transfer full</span></acronym>][<acronym title="Generics and defining elements of containers and arrays."><span class="acronym">element-type</span></acronym> NMConnection]</span></p>
 </div>
 </div>
 <hr>
@@ -3225,6 +3225,6 @@ user_function (<a class="link" href="NMDevice.html" title="NMDevice"><span class
 </div>
 </div>
 <div class="footer">
-<hr>Generated by GTK-Doc V1.29.1</div>
+<hr>Generated by GTK-Doc V1.29</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm/html/NMDeviceAdsl.html b/docs/libnm/html/NMDeviceAdsl.html
index e40b2ea2..9710b372 100644
--- a/docs/libnm/html/NMDeviceAdsl.html
+++ b/docs/libnm/html/NMDeviceAdsl.html
@@ -8,7 +8,7 @@
 <link rel="up" href="ch04.html" title="Device and Runtime Configuration API Reference">
 <link rel="prev" href="libnm-nm-device-6lowpan.html" title="nm-device-6lowpan">
 <link rel="next" href="NMDeviceBond.html" title="NMDeviceBond">
-<meta name="generator" content="GTK-Doc V1.29.1 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.29 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -155,6 +155,6 @@ nm_device_adsl_get_carrier (<em class="parameter"><code><a class="link" href="NM
 </div>
 </div>
 <div class="footer">
-<hr>Generated by GTK-Doc V1.29.1</div>
+<hr>Generated by GTK-Doc V1.29</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm/html/NMDeviceBond.html b/docs/libnm/html/NMDeviceBond.html
index 46fbb3ee..3e1f29ea 100644
--- a/docs/libnm/html/NMDeviceBond.html
+++ b/docs/libnm/html/NMDeviceBond.html
@@ -8,7 +8,7 @@
 <link rel="up" href="ch04.html" title="Device and Runtime Configuration API Reference">
 <link rel="prev" href="NMDeviceAdsl.html" title="NMDeviceAdsl">
 <link rel="next" href="NMDeviceBridge.html" title="NMDeviceBridge">
-<meta name="generator" content="GTK-Doc V1.29.1 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.29 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -279,6 +279,6 @@ copy used by the device, and must not be modified. </p>
 </div>
 </div>
 <div class="footer">
-<hr>Generated by GTK-Doc V1.29.1</div>
+<hr>Generated by GTK-Doc V1.29</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm/html/NMDeviceBridge.html b/docs/libnm/html/NMDeviceBridge.html
index 1efbcb81..adffd6df 100644
--- a/docs/libnm/html/NMDeviceBridge.html
+++ b/docs/libnm/html/NMDeviceBridge.html
@@ -8,7 +8,7 @@
 <link rel="up" href="ch04.html" title="Device and Runtime Configuration API Reference">
 <link rel="prev" href="NMDeviceBond.html" title="NMDeviceBond">
 <link rel="next" href="NMDeviceBt.html" title="NMDeviceBt">
-<meta name="generator" content="GTK-Doc V1.29.1 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.29 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -279,6 +279,6 @@ copy used by the device, and must not be modified. </p>
 </div>
 </div>
 <div class="footer">
-<hr>Generated by GTK-Doc V1.29.1</div>
+<hr>Generated by GTK-Doc V1.29</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm/html/NMDeviceBt.html b/docs/libnm/html/NMDeviceBt.html
index d87f9ae7..65a41ae5 100644
--- a/docs/libnm/html/NMDeviceBt.html
+++ b/docs/libnm/html/NMDeviceBt.html
@@ -8,7 +8,7 @@
 <link rel="up" href="ch04.html" title="Device and Runtime Configuration API Reference">
 <link rel="prev" href="NMDeviceBridge.html" title="NMDeviceBridge">
 <link rel="next" href="NMDeviceDummy.html" title="NMDeviceDummy">
-<meta name="generator" content="GTK-Doc V1.29.1 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.29 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -273,6 +273,6 @@ nm_device_bt_get_capabilities (<em class="parameter"><code><a class="link" href=
 </div>
 </div>
 <div class="footer">
-<hr>Generated by GTK-Doc V1.29.1</div>
+<hr>Generated by GTK-Doc V1.29</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm/html/NMDeviceDummy.html b/docs/libnm/html/NMDeviceDummy.html
index 1d430bee..baff573b 100644
--- a/docs/libnm/html/NMDeviceDummy.html
+++ b/docs/libnm/html/NMDeviceDummy.html
@@ -8,7 +8,7 @@
 <link rel="up" href="ch04.html" title="Device and Runtime Configuration API Reference">
 <link rel="prev" href="NMDeviceBt.html" title="NMDeviceBt">
 <link rel="next" href="NMDeviceEthernet.html" title="NMDeviceEthernet">
-<meta name="generator" content="GTK-Doc V1.29.1 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.29 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -158,6 +158,6 @@ device, and must not be modified.</p>
 </div>
 </div>
 <div class="footer">
-<hr>Generated by GTK-Doc V1.29.1</div>
+<hr>Generated by GTK-Doc V1.29</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm/html/NMDeviceEthernet.html b/docs/libnm/html/NMDeviceEthernet.html
index 002f70ff..02f43818 100644
--- a/docs/libnm/html/NMDeviceEthernet.html
+++ b/docs/libnm/html/NMDeviceEthernet.html
@@ -8,7 +8,7 @@
 <link rel="up" href="ch04.html" title="Device and Runtime Configuration API Reference">
 <link rel="prev" href="NMDeviceDummy.html" title="NMDeviceDummy">
 <link rel="next" href="NMDeviceGeneric.html" title="NMDeviceGeneric">
-<meta name="generator" content="GTK-Doc V1.29.1 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.29 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -394,6 +394,6 @@ communication with z/VM or s390 host.</p>
 </div>
 </div>
 <div class="footer">
-<hr>Generated by GTK-Doc V1.29.1</div>
+<hr>Generated by GTK-Doc V1.29</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm/html/NMDeviceGeneric.html b/docs/libnm/html/NMDeviceGeneric.html
index e1b11244..1d477d45 100644
--- a/docs/libnm/html/NMDeviceGeneric.html
+++ b/docs/libnm/html/NMDeviceGeneric.html
@@ -8,7 +8,7 @@
 <link rel="up" href="ch04.html" title="Device and Runtime Configuration API Reference">
 <link rel="prev" href="NMDeviceEthernet.html" title="NMDeviceEthernet">
 <link rel="next" href="NMDeviceInfiniband.html" title="NMDeviceInfiniband">
-<meta name="generator" content="GTK-Doc V1.29.1 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.29 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -183,6 +183,6 @@ if not known.</p>
 </div>
 </div>
 <div class="footer">
-<hr>Generated by GTK-Doc V1.29.1</div>
+<hr>Generated by GTK-Doc V1.29</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm/html/NMDeviceIPTunnel.html b/docs/libnm/html/NMDeviceIPTunnel.html
index c5809858..b6bc3bd9 100644
--- a/docs/libnm/html/NMDeviceIPTunnel.html
+++ b/docs/libnm/html/NMDeviceIPTunnel.html
@@ -8,7 +8,7 @@
 <link rel="up" href="ch04.html" title="Device and Runtime Configuration API Reference">
 <link rel="prev" href="NMDeviceInfiniband.html" title="NMDeviceInfiniband">
 <link rel="next" href="NMDeviceMacsec.html" title="NMDeviceMacsec">
-<meta name="generator" content="GTK-Doc V1.29.1 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.29 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -808,6 +808,6 @@ tunneled packets.</p>
 </div>
 </div>
 <div class="footer">
-<hr>Generated by GTK-Doc V1.29.1</div>
+<hr>Generated by GTK-Doc V1.29</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm/html/NMDeviceInfiniband.html b/docs/libnm/html/NMDeviceInfiniband.html
index 02078964..3032e7f5 100644
--- a/docs/libnm/html/NMDeviceInfiniband.html
+++ b/docs/libnm/html/NMDeviceInfiniband.html
@@ -8,7 +8,7 @@
 <link rel="up" href="ch04.html" title="Device and Runtime Configuration API Reference">
 <link rel="prev" href="NMDeviceGeneric.html" title="NMDeviceGeneric">
 <link rel="next" href="NMDeviceIPTunnel.html" title="NMDeviceIPTunnel">
-<meta name="generator" content="GTK-Doc V1.29.1 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.29 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -217,6 +217,6 @@ nm_device_infiniband_get_carrier (<em class="parameter"><code><a class="link" hr
 </div>
 </div>
 <div class="footer">
-<hr>Generated by GTK-Doc V1.29.1</div>
+<hr>Generated by GTK-Doc V1.29</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm/html/NMDeviceMacsec.html b/docs/libnm/html/NMDeviceMacsec.html
index e38fdd75..13d85dee 100644
--- a/docs/libnm/html/NMDeviceMacsec.html
+++ b/docs/libnm/html/NMDeviceMacsec.html
@@ -8,7 +8,7 @@
 <link rel="up" href="ch04.html" title="Device and Runtime Configuration API Reference">
 <link rel="prev" href="NMDeviceIPTunnel.html" title="NMDeviceIPTunnel">
 <link rel="next" href="NMDeviceMacvlan.html" title="NMDeviceMacvlan">
-<meta name="generator" content="GTK-Doc V1.29.1 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.29 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -939,6 +939,6 @@ disabled).</p>
 </div>
 </div>
 <div class="footer">
-<hr>Generated by GTK-Doc V1.29.1</div>
+<hr>Generated by GTK-Doc V1.29</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm/html/NMDeviceMacvlan.html b/docs/libnm/html/NMDeviceMacvlan.html
index 290d3287..d0842777 100644
--- a/docs/libnm/html/NMDeviceMacvlan.html
+++ b/docs/libnm/html/NMDeviceMacvlan.html
@@ -8,7 +8,7 @@
 <link rel="up" href="ch04.html" title="Device and Runtime Configuration API Reference">
 <link rel="prev" href="NMDeviceMacsec.html" title="NMDeviceMacsec">
 <link rel="next" href="NMDeviceModem.html" title="NMDeviceModem">
-<meta name="generator" content="GTK-Doc V1.29.1 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.29 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -399,6 +399,6 @@ device, and must not be modified.</p>
 </div>
 </div>
 <div class="footer">
-<hr>Generated by GTK-Doc V1.29.1</div>
+<hr>Generated by GTK-Doc V1.29</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm/html/NMDeviceModem.html b/docs/libnm/html/NMDeviceModem.html
index a45814e5..6443328c 100644
--- a/docs/libnm/html/NMDeviceModem.html
+++ b/docs/libnm/html/NMDeviceModem.html
@@ -8,7 +8,7 @@
 <link rel="up" href="ch04.html" title="Device and Runtime Configuration API Reference">
 <link rel="prev" href="NMDeviceMacvlan.html" title="NMDeviceMacvlan">
 <link rel="next" href="NMDeviceOlpcMesh.html" title="NMDeviceOlpcMesh">
-<meta name="generator" content="GTK-Doc V1.29.1 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.29 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -225,6 +225,6 @@ CDMA/EVDO and GSM/UMTS.</p>
 </div>
 </div>
 <div class="footer">
-<hr>Generated by GTK-Doc V1.29.1</div>
+<hr>Generated by GTK-Doc V1.29</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm/html/NMDeviceOlpcMesh.html b/docs/libnm/html/NMDeviceOlpcMesh.html
index fdeaaf72..1842b576 100644
--- a/docs/libnm/html/NMDeviceOlpcMesh.html
+++ b/docs/libnm/html/NMDeviceOlpcMesh.html
@@ -8,7 +8,7 @@
 <link rel="up" href="ch04.html" title="Device and Runtime Configuration API Reference">
 <link rel="prev" href="NMDeviceModem.html" title="NMDeviceModem">
 <link rel="next" href="NMDeviceOvsBridge.html" title="NMDeviceOvsBridge">
-<meta name="generator" content="GTK-Doc V1.29.1 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.29 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -276,6 +276,6 @@ nm_device_olpc_mesh_get_active_channel
 </div>
 </div>
 <div class="footer">
-<hr>Generated by GTK-Doc V1.29.1</div>
+<hr>Generated by GTK-Doc V1.29</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm/html/NMDeviceOvsBridge.html b/docs/libnm/html/NMDeviceOvsBridge.html
index d30a1808..60a2cfe3 100644
--- a/docs/libnm/html/NMDeviceOvsBridge.html
+++ b/docs/libnm/html/NMDeviceOvsBridge.html
@@ -8,7 +8,7 @@
 <link rel="up" href="ch04.html" title="Device and Runtime Configuration API Reference">
 <link rel="prev" href="NMDeviceOlpcMesh.html" title="NMDeviceOlpcMesh">
 <link rel="next" href="NMDeviceOvsInterface.html" title="NMDeviceOvsInterface">
-<meta name="generator" content="GTK-Doc V1.29.1 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.29 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -107,6 +107,6 @@ copy used by the device, and must not be modified. </p>
 </div>
 </div>
 <div class="footer">
-<hr>Generated by GTK-Doc V1.29.1</div>
+<hr>Generated by GTK-Doc V1.29</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm/html/NMDeviceOvsInterface.html b/docs/libnm/html/NMDeviceOvsInterface.html
index 558ebfc5..6aa8b2b9 100644
--- a/docs/libnm/html/NMDeviceOvsInterface.html
+++ b/docs/libnm/html/NMDeviceOvsInterface.html
@@ -8,7 +8,7 @@
 <link rel="up" href="ch04.html" title="Device and Runtime Configuration API Reference">
 <link rel="prev" href="NMDeviceOvsBridge.html" title="NMDeviceOvsBridge">
 <link rel="next" href="NMDeviceOvsPort.html" title="NMDeviceOvsPort">
-<meta name="generator" content="GTK-Doc V1.29.1 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.29 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -43,6 +43,6 @@
 </div>
 </div>
 <div class="footer">
-<hr>Generated by GTK-Doc V1.29.1</div>
+<hr>Generated by GTK-Doc V1.29</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm/html/NMDeviceOvsPort.html b/docs/libnm/html/NMDeviceOvsPort.html
index 56187d9a..01ff2196 100644
--- a/docs/libnm/html/NMDeviceOvsPort.html
+++ b/docs/libnm/html/NMDeviceOvsPort.html
@@ -8,7 +8,7 @@
 <link rel="up" href="ch04.html" title="Device and Runtime Configuration API Reference">
 <link rel="prev" href="NMDeviceOvsInterface.html" title="NMDeviceOvsInterface">
 <link rel="next" href="NMDevicePpp.html" title="NMDevicePpp">
-<meta name="generator" content="GTK-Doc V1.29.1 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.29 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -107,6 +107,6 @@ copy used by the device, and must not be modified. </p>
 </div>
 </div>
 <div class="footer">
-<hr>Generated by GTK-Doc V1.29.1</div>
+<hr>Generated by GTK-Doc V1.29</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm/html/NMDevicePpp.html b/docs/libnm/html/NMDevicePpp.html
index 10595dd1..489a67ed 100644
--- a/docs/libnm/html/NMDevicePpp.html
+++ b/docs/libnm/html/NMDevicePpp.html
@@ -8,7 +8,7 @@
 <link rel="up" href="ch04.html" title="Device and Runtime Configuration API Reference">
 <link rel="prev" href="NMDeviceOvsPort.html" title="NMDeviceOvsPort">
 <link rel="next" href="NMDeviceTeam.html" title="NMDeviceTeam">
-<meta name="generator" content="GTK-Doc V1.29.1 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.29 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -43,6 +43,6 @@
 </div>
 </div>
 <div class="footer">
-<hr>Generated by GTK-Doc V1.29.1</div>
+<hr>Generated by GTK-Doc V1.29</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm/html/NMDeviceTeam.html b/docs/libnm/html/NMDeviceTeam.html
index 70fc7c40..41e0c754 100644
--- a/docs/libnm/html/NMDeviceTeam.html
+++ b/docs/libnm/html/NMDeviceTeam.html
@@ -8,7 +8,7 @@
 <link rel="up" href="ch04.html" title="Device and Runtime Configuration API Reference">
 <link rel="prev" href="NMDevicePpp.html" title="NMDevicePpp">
 <link rel="next" href="NMDeviceTun.html" title="NMDeviceTun">
-<meta name="generator" content="GTK-Doc V1.29.1 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.29 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -339,6 +339,6 @@ device, and must not be modified.</p>
 </div>
 </div>
 <div class="footer">
-<hr>Generated by GTK-Doc V1.29.1</div>
+<hr>Generated by GTK-Doc V1.29</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm/html/NMDeviceTun.html b/docs/libnm/html/NMDeviceTun.html
index 5df9be41..6652457b 100644
--- a/docs/libnm/html/NMDeviceTun.html
+++ b/docs/libnm/html/NMDeviceTun.html
@@ -8,7 +8,7 @@
 <link rel="up" href="ch04.html" title="Device and Runtime Configuration API Reference">
 <link rel="prev" href="NMDeviceTeam.html" title="NMDeviceTeam">
 <link rel="next" href="NMDeviceVlan.html" title="NMDeviceVlan">
-<meta name="generator" content="GTK-Doc V1.29.1 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.29 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -501,6 +501,6 @@ include a virtio network header.</p>
 </div>
 </div>
 <div class="footer">
-<hr>Generated by GTK-Doc V1.29.1</div>
+<hr>Generated by GTK-Doc V1.29</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm/html/NMDeviceVlan.html b/docs/libnm/html/NMDeviceVlan.html
index 90df2373..70e9157d 100644
--- a/docs/libnm/html/NMDeviceVlan.html
+++ b/docs/libnm/html/NMDeviceVlan.html
@@ -8,7 +8,7 @@
 <link rel="up" href="ch04.html" title="Device and Runtime Configuration API Reference">
 <link rel="prev" href="NMDeviceTun.html" title="NMDeviceTun">
 <link rel="next" href="NMDeviceVxlan.html" title="NMDeviceVxlan">
-<meta name="generator" content="GTK-Doc V1.29.1 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.29 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -331,6 +331,6 @@ nm_device_vlan_get_vlan_id (<em class="parameter"><code><a class="link" href="NM
 </div>
 </div>
 <div class="footer">
-<hr>Generated by GTK-Doc V1.29.1</div>
+<hr>Generated by GTK-Doc V1.29</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm/html/NMDeviceVxlan.html b/docs/libnm/html/NMDeviceVxlan.html
index 506d3593..8b36a0e8 100644
--- a/docs/libnm/html/NMDeviceVxlan.html
+++ b/docs/libnm/html/NMDeviceVxlan.html
@@ -8,7 +8,7 @@
 <link rel="up" href="ch04.html" title="Device and Runtime Configuration API Reference">
 <link rel="prev" href="NMDeviceVlan.html" title="NMDeviceVlan">
 <link rel="next" href="NMDeviceWifi.html" title="NMDeviceWifi">
-<meta name="generator" content="GTK-Doc V1.29.1 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.29 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -1162,6 +1162,6 @@ tunnel endpoint.</p>
 </div>
 </div>
 <div class="footer">
-<hr>Generated by GTK-Doc V1.29.1</div>
+<hr>Generated by GTK-Doc V1.29</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm/html/NMDeviceWifi.html b/docs/libnm/html/NMDeviceWifi.html
index b64c0608..863bd4ad 100644
--- a/docs/libnm/html/NMDeviceWifi.html
+++ b/docs/libnm/html/NMDeviceWifi.html
@@ -8,7 +8,7 @@
 <link rel="up" href="ch04.html" title="Device and Runtime Configuration API Reference">
 <link rel="prev" href="NMDeviceVxlan.html" title="NMDeviceVxlan">
 <link rel="next" href="NMDeviceWimax.html" title="NMDeviceWimax">
-<meta name="generator" content="GTK-Doc V1.29.1 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.29 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -1009,6 +1009,6 @@ user_function (<a class="link" href="NMDeviceWifi.html" title="NMDeviceWifi"><sp
 </div>
 </div>
 <div class="footer">
-<hr>Generated by GTK-Doc V1.29.1</div>
+<hr>Generated by GTK-Doc V1.29</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm/html/NMDeviceWimax.html b/docs/libnm/html/NMDeviceWimax.html
index e3eb2a7f..53c94d36 100644
--- a/docs/libnm/html/NMDeviceWimax.html
+++ b/docs/libnm/html/NMDeviceWimax.html
@@ -8,7 +8,7 @@
 <link rel="up" href="ch04.html" title="Device and Runtime Configuration API Reference">
 <link rel="prev" href="NMDeviceWifi.html" title="NMDeviceWifi">
 <link rel="next" href="NMDeviceWireGuard.html" title="NMDeviceWireGuard">
-<meta name="generator" content="GTK-Doc V1.29.1 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.29 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -796,6 +796,6 @@ user_function (<a class="link" href="NMDeviceWimax.html" title="NMDeviceWimax"><
 </div>
 </div>
 <div class="footer">
-<hr>Generated by GTK-Doc V1.29.1</div>
+<hr>Generated by GTK-Doc V1.29</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm/html/NMDeviceWireGuard.html b/docs/libnm/html/NMDeviceWireGuard.html
index db34d4e7..714829e0 100644
--- a/docs/libnm/html/NMDeviceWireGuard.html
+++ b/docs/libnm/html/NMDeviceWireGuard.html
@@ -8,7 +8,7 @@
 <link rel="up" href="ch04.html" title="Device and Runtime Configuration API Reference">
 <link rel="prev" href="NMDeviceWimax.html" title="NMDeviceWimax">
 <link rel="next" href="libnm-nm-device-wpan.html" title="nm-device-wpan">
-<meta name="generator" content="GTK-Doc V1.29.1 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.29 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -200,6 +200,6 @@ See: ip-rule(8)</p>
 </div>
 </div>
 <div class="footer">
-<hr>Generated by GTK-Doc V1.29.1</div>
+<hr>Generated by GTK-Doc V1.29</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm/html/NMDhcpConfig.html b/docs/libnm/html/NMDhcpConfig.html
index 27916206..189ee3a3 100644
--- a/docs/libnm/html/NMDhcpConfig.html
+++ b/docs/libnm/html/NMDhcpConfig.html
@@ -8,7 +8,7 @@
 <link rel="up" href="ch04.html" title="Device and Runtime Configuration API Reference">
 <link rel="prev" href="NMIPConfig.html" title="NMIPConfig">
 <link rel="next" href="NMCheckpoint.html" title="NMCheckpoint">
-<meta name="generator" content="GTK-Doc V1.29.1 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.29 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -262,6 +262,6 @@ configuration, and must not be modified.</p>
 </div>
 </div>
 <div class="footer">
-<hr>Generated by GTK-Doc V1.29.1</div>
+<hr>Generated by GTK-Doc V1.29</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm/html/NMIPConfig.html b/docs/libnm/html/NMIPConfig.html
index 98340b5d..a8d10522 100644
--- a/docs/libnm/html/NMIPConfig.html
+++ b/docs/libnm/html/NMIPConfig.html
@@ -8,7 +8,7 @@
 <link rel="up" href="ch04.html" title="Device and Runtime Configuration API Reference">
 <link rel="prev" href="NMWimaxNsp.html" title="NMWimaxNsp">
 <link rel="next" href="NMDhcpConfig.html" title="NMDhcpConfig">
-<meta name="generator" content="GTK-Doc V1.29.1 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.29 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -570,6 +570,6 @@ nm_ip_config_get_wins_servers (<em class="parameter"><code><a class="link" href=
 </div>
 </div>
 <div class="footer">
-<hr>Generated by GTK-Doc V1.29.1</div>
+<hr>Generated by GTK-Doc V1.29</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm/html/NMObject.html b/docs/libnm/html/NMObject.html
index 72578230..dacf1197 100644
--- a/docs/libnm/html/NMObject.html
+++ b/docs/libnm/html/NMObject.html
@@ -8,7 +8,7 @@
 <link rel="up" href="ch02.html" title="Client Object API Reference">
 <link rel="prev" href="NMSecretAgentOld.html" title="NMSecretAgentOld">
 <link rel="next" href="libnm-nm-errors.html" title="nm-errors">
-<meta name="generator" content="GTK-Doc V1.29.1 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.29 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -226,6 +226,6 @@ object, and must not be modified.</p>
 </div>
 </div>
 <div class="footer">
-<hr>Generated by GTK-Doc V1.29.1</div>
+<hr>Generated by GTK-Doc V1.29</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm/html/NMRemoteConnection.html b/docs/libnm/html/NMRemoteConnection.html
index b415e3c0..6227c74f 100644
--- a/docs/libnm/html/NMRemoteConnection.html
+++ b/docs/libnm/html/NMRemoteConnection.html
@@ -8,7 +8,7 @@
 <link rel="up" href="ch03.html" title="Connection and Setting API Reference">
 <link rel="prev" href="NMSimpleConnection.html" title="NMSimpleConnection">
 <link rel="next" href="NMSetting.html" title="NMSetting">
-<meta name="generator" content="GTK-Doc V1.29.1 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.29 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -1129,6 +1129,6 @@ after you already have a reference to it.)</p>
 </div>
 </div>
 <div class="footer">
-<hr>Generated by GTK-Doc V1.29.1</div>
+<hr>Generated by GTK-Doc V1.29</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm/html/NMSecretAgentOld.html b/docs/libnm/html/NMSecretAgentOld.html
index ae155696..95f43d05 100644
--- a/docs/libnm/html/NMSecretAgentOld.html
+++ b/docs/libnm/html/NMSecretAgentOld.html
@@ -8,7 +8,7 @@
 <link rel="up" href="ch02.html" title="Client Object API Reference">
 <link rel="prev" href="NMClient.html" title="NMClient">
 <link rel="next" href="NMObject.html" title="NMObject">
-<meta name="generator" content="GTK-Doc V1.29.1 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.29 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -827,6 +827,6 @@ of 3 characters.  An example valid identifier is 'org.gnome.nm-applet'
 </div>
 </div>
 <div class="footer">
-<hr>Generated by GTK-Doc V1.29.1</div>
+<hr>Generated by GTK-Doc V1.29</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm/html/NMSetting.html b/docs/libnm/html/NMSetting.html
index 045d0177..2340e37b 100644
--- a/docs/libnm/html/NMSetting.html
+++ b/docs/libnm/html/NMSetting.html
@@ -8,7 +8,7 @@
 <link rel="up" href="ch03.html" title="Connection and Setting API Reference">
 <link rel="prev" href="NMRemoteConnection.html" title="NMRemoteConnection">
 <link rel="next" href="NMSettingConnection.html" title="NMSettingConnection">
-<meta name="generator" content="GTK-Doc V1.29.1 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.29 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -1165,6 +1165,6 @@ example "ppp" or "802-11-wireless" or "802-3-ethernet".</p>
 </div>
 </div>
 <div class="footer">
-<hr>Generated by GTK-Doc V1.29.1</div>
+<hr>Generated by GTK-Doc V1.29</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm/html/NMSetting6Lowpan.html b/docs/libnm/html/NMSetting6Lowpan.html
index 2f6d0b35..922e2358 100644
--- a/docs/libnm/html/NMSetting6Lowpan.html
+++ b/docs/libnm/html/NMSetting6Lowpan.html
@@ -8,7 +8,7 @@
 <link rel="up" href="ch03.html" title="Connection and Setting API Reference">
 <link rel="prev" href="NMSettingConnection.html" title="NMSettingConnection">
 <link rel="next" href="NMSetting8021x.html" title="NMSetting8021x">
-<meta name="generator" content="GTK-Doc V1.29.1 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.29 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -138,6 +138,6 @@ nm_setting_6lowpan_get_parent (<em class="parameter"><code><a class="link" href=
 </div>
 </div>
 <div class="footer">
-<hr>Generated by GTK-Doc V1.29.1</div>
+<hr>Generated by GTK-Doc V1.29</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm/html/NMSetting8021x.html b/docs/libnm/html/NMSetting8021x.html
index 8389a1ca..21ac1234 100644
--- a/docs/libnm/html/NMSetting8021x.html
+++ b/docs/libnm/html/NMSetting8021x.html
@@ -8,7 +8,7 @@
 <link rel="up" href="ch03.html" title="Connection and Setting API Reference">
 <link rel="prev" href="NMSetting6Lowpan.html" title="NMSetting6Lowpan">
 <link rel="next" href="NMSettingAdsl.html" title="NMSettingAdsl">
-<meta name="generator" content="GTK-Doc V1.29.1 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.29 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -5036,6 +5036,6 @@ properties instead (sets ca_cert/ca_cert2 options for wpa_supplicant).</p>
 </div>
 </div>
 <div class="footer">
-<hr>Generated by GTK-Doc V1.29.1</div>
+<hr>Generated by GTK-Doc V1.29</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm/html/NMSettingAdsl.html b/docs/libnm/html/NMSettingAdsl.html
index 1f5285c9..ccef965c 100644
--- a/docs/libnm/html/NMSettingAdsl.html
+++ b/docs/libnm/html/NMSettingAdsl.html
@@ -8,7 +8,7 @@
 <link rel="up" href="ch03.html" title="Connection and Setting API Reference">
 <link rel="prev" href="NMSetting8021x.html" title="NMSetting8021x">
 <link rel="next" href="NMSettingBluetooth.html" title="NMSettingBluetooth">
-<meta name="generator" content="GTK-Doc V1.29.1 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.29 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -569,6 +569,6 @@ nm_setting_adsl_get_password_flags (<em class="parameter"><code><a class="link"
 </div>
 </div>
 <div class="footer">
-<hr>Generated by GTK-Doc V1.29.1</div>
+<hr>Generated by GTK-Doc V1.29</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm/html/NMSettingBluetooth.html b/docs/libnm/html/NMSettingBluetooth.html
index b214a3fc..940ac90b 100644
--- a/docs/libnm/html/NMSettingBluetooth.html
+++ b/docs/libnm/html/NMSettingBluetooth.html
@@ -8,7 +8,7 @@
 <link rel="up" href="ch03.html" title="Connection and Setting API Reference">
 <link rel="prev" href="NMSettingAdsl.html" title="NMSettingAdsl">
 <link rel="next" href="NMSettingBond.html" title="NMSettingBond">
-<meta name="generator" content="GTK-Doc V1.29.1 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.29 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -284,6 +284,6 @@ Area Networking connections to devices supporting the NAP profile.</p>
 </div>
 </div>
 <div class="footer">
-<hr>Generated by GTK-Doc V1.29.1</div>
+<hr>Generated by GTK-Doc V1.29</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm/html/NMSettingBond.html b/docs/libnm/html/NMSettingBond.html
index c7256553..ba637f9c 100644
--- a/docs/libnm/html/NMSettingBond.html
+++ b/docs/libnm/html/NMSettingBond.html
@@ -8,7 +8,7 @@
 <link rel="up" href="ch03.html" title="Connection and Setting API Reference">
 <link rel="prev" href="NMSettingBluetooth.html" title="NMSettingBluetooth">
 <link rel="next" href="NMSettingBridgePort.html" title="NMSettingBridgePort">
-<meta name="generator" content="GTK-Doc V1.29.1 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.29 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -787,6 +787,6 @@ the <a class="link" href="NMSettingBond.html#NMSettingBond--options" title="The
 </div>
 </div>
 <div class="footer">
-<hr>Generated by GTK-Doc V1.29.1</div>
+<hr>Generated by GTK-Doc V1.29</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm/html/NMSettingBridge.html b/docs/libnm/html/NMSettingBridge.html
index c6287586..8f374b6a 100644
--- a/docs/libnm/html/NMSettingBridge.html
+++ b/docs/libnm/html/NMSettingBridge.html
@@ -8,7 +8,7 @@
 <link rel="up" href="ch03.html" title="Connection and Setting API Reference">
 <link rel="prev" href="NMSettingBridgePort.html" title="NMSettingBridgePort">
 <link rel="next" href="NMSettingCdma.html" title="NMSettingCdma">
-<meta name="generator" content="GTK-Doc V1.29.1 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.29 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -663,6 +663,6 @@ bridge.</p>
 </div>
 </div>
 <div class="footer">
-<hr>Generated by GTK-Doc V1.29.1</div>
+<hr>Generated by GTK-Doc V1.29</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm/html/NMSettingBridgePort.html b/docs/libnm/html/NMSettingBridgePort.html
index 2e60b28c..2aa8b1d3 100644
--- a/docs/libnm/html/NMSettingBridgePort.html
+++ b/docs/libnm/html/NMSettingBridgePort.html
@@ -8,7 +8,7 @@
 <link rel="up" href="ch03.html" title="Connection and Setting API Reference">
 <link rel="prev" href="NMSettingBond.html" title="NMSettingBond">
 <link rel="next" href="NMSettingBridge.html" title="NMSettingBridge">
-<meta name="generator" content="GTK-Doc V1.29.1 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.29 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -300,6 +300,6 @@ port.</p>
 </div>
 </div>
 <div class="footer">
-<hr>Generated by GTK-Doc V1.29.1</div>
+<hr>Generated by GTK-Doc V1.29</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm/html/NMSettingCdma.html b/docs/libnm/html/NMSettingCdma.html
index 9ff38f47..329c3da6 100644
--- a/docs/libnm/html/NMSettingCdma.html
+++ b/docs/libnm/html/NMSettingCdma.html
@@ -8,7 +8,7 @@
 <link rel="up" href="ch03.html" title="Connection and Setting API Reference">
 <link rel="prev" href="NMSettingBridge.html" title="NMSettingBridge">
 <link rel="next" href="NMSettingDcb.html" title="NMSettingDcb">
-<meta name="generator" content="GTK-Doc V1.29.1 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.29 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -415,6 +415,6 @@ username is required, it is specified here.</p>
 </div>
 </div>
 <div class="footer">
-<hr>Generated by GTK-Doc V1.29.1</div>
+<hr>Generated by GTK-Doc V1.29</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm/html/NMSettingConnection.html b/docs/libnm/html/NMSettingConnection.html
index 08f7ac46..3eba2674 100644
--- a/docs/libnm/html/NMSettingConnection.html
+++ b/docs/libnm/html/NMSettingConnection.html
@@ -8,7 +8,7 @@
 <link rel="up" href="ch03.html" title="Connection and Setting API Reference">
 <link rel="prev" href="NMSetting.html" title="NMSetting">
 <link rel="next" href="NMSetting6Lowpan.html" title="NMSetting6Lowpan">
-<meta name="generator" content="GTK-Doc V1.29.1 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.29 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -2214,11 +2214,11 @@ 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.</p>
 <p>The '$' character is treated special to perform dynamic substitutions
-at runtime. Currently supported are "${CONNECTION}", "${DEVICE}",
+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 the the interface name of the
-device.
+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 "$$".
@@ -2271,7 +2271,7 @@ provider, or <a class="link" href="NMSettingConnection.html#NMSettingConnection-
 <p>The UUID must be in the format "2815492f-7e56-435e-b2e9-246bd7cdc664"
 (ie, contains only hexadecimal characters and "-").  A suitable UUID may
 be generated by <a class="link" href="libnm-nm-utils.html#nm-utils-uuid-generate" title="nm_utils_uuid_generate ()"><code class="function">nm_utils_uuid_generate()</code></a> or
-<code class="function">nm_utils_uuid_generate_from_string()</code>.</p>
+<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-nm-utils.html#nm-utils-uuid-generate-from-string"><code class="function">nm_utils_uuid_generate_from_string()</code></a>.</p>
 <p>Flags: Read / Write</p>
 <p>Default value: NULL</p>
 </div>
@@ -2291,6 +2291,6 @@ the change takes effect immediately.</p>
 </div>
 </div>
 <div class="footer">
-<hr>Generated by GTK-Doc V1.29.1</div>
+<hr>Generated by GTK-Doc V1.29</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm/html/NMSettingDcb.html b/docs/libnm/html/NMSettingDcb.html
index 468e49f1..9c8ea1cf 100644
--- a/docs/libnm/html/NMSettingDcb.html
+++ b/docs/libnm/html/NMSettingDcb.html
@@ -8,7 +8,7 @@
 <link rel="up" href="ch03.html" title="Connection and Setting API Reference">
 <link rel="prev" href="NMSettingCdma.html" title="NMSettingCdma">
 <link rel="next" href="NMSettingDummy.html" title="NMSettingDummy">
-<meta name="generator" content="GTK-Doc V1.29.1 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.29 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -1403,6 +1403,6 @@ which the priority is mapped.</p>
 </div>
 </div>
 <div class="footer">
-<hr>Generated by GTK-Doc V1.29.1</div>
+<hr>Generated by GTK-Doc V1.29</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm/html/NMSettingDummy.html b/docs/libnm/html/NMSettingDummy.html
index 637a404f..1e1f6b4b 100644
--- a/docs/libnm/html/NMSettingDummy.html
+++ b/docs/libnm/html/NMSettingDummy.html
@@ -8,7 +8,7 @@
 <link rel="up" href="ch03.html" title="Connection and Setting API Reference">
 <link rel="prev" href="NMSettingDcb.html" title="NMSettingDcb">
 <link rel="next" href="NMSettingEthtool.html" title="NMSettingEthtool">
-<meta name="generator" content="GTK-Doc V1.29.1 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.29 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -111,6 +111,6 @@ nm_setting_dummy_new (<em class="parameter"><code><span class="type">void</span>
 </div>
 </div>
 <div class="footer">
-<hr>Generated by GTK-Doc V1.29.1</div>
+<hr>Generated by GTK-Doc V1.29</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm/html/NMSettingEthtool.html b/docs/libnm/html/NMSettingEthtool.html
index 850bb139..0644c606 100644
--- a/docs/libnm/html/NMSettingEthtool.html
+++ b/docs/libnm/html/NMSettingEthtool.html
@@ -8,7 +8,7 @@
 <link rel="up" href="ch03.html" title="Connection and Setting API Reference">
 <link rel="prev" href="NMSettingDummy.html" title="NMSettingDummy">
 <link rel="next" href="NMSettingGeneric.html" title="NMSettingGeneric">
-<meta name="generator" content="GTK-Doc V1.29.1 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.29 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -771,6 +771,6 @@ nm_setting_ethtool_clear_features (<em class="parameter"><code><a class="link" h
 </div>
 </div>
 <div class="footer">
-<hr>Generated by GTK-Doc V1.29.1</div>
+<hr>Generated by GTK-Doc V1.29</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm/html/NMSettingGeneric.html b/docs/libnm/html/NMSettingGeneric.html
index cdf607e7..939c3c53 100644
--- a/docs/libnm/html/NMSettingGeneric.html
+++ b/docs/libnm/html/NMSettingGeneric.html
@@ -8,7 +8,7 @@
 <link rel="up" href="ch03.html" title="Connection and Setting API Reference">
 <link rel="prev" href="NMSettingEthtool.html" title="NMSettingEthtool">
 <link rel="next" href="NMSettingGsm.html" title="NMSettingGsm">
-<meta name="generator" content="GTK-Doc V1.29.1 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.29 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -81,7 +81,7 @@
 optional properties that apply to "generic" devices (ie, devices that
 NetworkManager does not specifically recognize).</p>
 <p>There are currently no properties on this object; it exists only to be
-the "connection type" setting on <span class="type">NMConnections</span> for generic devices.</p>
+the "connection type" setting on <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html#NMConnection-struct"><span class="type">NMConnections</span></a> for generic devices.</p>
 </div>
 <div class="refsect1">
 <a name="NMSettingGeneric.functions_details"></a><h2>Functions</h2>
@@ -113,6 +113,6 @@ nm_setting_generic_new (<em class="parameter"><code><span class="type">void</spa
 </div>
 </div>
 <div class="footer">
-<hr>Generated by GTK-Doc V1.29.1</div>
+<hr>Generated by GTK-Doc V1.29</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm/html/NMSettingGsm.html b/docs/libnm/html/NMSettingGsm.html
index 4fd18cc3..c7ce6adf 100644
--- a/docs/libnm/html/NMSettingGsm.html
+++ b/docs/libnm/html/NMSettingGsm.html
@@ -8,7 +8,7 @@
 <link rel="up" href="ch03.html" title="Connection and Setting API Reference">
 <link rel="prev" href="NMSettingGeneric.html" title="NMSettingGeneric">
 <link rel="next" href="NMSettingInfiniband.html" title="NMSettingInfiniband">
-<meta name="generator" content="GTK-Doc V1.29.1 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.29 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -891,6 +891,6 @@ username is required, it is specified here.</p>
 </div>
 </div>
 <div class="footer">
-<hr>Generated by GTK-Doc V1.29.1</div>
+<hr>Generated by GTK-Doc V1.29</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm/html/NMSettingIP4Config.html b/docs/libnm/html/NMSettingIP4Config.html
index c8df79f4..4755fcef 100644
--- a/docs/libnm/html/NMSettingIP4Config.html
+++ b/docs/libnm/html/NMSettingIP4Config.html
@@ -8,7 +8,7 @@
 <link rel="up" href="ch03.html" title="Connection and Setting API Reference">
 <link rel="prev" href="NMSettingInfiniband.html" title="NMSettingInfiniband">
 <link rel="next" href="NMSettingIP6Config.html" title="NMSettingIP6Config">
-<meta name="generator" content="GTK-Doc V1.29.1 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.29 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -323,10 +323,14 @@ non-hardware-address client ID and the 'type' field is set to 0.</p>
 current or permanent MAC address of the device to generate a client identifier
 with type ethernet (01). Currently, these options only work for ethernet
 type of links.</p>
+<p>The special value "duid" generates a RFC4361-compliant client identifier based
+on a hash of the interface name as IAID and /etc/machine-id.</p>
 <p>The special value "stable" is supported to generate a type 0 client identifier based
-on the stable-id (see connection.stable-id) and a per-host key.</p>
-<p>If unset, a globally configured default is used. If still unset, the
-client-id from the last lease is reused.</p>
+on the stable-id (see connection.stable-id) and a per-host key. If you set the
+stable-id, you may want to include the "${DEVICE}" or "${MAC}" specifier to get a
+per-device key.</p>
+<p>If unset, a globally configured default is used. If still unset, the default
+depends on the DHCP plugin.</p>
 <p>Flags: Read / Write</p>
 <p>Default value: NULL</p>
 </div>
@@ -345,6 +349,6 @@ cannot be set at the same time.</p>
 </div>
 </div>
 <div class="footer">
-<hr>Generated by GTK-Doc V1.29.1</div>
+<hr>Generated by GTK-Doc V1.29</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm/html/NMSettingIP6Config.html b/docs/libnm/html/NMSettingIP6Config.html
index 3565445f..154f953e 100644
--- a/docs/libnm/html/NMSettingIP6Config.html
+++ b/docs/libnm/html/NMSettingIP6Config.html
@@ -8,7 +8,7 @@
 <link rel="up" href="ch03.html" title="Connection and Setting API Reference">
 <link rel="prev" href="NMSettingIP4Config.html" title="NMSettingIP4Config">
 <link rel="next" href="NMSettingIPConfig.html" title="NMSettingIPConfig">
-<meta name="generator" content="GTK-Doc V1.29.1 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.29 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -567,7 +567,8 @@ try providing a stable DUID-LLT, the time field will contain a constant
 timestamp that is used globally (for all profiles) and persisted to disk.</p>
 <p>The special values "stable-llt", "stable-ll" and "stable-uuid" will generate
 a DUID of the corresponding type, derived from the connection's stable-id and
-a per-host unique key.
+a per-host unique key. You may want to include the "${DEVICE}" or "${MAC}" specifier
+in the stable-id, in case this profile gets activated on multiple devices.
 So, the link-layer address of "stable-ll" and "stable-llt" will be a generated
 address derived from the stable id. The DUID-LLT time value in the "stable-llt"
 option will be picked among a static timespan of three years (the upper bound
@@ -612,6 +613,6 @@ IPv6 tokenized interface identifiers. Useful with eui64 addr-gen-mode.</p>
 </div>
 </div>
 <div class="footer">
-<hr>Generated by GTK-Doc V1.29.1</div>
+<hr>Generated by GTK-Doc V1.29</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm/html/NMSettingIPConfig.html b/docs/libnm/html/NMSettingIPConfig.html
index 16d8cb2c..23fbdcbe 100644
--- a/docs/libnm/html/NMSettingIPConfig.html
+++ b/docs/libnm/html/NMSettingIPConfig.html
@@ -8,7 +8,7 @@
 <link rel="up" href="ch03.html" title="Connection and Setting API Reference">
 <link rel="prev" href="NMSettingIP6Config.html" title="NMSettingIP6Config">
 <link rel="next" href="NMSettingIPTunnel.html" title="NMSettingIPTunnel">
-<meta name="generator" content="GTK-Doc V1.29.1 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.29 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -4386,6 +4386,6 @@ of NetworkManager.</p>
 </div>
 </div>
 <div class="footer">
-<hr>Generated by GTK-Doc V1.29.1</div>
+<hr>Generated by GTK-Doc V1.29</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm/html/NMSettingIPTunnel.html b/docs/libnm/html/NMSettingIPTunnel.html
index 51d2f19e..dbbb4953 100644
--- a/docs/libnm/html/NMSettingIPTunnel.html
+++ b/docs/libnm/html/NMSettingIPTunnel.html
@@ -8,7 +8,7 @@
 <link rel="up" href="ch03.html" title="Connection and Setting API Reference">
 <link rel="prev" href="NMSettingIPConfig.html" title="NMSettingIPConfig">
 <link rel="next" href="NMSettingMacsec.html" title="NMSettingMacsec">
-<meta name="generator" content="GTK-Doc V1.29.1 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.29 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -951,6 +951,6 @@ packets inherit the TTL value.</p>
 </div>
 </div>
 <div class="footer">
-<hr>Generated by GTK-Doc V1.29.1</div>
+<hr>Generated by GTK-Doc V1.29</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm/html/NMSettingInfiniband.html b/docs/libnm/html/NMSettingInfiniband.html
index 3cab06a7..8c3f6727 100644
--- a/docs/libnm/html/NMSettingInfiniband.html
+++ b/docs/libnm/html/NMSettingInfiniband.html
@@ -8,7 +8,7 @@
 <link rel="up" href="ch03.html" title="Connection and Setting API Reference">
 <link rel="prev" href="NMSettingGsm.html" title="NMSettingGsm">
 <link rel="next" href="NMSettingIP4Config.html" title="NMSettingIP4Config">
-<meta name="generator" content="GTK-Doc V1.29.1 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.29 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -461,6 +461,6 @@ specify the base device by setting either this property or
 </div>
 </div>
 <div class="footer">
-<hr>Generated by GTK-Doc V1.29.1</div>
+<hr>Generated by GTK-Doc V1.29</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm/html/NMSettingMacsec.html b/docs/libnm/html/NMSettingMacsec.html
index 1a1d476b..31a82ce8 100644
--- a/docs/libnm/html/NMSettingMacsec.html
+++ b/docs/libnm/html/NMSettingMacsec.html
@@ -8,7 +8,7 @@
 <link rel="up" href="ch03.html" title="Connection and Setting API Reference">
 <link rel="prev" href="NMSettingIPTunnel.html" title="NMSettingIPTunnel">
 <link rel="next" href="NMSettingMacvlan.html" title="NMSettingMacvlan">
-<meta name="generator" content="GTK-Doc V1.29.1 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.29 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -764,6 +764,6 @@ in every packet.</p>
 </div>
 </div>
 <div class="footer">
-<hr>Generated by GTK-Doc V1.29.1</div>
+<hr>Generated by GTK-Doc V1.29</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm/html/NMSettingMacvlan.html b/docs/libnm/html/NMSettingMacvlan.html
index e825651e..3471ecd5 100644
--- a/docs/libnm/html/NMSettingMacvlan.html
+++ b/docs/libnm/html/NMSettingMacvlan.html
@@ -8,7 +8,7 @@
 <link rel="up" href="ch03.html" title="Connection and Setting API Reference">
 <link rel="prev" href="NMSettingMacsec.html" title="NMSettingMacsec">
 <link rel="next" href="NMSettingMatch.html" title="NMSettingMatch">
-<meta name="generator" content="GTK-Doc V1.29.1 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.29 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -438,6 +438,6 @@ with a <a class="link" href="NMSettingWired.html#NMSettingWired--mac-address" ti
 </div>
 </div>
 <div class="footer">
-<hr>Generated by GTK-Doc V1.29.1</div>
+<hr>Generated by GTK-Doc V1.29</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm/html/NMSettingMatch.html b/docs/libnm/html/NMSettingMatch.html
index fd15e721..c391014b 100644
--- a/docs/libnm/html/NMSettingMatch.html
+++ b/docs/libnm/html/NMSettingMatch.html
@@ -8,7 +8,7 @@
 <link rel="up" href="ch03.html" title="Connection and Setting API Reference">
 <link rel="prev" href="NMSettingMacvlan.html" title="NMSettingMacvlan">
 <link rel="next" href="NMSettingOlpcMesh.html" title="NMSettingOlpcMesh">
-<meta name="generator" content="GTK-Doc V1.29.1 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.29 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -378,6 +378,6 @@ nm_setting_match_get_interface_names (<em class="parameter"><code><a class="link
 </div>
 </div>
 <div class="footer">
-<hr>Generated by GTK-Doc V1.29.1</div>
+<hr>Generated by GTK-Doc V1.29</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm/html/NMSettingOlpcMesh.html b/docs/libnm/html/NMSettingOlpcMesh.html
index c4dc16a5..e2b68aed 100644
--- a/docs/libnm/html/NMSettingOlpcMesh.html
+++ b/docs/libnm/html/NMSettingOlpcMesh.html
@@ -8,7 +8,7 @@
 <link rel="up" href="ch03.html" title="Connection and Setting API Reference">
 <link rel="prev" href="NMSettingMatch.html" title="NMSettingMatch">
 <link rel="next" href="NMSettingOvsBridge.html" title="NMSettingOvsBridge">
-<meta name="generator" content="GTK-Doc V1.29.1 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.29 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -260,6 +260,6 @@ answers the request.</p>
 </div>
 </div>
 <div class="footer">
-<hr>Generated by GTK-Doc V1.29.1</div>
+<hr>Generated by GTK-Doc V1.29</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm/html/NMSettingOvsBridge.html b/docs/libnm/html/NMSettingOvsBridge.html
index eede5c9c..21bd4940 100644
--- a/docs/libnm/html/NMSettingOvsBridge.html
+++ b/docs/libnm/html/NMSettingOvsBridge.html
@@ -8,7 +8,7 @@
 <link rel="up" href="ch03.html" title="Connection and Setting API Reference">
 <link rel="prev" href="NMSettingOlpcMesh.html" title="NMSettingOlpcMesh">
 <link rel="next" href="NMSettingOvsInterface.html" title="NMSettingOvsInterface">
-<meta name="generator" content="GTK-Doc V1.29.1 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.29 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -271,6 +271,6 @@ nm_setting_ovs_bridge_get_stp_enable (<em class="parameter"><code><a class="link
 </div>
 </div>
 <div class="footer">
-<hr>Generated by GTK-Doc V1.29.1</div>
+<hr>Generated by GTK-Doc V1.29</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm/html/NMSettingOvsInterface.html b/docs/libnm/html/NMSettingOvsInterface.html
index 790860f2..e7c35782 100644
--- a/docs/libnm/html/NMSettingOvsInterface.html
+++ b/docs/libnm/html/NMSettingOvsInterface.html
@@ -8,7 +8,7 @@
 <link rel="up" href="ch03.html" title="Connection and Setting API Reference">
 <link rel="prev" href="NMSettingOvsBridge.html" title="NMSettingOvsBridge">
 <link rel="next" href="NMSettingOvsPatch.html" title="NMSettingOvsPatch">
-<meta name="generator" content="GTK-Doc V1.29.1 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.29 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -139,6 +139,6 @@ nm_setting_ovs_interface_get_interface_type
 </div>
 </div>
 <div class="footer">
-<hr>Generated by GTK-Doc V1.29.1</div>
+<hr>Generated by GTK-Doc V1.29</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm/html/NMSettingOvsPatch.html b/docs/libnm/html/NMSettingOvsPatch.html
index 123ceedb..3c9a5b7a 100644
--- a/docs/libnm/html/NMSettingOvsPatch.html
+++ b/docs/libnm/html/NMSettingOvsPatch.html
@@ -8,7 +8,7 @@
 <link rel="up" href="ch03.html" title="Connection and Setting API Reference">
 <link rel="prev" href="NMSettingOvsInterface.html" title="NMSettingOvsInterface">
 <link rel="next" href="NMSettingOvsPort.html" title="NMSettingOvsPort">
-<meta name="generator" content="GTK-Doc V1.29.1 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.29 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -138,6 +138,6 @@ nm_setting_ovs_patch_get_peer (<em class="parameter"><code><a class="link" href=
 </div>
 </div>
 <div class="footer">
-<hr>Generated by GTK-Doc V1.29.1</div>
+<hr>Generated by GTK-Doc V1.29</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm/html/NMSettingOvsPort.html b/docs/libnm/html/NMSettingOvsPort.html
index 908ee2d4..1c5e81dc 100644
--- a/docs/libnm/html/NMSettingOvsPort.html
+++ b/docs/libnm/html/NMSettingOvsPort.html
@@ -8,7 +8,7 @@
 <link rel="up" href="ch03.html" title="Connection and Setting API Reference">
 <link rel="prev" href="NMSettingOvsPatch.html" title="NMSettingOvsPatch">
 <link rel="next" href="NMSettingPppoe.html" title="NMSettingPppoe">
-<meta name="generator" content="GTK-Doc V1.29.1 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.29 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -357,6 +357,6 @@ nm_setting_ovs_port_get_bond_downdelay
 </div>
 </div>
 <div class="footer">
-<hr>Generated by GTK-Doc V1.29.1</div>
+<hr>Generated by GTK-Doc V1.29</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm/html/NMSettingPpp.html b/docs/libnm/html/NMSettingPpp.html
index 9e29905b..be86468b 100644
--- a/docs/libnm/html/NMSettingPpp.html
+++ b/docs/libnm/html/NMSettingPpp.html
@@ -8,7 +8,7 @@
 <link rel="up" href="ch03.html" title="Connection and Setting API Reference">
 <link rel="prev" href="NMSettingPppoe.html" title="NMSettingPppoe">
 <link rel="next" href="NMSettingProxy.html" title="NMSettingProxy">
-<meta name="generator" content="GTK-Doc V1.29.1 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.29 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -1159,6 +1159,6 @@ be set to <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macro
 </div>
 </div>
 <div class="footer">
-<hr>Generated by GTK-Doc V1.29.1</div>
+<hr>Generated by GTK-Doc V1.29</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm/html/NMSettingPppoe.html b/docs/libnm/html/NMSettingPppoe.html
index b56bffc4..61858a6d 100644
--- a/docs/libnm/html/NMSettingPppoe.html
+++ b/docs/libnm/html/NMSettingPppoe.html
@@ -8,7 +8,7 @@
 <link rel="up" href="ch03.html" title="Connection and Setting API Reference">
 <link rel="prev" href="NMSettingOvsPort.html" title="NMSettingOvsPort">
 <link rel="next" href="NMSettingPpp.html" title="NMSettingPpp">
-<meta name="generator" content="GTK-Doc V1.29.1 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.29 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -415,6 +415,6 @@ access concentrators or a specific service is known to be required.</p>
 </div>
 </div>
 <div class="footer">
-<hr>Generated by GTK-Doc V1.29.1</div>
+<hr>Generated by GTK-Doc V1.29</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm/html/NMSettingProxy.html b/docs/libnm/html/NMSettingProxy.html
index 145bc09e..2870c41e 100644
--- a/docs/libnm/html/NMSettingProxy.html
+++ b/docs/libnm/html/NMSettingProxy.html
@@ -8,7 +8,7 @@
 <link rel="up" href="ch03.html" title="Connection and Setting API Reference">
 <link rel="prev" href="NMSettingPpp.html" title="NMSettingPpp">
 <link rel="next" href="NMSettingSerial.html" title="NMSettingSerial">
-<meta name="generator" content="GTK-Doc V1.29.1 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.29 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -406,6 +406,6 @@ nm_setting_proxy_get_pac_script (<em class="parameter"><code><a class="link" hre
 </div>
 </div>
 <div class="footer">
-<hr>Generated by GTK-Doc V1.29.1</div>
+<hr>Generated by GTK-Doc V1.29</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm/html/NMSettingSerial.html b/docs/libnm/html/NMSettingSerial.html
index ccdabf98..9cb1f0aa 100644
--- a/docs/libnm/html/NMSettingSerial.html
+++ b/docs/libnm/html/NMSettingSerial.html
@@ -8,7 +8,7 @@
 <link rel="up" href="ch03.html" title="Connection and Setting API Reference">
 <link rel="prev" href="NMSettingProxy.html" title="NMSettingProxy">
 <link rel="next" href="NMSettingSriov.html" title="NMSettingSriov">
-<meta name="generator" content="GTK-Doc V1.29.1 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.29 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -458,6 +458,6 @@ The 1 in "8n1" for example.</p>
 </div>
 </div>
 <div class="footer">
-<hr>Generated by GTK-Doc V1.29.1</div>
+<hr>Generated by GTK-Doc V1.29</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm/html/NMSettingSriov.html b/docs/libnm/html/NMSettingSriov.html
index 1d2a2b0d..c77a2123 100644
--- a/docs/libnm/html/NMSettingSriov.html
+++ b/docs/libnm/html/NMSettingSriov.html
@@ -8,7 +8,7 @@
 <link rel="up" href="ch03.html" title="Connection and Setting API Reference">
 <link rel="prev" href="NMSettingSerial.html" title="NMSettingSerial">
 <link rel="next" href="NMSettingTCConfig.html" title="NMSettingTCConfig">
-<meta name="generator" content="GTK-Doc V1.29.1 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.29 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -1191,6 +1191,6 @@ the value is of the correct type and well-formed.</p>
 </div>
 </div>
 <div class="footer">
-<hr>Generated by GTK-Doc V1.29.1</div>
+<hr>Generated by GTK-Doc V1.29</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm/html/NMSettingTCConfig.html b/docs/libnm/html/NMSettingTCConfig.html
index db35030c..52cad487 100644
--- a/docs/libnm/html/NMSettingTCConfig.html
+++ b/docs/libnm/html/NMSettingTCConfig.html
@@ -8,7 +8,7 @@
 <link rel="up" href="ch03.html" title="Connection and Setting API Reference">
 <link rel="prev" href="NMSettingSriov.html" title="NMSettingSriov">
 <link rel="next" href="NMSettingTeamPort.html" title="NMSettingTeamPort">
-<meta name="generator" content="GTK-Doc V1.29.1 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.29 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -1693,6 +1693,6 @@ nm_setting_tc_config_clear_tfilters (<em class="parameter"><code><a class="link"
 </div>
 </div>
 <div class="footer">
-<hr>Generated by GTK-Doc V1.29.1</div>
+<hr>Generated by GTK-Doc V1.29</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm/html/NMSettingTeam.html b/docs/libnm/html/NMSettingTeam.html
index 0df3712b..1d4beb4a 100644
--- a/docs/libnm/html/NMSettingTeam.html
+++ b/docs/libnm/html/NMSettingTeam.html
@@ -8,7 +8,7 @@
 <link rel="up" href="ch03.html" title="Connection and Setting API Reference">
 <link rel="prev" href="NMSettingTeamPort.html" title="NMSettingTeamPort">
 <link rel="next" href="NMSettingTun.html" title="NMSettingTun">
-<meta name="generator" content="GTK-Doc V1.29.1 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.29 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -2364,6 +2364,6 @@ a default value).</p>
 </div>
 </div>
 <div class="footer">
-<hr>Generated by GTK-Doc V1.29.1</div>
+<hr>Generated by GTK-Doc V1.29</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm/html/NMSettingTeamPort.html b/docs/libnm/html/NMSettingTeamPort.html
index 28eaa762..e1cc4098 100644
--- a/docs/libnm/html/NMSettingTeamPort.html
+++ b/docs/libnm/html/NMSettingTeamPort.html
@@ -8,7 +8,7 @@
 <link rel="up" href="ch03.html" title="Connection and Setting API Reference">
 <link rel="prev" href="NMSettingTCConfig.html" title="NMSettingTCConfig">
 <link rel="next" href="NMSettingTeam.html" title="NMSettingTeam">
-<meta name="generator" content="GTK-Doc V1.29.1 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.29 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -768,6 +768,6 @@ When set to -1 means the parameter is skipped from the json config.</p>
 </div>
 </div>
 <div class="footer">
-<hr>Generated by GTK-Doc V1.29.1</div>
+<hr>Generated by GTK-Doc V1.29</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm/html/NMSettingTun.html b/docs/libnm/html/NMSettingTun.html
index e2fec401..39a3e5a2 100644
--- a/docs/libnm/html/NMSettingTun.html
+++ b/docs/libnm/html/NMSettingTun.html
@@ -8,7 +8,7 @@
 <link rel="up" href="ch03.html" title="Connection and Setting API Reference">
 <link rel="prev" href="NMSettingTeam.html" title="NMSettingTeam">
 <link rel="next" href="NMSettingUser.html" title="NMSettingUser">
-<meta name="generator" content="GTK-Doc V1.29.1 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.29 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -530,6 +530,6 @@ network header.</p>
 </div>
 </div>
 <div class="footer">
-<hr>Generated by GTK-Doc V1.29.1</div>
+<hr>Generated by GTK-Doc V1.29</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm/html/NMSettingUser.html b/docs/libnm/html/NMSettingUser.html
index 6d977b72..0da8d24a 100644
--- a/docs/libnm/html/NMSettingUser.html
+++ b/docs/libnm/html/NMSettingUser.html
@@ -8,7 +8,7 @@
 <link rel="up" href="ch03.html" title="Connection and Setting API Reference">
 <link rel="prev" href="NMSettingTun.html" title="NMSettingTun">
 <link rel="next" href="NMSettingVlan.html" title="NMSettingVlan">
-<meta name="generator" content="GTK-Doc V1.29.1 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.29 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -342,6 +342,6 @@ is a valid user data value.</p>
 </div>
 </div>
 <div class="footer">
-<hr>Generated by GTK-Doc V1.29.1</div>
+<hr>Generated by GTK-Doc V1.29</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm/html/NMSettingVlan.html b/docs/libnm/html/NMSettingVlan.html
index d7ab5ef8..7ec017c7 100644
--- a/docs/libnm/html/NMSettingVlan.html
+++ b/docs/libnm/html/NMSettingVlan.html
@@ -8,7 +8,7 @@
 <link rel="up" href="ch03.html" title="Connection and Setting API Reference">
 <link rel="prev" href="NMSettingUser.html" title="NMSettingUser">
 <link rel="next" href="NMSettingVpn.html" title="NMSettingVpn">
-<meta name="generator" content="GTK-Doc V1.29.1 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.29 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -889,6 +889,6 @@ with a <a class="link" href="NMSettingWired.html#NMSettingWired--mac-address" ti
 </div>
 </div>
 <div class="footer">
-<hr>Generated by GTK-Doc V1.29.1</div>
+<hr>Generated by GTK-Doc V1.29</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm/html/NMSettingVpn.html b/docs/libnm/html/NMSettingVpn.html
index 2bdba73f..52119bb7 100644
--- a/docs/libnm/html/NMSettingVpn.html
+++ b/docs/libnm/html/NMSettingVpn.html
@@ -8,7 +8,7 @@
 <link rel="up" href="ch03.html" title="Connection and Setting API Reference">
 <link rel="prev" href="NMSettingVlan.html" title="NMSettingVlan">
 <link rel="next" href="NMSettingVxlan.html" title="NMSettingVxlan">
-<meta name="generator" content="GTK-Doc V1.29.1 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.29 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -988,6 +988,6 @@ VPN connection.</p>
 </div>
 </div>
 <div class="footer">
-<hr>Generated by GTK-Doc V1.29.1</div>
+<hr>Generated by GTK-Doc V1.29</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm/html/NMSettingVxlan.html b/docs/libnm/html/NMSettingVxlan.html
index d697979b..4634af0a 100644
--- a/docs/libnm/html/NMSettingVxlan.html
+++ b/docs/libnm/html/NMSettingVxlan.html
@@ -8,7 +8,7 @@
 <link rel="up" href="ch03.html" title="Connection and Setting API Reference">
 <link rel="prev" href="NMSettingVpn.html" title="NMSettingVpn">
 <link rel="next" href="NMSettingWimax.html" title="NMSettingWimax">
-<meta name="generator" content="GTK-Doc V1.29.1 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.29 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -1070,6 +1070,6 @@ tunnel endpoint.</p>
 </div>
 </div>
 <div class="footer">
-<hr>Generated by GTK-Doc V1.29.1</div>
+<hr>Generated by GTK-Doc V1.29</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm/html/NMSettingWimax.html b/docs/libnm/html/NMSettingWimax.html
index 4ac21b44..519d0a9c 100644
--- a/docs/libnm/html/NMSettingWimax.html
+++ b/docs/libnm/html/NMSettingWimax.html
@@ -8,7 +8,7 @@
 <link rel="up" href="ch03.html" title="Connection and Setting API Reference">
 <link rel="prev" href="NMSettingVxlan.html" title="NMSettingVxlan">
 <link rel="next" href="NMSettingWired.html" title="NMSettingWired">
-<meta name="generator" content="GTK-Doc V1.29.1 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.29 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -268,6 +268,6 @@ should use.</p>
 </div>
 </div>
 <div class="footer">
-<hr>Generated by GTK-Doc V1.29.1</div>
+<hr>Generated by GTK-Doc V1.29</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm/html/NMSettingWired.html b/docs/libnm/html/NMSettingWired.html
index 0b20755d..8850803b 100644
--- a/docs/libnm/html/NMSettingWired.html
+++ b/docs/libnm/html/NMSettingWired.html
@@ -8,7 +8,7 @@
 <link rel="up" href="ch03.html" title="Connection and Setting API Reference">
 <link rel="prev" href="NMSettingWimax.html" title="NMSettingWimax">
 <link rel="next" href="NMSettingWirelessSecurity.html" title="NMSettingWirelessSecurity">
-<meta name="generator" content="GTK-Doc V1.29.1 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.29 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -1612,6 +1612,6 @@ no password will be required.</p>
 </div>
 </div>
 <div class="footer">
-<hr>Generated by GTK-Doc V1.29.1</div>
+<hr>Generated by GTK-Doc V1.29</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm/html/NMSettingWireless.html b/docs/libnm/html/NMSettingWireless.html
index 40b975d9..64488bdc 100644
--- a/docs/libnm/html/NMSettingWireless.html
+++ b/docs/libnm/html/NMSettingWireless.html
@@ -8,7 +8,7 @@
 <link rel="up" href="ch03.html" title="Connection and Setting API Reference">
 <link rel="prev" href="NMSettingWirelessSecurity.html" title="NMSettingWirelessSecurity">
 <link rel="next" href="NMSettingWpan.html" title="NMSettingWpan">
-<meta name="generator" content="GTK-Doc V1.29.1 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.29 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -1811,6 +1811,6 @@ NetworkManager).</p>
 </div>
 </div>
 <div class="footer">
-<hr>Generated by GTK-Doc V1.29.1</div>
+<hr>Generated by GTK-Doc V1.29</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm/html/NMSettingWirelessSecurity.html b/docs/libnm/html/NMSettingWirelessSecurity.html
index fb43d8bd..515dabd0 100644
--- a/docs/libnm/html/NMSettingWirelessSecurity.html
+++ b/docs/libnm/html/NMSettingWirelessSecurity.html
@@ -8,7 +8,7 @@
 <link rel="up" href="ch03.html" title="Connection and Setting API Reference">
 <link rel="prev" href="NMSettingWired.html" title="NMSettingWired">
 <link rel="next" href="NMSettingWireless.html" title="NMSettingWireless">
-<meta name="generator" content="GTK-Doc V1.29.1 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.29 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -2120,6 +2120,6 @@ the Access Point capabilities.</p>
 </div>
 </div>
 <div class="footer">
-<hr>Generated by GTK-Doc V1.29.1</div>
+<hr>Generated by GTK-Doc V1.29</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm/html/NMSettingWpan.html b/docs/libnm/html/NMSettingWpan.html
index e28d4119..1ceb07c3 100644
--- a/docs/libnm/html/NMSettingWpan.html
+++ b/docs/libnm/html/NMSettingWpan.html
@@ -8,7 +8,7 @@
 <link rel="up" href="ch03.html" title="Connection and Setting API Reference">
 <link rel="prev" href="NMSettingWireless.html" title="NMSettingWireless">
 <link rel="next" href="ch04.html" title="Device and Runtime Configuration API Reference">
-<meta name="generator" content="GTK-Doc V1.29.1 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.29 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -226,6 +226,6 @@ nm_setting_wpan_get_short_address (<em class="parameter"><code><a class="link" h
 </div>
 </div>
 <div class="footer">
-<hr>Generated by GTK-Doc V1.29.1</div>
+<hr>Generated by GTK-Doc V1.29</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm/html/NMSimpleConnection.html b/docs/libnm/html/NMSimpleConnection.html
index 3095ae1d..dba78002 100644
--- a/docs/libnm/html/NMSimpleConnection.html
+++ b/docs/libnm/html/NMSimpleConnection.html
@@ -8,7 +8,7 @@
 <link rel="up" href="ch03.html" title="Connection and Setting API Reference">
 <link rel="prev" href="NMConnection.html" title="NMConnection">
 <link rel="next" href="NMRemoteConnection.html" title="NMRemoteConnection">
-<meta name="generator" content="GTK-Doc V1.29.1 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.29 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -188,6 +188,6 @@ and properties as the source <a class="link" href="NMConnection.html" title="NMC
 </div>
 </div>
 <div class="footer">
-<hr>Generated by GTK-Doc V1.29.1</div>
+<hr>Generated by GTK-Doc V1.29</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm/html/NMVpnConnection.html b/docs/libnm/html/NMVpnConnection.html
index b07f9c24..6414ffd3 100644
--- a/docs/libnm/html/NMVpnConnection.html
+++ b/docs/libnm/html/NMVpnConnection.html
@@ -8,7 +8,7 @@
 <link rel="up" href="ch04.html" title="Device and Runtime Configuration API Reference">
 <link rel="prev" href="NMActiveConnection.html" title="NMActiveConnection">
 <link rel="next" href="NMAccessPoint.html" title="NMAccessPoint">
-<meta name="generator" content="GTK-Doc V1.29.1 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.29 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -245,6 +245,6 @@ user_function (<a class="link" href="NMVpnConnection.html" title="NMVpnConnectio
 </div>
 </div>
 <div class="footer">
-<hr>Generated by GTK-Doc V1.29.1</div>
+<hr>Generated by GTK-Doc V1.29</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm/html/NMVpnEditor.html b/docs/libnm/html/NMVpnEditor.html
index 51ddc528..847edfbd 100644
--- a/docs/libnm/html/NMVpnEditor.html
+++ b/docs/libnm/html/NMVpnEditor.html
@@ -8,7 +8,7 @@
 <link rel="up" href="ch06.html" title="VPN Plugin API Reference">
 <link rel="prev" href="libnm-nm-vpn-plugin-info.html" title="nm-vpn-plugin-info">
 <link rel="next" href="NMVpnEditorPlugin.html" title="NMVpnEditorPlugin">
-<meta name="generator" content="GTK-Doc V1.29.1 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.29 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -140,7 +140,7 @@ nm_vpn_editor_update_connection (<em class="parameter"><code><a class="link" hre
 <tbody>
 <tr>
 <td class="struct_member_name"><p><em class="structfield"><code><a name="NMVpnEditorInterface.get-widget"></a>get_widget</code></em> ()</p></td>
-<td class="struct_member_description"><p>return the <a href="https://developer.gnome.org/gtk4/GtkWidget.html#GtkWidget-struct"><span class="type">GtkWidget</span></a> for the VPN editor's UI</p></td>
+<td class="struct_member_description"><p>return the <span class="type">GtkWidget</span> for the VPN editor's UI</p></td>
 <td class="struct_member_annotations"> </td>
 </tr>
 <tr>
@@ -175,6 +175,6 @@ to write values to the connection.</p></td>
 </div>
 </div>
 <div class="footer">
-<hr>Generated by GTK-Doc V1.29.1</div>
+<hr>Generated by GTK-Doc V1.29</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm/html/NMVpnEditorPlugin.html b/docs/libnm/html/NMVpnEditorPlugin.html
index 4cff61e5..f1168013 100644
--- a/docs/libnm/html/NMVpnEditorPlugin.html
+++ b/docs/libnm/html/NMVpnEditorPlugin.html
@@ -8,7 +8,7 @@
 <link rel="up" href="ch06.html" title="VPN Plugin API Reference">
 <link rel="prev" href="NMVpnEditor.html" title="NMVpnEditor">
 <link rel="next" href="libnm-nm-vpn-plugin-old.html" title="nm-vpn-plugin-old">
-<meta name="generator" content="GTK-Doc V1.29.1 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.29 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -821,6 +821,6 @@ user_function (<a class="link" href="NMVpnEditor.html" title="NMVpnEditor"><span
 </div>
 </div>
 <div class="footer">
-<hr>Generated by GTK-Doc V1.29.1</div>
+<hr>Generated by GTK-Doc V1.29</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm/html/NMWimaxNsp.html b/docs/libnm/html/NMWimaxNsp.html
index 67b5cc99..eb249419 100644
--- a/docs/libnm/html/NMWimaxNsp.html
+++ b/docs/libnm/html/NMWimaxNsp.html
@@ -8,7 +8,7 @@
 <link rel="up" href="ch04.html" title="Device and Runtime Configuration API Reference">
 <link rel="prev" href="NMAccessPoint.html" title="NMAccessPoint">
 <link rel="next" href="NMIPConfig.html" title="NMIPConfig">
-<meta name="generator" content="GTK-Doc V1.29.1 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.29 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -260,7 +260,7 @@ connections will match the <em class="parameter"><code>nsp</code></em>
 </tr>
 <tr>
 <td class="parameter_name"><p>connections</p></td>
-<td class="parameter_description"><p>an array of <span class="type">NMConnections</span> to
+<td class="parameter_description"><p>an array of <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html#NMConnection-struct"><span class="type">NMConnections</span></a> to
 filter. </p></td>
 <td class="parameter_annotations"><span class="annotation">[<acronym title="Generics and defining elements of containers and arrays."><span class="acronym">element-type</span></acronym> NMConnection]</span></td>
 </tr>
@@ -270,10 +270,10 @@ filter. </p></td>
 <div class="refsect3">
 <a name="nm-wimax-nsp-filter-connections.returns"></a><h4>Returns</h4>
 <p>an array of
-<span class="type">NMConnections</span> that could be activated with the given <em class="parameter"><code>nsp</code></em>
+<a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html#NMConnection-struct"><span class="type">NMConnections</span></a> that could be activated with the given <em class="parameter"><code>nsp</code></em>
 .  The array should
 be freed with <a href="https://developer.gnome.org/glib/unstable/glib-Pointer-Arrays.html#g-ptr-array-unref"><code class="function">g_ptr_array_unref()</code></a> when it is no longer required. </p>
-<p><span class="annotation">[<acronym title="Free data container after the code is done."><span class="acronym">transfer container</span></acronym>][<acronym title="Generics and defining elements of containers and arrays."><span class="acronym">element-type</span></acronym> NMConnection]</span></p>
+<p><span class="annotation">[<acronym title="Free data after the code is done."><span class="acronym">transfer full</span></acronym>][<acronym title="Generics and defining elements of containers and arrays."><span class="acronym">element-type</span></acronym> NMConnection]</span></p>
 </div>
 </div>
 <hr>
@@ -371,6 +371,6 @@ against</p></td>
 </div>
 </div>
 <div class="footer">
-<hr>Generated by GTK-Doc V1.29.1</div>
+<hr>Generated by GTK-Doc V1.29</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm/html/annotation-glossary.html b/docs/libnm/html/annotation-glossary.html
index c46d5b8f..2c027534 100644
--- a/docs/libnm/html/annotation-glossary.html
+++ b/docs/libnm/html/annotation-glossary.html
@@ -7,7 +7,7 @@
 <link rel="home" href="index.html" title="libnm Reference Manual">
 <link rel="up" href="index.html" title="libnm Reference Manual">
 <link rel="prev" href="api-index-full.html" title="API Index">
-<meta name="generator" content="GTK-Doc V1.29.1 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.29 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -73,6 +73,6 @@
 <dd class="glossdef"><p>Override the parsed C type with given type.</p></dd>
 </div>
 <div class="footer">
-<hr>Generated by GTK-Doc V1.29.1</div>
+<hr>Generated by GTK-Doc V1.29</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm/html/api-index-full.html b/docs/libnm/html/api-index-full.html
index 16452f62..9d850e33 100644
--- a/docs/libnm/html/api-index-full.html
+++ b/docs/libnm/html/api-index-full.html
@@ -8,7 +8,7 @@
 <link rel="up" href="index.html" title="libnm Reference Manual">
 <link rel="prev" href="object-tree.html" title="Object Hierarchy">
 <link rel="next" href="annotation-glossary.html" title="Annotation Glossary">
-<meta name="generator" content="GTK-Doc V1.29.1 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.29 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -1111,19 +1111,19 @@ NMCheckpoint:rollback-timeout, object property in NMDeviceOvs
 </dt>
 <dd></dd>
 <dt>
-NMConnection, struct in NMSettingOvs
+<a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html#NMConnection-struct">NMConnection</a>, struct in NMSettingOvs
 </dt>
 <dd></dd>
 <dt>
-NMConnection::changed, object signal in NMSettingOvs
+<a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html#NMConnection-changed">NMConnection::changed</a>, object signal in NMSettingOvs
 </dt>
 <dd></dd>
 <dt>
-NMConnection::secrets-cleared, object signal in NMSettingOvs
+<a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html#NMConnection-secrets-cleared">NMConnection::secrets-cleared</a>, object signal in NMSettingOvs
 </dt>
 <dd></dd>
 <dt>
-NMConnection::secrets-updated, object signal in NMSettingOvs
+<a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html#NMConnection-secrets-updated">NMConnection::secrets-updated</a>, object signal in NMSettingOvs
 </dt>
 <dd></dd>
 <dt>
@@ -1628,11 +1628,11 @@ NMConnection::secrets-updated, object signal in NMSettingOvs
 </dt>
 <dd></dd>
 <dt>
-NM_DBUS_INTERFACE_VPN, macro in nm-vpn-dbus-interface
+<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManagerVPN.html#NM-DBUS-INTERFACE-VPN:CAPS">NM_DBUS_INTERFACE_VPN</a>, macro in nm-vpn-dbus-interface
 </dt>
 <dd></dd>
 <dt>
-NM_DBUS_INTERFACE_VPN_CONNECTION, macro in nm-vpn-dbus-interface
+<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManagerVPN.html#NM-DBUS-INTERFACE-VPN-CONNECTION:CAPS">NM_DBUS_INTERFACE_VPN_CONNECTION</a>, macro in nm-vpn-dbus-interface
 </dt>
 <dd></dd>
 <dt>
@@ -1640,15 +1640,15 @@ NM_DBUS_INTERFACE_VPN_CONNECTION, macro in nm-vpn-dbus-interface
 </dt>
 <dd></dd>
 <dt>
-NM_DBUS_INVALID_VPN_CONNECTION, macro in nm-vpn-dbus-interface
+<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManagerVPN.html#NM-DBUS-INVALID-VPN-CONNECTION:CAPS">NM_DBUS_INVALID_VPN_CONNECTION</a>, macro in nm-vpn-dbus-interface
 </dt>
 <dd></dd>
 <dt>
-NM_DBUS_NO_ACTIVE_VPN_CONNECTION, macro in nm-vpn-dbus-interface
+<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManagerVPN.html#NM-DBUS-NO-ACTIVE-VPN-CONNECTION:CAPS">NM_DBUS_NO_ACTIVE_VPN_CONNECTION</a>, macro in nm-vpn-dbus-interface
 </dt>
 <dd></dd>
 <dt>
-NM_DBUS_NO_VPN_CONNECTIONS, macro in nm-vpn-dbus-interface
+<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManagerVPN.html#NM-DBUS-NO-VPN-CONNECTIONS:CAPS">NM_DBUS_NO_VPN_CONNECTIONS</a>, macro in nm-vpn-dbus-interface
 </dt>
 <dd></dd>
 <dt>
@@ -1680,11 +1680,11 @@ NM_DBUS_NO_VPN_CONNECTIONS, macro in nm-vpn-dbus-interface
 </dt>
 <dd></dd>
 <dt>
-NM_DBUS_PATH_VPN, macro in nm-vpn-dbus-interface
+<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManagerVPN.html#NM-DBUS-PATH-VPN:CAPS">NM_DBUS_PATH_VPN</a>, macro in nm-vpn-dbus-interface
 </dt>
 <dd></dd>
 <dt>
-NM_DBUS_PATH_VPN_CONNECTION, macro in nm-vpn-dbus-interface
+<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManagerVPN.html#NM-DBUS-PATH-VPN-CONNECTION:CAPS">NM_DBUS_PATH_VPN_CONNECTION</a>, macro in nm-vpn-dbus-interface
 </dt>
 <dd></dd>
 <dt>
@@ -1696,67 +1696,67 @@ NM_DBUS_PATH_VPN_CONNECTION, macro in nm-vpn-dbus-interface
 </dt>
 <dd></dd>
 <dt>
-NM_DBUS_VPN_ALREADY_STARTED, macro in nm-vpn-dbus-interface
+<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManagerVPN.html#NM-DBUS-VPN-ALREADY-STARTED:CAPS">NM_DBUS_VPN_ALREADY_STARTED</a>, macro in nm-vpn-dbus-interface
 </dt>
 <dd></dd>
 <dt>
-NM_DBUS_VPN_ALREADY_STOPPED, macro in nm-vpn-dbus-interface
+<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManagerVPN.html#NM-DBUS-VPN-ALREADY-STOPPED:CAPS">NM_DBUS_VPN_ALREADY_STOPPED</a>, macro in nm-vpn-dbus-interface
 </dt>
 <dd></dd>
 <dt>
-NM_DBUS_VPN_BAD_ARGUMENTS, macro in nm-vpn-dbus-interface
+<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManagerVPN.html#NM-DBUS-VPN-BAD-ARGUMENTS:CAPS">NM_DBUS_VPN_BAD_ARGUMENTS</a>, macro in nm-vpn-dbus-interface
 </dt>
 <dd></dd>
 <dt>
-NM_DBUS_VPN_ERROR_PREFIX, macro in nm-vpn-dbus-interface
+<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManagerVPN.html#NM-DBUS-VPN-ERROR-PREFIX:CAPS">NM_DBUS_VPN_ERROR_PREFIX</a>, macro in nm-vpn-dbus-interface
 </dt>
 <dd></dd>
 <dt>
-NM_DBUS_VPN_INTERACTIVE_NOT_SUPPORTED, macro in nm-vpn-dbus-interface
+<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManagerVPN.html#NM-DBUS-VPN-INTERACTIVE-NOT-SUPPORTED:CAPS">NM_DBUS_VPN_INTERACTIVE_NOT_SUPPORTED</a>, macro in nm-vpn-dbus-interface
 </dt>
 <dd></dd>
 <dt>
-NM_DBUS_VPN_SIGNAL_CONNECT_FAILED, macro in nm-vpn-dbus-interface
+<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManagerVPN.html#NM-DBUS-VPN-SIGNAL-CONNECT-FAILED:CAPS">NM_DBUS_VPN_SIGNAL_CONNECT_FAILED</a>, macro in nm-vpn-dbus-interface
 </dt>
 <dd></dd>
 <dt>
-NM_DBUS_VPN_SIGNAL_IP4_CONFIG, macro in nm-vpn-dbus-interface
+<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManagerVPN.html#NM-DBUS-VPN-SIGNAL-IP4-CONFIG:CAPS">NM_DBUS_VPN_SIGNAL_IP4_CONFIG</a>, macro in nm-vpn-dbus-interface
 </dt>
 <dd></dd>
 <dt>
-NM_DBUS_VPN_SIGNAL_IP_CONFIG_BAD, macro in nm-vpn-dbus-interface
+<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManagerVPN.html#NM-DBUS-VPN-SIGNAL-IP-CONFIG-BAD:CAPS">NM_DBUS_VPN_SIGNAL_IP_CONFIG_BAD</a>, macro in nm-vpn-dbus-interface
 </dt>
 <dd></dd>
 <dt>
-NM_DBUS_VPN_SIGNAL_LAUNCH_FAILED, macro in nm-vpn-dbus-interface
+<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManagerVPN.html#NM-DBUS-VPN-SIGNAL-LAUNCH-FAILED:CAPS">NM_DBUS_VPN_SIGNAL_LAUNCH_FAILED</a>, macro in nm-vpn-dbus-interface
 </dt>
 <dd></dd>
 <dt>
-NM_DBUS_VPN_SIGNAL_LOGIN_BANNER, macro in nm-vpn-dbus-interface
+<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManagerVPN.html#NM-DBUS-VPN-SIGNAL-LOGIN-BANNER:CAPS">NM_DBUS_VPN_SIGNAL_LOGIN_BANNER</a>, macro in nm-vpn-dbus-interface
 </dt>
 <dd></dd>
 <dt>
-NM_DBUS_VPN_SIGNAL_LOGIN_FAILED, macro in nm-vpn-dbus-interface
+<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManagerVPN.html#NM-DBUS-VPN-SIGNAL-LOGIN-FAILED:CAPS">NM_DBUS_VPN_SIGNAL_LOGIN_FAILED</a>, macro in nm-vpn-dbus-interface
 </dt>
 <dd></dd>
 <dt>
-NM_DBUS_VPN_SIGNAL_STATE_CHANGE, macro in nm-vpn-dbus-interface
+<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManagerVPN.html#NM-DBUS-VPN-SIGNAL-STATE-CHANGE:CAPS">NM_DBUS_VPN_SIGNAL_STATE_CHANGE</a>, macro in nm-vpn-dbus-interface
 </dt>
 <dd></dd>
 <dt>
-NM_DBUS_VPN_SIGNAL_VPN_CONFIG_BAD, macro in nm-vpn-dbus-interface
+<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManagerVPN.html#NM-DBUS-VPN-SIGNAL-VPN-CONFIG-BAD:CAPS">NM_DBUS_VPN_SIGNAL_VPN_CONFIG_BAD</a>, macro in nm-vpn-dbus-interface
 </dt>
 <dd></dd>
 <dt>
-NM_DBUS_VPN_STARTING_IN_PROGRESS, macro in nm-vpn-dbus-interface
+<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManagerVPN.html#NM-DBUS-VPN-STARTING-IN-PROGRESS:CAPS">NM_DBUS_VPN_STARTING_IN_PROGRESS</a>, macro in nm-vpn-dbus-interface
 </dt>
 <dd></dd>
 <dt>
-NM_DBUS_VPN_STOPPING_IN_PROGRESS, macro in nm-vpn-dbus-interface
+<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManagerVPN.html#NM-DBUS-VPN-STOPPING-IN-PROGRESS:CAPS">NM_DBUS_VPN_STOPPING_IN_PROGRESS</a>, macro in nm-vpn-dbus-interface
 </dt>
 <dd></dd>
 <dt>
-NM_DBUS_VPN_WRONG_STATE, macro in nm-vpn-dbus-interface
+<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManagerVPN.html#NM-DBUS-VPN-WRONG-STATE:CAPS">NM_DBUS_VPN_WRONG_STATE</a>, macro in nm-vpn-dbus-interface
 </dt>
 <dd></dd>
 <dt>
@@ -4455,7 +4455,7 @@ json_object_iter_key, macro in nm-json
 </dt>
 <dd></dd>
 <dt>
-<a href="/usr/share/gtk-doc/html/json-glib/json-glib-JSON-Object.html#json-object-iter-next">json_object_iter_next</a>, macro in nm-json
+json_object_iter_next, macro in nm-json
 </dt>
 <dd></dd>
 <dt>
@@ -11623,11 +11623,11 @@ nm_utils_fixup_vendor_string, function in nm-libnm-utils
 </dt>
 <dd></dd>
 <dt>
-NM_VPN_DBUS_PLUGIN_INTERFACE, macro in nm-vpn-dbus-interface
+<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManagerVPN.html#NM-VPN-DBUS-PLUGIN-INTERFACE:CAPS">NM_VPN_DBUS_PLUGIN_INTERFACE</a>, macro in nm-vpn-dbus-interface
 </dt>
 <dd></dd>
 <dt>
-NM_VPN_DBUS_PLUGIN_PATH, macro in nm-vpn-dbus-interface
+<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManagerVPN.html#NM-VPN-DBUS-PLUGIN-PATH:CAPS">NM_VPN_DBUS_PLUGIN_PATH</a>, macro in nm-vpn-dbus-interface
 </dt>
 <dd></dd>
 <dt>
@@ -11695,27 +11695,27 @@ NM_VPN_DBUS_PLUGIN_PATH, macro in nm-vpn-dbus-interface
 </dt>
 <dd></dd>
 <dt>
-NM_VPN_PLUGIN_CAN_PERSIST, macro in nm-vpn-dbus-interface
+<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManagerVPN.html#NM-VPN-PLUGIN-CAN-PERSIST:CAPS">NM_VPN_PLUGIN_CAN_PERSIST</a>, macro in nm-vpn-dbus-interface
 </dt>
 <dd></dd>
 <dt>
-NM_VPN_PLUGIN_CONFIG_BANNER, macro in nm-vpn-dbus-interface
+<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManagerVPN.html#NM-VPN-PLUGIN-CONFIG-BANNER:CAPS">NM_VPN_PLUGIN_CONFIG_BANNER</a>, macro in nm-vpn-dbus-interface
 </dt>
 <dd></dd>
 <dt>
-NM_VPN_PLUGIN_CONFIG_EXT_GATEWAY, macro in nm-vpn-dbus-interface
+<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManagerVPN.html#NM-VPN-PLUGIN-CONFIG-EXT-GATEWAY:CAPS">NM_VPN_PLUGIN_CONFIG_EXT_GATEWAY</a>, macro in nm-vpn-dbus-interface
 </dt>
 <dd></dd>
 <dt>
-NM_VPN_PLUGIN_CONFIG_HAS_IP4, macro in nm-vpn-dbus-interface
+<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManagerVPN.html#NM-VPN-PLUGIN-CONFIG-HAS-IP4:CAPS">NM_VPN_PLUGIN_CONFIG_HAS_IP4</a>, macro in nm-vpn-dbus-interface
 </dt>
 <dd></dd>
 <dt>
-NM_VPN_PLUGIN_CONFIG_HAS_IP6, macro in nm-vpn-dbus-interface
+<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManagerVPN.html#NM-VPN-PLUGIN-CONFIG-HAS-IP6:CAPS">NM_VPN_PLUGIN_CONFIG_HAS_IP6</a>, macro in nm-vpn-dbus-interface
 </dt>
 <dd></dd>
 <dt>
-NM_VPN_PLUGIN_CONFIG_MTU, macro in nm-vpn-dbus-interface
+<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManagerVPN.html#NM-VPN-PLUGIN-CONFIG-MTU:CAPS">NM_VPN_PLUGIN_CONFIG_MTU</a>, macro in nm-vpn-dbus-interface
 </dt>
 <dd></dd>
 <dt>
@@ -11723,7 +11723,7 @@ NM_VPN_PLUGIN_CONFIG_PROXY_PAC, macro in nm-vpn-dbus-interface
 </dt>
 <dd></dd>
 <dt>
-NM_VPN_PLUGIN_CONFIG_TUNDEV, macro in nm-vpn-dbus-interface
+<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManagerVPN.html#NM-VPN-PLUGIN-CONFIG-TUNDEV:CAPS">NM_VPN_PLUGIN_CONFIG_TUNDEV</a>, macro in nm-vpn-dbus-interface
 </dt>
 <dd></dd>
 <dt>
@@ -11759,55 +11759,55 @@ NM_VPN_PLUGIN_CONFIG_TUNDEV, macro in nm-vpn-dbus-interface
 </dt>
 <dd></dd>
 <dt>
-NM_VPN_PLUGIN_IP4_CONFIG_ADDRESS, macro in nm-vpn-dbus-interface
+<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManagerVPN.html#NM-VPN-PLUGIN-IP4-CONFIG-ADDRESS:CAPS">NM_VPN_PLUGIN_IP4_CONFIG_ADDRESS</a>, macro in nm-vpn-dbus-interface
 </dt>
 <dd></dd>
 <dt>
-NM_VPN_PLUGIN_IP4_CONFIG_BANNER, macro in nm-vpn-dbus-interface
+<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManagerVPN.html#NM-VPN-PLUGIN-IP4-CONFIG-BANNER:CAPS">NM_VPN_PLUGIN_IP4_CONFIG_BANNER</a>, macro in nm-vpn-dbus-interface
 </dt>
 <dd></dd>
 <dt>
-NM_VPN_PLUGIN_IP4_CONFIG_DNS, macro in nm-vpn-dbus-interface
+<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManagerVPN.html#NM-VPN-PLUGIN-IP4-CONFIG-DNS:CAPS">NM_VPN_PLUGIN_IP4_CONFIG_DNS</a>, macro in nm-vpn-dbus-interface
 </dt>
 <dd></dd>
 <dt>
-NM_VPN_PLUGIN_IP4_CONFIG_DOMAIN, macro in nm-vpn-dbus-interface
+<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManagerVPN.html#NM-VPN-PLUGIN-IP4-CONFIG-DOMAIN:CAPS">NM_VPN_PLUGIN_IP4_CONFIG_DOMAIN</a>, macro in nm-vpn-dbus-interface
 </dt>
 <dd></dd>
 <dt>
-NM_VPN_PLUGIN_IP4_CONFIG_DOMAINS, macro in nm-vpn-dbus-interface
+<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManagerVPN.html#NM-VPN-PLUGIN-IP4-CONFIG-DOMAINS:CAPS">NM_VPN_PLUGIN_IP4_CONFIG_DOMAINS</a>, macro in nm-vpn-dbus-interface
 </dt>
 <dd></dd>
 <dt>
-NM_VPN_PLUGIN_IP4_CONFIG_EXT_GATEWAY, macro in nm-vpn-dbus-interface
+<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManagerVPN.html#NM-VPN-PLUGIN-IP4-CONFIG-EXT-GATEWAY:CAPS">NM_VPN_PLUGIN_IP4_CONFIG_EXT_GATEWAY</a>, macro in nm-vpn-dbus-interface
 </dt>
 <dd></dd>
 <dt>
-NM_VPN_PLUGIN_IP4_CONFIG_GATEWAY, macro in nm-vpn-dbus-interface
+<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManagerVPN.html#NM-VPN-PLUGIN-IP4-CONFIG-GATEWAY:CAPS">NM_VPN_PLUGIN_IP4_CONFIG_GATEWAY</a>, macro in nm-vpn-dbus-interface
 </dt>
 <dd></dd>
 <dt>
-NM_VPN_PLUGIN_IP4_CONFIG_INT_GATEWAY, macro in nm-vpn-dbus-interface
+<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManagerVPN.html#NM-VPN-PLUGIN-IP4-CONFIG-INT-GATEWAY:CAPS">NM_VPN_PLUGIN_IP4_CONFIG_INT_GATEWAY</a>, macro in nm-vpn-dbus-interface
 </dt>
 <dd></dd>
 <dt>
-NM_VPN_PLUGIN_IP4_CONFIG_MSS, macro in nm-vpn-dbus-interface
+<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManagerVPN.html#NM-VPN-PLUGIN-IP4-CONFIG-MSS:CAPS">NM_VPN_PLUGIN_IP4_CONFIG_MSS</a>, macro in nm-vpn-dbus-interface
 </dt>
 <dd></dd>
 <dt>
-NM_VPN_PLUGIN_IP4_CONFIG_MTU, macro in nm-vpn-dbus-interface
+<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManagerVPN.html#NM-VPN-PLUGIN-IP4-CONFIG-MTU:CAPS">NM_VPN_PLUGIN_IP4_CONFIG_MTU</a>, macro in nm-vpn-dbus-interface
 </dt>
 <dd></dd>
 <dt>
-NM_VPN_PLUGIN_IP4_CONFIG_NBNS, macro in nm-vpn-dbus-interface
+<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManagerVPN.html#NM-VPN-PLUGIN-IP4-CONFIG-NBNS:CAPS">NM_VPN_PLUGIN_IP4_CONFIG_NBNS</a>, macro in nm-vpn-dbus-interface
 </dt>
 <dd></dd>
 <dt>
-NM_VPN_PLUGIN_IP4_CONFIG_NEVER_DEFAULT, macro in nm-vpn-dbus-interface
+<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManagerVPN.html#NM-VPN-PLUGIN-IP4-CONFIG-NEVER-DEFAULT:CAPS">NM_VPN_PLUGIN_IP4_CONFIG_NEVER_DEFAULT</a>, macro in nm-vpn-dbus-interface
 </dt>
 <dd></dd>
 <dt>
-NM_VPN_PLUGIN_IP4_CONFIG_PREFIX, macro in nm-vpn-dbus-interface
+<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManagerVPN.html#NM-VPN-PLUGIN-IP4-CONFIG-PREFIX:CAPS">NM_VPN_PLUGIN_IP4_CONFIG_PREFIX</a>, macro in nm-vpn-dbus-interface
 </dt>
 <dd></dd>
 <dt>
@@ -11815,47 +11815,47 @@ NM_VPN_PLUGIN_IP4_CONFIG_PRESERVE_ROUTES, macro in nm-vpn-dbus-interface
 </dt>
 <dd></dd>
 <dt>
-NM_VPN_PLUGIN_IP4_CONFIG_PTP, macro in nm-vpn-dbus-interface
+<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManagerVPN.html#NM-VPN-PLUGIN-IP4-CONFIG-PTP:CAPS">NM_VPN_PLUGIN_IP4_CONFIG_PTP</a>, macro in nm-vpn-dbus-interface
 </dt>
 <dd></dd>
 <dt>
-NM_VPN_PLUGIN_IP4_CONFIG_ROUTES, macro in nm-vpn-dbus-interface
+<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManagerVPN.html#NM-VPN-PLUGIN-IP4-CONFIG-ROUTES:CAPS">NM_VPN_PLUGIN_IP4_CONFIG_ROUTES</a>, macro in nm-vpn-dbus-interface
 </dt>
 <dd></dd>
 <dt>
-NM_VPN_PLUGIN_IP4_CONFIG_TUNDEV, macro in nm-vpn-dbus-interface
+<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManagerVPN.html#NM-VPN-PLUGIN-IP4-CONFIG-TUNDEV:CAPS">NM_VPN_PLUGIN_IP4_CONFIG_TUNDEV</a>, macro in nm-vpn-dbus-interface
 </dt>
 <dd></dd>
 <dt>
-NM_VPN_PLUGIN_IP6_CONFIG_ADDRESS, macro in nm-vpn-dbus-interface
+<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManagerVPN.html#NM-VPN-PLUGIN-IP6-CONFIG-ADDRESS:CAPS">NM_VPN_PLUGIN_IP6_CONFIG_ADDRESS</a>, macro in nm-vpn-dbus-interface
 </dt>
 <dd></dd>
 <dt>
-NM_VPN_PLUGIN_IP6_CONFIG_DNS, macro in nm-vpn-dbus-interface
+<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManagerVPN.html#NM-VPN-PLUGIN-IP6-CONFIG-DNS:CAPS">NM_VPN_PLUGIN_IP6_CONFIG_DNS</a>, macro in nm-vpn-dbus-interface
 </dt>
 <dd></dd>
 <dt>
-NM_VPN_PLUGIN_IP6_CONFIG_DOMAIN, macro in nm-vpn-dbus-interface
+<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManagerVPN.html#NM-VPN-PLUGIN-IP6-CONFIG-DOMAIN:CAPS">NM_VPN_PLUGIN_IP6_CONFIG_DOMAIN</a>, macro in nm-vpn-dbus-interface
 </dt>
 <dd></dd>
 <dt>
-NM_VPN_PLUGIN_IP6_CONFIG_DOMAINS, macro in nm-vpn-dbus-interface
+<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManagerVPN.html#NM-VPN-PLUGIN-IP6-CONFIG-DOMAINS:CAPS">NM_VPN_PLUGIN_IP6_CONFIG_DOMAINS</a>, macro in nm-vpn-dbus-interface
 </dt>
 <dd></dd>
 <dt>
-NM_VPN_PLUGIN_IP6_CONFIG_INT_GATEWAY, macro in nm-vpn-dbus-interface
+<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManagerVPN.html#NM-VPN-PLUGIN-IP6-CONFIG-INT-GATEWAY:CAPS">NM_VPN_PLUGIN_IP6_CONFIG_INT_GATEWAY</a>, macro in nm-vpn-dbus-interface
 </dt>
 <dd></dd>
 <dt>
-NM_VPN_PLUGIN_IP6_CONFIG_MSS, macro in nm-vpn-dbus-interface
+<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManagerVPN.html#NM-VPN-PLUGIN-IP6-CONFIG-MSS:CAPS">NM_VPN_PLUGIN_IP6_CONFIG_MSS</a>, macro in nm-vpn-dbus-interface
 </dt>
 <dd></dd>
 <dt>
-NM_VPN_PLUGIN_IP6_CONFIG_NEVER_DEFAULT, macro in nm-vpn-dbus-interface
+<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManagerVPN.html#NM-VPN-PLUGIN-IP6-CONFIG-NEVER-DEFAULT:CAPS">NM_VPN_PLUGIN_IP6_CONFIG_NEVER_DEFAULT</a>, macro in nm-vpn-dbus-interface
 </dt>
 <dd></dd>
 <dt>
-NM_VPN_PLUGIN_IP6_CONFIG_PREFIX, macro in nm-vpn-dbus-interface
+<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManagerVPN.html#NM-VPN-PLUGIN-IP6-CONFIG-PREFIX:CAPS">NM_VPN_PLUGIN_IP6_CONFIG_PREFIX</a>, macro in nm-vpn-dbus-interface
 </dt>
 <dd></dd>
 <dt>
@@ -11863,11 +11863,11 @@ NM_VPN_PLUGIN_IP6_CONFIG_PRESERVE_ROUTES, macro in nm-vpn-dbus-interface
 </dt>
 <dd></dd>
 <dt>
-NM_VPN_PLUGIN_IP6_CONFIG_PTP, macro in nm-vpn-dbus-interface
+<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManagerVPN.html#NM-VPN-PLUGIN-IP6-CONFIG-PTP:CAPS">NM_VPN_PLUGIN_IP6_CONFIG_PTP</a>, macro in nm-vpn-dbus-interface
 </dt>
 <dd></dd>
 <dt>
-NM_VPN_PLUGIN_IP6_CONFIG_ROUTES, macro in nm-vpn-dbus-interface
+<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManagerVPN.html#NM-VPN-PLUGIN-IP6-CONFIG-ROUTES:CAPS">NM_VPN_PLUGIN_IP6_CONFIG_ROUTES</a>, macro in nm-vpn-dbus-interface
 </dt>
 <dd></dd>
 <dt>
@@ -11949,6 +11949,6 @@ NM_VPN_PLUGIN_IP6_CONFIG_ROUTES, macro in nm-vpn-dbus-interface
 <dd></dd>
 </div>
 <div class="footer">
-<hr>Generated by GTK-Doc V1.29.1</div>
+<hr>Generated by GTK-Doc V1.29</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm/html/ch02.html b/docs/libnm/html/ch02.html
index 5e3bfc04..cb969f84 100644
--- a/docs/libnm/html/ch02.html
+++ b/docs/libnm/html/ch02.html
@@ -8,7 +8,7 @@
 <link rel="up" href="index.html" title="libnm Reference Manual">
 <link rel="prev" href="usage.html" title="Using libnm">
 <link rel="next" href="NMClient.html" title="NMClient">
-<meta name="generator" content="GTK-Doc V1.29.1 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.29 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -41,6 +41,6 @@
 </dl></div>
 </div>
 <div class="footer">
-<hr>Generated by GTK-Doc V1.29.1</div>
+<hr>Generated by GTK-Doc V1.29</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm/html/ch03.html b/docs/libnm/html/ch03.html
index ac1c33f2..4e2b599e 100644
--- a/docs/libnm/html/ch03.html
+++ b/docs/libnm/html/ch03.html
@@ -8,7 +8,7 @@
 <link rel="up" href="index.html" title="libnm Reference Manual">
 <link rel="prev" href="libnm-nm-dbus-interface.html" title="nm-dbus-interface">
 <link rel="next" href="NMConnection.html" title="NMConnection">
-<meta name="generator" content="GTK-Doc V1.29.1 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.29 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -177,6 +177,6 @@ use WEP, LEAP, WPA or WPA2/RSN security</span>
 </dl></div>
 </div>
 <div class="footer">
-<hr>Generated by GTK-Doc V1.29.1</div>
+<hr>Generated by GTK-Doc V1.29</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm/html/ch04.html b/docs/libnm/html/ch04.html
index 395595b2..5553f2c6 100644
--- a/docs/libnm/html/ch04.html
+++ b/docs/libnm/html/ch04.html
@@ -8,7 +8,7 @@
 <link rel="up" href="index.html" title="libnm Reference Manual">
 <link rel="prev" href="NMSettingWpan.html" title="NMSettingWpan">
 <link rel="next" href="NMDevice.html" title="NMDevice">
-<meta name="generator" content="GTK-Doc V1.29.1 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.29 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -128,6 +128,6 @@
 </dl></div>
 </div>
 <div class="footer">
-<hr>Generated by GTK-Doc V1.29.1</div>
+<hr>Generated by GTK-Doc V1.29</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm/html/ch05.html b/docs/libnm/html/ch05.html
index 1d7c88f4..7899678a 100644
--- a/docs/libnm/html/ch05.html
+++ b/docs/libnm/html/ch05.html
@@ -8,7 +8,7 @@
 <link rel="up" href="index.html" title="libnm Reference Manual">
 <link rel="prev" href="NMCheckpoint.html" title="NMCheckpoint">
 <link rel="next" href="libnm-nm-utils.html" title="nm-utils">
-<meta name="generator" content="GTK-Doc V1.29.1 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.29 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -32,6 +32,6 @@
 </dl></div>
 </div>
 <div class="footer">
-<hr>Generated by GTK-Doc V1.29.1</div>
+<hr>Generated by GTK-Doc V1.29</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm/html/ch06.html b/docs/libnm/html/ch06.html
index 8ebc4add..a36e867d 100644
--- a/docs/libnm/html/ch06.html
+++ b/docs/libnm/html/ch06.html
@@ -8,7 +8,7 @@
 <link rel="up" href="index.html" title="libnm Reference Manual">
 <link rel="prev" href="libnm-nm-version.html" title="nm-version">
 <link rel="next" href="libnm-nm-vpn-service-plugin.html" title="nm-vpn-service-plugin">
-<meta name="generator" content="GTK-Doc V1.29.1 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.29 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -41,6 +41,6 @@
 </dl></div>
 </div>
 <div class="footer">
-<hr>Generated by GTK-Doc V1.29.1</div>
+<hr>Generated by GTK-Doc V1.29</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm/html/index.html b/docs/libnm/html/index.html
index f76a50a5..9d83dca8 100644
--- a/docs/libnm/html/index.html
+++ b/docs/libnm/html/index.html
@@ -6,7 +6,7 @@
 <meta name="generator" content="DocBook XSL Stylesheets Vsnapshot">
 <link rel="home" href="index.html" title="libnm Reference Manual">
 <link rel="next" href="ref-overview.html" title="Overview">
-<meta name="generator" content="GTK-Doc V1.29.1 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.29 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -15,7 +15,7 @@
 <div>
 <div><table class="navigation" id="top" width="100%" cellpadding="2" cellspacing="0"><tr><th valign="middle"><p class="title">libnm Reference Manual</p></th></tr></table></div>
 <div><p class="releaseinfo">
-      for libnm 1.14.4
+      for libnm 1.14.6
 
       The latest version of this documentation can be found on-line at
       <a class="ulink" href="https://developer.gnome.org/libnm/stable/" target="_top">https://developer.gnome.org/libnm/stable/</a>.
@@ -362,6 +362,6 @@ use WEP, LEAP, WPA or WPA2/RSN security</span>
 </dl></div>
 </div>
 <div class="footer">
-<hr>Generated by GTK-Doc V1.29.1</div>
+<hr>Generated by GTK-Doc V1.29</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm/html/libnm-nm-dbus-interface.html b/docs/libnm/html/libnm-nm-dbus-interface.html
index 2bab8834..b845c764 100644
--- a/docs/libnm/html/libnm-nm-dbus-interface.html
+++ b/docs/libnm/html/libnm-nm-dbus-interface.html
@@ -8,7 +8,7 @@
 <link rel="up" href="ch02.html" title="Client Object API Reference">
 <link rel="prev" href="libnm-nm-errors.html" title="nm-errors">
 <link rel="next" href="ch03.html" title="Connection and Setting API Reference">
-<meta name="generator" content="GTK-Doc V1.29.1 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.29 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -3338,6 +3338,6 @@ VPN plugin authentication dialogs.</p>
 </div>
 </div>
 <div class="footer">
-<hr>Generated by GTK-Doc V1.29.1</div>
+<hr>Generated by GTK-Doc V1.29</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm/html/libnm-nm-device-6lowpan.html b/docs/libnm/html/libnm-nm-device-6lowpan.html
index 2839dd8c..35c52a09 100644
--- a/docs/libnm/html/libnm-nm-device-6lowpan.html
+++ b/docs/libnm/html/libnm-nm-device-6lowpan.html
@@ -8,7 +8,7 @@
 <link rel="up" href="ch04.html" title="Device and Runtime Configuration API Reference">
 <link rel="prev" href="NMDevice.html" title="NMDevice">
 <link rel="next" href="NMDeviceAdsl.html" title="NMDeviceAdsl">
-<meta name="generator" content="GTK-Doc V1.29.1 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.29 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -152,6 +152,6 @@ device, and must not be modified.</p>
 </div>
 </div>
 <div class="footer">
-<hr>Generated by GTK-Doc V1.29.1</div>
+<hr>Generated by GTK-Doc V1.29</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm/html/libnm-nm-device-wpan.html b/docs/libnm/html/libnm-nm-device-wpan.html
index 824848c6..650ef4ec 100644
--- a/docs/libnm/html/libnm-nm-device-wpan.html
+++ b/docs/libnm/html/libnm-nm-device-wpan.html
@@ -8,7 +8,7 @@
 <link rel="up" href="ch04.html" title="Device and Runtime Configuration API Reference">
 <link rel="prev" href="NMDeviceWireGuard.html" title="NMDeviceWireGuard">
 <link rel="next" href="NMActiveConnection.html" title="NMActiveConnection">
-<meta name="generator" content="GTK-Doc V1.29.1 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.29 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -102,6 +102,6 @@ device, and must not be modified.</p>
 </div>
 </div>
 <div class="footer">
-<hr>Generated by GTK-Doc V1.29.1</div>
+<hr>Generated by GTK-Doc V1.29</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm/html/libnm-nm-errors.html b/docs/libnm/html/libnm-nm-errors.html
index 0e956b21..9e2f2d03 100644
--- a/docs/libnm/html/libnm-nm-errors.html
+++ b/docs/libnm/html/libnm-nm-errors.html
@@ -8,7 +8,7 @@
 <link rel="up" href="ch02.html" title="Client Object API Reference">
 <link rel="prev" href="NMObject.html" title="NMObject">
 <link rel="next" href="libnm-nm-dbus-interface.html" title="nm-dbus-interface">
-<meta name="generator" content="GTK-Doc V1.29.1 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.29 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -254,7 +254,7 @@ nm_vpn_plugin_error_quark (<em class="parameter"><code><span class="type">void</
 <a name="NMAgentManagerError"></a><h3>enum NMAgentManagerError</h3>
 <p>Errors returned from the secret-agent manager.</p>
 <p>These errors may be returned from operations that could cause secrets to be
-requested (such as <code class="function">nm_client_activate_connection()</code>), and correspond to D-Bus
+requested (such as <a href="/usr/share/gtk-doc/html/libnm-glib/NMClient.html#nm-client-activate-connection"><code class="function">nm_client_activate_connection()</code></a>), and correspond to D-Bus
 errors in the "org.freedesktop.NetworkManager.AgentManager" namespace.</p>
 <div class="refsect3">
 <a name="NMAgentManagerError.members"></a><h4>Members</h4>
@@ -730,7 +730,7 @@ errors in that namespace.</p>
 when they encounter problems retrieving secrets on behalf of NM. They
 correspond to errors in the "org.freedesktop.NetworkManager.SecretManager"
 namespace.</p>
-<p>Client APIs such as <code class="function">nm_client_activate_connection()</code> will not see these error
+<p>Client APIs such as <a href="/usr/share/gtk-doc/html/libnm-glib/NMClient.html#nm-client-activate-connection"><code class="function">nm_client_activate_connection()</code></a> will not see these error
 codes; instead, the secret agent manager will translate them to the
 corresponding <a class="link" href="libnm-nm-errors.html#NMAgentManagerError" title="enum NMAgentManagerError"><span class="type">NMAgentManagerError</span></a> codes.</p>
 <div class="refsect3">
@@ -991,6 +991,6 @@ to errors in the "org.freedesktop.NetworkManager.VPN.Error" namespace.</p>
 </div>
 </div>
 <div class="footer">
-<hr>Generated by GTK-Doc V1.29.1</div>
+<hr>Generated by GTK-Doc V1.29</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm/html/libnm-nm-utils.html b/docs/libnm/html/libnm-nm-utils.html
index e07cae87..70a83944 100644
--- a/docs/libnm/html/libnm-nm-utils.html
+++ b/docs/libnm/html/libnm-nm-utils.html
@@ -8,7 +8,7 @@
 <link rel="up" href="ch05.html" title="Utility API Reference">
 <link rel="prev" href="ch05.html" title="Utility API Reference">
 <link rel="next" href="libnm-nm-version.html" title="nm-version">
-<meta name="generator" content="GTK-Doc V1.29.1 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.29 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -3472,6 +3472,6 @@ for both <a class="link" href="libnm-nm-utils.html#nm-utils-inet4-ntop" title="n
 </div>
 </div>
 <div class="footer">
-<hr>Generated by GTK-Doc V1.29.1</div>
+<hr>Generated by GTK-Doc V1.29</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm/html/libnm-nm-version.html b/docs/libnm/html/libnm-nm-version.html
index 5e06c5d7..bfeff4b5 100644
--- a/docs/libnm/html/libnm-nm-version.html
+++ b/docs/libnm/html/libnm-nm-version.html
@@ -8,7 +8,7 @@
 <link rel="up" href="ch05.html" title="Utility API Reference">
 <link rel="prev" href="libnm-nm-utils.html" title="nm-utils">
 <link rel="next" href="ch06.html" title="VPN Plugin API Reference">
-<meta name="generator" content="GTK-Doc V1.29.1 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.29 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -367,6 +367,6 @@
 </div>
 </div>
 <div class="footer">
-<hr>Generated by GTK-Doc V1.29.1</div>
+<hr>Generated by GTK-Doc V1.29</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm/html/libnm-nm-vpn-plugin-info.html b/docs/libnm/html/libnm-nm-vpn-plugin-info.html
index 22d65ff5..fe4f1a6c 100644
--- a/docs/libnm/html/libnm-nm-vpn-plugin-info.html
+++ b/docs/libnm/html/libnm-nm-vpn-plugin-info.html
@@ -8,7 +8,7 @@
 <link rel="up" href="ch06.html" title="VPN Plugin API Reference">
 <link rel="prev" href="libnm-nm-vpn-service-plugin.html" title="nm-vpn-service-plugin">
 <link rel="next" href="NMVpnEditor.html" title="NMVpnEditor">
-<meta name="generator" content="GTK-Doc V1.29.1 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.29 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -126,6 +126,6 @@
 </div>
 </div>
 <div class="footer">
-<hr>Generated by GTK-Doc V1.29.1</div>
+<hr>Generated by GTK-Doc V1.29</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm/html/libnm-nm-vpn-plugin-old.html b/docs/libnm/html/libnm-nm-vpn-plugin-old.html
index f0dc7b88..bf9d4584 100644
--- a/docs/libnm/html/libnm-nm-vpn-plugin-old.html
+++ b/docs/libnm/html/libnm-nm-vpn-plugin-old.html
@@ -8,7 +8,7 @@
 <link rel="up" href="ch06.html" title="VPN Plugin API Reference">
 <link rel="prev" href="NMVpnEditorPlugin.html" title="NMVpnEditorPlugin">
 <link rel="next" href="object-tree.html" title="Object Hierarchy">
-<meta name="generator" content="GTK-Doc V1.29.1 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.29 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -73,6 +73,6 @@
 </div>
 </div>
 <div class="footer">
-<hr>Generated by GTK-Doc V1.29.1</div>
+<hr>Generated by GTK-Doc V1.29</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm/html/libnm-nm-vpn-service-plugin.html b/docs/libnm/html/libnm-nm-vpn-service-plugin.html
index 836d8075..b427a6b8 100644
--- a/docs/libnm/html/libnm-nm-vpn-service-plugin.html
+++ b/docs/libnm/html/libnm-nm-vpn-service-plugin.html
@@ -8,7 +8,7 @@
 <link rel="up" href="ch06.html" title="VPN Plugin API Reference">
 <link rel="prev" href="ch06.html" title="VPN Plugin API Reference">
 <link rel="next" href="libnm-nm-vpn-plugin-info.html" title="nm-vpn-plugin-info">
-<meta name="generator" content="GTK-Doc V1.29.1 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.29 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -83,6 +83,6 @@
 </div>
 </div>
 <div class="footer">
-<hr>Generated by GTK-Doc V1.29.1</div>
+<hr>Generated by GTK-Doc V1.29</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm/html/object-tree.html b/docs/libnm/html/object-tree.html
index d863f8c7..d5d0d0c7 100644
--- a/docs/libnm/html/object-tree.html
+++ b/docs/libnm/html/object-tree.html
@@ -8,7 +8,7 @@
 <link rel="up" href="index.html" title="libnm Reference Manual">
 <link rel="prev" href="libnm-nm-vpn-plugin-old.html" title="nm-vpn-plugin-old">
 <link rel="next" href="api-index-full.html" title="API Index">
-<meta name="generator" content="GTK-Doc V1.29.1 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.29 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -204,6 +204,6 @@
 </pre>
 </div>
 <div class="footer">
-<hr>Generated by GTK-Doc V1.29.1</div>
+<hr>Generated by GTK-Doc V1.29</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm/html/ref-overview.html b/docs/libnm/html/ref-overview.html
index 0c083992..5bb7c4e5 100644
--- a/docs/libnm/html/ref-overview.html
+++ b/docs/libnm/html/ref-overview.html
@@ -8,7 +8,7 @@
 <link rel="up" href="index.html" title="libnm Reference Manual">
 <link rel="prev" href="index.html" title="libnm Reference Manual">
 <link rel="next" href="usage.html" title="Using libnm">
-<meta name="generator" content="GTK-Doc V1.29.1 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.29 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -62,6 +62,6 @@
 </div>
 </div>
 <div class="footer">
-<hr>Generated by GTK-Doc V1.29.1</div>
+<hr>Generated by GTK-Doc V1.29</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm/html/usage.html b/docs/libnm/html/usage.html
index 19b42b6f..452b8d12 100644
--- a/docs/libnm/html/usage.html
+++ b/docs/libnm/html/usage.html
@@ -8,7 +8,7 @@
 <link rel="up" href="ref-overview.html" title="Overview">
 <link rel="prev" href="ref-overview.html" title="Overview">
 <link rel="next" href="ch02.html" title="Client Object API Reference">
-<meta name="generator" content="GTK-Doc V1.29.1 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.29 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -96,7 +96,7 @@
         </p>
 <pre class="screen"><code class="prompt">$ </code><strong class="userinput"><code>cc $(pkg-config --libs --cflags libnm) -o hello-nm hello-nm.c</code></strong>
   <code class="prompt">$ </code><strong class="userinput"><code>./hello-nm</code></strong>
-  NetworkManager version: 1.14.4
+  NetworkManager version: 1.14.6
 
   <code class="prompt">$ </code></pre>
 <p>
@@ -161,6 +161,6 @@
 </div>
 </div>
 <div class="footer">
-<hr>Generated by GTK-Doc V1.29.1</div>
+<hr>Generated by GTK-Doc V1.29</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libnm/libnm-docs.xml b/docs/libnm/libnm-docs.xml
index a0f87bfb..8ff9676f 100644
--- a/docs/libnm/libnm-docs.xml
+++ b/docs/libnm/libnm-docs.xml
@@ -294,13 +294,6 @@ print ("NetworkManager version " + client.get_version())]]></programlisting></in
     <xi:include href="xml/nm-vpn-plugin-old.xml"/>
   </chapter>
 
-  <!--
-    These don't contain any useful documentaiton. Keep them here,
-    so that tools/check-docs.sh knows that we did omit them intentionally.
-    <xi:include href="xml/nm-core-enum-types.xml"/>
-    <xi:include href="xml/nm-enum-types.xml"/>
-  -->
-
   <chapter id="object-tree">
     <title>Object Hierarchy
      
diff --git a/docs/libnm/version.xml b/docs/libnm/version.xml
index 4e00d0ac..c6ba3bc1 100644
--- a/docs/libnm/version.xml
+++ b/docs/libnm/version.xml
@@ -1 +1 @@
-1.14.4
+1.14.6
diff --git a/docs/meson.build b/docs/meson.build
index 1fb21fb4..92e6d6e9 100644
--- a/docs/meson.build
+++ b/docs/meson.build
@@ -14,5 +14,5 @@ endif
 test(
   'check-docs',
   find_program(join_paths(meson.source_root(), 'tools', 'check-docs.sh')),
-  args: [meson.source_root()]
+  args: [meson.source_root(), meson.build_root()]
 )
diff --git a/examples/nm-conf.d/31-mac-addr-change.conf b/examples/nm-conf.d/31-mac-addr-change.conf
index 1ae2e0dc..554b698f 100644
--- a/examples/nm-conf.d/31-mac-addr-change.conf
+++ b/examples/nm-conf.d/31-mac-addr-change.conf
@@ -4,8 +4,13 @@
 # See man NetworkManager.conf
 #
 # https://bugzilla.gnome.org/show_bug.cgi?id=777523
-[device-mac-addr-change-wifi]
+[device-31-mac-addr-change]
 match-device=driver:rtl8723bs,driver:rtl8189es,driver:r8188eu,driver:eagle_sdio
 wifi.scan-rand-mac-address=no
+
+[connection-31-mac-addr-change]
+match-device=driver:rtl8723bs,driver:rtl8189es,driver:r8188eu,driver:eagle_sdio
+# these are per-profile properties. Here we overwrite the default
+# value, but explicitly configuring it in the profile takes precedence.
 wifi.cloned-mac-address=preserve
 ethernet.cloned-mac-address=preserve
diff --git a/libnm-core/nm-connection.c b/libnm-core/nm-connection.c
index 172f9c99..5f406cc6 100644
--- a/libnm-core/nm-connection.c
+++ b/libnm-core/nm-connection.c
@@ -1124,6 +1124,29 @@ _normalize_wireless_mac_address_randomization (NMConnection *self, GHashTable *p
 	return FALSE;
 }
 
+static gboolean
+_normalize_macsec (NMConnection *self, GHashTable *parameters)
+{
+	NMSettingMacsec *s_macsec = nm_connection_get_setting_macsec (self);
+	gboolean changed = FALSE;
+
+	if (!s_macsec)
+		return FALSE;
+
+	if (nm_setting_macsec_get_mode (s_macsec) != NM_SETTING_MACSEC_MODE_PSK) {
+		if (nm_setting_macsec_get_mka_cak (s_macsec)) {
+			g_object_set (s_macsec, NM_SETTING_MACSEC_MKA_CAK, NULL, NULL);
+			changed = TRUE;
+		}
+		if (nm_setting_macsec_get_mka_ckn (s_macsec)) {
+			g_object_set (s_macsec, NM_SETTING_MACSEC_MKA_CKN, NULL, NULL);
+			changed = TRUE;
+		}
+	}
+
+	return changed;
+}
+
 static gboolean
 _normalize_team_config (NMConnection *self, GHashTable *parameters)
 {
@@ -1564,6 +1587,7 @@ nm_connection_normalize (NMConnection *connection,
 	was_modified |= _normalize_bond_mode (connection, parameters);
 	was_modified |= _normalize_bond_options (connection, parameters);
 	was_modified |= _normalize_wireless_mac_address_randomization (connection, parameters);
+	was_modified |= _normalize_macsec (connection, parameters);
 	was_modified |= _normalize_team_config (connection, parameters);
 	was_modified |= _normalize_team_port_config (connection, parameters);
 	was_modified |= _normalize_bluetooth_type (connection, parameters);
diff --git a/libnm-core/nm-connection.h b/libnm-core/nm-connection.h
index 802f68ba..b6e00977 100644
--- a/libnm-core/nm-connection.h
+++ b/libnm-core/nm-connection.h
@@ -121,6 +121,8 @@ typedef enum { /*< flags >*/
 	NM_CONNECTION_SERIALIZE_ALL = 0x00000000,
 	NM_CONNECTION_SERIALIZE_NO_SECRETS = 0x00000001,
 	NM_CONNECTION_SERIALIZE_ONLY_SECRETS = 0x00000002,
+
+	/* 0x80000000 is used for a private flag */
 } NMConnectionSerializationFlags;
 
 GVariant     *nm_connection_to_dbus       (NMConnection *connection,
diff --git a/libnm-core/nm-core-internal.h b/libnm-core/nm-core-internal.h
index f0d4e40f..9d2d0f2c 100644
--- a/libnm-core/nm-core-internal.h
+++ b/libnm-core/nm-core-internal.h
@@ -101,6 +101,11 @@
 #define NM_BR_MIN_AGEING_TIME   0
 #define NM_BR_MAX_AGEING_TIME   1000000
 
+#define NM_BR_PORT_MAX_PRIORITY 63
+#define NM_BR_PORT_DEF_PRIORITY 32
+
+#define NM_BR_PORT_MAX_PATH_COST 65535
+
 /* NM_SETTING_COMPARE_FLAG_INFERRABLE: check whether a device-generated
  * connection can be replaced by a already-defined connection. This flag only
  * takes into account properties marked with the %NM_SETTING_PARAM_INFERRABLE
@@ -174,6 +179,13 @@ NMSettingPriority _nm_setting_get_setting_priority (NMSetting *setting);
 
 gboolean _nm_setting_get_property (NMSetting *setting, const char *name, GValue *value);
 
+/* NM_CONNECTION_SERIALIZE_NO_SYNTH: This flag is passed to _nm_setting_to_dbus()
+ * by nm_setting_to_string() to let it know that it shouldn't serialize the
+ * synthetic properties. It wouldn't be able to do so, since the full connection
+ * is not available, only the setting alone.
+ */
+#define NM_CONNECTION_SERIALIZE_NO_SYNTH ((NMConnectionSerializationFlags) 0x80000000)
+
 /*****************************************************************************/
 
 GHashTable *_nm_setting_gendata_hash (NMSetting *setting,
@@ -212,15 +224,26 @@ guint nm_setting_ethtool_init_features (NMSettingEthtool *setting,
 guint8 *_nm_utils_hwaddr_aton (const char *asc, gpointer buffer, gsize buffer_length, gsize *out_length);
 const char *nm_utils_hwaddr_ntoa_buf (gconstpointer addr, gsize addr_len, gboolean upper_case, char *buf, gsize buf_len);
 
-char *_nm_utils_bin2str (gconstpointer addr, gsize length, gboolean upper_case);
-void _nm_utils_bin2str_full (gconstpointer addr, gsize length, const char delimiter, gboolean upper_case, char *out);
+char *_nm_utils_bin2hexstr_full (gconstpointer addr, gsize length, const char delimiter, gboolean upper_case, char *out);
+
+guint8 *_nm_utils_hexstr2bin_full (const char *hexstr,
+                                   gboolean allow_0x_prefix,
+                                   gboolean delimiter_required,
+                                   const char *delimiter_candidates,
+                                   gsize required_len,
+                                   guint8 *buffer,
+                                   gsize buffer_len,
+                                   gsize *out_len);
+
+#define _nm_utils_hexstr2bin_buf(hexstr, allow_0x_prefix, delimiter_required, delimiter_candidates, buffer) \
+    _nm_utils_hexstr2bin_full ((hexstr), (allow_0x_prefix), (delimiter_required), (delimiter_candidates), G_N_ELEMENTS (buffer), (buffer), G_N_ELEMENTS (buffer), NULL)
 
-guint8 *_nm_utils_str2bin_full (const char *asc,
-                                gboolean delimiter_required,
-                                const char *delimiter_candidates,
-                                guint8 *buffer,
-                                gsize buffer_length,
-                                gsize *out_len);
+guint8 *_nm_utils_hexstr2bin_alloc (const char *hexstr,
+                                    gboolean allow_0x_prefix,
+                                    gboolean delimiter_required,
+                                    const char *delimiter_candidates,
+                                    gsize required_len,
+                                    gsize *out_len);
 
 GSList *    _nm_utils_hash_values_to_slist (GHashTable *hash);
 
@@ -234,7 +257,7 @@ gboolean _nm_ip_route_attribute_validate_all (const NMIPRoute *route);
 const char **_nm_ip_route_get_attribute_names (const NMIPRoute *route, gboolean sorted, guint *out_length);
 GHashTable *_nm_ip_route_get_attributes_direct (NMIPRoute *route);
 
-NMSriovVF *_nm_utils_sriov_vf_from_strparts (const char *index, const char *detail, GError **error);
+NMSriovVF *_nm_utils_sriov_vf_from_strparts (const char *index, const char *detail, gboolean ignore_unknown, GError **error);
 gboolean _nm_sriov_vf_attribute_validate_all (const NMSriovVF *vf, GError **error);
 
 static inline void
@@ -272,8 +295,25 @@ gboolean _nm_utils_check_module_file (const char *name,
                                       gpointer user_data,
                                       GError **error);
 
+/*****************************************************************************/
+
+typedef struct _NMUuid {
+	guchar uuid[16];
+} NMUuid;
+
+NMUuid *_nm_utils_uuid_parse (const char *str,
+                              NMUuid *uuid);
+char *_nm_utils_uuid_unparse (const NMUuid *uuid,
+                              char *out_str /*[37]*/);
+NMUuid *_nm_utils_uuid_generate_random (NMUuid *out_uuid);
+
+gboolean nm_utils_uuid_is_null (const NMUuid *uuid);
+
 #define NM_UTILS_UUID_TYPE_LEGACY            0
-#define NM_UTILS_UUID_TYPE_VARIANT3          1
+#define NM_UTILS_UUID_TYPE_VERSION3          3
+#define NM_UTILS_UUID_TYPE_VERSION5          5
+
+NMUuid *nm_utils_uuid_generate_from_string_bin (NMUuid *uuid, const char *s, gssize slen, int uuid_type, gpointer type_args);
 
 char *nm_utils_uuid_generate_from_string (const char *s, gssize slen, int uuid_type, gpointer type_args);
 
diff --git a/libnm-core/nm-crypto.c b/libnm-core/nm-crypto.c
index dc8f1c15..1af2ea28 100644
--- a/libnm-core/nm-crypto.c
+++ b/libnm-core/nm-crypto.c
@@ -879,13 +879,10 @@ nm_crypto_md5_hash (const guint8 *salt,
                     gsize buflen)
 {
 	nm_auto_free_checksum GChecksum *ctx = NULL;
-#define MD5_DIGEST_LEN 16
-	nm_auto_clear_static_secret_ptr const NMSecretPtr digest = NM_SECRET_PTR_STATIC (MD5_DIGEST_LEN);
+	nm_auto_clear_static_secret_ptr const NMSecretPtr digest = NM_SECRET_PTR_STATIC (NM_UTILS_CHECKSUM_LENGTH_MD5);
 	gsize bufidx = 0;
 	int i;
 
-	nm_assert (g_checksum_type_get_length (G_CHECKSUM_MD5) == MD5_DIGEST_LEN);
-
 	g_return_if_fail (password_len == 0 || password);
 	g_return_if_fail (buffer);
 	g_return_if_fail (buflen > 0);
@@ -894,25 +891,21 @@ nm_crypto_md5_hash (const guint8 *salt,
 	ctx = g_checksum_new (G_CHECKSUM_MD5);
 
 	for (;;) {
-		gsize digest_len;
-
 		if (password_len > 0)
 			g_checksum_update (ctx, (const guchar *) password, password_len);
 		if (salt_len > 0)
 			g_checksum_update (ctx, (const guchar *) salt, salt_len);
 
-		digest_len = MD5_DIGEST_LEN;
-		g_checksum_get_digest (ctx, digest.bin, &digest_len);
-		nm_assert (digest_len == MD5_DIGEST_LEN);
+		nm_utils_checksum_get_digest_len (ctx, digest.bin, NM_UTILS_CHECKSUM_LENGTH_MD5);
 
-		for (i = 0; i < MD5_DIGEST_LEN; i++) {
+		for (i = 0; i < NM_UTILS_CHECKSUM_LENGTH_MD5; i++) {
 			if (bufidx >= buflen)
 				return;
 			buffer[bufidx++] = digest.bin[i];
 		}
 
 		g_checksum_reset (ctx);
-		g_checksum_update (ctx, digest.ptr, MD5_DIGEST_LEN);
+		g_checksum_update (ctx, digest.ptr, NM_UTILS_CHECKSUM_LENGTH_MD5);
 	}
 }
 
diff --git a/libnm-core/nm-keyfile.c b/libnm-core/nm-keyfile.c
index e4ed1899..5aa8a4ac 100644
--- a/libnm-core/nm-keyfile.c
+++ b/libnm-core/nm-keyfile.c
@@ -152,7 +152,7 @@ sriov_vfs_parser (KeyfileReaderInfo *info, NMSetting *setting, const char *key)
 		                                         keys[i],
 		                                         NULL);
 
-		vf = _nm_utils_sriov_vf_from_strparts (rest, value, NULL);
+		vf = _nm_utils_sriov_vf_from_strparts (rest, value, TRUE, NULL);
 		if (vf)
 			g_ptr_array_add (vfs, vf);
 	}
diff --git a/libnm-core/nm-setting-bridge-port.c b/libnm-core/nm-setting-bridge-port.c
index 4104f8c5..bc9c3e6f 100644
--- a/libnm-core/nm-setting-bridge-port.c
+++ b/libnm-core/nm-setting-bridge-port.c
@@ -104,12 +104,6 @@ nm_setting_bridge_port_get_hairpin_mode (NMSettingBridgePort *setting)
 
 /*****************************************************************************/
 
-#define BR_MAX_PORT_PRIORITY 63
-#define BR_DEF_PRIORITY      32
-
-#define BR_MIN_PATH_COST     1
-#define BR_MAX_PATH_COST     65535
-
 static gboolean
 verify (NMSetting *setting, NMConnection *connection, GError **error)
 {
@@ -238,7 +232,7 @@ nm_setting_bridge_port_class_init (NMSettingBridgePortClass *klass)
 	g_object_class_install_property
 		(object_class, PROP_PRIORITY,
 		 g_param_spec_uint (NM_SETTING_BRIDGE_PORT_PRIORITY, "", "",
-		                    0, BR_MAX_PORT_PRIORITY, BR_DEF_PRIORITY,
+		                    0, NM_BR_PORT_MAX_PRIORITY, NM_BR_PORT_DEF_PRIORITY,
 		                    G_PARAM_READWRITE |
 		                    G_PARAM_CONSTRUCT |
 		                    NM_SETTING_PARAM_INFERRABLE |
@@ -261,10 +255,9 @@ nm_setting_bridge_port_class_init (NMSettingBridgePortClass *klass)
 	g_object_class_install_property
 		(object_class, PROP_PATH_COST,
 		 g_param_spec_uint (NM_SETTING_BRIDGE_PORT_PATH_COST, "", "",
-		                    0, BR_MAX_PATH_COST, 100,
+		                    0, NM_BR_PORT_MAX_PATH_COST, 100,
 		                    G_PARAM_READWRITE |
 		                    G_PARAM_CONSTRUCT |
-		                    NM_SETTING_PARAM_INFERRABLE |
 		                    G_PARAM_STATIC_STRINGS));
 
 	/**
diff --git a/libnm-core/nm-setting-connection.c b/libnm-core/nm-setting-connection.c
index 50240bc9..44021b9c 100644
--- a/libnm-core/nm-setting-connection.c
+++ b/libnm-core/nm-setting-connection.c
@@ -1626,11 +1626,11 @@ nm_setting_connection_class_init (NMSettingConnectionClass *klass)
 	 * name is included, so that different interfaces yield different addresses.
 	 *
 	 * The '$' character is treated special to perform dynamic substitutions
-	 * at runtime. Currently supported are "${CONNECTION}", "${DEVICE}",
+	 * 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 the the interface name of the
-	 * device.
+	 * 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 "$$".
diff --git a/libnm-core/nm-setting-ip4-config.c b/libnm-core/nm-setting-ip4-config.c
index 19f1cc8d..36765484 100644
--- a/libnm-core/nm-setting-ip4-config.c
+++ b/libnm-core/nm-setting-ip4-config.c
@@ -721,11 +721,16 @@ nm_setting_ip4_config_class_init (NMSettingIP4ConfigClass *klass)
 	 * with type ethernet (01). Currently, these options only work for ethernet
 	 * type of links.
 	 *
+	 * The special value "duid" generates a RFC4361-compliant client identifier based
+	 * on a hash of the interface name as IAID and /etc/machine-id.
+	 *
 	 * The special value "stable" is supported to generate a type 0 client identifier based
-	 * on the stable-id (see connection.stable-id) and a per-host key.
+	 * on the stable-id (see connection.stable-id) and a per-host key. If you set the
+	 * stable-id, you may want to include the "${DEVICE}" or "${MAC}" specifier to get a
+	 * per-device key.
 	 *
-	 * If unset, a globally configured default is used. If still unset, the
-	 * client-id from the last lease is reused.
+	 * If unset, a globally configured default is used. If still unset, the default
+	 * depends on the DHCP plugin.
 	 **/
 	/* ---ifcfg-rh---
 	 * property: dhcp-client-id
diff --git a/libnm-core/nm-setting-ip6-config.c b/libnm-core/nm-setting-ip6-config.c
index a55fd801..fa65be91 100644
--- a/libnm-core/nm-setting-ip6-config.c
+++ b/libnm-core/nm-setting-ip6-config.c
@@ -852,7 +852,8 @@ nm_setting_ip6_config_class_init (NMSettingIP6ConfigClass *klass)
 	 *
 	 * The special values "stable-llt", "stable-ll" and "stable-uuid" will generate
 	 * a DUID of the corresponding type, derived from the connection's stable-id and
-	 * a per-host unique key.
+	 * a per-host unique key. You may want to include the "${DEVICE}" or "${MAC}" specifier
+	 * in the stable-id, in case this profile gets activated on multiple devices.
 	 * So, the link-layer address of "stable-ll" and "stable-llt" will be a generated
 	 * address derived from the stable id. The DUID-LLT time value in the "stable-llt"
 	 * option will be picked among a static timespan of three years (the upper bound
diff --git a/libnm-core/nm-setting-macsec.c b/libnm-core/nm-setting-macsec.c
index 2c7cff23..5c468221 100644
--- a/libnm-core/nm-setting-macsec.c
+++ b/libnm-core/nm-setting-macsec.c
@@ -243,6 +243,12 @@ verify_macsec_key (const char *key, gboolean cak, GError **error)
 {
 	int req_len;
 
+	/* CAK is a connection secret and can be NULL for various
+	 * reasons (agent-owned, no permissions to get secrets, etc.)
+	 */
+	if (cak && !key)
+		return TRUE;
+
 	if (!key || !key[0]) {
 		g_set_error_literal (error,
 		                     NM_CONNECTION_ERROR,
@@ -254,7 +260,7 @@ verify_macsec_key (const char *key, gboolean cak, GError **error)
 	req_len = cak ?
 	    NM_SETTING_MACSEC_MKA_CAK_LENGTH :
 	    NM_SETTING_MACSEC_MKA_CKN_LENGTH;
-	if (strlen (key) != req_len) {
+	if (strlen (key) != (gsize) req_len) {
 		g_set_error (error,
 		             NM_CONNECTION_ERROR,
 		             NM_CONNECTION_ERROR_INVALID_PROPERTY,
@@ -340,6 +346,10 @@ verify (NMSetting *setting, NMConnection *connection, GError **error)
 			g_prefix_error (error, "%s.%s: ", NM_SETTING_MACSEC_SETTING_NAME, NM_SETTING_MACSEC_MKA_CKN);
 			return FALSE;
 		}
+		if (!verify_macsec_key (priv->mka_cak, TRUE, error)) {
+			g_prefix_error (error, "%s.%s: ", NM_SETTING_MACSEC_SETTING_NAME, NM_SETTING_MACSEC_MKA_CAK);
+			return FALSE;
+		}
 	} else if (priv->mode == NM_SETTING_MACSEC_MODE_EAP) {
 		if (!s_8021x) {
 			g_set_error (error,
@@ -350,6 +360,13 @@ verify (NMSetting *setting, NMConnection *connection, GError **error)
 			g_prefix_error (error, "%s: ", NM_SETTING_MACSEC_SETTING_NAME);
 			return FALSE;
 		}
+	} else {
+		g_set_error_literal (error,
+		                     NM_CONNECTION_ERROR,
+		                     NM_CONNECTION_ERROR_INVALID_PROPERTY,
+		                     _("must be either psk (0) or eap (1)"));
+		g_prefix_error (error, "%s.%s: ", NM_SETTING_MACSEC_SETTING_NAME, NM_SETTING_MACSEC_MODE);
+		return FALSE;
 	}
 
 	if (priv->port <= 0 || priv->port > 65534) {
@@ -362,6 +379,17 @@ verify (NMSetting *setting, NMConnection *connection, GError **error)
 		return FALSE;
 	}
 
+	if (   priv->mode != NM_SETTING_MACSEC_MODE_PSK
+	    && (priv->mka_cak || priv->mka_ckn)) {
+		g_set_error_literal (error,
+		                     NM_CONNECTION_ERROR,
+		                     NM_CONNECTION_ERROR_INVALID_PROPERTY,
+		                     _("only valid for psk mode"));
+		g_prefix_error (error, "%s.%s: ", NM_SETTING_MACSEC_SETTING_NAME,
+		                priv->mka_cak ? NM_SETTING_MACSEC_MKA_CAK : NM_SETTING_MACSEC_MKA_CKN);
+		return NM_SETTING_VERIFY_NORMALIZABLE;
+	}
+
 	return TRUE;
 }
 
diff --git a/libnm-core/nm-setting-sriov.c b/libnm-core/nm-setting-sriov.c
index 7228fb0c..0addd972 100644
--- a/libnm-core/nm-setting-sriov.c
+++ b/libnm-core/nm-setting-sriov.c
@@ -1248,6 +1248,11 @@ nm_setting_sriov_class_init (NMSettingSriovClass *klass)
 	 *
 	 * The total number of virtual functions to create.
 	 *
+	 * Note that when the sriov setting is present NetworkManager
+	 * enforces the number of virtual functions on the interface
+	 * also when it is zero. To prevent any changes to SR-IOV
+	 * parameters don't add a sriov setting to the connection.
+	 *
 	 * Since: 1.14
 	 **/
 	/* ---ifcfg-rh---
@@ -1283,7 +1288,11 @@ nm_setting_sriov_class_init (NMSettingSriovClass *klass)
 	 *
 	 *   "2 mac=00:11:22:33:44:55 spoof-check=true".
 	 *
-	 * The "vlans" attribute is represented as a semicolor-separated
+	 * Multiple VFs can be specified using a comma as separator.
+	 * Currently the following attributes are supported: mac,
+	 * spoof-check, trust, min-tx-rate, max-tx-rate, vlans.
+	 *
+	 * The "vlans" attribute is represented as a semicolon-separated
 	 * list of VLAN descriptors, where each descriptor has the form
 	 *
 	 *   "ID[.PRIORITY[.PROTO]]".
@@ -1291,6 +1300,7 @@ nm_setting_sriov_class_init (NMSettingSriovClass *klass)
 	 * PROTO can be either 'q' for 802.1Q (the default) or 'ad' for
 	 * 802.1ad.
 	 *
+
 	 * Since: 1.14
 	 **/
 	/* ---ifcfg-rh---
diff --git a/libnm-core/nm-setting.c b/libnm-core/nm-setting.c
index 6b9681b5..047391ce 100644
--- a/libnm-core/nm-setting.c
+++ b/libnm-core/nm-setting.c
@@ -685,10 +685,15 @@ _nm_setting_to_dbus (NMSetting *setting, NMConnection *connection, NMConnectionS
 				continue;
 		}
 
-		if (property->synth_func)
-			dbus_value = property->synth_func (setting, connection, property->name);
-		else
+		if (property->synth_func) {
+			if (!(flags & NM_CONNECTION_SERIALIZE_NO_SYNTH))
+				dbus_value = property->synth_func (setting, connection, property->name);
+			else
+				dbus_value = NULL;
+		} else {
 			dbus_value = get_property_for_dbus (setting, property, TRUE);
+		}
+
 		if (dbus_value) {
 			/* Allow dbus_value to be either floating or not. */
 			g_variant_take_ref (dbus_value);
@@ -2013,7 +2018,8 @@ nm_setting_to_string (NMSetting *setting)
 	string = g_string_new (nm_setting_get_name (setting));
 	g_string_append_c (string, '\n');
 
-	variant = _nm_setting_to_dbus (setting, NULL, NM_CONNECTION_SERIALIZE_ALL);
+	variant = _nm_setting_to_dbus (setting, NULL,   NM_CONNECTION_SERIALIZE_ALL
+	                                              | NM_CONNECTION_SERIALIZE_NO_SYNTH);
 
 	g_variant_iter_init (&iter, variant);
 	while ((child = g_variant_iter_next_value (&iter))) {
diff --git a/libnm-core/nm-utils.c b/libnm-core/nm-utils.c
index 0f524e11..f75276c7 100644
--- a/libnm-core/nm-utils.c
+++ b/libnm-core/nm-utils.c
@@ -2737,11 +2737,14 @@ nm_utils_sriov_vf_from_str (const char *str, GError **error)
 		detail++;
 	}
 
-	return _nm_utils_sriov_vf_from_strparts (str, detail, error);
+	return _nm_utils_sriov_vf_from_strparts (str, detail, FALSE, error);
 }
 
 NMSriovVF *
-_nm_utils_sriov_vf_from_strparts (const char *index, const char *detail, GError **error)
+_nm_utils_sriov_vf_from_strparts (const char *index,
+                                  const char *detail,
+                                  gboolean ignore_unknown,
+                                  GError **error)
 {
 	NMSriovVF *vf;
 	guint32 n_index;
@@ -2761,7 +2764,12 @@ _nm_utils_sriov_vf_from_strparts (const char *index, const char *detail, GError
 
 	vf = nm_sriov_vf_new (n_index);
 	if (detail) {
-		ht = nm_utils_parse_variant_attributes (detail, ' ', '=', TRUE, _nm_sriov_vf_attribute_spec, error);
+		ht = nm_utils_parse_variant_attributes (detail,
+		                                        ' ',
+		                                        '=',
+		                                        ignore_unknown,
+		                                        _nm_sriov_vf_attribute_spec,
+		                                        error);
 		if (!ht) {
 			nm_sriov_vf_unref (vf);
 			return NULL;
@@ -2785,6 +2793,57 @@ _nm_utils_sriov_vf_from_strparts (const char *index, const char *detail, GError
 
 /*****************************************************************************/
 
+NMUuid *
+_nm_utils_uuid_parse (const char *str,
+                      NMUuid *out_uuid)
+{
+	nm_assert (str);
+	nm_assert (out_uuid);
+
+	if (uuid_parse (str, out_uuid->uuid) != 0)
+		return NULL;
+	return out_uuid;
+}
+
+char *
+_nm_utils_uuid_unparse (const NMUuid *uuid,
+                        char *out_str /*[37]*/)
+{
+	nm_assert (uuid);
+
+	if (!out_str) {
+		/* for convenience, allow %NULL to indicate that a new
+		 * string should be allocated. */
+		out_str = g_malloc (37);
+	}
+	uuid_unparse_lower (uuid->uuid, out_str);
+	return out_str;
+}
+
+NMUuid *
+_nm_utils_uuid_generate_random (NMUuid *out_uuid)
+{
+	nm_assert (out_uuid);
+
+	uuid_generate_random (out_uuid->uuid);
+	return out_uuid;
+}
+
+gboolean
+nm_utils_uuid_is_null (const NMUuid *uuid)
+{
+	int i;
+
+	if (!uuid)
+		return TRUE;
+
+	for (i = 0; i < G_N_ELEMENTS (uuid->uuid); i++) {
+		if (uuid->uuid[i])
+			return FALSE;
+	}
+	return TRUE;
+}
+
 /**
  * nm_utils_uuid_generate_buf_:
  * @buf: input buffer, must contain at least 37 bytes
@@ -2794,11 +2853,12 @@ _nm_utils_sriov_vf_from_strparts (const char *index, const char *detail, GError
 char *
 nm_utils_uuid_generate_buf_ (char *buf)
 {
-	uuid_t uuid;
+	NMUuid uuid;
+
+	nm_assert (buf);
 
-	uuid_generate_random (uuid);
-	uuid_unparse_lower (uuid, buf);
-	return buf;
+	_nm_utils_uuid_generate_random (&uuid);
+	return _nm_utils_uuid_unparse (&uuid, buf);
 }
 
 /**
@@ -2814,7 +2874,9 @@ nm_utils_uuid_generate (void)
 }
 
 /**
- * nm_utils_uuid_generate_from_string:
+ * nm_utils_uuid_generate_from_string_bin:
+ * @uuid: the UUID to update inplace. This function cannot
+ *   fail to succeed.
  * @s: a string to use as the seed for the UUID
  * @slen: if negative, treat @s as zero terminated C string.
  *   Otherwise, assume the length as given (and allow @s to be
@@ -2824,60 +2886,92 @@ nm_utils_uuid_generate (void)
  *
  * For a given @s, this function will always return the same UUID.
  *
- * Returns: a newly allocated UUID suitable for use as the #NMSettingConnection
- * object's #NMSettingConnection:id: property
+ * Returns: the input @uuid. This function cannot fail.
  **/
-char *
-nm_utils_uuid_generate_from_string (const char *s, gssize slen, int uuid_type, gpointer type_args)
+NMUuid *
+nm_utils_uuid_generate_from_string_bin (NMUuid *uuid, const char *s, gssize slen, int uuid_type, gpointer type_args)
 {
-	uuid_t uuid;
-	char *buf;
-
+	g_return_val_if_fail (uuid, FALSE);
 	g_return_val_if_fail (slen == 0 || s, FALSE);
 
-	g_return_val_if_fail (uuid_type == NM_UTILS_UUID_TYPE_LEGACY || uuid_type == NM_UTILS_UUID_TYPE_VARIANT3, NULL);
-	g_return_val_if_fail (!type_args || uuid_type == NM_UTILS_UUID_TYPE_VARIANT3, NULL);
-
 	if (slen < 0)
 		slen = s ? strlen (s) : 0;
 
 	switch (uuid_type) {
 	case NM_UTILS_UUID_TYPE_LEGACY:
+		g_return_val_if_fail (!type_args, NULL);
 		nm_crypto_md5_hash (NULL,
 		                    0,
 		                    (guint8 *) s,
 		                    slen,
 		                    (guint8 *) uuid,
-		                    sizeof (uuid));
+		                    sizeof (*uuid));
 		break;
-	case NM_UTILS_UUID_TYPE_VARIANT3: {
-		uuid_t ns_uuid = { 0 };
+	case NM_UTILS_UUID_TYPE_VERSION3:
+	case NM_UTILS_UUID_TYPE_VERSION5: {
+		NMUuid ns_uuid = { 0 };
 
 		if (type_args) {
 			/* type_args can be a name space UUID. Interpret it as (char *) */
-			if (uuid_parse ((char *) type_args, ns_uuid) != 0)
+			if (!_nm_utils_uuid_parse (type_args, &ns_uuid))
 				g_return_val_if_reached (NULL);
 		}
 
-		nm_crypto_md5_hash ((guint8 *) s,
-		                    slen,
-		                    (guint8 *) ns_uuid,
-		                    sizeof (ns_uuid),
-		                    (guint8 *) uuid,
-		                    sizeof (uuid));
+		if (uuid_type == NM_UTILS_UUID_TYPE_VERSION3) {
+			nm_crypto_md5_hash ((guint8 *) s,
+			                    slen,
+			                    (guint8 *) &ns_uuid,
+			                    sizeof (ns_uuid),
+			                    (guint8 *) uuid,
+			                    sizeof (*uuid));
+		} else {
+			nm_auto_free_checksum GChecksum *sum = NULL;
+			union {
+				guint8 sha1[NM_UTILS_CHECKSUM_LENGTH_SHA1];
+				NMUuid uuid;
+			} digest;
+
+			sum = g_checksum_new (G_CHECKSUM_SHA1);
+			g_checksum_update (sum, (guchar *) &ns_uuid, sizeof (ns_uuid));
+			g_checksum_update (sum, (guchar *) s, slen);
+			nm_utils_checksum_get_digest (sum, digest.sha1);
+
+			G_STATIC_ASSERT_EXPR (sizeof (digest.sha1) > sizeof (digest.uuid));
+			*uuid = digest.uuid;
+		}
 
-		uuid[6] = (uuid[6] & 0x0F) | 0x30;
-		uuid[8] = (uuid[8] & 0x3F) | 0x80;
+		uuid->uuid[6] = (uuid->uuid[6] & 0x0F) | (uuid_type << 4);
+		uuid->uuid[8] = (uuid->uuid[8] & 0x3F) | 0x80;
 		break;
 	}
 	default:
 		g_return_val_if_reached (NULL);
 	}
 
-	buf = g_malloc (37);
-	uuid_unparse_lower (uuid, &buf[0]);
+	return uuid;
+}
 
-	return buf;
+/**
+ * nm_utils_uuid_generate_from_string:
+ * @s: a string to use as the seed for the UUID
+ * @slen: if negative, treat @s as zero terminated C string.
+ *   Otherwise, assume the length as given (and allow @s to be
+ *   non-null terminated or contain '\0').
+ * @uuid_type: a type identifier which UUID format to generate.
+ * @type_args: additional arguments, depending on the uuid_type
+ *
+ * For a given @s, this function will always return the same UUID.
+ *
+ * Returns: a newly allocated UUID suitable for use as the #NMSettingConnection
+ * object's #NMSettingConnection:id: property
+ **/
+char *
+nm_utils_uuid_generate_from_string (const char *s, gssize slen, int uuid_type, gpointer type_args)
+{
+	NMUuid uuid;
+
+	nm_utils_uuid_generate_from_string_bin (&uuid, s, slen, uuid_type, type_args);
+	return _nm_utils_uuid_unparse (&uuid, NULL);
 }
 
 /**
@@ -2902,7 +2996,7 @@ _nm_utils_uuid_generate_from_strings (const char *string1, ...)
 	char *uuid;
 
 	if (!string1)
-		return nm_utils_uuid_generate_from_string (NULL, 0, NM_UTILS_UUID_TYPE_VARIANT3, NM_UTILS_UUID_NS);
+		return nm_utils_uuid_generate_from_string (NULL, 0, NM_UTILS_UUID_TYPE_VERSION3, NM_UTILS_UUID_NS);
 
 	str = g_string_sized_new (120); /* effectively allocates power of 2 (128)*/
 
@@ -2916,7 +3010,7 @@ _nm_utils_uuid_generate_from_strings (const char *string1, ...)
 	}
 	va_end (args);
 
-	uuid = nm_utils_uuid_generate_from_string (str->str, str->len, NM_UTILS_UUID_TYPE_VARIANT3, NM_UTILS_UUID_NS);
+	uuid = nm_utils_uuid_generate_from_string (str->str, str->len, NM_UTILS_UUID_TYPE_VERSION3, NM_UTILS_UUID_NS);
 
 	g_string_free (str, TRUE);
 	return uuid;
@@ -3527,60 +3621,68 @@ nm_utils_hwaddr_len (int type)
 }
 
 guint8 *
-_nm_utils_str2bin_full (const char *asc,
-                        gboolean delimiter_required,
-                        const char *delimiter_candidates,
-                        guint8 *buffer,
-                        gsize buffer_length,
-                        gsize *out_len)
-{
-	const char *in = asc;
+_nm_utils_hexstr2bin_full (const char *hexstr,
+                           gboolean allow_0x_prefix,
+                           gboolean delimiter_required,
+                           const char *delimiter_candidates,
+                           gsize required_len,
+                           guint8 *buffer,
+                           gsize buffer_len,
+                           gsize *out_len)
+{
+	const char *in = hexstr;
 	guint8 *out = buffer;
 	gboolean delimiter_has = TRUE;
 	guint8 delimiter = '\0';
+	gsize len;
 
-	nm_assert (asc);
+	nm_assert (hexstr);
 	nm_assert (buffer);
-	nm_assert (buffer_length);
-	nm_assert (out_len);
+	nm_assert (required_len > 0 || out_len);
+
+	if (   allow_0x_prefix
+	    && in[0] == '0'
+	    && in[1] == 'x')
+		in += 2;
 
 	while (TRUE) {
 		const guint8 d1 = in[0];
 		guint8 d2;
+		int i1, i2;
 
-		if (!g_ascii_isxdigit (d1))
-			return NULL;
-
-#define HEXVAL(c) ((c) <= '9' ? (c) - '0' : ((c) & 0x4F) - ('A' - 10))
+		i1 = nm_utils_hexchar_to_int (d1);
+		if (i1 < 0)
+			goto fail;
 
 		/* If there's no leading zero (ie "aa:b:cc") then fake it */
 		d2 = in[1];
-		if (d2 && g_ascii_isxdigit (d2)) {
-			*out++ = (HEXVAL (d1) << 4) + HEXVAL (d2);
+		if (   d2
+		    && (i2 = nm_utils_hexchar_to_int (d2)) >= 0) {
+			*out++ = (i1 << 4) + i2;
 			d2 = in[2];
 			if (!d2)
 				break;
 			in += 2;
 		} else {
 			/* Fake leading zero */
-			*out++ = HEXVAL (d1);
+			*out++ = i1;
 			if (!d2) {
 				if (!delimiter_has) {
 					/* when using no delimiter, there must be pairs of hex chars */
-					return NULL;
+					goto fail;
 				}
 				break;
 			}
 			in += 1;
 		}
 
-		if (--buffer_length == 0)
-			return NULL;
+		if (--buffer_len == 0)
+			goto fail;
 
 		if (delimiter_has) {
 			if (d2 != delimiter) {
 				if (delimiter)
-					return NULL;
+					goto fail;
 				if (delimiter_candidates) {
 					while (delimiter_candidates[0]) {
 						if (delimiter_candidates++[0] == d2)
@@ -3589,7 +3691,7 @@ _nm_utils_str2bin_full (const char *asc,
 				}
 				if (!delimiter) {
 					if (delimiter_required)
-						return NULL;
+						goto fail;
 					delimiter_has = FALSE;
 					continue;
 				}
@@ -3598,11 +3700,66 @@ _nm_utils_str2bin_full (const char *asc,
 		}
 	}
 
-	*out_len = out - buffer;
-	return buffer;
+	len = out - buffer;
+	if (   required_len == 0
+	    || len == required_len) {
+		NM_SET_OUT (out_len, len);
+		return buffer;
+	}
+
+fail:
+	NM_SET_OUT (out_len, 0);
+	return NULL;
 }
 
-#define hwaddr_aton(asc, buffer, buffer_length, out_len) _nm_utils_str2bin_full ((asc), TRUE, ":-", (buffer), (buffer_length), (out_len))
+guint8 *
+_nm_utils_hexstr2bin_alloc (const char *hexstr,
+                            gboolean allow_0x_prefix,
+                            gboolean delimiter_required,
+                            const char *delimiter_candidates,
+                            gsize required_len,
+                            gsize *out_len)
+{
+	guint8 *buffer;
+	gsize buffer_len, len;
+
+	g_return_val_if_fail (hexstr, NULL);
+
+	nm_assert (required_len > 0 || out_len);
+
+	if (   allow_0x_prefix
+	    && hexstr[0] == '0'
+	    && hexstr[1] == 'x')
+		hexstr += 2;
+
+	if (!hexstr[0])
+		goto fail;
+
+	if (required_len > 0)
+		buffer_len = required_len;
+	else
+		buffer_len = strlen (hexstr) / 2 + 3;
+
+	buffer = g_malloc (buffer_len);
+
+	if (_nm_utils_hexstr2bin_full (hexstr,
+	                               FALSE,
+	                               delimiter_required,
+	                               delimiter_candidates,
+	                               required_len,
+	                               buffer,
+	                               buffer_len,
+	                               &len)) {
+		NM_SET_OUT (out_len, len);
+		return buffer;
+	}
+
+	g_free (buffer);
+
+fail:
+	NM_SET_OUT (out_len, 0);
+	return NULL;
+}
 
 /**
  * nm_utils_hexstr2bin:
@@ -3619,23 +3776,17 @@ GBytes *
 nm_utils_hexstr2bin (const char *hex)
 {
 	guint8 *buffer;
-	gsize buffer_length, len;
-
-	g_return_val_if_fail (hex != NULL, NULL);
-
-	if (hex[0] == '0' && hex[1] == 'x')
-		hex += 2;
+	gsize len;
 
-	buffer_length = strlen (hex) / 2 + 3;
-	buffer = g_malloc (buffer_length);
-	if (!_nm_utils_str2bin_full (hex, FALSE, ":", buffer, buffer_length, &len)) {
-		g_free (buffer);
+	buffer = _nm_utils_hexstr2bin_alloc (hex, TRUE, FALSE, ":", 0, &len);
+	if (!buffer)
 		return NULL;
-	}
 	buffer = g_realloc (buffer, len);
 	return g_bytes_new_take (buffer, len);
 }
 
+#define hwaddr_aton(asc, buffer, buffer_len, out_len) _nm_utils_hexstr2bin_full ((asc), FALSE, TRUE, ":-", 0, (buffer), (buffer_len), (out_len))
+
 /**
  * nm_utils_hwaddr_atoba:
  * @asc: the ASCII representation of a hardware address
@@ -3728,16 +3879,46 @@ nm_utils_hwaddr_aton (const char *asc, gpointer buffer, gsize length)
 	return buffer;
 }
 
-void
-_nm_utils_bin2str_full (gconstpointer addr, gsize length, const char delimiter, gboolean upper_case, char *out)
+/**
+ * _nm_utils_bin2hexstr_full:
+ * @addr: pointer of @length bytes.
+ * @length: number of bytes in @addr
+ * @delimiter: either '\0', otherwise the output string will have the
+ *   given delimiter character between each two hex numbers.
+ * @upper_case: if TRUE, use upper case ASCII characters for hex.
+ * @out: if %NULL, the function will allocate a new buffer of
+ *   either (@length*2+1) or (@length*3) bytes, depending on whether
+ *   a @delimiter is specified. In that case, the allocated buffer will
+ *   be returned and must be freed by the caller.
+ *   If not %NULL, the buffer must already be preallocated and contain
+ *   at least (@length*2+1) or (@length*3) bytes, depending on the delimiter.
+ *
+ * Returns: the binary value converted to a hex string. If @out is given,
+ *   this always returns @out. If @out is %NULL, a newly allocated string
+ *   is returned.
+ */
+char *
+_nm_utils_bin2hexstr_full (gconstpointer addr,
+                           gsize length,
+                           char delimiter,
+                           gboolean upper_case,
+                           char *out)
 {
 	const guint8 *in = addr;
 	const char *LOOKUP = upper_case ? "0123456789ABCDEF" : "0123456789abcdef";
+	char *out0;
 
 	nm_assert (addr);
-	nm_assert (out);
 	nm_assert (length > 0);
 
+	if (out)
+		out0 = out;
+	else {
+		out0 = out = g_new (char, delimiter == '\0'
+		                          ? length * 2 + 1
+		                          : length * 3);
+	}
+
 	/* @out must contain at least @length*3 bytes if @delimiter is set,
 	 * otherwise, @length*2+1. */
 
@@ -3754,6 +3935,7 @@ _nm_utils_bin2str_full (gconstpointer addr, gsize length, const char delimiter,
 	}
 
 	*out = 0;
+	return out0;
 }
 
 /**
@@ -3779,7 +3961,8 @@ nm_utils_bin2hexstr (gconstpointer src, gsize len, int final_len)
 	g_return_val_if_fail (final_len < 0 || (gsize) final_len < buflen, NULL);
 
 	result = g_malloc (buflen);
-	_nm_utils_bin2str_full (src, len, '\0', FALSE, result);
+
+	_nm_utils_bin2hexstr_full (src, len, '\0', FALSE, result);
 
 	/* Cut converted key off at the correct length for this cipher type */
 	if (final_len >= 0 && (gsize) final_len < buflen)
@@ -3800,14 +3983,10 @@ nm_utils_bin2hexstr (gconstpointer src, gsize len, int final_len)
 char *
 nm_utils_hwaddr_ntoa (gconstpointer addr, gsize length)
 {
-	char *result;
-
 	g_return_val_if_fail (addr, g_strdup (""));
 	g_return_val_if_fail (length > 0, g_strdup (""));
 
-	result = g_malloc (length * 3);
-	_nm_utils_bin2str_full (addr, length, ':', TRUE, result);
-	return result;
+	return _nm_utils_bin2hexstr_full (addr, length, ':', TRUE, NULL);
 }
 
 const char *
@@ -3819,31 +3998,7 @@ nm_utils_hwaddr_ntoa_buf (gconstpointer addr, gsize addr_len, gboolean upper_cas
 	if (buf_len < addr_len * 3)
 		g_return_val_if_reached (NULL);
 
-	_nm_utils_bin2str_full (addr, addr_len, ':', upper_case, buf);
-	return buf;
-}
-
-/**
- * _nm_utils_bin2str:
- * @addr: (type guint8) (array length=length): a binary hardware address
- * @length: the length of @addr
- * @upper_case: the case for the hexadecimal digits.
- *
- * Converts @addr to textual form.
- *
- * Return value: (transfer full): the textual form of @addr
- */
-char *
-_nm_utils_bin2str (gconstpointer addr, gsize length, gboolean upper_case)
-{
-	char *result;
-
-	g_return_val_if_fail (addr, g_strdup (""));
-	g_return_val_if_fail (length > 0, g_strdup (""));
-
-	result = g_malloc (length * 3);
-	_nm_utils_bin2str_full (addr, length, ':', upper_case, result);
-	return result;
+	return _nm_utils_bin2hexstr_full (addr, addr_len, ':', upper_case, buf);
 }
 
 /**
@@ -4510,7 +4665,7 @@ _nm_utils_dhcp_duid_valid (const char *duid, GBytes **out_duid_bin)
 		return TRUE;
 	}
 
-	if (_nm_utils_str2bin_full (duid, FALSE, ":", duid_arr, sizeof (duid_arr), &duid_len)) {
+	if (_nm_utils_hexstr2bin_full (duid, FALSE, FALSE, ":", 0, duid_arr, sizeof (duid_arr), &duid_len)) {
 		/* MAX DUID length is 128 octects + the type code (2 octects). */
 		if (   duid_len > 2
 		    && duid_len <= (128 + 2)) {
diff --git a/libnm-core/tests/test-general.c b/libnm-core/tests/test-general.c
index 5a954270..67b80098 100644
--- a/libnm-core/tests/test-general.c
+++ b/libnm-core/tests/test-general.c
@@ -5439,8 +5439,21 @@ test_nm_strquote (void)
 
 /*****************************************************************************/
 
-#define UUID_NIL        "00000000-0000-0000-0000-000000000000"
+#define UUID_NS_ZERO    "00000000-0000-0000-0000-000000000000"
 #define UUID_NS_DNS     "6ba7b810-9dad-11d1-80b4-00c04fd430c8"
+#define UUID_NS_URL     "6ba7b811-9dad-11d1-80b4-00c04fd430c8"
+#define UUID_NS_OID     "6ba7b812-9dad-11d1-80b4-00c04fd430c8"
+#define UUID_NS_X500    "6ba7b814-9dad-11d1-80b4-00c04fd430c8"
+
+static const NMUuid *
+_uuid (const char *str)
+{
+	static NMUuid u;
+
+	g_assert (str);
+	g_assert (_nm_utils_uuid_parse (str, &u));
+	return &u;
+}
 
 static void
 _test_uuid (int uuid_type, const char *expected_uuid, const char *str, gssize slen, gpointer type_args)
@@ -5452,9 +5465,17 @@ _test_uuid (int uuid_type, const char *expected_uuid, const char *str, gssize sl
 	g_assert (uuid_test);
 	g_assert (nm_utils_is_uuid (uuid_test));
 
-	if (strcmp (uuid_test, expected_uuid)) {
-		g_error ("UUID test failed: type=%d; text=%s, len=%lld, uuid=%s, expected=%s", uuid_type,
-		         str, (long long) slen, uuid_test, expected_uuid);
+	if (!nm_streq (uuid_test, expected_uuid)) {
+		g_error ("UUID test failed: type=%d; text=%s, len=%lld, ns=%s, uuid=%s, expected=%s",
+		         uuid_type,
+		         str,
+		         (long long) slen,
+		         NM_IN_SET (uuid_type, NM_UTILS_UUID_TYPE_VERSION3,
+		                               NM_UTILS_UUID_TYPE_VERSION5)
+		           ? (((const char *) type_args) ?: "(all-zero)")
+		           : (type_args ? "(unknown)" : "(null)"),
+		         uuid_test,
+		         expected_uuid);
 	}
 
 	if (slen < 0) {
@@ -5465,30 +5486,174 @@ _test_uuid (int uuid_type, const char *expected_uuid, const char *str, gssize sl
 		_test_uuid (uuid_type, expected_uuid, NULL, 0, type_args);
 	}
 
-	if (uuid_type == NM_UTILS_UUID_TYPE_VARIANT3 && !type_args) {
-		/* For NM_UTILS_UUID_TYPE_VARIANT3, a missing @type_args is equal to UUID_NIL */
-		_test_uuid (uuid_type, expected_uuid, str, slen, UUID_NIL);
+	if (   NM_IN_SET (uuid_type, NM_UTILS_UUID_TYPE_VERSION3,
+	                             NM_UTILS_UUID_TYPE_VERSION5)
+	    && !type_args) {
+		/* For version3 and version5, a missing @type_args is equal to UUID_NS_ZERO */
+		_test_uuid (uuid_type, expected_uuid, str, slen, UUID_NS_ZERO);
 	}
 }
 
+typedef struct {
+	const char *uuid3;
+	const char *uuid5;
+} ExpectedUuids;
+
 static void
 test_nm_utils_uuid_generate_from_string (void)
 {
+	const ExpectedUuids zero_uuids[] = {
+	    { .uuid3 = "19826852-5007-3022-a72a-212f66e9fac3", .uuid5 = "b6c54489-38a0-5f50-a60a-fd8d76219cae", },
+	    { .uuid3 = "9153af2e-fc8e-34f3-9e8b-81f73b33d0cb", .uuid5 = "11116e73-1c03-5de6-9130-5f9925ae8ab4", },
+	    { .uuid3 = "2f06a3ae-d78d-30d7-b898-088a0e0b76f6", .uuid5 = "1087ebe8-1ef8-5d97-8873-735b4949004d", },
+	    { .uuid3 = "aca948e0-1468-3a51-9f2e-c688a484efd7", .uuid5 = "7e57d004-2b97-5e7a-b45f-5387367791cd", },
+	    { .uuid3 = "b74e537a-53e8-3808-9abd-58546a6542bd", .uuid5 = "1dd80df1-492c-5dc5-aec2-6bf0e104f923", },
+	    { .uuid3 = "1b00958a-7d76-3d08-8aba-c66c5828658c", .uuid5 = "f797f61e-a392-5acf-af25-b46057f1c8e8", },
+	    { .uuid3 = "7ba18f7d-c9cf-3b48-a89e-ad79243135cc", .uuid5 = "e02c9780-2fc5-5d57-b92f-4cc3a64bff16", },
+	    { .uuid3 = "9baf0978-1a60-35c5-9e9b-bec8d259fd4e", .uuid5 = "94167980-f909-527e-a4af-bc3155f586d3", },
+	    { .uuid3 = "588668c0-7631-39c7-9976-c7d414adf7ba", .uuid5 = "9e3eefda-b56e-56bd-8a3a-0b8009d4a536", },
+	    { .uuid3 = "8edb3613-9612-3b32-9dd7-0a01aa8ed453", .uuid5 = "9b75648e-d38c-54e8-adee-1fb295a079c9", },
+	    { .uuid3 = "f3b34394-63a5-3773-9014-1f8a50d765b8", .uuid5 = "dd56b598-9e74-58c3-b3e8-2c623780b8ed", },
+	    { .uuid3 = "0572965f-05b8-342b-b225-d5c29d449eee", .uuid5 = "5666449a-fb7e-55b7-ae9f-0552e6513a10", },
+	    { .uuid3 = "6f7177c3-77b0-3f42-82a8-7031e25fcccf", .uuid5 = "10b38db9-82fc-528e-9ddb-1f09b7dbf907", },
+	    { .uuid3 = "d1e0f845-bc1b-368c-b8c8-49ab0b9e486b", .uuid5 = "85492596-9468-5845-9c7f-d4ae999cb751", },
+	    { .uuid3 = "46371ea3-c8a3-34d8-b2cf-2fa90bda4378", .uuid5 = "22b1c0dd-aa5d-54a4-8768-5adfd0d112bd", },
+	    { .uuid3 = "f1e6b499-9b68-343b-a5c5-ece7acc49a68", .uuid5 = "9cc429f8-200e-52a3-9e3b-ef134afa1e29", },
+	    { .uuid3 = "9ed06458-c712-31dd-aba5-6cf79879fabe", .uuid5 = "3949f95c-5d76-5ee2-af60-8e2d8fcf649d", },
+	    { .uuid3 = "4ddd5cd7-bc83-36aa-909c-4e660f57c830", .uuid5 = "0e994a02-069b-58fb-b3a4-d7dc94e90fca", },
+	    { .uuid3 = "335fa537-0909-395d-a696-6f41827dcbeb", .uuid5 = "17db3a41-de9b-5c6b-904d-833943209b3c", },
+	    { .uuid3 = "dbd58444-05ad-3edd-adc7-4393ecbcb43c", .uuid5 = "1bd906f2-05f9-5ab5-a39a-4c17a188f886", },
+	    { .uuid3 = "a1c62d82-d13c-361b-8f4e-ca91bc2f7fc5", .uuid5 = "ce6550fd-95b7-57e4-9aa7-461522666be4", },
+	    { .uuid3 = "e943d83e-3f82-307f-81ed-b7a7bcd0743e", .uuid5 = "04aa09ee-b420-57ac-8a23-5d99907fb0a1", },
+	    { .uuid3 = "cabf46dd-9f09-375c-8f6e-f2a8cf114709", .uuid5 = "8ece2c62-0c31-5c55-b7c6-155381e3780e", },
+	    { .uuid3 = "19beddf3-f2fb-340f-96ac-4f394960b7a7", .uuid5 = "5762a9f9-9a21-59ab-b0d2-2cb90027ef7f", },
+	    { .uuid3 = "08d835c2-f4ca-394c-ba7f-2494d8b60c6c", .uuid5 = "23c8409d-4b5f-5b6a-b946-41e49bad6c78", },
+	    { .uuid3 = "3b8c6847-5331-35bf-9cd9-ced50e53cd7c", .uuid5 = "e8e396be-95d5-5569-8edc-e0b64c2b7613", },
+	    { .uuid3 = "e601f160-484b-3254-8f3b-0a25c7203d8a", .uuid5 = "bc8b3cbc-ad5b-5808-a1b0-e0f7a1ad68a3", },
+	    { .uuid3 = "e5e492ed-5349-379d-b7de-a370a51e44a3", .uuid5 = "62c5ed3f-9afa-59ad-874f-a9dd8afc69d4", },
+	    { .uuid3 = "c40111f6-fe97-305e-bfce-7db730c3d2ec", .uuid5 = "66877a72-7243-59ed-b9e3-b5023b6da9c2", },
+	    { .uuid3 = "21e18ea8-95c2-362b-9ca9-25d6a0ff2dff", .uuid5 = "49a49eee-7e86-5d66-837a-8a8810cb5562", },
+	    { .uuid3 = "adab623b-1343-307f-80d8-58d005376ad9", .uuid5 = "e4a2a7ed-3bf3-53cf-a2bb-154dbb39a38c", },
+	    { .uuid3 = "67e9fc7c-dafe-356d-ac1a-a63ce3f44813", .uuid5 = "50cacfc9-f5d2-52dd-897c-a25a0927b816", },
+	    { .uuid3 = "36cc7f20-126c-3e40-94e7-737ac7486547", .uuid5 = "ca629991-3f2b-5e86-9bb7-37a335f7d809", },
+	    { .uuid3 = "fe282996-ac5e-3d13-b478-5def30007a8e", .uuid5 = "c1adf8a7-f72a-58ae-82d5-d18807f12e2e", },
+	    { .uuid3 = "3bfe339c-05ae-3233-a1a5-ebf1ead589db", .uuid5 = "6120c3cd-24e1-5ce4-987b-f8bfee2e4633", },
+	    { .uuid3 = "d1d90bc7-da4a-3cd7-a7c8-a1a89765d8ee", .uuid5 = "433d6a26-c319-5fcf-9a30-5ec6ad59d109", },
+	    { .uuid3 = "10b88a02-0102-359b-81e9-7e3b0ff7d25e", .uuid5 = "77d228d9-1b96-59e2-a07e-a8fdd4f62884", },
+	    { .uuid3 = "7da5e4f2-6df0-3aca-a1b0-b7f8b1340e1d", .uuid5 = "698259bf-a32b-5e00-9ec6-88b12278c4ad", },
+	    { .uuid3 = "cbe24d98-ca20-3058-86b6-24a6b36ceff0", .uuid5 = "60dbca63-704f-5666-9f64-f4e1a630c4aa", },
+	    { .uuid3 = "04d84e6a-b793-3993-afbf-bae7cfc42b49", .uuid5 = "79d63ec0-a39d-557d-8299-f4c97acfadc3", },
+	    { .uuid3 = "fdd157d8-a537-350a-9cc9-1930e8666c63", .uuid5 = "7df7f75e-a146-5a76-828b-bac052db312b", },
+	    { .uuid3 = "0bea36bb-24a7-3ee6-a98d-116433c14cd4", .uuid5 = "2bcca2e9-2879-53e3-b09d-cbbfd58771b2", },
+	    { .uuid3 = "52b040a4-1b84-32d2-b758-f82386f7e0f0", .uuid5 = "cb7bdca3-e9f7-50cd-b72e-73cb9ff24f62", },
+	    { .uuid3 = "0f0a4e26-e034-3021-acf2-4e886af43092", .uuid5 = "8e428e2b-5da3-5368-b760-5ca07ccbd819", },
+	    { .uuid3 = "819d3cd1-afe5-3e4a-9f0c-945e25d09879", .uuid5 = "f340ef4d-139c-567a-b0fc-7c495336674e", },
+	    { .uuid3 = "e7df1a3b-c9f8-3e5a-88d6-ba72b2a0f27b", .uuid5 = "7e3f5fd2-3c93-58d6-9f35-6e0192445b11", },
+	    { .uuid3 = "0854bedf-74ba-3f2b-b823-dc2c90d27c76", .uuid5 = "bc112b6b-c5de-5ee9-b816-808792743a20", },
+	    { .uuid3 = "a1b8c3ba-f821-32ef-a3fd-b97b3855efa8", .uuid5 = "47f8f82d-9fcd-553c-90c5-3f3cb3ad00ad", },
+	    { .uuid3 = "9458f819-079b-3033-9430-ba10f576c067", .uuid5 = "bee5c091-5f01-51fa-86bb-e9488fd3b4da", },
+	    { .uuid3 = "8e1f240a-e386-3e00-866a-6f9da1e3503f", .uuid5 = "8ea92cea-d741-566f-a44a-d51e65b4c5e4", },
+	};
+	const ExpectedUuids dns_uuids[] = {
+	    { .uuid3 = "4385125b-dd1e-3025-880f-3311517cc8d5", .uuid5 = "6af613b6-569c-5c22-9c37-2ed93f31d3af", },
+	    { .uuid3 = "afd0b036-625a-3aa8-b639-9dc8c8fff0ff", .uuid5 = "b04965e6-a9bb-591f-8f8a-1adcb2c8dc39", },
+	    { .uuid3 = "9c45c2f1-1761-3daa-ad31-1ff8703ae846", .uuid5 = "4b166dbe-d99d-5091-abdd-95b83330ed3a", },
+	    { .uuid3 = "15e0ba07-10e4-3d7f-aaff-c00fed873c88", .uuid5 = "98123fde-012f-5ff3-8b50-881449dac91a", },
+	    { .uuid3 = "bc27b4db-bc0f-34f9-ae8e-4b72f2d51b60", .uuid5 = "6ed955c6-506a-5343-9be4-2c0afae02eef", },
+	    { .uuid3 = "7586bfed-b8b8-3bb3-9c95-09a4a79dc0f7", .uuid5 = "c8691da2-158a-5ed6-8537-0e6f140801f2", },
+	    { .uuid3 = "881430b6-8d28-3175-b87d-e81f2f5978c6", .uuid5 = "a6c4fc8f-6950-51de-a9ae-2c519c465071", },
+	    { .uuid3 = "24075675-98ae-354e-89ca-0126a9ad36e3", .uuid5 = "a9f96b98-dd44-5216-ab0d-dbfc6b262edf", },
+	    { .uuid3 = "2c269ea4-dbfd-32dd-9bd7-a5c22677d18b", .uuid5 = "e99caacd-6c45-5906-bd9f-b79e62f25963", },
+	    { .uuid3 = "44eb0948-118f-3f28-87e4-f61c8f889aba", .uuid5 = "e4d80b30-151e-51b5-9f4f-18a3b82718e6", },
+	    { .uuid3 = "fc72beeb-f790-36ee-a73d-33888c9d8880", .uuid5 = "0159d6c7-973f-5e7a-a9a0-d195d0ea6fe2", },
+	    { .uuid3 = "1e46afa2-6176-3cd3-9750-3015846723df", .uuid5 = "7fef88f7-411d-5669-b42d-bf5fc7f9b58b", },
+	    { .uuid3 = "0042b01d-95bd-343f-bd9f-3186bfd63508", .uuid5 = "52524d6e-10dc-5261-aa36-8b2efcbaa5f0", },
+	    { .uuid3 = "115ff52f-d605-3b4b-98fe-c0ea57f4930c", .uuid5 = "91c274f2-9a0d-5ce6-ac3d-7529f452df21", },
+	    { .uuid3 = "ed0221e8-ac7d-393b-821d-25183567885b", .uuid5 = "0ff1e264-520d-543a-87dd-181a491e667e", },
+	    { .uuid3 = "508ef333-85a6-314c-bcf3-17ddc32b2216", .uuid5 = "23986425-d3a5-5e13-8bab-299745777a8d", },
+	    { .uuid3 = "a4715ee0-524a-37cc-beb2-a0b5030757b7", .uuid5 = "c15b38c9-9a3e-543c-a703-dd742f25b4d5", },
+	    { .uuid3 = "d1c72756-aaec-3470-a2f2-97415f44d72f", .uuid5 = "db680066-c83d-5ed7-89a4-1d79466ea62d", },
+	    { .uuid3 = "7aec2f01-586e-3d53-b8f3-6cf7e6b649a4", .uuid5 = "cadb7952-2bba-5609-88d4-8e47ec4e7920", },
+	    { .uuid3 = "3d234b88-8d6f-319a-91ea-edb6059fc825", .uuid5 = "35140057-a2a4-5adb-a500-46f8ed8b66a9", },
+	    { .uuid3 = "d2568554-93ec-30c7-9e15-f383be19e5bb", .uuid5 = "66e549b7-01e2-5d07-98d5-430f74d8d3b2", },
+	    { .uuid3 = "800e59a7-dd0f-3114-8e58-ab7e213895ca", .uuid5 = "292c8e99-2378-55aa-83d8-350e0ac3f1cc", },
+	    { .uuid3 = "3b7d03f0-e067-3d72-84f4-e410ac36ef57", .uuid5 = "0e3b230a-0509-55d8-96a0-9875f387a2be", },
+	    { .uuid3 = "8762be68-de95-391a-94a0-c5fd0446e037", .uuid5 = "4c507660-a83b-55c0-9b2b-83eccb07723d", },
+	    { .uuid3 = "2bd8b4c9-01af-3cd0-aced-94ee6e2004b8", .uuid5 = "a1b9b633-da11-58be-b1a9-5cfa2848f186", },
+	    { .uuid3 = "a627d6a4-394a-33f5-b68e-22bfb6488d01", .uuid5 = "c2708a8b-120a-56f5-a30d-990048af87cc", },
+	    { .uuid3 = "6a592510-17d9-3925-b321-4a8d4927f8d0", .uuid5 = "e7263999-68b6-5a23-b530-af25b7efd632", },
+	    { .uuid3 = "9ee72491-59c4-333c-bb93-fe733a842fdb", .uuid5 = "ce1ae2d5-3454-5952-97ff-36ff935bcfe9", },
+	    { .uuid3 = "2591c62c-0a9d-3c28-97bc-fa0401556a3c", .uuid5 = "33677b87-bc8d-5ff6-9a25-fe60225e4bf0", },
+	    { .uuid3 = "7912be1e-4562-373b-92e2-3d6d2123bc8e", .uuid5 = "ed2305ae-e8f9-5387-b860-3d80ae6c02f7", },
+	    { .uuid3 = "09370cda-89a4-3a48-b592-9c0486e0d5e4", .uuid5 = "604ed872-ae2d-5d91-8e3e-572f3a3aaaa5", },
+	    { .uuid3 = "de5980d3-a137-373c-850b-ca3e5f100779", .uuid5 = "8f8173d9-2f8d-5636-a693-24d9f79ba651", },
+	    { .uuid3 = "9441501d-f633-365a-8955-9df443edc762", .uuid5 = "36eb8d4d-b854-51f1-9fdf-3735964225d5", },
+	    { .uuid3 = "434ada18-13ce-3c08-8b40-a1a1ae030569", .uuid5 = "3493b6ca-f84b-56a9-97cc-c0bd1c46c4c0", },
+	    { .uuid3 = "a13b6160-bd23-3710-a150-41d800dd30b4", .uuid5 = "f413ea13-fcd9-5b44-9d22-1fa1f7b063a5", },
+	    { .uuid3 = "73a67c12-c5f0-3288-ad6a-c78aea0917b0", .uuid5 = "f468d924-d23b-56c2-b90f-3d1cf4b45337", },
+	    { .uuid3 = "a126ee4f-a222-357d-b71b-7d3f226c559f", .uuid5 = "8828c9d6-ed76-5c09-bf64-ba9e9cd90896", },
+	    { .uuid3 = "48f4f36b-b015-3137-9b6e-351bb175c7f7", .uuid5 = "facb7618-55ca-5c30-9cba-fd567b6c0611", },
+	    { .uuid3 = "3fe8f6a3-fe4a-3487-89d6-dd06c6ad02e3", .uuid5 = "96f3de0e-6412-5434-b406-67ef3352ab85", },
+	    { .uuid3 = "d68fa2d4-adc9-3b20-ac77-42585cd1d59f", .uuid5 = "9ebacb89-40ab-52b3-93a2-9054611d8f55", },
+	    { .uuid3 = "819f86a3-31d5-3e72-a83e-142c3a3e4832", .uuid5 = "681046ff-9129-5ade-b11c-769864e02184", },
+	    { .uuid3 = "9957b433-ddc8-3113-a3e6-5512cf13dab1", .uuid5 = "c13d0b5d-1ca3-57b6-a23f-8586bca44928", },
+	    { .uuid3 = "5aab6e0c-b7d3-379c-92e3-2bfbb5572511", .uuid5 = "7c411b5e-9d3f-50b5-9c28-62096e41c4ed", },
+	    { .uuid3 = "11c8ff30-3a7d-3547-80a7-d61b8abeeda8", .uuid5 = "f825aafe-6696-5121-b263-6b2c408b7f43", },
+	    { .uuid3 = "98799b9f-1c5e-30b3-930f-e412b862cbe4", .uuid5 = "f2b4caea-61c3-5bed-8ce7-d8b9d16e129e", },
+	    { .uuid3 = "9bdf2544-31d8-3555-94b0-6a749118a996", .uuid5 = "3593855a-6557-5736-8cab-172c6987f949", },
+	    { .uuid3 = "ddcfb9b3-e990-3985-9021-546a2711e7e5", .uuid5 = "36392431-d554-5385-b876-7bc6e1cb26b3", },
+	    { .uuid3 = "190d7a78-1484-3136-80a6-40f28852785c", .uuid5 = "7e645493-0898-5501-8155-e8578b4f5224", },
+	    { .uuid3 = "6ed693e4-7dc0-3210-856b-a6eb4cc73e13", .uuid5 = "14dc6a81-0491-5683-baaf-7582a61c5798", },
+	    { .uuid3 = "b6a14b21-e73a-3ce2-9076-a804c434f5c6", .uuid5 = "883e0a9c-e3b3-5f9c-8073-2913cbbb99ec", },
+	};
+	char i_str[30];
+	guint i;
+
 	_test_uuid (NM_UTILS_UUID_TYPE_LEGACY, "d41d8cd9-8f00-b204-e980-0998ecf8427e", "", -1, NULL);
 	_test_uuid (NM_UTILS_UUID_TYPE_LEGACY, "0cc175b9-c0f1-b6a8-31c3-99e269772661", "a", -1, NULL);
 	_test_uuid (NM_UTILS_UUID_TYPE_LEGACY, "098f6bcd-4621-d373-cade-4e832627b4f6", "test", -1, NULL);
 	_test_uuid (NM_UTILS_UUID_TYPE_LEGACY, "70350f60-27bc-e371-3f6b-76473084309b", "a\0b", 3, NULL);
 	_test_uuid (NM_UTILS_UUID_TYPE_LEGACY, "59c0547b-7fe2-1c15-2cce-e328e8bf6742", "/etc/NetworkManager/system-connections/em1", -1, NULL);
 
-	_test_uuid (NM_UTILS_UUID_TYPE_VARIANT3, "4ae71336-e44b-39bf-b9d2-752e234818a5", "", -1, NULL);
-	_test_uuid (NM_UTILS_UUID_TYPE_VARIANT3, "0531103a-d8fc-3dd4-b972-d98e4750994e", "a", -1, NULL);
-	_test_uuid (NM_UTILS_UUID_TYPE_VARIANT3, "96e17d7a-ac89-38cf-95e1-bf5098da34e1", "test", -1, NULL);
-	_test_uuid (NM_UTILS_UUID_TYPE_VARIANT3, "8156568e-4ae6-3f34-a93e-18e2c6cbbf78", "a\0b", 3, NULL);
+	_test_uuid (NM_UTILS_UUID_TYPE_VERSION3, "4ae71336-e44b-39bf-b9d2-752e234818a5", "", -1, NULL);
+	_test_uuid (NM_UTILS_UUID_TYPE_VERSION3, "0531103a-d8fc-3dd4-b972-d98e4750994e", "a", -1, NULL);
+	_test_uuid (NM_UTILS_UUID_TYPE_VERSION3, "96e17d7a-ac89-38cf-95e1-bf5098da34e1", "test", -1, NULL);
+	_test_uuid (NM_UTILS_UUID_TYPE_VERSION3, "8156568e-4ae6-3f34-a93e-18e2c6cbbf78", "a\0b", 3, NULL);
+
+	_test_uuid (NM_UTILS_UUID_TYPE_VERSION3, "c87ee674-4ddc-3efe-a74e-dfe25da5d7b3", "", -1, UUID_NS_DNS);
+	_test_uuid (NM_UTILS_UUID_TYPE_VERSION3, "4c104dd0-4821-30d5-9ce3-0e7a1f8b7c0d", "a", -1, UUID_NS_DNS);
+	_test_uuid (NM_UTILS_UUID_TYPE_VERSION3, "45a113ac-c7f2-30b0-90a5-a399ab912716", "test", -1, UUID_NS_DNS);
+	_test_uuid (NM_UTILS_UUID_TYPE_VERSION3, "002a0ada-f547-375a-bab5-896a11d1927e", "a\0b", 3, UUID_NS_DNS);
+	_test_uuid (NM_UTILS_UUID_TYPE_VERSION3, "9a75f5f2-195e-31a9-9d07-8c18b5d3b285", "test123", -1, UUID_NS_DNS);
+	_test_uuid (NM_UTILS_UUID_TYPE_VERSION3, "ec794efe-a384-3b11-a0b6-ec8995bc6acc", "x", -1, UUID_NS_DNS);
+
+	_test_uuid (NM_UTILS_UUID_TYPE_VERSION5, "a7650b9f-f19f-5300-8a13-91160ea8de2c", "a\0b", 3, NULL);
+	_test_uuid (NM_UTILS_UUID_TYPE_VERSION5, "4f3f2898-69e3-5a0d-820a-c4e87987dbce", "a", -1, UUID_NS_DNS);
+	_test_uuid (NM_UTILS_UUID_TYPE_VERSION5, "05b16a01-46c6-56dd-bd6e-c6dfb4a1427a", "x", -1, UUID_NS_DNS);
+	_test_uuid (NM_UTILS_UUID_TYPE_VERSION5, "c9ed566a-6b79-5d3a-b2b7-96a936b48cf3", "test123", -1, UUID_NS_DNS);
+
+	for (i = 0; i < G_N_ELEMENTS (zero_uuids); i++) {
+		nm_sprintf_buf (i_str, "%u", i),
+		_test_uuid (NM_UTILS_UUID_TYPE_VERSION3, zero_uuids[i].uuid3, i_str, -1, NULL);
+		_test_uuid (NM_UTILS_UUID_TYPE_VERSION5, zero_uuids[i].uuid5, i_str, -1, NULL);
+	}
+	for (i = 0; i < G_N_ELEMENTS (dns_uuids); i++) {
+		nm_sprintf_buf (i_str, "%u", i),
+		_test_uuid (NM_UTILS_UUID_TYPE_VERSION3, dns_uuids[i].uuid3, i_str, -1, UUID_NS_DNS);
+		_test_uuid (NM_UTILS_UUID_TYPE_VERSION5, dns_uuids[i].uuid5, i_str, -1, UUID_NS_DNS);
+	}
+
+	/* examples from cpython unit tests: */
+	_test_uuid (NM_UTILS_UUID_TYPE_VERSION3, "6fa459ea-ee8a-3ca4-894e-db77e160355e", "python.org", -1, UUID_NS_DNS);
+	_test_uuid (NM_UTILS_UUID_TYPE_VERSION5, "886313e1-3b8a-5372-9b90-0c9aee199e5d", "python.org", -1, UUID_NS_DNS);
+	_test_uuid (NM_UTILS_UUID_TYPE_VERSION3, "9fe8e8c4-aaa8-32a9-a55c-4535a88b748d", "http://python.org/", -1, UUID_NS_URL);
+	_test_uuid (NM_UTILS_UUID_TYPE_VERSION5, "4c565f0d-3f5a-5890-b41b-20cf47701c5e", "http://python.org/", -1, UUID_NS_URL);
+	_test_uuid (NM_UTILS_UUID_TYPE_VERSION3, "dd1a1cef-13d5-368a-ad82-eca71acd4cd1", "1.3.6.1", -1, UUID_NS_OID);
+	_test_uuid (NM_UTILS_UUID_TYPE_VERSION5, "1447fa61-5277-5fef-a9b3-fbc6e44f4af3", "1.3.6.1", -1, UUID_NS_OID);
+	_test_uuid (NM_UTILS_UUID_TYPE_VERSION3, "658d3002-db6b-3040-a1d1-8ddd7d189a4d", "c=ca", -1, UUID_NS_X500);
+	_test_uuid (NM_UTILS_UUID_TYPE_VERSION5, "cc957dd1-a972-5349-98cd-874190002798", "c=ca", -1, UUID_NS_X500);
 
-	_test_uuid (NM_UTILS_UUID_TYPE_VARIANT3, "c87ee674-4ddc-3efe-a74e-dfe25da5d7b3", "", -1, UUID_NS_DNS);
-	_test_uuid (NM_UTILS_UUID_TYPE_VARIANT3, "4c104dd0-4821-30d5-9ce3-0e7a1f8b7c0d", "a", -1, UUID_NS_DNS);
-	_test_uuid (NM_UTILS_UUID_TYPE_VARIANT3, "45a113ac-c7f2-30b0-90a5-a399ab912716", "test", -1, UUID_NS_DNS);
-	_test_uuid (NM_UTILS_UUID_TYPE_VARIANT3, "002a0ada-f547-375a-bab5-896a11d1927e", "a\0b", 3, UUID_NS_DNS);
+	_test_uuid (NM_UTILS_UUID_TYPE_VERSION5, "74738ff5-5367-5958-9aee-98fffdcd1876", "www.example.org", -1, UUID_NS_DNS);
 }
 
 /*****************************************************************************/
@@ -5505,7 +5670,7 @@ __test_uuid (const char *expected_uuid, const char *str, gssize slen, char *uuid
 	}
 	g_free (uuid_test);
 
-	uuid_test = nm_utils_uuid_generate_from_string (str, slen, NM_UTILS_UUID_TYPE_VARIANT3, NM_UTILS_UUID_NS);
+	uuid_test = nm_utils_uuid_generate_from_string (str, slen, NM_UTILS_UUID_TYPE_VERSION3, NM_UTILS_UUID_NS);
 
 	g_assert (uuid_test);
 	g_assert (nm_utils_is_uuid (uuid_test));
@@ -5522,6 +5687,15 @@ __test_uuid (const char *expected_uuid, const char *str, gssize slen, char *uuid
 static void
 test_nm_utils_uuid_generate_from_strings (void)
 {
+	const NMUuid uuid0 = { 0 };
+
+	g_assert_cmpmem (&uuid0, sizeof (uuid0), _uuid ("00000000-0000-0000-0000-000000000000"), 16);
+
+	g_assert (nm_utils_uuid_is_null (NULL));
+	g_assert (nm_utils_uuid_is_null (&uuid0));
+	g_assert ( nm_utils_uuid_is_null (_uuid ("00000000-0000-0000-0000-000000000000")));
+	g_assert (!nm_utils_uuid_is_null (_uuid ("10000000-0000-0000-0000-000000000000")));
+
 	_test_uuid ("b07c334a-399b-32de-8d50-58e4e08f98e3", "",         0, NULL);
 	_test_uuid ("b8a426cb-bcb5-30a3-bd8f-6786fea72df9", "\0",       1, "");
 	_test_uuid ("12a4a982-7aae-39e1-951e-41aeb1250959", "a\0",      2, "a");
diff --git a/libnm/meson.build b/libnm/meson.build
index 62e3e9d7..62e37993 100644
--- a/libnm/meson.build
+++ b/libnm/meson.build
@@ -184,7 +184,7 @@ pkg.generate(
   requires: 'gio-2.0',
   variables: [
     'exec_prefix=${prefix}',
-    'vpnservicedir=' + join_paths(nm_pkglibdir, 'VPN')
+    'vpnservicedir=' + join_paths('${prefix}', 'lib', nm_name, 'VPN')
   ]
 )
 
diff --git a/libnm/nm-access-point.c b/libnm/nm-access-point.c
index 1cac12f9..25281c92 100644
--- a/libnm/nm-access-point.c
+++ b/libnm/nm-access-point.c
@@ -367,7 +367,7 @@ nm_access_point_connection_valid (NMAccessPoint *ap, NMConnection *connection)
  * #NMDevice using nm_device_filter_connections() and finally filter that list
  * with this function.
  *
- * Returns: (transfer container) (element-type NMConnection): an array of
+ * Returns: (transfer full) (element-type NMConnection): an array of
  * #NMConnections that could be activated with the given @ap.  The array should
  * be freed with g_ptr_array_unref() when it is no longer required.
  **/
diff --git a/libnm/nm-device-tun.c b/libnm/nm-device-tun.c
index 2c88bf33..b5721350 100644
--- a/libnm/nm-device-tun.c
+++ b/libnm/nm-device-tun.c
@@ -268,6 +268,7 @@ finalize (GObject *object)
 	NMDeviceTunPrivate *priv = NM_DEVICE_TUN_GET_PRIVATE (object);
 
 	g_free (priv->mode);
+	g_free (priv->hw_address);
 
 	G_OBJECT_CLASS (nm_device_tun_parent_class)->finalize (object);
 }
diff --git a/libnm/nm-device.c b/libnm/nm-device.c
index aa45c4ad..3f1cc636 100644
--- a/libnm/nm-device.c
+++ b/libnm/nm-device.c
@@ -2533,7 +2533,7 @@ nm_device_connection_compatible (NMDevice *device, NMConnection *connection, GEr
  * incompatible with the device. To get the full list of connections see
  * nm_client_get_connections().
  *
- * Returns: (transfer container) (element-type NMConnection): an array of
+ * Returns: (transfer full) (element-type NMConnection): an array of
  * #NMConnections that could be activated with the given @device.  The array
  * should be freed with g_ptr_array_unref() when it is no longer required.
  **/
diff --git a/libnm/nm-manager.c b/libnm/nm-manager.c
index aac120c6..e108f2b0 100644
--- a/libnm/nm-manager.c
+++ b/libnm/nm-manager.c
@@ -885,22 +885,20 @@ activate_info_complete (ActivateInfo *info,
                         NMActiveConnection *active,
                         GError *error)
 {
+	nm_clear_g_signal_handler (info->cancellable, &info->cancelled_id);
+
+	c_list_unlink_stale (&info->lst);
+
 	if (active)
 		g_simple_async_result_set_op_res_gpointer (info->simple, g_object_ref (active), g_object_unref);
 	else
 		g_simple_async_result_set_from_error (info->simple, error);
 	g_simple_async_result_complete (info->simple);
 
-	c_list_unlink_stale (&info->lst);
-
 	g_free (info->active_path);
 	g_free (info->new_connection_path);
 	g_object_unref (info->simple);
-	if (info->cancellable) {
-		if (info->cancelled_id)
-			g_signal_handler_disconnect (info->cancellable, info->cancelled_id);
-		g_object_unref (info->cancellable);
-	}
+	nm_g_object_unref (info->cancellable);
 	g_slice_free (ActivateInfo, info);
 }
 
@@ -1538,7 +1536,7 @@ nm_manager_checkpoint_rollback_finish (NMManager *manager,
 	if (g_simple_async_result_propagate_error (simple, error))
 		return NULL;
 	else
-		return g_simple_async_result_get_op_res_gpointer (simple);
+		return g_hash_table_ref (g_simple_async_result_get_op_res_gpointer (simple));
 }
 
 static void
@@ -1732,6 +1730,8 @@ dispose (GObject *object)
 		priv->all_devices = NULL;
 	}
 
+	nm_clear_pointer (&priv->checkpoints, g_ptr_array_unref);
+
 	free_active_connections (manager);
 	g_clear_object (&priv->primary_connection);
 	g_clear_object (&priv->activating_connection);
diff --git a/libnm/nm-property-docs.xml b/libnm/nm-property-docs.xml
index 22aed0ea..4016bc07 100644
--- a/libnm/nm-property-docs.xml
+++ b/libnm/nm-property-docs.xml
@@ -22,7 +22,7 @@
     
     
     
-    
+    
     
     
     
@@ -164,7 +164,7 @@
   
     
     
-    
+    
     
     
     
@@ -187,7 +187,7 @@
     
     
     
-    
+    
     
     
     
@@ -309,8 +309,8 @@
   
   
     
-    
-    
+    
+    
   
   
     
diff --git a/libnm/nm-remote-connection.c b/libnm/nm-remote-connection.c
index 6c1e0924..08faa77e 100644
--- a/libnm/nm-remote-connection.c
+++ b/libnm/nm-remote-connection.c
@@ -918,7 +918,7 @@ get_property (GObject *object, guint prop_id,
 		g_value_set_boolean (value, NM_REMOTE_CONNECTION_GET_PRIVATE (object)->unsaved);
 		break;
 	case PROP_FLAGS:
-		g_value_set_boolean (value, NM_REMOTE_CONNECTION_GET_PRIVATE (object)->flags);
+		g_value_set_uint (value, NM_REMOTE_CONNECTION_GET_PRIVATE (object)->flags);
 		break;
 	case PROP_FILENAME:
 		g_value_set_string (value, NM_REMOTE_CONNECTION_GET_PRIVATE (object)->filename);
diff --git a/libnm/nm-settings-docs.xml b/libnm/nm-settings-docs.xml
index 258d3558..f3dca3fb 100644
--- a/libnm/nm-settings-docs.xml
+++ b/libnm/nm-settings-docs.xml
@@ -22,7 +22,7 @@
     
     
     
-    
+    
     
     
     
@@ -167,7 +167,7 @@
     
     
     
-    
+    
     
     
     
@@ -192,7 +192,7 @@
     
     
     
-    
+    
     
     
     
@@ -315,8 +315,8 @@
   
   
     
-    
-    
+    
+    
   
   
     
diff --git a/libnm/nm-wimax-nsp.c b/libnm/nm-wimax-nsp.c
index f8c8ca42..90c2c2bb 100644
--- a/libnm/nm-wimax-nsp.c
+++ b/libnm/nm-wimax-nsp.c
@@ -151,7 +151,7 @@ nm_wimax_nsp_connection_valid (NMWimaxNsp *nsp, NMConnection *connection)
  * return connections which may be activated with the NSP.  Any returned
  * connections will match the @nsp's network name and other attributes.
  *
- * Returns: (transfer container) (element-type NMConnection): an array of
+ * Returns: (transfer full) (element-type NMConnection): an array of
  * #NMConnections that could be activated with the given @nsp.  The array should
  * be freed with g_ptr_array_unref() when it is no longer required.
  **/
diff --git a/man/NetworkManager.8 b/man/NetworkManager.8
index 5cf80c19..4d82097c 100644
--- a/man/NetworkManager.8
+++ b/man/NetworkManager.8
@@ -2,12 +2,12 @@
 .\"     Title: NetworkManager
 .\"    Author: 
 .\" Generator: DocBook XSL Stylesheets vsnapshot 
-.\"      Date: 10/24/2018
+.\"      Date: 02/23/2019
 .\"    Manual: Network management daemons
-.\"    Source: NetworkManager 1.14.4
+.\"    Source: NetworkManager 1.14.6
 .\"  Language: English
 .\"
-.TH "NETWORKMANAGER" "8" "" "NetworkManager 1\&.14\&.4" "Network management daemons"
+.TH "NETWORKMANAGER" "8" "" "NetworkManager 1\&.14\&.6" "Network management daemons"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/NetworkManager.conf.5 b/man/NetworkManager.conf.5
index a27b8c3e..13efa991 100644
--- a/man/NetworkManager.conf.5
+++ b/man/NetworkManager.conf.5
@@ -2,12 +2,12 @@
 .\"     Title: NetworkManager.conf
 .\"    Author: 
 .\" Generator: DocBook XSL Stylesheets vsnapshot 
-.\"      Date: 10/24/2018
+.\"      Date: 02/23/2019
 .\"    Manual: Configuration
-.\"    Source: NetworkManager 1.14.4
+.\"    Source: NetworkManager 1.14.6
 .\"  Language: English
 .\"
-.TH "NETWORKMANAGER\&.CONF" "5" "" "NetworkManager 1\&.14\&.4" "Configuration"
+.TH "NETWORKMANAGER\&.CONF" "5" "" "NetworkManager 1\&.14\&.6" "Configuration"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -584,6 +584,14 @@ Not all properties can be overwritten, only the following properties are support
 \fBnm-settings\fR(5)
 for details)\&. A default value is only consulted if the corresponding per\-connection value explicitly allows for that\&.
 .PP
+\fI802\-1x\&.auth\-timeout\fR
+.RS 4
+.RE
+.PP
+\fIcdma\&.mtu\fR
+.RS 4
+.RE
+.PP
 \fIconnection\&.auth\-retries\fR
 .RS 4
 If left unspecified, the default value is 3 tries before failing the connection\&.
@@ -627,6 +635,10 @@ If configured explicitly to 0, the MTU is not reconfigured during device activat
 .RS 4
 .RE
 .PP
+\fIgsm\&.mtu\fR
+.RS 4
+.RE
+.PP
 \fIinfiniband\&.mtu\fR
 .RS 4
 If configured explicitly to 0, the MTU is not reconfigured during device activation unless it is required due to IPv6 constraints\&. If left unspecified, a DHCP/IPv6 SLAAC provided value is used or the MTU is left unspecified on activation\&.
@@ -729,6 +741,10 @@ If left unspecified, the default value "optional" will be used\&.
 .RS 4
 If left unspecified, the default value "optional" will be used\&.
 .RE
+.PP
+\fIwifi\&.wake\-on\-wlan\fR
+.RS 4
+.RE
 .SS "Sections"
 .PP
 You can configure multiple
@@ -1004,7 +1020,7 @@ enable=env:TAG1
 .RE
 .\}
 .sp
-More then one match can be specified\&. The configuration will be enabled if one of the predicates matches ("or")\&. The special prefix "except:" can be used to negate the match\&. Note that if one except\-predicate matches, the entire configuration will be disabled\&. In other words, a except predicate always wins over other predicates\&.
+More then one match can be specified\&. The configuration will be enabled if one of the predicates matches ("or")\&. The special prefix "except:" can be used to negate the match\&. Note that if one except\-predicate matches, the entire configuration will be disabled\&. In other words, a except predicate always wins over other predicates\&. If the setting only consists of "except:" matches and none of the negative conditions are satisfied, the configuration is still enabled\&.
 .sp
 .if n \{\
 .RS 4
@@ -1161,12 +1177,22 @@ driver:DRIVER
 Match the device driver as reported by "nmcli \-f GENERAL\&.DRIVER,GENERAL\&.DRIVER\-VERSION device show"\&. "DRIVER" must match the driver name exactly and does not support globbing\&. Optionally, a driver version may be specified separated by \*(Aq/\*(Aq\&. Globbing is supported for the version\&.
 .RE
 .PP
+dhcp\-plugin:DHCP
+.RS 4
+Match the configured DHCP plugin "main\&.dhcp"\&.
+.RE
+.PP
 except:SPEC
 .RS 4
 Negative match of a device\&.
 SPEC
 must be explicitly qualified with a prefix such as
 interface\-name:\&. A negative match has higher priority then the positive matches above\&.
+.sp
+If there is a list consisting only of negative matches, the behavior is the same as if there is also match\-all\&. That means, if none of all the negative matches is satisfied, the overall result is still a positive match\&. That means,
+"except:interface\-name:eth0"
+is the same as
+"*,except:interface\-name:eth0"\&.
 .RE
 .PP
 SPEC[,;]SPEC
diff --git a/man/NetworkManager.conf.xml b/man/NetworkManager.conf.xml
index 87cf0016..94a23fe8 100644
--- a/man/NetworkManager.conf.xml
+++ b/man/NetworkManager.conf.xml
@@ -642,6 +642,12 @@ ipv6.ip6-privacy=0
       A default value is only consulted if the corresponding per-connection value
       explicitly allows for that.
       
+        
+          802-1x.auth-timeout
+        
+        
+          cdma.mtu
+        
         
           connection.auth-retries
           If left unspecified, the default value is 3 tries before failing the connection.
@@ -676,6 +682,9 @@ ipv6.ip6-privacy=0
         
           ethernet.wake-on-lan
         
+        
+          gsm.mtu
+        
         
           infiniband.mtu
           If configured explicitly to 0, the MTU is not reconfigured during device activation unless it is required due to IPv6 constraints. If left unspecified, a DHCP/IPv6 SLAAC provided value is used or the MTU is left unspecified on activation.
@@ -770,6 +779,9 @@ ipv6.ip6-privacy=0
           If left unspecified, the default value
           "optional" will be used.
         
+        
+          wifi.wake-on-wlan
+        
       
     
     
@@ -1158,6 +1170,8 @@ enable=env:TAG1
               be used to negate the match. Note that if one except-predicate
               matches, the entire configuration will be disabled.
               In other words, a except predicate always wins over other predicates.
+              If the setting only consists of "except:" matches and none of the
+              negative conditions are satisfied, the configuration is still enabled.
 
 # enable the configuration either when the environment variable
 # is present or the version is at least 1.2.0.
@@ -1343,11 +1357,20 @@ enable=nm-version-min:1.3,nm-version-min:1.2.6,nm-version-min:1.0.16
           Optionally, a driver version may be specified separated by '/'. Globbing is supported for the version.
           
         
+        
+          dhcp-plugin:DHCP
+          Match the configured DHCP plugin "main.dhcp".
+          
+        
         
           except:SPEC
           Negative match of a device. SPEC must be explicitly qualified with
              a prefix such as interface-name:. A negative match has higher priority then the positive
-             matches above.
+             matches above.
+             If there is a list consisting only of negative matches, the behavior is the same as if there
+             is also match-all. That means, if none of all the negative matches is satisfied, the overall result is
+             still a positive match. That means, "except:interface-name:eth0" is the same as
+             "*,except:interface-name:eth0".
         
         
           SPEC[,;]SPEC
diff --git a/man/nm-initrd-generator.8 b/man/nm-initrd-generator.8
index 0f53f770..eaebea30 100644
--- a/man/nm-initrd-generator.8
+++ b/man/nm-initrd-generator.8
@@ -2,12 +2,12 @@
 .\"     Title: nm-initrd-generator
 .\"    Author: 
 .\" Generator: DocBook XSL Stylesheets vsnapshot 
-.\"      Date: 10/24/2018
+.\"      Date: 02/23/2019
 .\"    Manual: System Administration
-.\"    Source: NetworkManager 1.14.4
+.\"    Source: NetworkManager 1.14.6
 .\"  Language: English
 .\"
-.TH "NM\-INITRD\-GENERATOR" "8" "" "NetworkManager 1\&.14\&.4" "System Administration"
+.TH "NM\-INITRD\-GENERATOR" "8" "" "NetworkManager 1\&.14\&.6" "System Administration"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/nm-online.1 b/man/nm-online.1
index 9e2f23e9..be044e0b 100644
--- a/man/nm-online.1
+++ b/man/nm-online.1
@@ -2,12 +2,12 @@
 .\"     Title: nm-online
 .\"    Author: 
 .\" Generator: DocBook XSL Stylesheets vsnapshot 
-.\"      Date: 10/24/2018
+.\"      Date: 02/23/2019
 .\"    Manual: General Commands Manual
-.\"    Source: NetworkManager 1.14.4
+.\"    Source: NetworkManager 1.14.6
 .\"  Language: English
 .\"
-.TH "NM\-ONLINE" "1" "" "NetworkManager 1\&.14\&.4" "General Commands Manual"
+.TH "NM\-ONLINE" "1" "" "NetworkManager 1\&.14\&.6" "General Commands Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/nm-openvswitch.7 b/man/nm-openvswitch.7
index 4b6c23b9..1a63813b 100644
--- a/man/nm-openvswitch.7
+++ b/man/nm-openvswitch.7
@@ -2,12 +2,12 @@
 .\"     Title: nm-openvswitch
 .\"    Author: 
 .\" Generator: DocBook XSL Stylesheets vsnapshot 
-.\"      Date: 10/24/2018
+.\"      Date: 02/23/2019
 .\"    Manual: OpenVSwitch support overview
-.\"    Source: NetworkManager 1.14.4
+.\"    Source: NetworkManager 1.14.6
 .\"  Language: English
 .\"
-.TH "NM\-OPENVSWITCH" "7" "" "NetworkManager 1\&.14\&.4" "OpenVSwitch support overview"
+.TH "NM\-OPENVSWITCH" "7" "" "NetworkManager 1\&.14\&.6" "OpenVSwitch support overview"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/nm-settings-ifcfg-rh.5 b/man/nm-settings-ifcfg-rh.5
index 99434ecc..eba90b88 100644
--- a/man/nm-settings-ifcfg-rh.5
+++ b/man/nm-settings-ifcfg-rh.5
@@ -2,12 +2,12 @@
 .\"     Title: nm-settings-ifcfg-rh
 .\"    Author: 
 .\" Generator: DocBook XSL Stylesheets vsnapshot 
-.\"      Date: 10/24/2018
+.\"      Date: 02/23/2019
 .\"    Manual: Configuration
-.\"    Source: NetworkManager 1.14.4
+.\"    Source: NetworkManager 1.14.6
 .\"  Language: English
 .\"
-.TH "NM\-SETTINGS\-IFCFG\-RH" "5" "" "NetworkManager 1\&.14\&.4" "Configuration"
+.TH "NM\-SETTINGS\-IFCFG\-RH" "5" "" "NetworkManager 1\&.14\&.6" "Configuration"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/nm-settings-ifcfg-rh.xml b/man/nm-settings-ifcfg-rh.xml
index 3739fb28..0c534728 100644
--- a/man/nm-settings-ifcfg-rh.xml
+++ b/man/nm-settings-ifcfg-rh.xml
@@ -1,6 +1,6 @@
 
 
-nm-settings-ifcfg-rhNetworkManager developersnm-settings-ifcfg-rh5NetworkManagerConfiguration1.14.4nm-settings-ifcfg-rhDescription of ifcfg-rh settings pluginDescription
+nm-settings-ifcfg-rhNetworkManager developersnm-settings-ifcfg-rh5NetworkManagerConfiguration1.14.6nm-settings-ifcfg-rhDescription of ifcfg-rh settings pluginDescription
           NetworkManager is based on the concept of connection profiles that contain
           network configuration (see nm-settings5 for details). The profiles can be
           stored in various formats. NetworkManager uses plugins for reading and writing
diff --git a/man/nm-settings-keyfile.5 b/man/nm-settings-keyfile.5
index 09f40a7a..e6fe5c05 100644
--- a/man/nm-settings-keyfile.5
+++ b/man/nm-settings-keyfile.5
@@ -2,12 +2,12 @@
 .\"     Title: nm-settings-keyfile
 .\"    Author: 
 .\" Generator: DocBook XSL Stylesheets vsnapshot 
-.\"      Date: 10/24/2018
+.\"      Date: 02/23/2019
 .\"    Manual: Configuration
-.\"    Source: NetworkManager 1.14.4
+.\"    Source: NetworkManager 1.14.6
 .\"  Language: English
 .\"
-.TH "NM\-SETTINGS\-KEYFILE" "5" "" "NetworkManager 1\&.14\&.4" "Configuration"
+.TH "NM\-SETTINGS\-KEYFILE" "5" "" "NetworkManager 1\&.14\&.6" "Configuration"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/nm-settings-keyfile.xml b/man/nm-settings-keyfile.xml
index 9731f684..4fbbef11 100644
--- a/man/nm-settings-keyfile.xml
+++ b/man/nm-settings-keyfile.xml
@@ -1,6 +1,6 @@
 
 
-nm-settings-keyfileNetworkManager developersnm-settings-keyfile5NetworkManagerConfiguration1.14.4nm-settings-keyfileDescription of keyfile settings pluginDescription
+nm-settings-keyfileNetworkManager developersnm-settings-keyfile5NetworkManagerConfiguration1.14.6nm-settings-keyfileDescription of keyfile settings pluginDescription
           NetworkManager is based on the concept of connection profiles that contain
           network configuration (see nm-settings5 for details). The profiles can be
           stored in various formats. NetworkManager uses plugins for reading and writing
diff --git a/man/nm-settings.5 b/man/nm-settings.5
index 59c7f754..70ee2711 100644
--- a/man/nm-settings.5
+++ b/man/nm-settings.5
@@ -2,12 +2,12 @@
 .\"     Title: nm-settings
 .\"    Author: 
 .\" Generator: DocBook XSL Stylesheets vsnapshot 
-.\"      Date: 10/24/2018
+.\"      Date: 02/23/2019
 .\"    Manual: Configuration
-.\"    Source: NetworkManager 1.14.4
+.\"    Source: NetworkManager 1.14.6
 .\"  Language: English
 .\"
-.TH "NM\-SETTINGS" "5" "" "NetworkManager 1\&.14\&.4" "Configuration"
+.TH "NM\-SETTINGS" "5" "" "NetworkManager 1\&.14\&.6" "Configuration"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -266,7 +266,7 @@ string
 T}:T{
 \ \&
 T}:T{
-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 as DHCP client identifier with ipv4\&.dhcp\-client\-id=stable and to derive the DHCP DUID with ipv6\&.dhcp\-duid=stable\-[llt,ll,uuid]\&. 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\*(Aqs name is included, so that different interfaces yield different addresses\&. The \*(Aq$\*(Aq character is treated special to perform dynamic substitutions at runtime\&. Currently supported are "${CONNECTION}", "${DEVICE}", "${BOOT}", "${RANDOM}"\&. These effectively create unique IDs per\-connection, per\-device, per\-boot, or every time\&. Note that "${DEVICE}" corresponds the the interface name of the device\&. Any unrecognized patterns following \*(Aq$\*(Aq are treated verbatim, however are reserved for future use\&. You are thus advised to avoid \*(Aq$\*(Aq 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\&.
+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 as DHCP client identifier with ipv4\&.dhcp\-client\-id=stable and to derive the DHCP DUID with ipv6\&.dhcp\-duid=stable\-[llt,ll,uuid]\&. 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\*(Aqs name is included, so that different interfaces yield different addresses\&. The \*(Aq$\*(Aq 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 the the interface name of the device and "${MAC}" is the permanent MAC address of the device\&. Any unrecognized patterns following \*(Aq$\*(Aq are treated verbatim, however are reserved for future use\&. You are thus advised to avoid \*(Aq$\*(Aq 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\&.
 T}
 T{
 timestamp
@@ -1703,7 +1703,7 @@ string
 T}:T{
 \ \&
 T}:T{
-A string sent to the DHCP server to identify the local machine which the DHCP server may use to customize the DHCP lease and options\&. When the property is a hex string (\*(Aqaa:bb:cc\*(Aq) it is interpreted as a binary client ID, in which case the first byte is assumed to be the \*(Aqtype\*(Aq field as per RFC 2132 section 9\&.14 and the remaining bytes may be an hardware address (e\&.g\&. \*(Aq01:xx:xx:xx:xx:xx:xx\*(Aq where 1 is the Ethernet ARP type and the rest is a MAC address)\&. If the property is not a hex string it is considered as a non\-hardware\-address client ID and the \*(Aqtype\*(Aq field is set to 0\&. The special values "mac" and "perm\-mac" are supported, which use the current or permanent MAC address of the device to generate a client identifier with type ethernet (01)\&. Currently, these options only work for ethernet type of links\&. The special value "stable" is supported to generate a type 0 client identifier based on the stable\-id (see connection\&.stable\-id) and a per\-host key\&. If unset, a globally configured default is used\&. If still unset, the client\-id from the last lease is reused\&.
+A string sent to the DHCP server to identify the local machine which the DHCP server may use to customize the DHCP lease and options\&. When the property is a hex string (\*(Aqaa:bb:cc\*(Aq) it is interpreted as a binary client ID, in which case the first byte is assumed to be the \*(Aqtype\*(Aq field as per RFC 2132 section 9\&.14 and the remaining bytes may be an hardware address (e\&.g\&. \*(Aq01:xx:xx:xx:xx:xx:xx\*(Aq where 1 is the Ethernet ARP type and the rest is a MAC address)\&. If the property is not a hex string it is considered as a non\-hardware\-address client ID and the \*(Aqtype\*(Aq field is set to 0\&. The special values "mac" and "perm\-mac" are supported, which use the current or permanent MAC address of the device to generate a client identifier with type ethernet (01)\&. Currently, these options only work for ethernet type of links\&. The special value "duid" generates a RFC4361\-compliant client identifier based on a hash of the interface name as IAID and /etc/machine\-id\&. The special value "stable" is supported to generate a type 0 client identifier based on the stable\-id (see connection\&.stable\-id) and a per\-host key\&. If you set the stable\-id, you may want to include the "${DEVICE}" or "${MAC}" specifier to get a per\-device key\&. If unset, a globally configured default is used\&. If still unset, the default depends on the DHCP plugin\&.
 T}
 T{
 dhcp\-fqdn
@@ -1952,7 +1952,7 @@ string
 T}:T{
 \ \&
 T}:T{
-A string containing the DHCPv6 Unique Identifier (DUID) used by the dhcp client to identify itself to DHCPv6 servers (RFC 3315)\&. The DUID is carried in the Client Identifier option\&. If the property is a hex string (\*(Aqaa:bb:cc\*(Aq) it is interpreted as a binary DUID and filled as an opaque value in the Client Identifier option\&. The special value "lease" will retrieve the DUID previously used from the lease file belonging to the connection\&. If no DUID is found and "dhclient" is the configured dhcp client, the DUID is searched in the system\-wide dhclient lease file\&. If still no DUID is found, or another dhcp client is used, a global and permanent DUID\-UUID (RFC 6355) will be generated based on the machine\-id\&. The special values "llt" and "ll" will generate a DUID of type LLT or LL (see RFC 3315) based on the current MAC address of the device\&. In order to try providing a stable DUID\-LLT, the time field will contain a constant timestamp that is used globally (for all profiles) and persisted to disk\&. The special values "stable\-llt", "stable\-ll" and "stable\-uuid" will generate a DUID of the corresponding type, derived from the connection\*(Aqs stable\-id and a per\-host unique key\&. So, the link\-layer address of "stable\-ll" and "stable\-llt" will be a generated address derived from the stable id\&. The DUID\-LLT time value in the "stable\-llt" option will be picked among a static timespan of three years (the upper bound of the interval is the same constant timestamp used in "llt")\&. When the property is unset, the global value provided for "ipv6\&.dhcp\-duid" is used\&. If no global value is provided, the default "lease" value is assumed\&.
+A string containing the DHCPv6 Unique Identifier (DUID) used by the dhcp client to identify itself to DHCPv6 servers (RFC 3315)\&. The DUID is carried in the Client Identifier option\&. If the property is a hex string (\*(Aqaa:bb:cc\*(Aq) it is interpreted as a binary DUID and filled as an opaque value in the Client Identifier option\&. The special value "lease" will retrieve the DUID previously used from the lease file belonging to the connection\&. If no DUID is found and "dhclient" is the configured dhcp client, the DUID is searched in the system\-wide dhclient lease file\&. If still no DUID is found, or another dhcp client is used, a global and permanent DUID\-UUID (RFC 6355) will be generated based on the machine\-id\&. The special values "llt" and "ll" will generate a DUID of type LLT or LL (see RFC 3315) based on the current MAC address of the device\&. In order to try providing a stable DUID\-LLT, the time field will contain a constant timestamp that is used globally (for all profiles) and persisted to disk\&. The special values "stable\-llt", "stable\-ll" and "stable\-uuid" will generate a DUID of the corresponding type, derived from the connection\*(Aqs stable\-id and a per\-host unique key\&. You may want to include the "${DEVICE}" or "${MAC}" specifier in the stable\-id, in case this profile gets activated on multiple devices\&. So, the link\-layer address of "stable\-ll" and "stable\-llt" will be a generated address derived from the stable id\&. The DUID\-LLT time value in the "stable\-llt" option will be picked among a static timespan of three years (the upper bound of the interval is the same constant timestamp used in "llt")\&. When the property is unset, the global value provided for "ipv6\&.dhcp\-duid" is used\&. If no global value is provided, the default "lease" value is assumed\&.
 T}
 T{
 dhcp\-hostname
@@ -3136,7 +3136,7 @@ uint32
 T}:T{
 0
 T}:T{
-The total number of virtual functions to create\&.
+The total number of virtual functions to create\&. Note that when the sriov setting is present NetworkManager enforces the number of virtual functions on the interface also when it is zero\&. To prevent any changes to SR\-IOV parameters don\*(Aqt add a sriov setting to the connection\&.
 T}
 T{
 vfs
@@ -3145,7 +3145,7 @@ array of vardict
 T}:T{
 []
 T}:T{
-Array of virtual function descriptors\&. Each VF descriptor is a dictionary mapping attribute names to GVariant values\&. The \*(Aqindex\*(Aq entry is mandatory for each VF\&. When represented as string a VF is in the form: "INDEX [ATTR=VALUE[ ATTR=VALUE]\&.\&.\&.]"\&. for example: "2 mac=00:11:22:33:44:55 spoof\-check=true"\&. The "vlans" attribute is represented as a semicolor\-separated list of VLAN descriptors, where each descriptor has the form "ID[\&.PRIORITY[\&.PROTO]]"\&. PROTO can be either \*(Aqq\*(Aq for 802\&.1Q (the default) or \*(Aqad\*(Aq for 802\&.1ad\&.
+Array of virtual function descriptors\&. Each VF descriptor is a dictionary mapping attribute names to GVariant values\&. The \*(Aqindex\*(Aq entry is mandatory for each VF\&. When represented as string a VF is in the form: "INDEX [ATTR=VALUE[ ATTR=VALUE]\&.\&.\&.]"\&. for example: "2 mac=00:11:22:33:44:55 spoof\-check=true"\&. Multiple VFs can be specified using a comma as separator\&. Currently the following attributes are supported: mac, spoof\-check, trust, min\-tx\-rate, max\-tx\-rate, vlans\&. The "vlans" attribute is represented as a semicolon\-separated list of VLAN descriptors, where each descriptor has the form "ID[\&.PRIORITY[\&.PROTO]]"\&. PROTO can be either \*(Aqq\*(Aq for 802\&.1Q (the default) or \*(Aqad\*(Aq for 802\&.1ad\&.
 T}
 .TE
 .sp 1
diff --git a/man/nm-settings.xml b/man/nm-settings.xml
index bd255cb1..5e7029e0 100644
--- a/man/nm-settings.xml
+++ b/man/nm-settings.xml
@@ -1,6 +1,6 @@
 
 
-nm-settingsNetworkManager developersnm-settings5NetworkManagerConfiguration1.14.4nm-settingsDescription of settings and properties of NetworkManager connection profilesDescription
+nm-settingsNetworkManager developersnm-settings5NetworkManagerConfiguration1.14.6nm-settingsDescription of settings and properties of NetworkManager connection profilesDescription
           NetworkManager is based on a concept of connection profiles, sometimes referred to as
           connections only. These connection profiles contain a network configuration. When
           NetworkManager activates a connection profile on a network device the configuration will
@@ -52,7 +52,7 @@
     read-onlybooleanFALSEFALSE 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.
     secondariesarray of string[]List of connection UUIDs that should be activated when the base connection itself is activated. Currently only VPN connections are supported.
     slave-typestringSetting name of the device type of this slave's master connection (eg, "bond"), or NULL if this connection is not a slave.
-    stable-idstringThis 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 as DHCP client identifier with ipv4.dhcp-client-id=stable and to derive the DHCP DUID with ipv6.dhcp-duid=stable-[llt,ll,uuid]. 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 '$' character is treated special to perform dynamic substitutions at runtime. Currently supported are "${CONNECTION}", "${DEVICE}", "${BOOT}", "${RANDOM}". These effectively create unique IDs per-connection, per-device, per-boot, or every time. Note that "${DEVICE}" corresponds the the interface name 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.
+    stable-idstringThis 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 as DHCP client identifier with ipv4.dhcp-client-id=stable and to derive the DHCP DUID with ipv6.dhcp-duid=stable-[llt,ll,uuid]. 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 '$' 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 the 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.
     timestampuint640The 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).
     typestringBase type of the connection. For hardware-dependent connections, should contain the setting name of the hardware-type specific setting (ie, "802-3-ethernet" or "802-11-wireless" or "bluetooth", etc), and for non-hardware dependent connections like VPN or otherwise, should contain the setting name of that setting type (ie, "vpn" or "bridge", etc).
     uuidstringA universally unique identifier for the connection, for example generated with libuuid.  It should be assigned when the connection is created, and never changed as long as the connection still applies to the same network.  For example, it should not be changed when the "id" property or NMSettingIP4Config changes, but might need to be re-created when the Wi-Fi SSID, mobile broadband network provider, or "type" property changes. The UUID must be in the format "2815492f-7e56-435e-b2e9-246bd7cdc664" (ie, contains only hexadecimal characters and "-").
@@ -197,7 +197,7 @@
     address-dataarray of vardictArray of IPv4 addresses. Each address dictionary contains at least 'address' and 'prefix' entries, containing the IP address as a string, and the prefix length as a uint32. Additional attributes may also exist on some addresses.
     addressesarray of array of uint32[]Deprecated in favor of the 'address-data' and 'gateway' properties, but this can be used for backward-compatibility with older daemons. Note that if you send this property the daemon will ignore 'address-data' and 'gateway'.  Array of IPv4 address structures.  Each IPv4 address structure is composed of 3 32-bit values; the first being the IPv4 address (network byte order), the second the prefix (1 - 32), and last the IPv4 gateway (network byte order). The gateway may be left as 0 if no gateway exists for that subnet.
     dad-timeoutint32-1Timeout in milliseconds used to check for the presence of duplicate IP addresses on the network.  If an address conflict is detected, the activation will fail.  A zero value means that no duplicate address detection is performed, -1 means the default value (either configuration ipvx.dad-timeout override or zero).  A value greater than zero is a timeout in milliseconds. The property is currently implemented only for IPv4.
-    dhcp-client-idstringA string sent to the DHCP server to identify the local machine which the DHCP server may use to customize the DHCP lease and options. When the property is a hex string ('aa:bb:cc') it is interpreted as a binary client ID, in which case the first byte is assumed to be the 'type' field as per RFC 2132 section 9.14 and the remaining bytes may be an hardware address (e.g. '01:xx:xx:xx:xx:xx:xx' where 1 is the Ethernet ARP type and the rest is a MAC address). If the property is not a hex string it is considered as a non-hardware-address client ID and the 'type' field is set to 0. The special values "mac" and "perm-mac" are supported, which use the current or permanent MAC address of the device to generate a client identifier with type ethernet (01). Currently, these options only work for ethernet type of links. The special value "stable" is supported to generate a type 0 client identifier based on the stable-id (see connection.stable-id) and a per-host key. If unset, a globally configured default is used. If still unset, the client-id from the last lease is reused.
+    dhcp-client-idstringA string sent to the DHCP server to identify the local machine which the DHCP server may use to customize the DHCP lease and options. When the property is a hex string ('aa:bb:cc') it is interpreted as a binary client ID, in which case the first byte is assumed to be the 'type' field as per RFC 2132 section 9.14 and the remaining bytes may be an hardware address (e.g. '01:xx:xx:xx:xx:xx:xx' where 1 is the Ethernet ARP type and the rest is a MAC address). If the property is not a hex string it is considered as a non-hardware-address client ID and the 'type' field is set to 0. The special values "mac" and "perm-mac" are supported, which use the current or permanent MAC address of the device to generate a client identifier with type ethernet (01). Currently, these options only work for ethernet type of links. The special value "duid" generates a RFC4361-compliant client identifier based on a hash of the interface name as IAID and /etc/machine-id. The special value "stable" is supported to generate a type 0 client identifier based on the stable-id (see connection.stable-id) and a per-host key. If you set the stable-id, you may want to include the "${DEVICE}" or "${MAC}" specifier to get a per-device key. If unset, a globally configured default is used. If still unset, the default depends on the DHCP plugin.
     dhcp-fqdnstringIf the "dhcp-send-hostname" property is TRUE, then the specified FQDN will be sent to the DHCP server when acquiring a lease. This property and "dhcp-hostname" are mutually exclusive and cannot be set at the same time.
     dhcp-hostnamestringIf the "dhcp-send-hostname" property is TRUE, then the specified name will be sent to the DHCP server when acquiring a lease. This property and "dhcp-fqdn" are mutually exclusive and cannot be set at the same time.
     dhcp-send-hostnamebooleanTRUEIf TRUE, a hostname is sent to the DHCP server when acquiring a lease. Some DHCP servers use this hostname to update DNS databases, essentially providing a static hostname for the computer.  If the "dhcp-hostname" property is NULL and this property is TRUE, the current persistent hostname of the computer is sent.
@@ -222,7 +222,7 @@
     address-dataarray of vardictArray of IPv6 addresses. Each address dictionary contains at least 'address' and 'prefix' entries, containing the IP address as a string, and the prefix length as a uint32. Additional attributes may also exist on some addresses.
     addressesarray of legacy IPv6 address struct (a(ayuay))[]Deprecated in favor of the 'address-data' and 'gateway' properties, but this can be used for backward-compatibility with older daemons. Note that if you send this property the daemon will ignore 'address-data' and 'gateway'.  Array of IPv6 address structures.  Each IPv6 address structure is composed of an IPv6 address, a prefix length (1 - 128), and an IPv6 gateway address. The gateway may be zeroed out if no gateway exists for that subnet.
     dad-timeoutint32-1Timeout in milliseconds used to check for the presence of duplicate IP addresses on the network.  If an address conflict is detected, the activation will fail.  A zero value means that no duplicate address detection is performed, -1 means the default value (either configuration ipvx.dad-timeout override or zero).  A value greater than zero is a timeout in milliseconds. The property is currently implemented only for IPv4.
-    dhcp-duidstringA string containing the DHCPv6 Unique Identifier (DUID) used by the dhcp client to identify itself to DHCPv6 servers (RFC 3315). The DUID is carried in the Client Identifier option. If the property is a hex string ('aa:bb:cc') it is interpreted as a binary DUID and filled as an opaque value in the Client Identifier option. The special value "lease" will retrieve the DUID previously used from the lease file belonging to the connection. If no DUID is found and "dhclient" is the configured dhcp client, the DUID is searched in the system-wide dhclient lease file. If still no DUID is found, or another dhcp client is used, a global and permanent DUID-UUID (RFC 6355) will be generated based on the machine-id. The special values "llt" and "ll" will generate a DUID of type LLT or LL (see RFC 3315) based on the current MAC address of the device. In order to try providing a stable DUID-LLT, the time field will contain a constant timestamp that is used globally (for all profiles) and persisted to disk. The special values "stable-llt", "stable-ll" and "stable-uuid" will generate a DUID of the corresponding type, derived from the connection's stable-id and a per-host unique key. So, the link-layer address of "stable-ll" and "stable-llt" will be a generated address derived from the stable id. The DUID-LLT time value in the "stable-llt" option will be picked among a static timespan of three years (the upper bound of the interval is the same constant timestamp used in "llt"). When the property is unset, the global value provided for "ipv6.dhcp-duid" is used. If no global value is provided, the default "lease" value is assumed.
+    dhcp-duidstringA string containing the DHCPv6 Unique Identifier (DUID) used by the dhcp client to identify itself to DHCPv6 servers (RFC 3315). The DUID is carried in the Client Identifier option. If the property is a hex string ('aa:bb:cc') it is interpreted as a binary DUID and filled as an opaque value in the Client Identifier option. The special value "lease" will retrieve the DUID previously used from the lease file belonging to the connection. If no DUID is found and "dhclient" is the configured dhcp client, the DUID is searched in the system-wide dhclient lease file. If still no DUID is found, or another dhcp client is used, a global and permanent DUID-UUID (RFC 6355) will be generated based on the machine-id. The special values "llt" and "ll" will generate a DUID of type LLT or LL (see RFC 3315) based on the current MAC address of the device. In order to try providing a stable DUID-LLT, the time field will contain a constant timestamp that is used globally (for all profiles) and persisted to disk. The special values "stable-llt", "stable-ll" and "stable-uuid" will generate a DUID of the corresponding type, derived from the connection's stable-id and a per-host unique key. You may want to include the "${DEVICE}" or "${MAC}" specifier in the stable-id, in case this profile gets activated on multiple devices. So, the link-layer address of "stable-ll" and "stable-llt" will be a generated address derived from the stable id. The DUID-LLT time value in the "stable-llt" option will be picked among a static timespan of three years (the upper bound of the interval is the same constant timestamp used in "llt"). When the property is unset, the global value provided for "ipv6.dhcp-duid" is used. If no global value is provided, the default "lease" value is assumed.
     dhcp-hostnamestringIf the "dhcp-send-hostname" property is TRUE, then the specified name will be sent to the DHCP server when acquiring a lease. This property and "dhcp-fqdn" are mutually exclusive and cannot be set at the same time.
     dhcp-send-hostnamebooleanTRUEIf TRUE, a hostname is sent to the DHCP server when acquiring a lease. Some DHCP servers use this hostname to update DNS databases, essentially providing a static hostname for the computer.  If the "dhcp-hostname" property is NULL and this property is TRUE, the current persistent hostname of the computer is sent.
     dhcp-timeoutint320A timeout for a DHCP transaction in seconds.
@@ -345,8 +345,8 @@
   
   sriov settingSR-IOV settings..Key NameValue TypeDefault ValueValue Description
     autoprobe-driversNMTernary (int32)Whether to autoprobe virtual functions by a compatible driver. If set to NM_TERNARY_TRUE (1), the kernel will try to bind VFs to a compatible driver and if this succeeds a new network interface will be instantiated for each VF. If set to NM_TERNARY_FALSE (0), VFs will not be claimed and no network interfaces will be created for them. When set to NM_TERNARY_DEFAULT (-1), the global default is used; in case the global default is unspecified it is assumed to be NM_TERNARY_TRUE (1).
-    total-vfsuint320The total number of virtual functions to create.
-    vfsarray of vardict[]Array of virtual function descriptors. Each VF descriptor is a dictionary mapping attribute names to GVariant values. The 'index' entry is mandatory for each VF. When represented as string a VF is in the form: "INDEX [ATTR=VALUE[ ATTR=VALUE]...]". for example: "2 mac=00:11:22:33:44:55 spoof-check=true". The "vlans" attribute is represented as a semicolor-separated list of VLAN descriptors, where each descriptor has the form "ID[.PRIORITY[.PROTO]]". PROTO can be either 'q' for 802.1Q (the default) or 'ad' for 802.1ad.
+    total-vfsuint320The total number of virtual functions to create. Note that when the sriov setting is present NetworkManager enforces the number of virtual functions on the interface also when it is zero. To prevent any changes to SR-IOV parameters don't add a sriov setting to the connection.
+    vfsarray of vardict[]Array of virtual function descriptors. Each VF descriptor is a dictionary mapping attribute names to GVariant values. The 'index' entry is mandatory for each VF. When represented as string a VF is in the form: "INDEX [ATTR=VALUE[ ATTR=VALUE]...]". for example: "2 mac=00:11:22:33:44:55 spoof-check=true". Multiple VFs can be specified using a comma as separator. Currently the following attributes are supported: mac, spoof-check, trust, min-tx-rate, max-tx-rate, vlans. The "vlans" attribute is represented as a semicolon-separated list of VLAN descriptors, where each descriptor has the form "ID[.PRIORITY[.PROTO]]". PROTO can be either 'q' for 802.1Q (the default) or 'ad' for 802.1ad.
   
   tc settingLinux Traffic Control Settings..Key NameValue TypeDefault ValueValue Description
     qdiscsarray of vardict[]Array of TC queueing disciplines.
diff --git a/man/nmcli-examples.7 b/man/nmcli-examples.7
index b5a5e7d3..0bdbc359 100644
--- a/man/nmcli-examples.7
+++ b/man/nmcli-examples.7
@@ -2,12 +2,12 @@
 .\"     Title: nmcli-examples
 .\"    Author: 
 .\" Generator: DocBook XSL Stylesheets vsnapshot 
-.\"      Date: 10/24/2018
+.\"      Date: 02/23/2019
 .\"    Manual: Examples
-.\"    Source: NetworkManager 1.14.4
+.\"    Source: NetworkManager 1.14.6
 .\"  Language: English
 .\"
-.TH "NMCLI\-EXAMPLES" "7" "" "NetworkManager 1\&.14\&.4" "Examples"
+.TH "NMCLI\-EXAMPLES" "7" "" "NetworkManager 1\&.14\&.6" "Examples"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -352,7 +352,30 @@ This example shows retrieval of ip4 connection field values via the \-\-get\-val
 \fBnmcli\fR(1)
 manual page for more customized output\&.
 .PP
-\fBExample\ \&11.\ \&Escaping colon characters in tabular mode\fR
+\fBExample\ \&11.\ \&Adding an Ethernet connection and configuring SR\-IOV VFs\fR
+.sp
+.if n \{\
+.RS 4
+.\}
+.nf
+$ \fBnmcli con add type ethernet con\-name EthernetPF ifname em1\fR
+$ \fBnmcli con modify EthernetPF sriov\&.total\-vfs 3 sriov\&.autoprobe\-drivers false\fR
+$ \fBnmcli con modify EthernetPF sriov\&.vfs \*(Aq0 mac=00:11:22:33:44:55 vlans=10, 1 trust=true spoof\-check=false\*(Aq\fR
+$ \fBnmcli con modify EthernetPF +sriov\&.vfs \*(Aq2 max\-tx\-rate=20\*(Aq\fR
+.fi
+.if n \{\
+.RE
+.\}
+.PP
+This example demonstrates adding an Ethernet connection for physical function (PF)
+\fIens4\fR
+and configuring 3 SR\-IOV virtual functions (VFs) on it\&. The first VF is configured with MAC address 00:11:22:33:44:55 and VLAN 10, the second one has the
+\fItrust\fR
+and
+\fIspoof\-check\fR
+features respectively enabled and disabled\&. VF number 2 has a maximux transmission rate of 20Mbps\&. The kernel is instructed to not automatically instantiate a network interface for the VFs\&.
+.PP
+\fBExample\ \&12.\ \&Escaping colon characters in tabular mode\fR
 .sp
 .if n \{\
 .RS 4
@@ -371,7 +394,7 @@ nager/ActiveConnection/9
 .PP
 This example shows escaping colon characters in tabular mode\&. It may be useful for script processing, because \*(Aq:\*(Aq is used as a field separator\&.
 .PP
-\fBExample\ \&12.\ \&nmcli usage in a NetworkManager dispatcher script to make Ethernet and Wi\-Fi mutually exclusive\fR
+\fBExample\ \&13.\ \&nmcli usage in a NetworkManager dispatcher script to make Ethernet and Wi\-Fi mutually exclusive\fR
 .sp
 .if n \{\
 .RS 4
@@ -409,7 +432,7 @@ manual page for more information about NetworkManager dispatcher scripts\&.
 .PP
 \fBExample sessions of interactive connection editor\fR
 .PP
-\fBExample\ \&13.\ \&Adding an ethernet connection profile in interactive editor (a)\fR
+\fBExample\ \&14.\ \&Adding an ethernet connection profile in interactive editor (a)\fR
 .sp
 .if n \{\
 .RS 4
diff --git a/man/nmcli-examples.xml b/man/nmcli-examples.xml
index 0b15f112..8be3903a 100644
--- a/man/nmcli-examples.xml
+++ b/man/nmcli-examples.xml
@@ -272,6 +272,23 @@ IP4:192.168.1.12/24:192.168.1.1::192.168.1.1::
       
     
 
+    Adding an Ethernet connection and configuring SR-IOV VFs
+$ nmcli con add type ethernet con-name EthernetPF ifname em1
+$ nmcli con modify EthernetPF sriov.total-vfs 3 sriov.autoprobe-drivers false
+$ nmcli con modify EthernetPF sriov.vfs '0 mac=00:11:22:33:44:55 vlans=10, 1 trust=true spoof-check=false'
+$ nmcli con modify EthernetPF +sriov.vfs '2 max-tx-rate=20'
+      
+        This example demonstrates adding an Ethernet connection for
+        physical function (PF) ens4 and
+        configuring 3 SR-IOV virtual functions (VFs) on it. The first
+        VF is configured with MAC address 00:11:22:33:44:55 and VLAN
+        10, the second one has the trust and
+        spoof-check features respectively enabled
+        and disabled. VF number 2 has a maximux transmission rate of
+        20Mbps. The kernel is instructed to not automatically
+        instantiate a network interface for the VFs.
+      
+    
 
     Escaping colon characters in tabular mode
 $ nmcli -t -f general -e yes -m tab dev show eth0
diff --git a/man/nmcli.1 b/man/nmcli.1
index 00fdcdd4..00ab979b 100644
--- a/man/nmcli.1
+++ b/man/nmcli.1
@@ -2,12 +2,12 @@
 .\"     Title: nmcli
 .\"    Author: 
 .\" Generator: DocBook XSL Stylesheets vsnapshot 
-.\"      Date: 10/24/2018
+.\"      Date: 02/23/2019
 .\"    Manual: General Commands Manual
-.\"    Source: NetworkManager 1.14.4
+.\"    Source: NetworkManager 1.14.6
 .\"  Language: English
 .\"
-.TH "NMCLI" "1" "" "NetworkManager 1\&.14\&.4" "General Commands Manual"
+.TH "NMCLI" "1" "" "NetworkManager 1\&.14\&.6" "General Commands Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/nmtui.1 b/man/nmtui.1
index 7a27832b..f87bc088 100644
--- a/man/nmtui.1
+++ b/man/nmtui.1
@@ -2,12 +2,12 @@
 .\"     Title: nmtui
 .\"    Author: 
 .\" Generator: DocBook XSL Stylesheets vsnapshot 
-.\"      Date: 10/24/2018
+.\"      Date: 02/23/2019
 .\"    Manual: General Commands Manual
-.\"    Source: NetworkManager 1.14.4
+.\"    Source: NetworkManager 1.14.6
 .\"  Language: English
 .\"
-.TH "NMTUI" "1" "" "NetworkManager 1\&.14\&.4" "General Commands Manual"
+.TH "NMTUI" "1" "" "NetworkManager 1\&.14\&.6" "General Commands Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/meson.build b/meson.build
index eebc7232..7627c2a9 100644
--- a/meson.build
+++ b/meson.build
@@ -4,7 +4,7 @@ project(
 #  - add corresponding NM_VERSION_x_y_z macros in
 #    "shared/nm-version-macros.h.in"
 #  - update number in configure.ac
-  version: '1.14.4',
+  version: '1.14.6',
   license: 'GPL2+',
   default_options: [
     'buildtype=debugoptimized',
diff --git a/meson_options.txt b/meson_options.txt
index 0f93d77f..f4c8e5ee 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -73,4 +73,3 @@ option('libpsl', type: 'boolean', value: true, description: 'Link against libpsl
 option('json_validation', type: 'boolean', value: true, description: 'Enable JSON validation in libnm')
 option('crypto', type: 'combo', choices: ['nss', 'gnutls'], value: 'nss', description: 'Cryptography library to use for certificate and key operations')
 option('qt', type: 'boolean', value: true, description: 'enable Qt examples')
-option('check_settings_docs', type: 'boolean', value: false, description: 'compare check settings-docs.h file')
diff --git a/shared/nm-utils/nm-hash-utils.c b/shared/nm-utils/nm-hash-utils.c
index 4bc12b7c..80387c71 100644
--- a/shared/nm-utils/nm-hash-utils.c
+++ b/shared/nm-utils/nm-hash-utils.c
@@ -40,53 +40,66 @@ static const guint8 *volatile global_seed = NULL;
 static const guint8 *
 _get_hash_key_init (void)
 {
+	static gsize g_lock;
 	/* the returned hash is aligned to guin64, hence, it is safe
 	 * to use it as guint* or guint64* pointer. */
 	static union {
 		guint8 v8[HASH_KEY_SIZE];
 	} g_arr _nm_alignas (guint64);
-	static gsize g_lock;
 	const guint8 *g;
-	CSipHash siph_state;
-	uint64_t h;
-	guint *p;
+	union {
+		guint8 v8[HASH_KEY_SIZE];
+		guint vuint;
+	} t_arr;
 
-	g = global_seed;
+again:
+	g = g_atomic_pointer_get (&global_seed);
 	if (G_LIKELY (g != NULL)) {
 		nm_assert (g == g_arr.v8);
 		return g;
 	}
 
-	if (g_once_init_enter (&g_lock)) {
+	{
+		CSipHash siph_state;
+		uint64_t h;
 
-		nm_utils_random_bytes (g_arr.v8, sizeof (g_arr.v8));
+		/* initialize a random key in t_arr. */
+
+		nm_utils_random_bytes (&t_arr, sizeof (t_arr));
 
 		/* use siphash() of the key-size, to mangle the first guint. Otherwise,
 		 * the first guint has only the entropy that nm_utils_random_bytes()
-		 * generated for the first 4 bytes and relies on a good random generator. */
-		c_siphash_init (&siph_state, g_arr.v8);
-		c_siphash_append (&siph_state, g_arr.v8, sizeof (g_arr.v8));
+		 * generated for the first 4 bytes and relies on a good random generator.
+		 *
+		 * The first int is especially intersting for nm_hash_static() below, and we
+		 * want to have it all the entropy of t_arr. */
+		c_siphash_init (&siph_state, t_arr.v8);
+		c_siphash_append (&siph_state, (const guint8 *) &t_arr, sizeof (t_arr));
 		h = c_siphash_finalize (&siph_state);
-		p = (guint *) g_arr.v8;
 		if (sizeof (guint) < sizeof (h))
-			*p = *p ^ ((guint) (h & 0xFFFFFFFFu)) ^ ((guint) (h >> 32));
+			t_arr.vuint = t_arr.vuint ^ ((guint) (h & 0xFFFFFFFFu)) ^ ((guint) (h >> 32));
 		else
-			*p = *p ^ ((guint) (h & 0xFFFFFFFFu));
+			t_arr.vuint = t_arr.vuint ^ ((guint) (h & 0xFFFFFFFFu));
+	}
 
-		g_atomic_pointer_compare_and_exchange (&global_seed, NULL, g_arr.v8);
-		g_once_init_leave (&g_lock, 1);
+	if (!g_once_init_enter (&g_lock)) {
+		/* lost a race. The random key is already initialized. */
+		goto again;
 	}
 
-	nm_assert (global_seed == g_arr.v8);
-	return g_arr.v8;
+	memcpy (g_arr.v8, t_arr.v8, HASH_KEY_SIZE);
+	g = g_arr.v8;
+	g_atomic_pointer_set (&global_seed, g);
+	g_once_init_leave (&g_lock, 1);
+	return g;
 }
 
 #define _get_hash_key() \
 	({ \
 		const guint8 *_g; \
 		\
-		_g = global_seed; \
-		if (G_UNLIKELY (_g == NULL)) \
+		_g = g_atomic_pointer_get (&global_seed); \
+		if (G_UNLIKELY (!_g)) \
 			_g = _get_hash_key_init (); \
 		_g; \
 	})
@@ -109,17 +122,17 @@ nm_hash_static (guint static_seed)
 }
 
 void
-nm_hash_init (NMHashState *state, guint static_seed)
+nm_hash_siphash42_init (CSipHash *h, guint static_seed)
 {
 	const guint8 *g;
 	guint seed[HASH_KEY_SIZE_GUINT];
 
-	nm_assert (state);
+	nm_assert (h);
 
 	g = _get_hash_key ();
 	memcpy (seed, g, HASH_KEY_SIZE);
 	seed[0] ^= static_seed;
-	c_siphash_init (&state->_state, (const guint8 *) seed);
+	c_siphash_init (h, (const guint8 *) seed);
 }
 
 guint
diff --git a/shared/nm-utils/nm-hash-utils.h b/shared/nm-utils/nm-hash-utils.h
index b797fb75..cf71a7e9 100644
--- a/shared/nm-utils/nm-hash-utils.h
+++ b/shared/nm-utils/nm-hash-utils.h
@@ -25,6 +25,39 @@
 #include "c-siphash/src/c-siphash.h"
 #include "nm-macros-internal.h"
 
+/*****************************************************************************/
+
+void nm_hash_siphash42_init (CSipHash *h, guint static_seed);
+
+/* Siphash24 of binary buffer @arr and @len, using the randomized seed from
+ * other NMHash functions.
+ *
+ * Note, that this is guaranteed to use siphash42 under the hood (contrary to
+ * all other NMHash API, which leave this undefined). That matters at the point,
+ * where the caller needs to be sure that a reasonably strong hasing algorithm
+ * is used.  (Yes, NMHash is all about siphash24, but otherwise that is not promised
+ * anywhere).
+ *
+ * Another difference is, that this returns guint64 (not guint like other NMHash functions).
+ *
+ * Another difference is, that this may also return zero (not like nm_hash_complete()).
+ *
+ * Then, why not use c_siphash_hash() directly? Because this also uses the randomized,
+ * per-run hash-seed like nm_hash_init(). So, you get siphash24 with a random
+ * seed (which is cached for the current run of the program).
+ */
+static inline guint64
+nm_hash_siphash42 (guint static_seed, const void *ptr, gsize n)
+{
+	CSipHash h;
+
+	nm_hash_siphash42_init (&h, static_seed);
+	c_siphash_append (&h, ptr, n);
+	return c_siphash_finalize (&h);
+}
+
+/*****************************************************************************/
+
 struct _NMHashState {
 	CSipHash _state;
 };
@@ -33,16 +66,33 @@ typedef struct _NMHashState NMHashState;
 
 guint nm_hash_static (guint static_seed);
 
-void nm_hash_init (NMHashState *state, guint static_seed);
+static inline void
+nm_hash_init (NMHashState *state, guint static_seed)
+{
+	nm_assert (state);
+
+	nm_hash_siphash42_init (&state->_state, static_seed);
+}
+
+static inline guint64
+nm_hash_complete_u64 (NMHashState *state)
+{
+	nm_assert (state);
+
+	/* this returns the native u64 hash value. Note that this differs
+	 * from nm_hash_complete() in two ways:
+	 *
+	 * - the type, guint64 vs. guint.
+	 * - nm_hash_complete() never returns zero. */
+	return c_siphash_finalize (&state->_state);
+}
 
 static inline guint
 nm_hash_complete (NMHashState *state)
 {
 	guint64 h;
 
-	nm_assert (state);
-
-	h = c_siphash_finalize (&state->_state);
+	h = nm_hash_complete_u64 (state);
 
 	/* we don't ever want to return a zero hash.
 	 *
@@ -218,8 +268,8 @@ guint nm_str_hash (gconstpointer str);
 	({ \
 		NMHashState _h; \
 		\
-		nm_hash_init (&_h, static_seed); \
-		nm_hash_update_val (&_h, val); \
+		nm_hash_init (&_h, (static_seed)); \
+		nm_hash_update_val (&_h, (val)); \
 		nm_hash_complete (&_h); \
 	})
 
diff --git a/shared/nm-utils/nm-jansson.h b/shared/nm-utils/nm-jansson.h
index b00c75c6..cacf87a6 100644
--- a/shared/nm-utils/nm-jansson.h
+++ b/shared/nm-utils/nm-jansson.h
@@ -41,6 +41,9 @@
             n = json_object_iter_next(object, json_object_key_to_iter(key)))
 #endif
 
+NM_AUTO_DEFINE_FCN0 (json_t *, _nm_auto_decref_json, json_decref)
+#define nm_auto_decref_json nm_auto(_nm_auto_decref_json)
+
 #endif /* WITH_JANSON */
 
 #endif  /* __NM_JANSSON_H__ */
diff --git a/shared/nm-utils/nm-macros-internal.h b/shared/nm-utils/nm-macros-internal.h
index 084219b4..9059783f 100644
--- a/shared/nm-utils/nm-macros-internal.h
+++ b/shared/nm-utils/nm-macros-internal.h
@@ -639,6 +639,9 @@ NM_G_ERROR_MSG (GError *error)
 #define NM_PROPAGATE_CONST(test_expr, ptr) (ptr)
 #endif
 
+#define NM_MAKE_STRV(...) \
+	((const char *const[]) { __VA_ARGS__, NULL })
+
 /*****************************************************************************/
 
 #define _NM_IN_SET_EVAL_1( op, _x, y)           (_x == (y))
@@ -1321,6 +1324,16 @@ nm_strcmp_p (gconstpointer a, gconstpointer b)
 		     : NM_UNIQ_T(X,xq)); \
 	})
 
+#define NM_MAX_WITH_CMP(cmp, a, b) \
+	({ \
+		typeof (a) _a = (a); \
+		typeof (b) _b = (b); \
+		\
+		(  ((cmp (_a, _b)) >= 0) \
+		 ? _a \
+		 : _b); \
+	})
+
 /*****************************************************************************/
 
 static inline guint
diff --git a/shared/nm-utils/nm-shared-utils.c b/shared/nm-utils/nm-shared-utils.c
index ba38237b..d399ce3f 100644
--- a/shared/nm-utils/nm-shared-utils.c
+++ b/shared/nm-utils/nm-shared-utils.c
@@ -1081,11 +1081,24 @@ nm_utils_error_is_cancelled (GError *error,
                              gboolean consider_is_disposing)
 {
 	if (error) {
-		if (g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED))
-			return TRUE;
-		if (   consider_is_disposing
-		    && g_error_matches (error, NM_UTILS_ERROR, NM_UTILS_ERROR_CANCELLED_DISPOSING))
-			return TRUE;
+		if (error->domain == G_IO_ERROR)
+			return NM_IN_SET (error->code, G_IO_ERROR_CANCELLED);
+		if (consider_is_disposing) {
+			if (error->domain == NM_UTILS_ERROR)
+				return NM_IN_SET (error->code, NM_UTILS_ERROR_CANCELLED_DISPOSING);
+		}
+	}
+	return FALSE;
+}
+
+gboolean
+nm_utils_error_is_notfound (GError *error)
+{
+	if (error) {
+		if (error->domain == G_IO_ERROR)
+			return NM_IN_SET (error->code, G_IO_ERROR_NOT_FOUND);
+		if (error->domain == G_FILE_ERROR)
+			return NM_IN_SET (error->code, G_FILE_ERROR_NOENT);
 	}
 	return FALSE;
 }
diff --git a/shared/nm-utils/nm-shared-utils.h b/shared/nm-utils/nm-shared-utils.h
index 3ea887b4..82eebc9d 100644
--- a/shared/nm-utils/nm-shared-utils.h
+++ b/shared/nm-utils/nm-shared-utils.h
@@ -379,6 +379,46 @@ char **_nm_utils_strv_cleanup (char **strv,
 
 /*****************************************************************************/
 
+#define NM_UTILS_CHECKSUM_LENGTH_MD5          16
+#define NM_UTILS_CHECKSUM_LENGTH_SHA1         20
+#define NM_UTILS_CHECKSUM_LENGTH_SHA256       32
+
+#define nm_utils_checksum_get_digest(sum, arr) \
+	G_STMT_START { \
+		GChecksum *const _sum = (sum); \
+		gsize _len; \
+		\
+		G_STATIC_ASSERT_EXPR (   sizeof (arr) == NM_UTILS_CHECKSUM_LENGTH_MD5 \
+		                      || sizeof (arr) == NM_UTILS_CHECKSUM_LENGTH_SHA1 \
+		                      || sizeof (arr) == NM_UTILS_CHECKSUM_LENGTH_SHA256); \
+		G_STATIC_ASSERT_EXPR (sizeof (arr) == G_N_ELEMENTS (arr)); \
+		\
+		nm_assert (_sum); \
+		\
+		_len = G_N_ELEMENTS (arr); \
+		\
+		g_checksum_get_digest (_sum, (arr), &_len); \
+		nm_assert (_len == G_N_ELEMENTS (arr)); \
+	} G_STMT_END
+
+#define nm_utils_checksum_get_digest_len(sum, buf, len) \
+	G_STMT_START { \
+		GChecksum *const _sum = (sum); \
+		const gsize _len0 = (len); \
+		gsize _len; \
+		\
+		nm_assert (NM_IN_SET (_len0, NM_UTILS_CHECKSUM_LENGTH_MD5, \
+		                             NM_UTILS_CHECKSUM_LENGTH_SHA1, \
+		                             NM_UTILS_CHECKSUM_LENGTH_SHA256)); \
+		nm_assert (_sum); \
+		\
+		_len = _len0; \
+		g_checksum_get_digest (_sum, (buf), &_len); \
+		nm_assert (_len == _len0); \
+	} G_STMT_END
+
+/*****************************************************************************/
+
 guint32 _nm_utils_ip4_prefix_to_netmask (guint32 prefix);
 guint32 _nm_utils_ip4_get_default_prefix (guint32 ip);
 
@@ -605,6 +645,8 @@ void nm_utils_error_set_cancelled (GError **error,
 gboolean nm_utils_error_is_cancelled (GError *error,
                                       gboolean consider_is_disposing);
 
+gboolean nm_utils_error_is_notfound (GError *error);
+
 static inline void
 nm_utils_error_set_literal (GError **error, int error_code, const char *literal)
 {
diff --git a/shared/nm-utils/nm-test-utils.h b/shared/nm-utils/nm-test-utils.h
index c8139862..7decd363 100644
--- a/shared/nm-utils/nm-test-utils.h
+++ b/shared/nm-utils/nm-test-utils.h
@@ -1337,6 +1337,42 @@ _nmtst_assert_resolve_relative_path_equals (const char *f1, const char *f2, cons
 
 /*****************************************************************************/
 
+#ifdef __NETWORKMANAGER_LOGGING_H__
+static inline gpointer
+nmtst_logging_disable (gboolean always)
+{
+	gpointer p;
+
+	g_assert (nmtst_initialized ());
+	if (!always && __nmtst_internal.no_expect_message) {
+		/* The caller does not want to @always suppress logging. Instead,
+		 * the caller wants to suppress unexpected log messages that would
+		 * fail assertions (since we possibly assert against all unexpected
+		 * log messages).
+		 *
+		 * If the test is run with no-expect-message, then don't suppress
+		 * the loggings, because they also wouldn't fail assertions. */
+		return NULL;
+	}
+
+	p = g_memdup (_nm_logging_enabled_state, sizeof (_nm_logging_enabled_state));
+	memset (_nm_logging_enabled_state, 0, sizeof (_nm_logging_enabled_state));
+	return p;
+}
+
+static inline void
+nmtst_logging_reenable (gpointer old_state)
+{
+	g_assert (nmtst_initialized ());
+	if (old_state) {
+		memcpy (_nm_logging_enabled_state, old_state, sizeof (_nm_logging_enabled_state));
+		g_free (old_state);
+	}
+}
+#endif
+
+/*****************************************************************************/
+
 #ifdef NM_SETTING_IP_CONFIG_H
 static inline void
 nmtst_setting_ip_config_add_address (NMSettingIPConfig *s_ip,
diff --git a/shared/nm-utils/nm-udev-utils.c b/shared/nm-utils/nm-udev-utils.c
index 709f7590..5d0919b3 100644
--- a/shared/nm-utils/nm-udev-utils.c
+++ b/shared/nm-utils/nm-udev-utils.c
@@ -241,26 +241,23 @@ nm_udev_client_new (const char *const*subsystems,
 		if (self->subsystems) {
 			/* install subsystem filters to only wake up for certain events */
 			for (n = 0; self->subsystems[n]; n++) {
-				if (self->monitor) {
-					gs_free char *to_free = NULL;
-					const char *subsystem;
-					const char *devtype;
-
-					_subsystem_split (self->subsystems[n], &subsystem, &devtype, &to_free);
-					udev_monitor_filter_add_match_subsystem_devtype (self->monitor, subsystem, devtype);
-				}
+				gs_free char *to_free = NULL;
+				const char *subsystem;
+				const char *devtype;
+
+				_subsystem_split (self->subsystems[n], &subsystem, &devtype, &to_free);
+				udev_monitor_filter_add_match_subsystem_devtype (self->monitor, subsystem, devtype);
 			}
 
 			/* listen to events, and buffer them */
-			if (self->monitor) {
-				udev_monitor_enable_receiving (self->monitor);
-				channel = g_io_channel_unix_new (udev_monitor_get_fd (self->monitor));
-				self->watch_source = g_io_create_watch (channel, G_IO_IN);
-				g_io_channel_unref (channel);
-				g_source_set_callback (self->watch_source, (GSourceFunc)(void (*) (void)) monitor_event, self, NULL);
-				g_source_attach (self->watch_source, g_main_context_get_thread_default ());
-				g_source_unref (self->watch_source);
-			}
+			udev_monitor_set_receive_buffer_size (self->monitor, 4*1024*1024);
+			udev_monitor_enable_receiving (self->monitor);
+			channel = g_io_channel_unix_new (udev_monitor_get_fd (self->monitor));
+			self->watch_source = g_io_create_watch (channel, G_IO_IN);
+			g_io_channel_unref (channel);
+			g_source_set_callback (self->watch_source, (GSourceFunc)(void (*) (void)) monitor_event, self, NULL);
+			g_source_attach (self->watch_source, g_main_context_get_thread_default ());
+			g_source_unref (self->watch_source);
 		}
 	}
 
diff --git a/shared/nm-version-macros.h b/shared/nm-version-macros.h
index e9f61081..7dc2760e 100644
--- a/shared/nm-version-macros.h
+++ b/shared/nm-version-macros.h
@@ -45,7 +45,7 @@
  * Evaluates to the micro version number of NetworkManager which this source
  * compiled against.
  */
-#define NM_MICRO_VERSION (4)
+#define NM_MICRO_VERSION (6)
 
 /**
  * NM_CHECK_VERSION:
@@ -76,6 +76,7 @@
 #define NM_VERSION_1_14   (NM_ENCODE_VERSION (1, 14, 0))
 #define NM_VERSION_1_14_2 (NM_ENCODE_VERSION (1, 14, 2))
 #define NM_VERSION_1_14_4 (NM_ENCODE_VERSION (1, 14, 4))
+#define NM_VERSION_1_14_6 (NM_ENCODE_VERSION (1, 14, 6))
 
 /* For releases, NM_API_VERSION is equal to NM_VERSION.
  *
diff --git a/shared/nm-version-macros.h.in b/shared/nm-version-macros.h.in
index 08717101..dead985a 100644
--- a/shared/nm-version-macros.h.in
+++ b/shared/nm-version-macros.h.in
@@ -76,6 +76,7 @@
 #define NM_VERSION_1_14   (NM_ENCODE_VERSION (1, 14, 0))
 #define NM_VERSION_1_14_2 (NM_ENCODE_VERSION (1, 14, 2))
 #define NM_VERSION_1_14_4 (NM_ENCODE_VERSION (1, 14, 4))
+#define NM_VERSION_1_14_6 (NM_ENCODE_VERSION (1, 14, 6))
 
 /* For releases, NM_API_VERSION is equal to NM_VERSION.
  *
diff --git a/src/NetworkManagerUtils.c b/src/NetworkManagerUtils.c
index 1404854d..e3766809 100644
--- a/src/NetworkManagerUtils.c
+++ b/src/NetworkManagerUtils.c
@@ -881,6 +881,7 @@ nm_utils_match_connection (NMConnection *const*connections,
 int
 nm_match_spec_device_by_pllink (const NMPlatformLink *pllink,
                                 const char *match_device_type,
+                                const char *match_dhcp_plugin,
                                 const GSList *specs,
                                 int no_match_value)
 {
@@ -897,7 +898,8 @@ nm_match_spec_device_by_pllink (const NMPlatformLink *pllink,
 	                          pllink ? pllink->driver : NULL,
 	                          NULL,
 	                          NULL,
-	                          NULL);
+	                          NULL,
+	                          match_dhcp_plugin);
 
 	switch (m) {
 	case NM_MATCH_SPEC_MATCH:
diff --git a/src/NetworkManagerUtils.h b/src/NetworkManagerUtils.h
index b26d08bd..efbd9037 100644
--- a/src/NetworkManagerUtils.h
+++ b/src/NetworkManagerUtils.h
@@ -50,6 +50,7 @@ NMConnection *nm_utils_match_connection (NMConnection *const*connections,
 
 int nm_match_spec_device_by_pllink (const NMPlatformLink *pllink,
                                     const char *match_device_type,
+                                    const char *match_dhcp_plugin,
                                     const GSList *specs,
                                     int no_match_value);
 
diff --git a/src/devices/bluetooth/nm-device-bt.c b/src/devices/bluetooth/nm-device-bt.c
index 1f650d33..f4a1b709 100644
--- a/src/devices/bluetooth/nm-device-bt.c
+++ b/src/devices/bluetooth/nm-device-bt.c
@@ -323,7 +323,7 @@ complete_connection (NMDevice *device,
 		} else {
 			fallback_prefix = _("CDMA connection");
 			if (!nm_setting_cdma_get_number (s_cdma))
-				g_object_set (G_OBJECT (s_cdma), NM_SETTING_GSM_NUMBER, "#777", NULL);
+				g_object_set (G_OBJECT (s_cdma), NM_SETTING_CDMA_NUMBER, "#777", NULL);
 		}
 	} else {
 		g_set_error_literal (error,
diff --git a/src/devices/nm-device-bridge.c b/src/devices/nm-device-bridge.c
index e79de95c..68e1ac28 100644
--- a/src/devices/nm-device-bridge.c
+++ b/src/devices/nm-device-bridge.c
@@ -168,26 +168,52 @@ complete_connection (NMDevice *device,
 typedef struct {
 	const char *name;
 	const char *sysname;
-	gboolean default_if_zero;
-	gboolean user_hz_compensate;
+	uint nm_min;
+	uint nm_max;
+	uint nm_default;
+	bool default_if_zero;
+	bool user_hz_compensate;
+	bool only_with_stp;
 } Option;
 
 static const Option master_options[] = {
-	{ NM_SETTING_BRIDGE_STP, "stp_state", FALSE, FALSE },
-	{ NM_SETTING_BRIDGE_PRIORITY, "priority", TRUE, FALSE },
-	{ NM_SETTING_BRIDGE_FORWARD_DELAY, "forward_delay", TRUE, TRUE },
-	{ NM_SETTING_BRIDGE_HELLO_TIME, "hello_time", TRUE, TRUE },
-	{ NM_SETTING_BRIDGE_MAX_AGE, "max_age", TRUE, TRUE },
-	{ NM_SETTING_BRIDGE_AGEING_TIME, "ageing_time", TRUE, TRUE },
-	{ NM_SETTING_BRIDGE_GROUP_FORWARD_MASK, "group_fwd_mask", TRUE, FALSE },
-	{ NM_SETTING_BRIDGE_MULTICAST_SNOOPING, "multicast_snooping", FALSE, FALSE },
+	{ NM_SETTING_BRIDGE_STP,                "stp_state", /* this must stay as the first item */
+	                                        0, 1, 1,
+	                                        FALSE, FALSE, FALSE },
+	{ NM_SETTING_BRIDGE_PRIORITY,           "priority",
+	                                        0, G_MAXUINT16, 0x8000,
+	                                        TRUE, FALSE, TRUE },
+	{ NM_SETTING_BRIDGE_FORWARD_DELAY,      "forward_delay",
+	                                        0, NM_BR_MAX_FORWARD_DELAY, 15,
+	                                        TRUE, TRUE, TRUE},
+	{ NM_SETTING_BRIDGE_HELLO_TIME,         "hello_time",
+	                                        0, NM_BR_MAX_HELLO_TIME, 2,
+	                                        TRUE, TRUE, TRUE },
+	{ NM_SETTING_BRIDGE_MAX_AGE,            "max_age",
+	                                        0, NM_BR_MAX_MAX_AGE, 20,
+	                                        TRUE, TRUE, TRUE },
+	{ NM_SETTING_BRIDGE_AGEING_TIME,        "ageing_time",
+	                                        NM_BR_MIN_AGEING_TIME, NM_BR_MAX_AGEING_TIME, 300,
+	                                        TRUE, TRUE, FALSE },
+	{ NM_SETTING_BRIDGE_GROUP_FORWARD_MASK, "group_fwd_mask",
+	                                        0, 0xFFFF, 0,
+	                                        TRUE, FALSE, FALSE },
+	{ NM_SETTING_BRIDGE_MULTICAST_SNOOPING, "multicast_snooping",
+	                                        0, 1, 1,
+	                                        FALSE, FALSE, FALSE },
 	{ NULL, NULL }
 };
 
 static const Option slave_options[] = {
-	{ NM_SETTING_BRIDGE_PORT_PRIORITY, "priority", TRUE, FALSE },
-	{ NM_SETTING_BRIDGE_PORT_PATH_COST, "path_cost", TRUE, FALSE },
-	{ NM_SETTING_BRIDGE_PORT_HAIRPIN_MODE, "hairpin_mode", FALSE, FALSE },
+	{ NM_SETTING_BRIDGE_PORT_PRIORITY,     "priority",
+	                                       0, NM_BR_PORT_MAX_PRIORITY, NM_BR_PORT_DEF_PRIORITY,
+	                                       TRUE, FALSE },
+	{ NM_SETTING_BRIDGE_PORT_PATH_COST,    "path_cost",
+	                                       0, NM_BR_PORT_MAX_PATH_COST, 100,
+	                                       TRUE, FALSE },
+	{ NM_SETTING_BRIDGE_PORT_HAIRPIN_MODE, "hairpin_mode",
+	                                       0, 1, 0,
+	                                       FALSE, FALSE },
 	{ NULL, NULL }
 };
 
@@ -275,23 +301,43 @@ update_connection (NMDevice *device, NMConnection *connection)
 	NMSettingBridge *s_bridge = nm_connection_get_setting_bridge (connection);
 	int ifindex = nm_device_get_ifindex (device);
 	const Option *option;
+	gs_free char *stp = NULL;
+	int stp_value;
 
 	if (!s_bridge) {
 		s_bridge = (NMSettingBridge *) nm_setting_bridge_new ();
 		nm_connection_add_setting (connection, (NMSetting *) s_bridge);
 	}
 
-	for (option = master_options; option->name; option++) {
+	option = master_options;
+	nm_assert (nm_streq (option->sysname, "stp_state"));
+
+	stp = nm_platform_sysctl_master_get_option (nm_device_get_platform (device), ifindex, option->sysname);
+	stp_value = _nm_utils_ascii_str_to_int64 (stp, 10, option->nm_min, option->nm_max, option->nm_default);
+	g_object_set (s_bridge, option->name, stp_value, NULL);
+	option++;
+
+	for (; option->name; option++) {
 		gs_free char *str = nm_platform_sysctl_master_get_option (nm_device_get_platform (device), ifindex, option->sysname);
-		int value;
+		uint value;
 
-		if (str) {
-			value = strtol (str, NULL, 10);
+		if (!stp_value && option->only_with_stp)
+			continue;
 
+		if (str) {
 			/* See comments in set_sysfs_uint() about centiseconds. */
-			if (option->user_hz_compensate)
+			if (option->user_hz_compensate) {
+				value = _nm_utils_ascii_str_to_int64 (str, 10,
+				                                      option->nm_min * 100,
+				                                      option->nm_max * 100,
+				                                      option->nm_default * 100);
 				value /= 100;
-
+			} else {
+				value = _nm_utils_ascii_str_to_int64 (str, 10,
+				                                      option->nm_min,
+				                                      option->nm_max,
+				                                      option->nm_default);
+			}
 			g_object_set (s_bridge, option->name, value, NULL);
 		} else
 			_LOGW (LOGD_BRIDGE, "failed to read bridge setting '%s'", option->sysname);
@@ -322,15 +368,22 @@ master_update_slave_connection (NMDevice *device,
 
 	for (option = slave_options; option->name; option++) {
 		gs_free char *str = nm_platform_sysctl_slave_get_option (nm_device_get_platform (device), ifindex_slave, option->sysname);
-		int value;
+		uint value;
 
 		if (str) {
-			value = strtol (str, NULL, 10);
-
 			/* See comments in set_sysfs_uint() about centiseconds. */
-			if (option->user_hz_compensate)
+			if (option->user_hz_compensate) {
+				value = _nm_utils_ascii_str_to_int64 (str, 10,
+				                                      option->nm_min * 100,
+				                                      option->nm_max * 100,
+				                                      option->nm_default * 100);
 				value /= 100;
-
+			} else {
+				value = _nm_utils_ascii_str_to_int64 (str, 10,
+				                                      option->nm_min,
+				                                      option->nm_max,
+				                                      option->nm_default);
+			}
 			g_object_set (s_port, option->name, value, NULL);
 		} else
 			_LOGW (LOGD_BRIDGE, "failed to read bridge port setting '%s'", option->sysname);
diff --git a/src/devices/nm-device-ethernet.c b/src/devices/nm-device-ethernet.c
index 0fb8fea4..e7262683 100644
--- a/src/devices/nm-device-ethernet.c
+++ b/src/devices/nm-device-ethernet.c
@@ -1446,7 +1446,6 @@ new_default_connection (NMDevice *self)
 	const char *uprop = "0";
 	gs_free char *defname = NULL;
 	gs_free char *uuid = NULL;
-	gs_free char *machine_id = NULL;
 	guint i, n_connections;
 
 	if (nm_config_get_no_auto_default_for_device (nm_config_get (), self))
@@ -1470,12 +1469,10 @@ new_default_connection (NMDevice *self)
 	if (!defname)
 		return NULL;
 
-	machine_id = nm_utils_machine_id_read ();
-
 	/* Create a stable UUID. The UUID is also the Network_ID for stable-privacy addr-gen-mode,
 	 * thus when it changes we will also generate different IPv6 addresses. */
 	uuid = _nm_utils_uuid_generate_from_strings ("default-wired",
-	                                             machine_id ?: "",
+	                                             nm_utils_machine_id_str (),
 	                                             defname,
 	                                             perm_hw_addr,
 	                                             NULL);
diff --git a/src/devices/nm-device-infiniband.c b/src/devices/nm-device-infiniband.c
index 41fac157..5138b684 100644
--- a/src/devices/nm-device-infiniband.c
+++ b/src/devices/nm-device-infiniband.c
@@ -22,6 +22,7 @@
 
 #include "nm-device-infiniband.h"
 
+#include 
 #include 
 
 #include "NetworkManagerUtils.h"
diff --git a/src/devices/nm-device-ip-tunnel.c b/src/devices/nm-device-ip-tunnel.c
index 568403c6..1c7e6d51 100644
--- a/src/devices/nm-device-ip-tunnel.c
+++ b/src/devices/nm-device-ip-tunnel.c
@@ -27,6 +27,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include "nm-device-private.h"
 #include "nm-manager.h"
diff --git a/src/devices/nm-device-macvlan.c b/src/devices/nm-device-macvlan.c
index ff386c82..2b212154 100644
--- a/src/devices/nm-device-macvlan.c
+++ b/src/devices/nm-device-macvlan.c
@@ -23,6 +23,7 @@
 #include "nm-device-macvlan.h"
 
 #include 
+#include 
 
 #include "nm-device-private.h"
 #include "settings/nm-settings.h"
diff --git a/src/devices/nm-device-wpan.c b/src/devices/nm-device-wpan.c
index f910b0b8..05b507d5 100644
--- a/src/devices/nm-device-wpan.c
+++ b/src/devices/nm-device-wpan.c
@@ -25,6 +25,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include "nm-act-request.h"
 #include "nm-device-private.h"
diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c
index f2dbe659..89e1cc51 100644
--- a/src/devices/nm-device.c
+++ b/src/devices/nm-device.c
@@ -37,7 +37,6 @@
 #include 
 #include 
 #include 
-#include 
 
 #include "nm-utils/nm-dedup-multi.h"
 #include "nm-utils/nm-random-utils.h"
@@ -386,13 +385,14 @@ typedef struct _NMDevicePrivate {
 	bool            v4_route_table_initialized:1;
 	bool            v6_route_table_initialized:1;
 
-	NMDeviceAutoconnectBlockedFlags autoconnect_blocked_flags:4;
+	NMDeviceAutoconnectBlockedFlags autoconnect_blocked_flags:5;
 
 	bool            is_enslaved:1;
 	bool            master_ready_handled:1;
 
 	bool            ipv6ll_handle:1; /* TRUE if NM handles the device's IPv6LL address */
 	bool            ipv6ll_has:1;
+	bool            device_link_changed_down:1;
 
 	/* Generic DHCP stuff */
 	char *          dhcp_anycast_address;
@@ -1264,6 +1264,8 @@ _get_stable_id (NMDevice *self,
 		gs_free char *generated = NULL;
 		NMUtilsStableType stable_type;
 		NMSettingConnection *s_con;
+		gboolean hwaddr_is_fake;
+		const char *hwaddr;
 		const char *stable_id;
 		const char *uuid;
 
@@ -1280,9 +1282,15 @@ _get_stable_id (NMDevice *self,
 
 		uuid = nm_connection_get_uuid (connection);
 
+		/* the cloned-mac-address may be generated based on the stable-id.
+		 * Thus, at this point, we can only use the permanant MAC address
+		 * as seed. */
+		hwaddr = nm_device_get_permanent_hw_address_full (self, TRUE, &hwaddr_is_fake);
+
 		stable_type = nm_utils_stable_id_parse (stable_id,
 		                                        nm_device_get_ip_iface (self),
-		                                        NULL,
+		                                        !hwaddr_is_fake ? hwaddr : NULL,
+		                                        nm_utils_boot_id_str (),
 		                                        uuid,
 		                                        &generated);
 
@@ -3585,8 +3593,10 @@ device_link_changed (NMDevice *self)
 	gboolean was_up;
 	gboolean update_unmanaged_specs = FALSE;
 	gboolean got_hw_addr = FALSE, had_hw_addr;
+	gboolean seen_down = priv->device_link_changed_down;
 
 	priv->device_link_changed_id = 0;
+	priv->device_link_changed_down = FALSE;
 
 	ifindex = nm_device_get_ifindex (self);
 	pllink = nm_platform_link_get (nm_device_get_platform (self), ifindex);
@@ -3696,7 +3706,7 @@ device_link_changed (NMDevice *self)
 
 	device_recheck_slave_status (self, pllink);
 
-	if (priv->up && !was_up) {
+	if (priv->up && (!was_up || seen_down)) {
 		/* the link was down and just came up. That happens for example, while changing MTU.
 		 * We must restore IP configuration. */
 		if (priv->ip4_state == IP_DONE) {
@@ -3772,6 +3782,8 @@ link_changed_cb (NMPlatform *platform,
 	priv = NM_DEVICE_GET_PRIVATE (self);
 
 	if (ifindex == nm_device_get_ifindex (self)) {
+		if (!(info->n_ifi_flags & IFF_UP))
+			priv->device_link_changed_down = TRUE;
 		if (!priv->device_link_changed_id) {
 			priv->device_link_changed_id = g_idle_add ((GSourceFunc) device_link_changed, self);
 			_LOGD (LOGD_DEVICE, "queued link change for ifindex %d", ifindex);
@@ -4133,7 +4145,7 @@ device_init_static_sriov_num_vfs (NMDevice *self)
 		num_vfs = _nm_utils_ascii_str_to_int64 (value, 10, 0, G_MAXINT32, -1);
 		if (num_vfs >= 0) {
 			nm_platform_link_set_sriov_params (nm_device_get_platform (self),
-			                                   priv->ifindex, num_vfs, -1);
+			                                   priv->ifindex, num_vfs, NM_TERNARY_DEFAULT);
 		}
 	}
 }
@@ -4296,8 +4308,6 @@ realize_start_setup (NMDevice *self,
 
 	nm_device_set_carrier_from_platform (self);
 
-	device_init_static_sriov_num_vfs (self);
-
 	nm_assert (!priv->stats.timeout_id);
 	real_rate = _stats_refresh_rate_real (priv->stats.refresh_rate_ms);
 	if (real_rate)
@@ -6201,7 +6211,7 @@ act_stage1_prepare (NMDevice *self, NMDeviceStateReason *out_failure_reason)
 		nm_auto_freev NMPlatformVF **plat_vfs = NULL;
 		gs_free_error GError *error = NULL;
 		NMSriovVF *vf;
-		int autoprobe;
+		NMTernary autoprobe;
 
 		autoprobe = nm_setting_sriov_get_autoprobe_drivers (s_sriov);
 		if (autoprobe == NM_TERNARY_DEFAULT) {
@@ -7449,18 +7459,6 @@ get_dhcp_timeout (NMDevice *self, int addr_family)
 	return timeout ?: NM_DHCP_TIMEOUT_DEFAULT;
 }
 
-static GBytes *
-dhcp4_get_client_id_mac (const guint8 *hwaddr /* ETH_ALEN bytes */)
-{
-	guint8 *client_id_buf;
-	guint8 hwaddr_type = ARPHRD_ETHER;
-
-	client_id_buf = g_malloc (ETH_ALEN + 1);
-	client_id_buf[0] = hwaddr_type;
-	memcpy (&client_id_buf[1], hwaddr, ETH_ALEN);
-	return g_bytes_new_take (client_id_buf, ETH_ALEN + 1);
-}
-
 static GBytes *
 dhcp4_get_client_id (NMDevice *self,
                      NMConnection *connection,
@@ -7473,6 +7471,7 @@ dhcp4_get_client_id (NMDevice *self,
 	const char *fail_reason;
 	guint8 hwaddr_bin_buf[NM_UTILS_HWADDR_LEN_MAX];
 	const guint8 *hwaddr_bin;
+	int arp_type;
 	gsize hwaddr_len;
 	GBytes *result;
 	gs_free char *logstr1 = NULL;
@@ -7497,17 +7496,18 @@ dhcp4_get_client_id (NMDevice *self,
 
 	if (nm_streq (client_id, "mac")) {
 		if (!hwaddr) {
-			fail_reason = "failed to get current MAC address";
+			fail_reason = "missing link-layer address";
 			goto out_fail;
 		}
 
 		hwaddr_bin = g_bytes_get_data (hwaddr, &hwaddr_len);
-		if (hwaddr_len != ETH_ALEN) {
-			fail_reason = "MAC address is not ethernet";
+		arp_type = nm_utils_arp_type_detect_from_hwaddrlen (hwaddr_len);
+		if (arp_type < 0) {
+			fail_reason = "unsupported link-layer address";
 			goto out_fail;
 		}
 
-		result = dhcp4_get_client_id_mac (hwaddr_bin);
+		result = nm_utils_dhcp_client_id_mac (arp_type, hwaddr_bin, hwaddr_len);
 		goto out_good;
 	}
 
@@ -7516,32 +7516,37 @@ dhcp4_get_client_id (NMDevice *self,
 
 		hwaddr_str = nm_device_get_permanent_hw_address (self);
 		if (!hwaddr_str) {
-			fail_reason = "failed to get permanent MAC address";
+			fail_reason = "missing permanent link-layer address";
 			goto out_fail;
 		}
 
 		if (!_nm_utils_hwaddr_aton (hwaddr_str, hwaddr_bin_buf, sizeof (hwaddr_bin_buf), &hwaddr_len))
 			g_return_val_if_reached (NULL);
 
-		if (hwaddr_len != ETH_ALEN) {
-			/* unsupported type. */
-			fail_reason = "MAC address is not ethernet";
+		arp_type = nm_utils_arp_type_detect_from_hwaddrlen (hwaddr_len);
+		if (arp_type < 0) {
+			fail_reason = "unsupported permanent link-layer address";
 			goto out_fail;
 		}
 
-		result = dhcp4_get_client_id_mac (hwaddr_bin_buf);
+		result = nm_utils_dhcp_client_id_mac (arp_type, hwaddr_bin_buf, hwaddr_len);
+		goto out_good;
+	}
+
+	if (nm_streq (client_id, "duid")) {
+		result = nm_utils_dhcp_client_id_systemd_node_specific (TRUE,
+		                                                        nm_device_get_ip_iface (self));
 		goto out_good;
 	}
 
 	if (nm_streq (client_id, "stable")) {
+		nm_auto_free_checksum GChecksum *sum = NULL;
+		guint8 digest[NM_UTILS_CHECKSUM_LENGTH_SHA1];
 		NMUtilsStableType stable_type;
 		const char *stable_id;
-		GChecksum *sum;
-		guint8 buf[20];
-		gsize buf_size;
 		guint32 salted_header;
-		const guint8 *secret_key;
-		gsize secret_key_len;
+		const guint8 *host_id;
+		gsize host_id_len;
 
 		stable_id = _get_stable_id (self, connection, &stable_type);
 		if (!stable_id)
@@ -7549,23 +7554,17 @@ dhcp4_get_client_id (NMDevice *self,
 
 		salted_header = htonl (2011610591 + stable_type);
 
-		nm_utils_secret_key_get (&secret_key, &secret_key_len);
+		nm_utils_host_id_get (&host_id, &host_id_len);
 
 		sum = g_checksum_new (G_CHECKSUM_SHA1);
-
 		g_checksum_update (sum, (const guchar *) &salted_header, sizeof (salted_header));
 		g_checksum_update (sum, (const guchar *) stable_id, strlen (stable_id) + 1);
-		g_checksum_update (sum, (const guchar *) secret_key, secret_key_len);
-
-		buf_size = sizeof (buf);
-		g_checksum_get_digest (sum, buf, &buf_size);
-		nm_assert (buf_size == sizeof (buf));
-
-		g_checksum_free (sum);
+		g_checksum_update (sum, (const guchar *) host_id, host_id_len);
+		nm_utils_checksum_get_digest (sum, digest);
 
 		client_id_buf = g_malloc (1 + 15);
 		client_id_buf[0] = 0;
-		memcpy (&client_id_buf[1], buf, 15);
+		memcpy (&client_id_buf[1], digest, 15);
 		result = g_bytes_new_take (client_id_buf, 1 + 15);
 		goto out_good;
 	}
@@ -8187,53 +8186,63 @@ dhcp6_prefix_delegated (NMDhcpClient *client,
 	g_signal_emit (self, signals[IP6_PREFIX_DELEGATED], 0, prefix);
 }
 
+/*****************************************************************************/
+
 /* RFC 3315 defines the epoch for the DUID-LLT time field on Jan 1st 2000. */
 #define EPOCH_DATETIME_200001010000  946684800
 
 static GBytes *
-generate_duid_llt (const guint8 *hwaddr /* ETH_ALEN bytes */,
+generate_duid_llt (int arp_type,
+                   const guint8 *hwaddr,
+                   gsize hwaddr_len,
                    gint64 time)
 {
 	guint8 *arr;
 	const guint16 duid_type = htons (1);
-	const guint16 hw_type = htons (ARPHRD_ETHER);
+	const guint16 hw_type = htons (arp_type);
 	const guint32 duid_time = htonl (NM_MAX (0, time - EPOCH_DATETIME_200001010000));
 
-	arr = g_new (guint8, 2 + 2 + 4 + ETH_ALEN);
+	if (!nm_utils_arp_type_get_hwaddr_relevant_part (arp_type, &hwaddr, &hwaddr_len))
+		nm_assert_not_reached ();
+
+	arr = g_new (guint8, 2 + 2 + 4 + hwaddr_len);
 
 	memcpy (&arr[0], &duid_type, 2);
 	memcpy (&arr[2], &hw_type, 2);
 	memcpy (&arr[4], &duid_time, 4);
-	memcpy (&arr[8], hwaddr, ETH_ALEN);
+	memcpy (&arr[8], hwaddr, hwaddr_len);
 
-	return g_bytes_new_take (arr, 2 + 2 + 4 + ETH_ALEN);
+	return g_bytes_new_take (arr, 2 + 2 + 4 + hwaddr_len);
 }
 
 static GBytes *
-generate_duid_ll (const guint8 *hwaddr /* ETH_ALEN bytes */)
+generate_duid_ll (int arp_type,
+                  const guint8 *hwaddr,
+                  gsize hwaddr_len)
 {
 	guint8 *arr;
 	const guint16 duid_type = htons (3);
-	const guint16 hw_type = htons (ARPHRD_ETHER);
+	const guint16 hw_type = htons (arp_type);
 
-	arr = g_new (guint8, 2 + 2 + ETH_ALEN);
+	if (!nm_utils_arp_type_get_hwaddr_relevant_part (arp_type, &hwaddr, &hwaddr_len))
+		nm_assert_not_reached ();
+
+	arr = g_new (guint8, 2 + 2 + hwaddr_len);
 
 	memcpy (&arr[0], &duid_type, 2);
 	memcpy (&arr[2], &hw_type, 2);
-	memcpy (&arr[4], hwaddr, ETH_ALEN);
+	memcpy (&arr[4], hwaddr, hwaddr_len);
 
-	return g_bytes_new_take (arr, 2 + 2 + ETH_ALEN);
+	return g_bytes_new_take (arr, 2 + 2 + hwaddr_len);
 }
 
 static GBytes *
-generate_duid_uuid (guint8 *data, gsize data_len)
+generate_duid_uuid (const NMUuid *uuid)
 {
-	const guint16 duid_type = g_htons (4);
-	const int DUID_SIZE = 18;
+	const guint16 duid_type = htons (4);
 	guint8 *duid_buffer;
 
-	nm_assert (data);
-	nm_assert (data_len >= 16);
+	nm_assert (uuid);
 
 	/* Generate a DHCP Unique Identifier for DHCPv6 using the
 	 * DUID-UUID method (see RFC 6355 section 4).  Format is:
@@ -8241,44 +8250,47 @@ generate_duid_uuid (guint8 *data, gsize data_len)
 	 * u16: type (DUID-UUID = 4)
 	 * u8[16]: UUID bytes
 	 */
-	duid_buffer = g_malloc (DUID_SIZE);
-
 	G_STATIC_ASSERT_EXPR (sizeof (duid_type) == 2);
+	G_STATIC_ASSERT_EXPR (sizeof (*uuid) == 16);
+	duid_buffer = g_malloc (18);
 	memcpy (&duid_buffer[0], &duid_type, 2);
-
-	/* UUID is 128 bits, we just take the first 128 bits
-	 * (regardless of data size) as the DUID-UUID.
-	 */
-	memcpy (&duid_buffer[2], data, 16);
-
-	return g_bytes_new_take (duid_buffer, DUID_SIZE);
+	memcpy (&duid_buffer[2], uuid, 16);
+	return g_bytes_new_take (duid_buffer, 18);
 }
 
 static GBytes *
 generate_duid_from_machine_id (void)
 {
-	gs_free const char *machine_id_s = NULL;
-	uuid_t uuid;
-	GChecksum *sum;
-	guint8 sha256_digest[32];
-	gsize len = sizeof (sha256_digest);
-	static GBytes *global_duid = NULL;
+	static GBytes *volatile global_duid = NULL;
+	GBytes *p;
 
-	if (global_duid)
-		return g_bytes_ref (global_duid);
+again:
+	p = g_atomic_pointer_get (&global_duid);
+	if (G_UNLIKELY (!p)) {
+		nm_auto_free_checksum GChecksum *sum = NULL;
+		const NMUuid *machine_id;
+		union {
+			guint8 sha256[NM_UTILS_CHECKSUM_LENGTH_SHA256];
+			NMUuid uuid;
+		} digest;
 
-	machine_id_s = nm_utils_machine_id_read ();
-	if (!nm_utils_machine_id_parse (machine_id_s, uuid))
-		return NULL;
+		machine_id = nm_utils_machine_id_bin ();
+
+		/* Hash the machine ID so it's not leaked to the network */
+		sum = g_checksum_new (G_CHECKSUM_SHA256);
+		g_checksum_update (sum, (const guchar *) machine_id, sizeof (*machine_id));
+		nm_utils_checksum_get_digest (sum, digest.sha256);
 
-	/* Hash the machine ID so it's not leaked to the network */
-	sum = g_checksum_new (G_CHECKSUM_SHA256);
-	g_checksum_update (sum, (const guchar *) &uuid, sizeof (uuid));
-	g_checksum_get_digest (sum, sha256_digest, &len);
-	g_checksum_free (sum);
+		G_STATIC_ASSERT_EXPR (sizeof (digest.sha256) > sizeof (digest.uuid));
+		p = generate_duid_uuid (&digest.uuid);
+
+		if (!g_atomic_pointer_compare_and_exchange (&global_duid, NULL, p)) {
+			g_bytes_unref (p);
+			goto again;
+		}
+	}
 
-	global_duid = generate_duid_uuid (sha256_digest, len);
-	return g_bytes_ref (global_duid);
+	return g_bytes_ref (p);
 }
 
 static GBytes *
@@ -8289,10 +8301,11 @@ dhcp6_get_duid (NMDevice *self, NMConnection *connection, GBytes *hwaddr, gboole
 	gs_free char *duid_default = NULL;
 	const char *duid_error;
 	GBytes *duid_out;
-	guint8 sha256_digest[32];
-	gsize len = sizeof (sha256_digest);
 	gboolean duid_enforce = TRUE;
 	gs_free char *logstr1 = NULL;
+	const guint8 *hwaddr_bin;
+	gsize hwaddr_len;
+	int arp_type;
 
 	s_ip6 = nm_connection_get_setting_ip6_config (connection);
 	duid = nm_setting_ip6_config_get_dhcp_duid (NM_SETTING_IP6_CONFIG (s_ip6));
@@ -8308,10 +8321,6 @@ dhcp6_get_duid (NMDevice *self, NMConnection *connection, GBytes *hwaddr, gboole
 	if (nm_streq (duid, "lease")) {
 		duid_enforce = FALSE;
 		duid_out = generate_duid_from_machine_id ();
-		if (!duid_out) {
-			duid_error = "failure to read machine-id";
-			goto out_fail;
-		}
 		goto out_good;
 	}
 
@@ -8328,78 +8337,138 @@ dhcp6_get_duid (NMDevice *self, NMConnection *connection, GBytes *hwaddr, gboole
 			duid_error = "missing link-layer address";
 			goto out_fail;
 		}
-		if (g_bytes_get_size (hwaddr) != ETH_ALEN) {
+
+		hwaddr_bin = g_bytes_get_data (hwaddr, &hwaddr_len);
+		arp_type = nm_utils_arp_type_detect_from_hwaddrlen (hwaddr_len);
+		if (arp_type < 0) {
 			duid_error = "unsupported link-layer address";
 			goto out_fail;
 		}
 
-		if (nm_streq (duid, "ll")) {
-			duid_out = generate_duid_ll (g_bytes_get_data (hwaddr, NULL));
-		} else {
-			gint64 time;
-
-			time = nm_utils_secret_key_get_timestamp ();
-			if (!time) {
-				duid_error = "cannot retrieve the secret key timestamp";
-				goto out_fail;
-			}
-
-			duid_out = generate_duid_llt (g_bytes_get_data (hwaddr, NULL), time);
+		if (nm_streq (duid, "ll"))
+			duid_out = generate_duid_ll (arp_type, hwaddr_bin, hwaddr_len);
+		else {
+			duid_out = generate_duid_llt (arp_type, hwaddr_bin, hwaddr_len,
+			                              nm_utils_host_id_get_timestamp_ns () / NM_UTILS_NS_PER_SECOND);
 		}
 
 		goto out_good;
 	}
 
 	if (NM_IN_STRSET (duid, "stable-ll", "stable-llt", "stable-uuid")) {
+		/* preferably, we would salt the checksum differently for each @duid type. We missed
+		 * to do that initially, so most types use the DEFAULT_SALT.
+		 *
+		 * Implemenations that are added later, should use a distinct salt instead,
+		 * like "stable-ll"/"stable-llt" with ARPHRD_INFINIBAND below. */
+		const guint32 DEFAULT_SALT = 670531087u;
+		nm_auto_free_checksum GChecksum *sum = NULL;
 		NMUtilsStableType stable_type;
 		const char *stable_id = NULL;
 		guint32 salted_header;
-		GChecksum *sum;
-		const guint8 *secret_key;
-		gsize secret_key_len;
+		const guint8 *host_id;
+		gsize host_id_len;
+		union {
+			guint8 sha256[NM_UTILS_CHECKSUM_LENGTH_SHA256];
+			guint8 hwaddr_eth[ETH_ALEN];
+			guint8 hwaddr_infiniband[INFINIBAND_ALEN];
+			NMUuid uuid;
+			struct _nm_packed {
+				guint8 hwaddr[ETH_ALEN];
+				guint32 timestamp;
+			} llt_eth;
+			struct _nm_packed {
+				guint8 hwaddr[INFINIBAND_ALEN];
+				guint32 timestamp;
+			} llt_infiniband;
+		} digest;
 
 		stable_id = _get_stable_id (self, connection, &stable_type);
 		if (!stable_id)
 			g_return_val_if_reached (NULL);
 
-		salted_header = htonl (670531087 + stable_type);
+		if (NM_IN_STRSET (duid, "stable-ll", "stable-llt")) {
+			/* for stable LL/LLT DUIDs, we still need a hardware address to detect
+			 * the arp-type. Alternatively, we would be able to detect it based on
+			 * other means (e.g. NMDevice type), but instead require the hardware
+			 * address to be present. This is at least consistent with the "ll"/"llt"
+			 * modes above. */
+			if (!hwaddr) {
+				duid_error = "missing link-layer address";
+				goto out_fail;
+			}
+			if ((arp_type = nm_utils_arp_type_detect_from_hwaddrlen (g_bytes_get_size (hwaddr))) < 0) {
+				duid_error = "unsupported link-layer address";
+				goto out_fail;
+			}
+
+			if (arp_type == ARPHRD_ETHER)
+				salted_header = DEFAULT_SALT;
+			else {
+				nm_assert (arp_type == ARPHRD_INFINIBAND);
+				salted_header = 0x42492CEFu + ((guint32) arp_type);
+			}
+		} else {
+			salted_header = DEFAULT_SALT;
+			arp_type = -1;
+		}
 
-		nm_utils_secret_key_get (&secret_key, &secret_key_len);
+		salted_header = htonl (salted_header + ((guint32) stable_type));
 
-		sum = g_checksum_new (G_CHECKSUM_SHA256);
+		nm_utils_host_id_get (&host_id, &host_id_len);
 
+		sum = g_checksum_new (G_CHECKSUM_SHA256);
 		g_checksum_update (sum, (const guchar *) &salted_header, sizeof (salted_header));
 		g_checksum_update (sum, (const guchar *) stable_id, -1);
-		g_checksum_update (sum, (const guchar *) secret_key, secret_key_len);
+		g_checksum_update (sum, (const guchar *) host_id, host_id_len);
+		nm_utils_checksum_get_digest (sum, digest.sha256);
 
-		g_checksum_get_digest (sum, sha256_digest, &len);
-		g_checksum_free (sum);
+		G_STATIC_ASSERT_EXPR (sizeof (digest) == sizeof (digest.sha256));
 
 		if (nm_streq (duid, "stable-ll")) {
-			duid_out = generate_duid_ll (sha256_digest);
+			switch (arp_type) {
+			case ARPHRD_ETHER:
+				duid_out = generate_duid_ll (arp_type, digest.hwaddr_eth, sizeof (digest.hwaddr_eth));
+				break;
+			case ARPHRD_INFINIBAND:
+				duid_out = generate_duid_ll (arp_type, digest.hwaddr_infiniband, sizeof (digest.hwaddr_infiniband));
+				break;
+			default:
+				g_return_val_if_reached (NULL);
+			}
 		} else if (nm_streq (duid, "stable-llt")) {
 			gint64 time;
+			guint32 timestamp;
 
 #define EPOCH_DATETIME_THREE_YEARS  (356 * 24 * 3600 * 3)
 
-			/* We want a variable time between the secret_key timestamp and three years
+			/* We want a variable time between the host_id timestamp and three years
 			 * before. Let's compute the time (in seconds) from 0 to 3 years; then we'll
-			 * subtract it from the secret_key timestamp.
+			 * subtract it from the host_id timestamp.
 			 */
-			time = nm_utils_secret_key_get_timestamp ();
-			if (!time) {
-				duid_error = "cannot retrieve the secret key timestamp";
-				goto out_fail;
-			}
+			time = nm_utils_host_id_get_timestamp_ns () / NM_UTILS_NS_PER_SECOND;
+
 			/* don't use too old timestamps. They cannot be expressed in DUID-LLT and
 			 * would all be truncated to zero. */
 			time = NM_MAX (time, EPOCH_DATETIME_200001010000 + EPOCH_DATETIME_THREE_YEARS);
-			time -= (unaligned_read_be32 (&sha256_digest[ETH_ALEN]) % EPOCH_DATETIME_THREE_YEARS);
 
-			duid_out = generate_duid_llt (sha256_digest, time);
+			switch (arp_type) {
+			case ARPHRD_ETHER:
+				timestamp = unaligned_read_be32 (&digest.llt_eth.timestamp);
+				time -= timestamp % EPOCH_DATETIME_THREE_YEARS;
+				duid_out = generate_duid_llt (arp_type, digest.llt_eth.hwaddr, sizeof (digest.llt_eth.hwaddr), time);
+				break;
+			case ARPHRD_INFINIBAND:
+				timestamp = unaligned_read_be32 (&digest.llt_infiniband.timestamp);
+				time -= timestamp % EPOCH_DATETIME_THREE_YEARS;
+				duid_out = generate_duid_llt (arp_type, digest.llt_infiniband.hwaddr, sizeof (digest.llt_infiniband.hwaddr), time);
+				break;
+			default:
+				g_return_val_if_reached (NULL);
+			}
 		} else {
 			nm_assert (nm_streq (duid, "stable-uuid"));
-			duid_out = generate_duid_uuid (sha256_digest, len);
+			duid_out = generate_duid_uuid (&digest.uuid);
 		}
 
 		goto out_good;
@@ -8410,14 +8479,14 @@ dhcp6_get_duid (NMDevice *self, NMConnection *connection, GBytes *hwaddr, gboole
 out_fail:
 	nm_assert (!duid_out && duid_error);
 	{
-		guint8 uuid[16];
+		NMUuid uuid;
 
 		_LOGW (LOGD_IP6 | LOGD_DHCP6,
 		       "ipv6.dhcp-duid: failure to generate %s DUID: %s. Fallback to random DUID-UUID.",
 		       duid, duid_error);
 
-		nm_utils_random_bytes (uuid, sizeof (uuid));
-		duid_out = generate_duid_uuid (uuid, sizeof (uuid));
+		nm_utils_random_bytes (&uuid, sizeof (uuid));
+		duid_out = generate_duid_uuid (&uuid);
 	}
 
 out_good:
@@ -8432,6 +8501,8 @@ out_good:
 	return duid_out;
 }
 
+/*****************************************************************************/
+
 static gboolean
 dhcp6_start_with_link_ready (NMDevice *self, NMConnection *connection)
 {
@@ -11961,7 +12032,7 @@ nm_device_set_ip_config (NMDevice *self,
 			priv->needs_ip6_subnet = FALSE;
 	}
 
-	if (IS_IPv4) {
+	if (IS_IPv4 && FALSE /* rp_filter handling is disabled */) {
 		if (!nm_device_sys_iface_state_is_external_or_assume (self))
 			ip4_rp_filter_update (self);
 	}
@@ -12859,7 +12930,7 @@ queued_ip_config_change (NMDevice *self, int addr_family)
 
 	set_unmanaged_external_down (self, TRUE);
 
-	if (IS_IPv4) {
+	if (IS_IPv4 && FALSE /* rp_filter handling is disabled */) {
 		if (!nm_device_sys_iface_state_is_external_or_assume (self)) {
 			priv->v4_has_shadowed_routes = _v4_has_shadowed_routes_detect (self);;
 			ip4_rp_filter_update (self);
@@ -14384,9 +14455,11 @@ nm_device_spawn_iface_helper (NMDevice *self)
 			if (client_id) {
 				g_ptr_array_add (argv, g_strdup ("--dhcp4-clientid"));
 				g_ptr_array_add (argv,
-				                 _nm_utils_bin2str (g_bytes_get_data (client_id, NULL),
-				                                    g_bytes_get_size (client_id),
-				                                    FALSE));
+				                 _nm_utils_bin2hexstr_full (g_bytes_get_data (client_id, NULL),
+				                                            g_bytes_get_size (client_id),
+				                                            ':',
+				                                            FALSE,
+				                                            NULL));
 			}
 
 			hostname = nm_dhcp_client_get_hostname (priv->dhcp4.client);
@@ -14424,9 +14497,11 @@ nm_device_spawn_iface_helper (NMDevice *self)
 		if (nm_device_get_ip_iface_identifier (self, &iid, FALSE)) {
 			g_ptr_array_add (argv, g_strdup ("--iid"));
 			g_ptr_array_add (argv,
-			                 _nm_utils_bin2str (iid.id_u8,
-			                                    sizeof (NMUtilsIPv6IfaceId),
-			                                    FALSE));
+			                 _nm_utils_bin2hexstr_full (iid.id_u8,
+			                                            sizeof (NMUtilsIPv6IfaceId),
+			                                            ':',
+			                                            FALSE,
+			                                            NULL));
 		}
 
 		g_ptr_array_add (argv, g_strdup ("--addr-gen-mode"));
@@ -14561,6 +14636,7 @@ _set_state_full (NMDevice *self,
 	NMActRequest *req;
 	gboolean no_firmware = FALSE;
 	NMSettingsConnection *sett_conn;
+	NMSettingSriov *s_sriov;
 
 	g_return_if_fail (NM_IS_DEVICE (self));
 
@@ -14668,6 +14744,7 @@ _set_state_full (NMDevice *self,
 			save_ip6_properties (self);
 			if (priv->sys_iface_state == NM_DEVICE_SYS_IFACE_STATE_MANAGED)
 				ip6_managed_setup (self);
+			device_init_static_sriov_num_vfs (self);
 		}
 
 		if (priv->sys_iface_state == NM_DEVICE_SYS_IFACE_STATE_MANAGED) {
@@ -14756,6 +14833,12 @@ _set_state_full (NMDevice *self,
 		}
 		break;
 	case NM_DEVICE_STATE_DEACTIVATING:
+		if (   (s_sriov = (NMSettingSriov *) nm_device_get_applied_setting (self, NM_TYPE_SETTING_SRIOV))
+		    && priv->ifindex > 0) {
+			nm_platform_link_set_sriov_params (nm_device_get_platform (self),
+			                                   priv->ifindex, 0, NM_TERNARY_TRUE);
+		}
+
 		_cancel_activation (self);
 
 		/* We cache the ignore_carrier state to not react on config-reloads while the connection
@@ -15273,7 +15356,7 @@ _get_generate_mac_address_mask_setting (NMDevice *self, NMConnection *connection
 	}
 
 	a = nm_config_data_get_connection_default (NM_CONFIG_GET_DATA,
-	                                           is_wifi ? "wifi.generate-mac-address-mask" : "ethernet.generate-mac-mac-address-mask",
+	                                           is_wifi ? "wifi.generate-mac-address-mask" : "ethernet.generate-mac-address-mask",
 	                                           self);
 	if (!a)
 		return NULL;
@@ -15314,7 +15397,8 @@ _hw_addr_set (NMDevice *self,
 	NMPlatformError plerr;
 	guint8 addr_bytes[NM_UTILS_HWADDR_LEN_MAX];
 	gsize addr_len;
-	gboolean was_up;
+	gboolean was_taken_down = FALSE;
+	gboolean retry_down;
 
 	nm_assert (NM_IS_DEVICE (self));
 	nm_assert (addr);
@@ -15337,21 +15421,37 @@ _hw_addr_set (NMDevice *self,
 
 	_LOGT (LOGD_DEVICE, "set-hw-addr: setting MAC address to '%s' (%s, %s)...", addr, operation, detail);
 
-	was_up = nm_device_is_up (self);
-	if (was_up) {
-		/* Can't change MAC address while device is up */
+	if (nm_device_get_device_type (self) == NM_DEVICE_TYPE_WIFI) {
+		/* Always take the device down for Wi-Fi because
+		 * wpa_supplicant needs it to properly detect the MAC
+		 * change. */
+		retry_down = FALSE;
+		was_taken_down = TRUE;
 		nm_device_take_down (self, FALSE);
 	}
 
+again:
 	plerr = nm_platform_link_set_address (nm_device_get_platform (self), nm_device_get_ip_ifindex (self), addr_bytes, addr_len);
 	success = (plerr == NM_PLATFORM_ERROR_SUCCESS);
-	if (success) {
-		/* MAC address succesfully changed; update the current MAC to match */
+	if (!success) {
+		retry_down =    !was_taken_down
+		             && plerr != NM_PLATFORM_ERROR_NOT_FOUND
+		             && nm_platform_link_is_up (nm_device_get_platform (self),
+		                                        nm_device_get_ip_ifindex (self));
+		_NMLOG (     retry_down
+		          || plerr == NM_PLATFORM_ERROR_NOT_FOUND
+		        ? LOGL_DEBUG
+		        : LOGL_WARN,
+		        LOGD_DEVICE,
+		        "set-hw-addr: failed to %s MAC address to %s (%s) (%s)%s",
+		        operation, addr, detail,
+		        nm_platform_error_to_string_a (plerr),
+		        retry_down ? " (retry with taking down)" : "");
+	} else {
+		/* MAC address successfully changed; update the current MAC to match */
 		nm_device_update_hw_address (self);
-		if (_hw_addr_matches (self, addr_bytes, addr_len)) {
-			_LOGI (LOGD_DEVICE, "set-hw-addr: %s MAC address to %s (%s)",
-			       operation, addr, detail);
-		} else {
+
+		if (!_hw_addr_matches (self, addr_bytes, addr_len)) {
 			gint64 poll_end, now;
 
 			_LOGD (LOGD_DEVICE,
@@ -15392,24 +15492,40 @@ handle_fail:
 				success = FALSE;
 				break;
 			}
+		}
 
-			if (success) {
-				_LOGI (LOGD_DEVICE, "set-hw-addr: %s MAC address to %s (%s)",
-				       operation, addr, detail);
-			} else {
-				_LOGW (LOGD_DEVICE,
-				       "set-hw-addr: new MAC address %s not successfully %s (%s)",
-				       addr, operation, detail);
-			}
+		if (success) {
+			retry_down = FALSE;
+			_LOGI (LOGD_DEVICE, "set-hw-addr: %s MAC address to %s (%s)",
+			       operation, addr, detail);
+		} else {
+			retry_down =    !was_taken_down
+			             && nm_platform_link_is_up (nm_device_get_platform (self),
+			                                        nm_device_get_ip_ifindex (self));
+
+			_NMLOG (  retry_down
+			        ? LOGL_DEBUG
+			        : LOGL_WARN,
+			        LOGD_DEVICE,
+			        "set-hw-addr: new MAC address %s not successfully %s (%s)%s",
+			        addr,
+			        operation,
+			        detail,
+			        retry_down ? " (retry with taking down)" : "");
 		}
-	} else {
-		_NMLOG (plerr == NM_PLATFORM_ERROR_NOT_FOUND ? LOGL_DEBUG : LOGL_WARN,
-		        LOGD_DEVICE, "set-hw-addr: failed to %s MAC address to %s (%s) (%s)",
-		        operation, addr, detail,
-		        nm_platform_error_to_string_a (plerr));
 	}
 
-	if (was_up) {
+	if (retry_down) {
+		/* changing the MAC address failed, but also the device was up (and we did not yet try to take
+		 * it down). Optimally, we change the MAC address without taking the device down, but some
+		 * devices don't like that. So, retry with taking the device down. */
+		retry_down = FALSE;
+		was_taken_down = TRUE;
+		nm_device_take_down (self, FALSE);
+		goto again;
+	}
+
+	if (was_taken_down) {
 		if (!nm_device_bring_up (self, TRUE, NULL))
 			return FALSE;
 	}
@@ -15728,7 +15844,8 @@ nm_device_spec_match_list_full (NMDevice *self, const GSList *specs, int no_matc
 	                          nm_device_get_driver (self),
 	                          nm_device_get_driver_version (self),
 	                          nm_device_get_permanent_hw_address (self),
-	                          klass->get_s390_subchannels ? klass->get_s390_subchannels (self) : NULL);
+	                          klass->get_s390_subchannels ? klass->get_s390_subchannels (self) : NULL,
+	                          nm_dhcp_manager_get_config (nm_dhcp_manager_get ()));
 
 	switch (m) {
 	case NM_MATCH_SPEC_MATCH:
diff --git a/src/devices/nm-device.h b/src/devices/nm-device.h
index 8f376b20..3c703564 100644
--- a/src/devices/nm-device.h
+++ b/src/devices/nm-device.h
@@ -722,6 +722,8 @@ typedef enum {
 
 	NM_DEVICE_AUTOCONNECT_BLOCKED_WRONG_PIN             = (1LL <<  1),
 	NM_DEVICE_AUTOCONNECT_BLOCKED_MANUAL_DISCONNECT     = (1LL <<  2),
+	NM_DEVICE_AUTOCONNECT_BLOCKED_SIM_MISSING           = (1LL <<  3),
+	NM_DEVICE_AUTOCONNECT_BLOCKED_INIT_FAILED           = (1LL <<  4),
 
 	_NM_DEVICE_AUTOCONNECT_BLOCKED_LAST,
 
diff --git a/src/devices/nm-lldp-listener.c b/src/devices/nm-lldp-listener.c
index f637825b..c0484ed3 100644
--- a/src/devices/nm-lldp-listener.c
+++ b/src/devices/nm-lldp-listener.c
@@ -534,11 +534,13 @@ lldp_neighbor_new (sd_lldp_neighbor *neighbor_sd, GError **error)
 				l = data8[2];
 				if (len != 3 + l)
 					continue;
+				if (l > 32)
+					continue;
 
 				_lldp_attr_set_uint32 (neigh->attrs, LLDP_ATTR_ID_IEEE_802_1_VID,
 				                       _access_uint16 (&data8[0]));
 				_lldp_attr_set_str_ptr (neigh->attrs, LLDP_ATTR_ID_IEEE_802_1_VLAN_NAME,
-				                        &data8[3], len);
+				                        &data8[3], l);
 				break;
 			}
 			default:
diff --git a/src/devices/ovs/nm-ovsdb.c b/src/devices/ovs/nm-ovsdb.c
index b00397cf..494e2ea0 100644
--- a/src/devices/ovs/nm-ovsdb.c
+++ b/src/devices/ovs/nm-ovsdb.c
@@ -349,14 +349,14 @@ _insert_interface (json_t *params, NMConnection *interface)
 	if (s_ovs_iface)
 		type = nm_setting_ovs_interface_get_interface_type (s_ovs_iface);
 
-	json_array_append (options, json_string ("map"));
+	json_array_append_new (options, json_string ("map"));
 	s_ovs_patch = nm_connection_get_setting_ovs_patch (interface);
 	if (s_ovs_patch) {
-		json_array_append (options, json_pack ("[[s, s]]",
+		json_array_append_new (options, json_pack ("[[s, s]]",
 		                                       "peer",
 		                                        nm_setting_ovs_patch_get_peer (s_ovs_patch)));
 	} else {
-		json_array_append (options, json_array ());
+		json_array_append_new (options, json_array ());
 	}
 
 	json_array_append_new (params,
@@ -504,12 +504,15 @@ _add_interface (NMOvsdb *self, json_t *params,
 	OpenvswitchBridge *ovs_bridge = NULL;
 	OpenvswitchPort *ovs_port = NULL;
 	OpenvswitchInterface *ovs_interface = NULL;
+	nm_auto_decref_json json_t *bridges = NULL;
+	nm_auto_decref_json json_t *new_bridges = NULL;
+	nm_auto_decref_json json_t *ports = NULL;
+	nm_auto_decref_json json_t *new_ports = NULL;
+	nm_auto_decref_json json_t *interfaces = NULL;
+	nm_auto_decref_json json_t *new_interfaces = NULL;
+	gboolean has_interface = FALSE;
 	int pi;
 	int ii;
-	json_t *bridges, *new_bridges;
-	json_t *ports, *new_ports;
-	json_t *interfaces, *new_interfaces;
-	gboolean has_interface = FALSE;
 
 	bridges = json_array ();
 	ports = json_array ();
@@ -585,14 +588,6 @@ _add_interface (NMOvsdb *self, json_t *params,
 		_insert_interface (params, interface);
 		json_array_append_new (new_interfaces, json_pack ("[s, s]", "named-uuid", "rowInterface"));
 	}
-
-	json_decref (interfaces);
-	json_decref (ports);
-	json_decref (bridges);
-
-	json_decref (new_interfaces);
-	json_decref (new_ports);
-	json_decref (new_bridges);
 }
 
 /**
@@ -612,14 +607,13 @@ _delete_interface (NMOvsdb *self, json_t *params, const char *ifname)
 	OpenvswitchBridge *ovs_bridge;
 	OpenvswitchPort *ovs_port;
 	OpenvswitchInterface *ovs_interface;
-	int pi;
-	int ii;
-	json_t *bridges, *new_bridges;
-	json_t *ports, *new_ports;
-	json_t *interfaces, *new_interfaces;
+	nm_auto_decref_json json_t *bridges = NULL;
+	nm_auto_decref_json json_t *new_bridges = NULL;
 	gboolean bridges_changed;
 	gboolean ports_changed;
 	gboolean interfaces_changed;
+	int pi;
+	int ii;
 
 	bridges = json_array ();
 	new_bridges = json_array ();
@@ -627,20 +621,26 @@ _delete_interface (NMOvsdb *self, json_t *params, const char *ifname)
 
 	g_hash_table_iter_init (&iter, priv->bridges);
 	while (g_hash_table_iter_next (&iter, (gpointer) &bridge_uuid, (gpointer) &ovs_bridge)) {
-		json_array_append_new (bridges, json_pack ("[s,s]", "uuid", bridge_uuid));
+		nm_auto_decref_json json_t *ports = NULL;
+		nm_auto_decref_json json_t *new_ports = NULL;
 
 		ports = json_array ();
 		new_ports = json_array ();
 		ports_changed = FALSE;
 
+		json_array_append_new (bridges, json_pack ("[s,s]", "uuid", bridge_uuid));
+
 		for (pi = 0; pi < ovs_bridge->ports->len; pi++) {
+			nm_auto_decref_json json_t *interfaces = NULL;
+			nm_auto_decref_json json_t *new_interfaces = NULL;
+
+			interfaces = json_array ();
+			new_interfaces = json_array ();
 			port_uuid = g_ptr_array_index (ovs_bridge->ports, pi);
 			ovs_port = g_hash_table_lookup (priv->ports, port_uuid);
 
 			json_array_append_new (ports, json_pack ("[s,s]", "uuid", port_uuid));
 
-			interfaces = json_array ();
-			new_interfaces = json_array ();
 			interfaces_changed = FALSE;
 
 			for (ii = 0; ii < ovs_port->interfaces->len; ii++) {
@@ -667,9 +667,6 @@ _delete_interface (NMOvsdb *self, json_t *params, const char *ifname)
 				}
 				json_array_append_new (new_ports, json_pack ("[s,s]", "uuid", port_uuid));
 			}
-
-			json_decref (interfaces);
-			json_decref (new_interfaces);
 		}
 
 		if (json_array_size (new_ports) == 0) {
@@ -681,9 +678,6 @@ _delete_interface (NMOvsdb *self, json_t *params, const char *ifname)
 			}
 			json_array_append_new (new_bridges, json_pack ("[s,s]", "uuid", bridge_uuid));
 		}
-
-		json_decref (ports);
-		json_decref (new_ports);
 	}
 
 	if (bridges_changed) {
@@ -708,7 +702,7 @@ ovsdb_next_command (NMOvsdb *self)
 	NMOvsdbPrivate *priv = NM_OVSDB_GET_PRIVATE (self);
 	OvsdbMethodCall *call = NULL;
 	char *cmd;
-	json_t *msg = NULL;
+	nm_auto_decref_json json_t *msg = NULL;
 	json_t *params;
 
 	if (!priv->conn)
@@ -764,7 +758,6 @@ ovsdb_next_command (NMOvsdb *self)
 	cmd = json_dumps (msg, 0);
 
 	g_string_append (priv->output, cmd);
-	json_decref (msg);
 	free (cmd);
 
 	ovsdb_write (self);
@@ -1041,7 +1034,7 @@ static void
 ovsdb_got_echo (NMOvsdb *self, json_int_t id, json_t *data)
 {
 	NMOvsdbPrivate *priv = NM_OVSDB_GET_PRIVATE (self);
-	json_t *msg;
+	nm_auto_decref_json json_t *msg = NULL;
 	char *reply;
 	gboolean output_was_empty;
 
@@ -1050,7 +1043,6 @@ ovsdb_got_echo (NMOvsdb *self, json_int_t id, json_t *data)
 	msg = json_pack ("{s:I, s:O}", "id", id, "result", data);
 	reply = json_dumps (msg, 0);
 	g_string_append (priv->output, reply);
-	json_decref (msg);
 	free (reply);
 
 	if (output_was_empty)
@@ -1300,6 +1292,9 @@ ovsdb_disconnect (NMOvsdb *self, gboolean is_disposing)
 	gpointer user_data;
 	gs_free_error GError *error = NULL;
 
+	if (!priv->client)
+		return;
+
 	_LOGD ("disconnecting from ovsdb");
 	nm_utils_error_set_cancelled (&error, is_disposing, "NMOvsdb");
 
@@ -1317,6 +1312,7 @@ ovsdb_disconnect (NMOvsdb *self, gboolean is_disposing)
 	g_clear_object (&priv->client);
 	g_clear_object (&priv->conn);
 	g_clear_pointer (&priv->db_uuid, g_free);
+	nm_clear_g_cancellable (&priv->cancellable);
 }
 
 static void
@@ -1535,11 +1531,14 @@ dispose (GObject *object)
 
 	ovsdb_disconnect (self, TRUE);
 
-	g_string_free (priv->input, TRUE);
-	priv->input = NULL;
-	g_string_free (priv->output, TRUE);
-	priv->output = NULL;
-
+	if (priv->input) {
+		g_string_free (priv->input, TRUE);
+		priv->input = NULL;
+	}
+	if (priv->output) {
+		g_string_free (priv->output, TRUE);
+		priv->output = NULL;
+	}
 	if (priv->calls) {
 		g_array_free (priv->calls, TRUE);
 		priv->calls = NULL;
@@ -1549,9 +1548,6 @@ dispose (GObject *object)
 	g_clear_pointer (&priv->ports, g_hash_table_destroy);
 	g_clear_pointer (&priv->interfaces, g_hash_table_destroy);
 
-	g_cancellable_cancel (priv->cancellable);
-	g_clear_object (&priv->cancellable);
-
 	G_OBJECT_CLASS (nm_ovsdb_parent_class)->dispose (object);
 }
 
diff --git a/src/devices/tests/test-lldp.c b/src/devices/tests/test-lldp.c
index c2ac8e19..7227d082 100644
--- a/src/devices/tests/test-lldp.c
+++ b/src/devices/tests/test-lldp.c
@@ -219,11 +219,10 @@ TEST_RECV_FRAME_DEFINE (_test_recv_data1_frame0,
 	0x01, 0xe8,
 	0xfe, 0x07, 0x00, 0x80, 0xc2, 0x02, /* IEEE 802.1 - Port and Protocol VLAN ID */
 	0x01, 0x00, 0x00,
-	0xfe, 0x17, 0x00, 0x80, 0xc2, 0x03, /* IEEE 802.1 - VLAN Name */
-	0x01, 0xe8, 0x10, 0x76, 0x32, 0x2d,
+	0xfe, 0x16, 0x00, 0x80, 0xc2, 0x03, /* IEEE 802.1 - VLAN Name */
+	0x01, 0xe8, 0x0f, 0x76, 0x32, 0x2d,
 	0x30, 0x34, 0x38, 0x38, 0x2d, 0x30,
 	0x33, 0x2d, 0x30, 0x35, 0x30, 0x35,
-	0x00,
 	0xfe, 0x05, 0x00, 0x80, 0xc2, 0x04, /* IEEE 802.1 - Protocol Identity */
 	0x00,
 	0x00, 0x00                          /* End of LLDPDU */
diff --git a/src/devices/wifi/nm-device-olpc-mesh.c b/src/devices/wifi/nm-device-olpc-mesh.c
index 9ae81139..4c42e7d3 100644
--- a/src/devices/wifi/nm-device-olpc-mesh.c
+++ b/src/devices/wifi/nm-device-olpc-mesh.c
@@ -82,7 +82,19 @@ G_DEFINE_TYPE (NMDeviceOlpcMesh, nm_device_olpc_mesh, NM_TYPE_DEVICE)
 static gboolean
 get_autoconnect_allowed (NMDevice *device)
 {
-	return FALSE;
+	NMDeviceOlpcMesh *self = NM_DEVICE_OLPC_MESH (device);
+	NMDeviceOlpcMeshPrivate *priv = NM_DEVICE_OLPC_MESH_GET_PRIVATE (self);
+
+	/* We shall always have a companion if we're >= DISCONENCTED, and this
+	 * ought not be called until then. */
+	g_return_val_if_fail (priv->companion, FALSE);
+
+	/* We must not attempt to autoconnect when the companion is connected or
+	 * connecting, * because we'd tear down its connection. */
+	if (nm_device_get_state (priv->companion) > NM_DEVICE_STATE_DISCONNECTED)
+		return FALSE;
+
+	return TRUE;
 }
 
 #define DEFAULT_SSID "olpc-mesh"
@@ -265,6 +277,11 @@ companion_state_changed_cb (NMDeviceWifi *companion,
 	NMDeviceOlpcMesh *self = NM_DEVICE_OLPC_MESH (user_data);
 	NMDeviceState self_state = nm_device_get_state (NM_DEVICE (self));
 
+	if (   old_state > NM_DEVICE_STATE_DISCONNECTED
+	    && state <= NM_DEVICE_STATE_DISCONNECTED) {
+		nm_device_emit_recheck_auto_activate (NM_DEVICE (self));
+	}
+
 	if (   self_state < NM_DEVICE_STATE_PREPARE
 	    || self_state > NM_DEVICE_STATE_ACTIVATED
 	    || state < NM_DEVICE_STATE_PREPARE
diff --git a/src/devices/wwan/nm-device-modem.c b/src/devices/wwan/nm-device-modem.c
index 4119d598..8ff931aa 100644
--- a/src/devices/wwan/nm-device-modem.c
+++ b/src/devices/wwan/nm-device-modem.c
@@ -125,14 +125,40 @@ modem_prepare_result (NMModem *modem,
 	if (success)
 		nm_device_activate_schedule_stage2_device_config (device);
 	else {
-		if (nm_device_state_reason_check (reason) == NM_DEVICE_STATE_REASON_SIM_PIN_INCORRECT) {
-			/* If the connect failed because the SIM PIN was wrong don't allow
-			 * the device to be auto-activated anymore, which would risk locking
-			 * the SIM if the incorrect PIN continues to be used.
-			 */
+		/* There are several reasons to block autoconnection at device level:
+		 *
+		 *  - Wrong SIM-PIN: The device won't autoconnect because it doesn't make sense
+		 *    to retry the connection with the same PIN. This error also makes autoconnection
+		 *    blocked at settings level, so not even a modem unplug and replug will allow
+		 *    autoconnection again. It is somewhat redundant to block autoconnection at
+		 *    both device and setting level really.
+		 *
+		 *  - SIM wrong or not inserted: If the modem is reporting a SIM not inserted error,
+		 *    we can block autoconnection at device level, so that if the same device is
+		 *    unplugged and replugged with a SIM (or if a SIM hotplug event happens in MM,
+		 *    recreating the device completely), we can try the autoconnection again.
+		 *
+		 *  - Modem initialization failed: For some reason unknown to NM, the modem wasn't
+		 *    initialized correctly, which leads to an unusable device. A device unplug and
+		 *    replug may solve the issue, so make it a device-level autoconnection blocking
+		 *    reason.
+		 */
+		switch (nm_device_state_reason_check (reason)) {
+		case NM_DEVICE_STATE_REASON_GSM_SIM_PIN_REQUIRED:
+		case NM_DEVICE_STATE_REASON_GSM_SIM_PUK_REQUIRED:
+		case NM_DEVICE_STATE_REASON_SIM_PIN_INCORRECT:
 			nm_device_autoconnect_blocked_set (device, NM_DEVICE_AUTOCONNECT_BLOCKED_WRONG_PIN);
+			break;
+		case NM_DEVICE_STATE_REASON_GSM_SIM_NOT_INSERTED:
+		case NM_DEVICE_STATE_REASON_GSM_SIM_WRONG:
+			nm_device_autoconnect_blocked_set (device, NM_DEVICE_AUTOCONNECT_BLOCKED_SIM_MISSING);
+			break;
+		case NM_DEVICE_STATE_REASON_MODEM_INIT_FAILED:
+			nm_device_autoconnect_blocked_set (device, NM_DEVICE_AUTOCONNECT_BLOCKED_INIT_FAILED);
+			break;
+		default:
+			break;
 		}
-
 		nm_device_state_changed (device, NM_DEVICE_STATE_FAILED, reason);
 	}
 }
diff --git a/src/dhcp/nm-dhcp-client.c b/src/dhcp/nm-dhcp-client.c
index 16db8306..37fb18c4 100644
--- a/src/dhcp/nm-dhcp-client.c
+++ b/src/dhcp/nm-dhcp-client.c
@@ -28,7 +28,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 
 #include "nm-utils/nm-dedup-multi.h"
@@ -62,6 +61,7 @@ NM_GOBJECT_PROPERTIES_DEFINE (NMDhcpClient,
 	PROP_ROUTE_TABLE,
 	PROP_TIMEOUT,
 	PROP_UUID,
+	PROP_HOSTNAME,
 );
 
 typedef struct _NMDhcpClientPrivate {
@@ -69,7 +69,6 @@ typedef struct _NMDhcpClientPrivate {
 	char *       iface;
 	GBytes *     hwaddr;
 	char *       uuid;
-	GBytes *     duid;
 	GBytes *     client_id;
 	char *       hostname;
 	pid_t        pid;
@@ -139,14 +138,6 @@ nm_dhcp_client_get_uuid (NMDhcpClient *self)
 	return NM_DHCP_CLIENT_GET_PRIVATE (self)->uuid;
 }
 
-GBytes *
-nm_dhcp_client_get_duid (NMDhcpClient *self)
-{
-	g_return_val_if_fail (NM_IS_DHCP_CLIENT (self), NULL);
-
-	return NM_DHCP_CLIENT_GET_PRIVATE (self)->duid;
-}
-
 GBytes *
 nm_dhcp_client_get_hw_addr (NMDhcpClient *self)
 {
@@ -230,6 +221,18 @@ _set_client_id (NMDhcpClient *self, GBytes *client_id, gboolean take)
 	priv->client_id = client_id;
 	if (!take && client_id)
 		g_bytes_ref (client_id);
+
+	{
+		gs_free char *s = NULL;
+
+		_LOGT ("%s: set %s",
+		       nm_dhcp_client_get_addr_family (self) == AF_INET6
+		         ? "duid"
+		         : "client-id",
+		       priv->client_id
+		         ? (s = nm_dhcp_utils_duid_to_string (priv->client_id))
+		         : "default");
+	}
 }
 
 void
@@ -362,7 +365,7 @@ nm_dhcp_client_stop_pid (pid_t pid, const char *iface)
 }
 
 static void
-stop (NMDhcpClient *self, gboolean release, GBytes *duid)
+stop (NMDhcpClient *self, gboolean release)
 {
 	NMDhcpClientPrivate *priv;
 
@@ -509,7 +512,6 @@ gboolean
 nm_dhcp_client_start_ip4 (NMDhcpClient *self,
                           GBytes *client_id,
                           const char *dhcp_anycast_addr,
-                          const char *hostname,
                           const char *last_ip4_address,
                           GError **error)
 {
@@ -529,9 +531,6 @@ nm_dhcp_client_start_ip4 (NMDhcpClient *self,
 
 	nm_dhcp_client_set_client_id (self, client_id);
 
-	g_clear_pointer (&priv->hostname, g_free);
-	priv->hostname = g_strdup (hostname);
-
 	return NM_DHCP_CLIENT_GET_CLASS (self)->ip4_start (self,
 	                                                   dhcp_anycast_addr,
 	                                                   last_ip4_address,
@@ -550,34 +549,29 @@ nm_dhcp_client_start_ip6 (NMDhcpClient *self,
                           gboolean enforce_duid,
                           const char *dhcp_anycast_addr,
                           const struct in6_addr *ll_addr,
-                          const char *hostname,
                           NMSettingIP6ConfigPrivacy privacy,
                           guint needed_prefixes,
                           GError **error)
 {
 	NMDhcpClientPrivate *priv;
-	gs_free char *str = NULL;
+	gs_unref_bytes GBytes *own_client_id = NULL;
 
 	g_return_val_if_fail (NM_IS_DHCP_CLIENT (self), FALSE);
+	g_return_val_if_fail (client_id, FALSE);
 
 	priv = NM_DHCP_CLIENT_GET_PRIVATE (self);
+
 	g_return_val_if_fail (priv->pid == -1, FALSE);
 	g_return_val_if_fail (priv->addr_family == AF_INET6, FALSE);
 	g_return_val_if_fail (priv->uuid != NULL, FALSE);
-
-	nm_assert (!priv->duid);
-	nm_assert (client_id);
+	g_return_val_if_fail (!priv->client_id, FALSE);
 
 	if (!enforce_duid)
-		priv->duid = NM_DHCP_CLIENT_GET_CLASS (self)->get_duid (self);
-
-	if (!priv->duid)
-		priv->duid = g_bytes_ref (client_id);
-
-	_LOGD ("DUID is '%s'", (str = nm_dhcp_utils_duid_to_string (priv->duid)));
+		own_client_id = NM_DHCP_CLIENT_GET_CLASS (self)->get_duid (self);
 
-	g_clear_pointer (&priv->hostname, g_free);
-	priv->hostname = g_strdup (hostname);
+	_set_client_id (self,
+	                own_client_id ?: client_id,
+	                FALSE);
 
 	if (priv->timeout == NM_DHCP_TIMEOUT_INFINITY)
 		_LOGI ("activation: beginning transaction (no timeout)");
@@ -588,7 +582,6 @@ nm_dhcp_client_start_ip6 (NMDhcpClient *self,
 	                                                   dhcp_anycast_addr,
 	                                                   ll_addr,
 	                                                   privacy,
-	                                                   priv->duid,
 	                                                   needed_prefixes,
 	                                                   error);
 }
@@ -655,7 +648,7 @@ nm_dhcp_client_stop (NMDhcpClient *self, gboolean release)
 
 	/* Kill the DHCP client */
 	old_pid = priv->pid;
-	NM_DHCP_CLIENT_GET_CLASS (self)->stop (self, release, priv->duid);
+	NM_DHCP_CLIENT_GET_CLASS (self)->stop (self, release);
 	if (old_pid > 0)
 		_LOGI ("canceled DHCP transaction, DHCP client pid %d", old_pid);
 	else
@@ -859,6 +852,9 @@ get_property (GObject *object, guint prop_id,
 	case PROP_UUID:
 		g_value_set_string (value, priv->uuid);
 		break;
+	case PROP_HOSTNAME:
+		g_value_set_string (value, priv->hostname);
+		break;
 	case PROP_ROUTE_METRIC:
 		g_value_set_uint (value, priv->route_metric);
 		break;
@@ -899,11 +895,13 @@ set_property (GObject *object, guint prop_id,
 	case PROP_IFACE:
 		/* construct-only */
 		priv->iface = g_value_dup_string (value);
+		g_return_if_fail (   priv->iface
+		                  && nm_utils_is_valid_iface_name (priv->iface, NULL));
 		break;
 	case PROP_IFINDEX:
 		/* construct-only */
 		priv->ifindex = g_value_get_int (value);
-		g_warn_if_fail (priv->ifindex > 0);
+		g_return_if_fail (priv->ifindex > 0);
 		break;
 	case PROP_HWADDR:
 		/* construct-only */
@@ -919,6 +917,10 @@ set_property (GObject *object, guint prop_id,
 		/* construct-only */
 		priv->uuid = g_value_dup_string (value);
 		break;
+	case PROP_HOSTNAME:
+		/* construct-only */
+		priv->hostname = g_value_dup_string (value);
+		break;
 	case PROP_ROUTE_TABLE:
 		priv->route_table = g_value_get_uint (value);
 		break;
@@ -971,7 +973,6 @@ dispose (GObject *object)
 	g_clear_pointer (&priv->uuid, g_free);
 	g_clear_pointer (&priv->client_id, g_bytes_unref);
 	g_clear_pointer (&priv->hwaddr, g_bytes_unref);
-	g_clear_pointer (&priv->duid, g_bytes_unref);
 
 	G_OBJECT_CLASS (nm_dhcp_client_parent_class)->dispose (object);
 
@@ -1028,6 +1029,12 @@ nm_dhcp_client_class_init (NMDhcpClientClass *client_class)
 	                         G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY |
 	                         G_PARAM_STATIC_STRINGS);
 
+	obj_properties[PROP_HOSTNAME] =
+	    g_param_spec_string (NM_DHCP_CLIENT_HOSTNAME, "", "",
+	                         NULL,
+	                         G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY |
+	                         G_PARAM_STATIC_STRINGS);
+
 	obj_properties[PROP_ROUTE_TABLE] =
 	    g_param_spec_uint (NM_DHCP_CLIENT_ROUTE_TABLE, "", "",
 	                       0, G_MAXUINT32, RT_TABLE_MAIN,
@@ -1058,7 +1065,7 @@ nm_dhcp_client_class_init (NMDhcpClientClass *client_class)
 	    g_signal_new (NM_DHCP_CLIENT_SIGNAL_STATE_CHANGED,
 	                  G_OBJECT_CLASS_TYPE (object_class),
 	                  G_SIGNAL_RUN_FIRST,
-	                  G_STRUCT_OFFSET (NMDhcpClientClass, state_changed),
+	                  0,
 	                  NULL, NULL, NULL,
 	                  G_TYPE_NONE, 4, G_TYPE_UINT, G_TYPE_OBJECT, G_TYPE_HASH_TABLE, G_TYPE_STRING);
 
@@ -1066,7 +1073,7 @@ nm_dhcp_client_class_init (NMDhcpClientClass *client_class)
 	    g_signal_new (NM_DHCP_CLIENT_SIGNAL_PREFIX_DELEGATED,
 	                  G_OBJECT_CLASS_TYPE (object_class),
 	                  G_SIGNAL_RUN_FIRST,
-	                  G_STRUCT_OFFSET (NMDhcpClientClass, state_changed),
+	                  0,
 	                  NULL, NULL, NULL,
 	                  G_TYPE_NONE, 1, G_TYPE_POINTER);
 }
diff --git a/src/dhcp/nm-dhcp-client.h b/src/dhcp/nm-dhcp-client.h
index 86d60e38..8be50717 100644
--- a/src/dhcp/nm-dhcp-client.h
+++ b/src/dhcp/nm-dhcp-client.h
@@ -41,6 +41,7 @@
 #define NM_DHCP_CLIENT_IFINDEX      "ifindex"
 #define NM_DHCP_CLIENT_INTERFACE    "iface"
 #define NM_DHCP_CLIENT_MULTI_IDX    "multi-idx"
+#define NM_DHCP_CLIENT_HOSTNAME     "hostname"
 #define NM_DHCP_CLIENT_ROUTE_METRIC "route-metric"
 #define NM_DHCP_CLIENT_ROUTE_TABLE  "route-table"
 #define NM_DHCP_CLIENT_TIMEOUT      "timeout"
@@ -85,13 +86,11 @@ typedef struct {
 	                           const char *anycast_addr,
 	                           const struct in6_addr *ll_addr,
 	                           NMSettingIP6ConfigPrivacy privacy,
-	                           GBytes *duid,
 	                           guint needed_prefixes,
 	                           GError **error);
 
 	void (*stop)              (NMDhcpClient *self,
-	                           gboolean release,
-	                           GBytes *duid);
+	                           gboolean release);
 
 	/**
 	 * get_duid:
@@ -103,12 +102,6 @@ typedef struct {
 	 * returned.
 	 */
 	GBytes *(*get_duid) (NMDhcpClient *self);
-
-	/* Signals */
-	void (*state_changed) (NMDhcpClient *self,
-	                       NMDhcpState state,
-	                       GObject *ip_config,
-	                       GHashTable *options);
 } NMDhcpClientClass;
 
 GType nm_dhcp_client_get_type (void);
@@ -150,7 +143,6 @@ gboolean nm_dhcp_client_get_use_fqdn (NMDhcpClient *self);
 gboolean nm_dhcp_client_start_ip4 (NMDhcpClient *self,
                                    GBytes *client_id,
                                    const char *dhcp_anycast_addr,
-                                   const char *hostname,
                                    const char *last_ip4_address,
                                    GError **error);
 
@@ -159,7 +151,6 @@ gboolean nm_dhcp_client_start_ip6 (NMDhcpClient *self,
                                    gboolean enforce_duid,
                                    const char *dhcp_anycast_addr,
                                    const struct in6_addr *ll_addr,
-                                   const char *hostname,
                                    NMSettingIP6ConfigPrivacy privacy,
                                    guint needed_prefixes,
                                    GError **error);
diff --git a/src/dhcp/nm-dhcp-dhclient-utils.c b/src/dhcp/nm-dhcp-dhclient-utils.c
index a2c3bfb6..be8d06d9 100644
--- a/src/dhcp/nm-dhcp-dhclient-utils.c
+++ b/src/dhcp/nm-dhcp-dhclient-utils.c
@@ -24,6 +24,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include "nm-utils/nm-dedup-multi.h"
 
@@ -233,29 +234,6 @@ read_client_id (const char *str)
 	return nm_utils_hexstr2bin (s);
 }
 
-GBytes *
-nm_dhcp_dhclient_get_client_id_from_config_file (const char *path)
-{
-	gs_free char *contents = NULL;
-	gs_strfreev char **lines = NULL;
-	char **line;
-
-	g_return_val_if_fail (path != NULL, NULL);
-
-	if (!g_file_test (path, G_FILE_TEST_EXISTS))
-		return NULL;
-
-	if (!g_file_get_contents (path, &contents, NULL, NULL))
-		return NULL;
-
-	lines = g_strsplit_set (contents, "\n\r", 0);
-	for (line = lines; lines && *line; line++) {
-		if (!strncmp (*line, CLIENTID_TAG, NM_STRLEN (CLIENTID_TAG)))
-			return read_client_id (*line);
-	}
-	return NULL;
-}
-
 static gboolean
 read_interface (const char *line, char *interface, guint size)
 {
@@ -570,6 +548,7 @@ error:
 
 #define DUID_PREFIX "default-duid \""
 
+/* Beware: @error may be unset even if the function returns %NULL. */
 GBytes *
 nm_dhcp_dhclient_read_duid (const char *leasefile, GError **error)
 {
@@ -606,9 +585,10 @@ nm_dhcp_dhclient_read_duid (const char *leasefile, GError **error)
 
 gboolean
 nm_dhcp_dhclient_save_duid (const char *leasefile,
-                            const char *escaped_duid,
+                            GBytes *duid,
                             GError **error)
 {
+	gs_free char *escaped_duid = NULL;
 	gs_strfreev char **lines = NULL;
 	char **iter, *l;
 	GString *s;
@@ -616,6 +596,14 @@ nm_dhcp_dhclient_save_duid (const char *leasefile,
 	gsize len = 0;
 
 	g_return_val_if_fail (leasefile != NULL, FALSE);
+
+	if (!duid) {
+		nm_utils_error_set_literal (error, NM_UTILS_ERROR_UNKNOWN,
+		                            "missing duid");
+		g_return_val_if_reached (FALSE);
+	}
+
+	escaped_duid = nm_dhcp_dhclient_escape_duid (duid);
 	g_return_val_if_fail (escaped_duid != NULL, FALSE);
 
 	if (g_file_test (leasefile, G_FILE_TEST_EXISTS)) {
diff --git a/src/dhcp/nm-dhcp-dhclient-utils.h b/src/dhcp/nm-dhcp-dhclient-utils.h
index fab9196a..57a711db 100644
--- a/src/dhcp/nm-dhcp-dhclient-utils.h
+++ b/src/dhcp/nm-dhcp-dhclient-utils.h
@@ -40,10 +40,7 @@ GBytes *nm_dhcp_dhclient_unescape_duid (const char *duid);
 GBytes *nm_dhcp_dhclient_read_duid (const char *leasefile, GError **error);
 
 gboolean nm_dhcp_dhclient_save_duid (const char *leasefile,
-                                     const char *escaped_duid,
+                                     GBytes *duid,
                                      GError **error);
 
-GBytes *nm_dhcp_dhclient_get_client_id_from_config_file (const char *path);
-
 #endif /* __NETWORKMANAGER_DHCP_DHCLIENT_UTILS_H__ */
-
diff --git a/src/dhcp/nm-dhcp-dhclient.c b/src/dhcp/nm-dhcp-dhclient.c
index 33c26712..0146c8b4 100644
--- a/src/dhcp/nm-dhcp-dhclient.c
+++ b/src/dhcp/nm-dhcp-dhclient.c
@@ -121,8 +121,8 @@ get_dhclient_leasefile (int addr_family,
                         const char *uuid,
                         char **out_preferred_path)
 {
-	char *rundir_path;
-	char *path;
+	gs_free char *rundir_path = NULL;
+	gs_free char *path = NULL;
 
 	/* First, see if the lease file is in /run */
 	rundir_path = g_strdup_printf (NMRUNDIR "/dhclient%s-%s-%s.lease",
@@ -132,7 +132,7 @@ get_dhclient_leasefile (int addr_family,
 
 	if (g_file_test (rundir_path, G_FILE_TEST_EXISTS)) {
 		NM_SET_OUT (out_preferred_path, g_strdup (rundir_path));
-		return rundir_path;
+		return g_steal_pointer (&rundir_path);
 	}
 
 	/* /var/lib/NetworkManager is the preferred leasefile path */
@@ -142,18 +142,14 @@ get_dhclient_leasefile (int addr_family,
 	                        iface);
 
 	if (g_file_test (path, G_FILE_TEST_EXISTS)) {
-		g_free (rundir_path);
 		NM_SET_OUT (out_preferred_path, g_strdup (path));
-		return path;
+		return g_steal_pointer (&path);
 	}
 
-	if (nm_config_get_configure_and_quit (nm_config_get ()) == NM_CONFIG_CONFIGURE_AND_QUIT_INITRD) {
-		g_free (path);
-		path = rundir_path;
-	} else {
-		g_free (rundir_path);
-	}
-	NM_SET_OUT (out_preferred_path, g_steal_pointer (&path));
+	if (nm_config_get_configure_and_quit (nm_config_get ()) == NM_CONFIG_CONFIGURE_AND_QUIT_INITRD)
+		NM_SET_OUT (out_preferred_path, g_steal_pointer (&rundir_path));
+	else
+		NM_SET_OUT (out_preferred_path, g_steal_pointer (&path));
 
 	/* If the leasefile we're looking for doesn't exist yet in the new location
 	 * (eg, /var/lib/NetworkManager) then look in old locations to maintain
@@ -166,17 +162,16 @@ get_dhclient_leasefile (int addr_family,
 	path = g_strdup_printf (LOCALSTATEDIR "/lib/dhcp/dhclient%s-%s-%s.lease",
 	                        _addr_family_to_path_part (addr_family), uuid, iface);
 	if (g_file_test (path, G_FILE_TEST_EXISTS))
-		return path;
+		return g_steal_pointer (&path);
 
 	/* Old Red Hat and Fedora location */
 	g_free (path);
 	path = g_strdup_printf (LOCALSTATEDIR "/lib/dhclient/dhclient%s-%s-%s.lease",
 	                        _addr_family_to_path_part (addr_family), uuid, iface);
 	if (g_file_test (path, G_FILE_TEST_EXISTS))
-		return path;
+		return g_steal_pointer (&path);
 
 	/* Fail */
-	g_free (path);
 	return NULL;
 }
 
@@ -327,8 +322,18 @@ create_dhclient_config (NMDhcpDhclient *self,
 	else
 		_LOGD ("no existing dhclient configuration to merge");
 
-	if (!merge_dhclient_config (self, addr_family, iface, new, client_id, dhcp_anycast_addr,
-	                            hostname, timeout, use_fqdn, orig, out_new_client_id, &error)) {
+	if (!merge_dhclient_config (self,
+	                            addr_family,
+	                            iface,
+	                            new,
+	                            client_id,
+	                            dhcp_anycast_addr,
+	                            hostname,
+	                            timeout,
+	                            use_fqdn,
+	                            orig,
+	                            out_new_client_id,
+	                            &error)) {
 		_LOGW ("error creating dhclient configuration: %s", error->message);
 		g_clear_error (&error);
 	}
@@ -339,7 +344,6 @@ create_dhclient_config (NMDhcpDhclient *self,
 static gboolean
 dhclient_start (NMDhcpClient *client,
                 const char *mode_opt,
-                GBytes *duid,
                 gboolean release,
                 pid_t *out_pid,
                 int prefixes,
@@ -418,10 +422,9 @@ dhclient_start (NMDhcpClient *client,
 
 	/* Save the DUID to the leasefile dhclient will actually use */
 	if (addr_family == AF_INET6) {
-		gs_free char *escaped = NULL;
-
-		escaped = nm_dhcp_dhclient_escape_duid (duid);
-		if (!nm_dhcp_dhclient_save_duid (priv->lease_file, escaped, &local)) {
+		if (!nm_dhcp_dhclient_save_duid (priv->lease_file,
+		                                 nm_dhcp_client_get_client_id (client),
+		                                 &local)) {
 			nm_utils_error_set (error,
 			                    NM_UTILS_ERROR_UNKNOWN,
 			                    "failed to save DUID to '%s': %s",
@@ -540,7 +543,6 @@ ip4_start (NMDhcpClient *client,
 		nm_dhcp_client_set_client_id (client, new_client_id);
 	}
 	return dhclient_start (client,
-	                       NULL,
 	                       NULL,
 	                       FALSE,
 	                       NULL,
@@ -553,7 +555,6 @@ ip6_start (NMDhcpClient *client,
            const char *dhcp_anycast_addr,
            const struct in6_addr *ll_addr,
            NMSettingIP6ConfigPrivacy privacy,
-           GBytes *duid,
            guint needed_prefixes,
            GError **error)
 {
@@ -581,7 +582,6 @@ ip6_start (NMDhcpClient *client,
 	                       nm_dhcp_client_get_info_only (NM_DHCP_CLIENT (self))
 	                         ? "-S"
 	                         : "-N",
-	                       duid,
 	                       FALSE,
 	                       NULL,
 	                       needed_prefixes,
@@ -589,12 +589,12 @@ ip6_start (NMDhcpClient *client,
 }
 
 static void
-stop (NMDhcpClient *client, gboolean release, GBytes *duid)
+stop (NMDhcpClient *client, gboolean release)
 {
 	NMDhcpDhclient *self = NM_DHCP_DHCLIENT (client);
 	NMDhcpDhclientPrivate *priv = NM_DHCP_DHCLIENT_GET_PRIVATE (self);
 
-	NM_DHCP_CLIENT_CLASS (nm_dhcp_dhclient_parent_class)->stop (client, release, duid);
+	NM_DHCP_CLIENT_CLASS (nm_dhcp_dhclient_parent_class)->stop (client, release);
 
 	if (priv->conf_file)
 		if (remove (priv->conf_file) == -1)
@@ -613,7 +613,6 @@ stop (NMDhcpClient *client, gboolean release, GBytes *duid)
 
 		if (dhclient_start (client,
 		                    NULL,
-		                    duid,
 		                    TRUE,
 		                    &rpid,
 		                    0,
@@ -624,31 +623,13 @@ stop (NMDhcpClient *client, gboolean release, GBytes *duid)
 	}
 }
 
-static void
-state_changed (NMDhcpClient *client,
-               NMDhcpState state,
-               GObject *ip_config,
-               GHashTable *options)
-{
-	NMDhcpDhclientPrivate *priv = NM_DHCP_DHCLIENT_GET_PRIVATE ((NMDhcpDhclient *) client);
-	gs_unref_bytes GBytes *client_id = NULL;
-
-	if (nm_dhcp_client_get_client_id (client))
-		return;
-	if (state != NM_DHCP_STATE_BOUND)
-		return;
-
-	client_id = nm_dhcp_dhclient_get_client_id_from_config_file (priv->conf_file);
-	nm_dhcp_client_set_client_id (client, client_id);
-}
-
 static GBytes *
 get_duid (NMDhcpClient *client)
 {
 	NMDhcpDhclient *self = NM_DHCP_DHCLIENT (client);
 	NMDhcpDhclientPrivate *priv = NM_DHCP_DHCLIENT_GET_PRIVATE (self);
 	GBytes *duid = NULL;
-	char *leasefile;
+	gs_free char *leasefile = NULL;
 	GError *error = NULL;
 
 	/* Look in interface-specific leasefile first for backwards compat */
@@ -659,25 +640,23 @@ get_duid (NMDhcpClient *client)
 	if (leasefile) {
 		_LOGD ("looking for DUID in '%s'", leasefile);
 		duid = nm_dhcp_dhclient_read_duid (leasefile, &error);
-
 		if (error) {
 			_LOGW ("failed to read leasefile '%s': %s",
 			       leasefile, error->message);
 			g_clear_error (&error);
 		}
-		g_free (leasefile);
+		if (duid)
+			return duid;
 	}
 
-	if (!duid) {
-		/* Otherwise read the default machine-wide DUID */
-		_LOGD ("looking for default DUID in '%s'", priv->def_leasefile);
-		duid = nm_dhcp_dhclient_read_duid (priv->def_leasefile, &error);
-		if (error) {
-			_LOGW ("failed to read leasefile '%s': %s",
-			        priv->def_leasefile,
-			        error->message);
-			g_clear_error (&error);
-		}
+	/* Otherwise read the default machine-wide DUID */
+	_LOGD ("looking for default DUID in '%s'", priv->def_leasefile);
+	duid = nm_dhcp_dhclient_read_duid (priv->def_leasefile, &error);
+	if (error) {
+		_LOGW ("failed to read leasefile '%s': %s",
+		        priv->def_leasefile,
+		        error->message);
+		g_clear_error (&error);
 	}
 
 	return duid;
@@ -742,7 +721,6 @@ nm_dhcp_dhclient_class_init (NMDhcpDhclientClass *dhclient_class)
 	client_class->ip6_start = ip6_start;
 	client_class->stop = stop;
 	client_class->get_duid = get_duid;
-	client_class->state_changed = state_changed;
 }
 
 const NMDhcpClientFactory _nm_dhcp_client_factory_dhclient = {
diff --git a/src/dhcp/nm-dhcp-dhcpcanon.c b/src/dhcp/nm-dhcp-dhcpcanon.c
index de403020..0f033e22 100644
--- a/src/dhcp/nm-dhcp-dhcpcanon.c
+++ b/src/dhcp/nm-dhcp-dhcpcanon.c
@@ -193,20 +193,20 @@ ip6_start (NMDhcpClient *client,
            const char *dhcp_anycast_addr,
            const struct in6_addr *ll_addr,
            NMSettingIP6ConfigPrivacy privacy,
-           GBytes *duid,
            guint needed_prefixes,
            GError **error)
 {
 	nm_utils_error_set_literal (error, NM_UTILS_ERROR_UNKNOWN, "dhcpcanon plugin does not support IPv6");
 	return FALSE;
 }
+
 static void
-stop (NMDhcpClient *client, gboolean release, GBytes *duid)
+stop (NMDhcpClient *client, gboolean release)
 {
 	NMDhcpDhcpcanon *self = NM_DHCP_DHCPCANON (client);
 	NMDhcpDhcpcanonPrivate *priv = NM_DHCP_DHCPCANON_GET_PRIVATE (self);
 
-	NM_DHCP_CLIENT_CLASS (nm_dhcp_dhcpcanon_parent_class)->stop (client, release, duid);
+	NM_DHCP_CLIENT_CLASS (nm_dhcp_dhcpcanon_parent_class)->stop (client, release);
 
 	if (priv->pid_file) {
 		if (remove (priv->pid_file) == -1)
@@ -216,18 +216,6 @@ stop (NMDhcpClient *client, gboolean release, GBytes *duid)
 	}
 }
 
-static void
-state_changed (NMDhcpClient *client,
-               NMDhcpState state,
-               GObject *ip_config,
-               GHashTable *options)
-{
-	if (nm_dhcp_client_get_client_id (client))
-		return;
-	if (state != NM_DHCP_STATE_BOUND)
-		return;
-}
-
 /*****************************************************************************/
 
 static void
@@ -270,7 +258,6 @@ nm_dhcp_dhcpcanon_class_init (NMDhcpDhcpcanonClass *dhcpcanon_class)
 	client_class->ip4_start = ip4_start;
 	client_class->ip6_start = ip6_start;
 	client_class->stop = stop;
-	client_class->state_changed = state_changed;
 }
 
 const NMDhcpClientFactory _nm_dhcp_client_factory_dhcpcanon = {
diff --git a/src/dhcp/nm-dhcp-dhcpcd.c b/src/dhcp/nm-dhcp-dhcpcd.c
index 98ab5342..e2a1354f 100644
--- a/src/dhcp/nm-dhcp-dhcpcd.c
+++ b/src/dhcp/nm-dhcp-dhcpcd.c
@@ -187,7 +187,6 @@ ip6_start (NMDhcpClient *client,
            const char *dhcp_anycast_addr,
            const struct in6_addr *ll_addr,
            NMSettingIP6ConfigPrivacy privacy,
-           GBytes *duid,
            guint needed_prefixes,
            GError **error)
 {
@@ -196,12 +195,12 @@ ip6_start (NMDhcpClient *client,
 }
 
 static void
-stop (NMDhcpClient *client, gboolean release, GBytes *duid)
+stop (NMDhcpClient *client, gboolean release)
 {
 	NMDhcpDhcpcd *self = NM_DHCP_DHCPCD (client);
 	NMDhcpDhcpcdPrivate *priv = NM_DHCP_DHCPCD_GET_PRIVATE (self);
 
-	NM_DHCP_CLIENT_CLASS (nm_dhcp_dhcpcd_parent_class)->stop (client, release, duid);
+	NM_DHCP_CLIENT_CLASS (nm_dhcp_dhcpcd_parent_class)->stop (client, release);
 
 	if (priv->pid_file) {
 		if (remove (priv->pid_file) == -1)
diff --git a/src/dhcp/nm-dhcp-manager.c b/src/dhcp/nm-dhcp-manager.c
index 5ae16d72..a51c6e38 100644
--- a/src/dhcp/nm-dhcp-manager.c
+++ b/src/dhcp/nm-dhcp-manager.c
@@ -181,6 +181,7 @@ client_start (NMDhcpManager *self,
 	gsize hwaddr_len;
 
 	g_return_val_if_fail (NM_IS_DHCP_MANAGER (self), NULL);
+	g_return_val_if_fail (iface, NULL);
 	g_return_val_if_fail (ifindex > 0, NULL);
 	g_return_val_if_fail (uuid != NULL, NULL);
 	g_return_val_if_fail (!dhcp_client_id || g_bytes_get_size (dhcp_client_id) >= 2, NULL);
@@ -221,6 +222,7 @@ client_start (NMDhcpManager *self,
 	                       NM_DHCP_CLIENT_IFINDEX, ifindex,
 	                       NM_DHCP_CLIENT_HWADDR, hwaddr,
 	                       NM_DHCP_CLIENT_UUID, uuid,
+	                       NM_DHCP_CLIENT_HOSTNAME, hostname,
 	                       NM_DHCP_CLIENT_ROUTE_TABLE, (guint) route_table,
 	                       NM_DHCP_CLIENT_ROUTE_METRIC, (guint) route_metric,
 	                       NM_DHCP_CLIENT_TIMEOUT, (guint) timeout,
@@ -233,11 +235,36 @@ client_start (NMDhcpManager *self,
 	c_list_link_tail (&priv->dhcp_client_lst_head, &client->dhcp_client_lst);
 	g_signal_connect (client, NM_DHCP_CLIENT_SIGNAL_STATE_CHANGED, G_CALLBACK (client_state_changed), self);
 
+	/* unfortunately, our implementations work differently per address-family regarding client-id/DUID.
+	 *
+	 * - for IPv4, the calling code may determine a client-id (from NM's connection profile).
+	 *   If present, it is taken. If not present, the DHCP plugin uses a plugin specific default.
+	 *     - for "internal" plugin, the default is just "duid".
+	 *     - for "dhclient", we try to get the configuration from dhclient's /etc/dhcp or fallback
+	 *       to whatever dhclient uses by default.
+	 *   We do it this way, because for dhclient the user may configure a default
+	 *   outside of NM, and we want to honor that. Worse, dhclient could be a wapper
+	 *   script where the wrapper script overwrites the client-id. We need to distinguish
+	 *   between: force a particular client-id and leave it unspecified to whatever dhclient
+	 *   wants.
+	 *
+	 * - for IPv6, the calling code always determines a client-id. It also specifies @enforce_duid,
+	 *   to determine whether the given client-id must be used.
+	 *     - for "internal" plugin @enforce_duid doesn't matter and the given client-id is
+	 *       always used.
+	 *     - for "dhclient", @enforce_duid FALSE means to first try to load the DUID from the
+	 *       lease file, and only otherwise fallback to the given client-id.
+	 *     - other plugins don't support DHCPv6.
+	 *   It's done this way, so that existing dhclient setups don't change behavior on upgrade.
+	 *
+	 * This difference is cumbersome and only exists because of "dhclient" which supports hacking the
+	 * default outside of NetworkManager API.
+	 */
+
 	if (addr_family == AF_INET) {
 		success = nm_dhcp_client_start_ip4 (client,
 		                                    dhcp_client_id,
 		                                    dhcp_anycast_addr,
-		                                    hostname,
 		                                    last_ip4_address,
 		                                    error);
 	} else {
@@ -246,7 +273,6 @@ client_start (NMDhcpManager *self,
 		                                    enforce_duid,
 		                                    dhcp_anycast_addr,
 		                                    ipv6_ll_addr,
-		                                    hostname,
 		                                    privacy,
 		                                    needed_prefixes,
 		                                    error);
@@ -311,10 +337,27 @@ nm_dhcp_manager_start_ip4 (NMDhcpManager *self,
 		}
 	}
 
-	return client_start (self, AF_INET, multi_idx, iface, ifindex, hwaddr, uuid,
-	                     route_table, route_metric, NULL,
-	                     dhcp_client_id, 0, timeout, dhcp_anycast_addr, hostname,
-	                     use_fqdn, FALSE, 0, last_ip_address, 0, error);
+	return client_start (self,
+	                     AF_INET,
+	                     multi_idx,
+	                     iface,
+	                     ifindex,
+	                     hwaddr,
+	                     uuid,
+	                     route_table,
+	                     route_metric,
+	                     NULL,
+	                     dhcp_client_id,
+	                     FALSE,
+	                     timeout,
+	                     dhcp_anycast_addr,
+	                     hostname,
+	                     use_fqdn,
+	                     FALSE,
+	                     0,
+	                     last_ip_address,
+	                     0,
+	                     error);
 }
 
 /* Caller owns a reference to the NMDhcpClient on return */
@@ -349,10 +392,27 @@ nm_dhcp_manager_start_ip6 (NMDhcpManager *self,
 		/* Always prefer the explicit dhcp-hostname if given */
 		hostname = dhcp_hostname ?: priv->default_hostname;
 	}
-	return client_start (self, AF_INET6, multi_idx, iface, ifindex, hwaddr, uuid,
-	                     route_table, route_metric, ll_addr, duid, enforce_duid,
-	                     timeout, dhcp_anycast_addr, hostname, TRUE, info_only,
-	                     privacy, NULL, needed_prefixes, error);
+	return client_start (self,
+	                     AF_INET6,
+	                     multi_idx,
+	                     iface,
+	                     ifindex,
+	                     hwaddr,
+	                     uuid,
+	                     route_table,
+	                     route_metric,
+	                     ll_addr,
+	                     duid,
+	                     enforce_duid,
+	                     timeout,
+	                     dhcp_anycast_addr,
+	                     hostname,
+	                     TRUE,
+	                     info_only,
+	                     privacy,
+	                     NULL,
+	                     needed_prefixes,
+	                     error);
 }
 
 void
@@ -384,6 +444,12 @@ nm_dhcp_manager_get_config (NMDhcpManager *self)
 
 NM_DEFINE_SINGLETON_GETTER (NMDhcpManager, nm_dhcp_manager_get, NM_TYPE_DHCP_MANAGER);
 
+void
+nmtst_dhcp_manager_unget (gpointer self)
+{
+	_nmtst_nm_dhcp_manager_get_reset (self);
+}
+
 static void
 nm_dhcp_manager_init (NMDhcpManager *self)
 {
@@ -446,6 +512,10 @@ nm_dhcp_manager_init (NMDhcpManager *self)
 
 	nm_log_info (LOGD_DHCP, "dhcp-init: Using DHCP client '%s'", client_factory->name);
 
+	/* NOTE: currently the DHCP plugin is chosen once at start. It's not
+	 * possible to reload that configuration. If that ever becomes possible,
+	 * beware that the "dhcp-plugin" device spec made decisions based on
+	 * the previous plugin and may need reevaluation. */
 	priv->client_factory = client_factory;
 }
 
diff --git a/src/dhcp/nm-dhcp-manager.h b/src/dhcp/nm-dhcp-manager.h
index 1d9e5c21..f8f39e53 100644
--- a/src/dhcp/nm-dhcp-manager.h
+++ b/src/dhcp/nm-dhcp-manager.h
@@ -87,4 +87,6 @@ extern const char* nm_dhcp_helper_path;
 
 extern const NMDhcpClientFactory *const _nm_dhcp_manager_factories[4];
 
+void nmtst_dhcp_manager_unget (gpointer singleton_instance);
+
 #endif /* __NETWORKMANAGER_DHCP_MANAGER_H__ */
diff --git a/src/dhcp/nm-dhcp-systemd.c b/src/dhcp/nm-dhcp-systemd.c
index 5b7b5fbe..5c60af5f 100644
--- a/src/dhcp/nm-dhcp-systemd.c
+++ b/src/dhcp/nm-dhcp-systemd.c
@@ -34,6 +34,7 @@
 #include "nm-utils.h"
 #include "nm-config.h"
 #include "nm-dhcp-utils.h"
+#include "nm-core-utils.h"
 #include "NetworkManagerUtils.h"
 #include "platform/nm-platform.h"
 #include "nm-dhcp-client-logging.h"
@@ -482,22 +483,6 @@ get_leasefile_path (int addr_family, const char *iface, const char *uuid)
 
 /*****************************************************************************/
 
-static void
-_save_client_id (NMDhcpSystemd *self,
-                 uint8_t type,
-                 const uint8_t *client_id,
-                 size_t len)
-{
-	g_return_if_fail (self != NULL);
-	g_return_if_fail (client_id != NULL);
-	g_return_if_fail (len > 0);
-
-	if (!nm_dhcp_client_get_client_id (NM_DHCP_CLIENT (self))) {
-		nm_dhcp_client_set_client_id_bin (NM_DHCP_CLIENT (self),
-		                                  type, client_id, len);
-	}
-}
-
 static void
 bound4_handle (NMDhcpSystemd *self)
 {
@@ -529,17 +514,9 @@ bound4_handle (NMDhcpSystemd *self)
 	                                  TRUE,
 	                                  &error);
 	if (ip4_config) {
-		const uint8_t *client_id = NULL;
-		size_t client_id_len = 0;
-		uint8_t type = 0;
-
 		add_requests_to_options (options, dhcp4_requests);
 		dhcp_lease_save (lease, priv->lease_file);
 
-		sd_dhcp_client_get_client_id (priv->client4, &type, &client_id, &client_id_len);
-		if (client_id)
-			_save_client_id (self, type, client_id, client_id_len);
-
 		nm_dhcp_client_set_state (NM_DHCP_CLIENT (self),
 		                          NM_DHCP_STATE_BOUND,
 		                          NM_IP_CONFIG_CAST (ip4_config),
@@ -582,127 +559,122 @@ dhcp_event_cb (sd_dhcp_client *client, int event, gpointer user_data)
 	}
 }
 
-static guint16
-get_arp_type (GBytes *hwaddr)
-{
-	switch (g_bytes_get_size (hwaddr)) {
-	case ETH_ALEN:
-		return ARPHRD_ETHER;
-	case INFINIBAND_ALEN:
-		return ARPHRD_INFINIBAND;
-	default:
-		return ARPHRD_NONE;
-	}
-}
-
 static gboolean
 ip4_start (NMDhcpClient *client,
            const char *dhcp_anycast_addr,
            const char *last_ip4_address,
            GError **error)
 {
+	nm_auto (sd_dhcp_client_unrefp) sd_dhcp_client *sd_client = NULL;
 	NMDhcpSystemd *self = NM_DHCP_SYSTEMD (client);
 	NMDhcpSystemdPrivate *priv = NM_DHCP_SYSTEMD_GET_PRIVATE (self);
-	const char *iface = nm_dhcp_client_get_iface (client);
+	gs_free char *lease_file = NULL;
 	GBytes *hwaddr;
-	sd_dhcp_lease *lease = NULL;
-	GBytes *override_client_id;
-	const uint8_t *client_id = NULL;
-	size_t client_id_len = 0;
+	const uint8_t *hwaddr_arr;
+	gsize hwaddr_len;
+	int arp_type;
+	GBytes *client_id;
+	gs_unref_bytes GBytes *client_id_new = NULL;
+	const uint8_t *client_id_arr;
+	size_t client_id_len;
 	struct in_addr last_addr = { 0 };
 	const char *hostname;
 	int r, i;
-	gboolean success = FALSE;
 
-	g_assert (priv->client4 == NULL);
-	g_assert (priv->client6 == NULL);
-
-	g_free (priv->lease_file);
-	priv->lease_file = get_leasefile_path (AF_INET, iface, nm_dhcp_client_get_uuid (client));
+	g_return_val_if_fail (!priv->client4, FALSE);
+	g_return_val_if_fail (!priv->client6, FALSE);
 
-	r = sd_dhcp_client_new (&priv->client4, FALSE);
+	r = sd_dhcp_client_new (&sd_client, FALSE);
 	if (r < 0) {
 		nm_utils_error_set_errno (error, r, "failed to create dhcp-client: %s");
 		return FALSE;
 	}
 
-	_LOGT ("dhcp-client4: set %p", priv->client4);
+	_LOGT ("dhcp-client4: set %p", sd_client);
 
-	r = sd_dhcp_client_attach_event (priv->client4, NULL, 0);
+	r = sd_dhcp_client_attach_event (sd_client, NULL, 0);
 	if (r < 0) {
 		nm_utils_error_set_errno (error, r, "failed to attach event: %s");
-		goto errout;
+		return FALSE;
 	}
 
 	hwaddr = nm_dhcp_client_get_hw_addr (client);
-	if (hwaddr) {
-		const uint8_t *data;
-		gsize len;
-
-		data = g_bytes_get_data (hwaddr, &len);
-		r = sd_dhcp_client_set_mac (priv->client4,
-		                            data,
-		                            len,
-		                            get_arp_type (hwaddr));
-		if (r < 0) {
-			nm_utils_error_set_errno (error, r, "failed to set MAC address: %s");
-			goto errout;
-		}
+	if (   !hwaddr
+	    || !(hwaddr_arr = g_bytes_get_data (hwaddr, &hwaddr_len))
+	    || (arp_type = nm_utils_arp_type_detect_from_hwaddrlen (hwaddr_len)) < 0) {
+		nm_utils_error_set_literal (error, NM_UTILS_ERROR_UNKNOWN, "invalid MAC address");
+		return FALSE;
 	}
-
-	r = sd_dhcp_client_set_ifindex (priv->client4, nm_dhcp_client_get_ifindex (client));
+	r = sd_dhcp_client_set_mac (sd_client,
+	                            hwaddr_arr,
+	                            hwaddr_len,
+	                            (guint16) arp_type);
 	if (r < 0) {
-		nm_utils_error_set_errno (error, r, "failed to set ifindex: %s");
-		goto errout;
+		nm_utils_error_set_errno (error, r, "failed to set MAC address: %s");
+		return FALSE;
 	}
 
-	r = sd_dhcp_client_set_callback (priv->client4, dhcp_event_cb, client);
+	r = sd_dhcp_client_set_ifindex (sd_client,
+	                                nm_dhcp_client_get_ifindex (client));
 	if (r < 0) {
-		nm_utils_error_set_errno (error, r, "failed to set callback: %s");
-		goto errout;
+		nm_utils_error_set_errno (error, r, "failed to set ifindex: %s");
+		return FALSE;
 	}
 
-	dhcp_lease_load (&lease, priv->lease_file);
+	lease_file = get_leasefile_path (AF_INET,
+	                                 nm_dhcp_client_get_iface (client),
+	                                 nm_dhcp_client_get_uuid (client));
 
 	if (last_ip4_address)
 		inet_pton (AF_INET, last_ip4_address, &last_addr);
-	else if (lease)
-		sd_dhcp_lease_get_address (lease, &last_addr);
+	else {
+		nm_auto (sd_dhcp_lease_unrefp) sd_dhcp_lease *lease = NULL;
+
+		dhcp_lease_load (&lease, lease_file);
+		if (lease)
+			sd_dhcp_lease_get_address (lease, &last_addr);
+	}
 
 	if (last_addr.s_addr) {
-		r = sd_dhcp_client_set_request_address (priv->client4, &last_addr);
+		r = sd_dhcp_client_set_request_address (sd_client, &last_addr);
 		if (r < 0) {
 			nm_utils_error_set_errno (error, r, "failed to set last IPv4 address: %s");
-			goto errout;
+			return FALSE;
 		}
 	}
 
-	override_client_id = nm_dhcp_client_get_client_id (client);
-	if (override_client_id) {
-		client_id = g_bytes_get_data (override_client_id, &client_id_len);
-		nm_assert (client_id && client_id_len >= 2);
-		sd_dhcp_client_set_client_id (priv->client4,
-		                              client_id[0],
-		                              client_id + 1,
-		                              NM_MIN (client_id_len - 1, _NM_SD_MAX_CLIENT_ID_LEN));
-	} else if (lease) {
-		r = sd_dhcp_lease_get_client_id (lease, (const void **) &client_id, &client_id_len);
-		if (r == 0 && client_id_len >= 2) {
-			sd_dhcp_client_set_client_id (priv->client4,
-			                              client_id[0],
-			                              client_id + 1,
-			                              client_id_len - 1);
-			_save_client_id (NM_DHCP_SYSTEMD (client),
-			                 client_id[0],
-			                 client_id + 1,
-			                 client_id_len - 1);
-		}
+	client_id = nm_dhcp_client_get_client_id (client);
+	if (!client_id) {
+		client_id_new = nm_utils_dhcp_client_id_systemd_node_specific (TRUE,
+		                                                               nm_dhcp_client_get_iface (client));
+		client_id = client_id_new;
+	}
+
+	if (   !(client_id_arr = g_bytes_get_data (client_id, &client_id_len))
+	    || client_id_len < 2) {
+
+		/* invalid client-ids are not expected. */
+		nm_assert_not_reached ();
+
+		nm_utils_error_set_literal (error, NM_UTILS_ERROR_UNKNOWN, "no valid IPv4 client-id");
+		return FALSE;
+	}
+
+	/* Note that we always set a client-id. In particular for infiniband that is necessary,
+	 * see https://tools.ietf.org/html/rfc4390#section-2.1 . */
+	r = sd_dhcp_client_set_client_id (sd_client,
+	                                  client_id_arr[0],
+	                                  client_id_arr + 1,
+	                                  NM_MIN (client_id_len - 1, _NM_SD_MAX_CLIENT_ID_LEN));
+	if (r < 0) {
+		nm_utils_error_set_errno (error, r, "failed to set IPv4 client-id: %s");
+		return FALSE;
 	}
 
 	/* Add requested options */
 	for (i = 0; dhcp4_requests[i].name; i++) {
 		if (dhcp4_requests[i].include)
-			sd_dhcp_client_set_request_option (priv->client4, dhcp4_requests[i].num);
+			sd_dhcp_client_set_request_option (sd_client, dhcp4_requests[i].num);
 	}
 
 	hostname = nm_dhcp_client_get_hostname (client);
@@ -711,28 +683,36 @@ ip4_start (NMDhcpClient *client,
 		 * only based on whether the hostname has a domain part or not. At the
 		 * moment there is no way to force one or another.
 		 */
-		r = sd_dhcp_client_set_hostname (priv->client4, hostname);
+		r = sd_dhcp_client_set_hostname (sd_client, hostname);
 		if (r < 0) {
 			nm_utils_error_set_errno (error, r, "failed to set DHCP hostname: %s");
-			goto errout;
+			return FALSE;
 		}
 	}
 
+	r = sd_dhcp_client_set_callback (sd_client, dhcp_event_cb, client);
+	if (r < 0) {
+		nm_utils_error_set_errno (error, r, "failed to set callback: %s");
+		return FALSE;
+	}
+
+	priv->client4 = g_steal_pointer (&sd_client);
+
+	g_free (priv->lease_file);
+	priv->lease_file = g_steal_pointer (&lease_file);
+
+	nm_dhcp_client_set_client_id (client, client_id);
+
 	r = sd_dhcp_client_start (priv->client4);
 	if (r < 0) {
+		sd_dhcp_client_set_callback (priv->client4, NULL, NULL);
+		nm_clear_pointer (&priv->client4, sd_dhcp_client_unref);
 		nm_utils_error_set_errno (error, r, "failed to start DHCP client: %s");
-		goto errout;
+		return FALSE;
 	}
 
 	nm_dhcp_client_start_timeout (client);
-
-	success = TRUE;
-
-errout:
-	sd_dhcp_lease_unref (lease);
-	if (!success)
-		sd_dhcp_client_unref (g_steal_pointer (&priv->client4));
-	return success;
+	return TRUE;
 }
 
 static NMIP6Config *
@@ -895,31 +875,33 @@ ip6_start (NMDhcpClient *client,
            const char *dhcp_anycast_addr,
            const struct in6_addr *ll_addr,
            NMSettingIP6ConfigPrivacy privacy,
-           GBytes *duid,
            guint needed_prefixes,
            GError **error)
 {
 	NMDhcpSystemd *self = NM_DHCP_SYSTEMD (client);
 	NMDhcpSystemdPrivate *priv = NM_DHCP_SYSTEMD_GET_PRIVATE (self);
-	const char *iface = nm_dhcp_client_get_iface (client);
+	nm_auto (sd_dhcp6_client_unrefp) sd_dhcp6_client *sd_client = NULL;
 	GBytes *hwaddr;
 	const char *hostname;
 	int r, i;
 	const guint8 *duid_arr;
 	gsize duid_len;
-
-	g_assert (priv->client4 == NULL);
-	g_assert (priv->client6 == NULL);
-	g_return_val_if_fail (duid != NULL, FALSE);
-
-	duid_arr = g_bytes_get_data (duid, &duid_len);
-	if (!duid_arr || duid_len < 2)
+	GBytes *duid;
+	const uint8_t *hwaddr_arr;
+	gsize hwaddr_len;
+	int arp_type;
+
+	g_return_val_if_fail (!priv->client4, FALSE);
+	g_return_val_if_fail (!priv->client6, FALSE);
+
+	if (   !(duid = nm_dhcp_client_get_client_id (client))
+	    || !(duid_arr = g_bytes_get_data (duid, &duid_len))
+	    || duid_len < 2) {
+		nm_utils_error_set_literal (error, NM_UTILS_ERROR_UNKNOWN, "missing DUID");
 		g_return_val_if_reached (FALSE);
+	}
 
-	g_free (priv->lease_file);
-	priv->lease_file = get_leasefile_path (AF_INET6, iface, nm_dhcp_client_get_uuid (client));
-
-	r = sd_dhcp6_client_new (&priv->client6);
+	r = sd_dhcp6_client_new (&sd_client);
 	if (r < 0) {
 		nm_utils_error_set_errno (error, r, "failed to create dhcp-client: %s");
 		return FALSE;
@@ -930,12 +912,12 @@ ip6_start (NMDhcpClient *client,
 		       needed_prefixes);
 	}
 
-	_LOGT ("dhcp-client6: set %p", priv->client6);
+	_LOGT ("dhcp-client6: set %p", sd_client);
 
 	if (nm_dhcp_client_get_info_only (client))
-		sd_dhcp6_client_set_information_request (priv->client6, 1);
+		sd_dhcp6_client_set_information_request (sd_client, 1);
 
-	r = sd_dhcp6_client_set_duid (priv->client6,
+	r = sd_dhcp6_client_set_duid (sd_client,
 	                              unaligned_read_be16 (&duid_arr[0]),
 	                              &duid_arr[2],
 	                              duid_len - 2);
@@ -944,82 +926,82 @@ ip6_start (NMDhcpClient *client,
 		return FALSE;
 	}
 
-	r = sd_dhcp6_client_attach_event (priv->client6, NULL, 0);
+	r = sd_dhcp6_client_attach_event (sd_client, NULL, 0);
 	if (r < 0) {
 		nm_utils_error_set_errno (error, r, "failed to attach event: %s");
-		goto errout;
+		return FALSE;
 	}
 
 	hwaddr = nm_dhcp_client_get_hw_addr (client);
-	if (hwaddr) {
-		const uint8_t *data;
-		gsize len;
-
-		data = g_bytes_get_data (hwaddr, &len);
-		r = sd_dhcp6_client_set_mac (priv->client6,
-		                             data,
-		                             len,
-		                             get_arp_type (hwaddr));
-		if (r < 0) {
-			nm_utils_error_set_errno (error, r, "failed to set MAC address: %s");
-			goto errout;
-		}
+	if (   !hwaddr
+	    || !(hwaddr_arr = g_bytes_get_data (hwaddr, &hwaddr_len))
+	    || (arp_type = nm_utils_arp_type_detect_from_hwaddrlen (hwaddr_len)) < 0) {
+		nm_utils_error_set_literal (error, NM_UTILS_ERROR_UNKNOWN, "invalid MAC address");
+		return FALSE;
 	}
-
-	r = sd_dhcp6_client_set_ifindex (priv->client6, nm_dhcp_client_get_ifindex (client));
+	r = sd_dhcp6_client_set_mac (sd_client,
+	                             hwaddr_arr,
+	                             hwaddr_len,
+	                             (guint16) arp_type);
 	if (r < 0) {
-		nm_utils_error_set_errno (error, r, "failed to set ifindex: %s");
-		goto errout;
+		nm_utils_error_set_errno (error, r, "failed to set MAC address: %s");
+		return FALSE;
 	}
 
-	r = sd_dhcp6_client_set_callback (priv->client6, dhcp6_event_cb, client);
+	r = sd_dhcp6_client_set_ifindex (sd_client,
+	                                 nm_dhcp_client_get_ifindex (client));
 	if (r < 0) {
-		nm_utils_error_set_errno (error, r, "failed to set callback: %s");
-		goto errout;
+		nm_utils_error_set_errno (error, r, "failed to set ifindex: %s");
+		return FALSE;
 	}
 
 	/* Add requested options */
 	for (i = 0; dhcp6_requests[i].name; i++) {
 		if (dhcp6_requests[i].include)
-			sd_dhcp6_client_set_request_option (priv->client6, dhcp6_requests[i].num);
+			sd_dhcp6_client_set_request_option (sd_client, dhcp6_requests[i].num);
 	}
 
-	r = sd_dhcp6_client_set_local_address (priv->client6, ll_addr);
+	r = sd_dhcp6_client_set_local_address (sd_client, ll_addr);
 	if (r < 0) {
 		nm_utils_error_set_errno (error, r, "failed to set local address: %s");
-		goto errout;
+		return FALSE;
 	}
 
 	hostname = nm_dhcp_client_get_hostname (client);
-	r = sd_dhcp6_client_set_fqdn (priv->client6, hostname);
+	r = sd_dhcp6_client_set_fqdn (sd_client, hostname);
 	if (r < 0) {
 		nm_utils_error_set_errno (error, r, "failed to set DHCP hostname: %s");
-		goto errout;
+		return FALSE;
 	}
 
+	r = sd_dhcp6_client_set_callback (sd_client, dhcp6_event_cb, client);
+	if (r < 0) {
+		nm_utils_error_set_errno (error, r, "failed to set callback: %s");
+		return FALSE;
+	}
+
+	priv->client6 = g_steal_pointer (&sd_client);
+
 	r = sd_dhcp6_client_start (priv->client6);
 	if (r < 0) {
+		sd_dhcp6_client_set_callback (priv->client6, NULL, NULL);
+		nm_clear_pointer (&priv->client6, sd_dhcp6_client_unref);
 		nm_utils_error_set_errno (error, r, "failed to start client: %s");
-		goto errout;
+		return FALSE;
 	}
 
 	nm_dhcp_client_start_timeout (client);
-
 	return TRUE;
-
-errout:
-	sd_dhcp6_client_unref (g_steal_pointer (&priv->client6));
-	return FALSE;
 }
 
 static void
-stop (NMDhcpClient *client, gboolean release, GBytes *duid)
+stop (NMDhcpClient *client, gboolean release)
 {
 	NMDhcpSystemd *self = NM_DHCP_SYSTEMD (client);
 	NMDhcpSystemdPrivate *priv = NM_DHCP_SYSTEMD_GET_PRIVATE (self);
 	int r = 0;
 
-	NM_DHCP_CLIENT_CLASS (nm_dhcp_systemd_parent_class)->stop (client, release, duid);
+	NM_DHCP_CLIENT_CLASS (nm_dhcp_systemd_parent_class)->stop (client, release);
 
 	_LOGT ("dhcp-client%d: stop %p",
 	       priv->client4 ? '4' : '6',
diff --git a/src/dhcp/nm-dhcp-utils.c b/src/dhcp/nm-dhcp-utils.c
index 6bbc670b..9b1653b8 100644
--- a/src/dhcp/nm-dhcp-utils.c
+++ b/src/dhcp/nm-dhcp-utils.c
@@ -726,10 +726,10 @@ nm_dhcp_utils_duid_to_string (GBytes *duid)
 	gconstpointer data;
 	gsize len;
 
-	g_return_val_if_fail (duid != NULL, NULL);
+	g_return_val_if_fail (duid, NULL);
 
 	data = g_bytes_get_data (duid, &len);
-	return _nm_utils_bin2str (data, len, FALSE);
+	return _nm_utils_bin2hexstr_full (data, len, ':', FALSE, NULL);
 }
 
 /**
diff --git a/src/dhcp/tests/test-dhcp-dhclient.c b/src/dhcp/tests/test-dhcp-dhclient.c
index edac4257..ab1f5551 100644
--- a/src/dhcp/tests/test-dhcp-dhclient.c
+++ b/src/dhcp/tests/test-dhcp-dhclient.c
@@ -760,62 +760,74 @@ test_read_commented_duid_from_leasefile (void)
 	g_assert (duid == NULL);
 }
 
+/*****************************************************************************/
+
+static void
+_save_duid (const char *path,
+            const guint8 *duid_bin,
+            gsize duid_len)
+{
+	gs_unref_bytes GBytes *duid = NULL;
+	GError *error = NULL;
+	gboolean success;
+
+	g_assert (path);
+	g_assert (duid_bin);
+	g_assert (duid_len > 0);
+
+	duid = g_bytes_new (duid_bin, duid_len);
+	success = nm_dhcp_dhclient_save_duid (path, duid, &error);
+	nmtst_assert_success (success, error);
+}
+
 static void
 test_write_duid (void)
 {
-	const char *duid = "\\000\\001\\000\\001\\027X\\350X\\000#\\025\\010~\\254";
+	const guint8 duid[] = { 000, 001, 000, 001, 027, 'X', 0350, 'X', 0, '#', 025, 010, '~', 0254 };
 	const char *expected_contents = "default-duid \"\\000\\001\\000\\001\\027X\\350X\\000#\\025\\010~\\254\";\n";
 	GError *error = NULL;
-	char *contents = NULL;
+	gs_free char *contents = NULL;
 	gboolean success;
 	const char *path = "test-dhclient-write-duid.leases";
 
-	success = nm_dhcp_dhclient_save_duid (path, duid, &error);
-	g_assert_no_error (error);
-	g_assert (success);
+	_save_duid (path, duid, G_N_ELEMENTS (duid));
 
 	success = g_file_get_contents (path, &contents, NULL, &error);
-	g_assert_no_error (error);
-	g_assert (success);
+	nmtst_assert_success (success, error);
 
 	unlink (path);
-	g_assert_cmpstr (expected_contents, ==, contents);
 
-	g_free (contents);
+	g_assert_cmpstr (expected_contents, ==, contents);
 }
 
 static void
 test_write_existing_duid (void)
 {
-	const char *duid = "\\000\\001\\000\\001\\023o\\023n\\000\\\"\\372\\214\\326\\302";
+	const guint8 duid[] = { 000, 001, 000, 001, 023, 'o', 023, 'n', 000, '\"', 0372, 0214, 0326, 0302 };
 	const char *original_contents = "default-duid \"\\000\\001\\000\\001\\027X\\350X\\000#\\025\\010~\\254\";\n";
 	const char *expected_contents = "default-duid \"\\000\\001\\000\\001\\023o\\023n\\000\\\"\\372\\214\\326\\302\";\n";
 	GError *error = NULL;
-	char *contents = NULL;
+	gs_free char *contents = NULL;
 	gboolean success;
 	const char *path = "test-dhclient-write-existing-duid.leases";
 
 	success = g_file_set_contents (path, original_contents, -1, &error);
-	g_assert_no_error (error);
-	g_assert (success);
+	nmtst_assert_success (success, error);
 
 	/* Save other DUID; should be overwritten */
-	success = nm_dhcp_dhclient_save_duid (path, duid, &error);
-	g_assert_no_error (error);
-	g_assert (success);
+	_save_duid (path, duid, G_N_ELEMENTS (duid));
 
 	/* reread original contents */
 	success = g_file_get_contents (path, &contents, NULL, &error);
-	g_assert_no_error (error);
-	g_assert (success);
+	nmtst_assert_success (success, error);
 
 	unlink (path);
 	g_assert_cmpstr (expected_contents, ==, contents);
-
-	g_free (contents);
 }
 
+static const guint8 DUID_BIN[] = { 000, 001, 000, 001, 023, 'o', 023, 'n', 000, '\"', 0372, 0214, 0326, 0302 };
 #define DUID "\\000\\001\\000\\001\\023o\\023n\\000\\\"\\372\\214\\326\\302"
+
 static void
 test_write_existing_commented_duid (void)
 {
@@ -824,28 +836,22 @@ test_write_existing_commented_duid (void)
 	    "default-duid \"" DUID "\";\n"
 	    ORIG_CONTENTS;
 	GError *error = NULL;
-	char *contents = NULL;
+	gs_free char *contents = NULL;
 	gboolean success;
 	const char *path = "test-dhclient-write-existing-commented-duid.leases";
 
 	success = g_file_set_contents (path, ORIG_CONTENTS, -1, &error);
-	g_assert_no_error (error);
-	g_assert (success);
+	nmtst_assert_success (success, error);
 
 	/* Save other DUID; should be saved on top */
-	success = nm_dhcp_dhclient_save_duid (path, DUID, &error);
-	g_assert_no_error (error);
-	g_assert (success);
+	_save_duid (path, DUID_BIN, G_N_ELEMENTS (DUID_BIN));
 
 	/* reread original contents */
 	success = g_file_get_contents (path, &contents, NULL, &error);
-	g_assert_no_error (error);
-	g_assert (success);
+	nmtst_assert_success (success, error);
 
 	unlink (path);
 	g_assert_cmpstr (expected_contents, ==, contents);
-
-	g_free (contents);
 #undef ORIG_CONTENTS
 }
 
@@ -865,8 +871,7 @@ test_write_existing_multiline_duid (void)
 	success = g_file_set_contents (path, ORIG_CONTENTS, -1, &error);
 	nmtst_assert_success (success, error);
 
-	success = nm_dhcp_dhclient_save_duid (path, DUID, &error);
-	nmtst_assert_success (success, error);
+	_save_duid (path, DUID_BIN, G_N_ELEMENTS (DUID_BIN));
 
 	success = g_file_get_contents (path, &contents, NULL, &error);
 	nmtst_assert_success (success, error);
diff --git a/src/dns/nm-dns-dnsmasq.c b/src/dns/nm-dns-dnsmasq.c
index b48c6b87..b54df730 100644
--- a/src/dns/nm-dns-dnsmasq.c
+++ b/src/dns/nm-dns-dnsmasq.c
@@ -254,9 +254,16 @@ name_owner_changed (GObject    *object,
 		priv->running = TRUE;
 		send_dnsmasq_update (self);
 	} else {
-		_LOGI ("dnsmasq disappeared");
-		priv->running = FALSE;
-		g_signal_emit_by_name (self, NM_DNS_PLUGIN_FAILED);
+		if (priv->running) {
+			_LOGI ("dnsmasq disappeared");
+			priv->running = FALSE;
+			g_signal_emit_by_name (self, NM_DNS_PLUGIN_FAILED);
+		} else {
+			/* The only reason for which (!priv->running) here
+			 * is that the dnsmasq process quit. We don't care
+			 * of that here, the manager handles child restarts
+			 * by itself. */
+		}
 	}
 }
 
diff --git a/src/dns/nm-dns-manager.c b/src/dns/nm-dns-manager.c
index 6a59b41c..aebe3e12 100644
--- a/src/dns/nm-dns-manager.c
+++ b/src/dns/nm-dns-manager.c
@@ -55,7 +55,7 @@
 #include "nm-dns-systemd-resolved.h"
 #include "nm-dns-unbound.h"
 
-#define HASH_LEN 20
+#define HASH_LEN   NM_UTILS_CHECKSUM_LENGTH_SHA1
 
 #ifndef RESOLVCONF_PATH
 #define RESOLVCONF_PATH "/sbin/resolvconf"
@@ -582,53 +582,85 @@ again:
 }
 
 static char *
-create_resolv_conf (char **searches,
-                    char **nameservers,
-                    char **options)
+create_resolv_conf (const char *const*searches,
+                    const char *const*nameservers,
+                    const char *const*options)
 {
-	gs_free char *searches_str = NULL;
-	gs_free char *nameservers_str = NULL;
-	gs_free char *options_str = NULL;
-	char *tmp_str;
 	GString *str;
-	int i;
+	gsize i;
 
-	if (searches) {
-		tmp_str = g_strjoinv (" ", searches);
-		searches_str = g_strconcat ("search ", tmp_str, "\n", NULL);
-		g_free (tmp_str);
-	}
+	str = g_string_new_len (NULL, 245);
 
-	if (options) {
-		tmp_str = g_strjoinv (" ", options);
-		options_str = g_strconcat ("options ", tmp_str, "\n", NULL);
-		g_free (tmp_str);
-	}
+	g_string_append (str, "# Generated by NetworkManager\n");
 
-	if (nameservers) {
-		int num = g_strv_length (nameservers);
+	if (searches && searches[0]) {
+		gsize search_base_idx;
 
-		str = g_string_new ("");
-		for (i = 0; i < num; i++) {
-			if (i == 3) {
-				g_string_append (str, "# ");
-				g_string_append (str, "NOTE: the libc resolver may not support more than 3 nameservers.");
-				g_string_append (str, "\n# ");
-				g_string_append (str, "The nameservers listed below may not be recognized.");
-				g_string_append_c (str, '\n');
+		g_string_append (str, "search");
+		search_base_idx = str->len;
+
+		for (i = 0; searches[i]; i++) {
+			const char *s = searches[i];
+			gsize l = strlen (s);
+
+			if (   l == 0
+			    || NM_STRCHAR_ANY (s, ch, NM_IN_SET (ch, ' ', '\t', '\n'))) {
+				/* there should be no such characters in the search entry. Also,
+				 * because glibc parser would treat them as line/word separator.
+				 *
+				 * Skip the value silently. */
+				continue;
 			}
 
+			if (search_base_idx > 0) {
+				if (str->len - search_base_idx + 1 + l > 254) {
+					/* this entry crosses the 256 character boundery. Older glibc versions
+					 * would truncate the entry at this point.
+					 *
+					 * Fill the line with spaces to cross the 256 char boundary and continue
+					 * afterwards. This way, the truncation happens between two search entries. */
+					while (str->len - search_base_idx < 257)
+						g_string_append_c (str, ' ');
+					search_base_idx = 0;
+				}
+			}
+
+			g_string_append_c (str, ' ');
+			g_string_append_len (str, s, l);
+		}
+		g_string_append_c (str, '\n');
+	}
+
+	if (nameservers && nameservers[0]) {
+		for (i = 0; nameservers[i]; i++) {
+			if (i == 3) {
+				g_string_append (str, "# NOTE: the libc resolver may not support more than 3 nameservers.\n");
+				g_string_append (str, "# The nameservers listed below may not be recognized.\n");
+			}
 			g_string_append (str, "nameserver ");
 			g_string_append (str, nameservers[i]);
 			g_string_append_c (str, '\n');
 		}
-		nameservers_str = g_string_free (str, FALSE);
 	}
 
-	return g_strdup_printf ("# Generated by NetworkManager\n%s%s%s",
-	                        searches_str ?: "",
-	                        nameservers_str ?: "",
-	                        options_str ?: "");
+	if (options && options[0]) {
+		g_string_append (str, "options");
+		for (i = 0; options[i]; i++) {
+			g_string_append_c (str, ' ');
+			g_string_append (str, options[i]);
+		}
+		g_string_append_c (str, '\n');
+	}
+
+	return g_string_free (str, FALSE);
+}
+
+char *
+nmtst_dns_create_resolv_conf (const char *const*searches,
+                              const char *const*nameservers,
+                              const char *const*options)
+{
+	return create_resolv_conf (searches, nameservers, options);
 }
 
 static gboolean
@@ -654,9 +686,9 @@ write_resolv_conf_contents (FILE *f,
 
 static gboolean
 write_resolv_conf (FILE *f,
-                   char **searches,
-                   char **nameservers,
-                   char **options,
+                   const char *const*searches,
+                   const char *const*nameservers,
+                   const char *const*options,
                    GError **error)
 {
 	gs_free char *content = NULL;
@@ -718,7 +750,11 @@ dispatch_resolvconf (NMDnsManager *self,
 		return SR_ERROR;
 	}
 
-	success = write_resolv_conf (f, searches, nameservers, options, error);
+	success = write_resolv_conf (f,
+	                             NM_CAST_STRV_CC (searches),
+	                             NM_CAST_STRV_CC (nameservers),
+	                             NM_CAST_STRV_CC (options),
+	                             error);
 	err = pclose (f);
 	if (err < 0) {
 		errnosv = errno;
@@ -757,9 +793,9 @@ _read_link_cached (const char *path, gboolean *is_cached, char **cached)
 
 static SpawnResult
 update_resolv_conf (NMDnsManager *self,
-                    char **searches,
-                    char **nameservers,
-                    char **options,
+                    const char *const*searches,
+                    const char *const*nameservers,
+                    const char *const*options,
                     GError **error,
                     NMDnsManagerResolvConfManager rc_manager)
 {
@@ -958,12 +994,11 @@ update_resolv_conf (NMDnsManager *self,
 static void
 compute_hash (NMDnsManager *self, const NMGlobalDnsConfig *global, guint8 buffer[HASH_LEN])
 {
-	GChecksum *sum;
-	gsize len = HASH_LEN;
+	nm_auto_free_checksum GChecksum *sum = NULL;
 	NMDnsIPConfigData *ip_data;
 
 	sum = g_checksum_new (G_CHECKSUM_SHA1);
-	nm_assert (len == g_checksum_type_get_length (G_CHECKSUM_SHA1));
+	nm_assert (HASH_LEN == g_checksum_type_get_length (G_CHECKSUM_SHA1));
 
 	if (global)
 		nm_global_dns_config_update_checksum (global, sum);
@@ -977,8 +1012,7 @@ compute_hash (NMDnsManager *self, const NMGlobalDnsConfig *global, guint8 buffer
 			nm_ip_config_hash (ip_data->ip_config, sum, TRUE);
 	}
 
-	g_checksum_get_digest (sum, buffer, &len);
-	g_checksum_free (sum);
+	nm_utils_checksum_get_digest_len (sum, buffer, HASH_LEN);
 }
 
 static gboolean
@@ -1066,7 +1100,6 @@ _collect_resolv_conf_data (NMDnsManager *self,
                            const char **out_nis_domain)
 {
 	NMDnsManagerPrivate *priv;
-	guint i, num, len;
 	NMResolvConfData rc = {
 		.nameservers = g_ptr_array_new (),
 		.searches = g_ptr_array_new (),
@@ -1136,17 +1169,6 @@ _collect_resolv_conf_data (NMDnsManager *self,
 		}
 	}
 
-	/* Per 'man resolv.conf', the search list is limited to 6 domains
-	 * totalling 256 characters.
-	 */
-	num = MIN (rc.searches->len, 6u);
-	for (i = 0, len = 0; i < num; i++) {
-		len += strlen (rc.searches->pdata[i]) + 1; /* +1 for spaces */
-		if (len > 256)
-			break;
-	}
-	g_ptr_array_set_size (rc.searches, i);
-
 	*out_searches = _ptrarray_to_strv (rc.searches);
 	*out_options = _ptrarray_to_strv (rc.options);
 	*out_nameservers = _ptrarray_to_strv (rc.nameservers);
@@ -1449,7 +1471,12 @@ update_dns (NMDnsManager *self,
 		switch (priv->rc_manager) {
 		case NM_DNS_MANAGER_RESOLV_CONF_MAN_SYMLINK:
 		case NM_DNS_MANAGER_RESOLV_CONF_MAN_FILE:
-			result = update_resolv_conf (self, searches, nameservers, options, error, priv->rc_manager);
+			result = update_resolv_conf (self,
+			                             NM_CAST_STRV_CC (searches),
+			                             NM_CAST_STRV_CC (nameservers),
+			                             NM_CAST_STRV_CC (options),
+			                             error,
+			                             priv->rc_manager);
 			resolv_conf_updated = TRUE;
 			/* If we have ended with no nameservers avoid updating again resolv.conf
 			 * on stop, as some external changes may be applied to it in the meanwhile */
@@ -1474,15 +1501,26 @@ update_dns (NMDnsManager *self,
 		if (result == SR_NOTFOUND) {
 			_LOGD ("update-dns: program not available, writing to resolv.conf");
 			g_clear_error (error);
-			result = update_resolv_conf (self, searches, nameservers, options, error, NM_DNS_MANAGER_RESOLV_CONF_MAN_SYMLINK);
+			result = update_resolv_conf (self,
+			                             NM_CAST_STRV_CC (searches),
+			                             NM_CAST_STRV_CC (nameservers),
+			                             NM_CAST_STRV_CC (options),
+			                             error,
+			                             NM_DNS_MANAGER_RESOLV_CONF_MAN_SYMLINK);
 			resolv_conf_updated = TRUE;
 		}
 	}
 
 	/* Unless we've already done it, update private resolv.conf in NMRUNDIR
 	   ignoring any errors */
-	if (!resolv_conf_updated)
-		update_resolv_conf (self, searches, nameservers, options, NULL, NM_DNS_MANAGER_RESOLV_CONF_MAN_UNMANAGED);
+	if (!resolv_conf_updated) {
+		update_resolv_conf (self,
+		                    NM_CAST_STRV_CC (searches),
+		                    NM_CAST_STRV_CC (nameservers),
+		                    NM_CAST_STRV_CC (options),
+		                    NULL,
+		                    NM_DNS_MANAGER_RESOLV_CONF_MAN_UNMANAGED);
+	}
 
 	/* signal that resolv.conf was changed */
 	if (update && result == SR_SUCCESS)
@@ -1542,6 +1580,7 @@ plugin_child_quit (NMDnsPlugin *plugin, int exit_status, gpointer user_data)
 	} else {
 		priv->plugin_ratelimit.num_restarts++;
 		if (priv->plugin_ratelimit.num_restarts > PLUGIN_RATELIMIT_BURST) {
+			plugin_failed (plugin, self);
 			_LOGW ("plugin %s child respawning too fast, delaying update for %u seconds",
 			        nm_dns_plugin_get_name (plugin), PLUGIN_RATELIMIT_DELAY);
 			priv->plugin_ratelimit.timer = g_timeout_add_seconds (PLUGIN_RATELIMIT_DELAY,
diff --git a/src/dns/nm-dns-manager.h b/src/dns/nm-dns-manager.h
index ed1974a5..a3e9472e 100644
--- a/src/dns/nm-dns-manager.h
+++ b/src/dns/nm-dns-manager.h
@@ -129,4 +129,10 @@ typedef enum {
 
 void nm_dns_manager_stop (NMDnsManager *self);
 
+/*****************************************************************************/
+
+char *nmtst_dns_create_resolv_conf (const char *const*searches,
+                                    const char *const*nameservers,
+                                    const char *const*options);
+
 #endif /* __NETWORKMANAGER_DNS_MANAGER_H__ */
diff --git a/src/dnsmasq/nm-dnsmasq-manager.c b/src/dnsmasq/nm-dnsmasq-manager.c
index 09889441..3fe2f489 100644
--- a/src/dnsmasq/nm-dnsmasq-manager.c
+++ b/src/dnsmasq/nm-dnsmasq-manager.c
@@ -235,6 +235,7 @@ create_dm_cmd_line (const char *iface,
 			g_string_append_c (s, ',');
 			g_string_append (s, nm_utils_inet4_ntop (nm_ip4_config_get_nameserver (ip4_config, i), tmpaddr));
 		}
+		nm_cmd_line_add_string (cmd, s->str);
 		g_string_truncate (s, 0);
 	}
 
@@ -244,6 +245,7 @@ create_dm_cmd_line (const char *iface,
 			g_string_append_c (s, ',');
 			g_string_append (s, nm_ip4_config_get_search (ip4_config, i));
 		}
+		nm_cmd_line_add_string (cmd, s->str);
 		g_string_truncate (s, 0);
 	}
 
diff --git a/src/initrd/meson.build b/src/initrd/meson.build
new file mode 100644
index 00000000..66e825d5
--- /dev/null
+++ b/src/initrd/meson.build
@@ -0,0 +1,32 @@
+sources = files(
+  'nmi-cmdline-reader.c',
+  'nmi-ibft-reader.c'
+)
+
+nm_cflags = ['-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_DAEMON']
+
+libnmi_core = static_library(
+  'nmi-core',
+  c_args: nm_cflags,
+  sources: sources,
+  include_directories: src_inc,
+  dependencies: nm_core_dep,
+)
+
+name = 'nm-initrd-generator'
+executable(
+  name,
+  name + '.c',
+  c_args: nm_cflags,
+  include_directories: src_inc,
+  dependencies: [ nm_core_dep ],
+  link_with: [libnetwork_manager_base, libnmi_core],
+  link_args: ldflags_linker_script_binary,
+  link_depends: linker_script_binary,
+  install: true,
+  install_dir: nm_libexecdir,
+)
+
+if enable_tests
+  subdir('tests')
+endif
diff --git a/src/initrd/tests/meson.build b/src/initrd/tests/meson.build
new file mode 100644
index 00000000..6b316d4e
--- /dev/null
+++ b/src/initrd/tests/meson.build
@@ -0,0 +1,23 @@
+test_units = [
+  'test-ibft-reader',
+  'test-cmdline-reader',
+]
+
+cflags = [
+  '-DTEST_INITRD_DIR="@0@"'.format(meson.current_source_dir()),
+]
+
+foreach test_unit : test_units
+  exe = executable(
+    test_unit,
+    test_unit + '.c',
+    dependencies: test_nm_dep,
+    c_args: cflags,
+    link_with: libnmi_core
+  )
+  test(
+    'initrd/' + test_unit,
+    test_script,
+    args: test_args + [exe.full_path()]
+  )
+endforeach
diff --git a/src/ndisc/nm-ndisc.h b/src/ndisc/nm-ndisc.h
index 73eef368..6c0c0264 100644
--- a/src/ndisc/nm-ndisc.h
+++ b/src/ndisc/nm-ndisc.h
@@ -23,6 +23,7 @@
 
 #include 
 #include 
+#include 
 
 #include "nm-setting-ip6-config.h"
 #include "NetworkManagerUtils.h"
diff --git a/src/nm-config-data.c b/src/nm-config-data.c
index 8d84e74a..0259f001 100644
--- a/src/nm-config-data.c
+++ b/src/nm-config-data.c
@@ -1241,9 +1241,13 @@ _match_section_infos_lookup (const MatchSectionInfo *match_section_infos,
                              const char *match_device_type,
                              char **out_value)
 {
+	const char *match_dhcp_plugin;
+
 	if (!match_section_infos)
 		return NULL;
 
+	match_dhcp_plugin = nm_dhcp_manager_get_config (nm_dhcp_manager_get ());
+
 	for (; match_section_infos->group_name; match_section_infos++) {
 		char *value = NULL;
 		gboolean match;
@@ -1263,7 +1267,7 @@ _match_section_infos_lookup (const MatchSectionInfo *match_section_infos,
 			if (device)
 				match = nm_device_spec_match_list (device, match_section_infos->match_device.spec);
 			else if (pllink)
-				match = nm_match_spec_device_by_pllink (pllink, match_device_type, match_section_infos->match_device.spec, FALSE);
+				match = nm_match_spec_device_by_pllink (pllink, match_device_type, match_dhcp_plugin, match_section_infos->match_device.spec, FALSE);
 			else
 				match = FALSE;
 		} else
diff --git a/src/nm-config-data.h b/src/nm-config-data.h
index b52ddcc4..545d9a87 100644
--- a/src/nm-config-data.h
+++ b/src/nm-config-data.h
@@ -232,5 +232,14 @@ GKeyFile *_nm_config_data_get_keyfile (const NMConfigData *self);
 GKeyFile *_nm_config_data_get_keyfile_user (const NMConfigData *self);
 GKeyFile *_nm_config_data_get_keyfile_intern (const NMConfigData *self);
 
+/*****************************************************************************/
+
+/* nm-config-data.c requires getting the DHCP manager's configuration. That is a bit
+ * ugly, and optimally, NMConfig* is independent of NMDhcpManager. Instead of
+ * including the header, forward declare the two functions that we need. */
+struct _NMDhcpManager;
+struct _NMDhcpManager *nm_dhcp_manager_get (void);
+const char *nm_dhcp_manager_get_config (struct _NMDhcpManager *self);
+
 #endif /* NM_CONFIG_DATA_H */
 
diff --git a/src/nm-connectivity.h b/src/nm-connectivity.h
index 178f27ad..99333ced 100644
--- a/src/nm-connectivity.h
+++ b/src/nm-connectivity.h
@@ -24,6 +24,21 @@
 
 #include "nm-dbus-interface.h"
 
+/*****************************************************************************/
+
+static inline int
+nm_connectivity_state_cmp (NMConnectivityState a, NMConnectivityState b)
+{
+	if (a == NM_CONNECTIVITY_PORTAL && b == NM_CONNECTIVITY_LIMITED)
+		return 1;
+	if (b == NM_CONNECTIVITY_PORTAL && a == NM_CONNECTIVITY_LIMITED)
+		return -1;
+	NM_CMP_DIRECT (a, b);
+	return 0;
+}
+
+/*****************************************************************************/
+
 #define NM_CONNECTIVITY_ERROR     ((NMConnectivityState) -1)
 #define NM_CONNECTIVITY_FAKE      ((NMConnectivityState) -2)
 #define NM_CONNECTIVITY_CANCELLED ((NMConnectivityState) -3)
diff --git a/src/nm-core-utils.c b/src/nm-core-utils.c
index ca8c9526..a65ac636 100644
--- a/src/nm-core-utils.c
+++ b/src/nm-core-utils.c
@@ -30,15 +30,19 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
 #include 
 #include 
+#include 
 #include 
 
 #include "nm-utils/nm-random-utils.h"
 #include "nm-utils/nm-io-utils.h"
+#include "nm-utils/unaligned.h"
+#include "nm-utils/nm-secret-utils.h"
 #include "nm-utils.h"
 #include "nm-core-internal.h"
 #include "nm-setting-connection.h"
@@ -48,6 +52,17 @@
 #include "nm-setting-wireless-security.h"
 
 G_STATIC_ASSERT (sizeof (NMUtilsTestFlags) <= sizeof (int));
+
+/* we read _nm_utils_testing without memory barrier. This is thread-safe,
+ * because the static variable is initialized to zero, and only reset
+ * once to a non-zero value (via g_atomic_int_compare_and_exchange()).
+ *
+ * Since there is only one integer that contains the data, there is no
+ * caching problem reading this (atomic int) variable without
+ * synchronization/memory-barrier. Contrary to a double-checked locking,
+ * where one needs a memory barrier to read the variable and ensure
+ * that also the related data is coherent in cache. Here there is no
+ * related data. */
 static int _nm_utils_testing = 0;
 
 gboolean
@@ -66,6 +81,7 @@ nm_utils_get_testing ()
 {
 	NMUtilsTestFlags flags;
 
+again:
 	flags = (NMUtilsTestFlags) _nm_utils_testing;
 	if (flags != NM_UTILS_TEST_NONE) {
 		/* Flags already initialized. Return them. */
@@ -78,12 +94,11 @@ nm_utils_get_testing ()
 	if (g_test_initialized ())
 		flags |= _NM_UTILS_TEST_GENERAL;
 
-	if (g_atomic_int_compare_and_exchange (&_nm_utils_testing, 0, (int) flags)) {
-		/* Done. We set it. */
-		return flags & NM_UTILS_TEST_ALL;
-	}
-	/* It changed in the meantime (??). Re-read the value. */
-	return ((NMUtilsTestFlags) _nm_utils_testing) & NM_UTILS_TEST_ALL;
+	g_atomic_int_compare_and_exchange (&_nm_utils_testing, 0, (int) flags);
+
+	/* regardless of whether we won the race of initializing _nm_utils_testing,
+	 * go back and read the value again. It must be non-zero by now. */
+	goto again;
 }
 
 void
@@ -1133,6 +1148,7 @@ nm_utils_read_link_absolute (const char *link_file, GError **error)
 #define DEVICE_TYPE_TAG "type:"
 #define DRIVER_TAG "driver:"
 #define SUBCHAN_TAG "s390-subchannels:"
+#define DHCP_PLUGIN_TAG "dhcp-plugin:"
 #define EXCEPT_TAG "except:"
 #define MATCH_TAG_CONFIG_NM_VERSION             "nm-version:"
 #define MATCH_TAG_CONFIG_NM_VERSION_MIN         "nm-version-min:"
@@ -1144,6 +1160,7 @@ typedef struct {
 	const char *device_type;
 	const char *driver;
 	const char *driver_version;
+	const char *dhcp_plugin;
 	struct {
 		const char *value;
 		gboolean is_parsed;
@@ -1280,6 +1297,34 @@ match_device_hwaddr_eval (const char *spec_str,
 		_has; \
 	})
 
+static NMMatchSpecMatchType
+_match_result (gboolean has_except,
+               gboolean has_not_except,
+               gboolean has_match,
+               gboolean has_match_except)
+{
+	if (   has_except
+	    && !has_not_except) {
+		/* a match spec that only consists of a list of except matches is treated specially. */
+		nm_assert (!has_match);
+		if (has_match_except) {
+			/* one of the "except:" matches matched. The result is an explicit
+			 * negative match. */
+			return NM_MATCH_SPEC_NEG_MATCH;
+		} else {
+			/* none of the "except:" matches matched. The result is a positive match,
+			 * despite there being no positive match. */
+			return NM_MATCH_SPEC_MATCH;
+		}
+	}
+
+	if (has_match_except)
+		return NM_MATCH_SPEC_NEG_MATCH;
+	if (has_match)
+		return NM_MATCH_SPEC_MATCH;
+	return NM_MATCH_SPEC_NO_MATCH;
+}
+
 static const char *
 match_except (const char *spec_str, gboolean *out_except)
 {
@@ -1361,6 +1406,9 @@ match_device_eval (const char *spec_str,
 	if (_MATCH_CHECK (spec_str, SUBCHAN_TAG))
 		return match_data_s390_subchannels_eval (spec_str, match_data);
 
+	if (_MATCH_CHECK (spec_str, DHCP_PLUGIN_TAG))
+		return nm_streq0 (spec_str, match_data->dhcp_plugin);
+
 	if (allow_fuzzy) {
 		if (match_device_hwaddr_eval (spec_str, match_data))
 			return TRUE;
@@ -1379,17 +1427,21 @@ nm_match_spec_device (const GSList *specs,
                       const char *driver,
                       const char *driver_version,
                       const char *hwaddr,
-                      const char *s390_subchannels)
+                      const char *s390_subchannels,
+                      const char *dhcp_plugin)
 {
 	const GSList *iter;
-	NMMatchSpecMatchType match;
+	gboolean has_match = FALSE;
+	gboolean has_match_except = FALSE;
+	gboolean has_except = FALSE;
+	gboolean has_not_except = FALSE;
 	const char *spec_str;
-	gboolean except;
 	MatchDeviceData match_data = {
 	    .interface_name = interface_name,
 	    .device_type = nm_str_not_empty (device_type),
 	    .driver = nm_str_not_empty (driver),
 	    .driver_version = nm_str_not_empty (driver_version),
+	    .dhcp_plugin = nm_str_not_empty (dhcp_plugin),
 	    .hwaddr = {
 	        .value = hwaddr,
 	    },
@@ -1403,19 +1455,9 @@ nm_match_spec_device (const GSList *specs,
 	if (!specs)
 		return NM_MATCH_SPEC_NO_MATCH;
 
-	match = NM_MATCH_SPEC_NO_MATCH;
-
-	/* pre-search for "*" */
 	for (iter = specs; iter; iter = iter->next) {
-		spec_str = iter->data;
-
-		if (spec_str && spec_str[0] == '*' && spec_str[1] == '\0') {
-			match = NM_MATCH_SPEC_MATCH;
-			break;
-		}
-	}
+		gboolean except;
 
-	for (iter = specs; iter; iter = iter->next) {
 		spec_str = iter->data;
 
 		if (!spec_str || !*spec_str)
@@ -1423,10 +1465,14 @@ nm_match_spec_device (const GSList *specs,
 
 		spec_str = match_except (spec_str, &except);
 
-		if (   !except
-		    && match == NM_MATCH_SPEC_MATCH) {
-			/* we have no "except-match" but already match. No need to evaluate
-			 * the match, we cannot match stronger. */
+		if (except)
+			has_except = TRUE;
+		else
+			has_not_except = TRUE;
+
+		if (   ( except && has_match_except)
+		    || (!except && has_match)) {
+			/* evaluating the match does not give new information. Skip it. */
 			continue;
 		}
 
@@ -1436,11 +1482,12 @@ nm_match_spec_device (const GSList *specs,
 			continue;
 
 		if (except)
-			return NM_MATCH_SPEC_NEG_MATCH;
-		match = NM_MATCH_SPEC_MATCH;
+			has_match_except = TRUE;
+		else
+			has_match = TRUE;
 	}
 
-	return match;
+	return _match_result (has_except, has_not_except, has_match, has_match_except);
 }
 
 static gboolean
@@ -1510,7 +1557,10 @@ NMMatchSpecMatchType
 nm_match_spec_config (const GSList *specs, guint cur_nm_version, const char *env)
 {
 	const GSList *iter;
-	NMMatchSpecMatchType match = NM_MATCH_SPEC_NO_MATCH;
+	gboolean has_match = FALSE;
+	gboolean has_match_except = FALSE;
+	gboolean has_except = FALSE;
+	gboolean has_not_except = FALSE;
 
 	if (!specs)
 		return NM_MATCH_SPEC_NO_MATCH;
@@ -1525,6 +1575,17 @@ nm_match_spec_config (const GSList *specs, guint cur_nm_version, const char *env
 
 		spec_str = match_except (spec_str, &except);
 
+		if (except)
+			has_except = TRUE;
+		else
+			has_not_except = TRUE;
+
+		if (   ( except && has_match_except)
+		    || (!except && has_match)) {
+			/* evaluating the match does not give new information. Skip it. */
+			continue;
+		}
+
 		if (_MATCH_CHECK (spec_str, MATCH_TAG_CONFIG_NM_VERSION))
 			v_match = match_config_eval (spec_str, MATCH_TAG_CONFIG_NM_VERSION, cur_nm_version);
 		else if (_MATCH_CHECK (spec_str, MATCH_TAG_CONFIG_NM_VERSION_MIN))
@@ -1534,15 +1595,18 @@ nm_match_spec_config (const GSList *specs, guint cur_nm_version, const char *env
 		else if (_MATCH_CHECK (spec_str, MATCH_TAG_CONFIG_ENV))
 			v_match = env && env[0] && !strcmp (spec_str, env);
 		else
+			v_match = FALSE;
+
+		if (!v_match)
 			continue;
 
-		if (v_match) {
-			if (except)
-				return NM_MATCH_SPEC_NEG_MATCH;
-			match = NM_MATCH_SPEC_MATCH;
-		}
+		if (except)
+			has_match_except = TRUE;
+		else
+			has_match = TRUE;
 	}
-	return match;
+
+	return _match_result (has_except, has_not_except, has_match, has_match_except);
 }
 
 #undef _MATCH_CHECK
@@ -2503,209 +2567,549 @@ nm_utils_is_specific_hostname (const char *name)
 
 /*****************************************************************************/
 
-gboolean
-nm_utils_machine_id_parse (const char *id_str, /*uuid_t*/ guchar *out_uuid)
-{
-	int i;
-	guint8 v0, v1;
-
-	if (!id_str)
-		return FALSE;
-
-	for (i = 0; i < 32; i++) {
-		if (!g_ascii_isxdigit (id_str[i]))
-			return FALSE;
-	}
-	if (id_str[i] != '\0')
-		return FALSE;
+typedef struct {
+	NMUuid bin;
+	char _nul_sentinel; /* just for safety, if somebody accidentally uses the binary in a string context. */
 
-	if (out_uuid) {
-		for (i = 0; i < 16; i++) {
-			v0 = g_ascii_xdigit_value (*(id_str++));
-			v1 = g_ascii_xdigit_value (*(id_str++));
-			out_uuid[i] = (v0 << 4) + v1;
-		}
+	/* depending on whether the string is packed or not (with/without hyphens),
+	 * it's 32 or 36 characters long (plus the trailing NUL).
+	 *
+	 * The difference is that boot-id is a valid RFC 4211 UUID and represented
+	 * as a 36 ascii string (with hyphens). The machine-id technically is not
+	 * a UUID, but just a 32 byte sequence of hexchars. */
+	char str[37];
+	bool is_fake;
+} UuidData;
+
+static UuidData *
+_uuid_data_init (UuidData *uuid_data,
+                 gboolean packed,
+                 gboolean is_fake,
+                 const NMUuid *uuid)
+{
+	nm_assert (uuid_data);
+	nm_assert (uuid);
+
+	uuid_data->bin = *uuid;
+	uuid_data->_nul_sentinel = '\0';
+	uuid_data->is_fake = is_fake;
+	if (packed) {
+		G_STATIC_ASSERT_EXPR (sizeof (uuid_data->str) >= (sizeof (*uuid) * 2 + 1));
+		_nm_utils_bin2hexstr_full (uuid,
+		                           sizeof (*uuid),
+		                           '\0',
+		                           FALSE,
+		                           uuid_data->str);
+	} else {
+		G_STATIC_ASSERT_EXPR (sizeof (uuid_data->str) >= 37);
+		_nm_utils_uuid_unparse (uuid, uuid_data->str);
 	}
-	return TRUE;
+	return uuid_data;
 }
 
-char *
-nm_utils_machine_id_read (void)
+/*****************************************************************************/
+
+static const UuidData *
+_machine_id_get (gboolean allow_fake)
 {
-	gs_free char *contents = NULL;
-	int i;
+	static const UuidData *volatile p_uuid_data;
+	const UuidData *d;
+
+again:
+	d = g_atomic_pointer_get (&p_uuid_data);
+	if (G_UNLIKELY (!d)) {
+		static gsize lock;
+		static UuidData uuid_data;
+		gs_free char *content = NULL;
+		gboolean is_fake = TRUE;
+		const char *fake_type = NULL;
+		NMUuid uuid;
+
+		/* Get the machine ID from /etc/machine-id; it's always in /etc no matter
+		 * where our configured SYSCONFDIR is.  Alternatively, it might be in
+		 * LOCALSTATEDIR /lib/dbus/machine-id.
+		 */
+		if (   nm_utils_file_get_contents (-1, "/etc/machine-id", 100*1024, 0, &content, NULL, NULL) >= 0
+		    || nm_utils_file_get_contents (-1, LOCALSTATEDIR"/lib/dbus/machine-id", 100*1024, 0, &content, NULL, NULL) >= 0) {
+			g_strstrip (content);
+			if (_nm_utils_hexstr2bin_full (content,
+			                               FALSE,
+			                               FALSE,
+			                               NULL,
+			                               16,
+			                               (guint8 *) &uuid,
+			                               sizeof (uuid),
+			                               NULL)) {
+				if (!nm_utils_uuid_is_null (&uuid)) {
+					/* an all-zero machine-id is not valid. */
+					is_fake = FALSE;
+				}
+			}
+		}
 
-	/* Get the machine ID from /etc/machine-id; it's always in /etc no matter
-	 * where our configured SYSCONFDIR is.  Alternatively, it might be in
-	 * LOCALSTATEDIR /lib/dbus/machine-id.
-	 */
-	if (   !g_file_get_contents ("/etc/machine-id", &contents, NULL, NULL)
-	    && !g_file_get_contents (LOCALSTATEDIR "/lib/dbus/machine-id", &contents, NULL, NULL))
-		return NULL;
+		if (is_fake) {
+			const guint8 *seed_bin;
+			const char *hash_seed;
+			gsize seed_len;
+
+			if (!allow_fake) {
+				/* we don't allow generating (and memoizing) a fake key.
+				 * Signal that no valid machine-id exists. */
+				return NULL;
+			}
 
-	contents = g_strstrip (contents);
+			if (nm_utils_host_id_get (&seed_bin, &seed_len)) {
+				/* we have no valid machine-id. Generate a fake one by hashing
+				 * the secret-key. This key is commonly persisted, so it should be
+				 * stable accross reboots (despite having a broken system without
+				 * proper machine-id). */
+				fake_type = "secret-key";
+				hash_seed = "ab085f06-b629-46d1-a553-84eeba5683b6";
+			} else {
+				/* the secret-key is not valid/persistent either. That happens when we fail
+				 * to read/write the secret-key to disk. Fallback to boot-id. The boot-id
+				 * itself may be fake and randomly generated ad-hoc, but that is as best
+				 * as it gets.  */
+				seed_bin = (const guint8 *) nm_utils_boot_id_bin ();
+				seed_len = sizeof (NMUuid);
+				fake_type = "boot-id";
+				hash_seed = "7ff0c8f5-5399-4901-ab63-61bf594abe8b";
+			}
 
-	for (i = 0; i < 32; i++) {
-		if (!g_ascii_isxdigit (contents[i]))
-			return NULL;
-		if (contents[i] >= 'A' && contents[i] <= 'F') {
-			/* canonicalize to lower-case */
-			contents[i] = 'a' + (contents[i] - 'A');
+			/* the fake machine-id is based on secret-key/boot-id, but we hash it
+			 * again, so that they are not literally the same. */
+			nm_utils_uuid_generate_from_string_bin (&uuid,
+			                                        (const char *) seed_bin,
+			                                        seed_len,
+			                                        NM_UTILS_UUID_TYPE_VERSION5,
+			                                        (gpointer) hash_seed);
 		}
+
+		if (!g_once_init_enter (&lock))
+			goto again;
+
+		d = _uuid_data_init (&uuid_data, TRUE, is_fake, &uuid);
+		g_atomic_pointer_set (&p_uuid_data, d);
+		g_once_init_leave (&lock, 1);
+
+		if (is_fake) {
+			nm_log_err (LOGD_CORE,
+			            "/etc/machine-id: no valid machine-id. Use fake one based on %s: %s",
+			            fake_type,
+			            d->str);
+		} else
+			nm_log_dbg (LOGD_CORE, "/etc/machine-id: %s", d->str);
 	}
-	if (contents[i] != '\0')
-		return NULL;
 
-	return g_steal_pointer (&contents);
+	return d;
+}
+
+const char *
+nm_utils_machine_id_str (void)
+{
+	return _machine_id_get (TRUE)->str;
+}
+
+const NMUuid *
+nm_utils_machine_id_bin (void)
+{
+	return &_machine_id_get (TRUE)->bin;
+}
+
+gboolean
+nm_utils_machine_id_is_fake (void)
+{
+	return _machine_id_get (TRUE)->is_fake;
 }
 
 /*****************************************************************************/
 
+/* prefix for version2 secret key. The secret key is hashed with /etc/machine-id. */
+#define SECRET_KEY_V2_PREFIX "nm-v2:"
+#define SECRET_KEY_FILE      NMSTATEDIR"/secret_key"
+
 static gboolean
-_secret_key_read (guint8 **out_secret_key,
-                  gsize *out_key_len)
+_host_id_read_timestamp (gboolean use_secret_key_file,
+                         const guint8 *host_id,
+                         gsize host_id_len,
+                         gint64 *out_timestamp_ns)
 {
-	guint8 *secret_key;
-	gboolean success = TRUE;
-	gsize key_len;
-	gs_free_error GError *error = NULL;
+	struct stat st;
+	gint64 now;
+	guint64 v;
+
+	if (   use_secret_key_file
+	    && stat (SECRET_KEY_FILE, &st) == 0) {
+		/* don't check for overflow or timestamps in the future. We get whatever
+		 * (bogus) date is on the file. */
+		*out_timestamp_ns = (st.st_mtim.tv_sec * NM_UTILS_NS_PER_SECOND) + st.st_mtim.tv_nsec;
+		return TRUE;
+	}
 
-	/* Let's try to load a saved secret key first. */
-	if (g_file_get_contents (NMSTATEDIR "/secret_key", (char **) &secret_key, &key_len, &error)) {
-		if (key_len >= 16)
-			goto out;
+	/* generate a fake timestamp based on the host-id.
+	 *
+	 * This really should never happen under normal circumstances. We already
+	 * are in a code path, where the system has a problem (unable to get good randomness
+	 * and/or can't access the secret_key). In such a scenario, a fake timestamp is the
+	 * least of our problems.
+	 *
+	 * At least, generate something sensible so we don't have to worry about the
+	 * timestamp. It is wrong to worry about using a fake timestamp (which is tied to
+	 * the secret_key) if we are unable to access the secret_key file in the first place.
+	 *
+	 * Pick a random timestamp from the past two years. Yes, this timestamp
+	 * is not stable accross restarts, but apparently neither is the host-id
+	 * nor the secret_key itself. */
 
-		/* the secret key is borked. Log a warning, but proceed below to generate
-		 * a new one. */
-		nm_log_warn (LOGD_CORE, "secret-key: too short secret key in \"%s\" (generate new key)", NMSTATEDIR "/secret_key");
-		nm_clear_g_free (&secret_key);
-	} else {
-		if (!g_error_matches (error, G_IO_ERROR, G_IO_ERROR_NOT_FOUND)) {
+#define EPOCH_TWO_YEARS  (G_GINT64_CONSTANT (2 * 365 * 24 * 3600) * NM_UTILS_NS_PER_SECOND)
+
+	v = nm_hash_siphash42 (1156657133u, host_id, host_id_len);
+
+	now = time (NULL);
+	*out_timestamp_ns = NM_MAX ((gint64) 1,
+	                            (now * NM_UTILS_NS_PER_SECOND) - ((gint64) (v % ((guint64) (EPOCH_TWO_YEARS)))));
+	return FALSE;
+}
+
+static const guint8 *
+_host_id_hash_v2 (const guint8 *seed_arr,
+                  gsize seed_len,
+                  guint8 *out_digest /* 32 bytes (NM_UTILS_CHECKSUM_LENGTH_SHA256) */)
+{
+	nm_auto_free_checksum GChecksum *sum = g_checksum_new (G_CHECKSUM_SHA256);
+	const UuidData *machine_id_data;
+	char slen[100];
+
+	/*
+	    (stat -c '%s' /var/lib/NetworkManager/secret_key;
+	     echo -n ' ';
+	     cat /var/lib/NetworkManager/secret_key;
+	     cat /etc/machine-id | tr -d '\n' | sed -n 's/[a-f0-9-]/\0/pg') | sha256sum
+	*/
+
+	nm_sprintf_buf (slen, "%"G_GSIZE_FORMAT" ", seed_len);
+	g_checksum_update (sum, (const guchar *) slen, strlen (slen));
+
+	g_checksum_update (sum, (const guchar *) seed_arr, seed_len);
+
+	machine_id_data = _machine_id_get (FALSE);
+	if (   machine_id_data
+	    && !machine_id_data->is_fake)
+		g_checksum_update (sum, (const guchar *) machine_id_data->str, strlen (machine_id_data->str));
+
+	nm_utils_checksum_get_digest_len (sum, out_digest, NM_UTILS_CHECKSUM_LENGTH_SHA256);
+	return out_digest;
+}
+
+static gboolean
+_host_id_read (guint8 **out_host_id,
+               gsize *out_host_id_len)
+{
+#define SECRET_KEY_LEN 32u
+	guint8 sha256_digest[NM_UTILS_CHECKSUM_LENGTH_SHA256];
+	nm_auto_clear_secret_ptr NMSecretPtr file_content = { 0 };
+	const guint8 *secret_arr;
+	gsize secret_len;
+	GError *error = NULL;
+	gboolean success;
+
+	if (nm_utils_file_get_contents (-1,
+	                                SECRET_KEY_FILE,
+	                                10*1024,
+	                                NM_UTILS_FILE_GET_CONTENTS_FLAG_SECRET,
+	                                (char **) &file_content.str,
+	                                &file_content.len,
+	                                &error) < 0) {
+		if (!nm_utils_error_is_notfound (error)) {
 			nm_log_warn (LOGD_CORE, "secret-key: failure reading secret key in \"%s\": %s (generate new key)",
-			             NMSTATEDIR "/secret_key", error->message);
+			             SECRET_KEY_FILE, error->message);
 		}
 		g_clear_error (&error);
-	}
-
-	/* RFC7217 mandates the key SHOULD be at least 128 bits.
-	 * Let's use twice as much. */
-	key_len = 32;
-	secret_key = g_malloc (key_len + 1);
-
-	/* the secret-key is binary. Still, ensure that it's NULL terminated, just like
-	 * g_file_set_contents() does. */
-	secret_key[32] = '\0';
+	} else if (   file_content.len >= NM_STRLEN (SECRET_KEY_V2_PREFIX) + SECRET_KEY_LEN
+	           && memcmp (file_content.bin, SECRET_KEY_V2_PREFIX, NM_STRLEN (SECRET_KEY_V2_PREFIX)) == 0) {
+		/* for this type of secret key, we require a prefix followed at least SECRET_KEY_LEN (32) bytes. We
+		 * (also) do that, because older versions of NetworkManager wrote exactly 32 bytes without
+		 * prefix, so we won't wrongly interpret such legacy keys as v2 (if they accidentally have
+		 * a SECRET_KEY_V2_PREFIX prefix, they'll still have the wrong size).
+		 *
+		 * Note that below we generate the random seed in base64 encoding. But that is only done
+		 * to write an ASCII file. There is no base64 decoding and the ASCII is hashed as-is.
+		 * We would accept any binary data just as well (provided a suitable prefix and at least
+		 * 32 bytes).
+		 *
+		 * Note that when hashing the v2 content, we also hash the prefix. There is no strong reason,
+		 * except that it seems simpler not to distinguish between the v2 prefix and the content.
+		 * It's all just part of the seed. */
 
-	if (!nm_utils_random_bytes (secret_key, key_len)) {
-		nm_log_warn (LOGD_CORE, "secret-key: failure to generate good random data for secret-key (use non-persistent key)");
-		success = FALSE;
+		secret_arr = _host_id_hash_v2 (file_content.bin, file_content.len, sha256_digest);
+		secret_len = NM_UTILS_CHECKSUM_LENGTH_SHA256;
+		success = TRUE;
 		goto out;
+	} else if (file_content.len >= 16) {
+		secret_arr = file_content.bin;
+		secret_len = file_content.len;
+		success = TRUE;
+		goto out;
+	} else {
+		/* the secret key is borked. Log a warning, but proceed below to generate
+		 * a new one. */
+		nm_log_warn (LOGD_CORE, "secret-key: too short secret key in \"%s\" (generate new key)", SECRET_KEY_FILE);
 	}
 
-	if (!nm_utils_file_set_contents (NMSTATEDIR "/secret_key", (char *) secret_key, key_len, 0077, &error)) {
-		nm_log_warn (LOGD_CORE, "secret-key: failure to persist secret key in \"%s\" (%s) (use non-persistent key)",
-		             NMSTATEDIR "/secret_key", error->message);
-		success = FALSE;
-		goto out;
+	/* generate and persist new key */
+	{
+#define SECRET_KEY_LEN_BASE64 ((((SECRET_KEY_LEN / 3) + 1) * 4) + 4)
+		guint8 rnd_buf[SECRET_KEY_LEN];
+		guint8 new_content[NM_STRLEN (SECRET_KEY_V2_PREFIX) + SECRET_KEY_LEN_BASE64];
+		int base64_state = 0;
+		int base64_save = 0;
+		gsize len;
+
+		success = nm_utils_random_bytes (rnd_buf, sizeof (rnd_buf));
+
+		/* Our key is really binary data. But since we anyway generate a random seed
+		 * (with 32 random bytes), don't write it in binary, but instead create
+		 * an pure ASCII (base64) representation. Note that the ASCII will still be taken
+		 * as-is (no base64 decoding is done). The sole purpose is to write a ASCII file
+		 * instead of a binary. The content is gibberish either way. */
+		memcpy (new_content, SECRET_KEY_V2_PREFIX, NM_STRLEN (SECRET_KEY_V2_PREFIX));
+		len = NM_STRLEN (SECRET_KEY_V2_PREFIX);
+		len += g_base64_encode_step (rnd_buf,
+		                             sizeof (rnd_buf),
+		                             FALSE,
+		                             (char *) &new_content[len],
+		                             &base64_state,
+		                             &base64_save);
+		len += g_base64_encode_close (FALSE,
+		                              (char *) &new_content[len],
+		                              &base64_state,
+		                              &base64_save);
+		nm_assert (len <= sizeof (new_content));
+
+		secret_arr = _host_id_hash_v2 (new_content, len, sha256_digest);
+		secret_len = NM_UTILS_CHECKSUM_LENGTH_SHA256;
+
+		if (!success)
+			nm_log_warn (LOGD_CORE, "secret-key: failure to generate good random data for secret-key (use non-persistent key)");
+		else if (nm_utils_get_testing ()) {
+			/* for test code, we don't write the generated secret-key to disk. */
+		} else if (!nm_utils_file_set_contents (SECRET_KEY_FILE,
+		                                        (const char *) new_content,
+		                                        len,
+		                                        0077,
+		                                        &error)) {
+			nm_log_warn (LOGD_CORE, "secret-key: failure to persist secret key in \"%s\" (%s) (use non-persistent key)",
+			             SECRET_KEY_FILE, error->message);
+			g_clear_error (&error);
+			success = FALSE;
+		} else
+			nm_log_dbg (LOGD_CORE, "secret-key: persist new secret key to \"%s\"", SECRET_KEY_FILE);
+
+		nm_explicit_bzero (rnd_buf, sizeof (rnd_buf));
+		nm_explicit_bzero (new_content, sizeof (new_content));
 	}
 
 out:
-	/* regardless of success or failue, we always return a secret-key. The
-	 * caller may choose to ignore the error and proceed. */
-	*out_key_len = key_len;
-	*out_secret_key = secret_key;
+	*out_host_id_len = secret_len;
+	*out_host_id = nm_memdup (secret_arr, secret_len);
 	return success;
 }
 
 typedef struct {
-	const guint8 *secret_key;
-	gsize key_len;
+	guint8 *host_id;
+	gsize host_id_len;
+	gint64 timestamp_ns;
 	bool is_good:1;
-} SecretKeyData;
+	bool timestamp_is_good:1;
+} HostIdData;
 
-gboolean
-nm_utils_secret_key_get (const guint8 **out_secret_key,
-                         gsize *out_key_len)
+static const HostIdData *
+_host_id_get (void)
 {
-	static volatile const SecretKeyData *secret_key_static;
-	const SecretKeyData *secret_key;
+	static const HostIdData *volatile host_id_static;
+	const HostIdData *host_id;
 
-	secret_key = g_atomic_pointer_get (&secret_key_static);
-	if (G_UNLIKELY (!secret_key)) {
+again:
+	host_id = g_atomic_pointer_get (&host_id_static);
+	if (G_UNLIKELY (!host_id)) {
+		static HostIdData host_id_data;
 		static gsize init_value = 0;
-		static SecretKeyData secret_key_data;
-		gboolean tmp_success;
-		gs_free guint8 *tmp_secret_key = NULL;
-		gsize tmp_key_len;
-
-		tmp_success = _secret_key_read (&tmp_secret_key, &tmp_key_len);
-		if (g_once_init_enter (&init_value)) {
-			secret_key_data.secret_key = tmp_secret_key;
-			secret_key_data.key_len = tmp_key_len;
-			secret_key_data.is_good = tmp_success;
-
-			if (g_atomic_pointer_compare_and_exchange (&secret_key_static, NULL, &secret_key_data)) {
-				g_steal_pointer (&tmp_secret_key);
-				secret_key = &secret_key_data;
-			}
 
-			g_once_init_leave (&init_value, 1);
-		}
-		if (!secret_key)
-			secret_key = g_atomic_pointer_get (&secret_key_static);
+		if (!g_once_init_enter (&init_value))
+			goto again;
+
+		host_id_data.is_good = _host_id_read (&host_id_data.host_id,
+		                                      &host_id_data.host_id_len);
+
+		host_id_data.timestamp_is_good = _host_id_read_timestamp (host_id_data.is_good,
+		                                                          host_id_data.host_id,
+		                                                          host_id_data.host_id_len,
+		                                                          &host_id_data.timestamp_ns);
+		if (   !host_id_data.timestamp_is_good
+		    && host_id_data.is_good)
+			nm_log_warn (LOGD_CORE, "secret-key: failure reading host timestamp (use fake one)");
+
+		host_id = &host_id_data;
+		g_atomic_pointer_set (&host_id_static, host_id);
+		g_once_init_leave (&init_value, 1);
 	}
 
-	*out_secret_key = secret_key->secret_key;
-	*out_key_len = secret_key->key_len;
-	return secret_key->is_good;
+	return host_id;
 }
 
-gint64
-nm_utils_secret_key_get_timestamp (void)
+/**
+ * nm_utils_host_id_get:
+ * @out_host_id: (out) (transfer none): the binary host key
+ * @out_host_id_len: the length of the host key.
+ *
+ * This returns a per-host key that depends on /var/lib/NetworkManage/secret_key
+ * and (depending on the version) on /etc/machine-id. If /var/lib/NetworkManage/secret_key
+ * does not exist, it will be generated and persisted for next boot.
+ *
+ * Returns: %TRUE, if the host key is "good". Note that this function
+ *   will always succeed to return a host-key, and that this key
+ *   won't change during the run of the program (no matter what).
+ *   A %FALSE return possibly means, that the secret_key is not persisted
+ *   to disk, and/or that it was generated with bad randomness.
+ */
+gboolean
+nm_utils_host_id_get (const guint8 **out_host_id,
+                      gsize *out_host_id_len)
 {
-	struct stat stat_buf;
-	const guint8 *key;
-	gsize key_len;
+	const HostIdData *host_id;
 
-	if (!nm_utils_secret_key_get (&key, &key_len))
-		return 0;
-
-	if (stat (NMSTATEDIR "/secret_key", &stat_buf) != 0)
-		return 0;
+	host_id = _host_id_get ();
+	*out_host_id = host_id->host_id;
+	*out_host_id_len = host_id->host_id_len;
+	return host_id->is_good;
+}
 
-	return stat_buf.st_mtim.tv_sec;
+gint64
+nm_utils_host_id_get_timestamp_ns (void)
+{
+	return _host_id_get ()->timestamp_ns;
 }
 
 /*****************************************************************************/
 
-const char *
-nm_utils_get_boot_id (void)
+static const UuidData *
+_boot_id_get (void)
 {
-	static const char *boot_id;
-
-	if (G_UNLIKELY (!boot_id)) {
+	static const UuidData *volatile p_boot_id;
+	const UuidData *d;
+
+again:
+	d = g_atomic_pointer_get (&p_boot_id);
+	if (G_UNLIKELY (!d)) {
+		static gsize lock;
+		static UuidData boot_id;
 		gs_free char *contents = NULL;
+		NMUuid uuid;
+		gboolean is_fake = FALSE;
 
 		nm_utils_file_get_contents (-1, "/proc/sys/kernel/random/boot_id", 0,
 		                            NM_UTILS_FILE_GET_CONTENTS_FLAG_NONE,
 		                            &contents, NULL, NULL);
-		if (contents) {
-			g_strstrip (contents);
-			if (contents[0]) {
-				/* clone @contents because we keep @boot_id until the program
-				 * ends.
-				 * nm_utils_file_get_contents() likely allocated a larger
-				 * buffer chunk initially and (although using realloc to shrink
-				 * the buffer) it might not be best to keep this memory
-				 * around. */
-				boot_id = g_strdup (contents);
-			}
+		if (   !contents
+		    || !_nm_utils_uuid_parse (nm_strstrip (contents), &uuid)) {
+			/* generate a random UUID instead. */
+			is_fake = TRUE;
+			_nm_utils_uuid_generate_random (&uuid);
 		}
-		if (!boot_id)
-			boot_id = nm_utils_uuid_generate ();
+
+		if (!g_once_init_enter (&lock))
+			goto again;
+
+		d = _uuid_data_init (&boot_id, FALSE, is_fake, &uuid);
+		g_atomic_pointer_set (&p_boot_id, d);
+		g_once_init_leave (&lock, 1);
 	}
 
-	return boot_id;
+	return d;
+}
+
+const char *
+nm_utils_boot_id_str (void)
+{
+	return _boot_id_get ()->str;
+}
+
+const NMUuid *
+nm_utils_boot_id_bin (void)
+{
+	return &_boot_id_get ()->bin;
+}
+
+/*****************************************************************************/
+
+/**
+ * nm_utils_arp_type_detect_from_hwaddrlen:
+ * @hwaddr_len: the length of the hardware address in bytes.
+ *
+ * Detects the arp-type based on the length of the MAC address.
+ * On success, this returns a (positive) value in uint16_t range,
+ * like ARPHRD_ETHER or ARPHRD_INFINIBAND.
+ *
+ * On failure, returns a negative error code.
+ *
+ * Returns: the arp-type or negative value on error. */
+int
+nm_utils_arp_type_detect_from_hwaddrlen (gsize hwaddr_len)
+{
+	switch (hwaddr_len) {
+	case ETH_ALEN:
+		return ARPHRD_ETHER;
+	case INFINIBAND_ALEN:
+		return ARPHRD_INFINIBAND;
+	default:
+		/* Note: if you ever support anything but ethernet and infiniband,
+		 * make sure to look at all callers. They assert that it's one of
+		 * these two. */
+		return -EINVAL;
+	}
+}
+
+gboolean
+nm_utils_arp_type_validate_hwaddr (int arp_type,
+                                   const guint8 *hwaddr,
+                                   gsize hwaddr_len)
+{
+
+	if (!hwaddr)
+		return FALSE;
+
+	if (arp_type == ARPHRD_ETHER) {
+		G_STATIC_ASSERT (ARPHRD_ETHER >= 0 && ARPHRD_ETHER <= 0xFF);
+		if (hwaddr_len != ETH_ALEN)
+			return FALSE;
+	} else if (arp_type == ARPHRD_INFINIBAND) {
+		G_STATIC_ASSERT (ARPHRD_INFINIBAND >= 0 && ARPHRD_INFINIBAND <= 0xFF);
+		if (hwaddr_len != INFINIBAND_ALEN)
+			return FALSE;
+	} else
+		return FALSE;
+
+	nm_assert (arp_type == nm_utils_arp_type_detect_from_hwaddrlen (hwaddr_len));
+	return TRUE;
+}
+
+gboolean
+nm_utils_arp_type_get_hwaddr_relevant_part (int arp_type,
+                                            const guint8 **hwaddr,
+                                            gsize *hwaddr_len)
+{
+	g_return_val_if_fail (   hwaddr
+	                      && hwaddr_len
+	                      && nm_utils_arp_type_validate_hwaddr (arp_type, *hwaddr, *hwaddr_len),
+	                      FALSE);
+
+	/* for infiniband, we only consider the last 8 bytes. */
+	if (arp_type == ARPHRD_INFINIBAND) {
+		*hwaddr += (INFINIBAND_ALEN - 8);
+		*hwaddr_len = 8;
+	}
+
+	return TRUE;
 }
 
 /*****************************************************************************/
@@ -2920,9 +3324,8 @@ nm_utils_stable_id_random (void)
 char *
 nm_utils_stable_id_generated_complete (const char *stable_id_generated)
 {
-	guint8 buf[20];
-	GChecksum *sum;
-	gsize buf_size;
+	nm_auto_free_checksum GChecksum *sum = NULL;
+	guint8 buf[NM_UTILS_CHECKSUM_LENGTH_SHA1];
 	char *base64;
 
 	/* for NM_UTILS_STABLE_TYPE_GENERATED we genererate a possibly long string
@@ -2933,15 +3336,8 @@ nm_utils_stable_id_generated_complete (const char *stable_id_generated)
 	g_return_val_if_fail (stable_id_generated, NULL);
 
 	sum = g_checksum_new (G_CHECKSUM_SHA1);
-	nm_assert (sum);
-
 	g_checksum_update (sum, (guchar *) stable_id_generated, strlen (stable_id_generated));
-
-	buf_size = sizeof (buf);
-	g_checksum_get_digest (sum, buf, &buf_size);
-	nm_assert (buf_size == sizeof (buf));
-
-	g_checksum_free (sum);
+	nm_utils_checksum_get_digest (sum, buf);
 
 	/* we don't care to use the sha1 sum in common hex representation.
 	 * Use instead base64, it's 27 chars (stripping the padding) vs.
@@ -2967,6 +3363,7 @@ _stable_id_append (GString *str,
 NMUtilsStableType
 nm_utils_stable_id_parse (const char *stable_id,
                           const char *deviceid,
+                          const char *hwaddr,
                           const char *bootid,
                           const char *uuid,
                           char **out_generated)
@@ -3042,9 +3439,11 @@ nm_utils_stable_id_parse (const char *stable_id,
 		if (CHECK_PREFIX ("${CONNECTION}"))
 			_stable_id_append (str, uuid);
 		else if (CHECK_PREFIX ("${BOOT}"))
-			_stable_id_append (str, bootid ?: nm_utils_get_boot_id ());
+			_stable_id_append (str, bootid);
 		else if (CHECK_PREFIX ("${DEVICE}"))
 			_stable_id_append (str, deviceid);
+		else if (CHECK_PREFIX ("${MAC}"))
+			_stable_id_append (str, hwaddr);
 		else if (g_str_has_prefix (&stable_id[i], "${RANDOM}")) {
 			/* RANDOM makes not so much sense for cloned-mac-address
 			 * as the result is simmilar to specyifing "cloned-mac-address=random".
@@ -3121,28 +3520,20 @@ _set_stable_privacy (NMUtilsStableType stable_type,
                      const char *ifname,
                      const char *network_id,
                      guint32 dad_counter,
-                     const guint8 *secret_key,
-                     gsize key_len,
+                     const guint8 *host_id,
+                     gsize host_id_len,
                      GError **error)
 {
-	GChecksum *sum;
-	guint8 digest[32];
+	nm_auto_free_checksum GChecksum *sum = NULL;
+	guint8 digest[NM_UTILS_CHECKSUM_LENGTH_SHA256];
 	guint32 tmp[2];
-	gsize len = sizeof (digest);
 
-	nm_assert (key_len);
+	nm_assert (host_id_len);
 	nm_assert (network_id);
 
-	/* Documentation suggests that this can fail.
-	 * Maybe in case of a missing algorithm in crypto library? */
 	sum = g_checksum_new (G_CHECKSUM_SHA256);
-	if (!sum) {
-		g_set_error_literal (error, NM_UTILS_ERROR, NM_UTILS_ERROR_UNKNOWN,
-		                     "Can't create a SHA256 hash");
-		return FALSE;
-	}
 
-	key_len = MIN (key_len, G_MAXUINT32);
+	host_id_len = MIN (host_id_len, G_MAXUINT32);
 
 	if (stable_type != NM_UTILS_STABLE_TYPE_UUID) {
 		guint8 stable_type_uint8;
@@ -3155,7 +3546,7 @@ _set_stable_privacy (NMUtilsStableType stable_type,
 		 *
 		 * That is no real problem and it is still impossible to
 		 * force a collision here, because of how the remaining
-		 * fields are hashed. That is, as we also hash @key_len
+		 * fields are hashed. That is, as we also hash @host_id_len
 		 * and the terminating '\0' of @network_id, it is unambigiously
 		 * possible to revert the process and deduce the @stable_type.
 		 */
@@ -3166,27 +3557,20 @@ _set_stable_privacy (NMUtilsStableType stable_type,
 	g_checksum_update (sum, (const guchar *) ifname, strlen (ifname) + 1);
 	g_checksum_update (sum, (const guchar *) network_id, strlen (network_id) + 1);
 	tmp[0] = htonl (dad_counter);
-	tmp[1] = htonl (key_len);
+	tmp[1] = htonl (host_id_len);
 	g_checksum_update (sum, (const guchar *) tmp, sizeof (tmp));
-	g_checksum_update (sum, (const guchar *) secret_key, key_len);
-
-	g_checksum_get_digest (sum, digest, &len);
-
-	nm_assert (len == sizeof (digest));
+	g_checksum_update (sum, (const guchar *) host_id, host_id_len);
+	nm_utils_checksum_get_digest (sum, digest);
 
 	while (_is_reserved_ipv6_iid (digest)) {
 		g_checksum_reset (sum);
 		tmp[0] = htonl (++dad_counter);
-		g_checksum_update (sum, digest, len);
+		g_checksum_update (sum, digest, sizeof (digest));
 		g_checksum_update (sum, (const guchar *) &tmp[0], sizeof (tmp[0]));
-		g_checksum_get_digest (sum, digest, &len);
-		nm_assert (len == sizeof (digest));
+		nm_utils_checksum_get_digest (sum, digest);
 	}
 
-	g_checksum_free (sum);
-
 	memcpy (addr->s6_addr + 8, &digest[0], 8);
-
 	return TRUE;
 }
 
@@ -3196,11 +3580,11 @@ nm_utils_ipv6_addr_set_stable_privacy_impl (NMUtilsStableType stable_type,
                                             const char *ifname,
                                             const char *network_id,
                                             guint32 dad_counter,
-                                            guint8 *secret_key,
-                                            gsize key_len,
+                                            guint8 *host_id,
+                                            gsize host_id_len,
                                             GError **error)
 {
-	return _set_stable_privacy (stable_type, addr, ifname, network_id, dad_counter, secret_key, key_len, error);
+	return _set_stable_privacy (stable_type, addr, ifname, network_id, dad_counter, host_id, host_id_len, error);
 }
 
 #define RFC7217_IDGEN_RETRIES 3
@@ -3220,8 +3604,8 @@ nm_utils_ipv6_addr_set_stable_privacy (NMUtilsStableType stable_type,
                                        guint32 dad_counter,
                                        GError **error)
 {
-	const guint8 *secret_key;
-	gsize key_len;
+	const guint8 *host_id;
+	gsize host_id_len;
 
 	g_return_val_if_fail (network_id, FALSE);
 
@@ -3231,10 +3615,10 @@ nm_utils_ipv6_addr_set_stable_privacy (NMUtilsStableType stable_type,
 		return FALSE;
 	}
 
-	nm_utils_secret_key_get (&secret_key, &key_len);
+	nm_utils_host_id_get (&host_id, &host_id_len);
 
 	return _set_stable_privacy (stable_type, addr, ifname, network_id, dad_counter,
-	                            secret_key, key_len, error);
+	                            host_id, host_id_len, error);
 }
 
 /*****************************************************************************/
@@ -3306,42 +3690,36 @@ nm_utils_hw_addr_gen_random_eth (const char *current_mac_address,
 static char *
 _hw_addr_gen_stable_eth (NMUtilsStableType stable_type,
                          const char *stable_id,
-                         const guint8 *secret_key,
-                         gsize key_len,
+                         const guint8 *host_id,
+                         gsize host_id_len,
                          const char *ifname,
                          const char *current_mac_address,
                          const char *generate_mac_address_mask)
 {
-	GChecksum *sum;
+	nm_auto_free_checksum GChecksum *sum = NULL;
 	guint32 tmp;
-	guint8 digest[32];
-	gsize len = sizeof (digest);
+	guint8 digest[NM_UTILS_CHECKSUM_LENGTH_SHA256];
 	struct ether_addr bin_addr;
 	guint8 stable_type_uint8;
 
 	nm_assert (stable_id);
-	nm_assert (secret_key);
+	nm_assert (host_id);
 
 	sum = g_checksum_new (G_CHECKSUM_SHA256);
-	if (!sum)
-		return NULL;
 
-	key_len = MIN (key_len, G_MAXUINT32);
+	host_id_len = MIN (host_id_len, G_MAXUINT32);
 
 	nm_assert (stable_type < (NMUtilsStableType) 255);
 	stable_type_uint8 = stable_type;
 	g_checksum_update (sum, (const guchar *) &stable_type_uint8, sizeof (stable_type_uint8));
 
-	tmp = htonl ((guint32) key_len);
+	tmp = htonl ((guint32) host_id_len);
 	g_checksum_update (sum, (const guchar *) &tmp, sizeof (tmp));
-	g_checksum_update (sum, (const guchar *) secret_key, key_len);
+	g_checksum_update (sum, (const guchar *) host_id, host_id_len);
 	g_checksum_update (sum, (const guchar *) (ifname ?: ""), ifname ? (strlen (ifname) + 1) : 1);
 	g_checksum_update (sum, (const guchar *) stable_id, strlen (stable_id) + 1);
 
-	g_checksum_get_digest (sum, digest, &len);
-	g_checksum_free (sum);
-
-	g_return_val_if_fail (len == 32, NULL);
+	nm_utils_checksum_get_digest (sum, digest);
 
 	memcpy (&bin_addr, digest, ETH_ALEN);
 	_hw_addr_eth_complete (&bin_addr, current_mac_address, generate_mac_address_mask);
@@ -3351,13 +3729,13 @@ _hw_addr_gen_stable_eth (NMUtilsStableType stable_type,
 char *
 nm_utils_hw_addr_gen_stable_eth_impl (NMUtilsStableType stable_type,
                                       const char *stable_id,
-                                      const guint8 *secret_key,
-                                      gsize key_len,
+                                      const guint8 *host_id,
+                                      gsize host_id_len,
                                       const char *ifname,
                                       const char *current_mac_address,
                                       const char *generate_mac_address_mask)
 {
-	return _hw_addr_gen_stable_eth (stable_type, stable_id, secret_key, key_len, ifname, current_mac_address, generate_mac_address_mask);
+	return _hw_addr_gen_stable_eth (stable_type, stable_id, host_id, host_id_len, ifname, current_mac_address, generate_mac_address_mask);
 }
 
 char *
@@ -3367,17 +3745,17 @@ nm_utils_hw_addr_gen_stable_eth (NMUtilsStableType stable_type,
                                  const char *current_mac_address,
                                  const char *generate_mac_address_mask)
 {
-	const guint8 *secret_key;
-	gsize key_len;
+	const guint8 *host_id;
+	gsize host_id_len;
 
 	g_return_val_if_fail (stable_id, NULL);
 
-	nm_utils_secret_key_get (&secret_key, &key_len);
+	nm_utils_host_id_get (&host_id, &host_id_len);
 
 	return _hw_addr_gen_stable_eth (stable_type,
 	                                stable_id,
-	                                secret_key,
-	                                key_len,
+	                                host_id,
+	                                host_id_len,
 	                                ifname,
 	                                current_mac_address,
 	                                generate_mac_address_mask);
@@ -3385,6 +3763,118 @@ nm_utils_hw_addr_gen_stable_eth (NMUtilsStableType stable_type,
 
 /*****************************************************************************/
 
+GBytes *
+nm_utils_dhcp_client_id_mac (int arp_type,
+                             const guint8 *hwaddr,
+                             gsize hwaddr_len)
+{
+	guint8 *client_id_buf;
+	const guint8 hwaddr_type = arp_type;
+
+	if (!nm_utils_arp_type_get_hwaddr_relevant_part (arp_type, &hwaddr, &hwaddr_len))
+		g_return_val_if_reached (NULL);
+
+	client_id_buf = g_malloc (hwaddr_len + 1);
+	client_id_buf[0] = hwaddr_type;
+	memcpy (&client_id_buf[1], hwaddr, hwaddr_len);
+	return g_bytes_new_take (client_id_buf, hwaddr_len + 1);
+}
+
+/**
+ * nm_utils_dhcp_client_id_systemd_node_specific_full:
+ * @legacy_unstable_byteorder: historically, the code would generate a iaid
+ *   dependent on host endianness. This is undesirable, if backward compatibility
+ *   are not a concern, generate stable endianness.
+ * @interface_id: a binary identifer that is hashed into the DUID.
+ *   Comonly this is the interface-name, but it may be the MAC address.
+ * @interface_id_len: the length of @interface_id.
+ * @machine_id: the binary identifier for the machine. It is hashed
+ *   into the DUID. It commonly is /etc/machine-id (parsed in binary as NMUuid).
+ * @machine_id_len: the length of the @machine_id.
+ *
+ * Systemd's sd_dhcp_client generates a default client ID (type 255, node-specific,
+ * RFC 4361) if no explicit client-id is set. This function duplicates that
+ * implementation and exposes it as (internal) API.
+ *
+ * Returns: a %GBytes of generated client-id. This function cannot fail.
+ */
+GBytes *
+nm_utils_dhcp_client_id_systemd_node_specific_full (gboolean legacy_unstable_byteorder,
+                                                    const guint8 *interface_id,
+                                                    gsize interface_id_len,
+                                                    const guint8 *machine_id,
+                                                    gsize machine_id_len)
+{
+	const guint8 HASH_KEY[16] = { 0x80, 0x11, 0x8c, 0xc2, 0xfe, 0x4a, 0x03, 0xee, 0x3e, 0xd6, 0x0c, 0x6f, 0x36, 0x39, 0x14, 0x09 };
+	const guint16 DUID_TYPE_EN = 2;
+	const guint32 SYSTEMD_PEN = 43793;
+	struct _nm_packed {
+		guint8 type;
+		guint32 iaid;
+		struct _nm_packed {
+			guint16 type;
+			union {
+				struct _nm_packed {
+						/* DUID_TYPE_EN */
+						guint32 pen;
+						uint8_t id[8];
+				} en;
+			};
+		} duid;
+	} *client_id;
+	guint64 u64;
+	guint32 u32;
+
+	g_return_val_if_fail (interface_id, NULL);
+	g_return_val_if_fail (interface_id_len > 0, NULL);
+	g_return_val_if_fail (machine_id, NULL);
+	g_return_val_if_fail (machine_id_len > 0, NULL);
+
+	client_id = g_malloc (sizeof (*client_id));
+
+	client_id->type = 255;
+
+	u64 = c_siphash_hash (HASH_KEY, interface_id, interface_id_len);
+	u32 = (u64 & 0xffffffffu) ^ (u64 >> 32);
+	if (legacy_unstable_byteorder) {
+		/* original systemd code dhcp_identifier_set_iaid() generates the iaid
+		 * in native endianness. Do that too, to preserve compatibility
+		 * (https://github.com/systemd/systemd/pull/10614). */
+		u32 = bswap_32 (u32);
+	} else {
+		/* generate fixed byteorder, in a way that on little endian systems
+		 * the values agree. Meaning: legacy behavior is identical to this
+		 * on little endian. */
+		u32 = be32toh (u32);
+	}
+	unaligned_write_ne32 (&client_id->iaid, u32);
+
+	unaligned_write_be16 (&client_id->duid.type, DUID_TYPE_EN);
+
+	unaligned_write_be32 (&client_id->duid.en.pen, SYSTEMD_PEN);
+
+	u64 = htole64 (c_siphash_hash (HASH_KEY, machine_id, machine_id_len));
+	memcpy(client_id->duid.en.id, &u64, sizeof (client_id->duid.en.id));
+
+	G_STATIC_ASSERT_EXPR (sizeof (*client_id) == 19);
+	return g_bytes_new_take (client_id, 19);
+}
+
+GBytes *
+nm_utils_dhcp_client_id_systemd_node_specific (gboolean legacy_unstable_byteorder,
+                                               const char *ifname)
+{
+	g_return_val_if_fail (ifname && ifname[0], NULL);
+
+	return nm_utils_dhcp_client_id_systemd_node_specific_full (legacy_unstable_byteorder,
+	                                                           (const guint8 *) ifname,
+	                                                           strlen (ifname),
+	                                                           (const guint8 *) nm_utils_machine_id_bin (),
+	                                                           sizeof (NMUuid));
+}
+
+/*****************************************************************************/
+
 /**
  * nm_utils_setpgid:
  * @unused: unused
diff --git a/src/nm-core-utils.h b/src/nm-core-utils.h
index 30d1360a..2e75ea62 100644
--- a/src/nm-core-utils.h
+++ b/src/nm-core-utils.h
@@ -61,20 +61,35 @@ void _nm_singleton_instance_register_destruction (GObject *instance);
 #define NM_DEFINE_SINGLETON_GETTER(TYPE, GETTER, GTYPE, ...) \
 NM_DEFINE_SINGLETON_INSTANCE (TYPE); \
 NM_DEFINE_SINGLETON_REGISTER (TYPE); \
+static char _already_created_##GETTER = FALSE; \
 TYPE * \
 GETTER (void) \
 { \
 	if (G_UNLIKELY (!singleton_instance)) { \
-		static char _already_created = FALSE; \
-\
-		g_assert (!_already_created || (NM_DEFINE_SINGLETON_ALLOW_MULTIPLE)); \
-		_already_created = TRUE;\
+		g_assert (!(_already_created_##GETTER) || (NM_DEFINE_SINGLETON_ALLOW_MULTIPLE)); \
+		(_already_created_##GETTER) = TRUE;\
 		singleton_instance = (g_object_new (GTYPE, ##__VA_ARGS__, NULL)); \
 		g_assert (singleton_instance); \
 		nm_singleton_instance_register (); \
 		nm_log_dbg (LOGD_CORE, "create %s singleton (%p)", G_STRINGIFY (TYPE), singleton_instance); \
 	} \
 	return singleton_instance; \
+} \
+_nm_unused static void \
+_nmtst_##GETTER##_reset (TYPE *instance) \
+{ \
+	/* usually, the singleton can only be created once (and further instantiations
+	 * are guarded by an assert). For testing, we need to reset the singleton to
+	 * allow multiple instantiations. */ \
+	g_assert (G_IS_OBJECT (instance)); \
+	g_assert (instance == singleton_instance); \
+	g_assert (_already_created_##GETTER); \
+	g_object_unref (instance); \
+	\
+	/* require that the last unref also destroyed the singleton. If this fails,
+	 * somebody still keeps a reference. Fix your test! */ \
+	g_assert (!singleton_instance); \
+	_already_created_##GETTER = FALSE; \
 }
 
 /* attach @instance to the data or @owner. @owner owns a reference
@@ -208,7 +223,8 @@ NMMatchSpecMatchType nm_match_spec_device (const GSList *specs,
                                            const char *driver,
                                            const char *driver_version,
                                            const char *hwaddr,
-                                           const char *s390_subchannels);
+                                           const char *s390_subchannels,
+                                           const char *dhcp_plugin);
 NMMatchSpecMatchType nm_match_spec_config (const GSList *specs,
                                            guint nm_version,
                                            const char *env);
@@ -264,14 +280,32 @@ gboolean nm_utils_sysctl_ip_conf_is_path (int addr_family, const char *path, con
 
 gboolean nm_utils_is_specific_hostname (const char *name);
 
-char *nm_utils_machine_id_read (void);
-gboolean nm_utils_machine_id_parse (const char *id_str, /*uuid_t*/ guchar *out_uuid);
+struct _NMUuid;
+
+const char *nm_utils_machine_id_str (void);
+const struct _NMUuid *nm_utils_machine_id_bin (void);
+gboolean nm_utils_machine_id_is_fake (void);
 
-gboolean nm_utils_secret_key_get (const guint8 **out_secret_key,
-                                  gsize *out_key_len);
-gint64 nm_utils_secret_key_get_timestamp (void);
+const char *nm_utils_boot_id_str (void);
+const struct _NMUuid *nm_utils_boot_id_bin (void);
 
-const char *nm_utils_get_boot_id (void);
+gboolean nm_utils_host_id_get (const guint8 **out_host_id,
+                               gsize *out_host_id_len);
+gint64 nm_utils_host_id_get_timestamp_ns (void);
+
+/*****************************************************************************/
+
+int nm_utils_arp_type_detect_from_hwaddrlen (gsize hwaddr_len);
+
+gboolean nm_utils_arp_type_validate_hwaddr (int arp_type,
+                                            const guint8 *hwaddr,
+                                            gsize hwaddr_len);
+
+gboolean nm_utils_arp_type_get_hwaddr_relevant_part (int arp_type,
+                                                     const guint8 **hwaddr,
+                                                     gsize *hwaddr_len);
+
+/*****************************************************************************/
 
 /* IPv6 Interface Identifier helpers */
 
@@ -326,6 +360,7 @@ typedef enum {
 
 NMUtilsStableType nm_utils_stable_id_parse (const char *stable_id,
                                             const char *deviceid,
+                                            const char *hwaddr,
                                             const char *bootid,
                                             const char *uuid,
                                             char **out_generated);
@@ -338,8 +373,8 @@ gboolean nm_utils_ipv6_addr_set_stable_privacy_impl (NMUtilsStableType stable_ty
                                                      const char *ifname,
                                                      const char *network_id,
                                                      guint32 dad_counter,
-                                                     guint8 *secret_key,
-                                                     gsize key_len,
+                                                     guint8 *host_id,
+                                                     gsize host_id_len,
                                                      GError **error);
 
 gboolean nm_utils_ipv6_addr_set_stable_privacy (NMUtilsStableType id_type,
@@ -353,8 +388,8 @@ char *nm_utils_hw_addr_gen_random_eth (const char *current_mac_address,
                                        const char *generate_mac_address_mask);
 char *nm_utils_hw_addr_gen_stable_eth_impl (NMUtilsStableType stable_type,
                                             const char *stable_id,
-                                            const guint8 *secret_key,
-                                            gsize key_len,
+                                            const guint8 *host_id,
+                                            gsize host_id_len,
                                             const char *ifname,
                                             const char *current_mac_address,
                                             const char *generate_mac_address_mask);
@@ -364,6 +399,23 @@ char *nm_utils_hw_addr_gen_stable_eth (NMUtilsStableType stable_type,
                                        const char *current_mac_address,
                                        const char *generate_mac_address_mask);
 
+/*****************************************************************************/
+
+GBytes *nm_utils_dhcp_client_id_mac (int arp_type,
+                                     const guint8 *hwaddr,
+                                     gsize hwaddr_len);
+
+GBytes *nm_utils_dhcp_client_id_systemd_node_specific_full (gboolean legacy_unstable_byteorder,
+                                                            const guint8 *interface_id,
+                                                            gsize interface_id_len,
+                                                            const guint8 *machine_id,
+                                                            gsize machine_id_len);
+
+GBytes *nm_utils_dhcp_client_id_systemd_node_specific (gboolean legacy_unstable_byteorder,
+                                                       const char *ifname);
+
+/*****************************************************************************/
+
 void nm_utils_array_remove_at_indexes (GArray *array, const guint *indexes_to_delete, gsize len);
 
 void nm_utils_setpgid (gpointer unused);
diff --git a/src/nm-dbus-manager.c b/src/nm-dbus-manager.c
index ca7bde57..a5c7c12b 100644
--- a/src/nm-dbus-manager.c
+++ b/src/nm-dbus-manager.c
@@ -1538,6 +1538,18 @@ nm_dbus_manager_acquire_bus (NMDBusManager *self)
 		return FALSE;
 	}
 
+	registration_id = g_dbus_connection_register_object (connection,
+	                                                     OBJECT_MANAGER_SERVER_BASE_PATH,
+	                                                     NM_UNCONST_PTR (GDBusInterfaceInfo, &interface_info_objmgr),
+	                                                     &dbus_vtable_objmgr,
+	                                                     self,
+	                                                     NULL,
+	                                                     &error);
+	if (!registration_id) {
+		_LOGE ("failure to register object manager: %s", error->message);
+		return FALSE;
+	}
+
 	ret = _nm_dbus_proxy_call_sync (proxy,
 	                                "RequestName",
 	                                g_variant_new ("(su)",
@@ -1550,6 +1562,7 @@ nm_dbus_manager_acquire_bus (NMDBusManager *self)
 	if (!ret) {
 		_LOGE ("fatal failure to acquire D-Bus service \"%s"": %s",
 		       NM_DBUS_SERVICE, error->message);
+		g_dbus_connection_unregister_object(connection, registration_id);
 		return FALSE;
 	}
 
@@ -1557,18 +1570,7 @@ nm_dbus_manager_acquire_bus (NMDBusManager *self)
 	if (result != DBUS_REQUEST_NAME_REPLY_PRIMARY_OWNER) {
 		_LOGE ("fatal failure to acquire D-Bus service \"%s\" (%u). Service already taken",
 		       NM_DBUS_SERVICE, (guint) result);
-		return FALSE;
-	}
-
-	registration_id = g_dbus_connection_register_object (connection,
-	                                                     OBJECT_MANAGER_SERVER_BASE_PATH,
-	                                                     NM_UNCONST_PTR (GDBusInterfaceInfo, &interface_info_objmgr),
-	                                                     &dbus_vtable_objmgr,
-	                                                     self,
-	                                                     NULL,
-	                                                     &error);
-	if (!registration_id) {
-		_LOGE ("failure to register object manager: %s", error->message);
+		g_dbus_connection_unregister_object(connection, registration_id);
 		return FALSE;
 	}
 
diff --git a/src/nm-ip4-config.c b/src/nm-ip4-config.c
index 6604711c..ce7f7fc4 100644
--- a/src/nm-ip4-config.c
+++ b/src/nm-ip4-config.c
@@ -2996,29 +2996,19 @@ nm_ip4_config_hash (const NMIP4Config *self, GChecksum *sum, gboolean dns_only)
 gboolean
 nm_ip4_config_equal (const NMIP4Config *a, const NMIP4Config *b)
 {
-	GChecksum *a_checksum = g_checksum_new (G_CHECKSUM_SHA1);
-	GChecksum *b_checksum = g_checksum_new (G_CHECKSUM_SHA1);
-	guchar a_data[20], b_data[20];
-	gsize a_len = sizeof (a_data);
-	gsize b_len = sizeof (b_data);
-	gboolean equal;
+	nm_auto_free_checksum GChecksum *a_checksum = g_checksum_new (G_CHECKSUM_SHA1);
+	nm_auto_free_checksum GChecksum *b_checksum = g_checksum_new (G_CHECKSUM_SHA1);
+	guint8 a_data[NM_UTILS_CHECKSUM_LENGTH_SHA1];
+	guint8 b_data[NM_UTILS_CHECKSUM_LENGTH_SHA1];
 
 	if (a)
 		nm_ip4_config_hash (a, a_checksum, FALSE);
 	if (b)
 		nm_ip4_config_hash (b, b_checksum, FALSE);
 
-	g_checksum_get_digest (a_checksum, a_data, &a_len);
-	g_checksum_get_digest (b_checksum, b_data, &b_len);
-
-	nm_assert (a_len == sizeof (a_data));
-	nm_assert (b_len == sizeof (b_data));
-	equal = !memcmp (a_data, b_data, a_len);
-
-	g_checksum_free (a_checksum);
-	g_checksum_free (b_checksum);
-
-	return equal;
+	nm_utils_checksum_get_digest (a_checksum, a_data);
+	nm_utils_checksum_get_digest (b_checksum, b_data);
+	return !memcmp (a_data, b_data, sizeof (a_data));
 }
 
 /*****************************************************************************/
diff --git a/src/nm-ip6-config.c b/src/nm-ip6-config.c
index a8c4aecd..42240e69 100644
--- a/src/nm-ip6-config.c
+++ b/src/nm-ip6-config.c
@@ -2426,29 +2426,19 @@ nm_ip6_config_hash (const NMIP6Config *self, GChecksum *sum, gboolean dns_only)
 gboolean
 nm_ip6_config_equal (const NMIP6Config *a, const NMIP6Config *b)
 {
-	GChecksum *a_checksum = g_checksum_new (G_CHECKSUM_SHA1);
-	GChecksum *b_checksum = g_checksum_new (G_CHECKSUM_SHA1);
-	guchar a_data[20], b_data[20];
-	gsize a_len = sizeof (a_data);
-	gsize b_len = sizeof (b_data);
-	gboolean equal;
+	nm_auto_free_checksum GChecksum *a_checksum = g_checksum_new (G_CHECKSUM_SHA1);
+	nm_auto_free_checksum GChecksum *b_checksum = g_checksum_new (G_CHECKSUM_SHA1);
+	guint8 a_data[NM_UTILS_CHECKSUM_LENGTH_SHA1];
+	guint8 b_data[NM_UTILS_CHECKSUM_LENGTH_SHA1];
 
 	if (a)
 		nm_ip6_config_hash (a, a_checksum, FALSE);
 	if (b)
 		nm_ip6_config_hash (b, b_checksum, FALSE);
 
-	g_checksum_get_digest (a_checksum, a_data, &a_len);
-	g_checksum_get_digest (b_checksum, b_data, &b_len);
-
-	nm_assert (a_len == sizeof (a_data));
-	nm_assert (b_len == sizeof (b_data));
-	equal = !memcmp (a_data, b_data, a_len);
-
-	g_checksum_free (a_checksum);
-	g_checksum_free (b_checksum);
-
-	return equal;
+	nm_utils_checksum_get_digest (a_checksum, a_data);
+	nm_utils_checksum_get_digest (b_checksum, b_data);
+	return !memcmp (a_data, b_data, sizeof (a_data));
 }
 
 /*****************************************************************************/
diff --git a/src/nm-manager.c b/src/nm-manager.c
index 7598995d..3ddc3b92 100644
--- a/src/nm-manager.c
+++ b/src/nm-manager.c
@@ -1596,7 +1596,12 @@ again:
 static gboolean
 device_is_wake_on_lan (NMPlatform *platform, NMDevice *device)
 {
-	return nm_platform_link_get_wake_on_lan (platform, nm_device_get_ip_ifindex (device));
+	int ifindex;
+
+	ifindex = nm_device_get_ip_ifindex (device);
+	if (ifindex <= 0)
+		return FALSE;
+	return nm_platform_link_get_wake_on_lan (platform, ifindex);
 }
 
 static void
@@ -2816,18 +2821,21 @@ device_connectivity_changed (NMDevice *device,
 
 	best_state = nm_device_get_connectivity_state (device);
 	if (best_state < NM_CONNECTIVITY_FULL) {
+		/* FIXME: is this really correct, to considere devices that don't have
+		 * (the best) default route for connectivity checking? */
 		c_list_for_each_entry (dev, &priv->devices_lst_head, devices_lst) {
 			state = nm_device_get_connectivity_state (dev);
-			if (state <= best_state)
+			if (nm_connectivity_state_cmp (state, best_state) <= 0)
 				continue;
 			best_state = state;
-			if (best_state >= NM_CONNECTIVITY_FULL) {
+			if (nm_connectivity_state_cmp (best_state, NM_CONNECTIVITY_FULL) >= 0) {
 				/* it doesn't get better than this. */
 				break;
 			}
 		}
 	}
 	nm_assert (best_state <= NM_CONNECTIVITY_FULL);
+	nm_assert (nm_connectivity_state_cmp (best_state, NM_CONNECTIVITY_FULL) <= 0);
 
 	if (best_state != priv->connectivity_state) {
 		priv->connectivity_state = best_state;
diff --git a/src/nm-policy.c b/src/nm-policy.c
index 7f8c665c..a5960105 100644
--- a/src/nm-policy.c
+++ b/src/nm-policy.c
@@ -1751,17 +1751,14 @@ device_state_changed (NMDevice *device,
 	NMSettingConnection *s_con = NULL;
 
 	switch (nm_device_state_reason_check (reason)) {
-	case NM_DEVICE_STATE_REASON_GSM_REGISTRATION_DENIED:
-	case NM_DEVICE_STATE_REASON_GSM_REGISTRATION_NOT_SEARCHING:
-	case NM_DEVICE_STATE_REASON_GSM_SIM_NOT_INSERTED:
 	case NM_DEVICE_STATE_REASON_GSM_SIM_PIN_REQUIRED:
 	case NM_DEVICE_STATE_REASON_GSM_SIM_PUK_REQUIRED:
-	case NM_DEVICE_STATE_REASON_GSM_SIM_WRONG:
 	case NM_DEVICE_STATE_REASON_SIM_PIN_INCORRECT:
-	case NM_DEVICE_STATE_REASON_MODEM_INIT_FAILED:
 	case NM_DEVICE_STATE_REASON_GSM_APN_FAILED:
-		/* Block autoconnect of the just-failed connection for situations
-		 * where a retry attempt would just fail again.
+		/* Block autoconnection at settings level if there is any settings-specific
+		 * error reported by the modem (e.g. wrong SIM-PIN or wrong APN). Do not block
+		 * autoconnection at settings level for errors in the device domain (e.g.
+		 * a missing SIM or wrong modem initialization).
 		 */
 		if (sett_conn) {
 			nm_settings_connection_autoconnect_blocked_reason_set (sett_conn,
diff --git a/src/nm-test-utils-core.h b/src/nm-test-utils-core.h
index 5e89cb39..dbfe71ad 100644
--- a/src/nm-test-utils-core.h
+++ b/src/nm-test-utils-core.h
@@ -88,8 +88,8 @@ nmtst_platform_ip4_address_full (const char *address, const char *peer_address,
 {
 	NMPlatformIP4Address *addr = nmtst_platform_ip4_address (address, peer_address, plen);
 
-	G_STATIC_ASSERT (IFNAMSIZ == sizeof (addr->label));
-	g_assert (!label || strlen (label) < IFNAMSIZ);
+	G_STATIC_ASSERT (NMP_IFNAMSIZ == sizeof (addr->label));
+	g_assert (!label || strlen (label) < NMP_IFNAMSIZ);
 
 	addr->ifindex = ifindex;
 	addr->addr_source = source;
diff --git a/src/platform/nm-fake-platform.c b/src/platform/nm-fake-platform.c
index 82f9e2fb..ef69b391 100644
--- a/src/platform/nm-fake-platform.c
+++ b/src/platform/nm-fake-platform.c
@@ -26,6 +26,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 
 #include "nm-utils.h"
diff --git a/src/platform/nm-linux-platform.c b/src/platform/nm-linux-platform.c
index e73d5d8c..c0224fff 100644
--- a/src/platform/nm-linux-platform.c
+++ b/src/platform/nm-linux-platform.c
@@ -2031,7 +2031,7 @@ _wireguard_update_from_peers_nla (CList *peers,
 			}
 		}
 		if (tb[WGPEER_A_PERSISTENT_KEEPALIVE_INTERVAL])
-			peer_c->data.persistent_keepalive_interval = nla_get_u64 (tb[WGPEER_A_PERSISTENT_KEEPALIVE_INTERVAL]);
+			peer_c->data.persistent_keepalive_interval = nla_get_u16 (tb[WGPEER_A_PERSISTENT_KEEPALIVE_INTERVAL]);
 		if (tb[WGPEER_A_LAST_HANDSHAKE_TIME])
 			nla_memcpy (&peer_c->data.last_handshake_time, tb[WGPEER_A_LAST_HANDSHAKE_TIME], sizeof (peer_c->data.last_handshake_time));
 		if (tb[WGPEER_A_RX_BYTES])
@@ -5737,12 +5737,13 @@ static gboolean
 link_set_sriov_params (NMPlatform *platform,
                        int ifindex,
                        guint num_vfs,
-                       int autoprobe)
+                       NMTernary autoprobe)
 {
 	nm_auto_pop_netns NMPNetns *netns = NULL;
 	nm_auto_close int dirfd = -1;
-	gboolean current_autoprobe;
-	guint total, current_num;
+	int current_autoprobe;
+	guint total;
+	gint64 current_num;
 	char ifname[IFNAMSIZ];
 	char buf[64];
 
@@ -5775,14 +5776,14 @@ link_set_sriov_params (NMPlatform *platform,
 	                                                  NMP_SYSCTL_PATHID_NETDIR (dirfd,
 	                                                                            ifname,
 	                                                                            "device/sriov_numvfs"),
-	                                                  10, 0, G_MAXUINT, 0);
+	                                                  10, 0, G_MAXUINT, -1);
 	current_autoprobe = nm_platform_sysctl_get_int_checked (platform,
 	                                                        NMP_SYSCTL_PATHID_NETDIR (dirfd,
 	                                                                                  ifname,
 	                                                                                  "device/sriov_drivers_autoprobe"),
-	                                                        10, 0, G_MAXUINT, 0);
+	                                                        10, 0, 1, -1);
 	if (   current_num == num_vfs
-	    && (autoprobe == -1 || current_autoprobe == autoprobe))
+	    && (autoprobe == NM_TERNARY_DEFAULT || current_autoprobe == autoprobe))
 		return TRUE;
 
 	if (current_num != 0) {
@@ -5800,14 +5801,14 @@ link_set_sriov_params (NMPlatform *platform,
 	if (num_vfs == 0)
 		return TRUE;
 
-	if (   autoprobe >= 0
+	if (   NM_IN_SET (autoprobe, NM_TERNARY_TRUE, NM_TERNARY_FALSE)
 	    && current_autoprobe != autoprobe
 	    && !nm_platform_sysctl_set (NM_PLATFORM_GET,
 	                                NMP_SYSCTL_PATHID_NETDIR (dirfd,
 	                                                          ifname,
 	                                                          "device/sriov_drivers_autoprobe"),
-	                                nm_sprintf_buf (buf, "%d", autoprobe))) {
-		_LOGW ("link: couldn't set SR-IOV drivers-autoprobe to %d: %s", autoprobe, strerror (errno));
+	                                nm_sprintf_buf (buf, "%d", (int) autoprobe))) {
+		_LOGW ("link: couldn't set SR-IOV drivers-autoprobe to %d: %s", (int) autoprobe, strerror (errno));
 		return FALSE;
 	}
 
@@ -7044,7 +7045,7 @@ ip6_address_add (NMPlatform *platform,
 	                             ifindex,
 	                             &addr,
 	                             plen,
-	                             &peer_addr,
+	                             IN6_IS_ADDR_UNSPECIFIED (&peer_addr) ? NULL : &peer_addr,
 	                             flags,
 	                             RT_SCOPE_UNIVERSE,
 	                             lifetime,
diff --git a/src/platform/nm-platform-utils.c b/src/platform/nm-platform-utils.c
index 216b1547..cc43b27f 100644
--- a/src/platform/nm-platform-utils.c
+++ b/src/platform/nm-platform-utils.c
@@ -29,6 +29,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
diff --git a/src/platform/nm-platform.c b/src/platform/nm-platform.c
index 7ddcf41a..757a0f43 100644
--- a/src/platform/nm-platform.c
+++ b/src/platform/nm-platform.c
@@ -31,6 +31,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -1192,13 +1193,29 @@ nm_platform_link_refresh (NMPlatform *self, int ifindex)
 	return TRUE;
 }
 
-static guint
-_link_get_flags (NMPlatform *self, int ifindex)
+int
+nm_platform_link_get_ifi_flags (NMPlatform *self,
+                                int ifindex,
+                                guint requested_flags)
 {
 	const NMPlatformLink *pllink;
 
-	pllink = nm_platform_link_get (self, ifindex);
-	return pllink ? pllink->n_ifi_flags : IFF_NOARP;
+	_CHECK_SELF (self, klass, -EINVAL);
+
+	if (ifindex <= 0)
+		return -EINVAL;
+
+	/* include invisible links (only in netlink, not udev). */
+	pllink = NMP_OBJECT_CAST_LINK (nm_platform_link_get_obj (self, ifindex, FALSE));
+	if (!pllink)
+		return -ENODEV;
+
+	/* Errors are signaled as negative values. That means, you cannot request
+	 * the most significant bit (2^31) with this API. Assert against that. */
+	nm_assert ((int) requested_flags >= 0);
+	nm_assert (requested_flags < (guint) G_MAXINT);
+
+	return (int) (pllink->n_ifi_flags & requested_flags);
 }
 
 /**
@@ -1211,9 +1228,7 @@ _link_get_flags (NMPlatform *self, int ifindex)
 gboolean
 nm_platform_link_is_up (NMPlatform *self, int ifindex)
 {
-	_CHECK_SELF (self, klass, FALSE);
-
-	return NM_FLAGS_HAS (_link_get_flags (self, ifindex), IFF_UP);
+	return nm_platform_link_get_ifi_flags (self, ifindex, IFF_UP) == IFF_UP;
 }
 
 /**
@@ -1244,9 +1259,15 @@ nm_platform_link_is_connected (NMPlatform *self, int ifindex)
 gboolean
 nm_platform_link_uses_arp (NMPlatform *self, int ifindex)
 {
-	_CHECK_SELF (self, klass, FALSE);
+	int f;
+
+	f = nm_platform_link_get_ifi_flags (self, ifindex, IFF_NOARP);
 
-	return !NM_FLAGS_HAS (_link_get_flags (self, ifindex), IFF_NOARP);
+	if (f < 0)
+		return FALSE;
+	if (f == IFF_NOARP)
+		return FALSE;
+	return TRUE;
 }
 
 /**
@@ -1468,25 +1489,25 @@ nm_platform_link_supports_sriov (NMPlatform *self, int ifindex)
  * @self: platform instance
  * @ifindex: the index of the interface to change
  * @num_vfs: the number of VFs to create
- * @autoprobe: -1 to keep the current autoprobe-drivers value,
- *   or {0,1} to set a new value
+ * @autoprobe: the new autoprobe-drivers value (pass
+ *     %NM_TERNARY_DEFAULT to keep current value)
  */
 gboolean
 nm_platform_link_set_sriov_params (NMPlatform *self,
                                    int ifindex,
                                    guint num_vfs,
-                                   int autoprobe)
+                                   NMTernary autoprobe)
 {
 	_CHECK_SELF (self, klass, FALSE);
 
 	g_return_val_if_fail (ifindex > 0, FALSE);
-	g_return_val_if_fail (NM_IN_SET (autoprobe, -1, 0, 1), FALSE);
 
 	_LOGD ("link: setting %u total VFs and autoprobe %d for %s (%d)",
 	       num_vfs,
-	       autoprobe,
+	       (int) autoprobe,
 	       nm_strquote_a (25, nm_platform_link_get_name (self, ifindex)),
 	       ifindex);
+
 	return klass->link_set_sriov_params (self, ifindex, num_vfs, autoprobe);
 }
 
diff --git a/src/platform/nm-platform.h b/src/platform/nm-platform.h
index 11495aff..7e91f1f3 100644
--- a/src/platform/nm-platform.h
+++ b/src/platform/nm-platform.h
@@ -21,12 +21,6 @@
 #ifndef __NETWORKMANAGER_PLATFORM_H__
 #define __NETWORKMANAGER_PLATFORM_H__
 
-#include 
-#include 
-#include 
-#include 
-#include 
-
 #include "nm-dbus-interface.h"
 #include "nm-core-types-internal.h"
 
@@ -53,6 +47,12 @@
 
 /*****************************************************************************/
 
+/* IFNAMSIZ is both defined in  and . In the past, these
+ * headers conflicted, so we cannot simply include either of them in a header-file.*/
+#define NMP_IFNAMSIZ 16
+
+/*****************************************************************************/
+
 struct udev_device;
 
 typedef gboolean (*NMPObjectPredicateFunc) (const NMPObject *obj,
@@ -208,7 +208,7 @@ typedef enum {
 
 struct _NMPlatformLink {
 	__NMPlatformObject_COMMON;
-	char name[IFNAMSIZ];
+	char name[NMP_IFNAMSIZ];
 	NMLinkType type;
 
 	/* rtnl_link_get_type(), IFLA_INFO_KIND. */
@@ -355,7 +355,7 @@ struct _NMPlatformIP4Address {
 	 * */
 	in_addr_t peer_address;  /* PTP peer address */
 
-	char label[IFNAMSIZ];
+	char label[NMP_IFNAMSIZ];
 };
 
 /**
@@ -1105,12 +1105,12 @@ const char *nm_platform_error_to_string (NMPlatformError error,
 	((const char *) NULL), -1, (path)
 
 #define NMP_SYSCTL_PATHID_NETDIR_unsafe(dirfd, ifname, path) \
-	nm_sprintf_bufa (NM_STRLEN ("net:/sys/class/net//\0") + IFNAMSIZ + strlen (path), \
+	nm_sprintf_bufa (NM_STRLEN ("net:/sys/class/net//\0") + NMP_IFNAMSIZ + strlen (path), \
 	                 "net:/sys/class/net/%s/%s", (ifname), (path)), \
 	(dirfd), (path)
 
 #define NMP_SYSCTL_PATHID_NETDIR(dirfd, ifname, path) \
-	nm_sprintf_bufa (NM_STRLEN ("net:/sys/class/net//"path"/\0") + IFNAMSIZ, \
+	nm_sprintf_bufa (NM_STRLEN ("net:/sys/class/net//"path"/\0") + NMP_IFNAMSIZ, \
 	                 "net:/sys/class/net/%s/%s", (ifname), path), \
 	(dirfd), (""path"")
 
@@ -1165,6 +1165,7 @@ int nm_platform_link_get_ifindex (NMPlatform *self, const char *name);
 const char *nm_platform_link_get_name (NMPlatform *self, int ifindex);
 NMLinkType nm_platform_link_get_type (NMPlatform *self, int ifindex);
 gboolean nm_platform_link_is_software (NMPlatform *self, int ifindex);
+int nm_platform_link_get_ifi_flags (NMPlatform *self, int ifindex, guint requested_flags);
 gboolean nm_platform_link_is_up (NMPlatform *self, int ifindex);
 gboolean nm_platform_link_is_connected (NMPlatform *self, int ifindex);
 gboolean nm_platform_link_uses_arp (NMPlatform *self, int ifindex);
diff --git a/src/platform/nmp-object.c b/src/platform/nmp-object.c
index fdc27440..f7fa6cb3 100644
--- a/src/platform/nmp-object.c
+++ b/src/platform/nmp-object.c
@@ -24,6 +24,7 @@
 
 #include 
 #include 
+#include 
 #include 
 
 #include "nm-utils.h"
diff --git a/src/platform/tests/test-common.c b/src/platform/tests/test-common.c
index 3dedbd10..1cb2f516 100644
--- a/src/platform/tests/test-common.c
+++ b/src/platform/tests/test-common.c
@@ -787,8 +787,6 @@ nmtstp_ip_address_assert_lifetime (const NMPlatformIPAddress *addr,
 		if (lft == NM_PLATFORM_LIFETIME_PERMANENT)
 			g_assert_cmpint (adr, ==, NM_PLATFORM_LIFETIME_PERMANENT);
 		else {
-			g_assert_cmpint (adr, <=, lft);
-			g_assert_cmpint (offset, <=, adr);
 			g_assert_cmpint (adr - offset, <=, lft + CHECK_LIFETIME_MAX_DIFF);
 			g_assert_cmpint (adr - offset, >=, lft - CHECK_LIFETIME_MAX_DIFF);
 		}
diff --git a/src/platform/tests/test-common.h b/src/platform/tests/test-common.h
index 1baadfa1..7e81baea 100644
--- a/src/platform/tests/test-common.h
+++ b/src/platform/tests/test-common.h
@@ -21,6 +21,9 @@
 #include 
 #include 
 #include 
+#include 
+#include 
+#include 
 
 #include "platform/nm-platform.h"
 #include "platform/nmp-object.h"
diff --git a/src/platform/wifi/nm-wifi-utils-nl80211.c b/src/platform/wifi/nm-wifi-utils-nl80211.c
index b3bb2bb6..39e3f971 100644
--- a/src/platform/wifi/nm-wifi-utils-nl80211.c
+++ b/src/platform/wifi/nm-wifi-utils-nl80211.c
@@ -30,6 +30,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include "platform/nm-netlink.h"
 #include "nm-wifi-utils-private.h"
diff --git a/src/platform/wpan/nm-wpan-utils.c b/src/platform/wpan/nm-wpan-utils.c
index 0544539a..882c4eec 100644
--- a/src/platform/wpan/nm-wpan-utils.c
+++ b/src/platform/wpan/nm-wpan-utils.c
@@ -21,6 +21,8 @@
 
 #include "nm-wpan-utils.h"
 
+#include 
+
 #include "platform/linux/nl802154.h"
 #include "platform/nm-netlink.h"
 
diff --git a/src/settings/nm-settings-connection.c b/src/settings/nm-settings-connection.c
index 4c25d0e9..6f47e14d 100644
--- a/src/settings/nm-settings-connection.c
+++ b/src/settings/nm-settings-connection.c
@@ -640,7 +640,9 @@ nm_settings_connection_update (NMSettingsConnection *self,
 	gboolean replaced = FALSE;
 	gs_free char *logmsg_change = NULL;
 	GError *local = NULL;
+	gs_unref_object NMConnection *simple = NULL;
 	gs_unref_variant GVariant *con_agent_secrets = NULL;
+	gs_unref_variant GVariant *new_agent_secrets = NULL;
 
 	g_return_val_if_fail (NM_IS_SETTINGS_CONNECTION (self), FALSE);
 
@@ -681,6 +683,16 @@ nm_settings_connection_update (NMSettingsConnection *self,
 
 	replace_connection = reread_connection ?: new_connection;
 
+	/* Save agent-owned secrets from the new connection for later use */
+	if (new_connection) {
+		simple = nm_simple_connection_new_clone (new_connection);
+		nm_connection_clear_secrets_with_flags (simple,
+		                                        secrets_filter_cb,
+		                                        GUINT_TO_POINTER (NM_SETTING_SECRET_FLAG_AGENT_OWNED));
+		new_agent_secrets = nm_connection_to_dbus (simple, NM_CONNECTION_SERIALIZE_ONLY_SECRETS);
+		g_clear_object (&simple);
+	}
+
 	/* Disconnect the changed signal to ensure we don't set Unsaved when
 	 * it's not required.
 	 */
@@ -691,7 +703,6 @@ nm_settings_connection_update (NMSettingsConnection *self,
 	    && !nm_connection_compare (nm_settings_connection_get_connection (self),
 	                               replace_connection,
 	                               NM_SETTING_COMPARE_FLAG_EXACT)) {
-		gs_unref_object NMConnection *simple = NULL;
 
 		if (log_diff_name) {
 			nm_utils_log_connection_diff (replace_connection, nm_settings_connection_get_connection (self), LOGL_DEBUG, LOGD_CORE, log_diff_name, "++ ",
@@ -738,6 +749,15 @@ nm_settings_connection_update (NMSettingsConnection *self,
 			(void) nm_connection_update_secrets (nm_settings_connection_get_connection (self), NULL, con_agent_secrets, NULL);
 	}
 
+	/* Apply agent-owned secrets from the new connection so that
+	 * they can be sent to agents */
+	if (new_agent_secrets) {
+		(void) nm_connection_update_secrets (nm_settings_connection_get_connection (self),
+		                                     NULL,
+		                                     new_agent_secrets,
+		                                     NULL);
+	}
+
 	nm_settings_connection_recheck_visibility (self);
 
 	if (   replaced
diff --git a/src/settings/plugins/ibft/tests/iscsiadm-test-bad-dns1 b/src/settings/plugins/ibft/tests/iscsiadm-test-bad-dns1
new file mode 100755
index 00000000..54f02da6
--- /dev/null
+++ b/src/settings/plugins/ibft/tests/iscsiadm-test-bad-dns1
@@ -0,0 +1,21 @@
+#!/bin/bash
+
+cat << EOF
+# BEGIN RECORD
+iface.initiatorname = iqn.pjones6
+iface.hwaddress = 00:33:21:98:b9:f0
+iface.bootproto = STATIC
+iface.ipaddress = 192.168.32.72
+iface.subnet_mask = 255.255.252.0
+iface.gateway = 192.168.35.254
+iface.primary_dns = 10000.500.250.1
+iface.secondary_dns = 10.16.255.3
+iface.vlan_id = 0
+iface.net_ifacename = eth0
+node.name = iqn.0.2008-11.com.blahblah:iscsi0
+node.conn[0].address = 10.16.52.16
+node.conn[0].port = 3260
+node.boot_lun = 00000000
+# END RECORD
+EOF
+
diff --git a/src/settings/plugins/ibft/tests/iscsiadm-test-bad-dns2 b/src/settings/plugins/ibft/tests/iscsiadm-test-bad-dns2
new file mode 100755
index 00000000..ebd7a9ca
--- /dev/null
+++ b/src/settings/plugins/ibft/tests/iscsiadm-test-bad-dns2
@@ -0,0 +1,21 @@
+#!/bin/bash
+
+cat << EOF
+# BEGIN RECORD
+iface.initiatorname = iqn.pjones6
+iface.hwaddress = 00:33:21:98:b9:f0
+iface.bootproto = STATIC
+iface.ipaddress = 192.168.32.72
+iface.subnet_mask = 255.255.252.0
+iface.gateway = 192.168.35.254
+iface.primary_dns = 10.16.255.2
+iface.secondary_dns = blah.foo.bar.baz
+iface.vlan_id = 0
+iface.net_ifacename = eth0
+node.name = iqn.0.2008-11.com.blahblah:iscsi0
+node.conn[0].address = 10.16.52.16
+node.conn[0].port = 3260
+node.boot_lun = 00000000
+# END RECORD
+EOF
+
diff --git a/src/settings/plugins/ibft/tests/iscsiadm-test-bad-entry b/src/settings/plugins/ibft/tests/iscsiadm-test-bad-entry
new file mode 100755
index 00000000..4e326048
--- /dev/null
+++ b/src/settings/plugins/ibft/tests/iscsiadm-test-bad-entry
@@ -0,0 +1,20 @@
+#!/bin/bash
+
+cat << EOF
+# BEGIN RECORD
+iface.initiatorname = iqn.pjones6
+iface.hwaddress = 00:33:21:98:b9:f0
+iface.bootproto = STATIC
+iface.ipaddress 192.168.32.72
+iface.subnet_mask = 255.255.252.0
+iface.gateway = 192.168.35.254
+iface.primary_dns = 10.16.255.2
+iface.secondary_dns = 10.16.255.3
+iface.vlan_id = 0
+iface.net_ifacename = eth0
+node.name = iqn.0.2008-11.com.blahblah:iscsi0
+node.conn[0].address = 10.16.52.16
+node.conn[0].port = 3260
+node.boot_lun = 00000000
+# END RECORD
+
diff --git a/src/settings/plugins/ibft/tests/iscsiadm-test-bad-gateway b/src/settings/plugins/ibft/tests/iscsiadm-test-bad-gateway
new file mode 100755
index 00000000..5390a6c3
--- /dev/null
+++ b/src/settings/plugins/ibft/tests/iscsiadm-test-bad-gateway
@@ -0,0 +1,21 @@
+#!/bin/bash
+
+cat << EOF
+# BEGIN RECORD
+iface.initiatorname = iqn.pjones6
+iface.hwaddress = 00:33:21:98:b9:f0
+iface.bootproto = STATIC
+iface.ipaddress = 192.168.32.72
+iface.subnet_mask = 255.255.252.0
+iface.gateway = bb.cc.dd.ee
+iface.primary_dns = 10.16.255.2
+iface.secondary_dns = 10.16.255.3
+iface.vlan_id = 0
+iface.net_ifacename = eth0
+node.name = iqn.0.2008-11.com.blahblah:iscsi0
+node.conn[0].address = 10.16.52.16
+node.conn[0].port = 3260
+node.boot_lun = 00000000
+# END RECORD
+EOF
+
diff --git a/src/settings/plugins/ibft/tests/iscsiadm-test-bad-ipaddr b/src/settings/plugins/ibft/tests/iscsiadm-test-bad-ipaddr
new file mode 100755
index 00000000..b41cd1f1
--- /dev/null
+++ b/src/settings/plugins/ibft/tests/iscsiadm-test-bad-ipaddr
@@ -0,0 +1,21 @@
+#!/bin/bash
+
+cat << EOF
+# BEGIN RECORD
+iface.initiatorname = iqn.pjones6
+iface.hwaddress = 00:33:21:98:b9:f0
+iface.bootproto = STATIC
+iface.ipaddress = aa.bb.cc.dd
+iface.subnet_mask = 255.255.252.0
+iface.gateway = 192.168.35.254
+iface.primary_dns = 10.16.255.2
+iface.secondary_dns = 10.16.255.3
+iface.vlan_id = 0
+iface.net_ifacename = eth0
+node.name = iqn.0.2008-11.com.blahblah:iscsi0
+node.conn[0].address = 10.16.52.16
+node.conn[0].port = 3260
+node.boot_lun = 00000000
+# END RECORD
+EOF
+
diff --git a/src/settings/plugins/ibft/tests/iscsiadm-test-bad-record b/src/settings/plugins/ibft/tests/iscsiadm-test-bad-record
new file mode 100755
index 00000000..22b34e6f
--- /dev/null
+++ b/src/settings/plugins/ibft/tests/iscsiadm-test-bad-record
@@ -0,0 +1,18 @@
+#!/bin/bash
+
+cat << EOF
+# BEGIN RECORD
+iface.initiatorname = iqn.pjones6
+iface.hwaddress = 00:33:21:98:b9:f0
+iface.bootproto = DHCP
+iface.gateway = 10.16.52.254
+iface.primary_dns = 10.16.255.2
+iface.secondary_dns = 10.16.255.3
+iface.vlan_id = 0
+iface.net_ifacename = eth0
+node.name = iqn.0.2008-11.com.blahblah:iscsi0
+node.conn[0].address = 10.16.52.16
+node.conn[0].port = 3260
+node.boot_lun = 00000000
+EOF
+
diff --git a/src/settings/plugins/ibft/tests/iscsiadm-test-dhcp b/src/settings/plugins/ibft/tests/iscsiadm-test-dhcp
new file mode 100755
index 00000000..556b0586
--- /dev/null
+++ b/src/settings/plugins/ibft/tests/iscsiadm-test-dhcp
@@ -0,0 +1,33 @@
+#!/bin/bash
+
+cat << EOF
+# BEGIN RECORD
+iface.initiatorname = iqn.pjones6
+iface.hwaddress = 00:33:21:98:b9:f0
+iface.bootproto = DHCP
+iface.gateway = 10.16.52.254
+iface.primary_dns = 10.16.255.2
+iface.secondary_dns = 10.16.255.3
+iface.vlan_id = 0
+iface.net_ifacename = eth0
+node.name = iqn.0.2008-11.com.blahblah:iscsi0
+node.conn[0].address = 10.16.52.16
+node.conn[0].port = 3260
+node.boot_lun = 00000000
+# END RECORD
+# BEGIN RECORD
+iface.initiatorname = iqn.pjones6
+iface.hwaddress = 00:33:21:98:b9:f1
+iface.bootproto = DHCP
+iface.gateway = 10.16.52.254
+iface.primary_dns = 10.16.255.2
+iface.secondary_dns = 10.16.255.3
+iface.vlan_id = 0
+iface.net_ifacename = eth1
+node.name = iqn.1.2008-11.com.blahblah:iscsi1
+node.conn[0].address = 10.16.52.16
+node.conn[0].port = 3260
+node.boot_lun = 00000000
+# END RECORD
+EOF
+
diff --git a/src/settings/plugins/ibft/tests/iscsiadm-test-static b/src/settings/plugins/ibft/tests/iscsiadm-test-static
new file mode 100755
index 00000000..51711480
--- /dev/null
+++ b/src/settings/plugins/ibft/tests/iscsiadm-test-static
@@ -0,0 +1,35 @@
+#!/bin/bash
+
+cat << EOF
+# BEGIN RECORD
+iface.initiatorname = iqn.pjones6
+iface.hwaddress = 00:33:21:98:b9:f0
+iface.bootproto = STATIC
+iface.ipaddress = 192.168.32.72
+iface.subnet_mask = 255.255.252.0
+iface.gateway = 192.168.35.254
+iface.primary_dns = 10.16.255.2
+iface.secondary_dns = 10.16.255.3
+iface.vlan_id = 0
+iface.net_ifacename = eth0
+node.name = iqn.0.2008-11.com.blahblah:iscsi0
+node.conn[0].address = 10.16.52.16
+node.conn[0].port = 3260
+node.boot_lun = 00000000
+# END RECORD
+# BEGIN RECORD
+iface.initiatorname = iqn.pjones6
+iface.hwaddress = 00:33:21:98:b9:f1
+iface.bootproto = DHCP
+iface.gateway = 10.16.52.254
+iface.primary_dns = 10.16.255.2
+iface.secondary_dns = 10.16.255.3
+iface.vlan_id = 0
+iface.net_ifacename = eth1
+node.name = iqn.1.2008-11.com.blahblah:iscsi1
+node.conn[0].address = 10.16.52.16
+node.conn[0].port = 3260
+node.boot_lun = 00000000
+# END RECORD
+EOF
+
diff --git a/src/settings/plugins/ibft/tests/iscsiadm-test-vlan b/src/settings/plugins/ibft/tests/iscsiadm-test-vlan
new file mode 100755
index 00000000..59b80bd0
--- /dev/null
+++ b/src/settings/plugins/ibft/tests/iscsiadm-test-vlan
@@ -0,0 +1,19 @@
+#!/bin/bash
+
+cat << EOF
+# BEGIN RECORD 6.2.0.873-21
+iface.initiatorname = iqn.2010-04.org.ipxe:d05faa97-c4be-44f6-a723-efde9aa399a0
+iface.transport_name = tcp
+iface.hwaddress = 00:33:21:98:b9:f0
+iface.bootproto = STATIC
+iface.ipaddress = 192.168.6.200
+iface.subnet_mask = 255.255.255.0
+iface.vlan_id = 123
+iface.net_ifacename = eth0
+node.name = iqn.2003-01.org.x:disk1
+node.conn[0].address = 192.168.6.32
+node.conn[0].port = 3260
+node.boot_lun = 01000000
+# END RECORD
+EOF
+
diff --git a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c b/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c
index 09a37991..261dfea2 100644
--- a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c
+++ b/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c
@@ -189,7 +189,7 @@ _secret_password_raw_to_bytes (const char *ifcfg_key,
 		password_raw += 2;
 
 	secret = nm_secret_buf_new (strlen (password_raw) / 2 + 3);
-	if (!_nm_utils_str2bin_full (password_raw, FALSE, ":", secret->bin, secret->len, &len)) {
+	if (!_nm_utils_hexstr2bin_full (password_raw, FALSE, FALSE, ":", 0, secret->bin, secret->len, &len)) {
 		g_set_error (error, NM_SETTINGS_ERROR, NM_SETTINGS_ERROR_INVALID_CONNECTION,
 		             "Invalid hex password in %s",
 		             ifcfg_key);
@@ -2226,20 +2226,19 @@ make_sriov_setting (shvarFile *ifcfg)
 {
 	gs_unref_hashtable GHashTable *keys = NULL;
 	gs_unref_ptrarray GPtrArray *vfs = NULL;
-	NMTernary autoprobe_drivers;
+	int autoprobe_drivers;
 	NMSettingSriov *s_sriov;
-	int total_vfs;
+	gint64 total_vfs;
 
-	total_vfs = svGetValueInt64 (ifcfg, "SRIOV_TOTAL_VFS", 10, 0, G_MAXINT32, 0);
-	if (!total_vfs)
-		return NULL;
+
+	total_vfs = svGetValueInt64 (ifcfg, "SRIOV_TOTAL_VFS", 10, 0, G_MAXUINT32, -1);
 
 	autoprobe_drivers = svGetValueInt64 (ifcfg,
 	                                     "SRIOV_AUTOPROBE_DRIVERS",
 	                                     10,
-	                                     NM_TERNARY_FALSE,
+	                                     NM_TERNARY_DEFAULT,
 	                                     NM_TERNARY_TRUE,
-	                                     NM_TERNARY_DEFAULT);
+	                                     -2);
 
 	keys = svGetKeys (ifcfg, SV_KEY_TYPE_SRIOV_VF);
 	if (keys) {
@@ -2261,7 +2260,7 @@ make_sriov_setting (shvarFile *ifcfg)
 
 			key += NM_STRLEN ("SRIOV_VF");
 
-			vf = _nm_utils_sriov_vf_from_strparts (key, value, &error);
+			vf = _nm_utils_sriov_vf_from_strparts (key, value, TRUE, &error);
 			if (!vf) {
 				PARSE_WARNING ("ignoring invalid SR-IOV VF '%s %s': %s",
 				               key, value, error->message);
@@ -2273,11 +2272,21 @@ make_sriov_setting (shvarFile *ifcfg)
 		}
 	}
 
+	/* Create the setting when at least one key is set */
+	if (   total_vfs < 0
+	    && !vfs
+	    && autoprobe_drivers < NM_TERNARY_DEFAULT)
+		return NULL;
+
 	s_sriov = (NMSettingSriov *) nm_setting_sriov_new ();
+
+	autoprobe_drivers = NM_MAX (autoprobe_drivers, NM_TERNARY_DEFAULT);
+	total_vfs = NM_MAX (total_vfs, 0);
+
 	g_object_set (s_sriov,
-	              NM_SETTING_SRIOV_TOTAL_VFS, total_vfs,
+	              NM_SETTING_SRIOV_TOTAL_VFS, (guint) total_vfs,
 	              NM_SETTING_SRIOV_VFS, vfs,
-	              NM_SETTING_SRIOV_AUTOPROBE_DRIVERS, (int) autoprobe_drivers,
+	              NM_SETTING_SRIOV_AUTOPROBE_DRIVERS, autoprobe_drivers,
 	              NULL);
 
 	return (NMSetting *) s_sriov;
diff --git a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.c b/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.c
index b70690cc..f5be7520 100644
--- a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.c
+++ b/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.c
@@ -2223,16 +2223,15 @@ write_sriov_setting (NMConnection *connection, shvarFile *ifcfg)
 
 	svUnsetAll (ifcfg, SV_KEY_TYPE_SRIOV_VF);
 
-	s_sriov = NM_SETTING_SRIOV (nm_connection_get_setting (connection, NM_TYPE_SETTING_SRIOV));
-	if (s_sriov)
-		num = nm_setting_sriov_get_total_vfs (s_sriov);
-	if (num == 0) {
+	s_sriov = NM_SETTING_SRIOV (nm_connection_get_setting (connection,
+	                                                       NM_TYPE_SETTING_SRIOV));
+	if (!s_sriov) {
 		svUnsetValue (ifcfg, "SRIOV_TOTAL_VFS");
 		svUnsetValue (ifcfg, "SRIOV_AUTOPROBE_DRIVERS");
 		return;
 	}
 
-	svSetValueInt64 (ifcfg, "SRIOV_TOTAL_VFS", num);
+	svSetValueInt64 (ifcfg, "SRIOV_TOTAL_VFS", nm_setting_sriov_get_total_vfs (s_sriov));
 
 	b = nm_setting_sriov_get_autoprobe_drivers (s_sriov);
 	if (b != NM_TERNARY_DEFAULT)
diff --git a/src/settings/plugins/ifupdown/nms-ifupdown-plugin.c b/src/settings/plugins/ifupdown/nms-ifupdown-plugin.c
index b66eedc7..f0e64d1d 100644
--- a/src/settings/plugins/ifupdown/nms-ifupdown-plugin.c
+++ b/src/settings/plugins/ifupdown/nms-ifupdown-plugin.c
@@ -282,8 +282,10 @@ initialize (NMSettingsPlugin *plugin)
 
 		g_hash_table_iter_init (&iter, priv->eni_ifaces);
 		while (g_hash_table_iter_next (&iter, NULL, (gpointer *) conn)) {
-			_nm_settings_plugin_emit_signal_connection_added (NM_SETTINGS_PLUGIN (self),
-			                                                  NM_SETTINGS_CONNECTION (conn));
+			if (conn) {
+				_nm_settings_plugin_emit_signal_connection_added (NM_SETTINGS_PLUGIN (self),
+				                                                  NM_SETTINGS_CONNECTION (conn));
+			}
 		}
 	}
 }
diff --git a/src/supplicant/nm-supplicant-config.c b/src/supplicant/nm-supplicant-config.c
index 043b5550..cfb33008 100644
--- a/src/supplicant/nm-supplicant-config.c
+++ b/src/supplicant/nm-supplicant-config.c
@@ -648,31 +648,28 @@ add_string_val (NMSupplicantConfig *self,
 
 static void
 wep128_passphrase_hash (const char *input,
-                        size_t input_len,
-                        guint8 *out_digest,
-                        size_t *out_digest_len)
+                        gsize input_len,
+                        guint8 *digest /* 13 bytes */)
 {
-	GChecksum *sum;
+	nm_auto_free_checksum GChecksum *sum = NULL;
+	guint8 md5[NM_UTILS_CHECKSUM_LENGTH_MD5];
 	guint8 data[64];
 	int i;
 
-	g_return_if_fail (out_digest != NULL);
-	g_return_if_fail (out_digest_len != NULL);
-	g_return_if_fail (*out_digest_len >= 16);
+	nm_assert (input);
+	nm_assert (input_len);
+	nm_assert (digest);
 
 	/* Get at least 64 bytes by repeating the passphrase into the buffer */
 	for (i = 0; i < sizeof (data); i++)
 		data[i] = input[i % input_len];
 
 	sum = g_checksum_new (G_CHECKSUM_MD5);
-	g_assert (sum);
 	g_checksum_update (sum, data, sizeof (data));
-	g_checksum_get_digest (sum, out_digest, out_digest_len);
-	g_checksum_free (sum);
+	nm_utils_checksum_get_digest (sum, md5);
 
-	g_assert (*out_digest_len == 16);
 	/* WEP104 keys are 13 bytes in length (26 hex characters) */
-	*out_digest_len = 13;
+	memcpy (digest, md5, 13);
 }
 
 static gboolean
@@ -682,9 +679,10 @@ add_wep_key (NMSupplicantConfig *self,
              NMWepKeyType wep_type,
              GError **error)
 {
-	size_t key_len = key ? strlen (key) : 0;
+	gsize key_len;
 
-	if (!key || !key_len)
+	if (   !key
+	    || (key_len = strlen (key)) == 0)
 		return TRUE;
 
 	if (wep_type == NM_WEP_KEY_TYPE_UNKNOWN) {
@@ -723,11 +721,10 @@ add_wep_key (NMSupplicantConfig *self,
 			return FALSE;
 		}
 	} else if (wep_type == NM_WEP_KEY_TYPE_PASSPHRASE) {
-		guint8 digest[16];
-		size_t digest_len = sizeof (digest);
+		guint8 digest[13];
 
-		wep128_passphrase_hash (key, key_len, digest, &digest_len);
-		if (!nm_supplicant_config_add_option (self, name, (const char *) digest, digest_len, "", error))
+		wep128_passphrase_hash (key, key_len, digest);
+		if (!nm_supplicant_config_add_option (self, name, (const char *) digest, sizeof (digest), "", error))
 			return FALSE;
 	}
 
@@ -747,6 +744,7 @@ nm_supplicant_config_add_setting_wireless_security (NMSupplicantConfig *self,
 	NMSupplicantConfigPrivate *priv = NM_SUPPLICANT_CONFIG_GET_PRIVATE (self);
 	const char *key_mgmt, *key_mgmt_conf, *auth_alg;
 	const char *psk;
+	gboolean set_pmf;
 
 	g_return_val_if_fail (NM_IS_SUPPLICANT_CONFIG (self), FALSE);
 	g_return_val_if_fail (setting != NULL, FALSE);
@@ -834,13 +832,14 @@ nm_supplicant_config_add_setting_wireless_security (NMSupplicantConfig *self,
 		pmf = NM_SETTING_WIRELESS_SECURITY_PMF_DISABLE;
 
 	/* Check if we actually support PMF */
+	set_pmf = TRUE;
 	if (!priv->support_pmf) {
 		if (pmf == NM_SETTING_WIRELESS_SECURITY_PMF_REQUIRED) {
 			g_set_error_literal (error, NM_SUPPLICANT_ERROR, NM_SUPPLICANT_ERROR_CONFIG,
 			                     "Supplicant does not support PMF");
 			return FALSE;
-		} else if (pmf == NM_SETTING_WIRELESS_SECURITY_PMF_OPTIONAL)
-			pmf = NM_SETTING_WIRELESS_SECURITY_PMF_DISABLE;
+		}
+		set_pmf = FALSE;
 	}
 
 	/* Only WPA-specific things when using WPA */
@@ -854,13 +853,14 @@ nm_supplicant_config_add_setting_wireless_security (NMSupplicantConfig *self,
 		if (!ADD_STRING_LIST_VAL (self, setting, wireless_security, group, groups, "group", ' ', TRUE, NULL, error))
 			return FALSE;
 
-		if (   !nm_streq (key_mgmt, "wpa-none")
+		if (   set_pmf
+		    && !nm_streq (key_mgmt, "wpa-none")
 		    && NM_IN_SET (pmf,
-		                  NM_SETTING_WIRELESS_SECURITY_PMF_OPTIONAL,
+		                  NM_SETTING_WIRELESS_SECURITY_PMF_DISABLE,
 		                  NM_SETTING_WIRELESS_SECURITY_PMF_REQUIRED)) {
 			if (!nm_supplicant_config_add_option (self,
 			                                      "ieee80211w",
-			                                      pmf == NM_SETTING_WIRELESS_SECURITY_PMF_OPTIONAL ? "1" : "2",
+			                                      pmf == NM_SETTING_WIRELESS_SECURITY_PMF_DISABLE ? "0" : "2",
 			                                      -1,
 			                                      NULL,
 			                                      error))
diff --git a/src/supplicant/nm-supplicant-interface.c b/src/supplicant/nm-supplicant-interface.c
index 5237acb2..0af9ebdb 100644
--- a/src/supplicant/nm-supplicant-interface.c
+++ b/src/supplicant/nm-supplicant-interface.c
@@ -555,6 +555,26 @@ iface_check_netreply_cb (GDBusProxy *proxy, GAsyncResult *result, gpointer user_
 	iface_check_ready (self);
 }
 
+static void
+iface_set_pmf_cb (GDBusProxy *proxy, GAsyncResult *result, gpointer user_data)
+{
+	NMSupplicantInterface *self;
+	gs_unref_variant GVariant *variant = NULL;
+	gs_free_error GError *error = NULL;
+
+	variant = g_dbus_proxy_call_finish (proxy, result, &error);
+	if (g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED))
+		return;
+
+	self = NM_SUPPLICANT_INTERFACE (user_data);
+
+	/* This can fail if the supplicant doesn't support PMF */
+	if (error)
+		_LOGD ("failed to set Pmf=1: %s", error->message);
+
+	iface_check_ready (self);
+}
+
 NMSupplicantFeature
 nm_supplicant_interface_get_ap_support (NMSupplicantInterface *self)
 {
@@ -1155,8 +1175,22 @@ on_iface_proxy_acquired (GDBusProxy *proxy, GAsyncResult *result, gpointer user_
 	                   NULL,
 	                   NULL);
 
-	/* Check whether NetworkReply and AP mode are supported */
+	/* Initialize global PMF setting to 'optional' */
 	priv->ready_count = 1;
+	g_dbus_proxy_call (priv->iface_proxy,
+	                   DBUS_INTERFACE_PROPERTIES ".Set",
+	                   g_variant_new ("(ssv)",
+	                                  WPAS_DBUS_IFACE_INTERFACE,
+	                                  "Pmf",
+	                                  g_variant_new_string ("1")),
+	                   G_DBUS_CALL_FLAGS_NONE,
+	                   -1,
+	                   priv->init_cancellable,
+	                   (GAsyncReadyCallback) iface_set_pmf_cb,
+	                   self);
+
+	/* Check whether NetworkReply and AP mode are supported */
+	priv->ready_count++;
 	g_dbus_proxy_call (priv->iface_proxy,
 	                   "NetworkReply",
 	                   g_variant_new ("(oss)",
diff --git a/src/supplicant/tests/test-supplicant-config.c b/src/supplicant/tests/test-supplicant-config.c
index 36831e67..d7ec1fe2 100644
--- a/src/supplicant/tests/test-supplicant-config.c
+++ b/src/supplicant/tests/test-supplicant-config.c
@@ -359,8 +359,8 @@ test_wifi_wpa_psk (const char *detail,
 	NMTST_EXPECT_NM_INFO ("Config: added 'pairwise' value 'TKIP CCMP'");
 	NMTST_EXPECT_NM_INFO ("Config: added 'group' value 'TKIP CCMP'");
 	switch (pmf) {
-	case NM_SETTING_WIRELESS_SECURITY_PMF_OPTIONAL:
-		NMTST_EXPECT_NM_INFO ("Config: added 'ieee80211w' value '1'");
+	case NM_SETTING_WIRELESS_SECURITY_PMF_DISABLE:
+		NMTST_EXPECT_NM_INFO ("Config: added 'ieee80211w' value '0'");
 		break;
 	case NM_SETTING_WIRELESS_SECURITY_PMF_REQUIRED:
 		NMTST_EXPECT_NM_INFO ("Config: added 'ieee80211w' value '2'");
diff --git a/src/systemd/meson.build b/src/systemd/meson.build
index 870721b0..1bf1ea41 100644
--- a/src/systemd/meson.build
+++ b/src/systemd/meson.build
@@ -49,7 +49,8 @@ sources = files(
   'src/libsystemd/sd-id128/id128-util.c',
   'src/libsystemd/sd-id128/sd-id128.c',
   'src/shared/dns-domain.c',
-  'nm-sd.c'
+  'nm-sd.c',
+  'nm-sd-utils.c',
 )
 
 incs = [
diff --git a/src/systemd/nm-sd-utils.c b/src/systemd/nm-sd-utils.c
new file mode 100644
index 00000000..c6c4c123
--- /dev/null
+++ b/src/systemd/nm-sd-utils.c
@@ -0,0 +1,61 @@
+/* This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301 USA.
+ *
+ * Copyright (C) 2018 Red Hat, Inc.
+ */
+
+#include "nm-default.h"
+
+#include "nm-sd-utils.h"
+
+#include "nm-core-internal.h"
+
+#include "nm-sd-adapt.h"
+
+#include "path-util.h"
+#include "sd-id128.h"
+
+/*****************************************************************************/
+
+gboolean
+nm_sd_utils_path_equal (const char *a, const char *b)
+{
+	return path_equal (a, b);
+}
+
+char *
+nm_sd_utils_path_simplify (char *path, gboolean kill_dots)
+{
+	return path_simplify (path, kill_dots);
+}
+
+const char *
+nm_sd_utils_path_startswith (const char *path, const char *prefix)
+{
+	return path_startswith (path, prefix);
+}
+
+/*****************************************************************************/
+
+NMUuid *
+nm_sd_utils_id128_get_machine (NMUuid *out_uuid)
+{
+	g_assert (out_uuid);
+
+	G_STATIC_ASSERT_EXPR (sizeof (*out_uuid) == sizeof (sd_id128_t));
+	if (sd_id128_get_machine ((sd_id128_t *) out_uuid) < 0)
+		return NULL;
+	return out_uuid;
+}
diff --git a/src/systemd/nm-sd-utils.h b/src/systemd/nm-sd-utils.h
new file mode 100644
index 00000000..0af514eb
--- /dev/null
+++ b/src/systemd/nm-sd-utils.h
@@ -0,0 +1,38 @@
+/* This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301 USA.
+ *
+ * Copyright (C) 2018 Red Hat, Inc.
+ */
+
+#ifndef __NM_SD_UTILS_H__
+#define __NM_SD_UTILS_H__
+
+/*****************************************************************************/
+
+gboolean nm_sd_utils_path_equal (const char *a, const char *b);
+
+char *nm_sd_utils_path_simplify (char *path, gboolean kill_dots);
+
+const char *nm_sd_utils_path_startswith (const char *path, const char *prefix);
+
+/*****************************************************************************/
+
+struct _NMUuid;
+
+struct _NMUuid *nm_sd_utils_id128_get_machine (struct _NMUuid *out_uuid);
+
+/*****************************************************************************/
+
+#endif /* __NM_SD_UTILS_H__ */
diff --git a/src/systemd/src/basic/path-util.c b/src/systemd/src/basic/path-util.c
index 5202eae3..3656a011 100644
--- a/src/systemd/src/basic/path-util.c
+++ b/src/systemd/src/basic/path-util.c
@@ -380,7 +380,6 @@ char *path_simplify(char *path, bool kill_dots) {
         return path;
 }
 
-#if 0 /* NM_IGNORED */
 char* path_startswith(const char *path, const char *prefix) {
         assert(path);
         assert(prefix);
@@ -423,7 +422,6 @@ char* path_startswith(const char *path, const char *prefix) {
                 prefix += b;
         }
 }
-#endif /* NM_IGNORED */
 
 int path_compare(const char *a, const char *b) {
         int d;
diff --git a/src/systemd/src/libsystemd-network/dhcp-identifier.c b/src/systemd/src/libsystemd-network/dhcp-identifier.c
index f18713e8..b1afbf00 100644
--- a/src/systemd/src/libsystemd-network/dhcp-identifier.c
+++ b/src/systemd/src/libsystemd-network/dhcp-identifier.c
@@ -25,13 +25,19 @@
 #define APPLICATION_ID SD_ID128_MAKE(a5,0a,d1,12,bf,60,45,77,a2,fb,74,1a,b1,95,5b,03)
 #define USEC_2000       ((usec_t) 946684800000000) /* 2000-01-01 00:00:00 UTC */
 
-int dhcp_validate_duid_len(uint16_t duid_type, size_t duid_len) {
+int dhcp_validate_duid_len(uint16_t duid_type, size_t duid_len, bool strict) {
         struct duid d;
 
         assert_cc(sizeof(d.raw) >= MAX_DUID_LEN);
         if (duid_len > MAX_DUID_LEN)
                 return -EINVAL;
 
+        if (!strict) {
+                /* Strict validation is not requested. We only ensure that the
+                 * DUID is not too long. */
+                return 0;
+        }
+
         switch (duid_type) {
         case DUID_TYPE_LLT:
                 if (duid_len <= sizeof(d.llt))
diff --git a/src/systemd/src/libsystemd-network/dhcp-identifier.h b/src/systemd/src/libsystemd-network/dhcp-identifier.h
index 64315d3a..e6834039 100644
--- a/src/systemd/src/libsystemd-network/dhcp-identifier.h
+++ b/src/systemd/src/libsystemd-network/dhcp-identifier.h
@@ -52,7 +52,7 @@ struct duid {
         };
 } _packed_;
 
-int dhcp_validate_duid_len(uint16_t duid_type, size_t duid_len);
+int dhcp_validate_duid_len(uint16_t duid_type, size_t duid_len, bool strict);
 int dhcp_identifier_set_duid_llt(struct duid *duid, usec_t t, const uint8_t *addr, size_t addr_len, uint16_t arp_type, size_t *len);
 int dhcp_identifier_set_duid_ll(struct duid *duid, const uint8_t *addr, size_t addr_len, uint16_t arp_type, size_t *len);
 int dhcp_identifier_set_duid_en(struct duid *duid, size_t *len);
diff --git a/src/systemd/src/libsystemd-network/dhcp6-option.c b/src/systemd/src/libsystemd-network/dhcp6-option.c
index ff1cbf13..22970443 100644
--- a/src/systemd/src/libsystemd-network/dhcp6-option.c
+++ b/src/systemd/src/libsystemd-network/dhcp6-option.c
@@ -105,7 +105,7 @@ int dhcp6_option_append_ia(uint8_t **buf, size_t *buflen, DHCP6IA *ia) {
                 return -EINVAL;
         }
 
-        if (*buflen < len)
+        if (*buflen < offsetof(DHCP6Option, data) + len)
                 return -ENOBUFS;
 
         ia_hdr = *buf;
@@ -465,13 +465,15 @@ int dhcp6_option_parse_ia(DHCP6Option *iaoption, DHCP6IA *ia) {
 
                 case SD_DHCP6_OPTION_STATUS_CODE:
 
-                        status = dhcp6_option_parse_status(option, optlen);
-                        if (status) {
+                        status = dhcp6_option_parse_status(option, optlen + sizeof(DHCP6Option));
+                        if (status < 0) {
+                                r = status;
+                                goto error;
+                        }
+                        if (status > 0) {
                                 log_dhcp6_client(client, "IA status %d",
                                                  status);
 
-                                dhcp6_lease_free_ia(ia);
-
                                 r = -EINVAL;
                                 goto error;
                         }
@@ -553,6 +555,7 @@ int dhcp6_option_parse_domainname(const uint8_t *optval, uint16_t optlen, char *
                 bool first = true;
 
                 for (;;) {
+                        const char *label;
                         uint8_t c;
 
                         c = optval[pos++];
@@ -560,47 +563,41 @@ int dhcp6_option_parse_domainname(const uint8_t *optval, uint16_t optlen, char *
                         if (c == 0)
                                 /* End of name */
                                 break;
-                        else if (c <= 63) {
-                                const char *label;
-
-                                /* Literal label */
-                                label = (const char *)&optval[pos];
-                                pos += c;
-                                if (pos >= optlen)
-                                        return -EMSGSIZE;
-
-                                if (!GREEDY_REALLOC(ret, allocated, n + !first + DNS_LABEL_ESCAPED_MAX)) {
-                                        r = -ENOMEM;
-                                        goto fail;
-                                }
-
-                                if (first)
-                                        first = false;
-                                else
-                                        ret[n++] = '.';
-
-                                r = dns_label_escape(label, c, ret + n, DNS_LABEL_ESCAPED_MAX);
-                                if (r < 0)
-                                        goto fail;
-
-                                n += r;
-                                continue;
-                        } else {
-                                r = -EBADMSG;
-                                goto fail;
-                        }
-                }
+                        if (c > 63)
+                                return -EBADMSG;
+
+                        /* Literal label */
+                        label = (const char *)&optval[pos];
+                        pos += c;
+                        if (pos >= optlen)
+                                return -EMSGSIZE;
+
+                        if (!GREEDY_REALLOC(ret, allocated, n + !first + DNS_LABEL_ESCAPED_MAX))
+                                return -ENOMEM;
+
+                        if (first)
+                                first = false;
+                        else
+                                ret[n++] = '.';
 
-                if (!GREEDY_REALLOC(ret, allocated, n + 1)) {
-                        r = -ENOMEM;
-                        goto fail;
+                        r = dns_label_escape(label, c, ret + n, DNS_LABEL_ESCAPED_MAX);
+                        if (r < 0)
+                                return r;
+
+                        n += r;
                 }
 
+                if (n == 0)
+                        continue;
+
+                if (!GREEDY_REALLOC(ret, allocated, n + 1))
+                        return -ENOMEM;
+
                 ret[n] = 0;
 
                 r = strv_extend(&names, ret);
                 if (r < 0)
-                        goto fail;
+                        return r;
 
                 idx++;
         }
@@ -608,7 +605,4 @@ int dhcp6_option_parse_domainname(const uint8_t *optval, uint16_t optlen, char *
         *str_arr = TAKE_PTR(names);
 
         return idx;
-
-fail:
-        return r;
 }
diff --git a/src/systemd/src/libsystemd-network/sd-dhcp-client.c b/src/systemd/src/libsystemd-network/sd-dhcp-client.c
index 42707f10..0c385a84 100644
--- a/src/systemd/src/libsystemd-network/sd-dhcp-client.c
+++ b/src/systemd/src/libsystemd-network/sd-dhcp-client.c
@@ -301,27 +301,22 @@ int sd_dhcp_client_set_client_id(
         assert_return(data_len > 0 && data_len <= MAX_CLIENT_ID_LEN, -EINVAL);
         G_STATIC_ASSERT_EXPR (_NM_SD_MAX_CLIENT_ID_LEN == MAX_CLIENT_ID_LEN);
 
-        switch (type) {
-
-        case ARPHRD_ETHER:
-                if (data_len != ETH_ALEN)
-                        return -EINVAL;
-                break;
-
-        case ARPHRD_INFINIBAND:
-                if (data_len != INFINIBAND_ALEN)
-                        return -EINVAL;
-                break;
-
-        default:
-                break;
-        }
-
         if (client->client_id_len == data_len + sizeof(client->client_id.type) &&
             client->client_id.type == type &&
             memcmp(&client->client_id.raw.data, data, data_len) == 0)
                 return 0;
 
+        /* For hardware types, log debug message about unexpected data length.
+         *
+         * Note that infiniband's INFINIBAND_ALEN is 20 bytes long, but only
+         * last last 8 bytes of the address are stable and suitable to put into
+         * the client-id. The caller is advised to account for that. */
+        if ((type == ARPHRD_ETHER && data_len != ETH_ALEN) ||
+            (type == ARPHRD_INFINIBAND && data_len != 8))
+                log_dhcp_client(client, "Changing client ID to hardware type %u with "
+                                "unexpected address length %zu",
+                                type, data_len);
+
         if (!IN_SET(client->state, DHCP_STATE_INIT, DHCP_STATE_STOPPED)) {
                 log_dhcp_client(client, "Changing client ID on running DHCP "
                                 "client, restarting");
@@ -362,7 +357,7 @@ static int dhcp_client_set_iaid_duid_internal(
         assert_return(duid_len == 0 || duid != NULL, -EINVAL);
 
         if (duid != NULL) {
-                r = dhcp_validate_duid_len(duid_type, duid_len);
+                r = dhcp_validate_duid_len(duid_type, duid_len, true);
                 if (r < 0)
                         return r;
         }
@@ -1688,6 +1683,8 @@ static int client_handle_message(sd_dhcp_client *client, DHCPMessage *message, i
                         client->timeout_resend =
                                 sd_event_source_unref(client->timeout_resend);
 
+                        client_notify(client, SD_DHCP_CLIENT_EVENT_EXPIRED);
+
                         r = client_initialize(client);
                         if (r < 0)
                                 goto error;
diff --git a/src/systemd/src/libsystemd-network/sd-dhcp-lease.c b/src/systemd/src/libsystemd-network/sd-dhcp-lease.c
index d2402595..cac07d3e 100644
--- a/src/systemd/src/libsystemd-network/sd-dhcp-lease.c
+++ b/src/systemd/src/libsystemd-network/sd-dhcp-lease.c
@@ -279,6 +279,8 @@ sd_dhcp_lease *sd_dhcp_lease_unref(sd_dhcp_lease *lease) {
                 free(option);
         }
 
+        free(lease->root_path);
+        free(lease->timezone);
         free(lease->hostname);
         free(lease->domainname);
         free(lease->dns);
diff --git a/src/systemd/src/libsystemd-network/sd-dhcp6-client.c b/src/systemd/src/libsystemd-network/sd-dhcp6-client.c
index 8444a750..f0cd2f97 100644
--- a/src/systemd/src/libsystemd-network/sd-dhcp6-client.c
+++ b/src/systemd/src/libsystemd-network/sd-dhcp6-client.c
@@ -197,9 +197,13 @@ static int dhcp6_client_set_duid_internal(
         assert_return(IN_SET(client->state, DHCP6_STATE_STOPPED), -EBUSY);
 
         if (duid != NULL) {
-                r = dhcp_validate_duid_len(duid_type, duid_len);
-                if (r < 0)
-                        return r;
+                r = dhcp_validate_duid_len(duid_type, duid_len, true);
+                if (r < 0) {
+                        r = dhcp_validate_duid_len(duid_type, duid_len, false);
+                        if (r < 0)
+                                return r;
+                        log_dhcp6_client(client, "Setting DUID of type %u with unexpected content", duid_type);
+                }
 
                 client->duid.type = htobe16(duid_type);
                 memcpy(&client->duid.raw.data, duid, duid_len);
@@ -818,8 +822,8 @@ static int client_parse_message(
                 uint8_t *optval;
                 be32_t iaid_lease;
 
-                if (len < offsetof(DHCP6Option, data) ||
-                    len < offsetof(DHCP6Option, data) + be16toh(option->len))
+                if (len < pos + offsetof(DHCP6Option, data) ||
+                    len < pos + offsetof(DHCP6Option, data) + be16toh(option->len))
                         return -ENOBUFS;
 
                 optcode = be16toh(option->code);
@@ -870,13 +874,14 @@ static int client_parse_message(
                         break;
 
                 case SD_DHCP6_OPTION_STATUS_CODE:
-                        status = dhcp6_option_parse_status(option, optlen);
-                        if (status) {
+                        status = dhcp6_option_parse_status(option, optlen + sizeof(DHCP6Option));
+                        if (status < 0)
+                                return status;
+
+                        if (status > 0) {
                                 log_dhcp6_client(client, "%s Status %s",
                                                  dhcp6_message_type_to_string(message->type),
                                                  dhcp6_message_status_to_string(status));
-                                dhcp6_lease_free_ia(&lease->ia);
-                                dhcp6_lease_free_ia(&lease->pd);
 
                                 return -EINVAL;
                         }
@@ -1274,6 +1279,7 @@ static int client_start(sd_dhcp6_client *client, enum DHCP6State state) {
                 log_dhcp6_client(client, "T1 expires in %s",
                                  format_timespan(time_string, FORMAT_TIMESPAN_MAX, timeout, USEC_PER_SEC));
 
+                client->lease->ia.timeout_t1 = sd_event_source_unref(client->lease->ia.timeout_t1);
                 r = sd_event_add_time(client->event,
                                       &client->lease->ia.timeout_t1,
                                       clock_boottime_or_monotonic(), time_now + timeout,
@@ -1296,6 +1302,7 @@ static int client_start(sd_dhcp6_client *client, enum DHCP6State state) {
                 log_dhcp6_client(client, "T2 expires in %s",
                                  format_timespan(time_string, FORMAT_TIMESPAN_MAX, timeout, USEC_PER_SEC));
 
+                client->lease->ia.timeout_t2 = sd_event_source_unref(client->lease->ia.timeout_t2);
                 r = sd_event_add_time(client->event,
                                       &client->lease->ia.timeout_t2,
                                       clock_boottime_or_monotonic(), time_now + timeout,
diff --git a/src/tests/config/test-config.c b/src/tests/config/test-config.c
index 75fef4fa..20a05df1 100644
--- a/src/tests/config/test-config.c
+++ b/src/tests/config/test-config.c
@@ -25,6 +25,7 @@
 #include "nm-config.h"
 #include "nm-test-device.h"
 #include "platform/nm-fake-platform.h"
+#include "dhcp/nm-dhcp-manager.h"
 #include "nm-dbus-manager.h"
 #include "nm-connectivity.h"
 
@@ -123,6 +124,24 @@ setup_config (GError **error, const char *config_file, const char *intern_config
 		g_assert_no_error (local_error);
 	}
 	nm_config_cmd_line_options_free (cli);
+
+	if (config) {
+		NMDhcpManager *dhcp_manager;
+		gpointer logging_old_state;
+
+		logging_old_state = nmtst_logging_disable (FALSE);
+
+		dhcp_manager = nm_dhcp_manager_get ();
+		g_test_assert_expected_messages ();
+
+		nmtst_logging_reenable (logging_old_state);
+
+		g_object_set_data_full (G_OBJECT (config),
+		                        "nmtst-config-keep-dhcp-manager-alive",
+		                        dhcp_manager,
+		                        nmtst_dhcp_manager_unget);
+	}
+
 	return config;
 }
 
diff --git a/src/tests/test-general.c b/src/tests/test-general.c
index 1e7329d1..9dce9435 100644
--- a/src/tests/test-general.c
+++ b/src/tests/test-general.c
@@ -22,12 +22,19 @@
 
 #include 
 #include 
+#include 
+#include 
 
 /* need math.h for isinf() and INFINITY. No need to link with -lm */
 #include 
 
 #include "NetworkManagerUtils.h"
 #include "nm-core-internal.h"
+#include "nm-core-utils.h"
+#include "systemd/nm-sd-utils.h"
+
+#include "dns/nm-dns-manager.h"
+#include "nm-connectivity.h"
 
 #include "nm-test-utils-core.h"
 
@@ -1093,7 +1100,7 @@ static NMMatchSpecMatchType
 _test_match_spec_device (const GSList *specs, const char *match_str)
 {
 	if (match_str && g_str_has_prefix (match_str, MATCH_S390))
-		return nm_match_spec_device (specs, NULL, NULL, NULL, NULL, NULL, &match_str[NM_STRLEN (MATCH_S390)]);
+		return nm_match_spec_device (specs, NULL, NULL, NULL, NULL, NULL, &match_str[NM_STRLEN (MATCH_S390)], NULL);
 	if (match_str && g_str_has_prefix (match_str, MATCH_DRIVER)) {
 		gs_free char *s = g_strdup (&match_str[NM_STRLEN (MATCH_DRIVER)]);
 		char *t;
@@ -1103,9 +1110,9 @@ _test_match_spec_device (const GSList *specs, const char *match_str)
 			t[0] = '\0';
 			t++;
 		}
-		return nm_match_spec_device (specs, NULL, NULL, s, t, NULL, NULL);
+		return nm_match_spec_device (specs, NULL, NULL, s, t, NULL, NULL, NULL);
 	}
-	return nm_match_spec_device (specs, match_str, NULL, NULL, NULL, NULL, NULL);
+	return nm_match_spec_device (specs, match_str, NULL, NULL, NULL, NULL, NULL, NULL);
 }
 
 static void
@@ -1226,6 +1233,10 @@ test_match_spec_device (void)
 	                            S ("em", "em\\", "em\\*", "em\\1", "em\\11", "em\\2", "em1", "em11", "em2", "em3"),
 	                            NULL,
 	                            S ("em*"));
+	_do_test_match_spec_device ("except:interface-name:em*",
+	                            S ("", "eth", "eth1", "e1"),
+	                            S (NULL),
+	                            S ("em", "em\\", "em\\*", "em\\1", "em\\11", "em\\2", "em1", "em11", "em2", "em3"));
 	_do_test_match_spec_device ("aa,bb,cc\\,dd,e,,",
 	                            S ("aa", "bb", "cc,dd", "e"),
 	                            NULL,
@@ -1298,7 +1309,8 @@ _do_test_match_spec_config (const char *file, int line, const char *spec_str, gu
 	if (expected != match_result)
 		g_error ("%s:%d: faild comparing \"%s\" with %u.%u.%u. Expected %d, but got %d", file, line, spec_str, v_maj, v_min, v_mic, (int) expected, (int) match_result);
 
-	if (g_slist_length (specs) == 1 && match_result != NM_MATCH_SPEC_NEG_MATCH) {
+	if (   g_slist_length (specs) == 1
+	    && !g_str_has_prefix (specs->data, "except:")) {
 		/* there is only one spec in the list... test that we match except: */
 		char *sss = g_strdup_printf ("except:%s", (char *) specs->data);
 		GSList *specs2 = g_slist_append (NULL, sss);
@@ -1306,7 +1318,7 @@ _do_test_match_spec_config (const char *file, int line, const char *spec_str, gu
 
 		match_result2 = nm_match_spec_config (specs2, version, NULL);
 		if (match_result == NM_MATCH_SPEC_NO_MATCH)
-			g_assert_cmpint (match_result2, ==, NM_MATCH_SPEC_NO_MATCH);
+			g_assert_cmpint (match_result2, ==, NM_MATCH_SPEC_MATCH);
 		else
 			g_assert_cmpint (match_result2, ==, NM_MATCH_SPEC_NEG_MATCH);
 
@@ -1390,7 +1402,7 @@ test_match_spec_config (void)
 	do_test_match_spec_config ("nm-version-max:1", 1, 4, 30, NM_MATCH_SPEC_MATCH);
 	do_test_match_spec_config ("nm-version-max:1", 2, 4, 30, NM_MATCH_SPEC_NO_MATCH);
 
-	do_test_match_spec_config ("except:nm-version:1.4.8", 1, 6, 0, NM_MATCH_SPEC_NO_MATCH);
+	do_test_match_spec_config ("except:nm-version:1.4.8", 1, 6, 0, NM_MATCH_SPEC_MATCH);
 	do_test_match_spec_config ("nm-version-min:1.6,except:nm-version:1.4.8", 1, 6, 0, NM_MATCH_SPEC_MATCH);
 
 	do_test_match_spec_config ("nm-version-min:1.6,nm-version-min:1.4.6,nm-version-min:1.2.16,except:nm-version:1.4.8", 1, 2, 0, NM_MATCH_SPEC_NO_MATCH);
@@ -1733,7 +1745,7 @@ do_test_stable_id_parse (const char *stable_id,
 	else
 		g_assert (stable_id);
 
-	stable_type = nm_utils_stable_id_parse (stable_id, "_DEVICE", "_BOOT", "_CONNECTION", &generated);
+	stable_type = nm_utils_stable_id_parse (stable_id, "_DEVICE", "_MAC", "_BOOT", "_CONNECTION", &generated);
 
 	g_assert_cmpint (expected_stable_type, ==, stable_type);
 
@@ -1772,6 +1784,7 @@ test_stable_id_parse (void)
 	_parse_generated ("x${BOOT}", "x${BOOT}=5{_BOOT}");
 	_parse_generated ("x${BOOT}${CONNECTION}", "x${BOOT}=5{_BOOT}${CONNECTION}=11{_CONNECTION}");
 	_parse_generated ("xX${BOOT}yY${CONNECTION}zZ", "xX${BOOT}=5{_BOOT}yY${CONNECTION}=11{_CONNECTION}zZ");
+	_parse_generated ("${MAC}x", "${MAC}=4{_MAC}x");
 	_parse_random ("${RANDOM}");
 	_parse_random (" ${RANDOM}");
 	_parse_random ("${BOOT}${RANDOM}");
@@ -1845,6 +1858,223 @@ test_nm_utils_exp10 (void)
 
 /*****************************************************************************/
 
+#define _TEST_RC(searches, nameservers, options, expected) \
+	G_STMT_START { \
+		const char *const*const _searches = (searches); \
+		const char *const*const _nameservers = (nameservers); \
+		const char *const*const _options = (options); \
+		gs_free char *_content = NULL; \
+		\
+		_content = nmtst_dns_create_resolv_conf (_searches, _nameservers, _options); \
+		g_assert_cmpstr (_content, ==, expected); \
+	} G_STMT_END
+
+static void
+test_dns_create_resolv_conf (void)
+{
+	_TEST_RC (NM_MAKE_STRV ("a"),
+	          NULL,
+	          NULL,
+	          "# Generated by NetworkManager\n"
+	          "search a\n"
+	          "");
+
+	_TEST_RC (NM_MAKE_STRV ("a", "b.com"),
+	          NM_MAKE_STRV ("192.168.55.1", "192.168.56.1"),
+	          NM_MAKE_STRV ("opt1", "opt2"),
+	          "# Generated by NetworkManager\n"
+	          "search a b.com\n"
+	          "nameserver 192.168.55.1\n"
+	          "nameserver 192.168.56.1\n"
+	          "options opt1 opt2\n"
+	          "");
+
+	_TEST_RC (NM_MAKE_STRV ("a2x456789.b2x456789.c2x456789.d2x456789.e2x456789.f2x456789.g2x456789.h2x456789.i2x456789.j2x4567890",
+	                        "a2y456789.b2y456789.c2y456789.d2y456789.e2y456789.f2y456789.g2y456789.h2y456789.i2y456789.j2y4567890",
+	                        "a2z456789.b2z456789.c2z456789.d2z456789.e2z456789.f2z456789.g2z456789.h2z456789.i2z456789.j2z4567890"),
+	          NULL,
+	          NULL,
+	          "# Generated by NetworkManager\n"
+	          "search a2x456789.b2x456789.c2x456789.d2x456789.e2x456789.f2x456789.g2x456789.h2x456789.i2x456789.j2x4567890 a2y456789.b2y456789.c2y456789.d2y456789.e2y456789.f2y456789.g2y456789.h2y456789.i2y456789.j2y4567890                                                        a2z456789.b2z456789.c2z456789.d2z456789.e2z456789.f2z456789.g2z456789.h2z456789.i2z456789.j2z4567890\n"
+	          "");
+
+}
+
+/*****************************************************************************/
+
+static void
+test_machine_id_read (void)
+{
+	NMUuid machine_id_sd;
+	const NMUuid *machine_id;
+	char machine_id_str[33];
+	gpointer logstate;
+
+	logstate = nmtst_logging_disable (FALSE);
+	/* If you run this test as root, without a valid /etc/machine-id,
+	 * the code will try to get the secret-key. That is a bit ugly,
+	 * but no real problem. */
+	machine_id = nm_utils_machine_id_bin ();
+	nmtst_logging_reenable (logstate);
+
+	g_assert (machine_id);
+	g_assert (_nm_utils_bin2hexstr_full (machine_id,
+	                                     sizeof (NMUuid),
+	                                     '\0',
+	                                     FALSE,
+	                                     machine_id_str) == machine_id_str);
+	g_assert (strlen (machine_id_str) == 32);
+	g_assert_cmpstr (machine_id_str, ==, nm_utils_machine_id_str ());
+
+	/* double check with systemd's implementation... */
+	if (!nm_sd_utils_id128_get_machine (&machine_id_sd)) {
+		/* if systemd failed to read /etc/machine-id, the file likely
+		 * is invalid. Our machine-id is fake, and we have nothing to
+		 * compare against. */
+
+		/* NOTE: this test will fail, if you don't have /etc/machine-id,
+		 * but a valid "LOCALSTATEDIR/lib/dbus/machine-id" file.
+		 * Just don't do that. */
+		g_assert (nm_utils_machine_id_is_fake ());
+	} else {
+		g_assert (!nm_utils_machine_id_is_fake ());
+		g_assert_cmpmem (&machine_id_sd, sizeof (NMUuid), machine_id, 16);
+	}
+}
+
+/*****************************************************************************/
+
+static void
+test_nm_utils_dhcp_client_id_systemd_node_specific (gconstpointer test_data)
+{
+	const int TEST_IDX = GPOINTER_TO_INT (test_data);
+	const guint8 HASH_KEY[16] = { 0x80, 0x11, 0x8c, 0xc2, 0xfe, 0x4a, 0x03, 0xee, 0x3e, 0xd6, 0x0c, 0x6f, 0x36, 0x39, 0x14, 0x09 };
+	const guint16 duid_type_en = htons (2);
+	const guint32 systemd_pen = htonl (43793);
+	const struct {
+		NMUuid machine_id;
+		const char *ifname;
+		guint64 ifname_hash_1;
+		guint32 iaid_ifname;
+		guint64 duid_id;
+	} d_array[] = {
+		[0] = {
+			.machine_id = { 0xcb, 0xc2, 0x2e, 0x47, 0x41, 0x8e, 0x40, 0x2a, 0xa7, 0xb3, 0x0d, 0xea, 0x92, 0x83, 0x94, 0xef },
+			.ifname = "lo",
+			.ifname_hash_1 = 0x7297085c2b12c911llu,
+			.iaid_ifname = htobe32 (0x5985c14du),
+			.duid_id = htobe64 (0x3d769bb2c14d29e1u),
+		},
+		[1] = {
+			.machine_id = { 0x11, 0x4e, 0xb4, 0xda, 0xd3, 0x22, 0x4a, 0xff, 0x9f, 0xc3, 0x30, 0x83, 0x38, 0xa0, 0xeb, 0xb7 },
+			.ifname = "eth0",
+			.ifname_hash_1 = 0x9e1cb083b54cd7b6llu,
+			.iaid_ifname = htobe32 (0x2b506735u),
+			.duid_id = htobe64 (0x551572e0f2a2a10fu),
+		},
+	};
+	int i;
+	typeof (d_array[0]) *d = &d_array[TEST_IDX];
+	gint64 u64;
+	gint32 u32;
+
+	/* the test already hard-codes the expected values iaid_ifname and duid_id
+	 * above. Still, redo the steps to derive them from the ifname/machine-id
+	 * and double check. */
+	u64 = c_siphash_hash (HASH_KEY, (const guint8 *) d->ifname, strlen (d->ifname));
+	g_assert_cmpint (u64, ==, d->ifname_hash_1);
+	u32 = be32toh ((u64 & 0xffffffffu) ^ (u64 >> 32));
+	g_assert_cmpint (u32, ==, d->iaid_ifname);
+
+	u64 = htole64 (c_siphash_hash (HASH_KEY, (const guint8 *) &d->machine_id, sizeof (d->machine_id)));
+	g_assert_cmpint (u64, ==, d->duid_id);
+
+	for (i = 0; i < 2; i++) {
+		const gboolean legacy_unstable_byteorder = (i != 0);
+		gs_unref_bytes GBytes *client_id = NULL;
+		const guint8 *cid;
+		guint32 iaid = d->iaid_ifname;
+
+		client_id = nm_utils_dhcp_client_id_systemd_node_specific_full (legacy_unstable_byteorder,
+		                                                                (const guint8 *) d->ifname,
+		                                                                strlen (d->ifname),
+		                                                                (const guint8 *) &d->machine_id,
+		                                                                sizeof (d->machine_id));
+
+		g_assert (client_id);
+		g_assert_cmpint (g_bytes_get_size (client_id), ==, 19);
+		cid = g_bytes_get_data (client_id, NULL);
+		g_assert_cmpint (cid[0], ==, 255);
+#if __BYTE_ORDER == __BIG_ENDIAN
+		if (legacy_unstable_byteorder) {
+			/* on non-little endian, the legacy behavior is to have the bytes
+			 * swapped. */
+			iaid = bswap_32 (iaid);
+		}
+#endif
+		g_assert_cmpmem (&cid[1], 4, &iaid, sizeof (iaid));
+		g_assert_cmpmem (&cid[5], 2, &duid_type_en, sizeof (duid_type_en));
+		g_assert_cmpmem (&cid[7], 4, &systemd_pen, sizeof (systemd_pen));
+		g_assert_cmpmem (&cid[11], 8, &d->duid_id, sizeof (d->duid_id));
+	}
+}
+
+/*****************************************************************************/
+
+static void
+test_connectivity_state_cmp (void)
+{
+	NMConnectivityState a;
+
+#define _cmp(a, b, cmp) \
+	G_STMT_START { \
+		const NMConnectivityState _a = (a); \
+		const NMConnectivityState _b = (b); \
+		const int _cmp = (cmp); \
+		\
+		g_assert (NM_IN_SET (_cmp, -1, 0, 1)); \
+		g_assert_cmpint (nm_connectivity_state_cmp (_a, _b), ==, _cmp); \
+		g_assert_cmpint (nm_connectivity_state_cmp (_b, _a), ==, -_cmp); \
+	} G_STMT_END
+
+	for (a = NM_CONNECTIVITY_UNKNOWN; a <= NM_CONNECTIVITY_FULL; a++)
+		_cmp (a, a, 0);
+
+	_cmp (NM_CONNECTIVITY_UNKNOWN, NM_CONNECTIVITY_UNKNOWN,  0);
+	_cmp (NM_CONNECTIVITY_UNKNOWN, NM_CONNECTIVITY_NONE,    -1);
+	_cmp (NM_CONNECTIVITY_UNKNOWN, NM_CONNECTIVITY_LIMITED, -1);
+	_cmp (NM_CONNECTIVITY_UNKNOWN, NM_CONNECTIVITY_PORTAL,  -1);
+	_cmp (NM_CONNECTIVITY_UNKNOWN, NM_CONNECTIVITY_FULL,    -1);
+
+	_cmp (NM_CONNECTIVITY_NONE,    NM_CONNECTIVITY_UNKNOWN,  1);
+	_cmp (NM_CONNECTIVITY_NONE,    NM_CONNECTIVITY_NONE,     0);
+	_cmp (NM_CONNECTIVITY_NONE,    NM_CONNECTIVITY_LIMITED, -1);
+	_cmp (NM_CONNECTIVITY_NONE,    NM_CONNECTIVITY_PORTAL,  -1);
+	_cmp (NM_CONNECTIVITY_NONE,    NM_CONNECTIVITY_FULL,    -1);
+
+	_cmp (NM_CONNECTIVITY_LIMITED, NM_CONNECTIVITY_UNKNOWN,  1);
+	_cmp (NM_CONNECTIVITY_LIMITED, NM_CONNECTIVITY_NONE,     1);
+	_cmp (NM_CONNECTIVITY_LIMITED, NM_CONNECTIVITY_LIMITED,  0);
+	_cmp (NM_CONNECTIVITY_LIMITED, NM_CONNECTIVITY_PORTAL,  -1);
+	_cmp (NM_CONNECTIVITY_LIMITED, NM_CONNECTIVITY_FULL,    -1);
+
+	_cmp (NM_CONNECTIVITY_PORTAL,  NM_CONNECTIVITY_UNKNOWN,  1);
+	_cmp (NM_CONNECTIVITY_PORTAL,  NM_CONNECTIVITY_NONE,     1);
+	_cmp (NM_CONNECTIVITY_PORTAL,  NM_CONNECTIVITY_LIMITED,  1);
+	_cmp (NM_CONNECTIVITY_PORTAL,  NM_CONNECTIVITY_PORTAL,   0);
+	_cmp (NM_CONNECTIVITY_PORTAL,  NM_CONNECTIVITY_FULL,    -1);
+
+	_cmp (NM_CONNECTIVITY_FULL,    NM_CONNECTIVITY_UNKNOWN,  1);
+	_cmp (NM_CONNECTIVITY_FULL,    NM_CONNECTIVITY_NONE,     1);
+	_cmp (NM_CONNECTIVITY_FULL,    NM_CONNECTIVITY_LIMITED,  1);
+	_cmp (NM_CONNECTIVITY_FULL,    NM_CONNECTIVITY_PORTAL,   1);
+	_cmp (NM_CONNECTIVITY_FULL,    NM_CONNECTIVITY_FULL,     0);
+
+#undef _cmp
+}
+
+/*****************************************************************************/
+
 NMTST_DEFINE ();
 
 int
@@ -1891,6 +2121,15 @@ main (int argc, char **argv)
 	g_test_add_func ("/general/stable-id/parse", test_stable_id_parse);
 	g_test_add_func ("/general/stable-id/generated-complete", test_stable_id_generated_complete);
 
+	g_test_add_func ("/general/machine-id/read", test_machine_id_read);
+
+	g_test_add_func ("/general/test_dns_create_resolv_conf", test_dns_create_resolv_conf);
+
+	g_test_add_data_func ("/general/nm_utils_dhcp_client_id_systemd_node_specific/0", GINT_TO_POINTER (0), test_nm_utils_dhcp_client_id_systemd_node_specific);
+	g_test_add_data_func ("/general/nm_utils_dhcp_client_id_systemd_node_specific/1", GINT_TO_POINTER (1), test_nm_utils_dhcp_client_id_systemd_node_specific);
+
+	g_test_add_func ("/core/general/test_connectivity_state_cmp", test_connectivity_state_cmp);
+
 	return g_test_run ();
 }
 
diff --git a/src/tests/test-ip6-config.c b/src/tests/test-ip6-config.c
index a03d89b0..5b255068 100644
--- a/src/tests/test-ip6-config.c
+++ b/src/tests/test-ip6-config.c
@@ -22,6 +22,7 @@
 
 #include 
 #include 
+#include 
 
 #include "nm-ip6-config.h"
 
diff --git a/src/tests/test-systemd.c b/src/tests/test-systemd.c
index ab5fed22..4660bd0d 100644
--- a/src/tests/test-systemd.c
+++ b/src/tests/test-systemd.c
@@ -20,6 +20,7 @@
 #include "nm-default.h"
 
 #include "systemd/nm-sd.h"
+#include "systemd/nm-sd-utils.h"
 
 #include "nm-test-utils-core.h"
 
@@ -173,6 +174,50 @@ test_sd_event (void)
 
 /*****************************************************************************/
 
+static void
+test_path_equal (void)
+{
+#define _path_equal_check1(path, kill_dots, expected) \
+	G_STMT_START { \
+		const gboolean _kill_dots = (kill_dots); \
+		const char *_path0 = (path); \
+		const char *_expected = (expected); \
+		gs_free char *_path = g_strdup (_path0); \
+		const char *_path_result; \
+		\
+		if (   !_kill_dots \
+		    && !nm_sd_utils_path_equal (_path0, _expected)) \
+			g_error ("Paths \"%s\" and \"%s\" don't compare equal", _path0, _expected); \
+		\
+		_path_result = nm_sd_utils_path_simplify (_path, _kill_dots); \
+		g_assert (_path_result == _path); \
+		g_assert_cmpstr (_path, ==, _expected); \
+	} G_STMT_END
+
+#define _path_equal_check(path, expected_no_kill_dots, expected_kill_dots) \
+	G_STMT_START { \
+		_path_equal_check1 (path, FALSE, expected_no_kill_dots); \
+		_path_equal_check1 (path, TRUE,  expected_kill_dots ?: expected_no_kill_dots); \
+	} G_STMT_END
+
+	_path_equal_check ("",                  "",                NULL);
+	_path_equal_check (".",                 ".",               "");
+	_path_equal_check ("..",                "..",              NULL);
+	_path_equal_check ("/..",               "/..",             NULL);
+	_path_equal_check ("//..",              "/..",             NULL);
+	_path_equal_check ("/.",                "/.",              "/");
+	_path_equal_check ("./",                ".",               "");
+	_path_equal_check ("./.",               "./.",             "");
+	_path_equal_check (".///.",             "./.",             "");
+	_path_equal_check (".///./",            "./.",             "");
+	_path_equal_check (".////",             ".",               "");
+	_path_equal_check ("//..//foo/",        "/../foo",         NULL);
+	_path_equal_check ("///foo//./bar/.",   "/foo/./bar/.",    "/foo/bar");
+	_path_equal_check (".//./foo//./bar/.", "././foo/./bar/.", "foo/bar");
+}
+
+/*****************************************************************************/
+
 NMTST_DEFINE ();
 
 int
@@ -183,6 +228,7 @@ main (int argc, char **argv)
 	g_test_add_func ("/systemd/dhcp/create", test_dhcp_create);
 	g_test_add_func ("/systemd/lldp/create", test_lldp_create);
 	g_test_add_func ("/systemd/sd-event", test_sd_event);
+	g_test_add_func ("/systemd/test_path_equal", test_path_equal);
 
 	return g_test_run ();
 }
diff --git a/src/vpn/nm-vpn-connection.c b/src/vpn/nm-vpn-connection.c
index bd847d75..3b3a97f4 100644
--- a/src/vpn/nm-vpn-connection.c
+++ b/src/vpn/nm-vpn-connection.c
@@ -729,15 +729,23 @@ add_ip4_vpn_gateway_route (NMIP4Config *config,
 		const NMPlatformIP4Route *r = NMP_OBJECT_CAST_IP4_ROUTE (route_resolved);
 
 		if (r->ifindex == ifindex) {
+			const NMPObject *obj;
+
 			/* `ip route get` always resolves the route, even if the destination is unreachable.
 			 * In which case, it pretends the destination is directly reachable.
 			 *
-			 * So, only accept direct routes, if @vpn_gw is a private network. */
-			if (   nm_platform_route_table_is_main (r->table_coerced)
-			    && (   r->gateway
-			        || nm_utils_ip_is_site_local (AF_INET, &vpn_gw))) {
-				parent_gw = r->gateway;
-				has_parent_gw = TRUE;
+			 * So, only accept direct routes if @vpn_gw is a private network
+			 * or if the parent device also has a direct default route */
+			if (nm_platform_route_table_is_main (r->table_coerced)) {
+				if (r->gateway) {
+					parent_gw = r->gateway;
+					has_parent_gw = TRUE;
+				} else if (nm_utils_ip_is_site_local (AF_INET, &vpn_gw)) {
+					has_parent_gw = TRUE;
+				} else if (   (obj = nm_device_get_best_default_route (parent_device, AF_INET))
+				           && !NMP_OBJECT_CAST_IP4_ROUTE (obj)->gateway) {
+					has_parent_gw = TRUE;
+				}
 			}
 		}
 	}
@@ -803,15 +811,23 @@ add_ip6_vpn_gateway_route (NMIP6Config *config,
 		const NMPlatformIP6Route *r = NMP_OBJECT_CAST_IP6_ROUTE (route_resolved);
 
 		if (r->ifindex == ifindex) {
+			const NMPObject *obj;
+
 			/* `ip route get` always resolves the route, even if the destination is unreachable.
 			 * In which case, it pretends the destination is directly reachable.
 			 *
-			 * So, only accept direct routes, if @vpn_gw is a private network. */
-			if (   nm_platform_route_table_is_main (r->table_coerced)
-			    && (   !IN6_IS_ADDR_UNSPECIFIED (&r->gateway)
-			        || nm_utils_ip_is_site_local (AF_INET6, &vpn_gw))) {
-				parent_gw = &r->gateway;
-				has_parent_gw = TRUE;
+			 * So, only accept direct routes if @vpn_gw is a private network
+			 * or if the parent device also has a direct default route */
+			if (nm_platform_route_table_is_main (r->table_coerced)) {
+				if (!IN6_IS_ADDR_UNSPECIFIED (&r->gateway)) {
+					parent_gw = &r->gateway;
+					has_parent_gw = TRUE;
+				} else if (nm_utils_ip_is_site_local (AF_INET6, &vpn_gw)) {
+					has_parent_gw = TRUE;
+				} else if (   (obj = nm_device_get_best_default_route (parent_device, AF_INET6))
+				           && IN6_IS_ADDR_UNSPECIFIED (&NMP_OBJECT_CAST_IP6_ROUTE (obj)->gateway)) {
+					has_parent_gw = TRUE;
+				}
 			}
 		}
 	}
diff --git a/tools/check-docs.sh b/tools/check-docs.sh
index 9dcdb1ef..b6fca6e0 100755
--- a/tools/check-docs.sh
+++ b/tools/check-docs.sh
@@ -1,22 +1,73 @@
-#!/bin/sh
+#!/bin/bash
 
-SOURCEDIR=$1
+set -e
+
+export LANG=C
+
+die() {
+    printf '%s\n' "$@" >&2
+    exit 1
+}
+
+word_regex() {
+    tr '\n|<>\\' ' ' \
+    | sed -e 's, *$,\\>,' \
+          -e 's,^ *,\\<,' \
+          -e 's, \+,\\>\\|\\<,g'
+}
+
+same_lines() {
+    diff <(printf "%s\n" "$1" | sed '/^$/d' | sort) \
+         <(printf "%s\n" "$2" | sed '/^$/d' | sort) >&2
+}
+
+libnm_headers() {
+    (
+        ls -1 "$1"libnm/*.h "$1"libnm-core/*.h
+        if [ -n "$2" ]; then
+            ls -1 "$2"/libnm/*.h "$2"/libnm-core/*.h
+        fi
+    ) | sort | uniq
+}
+
+
+SOURCEDIR="$1"
+BUILDDIR="$2"
+if test "$SOURCEDIR" == "$BUILDDIR"; then
+    BUILDDIR=
+fi
 [ -n "$SOURCEDIR" ] && SOURCEDIR="$SOURCEDIR/"
 
+
 # Check that the D-Bus API docs contain all known interfaces
-if (sed -n 's/.*&2; then
-	echo "*** Error: D-Bus interfaces not included in docs/api/network-manager-docs.xml ***" >&2
-	exit 1
+F1="$(sed -n 's,^      $,\1,p' "$SOURCEDIR"docs/api/network-manager-docs.xml)"
+F1_EXTRA="
+org.freedesktop.NetworkManager.Device.WiMax.xml
+org.freedesktop.NetworkManager.WiMax.Nsp.xml
+"
+F2="$(cd "$SOURCEDIR"introspection; ls -1 *.xml)"
+if ! same_lines "$F1"$'\n'"$F1_EXTRA" "$F2" ; then
+    die "*** Error: D-Bus interfaces not included in docs/api/network-manager-docs.xml ***"
 fi
 
+
 # Check that files that define types that are in public libnm API are included in libnm documentation.
-# Don't complain about readability or I'll rewrite this in Perl.
-if (sed -n 's/.*&2; then
-	echo "*** Error: libnm classes not included in docs/libnm/libnm-docs.xml ***" >&2
-	exit 1
+F1="$(sed -n 's/.*
Date: Tue, 26 Mar 2019 23:25:23 +0100
Subject: New upstream version 1.16.0

---
 Makefile.am                                        |   789 +-
 Makefile.examples                                  |     1 +
 Makefile.in                                        |  3902 +++---
 NEWS                                               |    95 +-
 README                                             |    20 +-
 TODO                                               |    14 +-
 clients/cli/agent.c                                |    24 +-
 clients/cli/common.c                               |   108 +-
 clients/cli/common.h                               |    15 +-
 clients/cli/connections.c                          |   477 +-
 clients/cli/connections.h                          |     2 +
 clients/cli/devices.c                              |   463 +-
 clients/cli/general.c                              |    49 +-
 clients/cli/meson.build                            |     8 +-
 clients/cli/nmcli.c                                |    49 +-
 clients/cli/nmcli.h                                |     6 +-
 clients/cli/polkit-agent.c                         |    16 +-
 clients/cli/settings.c                             |    17 +-
 clients/cli/settings.h                             |     3 +-
 clients/cli/utils.c                                |    65 +-
 clients/cli/utils.h                                |     6 +-
 clients/common/meson.build                         |    18 +-
 clients/common/nm-client-utils.c                   |     3 +-
 clients/common/nm-client-utils.h                   |     7 +
 clients/common/nm-meta-setting-desc.c              |   695 +-
 clients/common/nm-meta-setting-desc.h              |     5 +-
 clients/common/nm-polkit-listener.c                |     3 +-
 clients/common/nm-polkit-listener.h                |     4 +-
 clients/common/nm-secret-agent-simple.c            |  1155 +-
 clients/common/nm-secret-agent-simple.h            |    42 +-
 clients/common/nm-vpn-helpers.c                    |   569 +-
 clients/common/nm-vpn-helpers.h                    |     3 +
 clients/common/settings-docs.h                     |    27 +-
 clients/common/settings-docs.h.in                  |    27 +-
 clients/common/tests/meson.build                   |     4 +-
 clients/common/tests/test-general.c                |    96 +
 clients/common/tests/wg-test0.conf                 |    18 +
 clients/common/tests/wg-test1.conf                 |     3 +
 clients/common/tests/wg-test2.conf                 |     8 +
 clients/common/tests/wg-test3.conf                 |     3 +
 clients/meson.build                                |     4 +-
 clients/nm-online.c                                |     4 +-
 .../test-client.check-on-disk/test_001.expected    |   284 +-
 .../test-client.check-on-disk/test_002.expected    |   168 +-
 .../test-client.check-on-disk/test_003.expected    |  2086 +--
 .../test-client.check-on-disk/test_004.expected    | 13264 ++++++++++---------
 clients/tests/test-client.py                       |    22 +-
 clients/tui/meson.build                            |     8 +-
 clients/tui/newt/meson.build                       |     6 +-
 clients/tui/newt/nmt-newt-button-box.c             |     3 +-
 clients/tui/newt/nmt-newt-container.c              |     3 +-
 clients/tui/newt/nmt-newt-entry-numeric.c          |     4 +-
 clients/tui/newt/nmt-newt-entry.c                  |     2 -
 clients/tui/newt/nmt-newt-form.c                   |     1 -
 clients/tui/newt/nmt-newt-grid.c                   |     2 -
 clients/tui/newt/nmt-newt-label.c                  |     3 +-
 clients/tui/newt/nmt-newt-listbox.c                |     2 +-
 clients/tui/newt/nmt-newt-section.c                |     3 +-
 clients/tui/newt/nmt-newt-stack.c                  |     2 -
 clients/tui/newt/nmt-newt-textbox.c                |     3 +-
 clients/tui/newt/nmt-newt-utils.c                  |     1 -
 clients/tui/nm-editor-bindings.c                   |     7 +-
 clients/tui/nmt-address-list.c                     |     4 +-
 clients/tui/nmt-device-entry.c                     |     4 +-
 clients/tui/nmt-editor-grid.c                      |     2 -
 clients/tui/nmt-mac-entry.c                        |     2 -
 clients/tui/nmt-slave-list.c                       |     2 +-
 clients/tui/nmt-utils.c                            |     2 -
 clients/tui/nmt-widget-list.c                      |     4 +-
 clients/tui/nmtui-connect.c                        |     8 +-
 clients/tui/nmtui.c                                |     4 +-
 config.h.in                                        |     4 +
 config.h.meson                                     |     4 +
 configure                                          |   201 +-
 configure.ac                                       |    36 +-
 data/85-nm-unmanaged.rules                         |     3 +
 data/NetworkManager.service.in                     |     1 -
 data/meson.build                                   |    29 +-
 data/org.freedesktop.NetworkManager.policy.in.in   |    22 +-
 data/org.freedesktop.NetworkManager.service.in     |    11 -
 dispatcher/meson.build                             |    12 +-
 dispatcher/nm-dispatcher-utils.c                   |     4 +-
 dispatcher/nm-dispatcher.c                         |     4 +-
 dispatcher/tests/meson.build                       |     6 +-
 dispatcher/tests/test-dispatcher-envp.c            |     1 -
 docs/api/Makefile.am                               |    51 +-
 docs/api/Makefile.in                               |    52 +-
 ...g.freedesktop.NetworkManager.Device.WifiP2P.xml |   124 +
 ....freedesktop.NetworkManager.Device.Wireless.xml |     2 +-
 .../dbus-org.freedesktop.NetworkManager.Device.xml |    26 +-
 docs/api/dbus-org.freedesktop.NetworkManager.xml   |    67 +-
 docs/api/html/NetworkManager.conf.html             |    97 +-
 docs/api/html/NetworkManager.devhelp2              |   566 +-
 docs/api/html/NetworkManager.html                  |    23 +-
 docs/api/html/ch01.html                            |     6 +
 ...org.freedesktop.NetworkManager.AccessPoint.html |     4 +-
 ...-org.freedesktop.NetworkManager.Checkpoint.html |     4 +-
 ...org.freedesktop.NetworkManager.Device.Adsl.html |     4 +-
 ...reedesktop.NetworkManager.Device.Bluetooth.html |    12 +-
 ...org.freedesktop.NetworkManager.Device.Bond.html |     8 +-
 ...g.freedesktop.NetworkManager.Device.Bridge.html |     8 +-
 ...rg.freedesktop.NetworkManager.Device.Dummy.html |     8 +-
 ....freedesktop.NetworkManager.Device.Generic.html |    12 +-
 ...freedesktop.NetworkManager.Device.IPTunnel.html |    12 +-
 ...eedesktop.NetworkManager.Device.Infiniband.html |     8 +-
 ...g.freedesktop.NetworkManager.Device.Lowpan.html |     6 +-
 ...g.freedesktop.NetworkManager.Device.Macsec.html |     4 +-
 ....freedesktop.NetworkManager.Device.Macvlan.html |     4 +-
 ...rg.freedesktop.NetworkManager.Device.Modem.html |     4 +-
 ...freedesktop.NetworkManager.Device.OlpcMesh.html |     4 +-
 ...reedesktop.NetworkManager.Device.OvsBridge.html |     4 +-
 ...desktop.NetworkManager.Device.OvsInterface.html |     2 +-
 ....freedesktop.NetworkManager.Device.OvsPort.html |     4 +-
 ...-org.freedesktop.NetworkManager.Device.Ppp.html |     2 +-
 ...org.freedesktop.NetworkManager.Device.Team.html |     4 +-
 ...-org.freedesktop.NetworkManager.Device.Tun.html |     4 +-
 ...org.freedesktop.NetworkManager.Device.Veth.html |     4 +-
 ...org.freedesktop.NetworkManager.Device.Vlan.html |     4 +-
 ...rg.freedesktop.NetworkManager.Device.Vxlan.html |     8 +-
 ....freedesktop.NetworkManager.Device.WifiP2P.html |   171 +
 ...reedesktop.NetworkManager.Device.WireGuard.html |     8 +-
 ...rg.freedesktop.NetworkManager.Device.Wired.html |    12 +-
 ...freedesktop.NetworkManager.Device.Wireless.html |    10 +-
 ...org.freedesktop.NetworkManager.Device.Wpan.html |     2 +-
 ...dbus-org.freedesktop.NetworkManager.Device.html |    30 +-
 ...org.freedesktop.NetworkManager.WifiP2PPeer.html |   163 +
 .../html/gdbus-org.freedesktop.NetworkManager.html |    77 +-
 docs/api/html/index.html                           |    33 +-
 docs/api/html/ix01.html                            |  1456 +-
 docs/api/html/manpages.html                        |     2 +-
 docs/api/html/nm-dbus-types.html                   |   148 +-
 docs/api/html/nm-online.html                       |    24 +-
 docs/api/html/nm-openvswitch.html                  |    22 +-
 docs/api/html/nm-settings-ifcfg-rh.html            |    92 +-
 docs/api/html/nm-settings-keyfile.html             |    29 +-
 docs/api/html/nm-settings.html                     |   156 +-
 docs/api/html/nmcli-examples.html                  |    33 +-
 docs/api/html/nmcli.html                           |   166 +-
 docs/api/html/ref-dbus-checkpoint.html             |     4 +-
 docs/api/html/ref-dbus-devices.html                |    19 +-
 docs/api/html/ref-dbus-wifi-p2p-peers.html         |    32 +
 docs/api/html/ref-settings.html                    |     6 +
 docs/api/html/settings-6lowpan.html                |     2 +-
 docs/api/html/settings-802-11-olpc-mesh.html       |     2 +-
 .../html/settings-802-11-wireless-security.html    |     8 +-
 docs/api/html/settings-802-11-wireless.html        |    10 +-
 docs/api/html/settings-802-1x.html                 |     2 +-
 docs/api/html/settings-802-3-ethernet.html         |    10 +-
 docs/api/html/settings-adsl.html                   |     2 +-
 docs/api/html/settings-bluetooth.html              |     2 +-
 docs/api/html/settings-bond.html                   |     2 +-
 docs/api/html/settings-bridge-port.html            |     2 +-
 docs/api/html/settings-bridge.html                 |     2 +-
 docs/api/html/settings-cdma.html                   |     2 +-
 docs/api/html/settings-connection.html             |     4 +-
 docs/api/html/settings-dcb.html                    |     2 +-
 docs/api/html/settings-dummy.html                  |     2 +-
 docs/api/html/settings-ethtool.html                |     2 +-
 docs/api/html/settings-generic.html                |     2 +-
 docs/api/html/settings-gsm.html                    |     4 +-
 docs/api/html/settings-infiniband.html             |     2 +-
 docs/api/html/settings-ip-tunnel.html              |     2 +-
 docs/api/html/settings-ipv4.html                   |     4 +-
 docs/api/html/settings-ipv6.html                   |     4 +-
 docs/api/html/settings-macsec.html                 |     2 +-
 docs/api/html/settings-macvlan.html                |     2 +-
 docs/api/html/settings-match.html                  |     2 +-
 docs/api/html/settings-ovs-bridge.html             |     2 +-
 docs/api/html/settings-ovs-interface.html          |     2 +-
 docs/api/html/settings-ovs-patch.html              |     2 +-
 docs/api/html/settings-ovs-port.html               |     2 +-
 docs/api/html/settings-ppp.html                    |     2 +-
 docs/api/html/settings-pppoe.html                  |     2 +-
 docs/api/html/settings-proxy.html                  |     2 +-
 docs/api/html/settings-serial.html                 |     2 +-
 docs/api/html/settings-sriov.html                  |     2 +-
 docs/api/html/settings-tc.html                     |     2 +-
 docs/api/html/settings-team-port.html              |     4 +-
 docs/api/html/settings-team.html                   |     4 +-
 docs/api/html/settings-tun.html                    |     2 +-
 docs/api/html/settings-user.html                   |     2 +-
 docs/api/html/settings-vlan.html                   |     2 +-
 docs/api/html/settings-vpn.html                    |     2 +-
 docs/api/html/settings-vxlan.html                  |     6 +-
 docs/api/html/settings-wifi-p2p.html               |    83 +
 docs/api/html/settings-wimax.html                  |     8 +-
 docs/api/html/settings-wireguard.html              |   107 +
 docs/api/html/settings-wpan.html                   |    16 +-
 docs/api/html/spec.html                            |    23 +-
 docs/api/meson.build                               |     6 +-
 docs/api/network-manager-docs.xml                  |    13 +-
 docs/api/settings-spec.xml                         |    40 +-
 docs/api/version.xml                               |     2 +-
 docs/libnm-glib/Makefile.in                        |     1 +
 docs/libnm-glib/html/NMObject.html                 |     4 +-
 docs/libnm-glib/html/NMSecretAgent.html            |     2 +-
 docs/libnm-glib/html/index.html                    |     2 +-
 docs/libnm-glib/meson.build                        |     8 +-
 docs/libnm-glib/version.xml                        |     2 +-
 docs/libnm-util/Makefile.in                        |     1 +
 docs/libnm-util/html/NMSetting.html                |     2 +-
 docs/libnm-util/html/NMSettingConnection.html      |     4 +-
 .../libnm-util/html/NMSettingWirelessSecurity.html |     6 +-
 docs/libnm-util/html/index.html                    |     2 +-
 .../libnm-util/html/libnm-util-NetworkManager.html |     6 +-
 docs/libnm-util/html/libnm-util-nm-utils.html      |    14 +-
 docs/libnm-util/meson.build                        |     8 +-
 docs/libnm-util/version.xml                        |     2 +-
 docs/libnm/Makefile.in                             |     1 +
 docs/libnm/html/NMAccessPoint.html                 |     4 +-
 docs/libnm/html/NMActiveConnection.html            |    38 +-
 docs/libnm/html/NMCheckpoint.html                  |     2 +-
 docs/libnm/html/NMClient.html                      |   189 +-
 docs/libnm/html/NMConnection.html                  |    10 +-
 docs/libnm/html/NMDevice.html                      |   104 +-
 docs/libnm/html/NMDeviceVxlan.html                 |     6 +-
 docs/libnm/html/NMDeviceWifi.html                  |     8 +-
 docs/libnm/html/NMDeviceWifiP2P.html               |   427 +
 docs/libnm/html/NMObject.html                      |     1 +
 docs/libnm/html/NMSetting.html                     |    19 +-
 docs/libnm/html/NMSetting8021x.html                |    12 +-
 docs/libnm/html/NMSettingConnection.html           |     6 +-
 docs/libnm/html/NMSettingGsm.html                  |    98 +-
 docs/libnm/html/NMSettingIPConfig.html             |     5 +-
 docs/libnm/html/NMSettingOvsPort.html              |     4 +-
 docs/libnm/html/NMSettingPpp.html                  |     8 +-
 docs/libnm/html/NMSettingPppoe.html                |     8 +-
 docs/libnm/html/NMSettingProxy.html                |     4 +-
 docs/libnm/html/NMSettingTeam.html                 |   119 +-
 docs/libnm/html/NMSettingTeamPort.html             |     2 +-
 docs/libnm/html/NMSettingVpn.html                  |     8 +-
 docs/libnm/html/NMSettingVxlan.html                |     4 +-
 docs/libnm/html/NMSettingWifiP2P.html              |   233 +
 docs/libnm/html/NMSettingWimax.html                |     4 +-
 docs/libnm/html/NMSettingWireGuard.html            |  1743 +++
 docs/libnm/html/NMSettingWired.html                |     9 +-
 docs/libnm/html/NMSettingWireless.html             |    12 +-
 docs/libnm/html/NMSettingWirelessSecurity.html     |    30 +-
 docs/libnm/html/NMSettingWpan.html                 |   108 +
 docs/libnm/html/NMVpnEditorPlugin.html             |     8 +-
 docs/libnm/html/NMWifiP2PPeer.html                 |   618 +
 docs/libnm/html/NMWimaxNsp.html                    |     4 +-
 docs/libnm/html/api-index-full.html                |  4112 +++---
 docs/libnm/html/ch03.html                          |    12 +-
 docs/libnm/html/ch04.html                          |     6 +
 docs/libnm/html/index.html                         |    20 +-
 docs/libnm/html/libnm-nm-dbus-interface.html       |   312 +-
 docs/libnm/html/libnm-nm-errors.html               |     7 +
 docs/libnm/html/libnm-nm-utils.html                |    67 +-
 docs/libnm/html/libnm-nm-version.html              |    32 +
 docs/libnm/html/libnm.devhelp2                     |   230 +-
 docs/libnm/html/object-tree.html                   |    11 +-
 docs/libnm/html/ref-overview.html                  |     2 +-
 docs/libnm/html/usage.html                         |     2 +-
 docs/libnm/libnm-docs.xml                          |     8 +-
 docs/libnm/libnm-sections.txt                      |   234 +-
 docs/libnm/libnm.types                             |     5 +
 docs/libnm/meson.build                             |    10 +-
 docs/libnm/version.xml                             |     2 +-
 docs/meson.build                                   |     2 +-
 examples/C/glib/meson.build                        |     2 +-
 examples/C/qt/meson.build                          |    10 +-
 examples/dispatcher/70-wifi-wired-exclusive.sh     |     6 +-
 examples/lua/lgi/add-connection.lua                |     2 +-
 examples/lua/lgi/deactivate-all.lua                |     2 +-
 examples/nm-conf.d/30-anon.conf                    |     2 +-
 examples/python/dbus/create-bond.py                |     2 +-
 examples/python/dbus/show-bssids.py                |     2 +-
 examples/python/dbus/vpn.py                        |     2 +-
 examples/python/gi/add_connection.py               |     2 +-
 examples/python/gi/deactivate-all.py               |     2 +-
 examples/python/gi/nm-wg-set                       |   453 +
 examples/shell/nm-logging.sh                       |     2 +-
 introspection/meson.build                          |    28 +-
 ...g.freedesktop.NetworkManager.Device.WifiP2P.xml |    79 +
 ....freedesktop.NetworkManager.Device.Wireless.xml |     2 +-
 .../org.freedesktop.NetworkManager.Device.xml      |    24 +-
 .../org.freedesktop.NetworkManager.WifiP2PPeer.xml |    97 +
 introspection/org.freedesktop.NetworkManager.xml   |    40 +-
 libnm-core/meson.build                             |    30 +-
 libnm-core/nm-connection.c                         |   405 +-
 libnm-core/nm-connection.h                         |     6 +-
 libnm-core/nm-core-enum-types.c.template           |     4 +-
 libnm-core/nm-core-internal.h                      |   222 +-
 libnm-core/nm-core-types.h                         |    10 +-
 libnm-core/nm-crypto.c                             |     1 -
 libnm-core/nm-dbus-interface.h                     |   110 +-
 libnm-core/nm-dbus-types.xml                       |    54 +-
 libnm-core/nm-dbus-utils.c                         |    91 +-
 libnm-core/nm-errors.c                             |     3 +-
 libnm-core/nm-errors.h                             |     2 +
 libnm-core/nm-keyfile-internal.h                   |    15 +
 libnm-core/nm-keyfile-utils.c                      |    61 +-
 libnm-core/nm-keyfile-utils.h                      |    15 +-
 libnm-core/nm-keyfile.c                            |  1119 +-
 libnm-core/nm-property-compare.c                   |     5 +-
 libnm-core/nm-setting-6lowpan.c                    |    80 +-
 libnm-core/nm-setting-8021x.c                      |    10 +-
 libnm-core/nm-setting-8021x.h                      |     9 +-
 libnm-core/nm-setting-adsl.c                       |   225 +-
 libnm-core/nm-setting-bluetooth.c                  |   128 +-
 libnm-core/nm-setting-bond.c                       |   106 +-
 libnm-core/nm-setting-bridge-port.c                |   125 +-
 libnm-core/nm-setting-bridge.c                     |   284 +-
 libnm-core/nm-setting-cdma.c                       |   189 +-
 libnm-core/nm-setting-connection.c                 |   652 +-
 libnm-core/nm-setting-dcb.c                        |   432 +-
 libnm-core/nm-setting-dummy.c                      |    34 +-
 libnm-core/nm-setting-generic.c                    |    19 +-
 libnm-core/nm-setting-gsm.c                        |   367 +-
 libnm-core/nm-setting-gsm.h                        |     8 +-
 libnm-core/nm-setting-infiniband.c                 |   204 +-
 libnm-core/nm-setting-ip-config.c                  |   618 +-
 libnm-core/nm-setting-ip-config.h                  |     4 +-
 libnm-core/nm-setting-ip-tunnel.c                  |   336 +-
 libnm-core/nm-setting-ip4-config.c                 |   229 +-
 libnm-core/nm-setting-ip6-config.c                 |   180 +-
 libnm-core/nm-setting-macsec.c                     |   130 +-
 libnm-core/nm-setting-macvlan.c                    |   158 +-
 libnm-core/nm-setting-match.c                      |    17 +-
 libnm-core/nm-setting-olpc-mesh.c                  |   154 +-
 libnm-core/nm-setting-ovs-bridge.c                 |    66 +-
 libnm-core/nm-setting-ovs-interface.c              |    27 +-
 libnm-core/nm-setting-ovs-patch.c                  |    25 +-
 libnm-core/nm-setting-ovs-port.c                   |   102 +-
 libnm-core/nm-setting-ppp.c                        |   420 +-
 libnm-core/nm-setting-pppoe.c                      |   169 +-
 libnm-core/nm-setting-private.h                    |    29 +-
 libnm-core/nm-setting-proxy.c                      |   136 +-
 libnm-core/nm-setting-serial.c                     |   170 +-
 libnm-core/nm-setting-sriov.c                      |   200 +-
 libnm-core/nm-setting-tc-config.c                  |   267 +-
 libnm-core/nm-setting-team-port.c                  |   331 +-
 libnm-core/nm-setting-team.c                       |   651 +-
 libnm-core/nm-setting-team.h                       |    17 +-
 libnm-core/nm-setting-tun.c                        |   192 +-
 libnm-core/nm-setting-user.c                       |    46 +-
 libnm-core/nm-setting-vlan.c                       |   221 +-
 libnm-core/nm-setting-vpn.c                        |   540 +-
 libnm-core/nm-setting-vxlan.c                      |   417 +-
 libnm-core/nm-setting-wifi-p2p.c                   |   317 +
 libnm-core/nm-setting-wifi-p2p.h                   |    69 +
 libnm-core/nm-setting-wimax.c                      |   130 +-
 libnm-core/nm-setting-wired.c                      |   459 +-
 libnm-core/nm-setting-wired.h                      |    27 +-
 libnm-core/nm-setting-wireguard.c                  |  2499 ++++
 libnm-core/nm-setting-wireguard.h                  |   213 +
 libnm-core/nm-setting-wireless-security.c          |   686 +-
 libnm-core/nm-setting-wireless-security.h          |     9 +-
 libnm-core/nm-setting-wireless.c                   |   510 +-
 libnm-core/nm-setting-wireless.h                   |    32 +-
 libnm-core/nm-setting-wpan.c                       |   191 +-
 libnm-core/nm-setting-wpan.h                       |     9 +
 libnm-core/nm-setting.c                            |  1199 +-
 libnm-core/nm-setting.h                            |    98 +-
 libnm-core/nm-simple-connection.c                  |     5 +
 libnm-core/nm-utils-private.h                      |    18 +-
 libnm-core/nm-utils.c                              |   785 +-
 libnm-core/nm-utils.h                              |     6 +
 libnm-core/nm-version.h                            |    14 +
 libnm-core/nm-vpn-editor-plugin.c                  |    36 +-
 libnm-core/nm-vpn-plugin-info.c                    |   166 +-
 libnm-core/tests/meson.build                       |    14 +-
 libnm-core/tests/test-crypto.c                     |     1 -
 libnm-core/tests/test-general.c                    |   405 +-
 libnm-core/tests/test-keyfile.c                    |     4 +-
 libnm-core/tests/test-secrets.c                    |     2 -
 libnm-core/tests/test-setting.c                    |   692 +-
 libnm-core/tests/test-settings-defaults.c          |     2 -
 libnm-glib/meson.build                             |    83 +-
 libnm-glib/nm-client.c                             |     2 +-
 libnm-glib/nm-object.c                             |     4 +-
 libnm-glib/nm-object.h                             |     2 +-
 libnm-glib/nm-secret-agent.c                       |     6 +-
 libnm-glib/nm-vpn-plugin-utils.c                   |     2 -
 libnm-glib/tests/meson.build                       |     6 +-
 libnm-util/NetworkManager.h                        |     6 +-
 libnm-util/meson.build                             |    37 +-
 libnm-util/nm-connection.h                         |     2 +-
 libnm-util/nm-param-spec-specialized.c             |     4 +-
 libnm-util/nm-setting-8021x.c                      |     4 +-
 libnm-util/nm-setting-bond.c                       |     1 -
 libnm-util/nm-setting-bridge.c                     |     2 +-
 libnm-util/nm-setting-connection.c                 |     4 +-
 libnm-util/nm-setting-dcb.c                        |     2 +-
 libnm-util/nm-setting-vpn.c                        |     1 -
 libnm-util/nm-setting-wireless-security.c          |     2 +-
 libnm-util/nm-setting-wireless-security.h          |     4 +-
 libnm-util/nm-setting.c                            |     4 +-
 libnm-util/nm-setting.h                            |     2 +-
 libnm-util/nm-utils.c                              |    14 +-
 libnm-util/tests/meson.build                       |    10 +-
 libnm-util/tests/test-general.c                    |     4 +-
 libnm/NetworkManager.h                             |     6 +-
 libnm/fake-typelib/meson.build                     |     8 +-
 libnm/generate-plugin-docs.pl                      |     2 +-
 libnm/libnm.ver                                    |    74 +
 libnm/meson.build                                  |    79 +-
 libnm/nm-access-point.c                            |     2 -
 libnm/nm-active-connection.c                       |    10 +-
 libnm/nm-autoptr.h                                 |     4 +-
 libnm/nm-checkpoint.c                              |     2 +-
 libnm/nm-client.c                                  |   181 +-
 libnm/nm-client.h                                  |    19 +-
 libnm/nm-dbus-helpers.c                            |     4 +-
 libnm/nm-device-adsl.c                             |     3 -
 libnm/nm-device-bond.c                             |     4 +-
 libnm/nm-device-bridge.c                           |     4 +-
 libnm/nm-device-bt.c                               |     4 +-
 libnm/nm-device-dummy.c                            |     3 +-
 libnm/nm-device-ethernet.c                         |     4 +-
 libnm/nm-device-generic.c                          |     3 +-
 libnm/nm-device-infiniband.c                       |     4 +-
 libnm/nm-device-ip-tunnel.c                        |     4 +-
 libnm/nm-device-macsec.c                           |     3 +-
 libnm/nm-device-macvlan.c                          |     4 +-
 libnm/nm-device-modem.c                            |     4 +-
 libnm/nm-device-olpc-mesh.c                        |     4 +-
 libnm/nm-device-ovs-bridge.c                       |     3 +-
 libnm/nm-device-ovs-interface.c                    |     3 +-
 libnm/nm-device-ovs-port.c                         |     4 +-
 libnm/nm-device-team.c                             |     4 +-
 libnm/nm-device-tun.c                              |     5 +-
 libnm/nm-device-vlan.c                             |     4 +-
 libnm/nm-device-vxlan.c                            |     6 +-
 libnm/nm-device-wifi-p2p.c                         |   502 +
 libnm/nm-device-wifi-p2p.h                         |    80 +
 libnm/nm-device-wifi.c                             |     7 +-
 libnm/nm-device-wimax.c                            |     4 +-
 libnm/nm-device-wpan.c                             |     3 +-
 libnm/nm-device.c                                  |    88 +-
 libnm/nm-device.h                                  |     4 +
 libnm/nm-dhcp-config.c                             |     3 +-
 libnm/nm-dhcp4-config.c                            |     1 +
 libnm/nm-dhcp6-config.c                            |     1 +
 libnm/nm-dns-manager.c                             |     3 -
 libnm/nm-ip-config.c                               |     3 +-
 libnm/nm-ip4-config.c                              |     1 +
 libnm/nm-ip6-config.c                              |     1 +
 libnm/nm-libnm-utils.c                             |     2 +-
 libnm/nm-manager.c                                 |   154 +-
 libnm/nm-manager.h                                 |    17 +
 libnm/nm-object.c                                  |     3 +-
 libnm/nm-object.h                                  |     2 +-
 libnm/nm-property-docs.xml                         |    31 +-
 libnm/nm-remote-connection.c                       |     4 +-
 libnm/nm-remote-settings.c                         |     3 -
 libnm/nm-secret-agent-old.c                        |   524 +-
 libnm/nm-settings-docs-overrides.xml               |     9 +-
 libnm/nm-settings-docs.xml                         |    36 +-
 libnm/nm-settings-ifcfg-rh-docs.xml                |     6 +-
 libnm/nm-settings-keyfile-docs.xml                 |     7 +
 libnm/nm-types.h                                   |     4 +-
 libnm/nm-vpn-connection.c                          |     3 +-
 libnm/nm-vpn-plugin-old.c                          |     1 -
 libnm/nm-vpn-service-plugin.c                      |    82 +-
 libnm/nm-wifi-p2p-peer.c                           |   600 +
 libnm/nm-wifi-p2p-peer.h                           |    89 +
 libnm/nm-wimax-nsp.c                               |     4 +-
 libnm/tests/meson.build                            |     7 +-
 libnm/tests/test-general.c                         |   274 +
 libnm/tests/test-nm-client.c                       |     1 -
 libnm/tests/test-remote-settings-client.c          |     1 -
 libnm/tests/test-secret-agent.c                    |     1 -
 m4/compiler_options.m4                             |    20 +-
 man/NetworkManager.8                               |    19 +-
 man/NetworkManager.conf.5                          |    90 +-
 man/NetworkManager.conf.xml                        |    92 +-
 man/NetworkManager.xml                             |    19 +-
 man/common.ent.in                                  |     1 +
 man/meson.build                                    |    13 +-
 man/nm-initrd-generator.8                          |     6 +-
 man/nm-online.1                                    |    25 +-
 man/nm-online.xml                                  |    49 +-
 man/nm-openvswitch.7                               |    16 +-
 man/nm-openvswitch.xml                             |    18 +-
 man/nm-settings-ifcfg-rh.5                         |    60 +-
 man/nm-settings-ifcfg-rh.xml                       |     8 +-
 man/nm-settings-keyfile.5                          |    43 +-
 man/nm-settings-keyfile.xml                        |     6 +-
 man/nm-settings.5                                  |   182 +-
 man/nm-settings.xml                                |    38 +-
 man/nmcli-examples.7                               |    42 +-
 man/nmcli-examples.xml                             |    13 +
 man/nmcli.1                                        |   190 +-
 man/nmcli.xml                                      |   236 +-
 man/nmtui.1                                        |     6 +-
 meson.build                                        |    94 +-
 meson_options.txt                                  |     8 +-
 po/POTFILES.in                                     |    12 +-
 po/ar.po                                           |  8741 ++++++------
 po/as.po                                           | 10190 +++++++-------
 po/be@latin.po                                     |  8077 ++++++-----
 po/bg.po                                           |  9361 +++++++------
 po/bn_IN.po                                        | 10162 +++++++-------
 po/bs.po                                           |  8120 +++++++-----
 po/ca.po                                           |  8021 ++++++-----
 po/cs.po                                           |  7759 ++++++-----
 po/da.po                                           | 10635 ++++++++-------
 po/de.po                                           |  3762 ++++--
 po/dz.po                                           |  8759 ++++++------
 po/el.po                                           |  8021 ++++++-----
 po/en_CA.po                                        |  8936 +++++++------
 po/en_GB.po                                        |  9462 +++++++------
 po/eo.po                                           |  7955 ++++++-----
 po/es.po                                           |  4486 ++++---
 po/et.po                                           |  7406 ++++++-----
 po/eu.po                                           |  9164 +++++++------
 po/fi.po                                           |  9198 +++++++------
 po/fr.po                                           |  5102 ++++---
 po/gd.po                                           |  9662 ++++++++------
 po/gl.po                                           |  9267 +++++++------
 po/gu.po                                           | 10141 +++++++-------
 po/he.po                                           |  8065 ++++++-----
 po/hi.po                                           |  7968 ++++++-----
 po/hr.po                                           |  9353 +++++++------
 po/hu.po                                           |  9684 ++++++++------
 po/id.po                                           |  5359 ++++----
 po/it.po                                           |  4244 ++++--
 po/ja.po                                           |  2568 ++--
 po/ka.po                                           |  7383 ++++++-----
 po/kn.po                                           |  7917 ++++++-----
 po/ko.po                                           |  4359 +++---
 po/ku.po                                           |  7373 ++++++-----
 po/lt.po                                           |  9810 ++++++++------
 po/lv.po                                           |  9025 +++++++------
 po/mk.po                                           |  8066 ++++++-----
 po/ml.po                                           |  7359 +++++-----
 po/mr.po                                           | 10398 ++++++++-------
 po/nb.po                                           |  8141 +++++++-----
 po/ne.po                                           |  8739 ++++++------
 po/nl.po                                           |  7403 ++++++-----
 po/oc.po                                           |  9004 +++++++------
 po/or.po                                           |  7347 +++++-----
 po/pa.po                                           |  7335 +++++-----
 po/pl.po                                           |  4338 +++---
 po/pt.po                                           |  8743 ++++++------
 po/pt_BR.po                                        |  4302 +++---
 po/ru.po                                           |  4362 ++++--
 po/rw.po                                           |  8720 ++++++------
 po/sk.po                                           |  8709 ++++++------
 po/sl.po                                           |  9477 +++++++------
 po/sq.po                                           |  8155 +++++++-----
 po/sr.po                                           |  7620 ++++++-----
 po/sr@latin.po                                     |  7172 +++++-----
 po/sv.po                                           |  5781 ++++----
 po/ta.po                                           |  7916 ++++++-----
 po/te.po                                           | 10351 ++++++++-------
 po/th.po                                           |  7383 ++++++-----
 po/tr.po                                           |  7933 ++++++-----
 po/uk.po                                           |  5300 ++++----
 po/vi.po                                           |  7399 ++++++-----
 po/wa.po                                           |  8115 +++++++-----
 po/zh_CN.po                                        |  3768 +++---
 po/zh_HK.po                                        |  7385 ++++++-----
 po/zh_TW.po                                        |  4559 ++++---
 shared/c-rbtree/src/c-rbtree-private.h             |    40 +
 shared/c-rbtree/src/c-rbtree.c                     |  1118 ++
 shared/c-rbtree/src/c-rbtree.h                     |   430 +
 shared/c-siphash/src/c-siphash.c                   |     4 +-
 shared/meson.build                                 |   234 +-
 shared/n-acd/src/n-acd-bpf-fallback.c              |    29 +
 shared/n-acd/src/n-acd-bpf.c                       |   316 +
 shared/n-acd/src/n-acd-private.h                   |   172 +
 shared/n-acd/src/n-acd-probe.c                     |   636 +
 shared/n-acd/src/n-acd.c                           |  1560 +--
 shared/n-acd/src/n-acd.h                           |   126 +-
 shared/n-acd/src/util/timer.c                      |   189 +
 shared/n-acd/src/util/timer.h                      |    53 +
 shared/nm-common-macros.h                          |     1 +
 shared/nm-default.h                                |    11 +-
 shared/nm-ethtool-utils.c                          |     2 +-
 shared/nm-meta-setting.c                           |    24 +-
 shared/nm-meta-setting.h                           |     2 +
 shared/nm-test-utils-impl.c                        |     1 -
 shared/nm-utils/nm-c-list.h                        |    36 +
 shared/nm-utils/nm-dedup-multi.c                   |    61 +-
 shared/nm-utils/nm-dedup-multi.h                   |     8 +-
 shared/nm-utils/nm-errno.c                         |   198 +
 shared/nm-utils/nm-errno.h                         |   185 +
 shared/nm-utils/nm-glib.h                          |    32 +-
 shared/nm-utils/nm-hash-utils.c                    |     2 +-
 shared/nm-utils/nm-hash-utils.h                    |     3 +
 shared/nm-utils/nm-io-utils.c                      |    81 +-
 shared/nm-utils/nm-jansson.h                       |    10 +-
 shared/nm-utils/nm-logging-fwd.h                   |   113 +
 shared/nm-utils/nm-macros-internal.h               |   215 +-
 shared/nm-utils/nm-random-utils.c                  |     2 +-
 shared/nm-utils/nm-secret-utils.c                  |    27 +
 shared/nm-utils/nm-secret-utils.h                  |    29 +-
 shared/nm-utils/nm-shared-utils.c                  |   709 +-
 shared/nm-utils/nm-shared-utils.h                  |   300 +-
 shared/nm-utils/nm-test-utils.h                    |   145 +-
 shared/nm-utils/nm-time-utils.c                    |   273 +
 shared/nm-utils/nm-time-utils.h                    |    45 +
 shared/nm-utils/nm-vpn-plugin-utils.c              |    46 +-
 shared/nm-utils/tests/test-shared-general.c        |   267 +
 shared/nm-utils/unaligned.h                        |    24 +-
 shared/nm-version-macros.h                         |     8 +-
 shared/nm-version-macros.h.in                      |     4 +-
 shared/systemd/nm-logging-stub.c                   |    47 +
 shared/systemd/nm-sd-utils-shared.c                |    82 +
 shared/systemd/nm-sd-utils-shared.h                |    38 +
 shared/systemd/sd-adapt-shared/architecture.h      |     3 +
 shared/systemd/sd-adapt-shared/btrfs-util.h        |     3 +
 shared/systemd/sd-adapt-shared/build.h             |     3 +
 shared/systemd/sd-adapt-shared/cgroup-util.h       |     3 +
 shared/systemd/sd-adapt-shared/copy.h              |     3 +
 shared/systemd/sd-adapt-shared/def.h               |     3 +
 shared/systemd/sd-adapt-shared/device-nodes.h      |     3 +
 shared/systemd/sd-adapt-shared/dirent-util.h       |     5 +
 shared/systemd/sd-adapt-shared/errno-list.h        |     3 +
 shared/systemd/sd-adapt-shared/format-util.h       |     3 +
 shared/systemd/sd-adapt-shared/glob-util.h         |     3 +
 shared/systemd/sd-adapt-shared/gunicode.h          |     3 +
 shared/systemd/sd-adapt-shared/ioprio.h            |     3 +
 shared/systemd/sd-adapt-shared/locale-util.h       |     3 +
 shared/systemd/sd-adapt-shared/memfd-util.h        |     3 +
 shared/systemd/sd-adapt-shared/missing.h           |     6 +
 shared/systemd/sd-adapt-shared/missing_socket.h    |     3 +
 shared/systemd/sd-adapt-shared/missing_syscall.h   |     3 +
 shared/systemd/sd-adapt-shared/missing_timerfd.h   |     3 +
 shared/systemd/sd-adapt-shared/mkdir.h             |     3 +
 .../systemd/sd-adapt-shared/nm-sd-adapt-shared.h   |   139 +
 shared/systemd/sd-adapt-shared/procfs-util.h       |     3 +
 shared/systemd/sd-adapt-shared/raw-clone.h         |     3 +
 shared/systemd/sd-adapt-shared/rlimit-util.h       |     3 +
 shared/systemd/sd-adapt-shared/terminal-util.h     |     3 +
 shared/systemd/sd-adapt-shared/unaligned.h         |     3 +
 shared/systemd/sd-adapt-shared/user-util.h         |     3 +
 shared/systemd/sd-adapt-shared/virt.h              |     3 +
 shared/systemd/src/basic/alloc-util.c              |    83 +
 shared/systemd/src/basic/alloc-util.h              |   162 +
 shared/systemd/src/basic/async.h                   |     7 +
 shared/systemd/src/basic/env-file.c                |   568 +
 shared/systemd/src/basic/env-file.h                |    17 +
 shared/systemd/src/basic/env-util.c                |   758 ++
 shared/systemd/src/basic/env-util.h                |    47 +
 shared/systemd/src/basic/escape.c                  |   508 +
 shared/systemd/src/basic/escape.h                  |    53 +
 shared/systemd/src/basic/ether-addr-util.c         |   113 +
 shared/systemd/src/basic/ether-addr-util.h         |    28 +
 shared/systemd/src/basic/extract-word.c            |   289 +
 shared/systemd/src/basic/extract-word.h            |    17 +
 shared/systemd/src/basic/fd-util.c                 |   975 ++
 shared/systemd/src/basic/fd-util.h                 |   110 +
 shared/systemd/src/basic/fileio.c                  |   832 ++
 shared/systemd/src/basic/fileio.h                  |    78 +
 shared/systemd/src/basic/fs-util.c                 |  1368 ++
 shared/systemd/src/basic/fs-util.h                 |   111 +
 shared/systemd/src/basic/hash-funcs.c              |    97 +
 shared/systemd/src/basic/hash-funcs.h              |   106 +
 shared/systemd/src/basic/hashmap.c                 |  1913 +++
 shared/systemd/src/basic/hashmap.h                 |   429 +
 shared/systemd/src/basic/hexdecoct.c               |   828 ++
 shared/systemd/src/basic/hexdecoct.h               |    38 +
 shared/systemd/src/basic/hostname-util.c           |   314 +
 shared/systemd/src/basic/hostname-util.h           |    28 +
 shared/systemd/src/basic/in-addr-util.c            |   636 +
 shared/systemd/src/basic/in-addr-util.h            |    72 +
 shared/systemd/src/basic/io-util.c                 |   272 +
 shared/systemd/src/basic/io-util.h                 |    75 +
 shared/systemd/src/basic/list.h                    |   171 +
 shared/systemd/src/basic/log.h                     |   331 +
 shared/systemd/src/basic/macro.h                   |   558 +
 shared/systemd/src/basic/mempool.c                 |   101 +
 shared/systemd/src/basic/mempool.h                 |    31 +
 shared/systemd/src/basic/missing_fcntl.h           |    60 +
 shared/systemd/src/basic/missing_type.h            |    12 +
 shared/systemd/src/basic/parse-util.c              |   785 ++
 shared/systemd/src/basic/parse-util.h              |   120 +
 shared/systemd/src/basic/path-util.c               |  1160 ++
 shared/systemd/src/basic/path-util.h               |   192 +
 shared/systemd/src/basic/prioq.c                   |   302 +
 shared/systemd/src/basic/prioq.h                   |    32 +
 shared/systemd/src/basic/process-util.c            |  1575 +++
 shared/systemd/src/basic/process-util.h            |   196 +
 shared/systemd/src/basic/random-util.c             |   274 +
 shared/systemd/src/basic/random-util.h             |    33 +
 shared/systemd/src/basic/refcnt.h                  |    54 +
 shared/systemd/src/basic/set.h                     |   130 +
 shared/systemd/src/basic/signal-util.h             |    43 +
 shared/systemd/src/basic/siphash24.h               |    58 +
 shared/systemd/src/basic/socket-util.c             |  1353 ++
 shared/systemd/src/basic/socket-util.h             |   202 +
 shared/systemd/src/basic/sparse-endian.h           |    90 +
 shared/systemd/src/basic/stat-util.c               |   433 +
 shared/systemd/src/basic/stat-util.h               |    90 +
 shared/systemd/src/basic/stdio-util.h              |    64 +
 shared/systemd/src/basic/string-table.c            |    19 +
 shared/systemd/src/basic/string-table.h            |   112 +
 shared/systemd/src/basic/string-util.c             |  1107 ++
 shared/systemd/src/basic/string-util.h             |   266 +
 shared/systemd/src/basic/strv.c                    |   893 ++
 shared/systemd/src/basic/strv.h                    |   190 +
 shared/systemd/src/basic/time-util.c               |  1488 +++
 shared/systemd/src/basic/time-util.h               |   180 +
 shared/systemd/src/basic/tmpfile-util.c            |   336 +
 shared/systemd/src/basic/tmpfile-util.h            |    19 +
 shared/systemd/src/basic/umask-util.h              |    28 +
 shared/systemd/src/basic/utf8.c                    |   546 +
 shared/systemd/src/basic/utf8.h                    |    51 +
 shared/systemd/src/basic/util.c                    |   643 +
 shared/systemd/src/basic/util.h                    |   253 +
 src/NetworkManagerUtils.c                          |   226 +-
 src/NetworkManagerUtils.h                          |    11 +-
 src/devices/adsl/meson.build                       |     6 +-
 src/devices/adsl/nm-atm-manager.c                  |     1 -
 src/devices/adsl/nm-device-adsl.c                  |    41 +-
 src/devices/bluetooth/meson.build                  |     6 +-
 src/devices/bluetooth/nm-bluez-device.c            |   182 +-
 src/devices/bluetooth/nm-bluez-device.h            |    15 +-
 src/devices/bluetooth/nm-bluez-manager.c           |     1 -
 src/devices/bluetooth/nm-bluez4-adapter.c          |     2 -
 src/devices/bluetooth/nm-bluez4-manager.c          |     1 -
 src/devices/bluetooth/nm-bluez5-dun.c              |    40 +-
 src/devices/bluetooth/nm-bluez5-dun.h              |     3 +-
 src/devices/bluetooth/nm-bluez5-manager.c          |     1 -
 src/devices/bluetooth/nm-device-bt.c               |   116 +-
 src/devices/nm-acd-manager.c                       |   419 +-
 src/devices/nm-acd-manager.h                       |    24 +-
 src/devices/nm-device-6lowpan.c                    |     8 +-
 src/devices/nm-device-bond.c                       |    17 +-
 src/devices/nm-device-bridge.c                     |    16 +-
 src/devices/nm-device-dummy.c                      |     9 +-
 src/devices/nm-device-ethernet.c                   |    75 +-
 src/devices/nm-device-factory.c                    |     2 -
 src/devices/nm-device-infiniband.c                 |    19 +-
 src/devices/nm-device-ip-tunnel.c                  |    51 +-
 src/devices/nm-device-macsec.c                     |    25 +-
 src/devices/nm-device-macvlan.c                    |     9 +-
 src/devices/nm-device-ppp.c                        |    47 +-
 src/devices/nm-device-private.h                    |    90 +-
 src/devices/nm-device-tun.c                        |    20 +-
 src/devices/nm-device-veth.c                       |     2 -
 src/devices/nm-device-vlan.c                       |    20 +-
 src/devices/nm-device-vxlan.c                      |    28 +-
 src/devices/nm-device-wireguard.c                  |  1501 ++-
 src/devices/nm-device-wpan.c                       |    19 +-
 src/devices/nm-device.c                            |  2571 ++--
 src/devices/nm-device.h                            |    73 +-
 src/devices/nm-lldp-listener.c                     |    13 +-
 src/devices/ovs/meson.build                        |     6 +-
 src/devices/ovs/nm-device-ovs-bridge.c             |    18 +-
 src/devices/ovs/nm-device-ovs-interface.c          |    39 +-
 src/devices/ovs/nm-device-ovs-port.c               |    18 +-
 src/devices/ovs/nm-ovsdb.c                         |     3 +-
 src/devices/team/meson.build                       |     6 +-
 src/devices/team/nm-device-team.c                  |    34 +-
 src/devices/team/nm-team-factory.c                 |     1 -
 src/devices/tests/meson.build                      |     7 +-
 src/devices/tests/test-acd.c                       |    88 +-
 src/devices/wifi/meson.build                       |    14 +-
 src/devices/wifi/nm-device-iwd.c                   |  1139 +-
 src/devices/wifi/nm-device-iwd.h                   |     2 +-
 src/devices/wifi/nm-device-olpc-mesh.c             |    11 +-
 src/devices/wifi/nm-device-wifi-p2p.c              |  1316 ++
 src/devices/wifi/nm-device-wifi-p2p.h              |    50 +
 src/devices/wifi/nm-device-wifi.c                  |   346 +-
 src/devices/wifi/nm-device-wifi.h                  |     1 +
 src/devices/wifi/nm-iwd-manager.c                  |   134 +-
 src/devices/wifi/nm-wifi-ap.c                      |     6 +-
 src/devices/wifi/nm-wifi-factory.c                 |    69 +-
 src/devices/wifi/nm-wifi-p2p-peer.c                |   796 ++
 src/devices/wifi/nm-wifi-p2p-peer.h                |   114 +
 src/devices/wifi/nm-wifi-utils.c                   |     7 +-
 src/devices/wifi/tests/meson.build                 |     5 +-
 src/devices/wifi/tests/test-general.c              |     3 -
 src/devices/wwan/libnm-wwan.ver                    |     1 -
 src/devices/wwan/meson.build                       |    14 +-
 src/devices/wwan/nm-device-modem.c                 |   115 +-
 src/devices/wwan/nm-modem-broadband.c              |   118 +-
 src/devices/wwan/nm-modem-manager.c                |     1 -
 src/devices/wwan/nm-modem-ofono.c                  |   102 +-
 src/devices/wwan/nm-modem.c                        |   232 +-
 src/devices/wwan/nm-modem.h                        |    22 +-
 src/devices/wwan/nm-wwan-factory.c                 |     1 -
 src/dhcp/meson.build                               |     2 +-
 src/dhcp/nm-dhcp-client.c                          |    25 +-
 src/dhcp/nm-dhcp-client.h                          |     1 +
 src/dhcp/nm-dhcp-dhclient-utils.c                  |     5 +-
 src/dhcp/nm-dhcp-dhclient.c                        |    14 +-
 src/dhcp/nm-dhcp-dhcpcanon.c                       |     9 +-
 src/dhcp/nm-dhcp-dhcpcd.c                          |     9 +-
 src/dhcp/nm-dhcp-helper.c                          |     3 +-
 src/dhcp/nm-dhcp-listener.c                        |     2 -
 src/dhcp/nm-dhcp-manager.c                         |     4 +-
 src/dhcp/nm-dhcp-systemd.c                         |   625 +-
 src/dhcp/nm-dhcp-utils.c                           |    17 +-
 src/dhcp/tests/meson.build                         |     5 +-
 src/dhcp/tests/test-dhcp-dhclient.c                |     5 +-
 src/dhcp/tests/test-dhcp-utils.c                   |     1 -
 src/dns/nm-dns-manager.c                           |   198 +-
 src/dns/nm-dns-manager.h                           |     2 +
 src/dns/nm-dns-plugin.c                            |     1 -
 src/dnsmasq/nm-dnsmasq-manager.c                   |   172 +-
 src/dnsmasq/nm-dnsmasq-manager.h                   |     1 +
 src/dnsmasq/nm-dnsmasq-utils.c                     |     1 -
 src/dnsmasq/tests/meson.build                      |     2 +-
 src/initrd/meson.build                             |     2 +-
 src/initrd/nm-initrd-generator.c                   |    60 +-
 src/initrd/nm-initrd-generator.h                   |    21 +-
 src/initrd/nmi-cmdline-reader.c                    |    76 +-
 src/initrd/nmi-ibft-reader.c                       |    23 +-
 src/initrd/tests/meson.build                       |     4 +-
 src/initrd/tests/test-cmdline-reader.c             |    13 +-
 src/initrd/tests/test-ibft-reader.c                |    22 +-
 src/main-utils.c                                   |    26 +-
 src/main.c                                         |    22 +-
 src/meson.build                                    |    47 +-
 src/ndisc/nm-fake-ndisc.c                          |     1 -
 src/ndisc/nm-lndp-ndisc.c                          |    37 +-
 src/ndisc/nm-ndisc.c                               |    10 +-
 src/ndisc/tests/meson.build                        |     3 +-
 src/ndisc/tests/test-ndisc-fake.c                  |     1 -
 src/ndisc/tests/test-ndisc-linux.c                 |     1 -
 src/nm-act-request.c                               |     9 +-
 src/nm-act-request.h                               |     3 +-
 src/nm-active-connection.c                         |    94 +-
 src/nm-active-connection.h                         |     9 +
 src/nm-audit-manager.c                             |    12 +-
 src/nm-auth-subject.c                              |     1 -
 src/nm-auth-utils.c                                |     5 +-
 src/nm-checkpoint.c                                |     8 +-
 src/nm-config-data.c                               |   110 +-
 src/nm-config-data.h                               |    16 +
 src/nm-config.c                                    |   286 +-
 src/nm-config.h                                    |    49 +-
 src/nm-connectivity.c                              |   677 +-
 src/nm-connectivity.h                              |     2 +
 src/nm-core-utils.c                                |   389 +-
 src/nm-core-utils.h                                |    26 +-
 src/nm-dbus-manager.c                              |    12 +-
 src/nm-dbus-manager.h                              |     2 +
 src/nm-dcb.c                                       |     1 -
 src/nm-dhcp4-config.c                              |     2 -
 src/nm-dhcp6-config.c                              |     2 -
 src/nm-dispatcher.c                                |     5 +-
 src/nm-firewall-manager.c                          |     2 -
 src/nm-hostname-manager.c                          |     2 -
 src/nm-iface-helper.c                              |    55 +-
 src/nm-ip4-config.c                                |   101 +-
 src/nm-ip4-config.h                                |     7 +
 src/nm-ip6-config.c                                |    93 +-
 src/nm-ip6-config.h                                |     2 +
 src/nm-keep-alive.c                                |   526 +
 src/nm-keep-alive.h                                |    59 +
 src/nm-logging.c                                   |   634 +-
 src/nm-logging.h                                   |   130 +-
 src/nm-manager.c                                   |   486 +-
 src/nm-manager.h                                   |    29 +
 src/nm-pacrunner-manager.c                         |    12 +-
 src/nm-policy.c                                    |   137 +-
 src/nm-rfkill-manager.c                            |     3 +-
 src/nm-session-monitor.c                           |     6 +-
 src/nm-sleep-monitor.c                             |     2 -
 src/nm-types.h                                     |     3 +-
 src/org.freedesktop.NetworkManager.conf            |     4 +
 src/platform/nm-fake-platform.c                    |    33 +-
 src/platform/nm-linux-platform.c                   |  1429 +-
 src/platform/nm-netlink.c                          |   433 +-
 src/platform/nm-netlink.h                          |   326 +-
 src/platform/nm-platform-utils.c                   |    42 +-
 src/platform/nm-platform.c                         |  1164 +-
 src/platform/nm-platform.h                         |   346 +-
 src/platform/nmp-netns.c                           |   239 +-
 src/platform/nmp-object.c                          |   271 +-
 src/platform/nmp-object.h                          |    66 +-
 src/platform/tests/meson.build                     |    22 +-
 src/platform/tests/test-address.c                  |     2 +-
 src/platform/tests/test-cleanup.c                  |     5 +-
 src/platform/tests/test-common.c                   |   127 +-
 src/platform/tests/test-common.h                   |    16 +-
 src/platform/tests/test-link.c                     |   425 +-
 src/platform/tests/test-route.c                    |    16 +-
 src/platform/wifi/nm-wifi-utils-nl80211.c          |   395 +-
 src/platform/wifi/nm-wifi-utils-wext.c             |    44 +-
 src/platform/wifi/nm-wifi-utils.c                  |     1 -
 src/platform/wifi/nm-wifi-utils.h                  |     2 +-
 src/platform/wpan/nm-wpan-utils.c                  |    86 +-
 src/platform/wpan/nm-wpan-utils.h                  |     2 +
 src/ppp/meson.build                                |     8 +-
 src/ppp/nm-ppp-manager-call.c                      |     4 +-
 src/ppp/nm-ppp-manager-call.h                      |     1 +
 src/ppp/nm-ppp-manager.c                           |   316 +-
 src/ppp/nm-ppp-plugin-api.h                        |     1 +
 src/ppp/nm-pppd-plugin.c                           |     3 +-
 src/settings/nm-agent-manager.c                    |    47 +-
 src/settings/nm-settings-connection.c              |   208 +-
 src/settings/nm-settings.c                         |    43 +-
 src/settings/nm-settings.h                         |     2 +-
 src/settings/plugins/ibft/meson.build              |     6 +-
 src/settings/plugins/ibft/nms-ibft-connection.c    |     1 -
 src/settings/plugins/ibft/nms-ibft-plugin.c        |     2 -
 src/settings/plugins/ibft/nms-ibft-reader.c        |     2 -
 src/settings/plugins/ibft/tests/meson.build        |     4 +-
 src/settings/plugins/ibft/tests/test-ibft.c        |     1 -
 src/settings/plugins/ifcfg-rh/meson.build          |    12 +-
 src/settings/plugins/ifcfg-rh/nm-inotify-helper.c  |     8 +-
 .../plugins/ifcfg-rh/nms-ifcfg-rh-connection.c     |     1 -
 .../plugins/ifcfg-rh/nms-ifcfg-rh-plugin.c         |    11 +-
 .../plugins/ifcfg-rh/nms-ifcfg-rh-reader.c         |    67 +-
 src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-utils.c |     1 -
 .../plugins/ifcfg-rh/nms-ifcfg-rh-writer.c         |     6 +-
 src/settings/plugins/ifcfg-rh/shvar.c              |    32 +-
 src/settings/plugins/ifcfg-rh/tests/meson.build    |     4 +-
 .../ifcfg-Test_Write_WiFi_Band_A.cexpected         |     2 +-
 .../ifcfg-Test_Write_WiFi_Hidden.cexpected         |     2 +-
 .../ifcfg-Test_Write_WiFi_MAC_always.cexpected     |     2 +-
 .../ifcfg-Test_Write_WiFi_MAC_default.cexpected    |     2 +-
 .../ifcfg-Test_Write_WiFi_MAC_missing.cexpected    |     2 +-
 .../ifcfg-Test_Write_WiFi_MAC_never.cexpected      |     2 +-
 .../tests/network-scripts/ifcfg-test-wifi-sae      |     5 +
 .../network-scripts/ifcfg-test-write-unknown-4     |     2 +-
 .../ifcfg-test-write-unknown-4.expected            |     2 +-
 .../tests/network-scripts/keys-test-wifi-sae       |     1 +
 .../network-test-wired-never-default               |     2 +-
 .../plugins/ifcfg-rh/tests/test-ifcfg-rh.c         |    63 +-
 src/settings/plugins/ifupdown/meson.build          |    10 +-
 .../plugins/ifupdown/nms-ifupdown-connection.c     |     1 -
 .../ifupdown/nms-ifupdown-interface-parser.c       |     1 -
 .../plugins/ifupdown/nms-ifupdown-parser.c         |     6 +-
 .../plugins/ifupdown/nms-ifupdown-plugin.c         |     1 -
 src/settings/plugins/ifupdown/tests/meson.build    |     4 +-
 .../plugins/ifupdown/tests/test-ifupdown.c         |     2 -
 .../plugins/keyfile/nms-keyfile-connection.c       |     1 -
 src/settings/plugins/keyfile/nms-keyfile-plugin.c  |    71 +-
 src/settings/plugins/keyfile/nms-keyfile-reader.c  |    10 +-
 src/settings/plugins/keyfile/nms-keyfile-utils.c   |   328 +-
 src/settings/plugins/keyfile/nms-keyfile-utils.h   |    43 +-
 src/settings/plugins/keyfile/nms-keyfile-writer.c  |    77 +-
 src/settings/plugins/keyfile/tests/meson.build     |     3 +-
 src/settings/plugins/keyfile/tests/test-keyfile.c  |   131 +-
 src/supplicant/nm-supplicant-config.c              |   101 +-
 src/supplicant/nm-supplicant-interface.c           |   965 +-
 src/supplicant/nm-supplicant-interface.h           |    42 +-
 src/supplicant/nm-supplicant-manager.c             |   159 +-
 src/supplicant/nm-supplicant-manager.h             |     5 +
 src/supplicant/nm-supplicant-settings-verify.c     |    20 +-
 src/supplicant/tests/meson.build                   |     3 +-
 src/supplicant/tests/test-supplicant-config.c      |    72 +-
 src/systemd/meson.build                            |   117 +-
 src/systemd/nm-sd-utils-core.c                     |    40 +
 src/systemd/nm-sd-utils-core.h                     |    30 +
 src/systemd/nm-sd-utils.c                          |    61 -
 src/systemd/nm-sd-utils.h                          |    38 -
 src/systemd/nm-sd.c                                |     6 +-
 src/systemd/sd-adapt-core/condition.h              |     5 +
 src/systemd/sd-adapt-core/conf-parser.h            |     3 +
 src/systemd/sd-adapt-core/device-util.h            |     3 +
 src/systemd/sd-adapt-core/khash.h                  |     3 +
 src/systemd/sd-adapt-core/nm-sd-adapt-core.c       |    34 +
 src/systemd/sd-adapt-core/nm-sd-adapt-core.h       |   101 +
 src/systemd/sd-adapt-core/sd-daemon.h              |     3 +
 src/systemd/sd-adapt-core/sd-device.h              |     3 +
 src/systemd/sd-adapt-core/stat-util.h              |     3 +
 src/systemd/sd-adapt/architecture.h                |     3 -
 src/systemd/sd-adapt/btrfs-util.h                  |     3 -
 src/systemd/sd-adapt/build.h                       |     3 -
 src/systemd/sd-adapt/cgroup-util.h                 |     3 -
 src/systemd/sd-adapt/condition.h                   |     5 -
 src/systemd/sd-adapt/conf-parser.h                 |     3 -
 src/systemd/sd-adapt/copy.h                        |     3 -
 src/systemd/sd-adapt/def.h                         |     3 -
 src/systemd/sd-adapt/device-nodes.h                |     3 -
 src/systemd/sd-adapt/dirent-util.h                 |     3 -
 src/systemd/sd-adapt/errno-list.h                  |     3 -
 src/systemd/sd-adapt/format-util.h                 |     3 -
 src/systemd/sd-adapt/glob-util.h                   |     3 -
 src/systemd/sd-adapt/gunicode.h                    |     3 -
 src/systemd/sd-adapt/ioprio.h                      |     3 -
 src/systemd/sd-adapt/khash.h                       |     3 -
 src/systemd/sd-adapt/locale-util.h                 |     3 -
 src/systemd/sd-adapt/memfd-util.h                  |     3 -
 src/systemd/sd-adapt/missing.h                     |     3 -
 src/systemd/sd-adapt/mkdir.h                       |     3 -
 src/systemd/sd-adapt/nm-sd-adapt.c                 |    34 -
 src/systemd/sd-adapt/nm-sd-adapt.h                 |   191 -
 src/systemd/sd-adapt/procfs-util.h                 |     3 -
 src/systemd/sd-adapt/raw-clone.h                   |     3 -
 src/systemd/sd-adapt/sd-daemon.h                   |     3 -
 src/systemd/sd-adapt/sd-device.h                   |     3 -
 src/systemd/sd-adapt/stat-util.h                   |     3 -
 src/systemd/sd-adapt/terminal-util.h               |     3 -
 src/systemd/sd-adapt/unaligned.h                   |     3 -
 src/systemd/sd-adapt/user-util.h                   |     3 -
 src/systemd/sd-adapt/virt.h                        |     3 -
 src/systemd/src/basic/alloc-util.c                 |    83 -
 src/systemd/src/basic/alloc-util.h                 |   130 -
 src/systemd/src/basic/async.h                      |     7 -
 src/systemd/src/basic/env-util.c                   |   791 --
 src/systemd/src/basic/env-util.h                   |    50 -
 src/systemd/src/basic/escape.c                     |   509 -
 src/systemd/src/basic/escape.h                     |    55 -
 src/systemd/src/basic/ether-addr-util.c            |   119 -
 src/systemd/src/basic/ether-addr-util.h            |    28 -
 src/systemd/src/basic/extract-word.c               |   289 -
 src/systemd/src/basic/extract-word.h               |    17 -
 src/systemd/src/basic/fd-util.c                    |   959 --
 src/systemd/src/basic/fd-util.h                    |   110 -
 src/systemd/src/basic/fileio.c                     |  1671 ---
 src/systemd/src/basic/fileio.h                     |    96 -
 src/systemd/src/basic/fs-util.c                    |  1256 --
 src/systemd/src/basic/fs-util.h                    |   109 -
 src/systemd/src/basic/hash-funcs.c                 |   120 -
 src/systemd/src/basic/hash-funcs.h                 |    45 -
 src/systemd/src/basic/hashmap.c                    |  1988 ---
 src/systemd/src/basic/hashmap.h                    |   393 -
 src/systemd/src/basic/hexdecoct.c                  |   821 --
 src/systemd/src/basic/hexdecoct.h                  |    38 -
 src/systemd/src/basic/hostname-util.c              |   295 -
 src/systemd/src/basic/hostname-util.h              |    27 -
 src/systemd/src/basic/in-addr-util.c               |   602 -
 src/systemd/src/basic/in-addr-util.h               |    60 -
 src/systemd/src/basic/io-util.c                    |   256 -
 src/systemd/src/basic/io-util.h                    |    73 -
 src/systemd/src/basic/list.h                       |   169 -
 src/systemd/src/basic/log.h                        |   326 -
 src/systemd/src/basic/macro.h                      |   476 -
 src/systemd/src/basic/mempool.c                    |    87 -
 src/systemd/src/basic/mempool.h                    |    27 -
 src/systemd/src/basic/parse-util.c                 |   749 --
 src/systemd/src/basic/parse-util.h                 |   119 -
 src/systemd/src/basic/path-util.c                  |  1060 --
 src/systemd/src/basic/path-util.h                  |   175 -
 src/systemd/src/basic/prioq.c                      |   303 -
 src/systemd/src/basic/prioq.h                      |    25 -
 src/systemd/src/basic/process-util.c               |  1505 ---
 src/systemd/src/basic/process-util.h               |   200 -
 src/systemd/src/basic/random-util.c                |   220 -
 src/systemd/src/basic/random-util.h                |    25 -
 src/systemd/src/basic/refcnt.h                     |    16 -
 src/systemd/src/basic/set.h                        |   132 -
 src/systemd/src/basic/signal-util.h                |    43 -
 src/systemd/src/basic/siphash24.h                  |    53 -
 src/systemd/src/basic/socket-util.c                |  1254 --
 src/systemd/src/basic/socket-util.h                |   187 -
 src/systemd/src/basic/sparse-endian.h              |    93 -
 src/systemd/src/basic/stat-util.c                  |   272 -
 src/systemd/src/basic/stat-util.h                  |    61 -
 src/systemd/src/basic/stdio-util.h                 |    60 -
 src/systemd/src/basic/string-table.c               |    19 -
 src/systemd/src/basic/string-table.h               |   112 -
 src/systemd/src/basic/string-util.c                |  1079 --
 src/systemd/src/basic/string-util.h                |   230 -
 src/systemd/src/basic/strv.c                       |   888 --
 src/systemd/src/basic/strv.h                       |   177 -
 src/systemd/src/basic/time-util.c                  |  1503 ---
 src/systemd/src/basic/time-util.h                  |   183 -
 src/systemd/src/basic/umask-util.h                 |    28 -
 src/systemd/src/basic/utf8.c                       |   453 -
 src/systemd/src/basic/utf8.h                       |    48 -
 src/systemd/src/basic/util.c                       |   609 -
 src/systemd/src/basic/util.h                       |   209 -
 src/systemd/src/libsystemd-network/arp-util.c      |     2 +-
 .../src/libsystemd-network/dhcp-identifier.c       |    59 +-
 .../src/libsystemd-network/dhcp-identifier.h       |     2 +-
 .../src/libsystemd-network/dhcp-lease-internal.h   |     4 +-
 src/systemd/src/libsystemd-network/dhcp-network.c  |    42 +-
 src/systemd/src/libsystemd-network/dhcp-option.c   |     3 +-
 src/systemd/src/libsystemd-network/dhcp-packet.c   |    85 +-
 .../src/libsystemd-network/dhcp6-internal.h        |     6 +-
 .../src/libsystemd-network/dhcp6-lease-internal.h  |     2 +-
 src/systemd/src/libsystemd-network/dhcp6-network.c |    17 +-
 src/systemd/src/libsystemd-network/dhcp6-option.c  |   103 +-
 src/systemd/src/libsystemd-network/lldp-internal.h |     3 +
 src/systemd/src/libsystemd-network/lldp-neighbor.c |    45 +-
 src/systemd/src/libsystemd-network/lldp-neighbor.h |     3 +-
 src/systemd/src/libsystemd-network/lldp-network.c  |     3 +-
 .../src/libsystemd-network/network-internal.c      |    99 +-
 .../src/libsystemd-network/network-internal.h      |    12 +-
 .../src/libsystemd-network/sd-dhcp-client.c        |   312 +-
 src/systemd/src/libsystemd-network/sd-dhcp-lease.c |   121 +-
 .../src/libsystemd-network/sd-dhcp6-client.c       |   375 +-
 .../src/libsystemd-network/sd-dhcp6-lease.c        |    59 +-
 src/systemd/src/libsystemd-network/sd-ipv4acd.c    |    62 +-
 src/systemd/src/libsystemd-network/sd-ipv4ll.c     |    26 +-
 src/systemd/src/libsystemd-network/sd-lldp.c       |   113 +-
 src/systemd/src/libsystemd/sd-event/event-source.h |   206 +
 src/systemd/src/libsystemd/sd-event/event-util.c   |   100 +
 src/systemd/src/libsystemd/sd-event/event-util.h   |    13 +
 src/systemd/src/libsystemd/sd-event/sd-event.c     |   504 +-
 src/systemd/src/libsystemd/sd-id128/id128-util.c   |    14 +-
 src/systemd/src/libsystemd/sd-id128/id128-util.h   |     4 +-
 src/systemd/src/libsystemd/sd-id128/sd-id128.c     |    47 +-
 src/systemd/src/shared/dns-domain.c                |   115 +-
 src/systemd/src/shared/dns-domain.h                |    33 +-
 src/systemd/src/systemd/_sd-common.h               |    18 +-
 src/systemd/src/systemd/sd-dhcp-client.h           |     3 +
 src/systemd/src/systemd/sd-dhcp-lease.h            |     3 +-
 src/systemd/src/systemd/sd-dhcp6-client.h          |    10 +-
 src/systemd/src/systemd/sd-event.h                 |     7 +-
 src/systemd/src/systemd/sd-id128.h                 |    17 +-
 src/systemd/src/systemd/sd-lldp.h                  |    30 +-
 src/systemd/src/systemd/sd-ndisc.h                 |     6 +-
 src/tests/config/NetworkManager-warn.conf          |    26 +
 src/tests/config/NetworkManager.conf               |     6 +-
 src/tests/config/meson.build                       |     5 +-
 src/tests/config/nm-test-device.c                  |     3 +-
 src/tests/config/test-config.c                     |    77 +-
 src/tests/meson.build                              |    14 +-
 src/tests/test-dcb.c                               |     2 -
 src/tests/test-general-with-expect.c               |     5 +-
 src/tests/test-general.c                           |   210 +-
 src/tests/test-ip4-config.c                        |     1 -
 src/tests/test-ip6-config.c                        |     3 +-
 src/tests/test-systemd.c                           |   125 +-
 src/tests/test-utils.c                             |    14 +-
 src/vpn/nm-vpn-connection.c                        |    64 +-
 src/vpn/nm-vpn-connection.h                        |     3 +-
 src/vpn/nm-vpn-manager.c                           |     2 -
 tools/check-config-options.sh                      |    72 +
 tools/run-nm-test.sh                               |     9 +-
 tools/test-networkmanager-service.py               |    24 +-
 vapi/NM-1.0.metadata                               |     5 +-
 vapi/meson.build                                   |     8 +-
 1116 files changed, 379776 insertions(+), 276552 deletions(-)
 create mode 100644 clients/common/tests/wg-test0.conf
 create mode 100644 clients/common/tests/wg-test1.conf
 create mode 100644 clients/common/tests/wg-test2.conf
 create mode 100644 clients/common/tests/wg-test3.conf
 delete mode 100644 data/org.freedesktop.NetworkManager.service.in
 create mode 100644 docs/api/dbus-org.freedesktop.NetworkManager.Device.WifiP2P.xml
 create mode 100644 docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.WifiP2P.html
 create mode 100644 docs/api/html/gdbus-org.freedesktop.NetworkManager.WifiP2PPeer.html
 create mode 100644 docs/api/html/ref-dbus-wifi-p2p-peers.html
 create mode 100644 docs/api/html/settings-wifi-p2p.html
 create mode 100644 docs/api/html/settings-wireguard.html
 create mode 100644 docs/libnm/html/NMDeviceWifiP2P.html
 create mode 100644 docs/libnm/html/NMSettingWifiP2P.html
 create mode 100644 docs/libnm/html/NMSettingWireGuard.html
 create mode 100644 docs/libnm/html/NMWifiP2PPeer.html
 create mode 100755 examples/python/gi/nm-wg-set
 create mode 100644 introspection/org.freedesktop.NetworkManager.Device.WifiP2P.xml
 create mode 100644 introspection/org.freedesktop.NetworkManager.WifiP2PPeer.xml
 create mode 100644 libnm-core/nm-setting-wifi-p2p.c
 create mode 100644 libnm-core/nm-setting-wifi-p2p.h
 create mode 100644 libnm-core/nm-setting-wireguard.c
 create mode 100644 libnm-core/nm-setting-wireguard.h
 create mode 100644 libnm/nm-device-wifi-p2p.c
 create mode 100644 libnm/nm-device-wifi-p2p.h
 create mode 100644 libnm/nm-wifi-p2p-peer.c
 create mode 100644 libnm/nm-wifi-p2p-peer.h
 create mode 100644 shared/c-rbtree/src/c-rbtree-private.h
 create mode 100644 shared/c-rbtree/src/c-rbtree.c
 create mode 100644 shared/c-rbtree/src/c-rbtree.h
 create mode 100644 shared/n-acd/src/n-acd-bpf-fallback.c
 create mode 100644 shared/n-acd/src/n-acd-bpf.c
 create mode 100644 shared/n-acd/src/n-acd-private.h
 create mode 100644 shared/n-acd/src/n-acd-probe.c
 create mode 100644 shared/n-acd/src/util/timer.c
 create mode 100644 shared/n-acd/src/util/timer.h
 create mode 100644 shared/nm-utils/nm-errno.c
 create mode 100644 shared/nm-utils/nm-errno.h
 create mode 100644 shared/nm-utils/nm-logging-fwd.h
 create mode 100644 shared/nm-utils/nm-time-utils.c
 create mode 100644 shared/nm-utils/nm-time-utils.h
 create mode 100644 shared/nm-utils/tests/test-shared-general.c
 create mode 100644 shared/systemd/nm-logging-stub.c
 create mode 100644 shared/systemd/nm-sd-utils-shared.c
 create mode 100644 shared/systemd/nm-sd-utils-shared.h
 create mode 100644 shared/systemd/sd-adapt-shared/architecture.h
 create mode 100644 shared/systemd/sd-adapt-shared/btrfs-util.h
 create mode 100644 shared/systemd/sd-adapt-shared/build.h
 create mode 100644 shared/systemd/sd-adapt-shared/cgroup-util.h
 create mode 100644 shared/systemd/sd-adapt-shared/copy.h
 create mode 100644 shared/systemd/sd-adapt-shared/def.h
 create mode 100644 shared/systemd/sd-adapt-shared/device-nodes.h
 create mode 100644 shared/systemd/sd-adapt-shared/dirent-util.h
 create mode 100644 shared/systemd/sd-adapt-shared/errno-list.h
 create mode 100644 shared/systemd/sd-adapt-shared/format-util.h
 create mode 100644 shared/systemd/sd-adapt-shared/glob-util.h
 create mode 100644 shared/systemd/sd-adapt-shared/gunicode.h
 create mode 100644 shared/systemd/sd-adapt-shared/ioprio.h
 create mode 100644 shared/systemd/sd-adapt-shared/locale-util.h
 create mode 100644 shared/systemd/sd-adapt-shared/memfd-util.h
 create mode 100644 shared/systemd/sd-adapt-shared/missing.h
 create mode 100644 shared/systemd/sd-adapt-shared/missing_socket.h
 create mode 100644 shared/systemd/sd-adapt-shared/missing_syscall.h
 create mode 100644 shared/systemd/sd-adapt-shared/missing_timerfd.h
 create mode 100644 shared/systemd/sd-adapt-shared/mkdir.h
 create mode 100644 shared/systemd/sd-adapt-shared/nm-sd-adapt-shared.h
 create mode 100644 shared/systemd/sd-adapt-shared/procfs-util.h
 create mode 100644 shared/systemd/sd-adapt-shared/raw-clone.h
 create mode 100644 shared/systemd/sd-adapt-shared/rlimit-util.h
 create mode 100644 shared/systemd/sd-adapt-shared/terminal-util.h
 create mode 100644 shared/systemd/sd-adapt-shared/unaligned.h
 create mode 100644 shared/systemd/sd-adapt-shared/user-util.h
 create mode 100644 shared/systemd/sd-adapt-shared/virt.h
 create mode 100644 shared/systemd/src/basic/alloc-util.c
 create mode 100644 shared/systemd/src/basic/alloc-util.h
 create mode 100644 shared/systemd/src/basic/async.h
 create mode 100644 shared/systemd/src/basic/env-file.c
 create mode 100644 shared/systemd/src/basic/env-file.h
 create mode 100644 shared/systemd/src/basic/env-util.c
 create mode 100644 shared/systemd/src/basic/env-util.h
 create mode 100644 shared/systemd/src/basic/escape.c
 create mode 100644 shared/systemd/src/basic/escape.h
 create mode 100644 shared/systemd/src/basic/ether-addr-util.c
 create mode 100644 shared/systemd/src/basic/ether-addr-util.h
 create mode 100644 shared/systemd/src/basic/extract-word.c
 create mode 100644 shared/systemd/src/basic/extract-word.h
 create mode 100644 shared/systemd/src/basic/fd-util.c
 create mode 100644 shared/systemd/src/basic/fd-util.h
 create mode 100644 shared/systemd/src/basic/fileio.c
 create mode 100644 shared/systemd/src/basic/fileio.h
 create mode 100644 shared/systemd/src/basic/fs-util.c
 create mode 100644 shared/systemd/src/basic/fs-util.h
 create mode 100644 shared/systemd/src/basic/hash-funcs.c
 create mode 100644 shared/systemd/src/basic/hash-funcs.h
 create mode 100644 shared/systemd/src/basic/hashmap.c
 create mode 100644 shared/systemd/src/basic/hashmap.h
 create mode 100644 shared/systemd/src/basic/hexdecoct.c
 create mode 100644 shared/systemd/src/basic/hexdecoct.h
 create mode 100644 shared/systemd/src/basic/hostname-util.c
 create mode 100644 shared/systemd/src/basic/hostname-util.h
 create mode 100644 shared/systemd/src/basic/in-addr-util.c
 create mode 100644 shared/systemd/src/basic/in-addr-util.h
 create mode 100644 shared/systemd/src/basic/io-util.c
 create mode 100644 shared/systemd/src/basic/io-util.h
 create mode 100644 shared/systemd/src/basic/list.h
 create mode 100644 shared/systemd/src/basic/log.h
 create mode 100644 shared/systemd/src/basic/macro.h
 create mode 100644 shared/systemd/src/basic/mempool.c
 create mode 100644 shared/systemd/src/basic/mempool.h
 create mode 100644 shared/systemd/src/basic/missing_fcntl.h
 create mode 100644 shared/systemd/src/basic/missing_type.h
 create mode 100644 shared/systemd/src/basic/parse-util.c
 create mode 100644 shared/systemd/src/basic/parse-util.h
 create mode 100644 shared/systemd/src/basic/path-util.c
 create mode 100644 shared/systemd/src/basic/path-util.h
 create mode 100644 shared/systemd/src/basic/prioq.c
 create mode 100644 shared/systemd/src/basic/prioq.h
 create mode 100644 shared/systemd/src/basic/process-util.c
 create mode 100644 shared/systemd/src/basic/process-util.h
 create mode 100644 shared/systemd/src/basic/random-util.c
 create mode 100644 shared/systemd/src/basic/random-util.h
 create mode 100644 shared/systemd/src/basic/refcnt.h
 create mode 100644 shared/systemd/src/basic/set.h
 create mode 100644 shared/systemd/src/basic/signal-util.h
 create mode 100644 shared/systemd/src/basic/siphash24.h
 create mode 100644 shared/systemd/src/basic/socket-util.c
 create mode 100644 shared/systemd/src/basic/socket-util.h
 create mode 100644 shared/systemd/src/basic/sparse-endian.h
 create mode 100644 shared/systemd/src/basic/stat-util.c
 create mode 100644 shared/systemd/src/basic/stat-util.h
 create mode 100644 shared/systemd/src/basic/stdio-util.h
 create mode 100644 shared/systemd/src/basic/string-table.c
 create mode 100644 shared/systemd/src/basic/string-table.h
 create mode 100644 shared/systemd/src/basic/string-util.c
 create mode 100644 shared/systemd/src/basic/string-util.h
 create mode 100644 shared/systemd/src/basic/strv.c
 create mode 100644 shared/systemd/src/basic/strv.h
 create mode 100644 shared/systemd/src/basic/time-util.c
 create mode 100644 shared/systemd/src/basic/time-util.h
 create mode 100644 shared/systemd/src/basic/tmpfile-util.c
 create mode 100644 shared/systemd/src/basic/tmpfile-util.h
 create mode 100644 shared/systemd/src/basic/umask-util.h
 create mode 100644 shared/systemd/src/basic/utf8.c
 create mode 100644 shared/systemd/src/basic/utf8.h
 create mode 100644 shared/systemd/src/basic/util.c
 create mode 100644 shared/systemd/src/basic/util.h
 create mode 100644 src/devices/wifi/nm-device-wifi-p2p.c
 create mode 100644 src/devices/wifi/nm-device-wifi-p2p.h
 create mode 100644 src/devices/wifi/nm-wifi-p2p-peer.c
 create mode 100644 src/devices/wifi/nm-wifi-p2p-peer.h
 create mode 100644 src/nm-keep-alive.c
 create mode 100644 src/nm-keep-alive.h
 create mode 100644 src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-sae
 create mode 100644 src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-sae
 create mode 100644 src/systemd/nm-sd-utils-core.c
 create mode 100644 src/systemd/nm-sd-utils-core.h
 delete mode 100644 src/systemd/nm-sd-utils.c
 delete mode 100644 src/systemd/nm-sd-utils.h
 create mode 100644 src/systemd/sd-adapt-core/condition.h
 create mode 100644 src/systemd/sd-adapt-core/conf-parser.h
 create mode 100644 src/systemd/sd-adapt-core/device-util.h
 create mode 100644 src/systemd/sd-adapt-core/khash.h
 create mode 100644 src/systemd/sd-adapt-core/nm-sd-adapt-core.c
 create mode 100644 src/systemd/sd-adapt-core/nm-sd-adapt-core.h
 create mode 100644 src/systemd/sd-adapt-core/sd-daemon.h
 create mode 100644 src/systemd/sd-adapt-core/sd-device.h
 create mode 100644 src/systemd/sd-adapt-core/stat-util.h
 delete mode 100644 src/systemd/sd-adapt/architecture.h
 delete mode 100644 src/systemd/sd-adapt/btrfs-util.h
 delete mode 100644 src/systemd/sd-adapt/build.h
 delete mode 100644 src/systemd/sd-adapt/cgroup-util.h
 delete mode 100644 src/systemd/sd-adapt/condition.h
 delete mode 100644 src/systemd/sd-adapt/conf-parser.h
 delete mode 100644 src/systemd/sd-adapt/copy.h
 delete mode 100644 src/systemd/sd-adapt/def.h
 delete mode 100644 src/systemd/sd-adapt/device-nodes.h
 delete mode 100644 src/systemd/sd-adapt/dirent-util.h
 delete mode 100644 src/systemd/sd-adapt/errno-list.h
 delete mode 100644 src/systemd/sd-adapt/format-util.h
 delete mode 100644 src/systemd/sd-adapt/glob-util.h
 delete mode 100644 src/systemd/sd-adapt/gunicode.h
 delete mode 100644 src/systemd/sd-adapt/ioprio.h
 delete mode 100644 src/systemd/sd-adapt/khash.h
 delete mode 100644 src/systemd/sd-adapt/locale-util.h
 delete mode 100644 src/systemd/sd-adapt/memfd-util.h
 delete mode 100644 src/systemd/sd-adapt/missing.h
 delete mode 100644 src/systemd/sd-adapt/mkdir.h
 delete mode 100644 src/systemd/sd-adapt/nm-sd-adapt.c
 delete mode 100644 src/systemd/sd-adapt/nm-sd-adapt.h
 delete mode 100644 src/systemd/sd-adapt/procfs-util.h
 delete mode 100644 src/systemd/sd-adapt/raw-clone.h
 delete mode 100644 src/systemd/sd-adapt/sd-daemon.h
 delete mode 100644 src/systemd/sd-adapt/sd-device.h
 delete mode 100644 src/systemd/sd-adapt/stat-util.h
 delete mode 100644 src/systemd/sd-adapt/terminal-util.h
 delete mode 100644 src/systemd/sd-adapt/unaligned.h
 delete mode 100644 src/systemd/sd-adapt/user-util.h
 delete mode 100644 src/systemd/sd-adapt/virt.h
 delete mode 100644 src/systemd/src/basic/alloc-util.c
 delete mode 100644 src/systemd/src/basic/alloc-util.h
 delete mode 100644 src/systemd/src/basic/async.h
 delete mode 100644 src/systemd/src/basic/env-util.c
 delete mode 100644 src/systemd/src/basic/env-util.h
 delete mode 100644 src/systemd/src/basic/escape.c
 delete mode 100644 src/systemd/src/basic/escape.h
 delete mode 100644 src/systemd/src/basic/ether-addr-util.c
 delete mode 100644 src/systemd/src/basic/ether-addr-util.h
 delete mode 100644 src/systemd/src/basic/extract-word.c
 delete mode 100644 src/systemd/src/basic/extract-word.h
 delete mode 100644 src/systemd/src/basic/fd-util.c
 delete mode 100644 src/systemd/src/basic/fd-util.h
 delete mode 100644 src/systemd/src/basic/fileio.c
 delete mode 100644 src/systemd/src/basic/fileio.h
 delete mode 100644 src/systemd/src/basic/fs-util.c
 delete mode 100644 src/systemd/src/basic/fs-util.h
 delete mode 100644 src/systemd/src/basic/hash-funcs.c
 delete mode 100644 src/systemd/src/basic/hash-funcs.h
 delete mode 100644 src/systemd/src/basic/hashmap.c
 delete mode 100644 src/systemd/src/basic/hashmap.h
 delete mode 100644 src/systemd/src/basic/hexdecoct.c
 delete mode 100644 src/systemd/src/basic/hexdecoct.h
 delete mode 100644 src/systemd/src/basic/hostname-util.c
 delete mode 100644 src/systemd/src/basic/hostname-util.h
 delete mode 100644 src/systemd/src/basic/in-addr-util.c
 delete mode 100644 src/systemd/src/basic/in-addr-util.h
 delete mode 100644 src/systemd/src/basic/io-util.c
 delete mode 100644 src/systemd/src/basic/io-util.h
 delete mode 100644 src/systemd/src/basic/list.h
 delete mode 100644 src/systemd/src/basic/log.h
 delete mode 100644 src/systemd/src/basic/macro.h
 delete mode 100644 src/systemd/src/basic/mempool.c
 delete mode 100644 src/systemd/src/basic/mempool.h
 delete mode 100644 src/systemd/src/basic/parse-util.c
 delete mode 100644 src/systemd/src/basic/parse-util.h
 delete mode 100644 src/systemd/src/basic/path-util.c
 delete mode 100644 src/systemd/src/basic/path-util.h
 delete mode 100644 src/systemd/src/basic/prioq.c
 delete mode 100644 src/systemd/src/basic/prioq.h
 delete mode 100644 src/systemd/src/basic/process-util.c
 delete mode 100644 src/systemd/src/basic/process-util.h
 delete mode 100644 src/systemd/src/basic/random-util.c
 delete mode 100644 src/systemd/src/basic/random-util.h
 delete mode 100644 src/systemd/src/basic/refcnt.h
 delete mode 100644 src/systemd/src/basic/set.h
 delete mode 100644 src/systemd/src/basic/signal-util.h
 delete mode 100644 src/systemd/src/basic/siphash24.h
 delete mode 100644 src/systemd/src/basic/socket-util.c
 delete mode 100644 src/systemd/src/basic/socket-util.h
 delete mode 100644 src/systemd/src/basic/sparse-endian.h
 delete mode 100644 src/systemd/src/basic/stat-util.c
 delete mode 100644 src/systemd/src/basic/stat-util.h
 delete mode 100644 src/systemd/src/basic/stdio-util.h
 delete mode 100644 src/systemd/src/basic/string-table.c
 delete mode 100644 src/systemd/src/basic/string-table.h
 delete mode 100644 src/systemd/src/basic/string-util.c
 delete mode 100644 src/systemd/src/basic/string-util.h
 delete mode 100644 src/systemd/src/basic/strv.c
 delete mode 100644 src/systemd/src/basic/strv.h
 delete mode 100644 src/systemd/src/basic/time-util.c
 delete mode 100644 src/systemd/src/basic/time-util.h
 delete mode 100644 src/systemd/src/basic/umask-util.h
 delete mode 100644 src/systemd/src/basic/utf8.c
 delete mode 100644 src/systemd/src/basic/utf8.h
 delete mode 100644 src/systemd/src/basic/util.c
 delete mode 100644 src/systemd/src/basic/util.h
 create mode 100644 src/systemd/src/libsystemd/sd-event/event-source.h
 create mode 100644 src/systemd/src/libsystemd/sd-event/event-util.c
 create mode 100644 src/systemd/src/libsystemd/sd-event/event-util.h
 create mode 100644 src/tests/config/NetworkManager-warn.conf
 create mode 100755 tools/check-config-options.sh

diff --git a/Makefile.am b/Makefile.am
index e1b442e9..b180466a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -105,7 +105,7 @@ endif
 
 endif
 
-dflt_cppflags = -std=gnu99
+dflt_cppflags = -std=gnu11
 
 ###############################################################################
 
@@ -206,6 +206,181 @@ DISTCLEANFILES += $(polkit_policy_DATA)
 
 ###############################################################################
 
+noinst_LTLIBRARIES += shared/libcsiphash.la
+
+shared_libcsiphash_la_CPPFLAGS = \
+	$(CODE_COVERAGE_CFLAGS) \
+	$(SANITIZER_LIB_CFLAGS) \
+	$(NULL)
+
+shared_libcsiphash_la_SOURCES = \
+	shared/c-siphash/src/c-siphash.c \
+	shared/c-siphash/src/c-siphash.h \
+	$(NULL)
+
+###############################################################################
+
+noinst_LTLIBRARIES += shared/libcrbtree.la
+
+shared_libcrbtree_la_CFLAGS = \
+	$(AM_CFLAGS) \
+	-std=c11 \
+	$(NULL)
+
+shared_libcrbtree_la_CPPFLAGS = \
+	$(CODE_COVERAGE_CFLAGS) \
+	$(SANITIZER_LIB_CFLAGS) \
+	$(NULL)
+
+shared_libcrbtree_la_SOURCES = \
+	shared/c-rbtree/src/c-rbtree.c \
+	shared/c-rbtree/src/c-rbtree.h \
+	shared/c-rbtree/src/c-rbtree-private.h \
+	$(NULL)
+
+###############################################################################
+
+noinst_LTLIBRARIES += shared/libnacd.la
+
+shared_libnacd_la_CFLAGS = \
+	$(AM_CFLAGS) \
+	-std=c11 \
+	-Wno-pointer-arith \
+	-Wno-vla \
+	$(NULL)
+
+shared_libnacd_la_CPPFLAGS = \
+	-D_GNU_SOURCE \
+	-DSO_ATTACH_BPF=50 \
+	$(CODE_COVERAGE_CFLAGS) \
+	$(SANITIZER_LIB_CFLAGS) \
+	-I$(srcdir)/shared/c-list/src \
+	-I$(srcdir)/shared/c-siphash/src \
+	-I$(srcdir)/shared/c-rbtree/src \
+	$(NULL)
+
+shared_libnacd_la_SOURCES = \
+	shared/n-acd/src/n-acd.c \
+	shared/n-acd/src/n-acd.h \
+	shared/n-acd/src/n-acd-private.h \
+	shared/n-acd/src/n-acd-probe.c \
+	shared/n-acd/src/util/timer.c \
+	shared/n-acd/src/util/timer.h \
+	$(NULL)
+
+if WITH_EBPF
+shared_libnacd_la_SOURCES += shared/n-acd/src/n-acd-bpf.c
+else
+shared_libnacd_la_SOURCES += shared/n-acd/src/n-acd-bpf-fallback.c
+endif
+
+shared_libnacd_la_LIBADD = \
+	shared/libcrbtree.la \
+	$(NULL)
+
+###############################################################################
+
+shared_nm_utils_libnm_utils_cppflags = \
+	$(dflt_cppflags) \
+	-I$(srcdir)/shared \
+	$(CODE_COVERAGE_CFLAGS) \
+	$(SANITIZER_LIB_CFLAGS) \
+	$(GLIB_CFLAGS) \
+	-DG_LOG_DOMAIN=\""libnm"\" \
+	-DNETWORKMANAGER_COMPILATION='(NM_NETWORKMANAGER_COMPILATION_GLIB|NM_NETWORKMANAGER_COMPILATION_WITH_GLIB_I18N_LIB)' \
+	$(NULL)
+
+noinst_LTLIBRARIES += shared/nm-utils/libnm-utils-base.la
+
+shared_nm_utils_libnm_utils_base_la_CPPFLAGS = \
+	$(shared_nm_utils_libnm_utils_cppflags) \
+	$(NULL)
+
+shared_nm_utils_libnm_utils_base_la_SOURCES = \
+	shared/c-list/src/c-list.h \
+	shared/nm-utils/c-list-util.c \
+	shared/nm-utils/c-list-util.h \
+	shared/nm-utils/nm-c-list.h \
+	shared/nm-utils/nm-dedup-multi.c \
+	shared/nm-utils/nm-dedup-multi.h \
+	shared/nm-utils/nm-enum-utils.c \
+	shared/nm-utils/nm-enum-utils.h \
+	shared/nm-utils/nm-errno.c \
+	shared/nm-utils/nm-errno.h \
+	shared/nm-utils/nm-glib.h \
+	shared/nm-utils/nm-hash-utils.c \
+	shared/nm-utils/nm-hash-utils.h \
+	shared/nm-utils/nm-io-utils.c \
+	shared/nm-utils/nm-io-utils.h \
+	shared/nm-utils/nm-logging-fwd.h \
+	shared/nm-utils/nm-macros-internal.h \
+	shared/nm-utils/nm-obj.h \
+	shared/nm-utils/nm-random-utils.c \
+	shared/nm-utils/nm-random-utils.h \
+	shared/nm-utils/nm-secret-utils.c \
+	shared/nm-utils/nm-secret-utils.h \
+	shared/nm-utils/nm-shared-utils.c \
+	shared/nm-utils/nm-shared-utils.h \
+	shared/nm-utils/nm-time-utils.c \
+	shared/nm-utils/nm-time-utils.h \
+	shared/nm-utils/unaligned.h \
+	$(NULL)
+
+shared_nm_utils_libnm_utils_base_la_LDFLAGS = \
+	$(CODE_COVERAGE_LDFLAGS) \
+	$(SANITIZER_LIB_LDFLAGS) \
+	$(NULL)
+
+shared_nm_utils_libnm_utils_base_la_LIBADD = \
+	shared/libcsiphash.la \
+	$(GLIB_LIBS) \
+	$(NULL)
+
+###############################################################################
+
+noinst_LTLIBRARIES += shared/nm-utils/libnm-utils-udev.la
+
+shared_nm_utils_libnm_utils_udev_la_CPPFLAGS = \
+	$(shared_nm_utils_libnm_utils_cppflags) \
+	$(LIBUDEV_CFLAGS) \
+	$(NULL)
+
+shared_nm_utils_libnm_utils_udev_la_SOURCES = \
+	shared/nm-utils/nm-udev-utils.c \
+	shared/nm-utils/nm-udev-utils.h \
+	$(NULL)
+
+shared_nm_utils_libnm_utils_udev_la_LDFLAGS = \
+	$(CODE_COVERAGE_LDFLAGS) \
+	$(SANITIZER_LIB_LDFLAGS) \
+	$(NULL)
+
+shared_nm_utils_libnm_utils_udev_la_LIBADD = \
+	$(GLIB_LIBS) \
+	$(LIBUDEV_LIBS) \
+	$(NULL)
+
+###############################################################################
+
+check_programs += shared/nm-utils/tests/test-shared-general
+
+shared_nm_utils_tests_test_shared_general_CPPFLAGS = \
+	$(dflt_cppflags) \
+	-I$(srcdir)/shared \
+	-DNETWORKMANAGER_COMPILATION_TEST \
+	-DNETWORKMANAGER_COMPILATION='(NM_NETWORKMANAGER_COMPILATION_GLIB|NM_NETWORKMANAGER_COMPILATION_WITH_GLIB_I18N_PROG)' \
+	$(CODE_COVERAGE_CFLAGS) \
+	$(GLIB_CFLAGS) \
+	$(SANITIZER_LIB_CFLAGS) \
+	$(NULL)
+
+shared_nm_utils_tests_test_shared_general_LDADD = \
+	shared/nm-utils/libnm-utils-base.la \
+	$(GLIB_LIBS) \
+	$(NULL)
+
+###############################################################################
+
 noinst_LTLIBRARIES += \
 	introspection/libnmdbus.la
 
@@ -214,30 +389,32 @@ introspection_libnmdbus_la_CPPFLAGS = $(GLIB_CFLAGS)
 introspection_sources = \
 	introspection/org.freedesktop.NetworkManager.AccessPoint.c \
 	introspection/org.freedesktop.NetworkManager.AccessPoint.h \
-	introspection/org.freedesktop.NetworkManager.Connection.Active.c \
-	introspection/org.freedesktop.NetworkManager.Connection.Active.h \
 	introspection/org.freedesktop.NetworkManager.AgentManager.c \
 	introspection/org.freedesktop.NetworkManager.AgentManager.h \
 	introspection/org.freedesktop.NetworkManager.Checkpoint.c \
 	introspection/org.freedesktop.NetworkManager.Checkpoint.h \
+	introspection/org.freedesktop.NetworkManager.Connection.Active.c \
+	introspection/org.freedesktop.NetworkManager.Connection.Active.h \
+	introspection/org.freedesktop.NetworkManager.DHCP4Config.c \
+	introspection/org.freedesktop.NetworkManager.DHCP4Config.h \
+	introspection/org.freedesktop.NetworkManager.DHCP6Config.c \
+	introspection/org.freedesktop.NetworkManager.DHCP6Config.h \
 	introspection/org.freedesktop.NetworkManager.Device.Adsl.c \
 	introspection/org.freedesktop.NetworkManager.Device.Adsl.h \
+	introspection/org.freedesktop.NetworkManager.Device.Bluetooth.c \
+	introspection/org.freedesktop.NetworkManager.Device.Bluetooth.h \
 	introspection/org.freedesktop.NetworkManager.Device.Bond.c \
 	introspection/org.freedesktop.NetworkManager.Device.Bond.h \
 	introspection/org.freedesktop.NetworkManager.Device.Bridge.c \
 	introspection/org.freedesktop.NetworkManager.Device.Bridge.h \
-	introspection/org.freedesktop.NetworkManager.Device.Bluetooth.c \
-	introspection/org.freedesktop.NetworkManager.Device.Bluetooth.h \
 	introspection/org.freedesktop.NetworkManager.Device.Dummy.c \
 	introspection/org.freedesktop.NetworkManager.Device.Dummy.h \
-	introspection/org.freedesktop.NetworkManager.Device.Wired.c \
-	introspection/org.freedesktop.NetworkManager.Device.Wired.h \
 	introspection/org.freedesktop.NetworkManager.Device.Generic.c \
 	introspection/org.freedesktop.NetworkManager.Device.Generic.h \
-	introspection/org.freedesktop.NetworkManager.Device.Infiniband.c \
-	introspection/org.freedesktop.NetworkManager.Device.Infiniband.h \
 	introspection/org.freedesktop.NetworkManager.Device.IPTunnel.c \
 	introspection/org.freedesktop.NetworkManager.Device.IPTunnel.h \
+	introspection/org.freedesktop.NetworkManager.Device.Infiniband.c \
+	introspection/org.freedesktop.NetworkManager.Device.Infiniband.h \
 	introspection/org.freedesktop.NetworkManager.Device.Lowpan.c \
 	introspection/org.freedesktop.NetworkManager.Device.Lowpan.h \
 	introspection/org.freedesktop.NetworkManager.Device.Macsec.c \
@@ -248,12 +425,12 @@ introspection_sources = \
 	introspection/org.freedesktop.NetworkManager.Device.Modem.h \
 	introspection/org.freedesktop.NetworkManager.Device.OlpcMesh.c \
 	introspection/org.freedesktop.NetworkManager.Device.OlpcMesh.h \
+	introspection/org.freedesktop.NetworkManager.Device.OvsBridge.c \
+	introspection/org.freedesktop.NetworkManager.Device.OvsBridge.h \
 	introspection/org.freedesktop.NetworkManager.Device.OvsInterface.c \
 	introspection/org.freedesktop.NetworkManager.Device.OvsInterface.h \
 	introspection/org.freedesktop.NetworkManager.Device.OvsPort.c \
 	introspection/org.freedesktop.NetworkManager.Device.OvsPort.h \
-	introspection/org.freedesktop.NetworkManager.Device.OvsBridge.c \
-	introspection/org.freedesktop.NetworkManager.Device.OvsBridge.h \
 	introspection/org.freedesktop.NetworkManager.Device.Ppp.c \
 	introspection/org.freedesktop.NetworkManager.Device.Ppp.h \
 	introspection/org.freedesktop.NetworkManager.Device.Statistics.c \
@@ -268,28 +445,28 @@ introspection_sources = \
 	introspection/org.freedesktop.NetworkManager.Device.Vlan.h \
 	introspection/org.freedesktop.NetworkManager.Device.Vxlan.c \
 	introspection/org.freedesktop.NetworkManager.Device.Vxlan.h \
+	introspection/org.freedesktop.NetworkManager.Device.WiMax.c \
+	introspection/org.freedesktop.NetworkManager.Device.WiMax.h \
+	introspection/org.freedesktop.NetworkManager.Device.WifiP2P.c \
+	introspection/org.freedesktop.NetworkManager.Device.WifiP2P.h \
 	introspection/org.freedesktop.NetworkManager.Device.WireGuard.c \
 	introspection/org.freedesktop.NetworkManager.Device.WireGuard.h \
+	introspection/org.freedesktop.NetworkManager.Device.Wired.c \
+	introspection/org.freedesktop.NetworkManager.Device.Wired.h \
 	introspection/org.freedesktop.NetworkManager.Device.Wireless.c \
 	introspection/org.freedesktop.NetworkManager.Device.Wireless.h \
-	introspection/org.freedesktop.NetworkManager.Device.WiMax.c \
-	introspection/org.freedesktop.NetworkManager.Device.WiMax.h \
 	introspection/org.freedesktop.NetworkManager.Device.Wpan.c \
 	introspection/org.freedesktop.NetworkManager.Device.Wpan.h \
 	introspection/org.freedesktop.NetworkManager.Device.c \
 	introspection/org.freedesktop.NetworkManager.Device.h \
-	introspection/org.freedesktop.NetworkManager.DHCP4Config.c \
-	introspection/org.freedesktop.NetworkManager.DHCP4Config.h \
-	introspection/org.freedesktop.NetworkManager.DHCP6Config.c \
-	introspection/org.freedesktop.NetworkManager.DHCP6Config.h \
 	introspection/org.freedesktop.NetworkManager.DnsManager.c \
 	introspection/org.freedesktop.NetworkManager.DnsManager.h \
 	introspection/org.freedesktop.NetworkManager.IP4Config.c \
 	introspection/org.freedesktop.NetworkManager.IP4Config.h \
 	introspection/org.freedesktop.NetworkManager.IP6Config.c \
 	introspection/org.freedesktop.NetworkManager.IP6Config.h \
-	introspection/org.freedesktop.NetworkManager.c \
-	introspection/org.freedesktop.NetworkManager.h \
+	introspection/org.freedesktop.NetworkManager.WifiP2PPeer.c \
+	introspection/org.freedesktop.NetworkManager.WifiP2PPeer.h \
 	introspection/org.freedesktop.NetworkManager.PPP.c \
 	introspection/org.freedesktop.NetworkManager.PPP.h \
 	introspection/org.freedesktop.NetworkManager.SecretAgent.c \
@@ -301,56 +478,62 @@ introspection_sources = \
 	introspection/org.freedesktop.NetworkManager.VPN.Connection.c \
 	introspection/org.freedesktop.NetworkManager.VPN.Connection.h \
 	introspection/org.freedesktop.NetworkManager.VPN.Plugin.c \
-	introspection/org.freedesktop.NetworkManager.VPN.Plugin.h
+	introspection/org.freedesktop.NetworkManager.VPN.Plugin.h \
+	introspection/org.freedesktop.NetworkManager.c \
+	introspection/org.freedesktop.NetworkManager.h \
+	$(NULL)
 
 nodist_introspection_libnmdbus_la_SOURCES = $(introspection_sources)
 
 DBUS_INTERFACE_DOCS = \
 	docs/api/dbus-org.freedesktop.NetworkManager.AccessPoint.xml \
-	docs/api/dbus-org.freedesktop.NetworkManager.Connection.Active.xml \
+	docs/api/dbus-org.freedesktop.NetworkManager.AgentManager.xml \
 	docs/api/dbus-org.freedesktop.NetworkManager.Checkpoint.xml \
-	docs/api/dbus-org.freedesktop.NetworkManager.Device.Team.xml \
+	docs/api/dbus-org.freedesktop.NetworkManager.Connection.Active.xml \
+	docs/api/dbus-org.freedesktop.NetworkManager.DHCP4Config.xml \
 	docs/api/dbus-org.freedesktop.NetworkManager.DHCP6Config.xml \
-	docs/api/dbus-org.freedesktop.NetworkManager.Device.Wireless.xml \
-	docs/api/dbus-org.freedesktop.NetworkManager.xml \
-	docs/api/dbus-org.freedesktop.NetworkManager.VPN.Connection.xml \
-	docs/api/dbus-org.freedesktop.NetworkManager.SecretAgent.xml \
-	docs/api/dbus-org.freedesktop.NetworkManager.Device.xml \
-	docs/api/dbus-org.freedesktop.NetworkManager.VPN.Plugin.xml \
+	docs/api/dbus-org.freedesktop.NetworkManager.Device.Adsl.xml \
 	docs/api/dbus-org.freedesktop.NetworkManager.Device.Bluetooth.xml \
-	docs/api/dbus-org.freedesktop.NetworkManager.Device.Dummy.xml \
-	docs/api/dbus-org.freedesktop.NetworkManager.Device.Vxlan.xml \
-	docs/api/dbus-org.freedesktop.NetworkManager.Settings.Connection.xml \
 	docs/api/dbus-org.freedesktop.NetworkManager.Device.Bond.xml \
+	docs/api/dbus-org.freedesktop.NetworkManager.Device.Bridge.xml \
+	docs/api/dbus-org.freedesktop.NetworkManager.Device.Dummy.xml \
+	docs/api/dbus-org.freedesktop.NetworkManager.Device.Generic.xml \
+	docs/api/dbus-org.freedesktop.NetworkManager.Device.IPTunnel.xml \
+	docs/api/dbus-org.freedesktop.NetworkManager.Device.Infiniband.xml \
+	docs/api/dbus-org.freedesktop.NetworkManager.Device.Lowpan.xml \
 	docs/api/dbus-org.freedesktop.NetworkManager.Device.Macsec.xml \
 	docs/api/dbus-org.freedesktop.NetworkManager.Device.Macvlan.xml \
-	docs/api/dbus-org.freedesktop.NetworkManager.PPP.xml \
-	docs/api/dbus-org.freedesktop.NetworkManager.Device.Vlan.xml \
-	docs/api/dbus-org.freedesktop.NetworkManager.Device.Adsl.xml \
-	docs/api/dbus-org.freedesktop.NetworkManager.AgentManager.xml \
-	docs/api/dbus-org.freedesktop.NetworkManager.Device.WiMax.xml \
-	docs/api/dbus-org.freedesktop.NetworkManager.Device.Wpan.xml \
-	docs/api/dbus-org.freedesktop.NetworkManager.Device.IPTunnel.xml \
-	docs/api/dbus-org.freedesktop.NetworkManager.Device.Tun.xml \
-	docs/api/dbus-org.freedesktop.NetworkManager.Device.Bridge.xml \
+	docs/api/dbus-org.freedesktop.NetworkManager.Device.Modem.xml \
 	docs/api/dbus-org.freedesktop.NetworkManager.Device.OlpcMesh.xml \
+	docs/api/dbus-org.freedesktop.NetworkManager.Device.OvsBridge.xml \
 	docs/api/dbus-org.freedesktop.NetworkManager.Device.OvsInterface.xml \
 	docs/api/dbus-org.freedesktop.NetworkManager.Device.OvsPort.xml \
-	docs/api/dbus-org.freedesktop.NetworkManager.Device.OvsBridge.xml \
 	docs/api/dbus-org.freedesktop.NetworkManager.Device.Ppp.xml \
-	docs/api/dbus-org.freedesktop.NetworkManager.DHCP4Config.xml \
-	docs/api/dbus-org.freedesktop.NetworkManager.Device.Generic.xml \
-	docs/api/dbus-org.freedesktop.NetworkManager.Device.Infiniband.xml \
-	docs/api/dbus-org.freedesktop.NetworkManager.Device.Modem.xml \
-	docs/api/dbus-org.freedesktop.NetworkManager.IP6Config.xml \
+	docs/api/dbus-org.freedesktop.NetworkManager.Device.Statistics.xml \
+	docs/api/dbus-org.freedesktop.NetworkManager.Device.Team.xml \
+	docs/api/dbus-org.freedesktop.NetworkManager.Device.Tun.xml \
 	docs/api/dbus-org.freedesktop.NetworkManager.Device.Veth.xml \
-	docs/api/dbus-org.freedesktop.NetworkManager.Settings.xml \
-	docs/api/dbus-org.freedesktop.NetworkManager.Device.Wired.xml \
+	docs/api/dbus-org.freedesktop.NetworkManager.Device.Vlan.xml \
+	docs/api/dbus-org.freedesktop.NetworkManager.Device.Vxlan.xml \
+	docs/api/dbus-org.freedesktop.NetworkManager.Device.WiMax.xml \
+	docs/api/dbus-org.freedesktop.NetworkManager.Device.WifiP2P.xml \
 	docs/api/dbus-org.freedesktop.NetworkManager.Device.WireGuard.xml \
-	docs/api/dbus-org.freedesktop.NetworkManager.IP4Config.xml \
-	docs/api/dbus-org.freedesktop.NetworkManager.Device.Statistics.xml \
+	docs/api/dbus-org.freedesktop.NetworkManager.Device.Wired.xml \
+	docs/api/dbus-org.freedesktop.NetworkManager.Device.Wireless.xml \
+	docs/api/dbus-org.freedesktop.NetworkManager.Device.Wpan.xml \
+	docs/api/dbus-org.freedesktop.NetworkManager.Device.xml \
 	docs/api/dbus-org.freedesktop.NetworkManager.DnsManager.xml \
-	docs/api/dbus-org.freedesktop.NetworkManager.Device.Lowpan.xml
+	docs/api/dbus-org.freedesktop.NetworkManager.IP4Config.xml \
+	docs/api/dbus-org.freedesktop.NetworkManager.IP6Config.xml \
+	docs/api/dbus-org.freedesktop.NetworkManager.PPP.xml \
+	docs/api/dbus-org.freedesktop.NetworkManager.SecretAgent.xml \
+	docs/api/dbus-org.freedesktop.NetworkManager.Settings.Connection.xml \
+	docs/api/dbus-org.freedesktop.NetworkManager.Settings.xml \
+	docs/api/dbus-org.freedesktop.NetworkManager.VPN.Connection.xml \
+	docs/api/dbus-org.freedesktop.NetworkManager.VPN.Plugin.xml \
+	docs/api/dbus-org.freedesktop.NetworkManager.WifiP2PPeer.xml \
+	docs/api/dbus-org.freedesktop.NetworkManager.xml \
+	$(NULL)
 
 introspection/%.c: introspection/%.xml
 	@$(MKDIR_P) introspection/
@@ -371,26 +554,27 @@ dbusinterfacesdir = $(datadir)/dbus-1/interfaces
 
 dbusinterfaces_DATA = \
 	introspection/org.freedesktop.NetworkManager.AccessPoint.xml \
-	introspection/org.freedesktop.NetworkManager.Connection.Active.xml \
 	introspection/org.freedesktop.NetworkManager.AgentManager.xml \
 	introspection/org.freedesktop.NetworkManager.Checkpoint.xml \
+	introspection/org.freedesktop.NetworkManager.Connection.Active.xml \
+	introspection/org.freedesktop.NetworkManager.DHCP4Config.xml \
+	introspection/org.freedesktop.NetworkManager.DHCP6Config.xml \
 	introspection/org.freedesktop.NetworkManager.Device.Adsl.xml \
+	introspection/org.freedesktop.NetworkManager.Device.Bluetooth.xml \
 	introspection/org.freedesktop.NetworkManager.Device.Bond.xml \
 	introspection/org.freedesktop.NetworkManager.Device.Bridge.xml \
-	introspection/org.freedesktop.NetworkManager.Device.Bluetooth.xml \
 	introspection/org.freedesktop.NetworkManager.Device.Dummy.xml \
-	introspection/org.freedesktop.NetworkManager.Device.Wired.xml \
 	introspection/org.freedesktop.NetworkManager.Device.Generic.xml \
-	introspection/org.freedesktop.NetworkManager.Device.Infiniband.xml \
 	introspection/org.freedesktop.NetworkManager.Device.IPTunnel.xml \
+	introspection/org.freedesktop.NetworkManager.Device.Infiniband.xml \
 	introspection/org.freedesktop.NetworkManager.Device.Lowpan.xml \
 	introspection/org.freedesktop.NetworkManager.Device.Macsec.xml \
 	introspection/org.freedesktop.NetworkManager.Device.Macvlan.xml \
 	introspection/org.freedesktop.NetworkManager.Device.Modem.xml \
 	introspection/org.freedesktop.NetworkManager.Device.OlpcMesh.xml \
+	introspection/org.freedesktop.NetworkManager.Device.OvsBridge.xml \
 	introspection/org.freedesktop.NetworkManager.Device.OvsInterface.xml \
 	introspection/org.freedesktop.NetworkManager.Device.OvsPort.xml \
-	introspection/org.freedesktop.NetworkManager.Device.OvsBridge.xml \
 	introspection/org.freedesktop.NetworkManager.Device.Ppp.xml \
 	introspection/org.freedesktop.NetworkManager.Device.Statistics.xml \
 	introspection/org.freedesktop.NetworkManager.Device.Team.xml \
@@ -398,24 +582,26 @@ dbusinterfaces_DATA = \
 	introspection/org.freedesktop.NetworkManager.Device.Veth.xml \
 	introspection/org.freedesktop.NetworkManager.Device.Vlan.xml \
 	introspection/org.freedesktop.NetworkManager.Device.Vxlan.xml \
+	introspection/org.freedesktop.NetworkManager.Device.WiMax.xml \
+	introspection/org.freedesktop.NetworkManager.Device.WifiP2P.xml \
 	introspection/org.freedesktop.NetworkManager.Device.WireGuard.xml \
+	introspection/org.freedesktop.NetworkManager.Device.Wired.xml \
 	introspection/org.freedesktop.NetworkManager.Device.Wireless.xml \
-	introspection/org.freedesktop.NetworkManager.Device.WiMax.xml \
 	introspection/org.freedesktop.NetworkManager.Device.Wpan.xml \
 	introspection/org.freedesktop.NetworkManager.Device.xml \
-	introspection/org.freedesktop.NetworkManager.DHCP4Config.xml \
-	introspection/org.freedesktop.NetworkManager.DHCP6Config.xml \
 	introspection/org.freedesktop.NetworkManager.DnsManager.xml \
 	introspection/org.freedesktop.NetworkManager.IP4Config.xml \
 	introspection/org.freedesktop.NetworkManager.IP6Config.xml \
-	introspection/org.freedesktop.NetworkManager.xml \
 	introspection/org.freedesktop.NetworkManager.PPP.xml \
 	introspection/org.freedesktop.NetworkManager.SecretAgent.xml \
 	introspection/org.freedesktop.NetworkManager.Settings.Connection.xml \
 	introspection/org.freedesktop.NetworkManager.Settings.xml \
 	introspection/org.freedesktop.NetworkManager.VPN.Connection.xml \
 	introspection/org.freedesktop.NetworkManager.VPN.Plugin.xml \
-	introspection/org.freedesktop.NetworkManager.WiMax.Nsp.xml
+	introspection/org.freedesktop.NetworkManager.WiMax.Nsp.xml \
+	introspection/org.freedesktop.NetworkManager.WifiP2PPeer.xml \
+	introspection/org.freedesktop.NetworkManager.xml \
+	$(NULL)
 
 CLEANFILES += $(introspection_sources)
 CLEANFILES += $(DBUS_INTERFACE_DOCS)
@@ -481,8 +667,10 @@ libnm_core_lib_h_pub_real = \
 	libnm-core/nm-setting-vlan.h \
 	libnm-core/nm-setting-vpn.h \
 	libnm-core/nm-setting-vxlan.h \
+	libnm-core/nm-setting-wifi-p2p.h \
 	libnm-core/nm-setting-wimax.h \
 	libnm-core/nm-setting-wired.h \
+	libnm-core/nm-setting-wireguard.h \
 	libnm-core/nm-setting-wireless-security.h \
 	libnm-core/nm-setting-wireless.h \
 	libnm-core/nm-setting-wpan.h \
@@ -496,15 +684,6 @@ libnm_core_lib_h_pub_real = \
 libnm_core_lib_h_pub_mkenums = \
 	libnm-core/nm-core-enum-types.h
 libnm_core_lib_h_priv = \
-	shared/nm-utils/c-list-util.h \
-	shared/nm-utils/nm-dedup-multi.h \
-	shared/nm-utils/nm-enum-utils.h \
-	shared/nm-utils/nm-hash-utils.h \
-	shared/nm-utils/nm-io-utils.h \
-	shared/nm-utils/nm-secret-utils.h \
-	shared/nm-utils/nm-shared-utils.h \
-	shared/nm-utils/nm-random-utils.h \
-	shared/nm-utils/nm-udev-utils.h \
 	shared/nm-ethtool-utils.h \
 	shared/nm-meta-setting.h \
 	libnm-core/nm-crypto.h \
@@ -558,22 +737,15 @@ libnm_core_lib_c_settings_real = \
 	libnm-core/nm-setting-vlan.c \
 	libnm-core/nm-setting-vpn.c \
 	libnm-core/nm-setting-vxlan.c \
+	libnm-core/nm-setting-wifi-p2p.c \
 	libnm-core/nm-setting-wimax.c \
 	libnm-core/nm-setting-wired.c \
+	libnm-core/nm-setting-wireguard.c \
 	libnm-core/nm-setting-wireless-security.c \
 	libnm-core/nm-setting-wireless.c \
 	libnm-core/nm-setting-wpan.c
 libnm_core_lib_c_real = \
 	$(libnm_core_lib_c_settings_real) \
-	shared/nm-utils/c-list-util.c \
-	shared/nm-utils/nm-dedup-multi.c \
-	shared/nm-utils/nm-enum-utils.c \
-	shared/nm-utils/nm-hash-utils.c \
-	shared/nm-utils/nm-io-utils.c \
-	shared/nm-utils/nm-secret-utils.c \
-	shared/nm-utils/nm-shared-utils.c \
-	shared/nm-utils/nm-random-utils.c \
-	shared/nm-utils/nm-udev-utils.c \
 	shared/nm-ethtool-utils.c \
 	shared/nm-meta-setting.c \
 	libnm-core/nm-crypto.c \
@@ -666,7 +838,6 @@ nodist_libnm_core_libnm_core_la_SOURCES = \
 libnm_core_libnm_core_la_LIBADD = \
 	$(GLIB_LIBS) \
 	$(UUID_LIBS) \
-	$(LIBUDEV_LIBS) \
 	$(NULL)
 
 libnm_core_libnm_core_la_LDFLAGS = \
@@ -784,7 +955,9 @@ nodist_libnm_core_tests_test_general_SOURCES = \
 
 libnm_core_tests_ldadd = \
 	libnm-core/libnm-core.la \
-	shared/libcsiphash.la \
+	shared/systemd/libnm-systemd-shared.la \
+	shared/systemd/libnm-systemd-logging-stub.la \
+	shared/nm-utils/libnm-utils-base.la \
 	$(libnm_crypto_lib) \
 	$(GLIB_LIBS)
 
@@ -871,14 +1044,15 @@ libnm_lib_h_pub_real = \
 	libnm/nm-device-macvlan.h \
 	libnm/nm-device-modem.h \
 	libnm/nm-device-olpc-mesh.h \
+	libnm/nm-device-ovs-bridge.h \
 	libnm/nm-device-ovs-interface.h \
 	libnm/nm-device-ovs-port.h \
-	libnm/nm-device-ovs-bridge.h \
 	libnm/nm-device-ppp.h \
 	libnm/nm-device-team.h \
 	libnm/nm-device-tun.h \
 	libnm/nm-device-vlan.h \
 	libnm/nm-device-vxlan.h \
+	libnm/nm-device-wifi-p2p.h \
 	libnm/nm-device-wifi.h \
 	libnm/nm-device-wimax.h \
 	libnm/nm-device-wireguard.h \
@@ -894,6 +1068,7 @@ libnm_lib_h_pub_real = \
 	libnm/nm-vpn-editor.h \
 	libnm/nm-vpn-plugin-old.h \
 	libnm/nm-vpn-service-plugin.h \
+	libnm/nm-wifi-p2p-peer.h \
 	libnm/nm-wimax-nsp.h
 libnm_lib_h_pub_mkenums = \
 	libnm/nm-enum-types.h
@@ -930,14 +1105,15 @@ libnm_lib_c_real = \
 	libnm/nm-device-macvlan.c \
 	libnm/nm-device-modem.c \
 	libnm/nm-device-olpc-mesh.c \
+	libnm/nm-device-ovs-bridge.c \
 	libnm/nm-device-ovs-interface.c \
 	libnm/nm-device-ovs-port.c \
-	libnm/nm-device-ovs-bridge.c \
 	libnm/nm-device-ppp.c \
 	libnm/nm-device-team.c \
 	libnm/nm-device-tun.c \
 	libnm/nm-device-vlan.c \
 	libnm/nm-device-vxlan.c \
+	libnm/nm-device-wifi-p2p.c \
 	libnm/nm-device-wifi.c \
 	libnm/nm-device-wimax.c \
 	libnm/nm-device-wireguard.c \
@@ -956,9 +1132,10 @@ libnm_lib_c_real = \
 	libnm/nm-remote-settings.c \
 	libnm/nm-secret-agent-old.c \
 	libnm/nm-vpn-connection.c \
-	libnm/nm-vpn-plugin-old.c \
 	libnm/nm-vpn-editor.c \
+	libnm/nm-vpn-plugin-old.c \
 	libnm/nm-vpn-service-plugin.c \
+	libnm/nm-wifi-p2p-peer.c \
 	libnm/nm-wimax-nsp.c
 libnm_lib_c_mkenums = \
 	libnm/nm-enum-types.c
@@ -990,10 +1167,11 @@ libnm_libnm_utils_la_SOURCES = \
 
 libnm_libnm_utils_la_LIBADD = \
 	libnm-core/libnm-core.la \
-	shared/libcsiphash.la \
 	$(libnm_crypto_lib) \
 	introspection/libnmdbus.la \
-	$(GLIB_LIBS)
+	shared/nm-utils/libnm-utils-base.la \
+	$(GLIB_LIBS) \
+	$(NULL)
 
 $(libnm_libnm_utils_la_OBJECTS) : $(libnm_lib_h_pub_mkenums)
 
@@ -1034,10 +1212,13 @@ EXTRA_libnm_libnm_la_DEPENDENCIES = \
 
 libnm_libnm_la_LIBADD = \
 	libnm/libnm-utils.la \
+	shared/systemd/libnm-systemd-shared.la \
+	shared/systemd/libnm-systemd-logging-stub.la \
+	shared/nm-utils/libnm-utils-udev.la \
 	$(DL_LIBS) \
 	$(GLIB_LIBS) \
 	$(UUID_LIBS) \
-	$(LIBUDEV_LIBS)
+	$(NULL)
 
 libnm_libnm_la_LDFLAGS = \
 	-Wl,--version-script="$(srcdir)/libnm/libnm.ver" \
@@ -1199,6 +1380,8 @@ libnm_tests_cppflags = \
 
 libnm_tests_ldadd = \
 	libnm/libnm.la \
+	shared/systemd/libnm-systemd-shared.la \
+	shared/systemd/libnm-systemd-logging-stub.la \
 	$(GLIB_LIBS)
 
 libnm_tests_ldflags = \
@@ -1332,166 +1515,201 @@ libexec_PROGRAMS += \
 noinst_LTLIBRARIES += \
 	src/libNetworkManagerBase.la \
 	src/libNetworkManager.la \
-	src/libsystemd-nm.la
+	src/libnm-systemd-core.la \
+	$(NULL)
 
-###############################################################################
+check-config-options:
+	$(srcdir)/tools/check-config-options.sh "$(srcdir)"
 
-noinst_LTLIBRARIES += shared/libcsiphash.la
+check_local += check-config-options
 
-shared_libcsiphash_la_CPPFLAGS = \
+###############################################################################
+
+libsystemd_cppflags = \
+	$(dflt_cppflags) \
+	-I$(srcdir)/shared \
+	-I$(builddir)/shared \
+	-I$(srcdir)/shared/systemd/ \
+	-I$(srcdir)/shared/systemd/sd-adapt-shared \
+	-I$(srcdir)/shared/systemd/src/basic \
+	$(LIBSYSTEMD_NM_CFLAGS) \
+	$(GLIB_CFLAGS) \
 	$(CODE_COVERAGE_CFLAGS) \
-	$(SANITIZER_LIB_CFLAGS) \
 	$(NULL)
 
-shared_libcsiphash_la_SOURCES = \
-	shared/c-siphash/src/c-siphash.c \
-	shared/c-siphash/src/c-siphash.h
+libsystemd_libadd = \
+	$(GLIB_LIBS) \
+	$(CODE_COVERAGE_LDFLAGS) \
+	$(NULL)
 
-###############################################################################
+noinst_LTLIBRARIES += shared/systemd/libnm-systemd-logging-stub.la
 
-noinst_LTLIBRARIES += shared/libnacd.la
+shared_systemd_libnm_systemd_logging_stub_la_CPPFLAGS = \
+	$(libsystemd_cppflags) \
+	-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_SYSTEMD_SHARED \
+	-DG_LOG_DOMAIN=\""libnm"\" \
+	$(NULL)
 
-shared_libnacd_la_CFLAGS = -std=gnu99
+shared_systemd_libnm_systemd_logging_stub_la_SOURCES = \
+	shared/systemd/nm-logging-stub.c \
+	$(NULL)
 
-shared_libnacd_la_CPPFLAGS = \
-	$(CODE_COVERAGE_CFLAGS) \
-	$(SANITIZER_LIB_CFLAGS) \
-	-I$(srcdir)/shared/c-list/src \
-	-I$(srcdir)/shared/c-siphash/src \
+shared_systemd_libnm_systemd_logging_stub_la_LIBADD = \
+	$(libsystemd_libadd) \
 	$(NULL)
 
-shared_libnacd_la_SOURCES = \
-	shared/n-acd/src/n-acd.c \
-	shared/n-acd/src/n-acd.h
+noinst_LTLIBRARIES += shared/systemd/libnm-systemd-shared.la
+
+shared_systemd_libnm_systemd_shared_la_CPPFLAGS = \
+	$(libsystemd_cppflags) \
+	-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_SYSTEMD_SHARED \
+	-DG_LOG_DOMAIN=\""libnm"\" \
+	$(NULL)
 
-EXTRA_DIST += shared/c-list/src/c-list.h
+shared_systemd_libnm_systemd_shared_la_SOURCES = \
+	shared/systemd/nm-sd-utils-shared.c \
+	shared/systemd/nm-sd-utils-shared.h \
+	shared/systemd/sd-adapt-shared/architecture.h \
+	shared/systemd/sd-adapt-shared/btrfs-util.h \
+	shared/systemd/sd-adapt-shared/build.h \
+	shared/systemd/sd-adapt-shared/cgroup-util.h \
+	shared/systemd/sd-adapt-shared/copy.h \
+	shared/systemd/sd-adapt-shared/def.h \
+	shared/systemd/sd-adapt-shared/device-nodes.h \
+	shared/systemd/sd-adapt-shared/dirent-util.h \
+	shared/systemd/sd-adapt-shared/errno-list.h \
+	shared/systemd/sd-adapt-shared/format-util.h \
+	shared/systemd/sd-adapt-shared/glob-util.h \
+	shared/systemd/sd-adapt-shared/gunicode.h \
+	shared/systemd/sd-adapt-shared/ioprio.h \
+	shared/systemd/sd-adapt-shared/locale-util.h \
+	shared/systemd/sd-adapt-shared/memfd-util.h \
+	shared/systemd/sd-adapt-shared/missing.h \
+	shared/systemd/sd-adapt-shared/missing_socket.h \
+	shared/systemd/sd-adapt-shared/missing_syscall.h \
+	shared/systemd/sd-adapt-shared/missing_timerfd.h \
+	shared/systemd/sd-adapt-shared/mkdir.h \
+	shared/systemd/sd-adapt-shared/nm-sd-adapt-shared.h \
+	shared/systemd/sd-adapt-shared/nm-sd-adapt-shared.h \
+	shared/systemd/sd-adapt-shared/procfs-util.h \
+	shared/systemd/sd-adapt-shared/raw-clone.h \
+	shared/systemd/sd-adapt-shared/rlimit-util.h \
+	shared/systemd/sd-adapt-shared/terminal-util.h \
+	shared/systemd/sd-adapt-shared/unaligned.h \
+	shared/systemd/sd-adapt-shared/user-util.h \
+	shared/systemd/sd-adapt-shared/virt.h \
+	shared/systemd/src/basic/alloc-util.c \
+	shared/systemd/src/basic/alloc-util.h \
+	shared/systemd/src/basic/async.h \
+	shared/systemd/src/basic/env-file.c \
+	shared/systemd/src/basic/env-file.h \
+	shared/systemd/src/basic/env-util.c \
+	shared/systemd/src/basic/env-util.h \
+	shared/systemd/src/basic/escape.c \
+	shared/systemd/src/basic/escape.h \
+	shared/systemd/src/basic/ether-addr-util.c \
+	shared/systemd/src/basic/ether-addr-util.h \
+	shared/systemd/src/basic/extract-word.c \
+	shared/systemd/src/basic/extract-word.h \
+	shared/systemd/src/basic/fd-util.c \
+	shared/systemd/src/basic/fd-util.h \
+	shared/systemd/src/basic/fileio.c \
+	shared/systemd/src/basic/fileio.h \
+	shared/systemd/src/basic/fs-util.c \
+	shared/systemd/src/basic/fs-util.h \
+	shared/systemd/src/basic/hash-funcs.c \
+	shared/systemd/src/basic/hash-funcs.h \
+	shared/systemd/src/basic/hashmap.c \
+	shared/systemd/src/basic/hashmap.h \
+	shared/systemd/src/basic/hexdecoct.c \
+	shared/systemd/src/basic/hexdecoct.h \
+	shared/systemd/src/basic/hostname-util.c \
+	shared/systemd/src/basic/hostname-util.h \
+	shared/systemd/src/basic/in-addr-util.c \
+	shared/systemd/src/basic/in-addr-util.h \
+	shared/systemd/src/basic/io-util.c \
+	shared/systemd/src/basic/io-util.h \
+	shared/systemd/src/basic/list.h \
+	shared/systemd/src/basic/log.h \
+	shared/systemd/src/basic/macro.h \
+	shared/systemd/src/basic/mempool.c \
+	shared/systemd/src/basic/mempool.h \
+	shared/systemd/src/basic/missing_fcntl.h \
+	shared/systemd/src/basic/missing_type.h \
+	shared/systemd/src/basic/parse-util.c \
+	shared/systemd/src/basic/parse-util.h \
+	shared/systemd/src/basic/path-util.c \
+	shared/systemd/src/basic/path-util.h \
+	shared/systemd/src/basic/prioq.c \
+	shared/systemd/src/basic/prioq.h \
+	shared/systemd/src/basic/process-util.c \
+	shared/systemd/src/basic/process-util.h \
+	shared/systemd/src/basic/random-util.c \
+	shared/systemd/src/basic/random-util.h \
+	shared/systemd/src/basic/refcnt.h \
+	shared/systemd/src/basic/set.h \
+	shared/systemd/src/basic/signal-util.h \
+	shared/systemd/src/basic/siphash24.h \
+	shared/systemd/src/basic/socket-util.c \
+	shared/systemd/src/basic/socket-util.h \
+	shared/systemd/src/basic/sparse-endian.h \
+	shared/systemd/src/basic/stat-util.c \
+	shared/systemd/src/basic/stat-util.h \
+	shared/systemd/src/basic/stdio-util.h \
+	shared/systemd/src/basic/string-table.c \
+	shared/systemd/src/basic/string-table.h \
+	shared/systemd/src/basic/string-util.c \
+	shared/systemd/src/basic/string-util.h \
+	shared/systemd/src/basic/strv.c \
+	shared/systemd/src/basic/strv.h \
+	shared/systemd/src/basic/time-util.c \
+	shared/systemd/src/basic/time-util.h \
+	shared/systemd/src/basic/tmpfile-util.c \
+	shared/systemd/src/basic/tmpfile-util.h \
+	shared/systemd/src/basic/umask-util.h \
+	shared/systemd/src/basic/utf8.c \
+	shared/systemd/src/basic/utf8.h \
+	shared/systemd/src/basic/util.c \
+	shared/systemd/src/basic/util.h \
+	$(NULL)
+
+shared_systemd_libnm_systemd_shared_la_LIBADD = \
+	$(libsystemd_libadd) \
+	$(NULL)
 
 ###############################################################################
 
-src_libsystemd_nm_la_cppflags = \
-	$(dflt_cppflags) \
-	-I$(srcdir)/shared \
-	-I$(builddir)/shared \
+src_libnm_systemd_core_la_cppflags = \
+	$(libsystemd_cppflags) \
 	-I$(srcdir)/libnm-core \
 	-I$(builddir)/libnm-core \
 	-I$(srcdir)/src \
-	-I$(srcdir)/src/systemd/sd-adapt \
+	-I$(srcdir)/src/systemd/sd-adapt-core \
 	-I$(srcdir)/src/systemd/src/systemd \
-	-I$(srcdir)/src/systemd/src/basic \
 	-I$(srcdir)/src/systemd/src/shared \
 	-I$(srcdir)/src/systemd/src/libsystemd-network \
+	-I$(srcdir)/src/systemd/src/libsystemd/sd-event \
 	-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_SYSTEMD \
-	$(LIBSYSTEMD_NM_CFLAGS) \
-	$(GLIB_CFLAGS) \
-	$(CODE_COVERAGE_CFLAGS)
+	$(NULL)
 
-src_libsystemd_nm_la_libadd = \
-	$(GLIB_LIBS) \
-	$(CODE_COVERAGE_LDFLAGS)
+src_libnm_systemd_core_la_libadd = \
+	$(libsystemd_libadd) \
+	$(NULL)
 
-src_libsystemd_nm_la_SOURCES = \
+src_libnm_systemd_core_la_SOURCES = \
+	src/systemd/nm-sd-utils-core.c \
+	src/systemd/nm-sd-utils-core.h \
 	src/systemd/nm-sd.c \
 	src/systemd/nm-sd.h \
-	src/systemd/nm-sd-utils.c \
-	src/systemd/nm-sd-utils.h \
-	src/systemd/sd-adapt/nm-sd-adapt.c \
-	src/systemd/sd-adapt/nm-sd-adapt.h \
-	src/systemd/sd-adapt/architecture.h \
-	src/systemd/sd-adapt/btrfs-util.h \
-	src/systemd/sd-adapt/build.h \
-	src/systemd/sd-adapt/cgroup-util.h \
-	src/systemd/sd-adapt/condition.h \
-	src/systemd/sd-adapt/conf-parser.h \
-	src/systemd/sd-adapt/copy.h \
-	src/systemd/sd-adapt/def.h \
-	src/systemd/sd-adapt/device-nodes.h \
-	src/systemd/sd-adapt/dirent-util.h \
-	src/systemd/sd-adapt/errno-list.h \
-	src/systemd/sd-adapt/format-util.h \
-	src/systemd/sd-adapt/glob-util.h \
-	src/systemd/sd-adapt/gunicode.h \
-	src/systemd/sd-adapt/ioprio.h \
-	src/systemd/sd-adapt/khash.h \
-	src/systemd/sd-adapt/locale-util.h \
-	src/systemd/sd-adapt/memfd-util.h \
-	src/systemd/sd-adapt/missing.h \
-	src/systemd/sd-adapt/mkdir.h \
-	src/systemd/sd-adapt/procfs-util.h \
-	src/systemd/sd-adapt/raw-clone.h \
-	src/systemd/sd-adapt/sd-daemon.h \
-	src/systemd/sd-adapt/sd-device.h \
-	src/systemd/sd-adapt/stat-util.h \
-	src/systemd/sd-adapt/terminal-util.h \
-	src/systemd/sd-adapt/unaligned.h \
-	src/systemd/sd-adapt/user-util.h \
-	src/systemd/sd-adapt/virt.h \
-	src/systemd/src/basic/alloc-util.c \
-	src/systemd/src/basic/alloc-util.h \
-	src/systemd/src/basic/async.h \
-	src/systemd/src/basic/env-util.c \
-	src/systemd/src/basic/env-util.h \
-	src/systemd/src/basic/escape.c \
-	src/systemd/src/basic/escape.h \
-	src/systemd/src/basic/ether-addr-util.c \
-	src/systemd/src/basic/ether-addr-util.h \
-	src/systemd/src/basic/extract-word.c \
-	src/systemd/src/basic/extract-word.h \
-	src/systemd/src/basic/fd-util.c \
-	src/systemd/src/basic/fd-util.h \
-	src/systemd/src/basic/fileio.c \
-	src/systemd/src/basic/fileio.h \
-	src/systemd/src/basic/fs-util.c \
-	src/systemd/src/basic/fs-util.h \
-	src/systemd/src/basic/hash-funcs.c \
-	src/systemd/src/basic/hash-funcs.h \
-	src/systemd/src/basic/hashmap.c \
-	src/systemd/src/basic/hashmap.h \
-	src/systemd/src/basic/hexdecoct.c \
-	src/systemd/src/basic/hexdecoct.h \
-	src/systemd/src/basic/hostname-util.c \
-	src/systemd/src/basic/hostname-util.h \
-	src/systemd/src/basic/in-addr-util.c \
-	src/systemd/src/basic/in-addr-util.h \
-	src/systemd/src/basic/io-util.c \
-	src/systemd/src/basic/io-util.h \
-	src/systemd/src/basic/list.h \
-	src/systemd/src/basic/log.h \
-	src/systemd/src/basic/macro.h \
-	src/systemd/src/basic/mempool.c \
-	src/systemd/src/basic/mempool.h \
-	src/systemd/src/basic/parse-util.c \
-	src/systemd/src/basic/parse-util.h \
-	src/systemd/src/basic/path-util.c \
-	src/systemd/src/basic/path-util.h \
-	src/systemd/src/basic/prioq.c \
-	src/systemd/src/basic/prioq.h \
-	src/systemd/src/basic/process-util.c \
-	src/systemd/src/basic/process-util.h \
-	src/systemd/src/basic/random-util.c \
-	src/systemd/src/basic/random-util.h \
-	src/systemd/src/basic/refcnt.h \
-	src/systemd/src/basic/set.h \
-	src/systemd/src/basic/signal-util.h \
-	src/systemd/src/basic/siphash24.h \
-	src/systemd/src/basic/socket-util.c \
-	src/systemd/src/basic/socket-util.h \
-	src/systemd/src/basic/sparse-endian.h \
-	src/systemd/src/basic/stat-util.c \
-	src/systemd/src/basic/stat-util.h \
-	src/systemd/src/basic/stdio-util.h \
-	src/systemd/src/basic/string-table.c \
-	src/systemd/src/basic/string-table.h \
-	src/systemd/src/basic/string-util.c \
-	src/systemd/src/basic/string-util.h \
-	src/systemd/src/basic/strv.c \
-	src/systemd/src/basic/strv.h \
-	src/systemd/src/basic/time-util.c \
-	src/systemd/src/basic/time-util.h \
-	src/systemd/src/basic/umask-util.h \
-	src/systemd/src/basic/utf8.c \
-	src/systemd/src/basic/utf8.h \
-	src/systemd/src/basic/util.c \
-	src/systemd/src/basic/util.h \
+	src/systemd/sd-adapt-core/condition.h \
+	src/systemd/sd-adapt-core/conf-parser.h \
+	src/systemd/sd-adapt-core/device-util.h \
+	src/systemd/sd-adapt-core/khash.h \
+	src/systemd/sd-adapt-core/nm-sd-adapt-core.c \
+	src/systemd/sd-adapt-core/nm-sd-adapt-core.h \
+	src/systemd/sd-adapt-core/sd-daemon.h \
+	src/systemd/sd-adapt-core/sd-device.h \
+	src/systemd/sd-adapt-core/stat-util.h \
 	src/systemd/src/libsystemd-network/arp-util.c \
 	src/systemd/src/libsystemd-network/arp-util.h \
 	src/systemd/src/libsystemd-network/dhcp-identifier.c \
@@ -1521,6 +1739,9 @@ src_libsystemd_nm_la_SOURCES = \
 	src/systemd/src/libsystemd-network/sd-ipv4acd.c \
 	src/systemd/src/libsystemd-network/sd-ipv4ll.c \
 	src/systemd/src/libsystemd-network/sd-lldp.c \
+	src/systemd/src/libsystemd/sd-event/event-source.h \
+	src/systemd/src/libsystemd/sd-event/event-util.c \
+	src/systemd/src/libsystemd/sd-event/event-util.h \
 	src/systemd/src/libsystemd/sd-event/sd-event.c \
 	src/systemd/src/libsystemd/sd-id128/id128-util.c \
 	src/systemd/src/libsystemd/sd-id128/id128-util.h \
@@ -1539,9 +1760,9 @@ src_libsystemd_nm_la_SOURCES = \
 	src/systemd/src/systemd/sd-lldp.h \
 	src/systemd/src/systemd/sd-ndisc.h
 
-src_libsystemd_nm_la_CPPFLAGS = $(src_libsystemd_nm_la_cppflags)
-src_libsystemd_nm_la_LIBADD = $(src_libsystemd_nm_la_libadd)
-$(src_libsystemd_nm_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
+src_libnm_systemd_core_la_CPPFLAGS = $(src_libnm_systemd_core_la_cppflags)
+src_libnm_systemd_core_la_LIBADD = $(src_libnm_systemd_core_la_libadd)
+$(src_libnm_systemd_core_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
 
 EXTRA_DIST += \
 	src/systemd/meson.build
@@ -1619,8 +1840,9 @@ endif
 
 src_libNetworkManagerBase_la_LIBADD = \
 	libnm-core/libnm-core.la \
-	shared/libcsiphash.la \
 	$(libnm_crypto_lib) \
+	shared/nm-utils/libnm-utils-udev.la \
+	shared/nm-utils/libnm-utils-base.la \
 	$(GLIB_LIBS) \
 	$(SYSTEMD_JOURNAL_LIBS) \
 	$(LIBUDEV_LIBS) \
@@ -1642,12 +1864,12 @@ src_libNetworkManager_la_SOURCES = \
 	src/nm-checkpoint-manager.c \
 	src/nm-checkpoint-manager.h \
 	\
-	src/devices/nm-device.c \
-	src/devices/nm-device.h \
-	src/devices/nm-lldp-listener.c \
-	src/devices/nm-lldp-listener.h \
 	src/devices/nm-acd-manager.c \
 	src/devices/nm-acd-manager.h \
+	src/devices/nm-lldp-listener.c \
+	src/devices/nm-lldp-listener.h \
+	src/devices/nm-device.c \
+	src/devices/nm-device.h \
 	src/devices/nm-device-ethernet-utils.c \
 	src/devices/nm-device-ethernet-utils.h \
 	src/devices/nm-device-factory.c \
@@ -1804,6 +2026,8 @@ src_libNetworkManager_la_SOURCES = \
 	src/nm-rfkill-manager.h \
 	src/nm-session-monitor.h \
 	src/nm-session-monitor.c \
+	src/nm-keep-alive.c \
+	src/nm-keep-alive.h \
 	src/nm-sleep-monitor.c \
 	src/nm-sleep-monitor.h \
 	src/nm-types.h \
@@ -1812,7 +2036,8 @@ src_libNetworkManager_la_SOURCES = \
 
 src_libNetworkManager_la_LIBADD = \
 	src/libNetworkManagerBase.la \
-	src/libsystemd-nm.la \
+	src/libnm-systemd-core.la \
+	shared/systemd/libnm-systemd-shared.la \
 	shared/libnacd.la \
 	$(GLIB_LIBS) \
 	$(LIBUDEV_LIBS) \
@@ -1885,7 +2110,8 @@ src_nm_iface_helper_SOURCES = \
 
 src_nm_iface_helper_LDADD = \
 	src/libNetworkManagerBase.la \
-	src/libsystemd-nm.la \
+	src/libnm-systemd-core.la \
+	shared/systemd/libnm-systemd-shared.la \
 	$(GLIB_LIBS) \
 	$(LIBUDEV_LIBS) \
 	$(LIBNDP_LIBS) \
@@ -1922,7 +2148,10 @@ src_initrd_nm_initrd_generator_LDADD = \
 	libnm-core/libnm-core.la \
 	src/initrd/libnmi-core.la \
 	src/libNetworkManagerBase.la \
-	$(GLIB_LIBS)
+	shared/systemd/libnm-systemd-shared.la \
+	shared/nm-utils/libnm-utils-base.la \
+	$(GLIB_LIBS) \
+	$(NULL)
 
 src_initrd_nm_initrd_generator_LDFLAGS = \
 	-Wl,--version-script="$(srcdir)/linker-script-binary.ver" \
@@ -1943,7 +2172,9 @@ src_initrd_tests_test_ibft_reader_LDADD = \
 	libnm-core/libnm-core.la \
 	src/initrd/libnmi-core.la \
 	src/libNetworkManagerTest.la \
-	$(GLIB_LIBS)
+	shared/nm-utils/libnm-utils-base.la \
+	$(GLIB_LIBS) \
+	$(NULL)
 
 EXTRA_DIST += \
 	src/initrd/meson.build \
@@ -2157,7 +2388,9 @@ src_initrd_tests_test_cmdline_reader_LDADD = \
 	libnm-core/libnm-core.la \
 	src/initrd/libnmi-core.la \
 	src/libNetworkManagerTest.la \
-	$(GLIB_LIBS)
+	shared/nm-utils/libnm-utils-base.la \
+	$(GLIB_LIBS) \
+	$(NULL)
 
 $(src_initrd_libnmi_core_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
 $(src_initrd_nm_initrd_generator_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
@@ -2538,8 +2771,8 @@ EXTRA_DIST += \
 	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Bridge_Component.cexpected \
 	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Permissions.cexpected \
 	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Proxy_Basic.cexpected \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Team_Port.cexpected \
 	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Team_Infiniband_Port.cexpected \
+	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Team_Port.cexpected \
 	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_VLAN_reorder_hdr.cexpected \
 	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_WiFi_Band_A.cexpected \
 	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_WiFi_Hidden.cexpected \
@@ -2633,6 +2866,7 @@ EXTRA_DIST += \
 	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-open-ssid-long-hex \
 	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-open-ssid-long-quoted \
 	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-open-ssid-quoted \
+	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-sae \
 	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wep \
 	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wep-104-ascii \
 	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wep-40-ascii \
@@ -2650,8 +2884,8 @@ EXTRA_DIST += \
 	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wpa-psk-unquoted \
 	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wpa-psk-unquoted2 \
 	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-802-1X-subj-matches \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-802-1x-ttls-eapgtc \
 	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-802-1x-password-raw \
+	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-802-1x-ttls-eapgtc \
 	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-8021x-peap-mschapv2 \
 	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-8021x-tls-agent \
 	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-8021x-tls-always \
@@ -2698,6 +2932,7 @@ EXTRA_DIST += \
 	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test_write_wired_auto_negotiate_on.cexpected \
 	src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-dynamic-wep-leap \
 	src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-leap \
+	src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-sae \
 	src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wep \
 	src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wep-104-ascii \
 	src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wep-40-ascii \
@@ -2811,13 +3046,14 @@ check_programs += src/settings/plugins/ifupdown/tests/test-ifupdown
 src_settings_plugins_ifupdown_tests_test_ifupdown_CPPFLAGS = $(src_cppflags_base_test)
 
 src_settings_plugins_ifupdown_tests_test_ifupdown_LDFLAGS = \
-	$(GLIB_LDFLAGS) \
 	$(CODE_COVERAGE_LDFLAGS) \
 	$(SANITIZER_EXEC_LDFLAGS)
 
 src_settings_plugins_ifupdown_tests_test_ifupdown_LDADD = \
 	src/settings/plugins/ifupdown/libnms-ifupdown-core.la \
-	src/libNetworkManagerTest.la
+	src/libNetworkManagerTest.la \
+	$(GLIB_LIBS) \
+	$(NULL)
 
 $(src_settings_plugins_ifupdown_tests_test_ifupdown_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
 
@@ -3025,24 +3261,30 @@ if WITH_WIFI
 core_plugins += src/devices/wifi/libnm-device-plugin-wifi.la
 
 src_devices_wifi_libnm_device_plugin_wifi_la_SOURCES = \
-	src/devices/wifi/nm-wifi-factory.c \
+	src/devices/wifi/nm-device-olpc-mesh.c \
+	src/devices/wifi/nm-device-olpc-mesh.h \
+	src/devices/wifi/nm-device-wifi-p2p.c \
+	src/devices/wifi/nm-device-wifi-p2p.h \
 	src/devices/wifi/nm-device-wifi.c \
 	src/devices/wifi/nm-device-wifi.h \
 	src/devices/wifi/nm-wifi-ap.c \
 	src/devices/wifi/nm-wifi-ap.h \
-	src/devices/wifi/nm-wifi-utils.c \
-	src/devices/wifi/nm-wifi-utils.h \
 	src/devices/wifi/nm-wifi-common.c \
 	src/devices/wifi/nm-wifi-common.h \
-	src/devices/wifi/nm-device-olpc-mesh.c \
-	src/devices/wifi/nm-device-olpc-mesh.h
+	src/devices/wifi/nm-wifi-factory.c \
+	src/devices/wifi/nm-wifi-p2p-peer.c \
+	src/devices/wifi/nm-wifi-p2p-peer.h \
+	src/devices/wifi/nm-wifi-utils.c \
+	src/devices/wifi/nm-wifi-utils.h \
+	$(NULL)
 
 if WITH_IWD
 src_devices_wifi_libnm_device_plugin_wifi_la_SOURCES += \
 	src/devices/wifi/nm-device-iwd.c \
 	src/devices/wifi/nm-device-iwd.h \
 	src/devices/wifi/nm-iwd-manager.c \
-	src/devices/wifi/nm-iwd-manager.h
+	src/devices/wifi/nm-iwd-manager.h \
+	$(NULL)
 endif
 
 src_devices_wifi_libnm_device_plugin_wifi_la_CPPFLAGS = $(src_cppflags_device_plugin)
@@ -3386,6 +3628,7 @@ $(src_tests_config_test_config_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
 
 EXTRA_DIST += \
 	src/tests/config/NetworkManager.conf \
+	src/tests/config/NetworkManager-warn.conf \
 	src/tests/config/NetworkManager.state \
 	src/tests/config/bad.conf \
 	src/tests/config/global-dns-invalid.conf \
@@ -3453,14 +3696,13 @@ $(src_tests_test_wired_defname_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
 $(src_tests_test_utils_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
 
 src_tests_test_systemd_CPPFLAGS = \
-	$(src_libsystemd_nm_la_cppflags) \
+	$(src_libnm_systemd_core_la_cppflags) \
 	-DNETWORKMANAGER_COMPILATION_TEST
-src_tests_test_systemd_SOURCES = \
-	src/tests/test-systemd.c
 src_tests_test_systemd_LDADD = \
-	src/libsystemd-nm.la \
+	src/libnm-systemd-core.la \
+	shared/systemd/libnm-systemd-shared.la \
 	shared/libcsiphash.la \
-	$(src_libsystemd_nm_la_libadd) \
+	$(src_libnm_systemd_core_la_libadd) \
 	$(NULL)
 
 $(src_tests_test_systemd_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
@@ -3638,6 +3880,7 @@ clients_nm_online_LDADD = \
 	$(GLIB_LIBS)
 
 $(clients_nm_online_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
+$(clients_nm_online_OBJECTS): $(libnm_lib_h_pub_mkenums)
 
 EXTRA_DIST += \
 	clients/meson.build
@@ -3664,15 +3907,6 @@ clients_cppflags = \
 check_ltlibraries += clients/common/libnmc-base.la
 
 clients_common_libnmc_base_la_SOURCES = \
-	shared/nm-utils/nm-enum-utils.c \
-	shared/nm-utils/nm-enum-utils.h \
-	shared/nm-utils/nm-hash-utils.c \
-	shared/nm-utils/nm-hash-utils.h \
-	shared/nm-utils/nm-random-utils.c \
-	shared/nm-utils/nm-random-utils.h \
-	shared/nm-utils/nm-shared-utils.c \
-	shared/nm-utils/nm-shared-utils.h \
-	\
 	clients/common/nm-secret-agent-simple.c \
 	clients/common/nm-secret-agent-simple.h \
 	clients/common/nm-vpn-helpers.c \
@@ -3687,7 +3921,7 @@ clients_common_libnmc_base_la_CPPFLAGS = \
 
 clients_common_libnmc_base_la_LIBADD = \
 	libnm/libnm.la \
-	shared/libcsiphash.la \
+	shared/nm-utils/libnm-utils-base.la \
 	$(GLIB_LIBS) \
 	$(NULL)
 
@@ -3770,6 +4004,13 @@ clients_common_tests_test_general_LDADD = \
 
 $(clients_common_tests_test_general_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
 
+EXTRA_DIST += \
+	clients/common/tests/wg-test0.conf \
+	clients/common/tests/wg-test1.conf \
+	clients/common/tests/wg-test2.conf \
+	clients/common/tests/wg-test3.conf \
+	$(NULL)
+
 ###############################################################################
 # clients/cli
 ###############################################################################
@@ -4075,6 +4316,7 @@ data_edit = sed \
 	-e 's|@sbindir[@]|$(sbindir)|g' \
 	-e 's|@sysconfdir[@]|$(sysconfdir)|g' \
 	-e 's|@nmrundir[@]|$(nmrundir)|g' \
+	-e 's|@nmstatedir[@]|$(nmstatedir)|g' \
 	-e 's|@localstatedir[@]|$(localstatedir)|g' \
 	-e 's|@libexecdir[@]|$(libexecdir)|g' \
 	-e 's|@DISTRO_NETWORK_SERVICE[@]|$(DISTRO_NETWORK_SERVICE)|g' \
@@ -4105,11 +4347,6 @@ endif
 data/NetworkManager-dispatcher.service: $(srcdir)/data/NetworkManager-dispatcher.service.in
 	$(AM_V_GEN) $(data_edit) $< >$@
 
-data/org.freedesktop.NetworkManager.service: $(srcdir)/data/org.freedesktop.NetworkManager.service.in
-	$(AM_V_GEN) $(data_edit) $< >$@
-
-service_DATA += data/org.freedesktop.NetworkManager.service
-
 endif
 
 examples_DATA += data/server.conf
@@ -4131,7 +4368,6 @@ EXTRA_DIST += \
 	data/NetworkManager-wait-online.service.in \
 	data/NetworkManager-wait-online-systemd-pre200.service.in \
 	data/NetworkManager-dispatcher.service.in \
-	data/org.freedesktop.NetworkManager.service.in \
 	data/84-nm-drivers.rules \
 	data/85-nm-unmanaged.rules \
 	data/90-nm-thunderbolt.rules \
@@ -4142,7 +4378,6 @@ CLEANFILES += \
 	data/NetworkManager.service \
 	data/NetworkManager-wait-online.service \
 	data/NetworkManager-dispatcher.service \
-	data/org.freedesktop.NetworkManager.service \
 	data/server.conf
 
 ###############################################################################
@@ -4204,7 +4439,6 @@ libnm_util_lib_h_pub_real = \
 libnm_util_lib_h_pub_mkenums = \
 	libnm-util/nm-utils-enum-types.h
 libnm_util_lib_h_priv = \
-	shared/nm-utils/nm-shared-utils.h \
 	libnm-util/crypto.h \
 	libnm-util/nm-dbus-glib-types.h \
 	libnm-util/nm-gvaluearray-compat.h \
@@ -4219,7 +4453,6 @@ nodist_libnm_util_libnm_util_include_HEADERS = \
 	$(libnm_util_lib_h_pub_mkenums)
 
 libnm_util_lib_c_real = \
-	shared/nm-utils/nm-shared-utils.c \
 	libnm-util/crypto.c \
 	libnm-util/nm-connection.c \
 	libnm-util/nm-param-spec-specialized.c \
@@ -4277,6 +4510,7 @@ nm_utils_enum_types_sources = $(filter-out libnm-util/NetworkManager%,$(libnm_ut
 $(libnm_util_libnm_util_la_OBJECTS): $(libnm_util_lib_h_pub_mkenums)
 
 libnm_util_libnm_util_la_LIBADD = \
+	shared/nm-utils/libnm-utils-base.la \
 	$(GLIB_LIBS) \
 	$(DBUS_LIBS) \
 	$(UUID_LIBS)
@@ -4518,7 +4752,6 @@ libnm_glib_lib_h_pub_real = \
 libnm_glib_lib_h_pub_mkenums = \
 	libnm-glib/nm-glib-enum-types.h
 libnm_glib_lib_h_priv = \
-	shared/nm-utils/nm-udev-utils.h \
 	libnm-glib/nm-object-private.h \
 	libnm-glib/nm-device-private.h \
 	libnm-glib/nm-types-private.h \
@@ -4545,7 +4778,6 @@ nodist_libnm_glib_libnmvpn_HEADERS = \
 	$(libnm_glib_vpn_h_mkenums)
 
 libnm_glib_lib_c_real = \
-	shared/nm-utils/nm-udev-utils.c \
 	libnm-glib/nm-object.c \
 	libnm-glib/nm-dbus-helpers.c \
 	libnm-glib/nm-client.c \
@@ -4600,9 +4832,12 @@ libnm_glib_libnm_glib_la_LDFLAGS = \
 libnm_glib_libnm_glib_la_LIBADD = \
 	libnm-util/libnm-util.la \
 	libnm-glib/libdeprecated-nm-glib.la \
+	shared/nm-utils/libnm-utils-udev.la \
 	$(GLIB_LIBS) \
 	$(DBUS_LIBS) \
-	$(LIBUDEV_LIBS)
+	$(LIBUDEV_LIBS) \
+	$(NULL)
+
 $(libnm_glib_libnm_glib_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
 
 GLIB_GENERATED += \
@@ -5017,30 +5252,18 @@ EXTRA_DIST += \
 	shared/nm-dispatcher-api.h \
 	shared/nm-test-libnm-utils.h \
 	shared/nm-test-utils-impl.c \
-	shared/nm-utils/c-list-util.c \
-	shared/nm-utils/c-list-util.h \
-	shared/nm-utils/nm-c-list.h \
 	shared/nm-utils/nm-compat.c \
 	shared/nm-utils/nm-compat.h \
-	shared/nm-utils/nm-glib.h \
-	shared/nm-utils/nm-io-utils.c \
-	shared/nm-utils/nm-io-utils.h \
 	shared/nm-utils/nm-jansson.h \
-	shared/nm-utils/nm-obj.h \
-	shared/nm-utils/nm-macros-internal.h \
-	shared/nm-utils/nm-secret-utils.c \
-	shared/nm-utils/nm-secret-utils.h \
-	shared/nm-utils/nm-shared-utils.c \
-	shared/nm-utils/nm-shared-utils.h \
 	shared/nm-utils/nm-test-utils.h \
 	shared/nm-utils/nm-vpn-editor-plugin-call.h \
 	shared/nm-utils/nm-vpn-plugin-macros.h \
 	shared/nm-utils/nm-vpn-plugin-utils.c \
 	shared/nm-utils/nm-vpn-plugin-utils.h \
-	shared/nm-utils/unaligned.h \
 	shared/nm-version-macros.h.in \
 	shared/meson.build \
 	\
+	tools/check-config-options.sh \
 	tools/check-docs.sh \
 	tools/check-exports.sh \
 	tools/check-settings-docs.sh \
diff --git a/Makefile.examples b/Makefile.examples
index d49db6ce..92923a8d 100644
--- a/Makefile.examples
+++ b/Makefile.examples
@@ -177,6 +177,7 @@ EXTRA_DIST += \
 	examples/python/gi/get_ips.py \
 	examples/python/gi/list-connections.py \
 	examples/python/gi/nm-connection-update-stable-id.py \
+	examples/python/gi/nm-wg-set \
 	examples/python/gi/setting-user-data.py \
 	examples/python/gi/show-wifi-networks.py \
 	examples/python/gi/update-ip4-method.py \
diff --git a/Makefile.in b/Makefile.in
index d4b9349b..71238e0b 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -158,28 +158,30 @@ TESTS = $(am__EXEEXT_14)
 
 ###############################################################################
 @WITH_LEGACY_LIBRARIES_TRUE@am__append_5 = NetworkManager.pc
-@WITH_JSON_VALIDATION_TRUE@am__append_6 = \
+@WITH_EBPF_TRUE@am__append_6 = shared/n-acd/src/n-acd-bpf.c
+@WITH_EBPF_FALSE@am__append_7 = shared/n-acd/src/n-acd-bpf-fallback.c
+@WITH_JSON_VALIDATION_TRUE@am__append_8 = \
 @WITH_JSON_VALIDATION_TRUE@	libnm-core/nm-json.h
 
-@WITH_JSON_VALIDATION_TRUE@am__append_7 = \
+@WITH_JSON_VALIDATION_TRUE@am__append_9 = \
 @WITH_JSON_VALIDATION_TRUE@	libnm-core/nm-json.c
 
-@WITH_JSON_VALIDATION_TRUE@am__append_8 = $(JANSSON_CFLAGS)
-@HAVE_CRYPTO_GNUTLS_TRUE@@WITH_GNUTLS_FALSE@am__append_9 = libnm-core/libnm-crypto-gnutls.la
-@HAVE_CRYPTO_NSS_TRUE@@WITH_NSS_FALSE@am__append_10 = libnm-core/libnm-crypto-nss.la
-@HAVE_INTROSPECTION_TRUE@am__append_11 = libnm/NM-1.0.typelib
-@HAVE_INTROSPECTION_TRUE@am__append_12 = libnm/NM-1.0.gir
-@HAVE_INTROSPECTION_TRUE@@WITH_FAKE_TYPELIBS_TRUE@am__append_13 = \
+@WITH_JSON_VALIDATION_TRUE@am__append_10 = $(JANSSON_CFLAGS)
+@HAVE_CRYPTO_GNUTLS_TRUE@@WITH_GNUTLS_FALSE@am__append_11 = libnm-core/libnm-crypto-gnutls.la
+@HAVE_CRYPTO_NSS_TRUE@@WITH_NSS_FALSE@am__append_12 = libnm-core/libnm-crypto-nss.la
+@HAVE_INTROSPECTION_TRUE@am__append_13 = libnm/NM-1.0.typelib
+@HAVE_INTROSPECTION_TRUE@am__append_14 = libnm/NM-1.0.gir
+@HAVE_INTROSPECTION_TRUE@@WITH_FAKE_TYPELIBS_TRUE@am__append_15 = \
 @HAVE_INTROSPECTION_TRUE@@WITH_FAKE_TYPELIBS_TRUE@	libnm/fake-typelib/typelibs.c \
 @HAVE_INTROSPECTION_TRUE@@WITH_FAKE_TYPELIBS_TRUE@	libnm/fake-typelib/NMClient.typelib \
 @HAVE_INTROSPECTION_TRUE@@WITH_FAKE_TYPELIBS_TRUE@	libnm/fake-typelib/NetworkManager.typelib
 
-@HAVE_INTROSPECTION_TRUE@am__append_14 = $(libnm_noinst_data)
-@HAVE_INTROSPECTION_TRUE@am__append_15 = $(libnm_noinst_data)
-@HAVE_INTROSPECTION_TRUE@am__append_16 = $(libnm_tests_programs_req_introspection)
-@HAVE_INTROSPECTION_FALSE@am__append_17 = $(libnm_tests_programs_req_introspection)
-@REQUIRE_ROOT_TESTS_TRUE@am__append_18 = -DREQUIRE_ROOT_TESTS=1
-@WITH_WEXT_TRUE@am__append_19 = \
+@HAVE_INTROSPECTION_TRUE@am__append_16 = $(libnm_noinst_data)
+@HAVE_INTROSPECTION_TRUE@am__append_17 = $(libnm_noinst_data)
+@HAVE_INTROSPECTION_TRUE@am__append_18 = $(libnm_tests_programs_req_introspection)
+@HAVE_INTROSPECTION_FALSE@am__append_19 = $(libnm_tests_programs_req_introspection)
+@REQUIRE_ROOT_TESTS_TRUE@am__append_20 = -DREQUIRE_ROOT_TESTS=1
+@WITH_WEXT_TRUE@am__append_21 = \
 @WITH_WEXT_TRUE@	src/platform/wifi/nm-wifi-utils-wext.c \
 @WITH_WEXT_TRUE@	src/platform/wifi/nm-wifi-utils-wext.h
 
@@ -187,139 +189,139 @@ TESTS = $(am__EXEEXT_14)
 ###############################################################################
 # src/ppp
 ###############################################################################
-@WITH_PPP_TRUE@am__append_20 = src/ppp/libnm-ppp-plugin.la
-@WITH_PPP_TRUE@am__append_21 = src/ppp/nm-pppd-plugin.la
+@WITH_PPP_TRUE@am__append_22 = src/ppp/libnm-ppp-plugin.la
+@WITH_PPP_TRUE@am__append_23 = src/ppp/nm-pppd-plugin.la
 
 ###############################################################################
 # src/settings/plugins/ibft
 ###############################################################################
-@CONFIG_PLUGIN_IBFT_TRUE@am__append_22 = src/settings/plugins/ibft/libnm-settings-plugin-ibft.la
-@CONFIG_PLUGIN_IBFT_TRUE@am__append_23 = src/settings/plugins/ibft/libnms-ibft-core.la
-@CONFIG_PLUGIN_IBFT_TRUE@am__append_24 = src/settings/plugins/ibft/tests/test-ibft
-@CONFIG_PLUGIN_IBFT_TRUE@am__append_25 = check-local-symbols-settings-ibft
+@CONFIG_PLUGIN_IBFT_TRUE@am__append_24 = src/settings/plugins/ibft/libnm-settings-plugin-ibft.la
+@CONFIG_PLUGIN_IBFT_TRUE@am__append_25 = src/settings/plugins/ibft/libnms-ibft-core.la
+@CONFIG_PLUGIN_IBFT_TRUE@am__append_26 = src/settings/plugins/ibft/tests/test-ibft
+@CONFIG_PLUGIN_IBFT_TRUE@am__append_27 = check-local-symbols-settings-ibft
 
 ###############################################################################
 # src/settings/plugins/ifcfg-rh
 ###############################################################################
-@CONFIG_PLUGIN_IFCFG_RH_TRUE@am__append_26 = src/settings/plugins/ifcfg-rh/libnm-settings-plugin-ifcfg-rh.la
-@CONFIG_PLUGIN_IFCFG_RH_TRUE@am__append_27 = \
+@CONFIG_PLUGIN_IFCFG_RH_TRUE@am__append_28 = src/settings/plugins/ifcfg-rh/libnm-settings-plugin-ifcfg-rh.la
+@CONFIG_PLUGIN_IFCFG_RH_TRUE@am__append_29 = \
 @CONFIG_PLUGIN_IFCFG_RH_TRUE@	src/settings/plugins/ifcfg-rh/libnmdbus-ifcfg-rh.la \
 @CONFIG_PLUGIN_IFCFG_RH_TRUE@	src/settings/plugins/ifcfg-rh/libnms-ifcfg-rh-core.la
 
-@CONFIG_PLUGIN_IFCFG_RH_TRUE@am__append_28 = $(nodist_src_settings_plugins_ifcfg_rh_libnmdbus_ifcfg_rh_la_SOURCES)
-@CONFIG_PLUGIN_IFCFG_RH_TRUE@am__append_29 = check-local-symbols-settings-ifcfg-rh
+@CONFIG_PLUGIN_IFCFG_RH_TRUE@am__append_30 = $(nodist_src_settings_plugins_ifcfg_rh_libnmdbus_ifcfg_rh_la_SOURCES)
+@CONFIG_PLUGIN_IFCFG_RH_TRUE@am__append_31 = check-local-symbols-settings-ifcfg-rh
 
 ###############################################################################
 # src/settings/plugins/ifcfg-rh/tests
 ###############################################################################
-@CONFIG_PLUGIN_IFCFG_RH_TRUE@am__append_30 = src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh
-@CONFIG_PLUGIN_IFCFG_RH_TRUE@am__append_31 = \
+@CONFIG_PLUGIN_IFCFG_RH_TRUE@am__append_32 = src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh
+@CONFIG_PLUGIN_IFCFG_RH_TRUE@am__append_33 = \
 @CONFIG_PLUGIN_IFCFG_RH_TRUE@	src/settings/plugins/ifcfg-rh/nm-ifup \
 @CONFIG_PLUGIN_IFCFG_RH_TRUE@	src/settings/plugins/ifcfg-rh/nm-ifdown
 
-@CONFIG_PLUGIN_IFCFG_RH_TRUE@am__append_32 = install-data-hook-ifcfg-rh
+@CONFIG_PLUGIN_IFCFG_RH_TRUE@am__append_34 = install-data-hook-ifcfg-rh
 
 ###############################################################################
-@CONFIG_PLUGIN_IFCFG_RH_TRUE@am__append_33 = src/settings/plugins/ifcfg-rh/nm-ifcfg-rh.conf
+@CONFIG_PLUGIN_IFCFG_RH_TRUE@am__append_35 = src/settings/plugins/ifcfg-rh/nm-ifcfg-rh.conf
 
 ###############################################################################
 # src/settings/plugins/ifupdown
 ###############################################################################
-@CONFIG_PLUGIN_IFUPDOWN_TRUE@am__append_34 = src/settings/plugins/ifupdown/libnm-settings-plugin-ifupdown.la
-@CONFIG_PLUGIN_IFUPDOWN_TRUE@am__append_35 = src/settings/plugins/ifupdown/libnms-ifupdown-core.la
-@CONFIG_PLUGIN_IFUPDOWN_TRUE@am__append_36 = check-local-symbols-settings-ifupdown
+@CONFIG_PLUGIN_IFUPDOWN_TRUE@am__append_36 = src/settings/plugins/ifupdown/libnm-settings-plugin-ifupdown.la
+@CONFIG_PLUGIN_IFUPDOWN_TRUE@am__append_37 = src/settings/plugins/ifupdown/libnms-ifupdown-core.la
+@CONFIG_PLUGIN_IFUPDOWN_TRUE@am__append_38 = check-local-symbols-settings-ifupdown
 
 ###############################################################################
-@CONFIG_PLUGIN_IFUPDOWN_TRUE@am__append_37 = src/settings/plugins/ifupdown/tests/test-ifupdown
+@CONFIG_PLUGIN_IFUPDOWN_TRUE@am__append_39 = src/settings/plugins/ifupdown/tests/test-ifupdown
 
 ###############################################################################
 # src/devices/bluetooth
 ###############################################################################
-@WITH_MODEM_MANAGER_1_TRUE@am__append_38 =  \
+@WITH_MODEM_MANAGER_1_TRUE@am__append_40 =  \
 @WITH_MODEM_MANAGER_1_TRUE@	src/devices/wwan/libnm-wwan.la \
 @WITH_MODEM_MANAGER_1_TRUE@	src/devices/wwan/libnm-device-plugin-wwan.la \
 @WITH_MODEM_MANAGER_1_TRUE@	src/devices/bluetooth/libnm-device-plugin-bluetooth.la
-@WITH_MODEM_MANAGER_1_TRUE@@WITH_OFONO_TRUE@am__append_39 = \
+@WITH_MODEM_MANAGER_1_TRUE@@WITH_OFONO_TRUE@am__append_41 = \
 @WITH_MODEM_MANAGER_1_TRUE@@WITH_OFONO_TRUE@	src/devices/wwan/nm-modem-ofono.c \
 @WITH_MODEM_MANAGER_1_TRUE@@WITH_OFONO_TRUE@	src/devices/wwan/nm-modem-ofono.h
 
-@WITH_MODEM_MANAGER_1_TRUE@am__append_40 = check-local-devices-wwan \
+@WITH_MODEM_MANAGER_1_TRUE@am__append_42 = check-local-devices-wwan \
 @WITH_MODEM_MANAGER_1_TRUE@	check-local-devices-bluetooth
-@WITH_BLUEZ5_DUN_TRUE@@WITH_MODEM_MANAGER_1_TRUE@am__append_41 = $(BLUEZ5_CFLAGS)
-@WITH_BLUEZ5_DUN_TRUE@@WITH_MODEM_MANAGER_1_TRUE@am__append_42 = \
+@WITH_BLUEZ5_DUN_TRUE@@WITH_MODEM_MANAGER_1_TRUE@am__append_43 = $(BLUEZ5_CFLAGS)
+@WITH_BLUEZ5_DUN_TRUE@@WITH_MODEM_MANAGER_1_TRUE@am__append_44 = \
 @WITH_BLUEZ5_DUN_TRUE@@WITH_MODEM_MANAGER_1_TRUE@	src/devices/bluetooth/nm-bluez5-dun.c \
 @WITH_BLUEZ5_DUN_TRUE@@WITH_MODEM_MANAGER_1_TRUE@	src/devices/bluetooth/nm-bluez5-dun.h
 
-@WITH_BLUEZ5_DUN_TRUE@@WITH_MODEM_MANAGER_1_TRUE@am__append_43 = $(BLUEZ5_LIBS)
+@WITH_BLUEZ5_DUN_TRUE@@WITH_MODEM_MANAGER_1_TRUE@am__append_45 = $(BLUEZ5_LIBS)
 
 ###############################################################################
 # src/devices/wifi
 ###############################################################################
-@WITH_WIFI_TRUE@am__append_44 = src/devices/wifi/libnm-device-plugin-wifi.la
-@WITH_IWD_TRUE@@WITH_WIFI_TRUE@am__append_45 = \
+@WITH_WIFI_TRUE@am__append_46 = src/devices/wifi/libnm-device-plugin-wifi.la
+@WITH_IWD_TRUE@@WITH_WIFI_TRUE@am__append_47 = \
 @WITH_IWD_TRUE@@WITH_WIFI_TRUE@	src/devices/wifi/nm-device-iwd.c \
 @WITH_IWD_TRUE@@WITH_WIFI_TRUE@	src/devices/wifi/nm-device-iwd.h \
 @WITH_IWD_TRUE@@WITH_WIFI_TRUE@	src/devices/wifi/nm-iwd-manager.c \
-@WITH_IWD_TRUE@@WITH_WIFI_TRUE@	src/devices/wifi/nm-iwd-manager.h
+@WITH_IWD_TRUE@@WITH_WIFI_TRUE@	src/devices/wifi/nm-iwd-manager.h \
+@WITH_IWD_TRUE@@WITH_WIFI_TRUE@	$(NULL)
 
-@WITH_WIFI_TRUE@am__append_46 = check-local-devices-wifi
-@WITH_WIFI_TRUE@am__append_47 = src/devices/wifi/tests/test-general
+@WITH_WIFI_TRUE@am__append_48 = check-local-devices-wifi
+@WITH_WIFI_TRUE@am__append_49 = src/devices/wifi/tests/test-general
 
 ###############################################################################
 # src/devices/team
 ###############################################################################
-@WITH_TEAMDCTL_TRUE@am__append_48 = src/devices/team/libnm-device-plugin-team.la
-@WITH_TEAMDCTL_TRUE@am__append_49 = check-local-devices-team
-@WITH_OPENVSWITCH_TRUE@am__append_50 = src/devices/ovs/libnm-device-plugin-ovs.la
-@HAVE_INTROSPECTION_TRUE@am__append_51 = $(clients_common_settings_doc_h)
-@HAVE_INTROSPECTION_TRUE@am__append_52 = check-local-settings-docs
-@HAVE_INTROSPECTION_TRUE@am__append_53 = clients/common/libnmc.la
-@HAVE_INTROSPECTION_FALSE@am__append_54 = clients/common/libnmc.la
-@HAVE_INTROSPECTION_TRUE@am__append_55 = clients/common/tests/test-general
-@BUILD_NMCLI_TRUE@@HAVE_INTROSPECTION_FALSE@am__append_56 = clients/common/tests/test-general
+@WITH_TEAMDCTL_TRUE@am__append_50 = src/devices/team/libnm-device-plugin-team.la
+@WITH_TEAMDCTL_TRUE@am__append_51 = check-local-devices-team
+@WITH_OPENVSWITCH_TRUE@am__append_52 = src/devices/ovs/libnm-device-plugin-ovs.la
+@HAVE_INTROSPECTION_TRUE@am__append_53 = $(clients_common_settings_doc_h)
+@HAVE_INTROSPECTION_TRUE@am__append_54 = check-local-settings-docs
+@HAVE_INTROSPECTION_TRUE@am__append_55 = clients/common/libnmc.la
+@HAVE_INTROSPECTION_FALSE@am__append_56 = clients/common/libnmc.la
+@HAVE_INTROSPECTION_TRUE@am__append_57 = clients/common/tests/test-general
+@BUILD_NMCLI_TRUE@@HAVE_INTROSPECTION_FALSE@am__append_58 = clients/common/tests/test-general
 
 ###############################################################################
 # clients/cli
 ###############################################################################
-@BUILD_NMCLI_TRUE@am__append_57 = clients/cli/nmcli
-@BUILD_NMCLI_TRUE@@WITH_POLKIT_AGENT_TRUE@am__append_58 = $(POLKIT_CFLAGS)
-@BUILD_NMCLI_TRUE@@WITH_POLKIT_AGENT_TRUE@am__append_59 = \
+@BUILD_NMCLI_TRUE@am__append_59 = clients/cli/nmcli
+@BUILD_NMCLI_TRUE@@WITH_POLKIT_AGENT_TRUE@am__append_60 = $(POLKIT_CFLAGS)
+@BUILD_NMCLI_TRUE@@WITH_POLKIT_AGENT_TRUE@am__append_61 = \
 @BUILD_NMCLI_TRUE@@WITH_POLKIT_AGENT_TRUE@	clients/common/nm-polkit-listener.c \
 @BUILD_NMCLI_TRUE@@WITH_POLKIT_AGENT_TRUE@	clients/common/nm-polkit-listener.h
 
-@BUILD_NMCLI_TRUE@@WITH_POLKIT_AGENT_TRUE@am__append_60 = $(POLKIT_LIBS)
-@BUILD_NMCLI_TRUE@am__append_61 = install-data-hook-nmcli
-@BUILD_NMCLI_TRUE@am__append_62 = uninstall-hook-nmcli
+@BUILD_NMCLI_TRUE@@WITH_POLKIT_AGENT_TRUE@am__append_62 = $(POLKIT_LIBS)
+@BUILD_NMCLI_TRUE@am__append_63 = install-data-hook-nmcli
+@BUILD_NMCLI_TRUE@am__append_64 = uninstall-hook-nmcli
 
 ###############################################################################
 # clients/tui
 ###############################################################################
-@BUILD_NMTUI_TRUE@am__append_63 = clients/tui/newt/libnmt-newt.a
-@BUILD_NMTUI_TRUE@am__append_64 = clients/tui/nmtui
-@BUILD_NMTUI_TRUE@am__append_65 = install-exec-hook-nmtui
-@BUILD_NMTUI_TRUE@am__append_66 = uninstall-hook-nmtui
-@HAVE_SYSTEMD_TRUE@am__append_67 = data/org.freedesktop.NetworkManager.service
+@BUILD_NMTUI_TRUE@am__append_65 = clients/tui/newt/libnmt-newt.a
+@BUILD_NMTUI_TRUE@am__append_66 = clients/tui/nmtui
+@BUILD_NMTUI_TRUE@am__append_67 = install-exec-hook-nmtui
+@BUILD_NMTUI_TRUE@am__append_68 = uninstall-hook-nmtui
 
 ###############################################################################
 # libnm-util
 ###############################################################################
-@WITH_LEGACY_LIBRARIES_TRUE@am__append_68 = libnm-util/libnm-util.la \
+@WITH_LEGACY_LIBRARIES_TRUE@am__append_69 = libnm-util/libnm-util.la \
 @WITH_LEGACY_LIBRARIES_TRUE@	libnm-glib/libnm-glib.la \
 @WITH_LEGACY_LIBRARIES_TRUE@	libnm-glib/libnm-glib-vpn.la
-@WITH_LEGACY_LIBRARIES_TRUE@am__append_69 =  \
+@WITH_LEGACY_LIBRARIES_TRUE@am__append_70 =  \
 @WITH_LEGACY_LIBRARIES_TRUE@	$(libnm_util_lib_h_pub_mkenums) \
 @WITH_LEGACY_LIBRARIES_TRUE@	$(libnm_util_lib_c_mkenums) \
 @WITH_LEGACY_LIBRARIES_TRUE@	$(libnm_glib_lib_h_pub_mkenums) \
 @WITH_LEGACY_LIBRARIES_TRUE@	$(libnm_glib_lib_c_mkenums) \
 @WITH_LEGACY_LIBRARIES_TRUE@	$(libnm_glib_vpn_h_mkenums) \
 @WITH_LEGACY_LIBRARIES_TRUE@	$(libnm_glib_vpn_c_mkenums)
-@WITH_GNUTLS_TRUE@@WITH_LEGACY_LIBRARIES_TRUE@am__append_70 = $(GNUTLS_CFLAGS)
-@WITH_GNUTLS_TRUE@@WITH_LEGACY_LIBRARIES_TRUE@am__append_71 = libnm-util/crypto_gnutls.c
-@WITH_GNUTLS_TRUE@@WITH_LEGACY_LIBRARIES_TRUE@am__append_72 = $(GNUTLS_LIBS)
-@WITH_LEGACY_LIBRARIES_TRUE@@WITH_NSS_TRUE@am__append_73 = $(NSS_CFLAGS)
-@WITH_LEGACY_LIBRARIES_TRUE@@WITH_NSS_TRUE@am__append_74 = libnm-util/crypto_nss.c
-@WITH_LEGACY_LIBRARIES_TRUE@@WITH_NSS_TRUE@am__append_75 = $(NSS_LIBS)
-@WITH_LEGACY_LIBRARIES_TRUE@am__append_76 =  \
+@WITH_GNUTLS_TRUE@@WITH_LEGACY_LIBRARIES_TRUE@am__append_71 = $(GNUTLS_CFLAGS)
+@WITH_GNUTLS_TRUE@@WITH_LEGACY_LIBRARIES_TRUE@am__append_72 = libnm-util/crypto_gnutls.c
+@WITH_GNUTLS_TRUE@@WITH_LEGACY_LIBRARIES_TRUE@am__append_73 = $(GNUTLS_LIBS)
+@WITH_LEGACY_LIBRARIES_TRUE@@WITH_NSS_TRUE@am__append_74 = $(NSS_CFLAGS)
+@WITH_LEGACY_LIBRARIES_TRUE@@WITH_NSS_TRUE@am__append_75 = libnm-util/crypto_nss.c
+@WITH_LEGACY_LIBRARIES_TRUE@@WITH_NSS_TRUE@am__append_76 = $(NSS_LIBS)
+@WITH_LEGACY_LIBRARIES_TRUE@am__append_77 =  \
 @WITH_LEGACY_LIBRARIES_TRUE@	libnm-util/crypto_gnutls.c \
 @WITH_LEGACY_LIBRARIES_TRUE@	libnm-util/crypto_nss.c \
 @WITH_LEGACY_LIBRARIES_TRUE@	libnm-util/COPYING \
@@ -338,26 +340,26 @@ TESTS = $(am__EXEEXT_14)
 @WITH_LEGACY_LIBRARIES_TRUE@	libnm-glib/nm-glib-enum-types.c.template \
 @WITH_LEGACY_LIBRARIES_TRUE@	libnm-glib/nm-glib-enum-types.h.template \
 @WITH_LEGACY_LIBRARIES_TRUE@	libnm-glib/meson.build
-@WITH_LEGACY_LIBRARIES_TRUE@am__append_77 = libnm-util/libtest-crypto.la
-@WITH_GNUTLS_TRUE@@WITH_LEGACY_LIBRARIES_TRUE@am__append_78 = libnm-util/crypto_gnutls.c
-@WITH_GNUTLS_TRUE@@WITH_LEGACY_LIBRARIES_TRUE@am__append_79 = $(GNUTLS_LIBS)
-@WITH_LEGACY_LIBRARIES_TRUE@@WITH_NSS_TRUE@am__append_80 = libnm-util/crypto_nss.c
-@WITH_LEGACY_LIBRARIES_TRUE@@WITH_NSS_TRUE@am__append_81 = $(NSS_LIBS)
-@WITH_LEGACY_LIBRARIES_TRUE@am__append_82 = libnm-util/libnm-util.pc \
+@WITH_LEGACY_LIBRARIES_TRUE@am__append_78 = libnm-util/libtest-crypto.la
+@WITH_GNUTLS_TRUE@@WITH_LEGACY_LIBRARIES_TRUE@am__append_79 = libnm-util/crypto_gnutls.c
+@WITH_GNUTLS_TRUE@@WITH_LEGACY_LIBRARIES_TRUE@am__append_80 = $(GNUTLS_LIBS)
+@WITH_LEGACY_LIBRARIES_TRUE@@WITH_NSS_TRUE@am__append_81 = libnm-util/crypto_nss.c
+@WITH_LEGACY_LIBRARIES_TRUE@@WITH_NSS_TRUE@am__append_82 = $(NSS_LIBS)
+@WITH_LEGACY_LIBRARIES_TRUE@am__append_83 = libnm-util/libnm-util.pc \
 @WITH_LEGACY_LIBRARIES_TRUE@	libnm-glib/libnm-glib.pc \
 @WITH_LEGACY_LIBRARIES_TRUE@	libnm-glib/libnm-glib-vpn.pc
-@WITH_LEGACY_LIBRARIES_TRUE@am__append_83 = libnm-util/libnm-util.pc \
+@WITH_LEGACY_LIBRARIES_TRUE@am__append_84 = libnm-util/libnm-util.pc \
 @WITH_LEGACY_LIBRARIES_TRUE@	libnm-glib/libnm-glib.pc \
 @WITH_LEGACY_LIBRARIES_TRUE@	libnm-glib/libnm-glib.pc
-@HAVE_INTROSPECTION_TRUE@@WITH_LEGACY_LIBRARIES_TRUE@am__append_84 = libnm-util/NetworkManager-1.0.gir \
+@HAVE_INTROSPECTION_TRUE@@WITH_LEGACY_LIBRARIES_TRUE@am__append_85 = libnm-util/NetworkManager-1.0.gir \
 @HAVE_INTROSPECTION_TRUE@@WITH_LEGACY_LIBRARIES_TRUE@	libnm-glib/NMClient-1.0.gir
-@WITH_LEGACY_LIBRARIES_TRUE@am__append_85 =  \
+@WITH_LEGACY_LIBRARIES_TRUE@am__append_86 =  \
 @WITH_LEGACY_LIBRARIES_TRUE@	check-local-exports-libnm-util \
 @WITH_LEGACY_LIBRARIES_TRUE@	check-local-exports-libnm-glib
-@WITH_LEGACY_LIBRARIES_TRUE@am__append_86 = libnm-util/libnm-util.la \
+@WITH_LEGACY_LIBRARIES_TRUE@am__append_87 = libnm-util/libnm-util.la \
 @WITH_LEGACY_LIBRARIES_TRUE@	libnm-glib/libnm-glib.la \
 @WITH_LEGACY_LIBRARIES_TRUE@	libnm-glib/libnm-glib-vpn.la
-@WITH_LEGACY_LIBRARIES_TRUE@am__append_87 = \
+@WITH_LEGACY_LIBRARIES_TRUE@am__append_88 = \
 @WITH_LEGACY_LIBRARIES_TRUE@	libnm-util/tests/test-settings-defaults \
 @WITH_LEGACY_LIBRARIES_TRUE@	libnm-util/tests/test-crypto \
 @WITH_LEGACY_LIBRARIES_TRUE@	libnm-util/tests/test-secrets \
@@ -365,57 +367,57 @@ TESTS = $(am__EXEEXT_14)
 @WITH_LEGACY_LIBRARIES_TRUE@	libnm-util/tests/test-setting-8021x \
 @WITH_LEGACY_LIBRARIES_TRUE@	libnm-util/tests/test-setting-dcb
 
-@WITH_LEGACY_LIBRARIES_TRUE@am__append_88 = libnm-util/tests/test-libnm-linking \
+@WITH_LEGACY_LIBRARIES_TRUE@am__append_89 = libnm-util/tests/test-libnm-linking \
 @WITH_LEGACY_LIBRARIES_TRUE@	libnm-glib/libnm-glib-test \
 @WITH_LEGACY_LIBRARIES_TRUE@	libnm-glib/tests/test-nm-client
-@WITH_LEGACY_LIBRARIES_TRUE@am__append_89 = libnm-glib/libdeprecated-nm-glib.la
-@WITH_LEGACY_LIBRARIES_TRUE@am__append_90 = \
+@WITH_LEGACY_LIBRARIES_TRUE@am__append_90 = libnm-glib/libdeprecated-nm-glib.la
+@WITH_LEGACY_LIBRARIES_TRUE@am__append_91 = \
 @WITH_LEGACY_LIBRARIES_TRUE@	libnm-glib/nm-vpn-plugin-glue.h \
 @WITH_LEGACY_LIBRARIES_TRUE@	libnm-glib/nm-secret-agent-glue.h
 
-@HAVE_INTROSPECTION_TRUE@@WITH_LEGACY_LIBRARIES_TRUE@am__append_91 = check-local-libnm-glib-nm-client
-@HAVE_INTROSPECTION_TRUE@@WITH_LEGACY_LIBRARIES_TRUE@am__append_92 = libnm-glib/tests/test-remote-settings-client
-@HAVE_INTROSPECTION_FALSE@@WITH_LEGACY_LIBRARIES_TRUE@am__append_93 = libnm-glib/tests/test-remote-settings-client
-@HAVE_INTROSPECTION_TRUE@am__append_94 = $(man_nm_settings_xml)
-@WITH_OPENVSWITCH_TRUE@am__append_95 = man/nm-openvswitch.7
-@WITH_OPENVSWITCH_FALSE@am__append_96 = man/nm-openvswitch.7
+@HAVE_INTROSPECTION_TRUE@@WITH_LEGACY_LIBRARIES_TRUE@am__append_92 = check-local-libnm-glib-nm-client
+@HAVE_INTROSPECTION_TRUE@@WITH_LEGACY_LIBRARIES_TRUE@am__append_93 = libnm-glib/tests/test-remote-settings-client
+@HAVE_INTROSPECTION_FALSE@@WITH_LEGACY_LIBRARIES_TRUE@am__append_94 = libnm-glib/tests/test-remote-settings-client
+@HAVE_INTROSPECTION_TRUE@am__append_95 = $(man_nm_settings_xml)
+@WITH_OPENVSWITCH_TRUE@am__append_96 = man/nm-openvswitch.7
 @WITH_OPENVSWITCH_FALSE@am__append_97 = man/nm-openvswitch.7
-@CONFIG_PLUGIN_IFCFG_RH_TRUE@am__append_98 = man/nm-settings-ifcfg-rh.5
-@CONFIG_PLUGIN_IFCFG_RH_FALSE@am__append_99 = man/nm-settings-ifcfg-rh.5
+@WITH_OPENVSWITCH_FALSE@am__append_98 = man/nm-openvswitch.7
+@CONFIG_PLUGIN_IFCFG_RH_TRUE@am__append_99 = man/nm-settings-ifcfg-rh.5
 @CONFIG_PLUGIN_IFCFG_RH_FALSE@am__append_100 = man/nm-settings-ifcfg-rh.5
-@HAVE_DOCS_TRUE@am__append_101 = install-data-hook-man
-@HAVE_DOCS_TRUE@am__append_102 = uninstall-hook-man
-@HAVE_DOCS_TRUE@am__append_103 = $(man_pages) $(man_pages_autogen)
-@BUILD_DOCS_TRUE@am__append_104 = $(man_pages) $(man_pages_autogen)
+@CONFIG_PLUGIN_IFCFG_RH_FALSE@am__append_101 = man/nm-settings-ifcfg-rh.5
+@HAVE_DOCS_TRUE@am__append_102 = install-data-hook-man
+@HAVE_DOCS_TRUE@am__append_103 = uninstall-hook-man
+@HAVE_DOCS_TRUE@am__append_104 = $(man_pages) $(man_pages_autogen)
+@BUILD_DOCS_TRUE@am__append_105 = $(man_pages) $(man_pages_autogen)
 
 ###############################################################################
 # vapi
 ###############################################################################
-@ENABLE_VAPIGEN_TRUE@am__append_105 = \
+@ENABLE_VAPIGEN_TRUE@am__append_106 = \
 @ENABLE_VAPIGEN_TRUE@	vapi/libnm.vapi
 
-@ENABLE_VAPIGEN_TRUE@@WITH_LEGACY_LIBRARIES_TRUE@am__append_106 = \
+@ENABLE_VAPIGEN_TRUE@@WITH_LEGACY_LIBRARIES_TRUE@am__append_107 = \
 @ENABLE_VAPIGEN_TRUE@@WITH_LEGACY_LIBRARIES_TRUE@	vapi/libnm-util.vapi \
 @ENABLE_VAPIGEN_TRUE@@WITH_LEGACY_LIBRARIES_TRUE@	vapi/libnm-glib.vapi
 
-@ENABLE_VAPIGEN_TRUE@am__append_107 = \
+@ENABLE_VAPIGEN_TRUE@am__append_108 = \
 @ENABLE_VAPIGEN_TRUE@	$(VAPIGEN_VAPIS) \
 @ENABLE_VAPIGEN_TRUE@	$(VAPIGEN_VAPIS:.vapi=.deps)
 
-@ENABLE_VAPIGEN_TRUE@am__append_108 = $(VAPIGEN_VAPIS)
+@ENABLE_VAPIGEN_TRUE@am__append_109 = $(VAPIGEN_VAPIS)
 
 ###############################################################################
-@ENABLE_TESTS_TRUE@am__append_109 = $(check_programs) $(check_programs_norun)
-@ENABLE_TESTS_TRUE@am__append_110 = $(check_ltlibraries)
-@ENABLE_TESTS_FALSE@am__append_111 = $(check_programs) $(check_programs_norun)
-@ENABLE_TESTS_FALSE@am__append_112 = $(check_ltlibraries)
-@WITH_QT_TRUE@am__append_113 = \
+@ENABLE_TESTS_TRUE@am__append_110 = $(check_programs) $(check_programs_norun)
+@ENABLE_TESTS_TRUE@am__append_111 = $(check_ltlibraries)
+@ENABLE_TESTS_FALSE@am__append_112 = $(check_programs) $(check_programs_norun)
+@ENABLE_TESTS_FALSE@am__append_113 = $(check_ltlibraries)
+@WITH_QT_TRUE@am__append_114 = \
 @WITH_QT_TRUE@	examples/C/qt/add-connection-wired \
 @WITH_QT_TRUE@	examples/C/qt/list-connections \
 @WITH_QT_TRUE@	examples/C/qt/change-ipv4-addresses \
 @WITH_QT_TRUE@	examples/C/qt/monitor-nm-running
 
-@WITH_QT_TRUE@am__append_114 = \
+@WITH_QT_TRUE@am__append_115 = \
 @WITH_QT_TRUE@	examples/C/qt/monitor-nm-running.moc
 
 subdir = .
@@ -495,7 +497,8 @@ am__EXEEXT_4 = libnm/tests/test-nm-client$(EXEEXT) \
 @WITH_LEGACY_LIBRARIES_TRUE@	libnm-util/tests/test-setting-8021x$(EXEEXT) \
 @WITH_LEGACY_LIBRARIES_TRUE@	libnm-util/tests/test-setting-dcb$(EXEEXT)
 @HAVE_INTROSPECTION_TRUE@@WITH_LEGACY_LIBRARIES_TRUE@am__EXEEXT_13 = libnm-glib/tests/test-remote-settings-client$(EXEEXT)
-am__EXEEXT_14 = libnm-core/tests/test-compare$(EXEEXT) \
+am__EXEEXT_14 = shared/nm-utils/tests/test-shared-general$(EXEEXT) \
+	libnm-core/tests/test-compare$(EXEEXT) \
 	libnm-core/tests/test-crypto$(EXEEXT) \
 	libnm-core/tests/test-general$(EXEEXT) \
 	libnm-core/tests/test-keyfile$(EXEEXT) \
@@ -664,11 +667,8 @@ clients_tui_newt_libnmt_newt_a_OBJECTS =  \
 	$(am_clients_tui_newt_libnmt_newt_a_OBJECTS)
 am__DEPENDENCIES_1 =
 clients_common_libnmc_base_la_DEPENDENCIES = libnm/libnm.la \
-	shared/libcsiphash.la $(am__DEPENDENCIES_1)
-am_clients_common_libnmc_base_la_OBJECTS = shared/nm-utils/clients_common_libnmc_base_la-nm-enum-utils.lo \
-	shared/nm-utils/clients_common_libnmc_base_la-nm-hash-utils.lo \
-	shared/nm-utils/clients_common_libnmc_base_la-nm-random-utils.lo \
-	shared/nm-utils/clients_common_libnmc_base_la-nm-shared-utils.lo \
+	shared/nm-utils/libnm-utils-base.la $(am__DEPENDENCIES_1)
+am_clients_common_libnmc_base_la_OBJECTS =  \
 	clients/common/libnmc_base_la-nm-secret-agent-simple.lo \
 	clients/common/libnmc_base_la-nm-vpn-helpers.lo \
 	clients/common/libnmc_base_la-nm-client-utils.lo
@@ -700,26 +700,27 @@ dispatcher_libnm_dispatcher_core_la_OBJECTS =  \
 	$(am_dispatcher_libnm_dispatcher_core_la_OBJECTS)
 introspection_libnmdbus_la_LIBADD =
 am__objects_1 = introspection/libnmdbus_la-org.freedesktop.NetworkManager.AccessPoint.lo \
-	introspection/libnmdbus_la-org.freedesktop.NetworkManager.Connection.Active.lo \
 	introspection/libnmdbus_la-org.freedesktop.NetworkManager.AgentManager.lo \
 	introspection/libnmdbus_la-org.freedesktop.NetworkManager.Checkpoint.lo \
+	introspection/libnmdbus_la-org.freedesktop.NetworkManager.Connection.Active.lo \
+	introspection/libnmdbus_la-org.freedesktop.NetworkManager.DHCP4Config.lo \
+	introspection/libnmdbus_la-org.freedesktop.NetworkManager.DHCP6Config.lo \
 	introspection/libnmdbus_la-org.freedesktop.NetworkManager.Device.Adsl.lo \
+	introspection/libnmdbus_la-org.freedesktop.NetworkManager.Device.Bluetooth.lo \
 	introspection/libnmdbus_la-org.freedesktop.NetworkManager.Device.Bond.lo \
 	introspection/libnmdbus_la-org.freedesktop.NetworkManager.Device.Bridge.lo \
-	introspection/libnmdbus_la-org.freedesktop.NetworkManager.Device.Bluetooth.lo \
 	introspection/libnmdbus_la-org.freedesktop.NetworkManager.Device.Dummy.lo \
-	introspection/libnmdbus_la-org.freedesktop.NetworkManager.Device.Wired.lo \
 	introspection/libnmdbus_la-org.freedesktop.NetworkManager.Device.Generic.lo \
-	introspection/libnmdbus_la-org.freedesktop.NetworkManager.Device.Infiniband.lo \
 	introspection/libnmdbus_la-org.freedesktop.NetworkManager.Device.IPTunnel.lo \
+	introspection/libnmdbus_la-org.freedesktop.NetworkManager.Device.Infiniband.lo \
 	introspection/libnmdbus_la-org.freedesktop.NetworkManager.Device.Lowpan.lo \
 	introspection/libnmdbus_la-org.freedesktop.NetworkManager.Device.Macsec.lo \
 	introspection/libnmdbus_la-org.freedesktop.NetworkManager.Device.Macvlan.lo \
 	introspection/libnmdbus_la-org.freedesktop.NetworkManager.Device.Modem.lo \
 	introspection/libnmdbus_la-org.freedesktop.NetworkManager.Device.OlpcMesh.lo \
+	introspection/libnmdbus_la-org.freedesktop.NetworkManager.Device.OvsBridge.lo \
 	introspection/libnmdbus_la-org.freedesktop.NetworkManager.Device.OvsInterface.lo \
 	introspection/libnmdbus_la-org.freedesktop.NetworkManager.Device.OvsPort.lo \
-	introspection/libnmdbus_la-org.freedesktop.NetworkManager.Device.OvsBridge.lo \
 	introspection/libnmdbus_la-org.freedesktop.NetworkManager.Device.Ppp.lo \
 	introspection/libnmdbus_la-org.freedesktop.NetworkManager.Device.Statistics.lo \
 	introspection/libnmdbus_la-org.freedesktop.NetworkManager.Device.Team.lo \
@@ -727,28 +728,29 @@ am__objects_1 = introspection/libnmdbus_la-org.freedesktop.NetworkManager.Access
 	introspection/libnmdbus_la-org.freedesktop.NetworkManager.Device.Veth.lo \
 	introspection/libnmdbus_la-org.freedesktop.NetworkManager.Device.Vlan.lo \
 	introspection/libnmdbus_la-org.freedesktop.NetworkManager.Device.Vxlan.lo \
+	introspection/libnmdbus_la-org.freedesktop.NetworkManager.Device.WiMax.lo \
+	introspection/libnmdbus_la-org.freedesktop.NetworkManager.Device.WifiP2P.lo \
 	introspection/libnmdbus_la-org.freedesktop.NetworkManager.Device.WireGuard.lo \
+	introspection/libnmdbus_la-org.freedesktop.NetworkManager.Device.Wired.lo \
 	introspection/libnmdbus_la-org.freedesktop.NetworkManager.Device.Wireless.lo \
-	introspection/libnmdbus_la-org.freedesktop.NetworkManager.Device.WiMax.lo \
 	introspection/libnmdbus_la-org.freedesktop.NetworkManager.Device.Wpan.lo \
 	introspection/libnmdbus_la-org.freedesktop.NetworkManager.Device.lo \
-	introspection/libnmdbus_la-org.freedesktop.NetworkManager.DHCP4Config.lo \
-	introspection/libnmdbus_la-org.freedesktop.NetworkManager.DHCP6Config.lo \
 	introspection/libnmdbus_la-org.freedesktop.NetworkManager.DnsManager.lo \
 	introspection/libnmdbus_la-org.freedesktop.NetworkManager.IP4Config.lo \
 	introspection/libnmdbus_la-org.freedesktop.NetworkManager.IP6Config.lo \
-	introspection/libnmdbus_la-org.freedesktop.NetworkManager.lo \
+	introspection/libnmdbus_la-org.freedesktop.NetworkManager.WifiP2PPeer.lo \
 	introspection/libnmdbus_la-org.freedesktop.NetworkManager.PPP.lo \
 	introspection/libnmdbus_la-org.freedesktop.NetworkManager.SecretAgent.lo \
 	introspection/libnmdbus_la-org.freedesktop.NetworkManager.Settings.Connection.lo \
 	introspection/libnmdbus_la-org.freedesktop.NetworkManager.Settings.lo \
 	introspection/libnmdbus_la-org.freedesktop.NetworkManager.VPN.Connection.lo \
-	introspection/libnmdbus_la-org.freedesktop.NetworkManager.VPN.Plugin.lo
+	introspection/libnmdbus_la-org.freedesktop.NetworkManager.VPN.Plugin.lo \
+	introspection/libnmdbus_la-org.freedesktop.NetworkManager.lo
 nodist_introspection_libnmdbus_la_OBJECTS = $(am__objects_1)
 introspection_libnmdbus_la_OBJECTS =  \
 	$(nodist_introspection_libnmdbus_la_OBJECTS)
 libnm_core_libnm_core_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
-	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+	$(am__DEPENDENCIES_1)
 am__libnm_core_libnm_core_la_SOURCES_DIST =  \
 	shared/nm-version-macros.h libnm-core/nm-connection.h \
 	libnm-core/nm-core-types.h libnm-core/nm-dbus-interface.h \
@@ -778,22 +780,16 @@ am__libnm_core_libnm_core_la_SOURCES_DIST =  \
 	libnm-core/nm-setting-team-port.h libnm-core/nm-setting-team.h \
 	libnm-core/nm-setting-tun.h libnm-core/nm-setting-user.h \
 	libnm-core/nm-setting-vlan.h libnm-core/nm-setting-vpn.h \
-	libnm-core/nm-setting-vxlan.h libnm-core/nm-setting-wimax.h \
-	libnm-core/nm-setting-wired.h \
+	libnm-core/nm-setting-vxlan.h libnm-core/nm-setting-wifi-p2p.h \
+	libnm-core/nm-setting-wimax.h libnm-core/nm-setting-wired.h \
+	libnm-core/nm-setting-wireguard.h \
 	libnm-core/nm-setting-wireless-security.h \
 	libnm-core/nm-setting-wireless.h libnm-core/nm-setting-wpan.h \
 	libnm-core/nm-setting.h libnm-core/nm-simple-connection.h \
 	libnm-core/nm-utils.h libnm-core/nm-version.h \
 	libnm-core/nm-vpn-dbus-interface.h \
 	libnm-core/nm-vpn-editor-plugin.h \
-	libnm-core/nm-vpn-plugin-info.h shared/nm-utils/c-list-util.h \
-	shared/nm-utils/nm-dedup-multi.h \
-	shared/nm-utils/nm-enum-utils.h \
-	shared/nm-utils/nm-hash-utils.h shared/nm-utils/nm-io-utils.h \
-	shared/nm-utils/nm-secret-utils.h \
-	shared/nm-utils/nm-shared-utils.h \
-	shared/nm-utils/nm-random-utils.h \
-	shared/nm-utils/nm-udev-utils.h shared/nm-ethtool-utils.h \
+	libnm-core/nm-vpn-plugin-info.h shared/nm-ethtool-utils.h \
 	shared/nm-meta-setting.h libnm-core/nm-crypto.h \
 	libnm-core/nm-crypto-impl.h libnm-core/nm-connection-private.h \
 	libnm-core/nm-core-internal.h \
@@ -827,23 +823,18 @@ am__libnm_core_libnm_core_la_SOURCES_DIST =  \
 	libnm-core/nm-setting-team-port.c libnm-core/nm-setting-team.c \
 	libnm-core/nm-setting-tun.c libnm-core/nm-setting-user.c \
 	libnm-core/nm-setting-vlan.c libnm-core/nm-setting-vpn.c \
-	libnm-core/nm-setting-vxlan.c libnm-core/nm-setting-wimax.c \
-	libnm-core/nm-setting-wired.c \
+	libnm-core/nm-setting-vxlan.c libnm-core/nm-setting-wifi-p2p.c \
+	libnm-core/nm-setting-wimax.c libnm-core/nm-setting-wired.c \
+	libnm-core/nm-setting-wireguard.c \
 	libnm-core/nm-setting-wireless-security.c \
 	libnm-core/nm-setting-wireless.c libnm-core/nm-setting-wpan.c \
-	shared/nm-utils/c-list-util.c shared/nm-utils/nm-dedup-multi.c \
-	shared/nm-utils/nm-enum-utils.c \
-	shared/nm-utils/nm-hash-utils.c shared/nm-utils/nm-io-utils.c \
-	shared/nm-utils/nm-secret-utils.c \
-	shared/nm-utils/nm-shared-utils.c \
-	shared/nm-utils/nm-random-utils.c \
-	shared/nm-utils/nm-udev-utils.c shared/nm-ethtool-utils.c \
-	shared/nm-meta-setting.c libnm-core/nm-crypto.c \
-	libnm-core/nm-connection.c libnm-core/nm-dbus-utils.c \
-	libnm-core/nm-errors.c libnm-core/nm-keyfile.c \
-	libnm-core/nm-keyfile-utils.c libnm-core/nm-property-compare.c \
-	libnm-core/nm-setting.c libnm-core/nm-simple-connection.c \
-	libnm-core/nm-utils.c libnm-core/nm-vpn-editor-plugin.c \
+	shared/nm-ethtool-utils.c shared/nm-meta-setting.c \
+	libnm-core/nm-crypto.c libnm-core/nm-connection.c \
+	libnm-core/nm-dbus-utils.c libnm-core/nm-errors.c \
+	libnm-core/nm-keyfile.c libnm-core/nm-keyfile-utils.c \
+	libnm-core/nm-property-compare.c libnm-core/nm-setting.c \
+	libnm-core/nm-simple-connection.c libnm-core/nm-utils.c \
+	libnm-core/nm-vpn-editor-plugin.c \
 	libnm-core/nm-vpn-plugin-info.c libnm-core/nm-json.c
 am__objects_2 =
 am__objects_3 = $(am__objects_2)
@@ -887,22 +878,15 @@ am__objects_4 = libnm-core/libnm_core_la-nm-setting-6lowpan.lo \
 	libnm-core/libnm_core_la-nm-setting-vlan.lo \
 	libnm-core/libnm_core_la-nm-setting-vpn.lo \
 	libnm-core/libnm_core_la-nm-setting-vxlan.lo \
+	libnm-core/libnm_core_la-nm-setting-wifi-p2p.lo \
 	libnm-core/libnm_core_la-nm-setting-wimax.lo \
 	libnm-core/libnm_core_la-nm-setting-wired.lo \
+	libnm-core/libnm_core_la-nm-setting-wireguard.lo \
 	libnm-core/libnm_core_la-nm-setting-wireless-security.lo \
 	libnm-core/libnm_core_la-nm-setting-wireless.lo \
 	libnm-core/libnm_core_la-nm-setting-wpan.lo
 @WITH_JSON_VALIDATION_TRUE@am__objects_5 = libnm-core/libnm_core_la-nm-json.lo
 am__objects_6 = $(am__objects_4) \
-	shared/nm-utils/libnm_core_libnm_core_la-c-list-util.lo \
-	shared/nm-utils/libnm_core_libnm_core_la-nm-dedup-multi.lo \
-	shared/nm-utils/libnm_core_libnm_core_la-nm-enum-utils.lo \
-	shared/nm-utils/libnm_core_libnm_core_la-nm-hash-utils.lo \
-	shared/nm-utils/libnm_core_libnm_core_la-nm-io-utils.lo \
-	shared/nm-utils/libnm_core_libnm_core_la-nm-secret-utils.lo \
-	shared/nm-utils/libnm_core_libnm_core_la-nm-shared-utils.lo \
-	shared/nm-utils/libnm_core_libnm_core_la-nm-random-utils.lo \
-	shared/nm-utils/libnm_core_libnm_core_la-nm-udev-utils.lo \
 	shared/libnm_core_libnm_core_la-nm-ethtool-utils.lo \
 	shared/libnm_core_libnm_core_la-nm-meta-setting.lo \
 	libnm-core/libnm_core_la-nm-crypto.lo \
@@ -930,8 +914,7 @@ libnm_core_libnm_core_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
 	$(AM_CFLAGS) $(CFLAGS) $(libnm_core_libnm_core_la_LDFLAGS) \
 	$(LDFLAGS) -o $@
-am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
-	$(am__DEPENDENCIES_1)
+am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
 @HAVE_CRYPTO_GNUTLS_TRUE@libnm_core_libnm_crypto_gnutls_la_DEPENDENCIES =  \
 @HAVE_CRYPTO_GNUTLS_TRUE@	$(am__DEPENDENCIES_2) \
 @HAVE_CRYPTO_GNUTLS_TRUE@	$(am__DEPENDENCIES_1)
@@ -999,11 +982,11 @@ libnm_glib_libnm_glib_vpn_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 @WITH_LEGACY_LIBRARIES_TRUE@libnm_glib_libnm_glib_la_DEPENDENCIES =  \
 @WITH_LEGACY_LIBRARIES_TRUE@	libnm-util/libnm-util.la \
 @WITH_LEGACY_LIBRARIES_TRUE@	libnm-glib/libdeprecated-nm-glib.la \
+@WITH_LEGACY_LIBRARIES_TRUE@	shared/nm-utils/libnm-utils-udev.la \
 @WITH_LEGACY_LIBRARIES_TRUE@	$(am__DEPENDENCIES_1) \
 @WITH_LEGACY_LIBRARIES_TRUE@	$(am__DEPENDENCIES_1) \
 @WITH_LEGACY_LIBRARIES_TRUE@	$(am__DEPENDENCIES_1)
-am__libnm_glib_libnm_glib_la_SOURCES_DIST =  \
-	shared/nm-utils/nm-udev-utils.c libnm-glib/nm-object.c \
+am__libnm_glib_libnm_glib_la_SOURCES_DIST = libnm-glib/nm-object.c \
 	libnm-glib/nm-dbus-helpers.c libnm-glib/nm-client.c \
 	libnm-glib/nm-device.c libnm-glib/nm-device-ethernet.c \
 	libnm-glib/nm-device-infiniband.c libnm-glib/nm-device-adsl.c \
@@ -1033,13 +1016,11 @@ am__libnm_glib_libnm_glib_la_SOURCES_DIST =  \
 	libnm-glib/nm-dhcp6-config.h libnm-glib/nm-remote-connection.h \
 	libnm-glib/nm-remote-settings.h libnm-glib/nm-secret-agent.h \
 	libnm-glib/nm-device-wimax.h libnm-glib/nm-wimax-nsp.h \
-	shared/nm-utils/nm-udev-utils.h libnm-glib/nm-object-private.h \
-	libnm-glib/nm-device-private.h libnm-glib/nm-types-private.h \
-	libnm-glib/nm-object-cache.h \
+	libnm-glib/nm-object-private.h libnm-glib/nm-device-private.h \
+	libnm-glib/nm-types-private.h libnm-glib/nm-object-cache.h \
 	libnm-glib/nm-remote-connection-private.h \
 	libnm-glib/nm-dbus-helpers-private.h
-@WITH_LEGACY_LIBRARIES_TRUE@am__objects_10 = shared/nm-utils/libnm_glib_libnm_glib_la-nm-udev-utils.lo \
-@WITH_LEGACY_LIBRARIES_TRUE@	libnm-glib/libnm_glib_la-nm-object.lo \
+@WITH_LEGACY_LIBRARIES_TRUE@am__objects_10 = libnm-glib/libnm_glib_la-nm-object.lo \
 @WITH_LEGACY_LIBRARIES_TRUE@	libnm-glib/libnm_glib_la-nm-dbus-helpers.lo \
 @WITH_LEGACY_LIBRARIES_TRUE@	libnm-glib/libnm_glib_la-nm-client.lo \
 @WITH_LEGACY_LIBRARIES_TRUE@	libnm-glib/libnm_glib_la-nm-device.lo \
@@ -1086,14 +1067,13 @@ libnm_glib_libnm_glib_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 @WITH_LEGACY_LIBRARIES_TRUE@	-rpath $(libdir)
 @WITH_GNUTLS_TRUE@@WITH_LEGACY_LIBRARIES_TRUE@am__DEPENDENCIES_3 = $(am__DEPENDENCIES_1)
 @WITH_LEGACY_LIBRARIES_TRUE@@WITH_NSS_TRUE@am__DEPENDENCIES_4 = $(am__DEPENDENCIES_1)
-@WITH_LEGACY_LIBRARIES_TRUE@libnm_util_libnm_util_la_DEPENDENCIES =  \
+@WITH_LEGACY_LIBRARIES_TRUE@libnm_util_libnm_util_la_DEPENDENCIES = shared/nm-utils/libnm-utils-base.la \
 @WITH_LEGACY_LIBRARIES_TRUE@	$(am__DEPENDENCIES_1) \
 @WITH_LEGACY_LIBRARIES_TRUE@	$(am__DEPENDENCIES_1) \
 @WITH_LEGACY_LIBRARIES_TRUE@	$(am__DEPENDENCIES_1) \
 @WITH_LEGACY_LIBRARIES_TRUE@	$(am__DEPENDENCIES_3) \
 @WITH_LEGACY_LIBRARIES_TRUE@	$(am__DEPENDENCIES_4)
-am__libnm_util_libnm_util_la_SOURCES_DIST =  \
-	shared/nm-utils/nm-shared-utils.c libnm-util/crypto.c \
+am__libnm_util_libnm_util_la_SOURCES_DIST = libnm-util/crypto.c \
 	libnm-util/nm-connection.c \
 	libnm-util/nm-param-spec-specialized.c libnm-util/nm-setting.c \
 	libnm-util/nm-setting-8021x.c libnm-util/nm-setting-adsl.c \
@@ -1134,15 +1114,14 @@ am__libnm_util_libnm_util_la_SOURCES_DIST =  \
 	libnm-util/nm-setting-wireless.h \
 	libnm-util/nm-setting-wireless-security.h \
 	libnm-util/nm-setting-vpn.h libnm-util/nm-utils.h \
-	libnm-util/nm-version.h shared/nm-utils/nm-shared-utils.h \
-	libnm-util/crypto.h libnm-util/nm-dbus-glib-types.h \
+	libnm-util/nm-version.h libnm-util/crypto.h \
+	libnm-util/nm-dbus-glib-types.h \
 	libnm-util/nm-gvaluearray-compat.h \
 	libnm-util/nm-param-spec-specialized.h \
 	libnm-util/nm-setting-private.h libnm-util/nm-utils-private.h
 @WITH_GNUTLS_TRUE@@WITH_LEGACY_LIBRARIES_TRUE@am__objects_12 = libnm-util/libnm_util_la-crypto_gnutls.lo
 @WITH_LEGACY_LIBRARIES_TRUE@@WITH_NSS_TRUE@am__objects_13 = libnm-util/libnm_util_la-crypto_nss.lo
-@WITH_LEGACY_LIBRARIES_TRUE@am__objects_14 = shared/nm-utils/libnm_util_libnm_util_la-nm-shared-utils.lo \
-@WITH_LEGACY_LIBRARIES_TRUE@	libnm-util/libnm_util_la-crypto.lo \
+@WITH_LEGACY_LIBRARIES_TRUE@am__objects_14 = libnm-util/libnm_util_la-crypto.lo \
 @WITH_LEGACY_LIBRARIES_TRUE@	libnm-util/libnm_util_la-nm-connection.lo \
 @WITH_LEGACY_LIBRARIES_TRUE@	libnm-util/libnm_util_la-nm-param-spec-specialized.lo \
 @WITH_LEGACY_LIBRARIES_TRUE@	libnm-util/libnm_util_la-nm-setting.lo \
@@ -1207,15 +1186,17 @@ libnm_util_libtest_crypto_la_OBJECTS =  \
 @ENABLE_TESTS_FALSE@@WITH_LEGACY_LIBRARIES_TRUE@am_libnm_util_libtest_crypto_la_rpath =
 @ENABLE_TESTS_TRUE@@WITH_LEGACY_LIBRARIES_TRUE@am_libnm_util_libtest_crypto_la_rpath =
 libnm_libnm_utils_la_DEPENDENCIES = libnm-core/libnm-core.la \
-	shared/libcsiphash.la $(libnm_crypto_lib) \
-	introspection/libnmdbus.la $(am__DEPENDENCIES_1)
+	$(libnm_crypto_lib) introspection/libnmdbus.la \
+	shared/nm-utils/libnm-utils-base.la $(am__DEPENDENCIES_1)
 am_libnm_libnm_utils_la_OBJECTS =  \
 	libnm/libnm_utils_la-nm-libnm-utils.lo
 @HAVE_INTROSPECTION_TRUE@@WITH_FAKE_TYPELIBS_TRUE@nodist_libnm_libnm_utils_la_OBJECTS = libnm/fake-typelib/libnm_utils_la-typelibs.lo
 libnm_libnm_utils_la_OBJECTS = $(am_libnm_libnm_utils_la_OBJECTS) \
 	$(nodist_libnm_libnm_utils_la_OBJECTS)
 libnm_libnm_la_DEPENDENCIES = libnm/libnm-utils.la \
-	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+	shared/systemd/libnm-systemd-shared.la \
+	shared/systemd/libnm-systemd-logging-stub.la \
+	shared/nm-utils/libnm-utils-udev.la $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
 am__objects_18 = libnm/libnm_la-nm-access-point.lo \
 	libnm/libnm_la-nm-active-connection.lo \
@@ -1235,14 +1216,15 @@ am__objects_18 = libnm/libnm_la-nm-access-point.lo \
 	libnm/libnm_la-nm-device-macvlan.lo \
 	libnm/libnm_la-nm-device-modem.lo \
 	libnm/libnm_la-nm-device-olpc-mesh.lo \
+	libnm/libnm_la-nm-device-ovs-bridge.lo \
 	libnm/libnm_la-nm-device-ovs-interface.lo \
 	libnm/libnm_la-nm-device-ovs-port.lo \
-	libnm/libnm_la-nm-device-ovs-bridge.lo \
 	libnm/libnm_la-nm-device-ppp.lo \
 	libnm/libnm_la-nm-device-team.lo \
 	libnm/libnm_la-nm-device-tun.lo \
 	libnm/libnm_la-nm-device-vlan.lo \
 	libnm/libnm_la-nm-device-vxlan.lo \
+	libnm/libnm_la-nm-device-wifi-p2p.lo \
 	libnm/libnm_la-nm-device-wifi.lo \
 	libnm/libnm_la-nm-device-wimax.lo \
 	libnm/libnm_la-nm-device-wireguard.lo \
@@ -1258,9 +1240,10 @@ am__objects_18 = libnm/libnm_la-nm-access-point.lo \
 	libnm/libnm_la-nm-remote-settings.lo \
 	libnm/libnm_la-nm-secret-agent-old.lo \
 	libnm/libnm_la-nm-vpn-connection.lo \
-	libnm/libnm_la-nm-vpn-plugin-old.lo \
 	libnm/libnm_la-nm-vpn-editor.lo \
+	libnm/libnm_la-nm-vpn-plugin-old.lo \
 	libnm/libnm_la-nm-vpn-service-plugin.lo \
+	libnm/libnm_la-nm-wifi-p2p-peer.lo \
 	libnm/libnm_la-nm-wimax-nsp.lo
 am_libnm_libnm_la_OBJECTS = $(am__objects_2) $(am__objects_2) \
 	$(am__objects_18)
@@ -1284,17 +1267,108 @@ libnm_tests_libnm_vpn_plugin_utils_test_la_LINK = $(LIBTOOL) \
 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
 @ENABLE_TESTS_FALSE@am_libnm_tests_libnm_vpn_plugin_utils_test_la_rpath =
 @ENABLE_TESTS_TRUE@am_libnm_tests_libnm_vpn_plugin_utils_test_la_rpath =
+shared_libcrbtree_la_LIBADD =
+am_shared_libcrbtree_la_OBJECTS =  \
+	shared/c-rbtree/src/libcrbtree_la-c-rbtree.lo
+shared_libcrbtree_la_OBJECTS = $(am_shared_libcrbtree_la_OBJECTS)
+shared_libcrbtree_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
+	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
+	$(shared_libcrbtree_la_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
 shared_libcsiphash_la_LIBADD =
 am_shared_libcsiphash_la_OBJECTS =  \
 	shared/c-siphash/src/libcsiphash_la-c-siphash.lo
 shared_libcsiphash_la_OBJECTS = $(am_shared_libcsiphash_la_OBJECTS)
-shared_libnacd_la_LIBADD =
-am_shared_libnacd_la_OBJECTS = shared/n-acd/src/libnacd_la-n-acd.lo
+shared_libnacd_la_DEPENDENCIES = shared/libcrbtree.la
+am__shared_libnacd_la_SOURCES_DIST = shared/n-acd/src/n-acd.c \
+	shared/n-acd/src/n-acd.h shared/n-acd/src/n-acd-private.h \
+	shared/n-acd/src/n-acd-probe.c shared/n-acd/src/util/timer.c \
+	shared/n-acd/src/util/timer.h shared/n-acd/src/n-acd-bpf.c \
+	shared/n-acd/src/n-acd-bpf-fallback.c
+@WITH_EBPF_TRUE@am__objects_20 =  \
+@WITH_EBPF_TRUE@	shared/n-acd/src/libnacd_la-n-acd-bpf.lo
+@WITH_EBPF_FALSE@am__objects_21 = shared/n-acd/src/libnacd_la-n-acd-bpf-fallback.lo
+am_shared_libnacd_la_OBJECTS = shared/n-acd/src/libnacd_la-n-acd.lo \
+	shared/n-acd/src/libnacd_la-n-acd-probe.lo \
+	shared/n-acd/src/util/libnacd_la-timer.lo $(am__objects_20) \
+	$(am__objects_21)
 shared_libnacd_la_OBJECTS = $(am_shared_libnacd_la_OBJECTS)
 shared_libnacd_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
 	$(shared_libnacd_la_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \
 	-o $@
+shared_nm_utils_libnm_utils_base_la_DEPENDENCIES =  \
+	shared/libcsiphash.la $(am__DEPENDENCIES_1)
+am_shared_nm_utils_libnm_utils_base_la_OBJECTS =  \
+	shared/nm-utils/libnm_utils_base_la-c-list-util.lo \
+	shared/nm-utils/libnm_utils_base_la-nm-dedup-multi.lo \
+	shared/nm-utils/libnm_utils_base_la-nm-enum-utils.lo \
+	shared/nm-utils/libnm_utils_base_la-nm-errno.lo \
+	shared/nm-utils/libnm_utils_base_la-nm-hash-utils.lo \
+	shared/nm-utils/libnm_utils_base_la-nm-io-utils.lo \
+	shared/nm-utils/libnm_utils_base_la-nm-random-utils.lo \
+	shared/nm-utils/libnm_utils_base_la-nm-secret-utils.lo \
+	shared/nm-utils/libnm_utils_base_la-nm-shared-utils.lo \
+	shared/nm-utils/libnm_utils_base_la-nm-time-utils.lo
+shared_nm_utils_libnm_utils_base_la_OBJECTS =  \
+	$(am_shared_nm_utils_libnm_utils_base_la_OBJECTS)
+shared_nm_utils_libnm_utils_base_la_LINK = $(LIBTOOL) $(AM_V_lt) \
+	--tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link \
+	$(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(shared_nm_utils_libnm_utils_base_la_LDFLAGS) $(LDFLAGS) -o \
+	$@
+shared_nm_utils_libnm_utils_udev_la_DEPENDENCIES =  \
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+am_shared_nm_utils_libnm_utils_udev_la_OBJECTS =  \
+	shared/nm-utils/libnm_utils_udev_la-nm-udev-utils.lo
+shared_nm_utils_libnm_utils_udev_la_OBJECTS =  \
+	$(am_shared_nm_utils_libnm_utils_udev_la_OBJECTS)
+shared_nm_utils_libnm_utils_udev_la_LINK = $(LIBTOOL) $(AM_V_lt) \
+	--tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link \
+	$(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(shared_nm_utils_libnm_utils_udev_la_LDFLAGS) $(LDFLAGS) -o \
+	$@
+shared_systemd_libnm_systemd_logging_stub_la_DEPENDENCIES =  \
+	$(am__DEPENDENCIES_2)
+am_shared_systemd_libnm_systemd_logging_stub_la_OBJECTS = shared/systemd/libnm_systemd_logging_stub_la-nm-logging-stub.lo
+shared_systemd_libnm_systemd_logging_stub_la_OBJECTS =  \
+	$(am_shared_systemd_libnm_systemd_logging_stub_la_OBJECTS)
+shared_systemd_libnm_systemd_shared_la_DEPENDENCIES =  \
+	$(am__DEPENDENCIES_2)
+am_shared_systemd_libnm_systemd_shared_la_OBJECTS =  \
+	shared/systemd/libnm_systemd_shared_la-nm-sd-utils-shared.lo \
+	shared/systemd/src/basic/libnm_systemd_shared_la-alloc-util.lo \
+	shared/systemd/src/basic/libnm_systemd_shared_la-env-file.lo \
+	shared/systemd/src/basic/libnm_systemd_shared_la-env-util.lo \
+	shared/systemd/src/basic/libnm_systemd_shared_la-escape.lo \
+	shared/systemd/src/basic/libnm_systemd_shared_la-ether-addr-util.lo \
+	shared/systemd/src/basic/libnm_systemd_shared_la-extract-word.lo \
+	shared/systemd/src/basic/libnm_systemd_shared_la-fd-util.lo \
+	shared/systemd/src/basic/libnm_systemd_shared_la-fileio.lo \
+	shared/systemd/src/basic/libnm_systemd_shared_la-fs-util.lo \
+	shared/systemd/src/basic/libnm_systemd_shared_la-hash-funcs.lo \
+	shared/systemd/src/basic/libnm_systemd_shared_la-hashmap.lo \
+	shared/systemd/src/basic/libnm_systemd_shared_la-hexdecoct.lo \
+	shared/systemd/src/basic/libnm_systemd_shared_la-hostname-util.lo \
+	shared/systemd/src/basic/libnm_systemd_shared_la-in-addr-util.lo \
+	shared/systemd/src/basic/libnm_systemd_shared_la-io-util.lo \
+	shared/systemd/src/basic/libnm_systemd_shared_la-mempool.lo \
+	shared/systemd/src/basic/libnm_systemd_shared_la-parse-util.lo \
+	shared/systemd/src/basic/libnm_systemd_shared_la-path-util.lo \
+	shared/systemd/src/basic/libnm_systemd_shared_la-prioq.lo \
+	shared/systemd/src/basic/libnm_systemd_shared_la-process-util.lo \
+	shared/systemd/src/basic/libnm_systemd_shared_la-random-util.lo \
+	shared/systemd/src/basic/libnm_systemd_shared_la-socket-util.lo \
+	shared/systemd/src/basic/libnm_systemd_shared_la-stat-util.lo \
+	shared/systemd/src/basic/libnm_systemd_shared_la-string-table.lo \
+	shared/systemd/src/basic/libnm_systemd_shared_la-string-util.lo \
+	shared/systemd/src/basic/libnm_systemd_shared_la-strv.lo \
+	shared/systemd/src/basic/libnm_systemd_shared_la-time-util.lo \
+	shared/systemd/src/basic/libnm_systemd_shared_la-tmpfile-util.lo \
+	shared/systemd/src/basic/libnm_systemd_shared_la-utf8.lo \
+	shared/systemd/src/basic/libnm_systemd_shared_la-util.lo
+shared_systemd_libnm_systemd_shared_la_OBJECTS =  \
+	$(am_shared_systemd_libnm_systemd_shared_la_OBJECTS)
 src_devices_adsl_libnm_device_plugin_adsl_la_DEPENDENCIES =  \
 	$(am__DEPENDENCIES_1)
 am_src_devices_adsl_libnm_device_plugin_adsl_la_OBJECTS = src/devices/adsl/libnm_device_plugin_adsl_la-nm-atm-manager.lo \
@@ -1328,7 +1402,7 @@ am__src_devices_bluetooth_libnm_device_plugin_bluetooth_la_SOURCES_DIST =  \
 	src/devices/bluetooth/nm-device-bt.h \
 	src/devices/bluetooth/nm-bluez5-dun.c \
 	src/devices/bluetooth/nm-bluez5-dun.h
-@WITH_BLUEZ5_DUN_TRUE@@WITH_MODEM_MANAGER_1_TRUE@am__objects_20 = src/devices/bluetooth/libnm_device_plugin_bluetooth_la-nm-bluez5-dun.lo
+@WITH_BLUEZ5_DUN_TRUE@@WITH_MODEM_MANAGER_1_TRUE@am__objects_22 = src/devices/bluetooth/libnm_device_plugin_bluetooth_la-nm-bluez5-dun.lo
 @WITH_MODEM_MANAGER_1_TRUE@am_src_devices_bluetooth_libnm_device_plugin_bluetooth_la_OBJECTS = src/devices/bluetooth/libnm_device_plugin_bluetooth_la-nm-bluez-manager.lo \
 @WITH_MODEM_MANAGER_1_TRUE@	src/devices/bluetooth/libnm_device_plugin_bluetooth_la-nm-bluez-device.lo \
 @WITH_MODEM_MANAGER_1_TRUE@	src/devices/bluetooth/libnm_device_plugin_bluetooth_la-nm-bluez4-adapter.lo \
@@ -1336,7 +1410,7 @@ am__src_devices_bluetooth_libnm_device_plugin_bluetooth_la_SOURCES_DIST =  \
 @WITH_MODEM_MANAGER_1_TRUE@	src/devices/bluetooth/libnm_device_plugin_bluetooth_la-nm-bluez5-manager.lo \
 @WITH_MODEM_MANAGER_1_TRUE@	src/devices/bluetooth/libnm_device_plugin_bluetooth_la-nm-bt-error.lo \
 @WITH_MODEM_MANAGER_1_TRUE@	src/devices/bluetooth/libnm_device_plugin_bluetooth_la-nm-device-bt.lo \
-@WITH_MODEM_MANAGER_1_TRUE@	$(am__objects_20)
+@WITH_MODEM_MANAGER_1_TRUE@	$(am__objects_22)
 src_devices_bluetooth_libnm_device_plugin_bluetooth_la_OBJECTS = $(am_src_devices_bluetooth_libnm_device_plugin_bluetooth_la_OBJECTS)
 src_devices_bluetooth_libnm_device_plugin_bluetooth_la_LINK =  \
 	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
@@ -1393,29 +1467,35 @@ src_devices_team_libnm_device_plugin_team_la_LINK = $(LIBTOOL) \
 @WITH_WIFI_TRUE@src_devices_wifi_libnm_device_plugin_wifi_la_DEPENDENCIES =  \
 @WITH_WIFI_TRUE@	$(am__DEPENDENCIES_1)
 am__src_devices_wifi_libnm_device_plugin_wifi_la_SOURCES_DIST =  \
-	src/devices/wifi/nm-wifi-factory.c \
+	src/devices/wifi/nm-device-olpc-mesh.c \
+	src/devices/wifi/nm-device-olpc-mesh.h \
+	src/devices/wifi/nm-device-wifi-p2p.c \
+	src/devices/wifi/nm-device-wifi-p2p.h \
 	src/devices/wifi/nm-device-wifi.c \
 	src/devices/wifi/nm-device-wifi.h \
 	src/devices/wifi/nm-wifi-ap.c src/devices/wifi/nm-wifi-ap.h \
-	src/devices/wifi/nm-wifi-utils.c \
-	src/devices/wifi/nm-wifi-utils.h \
 	src/devices/wifi/nm-wifi-common.c \
 	src/devices/wifi/nm-wifi-common.h \
-	src/devices/wifi/nm-device-olpc-mesh.c \
-	src/devices/wifi/nm-device-olpc-mesh.h \
+	src/devices/wifi/nm-wifi-factory.c \
+	src/devices/wifi/nm-wifi-p2p-peer.c \
+	src/devices/wifi/nm-wifi-p2p-peer.h \
+	src/devices/wifi/nm-wifi-utils.c \
+	src/devices/wifi/nm-wifi-utils.h \
 	src/devices/wifi/nm-device-iwd.c \
 	src/devices/wifi/nm-device-iwd.h \
 	src/devices/wifi/nm-iwd-manager.c \
 	src/devices/wifi/nm-iwd-manager.h
-@WITH_IWD_TRUE@@WITH_WIFI_TRUE@am__objects_21 = src/devices/wifi/libnm_device_plugin_wifi_la-nm-device-iwd.lo \
+@WITH_IWD_TRUE@@WITH_WIFI_TRUE@am__objects_23 = src/devices/wifi/libnm_device_plugin_wifi_la-nm-device-iwd.lo \
 @WITH_IWD_TRUE@@WITH_WIFI_TRUE@	src/devices/wifi/libnm_device_plugin_wifi_la-nm-iwd-manager.lo
-@WITH_WIFI_TRUE@am_src_devices_wifi_libnm_device_plugin_wifi_la_OBJECTS = src/devices/wifi/libnm_device_plugin_wifi_la-nm-wifi-factory.lo \
+@WITH_WIFI_TRUE@am_src_devices_wifi_libnm_device_plugin_wifi_la_OBJECTS = src/devices/wifi/libnm_device_plugin_wifi_la-nm-device-olpc-mesh.lo \
+@WITH_WIFI_TRUE@	src/devices/wifi/libnm_device_plugin_wifi_la-nm-device-wifi-p2p.lo \
 @WITH_WIFI_TRUE@	src/devices/wifi/libnm_device_plugin_wifi_la-nm-device-wifi.lo \
 @WITH_WIFI_TRUE@	src/devices/wifi/libnm_device_plugin_wifi_la-nm-wifi-ap.lo \
-@WITH_WIFI_TRUE@	src/devices/wifi/libnm_device_plugin_wifi_la-nm-wifi-utils.lo \
 @WITH_WIFI_TRUE@	src/devices/wifi/libnm_device_plugin_wifi_la-nm-wifi-common.lo \
-@WITH_WIFI_TRUE@	src/devices/wifi/libnm_device_plugin_wifi_la-nm-device-olpc-mesh.lo \
-@WITH_WIFI_TRUE@	$(am__objects_21)
+@WITH_WIFI_TRUE@	src/devices/wifi/libnm_device_plugin_wifi_la-nm-wifi-factory.lo \
+@WITH_WIFI_TRUE@	src/devices/wifi/libnm_device_plugin_wifi_la-nm-wifi-p2p-peer.lo \
+@WITH_WIFI_TRUE@	src/devices/wifi/libnm_device_plugin_wifi_la-nm-wifi-utils.lo \
+@WITH_WIFI_TRUE@	$(am__objects_23)
 src_devices_wifi_libnm_device_plugin_wifi_la_OBJECTS =  \
 	$(am_src_devices_wifi_libnm_device_plugin_wifi_la_OBJECTS)
 src_devices_wifi_libnm_device_plugin_wifi_la_LINK = $(LIBTOOL) \
@@ -1455,11 +1535,11 @@ am__src_devices_wwan_libnm_wwan_la_SOURCES_DIST =  \
 	src/devices/wwan/nm-modem.c src/devices/wwan/nm-modem.h \
 	src/devices/wwan/nm-modem-ofono.c \
 	src/devices/wwan/nm-modem-ofono.h
-@WITH_MODEM_MANAGER_1_TRUE@@WITH_OFONO_TRUE@am__objects_22 = src/devices/wwan/libnm_wwan_la-nm-modem-ofono.lo
+@WITH_MODEM_MANAGER_1_TRUE@@WITH_OFONO_TRUE@am__objects_24 = src/devices/wwan/libnm_wwan_la-nm-modem-ofono.lo
 @WITH_MODEM_MANAGER_1_TRUE@am_src_devices_wwan_libnm_wwan_la_OBJECTS = src/devices/wwan/libnm_wwan_la-nm-modem-broadband.lo \
 @WITH_MODEM_MANAGER_1_TRUE@	src/devices/wwan/libnm_wwan_la-nm-modem-manager.lo \
 @WITH_MODEM_MANAGER_1_TRUE@	src/devices/wwan/libnm_wwan_la-nm-modem.lo \
-@WITH_MODEM_MANAGER_1_TRUE@	$(am__objects_22)
+@WITH_MODEM_MANAGER_1_TRUE@	$(am__objects_24)
 src_devices_wwan_libnm_wwan_la_OBJECTS =  \
 	$(am_src_devices_wwan_libnm_wwan_la_OBJECTS)
 src_devices_wwan_libnm_wwan_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
@@ -1475,17 +1555,19 @@ am_src_initrd_libnmi_core_la_OBJECTS =  \
 src_initrd_libnmi_core_la_OBJECTS =  \
 	$(am_src_initrd_libnmi_core_la_OBJECTS)
 src_libNetworkManager_la_DEPENDENCIES = src/libNetworkManagerBase.la \
-	src/libsystemd-nm.la shared/libnacd.la $(am__DEPENDENCIES_1) \
+	src/libnm-systemd-core.la \
+	shared/systemd/libnm-systemd-shared.la shared/libnacd.la \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
-	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1)
 am_src_libNetworkManager_la_OBJECTS =  \
 	src/libNetworkManager_la-nm-checkpoint.lo \
 	src/libNetworkManager_la-nm-checkpoint-manager.lo \
-	src/devices/libNetworkManager_la-nm-device.lo \
-	src/devices/libNetworkManager_la-nm-lldp-listener.lo \
 	src/devices/libNetworkManager_la-nm-acd-manager.lo \
+	src/devices/libNetworkManager_la-nm-lldp-listener.lo \
+	src/devices/libNetworkManager_la-nm-device.lo \
 	src/devices/libNetworkManager_la-nm-device-ethernet-utils.lo \
 	src/devices/libNetworkManager_la-nm-device-factory.lo \
 	src/devices/libNetworkManager_la-nm-device-generic.lo \
@@ -1557,13 +1639,14 @@ am_src_libNetworkManager_la_OBJECTS =  \
 	src/libNetworkManager_la-nm-policy.lo \
 	src/libNetworkManager_la-nm-rfkill-manager.lo \
 	src/libNetworkManager_la-nm-session-monitor.lo \
+	src/libNetworkManager_la-nm-keep-alive.lo \
 	src/libNetworkManager_la-nm-sleep-monitor.lo
 src_libNetworkManager_la_OBJECTS =  \
 	$(am_src_libNetworkManager_la_OBJECTS)
 src_libNetworkManagerBase_la_DEPENDENCIES = libnm-core/libnm-core.la \
-	shared/libcsiphash.la $(libnm_crypto_lib) \
-	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
-	$(am__DEPENDENCIES_1)
+	$(libnm_crypto_lib) shared/nm-utils/libnm-utils-udev.la \
+	shared/nm-utils/libnm-utils-base.la $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
 am__src_libNetworkManagerBase_la_SOURCES_DIST = src/nm-core-utils.c \
 	src/nm-core-utils.h src/nm-logging.c src/nm-logging.h \
 	src/NetworkManagerUtils.c src/NetworkManagerUtils.h \
@@ -1594,7 +1677,7 @@ am__src_libNetworkManagerBase_la_SOURCES_DIST = src/nm-core-utils.c \
 	src/main-utils.c src/main-utils.h \
 	src/platform/wifi/nm-wifi-utils-wext.c \
 	src/platform/wifi/nm-wifi-utils-wext.h
-@WITH_WEXT_TRUE@am__objects_23 = src/platform/wifi/libNetworkManagerBase_la-nm-wifi-utils-wext.lo
+@WITH_WEXT_TRUE@am__objects_25 = src/platform/wifi/libNetworkManagerBase_la-nm-wifi-utils-wext.lo
 am_src_libNetworkManagerBase_la_OBJECTS =  \
 	src/libNetworkManagerBase_la-nm-core-utils.lo \
 	src/libNetworkManagerBase_la-nm-logging.lo \
@@ -1618,7 +1701,7 @@ am_src_libNetworkManagerBase_la_OBJECTS =  \
 	src/dhcp/libNetworkManagerBase_la-nm-dhcp-utils.lo \
 	src/dhcp/libNetworkManagerBase_la-nm-dhcp-systemd.lo \
 	src/dhcp/libNetworkManagerBase_la-nm-dhcp-manager.lo \
-	src/libNetworkManagerBase_la-main-utils.lo $(am__objects_23)
+	src/libNetworkManagerBase_la-main-utils.lo $(am__objects_25)
 src_libNetworkManagerBase_la_OBJECTS =  \
 	$(am_src_libNetworkManagerBase_la_OBJECTS)
 src_libNetworkManagerTest_la_DEPENDENCIES = src/libNetworkManager.la \
@@ -1632,62 +1715,36 @@ src_libNetworkManagerTest_la_OBJECTS =  \
 	$(am_src_libNetworkManagerTest_la_OBJECTS)
 @ENABLE_TESTS_FALSE@am_src_libNetworkManagerTest_la_rpath =
 @ENABLE_TESTS_TRUE@am_src_libNetworkManagerTest_la_rpath =
-am__DEPENDENCIES_6 = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
-src_libsystemd_nm_la_DEPENDENCIES = $(am__DEPENDENCIES_6)
-am_src_libsystemd_nm_la_OBJECTS =  \
-	src/systemd/libsystemd_nm_la-nm-sd.lo \
-	src/systemd/libsystemd_nm_la-nm-sd-utils.lo \
-	src/systemd/sd-adapt/libsystemd_nm_la-nm-sd-adapt.lo \
-	src/systemd/src/basic/libsystemd_nm_la-alloc-util.lo \
-	src/systemd/src/basic/libsystemd_nm_la-env-util.lo \
-	src/systemd/src/basic/libsystemd_nm_la-escape.lo \
-	src/systemd/src/basic/libsystemd_nm_la-ether-addr-util.lo \
-	src/systemd/src/basic/libsystemd_nm_la-extract-word.lo \
-	src/systemd/src/basic/libsystemd_nm_la-fd-util.lo \
-	src/systemd/src/basic/libsystemd_nm_la-fileio.lo \
-	src/systemd/src/basic/libsystemd_nm_la-fs-util.lo \
-	src/systemd/src/basic/libsystemd_nm_la-hash-funcs.lo \
-	src/systemd/src/basic/libsystemd_nm_la-hashmap.lo \
-	src/systemd/src/basic/libsystemd_nm_la-hexdecoct.lo \
-	src/systemd/src/basic/libsystemd_nm_la-hostname-util.lo \
-	src/systemd/src/basic/libsystemd_nm_la-in-addr-util.lo \
-	src/systemd/src/basic/libsystemd_nm_la-io-util.lo \
-	src/systemd/src/basic/libsystemd_nm_la-mempool.lo \
-	src/systemd/src/basic/libsystemd_nm_la-parse-util.lo \
-	src/systemd/src/basic/libsystemd_nm_la-path-util.lo \
-	src/systemd/src/basic/libsystemd_nm_la-prioq.lo \
-	src/systemd/src/basic/libsystemd_nm_la-process-util.lo \
-	src/systemd/src/basic/libsystemd_nm_la-random-util.lo \
-	src/systemd/src/basic/libsystemd_nm_la-socket-util.lo \
-	src/systemd/src/basic/libsystemd_nm_la-stat-util.lo \
-	src/systemd/src/basic/libsystemd_nm_la-string-table.lo \
-	src/systemd/src/basic/libsystemd_nm_la-string-util.lo \
-	src/systemd/src/basic/libsystemd_nm_la-strv.lo \
-	src/systemd/src/basic/libsystemd_nm_la-time-util.lo \
-	src/systemd/src/basic/libsystemd_nm_la-utf8.lo \
-	src/systemd/src/basic/libsystemd_nm_la-util.lo \
-	src/systemd/src/libsystemd-network/libsystemd_nm_la-arp-util.lo \
-	src/systemd/src/libsystemd-network/libsystemd_nm_la-dhcp-identifier.lo \
-	src/systemd/src/libsystemd-network/libsystemd_nm_la-dhcp-network.lo \
-	src/systemd/src/libsystemd-network/libsystemd_nm_la-dhcp-option.lo \
-	src/systemd/src/libsystemd-network/libsystemd_nm_la-dhcp-packet.lo \
-	src/systemd/src/libsystemd-network/libsystemd_nm_la-dhcp6-network.lo \
-	src/systemd/src/libsystemd-network/libsystemd_nm_la-dhcp6-option.lo \
-	src/systemd/src/libsystemd-network/libsystemd_nm_la-lldp-neighbor.lo \
-	src/systemd/src/libsystemd-network/libsystemd_nm_la-lldp-network.lo \
-	src/systemd/src/libsystemd-network/libsystemd_nm_la-network-internal.lo \
-	src/systemd/src/libsystemd-network/libsystemd_nm_la-sd-dhcp-client.lo \
-	src/systemd/src/libsystemd-network/libsystemd_nm_la-sd-dhcp-lease.lo \
-	src/systemd/src/libsystemd-network/libsystemd_nm_la-sd-dhcp6-client.lo \
-	src/systemd/src/libsystemd-network/libsystemd_nm_la-sd-dhcp6-lease.lo \
-	src/systemd/src/libsystemd-network/libsystemd_nm_la-sd-ipv4acd.lo \
-	src/systemd/src/libsystemd-network/libsystemd_nm_la-sd-ipv4ll.lo \
-	src/systemd/src/libsystemd-network/libsystemd_nm_la-sd-lldp.lo \
-	src/systemd/src/libsystemd/sd-event/libsystemd_nm_la-sd-event.lo \
-	src/systemd/src/libsystemd/sd-id128/libsystemd_nm_la-id128-util.lo \
-	src/systemd/src/libsystemd/sd-id128/libsystemd_nm_la-sd-id128.lo \
-	src/systemd/src/shared/libsystemd_nm_la-dns-domain.lo
-src_libsystemd_nm_la_OBJECTS = $(am_src_libsystemd_nm_la_OBJECTS)
+am__DEPENDENCIES_6 = $(am__DEPENDENCIES_2)
+src_libnm_systemd_core_la_DEPENDENCIES = $(am__DEPENDENCIES_6)
+am_src_libnm_systemd_core_la_OBJECTS =  \
+	src/systemd/libnm_systemd_core_la-nm-sd-utils-core.lo \
+	src/systemd/libnm_systemd_core_la-nm-sd.lo \
+	src/systemd/sd-adapt-core/libnm_systemd_core_la-nm-sd-adapt-core.lo \
+	src/systemd/src/libsystemd-network/libnm_systemd_core_la-arp-util.lo \
+	src/systemd/src/libsystemd-network/libnm_systemd_core_la-dhcp-identifier.lo \
+	src/systemd/src/libsystemd-network/libnm_systemd_core_la-dhcp-network.lo \
+	src/systemd/src/libsystemd-network/libnm_systemd_core_la-dhcp-option.lo \
+	src/systemd/src/libsystemd-network/libnm_systemd_core_la-dhcp-packet.lo \
+	src/systemd/src/libsystemd-network/libnm_systemd_core_la-dhcp6-network.lo \
+	src/systemd/src/libsystemd-network/libnm_systemd_core_la-dhcp6-option.lo \
+	src/systemd/src/libsystemd-network/libnm_systemd_core_la-lldp-neighbor.lo \
+	src/systemd/src/libsystemd-network/libnm_systemd_core_la-lldp-network.lo \
+	src/systemd/src/libsystemd-network/libnm_systemd_core_la-network-internal.lo \
+	src/systemd/src/libsystemd-network/libnm_systemd_core_la-sd-dhcp-client.lo \
+	src/systemd/src/libsystemd-network/libnm_systemd_core_la-sd-dhcp-lease.lo \
+	src/systemd/src/libsystemd-network/libnm_systemd_core_la-sd-dhcp6-client.lo \
+	src/systemd/src/libsystemd-network/libnm_systemd_core_la-sd-dhcp6-lease.lo \
+	src/systemd/src/libsystemd-network/libnm_systemd_core_la-sd-ipv4acd.lo \
+	src/systemd/src/libsystemd-network/libnm_systemd_core_la-sd-ipv4ll.lo \
+	src/systemd/src/libsystemd-network/libnm_systemd_core_la-sd-lldp.lo \
+	src/systemd/src/libsystemd/sd-event/libnm_systemd_core_la-event-util.lo \
+	src/systemd/src/libsystemd/sd-event/libnm_systemd_core_la-sd-event.lo \
+	src/systemd/src/libsystemd/sd-id128/libnm_systemd_core_la-id128-util.lo \
+	src/systemd/src/libsystemd/sd-id128/libnm_systemd_core_la-sd-id128.lo \
+	src/systemd/src/shared/libnm_systemd_core_la-dns-domain.lo
+src_libnm_systemd_core_la_OBJECTS =  \
+	$(am_src_libnm_systemd_core_la_OBJECTS)
 @WITH_PPP_TRUE@src_ppp_libnm_ppp_plugin_la_DEPENDENCIES =  \
 @WITH_PPP_TRUE@	$(am__DEPENDENCIES_1)
 am__src_ppp_libnm_ppp_plugin_la_SOURCES_DIST =  \
@@ -1820,7 +1877,7 @@ am__clients_cli_nmcli_SOURCES_DIST = clients/cli/common.c \
 	clients/cli/polkit-agent.c clients/cli/polkit-agent.h \
 	clients/common/nm-polkit-listener.c \
 	clients/common/nm-polkit-listener.h
-@BUILD_NMCLI_TRUE@@WITH_POLKIT_AGENT_TRUE@am__objects_24 = clients/common/cli_nmcli-nm-polkit-listener.$(OBJEXT)
+@BUILD_NMCLI_TRUE@@WITH_POLKIT_AGENT_TRUE@am__objects_26 = clients/common/cli_nmcli-nm-polkit-listener.$(OBJEXT)
 @BUILD_NMCLI_TRUE@am_clients_cli_nmcli_OBJECTS =  \
 @BUILD_NMCLI_TRUE@	clients/cli/nmcli-common.$(OBJEXT) \
 @BUILD_NMCLI_TRUE@	clients/cli/nmcli-utils.$(OBJEXT) \
@@ -1831,7 +1888,7 @@ am__clients_cli_nmcli_SOURCES_DIST = clients/cli/common.c \
 @BUILD_NMCLI_TRUE@	clients/cli/nmcli-settings.$(OBJEXT) \
 @BUILD_NMCLI_TRUE@	clients/cli/nmcli-nmcli.$(OBJEXT) \
 @BUILD_NMCLI_TRUE@	clients/cli/nmcli-polkit-agent.$(OBJEXT) \
-@BUILD_NMCLI_TRUE@	$(am__objects_24)
+@BUILD_NMCLI_TRUE@	$(am__objects_26)
 clients_cli_nmcli_OBJECTS = $(am_clients_cli_nmcli_OBJECTS)
 @BUILD_NMCLI_TRUE@@WITH_POLKIT_AGENT_TRUE@am__DEPENDENCIES_7 = $(am__DEPENDENCIES_1)
 @BUILD_NMCLI_TRUE@clients_cli_nmcli_DEPENDENCIES = libnm/libnm.la \
@@ -1961,8 +2018,8 @@ clients_tui_nmtui_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 	-o $@
 am_dispatcher_nm_dispatcher_OBJECTS =  \
 	dispatcher/nm_dispatcher-nm-dispatcher.$(OBJEXT)
-am__objects_25 = dispatcher/nm_dispatcher-nmdbus-dispatcher.$(OBJEXT)
-nodist_dispatcher_nm_dispatcher_OBJECTS = $(am__objects_25)
+am__objects_27 = dispatcher/nm_dispatcher-nmdbus-dispatcher.$(OBJEXT)
+nodist_dispatcher_nm_dispatcher_OBJECTS = $(am__objects_27)
 dispatcher_nm_dispatcher_OBJECTS =  \
 	$(am_dispatcher_nm_dispatcher_OBJECTS) \
 	$(nodist_dispatcher_nm_dispatcher_OBJECTS)
@@ -2055,8 +2112,11 @@ libnm_core_tests_test_compare_SOURCES =  \
 	libnm-core/tests/test-compare.c
 libnm_core_tests_test_compare_OBJECTS =  \
 	libnm-core/tests/test_compare-test-compare.$(OBJEXT)
-am__DEPENDENCIES_8 = libnm-core/libnm-core.la shared/libcsiphash.la \
-	$(libnm_crypto_lib) $(am__DEPENDENCIES_1)
+am__DEPENDENCIES_8 = libnm-core/libnm-core.la \
+	shared/systemd/libnm-systemd-shared.la \
+	shared/systemd/libnm-systemd-logging-stub.la \
+	shared/nm-utils/libnm-utils-base.la $(libnm_crypto_lib) \
+	$(am__DEPENDENCIES_1)
 libnm_core_tests_test_compare_DEPENDENCIES = $(am__DEPENDENCIES_8)
 libnm_core_tests_test_compare_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
@@ -2225,7 +2285,10 @@ am_libnm_tests_test_general_OBJECTS =  \
 	libnm/tests/libnm_tests_test_general-test-general.$(OBJEXT)
 libnm_tests_test_general_OBJECTS =  \
 	$(am_libnm_tests_test_general_OBJECTS)
-am__DEPENDENCIES_10 = libnm/libnm.la $(am__DEPENDENCIES_1)
+am__DEPENDENCIES_10 = libnm/libnm.la \
+	shared/systemd/libnm-systemd-shared.la \
+	shared/systemd/libnm-systemd-logging-stub.la \
+	$(am__DEPENDENCIES_1)
 libnm_tests_test_general_DEPENDENCIES = libnm/libnm-utils.la \
 	$(am__DEPENDENCIES_10)
 libnm_tests_test_general_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
@@ -2261,6 +2324,11 @@ libnm_tests_test_secret_agent_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
 	$(AM_CFLAGS) $(CFLAGS) \
 	$(libnm_tests_test_secret_agent_LDFLAGS) $(LDFLAGS) -o $@
+shared_nm_utils_tests_test_shared_general_SOURCES =  \
+	shared/nm-utils/tests/test-shared-general.c
+shared_nm_utils_tests_test_shared_general_OBJECTS = shared/nm-utils/tests/test_shared_general-test-shared-general.$(OBJEXT)
+shared_nm_utils_tests_test_shared_general_DEPENDENCIES =  \
+	shared/nm-utils/libnm-utils-base.la $(am__DEPENDENCIES_1)
 am_src_NetworkManager_OBJECTS = src/NetworkManager-main.$(OBJEXT)
 src_NetworkManager_OBJECTS = $(am_src_NetworkManager_OBJECTS)
 src_NetworkManager_DEPENDENCIES = src/libNetworkManager.la
@@ -2346,7 +2414,9 @@ src_initrd_nm_initrd_generator_OBJECTS =  \
 	$(am_src_initrd_nm_initrd_generator_OBJECTS)
 src_initrd_nm_initrd_generator_DEPENDENCIES =  \
 	libnm-core/libnm-core.la src/initrd/libnmi-core.la \
-	src/libNetworkManagerBase.la $(am__DEPENDENCIES_1)
+	src/libNetworkManagerBase.la \
+	shared/systemd/libnm-systemd-shared.la \
+	shared/nm-utils/libnm-utils-base.la $(am__DEPENDENCIES_1)
 src_initrd_nm_initrd_generator_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
 	$(AM_CFLAGS) $(CFLAGS) \
@@ -2356,7 +2426,8 @@ src_initrd_tests_test_cmdline_reader_SOURCES =  \
 src_initrd_tests_test_cmdline_reader_OBJECTS = src/initrd/tests/test_cmdline_reader-test-cmdline-reader.$(OBJEXT)
 src_initrd_tests_test_cmdline_reader_DEPENDENCIES =  \
 	libnm-core/libnm-core.la src/initrd/libnmi-core.la \
-	src/libNetworkManagerTest.la $(am__DEPENDENCIES_1)
+	src/libNetworkManagerTest.la \
+	shared/nm-utils/libnm-utils-base.la $(am__DEPENDENCIES_1)
 src_initrd_tests_test_cmdline_reader_LINK = $(LIBTOOL) $(AM_V_lt) \
 	--tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link \
 	$(CCLD) $(AM_CFLAGS) $(CFLAGS) \
@@ -2368,7 +2439,8 @@ src_initrd_tests_test_ibft_reader_OBJECTS =  \
 	src/initrd/tests/test_ibft_reader-test-ibft-reader.$(OBJEXT)
 src_initrd_tests_test_ibft_reader_DEPENDENCIES =  \
 	libnm-core/libnm-core.la src/initrd/libnmi-core.la \
-	src/libNetworkManagerTest.la $(am__DEPENDENCIES_1)
+	src/libNetworkManagerTest.la \
+	shared/nm-utils/libnm-utils-base.la $(am__DEPENDENCIES_1)
 src_initrd_tests_test_ibft_reader_LINK = $(LIBTOOL) $(AM_V_lt) \
 	--tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link \
 	$(CCLD) $(AM_CFLAGS) $(CFLAGS) \
@@ -2398,7 +2470,8 @@ am_src_nm_iface_helper_OBJECTS =  \
 	src/nm_iface_helper-nm-iface-helper.$(OBJEXT)
 src_nm_iface_helper_OBJECTS = $(am_src_nm_iface_helper_OBJECTS)
 src_nm_iface_helper_DEPENDENCIES = src/libNetworkManagerBase.la \
-	src/libsystemd-nm.la $(am__DEPENDENCIES_1) \
+	src/libnm-systemd-core.la \
+	shared/systemd/libnm-systemd-shared.la $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1)
 src_nm_iface_helper_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
@@ -2545,7 +2618,8 @@ src_settings_plugins_ifupdown_tests_test_ifupdown_SOURCES =  \
 	src/settings/plugins/ifupdown/tests/test-ifupdown.c
 src_settings_plugins_ifupdown_tests_test_ifupdown_OBJECTS = src/settings/plugins/ifupdown/tests/test_ifupdown-test-ifupdown.$(OBJEXT)
 @CONFIG_PLUGIN_IFUPDOWN_TRUE@src_settings_plugins_ifupdown_tests_test_ifupdown_DEPENDENCIES = src/settings/plugins/ifupdown/libnms-ifupdown-core.la \
-@CONFIG_PLUGIN_IFUPDOWN_TRUE@	src/libNetworkManagerTest.la
+@CONFIG_PLUGIN_IFUPDOWN_TRUE@	src/libNetworkManagerTest.la \
+@CONFIG_PLUGIN_IFUPDOWN_TRUE@	$(am__DEPENDENCIES_1)
 src_settings_plugins_ifupdown_tests_test_ifupdown_LINK = $(LIBTOOL) \
 	$(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
 	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
@@ -2621,11 +2695,12 @@ src_tests_test_ip6_config_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
 	$(AM_CFLAGS) $(CFLAGS) $(src_tests_test_ip6_config_LDFLAGS) \
 	$(LDFLAGS) -o $@
-am_src_tests_test_systemd_OBJECTS =  \
+src_tests_test_systemd_SOURCES = src/tests/test-systemd.c
+src_tests_test_systemd_OBJECTS =  \
 	src/tests/test_systemd-test-systemd.$(OBJEXT)
-src_tests_test_systemd_OBJECTS = $(am_src_tests_test_systemd_OBJECTS)
-src_tests_test_systemd_DEPENDENCIES = src/libsystemd-nm.la \
-	shared/libcsiphash.la $(am__DEPENDENCIES_6)
+src_tests_test_systemd_DEPENDENCIES = src/libnm-systemd-core.la \
+	shared/systemd/libnm-systemd-shared.la shared/libcsiphash.la \
+	$(am__DEPENDENCIES_6)
 src_tests_test_utils_SOURCES = src/tests/test-utils.c
 src_tests_test_utils_OBJECTS =  \
 	src/tests/test_utils-test-utils.$(OBJEXT)
@@ -2784,6 +2859,7 @@ am__depfiles_remade = clients/$(DEPDIR)/nm_online-nm-online.Po \
 	introspection/$(DEPDIR)/libnmdbus_la-org.freedesktop.NetworkManager.Device.Vlan.Plo \
 	introspection/$(DEPDIR)/libnmdbus_la-org.freedesktop.NetworkManager.Device.Vxlan.Plo \
 	introspection/$(DEPDIR)/libnmdbus_la-org.freedesktop.NetworkManager.Device.WiMax.Plo \
+	introspection/$(DEPDIR)/libnmdbus_la-org.freedesktop.NetworkManager.Device.WifiP2P.Plo \
 	introspection/$(DEPDIR)/libnmdbus_la-org.freedesktop.NetworkManager.Device.WireGuard.Plo \
 	introspection/$(DEPDIR)/libnmdbus_la-org.freedesktop.NetworkManager.Device.Wired.Plo \
 	introspection/$(DEPDIR)/libnmdbus_la-org.freedesktop.NetworkManager.Device.Wireless.Plo \
@@ -2798,6 +2874,7 @@ am__depfiles_remade = clients/$(DEPDIR)/nm_online-nm-online.Po \
 	introspection/$(DEPDIR)/libnmdbus_la-org.freedesktop.NetworkManager.Settings.Plo \
 	introspection/$(DEPDIR)/libnmdbus_la-org.freedesktop.NetworkManager.VPN.Connection.Plo \
 	introspection/$(DEPDIR)/libnmdbus_la-org.freedesktop.NetworkManager.VPN.Plugin.Plo \
+	introspection/$(DEPDIR)/libnmdbus_la-org.freedesktop.NetworkManager.WifiP2PPeer.Plo \
 	libnm-core/$(DEPDIR)/libnm_core_la-nm-connection.Plo \
 	libnm-core/$(DEPDIR)/libnm_core_la-nm-core-enum-types.Plo \
 	libnm-core/$(DEPDIR)/libnm_core_la-nm-crypto.Plo \
@@ -2847,8 +2924,10 @@ am__depfiles_remade = clients/$(DEPDIR)/nm_online-nm-online.Po \
 	libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-vlan.Plo \
 	libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-vpn.Plo \
 	libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-vxlan.Plo \
+	libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-wifi-p2p.Plo \
 	libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-wimax.Plo \
 	libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-wired.Plo \
+	libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-wireguard.Plo \
 	libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-wireless-security.Plo \
 	libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-wireless.Plo \
 	libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-wpan.Plo \
@@ -2978,6 +3057,7 @@ am__depfiles_remade = clients/$(DEPDIR)/nm_online-nm-online.Po \
 	libnm/$(DEPDIR)/libnm_la-nm-device-tun.Plo \
 	libnm/$(DEPDIR)/libnm_la-nm-device-vlan.Plo \
 	libnm/$(DEPDIR)/libnm_la-nm-device-vxlan.Plo \
+	libnm/$(DEPDIR)/libnm_la-nm-device-wifi-p2p.Plo \
 	libnm/$(DEPDIR)/libnm_la-nm-device-wifi.Plo \
 	libnm/$(DEPDIR)/libnm_la-nm-device-wimax.Plo \
 	libnm/$(DEPDIR)/libnm_la-nm-device-wireguard.Plo \
@@ -3000,6 +3080,7 @@ am__depfiles_remade = clients/$(DEPDIR)/nm_online-nm-online.Po \
 	libnm/$(DEPDIR)/libnm_la-nm-vpn-editor.Plo \
 	libnm/$(DEPDIR)/libnm_la-nm-vpn-plugin-old.Plo \
 	libnm/$(DEPDIR)/libnm_la-nm-vpn-service-plugin.Plo \
+	libnm/$(DEPDIR)/libnm_la-nm-wifi-p2p-peer.Plo \
 	libnm/$(DEPDIR)/libnm_la-nm-wimax-nsp.Plo \
 	libnm/$(DEPDIR)/libnm_utils_la-nm-libnm-utils.Plo \
 	libnm/fake-typelib/$(DEPDIR)/libnm_utils_la-typelibs.Plo \
@@ -3016,25 +3097,59 @@ am__depfiles_remade = clients/$(DEPDIR)/nm_online-nm-online.Po \
 	shared/$(DEPDIR)/libnm_tests_test_nm_client-nm-test-utils-impl.Po \
 	shared/$(DEPDIR)/libnm_tests_test_remote_settings_client-nm-test-utils-impl.Po \
 	shared/$(DEPDIR)/libnm_tests_test_secret_agent-nm-test-utils-impl.Po \
+	shared/c-rbtree/src/$(DEPDIR)/libcrbtree_la-c-rbtree.Plo \
 	shared/c-siphash/src/$(DEPDIR)/libcsiphash_la-c-siphash.Plo \
+	shared/n-acd/src/$(DEPDIR)/libnacd_la-n-acd-bpf-fallback.Plo \
+	shared/n-acd/src/$(DEPDIR)/libnacd_la-n-acd-bpf.Plo \
+	shared/n-acd/src/$(DEPDIR)/libnacd_la-n-acd-probe.Plo \
 	shared/n-acd/src/$(DEPDIR)/libnacd_la-n-acd.Plo \
-	shared/nm-utils/$(DEPDIR)/clients_common_libnmc_base_la-nm-enum-utils.Plo \
-	shared/nm-utils/$(DEPDIR)/clients_common_libnmc_base_la-nm-hash-utils.Plo \
-	shared/nm-utils/$(DEPDIR)/clients_common_libnmc_base_la-nm-random-utils.Plo \
-	shared/nm-utils/$(DEPDIR)/clients_common_libnmc_base_la-nm-shared-utils.Plo \
-	shared/nm-utils/$(DEPDIR)/libnm_core_libnm_core_la-c-list-util.Plo \
-	shared/nm-utils/$(DEPDIR)/libnm_core_libnm_core_la-nm-dedup-multi.Plo \
-	shared/nm-utils/$(DEPDIR)/libnm_core_libnm_core_la-nm-enum-utils.Plo \
-	shared/nm-utils/$(DEPDIR)/libnm_core_libnm_core_la-nm-hash-utils.Plo \
-	shared/nm-utils/$(DEPDIR)/libnm_core_libnm_core_la-nm-io-utils.Plo \
-	shared/nm-utils/$(DEPDIR)/libnm_core_libnm_core_la-nm-random-utils.Plo \
-	shared/nm-utils/$(DEPDIR)/libnm_core_libnm_core_la-nm-secret-utils.Plo \
-	shared/nm-utils/$(DEPDIR)/libnm_core_libnm_core_la-nm-shared-utils.Plo \
-	shared/nm-utils/$(DEPDIR)/libnm_core_libnm_core_la-nm-udev-utils.Plo \
-	shared/nm-utils/$(DEPDIR)/libnm_glib_libnm_glib_la-nm-udev-utils.Plo \
+	shared/n-acd/src/util/$(DEPDIR)/libnacd_la-timer.Plo \
 	shared/nm-utils/$(DEPDIR)/libnm_tests_libnm_vpn_plugin_utils_test_la-nm-vpn-plugin-utils.Plo \
 	shared/nm-utils/$(DEPDIR)/libnm_tests_test_general-nm-compat.Po \
-	shared/nm-utils/$(DEPDIR)/libnm_util_libnm_util_la-nm-shared-utils.Plo \
+	shared/nm-utils/$(DEPDIR)/libnm_utils_base_la-c-list-util.Plo \
+	shared/nm-utils/$(DEPDIR)/libnm_utils_base_la-nm-dedup-multi.Plo \
+	shared/nm-utils/$(DEPDIR)/libnm_utils_base_la-nm-enum-utils.Plo \
+	shared/nm-utils/$(DEPDIR)/libnm_utils_base_la-nm-errno.Plo \
+	shared/nm-utils/$(DEPDIR)/libnm_utils_base_la-nm-hash-utils.Plo \
+	shared/nm-utils/$(DEPDIR)/libnm_utils_base_la-nm-io-utils.Plo \
+	shared/nm-utils/$(DEPDIR)/libnm_utils_base_la-nm-random-utils.Plo \
+	shared/nm-utils/$(DEPDIR)/libnm_utils_base_la-nm-secret-utils.Plo \
+	shared/nm-utils/$(DEPDIR)/libnm_utils_base_la-nm-shared-utils.Plo \
+	shared/nm-utils/$(DEPDIR)/libnm_utils_base_la-nm-time-utils.Plo \
+	shared/nm-utils/$(DEPDIR)/libnm_utils_udev_la-nm-udev-utils.Plo \
+	shared/nm-utils/tests/$(DEPDIR)/test_shared_general-test-shared-general.Po \
+	shared/systemd/$(DEPDIR)/libnm_systemd_logging_stub_la-nm-logging-stub.Plo \
+	shared/systemd/$(DEPDIR)/libnm_systemd_shared_la-nm-sd-utils-shared.Plo \
+	shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-alloc-util.Plo \
+	shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-env-file.Plo \
+	shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-env-util.Plo \
+	shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-escape.Plo \
+	shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-ether-addr-util.Plo \
+	shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-extract-word.Plo \
+	shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-fd-util.Plo \
+	shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-fileio.Plo \
+	shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-fs-util.Plo \
+	shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-hash-funcs.Plo \
+	shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-hashmap.Plo \
+	shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-hexdecoct.Plo \
+	shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-hostname-util.Plo \
+	shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-in-addr-util.Plo \
+	shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-io-util.Plo \
+	shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-mempool.Plo \
+	shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-parse-util.Plo \
+	shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-path-util.Plo \
+	shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-prioq.Plo \
+	shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-process-util.Plo \
+	shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-random-util.Plo \
+	shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-socket-util.Plo \
+	shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-stat-util.Plo \
+	shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-string-table.Plo \
+	shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-string-util.Plo \
+	shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-strv.Plo \
+	shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-time-util.Plo \
+	shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-tmpfile-util.Plo \
+	shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-utf8.Plo \
+	shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-util.Plo \
 	src/$(DEPDIR)/NetworkManager-main.Po \
 	src/$(DEPDIR)/libNetworkManagerBase_la-NetworkManagerUtils.Plo \
 	src/$(DEPDIR)/libNetworkManagerBase_la-main-utils.Plo \
@@ -3062,6 +3177,7 @@ am__depfiles_remade = clients/$(DEPDIR)/nm_online-nm-online.Po \
 	src/$(DEPDIR)/libNetworkManager_la-nm-dispatcher.Plo \
 	src/$(DEPDIR)/libNetworkManager_la-nm-firewall-manager.Plo \
 	src/$(DEPDIR)/libNetworkManager_la-nm-hostname-manager.Plo \
+	src/$(DEPDIR)/libNetworkManager_la-nm-keep-alive.Plo \
 	src/$(DEPDIR)/libNetworkManager_la-nm-manager.Plo \
 	src/$(DEPDIR)/libNetworkManager_la-nm-netns.Plo \
 	src/$(DEPDIR)/libNetworkManager_la-nm-pacrunner-manager.Plo \
@@ -3114,11 +3230,13 @@ am__depfiles_remade = clients/$(DEPDIR)/nm_online-nm-online.Po \
 	src/devices/tests/$(DEPDIR)/test_lldp-test-lldp.Po \
 	src/devices/wifi/$(DEPDIR)/libnm_device_plugin_wifi_la-nm-device-iwd.Plo \
 	src/devices/wifi/$(DEPDIR)/libnm_device_plugin_wifi_la-nm-device-olpc-mesh.Plo \
+	src/devices/wifi/$(DEPDIR)/libnm_device_plugin_wifi_la-nm-device-wifi-p2p.Plo \
 	src/devices/wifi/$(DEPDIR)/libnm_device_plugin_wifi_la-nm-device-wifi.Plo \
 	src/devices/wifi/$(DEPDIR)/libnm_device_plugin_wifi_la-nm-iwd-manager.Plo \
 	src/devices/wifi/$(DEPDIR)/libnm_device_plugin_wifi_la-nm-wifi-ap.Plo \
 	src/devices/wifi/$(DEPDIR)/libnm_device_plugin_wifi_la-nm-wifi-common.Plo \
 	src/devices/wifi/$(DEPDIR)/libnm_device_plugin_wifi_la-nm-wifi-factory.Plo \
+	src/devices/wifi/$(DEPDIR)/libnm_device_plugin_wifi_la-nm-wifi-p2p-peer.Plo \
 	src/devices/wifi/$(DEPDIR)/libnm_device_plugin_wifi_la-nm-wifi-utils.Plo \
 	src/devices/wifi/$(DEPDIR)/src_devices_wifi_tests_test_general-nm-wifi-ap.Po \
 	src/devices/wifi/$(DEPDIR)/src_devices_wifi_tests_test_general-nm-wifi-utils.Po \
@@ -3219,58 +3337,31 @@ am__depfiles_remade = clients/$(DEPDIR)/nm_online-nm-online.Po \
 	src/supplicant/$(DEPDIR)/libNetworkManager_la-nm-supplicant-manager.Plo \
 	src/supplicant/$(DEPDIR)/libNetworkManager_la-nm-supplicant-settings-verify.Plo \
 	src/supplicant/tests/$(DEPDIR)/test_supplicant_config-test-supplicant-config.Po \
-	src/systemd/$(DEPDIR)/libsystemd_nm_la-nm-sd-utils.Plo \
-	src/systemd/$(DEPDIR)/libsystemd_nm_la-nm-sd.Plo \
-	src/systemd/sd-adapt/$(DEPDIR)/libsystemd_nm_la-nm-sd-adapt.Plo \
-	src/systemd/src/basic/$(DEPDIR)/libsystemd_nm_la-alloc-util.Plo \
-	src/systemd/src/basic/$(DEPDIR)/libsystemd_nm_la-env-util.Plo \
-	src/systemd/src/basic/$(DEPDIR)/libsystemd_nm_la-escape.Plo \
-	src/systemd/src/basic/$(DEPDIR)/libsystemd_nm_la-ether-addr-util.Plo \
-	src/systemd/src/basic/$(DEPDIR)/libsystemd_nm_la-extract-word.Plo \
-	src/systemd/src/basic/$(DEPDIR)/libsystemd_nm_la-fd-util.Plo \
-	src/systemd/src/basic/$(DEPDIR)/libsystemd_nm_la-fileio.Plo \
-	src/systemd/src/basic/$(DEPDIR)/libsystemd_nm_la-fs-util.Plo \
-	src/systemd/src/basic/$(DEPDIR)/libsystemd_nm_la-hash-funcs.Plo \
-	src/systemd/src/basic/$(DEPDIR)/libsystemd_nm_la-hashmap.Plo \
-	src/systemd/src/basic/$(DEPDIR)/libsystemd_nm_la-hexdecoct.Plo \
-	src/systemd/src/basic/$(DEPDIR)/libsystemd_nm_la-hostname-util.Plo \
-	src/systemd/src/basic/$(DEPDIR)/libsystemd_nm_la-in-addr-util.Plo \
-	src/systemd/src/basic/$(DEPDIR)/libsystemd_nm_la-io-util.Plo \
-	src/systemd/src/basic/$(DEPDIR)/libsystemd_nm_la-mempool.Plo \
-	src/systemd/src/basic/$(DEPDIR)/libsystemd_nm_la-parse-util.Plo \
-	src/systemd/src/basic/$(DEPDIR)/libsystemd_nm_la-path-util.Plo \
-	src/systemd/src/basic/$(DEPDIR)/libsystemd_nm_la-prioq.Plo \
-	src/systemd/src/basic/$(DEPDIR)/libsystemd_nm_la-process-util.Plo \
-	src/systemd/src/basic/$(DEPDIR)/libsystemd_nm_la-random-util.Plo \
-	src/systemd/src/basic/$(DEPDIR)/libsystemd_nm_la-socket-util.Plo \
-	src/systemd/src/basic/$(DEPDIR)/libsystemd_nm_la-stat-util.Plo \
-	src/systemd/src/basic/$(DEPDIR)/libsystemd_nm_la-string-table.Plo \
-	src/systemd/src/basic/$(DEPDIR)/libsystemd_nm_la-string-util.Plo \
-	src/systemd/src/basic/$(DEPDIR)/libsystemd_nm_la-strv.Plo \
-	src/systemd/src/basic/$(DEPDIR)/libsystemd_nm_la-time-util.Plo \
-	src/systemd/src/basic/$(DEPDIR)/libsystemd_nm_la-utf8.Plo \
-	src/systemd/src/basic/$(DEPDIR)/libsystemd_nm_la-util.Plo \
-	src/systemd/src/libsystemd-network/$(DEPDIR)/libsystemd_nm_la-arp-util.Plo \
-	src/systemd/src/libsystemd-network/$(DEPDIR)/libsystemd_nm_la-dhcp-identifier.Plo \
-	src/systemd/src/libsystemd-network/$(DEPDIR)/libsystemd_nm_la-dhcp-network.Plo \
-	src/systemd/src/libsystemd-network/$(DEPDIR)/libsystemd_nm_la-dhcp-option.Plo \
-	src/systemd/src/libsystemd-network/$(DEPDIR)/libsystemd_nm_la-dhcp-packet.Plo \
-	src/systemd/src/libsystemd-network/$(DEPDIR)/libsystemd_nm_la-dhcp6-network.Plo \
-	src/systemd/src/libsystemd-network/$(DEPDIR)/libsystemd_nm_la-dhcp6-option.Plo \
-	src/systemd/src/libsystemd-network/$(DEPDIR)/libsystemd_nm_la-lldp-neighbor.Plo \
-	src/systemd/src/libsystemd-network/$(DEPDIR)/libsystemd_nm_la-lldp-network.Plo \
-	src/systemd/src/libsystemd-network/$(DEPDIR)/libsystemd_nm_la-network-internal.Plo \
-	src/systemd/src/libsystemd-network/$(DEPDIR)/libsystemd_nm_la-sd-dhcp-client.Plo \
-	src/systemd/src/libsystemd-network/$(DEPDIR)/libsystemd_nm_la-sd-dhcp-lease.Plo \
-	src/systemd/src/libsystemd-network/$(DEPDIR)/libsystemd_nm_la-sd-dhcp6-client.Plo \
-	src/systemd/src/libsystemd-network/$(DEPDIR)/libsystemd_nm_la-sd-dhcp6-lease.Plo \
-	src/systemd/src/libsystemd-network/$(DEPDIR)/libsystemd_nm_la-sd-ipv4acd.Plo \
-	src/systemd/src/libsystemd-network/$(DEPDIR)/libsystemd_nm_la-sd-ipv4ll.Plo \
-	src/systemd/src/libsystemd-network/$(DEPDIR)/libsystemd_nm_la-sd-lldp.Plo \
-	src/systemd/src/libsystemd/sd-event/$(DEPDIR)/libsystemd_nm_la-sd-event.Plo \
-	src/systemd/src/libsystemd/sd-id128/$(DEPDIR)/libsystemd_nm_la-id128-util.Plo \
-	src/systemd/src/libsystemd/sd-id128/$(DEPDIR)/libsystemd_nm_la-sd-id128.Plo \
-	src/systemd/src/shared/$(DEPDIR)/libsystemd_nm_la-dns-domain.Plo \
+	src/systemd/$(DEPDIR)/libnm_systemd_core_la-nm-sd-utils-core.Plo \
+	src/systemd/$(DEPDIR)/libnm_systemd_core_la-nm-sd.Plo \
+	src/systemd/sd-adapt-core/$(DEPDIR)/libnm_systemd_core_la-nm-sd-adapt-core.Plo \
+	src/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-arp-util.Plo \
+	src/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-dhcp-identifier.Plo \
+	src/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-dhcp-network.Plo \
+	src/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-dhcp-option.Plo \
+	src/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-dhcp-packet.Plo \
+	src/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-dhcp6-network.Plo \
+	src/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-dhcp6-option.Plo \
+	src/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-lldp-neighbor.Plo \
+	src/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-lldp-network.Plo \
+	src/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-network-internal.Plo \
+	src/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-sd-dhcp-client.Plo \
+	src/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-sd-dhcp-lease.Plo \
+	src/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-sd-dhcp6-client.Plo \
+	src/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-sd-dhcp6-lease.Plo \
+	src/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-sd-ipv4acd.Plo \
+	src/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-sd-ipv4ll.Plo \
+	src/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-sd-lldp.Plo \
+	src/systemd/src/libsystemd/sd-event/$(DEPDIR)/libnm_systemd_core_la-event-util.Plo \
+	src/systemd/src/libsystemd/sd-event/$(DEPDIR)/libnm_systemd_core_la-sd-event.Plo \
+	src/systemd/src/libsystemd/sd-id128/$(DEPDIR)/libnm_systemd_core_la-id128-util.Plo \
+	src/systemd/src/libsystemd/sd-id128/$(DEPDIR)/libnm_systemd_core_la-sd-id128.Plo \
+	src/systemd/src/shared/$(DEPDIR)/libnm_systemd_core_la-dns-domain.Plo \
 	src/tests/$(DEPDIR)/src_tests_test_general-test-general.Po \
 	src/tests/$(DEPDIR)/test_dcb-test-dcb.Po \
 	src/tests/$(DEPDIR)/test_general_with_expect-test-general-with-expect.Po \
@@ -3341,7 +3432,12 @@ SOURCES = $(clients_tui_newt_libnmt_newt_a_SOURCES) \
 	$(nodist_libnm_libnm_utils_la_SOURCES) \
 	$(libnm_libnm_la_SOURCES) $(nodist_libnm_libnm_la_SOURCES) \
 	$(libnm_tests_libnm_vpn_plugin_utils_test_la_SOURCES) \
+	$(shared_libcrbtree_la_SOURCES) \
 	$(shared_libcsiphash_la_SOURCES) $(shared_libnacd_la_SOURCES) \
+	$(shared_nm_utils_libnm_utils_base_la_SOURCES) \
+	$(shared_nm_utils_libnm_utils_udev_la_SOURCES) \
+	$(shared_systemd_libnm_systemd_logging_stub_la_SOURCES) \
+	$(shared_systemd_libnm_systemd_shared_la_SOURCES) \
 	$(src_devices_adsl_libnm_device_plugin_adsl_la_SOURCES) \
 	$(src_devices_bluetooth_libnm_device_plugin_bluetooth_la_SOURCES) \
 	$(src_devices_ovs_libnm_device_plugin_ovs_la_SOURCES) \
@@ -3353,7 +3449,7 @@ SOURCES = $(clients_tui_newt_libnmt_newt_a_SOURCES) \
 	$(src_libNetworkManager_la_SOURCES) \
 	$(src_libNetworkManagerBase_la_SOURCES) \
 	$(src_libNetworkManagerTest_la_SOURCES) \
-	$(src_libsystemd_nm_la_SOURCES) \
+	$(src_libnm_systemd_core_la_SOURCES) \
 	$(src_ppp_libnm_ppp_plugin_la_SOURCES) \
 	$(src_ppp_nm_pppd_plugin_la_SOURCES) \
 	$(src_settings_plugins_ibft_libnm_settings_plugin_ibft_la_SOURCES) \
@@ -3401,6 +3497,7 @@ SOURCES = $(clients_tui_newt_libnmt_newt_a_SOURCES) \
 	$(libnm_tests_test_nm_client_SOURCES) \
 	$(libnm_tests_test_remote_settings_client_SOURCES) \
 	$(libnm_tests_test_secret_agent_SOURCES) \
+	shared/nm-utils/tests/test-shared-general.c \
 	$(src_NetworkManager_SOURCES) src/devices/tests/test-acd.c \
 	src/devices/tests/test-lldp.c \
 	$(src_devices_wifi_tests_test_general_SOURCES) \
@@ -3432,7 +3529,7 @@ SOURCES = $(clients_tui_newt_libnmt_newt_a_SOURCES) \
 	$(src_tests_config_test_config_SOURCES) src/tests/test-dcb.c \
 	src/tests/test-general.c src/tests/test-general-with-expect.c \
 	src/tests/test-ip4-config.c src/tests/test-ip6-config.c \
-	$(src_tests_test_systemd_SOURCES) src/tests/test-utils.c \
+	src/tests/test-systemd.c src/tests/test-utils.c \
 	src/tests/test-wired-defname.c
 DIST_SOURCES = $(am__clients_tui_newt_libnmt_newt_a_SOURCES_DIST) \
 	$(clients_common_libnmc_base_la_SOURCES) \
@@ -3448,7 +3545,13 @@ DIST_SOURCES = $(am__clients_tui_newt_libnmt_newt_a_SOURCES_DIST) \
 	$(am__libnm_util_libtest_crypto_la_SOURCES_DIST) \
 	$(libnm_libnm_utils_la_SOURCES) $(libnm_libnm_la_SOURCES) \
 	$(libnm_tests_libnm_vpn_plugin_utils_test_la_SOURCES) \
-	$(shared_libcsiphash_la_SOURCES) $(shared_libnacd_la_SOURCES) \
+	$(shared_libcrbtree_la_SOURCES) \
+	$(shared_libcsiphash_la_SOURCES) \
+	$(am__shared_libnacd_la_SOURCES_DIST) \
+	$(shared_nm_utils_libnm_utils_base_la_SOURCES) \
+	$(shared_nm_utils_libnm_utils_udev_la_SOURCES) \
+	$(shared_systemd_libnm_systemd_logging_stub_la_SOURCES) \
+	$(shared_systemd_libnm_systemd_shared_la_SOURCES) \
 	$(src_devices_adsl_libnm_device_plugin_adsl_la_SOURCES) \
 	$(am__src_devices_bluetooth_libnm_device_plugin_bluetooth_la_SOURCES_DIST) \
 	$(am__src_devices_ovs_libnm_device_plugin_ovs_la_SOURCES_DIST) \
@@ -3460,7 +3563,7 @@ DIST_SOURCES = $(am__clients_tui_newt_libnmt_newt_a_SOURCES_DIST) \
 	$(src_libNetworkManager_la_SOURCES) \
 	$(am__src_libNetworkManagerBase_la_SOURCES_DIST) \
 	$(src_libNetworkManagerTest_la_SOURCES) \
-	$(src_libsystemd_nm_la_SOURCES) \
+	$(src_libnm_systemd_core_la_SOURCES) \
 	$(am__src_ppp_libnm_ppp_plugin_la_SOURCES_DIST) \
 	$(am__src_ppp_nm_pppd_plugin_la_SOURCES_DIST) \
 	$(am__src_settings_plugins_ibft_libnm_settings_plugin_ibft_la_SOURCES_DIST) \
@@ -3505,6 +3608,7 @@ DIST_SOURCES = $(am__clients_tui_newt_libnmt_newt_a_SOURCES_DIST) \
 	$(libnm_tests_test_nm_client_SOURCES) \
 	$(libnm_tests_test_remote_settings_client_SOURCES) \
 	$(libnm_tests_test_secret_agent_SOURCES) \
+	shared/nm-utils/tests/test-shared-general.c \
 	$(src_NetworkManager_SOURCES) src/devices/tests/test-acd.c \
 	src/devices/tests/test-lldp.c \
 	$(am__src_devices_wifi_tests_test_general_SOURCES_DIST) \
@@ -3536,7 +3640,7 @@ DIST_SOURCES = $(am__clients_tui_newt_libnmt_newt_a_SOURCES_DIST) \
 	$(src_tests_config_test_config_SOURCES) src/tests/test-dcb.c \
 	src/tests/test-general.c src/tests/test-general-with-expect.c \
 	src/tests/test-ip4-config.c src/tests/test-ip6-config.c \
-	$(src_tests_test_systemd_SOURCES) src/tests/test-utils.c \
+	src/tests/test-systemd.c src/tests/test-utils.c \
 	src/tests/test-wired-defname.c
 RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
 	ctags-recursive dvi-recursive html-recursive info-recursive \
@@ -3886,6 +3990,7 @@ distcleancheck_listfiles = find . -type f -print
 ACLOCAL = @ACLOCAL@
 ALL_LINGUAS = @ALL_LINGUAS@
 AMTAR = @AMTAR@
+AM_CFLAGS = @AM_CFLAGS@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AM_TESTS_FD_REDIRECT = @AM_TESTS_FD_REDIRECT@
 AR = @AR@
@@ -4192,48 +4297,54 @@ AUTOMAKE_OPTIONS = subdir-objects
 ###############################################################################
 
 ###############################################################################
-noinst_LTLIBRARIES = introspection/libnmdbus.la \
+
+###############################################################################
+
+###############################################################################
+noinst_LTLIBRARIES = shared/libcsiphash.la shared/libcrbtree.la \
+	shared/libnacd.la shared/nm-utils/libnm-utils-base.la \
+	shared/nm-utils/libnm-utils-udev.la introspection/libnmdbus.la \
 	libnm-core/libnm-core.la $(libnm_crypto_lib) \
 	libnm/libnm-utils.la src/libNetworkManagerBase.la \
-	src/libNetworkManager.la src/libsystemd-nm.la \
-	shared/libcsiphash.la shared/libnacd.la \
-	src/initrd/libnmi-core.la $(am__append_23) $(am__append_27) \
-	$(am__append_35) dispatcher/libnm-dispatcher-core.la \
-	$(am__append_89) $(am__append_110)
-check_LTLIBRARIES = $(am__append_112)
-noinst_LIBRARIES = $(am__append_63)
-noinst_DATA = $(am__append_14)
-dist_libexec_SCRIPTS = $(am__append_31)
+	src/libNetworkManager.la src/libnm-systemd-core.la $(NULL) \
+	shared/systemd/libnm-systemd-logging-stub.la \
+	shared/systemd/libnm-systemd-shared.la \
+	src/initrd/libnmi-core.la $(am__append_25) $(am__append_29) \
+	$(am__append_37) dispatcher/libnm-dispatcher-core.la \
+	$(am__append_90) $(am__append_111)
+check_LTLIBRARIES = $(am__append_113)
+noinst_LIBRARIES = $(am__append_65)
+noinst_DATA = $(am__append_16)
+dist_libexec_SCRIPTS = $(am__append_33)
 
 ###############################################################################
-lib_LTLIBRARIES = libnm/libnm.la $(am__append_68)
+lib_LTLIBRARIES = libnm/libnm.la $(am__append_69)
 plugin_LTLIBRARIES = $(core_plugins)
 
 ###############################################################################
 # src/devices/adsl
 ###############################################################################
-core_plugins = $(am__append_20) $(am__append_22) $(am__append_26) \
-	$(am__append_34) src/devices/adsl/libnm-device-plugin-adsl.la \
-	$(am__append_38) $(am__append_44) $(am__append_48) \
-	$(am__append_50)
-service_DATA = $(am__append_67)
-man_MANS = $(am__append_103)
+core_plugins = $(am__append_22) $(am__append_24) $(am__append_28) \
+	$(am__append_36) src/devices/adsl/libnm-device-plugin-adsl.la \
+	$(am__append_40) $(am__append_46) $(am__append_50) \
+	$(am__append_52)
+service_DATA = 
+man_MANS = $(am__append_104)
 examples_DATA = data/server.conf
 CLEANFILES = $(introspection_sources) $(DBUS_INTERFACE_DOCS) \
-	$(am__append_13) src/NetworkManager.ver $(am__append_28) \
+	$(am__append_15) src/NetworkManager.ver $(am__append_30) \
 	$(dispatcher_nmdbus_dispatcher_sources) \
 	dispatcher/org.freedesktop.nm_dispatcher.service \
 	clients/tests/test-client.log data/NetworkManager.service \
 	data/NetworkManager-wait-online.service \
-	data/NetworkManager-dispatcher.service \
-	data/org.freedesktop.NetworkManager.service data/server.conf \
-	$(am__append_90) $(am__append_94) man/common.ent \
-	$(am__append_104) $(am__append_108) $(GLIB_GENERATED) \
+	data/NetworkManager-dispatcher.service data/server.conf \
+	$(am__append_91) $(am__append_95) man/common.ent \
+	$(am__append_105) $(am__append_109) $(GLIB_GENERATED) \
 	$(INTROSPECTION_GIRS) $(typelib_DATA) cscope.in.out cscope.out \
-	cscope.po.out $(NULL) $(am__append_114)
+	cscope.po.out $(NULL) $(am__append_115)
 DISTCLEANFILES = config-extra.h intltool-extract intltool-merge \
 	intltool-update $(polkit_policy_DATA) libnm/libnm.pc \
-	$(am__append_51) $(am__append_83)
+	$(am__append_53) $(am__append_84)
 
 # test-cert.p12 created with:
 #
@@ -4282,13 +4393,12 @@ EXTRA_DIST = $(dbusinterfaces_DATA) introspection/meson.build \
 	libnm/fake-typelib/NetworkManager.gir \
 	libnm/fake-typelib/NMClient.gir \
 	libnm/fake-typelib/typelibs.gresource.xml \
-	libnm/fake-typelib/meson.build $(am__append_15) \
+	libnm/fake-typelib/meson.build $(am__append_17) \
 	libnm/generate-setting-docs.py libnm/generate-plugin-docs.pl \
 	libnm/nm-enum-types.c.template libnm/nm-enum-types.h.template \
 	libnm/meson.build libnm/tests/meson.build \
-	shared/c-list/src/c-list.h src/systemd/meson.build \
-	src/platform/linux/nl802154.h src/initrd/meson.build \
-	src/initrd/tests/meson.build \
+	src/systemd/meson.build src/platform/linux/nl802154.h \
+	src/initrd/meson.build src/initrd/tests/meson.build \
 	src/initrd/tests/sysfs/class/net/eth0/address \
 	src/initrd/tests/sysfs/class/net/eth2/address \
 	src/initrd/tests/sysfs/firmware/ibft/ethernet0/prefix-len \
@@ -4543,8 +4653,8 @@ EXTRA_DIST = $(dbusinterfaces_DATA) introspection/meson.build \
 	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Bridge_Component.cexpected \
 	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Permissions.cexpected \
 	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Proxy_Basic.cexpected \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Team_Port.cexpected \
 	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Team_Infiniband_Port.cexpected \
+	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Team_Port.cexpected \
 	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_VLAN_reorder_hdr.cexpected \
 	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_WiFi_Band_A.cexpected \
 	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_WiFi_Hidden.cexpected \
@@ -4638,6 +4748,7 @@ EXTRA_DIST = $(dbusinterfaces_DATA) introspection/meson.build \
 	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-open-ssid-long-hex \
 	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-open-ssid-long-quoted \
 	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-open-ssid-quoted \
+	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-sae \
 	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wep \
 	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wep-104-ascii \
 	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wep-40-ascii \
@@ -4655,8 +4766,8 @@ EXTRA_DIST = $(dbusinterfaces_DATA) introspection/meson.build \
 	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wpa-psk-unquoted \
 	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wpa-psk-unquoted2 \
 	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-802-1X-subj-matches \
-	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-802-1x-ttls-eapgtc \
 	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-802-1x-password-raw \
+	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-802-1x-ttls-eapgtc \
 	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-8021x-peap-mschapv2 \
 	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-8021x-tls-agent \
 	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-8021x-tls-always \
@@ -4703,6 +4814,7 @@ EXTRA_DIST = $(dbusinterfaces_DATA) introspection/meson.build \
 	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test_write_wired_auto_negotiate_on.cexpected \
 	src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-dynamic-wep-leap \
 	src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-leap \
+	src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-sae \
 	src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wep \
 	src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wep-104-ascii \
 	src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wep-40-ascii \
@@ -4769,6 +4881,7 @@ EXTRA_DIST = $(dbusinterfaces_DATA) introspection/meson.build \
 	src/supplicant/tests/certs/test-cert.p12 \
 	src/supplicant/tests/meson.build \
 	src/tests/config/NetworkManager.conf \
+	src/tests/config/NetworkManager-warn.conf \
 	src/tests/config/NetworkManager.state \
 	src/tests/config/bad.conf \
 	src/tests/config/global-dns-invalid.conf \
@@ -4790,6 +4903,10 @@ EXTRA_DIST = $(dbusinterfaces_DATA) introspection/meson.build \
 	dispatcher/tests/meson.build clients/meson.build \
 	$(clients_common_settings_doc_h) \
 	$(clients_common_settings_doc_h).in \
+	clients/common/tests/wg-test0.conf \
+	clients/common/tests/wg-test1.conf \
+	clients/common/tests/wg-test2.conf \
+	clients/common/tests/wg-test3.conf $(NULL) \
 	clients/cli/nmcli-completion clients/cli/meson.build \
 	clients/common/settings-docs.xsl clients/common/meson.build \
 	clients/common/tests/meson.build clients/tui/meson.build \
@@ -4802,11 +4919,10 @@ EXTRA_DIST = $(dbusinterfaces_DATA) introspection/meson.build \
 	data/NetworkManager-wait-online.service.in \
 	data/NetworkManager-wait-online-systemd-pre200.service.in \
 	data/NetworkManager-dispatcher.service.in \
-	data/org.freedesktop.NetworkManager.service.in \
 	data/84-nm-drivers.rules data/85-nm-unmanaged.rules \
 	data/90-nm-thunderbolt.rules data/server.conf.in \
-	data/meson.build $(am__append_76) libnm-glib/tests/meson.build \
-	$(am__append_96) $(am__append_99) man/common.ent.in \
+	data/meson.build $(am__append_77) libnm-glib/tests/meson.build \
+	$(am__append_97) $(am__append_100) man/common.ent.in \
 	$(man_nm_settings_xml) $(addsuffix .xsl,$(basename \
 	$(man_nm_settings_xml))) $(man_pages) $(addsuffix \
 	.xml,$(basename $(man_pages))) $(man_pages_autogen) \
@@ -4822,24 +4938,16 @@ EXTRA_DIST = $(dbusinterfaces_DATA) introspection/meson.build \
 	docs/meson.build po/meson.build shared/nm-common-macros.h \
 	shared/nm-dbus-compat.h shared/nm-default.h \
 	shared/nm-dispatcher-api.h shared/nm-test-libnm-utils.h \
-	shared/nm-test-utils-impl.c shared/nm-utils/c-list-util.c \
-	shared/nm-utils/c-list-util.h shared/nm-utils/nm-c-list.h \
-	shared/nm-utils/nm-compat.c shared/nm-utils/nm-compat.h \
-	shared/nm-utils/nm-glib.h shared/nm-utils/nm-io-utils.c \
-	shared/nm-utils/nm-io-utils.h shared/nm-utils/nm-jansson.h \
-	shared/nm-utils/nm-obj.h shared/nm-utils/nm-macros-internal.h \
-	shared/nm-utils/nm-secret-utils.c \
-	shared/nm-utils/nm-secret-utils.h \
-	shared/nm-utils/nm-shared-utils.c \
-	shared/nm-utils/nm-shared-utils.h \
+	shared/nm-test-utils-impl.c shared/nm-utils/nm-compat.c \
+	shared/nm-utils/nm-compat.h shared/nm-utils/nm-jansson.h \
 	shared/nm-utils/nm-test-utils.h \
 	shared/nm-utils/nm-vpn-editor-plugin-call.h \
 	shared/nm-utils/nm-vpn-plugin-macros.h \
 	shared/nm-utils/nm-vpn-plugin-utils.c \
 	shared/nm-utils/nm-vpn-plugin-utils.h \
-	shared/nm-utils/unaligned.h shared/nm-version-macros.h.in \
-	shared/meson.build tools/check-docs.sh tools/check-exports.sh \
-	tools/check-settings-docs.sh \
+	shared/nm-version-macros.h.in shared/meson.build \
+	tools/check-config-options.sh tools/check-docs.sh \
+	tools/check-exports.sh tools/check-settings-docs.sh \
 	tools/create-exports-NetworkManager.sh tools/debug-helper.py \
 	tools/meson-post-install.sh tools/run-nm-test.sh \
 	tools/test-networkmanager-service.py \
@@ -4887,6 +4995,7 @@ EXTRA_DIST = $(dbusinterfaces_DATA) introspection/meson.build \
 	examples/python/gi/get_ips.py \
 	examples/python/gi/list-connections.py \
 	examples/python/gi/nm-connection-update-stable-id.py \
+	examples/python/gi/nm-wg-set \
 	examples/python/gi/setting-user-data.py \
 	examples/python/gi/show-wifi-networks.py \
 	examples/python/gi/update-ip4-method.py \
@@ -4897,16 +5006,16 @@ EXTRA_DIST = $(dbusinterfaces_DATA) introspection/meson.build \
 	examples/shell/get-hostname.sh examples/shell/list-devices.sh \
 	examples/shell/disconnect-device.sh \
 	examples/shell/active-wifi.sh $(NULL)
-EXTRA_LTLIBRARIES = $(am__append_54)
+EXTRA_LTLIBRARIES = $(am__append_56)
 dist_hook = dist-hook-settings-ifcfg-rh-alias-files
 dist_dependencies = libnm-core/nm-vpn-dbus-types.xml \
-	libnm-core/nm-dbus-types.xml $(am__append_86) $(am__append_97) \
-	$(am__append_100) $(man_pages) $(man_pages_autogen)
+	libnm-core/nm-dbus-types.xml $(am__append_87) $(am__append_98) \
+	$(am__append_101) $(man_pages) $(man_pages_autogen)
 dist_configure_check = $(am__append_3) $(am__append_4)
-install_data_hook = $(am__append_32) install-data-hook-dispatcher \
-	$(am__append_61) $(am__append_101)
-install_exec_hook = $(am__append_65)
-uninstall_hook = $(am__append_62) $(am__append_66) $(am__append_102)
+install_data_hook = $(am__append_34) install-data-hook-dispatcher \
+	$(am__append_63) $(am__append_102)
+install_exec_hook = $(am__append_67)
+uninstall_hook = $(am__append_64) $(am__append_68) $(am__append_103)
 BUILT_SOURCES = libnm-core/nm-vpn-dbus-types.xml \
 	libnm-core/nm-dbus-types.xml $(gir_DATA) $(typelib_DATA)
 GLIB_GENERATED = $(libnm_core_lib_h_pub_mkenums) \
@@ -4914,12 +5023,14 @@ GLIB_GENERATED = $(libnm_core_lib_h_pub_mkenums) \
 	libnm-core/tests/nm-core-tests-enum-types.h \
 	libnm-core/tests/nm-core-tests-enum-types.c \
 	$(libnm_lib_h_pub_mkenums) $(libnm_lib_c_mkenums) \
-	$(am__append_69)
+	$(am__append_70)
 man_pages = man/NetworkManager.8 man/NetworkManager.conf.5 \
 	man/nm-online.1 man/nm-initrd-generator.8 man/nmcli-examples.7 \
-	man/nmcli.1 man/nmtui.1 $(am__append_95)
+	man/nmcli.1 man/nmtui.1 $(am__append_96)
 man_pages_autogen = man/nm-settings-keyfile.5 man/nm-settings.5 \
-	$(am__append_98)
+	$(am__append_99)
+
+###############################################################################
 
 ###############################################################################
 
@@ -4942,19 +5053,19 @@ man_pages_autogen = man/nm-settings-keyfile.5 man/nm-settings.5 \
 ###############################################################################
 # dispatcher/tests
 ###############################################################################
-check_programs = libnm-core/tests/test-compare \
-	libnm-core/tests/test-crypto libnm-core/tests/test-general \
-	libnm-core/tests/test-keyfile libnm-core/tests/test-secrets \
-	libnm-core/tests/test-setting \
+check_programs = shared/nm-utils/tests/test-shared-general \
+	libnm-core/tests/test-compare libnm-core/tests/test-crypto \
+	libnm-core/tests/test-general libnm-core/tests/test-keyfile \
+	libnm-core/tests/test-secrets libnm-core/tests/test-setting \
 	libnm-core/tests/test-settings-defaults \
-	$(libnm_tests_programs) $(am__append_16) \
+	$(libnm_tests_programs) $(am__append_18) \
 	src/initrd/tests/test-ibft-reader \
 	src/initrd/tests/test-cmdline-reader \
 	src/dhcp/tests/test-dhcp-dhclient \
 	src/dhcp/tests/test-dhcp-utils \
 	src/settings/plugins/keyfile/tests/test-keyfile \
-	$(am__append_24) $(am__append_30) $(am__append_37) \
-	$(am__append_47) src/dnsmasq/tests/test-dnsmasq-utils \
+	$(am__append_26) $(am__append_32) $(am__append_39) \
+	$(am__append_49) src/dnsmasq/tests/test-dnsmasq-utils \
 	src/platform/tests/test-link-fake \
 	src/platform/tests/test-link-linux \
 	src/platform/tests/test-address-fake \
@@ -4973,39 +5084,40 @@ check_programs = libnm-core/tests/test-compare \
 	src/tests/test-ip6-config src/tests/test-dcb \
 	src/tests/test-systemd src/tests/test-wired-defname \
 	src/tests/test-utils dispatcher/tests/test-dispatcher-envp \
-	$(am__append_55) $(am__append_56) $(am__append_87) \
-	$(am__append_92)
-check_programs_norun = $(am__append_17) src/platform/tests/monitor \
-	src/ndisc/tests/test-ndisc-linux $(am__append_88) \
-	$(am__append_93) examples/C/glib/add-connection-gdbus \
+	$(am__append_57) $(am__append_58) $(am__append_88) \
+	$(am__append_93)
+check_programs_norun = $(am__append_19) src/platform/tests/monitor \
+	src/ndisc/tests/test-ndisc-linux $(am__append_89) \
+	$(am__append_94) examples/C/glib/add-connection-gdbus \
 	examples/C/glib/add-connection-libnm \
 	examples/C/glib/get-active-connections-gdbus \
 	examples/C/glib/get-ap-info-libnm \
 	examples/C/glib/list-connections-gdbus \
 	examples/C/glib/list-connections-libnm \
 	examples/C/glib/monitor-nm-running-gdbus \
-	examples/C/glib/monitor-nm-state-gdbus $(am__append_113)
+	examples/C/glib/monitor-nm-state-gdbus $(am__append_114)
 
 ###############################################################################
 
 # just test, that we can build "nm-vpn-plugin-utils.c"
 
 ###############################################################################
-check_ltlibraries = $(am__append_9) $(am__append_10) \
+check_ltlibraries = $(am__append_11) $(am__append_12) \
 	libnm/tests/libnm-vpn-plugin-utils-test.la \
 	src/libNetworkManagerTest.la clients/common/libnmc-base.la \
-	$(am__append_53) $(am__append_77)
-check_local = check-docs check-local-exports-libnm $(am__append_25) \
-	$(am__append_29) $(am__append_36) check-local-devices-adsl \
-	$(am__append_40) $(am__append_46) $(am__append_49) \
-	$(am__append_52) check-local-clients-tests-test-client \
-	$(am__append_85) $(am__append_91)
-VAPIGEN_VAPIS = $(am__append_105) $(am__append_106)
-dbusservice_DATA = $(am__append_33) dispatcher/nm-dispatcher.conf \
+	$(am__append_55) $(am__append_78)
+check_local = check-docs check-local-exports-libnm \
+	check-config-options $(am__append_27) $(am__append_31) \
+	$(am__append_38) check-local-devices-adsl $(am__append_42) \
+	$(am__append_48) $(am__append_51) $(am__append_54) \
+	check-local-clients-tests-test-client $(am__append_86) \
+	$(am__append_92)
+VAPIGEN_VAPIS = $(am__append_106) $(am__append_107)
+dbusservice_DATA = $(am__append_35) dispatcher/nm-dispatcher.conf \
 	src/org.freedesktop.NetworkManager.conf
 dbusactivation_DATA =  \
 	dispatcher/org.freedesktop.nm_dispatcher.service
-INTROSPECTION_GIRS = $(am__append_12) $(am__append_84)
+INTROSPECTION_GIRS = $(am__append_14) $(am__append_85)
 INTROSPECTION_SCANNER_ARGS = 
 INTROSPECTION_COMPILER_ARGS = 
 # Pass SANITIZER_ENV where a command that uses built libraries is
@@ -5017,11 +5129,11 @@ libnminclude_HEADERS = $(libnm_core_lib_h_pub_real) \
 nodist_libnminclude_HEADERS = $(libnm_core_lib_h_pub_mkenums) \
 	$(libnm_lib_h_pub_mkenums)
 pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = $(am__append_5) libnm/libnm.pc $(am__append_82)
+pkgconfig_DATA = $(am__append_5) libnm/libnm.pc $(am__append_83)
 pppd_plugindir = $(PPPD_PLUGIN_DIR)
-pppd_plugin_LTLIBRARIES = $(am__append_21)
+pppd_plugin_LTLIBRARIES = $(am__append_23)
 vapidir = $(datadir)/vala/vapi
-vapi_DATA = $(am__append_107)
+vapi_DATA = $(am__append_108)
 examplesdir = $(docdir)/examples
 rundir = $(runstatedir)/NetworkManager
 statedir = $(localstatedir)/lib/NetworkManager
@@ -5033,7 +5145,7 @@ nmlocaledir = $(datadir)/locale
 GLIB_MKENUMS_H_FLAGS = --identifier-prefix NM
 GLIB_MKENUMS_C_FLAGS = --identifier-prefix NM
 SUBDIRS = . po $(am__append_1) $(am__append_2)
-dflt_cppflags = -std=gnu99
+dflt_cppflags = -std=gnu11
 
 ###############################################################################
 set_sanitizer_env = \
@@ -5070,34 +5182,179 @@ dist_polkit_policy_in_in_files = \
 	data/org.freedesktop.NetworkManager.policy.in.in
 
 polkit_policy_DATA = $(dist_polkit_policy_in_in_files:.policy.in.in=.policy)
+shared_libcsiphash_la_CPPFLAGS = \
+	$(CODE_COVERAGE_CFLAGS) \
+	$(SANITIZER_LIB_CFLAGS) \
+	$(NULL)
+
+shared_libcsiphash_la_SOURCES = \
+	shared/c-siphash/src/c-siphash.c \
+	shared/c-siphash/src/c-siphash.h \
+	$(NULL)
+
+shared_libcrbtree_la_CFLAGS = \
+	$(AM_CFLAGS) \
+	-std=c11 \
+	$(NULL)
+
+shared_libcrbtree_la_CPPFLAGS = \
+	$(CODE_COVERAGE_CFLAGS) \
+	$(SANITIZER_LIB_CFLAGS) \
+	$(NULL)
+
+shared_libcrbtree_la_SOURCES = \
+	shared/c-rbtree/src/c-rbtree.c \
+	shared/c-rbtree/src/c-rbtree.h \
+	shared/c-rbtree/src/c-rbtree-private.h \
+	$(NULL)
+
+shared_libnacd_la_CFLAGS = \
+	$(AM_CFLAGS) \
+	-std=c11 \
+	-Wno-pointer-arith \
+	-Wno-vla \
+	$(NULL)
+
+shared_libnacd_la_CPPFLAGS = \
+	-D_GNU_SOURCE \
+	-DSO_ATTACH_BPF=50 \
+	$(CODE_COVERAGE_CFLAGS) \
+	$(SANITIZER_LIB_CFLAGS) \
+	-I$(srcdir)/shared/c-list/src \
+	-I$(srcdir)/shared/c-siphash/src \
+	-I$(srcdir)/shared/c-rbtree/src \
+	$(NULL)
+
+shared_libnacd_la_SOURCES = shared/n-acd/src/n-acd.c \
+	shared/n-acd/src/n-acd.h shared/n-acd/src/n-acd-private.h \
+	shared/n-acd/src/n-acd-probe.c shared/n-acd/src/util/timer.c \
+	shared/n-acd/src/util/timer.h $(NULL) $(am__append_6) \
+	$(am__append_7)
+shared_libnacd_la_LIBADD = \
+	shared/libcrbtree.la \
+	$(NULL)
+
+
+###############################################################################
+shared_nm_utils_libnm_utils_cppflags = \
+	$(dflt_cppflags) \
+	-I$(srcdir)/shared \
+	$(CODE_COVERAGE_CFLAGS) \
+	$(SANITIZER_LIB_CFLAGS) \
+	$(GLIB_CFLAGS) \
+	-DG_LOG_DOMAIN=\""libnm"\" \
+	-DNETWORKMANAGER_COMPILATION='(NM_NETWORKMANAGER_COMPILATION_GLIB|NM_NETWORKMANAGER_COMPILATION_WITH_GLIB_I18N_LIB)' \
+	$(NULL)
+
+shared_nm_utils_libnm_utils_base_la_CPPFLAGS = \
+	$(shared_nm_utils_libnm_utils_cppflags) \
+	$(NULL)
+
+shared_nm_utils_libnm_utils_base_la_SOURCES = \
+	shared/c-list/src/c-list.h \
+	shared/nm-utils/c-list-util.c \
+	shared/nm-utils/c-list-util.h \
+	shared/nm-utils/nm-c-list.h \
+	shared/nm-utils/nm-dedup-multi.c \
+	shared/nm-utils/nm-dedup-multi.h \
+	shared/nm-utils/nm-enum-utils.c \
+	shared/nm-utils/nm-enum-utils.h \
+	shared/nm-utils/nm-errno.c \
+	shared/nm-utils/nm-errno.h \
+	shared/nm-utils/nm-glib.h \
+	shared/nm-utils/nm-hash-utils.c \
+	shared/nm-utils/nm-hash-utils.h \
+	shared/nm-utils/nm-io-utils.c \
+	shared/nm-utils/nm-io-utils.h \
+	shared/nm-utils/nm-logging-fwd.h \
+	shared/nm-utils/nm-macros-internal.h \
+	shared/nm-utils/nm-obj.h \
+	shared/nm-utils/nm-random-utils.c \
+	shared/nm-utils/nm-random-utils.h \
+	shared/nm-utils/nm-secret-utils.c \
+	shared/nm-utils/nm-secret-utils.h \
+	shared/nm-utils/nm-shared-utils.c \
+	shared/nm-utils/nm-shared-utils.h \
+	shared/nm-utils/nm-time-utils.c \
+	shared/nm-utils/nm-time-utils.h \
+	shared/nm-utils/unaligned.h \
+	$(NULL)
+
+shared_nm_utils_libnm_utils_base_la_LDFLAGS = \
+	$(CODE_COVERAGE_LDFLAGS) \
+	$(SANITIZER_LIB_LDFLAGS) \
+	$(NULL)
+
+shared_nm_utils_libnm_utils_base_la_LIBADD = \
+	shared/libcsiphash.la \
+	$(GLIB_LIBS) \
+	$(NULL)
+
+shared_nm_utils_libnm_utils_udev_la_CPPFLAGS = \
+	$(shared_nm_utils_libnm_utils_cppflags) \
+	$(LIBUDEV_CFLAGS) \
+	$(NULL)
+
+shared_nm_utils_libnm_utils_udev_la_SOURCES = \
+	shared/nm-utils/nm-udev-utils.c \
+	shared/nm-utils/nm-udev-utils.h \
+	$(NULL)
+
+shared_nm_utils_libnm_utils_udev_la_LDFLAGS = \
+	$(CODE_COVERAGE_LDFLAGS) \
+	$(SANITIZER_LIB_LDFLAGS) \
+	$(NULL)
+
+shared_nm_utils_libnm_utils_udev_la_LIBADD = \
+	$(GLIB_LIBS) \
+	$(LIBUDEV_LIBS) \
+	$(NULL)
+
+shared_nm_utils_tests_test_shared_general_CPPFLAGS = \
+	$(dflt_cppflags) \
+	-I$(srcdir)/shared \
+	-DNETWORKMANAGER_COMPILATION_TEST \
+	-DNETWORKMANAGER_COMPILATION='(NM_NETWORKMANAGER_COMPILATION_GLIB|NM_NETWORKMANAGER_COMPILATION_WITH_GLIB_I18N_PROG)' \
+	$(CODE_COVERAGE_CFLAGS) \
+	$(GLIB_CFLAGS) \
+	$(SANITIZER_LIB_CFLAGS) \
+	$(NULL)
+
+shared_nm_utils_tests_test_shared_general_LDADD = \
+	shared/nm-utils/libnm-utils-base.la \
+	$(GLIB_LIBS) \
+	$(NULL)
+
 introspection_libnmdbus_la_CPPFLAGS = $(GLIB_CFLAGS)
 introspection_sources = \
 	introspection/org.freedesktop.NetworkManager.AccessPoint.c \
 	introspection/org.freedesktop.NetworkManager.AccessPoint.h \
-	introspection/org.freedesktop.NetworkManager.Connection.Active.c \
-	introspection/org.freedesktop.NetworkManager.Connection.Active.h \
 	introspection/org.freedesktop.NetworkManager.AgentManager.c \
 	introspection/org.freedesktop.NetworkManager.AgentManager.h \
 	introspection/org.freedesktop.NetworkManager.Checkpoint.c \
 	introspection/org.freedesktop.NetworkManager.Checkpoint.h \
+	introspection/org.freedesktop.NetworkManager.Connection.Active.c \
+	introspection/org.freedesktop.NetworkManager.Connection.Active.h \
+	introspection/org.freedesktop.NetworkManager.DHCP4Config.c \
+	introspection/org.freedesktop.NetworkManager.DHCP4Config.h \
+	introspection/org.freedesktop.NetworkManager.DHCP6Config.c \
+	introspection/org.freedesktop.NetworkManager.DHCP6Config.h \
 	introspection/org.freedesktop.NetworkManager.Device.Adsl.c \
 	introspection/org.freedesktop.NetworkManager.Device.Adsl.h \
+	introspection/org.freedesktop.NetworkManager.Device.Bluetooth.c \
+	introspection/org.freedesktop.NetworkManager.Device.Bluetooth.h \
 	introspection/org.freedesktop.NetworkManager.Device.Bond.c \
 	introspection/org.freedesktop.NetworkManager.Device.Bond.h \
 	introspection/org.freedesktop.NetworkManager.Device.Bridge.c \
 	introspection/org.freedesktop.NetworkManager.Device.Bridge.h \
-	introspection/org.freedesktop.NetworkManager.Device.Bluetooth.c \
-	introspection/org.freedesktop.NetworkManager.Device.Bluetooth.h \
 	introspection/org.freedesktop.NetworkManager.Device.Dummy.c \
 	introspection/org.freedesktop.NetworkManager.Device.Dummy.h \
-	introspection/org.freedesktop.NetworkManager.Device.Wired.c \
-	introspection/org.freedesktop.NetworkManager.Device.Wired.h \
 	introspection/org.freedesktop.NetworkManager.Device.Generic.c \
 	introspection/org.freedesktop.NetworkManager.Device.Generic.h \
-	introspection/org.freedesktop.NetworkManager.Device.Infiniband.c \
-	introspection/org.freedesktop.NetworkManager.Device.Infiniband.h \
 	introspection/org.freedesktop.NetworkManager.Device.IPTunnel.c \
 	introspection/org.freedesktop.NetworkManager.Device.IPTunnel.h \
+	introspection/org.freedesktop.NetworkManager.Device.Infiniband.c \
+	introspection/org.freedesktop.NetworkManager.Device.Infiniband.h \
 	introspection/org.freedesktop.NetworkManager.Device.Lowpan.c \
 	introspection/org.freedesktop.NetworkManager.Device.Lowpan.h \
 	introspection/org.freedesktop.NetworkManager.Device.Macsec.c \
@@ -5108,12 +5365,12 @@ introspection_sources = \
 	introspection/org.freedesktop.NetworkManager.Device.Modem.h \
 	introspection/org.freedesktop.NetworkManager.Device.OlpcMesh.c \
 	introspection/org.freedesktop.NetworkManager.Device.OlpcMesh.h \
+	introspection/org.freedesktop.NetworkManager.Device.OvsBridge.c \
+	introspection/org.freedesktop.NetworkManager.Device.OvsBridge.h \
 	introspection/org.freedesktop.NetworkManager.Device.OvsInterface.c \
 	introspection/org.freedesktop.NetworkManager.Device.OvsInterface.h \
 	introspection/org.freedesktop.NetworkManager.Device.OvsPort.c \
 	introspection/org.freedesktop.NetworkManager.Device.OvsPort.h \
-	introspection/org.freedesktop.NetworkManager.Device.OvsBridge.c \
-	introspection/org.freedesktop.NetworkManager.Device.OvsBridge.h \
 	introspection/org.freedesktop.NetworkManager.Device.Ppp.c \
 	introspection/org.freedesktop.NetworkManager.Device.Ppp.h \
 	introspection/org.freedesktop.NetworkManager.Device.Statistics.c \
@@ -5128,28 +5385,28 @@ introspection_sources = \
 	introspection/org.freedesktop.NetworkManager.Device.Vlan.h \
 	introspection/org.freedesktop.NetworkManager.Device.Vxlan.c \
 	introspection/org.freedesktop.NetworkManager.Device.Vxlan.h \
+	introspection/org.freedesktop.NetworkManager.Device.WiMax.c \
+	introspection/org.freedesktop.NetworkManager.Device.WiMax.h \
+	introspection/org.freedesktop.NetworkManager.Device.WifiP2P.c \
+	introspection/org.freedesktop.NetworkManager.Device.WifiP2P.h \
 	introspection/org.freedesktop.NetworkManager.Device.WireGuard.c \
 	introspection/org.freedesktop.NetworkManager.Device.WireGuard.h \
+	introspection/org.freedesktop.NetworkManager.Device.Wired.c \
+	introspection/org.freedesktop.NetworkManager.Device.Wired.h \
 	introspection/org.freedesktop.NetworkManager.Device.Wireless.c \
 	introspection/org.freedesktop.NetworkManager.Device.Wireless.h \
-	introspection/org.freedesktop.NetworkManager.Device.WiMax.c \
-	introspection/org.freedesktop.NetworkManager.Device.WiMax.h \
 	introspection/org.freedesktop.NetworkManager.Device.Wpan.c \
 	introspection/org.freedesktop.NetworkManager.Device.Wpan.h \
 	introspection/org.freedesktop.NetworkManager.Device.c \
 	introspection/org.freedesktop.NetworkManager.Device.h \
-	introspection/org.freedesktop.NetworkManager.DHCP4Config.c \
-	introspection/org.freedesktop.NetworkManager.DHCP4Config.h \
-	introspection/org.freedesktop.NetworkManager.DHCP6Config.c \
-	introspection/org.freedesktop.NetworkManager.DHCP6Config.h \
 	introspection/org.freedesktop.NetworkManager.DnsManager.c \
 	introspection/org.freedesktop.NetworkManager.DnsManager.h \
 	introspection/org.freedesktop.NetworkManager.IP4Config.c \
 	introspection/org.freedesktop.NetworkManager.IP4Config.h \
 	introspection/org.freedesktop.NetworkManager.IP6Config.c \
 	introspection/org.freedesktop.NetworkManager.IP6Config.h \
-	introspection/org.freedesktop.NetworkManager.c \
-	introspection/org.freedesktop.NetworkManager.h \
+	introspection/org.freedesktop.NetworkManager.WifiP2PPeer.c \
+	introspection/org.freedesktop.NetworkManager.WifiP2PPeer.h \
 	introspection/org.freedesktop.NetworkManager.PPP.c \
 	introspection/org.freedesktop.NetworkManager.PPP.h \
 	introspection/org.freedesktop.NetworkManager.SecretAgent.c \
@@ -5161,79 +5418,86 @@ introspection_sources = \
 	introspection/org.freedesktop.NetworkManager.VPN.Connection.c \
 	introspection/org.freedesktop.NetworkManager.VPN.Connection.h \
 	introspection/org.freedesktop.NetworkManager.VPN.Plugin.c \
-	introspection/org.freedesktop.NetworkManager.VPN.Plugin.h
+	introspection/org.freedesktop.NetworkManager.VPN.Plugin.h \
+	introspection/org.freedesktop.NetworkManager.c \
+	introspection/org.freedesktop.NetworkManager.h \
+	$(NULL)
 
 nodist_introspection_libnmdbus_la_SOURCES = $(introspection_sources)
 DBUS_INTERFACE_DOCS = \
 	docs/api/dbus-org.freedesktop.NetworkManager.AccessPoint.xml \
-	docs/api/dbus-org.freedesktop.NetworkManager.Connection.Active.xml \
+	docs/api/dbus-org.freedesktop.NetworkManager.AgentManager.xml \
 	docs/api/dbus-org.freedesktop.NetworkManager.Checkpoint.xml \
-	docs/api/dbus-org.freedesktop.NetworkManager.Device.Team.xml \
+	docs/api/dbus-org.freedesktop.NetworkManager.Connection.Active.xml \
+	docs/api/dbus-org.freedesktop.NetworkManager.DHCP4Config.xml \
 	docs/api/dbus-org.freedesktop.NetworkManager.DHCP6Config.xml \
-	docs/api/dbus-org.freedesktop.NetworkManager.Device.Wireless.xml \
-	docs/api/dbus-org.freedesktop.NetworkManager.xml \
-	docs/api/dbus-org.freedesktop.NetworkManager.VPN.Connection.xml \
-	docs/api/dbus-org.freedesktop.NetworkManager.SecretAgent.xml \
-	docs/api/dbus-org.freedesktop.NetworkManager.Device.xml \
-	docs/api/dbus-org.freedesktop.NetworkManager.VPN.Plugin.xml \
+	docs/api/dbus-org.freedesktop.NetworkManager.Device.Adsl.xml \
 	docs/api/dbus-org.freedesktop.NetworkManager.Device.Bluetooth.xml \
-	docs/api/dbus-org.freedesktop.NetworkManager.Device.Dummy.xml \
-	docs/api/dbus-org.freedesktop.NetworkManager.Device.Vxlan.xml \
-	docs/api/dbus-org.freedesktop.NetworkManager.Settings.Connection.xml \
 	docs/api/dbus-org.freedesktop.NetworkManager.Device.Bond.xml \
+	docs/api/dbus-org.freedesktop.NetworkManager.Device.Bridge.xml \
+	docs/api/dbus-org.freedesktop.NetworkManager.Device.Dummy.xml \
+	docs/api/dbus-org.freedesktop.NetworkManager.Device.Generic.xml \
+	docs/api/dbus-org.freedesktop.NetworkManager.Device.IPTunnel.xml \
+	docs/api/dbus-org.freedesktop.NetworkManager.Device.Infiniband.xml \
+	docs/api/dbus-org.freedesktop.NetworkManager.Device.Lowpan.xml \
 	docs/api/dbus-org.freedesktop.NetworkManager.Device.Macsec.xml \
 	docs/api/dbus-org.freedesktop.NetworkManager.Device.Macvlan.xml \
-	docs/api/dbus-org.freedesktop.NetworkManager.PPP.xml \
-	docs/api/dbus-org.freedesktop.NetworkManager.Device.Vlan.xml \
-	docs/api/dbus-org.freedesktop.NetworkManager.Device.Adsl.xml \
-	docs/api/dbus-org.freedesktop.NetworkManager.AgentManager.xml \
-	docs/api/dbus-org.freedesktop.NetworkManager.Device.WiMax.xml \
-	docs/api/dbus-org.freedesktop.NetworkManager.Device.Wpan.xml \
-	docs/api/dbus-org.freedesktop.NetworkManager.Device.IPTunnel.xml \
-	docs/api/dbus-org.freedesktop.NetworkManager.Device.Tun.xml \
-	docs/api/dbus-org.freedesktop.NetworkManager.Device.Bridge.xml \
+	docs/api/dbus-org.freedesktop.NetworkManager.Device.Modem.xml \
 	docs/api/dbus-org.freedesktop.NetworkManager.Device.OlpcMesh.xml \
+	docs/api/dbus-org.freedesktop.NetworkManager.Device.OvsBridge.xml \
 	docs/api/dbus-org.freedesktop.NetworkManager.Device.OvsInterface.xml \
 	docs/api/dbus-org.freedesktop.NetworkManager.Device.OvsPort.xml \
-	docs/api/dbus-org.freedesktop.NetworkManager.Device.OvsBridge.xml \
 	docs/api/dbus-org.freedesktop.NetworkManager.Device.Ppp.xml \
-	docs/api/dbus-org.freedesktop.NetworkManager.DHCP4Config.xml \
-	docs/api/dbus-org.freedesktop.NetworkManager.Device.Generic.xml \
-	docs/api/dbus-org.freedesktop.NetworkManager.Device.Infiniband.xml \
-	docs/api/dbus-org.freedesktop.NetworkManager.Device.Modem.xml \
-	docs/api/dbus-org.freedesktop.NetworkManager.IP6Config.xml \
+	docs/api/dbus-org.freedesktop.NetworkManager.Device.Statistics.xml \
+	docs/api/dbus-org.freedesktop.NetworkManager.Device.Team.xml \
+	docs/api/dbus-org.freedesktop.NetworkManager.Device.Tun.xml \
 	docs/api/dbus-org.freedesktop.NetworkManager.Device.Veth.xml \
-	docs/api/dbus-org.freedesktop.NetworkManager.Settings.xml \
-	docs/api/dbus-org.freedesktop.NetworkManager.Device.Wired.xml \
+	docs/api/dbus-org.freedesktop.NetworkManager.Device.Vlan.xml \
+	docs/api/dbus-org.freedesktop.NetworkManager.Device.Vxlan.xml \
+	docs/api/dbus-org.freedesktop.NetworkManager.Device.WiMax.xml \
+	docs/api/dbus-org.freedesktop.NetworkManager.Device.WifiP2P.xml \
 	docs/api/dbus-org.freedesktop.NetworkManager.Device.WireGuard.xml \
-	docs/api/dbus-org.freedesktop.NetworkManager.IP4Config.xml \
-	docs/api/dbus-org.freedesktop.NetworkManager.Device.Statistics.xml \
+	docs/api/dbus-org.freedesktop.NetworkManager.Device.Wired.xml \
+	docs/api/dbus-org.freedesktop.NetworkManager.Device.Wireless.xml \
+	docs/api/dbus-org.freedesktop.NetworkManager.Device.Wpan.xml \
+	docs/api/dbus-org.freedesktop.NetworkManager.Device.xml \
 	docs/api/dbus-org.freedesktop.NetworkManager.DnsManager.xml \
-	docs/api/dbus-org.freedesktop.NetworkManager.Device.Lowpan.xml
+	docs/api/dbus-org.freedesktop.NetworkManager.IP4Config.xml \
+	docs/api/dbus-org.freedesktop.NetworkManager.IP6Config.xml \
+	docs/api/dbus-org.freedesktop.NetworkManager.PPP.xml \
+	docs/api/dbus-org.freedesktop.NetworkManager.SecretAgent.xml \
+	docs/api/dbus-org.freedesktop.NetworkManager.Settings.Connection.xml \
+	docs/api/dbus-org.freedesktop.NetworkManager.Settings.xml \
+	docs/api/dbus-org.freedesktop.NetworkManager.VPN.Connection.xml \
+	docs/api/dbus-org.freedesktop.NetworkManager.VPN.Plugin.xml \
+	docs/api/dbus-org.freedesktop.NetworkManager.WifiP2PPeer.xml \
+	docs/api/dbus-org.freedesktop.NetworkManager.xml \
+	$(NULL)
 
 dbusinterfacesdir = $(datadir)/dbus-1/interfaces
 dbusinterfaces_DATA = \
 	introspection/org.freedesktop.NetworkManager.AccessPoint.xml \
-	introspection/org.freedesktop.NetworkManager.Connection.Active.xml \
 	introspection/org.freedesktop.NetworkManager.AgentManager.xml \
 	introspection/org.freedesktop.NetworkManager.Checkpoint.xml \
+	introspection/org.freedesktop.NetworkManager.Connection.Active.xml \
+	introspection/org.freedesktop.NetworkManager.DHCP4Config.xml \
+	introspection/org.freedesktop.NetworkManager.DHCP6Config.xml \
 	introspection/org.freedesktop.NetworkManager.Device.Adsl.xml \
+	introspection/org.freedesktop.NetworkManager.Device.Bluetooth.xml \
 	introspection/org.freedesktop.NetworkManager.Device.Bond.xml \
 	introspection/org.freedesktop.NetworkManager.Device.Bridge.xml \
-	introspection/org.freedesktop.NetworkManager.Device.Bluetooth.xml \
 	introspection/org.freedesktop.NetworkManager.Device.Dummy.xml \
-	introspection/org.freedesktop.NetworkManager.Device.Wired.xml \
 	introspection/org.freedesktop.NetworkManager.Device.Generic.xml \
-	introspection/org.freedesktop.NetworkManager.Device.Infiniband.xml \
 	introspection/org.freedesktop.NetworkManager.Device.IPTunnel.xml \
+	introspection/org.freedesktop.NetworkManager.Device.Infiniband.xml \
 	introspection/org.freedesktop.NetworkManager.Device.Lowpan.xml \
 	introspection/org.freedesktop.NetworkManager.Device.Macsec.xml \
 	introspection/org.freedesktop.NetworkManager.Device.Macvlan.xml \
 	introspection/org.freedesktop.NetworkManager.Device.Modem.xml \
 	introspection/org.freedesktop.NetworkManager.Device.OlpcMesh.xml \
+	introspection/org.freedesktop.NetworkManager.Device.OvsBridge.xml \
 	introspection/org.freedesktop.NetworkManager.Device.OvsInterface.xml \
 	introspection/org.freedesktop.NetworkManager.Device.OvsPort.xml \
-	introspection/org.freedesktop.NetworkManager.Device.OvsBridge.xml \
 	introspection/org.freedesktop.NetworkManager.Device.Ppp.xml \
 	introspection/org.freedesktop.NetworkManager.Device.Statistics.xml \
 	introspection/org.freedesktop.NetworkManager.Device.Team.xml \
@@ -5241,24 +5505,26 @@ dbusinterfaces_DATA = \
 	introspection/org.freedesktop.NetworkManager.Device.Veth.xml \
 	introspection/org.freedesktop.NetworkManager.Device.Vlan.xml \
 	introspection/org.freedesktop.NetworkManager.Device.Vxlan.xml \
+	introspection/org.freedesktop.NetworkManager.Device.WiMax.xml \
+	introspection/org.freedesktop.NetworkManager.Device.WifiP2P.xml \
 	introspection/org.freedesktop.NetworkManager.Device.WireGuard.xml \
+	introspection/org.freedesktop.NetworkManager.Device.Wired.xml \
 	introspection/org.freedesktop.NetworkManager.Device.Wireless.xml \
-	introspection/org.freedesktop.NetworkManager.Device.WiMax.xml \
 	introspection/org.freedesktop.NetworkManager.Device.Wpan.xml \
 	introspection/org.freedesktop.NetworkManager.Device.xml \
-	introspection/org.freedesktop.NetworkManager.DHCP4Config.xml \
-	introspection/org.freedesktop.NetworkManager.DHCP6Config.xml \
 	introspection/org.freedesktop.NetworkManager.DnsManager.xml \
 	introspection/org.freedesktop.NetworkManager.IP4Config.xml \
 	introspection/org.freedesktop.NetworkManager.IP6Config.xml \
-	introspection/org.freedesktop.NetworkManager.xml \
 	introspection/org.freedesktop.NetworkManager.PPP.xml \
 	introspection/org.freedesktop.NetworkManager.SecretAgent.xml \
 	introspection/org.freedesktop.NetworkManager.Settings.Connection.xml \
 	introspection/org.freedesktop.NetworkManager.Settings.xml \
 	introspection/org.freedesktop.NetworkManager.VPN.Connection.xml \
 	introspection/org.freedesktop.NetworkManager.VPN.Plugin.xml \
-	introspection/org.freedesktop.NetworkManager.WiMax.Nsp.xml
+	introspection/org.freedesktop.NetworkManager.WiMax.Nsp.xml \
+	introspection/org.freedesktop.NetworkManager.WifiP2PPeer.xml \
+	introspection/org.freedesktop.NetworkManager.xml \
+	$(NULL)
 
 
 ###############################################################################
@@ -5308,8 +5574,10 @@ libnm_core_lib_h_pub_real = \
 	libnm-core/nm-setting-vlan.h \
 	libnm-core/nm-setting-vpn.h \
 	libnm-core/nm-setting-vxlan.h \
+	libnm-core/nm-setting-wifi-p2p.h \
 	libnm-core/nm-setting-wimax.h \
 	libnm-core/nm-setting-wired.h \
+	libnm-core/nm-setting-wireguard.h \
 	libnm-core/nm-setting-wireless-security.h \
 	libnm-core/nm-setting-wireless.h \
 	libnm-core/nm-setting-wpan.h \
@@ -5324,14 +5592,7 @@ libnm_core_lib_h_pub_real = \
 libnm_core_lib_h_pub_mkenums = \
 	libnm-core/nm-core-enum-types.h
 
-libnm_core_lib_h_priv = shared/nm-utils/c-list-util.h \
-	shared/nm-utils/nm-dedup-multi.h \
-	shared/nm-utils/nm-enum-utils.h \
-	shared/nm-utils/nm-hash-utils.h shared/nm-utils/nm-io-utils.h \
-	shared/nm-utils/nm-secret-utils.h \
-	shared/nm-utils/nm-shared-utils.h \
-	shared/nm-utils/nm-random-utils.h \
-	shared/nm-utils/nm-udev-utils.h shared/nm-ethtool-utils.h \
+libnm_core_lib_h_priv = shared/nm-ethtool-utils.h \
 	shared/nm-meta-setting.h libnm-core/nm-crypto.h \
 	libnm-core/nm-crypto-impl.h libnm-core/nm-connection-private.h \
 	libnm-core/nm-core-internal.h \
@@ -5339,7 +5600,7 @@ libnm_core_lib_h_priv = shared/nm-utils/c-list-util.h \
 	libnm-core/nm-keyfile-internal.h libnm-core/nm-keyfile-utils.h \
 	libnm-core/nm-property-compare.h \
 	libnm-core/nm-setting-private.h libnm-core/nm-utils-private.h \
-	$(am__append_6)
+	$(am__append_8)
 libnm_core_lib_c_settings_real = \
 	libnm-core/nm-setting-6lowpan.c \
 	libnm-core/nm-setting-8021x.c \
@@ -5381,27 +5642,23 @@ libnm_core_lib_c_settings_real = \
 	libnm-core/nm-setting-vlan.c \
 	libnm-core/nm-setting-vpn.c \
 	libnm-core/nm-setting-vxlan.c \
+	libnm-core/nm-setting-wifi-p2p.c \
 	libnm-core/nm-setting-wimax.c \
 	libnm-core/nm-setting-wired.c \
+	libnm-core/nm-setting-wireguard.c \
 	libnm-core/nm-setting-wireless-security.c \
 	libnm-core/nm-setting-wireless.c \
 	libnm-core/nm-setting-wpan.c
 
 libnm_core_lib_c_real = $(libnm_core_lib_c_settings_real) \
-	shared/nm-utils/c-list-util.c shared/nm-utils/nm-dedup-multi.c \
-	shared/nm-utils/nm-enum-utils.c \
-	shared/nm-utils/nm-hash-utils.c shared/nm-utils/nm-io-utils.c \
-	shared/nm-utils/nm-secret-utils.c \
-	shared/nm-utils/nm-shared-utils.c \
-	shared/nm-utils/nm-random-utils.c \
-	shared/nm-utils/nm-udev-utils.c shared/nm-ethtool-utils.c \
-	shared/nm-meta-setting.c libnm-core/nm-crypto.c \
-	libnm-core/nm-connection.c libnm-core/nm-dbus-utils.c \
-	libnm-core/nm-errors.c libnm-core/nm-keyfile.c \
-	libnm-core/nm-keyfile-utils.c libnm-core/nm-property-compare.c \
-	libnm-core/nm-setting.c libnm-core/nm-simple-connection.c \
-	libnm-core/nm-utils.c libnm-core/nm-vpn-editor-plugin.c \
-	libnm-core/nm-vpn-plugin-info.c $(am__append_7)
+	shared/nm-ethtool-utils.c shared/nm-meta-setting.c \
+	libnm-core/nm-crypto.c libnm-core/nm-connection.c \
+	libnm-core/nm-dbus-utils.c libnm-core/nm-errors.c \
+	libnm-core/nm-keyfile.c libnm-core/nm-keyfile-utils.c \
+	libnm-core/nm-property-compare.c libnm-core/nm-setting.c \
+	libnm-core/nm-simple-connection.c libnm-core/nm-utils.c \
+	libnm-core/nm-vpn-editor-plugin.c \
+	libnm-core/nm-vpn-plugin-info.c $(am__append_9)
 libnm_core_lib_c_mkenums = \
 	libnm-core/nm-core-enum-types.c
 
@@ -5424,7 +5681,7 @@ nm_core_enum_types_MKENUMS_C_FLAGS = --identifier-prefix NM --fhead '\#include "
 libnm_core_libnm_core_la_CPPFLAGS = $(dflt_cppflags_libnm_core) \
 	-DG_LOG_DOMAIN=\""libnm"\" \
 	-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIBNM_CORE \
-	$(NULL) $(am__append_8)
+	$(NULL) $(am__append_10)
 libnm_core_libnm_core_la_SOURCES = \
 	$(libnm_core_lib_h_pub_real) \
 	$(libnm_core_lib_h_priv) \
@@ -5437,7 +5694,6 @@ nodist_libnm_core_libnm_core_la_SOURCES = \
 libnm_core_libnm_core_la_LIBADD = \
 	$(GLIB_LIBS) \
 	$(UUID_LIBS) \
-	$(LIBUDEV_LIBS) \
 	$(NULL)
 
 libnm_core_libnm_core_la_LDFLAGS = \
@@ -5499,7 +5755,9 @@ nodist_libnm_core_tests_test_general_SOURCES = \
 
 libnm_core_tests_ldadd = \
 	libnm-core/libnm-core.la \
-	shared/libcsiphash.la \
+	shared/systemd/libnm-systemd-shared.la \
+	shared/systemd/libnm-systemd-logging-stub.la \
+	shared/nm-utils/libnm-utils-base.la \
 	$(libnm_crypto_lib) \
 	$(GLIB_LIBS)
 
@@ -5544,14 +5802,15 @@ libnm_lib_h_pub_real = \
 	libnm/nm-device-macvlan.h \
 	libnm/nm-device-modem.h \
 	libnm/nm-device-olpc-mesh.h \
+	libnm/nm-device-ovs-bridge.h \
 	libnm/nm-device-ovs-interface.h \
 	libnm/nm-device-ovs-port.h \
-	libnm/nm-device-ovs-bridge.h \
 	libnm/nm-device-ppp.h \
 	libnm/nm-device-team.h \
 	libnm/nm-device-tun.h \
 	libnm/nm-device-vlan.h \
 	libnm/nm-device-vxlan.h \
+	libnm/nm-device-wifi-p2p.h \
 	libnm/nm-device-wifi.h \
 	libnm/nm-device-wimax.h \
 	libnm/nm-device-wireguard.h \
@@ -5567,6 +5826,7 @@ libnm_lib_h_pub_real = \
 	libnm/nm-vpn-editor.h \
 	libnm/nm-vpn-plugin-old.h \
 	libnm/nm-vpn-service-plugin.h \
+	libnm/nm-wifi-p2p-peer.h \
 	libnm/nm-wimax-nsp.h
 
 libnm_lib_h_pub_mkenums = \
@@ -5606,14 +5866,15 @@ libnm_lib_c_real = \
 	libnm/nm-device-macvlan.c \
 	libnm/nm-device-modem.c \
 	libnm/nm-device-olpc-mesh.c \
+	libnm/nm-device-ovs-bridge.c \
 	libnm/nm-device-ovs-interface.c \
 	libnm/nm-device-ovs-port.c \
-	libnm/nm-device-ovs-bridge.c \
 	libnm/nm-device-ppp.c \
 	libnm/nm-device-team.c \
 	libnm/nm-device-tun.c \
 	libnm/nm-device-vlan.c \
 	libnm/nm-device-vxlan.c \
+	libnm/nm-device-wifi-p2p.c \
 	libnm/nm-device-wifi.c \
 	libnm/nm-device-wimax.c \
 	libnm/nm-device-wireguard.c \
@@ -5632,9 +5893,10 @@ libnm_lib_c_real = \
 	libnm/nm-remote-settings.c \
 	libnm/nm-secret-agent-old.c \
 	libnm/nm-vpn-connection.c \
-	libnm/nm-vpn-plugin-old.c \
 	libnm/nm-vpn-editor.c \
+	libnm/nm-vpn-plugin-old.c \
 	libnm/nm-vpn-service-plugin.c \
+	libnm/nm-wifi-p2p-peer.c \
 	libnm/nm-wimax-nsp.c
 
 libnm_lib_c_mkenums = \
@@ -5657,10 +5919,11 @@ libnm_libnm_utils_la_SOURCES = \
 
 libnm_libnm_utils_la_LIBADD = \
 	libnm-core/libnm-core.la \
-	shared/libcsiphash.la \
 	$(libnm_crypto_lib) \
 	introspection/libnmdbus.la \
-	$(GLIB_LIBS)
+	shared/nm-utils/libnm-utils-base.la \
+	$(GLIB_LIBS) \
+	$(NULL)
 
 nm_enum_types_sources = \
 	$(libnm_lib_h_pub_mkenums) \
@@ -5687,10 +5950,13 @@ EXTRA_libnm_libnm_la_DEPENDENCIES = \
 
 libnm_libnm_la_LIBADD = \
 	libnm/libnm-utils.la \
+	shared/systemd/libnm-systemd-shared.la \
+	shared/systemd/libnm-systemd-logging-stub.la \
+	shared/nm-utils/libnm-utils-udev.la \
 	$(DL_LIBS) \
 	$(GLIB_LIBS) \
 	$(UUID_LIBS) \
-	$(LIBUDEV_LIBS)
+	$(NULL)
 
 libnm_libnm_la_LDFLAGS = \
 	-Wl,--version-script="$(srcdir)/libnm/libnm.ver" \
@@ -5698,7 +5964,7 @@ libnm_libnm_la_LDFLAGS = \
 	$(SANITIZER_LIB_LDFLAGS) \
 	-version-info "1:0:1"
 
-libnm_NM_1_0_typelib = $(am__append_11)
+libnm_NM_1_0_typelib = $(am__append_13)
 @HAVE_INTROSPECTION_TRUE@libnm_NM_1_0_gir_INCLUDES = Gio-2.0
 @HAVE_INTROSPECTION_TRUE@libnm_NM_1_0_gir_PACKAGES = gio-2.0
 @HAVE_INTROSPECTION_TRUE@libnm_NM_1_0_gir_EXPORT_PACKAGES = libnm
@@ -5747,6 +6013,8 @@ libnm_tests_cppflags = \
 
 libnm_tests_ldadd = \
 	libnm/libnm.la \
+	shared/systemd/libnm-systemd-shared.la \
+	shared/systemd/libnm-systemd-logging-stub.la \
 	$(GLIB_LIBS)
 
 libnm_tests_ldflags = \
@@ -5839,155 +6107,191 @@ src_cppflags = \
 	$(NULL)
 
 src_cppflags_test = $(src_cppflags) -DNETWORKMANAGER_COMPILATION_TEST \
-	$(NULL) $(am__append_18)
+	$(NULL) $(am__append_20)
 src_ldflags = $(CODE_COVERAGE_LDFLAGS)
-shared_libcsiphash_la_CPPFLAGS = \
+
+###############################################################################
+libsystemd_cppflags = \
+	$(dflt_cppflags) \
+	-I$(srcdir)/shared \
+	-I$(builddir)/shared \
+	-I$(srcdir)/shared/systemd/ \
+	-I$(srcdir)/shared/systemd/sd-adapt-shared \
+	-I$(srcdir)/shared/systemd/src/basic \
+	$(LIBSYSTEMD_NM_CFLAGS) \
+	$(GLIB_CFLAGS) \
 	$(CODE_COVERAGE_CFLAGS) \
-	$(SANITIZER_LIB_CFLAGS) \
 	$(NULL)
 
-shared_libcsiphash_la_SOURCES = \
-	shared/c-siphash/src/c-siphash.c \
-	shared/c-siphash/src/c-siphash.h
+libsystemd_libadd = \
+	$(GLIB_LIBS) \
+	$(CODE_COVERAGE_LDFLAGS) \
+	$(NULL)
 
-shared_libnacd_la_CFLAGS = -std=gnu99
-shared_libnacd_la_CPPFLAGS = \
-	$(CODE_COVERAGE_CFLAGS) \
-	$(SANITIZER_LIB_CFLAGS) \
-	-I$(srcdir)/shared/c-list/src \
-	-I$(srcdir)/shared/c-siphash/src \
+shared_systemd_libnm_systemd_logging_stub_la_CPPFLAGS = \
+	$(libsystemd_cppflags) \
+	-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_SYSTEMD_SHARED \
+	-DG_LOG_DOMAIN=\""libnm"\" \
 	$(NULL)
 
-shared_libnacd_la_SOURCES = \
-	shared/n-acd/src/n-acd.c \
-	shared/n-acd/src/n-acd.h
+shared_systemd_libnm_systemd_logging_stub_la_SOURCES = \
+	shared/systemd/nm-logging-stub.c \
+	$(NULL)
+
+shared_systemd_libnm_systemd_logging_stub_la_LIBADD = \
+	$(libsystemd_libadd) \
+	$(NULL)
+
+shared_systemd_libnm_systemd_shared_la_CPPFLAGS = \
+	$(libsystemd_cppflags) \
+	-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_SYSTEMD_SHARED \
+	-DG_LOG_DOMAIN=\""libnm"\" \
+	$(NULL)
+
+shared_systemd_libnm_systemd_shared_la_SOURCES = \
+	shared/systemd/nm-sd-utils-shared.c \
+	shared/systemd/nm-sd-utils-shared.h \
+	shared/systemd/sd-adapt-shared/architecture.h \
+	shared/systemd/sd-adapt-shared/btrfs-util.h \
+	shared/systemd/sd-adapt-shared/build.h \
+	shared/systemd/sd-adapt-shared/cgroup-util.h \
+	shared/systemd/sd-adapt-shared/copy.h \
+	shared/systemd/sd-adapt-shared/def.h \
+	shared/systemd/sd-adapt-shared/device-nodes.h \
+	shared/systemd/sd-adapt-shared/dirent-util.h \
+	shared/systemd/sd-adapt-shared/errno-list.h \
+	shared/systemd/sd-adapt-shared/format-util.h \
+	shared/systemd/sd-adapt-shared/glob-util.h \
+	shared/systemd/sd-adapt-shared/gunicode.h \
+	shared/systemd/sd-adapt-shared/ioprio.h \
+	shared/systemd/sd-adapt-shared/locale-util.h \
+	shared/systemd/sd-adapt-shared/memfd-util.h \
+	shared/systemd/sd-adapt-shared/missing.h \
+	shared/systemd/sd-adapt-shared/missing_socket.h \
+	shared/systemd/sd-adapt-shared/missing_syscall.h \
+	shared/systemd/sd-adapt-shared/missing_timerfd.h \
+	shared/systemd/sd-adapt-shared/mkdir.h \
+	shared/systemd/sd-adapt-shared/nm-sd-adapt-shared.h \
+	shared/systemd/sd-adapt-shared/nm-sd-adapt-shared.h \
+	shared/systemd/sd-adapt-shared/procfs-util.h \
+	shared/systemd/sd-adapt-shared/raw-clone.h \
+	shared/systemd/sd-adapt-shared/rlimit-util.h \
+	shared/systemd/sd-adapt-shared/terminal-util.h \
+	shared/systemd/sd-adapt-shared/unaligned.h \
+	shared/systemd/sd-adapt-shared/user-util.h \
+	shared/systemd/sd-adapt-shared/virt.h \
+	shared/systemd/src/basic/alloc-util.c \
+	shared/systemd/src/basic/alloc-util.h \
+	shared/systemd/src/basic/async.h \
+	shared/systemd/src/basic/env-file.c \
+	shared/systemd/src/basic/env-file.h \
+	shared/systemd/src/basic/env-util.c \
+	shared/systemd/src/basic/env-util.h \
+	shared/systemd/src/basic/escape.c \
+	shared/systemd/src/basic/escape.h \
+	shared/systemd/src/basic/ether-addr-util.c \
+	shared/systemd/src/basic/ether-addr-util.h \
+	shared/systemd/src/basic/extract-word.c \
+	shared/systemd/src/basic/extract-word.h \
+	shared/systemd/src/basic/fd-util.c \
+	shared/systemd/src/basic/fd-util.h \
+	shared/systemd/src/basic/fileio.c \
+	shared/systemd/src/basic/fileio.h \
+	shared/systemd/src/basic/fs-util.c \
+	shared/systemd/src/basic/fs-util.h \
+	shared/systemd/src/basic/hash-funcs.c \
+	shared/systemd/src/basic/hash-funcs.h \
+	shared/systemd/src/basic/hashmap.c \
+	shared/systemd/src/basic/hashmap.h \
+	shared/systemd/src/basic/hexdecoct.c \
+	shared/systemd/src/basic/hexdecoct.h \
+	shared/systemd/src/basic/hostname-util.c \
+	shared/systemd/src/basic/hostname-util.h \
+	shared/systemd/src/basic/in-addr-util.c \
+	shared/systemd/src/basic/in-addr-util.h \
+	shared/systemd/src/basic/io-util.c \
+	shared/systemd/src/basic/io-util.h \
+	shared/systemd/src/basic/list.h \
+	shared/systemd/src/basic/log.h \
+	shared/systemd/src/basic/macro.h \
+	shared/systemd/src/basic/mempool.c \
+	shared/systemd/src/basic/mempool.h \
+	shared/systemd/src/basic/missing_fcntl.h \
+	shared/systemd/src/basic/missing_type.h \
+	shared/systemd/src/basic/parse-util.c \
+	shared/systemd/src/basic/parse-util.h \
+	shared/systemd/src/basic/path-util.c \
+	shared/systemd/src/basic/path-util.h \
+	shared/systemd/src/basic/prioq.c \
+	shared/systemd/src/basic/prioq.h \
+	shared/systemd/src/basic/process-util.c \
+	shared/systemd/src/basic/process-util.h \
+	shared/systemd/src/basic/random-util.c \
+	shared/systemd/src/basic/random-util.h \
+	shared/systemd/src/basic/refcnt.h \
+	shared/systemd/src/basic/set.h \
+	shared/systemd/src/basic/signal-util.h \
+	shared/systemd/src/basic/siphash24.h \
+	shared/systemd/src/basic/socket-util.c \
+	shared/systemd/src/basic/socket-util.h \
+	shared/systemd/src/basic/sparse-endian.h \
+	shared/systemd/src/basic/stat-util.c \
+	shared/systemd/src/basic/stat-util.h \
+	shared/systemd/src/basic/stdio-util.h \
+	shared/systemd/src/basic/string-table.c \
+	shared/systemd/src/basic/string-table.h \
+	shared/systemd/src/basic/string-util.c \
+	shared/systemd/src/basic/string-util.h \
+	shared/systemd/src/basic/strv.c \
+	shared/systemd/src/basic/strv.h \
+	shared/systemd/src/basic/time-util.c \
+	shared/systemd/src/basic/time-util.h \
+	shared/systemd/src/basic/tmpfile-util.c \
+	shared/systemd/src/basic/tmpfile-util.h \
+	shared/systemd/src/basic/umask-util.h \
+	shared/systemd/src/basic/utf8.c \
+	shared/systemd/src/basic/utf8.h \
+	shared/systemd/src/basic/util.c \
+	shared/systemd/src/basic/util.h \
+	$(NULL)
+
+shared_systemd_libnm_systemd_shared_la_LIBADD = \
+	$(libsystemd_libadd) \
+	$(NULL)
 
 
 ###############################################################################
-src_libsystemd_nm_la_cppflags = \
-	$(dflt_cppflags) \
-	-I$(srcdir)/shared \
-	-I$(builddir)/shared \
+src_libnm_systemd_core_la_cppflags = \
+	$(libsystemd_cppflags) \
 	-I$(srcdir)/libnm-core \
 	-I$(builddir)/libnm-core \
 	-I$(srcdir)/src \
-	-I$(srcdir)/src/systemd/sd-adapt \
+	-I$(srcdir)/src/systemd/sd-adapt-core \
 	-I$(srcdir)/src/systemd/src/systemd \
-	-I$(srcdir)/src/systemd/src/basic \
 	-I$(srcdir)/src/systemd/src/shared \
 	-I$(srcdir)/src/systemd/src/libsystemd-network \
+	-I$(srcdir)/src/systemd/src/libsystemd/sd-event \
 	-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_SYSTEMD \
-	$(LIBSYSTEMD_NM_CFLAGS) \
-	$(GLIB_CFLAGS) \
-	$(CODE_COVERAGE_CFLAGS)
+	$(NULL)
 
-src_libsystemd_nm_la_libadd = \
-	$(GLIB_LIBS) \
-	$(CODE_COVERAGE_LDFLAGS)
+src_libnm_systemd_core_la_libadd = \
+	$(libsystemd_libadd) \
+	$(NULL)
 
-src_libsystemd_nm_la_SOURCES = \
+src_libnm_systemd_core_la_SOURCES = \
+	src/systemd/nm-sd-utils-core.c \
+	src/systemd/nm-sd-utils-core.h \
 	src/systemd/nm-sd.c \
 	src/systemd/nm-sd.h \
-	src/systemd/nm-sd-utils.c \
-	src/systemd/nm-sd-utils.h \
-	src/systemd/sd-adapt/nm-sd-adapt.c \
-	src/systemd/sd-adapt/nm-sd-adapt.h \
-	src/systemd/sd-adapt/architecture.h \
-	src/systemd/sd-adapt/btrfs-util.h \
-	src/systemd/sd-adapt/build.h \
-	src/systemd/sd-adapt/cgroup-util.h \
-	src/systemd/sd-adapt/condition.h \
-	src/systemd/sd-adapt/conf-parser.h \
-	src/systemd/sd-adapt/copy.h \
-	src/systemd/sd-adapt/def.h \
-	src/systemd/sd-adapt/device-nodes.h \
-	src/systemd/sd-adapt/dirent-util.h \
-	src/systemd/sd-adapt/errno-list.h \
-	src/systemd/sd-adapt/format-util.h \
-	src/systemd/sd-adapt/glob-util.h \
-	src/systemd/sd-adapt/gunicode.h \
-	src/systemd/sd-adapt/ioprio.h \
-	src/systemd/sd-adapt/khash.h \
-	src/systemd/sd-adapt/locale-util.h \
-	src/systemd/sd-adapt/memfd-util.h \
-	src/systemd/sd-adapt/missing.h \
-	src/systemd/sd-adapt/mkdir.h \
-	src/systemd/sd-adapt/procfs-util.h \
-	src/systemd/sd-adapt/raw-clone.h \
-	src/systemd/sd-adapt/sd-daemon.h \
-	src/systemd/sd-adapt/sd-device.h \
-	src/systemd/sd-adapt/stat-util.h \
-	src/systemd/sd-adapt/terminal-util.h \
-	src/systemd/sd-adapt/unaligned.h \
-	src/systemd/sd-adapt/user-util.h \
-	src/systemd/sd-adapt/virt.h \
-	src/systemd/src/basic/alloc-util.c \
-	src/systemd/src/basic/alloc-util.h \
-	src/systemd/src/basic/async.h \
-	src/systemd/src/basic/env-util.c \
-	src/systemd/src/basic/env-util.h \
-	src/systemd/src/basic/escape.c \
-	src/systemd/src/basic/escape.h \
-	src/systemd/src/basic/ether-addr-util.c \
-	src/systemd/src/basic/ether-addr-util.h \
-	src/systemd/src/basic/extract-word.c \
-	src/systemd/src/basic/extract-word.h \
-	src/systemd/src/basic/fd-util.c \
-	src/systemd/src/basic/fd-util.h \
-	src/systemd/src/basic/fileio.c \
-	src/systemd/src/basic/fileio.h \
-	src/systemd/src/basic/fs-util.c \
-	src/systemd/src/basic/fs-util.h \
-	src/systemd/src/basic/hash-funcs.c \
-	src/systemd/src/basic/hash-funcs.h \
-	src/systemd/src/basic/hashmap.c \
-	src/systemd/src/basic/hashmap.h \
-	src/systemd/src/basic/hexdecoct.c \
-	src/systemd/src/basic/hexdecoct.h \
-	src/systemd/src/basic/hostname-util.c \
-	src/systemd/src/basic/hostname-util.h \
-	src/systemd/src/basic/in-addr-util.c \
-	src/systemd/src/basic/in-addr-util.h \
-	src/systemd/src/basic/io-util.c \
-	src/systemd/src/basic/io-util.h \
-	src/systemd/src/basic/list.h \
-	src/systemd/src/basic/log.h \
-	src/systemd/src/basic/macro.h \
-	src/systemd/src/basic/mempool.c \
-	src/systemd/src/basic/mempool.h \
-	src/systemd/src/basic/parse-util.c \
-	src/systemd/src/basic/parse-util.h \
-	src/systemd/src/basic/path-util.c \
-	src/systemd/src/basic/path-util.h \
-	src/systemd/src/basic/prioq.c \
-	src/systemd/src/basic/prioq.h \
-	src/systemd/src/basic/process-util.c \
-	src/systemd/src/basic/process-util.h \
-	src/systemd/src/basic/random-util.c \
-	src/systemd/src/basic/random-util.h \
-	src/systemd/src/basic/refcnt.h \
-	src/systemd/src/basic/set.h \
-	src/systemd/src/basic/signal-util.h \
-	src/systemd/src/basic/siphash24.h \
-	src/systemd/src/basic/socket-util.c \
-	src/systemd/src/basic/socket-util.h \
-	src/systemd/src/basic/sparse-endian.h \
-	src/systemd/src/basic/stat-util.c \
-	src/systemd/src/basic/stat-util.h \
-	src/systemd/src/basic/stdio-util.h \
-	src/systemd/src/basic/string-table.c \
-	src/systemd/src/basic/string-table.h \
-	src/systemd/src/basic/string-util.c \
-	src/systemd/src/basic/string-util.h \
-	src/systemd/src/basic/strv.c \
-	src/systemd/src/basic/strv.h \
-	src/systemd/src/basic/time-util.c \
-	src/systemd/src/basic/time-util.h \
-	src/systemd/src/basic/umask-util.h \
-	src/systemd/src/basic/utf8.c \
-	src/systemd/src/basic/utf8.h \
-	src/systemd/src/basic/util.c \
-	src/systemd/src/basic/util.h \
+	src/systemd/sd-adapt-core/condition.h \
+	src/systemd/sd-adapt-core/conf-parser.h \
+	src/systemd/sd-adapt-core/device-util.h \
+	src/systemd/sd-adapt-core/khash.h \
+	src/systemd/sd-adapt-core/nm-sd-adapt-core.c \
+	src/systemd/sd-adapt-core/nm-sd-adapt-core.h \
+	src/systemd/sd-adapt-core/sd-daemon.h \
+	src/systemd/sd-adapt-core/sd-device.h \
+	src/systemd/sd-adapt-core/stat-util.h \
 	src/systemd/src/libsystemd-network/arp-util.c \
 	src/systemd/src/libsystemd-network/arp-util.h \
 	src/systemd/src/libsystemd-network/dhcp-identifier.c \
@@ -6017,6 +6321,9 @@ src_libsystemd_nm_la_SOURCES = \
 	src/systemd/src/libsystemd-network/sd-ipv4acd.c \
 	src/systemd/src/libsystemd-network/sd-ipv4ll.c \
 	src/systemd/src/libsystemd-network/sd-lldp.c \
+	src/systemd/src/libsystemd/sd-event/event-source.h \
+	src/systemd/src/libsystemd/sd-event/event-util.c \
+	src/systemd/src/libsystemd/sd-event/event-util.h \
 	src/systemd/src/libsystemd/sd-event/sd-event.c \
 	src/systemd/src/libsystemd/sd-id128/id128-util.c \
 	src/systemd/src/libsystemd/sd-id128/id128-util.h \
@@ -6035,8 +6342,8 @@ src_libsystemd_nm_la_SOURCES = \
 	src/systemd/src/systemd/sd-lldp.h \
 	src/systemd/src/systemd/sd-ndisc.h
 
-src_libsystemd_nm_la_CPPFLAGS = $(src_libsystemd_nm_la_cppflags)
-src_libsystemd_nm_la_LIBADD = $(src_libsystemd_nm_la_libadd)
+src_libnm_systemd_core_la_CPPFLAGS = $(src_libnm_systemd_core_la_cppflags)
+src_libnm_systemd_core_la_LIBADD = $(src_libnm_systemd_core_la_libadd)
 
 ###############################################################################
 src_libNetworkManagerBase_la_CPPFLAGS = $(src_cppflags)
@@ -6067,11 +6374,12 @@ src_libNetworkManagerBase_la_SOURCES = src/nm-core-utils.c \
 	src/dhcp/nm-dhcp-client-logging.h src/dhcp/nm-dhcp-utils.c \
 	src/dhcp/nm-dhcp-utils.h src/dhcp/nm-dhcp-systemd.c \
 	src/dhcp/nm-dhcp-manager.c src/dhcp/nm-dhcp-manager.h \
-	src/main-utils.c src/main-utils.h $(NULL) $(am__append_19)
+	src/main-utils.c src/main-utils.h $(NULL) $(am__append_21)
 src_libNetworkManagerBase_la_LIBADD = \
 	libnm-core/libnm-core.la \
-	shared/libcsiphash.la \
 	$(libnm_crypto_lib) \
+	shared/nm-utils/libnm-utils-udev.la \
+	shared/nm-utils/libnm-utils-base.la \
 	$(GLIB_LIBS) \
 	$(SYSTEMD_JOURNAL_LIBS) \
 	$(LIBUDEV_LIBS) \
@@ -6087,12 +6395,12 @@ src_libNetworkManager_la_SOURCES = \
 	src/nm-checkpoint-manager.c \
 	src/nm-checkpoint-manager.h \
 	\
-	src/devices/nm-device.c \
-	src/devices/nm-device.h \
-	src/devices/nm-lldp-listener.c \
-	src/devices/nm-lldp-listener.h \
 	src/devices/nm-acd-manager.c \
 	src/devices/nm-acd-manager.h \
+	src/devices/nm-lldp-listener.c \
+	src/devices/nm-lldp-listener.h \
+	src/devices/nm-device.c \
+	src/devices/nm-device.h \
 	src/devices/nm-device-ethernet-utils.c \
 	src/devices/nm-device-ethernet-utils.h \
 	src/devices/nm-device-factory.c \
@@ -6249,6 +6557,8 @@ src_libNetworkManager_la_SOURCES = \
 	src/nm-rfkill-manager.h \
 	src/nm-session-monitor.h \
 	src/nm-session-monitor.c \
+	src/nm-keep-alive.c \
+	src/nm-keep-alive.h \
 	src/nm-sleep-monitor.c \
 	src/nm-sleep-monitor.h \
 	src/nm-types.h \
@@ -6257,7 +6567,8 @@ src_libNetworkManager_la_SOURCES = \
 
 src_libNetworkManager_la_LIBADD = \
 	src/libNetworkManagerBase.la \
-	src/libsystemd-nm.la \
+	src/libnm-systemd-core.la \
+	shared/systemd/libnm-systemd-shared.la \
 	shared/libnacd.la \
 	$(GLIB_LIBS) \
 	$(LIBUDEV_LIBS) \
@@ -6309,7 +6620,8 @@ src_nm_iface_helper_SOURCES = \
 
 src_nm_iface_helper_LDADD = \
 	src/libNetworkManagerBase.la \
-	src/libsystemd-nm.la \
+	src/libnm-systemd-core.la \
+	shared/systemd/libnm-systemd-shared.la \
 	$(GLIB_LIBS) \
 	$(LIBUDEV_LIBS) \
 	$(LIBNDP_LIBS) \
@@ -6338,7 +6650,10 @@ src_initrd_nm_initrd_generator_LDADD = \
 	libnm-core/libnm-core.la \
 	src/initrd/libnmi-core.la \
 	src/libNetworkManagerBase.la \
-	$(GLIB_LIBS)
+	shared/systemd/libnm-systemd-shared.la \
+	shared/nm-utils/libnm-utils-base.la \
+	$(GLIB_LIBS) \
+	$(NULL)
 
 src_initrd_nm_initrd_generator_LDFLAGS = \
 	-Wl,--version-script="$(srcdir)/linker-script-binary.ver" \
@@ -6357,7 +6672,9 @@ src_initrd_tests_test_ibft_reader_LDADD = \
 	libnm-core/libnm-core.la \
 	src/initrd/libnmi-core.la \
 	src/libNetworkManagerTest.la \
-	$(GLIB_LIBS)
+	shared/nm-utils/libnm-utils-base.la \
+	$(GLIB_LIBS) \
+	$(NULL)
 
 src_initrd_tests_test_cmdline_reader_CPPFLAGS = \
 	-DNETWORKMANAGER_COMPILATION_TEST \
@@ -6372,7 +6689,9 @@ src_initrd_tests_test_cmdline_reader_LDADD = \
 	libnm-core/libnm-core.la \
 	src/initrd/libnmi-core.la \
 	src/libNetworkManagerTest.la \
-	$(GLIB_LIBS)
+	shared/nm-utils/libnm-utils-base.la \
+	$(GLIB_LIBS) \
+	$(NULL)
 
 src_dhcp_nm_dhcp_helper_CPPFLAGS = \
 	$(dflt_cppflags) \
@@ -6579,13 +6898,14 @@ src_settings_plugins_ifcfg_rh_tests_network_scripts_alias_files = \
 
 @CONFIG_PLUGIN_IFUPDOWN_TRUE@src_settings_plugins_ifupdown_tests_test_ifupdown_CPPFLAGS = $(src_cppflags_base_test)
 @CONFIG_PLUGIN_IFUPDOWN_TRUE@src_settings_plugins_ifupdown_tests_test_ifupdown_LDFLAGS = \
-@CONFIG_PLUGIN_IFUPDOWN_TRUE@	$(GLIB_LDFLAGS) \
 @CONFIG_PLUGIN_IFUPDOWN_TRUE@	$(CODE_COVERAGE_LDFLAGS) \
 @CONFIG_PLUGIN_IFUPDOWN_TRUE@	$(SANITIZER_EXEC_LDFLAGS)
 
 @CONFIG_PLUGIN_IFUPDOWN_TRUE@src_settings_plugins_ifupdown_tests_test_ifupdown_LDADD = \
 @CONFIG_PLUGIN_IFUPDOWN_TRUE@	src/settings/plugins/ifupdown/libnms-ifupdown-core.la \
-@CONFIG_PLUGIN_IFUPDOWN_TRUE@	src/libNetworkManagerTest.la
+@CONFIG_PLUGIN_IFUPDOWN_TRUE@	src/libNetworkManagerTest.la \
+@CONFIG_PLUGIN_IFUPDOWN_TRUE@	$(GLIB_LIBS) \
+@CONFIG_PLUGIN_IFUPDOWN_TRUE@	$(NULL)
 
 src_devices_adsl_libnm_device_plugin_adsl_la_SOURCES = \
 	src/devices/adsl/nm-atm-manager.c \
@@ -6615,7 +6935,7 @@ src_devices_adsl_libnm_device_plugin_adsl_la_LIBADD = \
 @WITH_MODEM_MANAGER_1_TRUE@	src/devices/wwan/nm-modem-manager.h \
 @WITH_MODEM_MANAGER_1_TRUE@	src/devices/wwan/nm-modem.c \
 @WITH_MODEM_MANAGER_1_TRUE@	src/devices/wwan/nm-modem.h \
-@WITH_MODEM_MANAGER_1_TRUE@	$(am__append_39)
+@WITH_MODEM_MANAGER_1_TRUE@	$(am__append_41)
 @WITH_MODEM_MANAGER_1_TRUE@src_devices_wwan_libnm_wwan_la_CPPFLAGS = $(src_devices_wwan_cppflags)
 @WITH_MODEM_MANAGER_1_TRUE@src_devices_wwan_libnm_wwan_la_LDFLAGS = \
 @WITH_MODEM_MANAGER_1_TRUE@	-avoid-version \
@@ -6657,30 +6977,34 @@ src_devices_adsl_libnm_device_plugin_adsl_la_LIBADD = \
 @WITH_MODEM_MANAGER_1_TRUE@	src/devices/bluetooth/nm-bt-error.c \
 @WITH_MODEM_MANAGER_1_TRUE@	src/devices/bluetooth/nm-device-bt.c \
 @WITH_MODEM_MANAGER_1_TRUE@	src/devices/bluetooth/nm-device-bt.h \
-@WITH_MODEM_MANAGER_1_TRUE@	$(am__append_42)
+@WITH_MODEM_MANAGER_1_TRUE@	$(am__append_44)
 @WITH_MODEM_MANAGER_1_TRUE@src_devices_bluetooth_libnm_device_plugin_bluetooth_la_CPPFLAGS =  \
 @WITH_MODEM_MANAGER_1_TRUE@	$(src_cppflags_device_plugin) \
-@WITH_MODEM_MANAGER_1_TRUE@	$(am__append_41)
+@WITH_MODEM_MANAGER_1_TRUE@	$(am__append_43)
 @WITH_MODEM_MANAGER_1_TRUE@src_devices_bluetooth_libnm_device_plugin_bluetooth_la_LDFLAGS = \
 @WITH_MODEM_MANAGER_1_TRUE@	-module -avoid-version \
 @WITH_MODEM_MANAGER_1_TRUE@	-Wl,--version-script="$(srcdir)/linker-script-devices.ver"
 
 @WITH_MODEM_MANAGER_1_TRUE@src_devices_bluetooth_libnm_device_plugin_bluetooth_la_LIBADD =  \
 @WITH_MODEM_MANAGER_1_TRUE@	src/devices/wwan/libnm-wwan.la \
-@WITH_MODEM_MANAGER_1_TRUE@	$(GLIB_LIBS) $(am__append_43)
+@WITH_MODEM_MANAGER_1_TRUE@	$(GLIB_LIBS) $(am__append_45)
 @WITH_WIFI_TRUE@src_devices_wifi_libnm_device_plugin_wifi_la_SOURCES =  \
-@WITH_WIFI_TRUE@	src/devices/wifi/nm-wifi-factory.c \
+@WITH_WIFI_TRUE@	src/devices/wifi/nm-device-olpc-mesh.c \
+@WITH_WIFI_TRUE@	src/devices/wifi/nm-device-olpc-mesh.h \
+@WITH_WIFI_TRUE@	src/devices/wifi/nm-device-wifi-p2p.c \
+@WITH_WIFI_TRUE@	src/devices/wifi/nm-device-wifi-p2p.h \
 @WITH_WIFI_TRUE@	src/devices/wifi/nm-device-wifi.c \
 @WITH_WIFI_TRUE@	src/devices/wifi/nm-device-wifi.h \
 @WITH_WIFI_TRUE@	src/devices/wifi/nm-wifi-ap.c \
 @WITH_WIFI_TRUE@	src/devices/wifi/nm-wifi-ap.h \
-@WITH_WIFI_TRUE@	src/devices/wifi/nm-wifi-utils.c \
-@WITH_WIFI_TRUE@	src/devices/wifi/nm-wifi-utils.h \
 @WITH_WIFI_TRUE@	src/devices/wifi/nm-wifi-common.c \
 @WITH_WIFI_TRUE@	src/devices/wifi/nm-wifi-common.h \
-@WITH_WIFI_TRUE@	src/devices/wifi/nm-device-olpc-mesh.c \
-@WITH_WIFI_TRUE@	src/devices/wifi/nm-device-olpc-mesh.h \
-@WITH_WIFI_TRUE@	$(am__append_45)
+@WITH_WIFI_TRUE@	src/devices/wifi/nm-wifi-factory.c \
+@WITH_WIFI_TRUE@	src/devices/wifi/nm-wifi-p2p-peer.c \
+@WITH_WIFI_TRUE@	src/devices/wifi/nm-wifi-p2p-peer.h \
+@WITH_WIFI_TRUE@	src/devices/wifi/nm-wifi-utils.c \
+@WITH_WIFI_TRUE@	src/devices/wifi/nm-wifi-utils.h $(NULL) \
+@WITH_WIFI_TRUE@	$(am__append_47)
 @WITH_WIFI_TRUE@src_devices_wifi_libnm_device_plugin_wifi_la_CPPFLAGS = $(src_cppflags_device_plugin)
 @WITH_WIFI_TRUE@src_devices_wifi_libnm_device_plugin_wifi_la_LDFLAGS = \
 @WITH_WIFI_TRUE@	-module -avoid-version \
@@ -6900,16 +7224,14 @@ src_tests_test_utils_CPPFLAGS = $(src_cppflags_test)
 src_tests_test_utils_LDFLAGS = $(src_tests_ldflags)
 src_tests_test_utils_LDADD = $(src_tests_ldadd)
 src_tests_test_systemd_CPPFLAGS = \
-	$(src_libsystemd_nm_la_cppflags) \
+	$(src_libnm_systemd_core_la_cppflags) \
 	-DNETWORKMANAGER_COMPILATION_TEST
 
-src_tests_test_systemd_SOURCES = \
-	src/tests/test-systemd.c
-
 src_tests_test_systemd_LDADD = \
-	src/libsystemd-nm.la \
+	src/libnm-systemd-core.la \
+	shared/systemd/libnm-systemd-shared.la \
 	shared/libcsiphash.la \
-	$(src_libsystemd_nm_la_libadd) \
+	$(src_libnm_systemd_core_la_libadd) \
 	$(NULL)
 
 dispatcher_cppflags = \
@@ -7019,15 +7341,6 @@ clients_cppflags = \
 	$(NULL)
 
 clients_common_libnmc_base_la_SOURCES = \
-	shared/nm-utils/nm-enum-utils.c \
-	shared/nm-utils/nm-enum-utils.h \
-	shared/nm-utils/nm-hash-utils.c \
-	shared/nm-utils/nm-hash-utils.h \
-	shared/nm-utils/nm-random-utils.c \
-	shared/nm-utils/nm-random-utils.h \
-	shared/nm-utils/nm-shared-utils.c \
-	shared/nm-utils/nm-shared-utils.h \
-	\
 	clients/common/nm-secret-agent-simple.c \
 	clients/common/nm-secret-agent-simple.h \
 	clients/common/nm-vpn-helpers.c \
@@ -7042,7 +7355,7 @@ clients_common_libnmc_base_la_CPPFLAGS = \
 
 clients_common_libnmc_base_la_LIBADD = \
 	libnm/libnm.la \
-	shared/libcsiphash.la \
+	shared/nm-utils/libnm-utils-base.la \
 	$(GLIB_LIBS) \
 	$(NULL)
 
@@ -7098,15 +7411,15 @@ clients_common_tests_test_general_LDADD = \
 @BUILD_NMCLI_TRUE@	clients/cli/nmcli.h \
 @BUILD_NMCLI_TRUE@	clients/cli/polkit-agent.c \
 @BUILD_NMCLI_TRUE@	clients/cli/polkit-agent.h $(NULL) \
-@BUILD_NMCLI_TRUE@	$(am__append_59)
+@BUILD_NMCLI_TRUE@	$(am__append_61)
 @BUILD_NMCLI_TRUE@clients_cli_nmcli_CPPFLAGS =  \
 @BUILD_NMCLI_TRUE@	-I$(srcdir)/clients/cli $(clients_cppflags) \
 @BUILD_NMCLI_TRUE@	-DG_LOG_DOMAIN=\""nmcli"\" $(NULL) \
-@BUILD_NMCLI_TRUE@	$(am__append_58)
+@BUILD_NMCLI_TRUE@	$(am__append_60)
 @BUILD_NMCLI_TRUE@clients_cli_nmcli_LDADD = libnm/libnm.la \
 @BUILD_NMCLI_TRUE@	clients/common/libnmc-base.la \
 @BUILD_NMCLI_TRUE@	clients/common/libnmc.la $(GLIB_LIBS) \
-@BUILD_NMCLI_TRUE@	$(READLINE_LIBS) $(am__append_60)
+@BUILD_NMCLI_TRUE@	$(READLINE_LIBS) $(am__append_62)
 @BUILD_NMCLI_TRUE@clients_cli_nmcli_LDFLAGS = \
 @BUILD_NMCLI_TRUE@	-Wl,--version-script="$(srcdir)/linker-script-binary.ver" \
 @BUILD_NMCLI_TRUE@	$(SANITIZER_EXEC_LDFLAGS)
@@ -7277,6 +7590,7 @@ data_edit = sed \
 	-e 's|@sbindir[@]|$(sbindir)|g' \
 	-e 's|@sysconfdir[@]|$(sysconfdir)|g' \
 	-e 's|@nmrundir[@]|$(nmrundir)|g' \
+	-e 's|@nmstatedir[@]|$(nmstatedir)|g' \
 	-e 's|@localstatedir[@]|$(localstatedir)|g' \
 	-e 's|@libexecdir[@]|$(libexecdir)|g' \
 	-e 's|@DISTRO_NETWORK_SERVICE[@]|$(DISTRO_NETWORK_SERVICE)|g' \
@@ -7306,8 +7620,8 @@ data_edit = sed \
 @WITH_LEGACY_LIBRARIES_TRUE@	-DG_LOG_DOMAIN=\""libnm-util"\" \
 @WITH_LEGACY_LIBRARIES_TRUE@	-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIBNM_UTIL \
 @WITH_LEGACY_LIBRARIES_TRUE@	$(GLIB_CFLAGS) $(DBUS_CFLAGS) \
-@WITH_LEGACY_LIBRARIES_TRUE@	$(UUID_CFLAGS) $(am__append_70) \
-@WITH_LEGACY_LIBRARIES_TRUE@	$(am__append_73)
+@WITH_LEGACY_LIBRARIES_TRUE@	$(UUID_CFLAGS) $(am__append_71) \
+@WITH_LEGACY_LIBRARIES_TRUE@	$(am__append_74)
 @WITH_LEGACY_LIBRARIES_TRUE@libnm_util_lib_h_pub_real = \
 @WITH_LEGACY_LIBRARIES_TRUE@	shared/nm-version-macros.h \
 @WITH_LEGACY_LIBRARIES_TRUE@	libnm-util/NetworkManager.h \
@@ -7347,7 +7661,6 @@ data_edit = sed \
 @WITH_LEGACY_LIBRARIES_TRUE@	libnm-util/nm-utils-enum-types.h
 
 @WITH_LEGACY_LIBRARIES_TRUE@libnm_util_lib_h_priv = \
-@WITH_LEGACY_LIBRARIES_TRUE@	shared/nm-utils/nm-shared-utils.h \
 @WITH_LEGACY_LIBRARIES_TRUE@	libnm-util/crypto.h \
 @WITH_LEGACY_LIBRARIES_TRUE@	libnm-util/nm-dbus-glib-types.h \
 @WITH_LEGACY_LIBRARIES_TRUE@	libnm-util/nm-gvaluearray-compat.h \
@@ -7362,7 +7675,6 @@ data_edit = sed \
 @WITH_LEGACY_LIBRARIES_TRUE@	$(libnm_util_lib_h_pub_mkenums)
 
 @WITH_LEGACY_LIBRARIES_TRUE@libnm_util_lib_c_real =  \
-@WITH_LEGACY_LIBRARIES_TRUE@	shared/nm-utils/nm-shared-utils.c \
 @WITH_LEGACY_LIBRARIES_TRUE@	libnm-util/crypto.c \
 @WITH_LEGACY_LIBRARIES_TRUE@	libnm-util/nm-connection.c \
 @WITH_LEGACY_LIBRARIES_TRUE@	libnm-util/nm-param-spec-specialized.c \
@@ -7395,7 +7707,7 @@ data_edit = sed \
 @WITH_LEGACY_LIBRARIES_TRUE@	libnm-util/nm-setting-vpn.c \
 @WITH_LEGACY_LIBRARIES_TRUE@	libnm-util/nm-utils.c \
 @WITH_LEGACY_LIBRARIES_TRUE@	libnm-util/nm-value-transforms.c \
-@WITH_LEGACY_LIBRARIES_TRUE@	$(am__append_71) $(am__append_74)
+@WITH_LEGACY_LIBRARIES_TRUE@	$(am__append_72) $(am__append_75)
 @WITH_LEGACY_LIBRARIES_TRUE@libnm_util_lib_c_mkenums = \
 @WITH_LEGACY_LIBRARIES_TRUE@	libnm-util/nm-utils-enum-types.c
 
@@ -7410,21 +7722,21 @@ data_edit = sed \
 
 @WITH_LEGACY_LIBRARIES_TRUE@libnm_util_libnm_util_la_CPPFLAGS = $(libnm_util_cppflags)
 @WITH_LEGACY_LIBRARIES_TRUE@nm_utils_enum_types_sources = $(filter-out libnm-util/NetworkManager%,$(libnm_util_lib_h_pub_real))
-@WITH_LEGACY_LIBRARIES_TRUE@libnm_util_libnm_util_la_LIBADD =  \
+@WITH_LEGACY_LIBRARIES_TRUE@libnm_util_libnm_util_la_LIBADD = shared/nm-utils/libnm-utils-base.la \
 @WITH_LEGACY_LIBRARIES_TRUE@	$(GLIB_LIBS) $(DBUS_LIBS) \
-@WITH_LEGACY_LIBRARIES_TRUE@	$(UUID_LIBS) $(am__append_72) \
-@WITH_LEGACY_LIBRARIES_TRUE@	$(am__append_75)
+@WITH_LEGACY_LIBRARIES_TRUE@	$(UUID_LIBS) $(am__append_73) \
+@WITH_LEGACY_LIBRARIES_TRUE@	$(am__append_76)
 @WITH_LEGACY_LIBRARIES_TRUE@libnm_util_libnm_util_la_LDFLAGS = \
 @WITH_LEGACY_LIBRARIES_TRUE@	-Wl,--version-script=$(srcdir)/libnm-util/libnm-util.ver \
 @WITH_LEGACY_LIBRARIES_TRUE@	-version-info "9:0:7"
 
 @WITH_LEGACY_LIBRARIES_TRUE@libnm_util_libtest_crypto_la_SOURCES =  \
 @WITH_LEGACY_LIBRARIES_TRUE@	libnm-util/crypto.c \
-@WITH_LEGACY_LIBRARIES_TRUE@	$(am__append_78) $(am__append_80)
+@WITH_LEGACY_LIBRARIES_TRUE@	$(am__append_79) $(am__append_81)
 @WITH_LEGACY_LIBRARIES_TRUE@libnm_util_libtest_crypto_la_CPPFLAGS = $(libnm_util_cppflags)
 @WITH_LEGACY_LIBRARIES_TRUE@libnm_util_libtest_crypto_la_LIBADD =  \
-@WITH_LEGACY_LIBRARIES_TRUE@	$(GLIB_LIBS) $(am__append_79) \
-@WITH_LEGACY_LIBRARIES_TRUE@	$(am__append_81)
+@WITH_LEGACY_LIBRARIES_TRUE@	$(GLIB_LIBS) $(am__append_80) \
+@WITH_LEGACY_LIBRARIES_TRUE@	$(am__append_82)
 @HAVE_INTROSPECTION_TRUE@@WITH_LEGACY_LIBRARIES_TRUE@libnm_util_NetworkManager_1_0_gir_INCLUDES = GObject-2.0 DBusGLib-1.0
 @HAVE_INTROSPECTION_TRUE@@WITH_LEGACY_LIBRARIES_TRUE@libnm_util_NetworkManager_1_0_gir_PACKAGES = gobject-2.0 dbus-glib-1
 @HAVE_INTROSPECTION_TRUE@@WITH_LEGACY_LIBRARIES_TRUE@libnm_util_NetworkManager_1_0_gir_EXPORT_PACKAGES = libnm-util
@@ -7566,7 +7878,6 @@ data_edit = sed \
 @WITH_LEGACY_LIBRARIES_TRUE@	libnm-glib/nm-glib-enum-types.h
 
 @WITH_LEGACY_LIBRARIES_TRUE@libnm_glib_lib_h_priv = \
-@WITH_LEGACY_LIBRARIES_TRUE@	shared/nm-utils/nm-udev-utils.h \
 @WITH_LEGACY_LIBRARIES_TRUE@	libnm-glib/nm-object-private.h \
 @WITH_LEGACY_LIBRARIES_TRUE@	libnm-glib/nm-device-private.h \
 @WITH_LEGACY_LIBRARIES_TRUE@	libnm-glib/nm-types-private.h \
@@ -7595,7 +7906,6 @@ data_edit = sed \
 @WITH_LEGACY_LIBRARIES_TRUE@	$(libnm_glib_vpn_h_mkenums)
 
 @WITH_LEGACY_LIBRARIES_TRUE@libnm_glib_lib_c_real = \
-@WITH_LEGACY_LIBRARIES_TRUE@	shared/nm-utils/nm-udev-utils.c \
 @WITH_LEGACY_LIBRARIES_TRUE@	libnm-glib/nm-object.c \
 @WITH_LEGACY_LIBRARIES_TRUE@	libnm-glib/nm-dbus-helpers.c \
 @WITH_LEGACY_LIBRARIES_TRUE@	libnm-glib/nm-client.c \
@@ -7651,9 +7961,11 @@ data_edit = sed \
 @WITH_LEGACY_LIBRARIES_TRUE@libnm_glib_libnm_glib_la_LIBADD = \
 @WITH_LEGACY_LIBRARIES_TRUE@	libnm-util/libnm-util.la \
 @WITH_LEGACY_LIBRARIES_TRUE@	libnm-glib/libdeprecated-nm-glib.la \
+@WITH_LEGACY_LIBRARIES_TRUE@	shared/nm-utils/libnm-utils-udev.la \
 @WITH_LEGACY_LIBRARIES_TRUE@	$(GLIB_LIBS) \
 @WITH_LEGACY_LIBRARIES_TRUE@	$(DBUS_LIBS) \
-@WITH_LEGACY_LIBRARIES_TRUE@	$(LIBUDEV_LIBS)
+@WITH_LEGACY_LIBRARIES_TRUE@	$(LIBUDEV_LIBS) \
+@WITH_LEGACY_LIBRARIES_TRUE@	$(NULL)
 
 @WITH_LEGACY_LIBRARIES_TRUE@nm_glib_enum_types_sources = $(libnm_glib_lib_h_pub_real)
 @WITH_LEGACY_LIBRARIES_TRUE@libnm_glib_libnm_glib_test_CFLAGS = $(libnm_glib_cppflags)
@@ -8300,24 +8612,6 @@ clients/tui/newt/libnmt-newt.a: $(clients_tui_newt_libnmt_newt_a_OBJECTS) $(clie
 	$(AM_V_at)-rm -f clients/tui/newt/libnmt-newt.a
 	$(AM_V_AR)$(clients_tui_newt_libnmt_newt_a_AR) clients/tui/newt/libnmt-newt.a $(clients_tui_newt_libnmt_newt_a_OBJECTS) $(clients_tui_newt_libnmt_newt_a_LIBADD)
 	$(AM_V_at)$(RANLIB) clients/tui/newt/libnmt-newt.a
-shared/nm-utils/$(am__dirstamp):
-	@$(MKDIR_P) shared/nm-utils
-	@: > shared/nm-utils/$(am__dirstamp)
-shared/nm-utils/$(DEPDIR)/$(am__dirstamp):
-	@$(MKDIR_P) shared/nm-utils/$(DEPDIR)
-	@: > shared/nm-utils/$(DEPDIR)/$(am__dirstamp)
-shared/nm-utils/clients_common_libnmc_base_la-nm-enum-utils.lo:  \
-	shared/nm-utils/$(am__dirstamp) \
-	shared/nm-utils/$(DEPDIR)/$(am__dirstamp)
-shared/nm-utils/clients_common_libnmc_base_la-nm-hash-utils.lo:  \
-	shared/nm-utils/$(am__dirstamp) \
-	shared/nm-utils/$(DEPDIR)/$(am__dirstamp)
-shared/nm-utils/clients_common_libnmc_base_la-nm-random-utils.lo:  \
-	shared/nm-utils/$(am__dirstamp) \
-	shared/nm-utils/$(DEPDIR)/$(am__dirstamp)
-shared/nm-utils/clients_common_libnmc_base_la-nm-shared-utils.lo:  \
-	shared/nm-utils/$(am__dirstamp) \
-	shared/nm-utils/$(DEPDIR)/$(am__dirstamp)
 clients/common/$(am__dirstamp):
 	@$(MKDIR_P) clients/common
 	@: > clients/common/$(am__dirstamp)
@@ -8376,42 +8670,45 @@ introspection/$(DEPDIR)/$(am__dirstamp):
 introspection/libnmdbus_la-org.freedesktop.NetworkManager.AccessPoint.lo:  \
 	introspection/$(am__dirstamp) \
 	introspection/$(DEPDIR)/$(am__dirstamp)
-introspection/libnmdbus_la-org.freedesktop.NetworkManager.Connection.Active.lo:  \
-	introspection/$(am__dirstamp) \
-	introspection/$(DEPDIR)/$(am__dirstamp)
 introspection/libnmdbus_la-org.freedesktop.NetworkManager.AgentManager.lo:  \
 	introspection/$(am__dirstamp) \
 	introspection/$(DEPDIR)/$(am__dirstamp)
 introspection/libnmdbus_la-org.freedesktop.NetworkManager.Checkpoint.lo:  \
 	introspection/$(am__dirstamp) \
 	introspection/$(DEPDIR)/$(am__dirstamp)
-introspection/libnmdbus_la-org.freedesktop.NetworkManager.Device.Adsl.lo:  \
+introspection/libnmdbus_la-org.freedesktop.NetworkManager.Connection.Active.lo:  \
 	introspection/$(am__dirstamp) \
 	introspection/$(DEPDIR)/$(am__dirstamp)
-introspection/libnmdbus_la-org.freedesktop.NetworkManager.Device.Bond.lo:  \
+introspection/libnmdbus_la-org.freedesktop.NetworkManager.DHCP4Config.lo:  \
 	introspection/$(am__dirstamp) \
 	introspection/$(DEPDIR)/$(am__dirstamp)
-introspection/libnmdbus_la-org.freedesktop.NetworkManager.Device.Bridge.lo:  \
+introspection/libnmdbus_la-org.freedesktop.NetworkManager.DHCP6Config.lo:  \
+	introspection/$(am__dirstamp) \
+	introspection/$(DEPDIR)/$(am__dirstamp)
+introspection/libnmdbus_la-org.freedesktop.NetworkManager.Device.Adsl.lo:  \
 	introspection/$(am__dirstamp) \
 	introspection/$(DEPDIR)/$(am__dirstamp)
 introspection/libnmdbus_la-org.freedesktop.NetworkManager.Device.Bluetooth.lo:  \
 	introspection/$(am__dirstamp) \
 	introspection/$(DEPDIR)/$(am__dirstamp)
-introspection/libnmdbus_la-org.freedesktop.NetworkManager.Device.Dummy.lo:  \
+introspection/libnmdbus_la-org.freedesktop.NetworkManager.Device.Bond.lo:  \
 	introspection/$(am__dirstamp) \
 	introspection/$(DEPDIR)/$(am__dirstamp)
-introspection/libnmdbus_la-org.freedesktop.NetworkManager.Device.Wired.lo:  \
+introspection/libnmdbus_la-org.freedesktop.NetworkManager.Device.Bridge.lo:  \
 	introspection/$(am__dirstamp) \
 	introspection/$(DEPDIR)/$(am__dirstamp)
-introspection/libnmdbus_la-org.freedesktop.NetworkManager.Device.Generic.lo:  \
+introspection/libnmdbus_la-org.freedesktop.NetworkManager.Device.Dummy.lo:  \
 	introspection/$(am__dirstamp) \
 	introspection/$(DEPDIR)/$(am__dirstamp)
-introspection/libnmdbus_la-org.freedesktop.NetworkManager.Device.Infiniband.lo:  \
+introspection/libnmdbus_la-org.freedesktop.NetworkManager.Device.Generic.lo:  \
 	introspection/$(am__dirstamp) \
 	introspection/$(DEPDIR)/$(am__dirstamp)
 introspection/libnmdbus_la-org.freedesktop.NetworkManager.Device.IPTunnel.lo:  \
 	introspection/$(am__dirstamp) \
 	introspection/$(DEPDIR)/$(am__dirstamp)
+introspection/libnmdbus_la-org.freedesktop.NetworkManager.Device.Infiniband.lo:  \
+	introspection/$(am__dirstamp) \
+	introspection/$(DEPDIR)/$(am__dirstamp)
 introspection/libnmdbus_la-org.freedesktop.NetworkManager.Device.Lowpan.lo:  \
 	introspection/$(am__dirstamp) \
 	introspection/$(DEPDIR)/$(am__dirstamp)
@@ -8427,13 +8724,13 @@ introspection/libnmdbus_la-org.freedesktop.NetworkManager.Device.Modem.lo:  \
 introspection/libnmdbus_la-org.freedesktop.NetworkManager.Device.OlpcMesh.lo:  \
 	introspection/$(am__dirstamp) \
 	introspection/$(DEPDIR)/$(am__dirstamp)
-introspection/libnmdbus_la-org.freedesktop.NetworkManager.Device.OvsInterface.lo:  \
+introspection/libnmdbus_la-org.freedesktop.NetworkManager.Device.OvsBridge.lo:  \
 	introspection/$(am__dirstamp) \
 	introspection/$(DEPDIR)/$(am__dirstamp)
-introspection/libnmdbus_la-org.freedesktop.NetworkManager.Device.OvsPort.lo:  \
+introspection/libnmdbus_la-org.freedesktop.NetworkManager.Device.OvsInterface.lo:  \
 	introspection/$(am__dirstamp) \
 	introspection/$(DEPDIR)/$(am__dirstamp)
-introspection/libnmdbus_la-org.freedesktop.NetworkManager.Device.OvsBridge.lo:  \
+introspection/libnmdbus_la-org.freedesktop.NetworkManager.Device.OvsPort.lo:  \
 	introspection/$(am__dirstamp) \
 	introspection/$(DEPDIR)/$(am__dirstamp)
 introspection/libnmdbus_la-org.freedesktop.NetworkManager.Device.Ppp.lo:  \
@@ -8457,25 +8754,25 @@ introspection/libnmdbus_la-org.freedesktop.NetworkManager.Device.Vlan.lo:  \
 introspection/libnmdbus_la-org.freedesktop.NetworkManager.Device.Vxlan.lo:  \
 	introspection/$(am__dirstamp) \
 	introspection/$(DEPDIR)/$(am__dirstamp)
-introspection/libnmdbus_la-org.freedesktop.NetworkManager.Device.WireGuard.lo:  \
+introspection/libnmdbus_la-org.freedesktop.NetworkManager.Device.WiMax.lo:  \
 	introspection/$(am__dirstamp) \
 	introspection/$(DEPDIR)/$(am__dirstamp)
-introspection/libnmdbus_la-org.freedesktop.NetworkManager.Device.Wireless.lo:  \
+introspection/libnmdbus_la-org.freedesktop.NetworkManager.Device.WifiP2P.lo:  \
 	introspection/$(am__dirstamp) \
 	introspection/$(DEPDIR)/$(am__dirstamp)
-introspection/libnmdbus_la-org.freedesktop.NetworkManager.Device.WiMax.lo:  \
+introspection/libnmdbus_la-org.freedesktop.NetworkManager.Device.WireGuard.lo:  \
 	introspection/$(am__dirstamp) \
 	introspection/$(DEPDIR)/$(am__dirstamp)
-introspection/libnmdbus_la-org.freedesktop.NetworkManager.Device.Wpan.lo:  \
+introspection/libnmdbus_la-org.freedesktop.NetworkManager.Device.Wired.lo:  \
 	introspection/$(am__dirstamp) \
 	introspection/$(DEPDIR)/$(am__dirstamp)
-introspection/libnmdbus_la-org.freedesktop.NetworkManager.Device.lo:  \
+introspection/libnmdbus_la-org.freedesktop.NetworkManager.Device.Wireless.lo:  \
 	introspection/$(am__dirstamp) \
 	introspection/$(DEPDIR)/$(am__dirstamp)
-introspection/libnmdbus_la-org.freedesktop.NetworkManager.DHCP4Config.lo:  \
+introspection/libnmdbus_la-org.freedesktop.NetworkManager.Device.Wpan.lo:  \
 	introspection/$(am__dirstamp) \
 	introspection/$(DEPDIR)/$(am__dirstamp)
-introspection/libnmdbus_la-org.freedesktop.NetworkManager.DHCP6Config.lo:  \
+introspection/libnmdbus_la-org.freedesktop.NetworkManager.Device.lo:  \
 	introspection/$(am__dirstamp) \
 	introspection/$(DEPDIR)/$(am__dirstamp)
 introspection/libnmdbus_la-org.freedesktop.NetworkManager.DnsManager.lo:  \
@@ -8487,7 +8784,7 @@ introspection/libnmdbus_la-org.freedesktop.NetworkManager.IP4Config.lo:  \
 introspection/libnmdbus_la-org.freedesktop.NetworkManager.IP6Config.lo:  \
 	introspection/$(am__dirstamp) \
 	introspection/$(DEPDIR)/$(am__dirstamp)
-introspection/libnmdbus_la-org.freedesktop.NetworkManager.lo:  \
+introspection/libnmdbus_la-org.freedesktop.NetworkManager.WifiP2PPeer.lo:  \
 	introspection/$(am__dirstamp) \
 	introspection/$(DEPDIR)/$(am__dirstamp)
 introspection/libnmdbus_la-org.freedesktop.NetworkManager.PPP.lo:  \
@@ -8508,6 +8805,9 @@ introspection/libnmdbus_la-org.freedesktop.NetworkManager.VPN.Connection.lo:  \
 introspection/libnmdbus_la-org.freedesktop.NetworkManager.VPN.Plugin.lo:  \
 	introspection/$(am__dirstamp) \
 	introspection/$(DEPDIR)/$(am__dirstamp)
+introspection/libnmdbus_la-org.freedesktop.NetworkManager.lo:  \
+	introspection/$(am__dirstamp) \
+	introspection/$(DEPDIR)/$(am__dirstamp)
 
 introspection/libnmdbus.la: $(introspection_libnmdbus_la_OBJECTS) $(introspection_libnmdbus_la_DEPENDENCIES) $(EXTRA_introspection_libnmdbus_la_DEPENDENCIES) introspection/$(am__dirstamp)
 	$(AM_V_CCLD)$(LINK)  $(introspection_libnmdbus_la_OBJECTS) $(introspection_libnmdbus_la_LIBADD) $(LIBS)
@@ -8637,12 +8937,18 @@ libnm-core/libnm_core_la-nm-setting-vpn.lo:  \
 libnm-core/libnm_core_la-nm-setting-vxlan.lo:  \
 	libnm-core/$(am__dirstamp) \
 	libnm-core/$(DEPDIR)/$(am__dirstamp)
+libnm-core/libnm_core_la-nm-setting-wifi-p2p.lo:  \
+	libnm-core/$(am__dirstamp) \
+	libnm-core/$(DEPDIR)/$(am__dirstamp)
 libnm-core/libnm_core_la-nm-setting-wimax.lo:  \
 	libnm-core/$(am__dirstamp) \
 	libnm-core/$(DEPDIR)/$(am__dirstamp)
 libnm-core/libnm_core_la-nm-setting-wired.lo:  \
 	libnm-core/$(am__dirstamp) \
 	libnm-core/$(DEPDIR)/$(am__dirstamp)
+libnm-core/libnm_core_la-nm-setting-wireguard.lo:  \
+	libnm-core/$(am__dirstamp) \
+	libnm-core/$(DEPDIR)/$(am__dirstamp)
 libnm-core/libnm_core_la-nm-setting-wireless-security.lo:  \
 	libnm-core/$(am__dirstamp) \
 	libnm-core/$(DEPDIR)/$(am__dirstamp)
@@ -8652,33 +8958,6 @@ libnm-core/libnm_core_la-nm-setting-wireless.lo:  \
 libnm-core/libnm_core_la-nm-setting-wpan.lo:  \
 	libnm-core/$(am__dirstamp) \
 	libnm-core/$(DEPDIR)/$(am__dirstamp)
-shared/nm-utils/libnm_core_libnm_core_la-c-list-util.lo:  \
-	shared/nm-utils/$(am__dirstamp) \
-	shared/nm-utils/$(DEPDIR)/$(am__dirstamp)
-shared/nm-utils/libnm_core_libnm_core_la-nm-dedup-multi.lo:  \
-	shared/nm-utils/$(am__dirstamp) \
-	shared/nm-utils/$(DEPDIR)/$(am__dirstamp)
-shared/nm-utils/libnm_core_libnm_core_la-nm-enum-utils.lo:  \
-	shared/nm-utils/$(am__dirstamp) \
-	shared/nm-utils/$(DEPDIR)/$(am__dirstamp)
-shared/nm-utils/libnm_core_libnm_core_la-nm-hash-utils.lo:  \
-	shared/nm-utils/$(am__dirstamp) \
-	shared/nm-utils/$(DEPDIR)/$(am__dirstamp)
-shared/nm-utils/libnm_core_libnm_core_la-nm-io-utils.lo:  \
-	shared/nm-utils/$(am__dirstamp) \
-	shared/nm-utils/$(DEPDIR)/$(am__dirstamp)
-shared/nm-utils/libnm_core_libnm_core_la-nm-secret-utils.lo:  \
-	shared/nm-utils/$(am__dirstamp) \
-	shared/nm-utils/$(DEPDIR)/$(am__dirstamp)
-shared/nm-utils/libnm_core_libnm_core_la-nm-shared-utils.lo:  \
-	shared/nm-utils/$(am__dirstamp) \
-	shared/nm-utils/$(DEPDIR)/$(am__dirstamp)
-shared/nm-utils/libnm_core_libnm_core_la-nm-random-utils.lo:  \
-	shared/nm-utils/$(am__dirstamp) \
-	shared/nm-utils/$(DEPDIR)/$(am__dirstamp)
-shared/nm-utils/libnm_core_libnm_core_la-nm-udev-utils.lo:  \
-	shared/nm-utils/$(am__dirstamp) \
-	shared/nm-utils/$(DEPDIR)/$(am__dirstamp)
 shared/libnm_core_libnm_core_la-nm-ethtool-utils.lo:  \
 	shared/$(am__dirstamp) shared/$(DEPDIR)/$(am__dirstamp)
 shared/libnm_core_libnm_core_la-nm-meta-setting.lo:  \
@@ -8759,9 +9038,6 @@ libnm-glib/libnm_glib_vpn_la-nm-vpn-enum-types.lo:  \
 
 libnm-glib/libnm-glib-vpn.la: $(libnm_glib_libnm_glib_vpn_la_OBJECTS) $(libnm_glib_libnm_glib_vpn_la_DEPENDENCIES) $(EXTRA_libnm_glib_libnm_glib_vpn_la_DEPENDENCIES) libnm-glib/$(am__dirstamp)
 	$(AM_V_CCLD)$(libnm_glib_libnm_glib_vpn_la_LINK) $(am_libnm_glib_libnm_glib_vpn_la_rpath) $(libnm_glib_libnm_glib_vpn_la_OBJECTS) $(libnm_glib_libnm_glib_vpn_la_LIBADD) $(LIBS)
-shared/nm-utils/libnm_glib_libnm_glib_la-nm-udev-utils.lo:  \
-	shared/nm-utils/$(am__dirstamp) \
-	shared/nm-utils/$(DEPDIR)/$(am__dirstamp)
 libnm-glib/libnm_glib_la-nm-object.lo: libnm-glib/$(am__dirstamp) \
 	libnm-glib/$(DEPDIR)/$(am__dirstamp)
 libnm-glib/libnm_glib_la-nm-dbus-helpers.lo:  \
@@ -8850,9 +9126,6 @@ libnm-glib/libnm_glib_la-nm-glib-enum-types.lo:  \
 
 libnm-glib/libnm-glib.la: $(libnm_glib_libnm_glib_la_OBJECTS) $(libnm_glib_libnm_glib_la_DEPENDENCIES) $(EXTRA_libnm_glib_libnm_glib_la_DEPENDENCIES) libnm-glib/$(am__dirstamp)
 	$(AM_V_CCLD)$(libnm_glib_libnm_glib_la_LINK) $(am_libnm_glib_libnm_glib_la_rpath) $(libnm_glib_libnm_glib_la_OBJECTS) $(libnm_glib_libnm_glib_la_LIBADD) $(LIBS)
-shared/nm-utils/libnm_util_libnm_util_la-nm-shared-utils.lo:  \
-	shared/nm-utils/$(am__dirstamp) \
-	shared/nm-utils/$(DEPDIR)/$(am__dirstamp)
 libnm-util/$(am__dirstamp):
 	@$(MKDIR_P) libnm-util
 	@: > libnm-util/$(am__dirstamp)
@@ -9030,12 +9303,12 @@ libnm/libnm_la-nm-device-modem.lo: libnm/$(am__dirstamp) \
 	libnm/$(DEPDIR)/$(am__dirstamp)
 libnm/libnm_la-nm-device-olpc-mesh.lo: libnm/$(am__dirstamp) \
 	libnm/$(DEPDIR)/$(am__dirstamp)
+libnm/libnm_la-nm-device-ovs-bridge.lo: libnm/$(am__dirstamp) \
+	libnm/$(DEPDIR)/$(am__dirstamp)
 libnm/libnm_la-nm-device-ovs-interface.lo: libnm/$(am__dirstamp) \
 	libnm/$(DEPDIR)/$(am__dirstamp)
 libnm/libnm_la-nm-device-ovs-port.lo: libnm/$(am__dirstamp) \
 	libnm/$(DEPDIR)/$(am__dirstamp)
-libnm/libnm_la-nm-device-ovs-bridge.lo: libnm/$(am__dirstamp) \
-	libnm/$(DEPDIR)/$(am__dirstamp)
 libnm/libnm_la-nm-device-ppp.lo: libnm/$(am__dirstamp) \
 	libnm/$(DEPDIR)/$(am__dirstamp)
 libnm/libnm_la-nm-device-team.lo: libnm/$(am__dirstamp) \
@@ -9046,6 +9319,8 @@ libnm/libnm_la-nm-device-vlan.lo: libnm/$(am__dirstamp) \
 	libnm/$(DEPDIR)/$(am__dirstamp)
 libnm/libnm_la-nm-device-vxlan.lo: libnm/$(am__dirstamp) \
 	libnm/$(DEPDIR)/$(am__dirstamp)
+libnm/libnm_la-nm-device-wifi-p2p.lo: libnm/$(am__dirstamp) \
+	libnm/$(DEPDIR)/$(am__dirstamp)
 libnm/libnm_la-nm-device-wifi.lo: libnm/$(am__dirstamp) \
 	libnm/$(DEPDIR)/$(am__dirstamp)
 libnm/libnm_la-nm-device-wimax.lo: libnm/$(am__dirstamp) \
@@ -9082,12 +9357,14 @@ libnm/libnm_la-nm-secret-agent-old.lo: libnm/$(am__dirstamp) \
 	libnm/$(DEPDIR)/$(am__dirstamp)
 libnm/libnm_la-nm-vpn-connection.lo: libnm/$(am__dirstamp) \
 	libnm/$(DEPDIR)/$(am__dirstamp)
-libnm/libnm_la-nm-vpn-plugin-old.lo: libnm/$(am__dirstamp) \
-	libnm/$(DEPDIR)/$(am__dirstamp)
 libnm/libnm_la-nm-vpn-editor.lo: libnm/$(am__dirstamp) \
 	libnm/$(DEPDIR)/$(am__dirstamp)
+libnm/libnm_la-nm-vpn-plugin-old.lo: libnm/$(am__dirstamp) \
+	libnm/$(DEPDIR)/$(am__dirstamp)
 libnm/libnm_la-nm-vpn-service-plugin.lo: libnm/$(am__dirstamp) \
 	libnm/$(DEPDIR)/$(am__dirstamp)
+libnm/libnm_la-nm-wifi-p2p-peer.lo: libnm/$(am__dirstamp) \
+	libnm/$(DEPDIR)/$(am__dirstamp)
 libnm/libnm_la-nm-wimax-nsp.lo: libnm/$(am__dirstamp) \
 	libnm/$(DEPDIR)/$(am__dirstamp)
 libnm/libnm_la-nm-enum-types.lo: libnm/$(am__dirstamp) \
@@ -9095,6 +9372,12 @@ libnm/libnm_la-nm-enum-types.lo: libnm/$(am__dirstamp) \
 
 libnm/libnm.la: $(libnm_libnm_la_OBJECTS) $(libnm_libnm_la_DEPENDENCIES) $(EXTRA_libnm_libnm_la_DEPENDENCIES) libnm/$(am__dirstamp)
 	$(AM_V_CCLD)$(libnm_libnm_la_LINK) -rpath $(libdir) $(libnm_libnm_la_OBJECTS) $(libnm_libnm_la_LIBADD) $(LIBS)
+shared/nm-utils/$(am__dirstamp):
+	@$(MKDIR_P) shared/nm-utils
+	@: > shared/nm-utils/$(am__dirstamp)
+shared/nm-utils/$(DEPDIR)/$(am__dirstamp):
+	@$(MKDIR_P) shared/nm-utils/$(DEPDIR)
+	@: > shared/nm-utils/$(DEPDIR)/$(am__dirstamp)
 shared/nm-utils/libnm_tests_libnm_vpn_plugin_utils_test_la-nm-vpn-plugin-utils.lo:  \
 	shared/nm-utils/$(am__dirstamp) \
 	shared/nm-utils/$(DEPDIR)/$(am__dirstamp)
@@ -9104,6 +9387,18 @@ libnm/tests/$(am__dirstamp):
 
 libnm/tests/libnm-vpn-plugin-utils-test.la: $(libnm_tests_libnm_vpn_plugin_utils_test_la_OBJECTS) $(libnm_tests_libnm_vpn_plugin_utils_test_la_DEPENDENCIES) $(EXTRA_libnm_tests_libnm_vpn_plugin_utils_test_la_DEPENDENCIES) libnm/tests/$(am__dirstamp)
 	$(AM_V_CCLD)$(libnm_tests_libnm_vpn_plugin_utils_test_la_LINK) $(am_libnm_tests_libnm_vpn_plugin_utils_test_la_rpath) $(libnm_tests_libnm_vpn_plugin_utils_test_la_OBJECTS) $(libnm_tests_libnm_vpn_plugin_utils_test_la_LIBADD) $(LIBS)
+shared/c-rbtree/src/$(am__dirstamp):
+	@$(MKDIR_P) shared/c-rbtree/src
+	@: > shared/c-rbtree/src/$(am__dirstamp)
+shared/c-rbtree/src/$(DEPDIR)/$(am__dirstamp):
+	@$(MKDIR_P) shared/c-rbtree/src/$(DEPDIR)
+	@: > shared/c-rbtree/src/$(DEPDIR)/$(am__dirstamp)
+shared/c-rbtree/src/libcrbtree_la-c-rbtree.lo:  \
+	shared/c-rbtree/src/$(am__dirstamp) \
+	shared/c-rbtree/src/$(DEPDIR)/$(am__dirstamp)
+
+shared/libcrbtree.la: $(shared_libcrbtree_la_OBJECTS) $(shared_libcrbtree_la_DEPENDENCIES) $(EXTRA_shared_libcrbtree_la_DEPENDENCIES) shared/$(am__dirstamp)
+	$(AM_V_CCLD)$(shared_libcrbtree_la_LINK)  $(shared_libcrbtree_la_OBJECTS) $(shared_libcrbtree_la_LIBADD) $(LIBS)
 shared/c-siphash/src/$(am__dirstamp):
 	@$(MKDIR_P) shared/c-siphash/src
 	@: > shared/c-siphash/src/$(am__dirstamp)
@@ -9125,9 +9420,180 @@ shared/n-acd/src/$(DEPDIR)/$(am__dirstamp):
 shared/n-acd/src/libnacd_la-n-acd.lo:  \
 	shared/n-acd/src/$(am__dirstamp) \
 	shared/n-acd/src/$(DEPDIR)/$(am__dirstamp)
+shared/n-acd/src/libnacd_la-n-acd-probe.lo:  \
+	shared/n-acd/src/$(am__dirstamp) \
+	shared/n-acd/src/$(DEPDIR)/$(am__dirstamp)
+shared/n-acd/src/util/$(am__dirstamp):
+	@$(MKDIR_P) shared/n-acd/src/util
+	@: > shared/n-acd/src/util/$(am__dirstamp)
+shared/n-acd/src/util/$(DEPDIR)/$(am__dirstamp):
+	@$(MKDIR_P) shared/n-acd/src/util/$(DEPDIR)
+	@: > shared/n-acd/src/util/$(DEPDIR)/$(am__dirstamp)
+shared/n-acd/src/util/libnacd_la-timer.lo:  \
+	shared/n-acd/src/util/$(am__dirstamp) \
+	shared/n-acd/src/util/$(DEPDIR)/$(am__dirstamp)
+shared/n-acd/src/libnacd_la-n-acd-bpf.lo:  \
+	shared/n-acd/src/$(am__dirstamp) \
+	shared/n-acd/src/$(DEPDIR)/$(am__dirstamp)
+shared/n-acd/src/libnacd_la-n-acd-bpf-fallback.lo:  \
+	shared/n-acd/src/$(am__dirstamp) \
+	shared/n-acd/src/$(DEPDIR)/$(am__dirstamp)
 
 shared/libnacd.la: $(shared_libnacd_la_OBJECTS) $(shared_libnacd_la_DEPENDENCIES) $(EXTRA_shared_libnacd_la_DEPENDENCIES) shared/$(am__dirstamp)
 	$(AM_V_CCLD)$(shared_libnacd_la_LINK)  $(shared_libnacd_la_OBJECTS) $(shared_libnacd_la_LIBADD) $(LIBS)
+shared/nm-utils/libnm_utils_base_la-c-list-util.lo:  \
+	shared/nm-utils/$(am__dirstamp) \
+	shared/nm-utils/$(DEPDIR)/$(am__dirstamp)
+shared/nm-utils/libnm_utils_base_la-nm-dedup-multi.lo:  \
+	shared/nm-utils/$(am__dirstamp) \
+	shared/nm-utils/$(DEPDIR)/$(am__dirstamp)
+shared/nm-utils/libnm_utils_base_la-nm-enum-utils.lo:  \
+	shared/nm-utils/$(am__dirstamp) \
+	shared/nm-utils/$(DEPDIR)/$(am__dirstamp)
+shared/nm-utils/libnm_utils_base_la-nm-errno.lo:  \
+	shared/nm-utils/$(am__dirstamp) \
+	shared/nm-utils/$(DEPDIR)/$(am__dirstamp)
+shared/nm-utils/libnm_utils_base_la-nm-hash-utils.lo:  \
+	shared/nm-utils/$(am__dirstamp) \
+	shared/nm-utils/$(DEPDIR)/$(am__dirstamp)
+shared/nm-utils/libnm_utils_base_la-nm-io-utils.lo:  \
+	shared/nm-utils/$(am__dirstamp) \
+	shared/nm-utils/$(DEPDIR)/$(am__dirstamp)
+shared/nm-utils/libnm_utils_base_la-nm-random-utils.lo:  \
+	shared/nm-utils/$(am__dirstamp) \
+	shared/nm-utils/$(DEPDIR)/$(am__dirstamp)
+shared/nm-utils/libnm_utils_base_la-nm-secret-utils.lo:  \
+	shared/nm-utils/$(am__dirstamp) \
+	shared/nm-utils/$(DEPDIR)/$(am__dirstamp)
+shared/nm-utils/libnm_utils_base_la-nm-shared-utils.lo:  \
+	shared/nm-utils/$(am__dirstamp) \
+	shared/nm-utils/$(DEPDIR)/$(am__dirstamp)
+shared/nm-utils/libnm_utils_base_la-nm-time-utils.lo:  \
+	shared/nm-utils/$(am__dirstamp) \
+	shared/nm-utils/$(DEPDIR)/$(am__dirstamp)
+
+shared/nm-utils/libnm-utils-base.la: $(shared_nm_utils_libnm_utils_base_la_OBJECTS) $(shared_nm_utils_libnm_utils_base_la_DEPENDENCIES) $(EXTRA_shared_nm_utils_libnm_utils_base_la_DEPENDENCIES) shared/nm-utils/$(am__dirstamp)
+	$(AM_V_CCLD)$(shared_nm_utils_libnm_utils_base_la_LINK)  $(shared_nm_utils_libnm_utils_base_la_OBJECTS) $(shared_nm_utils_libnm_utils_base_la_LIBADD) $(LIBS)
+shared/nm-utils/libnm_utils_udev_la-nm-udev-utils.lo:  \
+	shared/nm-utils/$(am__dirstamp) \
+	shared/nm-utils/$(DEPDIR)/$(am__dirstamp)
+
+shared/nm-utils/libnm-utils-udev.la: $(shared_nm_utils_libnm_utils_udev_la_OBJECTS) $(shared_nm_utils_libnm_utils_udev_la_DEPENDENCIES) $(EXTRA_shared_nm_utils_libnm_utils_udev_la_DEPENDENCIES) shared/nm-utils/$(am__dirstamp)
+	$(AM_V_CCLD)$(shared_nm_utils_libnm_utils_udev_la_LINK)  $(shared_nm_utils_libnm_utils_udev_la_OBJECTS) $(shared_nm_utils_libnm_utils_udev_la_LIBADD) $(LIBS)
+shared/systemd/$(am__dirstamp):
+	@$(MKDIR_P) shared/systemd
+	@: > shared/systemd/$(am__dirstamp)
+shared/systemd/$(DEPDIR)/$(am__dirstamp):
+	@$(MKDIR_P) shared/systemd/$(DEPDIR)
+	@: > shared/systemd/$(DEPDIR)/$(am__dirstamp)
+shared/systemd/libnm_systemd_logging_stub_la-nm-logging-stub.lo:  \
+	shared/systemd/$(am__dirstamp) \
+	shared/systemd/$(DEPDIR)/$(am__dirstamp)
+
+shared/systemd/libnm-systemd-logging-stub.la: $(shared_systemd_libnm_systemd_logging_stub_la_OBJECTS) $(shared_systemd_libnm_systemd_logging_stub_la_DEPENDENCIES) $(EXTRA_shared_systemd_libnm_systemd_logging_stub_la_DEPENDENCIES) shared/systemd/$(am__dirstamp)
+	$(AM_V_CCLD)$(LINK)  $(shared_systemd_libnm_systemd_logging_stub_la_OBJECTS) $(shared_systemd_libnm_systemd_logging_stub_la_LIBADD) $(LIBS)
+shared/systemd/libnm_systemd_shared_la-nm-sd-utils-shared.lo:  \
+	shared/systemd/$(am__dirstamp) \
+	shared/systemd/$(DEPDIR)/$(am__dirstamp)
+shared/systemd/src/basic/$(am__dirstamp):
+	@$(MKDIR_P) shared/systemd/src/basic
+	@: > shared/systemd/src/basic/$(am__dirstamp)
+shared/systemd/src/basic/$(DEPDIR)/$(am__dirstamp):
+	@$(MKDIR_P) shared/systemd/src/basic/$(DEPDIR)
+	@: > shared/systemd/src/basic/$(DEPDIR)/$(am__dirstamp)
+shared/systemd/src/basic/libnm_systemd_shared_la-alloc-util.lo:  \
+	shared/systemd/src/basic/$(am__dirstamp) \
+	shared/systemd/src/basic/$(DEPDIR)/$(am__dirstamp)
+shared/systemd/src/basic/libnm_systemd_shared_la-env-file.lo:  \
+	shared/systemd/src/basic/$(am__dirstamp) \
+	shared/systemd/src/basic/$(DEPDIR)/$(am__dirstamp)
+shared/systemd/src/basic/libnm_systemd_shared_la-env-util.lo:  \
+	shared/systemd/src/basic/$(am__dirstamp) \
+	shared/systemd/src/basic/$(DEPDIR)/$(am__dirstamp)
+shared/systemd/src/basic/libnm_systemd_shared_la-escape.lo:  \
+	shared/systemd/src/basic/$(am__dirstamp) \
+	shared/systemd/src/basic/$(DEPDIR)/$(am__dirstamp)
+shared/systemd/src/basic/libnm_systemd_shared_la-ether-addr-util.lo:  \
+	shared/systemd/src/basic/$(am__dirstamp) \
+	shared/systemd/src/basic/$(DEPDIR)/$(am__dirstamp)
+shared/systemd/src/basic/libnm_systemd_shared_la-extract-word.lo:  \
+	shared/systemd/src/basic/$(am__dirstamp) \
+	shared/systemd/src/basic/$(DEPDIR)/$(am__dirstamp)
+shared/systemd/src/basic/libnm_systemd_shared_la-fd-util.lo:  \
+	shared/systemd/src/basic/$(am__dirstamp) \
+	shared/systemd/src/basic/$(DEPDIR)/$(am__dirstamp)
+shared/systemd/src/basic/libnm_systemd_shared_la-fileio.lo:  \
+	shared/systemd/src/basic/$(am__dirstamp) \
+	shared/systemd/src/basic/$(DEPDIR)/$(am__dirstamp)
+shared/systemd/src/basic/libnm_systemd_shared_la-fs-util.lo:  \
+	shared/systemd/src/basic/$(am__dirstamp) \
+	shared/systemd/src/basic/$(DEPDIR)/$(am__dirstamp)
+shared/systemd/src/basic/libnm_systemd_shared_la-hash-funcs.lo:  \
+	shared/systemd/src/basic/$(am__dirstamp) \
+	shared/systemd/src/basic/$(DEPDIR)/$(am__dirstamp)
+shared/systemd/src/basic/libnm_systemd_shared_la-hashmap.lo:  \
+	shared/systemd/src/basic/$(am__dirstamp) \
+	shared/systemd/src/basic/$(DEPDIR)/$(am__dirstamp)
+shared/systemd/src/basic/libnm_systemd_shared_la-hexdecoct.lo:  \
+	shared/systemd/src/basic/$(am__dirstamp) \
+	shared/systemd/src/basic/$(DEPDIR)/$(am__dirstamp)
+shared/systemd/src/basic/libnm_systemd_shared_la-hostname-util.lo:  \
+	shared/systemd/src/basic/$(am__dirstamp) \
+	shared/systemd/src/basic/$(DEPDIR)/$(am__dirstamp)
+shared/systemd/src/basic/libnm_systemd_shared_la-in-addr-util.lo:  \
+	shared/systemd/src/basic/$(am__dirstamp) \
+	shared/systemd/src/basic/$(DEPDIR)/$(am__dirstamp)
+shared/systemd/src/basic/libnm_systemd_shared_la-io-util.lo:  \
+	shared/systemd/src/basic/$(am__dirstamp) \
+	shared/systemd/src/basic/$(DEPDIR)/$(am__dirstamp)
+shared/systemd/src/basic/libnm_systemd_shared_la-mempool.lo:  \
+	shared/systemd/src/basic/$(am__dirstamp) \
+	shared/systemd/src/basic/$(DEPDIR)/$(am__dirstamp)
+shared/systemd/src/basic/libnm_systemd_shared_la-parse-util.lo:  \
+	shared/systemd/src/basic/$(am__dirstamp) \
+	shared/systemd/src/basic/$(DEPDIR)/$(am__dirstamp)
+shared/systemd/src/basic/libnm_systemd_shared_la-path-util.lo:  \
+	shared/systemd/src/basic/$(am__dirstamp) \
+	shared/systemd/src/basic/$(DEPDIR)/$(am__dirstamp)
+shared/systemd/src/basic/libnm_systemd_shared_la-prioq.lo:  \
+	shared/systemd/src/basic/$(am__dirstamp) \
+	shared/systemd/src/basic/$(DEPDIR)/$(am__dirstamp)
+shared/systemd/src/basic/libnm_systemd_shared_la-process-util.lo:  \
+	shared/systemd/src/basic/$(am__dirstamp) \
+	shared/systemd/src/basic/$(DEPDIR)/$(am__dirstamp)
+shared/systemd/src/basic/libnm_systemd_shared_la-random-util.lo:  \
+	shared/systemd/src/basic/$(am__dirstamp) \
+	shared/systemd/src/basic/$(DEPDIR)/$(am__dirstamp)
+shared/systemd/src/basic/libnm_systemd_shared_la-socket-util.lo:  \
+	shared/systemd/src/basic/$(am__dirstamp) \
+	shared/systemd/src/basic/$(DEPDIR)/$(am__dirstamp)
+shared/systemd/src/basic/libnm_systemd_shared_la-stat-util.lo:  \
+	shared/systemd/src/basic/$(am__dirstamp) \
+	shared/systemd/src/basic/$(DEPDIR)/$(am__dirstamp)
+shared/systemd/src/basic/libnm_systemd_shared_la-string-table.lo:  \
+	shared/systemd/src/basic/$(am__dirstamp) \
+	shared/systemd/src/basic/$(DEPDIR)/$(am__dirstamp)
+shared/systemd/src/basic/libnm_systemd_shared_la-string-util.lo:  \
+	shared/systemd/src/basic/$(am__dirstamp) \
+	shared/systemd/src/basic/$(DEPDIR)/$(am__dirstamp)
+shared/systemd/src/basic/libnm_systemd_shared_la-strv.lo:  \
+	shared/systemd/src/basic/$(am__dirstamp) \
+	shared/systemd/src/basic/$(DEPDIR)/$(am__dirstamp)
+shared/systemd/src/basic/libnm_systemd_shared_la-time-util.lo:  \
+	shared/systemd/src/basic/$(am__dirstamp) \
+	shared/systemd/src/basic/$(DEPDIR)/$(am__dirstamp)
+shared/systemd/src/basic/libnm_systemd_shared_la-tmpfile-util.lo:  \
+	shared/systemd/src/basic/$(am__dirstamp) \
+	shared/systemd/src/basic/$(DEPDIR)/$(am__dirstamp)
+shared/systemd/src/basic/libnm_systemd_shared_la-utf8.lo:  \
+	shared/systemd/src/basic/$(am__dirstamp) \
+	shared/systemd/src/basic/$(DEPDIR)/$(am__dirstamp)
+shared/systemd/src/basic/libnm_systemd_shared_la-util.lo:  \
+	shared/systemd/src/basic/$(am__dirstamp) \
+	shared/systemd/src/basic/$(DEPDIR)/$(am__dirstamp)
+
+shared/systemd/libnm-systemd-shared.la: $(shared_systemd_libnm_systemd_shared_la_OBJECTS) $(shared_systemd_libnm_systemd_shared_la_DEPENDENCIES) $(EXTRA_shared_systemd_libnm_systemd_shared_la_DEPENDENCIES) shared/systemd/$(am__dirstamp)
+	$(AM_V_CCLD)$(LINK)  $(shared_systemd_libnm_systemd_shared_la_OBJECTS) $(shared_systemd_libnm_systemd_shared_la_LIBADD) $(LIBS)
 src/devices/adsl/$(am__dirstamp):
 	@$(MKDIR_P) src/devices/adsl
 	@: > src/devices/adsl/$(am__dirstamp)
@@ -9221,7 +9687,10 @@ src/devices/wifi/$(am__dirstamp):
 src/devices/wifi/$(DEPDIR)/$(am__dirstamp):
 	@$(MKDIR_P) src/devices/wifi/$(DEPDIR)
 	@: > src/devices/wifi/$(DEPDIR)/$(am__dirstamp)
-src/devices/wifi/libnm_device_plugin_wifi_la-nm-wifi-factory.lo:  \
+src/devices/wifi/libnm_device_plugin_wifi_la-nm-device-olpc-mesh.lo:  \
+	src/devices/wifi/$(am__dirstamp) \
+	src/devices/wifi/$(DEPDIR)/$(am__dirstamp)
+src/devices/wifi/libnm_device_plugin_wifi_la-nm-device-wifi-p2p.lo:  \
 	src/devices/wifi/$(am__dirstamp) \
 	src/devices/wifi/$(DEPDIR)/$(am__dirstamp)
 src/devices/wifi/libnm_device_plugin_wifi_la-nm-device-wifi.lo:  \
@@ -9230,13 +9699,16 @@ src/devices/wifi/libnm_device_plugin_wifi_la-nm-device-wifi.lo:  \
 src/devices/wifi/libnm_device_plugin_wifi_la-nm-wifi-ap.lo:  \
 	src/devices/wifi/$(am__dirstamp) \
 	src/devices/wifi/$(DEPDIR)/$(am__dirstamp)
-src/devices/wifi/libnm_device_plugin_wifi_la-nm-wifi-utils.lo:  \
+src/devices/wifi/libnm_device_plugin_wifi_la-nm-wifi-common.lo:  \
 	src/devices/wifi/$(am__dirstamp) \
 	src/devices/wifi/$(DEPDIR)/$(am__dirstamp)
-src/devices/wifi/libnm_device_plugin_wifi_la-nm-wifi-common.lo:  \
+src/devices/wifi/libnm_device_plugin_wifi_la-nm-wifi-factory.lo:  \
 	src/devices/wifi/$(am__dirstamp) \
 	src/devices/wifi/$(DEPDIR)/$(am__dirstamp)
-src/devices/wifi/libnm_device_plugin_wifi_la-nm-device-olpc-mesh.lo:  \
+src/devices/wifi/libnm_device_plugin_wifi_la-nm-wifi-p2p-peer.lo:  \
+	src/devices/wifi/$(am__dirstamp) \
+	src/devices/wifi/$(DEPDIR)/$(am__dirstamp)
+src/devices/wifi/libnm_device_plugin_wifi_la-nm-wifi-utils.lo:  \
 	src/devices/wifi/$(am__dirstamp) \
 	src/devices/wifi/$(DEPDIR)/$(am__dirstamp)
 src/devices/wifi/libnm_device_plugin_wifi_la-nm-device-iwd.lo:  \
@@ -9309,13 +9781,13 @@ src/devices/$(am__dirstamp):
 src/devices/$(DEPDIR)/$(am__dirstamp):
 	@$(MKDIR_P) src/devices/$(DEPDIR)
 	@: > src/devices/$(DEPDIR)/$(am__dirstamp)
-src/devices/libNetworkManager_la-nm-device.lo:  \
+src/devices/libNetworkManager_la-nm-acd-manager.lo:  \
 	src/devices/$(am__dirstamp) \
 	src/devices/$(DEPDIR)/$(am__dirstamp)
 src/devices/libNetworkManager_la-nm-lldp-listener.lo:  \
 	src/devices/$(am__dirstamp) \
 	src/devices/$(DEPDIR)/$(am__dirstamp)
-src/devices/libNetworkManager_la-nm-acd-manager.lo:  \
+src/devices/libNetworkManager_la-nm-device.lo:  \
 	src/devices/$(am__dirstamp) \
 	src/devices/$(DEPDIR)/$(am__dirstamp)
 src/devices/libNetworkManager_la-nm-device-ethernet-utils.lo:  \
@@ -9543,6 +10015,8 @@ src/libNetworkManager_la-nm-rfkill-manager.lo: src/$(am__dirstamp) \
 	src/$(DEPDIR)/$(am__dirstamp)
 src/libNetworkManager_la-nm-session-monitor.lo: src/$(am__dirstamp) \
 	src/$(DEPDIR)/$(am__dirstamp)
+src/libNetworkManager_la-nm-keep-alive.lo: src/$(am__dirstamp) \
+	src/$(DEPDIR)/$(am__dirstamp)
 src/libNetworkManager_la-nm-sleep-monitor.lo: src/$(am__dirstamp) \
 	src/$(DEPDIR)/$(am__dirstamp)
 
@@ -9656,165 +10130,76 @@ src/systemd/$(am__dirstamp):
 src/systemd/$(DEPDIR)/$(am__dirstamp):
 	@$(MKDIR_P) src/systemd/$(DEPDIR)
 	@: > src/systemd/$(DEPDIR)/$(am__dirstamp)
-src/systemd/libsystemd_nm_la-nm-sd.lo: src/systemd/$(am__dirstamp) \
+src/systemd/libnm_systemd_core_la-nm-sd-utils-core.lo:  \
+	src/systemd/$(am__dirstamp) \
 	src/systemd/$(DEPDIR)/$(am__dirstamp)
-src/systemd/libsystemd_nm_la-nm-sd-utils.lo:  \
+src/systemd/libnm_systemd_core_la-nm-sd.lo:  \
 	src/systemd/$(am__dirstamp) \
 	src/systemd/$(DEPDIR)/$(am__dirstamp)
-src/systemd/sd-adapt/$(am__dirstamp):
-	@$(MKDIR_P) src/systemd/sd-adapt
-	@: > src/systemd/sd-adapt/$(am__dirstamp)
-src/systemd/sd-adapt/$(DEPDIR)/$(am__dirstamp):
-	@$(MKDIR_P) src/systemd/sd-adapt/$(DEPDIR)
-	@: > src/systemd/sd-adapt/$(DEPDIR)/$(am__dirstamp)
-src/systemd/sd-adapt/libsystemd_nm_la-nm-sd-adapt.lo:  \
-	src/systemd/sd-adapt/$(am__dirstamp) \
-	src/systemd/sd-adapt/$(DEPDIR)/$(am__dirstamp)
-src/systemd/src/basic/$(am__dirstamp):
-	@$(MKDIR_P) src/systemd/src/basic
-	@: > src/systemd/src/basic/$(am__dirstamp)
-src/systemd/src/basic/$(DEPDIR)/$(am__dirstamp):
-	@$(MKDIR_P) src/systemd/src/basic/$(DEPDIR)
-	@: > src/systemd/src/basic/$(DEPDIR)/$(am__dirstamp)
-src/systemd/src/basic/libsystemd_nm_la-alloc-util.lo:  \
-	src/systemd/src/basic/$(am__dirstamp) \
-	src/systemd/src/basic/$(DEPDIR)/$(am__dirstamp)
-src/systemd/src/basic/libsystemd_nm_la-env-util.lo:  \
-	src/systemd/src/basic/$(am__dirstamp) \
-	src/systemd/src/basic/$(DEPDIR)/$(am__dirstamp)
-src/systemd/src/basic/libsystemd_nm_la-escape.lo:  \
-	src/systemd/src/basic/$(am__dirstamp) \
-	src/systemd/src/basic/$(DEPDIR)/$(am__dirstamp)
-src/systemd/src/basic/libsystemd_nm_la-ether-addr-util.lo:  \
-	src/systemd/src/basic/$(am__dirstamp) \
-	src/systemd/src/basic/$(DEPDIR)/$(am__dirstamp)
-src/systemd/src/basic/libsystemd_nm_la-extract-word.lo:  \
-	src/systemd/src/basic/$(am__dirstamp) \
-	src/systemd/src/basic/$(DEPDIR)/$(am__dirstamp)
-src/systemd/src/basic/libsystemd_nm_la-fd-util.lo:  \
-	src/systemd/src/basic/$(am__dirstamp) \
-	src/systemd/src/basic/$(DEPDIR)/$(am__dirstamp)
-src/systemd/src/basic/libsystemd_nm_la-fileio.lo:  \
-	src/systemd/src/basic/$(am__dirstamp) \
-	src/systemd/src/basic/$(DEPDIR)/$(am__dirstamp)
-src/systemd/src/basic/libsystemd_nm_la-fs-util.lo:  \
-	src/systemd/src/basic/$(am__dirstamp) \
-	src/systemd/src/basic/$(DEPDIR)/$(am__dirstamp)
-src/systemd/src/basic/libsystemd_nm_la-hash-funcs.lo:  \
-	src/systemd/src/basic/$(am__dirstamp) \
-	src/systemd/src/basic/$(DEPDIR)/$(am__dirstamp)
-src/systemd/src/basic/libsystemd_nm_la-hashmap.lo:  \
-	src/systemd/src/basic/$(am__dirstamp) \
-	src/systemd/src/basic/$(DEPDIR)/$(am__dirstamp)
-src/systemd/src/basic/libsystemd_nm_la-hexdecoct.lo:  \
-	src/systemd/src/basic/$(am__dirstamp) \
-	src/systemd/src/basic/$(DEPDIR)/$(am__dirstamp)
-src/systemd/src/basic/libsystemd_nm_la-hostname-util.lo:  \
-	src/systemd/src/basic/$(am__dirstamp) \
-	src/systemd/src/basic/$(DEPDIR)/$(am__dirstamp)
-src/systemd/src/basic/libsystemd_nm_la-in-addr-util.lo:  \
-	src/systemd/src/basic/$(am__dirstamp) \
-	src/systemd/src/basic/$(DEPDIR)/$(am__dirstamp)
-src/systemd/src/basic/libsystemd_nm_la-io-util.lo:  \
-	src/systemd/src/basic/$(am__dirstamp) \
-	src/systemd/src/basic/$(DEPDIR)/$(am__dirstamp)
-src/systemd/src/basic/libsystemd_nm_la-mempool.lo:  \
-	src/systemd/src/basic/$(am__dirstamp) \
-	src/systemd/src/basic/$(DEPDIR)/$(am__dirstamp)
-src/systemd/src/basic/libsystemd_nm_la-parse-util.lo:  \
-	src/systemd/src/basic/$(am__dirstamp) \
-	src/systemd/src/basic/$(DEPDIR)/$(am__dirstamp)
-src/systemd/src/basic/libsystemd_nm_la-path-util.lo:  \
-	src/systemd/src/basic/$(am__dirstamp) \
-	src/systemd/src/basic/$(DEPDIR)/$(am__dirstamp)
-src/systemd/src/basic/libsystemd_nm_la-prioq.lo:  \
-	src/systemd/src/basic/$(am__dirstamp) \
-	src/systemd/src/basic/$(DEPDIR)/$(am__dirstamp)
-src/systemd/src/basic/libsystemd_nm_la-process-util.lo:  \
-	src/systemd/src/basic/$(am__dirstamp) \
-	src/systemd/src/basic/$(DEPDIR)/$(am__dirstamp)
-src/systemd/src/basic/libsystemd_nm_la-random-util.lo:  \
-	src/systemd/src/basic/$(am__dirstamp) \
-	src/systemd/src/basic/$(DEPDIR)/$(am__dirstamp)
-src/systemd/src/basic/libsystemd_nm_la-socket-util.lo:  \
-	src/systemd/src/basic/$(am__dirstamp) \
-	src/systemd/src/basic/$(DEPDIR)/$(am__dirstamp)
-src/systemd/src/basic/libsystemd_nm_la-stat-util.lo:  \
-	src/systemd/src/basic/$(am__dirstamp) \
-	src/systemd/src/basic/$(DEPDIR)/$(am__dirstamp)
-src/systemd/src/basic/libsystemd_nm_la-string-table.lo:  \
-	src/systemd/src/basic/$(am__dirstamp) \
-	src/systemd/src/basic/$(DEPDIR)/$(am__dirstamp)
-src/systemd/src/basic/libsystemd_nm_la-string-util.lo:  \
-	src/systemd/src/basic/$(am__dirstamp) \
-	src/systemd/src/basic/$(DEPDIR)/$(am__dirstamp)
-src/systemd/src/basic/libsystemd_nm_la-strv.lo:  \
-	src/systemd/src/basic/$(am__dirstamp) \
-	src/systemd/src/basic/$(DEPDIR)/$(am__dirstamp)
-src/systemd/src/basic/libsystemd_nm_la-time-util.lo:  \
-	src/systemd/src/basic/$(am__dirstamp) \
-	src/systemd/src/basic/$(DEPDIR)/$(am__dirstamp)
-src/systemd/src/basic/libsystemd_nm_la-utf8.lo:  \
-	src/systemd/src/basic/$(am__dirstamp) \
-	src/systemd/src/basic/$(DEPDIR)/$(am__dirstamp)
-src/systemd/src/basic/libsystemd_nm_la-util.lo:  \
-	src/systemd/src/basic/$(am__dirstamp) \
-	src/systemd/src/basic/$(DEPDIR)/$(am__dirstamp)
+src/systemd/sd-adapt-core/$(am__dirstamp):
+	@$(MKDIR_P) src/systemd/sd-adapt-core
+	@: > src/systemd/sd-adapt-core/$(am__dirstamp)
+src/systemd/sd-adapt-core/$(DEPDIR)/$(am__dirstamp):
+	@$(MKDIR_P) src/systemd/sd-adapt-core/$(DEPDIR)
+	@: > src/systemd/sd-adapt-core/$(DEPDIR)/$(am__dirstamp)
+src/systemd/sd-adapt-core/libnm_systemd_core_la-nm-sd-adapt-core.lo:  \
+	src/systemd/sd-adapt-core/$(am__dirstamp) \
+	src/systemd/sd-adapt-core/$(DEPDIR)/$(am__dirstamp)
 src/systemd/src/libsystemd-network/$(am__dirstamp):
 	@$(MKDIR_P) src/systemd/src/libsystemd-network
 	@: > src/systemd/src/libsystemd-network/$(am__dirstamp)
 src/systemd/src/libsystemd-network/$(DEPDIR)/$(am__dirstamp):
 	@$(MKDIR_P) src/systemd/src/libsystemd-network/$(DEPDIR)
 	@: > src/systemd/src/libsystemd-network/$(DEPDIR)/$(am__dirstamp)
-src/systemd/src/libsystemd-network/libsystemd_nm_la-arp-util.lo:  \
+src/systemd/src/libsystemd-network/libnm_systemd_core_la-arp-util.lo:  \
 	src/systemd/src/libsystemd-network/$(am__dirstamp) \
 	src/systemd/src/libsystemd-network/$(DEPDIR)/$(am__dirstamp)
-src/systemd/src/libsystemd-network/libsystemd_nm_la-dhcp-identifier.lo:  \
+src/systemd/src/libsystemd-network/libnm_systemd_core_la-dhcp-identifier.lo:  \
 	src/systemd/src/libsystemd-network/$(am__dirstamp) \
 	src/systemd/src/libsystemd-network/$(DEPDIR)/$(am__dirstamp)
-src/systemd/src/libsystemd-network/libsystemd_nm_la-dhcp-network.lo:  \
+src/systemd/src/libsystemd-network/libnm_systemd_core_la-dhcp-network.lo:  \
 	src/systemd/src/libsystemd-network/$(am__dirstamp) \
 	src/systemd/src/libsystemd-network/$(DEPDIR)/$(am__dirstamp)
-src/systemd/src/libsystemd-network/libsystemd_nm_la-dhcp-option.lo:  \
+src/systemd/src/libsystemd-network/libnm_systemd_core_la-dhcp-option.lo:  \
 	src/systemd/src/libsystemd-network/$(am__dirstamp) \
 	src/systemd/src/libsystemd-network/$(DEPDIR)/$(am__dirstamp)
-src/systemd/src/libsystemd-network/libsystemd_nm_la-dhcp-packet.lo:  \
+src/systemd/src/libsystemd-network/libnm_systemd_core_la-dhcp-packet.lo:  \
 	src/systemd/src/libsystemd-network/$(am__dirstamp) \
 	src/systemd/src/libsystemd-network/$(DEPDIR)/$(am__dirstamp)
-src/systemd/src/libsystemd-network/libsystemd_nm_la-dhcp6-network.lo:  \
+src/systemd/src/libsystemd-network/libnm_systemd_core_la-dhcp6-network.lo:  \
 	src/systemd/src/libsystemd-network/$(am__dirstamp) \
 	src/systemd/src/libsystemd-network/$(DEPDIR)/$(am__dirstamp)
-src/systemd/src/libsystemd-network/libsystemd_nm_la-dhcp6-option.lo:  \
+src/systemd/src/libsystemd-network/libnm_systemd_core_la-dhcp6-option.lo:  \
 	src/systemd/src/libsystemd-network/$(am__dirstamp) \
 	src/systemd/src/libsystemd-network/$(DEPDIR)/$(am__dirstamp)
-src/systemd/src/libsystemd-network/libsystemd_nm_la-lldp-neighbor.lo:  \
+src/systemd/src/libsystemd-network/libnm_systemd_core_la-lldp-neighbor.lo:  \
 	src/systemd/src/libsystemd-network/$(am__dirstamp) \
 	src/systemd/src/libsystemd-network/$(DEPDIR)/$(am__dirstamp)
-src/systemd/src/libsystemd-network/libsystemd_nm_la-lldp-network.lo:  \
+src/systemd/src/libsystemd-network/libnm_systemd_core_la-lldp-network.lo:  \
 	src/systemd/src/libsystemd-network/$(am__dirstamp) \
 	src/systemd/src/libsystemd-network/$(DEPDIR)/$(am__dirstamp)
-src/systemd/src/libsystemd-network/libsystemd_nm_la-network-internal.lo:  \
+src/systemd/src/libsystemd-network/libnm_systemd_core_la-network-internal.lo:  \
 	src/systemd/src/libsystemd-network/$(am__dirstamp) \
 	src/systemd/src/libsystemd-network/$(DEPDIR)/$(am__dirstamp)
-src/systemd/src/libsystemd-network/libsystemd_nm_la-sd-dhcp-client.lo:  \
+src/systemd/src/libsystemd-network/libnm_systemd_core_la-sd-dhcp-client.lo:  \
 	src/systemd/src/libsystemd-network/$(am__dirstamp) \
 	src/systemd/src/libsystemd-network/$(DEPDIR)/$(am__dirstamp)
-src/systemd/src/libsystemd-network/libsystemd_nm_la-sd-dhcp-lease.lo:  \
+src/systemd/src/libsystemd-network/libnm_systemd_core_la-sd-dhcp-lease.lo:  \
 	src/systemd/src/libsystemd-network/$(am__dirstamp) \
 	src/systemd/src/libsystemd-network/$(DEPDIR)/$(am__dirstamp)
-src/systemd/src/libsystemd-network/libsystemd_nm_la-sd-dhcp6-client.lo:  \
+src/systemd/src/libsystemd-network/libnm_systemd_core_la-sd-dhcp6-client.lo:  \
 	src/systemd/src/libsystemd-network/$(am__dirstamp) \
 	src/systemd/src/libsystemd-network/$(DEPDIR)/$(am__dirstamp)
-src/systemd/src/libsystemd-network/libsystemd_nm_la-sd-dhcp6-lease.lo:  \
+src/systemd/src/libsystemd-network/libnm_systemd_core_la-sd-dhcp6-lease.lo:  \
 	src/systemd/src/libsystemd-network/$(am__dirstamp) \
 	src/systemd/src/libsystemd-network/$(DEPDIR)/$(am__dirstamp)
-src/systemd/src/libsystemd-network/libsystemd_nm_la-sd-ipv4acd.lo:  \
+src/systemd/src/libsystemd-network/libnm_systemd_core_la-sd-ipv4acd.lo:  \
 	src/systemd/src/libsystemd-network/$(am__dirstamp) \
 	src/systemd/src/libsystemd-network/$(DEPDIR)/$(am__dirstamp)
-src/systemd/src/libsystemd-network/libsystemd_nm_la-sd-ipv4ll.lo:  \
+src/systemd/src/libsystemd-network/libnm_systemd_core_la-sd-ipv4ll.lo:  \
 	src/systemd/src/libsystemd-network/$(am__dirstamp) \
 	src/systemd/src/libsystemd-network/$(DEPDIR)/$(am__dirstamp)
-src/systemd/src/libsystemd-network/libsystemd_nm_la-sd-lldp.lo:  \
+src/systemd/src/libsystemd-network/libnm_systemd_core_la-sd-lldp.lo:  \
 	src/systemd/src/libsystemd-network/$(am__dirstamp) \
 	src/systemd/src/libsystemd-network/$(DEPDIR)/$(am__dirstamp)
 src/systemd/src/libsystemd/sd-event/$(am__dirstamp):
@@ -9823,7 +10208,10 @@ src/systemd/src/libsystemd/sd-event/$(am__dirstamp):
 src/systemd/src/libsystemd/sd-event/$(DEPDIR)/$(am__dirstamp):
 	@$(MKDIR_P) src/systemd/src/libsystemd/sd-event/$(DEPDIR)
 	@: > src/systemd/src/libsystemd/sd-event/$(DEPDIR)/$(am__dirstamp)
-src/systemd/src/libsystemd/sd-event/libsystemd_nm_la-sd-event.lo:  \
+src/systemd/src/libsystemd/sd-event/libnm_systemd_core_la-event-util.lo:  \
+	src/systemd/src/libsystemd/sd-event/$(am__dirstamp) \
+	src/systemd/src/libsystemd/sd-event/$(DEPDIR)/$(am__dirstamp)
+src/systemd/src/libsystemd/sd-event/libnm_systemd_core_la-sd-event.lo:  \
 	src/systemd/src/libsystemd/sd-event/$(am__dirstamp) \
 	src/systemd/src/libsystemd/sd-event/$(DEPDIR)/$(am__dirstamp)
 src/systemd/src/libsystemd/sd-id128/$(am__dirstamp):
@@ -9832,10 +10220,10 @@ src/systemd/src/libsystemd/sd-id128/$(am__dirstamp):
 src/systemd/src/libsystemd/sd-id128/$(DEPDIR)/$(am__dirstamp):
 	@$(MKDIR_P) src/systemd/src/libsystemd/sd-id128/$(DEPDIR)
 	@: > src/systemd/src/libsystemd/sd-id128/$(DEPDIR)/$(am__dirstamp)
-src/systemd/src/libsystemd/sd-id128/libsystemd_nm_la-id128-util.lo:  \
+src/systemd/src/libsystemd/sd-id128/libnm_systemd_core_la-id128-util.lo:  \
 	src/systemd/src/libsystemd/sd-id128/$(am__dirstamp) \
 	src/systemd/src/libsystemd/sd-id128/$(DEPDIR)/$(am__dirstamp)
-src/systemd/src/libsystemd/sd-id128/libsystemd_nm_la-sd-id128.lo:  \
+src/systemd/src/libsystemd/sd-id128/libnm_systemd_core_la-sd-id128.lo:  \
 	src/systemd/src/libsystemd/sd-id128/$(am__dirstamp) \
 	src/systemd/src/libsystemd/sd-id128/$(DEPDIR)/$(am__dirstamp)
 src/systemd/src/shared/$(am__dirstamp):
@@ -9844,12 +10232,12 @@ src/systemd/src/shared/$(am__dirstamp):
 src/systemd/src/shared/$(DEPDIR)/$(am__dirstamp):
 	@$(MKDIR_P) src/systemd/src/shared/$(DEPDIR)
 	@: > src/systemd/src/shared/$(DEPDIR)/$(am__dirstamp)
-src/systemd/src/shared/libsystemd_nm_la-dns-domain.lo:  \
+src/systemd/src/shared/libnm_systemd_core_la-dns-domain.lo:  \
 	src/systemd/src/shared/$(am__dirstamp) \
 	src/systemd/src/shared/$(DEPDIR)/$(am__dirstamp)
 
-src/libsystemd-nm.la: $(src_libsystemd_nm_la_OBJECTS) $(src_libsystemd_nm_la_DEPENDENCIES) $(EXTRA_src_libsystemd_nm_la_DEPENDENCIES) src/$(am__dirstamp)
-	$(AM_V_CCLD)$(LINK)  $(src_libsystemd_nm_la_OBJECTS) $(src_libsystemd_nm_la_LIBADD) $(LIBS)
+src/libnm-systemd-core.la: $(src_libnm_systemd_core_la_OBJECTS) $(src_libnm_systemd_core_la_DEPENDENCIES) $(EXTRA_src_libnm_systemd_core_la_DEPENDENCIES) src/$(am__dirstamp)
+	$(AM_V_CCLD)$(LINK)  $(src_libnm_systemd_core_la_OBJECTS) $(src_libnm_systemd_core_la_LIBADD) $(LIBS)
 src/ppp/libnm_ppp_plugin_la-nm-ppp-manager.lo:  \
 	src/ppp/$(am__dirstamp) src/ppp/$(DEPDIR)/$(am__dirstamp)
 
@@ -10424,6 +10812,19 @@ libnm/tests/test_secret_agent-test-secret-agent.$(OBJEXT):  \
 libnm/tests/test-secret-agent$(EXEEXT): $(libnm_tests_test_secret_agent_OBJECTS) $(libnm_tests_test_secret_agent_DEPENDENCIES) $(EXTRA_libnm_tests_test_secret_agent_DEPENDENCIES) libnm/tests/$(am__dirstamp)
 	@rm -f libnm/tests/test-secret-agent$(EXEEXT)
 	$(AM_V_CCLD)$(libnm_tests_test_secret_agent_LINK) $(libnm_tests_test_secret_agent_OBJECTS) $(libnm_tests_test_secret_agent_LDADD) $(LIBS)
+shared/nm-utils/tests/$(am__dirstamp):
+	@$(MKDIR_P) shared/nm-utils/tests
+	@: > shared/nm-utils/tests/$(am__dirstamp)
+shared/nm-utils/tests/$(DEPDIR)/$(am__dirstamp):
+	@$(MKDIR_P) shared/nm-utils/tests/$(DEPDIR)
+	@: > shared/nm-utils/tests/$(DEPDIR)/$(am__dirstamp)
+shared/nm-utils/tests/test_shared_general-test-shared-general.$(OBJEXT):  \
+	shared/nm-utils/tests/$(am__dirstamp) \
+	shared/nm-utils/tests/$(DEPDIR)/$(am__dirstamp)
+
+shared/nm-utils/tests/test-shared-general$(EXEEXT): $(shared_nm_utils_tests_test_shared_general_OBJECTS) $(shared_nm_utils_tests_test_shared_general_DEPENDENCIES) $(EXTRA_shared_nm_utils_tests_test_shared_general_DEPENDENCIES) shared/nm-utils/tests/$(am__dirstamp)
+	@rm -f shared/nm-utils/tests/test-shared-general$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(shared_nm_utils_tests_test_shared_general_OBJECTS) $(shared_nm_utils_tests_test_shared_general_LDADD) $(LIBS)
 src/NetworkManager-main.$(OBJEXT): src/$(am__dirstamp) \
 	src/$(DEPDIR)/$(am__dirstamp)
 
@@ -10841,12 +11242,21 @@ mostlyclean-compile:
 	-rm -f libnm/tests/*.$(OBJEXT)
 	-rm -f shared/*.$(OBJEXT)
 	-rm -f shared/*.lo
+	-rm -f shared/c-rbtree/src/*.$(OBJEXT)
+	-rm -f shared/c-rbtree/src/*.lo
 	-rm -f shared/c-siphash/src/*.$(OBJEXT)
 	-rm -f shared/c-siphash/src/*.lo
 	-rm -f shared/n-acd/src/*.$(OBJEXT)
 	-rm -f shared/n-acd/src/*.lo
+	-rm -f shared/n-acd/src/util/*.$(OBJEXT)
+	-rm -f shared/n-acd/src/util/*.lo
 	-rm -f shared/nm-utils/*.$(OBJEXT)
 	-rm -f shared/nm-utils/*.lo
+	-rm -f shared/nm-utils/tests/*.$(OBJEXT)
+	-rm -f shared/systemd/*.$(OBJEXT)
+	-rm -f shared/systemd/*.lo
+	-rm -f shared/systemd/src/basic/*.$(OBJEXT)
+	-rm -f shared/systemd/src/basic/*.lo
 	-rm -f src/*.$(OBJEXT)
 	-rm -f src/*.lo
 	-rm -f src/devices/*.$(OBJEXT)
@@ -10908,10 +11318,8 @@ mostlyclean-compile:
 	-rm -f src/supplicant/tests/*.$(OBJEXT)
 	-rm -f src/systemd/*.$(OBJEXT)
 	-rm -f src/systemd/*.lo
-	-rm -f src/systemd/sd-adapt/*.$(OBJEXT)
-	-rm -f src/systemd/sd-adapt/*.lo
-	-rm -f src/systemd/src/basic/*.$(OBJEXT)
-	-rm -f src/systemd/src/basic/*.lo
+	-rm -f src/systemd/sd-adapt-core/*.$(OBJEXT)
+	-rm -f src/systemd/sd-adapt-core/*.lo
 	-rm -f src/systemd/src/libsystemd-network/*.$(OBJEXT)
 	-rm -f src/systemd/src/libsystemd-network/*.lo
 	-rm -f src/systemd/src/libsystemd/sd-event/*.$(OBJEXT)
@@ -11052,6 +11460,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@introspection/$(DEPDIR)/libnmdbus_la-org.freedesktop.NetworkManager.Device.Vlan.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@introspection/$(DEPDIR)/libnmdbus_la-org.freedesktop.NetworkManager.Device.Vxlan.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@introspection/$(DEPDIR)/libnmdbus_la-org.freedesktop.NetworkManager.Device.WiMax.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@introspection/$(DEPDIR)/libnmdbus_la-org.freedesktop.NetworkManager.Device.WifiP2P.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@introspection/$(DEPDIR)/libnmdbus_la-org.freedesktop.NetworkManager.Device.WireGuard.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@introspection/$(DEPDIR)/libnmdbus_la-org.freedesktop.NetworkManager.Device.Wired.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@introspection/$(DEPDIR)/libnmdbus_la-org.freedesktop.NetworkManager.Device.Wireless.Plo@am__quote@ # am--include-marker
@@ -11066,6 +11475,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@introspection/$(DEPDIR)/libnmdbus_la-org.freedesktop.NetworkManager.Settings.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@introspection/$(DEPDIR)/libnmdbus_la-org.freedesktop.NetworkManager.VPN.Connection.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@introspection/$(DEPDIR)/libnmdbus_la-org.freedesktop.NetworkManager.VPN.Plugin.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@introspection/$(DEPDIR)/libnmdbus_la-org.freedesktop.NetworkManager.WifiP2PPeer.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@libnm-core/$(DEPDIR)/libnm_core_la-nm-connection.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@libnm-core/$(DEPDIR)/libnm_core_la-nm-core-enum-types.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@libnm-core/$(DEPDIR)/libnm_core_la-nm-crypto.Plo@am__quote@ # am--include-marker
@@ -11115,8 +11525,10 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-vlan.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-vpn.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-vxlan.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-wifi-p2p.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-wimax.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-wired.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-wireguard.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-wireless-security.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-wireless.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-wpan.Plo@am__quote@ # am--include-marker
@@ -11246,6 +11658,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@libnm/$(DEPDIR)/libnm_la-nm-device-tun.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@libnm/$(DEPDIR)/libnm_la-nm-device-vlan.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@libnm/$(DEPDIR)/libnm_la-nm-device-vxlan.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@libnm/$(DEPDIR)/libnm_la-nm-device-wifi-p2p.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@libnm/$(DEPDIR)/libnm_la-nm-device-wifi.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@libnm/$(DEPDIR)/libnm_la-nm-device-wimax.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@libnm/$(DEPDIR)/libnm_la-nm-device-wireguard.Plo@am__quote@ # am--include-marker
@@ -11268,6 +11681,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@libnm/$(DEPDIR)/libnm_la-nm-vpn-editor.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@libnm/$(DEPDIR)/libnm_la-nm-vpn-plugin-old.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@libnm/$(DEPDIR)/libnm_la-nm-vpn-service-plugin.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@libnm/$(DEPDIR)/libnm_la-nm-wifi-p2p-peer.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@libnm/$(DEPDIR)/libnm_la-nm-wimax-nsp.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@libnm/$(DEPDIR)/libnm_utils_la-nm-libnm-utils.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@libnm/fake-typelib/$(DEPDIR)/libnm_utils_la-typelibs.Plo@am__quote@ # am--include-marker
@@ -11284,25 +11698,59 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@shared/$(DEPDIR)/libnm_tests_test_nm_client-nm-test-utils-impl.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@shared/$(DEPDIR)/libnm_tests_test_remote_settings_client-nm-test-utils-impl.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@shared/$(DEPDIR)/libnm_tests_test_secret_agent-nm-test-utils-impl.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@shared/c-rbtree/src/$(DEPDIR)/libcrbtree_la-c-rbtree.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@shared/c-siphash/src/$(DEPDIR)/libcsiphash_la-c-siphash.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@shared/n-acd/src/$(DEPDIR)/libnacd_la-n-acd-bpf-fallback.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@shared/n-acd/src/$(DEPDIR)/libnacd_la-n-acd-bpf.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@shared/n-acd/src/$(DEPDIR)/libnacd_la-n-acd-probe.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@shared/n-acd/src/$(DEPDIR)/libnacd_la-n-acd.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@shared/nm-utils/$(DEPDIR)/clients_common_libnmc_base_la-nm-enum-utils.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@shared/nm-utils/$(DEPDIR)/clients_common_libnmc_base_la-nm-hash-utils.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@shared/nm-utils/$(DEPDIR)/clients_common_libnmc_base_la-nm-random-utils.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@shared/nm-utils/$(DEPDIR)/clients_common_libnmc_base_la-nm-shared-utils.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@shared/nm-utils/$(DEPDIR)/libnm_core_libnm_core_la-c-list-util.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@shared/nm-utils/$(DEPDIR)/libnm_core_libnm_core_la-nm-dedup-multi.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@shared/nm-utils/$(DEPDIR)/libnm_core_libnm_core_la-nm-enum-utils.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@shared/nm-utils/$(DEPDIR)/libnm_core_libnm_core_la-nm-hash-utils.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@shared/nm-utils/$(DEPDIR)/libnm_core_libnm_core_la-nm-io-utils.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@shared/nm-utils/$(DEPDIR)/libnm_core_libnm_core_la-nm-random-utils.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@shared/nm-utils/$(DEPDIR)/libnm_core_libnm_core_la-nm-secret-utils.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@shared/nm-utils/$(DEPDIR)/libnm_core_libnm_core_la-nm-shared-utils.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@shared/nm-utils/$(DEPDIR)/libnm_core_libnm_core_la-nm-udev-utils.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@shared/nm-utils/$(DEPDIR)/libnm_glib_libnm_glib_la-nm-udev-utils.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@shared/n-acd/src/util/$(DEPDIR)/libnacd_la-timer.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@shared/nm-utils/$(DEPDIR)/libnm_tests_libnm_vpn_plugin_utils_test_la-nm-vpn-plugin-utils.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@shared/nm-utils/$(DEPDIR)/libnm_tests_test_general-nm-compat.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@shared/nm-utils/$(DEPDIR)/libnm_util_libnm_util_la-nm-shared-utils.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@shared/nm-utils/$(DEPDIR)/libnm_utils_base_la-c-list-util.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@shared/nm-utils/$(DEPDIR)/libnm_utils_base_la-nm-dedup-multi.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@shared/nm-utils/$(DEPDIR)/libnm_utils_base_la-nm-enum-utils.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@shared/nm-utils/$(DEPDIR)/libnm_utils_base_la-nm-errno.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@shared/nm-utils/$(DEPDIR)/libnm_utils_base_la-nm-hash-utils.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@shared/nm-utils/$(DEPDIR)/libnm_utils_base_la-nm-io-utils.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@shared/nm-utils/$(DEPDIR)/libnm_utils_base_la-nm-random-utils.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@shared/nm-utils/$(DEPDIR)/libnm_utils_base_la-nm-secret-utils.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@shared/nm-utils/$(DEPDIR)/libnm_utils_base_la-nm-shared-utils.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@shared/nm-utils/$(DEPDIR)/libnm_utils_base_la-nm-time-utils.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@shared/nm-utils/$(DEPDIR)/libnm_utils_udev_la-nm-udev-utils.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@shared/nm-utils/tests/$(DEPDIR)/test_shared_general-test-shared-general.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@shared/systemd/$(DEPDIR)/libnm_systemd_logging_stub_la-nm-logging-stub.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@shared/systemd/$(DEPDIR)/libnm_systemd_shared_la-nm-sd-utils-shared.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-alloc-util.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-env-file.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-env-util.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-escape.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-ether-addr-util.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-extract-word.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-fd-util.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-fileio.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-fs-util.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-hash-funcs.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-hashmap.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-hexdecoct.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-hostname-util.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-in-addr-util.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-io-util.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-mempool.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-parse-util.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-path-util.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-prioq.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-process-util.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-random-util.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-socket-util.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-stat-util.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-string-table.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-string-util.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-strv.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-time-util.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-tmpfile-util.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-utf8.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-util.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/NetworkManager-main.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/libNetworkManagerBase_la-NetworkManagerUtils.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/libNetworkManagerBase_la-main-utils.Plo@am__quote@ # am--include-marker
@@ -11330,6 +11778,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/libNetworkManager_la-nm-dispatcher.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/libNetworkManager_la-nm-firewall-manager.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/libNetworkManager_la-nm-hostname-manager.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/libNetworkManager_la-nm-keep-alive.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/libNetworkManager_la-nm-manager.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/libNetworkManager_la-nm-netns.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/libNetworkManager_la-nm-pacrunner-manager.Plo@am__quote@ # am--include-marker
@@ -11382,11 +11831,13 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@src/devices/tests/$(DEPDIR)/test_lldp-test-lldp.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@src/devices/wifi/$(DEPDIR)/libnm_device_plugin_wifi_la-nm-device-iwd.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@src/devices/wifi/$(DEPDIR)/libnm_device_plugin_wifi_la-nm-device-olpc-mesh.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/devices/wifi/$(DEPDIR)/libnm_device_plugin_wifi_la-nm-device-wifi-p2p.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@src/devices/wifi/$(DEPDIR)/libnm_device_plugin_wifi_la-nm-device-wifi.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@src/devices/wifi/$(DEPDIR)/libnm_device_plugin_wifi_la-nm-iwd-manager.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@src/devices/wifi/$(DEPDIR)/libnm_device_plugin_wifi_la-nm-wifi-ap.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@src/devices/wifi/$(DEPDIR)/libnm_device_plugin_wifi_la-nm-wifi-common.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@src/devices/wifi/$(DEPDIR)/libnm_device_plugin_wifi_la-nm-wifi-factory.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/devices/wifi/$(DEPDIR)/libnm_device_plugin_wifi_la-nm-wifi-p2p-peer.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@src/devices/wifi/$(DEPDIR)/libnm_device_plugin_wifi_la-nm-wifi-utils.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@src/devices/wifi/$(DEPDIR)/src_devices_wifi_tests_test_general-nm-wifi-ap.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@src/devices/wifi/$(DEPDIR)/src_devices_wifi_tests_test_general-nm-wifi-utils.Po@am__quote@ # am--include-marker
@@ -11487,58 +11938,31 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@src/supplicant/$(DEPDIR)/libNetworkManager_la-nm-supplicant-manager.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@src/supplicant/$(DEPDIR)/libNetworkManager_la-nm-supplicant-settings-verify.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@src/supplicant/tests/$(DEPDIR)/test_supplicant_config-test-supplicant-config.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@src/systemd/$(DEPDIR)/libsystemd_nm_la-nm-sd-utils.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@src/systemd/$(DEPDIR)/libsystemd_nm_la-nm-sd.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@src/systemd/sd-adapt/$(DEPDIR)/libsystemd_nm_la-nm-sd-adapt.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@src/systemd/src/basic/$(DEPDIR)/libsystemd_nm_la-alloc-util.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@src/systemd/src/basic/$(DEPDIR)/libsystemd_nm_la-env-util.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@src/systemd/src/basic/$(DEPDIR)/libsystemd_nm_la-escape.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@src/systemd/src/basic/$(DEPDIR)/libsystemd_nm_la-ether-addr-util.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@src/systemd/src/basic/$(DEPDIR)/libsystemd_nm_la-extract-word.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@src/systemd/src/basic/$(DEPDIR)/libsystemd_nm_la-fd-util.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@src/systemd/src/basic/$(DEPDIR)/libsystemd_nm_la-fileio.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@src/systemd/src/basic/$(DEPDIR)/libsystemd_nm_la-fs-util.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@src/systemd/src/basic/$(DEPDIR)/libsystemd_nm_la-hash-funcs.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@src/systemd/src/basic/$(DEPDIR)/libsystemd_nm_la-hashmap.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@src/systemd/src/basic/$(DEPDIR)/libsystemd_nm_la-hexdecoct.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@src/systemd/src/basic/$(DEPDIR)/libsystemd_nm_la-hostname-util.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@src/systemd/src/basic/$(DEPDIR)/libsystemd_nm_la-in-addr-util.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@src/systemd/src/basic/$(DEPDIR)/libsystemd_nm_la-io-util.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@src/systemd/src/basic/$(DEPDIR)/libsystemd_nm_la-mempool.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@src/systemd/src/basic/$(DEPDIR)/libsystemd_nm_la-parse-util.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@src/systemd/src/basic/$(DEPDIR)/libsystemd_nm_la-path-util.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@src/systemd/src/basic/$(DEPDIR)/libsystemd_nm_la-prioq.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@src/systemd/src/basic/$(DEPDIR)/libsystemd_nm_la-process-util.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@src/systemd/src/basic/$(DEPDIR)/libsystemd_nm_la-random-util.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@src/systemd/src/basic/$(DEPDIR)/libsystemd_nm_la-socket-util.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@src/systemd/src/basic/$(DEPDIR)/libsystemd_nm_la-stat-util.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@src/systemd/src/basic/$(DEPDIR)/libsystemd_nm_la-string-table.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@src/systemd/src/basic/$(DEPDIR)/libsystemd_nm_la-string-util.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@src/systemd/src/basic/$(DEPDIR)/libsystemd_nm_la-strv.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@src/systemd/src/basic/$(DEPDIR)/libsystemd_nm_la-time-util.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@src/systemd/src/basic/$(DEPDIR)/libsystemd_nm_la-utf8.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@src/systemd/src/basic/$(DEPDIR)/libsystemd_nm_la-util.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@src/systemd/src/libsystemd-network/$(DEPDIR)/libsystemd_nm_la-arp-util.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@src/systemd/src/libsystemd-network/$(DEPDIR)/libsystemd_nm_la-dhcp-identifier.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@src/systemd/src/libsystemd-network/$(DEPDIR)/libsystemd_nm_la-dhcp-network.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@src/systemd/src/libsystemd-network/$(DEPDIR)/libsystemd_nm_la-dhcp-option.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@src/systemd/src/libsystemd-network/$(DEPDIR)/libsystemd_nm_la-dhcp-packet.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@src/systemd/src/libsystemd-network/$(DEPDIR)/libsystemd_nm_la-dhcp6-network.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@src/systemd/src/libsystemd-network/$(DEPDIR)/libsystemd_nm_la-dhcp6-option.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@src/systemd/src/libsystemd-network/$(DEPDIR)/libsystemd_nm_la-lldp-neighbor.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@src/systemd/src/libsystemd-network/$(DEPDIR)/libsystemd_nm_la-lldp-network.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@src/systemd/src/libsystemd-network/$(DEPDIR)/libsystemd_nm_la-network-internal.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@src/systemd/src/libsystemd-network/$(DEPDIR)/libsystemd_nm_la-sd-dhcp-client.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@src/systemd/src/libsystemd-network/$(DEPDIR)/libsystemd_nm_la-sd-dhcp-lease.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@src/systemd/src/libsystemd-network/$(DEPDIR)/libsystemd_nm_la-sd-dhcp6-client.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@src/systemd/src/libsystemd-network/$(DEPDIR)/libsystemd_nm_la-sd-dhcp6-lease.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@src/systemd/src/libsystemd-network/$(DEPDIR)/libsystemd_nm_la-sd-ipv4acd.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@src/systemd/src/libsystemd-network/$(DEPDIR)/libsystemd_nm_la-sd-ipv4ll.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@src/systemd/src/libsystemd-network/$(DEPDIR)/libsystemd_nm_la-sd-lldp.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@src/systemd/src/libsystemd/sd-event/$(DEPDIR)/libsystemd_nm_la-sd-event.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@src/systemd/src/libsystemd/sd-id128/$(DEPDIR)/libsystemd_nm_la-id128-util.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@src/systemd/src/libsystemd/sd-id128/$(DEPDIR)/libsystemd_nm_la-sd-id128.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@src/systemd/src/shared/$(DEPDIR)/libsystemd_nm_la-dns-domain.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/systemd/$(DEPDIR)/libnm_systemd_core_la-nm-sd-utils-core.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/systemd/$(DEPDIR)/libnm_systemd_core_la-nm-sd.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/systemd/sd-adapt-core/$(DEPDIR)/libnm_systemd_core_la-nm-sd-adapt-core.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-arp-util.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-dhcp-identifier.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-dhcp-network.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-dhcp-option.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-dhcp-packet.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-dhcp6-network.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-dhcp6-option.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-lldp-neighbor.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-lldp-network.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-network-internal.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-sd-dhcp-client.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-sd-dhcp-lease.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-sd-dhcp6-client.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-sd-dhcp6-lease.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-sd-ipv4acd.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-sd-ipv4ll.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-sd-lldp.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/systemd/src/libsystemd/sd-event/$(DEPDIR)/libnm_systemd_core_la-event-util.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/systemd/src/libsystemd/sd-event/$(DEPDIR)/libnm_systemd_core_la-sd-event.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/systemd/src/libsystemd/sd-id128/$(DEPDIR)/libnm_systemd_core_la-id128-util.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/systemd/src/libsystemd/sd-id128/$(DEPDIR)/libnm_systemd_core_la-sd-id128.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/systemd/src/shared/$(DEPDIR)/libnm_systemd_core_la-dns-domain.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@src/tests/$(DEPDIR)/src_tests_test_general-test-general.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@src/tests/$(DEPDIR)/test_dcb-test-dcb.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@src/tests/$(DEPDIR)/test_general_with_expect-test-general-with-expect.Po@am__quote@ # am--include-marker
@@ -11862,34 +12286,6 @@ clients/tui/newt/libnmt_newt_a-nmt-newt-widget.obj: clients/tui/newt/nmt-newt-wi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(clients_tui_newt_libnmt_newt_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o clients/tui/newt/libnmt_newt_a-nmt-newt-widget.obj `if test -f 'clients/tui/newt/nmt-newt-widget.c'; then $(CYGPATH_W) 'clients/tui/newt/nmt-newt-widget.c'; else $(CYGPATH_W) '$(srcdir)/clients/tui/newt/nmt-newt-widget.c'; fi`
 
-shared/nm-utils/clients_common_libnmc_base_la-nm-enum-utils.lo: shared/nm-utils/nm-enum-utils.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(clients_common_libnmc_base_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT shared/nm-utils/clients_common_libnmc_base_la-nm-enum-utils.lo -MD -MP -MF shared/nm-utils/$(DEPDIR)/clients_common_libnmc_base_la-nm-enum-utils.Tpo -c -o shared/nm-utils/clients_common_libnmc_base_la-nm-enum-utils.lo `test -f 'shared/nm-utils/nm-enum-utils.c' || echo '$(srcdir)/'`shared/nm-utils/nm-enum-utils.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) shared/nm-utils/$(DEPDIR)/clients_common_libnmc_base_la-nm-enum-utils.Tpo shared/nm-utils/$(DEPDIR)/clients_common_libnmc_base_la-nm-enum-utils.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='shared/nm-utils/nm-enum-utils.c' object='shared/nm-utils/clients_common_libnmc_base_la-nm-enum-utils.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(clients_common_libnmc_base_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o shared/nm-utils/clients_common_libnmc_base_la-nm-enum-utils.lo `test -f 'shared/nm-utils/nm-enum-utils.c' || echo '$(srcdir)/'`shared/nm-utils/nm-enum-utils.c
-
-shared/nm-utils/clients_common_libnmc_base_la-nm-hash-utils.lo: shared/nm-utils/nm-hash-utils.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(clients_common_libnmc_base_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT shared/nm-utils/clients_common_libnmc_base_la-nm-hash-utils.lo -MD -MP -MF shared/nm-utils/$(DEPDIR)/clients_common_libnmc_base_la-nm-hash-utils.Tpo -c -o shared/nm-utils/clients_common_libnmc_base_la-nm-hash-utils.lo `test -f 'shared/nm-utils/nm-hash-utils.c' || echo '$(srcdir)/'`shared/nm-utils/nm-hash-utils.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) shared/nm-utils/$(DEPDIR)/clients_common_libnmc_base_la-nm-hash-utils.Tpo shared/nm-utils/$(DEPDIR)/clients_common_libnmc_base_la-nm-hash-utils.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='shared/nm-utils/nm-hash-utils.c' object='shared/nm-utils/clients_common_libnmc_base_la-nm-hash-utils.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(clients_common_libnmc_base_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o shared/nm-utils/clients_common_libnmc_base_la-nm-hash-utils.lo `test -f 'shared/nm-utils/nm-hash-utils.c' || echo '$(srcdir)/'`shared/nm-utils/nm-hash-utils.c
-
-shared/nm-utils/clients_common_libnmc_base_la-nm-random-utils.lo: shared/nm-utils/nm-random-utils.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(clients_common_libnmc_base_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT shared/nm-utils/clients_common_libnmc_base_la-nm-random-utils.lo -MD -MP -MF shared/nm-utils/$(DEPDIR)/clients_common_libnmc_base_la-nm-random-utils.Tpo -c -o shared/nm-utils/clients_common_libnmc_base_la-nm-random-utils.lo `test -f 'shared/nm-utils/nm-random-utils.c' || echo '$(srcdir)/'`shared/nm-utils/nm-random-utils.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) shared/nm-utils/$(DEPDIR)/clients_common_libnmc_base_la-nm-random-utils.Tpo shared/nm-utils/$(DEPDIR)/clients_common_libnmc_base_la-nm-random-utils.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='shared/nm-utils/nm-random-utils.c' object='shared/nm-utils/clients_common_libnmc_base_la-nm-random-utils.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(clients_common_libnmc_base_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o shared/nm-utils/clients_common_libnmc_base_la-nm-random-utils.lo `test -f 'shared/nm-utils/nm-random-utils.c' || echo '$(srcdir)/'`shared/nm-utils/nm-random-utils.c
-
-shared/nm-utils/clients_common_libnmc_base_la-nm-shared-utils.lo: shared/nm-utils/nm-shared-utils.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(clients_common_libnmc_base_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT shared/nm-utils/clients_common_libnmc_base_la-nm-shared-utils.lo -MD -MP -MF shared/nm-utils/$(DEPDIR)/clients_common_libnmc_base_la-nm-shared-utils.Tpo -c -o shared/nm-utils/clients_common_libnmc_base_la-nm-shared-utils.lo `test -f 'shared/nm-utils/nm-shared-utils.c' || echo '$(srcdir)/'`shared/nm-utils/nm-shared-utils.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) shared/nm-utils/$(DEPDIR)/clients_common_libnmc_base_la-nm-shared-utils.Tpo shared/nm-utils/$(DEPDIR)/clients_common_libnmc_base_la-nm-shared-utils.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='shared/nm-utils/nm-shared-utils.c' object='shared/nm-utils/clients_common_libnmc_base_la-nm-shared-utils.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(clients_common_libnmc_base_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o shared/nm-utils/clients_common_libnmc_base_la-nm-shared-utils.lo `test -f 'shared/nm-utils/nm-shared-utils.c' || echo '$(srcdir)/'`shared/nm-utils/nm-shared-utils.c
-
 clients/common/libnmc_base_la-nm-secret-agent-simple.lo: clients/common/nm-secret-agent-simple.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(clients_common_libnmc_base_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT clients/common/libnmc_base_la-nm-secret-agent-simple.lo -MD -MP -MF clients/common/$(DEPDIR)/libnmc_base_la-nm-secret-agent-simple.Tpo -c -o clients/common/libnmc_base_la-nm-secret-agent-simple.lo `test -f 'clients/common/nm-secret-agent-simple.c' || echo '$(srcdir)/'`clients/common/nm-secret-agent-simple.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) clients/common/$(DEPDIR)/libnmc_base_la-nm-secret-agent-simple.Tpo clients/common/$(DEPDIR)/libnmc_base_la-nm-secret-agent-simple.Plo
@@ -11953,13 +12349,6 @@ introspection/libnmdbus_la-org.freedesktop.NetworkManager.AccessPoint.lo: intros
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(introspection_libnmdbus_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o introspection/libnmdbus_la-org.freedesktop.NetworkManager.AccessPoint.lo `test -f 'introspection/org.freedesktop.NetworkManager.AccessPoint.c' || echo '$(srcdir)/'`introspection/org.freedesktop.NetworkManager.AccessPoint.c
 
-introspection/libnmdbus_la-org.freedesktop.NetworkManager.Connection.Active.lo: introspection/org.freedesktop.NetworkManager.Connection.Active.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(introspection_libnmdbus_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT introspection/libnmdbus_la-org.freedesktop.NetworkManager.Connection.Active.lo -MD -MP -MF introspection/$(DEPDIR)/libnmdbus_la-org.freedesktop.NetworkManager.Connection.Active.Tpo -c -o introspection/libnmdbus_la-org.freedesktop.NetworkManager.Connection.Active.lo `test -f 'introspection/org.freedesktop.NetworkManager.Connection.Active.c' || echo '$(srcdir)/'`introspection/org.freedesktop.NetworkManager.Connection.Active.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) introspection/$(DEPDIR)/libnmdbus_la-org.freedesktop.NetworkManager.Connection.Active.Tpo introspection/$(DEPDIR)/libnmdbus_la-org.freedesktop.NetworkManager.Connection.Active.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='introspection/org.freedesktop.NetworkManager.Connection.Active.c' object='introspection/libnmdbus_la-org.freedesktop.NetworkManager.Connection.Active.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(introspection_libnmdbus_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o introspection/libnmdbus_la-org.freedesktop.NetworkManager.Connection.Active.lo `test -f 'introspection/org.freedesktop.NetworkManager.Connection.Active.c' || echo '$(srcdir)/'`introspection/org.freedesktop.NetworkManager.Connection.Active.c
-
 introspection/libnmdbus_la-org.freedesktop.NetworkManager.AgentManager.lo: introspection/org.freedesktop.NetworkManager.AgentManager.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(introspection_libnmdbus_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT introspection/libnmdbus_la-org.freedesktop.NetworkManager.AgentManager.lo -MD -MP -MF introspection/$(DEPDIR)/libnmdbus_la-org.freedesktop.NetworkManager.AgentManager.Tpo -c -o introspection/libnmdbus_la-org.freedesktop.NetworkManager.AgentManager.lo `test -f 'introspection/org.freedesktop.NetworkManager.AgentManager.c' || echo '$(srcdir)/'`introspection/org.freedesktop.NetworkManager.AgentManager.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) introspection/$(DEPDIR)/libnmdbus_la-org.freedesktop.NetworkManager.AgentManager.Tpo introspection/$(DEPDIR)/libnmdbus_la-org.freedesktop.NetworkManager.AgentManager.Plo
@@ -11974,6 +12363,27 @@ introspection/libnmdbus_la-org.freedesktop.NetworkManager.Checkpoint.lo: introsp
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(introspection_libnmdbus_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o introspection/libnmdbus_la-org.freedesktop.NetworkManager.Checkpoint.lo `test -f 'introspection/org.freedesktop.NetworkManager.Checkpoint.c' || echo '$(srcdir)/'`introspection/org.freedesktop.NetworkManager.Checkpoint.c
 
+introspection/libnmdbus_la-org.freedesktop.NetworkManager.Connection.Active.lo: introspection/org.freedesktop.NetworkManager.Connection.Active.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(introspection_libnmdbus_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT introspection/libnmdbus_la-org.freedesktop.NetworkManager.Connection.Active.lo -MD -MP -MF introspection/$(DEPDIR)/libnmdbus_la-org.freedesktop.NetworkManager.Connection.Active.Tpo -c -o introspection/libnmdbus_la-org.freedesktop.NetworkManager.Connection.Active.lo `test -f 'introspection/org.freedesktop.NetworkManager.Connection.Active.c' || echo '$(srcdir)/'`introspection/org.freedesktop.NetworkManager.Connection.Active.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) introspection/$(DEPDIR)/libnmdbus_la-org.freedesktop.NetworkManager.Connection.Active.Tpo introspection/$(DEPDIR)/libnmdbus_la-org.freedesktop.NetworkManager.Connection.Active.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='introspection/org.freedesktop.NetworkManager.Connection.Active.c' object='introspection/libnmdbus_la-org.freedesktop.NetworkManager.Connection.Active.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(introspection_libnmdbus_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o introspection/libnmdbus_la-org.freedesktop.NetworkManager.Connection.Active.lo `test -f 'introspection/org.freedesktop.NetworkManager.Connection.Active.c' || echo '$(srcdir)/'`introspection/org.freedesktop.NetworkManager.Connection.Active.c
+
+introspection/libnmdbus_la-org.freedesktop.NetworkManager.DHCP4Config.lo: introspection/org.freedesktop.NetworkManager.DHCP4Config.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(introspection_libnmdbus_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT introspection/libnmdbus_la-org.freedesktop.NetworkManager.DHCP4Config.lo -MD -MP -MF introspection/$(DEPDIR)/libnmdbus_la-org.freedesktop.NetworkManager.DHCP4Config.Tpo -c -o introspection/libnmdbus_la-org.freedesktop.NetworkManager.DHCP4Config.lo `test -f 'introspection/org.freedesktop.NetworkManager.DHCP4Config.c' || echo '$(srcdir)/'`introspection/org.freedesktop.NetworkManager.DHCP4Config.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) introspection/$(DEPDIR)/libnmdbus_la-org.freedesktop.NetworkManager.DHCP4Config.Tpo introspection/$(DEPDIR)/libnmdbus_la-org.freedesktop.NetworkManager.DHCP4Config.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='introspection/org.freedesktop.NetworkManager.DHCP4Config.c' object='introspection/libnmdbus_la-org.freedesktop.NetworkManager.DHCP4Config.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(introspection_libnmdbus_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o introspection/libnmdbus_la-org.freedesktop.NetworkManager.DHCP4Config.lo `test -f 'introspection/org.freedesktop.NetworkManager.DHCP4Config.c' || echo '$(srcdir)/'`introspection/org.freedesktop.NetworkManager.DHCP4Config.c
+
+introspection/libnmdbus_la-org.freedesktop.NetworkManager.DHCP6Config.lo: introspection/org.freedesktop.NetworkManager.DHCP6Config.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(introspection_libnmdbus_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT introspection/libnmdbus_la-org.freedesktop.NetworkManager.DHCP6Config.lo -MD -MP -MF introspection/$(DEPDIR)/libnmdbus_la-org.freedesktop.NetworkManager.DHCP6Config.Tpo -c -o introspection/libnmdbus_la-org.freedesktop.NetworkManager.DHCP6Config.lo `test -f 'introspection/org.freedesktop.NetworkManager.DHCP6Config.c' || echo '$(srcdir)/'`introspection/org.freedesktop.NetworkManager.DHCP6Config.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) introspection/$(DEPDIR)/libnmdbus_la-org.freedesktop.NetworkManager.DHCP6Config.Tpo introspection/$(DEPDIR)/libnmdbus_la-org.freedesktop.NetworkManager.DHCP6Config.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='introspection/org.freedesktop.NetworkManager.DHCP6Config.c' object='introspection/libnmdbus_la-org.freedesktop.NetworkManager.DHCP6Config.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(introspection_libnmdbus_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o introspection/libnmdbus_la-org.freedesktop.NetworkManager.DHCP6Config.lo `test -f 'introspection/org.freedesktop.NetworkManager.DHCP6Config.c' || echo '$(srcdir)/'`introspection/org.freedesktop.NetworkManager.DHCP6Config.c
+
 introspection/libnmdbus_la-org.freedesktop.NetworkManager.Device.Adsl.lo: introspection/org.freedesktop.NetworkManager.Device.Adsl.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(introspection_libnmdbus_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT introspection/libnmdbus_la-org.freedesktop.NetworkManager.Device.Adsl.lo -MD -MP -MF introspection/$(DEPDIR)/libnmdbus_la-org.freedesktop.NetworkManager.Device.Adsl.Tpo -c -o introspection/libnmdbus_la-org.freedesktop.NetworkManager.Device.Adsl.lo `test -f 'introspection/org.freedesktop.NetworkManager.Device.Adsl.c' || echo '$(srcdir)/'`introspection/org.freedesktop.NetworkManager.Device.Adsl.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) introspection/$(DEPDIR)/libnmdbus_la-org.freedesktop.NetworkManager.Device.Adsl.Tpo introspection/$(DEPDIR)/libnmdbus_la-org.freedesktop.NetworkManager.Device.Adsl.Plo
@@ -11981,6 +12391,13 @@ introspection/libnmdbus_la-org.freedesktop.NetworkManager.Device.Adsl.lo: intros
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(introspection_libnmdbus_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o introspection/libnmdbus_la-org.freedesktop.NetworkManager.Device.Adsl.lo `test -f 'introspection/org.freedesktop.NetworkManager.Device.Adsl.c' || echo '$(srcdir)/'`introspection/org.freedesktop.NetworkManager.Device.Adsl.c
 
+introspection/libnmdbus_la-org.freedesktop.NetworkManager.Device.Bluetooth.lo: introspection/org.freedesktop.NetworkManager.Device.Bluetooth.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(introspection_libnmdbus_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT introspection/libnmdbus_la-org.freedesktop.NetworkManager.Device.Bluetooth.lo -MD -MP -MF introspection/$(DEPDIR)/libnmdbus_la-org.freedesktop.NetworkManager.Device.Bluetooth.Tpo -c -o introspection/libnmdbus_la-org.freedesktop.NetworkManager.Device.Bluetooth.lo `test -f 'introspection/org.freedesktop.NetworkManager.Device.Bluetooth.c' || echo '$(srcdir)/'`introspection/org.freedesktop.NetworkManager.Device.Bluetooth.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) introspection/$(DEPDIR)/libnmdbus_la-org.freedesktop.NetworkManager.Device.Bluetooth.Tpo introspection/$(DEPDIR)/libnmdbus_la-org.freedesktop.NetworkManager.Device.Bluetooth.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='introspection/org.freedesktop.NetworkManager.Device.Bluetooth.c' object='introspection/libnmdbus_la-org.freedesktop.NetworkManager.Device.Bluetooth.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(introspection_libnmdbus_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o introspection/libnmdbus_la-org.freedesktop.NetworkManager.Device.Bluetooth.lo `test -f 'introspection/org.freedesktop.NetworkManager.Device.Bluetooth.c' || echo '$(srcdir)/'`introspection/org.freedesktop.NetworkManager.Device.Bluetooth.c
+
 introspection/libnmdbus_la-org.freedesktop.NetworkManager.Device.Bond.lo: introspection/org.freedesktop.NetworkManager.Device.Bond.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(introspection_libnmdbus_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT introspection/libnmdbus_la-org.freedesktop.NetworkManager.Device.Bond.lo -MD -MP -MF introspection/$(DEPDIR)/libnmdbus_la-org.freedesktop.NetworkManager.Device.Bond.Tpo -c -o introspection/libnmdbus_la-org.freedesktop.NetworkManager.Device.Bond.lo `test -f 'introspection/org.freedesktop.NetworkManager.Device.Bond.c' || echo '$(srcdir)/'`introspection/org.freedesktop.NetworkManager.Device.Bond.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) introspection/$(DEPDIR)/libnmdbus_la-org.freedesktop.NetworkManager.Device.Bond.Tpo introspection/$(DEPDIR)/libnmdbus_la-org.freedesktop.NetworkManager.Device.Bond.Plo
@@ -11995,13 +12412,6 @@ introspection/libnmdbus_la-org.freedesktop.NetworkManager.Device.Bridge.lo: intr
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(introspection_libnmdbus_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o introspection/libnmdbus_la-org.freedesktop.NetworkManager.Device.Bridge.lo `test -f 'introspection/org.freedesktop.NetworkManager.Device.Bridge.c' || echo '$(srcdir)/'`introspection/org.freedesktop.NetworkManager.Device.Bridge.c
 
-introspection/libnmdbus_la-org.freedesktop.NetworkManager.Device.Bluetooth.lo: introspection/org.freedesktop.NetworkManager.Device.Bluetooth.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(introspection_libnmdbus_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT introspection/libnmdbus_la-org.freedesktop.NetworkManager.Device.Bluetooth.lo -MD -MP -MF introspection/$(DEPDIR)/libnmdbus_la-org.freedesktop.NetworkManager.Device.Bluetooth.Tpo -c -o introspection/libnmdbus_la-org.freedesktop.NetworkManager.Device.Bluetooth.lo `test -f 'introspection/org.freedesktop.NetworkManager.Device.Bluetooth.c' || echo '$(srcdir)/'`introspection/org.freedesktop.NetworkManager.Device.Bluetooth.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) introspection/$(DEPDIR)/libnmdbus_la-org.freedesktop.NetworkManager.Device.Bluetooth.Tpo introspection/$(DEPDIR)/libnmdbus_la-org.freedesktop.NetworkManager.Device.Bluetooth.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='introspection/org.freedesktop.NetworkManager.Device.Bluetooth.c' object='introspection/libnmdbus_la-org.freedesktop.NetworkManager.Device.Bluetooth.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(introspection_libnmdbus_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o introspection/libnmdbus_la-org.freedesktop.NetworkManager.Device.Bluetooth.lo `test -f 'introspection/org.freedesktop.NetworkManager.Device.Bluetooth.c' || echo '$(srcdir)/'`introspection/org.freedesktop.NetworkManager.Device.Bluetooth.c
-
 introspection/libnmdbus_la-org.freedesktop.NetworkManager.Device.Dummy.lo: introspection/org.freedesktop.NetworkManager.Device.Dummy.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(introspection_libnmdbus_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT introspection/libnmdbus_la-org.freedesktop.NetworkManager.Device.Dummy.lo -MD -MP -MF introspection/$(DEPDIR)/libnmdbus_la-org.freedesktop.NetworkManager.Device.Dummy.Tpo -c -o introspection/libnmdbus_la-org.freedesktop.NetworkManager.Device.Dummy.lo `test -f 'introspection/org.freedesktop.NetworkManager.Device.Dummy.c' || echo '$(srcdir)/'`introspection/org.freedesktop.NetworkManager.Device.Dummy.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) introspection/$(DEPDIR)/libnmdbus_la-org.freedesktop.NetworkManager.Device.Dummy.Tpo introspection/$(DEPDIR)/libnmdbus_la-org.freedesktop.NetworkManager.Device.Dummy.Plo
@@ -12009,13 +12419,6 @@ introspection/libnmdbus_la-org.freedesktop.NetworkManager.Device.Dummy.lo: intro
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(introspection_libnmdbus_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o introspection/libnmdbus_la-org.freedesktop.NetworkManager.Device.Dummy.lo `test -f 'introspection/org.freedesktop.NetworkManager.Device.Dummy.c' || echo '$(srcdir)/'`introspection/org.freedesktop.NetworkManager.Device.Dummy.c
 
-introspection/libnmdbus_la-org.freedesktop.NetworkManager.Device.Wired.lo: introspection/org.freedesktop.NetworkManager.Device.Wired.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(introspection_libnmdbus_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT introspection/libnmdbus_la-org.freedesktop.NetworkManager.Device.Wired.lo -MD -MP -MF introspection/$(DEPDIR)/libnmdbus_la-org.freedesktop.NetworkManager.Device.Wired.Tpo -c -o introspection/libnmdbus_la-org.freedesktop.NetworkManager.Device.Wired.lo `test -f 'introspection/org.freedesktop.NetworkManager.Device.Wired.c' || echo '$(srcdir)/'`introspection/org.freedesktop.NetworkManager.Device.Wired.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) introspection/$(DEPDIR)/libnmdbus_la-org.freedesktop.NetworkManager.Device.Wired.Tpo introspection/$(DEPDIR)/libnmdbus_la-org.freedesktop.NetworkManager.Device.Wired.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='introspection/org.freedesktop.NetworkManager.Device.Wired.c' object='introspection/libnmdbus_la-org.freedesktop.NetworkManager.Device.Wired.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(introspection_libnmdbus_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o introspection/libnmdbus_la-org.freedesktop.NetworkManager.Device.Wired.lo `test -f 'introspection/org.freedesktop.NetworkManager.Device.Wired.c' || echo '$(srcdir)/'`introspection/org.freedesktop.NetworkManager.Device.Wired.c
-
 introspection/libnmdbus_la-org.freedesktop.NetworkManager.Device.Generic.lo: introspection/org.freedesktop.NetworkManager.Device.Generic.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(introspection_libnmdbus_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT introspection/libnmdbus_la-org.freedesktop.NetworkManager.Device.Generic.lo -MD -MP -MF introspection/$(DEPDIR)/libnmdbus_la-org.freedesktop.NetworkManager.Device.Generic.Tpo -c -o introspection/libnmdbus_la-org.freedesktop.NetworkManager.Device.Generic.lo `test -f 'introspection/org.freedesktop.NetworkManager.Device.Generic.c' || echo '$(srcdir)/'`introspection/org.freedesktop.NetworkManager.Device.Generic.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) introspection/$(DEPDIR)/libnmdbus_la-org.freedesktop.NetworkManager.Device.Generic.Tpo introspection/$(DEPDIR)/libnmdbus_la-org.freedesktop.NetworkManager.Device.Generic.Plo
@@ -12023,13 +12426,6 @@ introspection/libnmdbus_la-org.freedesktop.NetworkManager.Device.Generic.lo: int
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(introspection_libnmdbus_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o introspection/libnmdbus_la-org.freedesktop.NetworkManager.Device.Generic.lo `test -f 'introspection/org.freedesktop.NetworkManager.Device.Generic.c' || echo '$(srcdir)/'`introspection/org.freedesktop.NetworkManager.Device.Generic.c
 
-introspection/libnmdbus_la-org.freedesktop.NetworkManager.Device.Infiniband.lo: introspection/org.freedesktop.NetworkManager.Device.Infiniband.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(introspection_libnmdbus_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT introspection/libnmdbus_la-org.freedesktop.NetworkManager.Device.Infiniband.lo -MD -MP -MF introspection/$(DEPDIR)/libnmdbus_la-org.freedesktop.NetworkManager.Device.Infiniband.Tpo -c -o introspection/libnmdbus_la-org.freedesktop.NetworkManager.Device.Infiniband.lo `test -f 'introspection/org.freedesktop.NetworkManager.Device.Infiniband.c' || echo '$(srcdir)/'`introspection/org.freedesktop.NetworkManager.Device.Infiniband.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) introspection/$(DEPDIR)/libnmdbus_la-org.freedesktop.NetworkManager.Device.Infiniband.Tpo introspection/$(DEPDIR)/libnmdbus_la-org.freedesktop.NetworkManager.Device.Infiniband.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='introspection/org.freedesktop.NetworkManager.Device.Infiniband.c' object='introspection/libnmdbus_la-org.freedesktop.NetworkManager.Device.Infiniband.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(introspection_libnmdbus_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o introspection/libnmdbus_la-org.freedesktop.NetworkManager.Device.Infiniband.lo `test -f 'introspection/org.freedesktop.NetworkManager.Device.Infiniband.c' || echo '$(srcdir)/'`introspection/org.freedesktop.NetworkManager.Device.Infiniband.c
-
 introspection/libnmdbus_la-org.freedesktop.NetworkManager.Device.IPTunnel.lo: introspection/org.freedesktop.NetworkManager.Device.IPTunnel.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(introspection_libnmdbus_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT introspection/libnmdbus_la-org.freedesktop.NetworkManager.Device.IPTunnel.lo -MD -MP -MF introspection/$(DEPDIR)/libnmdbus_la-org.freedesktop.NetworkManager.Device.IPTunnel.Tpo -c -o introspection/libnmdbus_la-org.freedesktop.NetworkManager.Device.IPTunnel.lo `test -f 'introspection/org.freedesktop.NetworkManager.Device.IPTunnel.c' || echo '$(srcdir)/'`introspection/org.freedesktop.NetworkManager.Device.IPTunnel.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) introspection/$(DEPDIR)/libnmdbus_la-org.freedesktop.NetworkManager.Device.IPTunnel.Tpo introspection/$(DEPDIR)/libnmdbus_la-org.freedesktop.NetworkManager.Device.IPTunnel.Plo
@@ -12037,6 +12433,13 @@ introspection/libnmdbus_la-org.freedesktop.NetworkManager.Device.IPTunnel.lo: in
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(introspection_libnmdbus_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o introspection/libnmdbus_la-org.freedesktop.NetworkManager.Device.IPTunnel.lo `test -f 'introspection/org.freedesktop.NetworkManager.Device.IPTunnel.c' || echo '$(srcdir)/'`introspection/org.freedesktop.NetworkManager.Device.IPTunnel.c
 
+introspection/libnmdbus_la-org.freedesktop.NetworkManager.Device.Infiniband.lo: introspection/org.freedesktop.NetworkManager.Device.Infiniband.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(introspection_libnmdbus_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT introspection/libnmdbus_la-org.freedesktop.NetworkManager.Device.Infiniband.lo -MD -MP -MF introspection/$(DEPDIR)/libnmdbus_la-org.freedesktop.NetworkManager.Device.Infiniband.Tpo -c -o introspection/libnmdbus_la-org.freedesktop.NetworkManager.Device.Infiniband.lo `test -f 'introspection/org.freedesktop.NetworkManager.Device.Infiniband.c' || echo '$(srcdir)/'`introspection/org.freedesktop.NetworkManager.Device.Infiniband.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) introspection/$(DEPDIR)/libnmdbus_la-org.freedesktop.NetworkManager.Device.Infiniband.Tpo introspection/$(DEPDIR)/libnmdbus_la-org.freedesktop.NetworkManager.Device.Infiniband.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='introspection/org.freedesktop.NetworkManager.Device.Infiniband.c' object='introspection/libnmdbus_la-org.freedesktop.NetworkManager.Device.Infiniband.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(introspection_libnmdbus_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o introspection/libnmdbus_la-org.freedesktop.NetworkManager.Device.Infiniband.lo `test -f 'introspection/org.freedesktop.NetworkManager.Device.Infiniband.c' || echo '$(srcdir)/'`introspection/org.freedesktop.NetworkManager.Device.Infiniband.c
+
 introspection/libnmdbus_la-org.freedesktop.NetworkManager.Device.Lowpan.lo: introspection/org.freedesktop.NetworkManager.Device.Lowpan.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(introspection_libnmdbus_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT introspection/libnmdbus_la-org.freedesktop.NetworkManager.Device.Lowpan.lo -MD -MP -MF introspection/$(DEPDIR)/libnmdbus_la-org.freedesktop.NetworkManager.Device.Lowpan.Tpo -c -o introspection/libnmdbus_la-org.freedesktop.NetworkManager.Device.Lowpan.lo `test -f 'introspection/org.freedesktop.NetworkManager.Device.Lowpan.c' || echo '$(srcdir)/'`introspection/org.freedesktop.NetworkManager.Device.Lowpan.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) introspection/$(DEPDIR)/libnmdbus_la-org.freedesktop.NetworkManager.Device.Lowpan.Tpo introspection/$(DEPDIR)/libnmdbus_la-org.freedesktop.NetworkManager.Device.Lowpan.Plo
@@ -12072,6 +12475,13 @@ introspection/libnmdbus_la-org.freedesktop.NetworkManager.Device.OlpcMesh.lo: in
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(introspection_libnmdbus_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o introspection/libnmdbus_la-org.freedesktop.NetworkManager.Device.OlpcMesh.lo `test -f 'introspection/org.freedesktop.NetworkManager.Device.OlpcMesh.c' || echo '$(srcdir)/'`introspection/org.freedesktop.NetworkManager.Device.OlpcMesh.c
 
+introspection/libnmdbus_la-org.freedesktop.NetworkManager.Device.OvsBridge.lo: introspection/org.freedesktop.NetworkManager.Device.OvsBridge.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(introspection_libnmdbus_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT introspection/libnmdbus_la-org.freedesktop.NetworkManager.Device.OvsBridge.lo -MD -MP -MF introspection/$(DEPDIR)/libnmdbus_la-org.freedesktop.NetworkManager.Device.OvsBridge.Tpo -c -o introspection/libnmdbus_la-org.freedesktop.NetworkManager.Device.OvsBridge.lo `test -f 'introspection/org.freedesktop.NetworkManager.Device.OvsBridge.c' || echo '$(srcdir)/'`introspection/org.freedesktop.NetworkManager.Device.OvsBridge.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) introspection/$(DEPDIR)/libnmdbus_la-org.freedesktop.NetworkManager.Device.OvsBridge.Tpo introspection/$(DEPDIR)/libnmdbus_la-org.freedesktop.NetworkManager.Device.OvsBridge.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='introspection/org.freedesktop.NetworkManager.Device.OvsBridge.c' object='introspection/libnmdbus_la-org.freedesktop.NetworkManager.Device.OvsBridge.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(introspection_libnmdbus_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o introspection/libnmdbus_la-org.freedesktop.NetworkManager.Device.OvsBridge.lo `test -f 'introspection/org.freedesktop.NetworkManager.Device.OvsBridge.c' || echo '$(srcdir)/'`introspection/org.freedesktop.NetworkManager.Device.OvsBridge.c
+
 introspection/libnmdbus_la-org.freedesktop.NetworkManager.Device.OvsInterface.lo: introspection/org.freedesktop.NetworkManager.Device.OvsInterface.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(introspection_libnmdbus_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT introspection/libnmdbus_la-org.freedesktop.NetworkManager.Device.OvsInterface.lo -MD -MP -MF introspection/$(DEPDIR)/libnmdbus_la-org.freedesktop.NetworkManager.Device.OvsInterface.Tpo -c -o introspection/libnmdbus_la-org.freedesktop.NetworkManager.Device.OvsInterface.lo `test -f 'introspection/org.freedesktop.NetworkManager.Device.OvsInterface.c' || echo '$(srcdir)/'`introspection/org.freedesktop.NetworkManager.Device.OvsInterface.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) introspection/$(DEPDIR)/libnmdbus_la-org.freedesktop.NetworkManager.Device.OvsInterface.Tpo introspection/$(DEPDIR)/libnmdbus_la-org.freedesktop.NetworkManager.Device.OvsInterface.Plo
@@ -12086,13 +12496,6 @@ introspection/libnmdbus_la-org.freedesktop.NetworkManager.Device.OvsPort.lo: int
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(introspection_libnmdbus_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o introspection/libnmdbus_la-org.freedesktop.NetworkManager.Device.OvsPort.lo `test -f 'introspection/org.freedesktop.NetworkManager.Device.OvsPort.c' || echo '$(srcdir)/'`introspection/org.freedesktop.NetworkManager.Device.OvsPort.c
 
-introspection/libnmdbus_la-org.freedesktop.NetworkManager.Device.OvsBridge.lo: introspection/org.freedesktop.NetworkManager.Device.OvsBridge.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(introspection_libnmdbus_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT introspection/libnmdbus_la-org.freedesktop.NetworkManager.Device.OvsBridge.lo -MD -MP -MF introspection/$(DEPDIR)/libnmdbus_la-org.freedesktop.NetworkManager.Device.OvsBridge.Tpo -c -o introspection/libnmdbus_la-org.freedesktop.NetworkManager.Device.OvsBridge.lo `test -f 'introspection/org.freedesktop.NetworkManager.Device.OvsBridge.c' || echo '$(srcdir)/'`introspection/org.freedesktop.NetworkManager.Device.OvsBridge.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) introspection/$(DEPDIR)/libnmdbus_la-org.freedesktop.NetworkManager.Device.OvsBridge.Tpo introspection/$(DEPDIR)/libnmdbus_la-org.freedesktop.NetworkManager.Device.OvsBridge.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='introspection/org.freedesktop.NetworkManager.Device.OvsBridge.c' object='introspection/libnmdbus_la-org.freedesktop.NetworkManager.Device.OvsBridge.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(introspection_libnmdbus_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o introspection/libnmdbus_la-org.freedesktop.NetworkManager.Device.OvsBridge.lo `test -f 'introspection/org.freedesktop.NetworkManager.Device.OvsBridge.c' || echo '$(srcdir)/'`introspection/org.freedesktop.NetworkManager.Device.OvsBridge.c
-
 introspection/libnmdbus_la-org.freedesktop.NetworkManager.Device.Ppp.lo: introspection/org.freedesktop.NetworkManager.Device.Ppp.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(introspection_libnmdbus_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT introspection/libnmdbus_la-org.freedesktop.NetworkManager.Device.Ppp.lo -MD -MP -MF introspection/$(DEPDIR)/libnmdbus_la-org.freedesktop.NetworkManager.Device.Ppp.Tpo -c -o introspection/libnmdbus_la-org.freedesktop.NetworkManager.Device.Ppp.lo `test -f 'introspection/org.freedesktop.NetworkManager.Device.Ppp.c' || echo '$(srcdir)/'`introspection/org.freedesktop.NetworkManager.Device.Ppp.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) introspection/$(DEPDIR)/libnmdbus_la-org.freedesktop.NetworkManager.Device.Ppp.Tpo introspection/$(DEPDIR)/libnmdbus_la-org.freedesktop.NetworkManager.Device.Ppp.Plo
@@ -12142,6 +12545,20 @@ introspection/libnmdbus_la-org.freedesktop.NetworkManager.Device.Vxlan.lo: intro
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(introspection_libnmdbus_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o introspection/libnmdbus_la-org.freedesktop.NetworkManager.Device.Vxlan.lo `test -f 'introspection/org.freedesktop.NetworkManager.Device.Vxlan.c' || echo '$(srcdir)/'`introspection/org.freedesktop.NetworkManager.Device.Vxlan.c
 
+introspection/libnmdbus_la-org.freedesktop.NetworkManager.Device.WiMax.lo: introspection/org.freedesktop.NetworkManager.Device.WiMax.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(introspection_libnmdbus_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT introspection/libnmdbus_la-org.freedesktop.NetworkManager.Device.WiMax.lo -MD -MP -MF introspection/$(DEPDIR)/libnmdbus_la-org.freedesktop.NetworkManager.Device.WiMax.Tpo -c -o introspection/libnmdbus_la-org.freedesktop.NetworkManager.Device.WiMax.lo `test -f 'introspection/org.freedesktop.NetworkManager.Device.WiMax.c' || echo '$(srcdir)/'`introspection/org.freedesktop.NetworkManager.Device.WiMax.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) introspection/$(DEPDIR)/libnmdbus_la-org.freedesktop.NetworkManager.Device.WiMax.Tpo introspection/$(DEPDIR)/libnmdbus_la-org.freedesktop.NetworkManager.Device.WiMax.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='introspection/org.freedesktop.NetworkManager.Device.WiMax.c' object='introspection/libnmdbus_la-org.freedesktop.NetworkManager.Device.WiMax.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(introspection_libnmdbus_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o introspection/libnmdbus_la-org.freedesktop.NetworkManager.Device.WiMax.lo `test -f 'introspection/org.freedesktop.NetworkManager.Device.WiMax.c' || echo '$(srcdir)/'`introspection/org.freedesktop.NetworkManager.Device.WiMax.c
+
+introspection/libnmdbus_la-org.freedesktop.NetworkManager.Device.WifiP2P.lo: introspection/org.freedesktop.NetworkManager.Device.WifiP2P.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(introspection_libnmdbus_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT introspection/libnmdbus_la-org.freedesktop.NetworkManager.Device.WifiP2P.lo -MD -MP -MF introspection/$(DEPDIR)/libnmdbus_la-org.freedesktop.NetworkManager.Device.WifiP2P.Tpo -c -o introspection/libnmdbus_la-org.freedesktop.NetworkManager.Device.WifiP2P.lo `test -f 'introspection/org.freedesktop.NetworkManager.Device.WifiP2P.c' || echo '$(srcdir)/'`introspection/org.freedesktop.NetworkManager.Device.WifiP2P.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) introspection/$(DEPDIR)/libnmdbus_la-org.freedesktop.NetworkManager.Device.WifiP2P.Tpo introspection/$(DEPDIR)/libnmdbus_la-org.freedesktop.NetworkManager.Device.WifiP2P.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='introspection/org.freedesktop.NetworkManager.Device.WifiP2P.c' object='introspection/libnmdbus_la-org.freedesktop.NetworkManager.Device.WifiP2P.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(introspection_libnmdbus_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o introspection/libnmdbus_la-org.freedesktop.NetworkManager.Device.WifiP2P.lo `test -f 'introspection/org.freedesktop.NetworkManager.Device.WifiP2P.c' || echo '$(srcdir)/'`introspection/org.freedesktop.NetworkManager.Device.WifiP2P.c
+
 introspection/libnmdbus_la-org.freedesktop.NetworkManager.Device.WireGuard.lo: introspection/org.freedesktop.NetworkManager.Device.WireGuard.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(introspection_libnmdbus_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT introspection/libnmdbus_la-org.freedesktop.NetworkManager.Device.WireGuard.lo -MD -MP -MF introspection/$(DEPDIR)/libnmdbus_la-org.freedesktop.NetworkManager.Device.WireGuard.Tpo -c -o introspection/libnmdbus_la-org.freedesktop.NetworkManager.Device.WireGuard.lo `test -f 'introspection/org.freedesktop.NetworkManager.Device.WireGuard.c' || echo '$(srcdir)/'`introspection/org.freedesktop.NetworkManager.Device.WireGuard.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) introspection/$(DEPDIR)/libnmdbus_la-org.freedesktop.NetworkManager.Device.WireGuard.Tpo introspection/$(DEPDIR)/libnmdbus_la-org.freedesktop.NetworkManager.Device.WireGuard.Plo
@@ -12149,6 +12566,13 @@ introspection/libnmdbus_la-org.freedesktop.NetworkManager.Device.WireGuard.lo: i
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(introspection_libnmdbus_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o introspection/libnmdbus_la-org.freedesktop.NetworkManager.Device.WireGuard.lo `test -f 'introspection/org.freedesktop.NetworkManager.Device.WireGuard.c' || echo '$(srcdir)/'`introspection/org.freedesktop.NetworkManager.Device.WireGuard.c
 
+introspection/libnmdbus_la-org.freedesktop.NetworkManager.Device.Wired.lo: introspection/org.freedesktop.NetworkManager.Device.Wired.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(introspection_libnmdbus_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT introspection/libnmdbus_la-org.freedesktop.NetworkManager.Device.Wired.lo -MD -MP -MF introspection/$(DEPDIR)/libnmdbus_la-org.freedesktop.NetworkManager.Device.Wired.Tpo -c -o introspection/libnmdbus_la-org.freedesktop.NetworkManager.Device.Wired.lo `test -f 'introspection/org.freedesktop.NetworkManager.Device.Wired.c' || echo '$(srcdir)/'`introspection/org.freedesktop.NetworkManager.Device.Wired.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) introspection/$(DEPDIR)/libnmdbus_la-org.freedesktop.NetworkManager.Device.Wired.Tpo introspection/$(DEPDIR)/libnmdbus_la-org.freedesktop.NetworkManager.Device.Wired.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='introspection/org.freedesktop.NetworkManager.Device.Wired.c' object='introspection/libnmdbus_la-org.freedesktop.NetworkManager.Device.Wired.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(introspection_libnmdbus_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o introspection/libnmdbus_la-org.freedesktop.NetworkManager.Device.Wired.lo `test -f 'introspection/org.freedesktop.NetworkManager.Device.Wired.c' || echo '$(srcdir)/'`introspection/org.freedesktop.NetworkManager.Device.Wired.c
+
 introspection/libnmdbus_la-org.freedesktop.NetworkManager.Device.Wireless.lo: introspection/org.freedesktop.NetworkManager.Device.Wireless.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(introspection_libnmdbus_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT introspection/libnmdbus_la-org.freedesktop.NetworkManager.Device.Wireless.lo -MD -MP -MF introspection/$(DEPDIR)/libnmdbus_la-org.freedesktop.NetworkManager.Device.Wireless.Tpo -c -o introspection/libnmdbus_la-org.freedesktop.NetworkManager.Device.Wireless.lo `test -f 'introspection/org.freedesktop.NetworkManager.Device.Wireless.c' || echo '$(srcdir)/'`introspection/org.freedesktop.NetworkManager.Device.Wireless.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) introspection/$(DEPDIR)/libnmdbus_la-org.freedesktop.NetworkManager.Device.Wireless.Tpo introspection/$(DEPDIR)/libnmdbus_la-org.freedesktop.NetworkManager.Device.Wireless.Plo
@@ -12156,13 +12580,6 @@ introspection/libnmdbus_la-org.freedesktop.NetworkManager.Device.Wireless.lo: in
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(introspection_libnmdbus_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o introspection/libnmdbus_la-org.freedesktop.NetworkManager.Device.Wireless.lo `test -f 'introspection/org.freedesktop.NetworkManager.Device.Wireless.c' || echo '$(srcdir)/'`introspection/org.freedesktop.NetworkManager.Device.Wireless.c
 
-introspection/libnmdbus_la-org.freedesktop.NetworkManager.Device.WiMax.lo: introspection/org.freedesktop.NetworkManager.Device.WiMax.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(introspection_libnmdbus_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT introspection/libnmdbus_la-org.freedesktop.NetworkManager.Device.WiMax.lo -MD -MP -MF introspection/$(DEPDIR)/libnmdbus_la-org.freedesktop.NetworkManager.Device.WiMax.Tpo -c -o introspection/libnmdbus_la-org.freedesktop.NetworkManager.Device.WiMax.lo `test -f 'introspection/org.freedesktop.NetworkManager.Device.WiMax.c' || echo '$(srcdir)/'`introspection/org.freedesktop.NetworkManager.Device.WiMax.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) introspection/$(DEPDIR)/libnmdbus_la-org.freedesktop.NetworkManager.Device.WiMax.Tpo introspection/$(DEPDIR)/libnmdbus_la-org.freedesktop.NetworkManager.Device.WiMax.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='introspection/org.freedesktop.NetworkManager.Device.WiMax.c' object='introspection/libnmdbus_la-org.freedesktop.NetworkManager.Device.WiMax.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(introspection_libnmdbus_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o introspection/libnmdbus_la-org.freedesktop.NetworkManager.Device.WiMax.lo `test -f 'introspection/org.freedesktop.NetworkManager.Device.WiMax.c' || echo '$(srcdir)/'`introspection/org.freedesktop.NetworkManager.Device.WiMax.c
-
 introspection/libnmdbus_la-org.freedesktop.NetworkManager.Device.Wpan.lo: introspection/org.freedesktop.NetworkManager.Device.Wpan.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(introspection_libnmdbus_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT introspection/libnmdbus_la-org.freedesktop.NetworkManager.Device.Wpan.lo -MD -MP -MF introspection/$(DEPDIR)/libnmdbus_la-org.freedesktop.NetworkManager.Device.Wpan.Tpo -c -o introspection/libnmdbus_la-org.freedesktop.NetworkManager.Device.Wpan.lo `test -f 'introspection/org.freedesktop.NetworkManager.Device.Wpan.c' || echo '$(srcdir)/'`introspection/org.freedesktop.NetworkManager.Device.Wpan.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) introspection/$(DEPDIR)/libnmdbus_la-org.freedesktop.NetworkManager.Device.Wpan.Tpo introspection/$(DEPDIR)/libnmdbus_la-org.freedesktop.NetworkManager.Device.Wpan.Plo
@@ -12177,20 +12594,6 @@ introspection/libnmdbus_la-org.freedesktop.NetworkManager.Device.lo: introspecti
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(introspection_libnmdbus_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o introspection/libnmdbus_la-org.freedesktop.NetworkManager.Device.lo `test -f 'introspection/org.freedesktop.NetworkManager.Device.c' || echo '$(srcdir)/'`introspection/org.freedesktop.NetworkManager.Device.c
 
-introspection/libnmdbus_la-org.freedesktop.NetworkManager.DHCP4Config.lo: introspection/org.freedesktop.NetworkManager.DHCP4Config.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(introspection_libnmdbus_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT introspection/libnmdbus_la-org.freedesktop.NetworkManager.DHCP4Config.lo -MD -MP -MF introspection/$(DEPDIR)/libnmdbus_la-org.freedesktop.NetworkManager.DHCP4Config.Tpo -c -o introspection/libnmdbus_la-org.freedesktop.NetworkManager.DHCP4Config.lo `test -f 'introspection/org.freedesktop.NetworkManager.DHCP4Config.c' || echo '$(srcdir)/'`introspection/org.freedesktop.NetworkManager.DHCP4Config.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) introspection/$(DEPDIR)/libnmdbus_la-org.freedesktop.NetworkManager.DHCP4Config.Tpo introspection/$(DEPDIR)/libnmdbus_la-org.freedesktop.NetworkManager.DHCP4Config.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='introspection/org.freedesktop.NetworkManager.DHCP4Config.c' object='introspection/libnmdbus_la-org.freedesktop.NetworkManager.DHCP4Config.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(introspection_libnmdbus_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o introspection/libnmdbus_la-org.freedesktop.NetworkManager.DHCP4Config.lo `test -f 'introspection/org.freedesktop.NetworkManager.DHCP4Config.c' || echo '$(srcdir)/'`introspection/org.freedesktop.NetworkManager.DHCP4Config.c
-
-introspection/libnmdbus_la-org.freedesktop.NetworkManager.DHCP6Config.lo: introspection/org.freedesktop.NetworkManager.DHCP6Config.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(introspection_libnmdbus_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT introspection/libnmdbus_la-org.freedesktop.NetworkManager.DHCP6Config.lo -MD -MP -MF introspection/$(DEPDIR)/libnmdbus_la-org.freedesktop.NetworkManager.DHCP6Config.Tpo -c -o introspection/libnmdbus_la-org.freedesktop.NetworkManager.DHCP6Config.lo `test -f 'introspection/org.freedesktop.NetworkManager.DHCP6Config.c' || echo '$(srcdir)/'`introspection/org.freedesktop.NetworkManager.DHCP6Config.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) introspection/$(DEPDIR)/libnmdbus_la-org.freedesktop.NetworkManager.DHCP6Config.Tpo introspection/$(DEPDIR)/libnmdbus_la-org.freedesktop.NetworkManager.DHCP6Config.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='introspection/org.freedesktop.NetworkManager.DHCP6Config.c' object='introspection/libnmdbus_la-org.freedesktop.NetworkManager.DHCP6Config.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(introspection_libnmdbus_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o introspection/libnmdbus_la-org.freedesktop.NetworkManager.DHCP6Config.lo `test -f 'introspection/org.freedesktop.NetworkManager.DHCP6Config.c' || echo '$(srcdir)/'`introspection/org.freedesktop.NetworkManager.DHCP6Config.c
-
 introspection/libnmdbus_la-org.freedesktop.NetworkManager.DnsManager.lo: introspection/org.freedesktop.NetworkManager.DnsManager.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(introspection_libnmdbus_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT introspection/libnmdbus_la-org.freedesktop.NetworkManager.DnsManager.lo -MD -MP -MF introspection/$(DEPDIR)/libnmdbus_la-org.freedesktop.NetworkManager.DnsManager.Tpo -c -o introspection/libnmdbus_la-org.freedesktop.NetworkManager.DnsManager.lo `test -f 'introspection/org.freedesktop.NetworkManager.DnsManager.c' || echo '$(srcdir)/'`introspection/org.freedesktop.NetworkManager.DnsManager.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) introspection/$(DEPDIR)/libnmdbus_la-org.freedesktop.NetworkManager.DnsManager.Tpo introspection/$(DEPDIR)/libnmdbus_la-org.freedesktop.NetworkManager.DnsManager.Plo
@@ -12212,12 +12615,12 @@ introspection/libnmdbus_la-org.freedesktop.NetworkManager.IP6Config.lo: introspe
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(introspection_libnmdbus_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o introspection/libnmdbus_la-org.freedesktop.NetworkManager.IP6Config.lo `test -f 'introspection/org.freedesktop.NetworkManager.IP6Config.c' || echo '$(srcdir)/'`introspection/org.freedesktop.NetworkManager.IP6Config.c
 
-introspection/libnmdbus_la-org.freedesktop.NetworkManager.lo: introspection/org.freedesktop.NetworkManager.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(introspection_libnmdbus_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT introspection/libnmdbus_la-org.freedesktop.NetworkManager.lo -MD -MP -MF introspection/$(DEPDIR)/libnmdbus_la-org.freedesktop.NetworkManager.Tpo -c -o introspection/libnmdbus_la-org.freedesktop.NetworkManager.lo `test -f 'introspection/org.freedesktop.NetworkManager.c' || echo '$(srcdir)/'`introspection/org.freedesktop.NetworkManager.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) introspection/$(DEPDIR)/libnmdbus_la-org.freedesktop.NetworkManager.Tpo introspection/$(DEPDIR)/libnmdbus_la-org.freedesktop.NetworkManager.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='introspection/org.freedesktop.NetworkManager.c' object='introspection/libnmdbus_la-org.freedesktop.NetworkManager.lo' libtool=yes @AMDEPBACKSLASH@
+introspection/libnmdbus_la-org.freedesktop.NetworkManager.WifiP2PPeer.lo: introspection/org.freedesktop.NetworkManager.WifiP2PPeer.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(introspection_libnmdbus_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT introspection/libnmdbus_la-org.freedesktop.NetworkManager.WifiP2PPeer.lo -MD -MP -MF introspection/$(DEPDIR)/libnmdbus_la-org.freedesktop.NetworkManager.WifiP2PPeer.Tpo -c -o introspection/libnmdbus_la-org.freedesktop.NetworkManager.WifiP2PPeer.lo `test -f 'introspection/org.freedesktop.NetworkManager.WifiP2PPeer.c' || echo '$(srcdir)/'`introspection/org.freedesktop.NetworkManager.WifiP2PPeer.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) introspection/$(DEPDIR)/libnmdbus_la-org.freedesktop.NetworkManager.WifiP2PPeer.Tpo introspection/$(DEPDIR)/libnmdbus_la-org.freedesktop.NetworkManager.WifiP2PPeer.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='introspection/org.freedesktop.NetworkManager.WifiP2PPeer.c' object='introspection/libnmdbus_la-org.freedesktop.NetworkManager.WifiP2PPeer.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(introspection_libnmdbus_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o introspection/libnmdbus_la-org.freedesktop.NetworkManager.lo `test -f 'introspection/org.freedesktop.NetworkManager.c' || echo '$(srcdir)/'`introspection/org.freedesktop.NetworkManager.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(introspection_libnmdbus_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o introspection/libnmdbus_la-org.freedesktop.NetworkManager.WifiP2PPeer.lo `test -f 'introspection/org.freedesktop.NetworkManager.WifiP2PPeer.c' || echo '$(srcdir)/'`introspection/org.freedesktop.NetworkManager.WifiP2PPeer.c
 
 introspection/libnmdbus_la-org.freedesktop.NetworkManager.PPP.lo: introspection/org.freedesktop.NetworkManager.PPP.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(introspection_libnmdbus_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT introspection/libnmdbus_la-org.freedesktop.NetworkManager.PPP.lo -MD -MP -MF introspection/$(DEPDIR)/libnmdbus_la-org.freedesktop.NetworkManager.PPP.Tpo -c -o introspection/libnmdbus_la-org.freedesktop.NetworkManager.PPP.lo `test -f 'introspection/org.freedesktop.NetworkManager.PPP.c' || echo '$(srcdir)/'`introspection/org.freedesktop.NetworkManager.PPP.c
@@ -12261,6 +12664,13 @@ introspection/libnmdbus_la-org.freedesktop.NetworkManager.VPN.Plugin.lo: introsp
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(introspection_libnmdbus_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o introspection/libnmdbus_la-org.freedesktop.NetworkManager.VPN.Plugin.lo `test -f 'introspection/org.freedesktop.NetworkManager.VPN.Plugin.c' || echo '$(srcdir)/'`introspection/org.freedesktop.NetworkManager.VPN.Plugin.c
 
+introspection/libnmdbus_la-org.freedesktop.NetworkManager.lo: introspection/org.freedesktop.NetworkManager.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(introspection_libnmdbus_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT introspection/libnmdbus_la-org.freedesktop.NetworkManager.lo -MD -MP -MF introspection/$(DEPDIR)/libnmdbus_la-org.freedesktop.NetworkManager.Tpo -c -o introspection/libnmdbus_la-org.freedesktop.NetworkManager.lo `test -f 'introspection/org.freedesktop.NetworkManager.c' || echo '$(srcdir)/'`introspection/org.freedesktop.NetworkManager.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) introspection/$(DEPDIR)/libnmdbus_la-org.freedesktop.NetworkManager.Tpo introspection/$(DEPDIR)/libnmdbus_la-org.freedesktop.NetworkManager.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='introspection/org.freedesktop.NetworkManager.c' object='introspection/libnmdbus_la-org.freedesktop.NetworkManager.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(introspection_libnmdbus_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o introspection/libnmdbus_la-org.freedesktop.NetworkManager.lo `test -f 'introspection/org.freedesktop.NetworkManager.c' || echo '$(srcdir)/'`introspection/org.freedesktop.NetworkManager.c
+
 libnm-core/libnm_core_la-nm-setting-6lowpan.lo: libnm-core/nm-setting-6lowpan.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm-core/libnm_core_la-nm-setting-6lowpan.lo -MD -MP -MF libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-6lowpan.Tpo -c -o libnm-core/libnm_core_la-nm-setting-6lowpan.lo `test -f 'libnm-core/nm-setting-6lowpan.c' || echo '$(srcdir)/'`libnm-core/nm-setting-6lowpan.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-6lowpan.Tpo libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-6lowpan.Plo
@@ -12541,6 +12951,13 @@ libnm-core/libnm_core_la-nm-setting-vxlan.lo: libnm-core/nm-setting-vxlan.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm-core/libnm_core_la-nm-setting-vxlan.lo `test -f 'libnm-core/nm-setting-vxlan.c' || echo '$(srcdir)/'`libnm-core/nm-setting-vxlan.c
 
+libnm-core/libnm_core_la-nm-setting-wifi-p2p.lo: libnm-core/nm-setting-wifi-p2p.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm-core/libnm_core_la-nm-setting-wifi-p2p.lo -MD -MP -MF libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-wifi-p2p.Tpo -c -o libnm-core/libnm_core_la-nm-setting-wifi-p2p.lo `test -f 'libnm-core/nm-setting-wifi-p2p.c' || echo '$(srcdir)/'`libnm-core/nm-setting-wifi-p2p.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-wifi-p2p.Tpo libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-wifi-p2p.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm-core/nm-setting-wifi-p2p.c' object='libnm-core/libnm_core_la-nm-setting-wifi-p2p.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm-core/libnm_core_la-nm-setting-wifi-p2p.lo `test -f 'libnm-core/nm-setting-wifi-p2p.c' || echo '$(srcdir)/'`libnm-core/nm-setting-wifi-p2p.c
+
 libnm-core/libnm_core_la-nm-setting-wimax.lo: libnm-core/nm-setting-wimax.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm-core/libnm_core_la-nm-setting-wimax.lo -MD -MP -MF libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-wimax.Tpo -c -o libnm-core/libnm_core_la-nm-setting-wimax.lo `test -f 'libnm-core/nm-setting-wimax.c' || echo '$(srcdir)/'`libnm-core/nm-setting-wimax.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-wimax.Tpo libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-wimax.Plo
@@ -12555,6 +12972,13 @@ libnm-core/libnm_core_la-nm-setting-wired.lo: libnm-core/nm-setting-wired.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm-core/libnm_core_la-nm-setting-wired.lo `test -f 'libnm-core/nm-setting-wired.c' || echo '$(srcdir)/'`libnm-core/nm-setting-wired.c
 
+libnm-core/libnm_core_la-nm-setting-wireguard.lo: libnm-core/nm-setting-wireguard.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm-core/libnm_core_la-nm-setting-wireguard.lo -MD -MP -MF libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-wireguard.Tpo -c -o libnm-core/libnm_core_la-nm-setting-wireguard.lo `test -f 'libnm-core/nm-setting-wireguard.c' || echo '$(srcdir)/'`libnm-core/nm-setting-wireguard.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-wireguard.Tpo libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-wireguard.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm-core/nm-setting-wireguard.c' object='libnm-core/libnm_core_la-nm-setting-wireguard.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm-core/libnm_core_la-nm-setting-wireguard.lo `test -f 'libnm-core/nm-setting-wireguard.c' || echo '$(srcdir)/'`libnm-core/nm-setting-wireguard.c
+
 libnm-core/libnm_core_la-nm-setting-wireless-security.lo: libnm-core/nm-setting-wireless-security.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm-core/libnm_core_la-nm-setting-wireless-security.lo -MD -MP -MF libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-wireless-security.Tpo -c -o libnm-core/libnm_core_la-nm-setting-wireless-security.lo `test -f 'libnm-core/nm-setting-wireless-security.c' || echo '$(srcdir)/'`libnm-core/nm-setting-wireless-security.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-wireless-security.Tpo libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-wireless-security.Plo
@@ -12576,69 +13000,6 @@ libnm-core/libnm_core_la-nm-setting-wpan.lo: libnm-core/nm-setting-wpan.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm-core/libnm_core_la-nm-setting-wpan.lo `test -f 'libnm-core/nm-setting-wpan.c' || echo '$(srcdir)/'`libnm-core/nm-setting-wpan.c
 
-shared/nm-utils/libnm_core_libnm_core_la-c-list-util.lo: shared/nm-utils/c-list-util.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT shared/nm-utils/libnm_core_libnm_core_la-c-list-util.lo -MD -MP -MF shared/nm-utils/$(DEPDIR)/libnm_core_libnm_core_la-c-list-util.Tpo -c -o shared/nm-utils/libnm_core_libnm_core_la-c-list-util.lo `test -f 'shared/nm-utils/c-list-util.c' || echo '$(srcdir)/'`shared/nm-utils/c-list-util.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) shared/nm-utils/$(DEPDIR)/libnm_core_libnm_core_la-c-list-util.Tpo shared/nm-utils/$(DEPDIR)/libnm_core_libnm_core_la-c-list-util.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='shared/nm-utils/c-list-util.c' object='shared/nm-utils/libnm_core_libnm_core_la-c-list-util.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o shared/nm-utils/libnm_core_libnm_core_la-c-list-util.lo `test -f 'shared/nm-utils/c-list-util.c' || echo '$(srcdir)/'`shared/nm-utils/c-list-util.c
-
-shared/nm-utils/libnm_core_libnm_core_la-nm-dedup-multi.lo: shared/nm-utils/nm-dedup-multi.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT shared/nm-utils/libnm_core_libnm_core_la-nm-dedup-multi.lo -MD -MP -MF shared/nm-utils/$(DEPDIR)/libnm_core_libnm_core_la-nm-dedup-multi.Tpo -c -o shared/nm-utils/libnm_core_libnm_core_la-nm-dedup-multi.lo `test -f 'shared/nm-utils/nm-dedup-multi.c' || echo '$(srcdir)/'`shared/nm-utils/nm-dedup-multi.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) shared/nm-utils/$(DEPDIR)/libnm_core_libnm_core_la-nm-dedup-multi.Tpo shared/nm-utils/$(DEPDIR)/libnm_core_libnm_core_la-nm-dedup-multi.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='shared/nm-utils/nm-dedup-multi.c' object='shared/nm-utils/libnm_core_libnm_core_la-nm-dedup-multi.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o shared/nm-utils/libnm_core_libnm_core_la-nm-dedup-multi.lo `test -f 'shared/nm-utils/nm-dedup-multi.c' || echo '$(srcdir)/'`shared/nm-utils/nm-dedup-multi.c
-
-shared/nm-utils/libnm_core_libnm_core_la-nm-enum-utils.lo: shared/nm-utils/nm-enum-utils.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT shared/nm-utils/libnm_core_libnm_core_la-nm-enum-utils.lo -MD -MP -MF shared/nm-utils/$(DEPDIR)/libnm_core_libnm_core_la-nm-enum-utils.Tpo -c -o shared/nm-utils/libnm_core_libnm_core_la-nm-enum-utils.lo `test -f 'shared/nm-utils/nm-enum-utils.c' || echo '$(srcdir)/'`shared/nm-utils/nm-enum-utils.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) shared/nm-utils/$(DEPDIR)/libnm_core_libnm_core_la-nm-enum-utils.Tpo shared/nm-utils/$(DEPDIR)/libnm_core_libnm_core_la-nm-enum-utils.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='shared/nm-utils/nm-enum-utils.c' object='shared/nm-utils/libnm_core_libnm_core_la-nm-enum-utils.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o shared/nm-utils/libnm_core_libnm_core_la-nm-enum-utils.lo `test -f 'shared/nm-utils/nm-enum-utils.c' || echo '$(srcdir)/'`shared/nm-utils/nm-enum-utils.c
-
-shared/nm-utils/libnm_core_libnm_core_la-nm-hash-utils.lo: shared/nm-utils/nm-hash-utils.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT shared/nm-utils/libnm_core_libnm_core_la-nm-hash-utils.lo -MD -MP -MF shared/nm-utils/$(DEPDIR)/libnm_core_libnm_core_la-nm-hash-utils.Tpo -c -o shared/nm-utils/libnm_core_libnm_core_la-nm-hash-utils.lo `test -f 'shared/nm-utils/nm-hash-utils.c' || echo '$(srcdir)/'`shared/nm-utils/nm-hash-utils.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) shared/nm-utils/$(DEPDIR)/libnm_core_libnm_core_la-nm-hash-utils.Tpo shared/nm-utils/$(DEPDIR)/libnm_core_libnm_core_la-nm-hash-utils.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='shared/nm-utils/nm-hash-utils.c' object='shared/nm-utils/libnm_core_libnm_core_la-nm-hash-utils.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o shared/nm-utils/libnm_core_libnm_core_la-nm-hash-utils.lo `test -f 'shared/nm-utils/nm-hash-utils.c' || echo '$(srcdir)/'`shared/nm-utils/nm-hash-utils.c
-
-shared/nm-utils/libnm_core_libnm_core_la-nm-io-utils.lo: shared/nm-utils/nm-io-utils.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT shared/nm-utils/libnm_core_libnm_core_la-nm-io-utils.lo -MD -MP -MF shared/nm-utils/$(DEPDIR)/libnm_core_libnm_core_la-nm-io-utils.Tpo -c -o shared/nm-utils/libnm_core_libnm_core_la-nm-io-utils.lo `test -f 'shared/nm-utils/nm-io-utils.c' || echo '$(srcdir)/'`shared/nm-utils/nm-io-utils.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) shared/nm-utils/$(DEPDIR)/libnm_core_libnm_core_la-nm-io-utils.Tpo shared/nm-utils/$(DEPDIR)/libnm_core_libnm_core_la-nm-io-utils.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='shared/nm-utils/nm-io-utils.c' object='shared/nm-utils/libnm_core_libnm_core_la-nm-io-utils.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o shared/nm-utils/libnm_core_libnm_core_la-nm-io-utils.lo `test -f 'shared/nm-utils/nm-io-utils.c' || echo '$(srcdir)/'`shared/nm-utils/nm-io-utils.c
-
-shared/nm-utils/libnm_core_libnm_core_la-nm-secret-utils.lo: shared/nm-utils/nm-secret-utils.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT shared/nm-utils/libnm_core_libnm_core_la-nm-secret-utils.lo -MD -MP -MF shared/nm-utils/$(DEPDIR)/libnm_core_libnm_core_la-nm-secret-utils.Tpo -c -o shared/nm-utils/libnm_core_libnm_core_la-nm-secret-utils.lo `test -f 'shared/nm-utils/nm-secret-utils.c' || echo '$(srcdir)/'`shared/nm-utils/nm-secret-utils.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) shared/nm-utils/$(DEPDIR)/libnm_core_libnm_core_la-nm-secret-utils.Tpo shared/nm-utils/$(DEPDIR)/libnm_core_libnm_core_la-nm-secret-utils.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='shared/nm-utils/nm-secret-utils.c' object='shared/nm-utils/libnm_core_libnm_core_la-nm-secret-utils.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o shared/nm-utils/libnm_core_libnm_core_la-nm-secret-utils.lo `test -f 'shared/nm-utils/nm-secret-utils.c' || echo '$(srcdir)/'`shared/nm-utils/nm-secret-utils.c
-
-shared/nm-utils/libnm_core_libnm_core_la-nm-shared-utils.lo: shared/nm-utils/nm-shared-utils.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT shared/nm-utils/libnm_core_libnm_core_la-nm-shared-utils.lo -MD -MP -MF shared/nm-utils/$(DEPDIR)/libnm_core_libnm_core_la-nm-shared-utils.Tpo -c -o shared/nm-utils/libnm_core_libnm_core_la-nm-shared-utils.lo `test -f 'shared/nm-utils/nm-shared-utils.c' || echo '$(srcdir)/'`shared/nm-utils/nm-shared-utils.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) shared/nm-utils/$(DEPDIR)/libnm_core_libnm_core_la-nm-shared-utils.Tpo shared/nm-utils/$(DEPDIR)/libnm_core_libnm_core_la-nm-shared-utils.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='shared/nm-utils/nm-shared-utils.c' object='shared/nm-utils/libnm_core_libnm_core_la-nm-shared-utils.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o shared/nm-utils/libnm_core_libnm_core_la-nm-shared-utils.lo `test -f 'shared/nm-utils/nm-shared-utils.c' || echo '$(srcdir)/'`shared/nm-utils/nm-shared-utils.c
-
-shared/nm-utils/libnm_core_libnm_core_la-nm-random-utils.lo: shared/nm-utils/nm-random-utils.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT shared/nm-utils/libnm_core_libnm_core_la-nm-random-utils.lo -MD -MP -MF shared/nm-utils/$(DEPDIR)/libnm_core_libnm_core_la-nm-random-utils.Tpo -c -o shared/nm-utils/libnm_core_libnm_core_la-nm-random-utils.lo `test -f 'shared/nm-utils/nm-random-utils.c' || echo '$(srcdir)/'`shared/nm-utils/nm-random-utils.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) shared/nm-utils/$(DEPDIR)/libnm_core_libnm_core_la-nm-random-utils.Tpo shared/nm-utils/$(DEPDIR)/libnm_core_libnm_core_la-nm-random-utils.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='shared/nm-utils/nm-random-utils.c' object='shared/nm-utils/libnm_core_libnm_core_la-nm-random-utils.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o shared/nm-utils/libnm_core_libnm_core_la-nm-random-utils.lo `test -f 'shared/nm-utils/nm-random-utils.c' || echo '$(srcdir)/'`shared/nm-utils/nm-random-utils.c
-
-shared/nm-utils/libnm_core_libnm_core_la-nm-udev-utils.lo: shared/nm-utils/nm-udev-utils.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT shared/nm-utils/libnm_core_libnm_core_la-nm-udev-utils.lo -MD -MP -MF shared/nm-utils/$(DEPDIR)/libnm_core_libnm_core_la-nm-udev-utils.Tpo -c -o shared/nm-utils/libnm_core_libnm_core_la-nm-udev-utils.lo `test -f 'shared/nm-utils/nm-udev-utils.c' || echo '$(srcdir)/'`shared/nm-utils/nm-udev-utils.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) shared/nm-utils/$(DEPDIR)/libnm_core_libnm_core_la-nm-udev-utils.Tpo shared/nm-utils/$(DEPDIR)/libnm_core_libnm_core_la-nm-udev-utils.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='shared/nm-utils/nm-udev-utils.c' object='shared/nm-utils/libnm_core_libnm_core_la-nm-udev-utils.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o shared/nm-utils/libnm_core_libnm_core_la-nm-udev-utils.lo `test -f 'shared/nm-utils/nm-udev-utils.c' || echo '$(srcdir)/'`shared/nm-utils/nm-udev-utils.c
-
 shared/libnm_core_libnm_core_la-nm-ethtool-utils.lo: shared/nm-ethtool-utils.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT shared/libnm_core_libnm_core_la-nm-ethtool-utils.lo -MD -MP -MF shared/$(DEPDIR)/libnm_core_libnm_core_la-nm-ethtool-utils.Tpo -c -o shared/libnm_core_libnm_core_la-nm-ethtool-utils.lo `test -f 'shared/nm-ethtool-utils.c' || echo '$(srcdir)/'`shared/nm-ethtool-utils.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) shared/$(DEPDIR)/libnm_core_libnm_core_la-nm-ethtool-utils.Tpo shared/$(DEPDIR)/libnm_core_libnm_core_la-nm-ethtool-utils.Plo
@@ -12800,13 +13161,6 @@ libnm-glib/libnm_glib_vpn_la-nm-vpn-enum-types.lo: libnm-glib/nm-vpn-enum-types.
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_glib_libnm_glib_vpn_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm-glib/libnm_glib_vpn_la-nm-vpn-enum-types.lo `test -f 'libnm-glib/nm-vpn-enum-types.c' || echo '$(srcdir)/'`libnm-glib/nm-vpn-enum-types.c
 
-shared/nm-utils/libnm_glib_libnm_glib_la-nm-udev-utils.lo: shared/nm-utils/nm-udev-utils.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_glib_libnm_glib_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT shared/nm-utils/libnm_glib_libnm_glib_la-nm-udev-utils.lo -MD -MP -MF shared/nm-utils/$(DEPDIR)/libnm_glib_libnm_glib_la-nm-udev-utils.Tpo -c -o shared/nm-utils/libnm_glib_libnm_glib_la-nm-udev-utils.lo `test -f 'shared/nm-utils/nm-udev-utils.c' || echo '$(srcdir)/'`shared/nm-utils/nm-udev-utils.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) shared/nm-utils/$(DEPDIR)/libnm_glib_libnm_glib_la-nm-udev-utils.Tpo shared/nm-utils/$(DEPDIR)/libnm_glib_libnm_glib_la-nm-udev-utils.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='shared/nm-utils/nm-udev-utils.c' object='shared/nm-utils/libnm_glib_libnm_glib_la-nm-udev-utils.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_glib_libnm_glib_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o shared/nm-utils/libnm_glib_libnm_glib_la-nm-udev-utils.lo `test -f 'shared/nm-utils/nm-udev-utils.c' || echo '$(srcdir)/'`shared/nm-utils/nm-udev-utils.c
-
 libnm-glib/libnm_glib_la-nm-object.lo: libnm-glib/nm-object.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_glib_libnm_glib_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm-glib/libnm_glib_la-nm-object.lo -MD -MP -MF libnm-glib/$(DEPDIR)/libnm_glib_la-nm-object.Tpo -c -o libnm-glib/libnm_glib_la-nm-object.lo `test -f 'libnm-glib/nm-object.c' || echo '$(srcdir)/'`libnm-glib/nm-object.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm-glib/$(DEPDIR)/libnm_glib_la-nm-object.Tpo libnm-glib/$(DEPDIR)/libnm_glib_la-nm-object.Plo
@@ -13024,13 +13378,6 @@ libnm-glib/libnm_glib_la-nm-glib-enum-types.lo: libnm-glib/nm-glib-enum-types.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_glib_libnm_glib_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm-glib/libnm_glib_la-nm-glib-enum-types.lo `test -f 'libnm-glib/nm-glib-enum-types.c' || echo '$(srcdir)/'`libnm-glib/nm-glib-enum-types.c
 
-shared/nm-utils/libnm_util_libnm_util_la-nm-shared-utils.lo: shared/nm-utils/nm-shared-utils.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_util_libnm_util_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT shared/nm-utils/libnm_util_libnm_util_la-nm-shared-utils.lo -MD -MP -MF shared/nm-utils/$(DEPDIR)/libnm_util_libnm_util_la-nm-shared-utils.Tpo -c -o shared/nm-utils/libnm_util_libnm_util_la-nm-shared-utils.lo `test -f 'shared/nm-utils/nm-shared-utils.c' || echo '$(srcdir)/'`shared/nm-utils/nm-shared-utils.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) shared/nm-utils/$(DEPDIR)/libnm_util_libnm_util_la-nm-shared-utils.Tpo shared/nm-utils/$(DEPDIR)/libnm_util_libnm_util_la-nm-shared-utils.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='shared/nm-utils/nm-shared-utils.c' object='shared/nm-utils/libnm_util_libnm_util_la-nm-shared-utils.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_util_libnm_util_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o shared/nm-utils/libnm_util_libnm_util_la-nm-shared-utils.lo `test -f 'shared/nm-utils/nm-shared-utils.c' || echo '$(srcdir)/'`shared/nm-utils/nm-shared-utils.c
-
 libnm-util/libnm_util_la-crypto.lo: libnm-util/crypto.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_util_libnm_util_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm-util/libnm_util_la-crypto.lo -MD -MP -MF libnm-util/$(DEPDIR)/libnm_util_la-crypto.Tpo -c -o libnm-util/libnm_util_la-crypto.lo `test -f 'libnm-util/crypto.c' || echo '$(srcdir)/'`libnm-util/crypto.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm-util/$(DEPDIR)/libnm_util_la-crypto.Tpo libnm-util/$(DEPDIR)/libnm_util_la-crypto.Plo
@@ -13444,6 +13791,13 @@ libnm/libnm_la-nm-device-olpc-mesh.lo: libnm/nm-device-olpc-mesh.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_libnm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm/libnm_la-nm-device-olpc-mesh.lo `test -f 'libnm/nm-device-olpc-mesh.c' || echo '$(srcdir)/'`libnm/nm-device-olpc-mesh.c
 
+libnm/libnm_la-nm-device-ovs-bridge.lo: libnm/nm-device-ovs-bridge.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_libnm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm/libnm_la-nm-device-ovs-bridge.lo -MD -MP -MF libnm/$(DEPDIR)/libnm_la-nm-device-ovs-bridge.Tpo -c -o libnm/libnm_la-nm-device-ovs-bridge.lo `test -f 'libnm/nm-device-ovs-bridge.c' || echo '$(srcdir)/'`libnm/nm-device-ovs-bridge.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm/$(DEPDIR)/libnm_la-nm-device-ovs-bridge.Tpo libnm/$(DEPDIR)/libnm_la-nm-device-ovs-bridge.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm/nm-device-ovs-bridge.c' object='libnm/libnm_la-nm-device-ovs-bridge.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_libnm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm/libnm_la-nm-device-ovs-bridge.lo `test -f 'libnm/nm-device-ovs-bridge.c' || echo '$(srcdir)/'`libnm/nm-device-ovs-bridge.c
+
 libnm/libnm_la-nm-device-ovs-interface.lo: libnm/nm-device-ovs-interface.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_libnm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm/libnm_la-nm-device-ovs-interface.lo -MD -MP -MF libnm/$(DEPDIR)/libnm_la-nm-device-ovs-interface.Tpo -c -o libnm/libnm_la-nm-device-ovs-interface.lo `test -f 'libnm/nm-device-ovs-interface.c' || echo '$(srcdir)/'`libnm/nm-device-ovs-interface.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm/$(DEPDIR)/libnm_la-nm-device-ovs-interface.Tpo libnm/$(DEPDIR)/libnm_la-nm-device-ovs-interface.Plo
@@ -13458,13 +13812,6 @@ libnm/libnm_la-nm-device-ovs-port.lo: libnm/nm-device-ovs-port.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_libnm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm/libnm_la-nm-device-ovs-port.lo `test -f 'libnm/nm-device-ovs-port.c' || echo '$(srcdir)/'`libnm/nm-device-ovs-port.c
 
-libnm/libnm_la-nm-device-ovs-bridge.lo: libnm/nm-device-ovs-bridge.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_libnm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm/libnm_la-nm-device-ovs-bridge.lo -MD -MP -MF libnm/$(DEPDIR)/libnm_la-nm-device-ovs-bridge.Tpo -c -o libnm/libnm_la-nm-device-ovs-bridge.lo `test -f 'libnm/nm-device-ovs-bridge.c' || echo '$(srcdir)/'`libnm/nm-device-ovs-bridge.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm/$(DEPDIR)/libnm_la-nm-device-ovs-bridge.Tpo libnm/$(DEPDIR)/libnm_la-nm-device-ovs-bridge.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm/nm-device-ovs-bridge.c' object='libnm/libnm_la-nm-device-ovs-bridge.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_libnm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm/libnm_la-nm-device-ovs-bridge.lo `test -f 'libnm/nm-device-ovs-bridge.c' || echo '$(srcdir)/'`libnm/nm-device-ovs-bridge.c
-
 libnm/libnm_la-nm-device-ppp.lo: libnm/nm-device-ppp.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_libnm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm/libnm_la-nm-device-ppp.lo -MD -MP -MF libnm/$(DEPDIR)/libnm_la-nm-device-ppp.Tpo -c -o libnm/libnm_la-nm-device-ppp.lo `test -f 'libnm/nm-device-ppp.c' || echo '$(srcdir)/'`libnm/nm-device-ppp.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm/$(DEPDIR)/libnm_la-nm-device-ppp.Tpo libnm/$(DEPDIR)/libnm_la-nm-device-ppp.Plo
@@ -13500,6 +13847,13 @@ libnm/libnm_la-nm-device-vxlan.lo: libnm/nm-device-vxlan.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_libnm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm/libnm_la-nm-device-vxlan.lo `test -f 'libnm/nm-device-vxlan.c' || echo '$(srcdir)/'`libnm/nm-device-vxlan.c
 
+libnm/libnm_la-nm-device-wifi-p2p.lo: libnm/nm-device-wifi-p2p.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_libnm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm/libnm_la-nm-device-wifi-p2p.lo -MD -MP -MF libnm/$(DEPDIR)/libnm_la-nm-device-wifi-p2p.Tpo -c -o libnm/libnm_la-nm-device-wifi-p2p.lo `test -f 'libnm/nm-device-wifi-p2p.c' || echo '$(srcdir)/'`libnm/nm-device-wifi-p2p.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm/$(DEPDIR)/libnm_la-nm-device-wifi-p2p.Tpo libnm/$(DEPDIR)/libnm_la-nm-device-wifi-p2p.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm/nm-device-wifi-p2p.c' object='libnm/libnm_la-nm-device-wifi-p2p.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_libnm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm/libnm_la-nm-device-wifi-p2p.lo `test -f 'libnm/nm-device-wifi-p2p.c' || echo '$(srcdir)/'`libnm/nm-device-wifi-p2p.c
+
 libnm/libnm_la-nm-device-wifi.lo: libnm/nm-device-wifi.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_libnm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm/libnm_la-nm-device-wifi.lo -MD -MP -MF libnm/$(DEPDIR)/libnm_la-nm-device-wifi.Tpo -c -o libnm/libnm_la-nm-device-wifi.lo `test -f 'libnm/nm-device-wifi.c' || echo '$(srcdir)/'`libnm/nm-device-wifi.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm/$(DEPDIR)/libnm_la-nm-device-wifi.Tpo libnm/$(DEPDIR)/libnm_la-nm-device-wifi.Plo
@@ -13626,13 +13980,6 @@ libnm/libnm_la-nm-vpn-connection.lo: libnm/nm-vpn-connection.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_libnm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm/libnm_la-nm-vpn-connection.lo `test -f 'libnm/nm-vpn-connection.c' || echo '$(srcdir)/'`libnm/nm-vpn-connection.c
 
-libnm/libnm_la-nm-vpn-plugin-old.lo: libnm/nm-vpn-plugin-old.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_libnm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm/libnm_la-nm-vpn-plugin-old.lo -MD -MP -MF libnm/$(DEPDIR)/libnm_la-nm-vpn-plugin-old.Tpo -c -o libnm/libnm_la-nm-vpn-plugin-old.lo `test -f 'libnm/nm-vpn-plugin-old.c' || echo '$(srcdir)/'`libnm/nm-vpn-plugin-old.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm/$(DEPDIR)/libnm_la-nm-vpn-plugin-old.Tpo libnm/$(DEPDIR)/libnm_la-nm-vpn-plugin-old.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm/nm-vpn-plugin-old.c' object='libnm/libnm_la-nm-vpn-plugin-old.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_libnm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm/libnm_la-nm-vpn-plugin-old.lo `test -f 'libnm/nm-vpn-plugin-old.c' || echo '$(srcdir)/'`libnm/nm-vpn-plugin-old.c
-
 libnm/libnm_la-nm-vpn-editor.lo: libnm/nm-vpn-editor.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_libnm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm/libnm_la-nm-vpn-editor.lo -MD -MP -MF libnm/$(DEPDIR)/libnm_la-nm-vpn-editor.Tpo -c -o libnm/libnm_la-nm-vpn-editor.lo `test -f 'libnm/nm-vpn-editor.c' || echo '$(srcdir)/'`libnm/nm-vpn-editor.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm/$(DEPDIR)/libnm_la-nm-vpn-editor.Tpo libnm/$(DEPDIR)/libnm_la-nm-vpn-editor.Plo
@@ -13640,6 +13987,13 @@ libnm/libnm_la-nm-vpn-editor.lo: libnm/nm-vpn-editor.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_libnm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm/libnm_la-nm-vpn-editor.lo `test -f 'libnm/nm-vpn-editor.c' || echo '$(srcdir)/'`libnm/nm-vpn-editor.c
 
+libnm/libnm_la-nm-vpn-plugin-old.lo: libnm/nm-vpn-plugin-old.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_libnm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm/libnm_la-nm-vpn-plugin-old.lo -MD -MP -MF libnm/$(DEPDIR)/libnm_la-nm-vpn-plugin-old.Tpo -c -o libnm/libnm_la-nm-vpn-plugin-old.lo `test -f 'libnm/nm-vpn-plugin-old.c' || echo '$(srcdir)/'`libnm/nm-vpn-plugin-old.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm/$(DEPDIR)/libnm_la-nm-vpn-plugin-old.Tpo libnm/$(DEPDIR)/libnm_la-nm-vpn-plugin-old.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm/nm-vpn-plugin-old.c' object='libnm/libnm_la-nm-vpn-plugin-old.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_libnm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm/libnm_la-nm-vpn-plugin-old.lo `test -f 'libnm/nm-vpn-plugin-old.c' || echo '$(srcdir)/'`libnm/nm-vpn-plugin-old.c
+
 libnm/libnm_la-nm-vpn-service-plugin.lo: libnm/nm-vpn-service-plugin.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_libnm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm/libnm_la-nm-vpn-service-plugin.lo -MD -MP -MF libnm/$(DEPDIR)/libnm_la-nm-vpn-service-plugin.Tpo -c -o libnm/libnm_la-nm-vpn-service-plugin.lo `test -f 'libnm/nm-vpn-service-plugin.c' || echo '$(srcdir)/'`libnm/nm-vpn-service-plugin.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm/$(DEPDIR)/libnm_la-nm-vpn-service-plugin.Tpo libnm/$(DEPDIR)/libnm_la-nm-vpn-service-plugin.Plo
@@ -13647,6 +14001,13 @@ libnm/libnm_la-nm-vpn-service-plugin.lo: libnm/nm-vpn-service-plugin.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_libnm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm/libnm_la-nm-vpn-service-plugin.lo `test -f 'libnm/nm-vpn-service-plugin.c' || echo '$(srcdir)/'`libnm/nm-vpn-service-plugin.c
 
+libnm/libnm_la-nm-wifi-p2p-peer.lo: libnm/nm-wifi-p2p-peer.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_libnm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm/libnm_la-nm-wifi-p2p-peer.lo -MD -MP -MF libnm/$(DEPDIR)/libnm_la-nm-wifi-p2p-peer.Tpo -c -o libnm/libnm_la-nm-wifi-p2p-peer.lo `test -f 'libnm/nm-wifi-p2p-peer.c' || echo '$(srcdir)/'`libnm/nm-wifi-p2p-peer.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm/$(DEPDIR)/libnm_la-nm-wifi-p2p-peer.Tpo libnm/$(DEPDIR)/libnm_la-nm-wifi-p2p-peer.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm/nm-wifi-p2p-peer.c' object='libnm/libnm_la-nm-wifi-p2p-peer.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_libnm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm/libnm_la-nm-wifi-p2p-peer.lo `test -f 'libnm/nm-wifi-p2p-peer.c' || echo '$(srcdir)/'`libnm/nm-wifi-p2p-peer.c
+
 libnm/libnm_la-nm-wimax-nsp.lo: libnm/nm-wimax-nsp.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_libnm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm/libnm_la-nm-wimax-nsp.lo -MD -MP -MF libnm/$(DEPDIR)/libnm_la-nm-wimax-nsp.Tpo -c -o libnm/libnm_la-nm-wimax-nsp.lo `test -f 'libnm/nm-wimax-nsp.c' || echo '$(srcdir)/'`libnm/nm-wimax-nsp.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm/$(DEPDIR)/libnm_la-nm-wimax-nsp.Tpo libnm/$(DEPDIR)/libnm_la-nm-wimax-nsp.Plo
@@ -13668,6 +14029,13 @@ shared/nm-utils/libnm_tests_libnm_vpn_plugin_utils_test_la-nm-vpn-plugin-utils.l
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libnm_tests_libnm_vpn_plugin_utils_test_la_CFLAGS) $(CFLAGS) -c -o shared/nm-utils/libnm_tests_libnm_vpn_plugin_utils_test_la-nm-vpn-plugin-utils.lo `test -f 'shared/nm-utils/nm-vpn-plugin-utils.c' || echo '$(srcdir)/'`shared/nm-utils/nm-vpn-plugin-utils.c
 
+shared/c-rbtree/src/libcrbtree_la-c-rbtree.lo: shared/c-rbtree/src/c-rbtree.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shared_libcrbtree_la_CPPFLAGS) $(CPPFLAGS) $(shared_libcrbtree_la_CFLAGS) $(CFLAGS) -MT shared/c-rbtree/src/libcrbtree_la-c-rbtree.lo -MD -MP -MF shared/c-rbtree/src/$(DEPDIR)/libcrbtree_la-c-rbtree.Tpo -c -o shared/c-rbtree/src/libcrbtree_la-c-rbtree.lo `test -f 'shared/c-rbtree/src/c-rbtree.c' || echo '$(srcdir)/'`shared/c-rbtree/src/c-rbtree.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) shared/c-rbtree/src/$(DEPDIR)/libcrbtree_la-c-rbtree.Tpo shared/c-rbtree/src/$(DEPDIR)/libcrbtree_la-c-rbtree.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='shared/c-rbtree/src/c-rbtree.c' object='shared/c-rbtree/src/libcrbtree_la-c-rbtree.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shared_libcrbtree_la_CPPFLAGS) $(CPPFLAGS) $(shared_libcrbtree_la_CFLAGS) $(CFLAGS) -c -o shared/c-rbtree/src/libcrbtree_la-c-rbtree.lo `test -f 'shared/c-rbtree/src/c-rbtree.c' || echo '$(srcdir)/'`shared/c-rbtree/src/c-rbtree.c
+
 shared/c-siphash/src/libcsiphash_la-c-siphash.lo: shared/c-siphash/src/c-siphash.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shared_libcsiphash_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT shared/c-siphash/src/libcsiphash_la-c-siphash.lo -MD -MP -MF shared/c-siphash/src/$(DEPDIR)/libcsiphash_la-c-siphash.Tpo -c -o shared/c-siphash/src/libcsiphash_la-c-siphash.lo `test -f 'shared/c-siphash/src/c-siphash.c' || echo '$(srcdir)/'`shared/c-siphash/src/c-siphash.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) shared/c-siphash/src/$(DEPDIR)/libcsiphash_la-c-siphash.Tpo shared/c-siphash/src/$(DEPDIR)/libcsiphash_la-c-siphash.Plo
@@ -13682,6 +14050,335 @@ shared/n-acd/src/libnacd_la-n-acd.lo: shared/n-acd/src/n-acd.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shared_libnacd_la_CPPFLAGS) $(CPPFLAGS) $(shared_libnacd_la_CFLAGS) $(CFLAGS) -c -o shared/n-acd/src/libnacd_la-n-acd.lo `test -f 'shared/n-acd/src/n-acd.c' || echo '$(srcdir)/'`shared/n-acd/src/n-acd.c
 
+shared/n-acd/src/libnacd_la-n-acd-probe.lo: shared/n-acd/src/n-acd-probe.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shared_libnacd_la_CPPFLAGS) $(CPPFLAGS) $(shared_libnacd_la_CFLAGS) $(CFLAGS) -MT shared/n-acd/src/libnacd_la-n-acd-probe.lo -MD -MP -MF shared/n-acd/src/$(DEPDIR)/libnacd_la-n-acd-probe.Tpo -c -o shared/n-acd/src/libnacd_la-n-acd-probe.lo `test -f 'shared/n-acd/src/n-acd-probe.c' || echo '$(srcdir)/'`shared/n-acd/src/n-acd-probe.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) shared/n-acd/src/$(DEPDIR)/libnacd_la-n-acd-probe.Tpo shared/n-acd/src/$(DEPDIR)/libnacd_la-n-acd-probe.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='shared/n-acd/src/n-acd-probe.c' object='shared/n-acd/src/libnacd_la-n-acd-probe.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shared_libnacd_la_CPPFLAGS) $(CPPFLAGS) $(shared_libnacd_la_CFLAGS) $(CFLAGS) -c -o shared/n-acd/src/libnacd_la-n-acd-probe.lo `test -f 'shared/n-acd/src/n-acd-probe.c' || echo '$(srcdir)/'`shared/n-acd/src/n-acd-probe.c
+
+shared/n-acd/src/util/libnacd_la-timer.lo: shared/n-acd/src/util/timer.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shared_libnacd_la_CPPFLAGS) $(CPPFLAGS) $(shared_libnacd_la_CFLAGS) $(CFLAGS) -MT shared/n-acd/src/util/libnacd_la-timer.lo -MD -MP -MF shared/n-acd/src/util/$(DEPDIR)/libnacd_la-timer.Tpo -c -o shared/n-acd/src/util/libnacd_la-timer.lo `test -f 'shared/n-acd/src/util/timer.c' || echo '$(srcdir)/'`shared/n-acd/src/util/timer.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) shared/n-acd/src/util/$(DEPDIR)/libnacd_la-timer.Tpo shared/n-acd/src/util/$(DEPDIR)/libnacd_la-timer.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='shared/n-acd/src/util/timer.c' object='shared/n-acd/src/util/libnacd_la-timer.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shared_libnacd_la_CPPFLAGS) $(CPPFLAGS) $(shared_libnacd_la_CFLAGS) $(CFLAGS) -c -o shared/n-acd/src/util/libnacd_la-timer.lo `test -f 'shared/n-acd/src/util/timer.c' || echo '$(srcdir)/'`shared/n-acd/src/util/timer.c
+
+shared/n-acd/src/libnacd_la-n-acd-bpf.lo: shared/n-acd/src/n-acd-bpf.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shared_libnacd_la_CPPFLAGS) $(CPPFLAGS) $(shared_libnacd_la_CFLAGS) $(CFLAGS) -MT shared/n-acd/src/libnacd_la-n-acd-bpf.lo -MD -MP -MF shared/n-acd/src/$(DEPDIR)/libnacd_la-n-acd-bpf.Tpo -c -o shared/n-acd/src/libnacd_la-n-acd-bpf.lo `test -f 'shared/n-acd/src/n-acd-bpf.c' || echo '$(srcdir)/'`shared/n-acd/src/n-acd-bpf.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) shared/n-acd/src/$(DEPDIR)/libnacd_la-n-acd-bpf.Tpo shared/n-acd/src/$(DEPDIR)/libnacd_la-n-acd-bpf.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='shared/n-acd/src/n-acd-bpf.c' object='shared/n-acd/src/libnacd_la-n-acd-bpf.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shared_libnacd_la_CPPFLAGS) $(CPPFLAGS) $(shared_libnacd_la_CFLAGS) $(CFLAGS) -c -o shared/n-acd/src/libnacd_la-n-acd-bpf.lo `test -f 'shared/n-acd/src/n-acd-bpf.c' || echo '$(srcdir)/'`shared/n-acd/src/n-acd-bpf.c
+
+shared/n-acd/src/libnacd_la-n-acd-bpf-fallback.lo: shared/n-acd/src/n-acd-bpf-fallback.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shared_libnacd_la_CPPFLAGS) $(CPPFLAGS) $(shared_libnacd_la_CFLAGS) $(CFLAGS) -MT shared/n-acd/src/libnacd_la-n-acd-bpf-fallback.lo -MD -MP -MF shared/n-acd/src/$(DEPDIR)/libnacd_la-n-acd-bpf-fallback.Tpo -c -o shared/n-acd/src/libnacd_la-n-acd-bpf-fallback.lo `test -f 'shared/n-acd/src/n-acd-bpf-fallback.c' || echo '$(srcdir)/'`shared/n-acd/src/n-acd-bpf-fallback.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) shared/n-acd/src/$(DEPDIR)/libnacd_la-n-acd-bpf-fallback.Tpo shared/n-acd/src/$(DEPDIR)/libnacd_la-n-acd-bpf-fallback.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='shared/n-acd/src/n-acd-bpf-fallback.c' object='shared/n-acd/src/libnacd_la-n-acd-bpf-fallback.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shared_libnacd_la_CPPFLAGS) $(CPPFLAGS) $(shared_libnacd_la_CFLAGS) $(CFLAGS) -c -o shared/n-acd/src/libnacd_la-n-acd-bpf-fallback.lo `test -f 'shared/n-acd/src/n-acd-bpf-fallback.c' || echo '$(srcdir)/'`shared/n-acd/src/n-acd-bpf-fallback.c
+
+shared/nm-utils/libnm_utils_base_la-c-list-util.lo: shared/nm-utils/c-list-util.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shared_nm_utils_libnm_utils_base_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT shared/nm-utils/libnm_utils_base_la-c-list-util.lo -MD -MP -MF shared/nm-utils/$(DEPDIR)/libnm_utils_base_la-c-list-util.Tpo -c -o shared/nm-utils/libnm_utils_base_la-c-list-util.lo `test -f 'shared/nm-utils/c-list-util.c' || echo '$(srcdir)/'`shared/nm-utils/c-list-util.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) shared/nm-utils/$(DEPDIR)/libnm_utils_base_la-c-list-util.Tpo shared/nm-utils/$(DEPDIR)/libnm_utils_base_la-c-list-util.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='shared/nm-utils/c-list-util.c' object='shared/nm-utils/libnm_utils_base_la-c-list-util.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shared_nm_utils_libnm_utils_base_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o shared/nm-utils/libnm_utils_base_la-c-list-util.lo `test -f 'shared/nm-utils/c-list-util.c' || echo '$(srcdir)/'`shared/nm-utils/c-list-util.c
+
+shared/nm-utils/libnm_utils_base_la-nm-dedup-multi.lo: shared/nm-utils/nm-dedup-multi.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shared_nm_utils_libnm_utils_base_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT shared/nm-utils/libnm_utils_base_la-nm-dedup-multi.lo -MD -MP -MF shared/nm-utils/$(DEPDIR)/libnm_utils_base_la-nm-dedup-multi.Tpo -c -o shared/nm-utils/libnm_utils_base_la-nm-dedup-multi.lo `test -f 'shared/nm-utils/nm-dedup-multi.c' || echo '$(srcdir)/'`shared/nm-utils/nm-dedup-multi.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) shared/nm-utils/$(DEPDIR)/libnm_utils_base_la-nm-dedup-multi.Tpo shared/nm-utils/$(DEPDIR)/libnm_utils_base_la-nm-dedup-multi.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='shared/nm-utils/nm-dedup-multi.c' object='shared/nm-utils/libnm_utils_base_la-nm-dedup-multi.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shared_nm_utils_libnm_utils_base_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o shared/nm-utils/libnm_utils_base_la-nm-dedup-multi.lo `test -f 'shared/nm-utils/nm-dedup-multi.c' || echo '$(srcdir)/'`shared/nm-utils/nm-dedup-multi.c
+
+shared/nm-utils/libnm_utils_base_la-nm-enum-utils.lo: shared/nm-utils/nm-enum-utils.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shared_nm_utils_libnm_utils_base_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT shared/nm-utils/libnm_utils_base_la-nm-enum-utils.lo -MD -MP -MF shared/nm-utils/$(DEPDIR)/libnm_utils_base_la-nm-enum-utils.Tpo -c -o shared/nm-utils/libnm_utils_base_la-nm-enum-utils.lo `test -f 'shared/nm-utils/nm-enum-utils.c' || echo '$(srcdir)/'`shared/nm-utils/nm-enum-utils.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) shared/nm-utils/$(DEPDIR)/libnm_utils_base_la-nm-enum-utils.Tpo shared/nm-utils/$(DEPDIR)/libnm_utils_base_la-nm-enum-utils.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='shared/nm-utils/nm-enum-utils.c' object='shared/nm-utils/libnm_utils_base_la-nm-enum-utils.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shared_nm_utils_libnm_utils_base_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o shared/nm-utils/libnm_utils_base_la-nm-enum-utils.lo `test -f 'shared/nm-utils/nm-enum-utils.c' || echo '$(srcdir)/'`shared/nm-utils/nm-enum-utils.c
+
+shared/nm-utils/libnm_utils_base_la-nm-errno.lo: shared/nm-utils/nm-errno.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shared_nm_utils_libnm_utils_base_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT shared/nm-utils/libnm_utils_base_la-nm-errno.lo -MD -MP -MF shared/nm-utils/$(DEPDIR)/libnm_utils_base_la-nm-errno.Tpo -c -o shared/nm-utils/libnm_utils_base_la-nm-errno.lo `test -f 'shared/nm-utils/nm-errno.c' || echo '$(srcdir)/'`shared/nm-utils/nm-errno.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) shared/nm-utils/$(DEPDIR)/libnm_utils_base_la-nm-errno.Tpo shared/nm-utils/$(DEPDIR)/libnm_utils_base_la-nm-errno.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='shared/nm-utils/nm-errno.c' object='shared/nm-utils/libnm_utils_base_la-nm-errno.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shared_nm_utils_libnm_utils_base_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o shared/nm-utils/libnm_utils_base_la-nm-errno.lo `test -f 'shared/nm-utils/nm-errno.c' || echo '$(srcdir)/'`shared/nm-utils/nm-errno.c
+
+shared/nm-utils/libnm_utils_base_la-nm-hash-utils.lo: shared/nm-utils/nm-hash-utils.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shared_nm_utils_libnm_utils_base_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT shared/nm-utils/libnm_utils_base_la-nm-hash-utils.lo -MD -MP -MF shared/nm-utils/$(DEPDIR)/libnm_utils_base_la-nm-hash-utils.Tpo -c -o shared/nm-utils/libnm_utils_base_la-nm-hash-utils.lo `test -f 'shared/nm-utils/nm-hash-utils.c' || echo '$(srcdir)/'`shared/nm-utils/nm-hash-utils.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) shared/nm-utils/$(DEPDIR)/libnm_utils_base_la-nm-hash-utils.Tpo shared/nm-utils/$(DEPDIR)/libnm_utils_base_la-nm-hash-utils.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='shared/nm-utils/nm-hash-utils.c' object='shared/nm-utils/libnm_utils_base_la-nm-hash-utils.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shared_nm_utils_libnm_utils_base_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o shared/nm-utils/libnm_utils_base_la-nm-hash-utils.lo `test -f 'shared/nm-utils/nm-hash-utils.c' || echo '$(srcdir)/'`shared/nm-utils/nm-hash-utils.c
+
+shared/nm-utils/libnm_utils_base_la-nm-io-utils.lo: shared/nm-utils/nm-io-utils.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shared_nm_utils_libnm_utils_base_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT shared/nm-utils/libnm_utils_base_la-nm-io-utils.lo -MD -MP -MF shared/nm-utils/$(DEPDIR)/libnm_utils_base_la-nm-io-utils.Tpo -c -o shared/nm-utils/libnm_utils_base_la-nm-io-utils.lo `test -f 'shared/nm-utils/nm-io-utils.c' || echo '$(srcdir)/'`shared/nm-utils/nm-io-utils.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) shared/nm-utils/$(DEPDIR)/libnm_utils_base_la-nm-io-utils.Tpo shared/nm-utils/$(DEPDIR)/libnm_utils_base_la-nm-io-utils.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='shared/nm-utils/nm-io-utils.c' object='shared/nm-utils/libnm_utils_base_la-nm-io-utils.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shared_nm_utils_libnm_utils_base_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o shared/nm-utils/libnm_utils_base_la-nm-io-utils.lo `test -f 'shared/nm-utils/nm-io-utils.c' || echo '$(srcdir)/'`shared/nm-utils/nm-io-utils.c
+
+shared/nm-utils/libnm_utils_base_la-nm-random-utils.lo: shared/nm-utils/nm-random-utils.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shared_nm_utils_libnm_utils_base_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT shared/nm-utils/libnm_utils_base_la-nm-random-utils.lo -MD -MP -MF shared/nm-utils/$(DEPDIR)/libnm_utils_base_la-nm-random-utils.Tpo -c -o shared/nm-utils/libnm_utils_base_la-nm-random-utils.lo `test -f 'shared/nm-utils/nm-random-utils.c' || echo '$(srcdir)/'`shared/nm-utils/nm-random-utils.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) shared/nm-utils/$(DEPDIR)/libnm_utils_base_la-nm-random-utils.Tpo shared/nm-utils/$(DEPDIR)/libnm_utils_base_la-nm-random-utils.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='shared/nm-utils/nm-random-utils.c' object='shared/nm-utils/libnm_utils_base_la-nm-random-utils.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shared_nm_utils_libnm_utils_base_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o shared/nm-utils/libnm_utils_base_la-nm-random-utils.lo `test -f 'shared/nm-utils/nm-random-utils.c' || echo '$(srcdir)/'`shared/nm-utils/nm-random-utils.c
+
+shared/nm-utils/libnm_utils_base_la-nm-secret-utils.lo: shared/nm-utils/nm-secret-utils.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shared_nm_utils_libnm_utils_base_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT shared/nm-utils/libnm_utils_base_la-nm-secret-utils.lo -MD -MP -MF shared/nm-utils/$(DEPDIR)/libnm_utils_base_la-nm-secret-utils.Tpo -c -o shared/nm-utils/libnm_utils_base_la-nm-secret-utils.lo `test -f 'shared/nm-utils/nm-secret-utils.c' || echo '$(srcdir)/'`shared/nm-utils/nm-secret-utils.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) shared/nm-utils/$(DEPDIR)/libnm_utils_base_la-nm-secret-utils.Tpo shared/nm-utils/$(DEPDIR)/libnm_utils_base_la-nm-secret-utils.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='shared/nm-utils/nm-secret-utils.c' object='shared/nm-utils/libnm_utils_base_la-nm-secret-utils.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shared_nm_utils_libnm_utils_base_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o shared/nm-utils/libnm_utils_base_la-nm-secret-utils.lo `test -f 'shared/nm-utils/nm-secret-utils.c' || echo '$(srcdir)/'`shared/nm-utils/nm-secret-utils.c
+
+shared/nm-utils/libnm_utils_base_la-nm-shared-utils.lo: shared/nm-utils/nm-shared-utils.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shared_nm_utils_libnm_utils_base_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT shared/nm-utils/libnm_utils_base_la-nm-shared-utils.lo -MD -MP -MF shared/nm-utils/$(DEPDIR)/libnm_utils_base_la-nm-shared-utils.Tpo -c -o shared/nm-utils/libnm_utils_base_la-nm-shared-utils.lo `test -f 'shared/nm-utils/nm-shared-utils.c' || echo '$(srcdir)/'`shared/nm-utils/nm-shared-utils.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) shared/nm-utils/$(DEPDIR)/libnm_utils_base_la-nm-shared-utils.Tpo shared/nm-utils/$(DEPDIR)/libnm_utils_base_la-nm-shared-utils.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='shared/nm-utils/nm-shared-utils.c' object='shared/nm-utils/libnm_utils_base_la-nm-shared-utils.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shared_nm_utils_libnm_utils_base_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o shared/nm-utils/libnm_utils_base_la-nm-shared-utils.lo `test -f 'shared/nm-utils/nm-shared-utils.c' || echo '$(srcdir)/'`shared/nm-utils/nm-shared-utils.c
+
+shared/nm-utils/libnm_utils_base_la-nm-time-utils.lo: shared/nm-utils/nm-time-utils.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shared_nm_utils_libnm_utils_base_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT shared/nm-utils/libnm_utils_base_la-nm-time-utils.lo -MD -MP -MF shared/nm-utils/$(DEPDIR)/libnm_utils_base_la-nm-time-utils.Tpo -c -o shared/nm-utils/libnm_utils_base_la-nm-time-utils.lo `test -f 'shared/nm-utils/nm-time-utils.c' || echo '$(srcdir)/'`shared/nm-utils/nm-time-utils.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) shared/nm-utils/$(DEPDIR)/libnm_utils_base_la-nm-time-utils.Tpo shared/nm-utils/$(DEPDIR)/libnm_utils_base_la-nm-time-utils.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='shared/nm-utils/nm-time-utils.c' object='shared/nm-utils/libnm_utils_base_la-nm-time-utils.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shared_nm_utils_libnm_utils_base_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o shared/nm-utils/libnm_utils_base_la-nm-time-utils.lo `test -f 'shared/nm-utils/nm-time-utils.c' || echo '$(srcdir)/'`shared/nm-utils/nm-time-utils.c
+
+shared/nm-utils/libnm_utils_udev_la-nm-udev-utils.lo: shared/nm-utils/nm-udev-utils.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shared_nm_utils_libnm_utils_udev_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT shared/nm-utils/libnm_utils_udev_la-nm-udev-utils.lo -MD -MP -MF shared/nm-utils/$(DEPDIR)/libnm_utils_udev_la-nm-udev-utils.Tpo -c -o shared/nm-utils/libnm_utils_udev_la-nm-udev-utils.lo `test -f 'shared/nm-utils/nm-udev-utils.c' || echo '$(srcdir)/'`shared/nm-utils/nm-udev-utils.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) shared/nm-utils/$(DEPDIR)/libnm_utils_udev_la-nm-udev-utils.Tpo shared/nm-utils/$(DEPDIR)/libnm_utils_udev_la-nm-udev-utils.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='shared/nm-utils/nm-udev-utils.c' object='shared/nm-utils/libnm_utils_udev_la-nm-udev-utils.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shared_nm_utils_libnm_utils_udev_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o shared/nm-utils/libnm_utils_udev_la-nm-udev-utils.lo `test -f 'shared/nm-utils/nm-udev-utils.c' || echo '$(srcdir)/'`shared/nm-utils/nm-udev-utils.c
+
+shared/systemd/libnm_systemd_logging_stub_la-nm-logging-stub.lo: shared/systemd/nm-logging-stub.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shared_systemd_libnm_systemd_logging_stub_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT shared/systemd/libnm_systemd_logging_stub_la-nm-logging-stub.lo -MD -MP -MF shared/systemd/$(DEPDIR)/libnm_systemd_logging_stub_la-nm-logging-stub.Tpo -c -o shared/systemd/libnm_systemd_logging_stub_la-nm-logging-stub.lo `test -f 'shared/systemd/nm-logging-stub.c' || echo '$(srcdir)/'`shared/systemd/nm-logging-stub.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) shared/systemd/$(DEPDIR)/libnm_systemd_logging_stub_la-nm-logging-stub.Tpo shared/systemd/$(DEPDIR)/libnm_systemd_logging_stub_la-nm-logging-stub.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='shared/systemd/nm-logging-stub.c' object='shared/systemd/libnm_systemd_logging_stub_la-nm-logging-stub.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shared_systemd_libnm_systemd_logging_stub_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o shared/systemd/libnm_systemd_logging_stub_la-nm-logging-stub.lo `test -f 'shared/systemd/nm-logging-stub.c' || echo '$(srcdir)/'`shared/systemd/nm-logging-stub.c
+
+shared/systemd/libnm_systemd_shared_la-nm-sd-utils-shared.lo: shared/systemd/nm-sd-utils-shared.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shared_systemd_libnm_systemd_shared_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT shared/systemd/libnm_systemd_shared_la-nm-sd-utils-shared.lo -MD -MP -MF shared/systemd/$(DEPDIR)/libnm_systemd_shared_la-nm-sd-utils-shared.Tpo -c -o shared/systemd/libnm_systemd_shared_la-nm-sd-utils-shared.lo `test -f 'shared/systemd/nm-sd-utils-shared.c' || echo '$(srcdir)/'`shared/systemd/nm-sd-utils-shared.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) shared/systemd/$(DEPDIR)/libnm_systemd_shared_la-nm-sd-utils-shared.Tpo shared/systemd/$(DEPDIR)/libnm_systemd_shared_la-nm-sd-utils-shared.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='shared/systemd/nm-sd-utils-shared.c' object='shared/systemd/libnm_systemd_shared_la-nm-sd-utils-shared.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shared_systemd_libnm_systemd_shared_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o shared/systemd/libnm_systemd_shared_la-nm-sd-utils-shared.lo `test -f 'shared/systemd/nm-sd-utils-shared.c' || echo '$(srcdir)/'`shared/systemd/nm-sd-utils-shared.c
+
+shared/systemd/src/basic/libnm_systemd_shared_la-alloc-util.lo: shared/systemd/src/basic/alloc-util.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shared_systemd_libnm_systemd_shared_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT shared/systemd/src/basic/libnm_systemd_shared_la-alloc-util.lo -MD -MP -MF shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-alloc-util.Tpo -c -o shared/systemd/src/basic/libnm_systemd_shared_la-alloc-util.lo `test -f 'shared/systemd/src/basic/alloc-util.c' || echo '$(srcdir)/'`shared/systemd/src/basic/alloc-util.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-alloc-util.Tpo shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-alloc-util.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='shared/systemd/src/basic/alloc-util.c' object='shared/systemd/src/basic/libnm_systemd_shared_la-alloc-util.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shared_systemd_libnm_systemd_shared_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o shared/systemd/src/basic/libnm_systemd_shared_la-alloc-util.lo `test -f 'shared/systemd/src/basic/alloc-util.c' || echo '$(srcdir)/'`shared/systemd/src/basic/alloc-util.c
+
+shared/systemd/src/basic/libnm_systemd_shared_la-env-file.lo: shared/systemd/src/basic/env-file.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shared_systemd_libnm_systemd_shared_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT shared/systemd/src/basic/libnm_systemd_shared_la-env-file.lo -MD -MP -MF shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-env-file.Tpo -c -o shared/systemd/src/basic/libnm_systemd_shared_la-env-file.lo `test -f 'shared/systemd/src/basic/env-file.c' || echo '$(srcdir)/'`shared/systemd/src/basic/env-file.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-env-file.Tpo shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-env-file.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='shared/systemd/src/basic/env-file.c' object='shared/systemd/src/basic/libnm_systemd_shared_la-env-file.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shared_systemd_libnm_systemd_shared_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o shared/systemd/src/basic/libnm_systemd_shared_la-env-file.lo `test -f 'shared/systemd/src/basic/env-file.c' || echo '$(srcdir)/'`shared/systemd/src/basic/env-file.c
+
+shared/systemd/src/basic/libnm_systemd_shared_la-env-util.lo: shared/systemd/src/basic/env-util.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shared_systemd_libnm_systemd_shared_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT shared/systemd/src/basic/libnm_systemd_shared_la-env-util.lo -MD -MP -MF shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-env-util.Tpo -c -o shared/systemd/src/basic/libnm_systemd_shared_la-env-util.lo `test -f 'shared/systemd/src/basic/env-util.c' || echo '$(srcdir)/'`shared/systemd/src/basic/env-util.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-env-util.Tpo shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-env-util.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='shared/systemd/src/basic/env-util.c' object='shared/systemd/src/basic/libnm_systemd_shared_la-env-util.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shared_systemd_libnm_systemd_shared_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o shared/systemd/src/basic/libnm_systemd_shared_la-env-util.lo `test -f 'shared/systemd/src/basic/env-util.c' || echo '$(srcdir)/'`shared/systemd/src/basic/env-util.c
+
+shared/systemd/src/basic/libnm_systemd_shared_la-escape.lo: shared/systemd/src/basic/escape.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shared_systemd_libnm_systemd_shared_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT shared/systemd/src/basic/libnm_systemd_shared_la-escape.lo -MD -MP -MF shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-escape.Tpo -c -o shared/systemd/src/basic/libnm_systemd_shared_la-escape.lo `test -f 'shared/systemd/src/basic/escape.c' || echo '$(srcdir)/'`shared/systemd/src/basic/escape.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-escape.Tpo shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-escape.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='shared/systemd/src/basic/escape.c' object='shared/systemd/src/basic/libnm_systemd_shared_la-escape.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shared_systemd_libnm_systemd_shared_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o shared/systemd/src/basic/libnm_systemd_shared_la-escape.lo `test -f 'shared/systemd/src/basic/escape.c' || echo '$(srcdir)/'`shared/systemd/src/basic/escape.c
+
+shared/systemd/src/basic/libnm_systemd_shared_la-ether-addr-util.lo: shared/systemd/src/basic/ether-addr-util.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shared_systemd_libnm_systemd_shared_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT shared/systemd/src/basic/libnm_systemd_shared_la-ether-addr-util.lo -MD -MP -MF shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-ether-addr-util.Tpo -c -o shared/systemd/src/basic/libnm_systemd_shared_la-ether-addr-util.lo `test -f 'shared/systemd/src/basic/ether-addr-util.c' || echo '$(srcdir)/'`shared/systemd/src/basic/ether-addr-util.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-ether-addr-util.Tpo shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-ether-addr-util.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='shared/systemd/src/basic/ether-addr-util.c' object='shared/systemd/src/basic/libnm_systemd_shared_la-ether-addr-util.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shared_systemd_libnm_systemd_shared_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o shared/systemd/src/basic/libnm_systemd_shared_la-ether-addr-util.lo `test -f 'shared/systemd/src/basic/ether-addr-util.c' || echo '$(srcdir)/'`shared/systemd/src/basic/ether-addr-util.c
+
+shared/systemd/src/basic/libnm_systemd_shared_la-extract-word.lo: shared/systemd/src/basic/extract-word.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shared_systemd_libnm_systemd_shared_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT shared/systemd/src/basic/libnm_systemd_shared_la-extract-word.lo -MD -MP -MF shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-extract-word.Tpo -c -o shared/systemd/src/basic/libnm_systemd_shared_la-extract-word.lo `test -f 'shared/systemd/src/basic/extract-word.c' || echo '$(srcdir)/'`shared/systemd/src/basic/extract-word.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-extract-word.Tpo shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-extract-word.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='shared/systemd/src/basic/extract-word.c' object='shared/systemd/src/basic/libnm_systemd_shared_la-extract-word.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shared_systemd_libnm_systemd_shared_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o shared/systemd/src/basic/libnm_systemd_shared_la-extract-word.lo `test -f 'shared/systemd/src/basic/extract-word.c' || echo '$(srcdir)/'`shared/systemd/src/basic/extract-word.c
+
+shared/systemd/src/basic/libnm_systemd_shared_la-fd-util.lo: shared/systemd/src/basic/fd-util.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shared_systemd_libnm_systemd_shared_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT shared/systemd/src/basic/libnm_systemd_shared_la-fd-util.lo -MD -MP -MF shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-fd-util.Tpo -c -o shared/systemd/src/basic/libnm_systemd_shared_la-fd-util.lo `test -f 'shared/systemd/src/basic/fd-util.c' || echo '$(srcdir)/'`shared/systemd/src/basic/fd-util.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-fd-util.Tpo shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-fd-util.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='shared/systemd/src/basic/fd-util.c' object='shared/systemd/src/basic/libnm_systemd_shared_la-fd-util.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shared_systemd_libnm_systemd_shared_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o shared/systemd/src/basic/libnm_systemd_shared_la-fd-util.lo `test -f 'shared/systemd/src/basic/fd-util.c' || echo '$(srcdir)/'`shared/systemd/src/basic/fd-util.c
+
+shared/systemd/src/basic/libnm_systemd_shared_la-fileio.lo: shared/systemd/src/basic/fileio.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shared_systemd_libnm_systemd_shared_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT shared/systemd/src/basic/libnm_systemd_shared_la-fileio.lo -MD -MP -MF shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-fileio.Tpo -c -o shared/systemd/src/basic/libnm_systemd_shared_la-fileio.lo `test -f 'shared/systemd/src/basic/fileio.c' || echo '$(srcdir)/'`shared/systemd/src/basic/fileio.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-fileio.Tpo shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-fileio.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='shared/systemd/src/basic/fileio.c' object='shared/systemd/src/basic/libnm_systemd_shared_la-fileio.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shared_systemd_libnm_systemd_shared_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o shared/systemd/src/basic/libnm_systemd_shared_la-fileio.lo `test -f 'shared/systemd/src/basic/fileio.c' || echo '$(srcdir)/'`shared/systemd/src/basic/fileio.c
+
+shared/systemd/src/basic/libnm_systemd_shared_la-fs-util.lo: shared/systemd/src/basic/fs-util.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shared_systemd_libnm_systemd_shared_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT shared/systemd/src/basic/libnm_systemd_shared_la-fs-util.lo -MD -MP -MF shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-fs-util.Tpo -c -o shared/systemd/src/basic/libnm_systemd_shared_la-fs-util.lo `test -f 'shared/systemd/src/basic/fs-util.c' || echo '$(srcdir)/'`shared/systemd/src/basic/fs-util.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-fs-util.Tpo shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-fs-util.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='shared/systemd/src/basic/fs-util.c' object='shared/systemd/src/basic/libnm_systemd_shared_la-fs-util.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shared_systemd_libnm_systemd_shared_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o shared/systemd/src/basic/libnm_systemd_shared_la-fs-util.lo `test -f 'shared/systemd/src/basic/fs-util.c' || echo '$(srcdir)/'`shared/systemd/src/basic/fs-util.c
+
+shared/systemd/src/basic/libnm_systemd_shared_la-hash-funcs.lo: shared/systemd/src/basic/hash-funcs.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shared_systemd_libnm_systemd_shared_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT shared/systemd/src/basic/libnm_systemd_shared_la-hash-funcs.lo -MD -MP -MF shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-hash-funcs.Tpo -c -o shared/systemd/src/basic/libnm_systemd_shared_la-hash-funcs.lo `test -f 'shared/systemd/src/basic/hash-funcs.c' || echo '$(srcdir)/'`shared/systemd/src/basic/hash-funcs.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-hash-funcs.Tpo shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-hash-funcs.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='shared/systemd/src/basic/hash-funcs.c' object='shared/systemd/src/basic/libnm_systemd_shared_la-hash-funcs.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shared_systemd_libnm_systemd_shared_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o shared/systemd/src/basic/libnm_systemd_shared_la-hash-funcs.lo `test -f 'shared/systemd/src/basic/hash-funcs.c' || echo '$(srcdir)/'`shared/systemd/src/basic/hash-funcs.c
+
+shared/systemd/src/basic/libnm_systemd_shared_la-hashmap.lo: shared/systemd/src/basic/hashmap.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shared_systemd_libnm_systemd_shared_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT shared/systemd/src/basic/libnm_systemd_shared_la-hashmap.lo -MD -MP -MF shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-hashmap.Tpo -c -o shared/systemd/src/basic/libnm_systemd_shared_la-hashmap.lo `test -f 'shared/systemd/src/basic/hashmap.c' || echo '$(srcdir)/'`shared/systemd/src/basic/hashmap.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-hashmap.Tpo shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-hashmap.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='shared/systemd/src/basic/hashmap.c' object='shared/systemd/src/basic/libnm_systemd_shared_la-hashmap.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shared_systemd_libnm_systemd_shared_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o shared/systemd/src/basic/libnm_systemd_shared_la-hashmap.lo `test -f 'shared/systemd/src/basic/hashmap.c' || echo '$(srcdir)/'`shared/systemd/src/basic/hashmap.c
+
+shared/systemd/src/basic/libnm_systemd_shared_la-hexdecoct.lo: shared/systemd/src/basic/hexdecoct.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shared_systemd_libnm_systemd_shared_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT shared/systemd/src/basic/libnm_systemd_shared_la-hexdecoct.lo -MD -MP -MF shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-hexdecoct.Tpo -c -o shared/systemd/src/basic/libnm_systemd_shared_la-hexdecoct.lo `test -f 'shared/systemd/src/basic/hexdecoct.c' || echo '$(srcdir)/'`shared/systemd/src/basic/hexdecoct.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-hexdecoct.Tpo shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-hexdecoct.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='shared/systemd/src/basic/hexdecoct.c' object='shared/systemd/src/basic/libnm_systemd_shared_la-hexdecoct.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shared_systemd_libnm_systemd_shared_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o shared/systemd/src/basic/libnm_systemd_shared_la-hexdecoct.lo `test -f 'shared/systemd/src/basic/hexdecoct.c' || echo '$(srcdir)/'`shared/systemd/src/basic/hexdecoct.c
+
+shared/systemd/src/basic/libnm_systemd_shared_la-hostname-util.lo: shared/systemd/src/basic/hostname-util.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shared_systemd_libnm_systemd_shared_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT shared/systemd/src/basic/libnm_systemd_shared_la-hostname-util.lo -MD -MP -MF shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-hostname-util.Tpo -c -o shared/systemd/src/basic/libnm_systemd_shared_la-hostname-util.lo `test -f 'shared/systemd/src/basic/hostname-util.c' || echo '$(srcdir)/'`shared/systemd/src/basic/hostname-util.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-hostname-util.Tpo shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-hostname-util.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='shared/systemd/src/basic/hostname-util.c' object='shared/systemd/src/basic/libnm_systemd_shared_la-hostname-util.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shared_systemd_libnm_systemd_shared_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o shared/systemd/src/basic/libnm_systemd_shared_la-hostname-util.lo `test -f 'shared/systemd/src/basic/hostname-util.c' || echo '$(srcdir)/'`shared/systemd/src/basic/hostname-util.c
+
+shared/systemd/src/basic/libnm_systemd_shared_la-in-addr-util.lo: shared/systemd/src/basic/in-addr-util.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shared_systemd_libnm_systemd_shared_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT shared/systemd/src/basic/libnm_systemd_shared_la-in-addr-util.lo -MD -MP -MF shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-in-addr-util.Tpo -c -o shared/systemd/src/basic/libnm_systemd_shared_la-in-addr-util.lo `test -f 'shared/systemd/src/basic/in-addr-util.c' || echo '$(srcdir)/'`shared/systemd/src/basic/in-addr-util.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-in-addr-util.Tpo shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-in-addr-util.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='shared/systemd/src/basic/in-addr-util.c' object='shared/systemd/src/basic/libnm_systemd_shared_la-in-addr-util.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shared_systemd_libnm_systemd_shared_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o shared/systemd/src/basic/libnm_systemd_shared_la-in-addr-util.lo `test -f 'shared/systemd/src/basic/in-addr-util.c' || echo '$(srcdir)/'`shared/systemd/src/basic/in-addr-util.c
+
+shared/systemd/src/basic/libnm_systemd_shared_la-io-util.lo: shared/systemd/src/basic/io-util.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shared_systemd_libnm_systemd_shared_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT shared/systemd/src/basic/libnm_systemd_shared_la-io-util.lo -MD -MP -MF shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-io-util.Tpo -c -o shared/systemd/src/basic/libnm_systemd_shared_la-io-util.lo `test -f 'shared/systemd/src/basic/io-util.c' || echo '$(srcdir)/'`shared/systemd/src/basic/io-util.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-io-util.Tpo shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-io-util.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='shared/systemd/src/basic/io-util.c' object='shared/systemd/src/basic/libnm_systemd_shared_la-io-util.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shared_systemd_libnm_systemd_shared_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o shared/systemd/src/basic/libnm_systemd_shared_la-io-util.lo `test -f 'shared/systemd/src/basic/io-util.c' || echo '$(srcdir)/'`shared/systemd/src/basic/io-util.c
+
+shared/systemd/src/basic/libnm_systemd_shared_la-mempool.lo: shared/systemd/src/basic/mempool.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shared_systemd_libnm_systemd_shared_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT shared/systemd/src/basic/libnm_systemd_shared_la-mempool.lo -MD -MP -MF shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-mempool.Tpo -c -o shared/systemd/src/basic/libnm_systemd_shared_la-mempool.lo `test -f 'shared/systemd/src/basic/mempool.c' || echo '$(srcdir)/'`shared/systemd/src/basic/mempool.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-mempool.Tpo shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-mempool.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='shared/systemd/src/basic/mempool.c' object='shared/systemd/src/basic/libnm_systemd_shared_la-mempool.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shared_systemd_libnm_systemd_shared_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o shared/systemd/src/basic/libnm_systemd_shared_la-mempool.lo `test -f 'shared/systemd/src/basic/mempool.c' || echo '$(srcdir)/'`shared/systemd/src/basic/mempool.c
+
+shared/systemd/src/basic/libnm_systemd_shared_la-parse-util.lo: shared/systemd/src/basic/parse-util.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shared_systemd_libnm_systemd_shared_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT shared/systemd/src/basic/libnm_systemd_shared_la-parse-util.lo -MD -MP -MF shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-parse-util.Tpo -c -o shared/systemd/src/basic/libnm_systemd_shared_la-parse-util.lo `test -f 'shared/systemd/src/basic/parse-util.c' || echo '$(srcdir)/'`shared/systemd/src/basic/parse-util.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-parse-util.Tpo shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-parse-util.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='shared/systemd/src/basic/parse-util.c' object='shared/systemd/src/basic/libnm_systemd_shared_la-parse-util.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shared_systemd_libnm_systemd_shared_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o shared/systemd/src/basic/libnm_systemd_shared_la-parse-util.lo `test -f 'shared/systemd/src/basic/parse-util.c' || echo '$(srcdir)/'`shared/systemd/src/basic/parse-util.c
+
+shared/systemd/src/basic/libnm_systemd_shared_la-path-util.lo: shared/systemd/src/basic/path-util.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shared_systemd_libnm_systemd_shared_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT shared/systemd/src/basic/libnm_systemd_shared_la-path-util.lo -MD -MP -MF shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-path-util.Tpo -c -o shared/systemd/src/basic/libnm_systemd_shared_la-path-util.lo `test -f 'shared/systemd/src/basic/path-util.c' || echo '$(srcdir)/'`shared/systemd/src/basic/path-util.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-path-util.Tpo shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-path-util.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='shared/systemd/src/basic/path-util.c' object='shared/systemd/src/basic/libnm_systemd_shared_la-path-util.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shared_systemd_libnm_systemd_shared_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o shared/systemd/src/basic/libnm_systemd_shared_la-path-util.lo `test -f 'shared/systemd/src/basic/path-util.c' || echo '$(srcdir)/'`shared/systemd/src/basic/path-util.c
+
+shared/systemd/src/basic/libnm_systemd_shared_la-prioq.lo: shared/systemd/src/basic/prioq.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shared_systemd_libnm_systemd_shared_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT shared/systemd/src/basic/libnm_systemd_shared_la-prioq.lo -MD -MP -MF shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-prioq.Tpo -c -o shared/systemd/src/basic/libnm_systemd_shared_la-prioq.lo `test -f 'shared/systemd/src/basic/prioq.c' || echo '$(srcdir)/'`shared/systemd/src/basic/prioq.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-prioq.Tpo shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-prioq.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='shared/systemd/src/basic/prioq.c' object='shared/systemd/src/basic/libnm_systemd_shared_la-prioq.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shared_systemd_libnm_systemd_shared_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o shared/systemd/src/basic/libnm_systemd_shared_la-prioq.lo `test -f 'shared/systemd/src/basic/prioq.c' || echo '$(srcdir)/'`shared/systemd/src/basic/prioq.c
+
+shared/systemd/src/basic/libnm_systemd_shared_la-process-util.lo: shared/systemd/src/basic/process-util.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shared_systemd_libnm_systemd_shared_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT shared/systemd/src/basic/libnm_systemd_shared_la-process-util.lo -MD -MP -MF shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-process-util.Tpo -c -o shared/systemd/src/basic/libnm_systemd_shared_la-process-util.lo `test -f 'shared/systemd/src/basic/process-util.c' || echo '$(srcdir)/'`shared/systemd/src/basic/process-util.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-process-util.Tpo shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-process-util.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='shared/systemd/src/basic/process-util.c' object='shared/systemd/src/basic/libnm_systemd_shared_la-process-util.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shared_systemd_libnm_systemd_shared_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o shared/systemd/src/basic/libnm_systemd_shared_la-process-util.lo `test -f 'shared/systemd/src/basic/process-util.c' || echo '$(srcdir)/'`shared/systemd/src/basic/process-util.c
+
+shared/systemd/src/basic/libnm_systemd_shared_la-random-util.lo: shared/systemd/src/basic/random-util.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shared_systemd_libnm_systemd_shared_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT shared/systemd/src/basic/libnm_systemd_shared_la-random-util.lo -MD -MP -MF shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-random-util.Tpo -c -o shared/systemd/src/basic/libnm_systemd_shared_la-random-util.lo `test -f 'shared/systemd/src/basic/random-util.c' || echo '$(srcdir)/'`shared/systemd/src/basic/random-util.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-random-util.Tpo shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-random-util.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='shared/systemd/src/basic/random-util.c' object='shared/systemd/src/basic/libnm_systemd_shared_la-random-util.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shared_systemd_libnm_systemd_shared_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o shared/systemd/src/basic/libnm_systemd_shared_la-random-util.lo `test -f 'shared/systemd/src/basic/random-util.c' || echo '$(srcdir)/'`shared/systemd/src/basic/random-util.c
+
+shared/systemd/src/basic/libnm_systemd_shared_la-socket-util.lo: shared/systemd/src/basic/socket-util.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shared_systemd_libnm_systemd_shared_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT shared/systemd/src/basic/libnm_systemd_shared_la-socket-util.lo -MD -MP -MF shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-socket-util.Tpo -c -o shared/systemd/src/basic/libnm_systemd_shared_la-socket-util.lo `test -f 'shared/systemd/src/basic/socket-util.c' || echo '$(srcdir)/'`shared/systemd/src/basic/socket-util.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-socket-util.Tpo shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-socket-util.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='shared/systemd/src/basic/socket-util.c' object='shared/systemd/src/basic/libnm_systemd_shared_la-socket-util.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shared_systemd_libnm_systemd_shared_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o shared/systemd/src/basic/libnm_systemd_shared_la-socket-util.lo `test -f 'shared/systemd/src/basic/socket-util.c' || echo '$(srcdir)/'`shared/systemd/src/basic/socket-util.c
+
+shared/systemd/src/basic/libnm_systemd_shared_la-stat-util.lo: shared/systemd/src/basic/stat-util.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shared_systemd_libnm_systemd_shared_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT shared/systemd/src/basic/libnm_systemd_shared_la-stat-util.lo -MD -MP -MF shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-stat-util.Tpo -c -o shared/systemd/src/basic/libnm_systemd_shared_la-stat-util.lo `test -f 'shared/systemd/src/basic/stat-util.c' || echo '$(srcdir)/'`shared/systemd/src/basic/stat-util.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-stat-util.Tpo shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-stat-util.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='shared/systemd/src/basic/stat-util.c' object='shared/systemd/src/basic/libnm_systemd_shared_la-stat-util.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shared_systemd_libnm_systemd_shared_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o shared/systemd/src/basic/libnm_systemd_shared_la-stat-util.lo `test -f 'shared/systemd/src/basic/stat-util.c' || echo '$(srcdir)/'`shared/systemd/src/basic/stat-util.c
+
+shared/systemd/src/basic/libnm_systemd_shared_la-string-table.lo: shared/systemd/src/basic/string-table.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shared_systemd_libnm_systemd_shared_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT shared/systemd/src/basic/libnm_systemd_shared_la-string-table.lo -MD -MP -MF shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-string-table.Tpo -c -o shared/systemd/src/basic/libnm_systemd_shared_la-string-table.lo `test -f 'shared/systemd/src/basic/string-table.c' || echo '$(srcdir)/'`shared/systemd/src/basic/string-table.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-string-table.Tpo shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-string-table.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='shared/systemd/src/basic/string-table.c' object='shared/systemd/src/basic/libnm_systemd_shared_la-string-table.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shared_systemd_libnm_systemd_shared_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o shared/systemd/src/basic/libnm_systemd_shared_la-string-table.lo `test -f 'shared/systemd/src/basic/string-table.c' || echo '$(srcdir)/'`shared/systemd/src/basic/string-table.c
+
+shared/systemd/src/basic/libnm_systemd_shared_la-string-util.lo: shared/systemd/src/basic/string-util.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shared_systemd_libnm_systemd_shared_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT shared/systemd/src/basic/libnm_systemd_shared_la-string-util.lo -MD -MP -MF shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-string-util.Tpo -c -o shared/systemd/src/basic/libnm_systemd_shared_la-string-util.lo `test -f 'shared/systemd/src/basic/string-util.c' || echo '$(srcdir)/'`shared/systemd/src/basic/string-util.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-string-util.Tpo shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-string-util.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='shared/systemd/src/basic/string-util.c' object='shared/systemd/src/basic/libnm_systemd_shared_la-string-util.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shared_systemd_libnm_systemd_shared_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o shared/systemd/src/basic/libnm_systemd_shared_la-string-util.lo `test -f 'shared/systemd/src/basic/string-util.c' || echo '$(srcdir)/'`shared/systemd/src/basic/string-util.c
+
+shared/systemd/src/basic/libnm_systemd_shared_la-strv.lo: shared/systemd/src/basic/strv.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shared_systemd_libnm_systemd_shared_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT shared/systemd/src/basic/libnm_systemd_shared_la-strv.lo -MD -MP -MF shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-strv.Tpo -c -o shared/systemd/src/basic/libnm_systemd_shared_la-strv.lo `test -f 'shared/systemd/src/basic/strv.c' || echo '$(srcdir)/'`shared/systemd/src/basic/strv.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-strv.Tpo shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-strv.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='shared/systemd/src/basic/strv.c' object='shared/systemd/src/basic/libnm_systemd_shared_la-strv.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shared_systemd_libnm_systemd_shared_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o shared/systemd/src/basic/libnm_systemd_shared_la-strv.lo `test -f 'shared/systemd/src/basic/strv.c' || echo '$(srcdir)/'`shared/systemd/src/basic/strv.c
+
+shared/systemd/src/basic/libnm_systemd_shared_la-time-util.lo: shared/systemd/src/basic/time-util.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shared_systemd_libnm_systemd_shared_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT shared/systemd/src/basic/libnm_systemd_shared_la-time-util.lo -MD -MP -MF shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-time-util.Tpo -c -o shared/systemd/src/basic/libnm_systemd_shared_la-time-util.lo `test -f 'shared/systemd/src/basic/time-util.c' || echo '$(srcdir)/'`shared/systemd/src/basic/time-util.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-time-util.Tpo shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-time-util.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='shared/systemd/src/basic/time-util.c' object='shared/systemd/src/basic/libnm_systemd_shared_la-time-util.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shared_systemd_libnm_systemd_shared_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o shared/systemd/src/basic/libnm_systemd_shared_la-time-util.lo `test -f 'shared/systemd/src/basic/time-util.c' || echo '$(srcdir)/'`shared/systemd/src/basic/time-util.c
+
+shared/systemd/src/basic/libnm_systemd_shared_la-tmpfile-util.lo: shared/systemd/src/basic/tmpfile-util.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shared_systemd_libnm_systemd_shared_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT shared/systemd/src/basic/libnm_systemd_shared_la-tmpfile-util.lo -MD -MP -MF shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-tmpfile-util.Tpo -c -o shared/systemd/src/basic/libnm_systemd_shared_la-tmpfile-util.lo `test -f 'shared/systemd/src/basic/tmpfile-util.c' || echo '$(srcdir)/'`shared/systemd/src/basic/tmpfile-util.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-tmpfile-util.Tpo shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-tmpfile-util.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='shared/systemd/src/basic/tmpfile-util.c' object='shared/systemd/src/basic/libnm_systemd_shared_la-tmpfile-util.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shared_systemd_libnm_systemd_shared_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o shared/systemd/src/basic/libnm_systemd_shared_la-tmpfile-util.lo `test -f 'shared/systemd/src/basic/tmpfile-util.c' || echo '$(srcdir)/'`shared/systemd/src/basic/tmpfile-util.c
+
+shared/systemd/src/basic/libnm_systemd_shared_la-utf8.lo: shared/systemd/src/basic/utf8.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shared_systemd_libnm_systemd_shared_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT shared/systemd/src/basic/libnm_systemd_shared_la-utf8.lo -MD -MP -MF shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-utf8.Tpo -c -o shared/systemd/src/basic/libnm_systemd_shared_la-utf8.lo `test -f 'shared/systemd/src/basic/utf8.c' || echo '$(srcdir)/'`shared/systemd/src/basic/utf8.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-utf8.Tpo shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-utf8.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='shared/systemd/src/basic/utf8.c' object='shared/systemd/src/basic/libnm_systemd_shared_la-utf8.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shared_systemd_libnm_systemd_shared_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o shared/systemd/src/basic/libnm_systemd_shared_la-utf8.lo `test -f 'shared/systemd/src/basic/utf8.c' || echo '$(srcdir)/'`shared/systemd/src/basic/utf8.c
+
+shared/systemd/src/basic/libnm_systemd_shared_la-util.lo: shared/systemd/src/basic/util.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shared_systemd_libnm_systemd_shared_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT shared/systemd/src/basic/libnm_systemd_shared_la-util.lo -MD -MP -MF shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-util.Tpo -c -o shared/systemd/src/basic/libnm_systemd_shared_la-util.lo `test -f 'shared/systemd/src/basic/util.c' || echo '$(srcdir)/'`shared/systemd/src/basic/util.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-util.Tpo shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-util.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='shared/systemd/src/basic/util.c' object='shared/systemd/src/basic/libnm_systemd_shared_la-util.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shared_systemd_libnm_systemd_shared_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o shared/systemd/src/basic/libnm_systemd_shared_la-util.lo `test -f 'shared/systemd/src/basic/util.c' || echo '$(srcdir)/'`shared/systemd/src/basic/util.c
+
 src/devices/adsl/libnm_device_plugin_adsl_la-nm-atm-manager.lo: src/devices/adsl/nm-atm-manager.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_devices_adsl_libnm_device_plugin_adsl_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/devices/adsl/libnm_device_plugin_adsl_la-nm-atm-manager.lo -MD -MP -MF src/devices/adsl/$(DEPDIR)/libnm_device_plugin_adsl_la-nm-atm-manager.Tpo -c -o src/devices/adsl/libnm_device_plugin_adsl_la-nm-atm-manager.lo `test -f 'src/devices/adsl/nm-atm-manager.c' || echo '$(srcdir)/'`src/devices/adsl/nm-atm-manager.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/devices/adsl/$(DEPDIR)/libnm_device_plugin_adsl_la-nm-atm-manager.Tpo src/devices/adsl/$(DEPDIR)/libnm_device_plugin_adsl_la-nm-atm-manager.Plo
@@ -13801,12 +14498,19 @@ src/devices/team/libnm_device_plugin_team_la-nm-device-team.lo: src/devices/team
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_devices_team_libnm_device_plugin_team_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/devices/team/libnm_device_plugin_team_la-nm-device-team.lo `test -f 'src/devices/team/nm-device-team.c' || echo '$(srcdir)/'`src/devices/team/nm-device-team.c
 
-src/devices/wifi/libnm_device_plugin_wifi_la-nm-wifi-factory.lo: src/devices/wifi/nm-wifi-factory.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_devices_wifi_libnm_device_plugin_wifi_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/devices/wifi/libnm_device_plugin_wifi_la-nm-wifi-factory.lo -MD -MP -MF src/devices/wifi/$(DEPDIR)/libnm_device_plugin_wifi_la-nm-wifi-factory.Tpo -c -o src/devices/wifi/libnm_device_plugin_wifi_la-nm-wifi-factory.lo `test -f 'src/devices/wifi/nm-wifi-factory.c' || echo '$(srcdir)/'`src/devices/wifi/nm-wifi-factory.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/devices/wifi/$(DEPDIR)/libnm_device_plugin_wifi_la-nm-wifi-factory.Tpo src/devices/wifi/$(DEPDIR)/libnm_device_plugin_wifi_la-nm-wifi-factory.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/devices/wifi/nm-wifi-factory.c' object='src/devices/wifi/libnm_device_plugin_wifi_la-nm-wifi-factory.lo' libtool=yes @AMDEPBACKSLASH@
+src/devices/wifi/libnm_device_plugin_wifi_la-nm-device-olpc-mesh.lo: src/devices/wifi/nm-device-olpc-mesh.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_devices_wifi_libnm_device_plugin_wifi_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/devices/wifi/libnm_device_plugin_wifi_la-nm-device-olpc-mesh.lo -MD -MP -MF src/devices/wifi/$(DEPDIR)/libnm_device_plugin_wifi_la-nm-device-olpc-mesh.Tpo -c -o src/devices/wifi/libnm_device_plugin_wifi_la-nm-device-olpc-mesh.lo `test -f 'src/devices/wifi/nm-device-olpc-mesh.c' || echo '$(srcdir)/'`src/devices/wifi/nm-device-olpc-mesh.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/devices/wifi/$(DEPDIR)/libnm_device_plugin_wifi_la-nm-device-olpc-mesh.Tpo src/devices/wifi/$(DEPDIR)/libnm_device_plugin_wifi_la-nm-device-olpc-mesh.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/devices/wifi/nm-device-olpc-mesh.c' object='src/devices/wifi/libnm_device_plugin_wifi_la-nm-device-olpc-mesh.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_devices_wifi_libnm_device_plugin_wifi_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/devices/wifi/libnm_device_plugin_wifi_la-nm-wifi-factory.lo `test -f 'src/devices/wifi/nm-wifi-factory.c' || echo '$(srcdir)/'`src/devices/wifi/nm-wifi-factory.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_devices_wifi_libnm_device_plugin_wifi_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/devices/wifi/libnm_device_plugin_wifi_la-nm-device-olpc-mesh.lo `test -f 'src/devices/wifi/nm-device-olpc-mesh.c' || echo '$(srcdir)/'`src/devices/wifi/nm-device-olpc-mesh.c
+
+src/devices/wifi/libnm_device_plugin_wifi_la-nm-device-wifi-p2p.lo: src/devices/wifi/nm-device-wifi-p2p.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_devices_wifi_libnm_device_plugin_wifi_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/devices/wifi/libnm_device_plugin_wifi_la-nm-device-wifi-p2p.lo -MD -MP -MF src/devices/wifi/$(DEPDIR)/libnm_device_plugin_wifi_la-nm-device-wifi-p2p.Tpo -c -o src/devices/wifi/libnm_device_plugin_wifi_la-nm-device-wifi-p2p.lo `test -f 'src/devices/wifi/nm-device-wifi-p2p.c' || echo '$(srcdir)/'`src/devices/wifi/nm-device-wifi-p2p.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/devices/wifi/$(DEPDIR)/libnm_device_plugin_wifi_la-nm-device-wifi-p2p.Tpo src/devices/wifi/$(DEPDIR)/libnm_device_plugin_wifi_la-nm-device-wifi-p2p.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/devices/wifi/nm-device-wifi-p2p.c' object='src/devices/wifi/libnm_device_plugin_wifi_la-nm-device-wifi-p2p.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_devices_wifi_libnm_device_plugin_wifi_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/devices/wifi/libnm_device_plugin_wifi_la-nm-device-wifi-p2p.lo `test -f 'src/devices/wifi/nm-device-wifi-p2p.c' || echo '$(srcdir)/'`src/devices/wifi/nm-device-wifi-p2p.c
 
 src/devices/wifi/libnm_device_plugin_wifi_la-nm-device-wifi.lo: src/devices/wifi/nm-device-wifi.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_devices_wifi_libnm_device_plugin_wifi_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/devices/wifi/libnm_device_plugin_wifi_la-nm-device-wifi.lo -MD -MP -MF src/devices/wifi/$(DEPDIR)/libnm_device_plugin_wifi_la-nm-device-wifi.Tpo -c -o src/devices/wifi/libnm_device_plugin_wifi_la-nm-device-wifi.lo `test -f 'src/devices/wifi/nm-device-wifi.c' || echo '$(srcdir)/'`src/devices/wifi/nm-device-wifi.c
@@ -13822,13 +14526,6 @@ src/devices/wifi/libnm_device_plugin_wifi_la-nm-wifi-ap.lo: src/devices/wifi/nm-
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_devices_wifi_libnm_device_plugin_wifi_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/devices/wifi/libnm_device_plugin_wifi_la-nm-wifi-ap.lo `test -f 'src/devices/wifi/nm-wifi-ap.c' || echo '$(srcdir)/'`src/devices/wifi/nm-wifi-ap.c
 
-src/devices/wifi/libnm_device_plugin_wifi_la-nm-wifi-utils.lo: src/devices/wifi/nm-wifi-utils.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_devices_wifi_libnm_device_plugin_wifi_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/devices/wifi/libnm_device_plugin_wifi_la-nm-wifi-utils.lo -MD -MP -MF src/devices/wifi/$(DEPDIR)/libnm_device_plugin_wifi_la-nm-wifi-utils.Tpo -c -o src/devices/wifi/libnm_device_plugin_wifi_la-nm-wifi-utils.lo `test -f 'src/devices/wifi/nm-wifi-utils.c' || echo '$(srcdir)/'`src/devices/wifi/nm-wifi-utils.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/devices/wifi/$(DEPDIR)/libnm_device_plugin_wifi_la-nm-wifi-utils.Tpo src/devices/wifi/$(DEPDIR)/libnm_device_plugin_wifi_la-nm-wifi-utils.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/devices/wifi/nm-wifi-utils.c' object='src/devices/wifi/libnm_device_plugin_wifi_la-nm-wifi-utils.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_devices_wifi_libnm_device_plugin_wifi_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/devices/wifi/libnm_device_plugin_wifi_la-nm-wifi-utils.lo `test -f 'src/devices/wifi/nm-wifi-utils.c' || echo '$(srcdir)/'`src/devices/wifi/nm-wifi-utils.c
-
 src/devices/wifi/libnm_device_plugin_wifi_la-nm-wifi-common.lo: src/devices/wifi/nm-wifi-common.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_devices_wifi_libnm_device_plugin_wifi_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/devices/wifi/libnm_device_plugin_wifi_la-nm-wifi-common.lo -MD -MP -MF src/devices/wifi/$(DEPDIR)/libnm_device_plugin_wifi_la-nm-wifi-common.Tpo -c -o src/devices/wifi/libnm_device_plugin_wifi_la-nm-wifi-common.lo `test -f 'src/devices/wifi/nm-wifi-common.c' || echo '$(srcdir)/'`src/devices/wifi/nm-wifi-common.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/devices/wifi/$(DEPDIR)/libnm_device_plugin_wifi_la-nm-wifi-common.Tpo src/devices/wifi/$(DEPDIR)/libnm_device_plugin_wifi_la-nm-wifi-common.Plo
@@ -13836,12 +14533,26 @@ src/devices/wifi/libnm_device_plugin_wifi_la-nm-wifi-common.lo: src/devices/wifi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_devices_wifi_libnm_device_plugin_wifi_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/devices/wifi/libnm_device_plugin_wifi_la-nm-wifi-common.lo `test -f 'src/devices/wifi/nm-wifi-common.c' || echo '$(srcdir)/'`src/devices/wifi/nm-wifi-common.c
 
-src/devices/wifi/libnm_device_plugin_wifi_la-nm-device-olpc-mesh.lo: src/devices/wifi/nm-device-olpc-mesh.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_devices_wifi_libnm_device_plugin_wifi_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/devices/wifi/libnm_device_plugin_wifi_la-nm-device-olpc-mesh.lo -MD -MP -MF src/devices/wifi/$(DEPDIR)/libnm_device_plugin_wifi_la-nm-device-olpc-mesh.Tpo -c -o src/devices/wifi/libnm_device_plugin_wifi_la-nm-device-olpc-mesh.lo `test -f 'src/devices/wifi/nm-device-olpc-mesh.c' || echo '$(srcdir)/'`src/devices/wifi/nm-device-olpc-mesh.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/devices/wifi/$(DEPDIR)/libnm_device_plugin_wifi_la-nm-device-olpc-mesh.Tpo src/devices/wifi/$(DEPDIR)/libnm_device_plugin_wifi_la-nm-device-olpc-mesh.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/devices/wifi/nm-device-olpc-mesh.c' object='src/devices/wifi/libnm_device_plugin_wifi_la-nm-device-olpc-mesh.lo' libtool=yes @AMDEPBACKSLASH@
+src/devices/wifi/libnm_device_plugin_wifi_la-nm-wifi-factory.lo: src/devices/wifi/nm-wifi-factory.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_devices_wifi_libnm_device_plugin_wifi_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/devices/wifi/libnm_device_plugin_wifi_la-nm-wifi-factory.lo -MD -MP -MF src/devices/wifi/$(DEPDIR)/libnm_device_plugin_wifi_la-nm-wifi-factory.Tpo -c -o src/devices/wifi/libnm_device_plugin_wifi_la-nm-wifi-factory.lo `test -f 'src/devices/wifi/nm-wifi-factory.c' || echo '$(srcdir)/'`src/devices/wifi/nm-wifi-factory.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/devices/wifi/$(DEPDIR)/libnm_device_plugin_wifi_la-nm-wifi-factory.Tpo src/devices/wifi/$(DEPDIR)/libnm_device_plugin_wifi_la-nm-wifi-factory.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/devices/wifi/nm-wifi-factory.c' object='src/devices/wifi/libnm_device_plugin_wifi_la-nm-wifi-factory.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_devices_wifi_libnm_device_plugin_wifi_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/devices/wifi/libnm_device_plugin_wifi_la-nm-device-olpc-mesh.lo `test -f 'src/devices/wifi/nm-device-olpc-mesh.c' || echo '$(srcdir)/'`src/devices/wifi/nm-device-olpc-mesh.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_devices_wifi_libnm_device_plugin_wifi_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/devices/wifi/libnm_device_plugin_wifi_la-nm-wifi-factory.lo `test -f 'src/devices/wifi/nm-wifi-factory.c' || echo '$(srcdir)/'`src/devices/wifi/nm-wifi-factory.c
+
+src/devices/wifi/libnm_device_plugin_wifi_la-nm-wifi-p2p-peer.lo: src/devices/wifi/nm-wifi-p2p-peer.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_devices_wifi_libnm_device_plugin_wifi_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/devices/wifi/libnm_device_plugin_wifi_la-nm-wifi-p2p-peer.lo -MD -MP -MF src/devices/wifi/$(DEPDIR)/libnm_device_plugin_wifi_la-nm-wifi-p2p-peer.Tpo -c -o src/devices/wifi/libnm_device_plugin_wifi_la-nm-wifi-p2p-peer.lo `test -f 'src/devices/wifi/nm-wifi-p2p-peer.c' || echo '$(srcdir)/'`src/devices/wifi/nm-wifi-p2p-peer.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/devices/wifi/$(DEPDIR)/libnm_device_plugin_wifi_la-nm-wifi-p2p-peer.Tpo src/devices/wifi/$(DEPDIR)/libnm_device_plugin_wifi_la-nm-wifi-p2p-peer.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/devices/wifi/nm-wifi-p2p-peer.c' object='src/devices/wifi/libnm_device_plugin_wifi_la-nm-wifi-p2p-peer.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_devices_wifi_libnm_device_plugin_wifi_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/devices/wifi/libnm_device_plugin_wifi_la-nm-wifi-p2p-peer.lo `test -f 'src/devices/wifi/nm-wifi-p2p-peer.c' || echo '$(srcdir)/'`src/devices/wifi/nm-wifi-p2p-peer.c
+
+src/devices/wifi/libnm_device_plugin_wifi_la-nm-wifi-utils.lo: src/devices/wifi/nm-wifi-utils.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_devices_wifi_libnm_device_plugin_wifi_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/devices/wifi/libnm_device_plugin_wifi_la-nm-wifi-utils.lo -MD -MP -MF src/devices/wifi/$(DEPDIR)/libnm_device_plugin_wifi_la-nm-wifi-utils.Tpo -c -o src/devices/wifi/libnm_device_plugin_wifi_la-nm-wifi-utils.lo `test -f 'src/devices/wifi/nm-wifi-utils.c' || echo '$(srcdir)/'`src/devices/wifi/nm-wifi-utils.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/devices/wifi/$(DEPDIR)/libnm_device_plugin_wifi_la-nm-wifi-utils.Tpo src/devices/wifi/$(DEPDIR)/libnm_device_plugin_wifi_la-nm-wifi-utils.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/devices/wifi/nm-wifi-utils.c' object='src/devices/wifi/libnm_device_plugin_wifi_la-nm-wifi-utils.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_devices_wifi_libnm_device_plugin_wifi_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/devices/wifi/libnm_device_plugin_wifi_la-nm-wifi-utils.lo `test -f 'src/devices/wifi/nm-wifi-utils.c' || echo '$(srcdir)/'`src/devices/wifi/nm-wifi-utils.c
 
 src/devices/wifi/libnm_device_plugin_wifi_la-nm-device-iwd.lo: src/devices/wifi/nm-device-iwd.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_devices_wifi_libnm_device_plugin_wifi_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/devices/wifi/libnm_device_plugin_wifi_la-nm-device-iwd.lo -MD -MP -MF src/devices/wifi/$(DEPDIR)/libnm_device_plugin_wifi_la-nm-device-iwd.Tpo -c -o src/devices/wifi/libnm_device_plugin_wifi_la-nm-device-iwd.lo `test -f 'src/devices/wifi/nm-device-iwd.c' || echo '$(srcdir)/'`src/devices/wifi/nm-device-iwd.c
@@ -13927,12 +14638,12 @@ src/libNetworkManager_la-nm-checkpoint-manager.lo: src/nm-checkpoint-manager.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/libNetworkManager_la-nm-checkpoint-manager.lo `test -f 'src/nm-checkpoint-manager.c' || echo '$(srcdir)/'`src/nm-checkpoint-manager.c
 
-src/devices/libNetworkManager_la-nm-device.lo: src/devices/nm-device.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/devices/libNetworkManager_la-nm-device.lo -MD -MP -MF src/devices/$(DEPDIR)/libNetworkManager_la-nm-device.Tpo -c -o src/devices/libNetworkManager_la-nm-device.lo `test -f 'src/devices/nm-device.c' || echo '$(srcdir)/'`src/devices/nm-device.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/devices/$(DEPDIR)/libNetworkManager_la-nm-device.Tpo src/devices/$(DEPDIR)/libNetworkManager_la-nm-device.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/devices/nm-device.c' object='src/devices/libNetworkManager_la-nm-device.lo' libtool=yes @AMDEPBACKSLASH@
+src/devices/libNetworkManager_la-nm-acd-manager.lo: src/devices/nm-acd-manager.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/devices/libNetworkManager_la-nm-acd-manager.lo -MD -MP -MF src/devices/$(DEPDIR)/libNetworkManager_la-nm-acd-manager.Tpo -c -o src/devices/libNetworkManager_la-nm-acd-manager.lo `test -f 'src/devices/nm-acd-manager.c' || echo '$(srcdir)/'`src/devices/nm-acd-manager.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/devices/$(DEPDIR)/libNetworkManager_la-nm-acd-manager.Tpo src/devices/$(DEPDIR)/libNetworkManager_la-nm-acd-manager.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/devices/nm-acd-manager.c' object='src/devices/libNetworkManager_la-nm-acd-manager.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/devices/libNetworkManager_la-nm-device.lo `test -f 'src/devices/nm-device.c' || echo '$(srcdir)/'`src/devices/nm-device.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/devices/libNetworkManager_la-nm-acd-manager.lo `test -f 'src/devices/nm-acd-manager.c' || echo '$(srcdir)/'`src/devices/nm-acd-manager.c
 
 src/devices/libNetworkManager_la-nm-lldp-listener.lo: src/devices/nm-lldp-listener.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/devices/libNetworkManager_la-nm-lldp-listener.lo -MD -MP -MF src/devices/$(DEPDIR)/libNetworkManager_la-nm-lldp-listener.Tpo -c -o src/devices/libNetworkManager_la-nm-lldp-listener.lo `test -f 'src/devices/nm-lldp-listener.c' || echo '$(srcdir)/'`src/devices/nm-lldp-listener.c
@@ -13941,12 +14652,12 @@ src/devices/libNetworkManager_la-nm-lldp-listener.lo: src/devices/nm-lldp-listen
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/devices/libNetworkManager_la-nm-lldp-listener.lo `test -f 'src/devices/nm-lldp-listener.c' || echo '$(srcdir)/'`src/devices/nm-lldp-listener.c
 
-src/devices/libNetworkManager_la-nm-acd-manager.lo: src/devices/nm-acd-manager.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/devices/libNetworkManager_la-nm-acd-manager.lo -MD -MP -MF src/devices/$(DEPDIR)/libNetworkManager_la-nm-acd-manager.Tpo -c -o src/devices/libNetworkManager_la-nm-acd-manager.lo `test -f 'src/devices/nm-acd-manager.c' || echo '$(srcdir)/'`src/devices/nm-acd-manager.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/devices/$(DEPDIR)/libNetworkManager_la-nm-acd-manager.Tpo src/devices/$(DEPDIR)/libNetworkManager_la-nm-acd-manager.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/devices/nm-acd-manager.c' object='src/devices/libNetworkManager_la-nm-acd-manager.lo' libtool=yes @AMDEPBACKSLASH@
+src/devices/libNetworkManager_la-nm-device.lo: src/devices/nm-device.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/devices/libNetworkManager_la-nm-device.lo -MD -MP -MF src/devices/$(DEPDIR)/libNetworkManager_la-nm-device.Tpo -c -o src/devices/libNetworkManager_la-nm-device.lo `test -f 'src/devices/nm-device.c' || echo '$(srcdir)/'`src/devices/nm-device.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/devices/$(DEPDIR)/libNetworkManager_la-nm-device.Tpo src/devices/$(DEPDIR)/libNetworkManager_la-nm-device.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/devices/nm-device.c' object='src/devices/libNetworkManager_la-nm-device.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/devices/libNetworkManager_la-nm-acd-manager.lo `test -f 'src/devices/nm-acd-manager.c' || echo '$(srcdir)/'`src/devices/nm-acd-manager.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/devices/libNetworkManager_la-nm-device.lo `test -f 'src/devices/nm-device.c' || echo '$(srcdir)/'`src/devices/nm-device.c
 
 src/devices/libNetworkManager_la-nm-device-ethernet-utils.lo: src/devices/nm-device-ethernet-utils.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/devices/libNetworkManager_la-nm-device-ethernet-utils.lo -MD -MP -MF src/devices/$(DEPDIR)/libNetworkManager_la-nm-device-ethernet-utils.Tpo -c -o src/devices/libNetworkManager_la-nm-device-ethernet-utils.lo `test -f 'src/devices/nm-device-ethernet-utils.c' || echo '$(srcdir)/'`src/devices/nm-device-ethernet-utils.c
@@ -14445,6 +15156,13 @@ src/libNetworkManager_la-nm-session-monitor.lo: src/nm-session-monitor.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/libNetworkManager_la-nm-session-monitor.lo `test -f 'src/nm-session-monitor.c' || echo '$(srcdir)/'`src/nm-session-monitor.c
 
+src/libNetworkManager_la-nm-keep-alive.lo: src/nm-keep-alive.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/libNetworkManager_la-nm-keep-alive.lo -MD -MP -MF src/$(DEPDIR)/libNetworkManager_la-nm-keep-alive.Tpo -c -o src/libNetworkManager_la-nm-keep-alive.lo `test -f 'src/nm-keep-alive.c' || echo '$(srcdir)/'`src/nm-keep-alive.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/libNetworkManager_la-nm-keep-alive.Tpo src/$(DEPDIR)/libNetworkManager_la-nm-keep-alive.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/nm-keep-alive.c' object='src/libNetworkManager_la-nm-keep-alive.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/libNetworkManager_la-nm-keep-alive.lo `test -f 'src/nm-keep-alive.c' || echo '$(srcdir)/'`src/nm-keep-alive.c
+
 src/libNetworkManager_la-nm-sleep-monitor.lo: src/nm-sleep-monitor.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/libNetworkManager_la-nm-sleep-monitor.lo -MD -MP -MF src/$(DEPDIR)/libNetworkManager_la-nm-sleep-monitor.Tpo -c -o src/libNetworkManager_la-nm-sleep-monitor.lo `test -f 'src/nm-sleep-monitor.c' || echo '$(srcdir)/'`src/nm-sleep-monitor.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/libNetworkManager_la-nm-sleep-monitor.Tpo src/$(DEPDIR)/libNetworkManager_la-nm-sleep-monitor.Plo
@@ -14641,369 +15359,180 @@ src/platform/tests/libNetworkManagerTest_la-test-common.lo: src/platform/tests/t
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManagerTest_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/platform/tests/libNetworkManagerTest_la-test-common.lo `test -f 'src/platform/tests/test-common.c' || echo '$(srcdir)/'`src/platform/tests/test-common.c
 
-src/systemd/libsystemd_nm_la-nm-sd.lo: src/systemd/nm-sd.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libsystemd_nm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/systemd/libsystemd_nm_la-nm-sd.lo -MD -MP -MF src/systemd/$(DEPDIR)/libsystemd_nm_la-nm-sd.Tpo -c -o src/systemd/libsystemd_nm_la-nm-sd.lo `test -f 'src/systemd/nm-sd.c' || echo '$(srcdir)/'`src/systemd/nm-sd.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/systemd/$(DEPDIR)/libsystemd_nm_la-nm-sd.Tpo src/systemd/$(DEPDIR)/libsystemd_nm_la-nm-sd.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/systemd/nm-sd.c' object='src/systemd/libsystemd_nm_la-nm-sd.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libsystemd_nm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/systemd/libsystemd_nm_la-nm-sd.lo `test -f 'src/systemd/nm-sd.c' || echo '$(srcdir)/'`src/systemd/nm-sd.c
-
-src/systemd/libsystemd_nm_la-nm-sd-utils.lo: src/systemd/nm-sd-utils.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libsystemd_nm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/systemd/libsystemd_nm_la-nm-sd-utils.lo -MD -MP -MF src/systemd/$(DEPDIR)/libsystemd_nm_la-nm-sd-utils.Tpo -c -o src/systemd/libsystemd_nm_la-nm-sd-utils.lo `test -f 'src/systemd/nm-sd-utils.c' || echo '$(srcdir)/'`src/systemd/nm-sd-utils.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/systemd/$(DEPDIR)/libsystemd_nm_la-nm-sd-utils.Tpo src/systemd/$(DEPDIR)/libsystemd_nm_la-nm-sd-utils.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/systemd/nm-sd-utils.c' object='src/systemd/libsystemd_nm_la-nm-sd-utils.lo' libtool=yes @AMDEPBACKSLASH@
+src/systemd/libnm_systemd_core_la-nm-sd-utils-core.lo: src/systemd/nm-sd-utils-core.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libnm_systemd_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/systemd/libnm_systemd_core_la-nm-sd-utils-core.lo -MD -MP -MF src/systemd/$(DEPDIR)/libnm_systemd_core_la-nm-sd-utils-core.Tpo -c -o src/systemd/libnm_systemd_core_la-nm-sd-utils-core.lo `test -f 'src/systemd/nm-sd-utils-core.c' || echo '$(srcdir)/'`src/systemd/nm-sd-utils-core.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/systemd/$(DEPDIR)/libnm_systemd_core_la-nm-sd-utils-core.Tpo src/systemd/$(DEPDIR)/libnm_systemd_core_la-nm-sd-utils-core.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/systemd/nm-sd-utils-core.c' object='src/systemd/libnm_systemd_core_la-nm-sd-utils-core.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libsystemd_nm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/systemd/libsystemd_nm_la-nm-sd-utils.lo `test -f 'src/systemd/nm-sd-utils.c' || echo '$(srcdir)/'`src/systemd/nm-sd-utils.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libnm_systemd_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/systemd/libnm_systemd_core_la-nm-sd-utils-core.lo `test -f 'src/systemd/nm-sd-utils-core.c' || echo '$(srcdir)/'`src/systemd/nm-sd-utils-core.c
 
-src/systemd/sd-adapt/libsystemd_nm_la-nm-sd-adapt.lo: src/systemd/sd-adapt/nm-sd-adapt.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libsystemd_nm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/systemd/sd-adapt/libsystemd_nm_la-nm-sd-adapt.lo -MD -MP -MF src/systemd/sd-adapt/$(DEPDIR)/libsystemd_nm_la-nm-sd-adapt.Tpo -c -o src/systemd/sd-adapt/libsystemd_nm_la-nm-sd-adapt.lo `test -f 'src/systemd/sd-adapt/nm-sd-adapt.c' || echo '$(srcdir)/'`src/systemd/sd-adapt/nm-sd-adapt.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/systemd/sd-adapt/$(DEPDIR)/libsystemd_nm_la-nm-sd-adapt.Tpo src/systemd/sd-adapt/$(DEPDIR)/libsystemd_nm_la-nm-sd-adapt.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/systemd/sd-adapt/nm-sd-adapt.c' object='src/systemd/sd-adapt/libsystemd_nm_la-nm-sd-adapt.lo' libtool=yes @AMDEPBACKSLASH@
+src/systemd/libnm_systemd_core_la-nm-sd.lo: src/systemd/nm-sd.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libnm_systemd_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/systemd/libnm_systemd_core_la-nm-sd.lo -MD -MP -MF src/systemd/$(DEPDIR)/libnm_systemd_core_la-nm-sd.Tpo -c -o src/systemd/libnm_systemd_core_la-nm-sd.lo `test -f 'src/systemd/nm-sd.c' || echo '$(srcdir)/'`src/systemd/nm-sd.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/systemd/$(DEPDIR)/libnm_systemd_core_la-nm-sd.Tpo src/systemd/$(DEPDIR)/libnm_systemd_core_la-nm-sd.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/systemd/nm-sd.c' object='src/systemd/libnm_systemd_core_la-nm-sd.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libsystemd_nm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/systemd/sd-adapt/libsystemd_nm_la-nm-sd-adapt.lo `test -f 'src/systemd/sd-adapt/nm-sd-adapt.c' || echo '$(srcdir)/'`src/systemd/sd-adapt/nm-sd-adapt.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libnm_systemd_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/systemd/libnm_systemd_core_la-nm-sd.lo `test -f 'src/systemd/nm-sd.c' || echo '$(srcdir)/'`src/systemd/nm-sd.c
 
-src/systemd/src/basic/libsystemd_nm_la-alloc-util.lo: src/systemd/src/basic/alloc-util.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libsystemd_nm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/systemd/src/basic/libsystemd_nm_la-alloc-util.lo -MD -MP -MF src/systemd/src/basic/$(DEPDIR)/libsystemd_nm_la-alloc-util.Tpo -c -o src/systemd/src/basic/libsystemd_nm_la-alloc-util.lo `test -f 'src/systemd/src/basic/alloc-util.c' || echo '$(srcdir)/'`src/systemd/src/basic/alloc-util.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/systemd/src/basic/$(DEPDIR)/libsystemd_nm_la-alloc-util.Tpo src/systemd/src/basic/$(DEPDIR)/libsystemd_nm_la-alloc-util.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/systemd/src/basic/alloc-util.c' object='src/systemd/src/basic/libsystemd_nm_la-alloc-util.lo' libtool=yes @AMDEPBACKSLASH@
+src/systemd/sd-adapt-core/libnm_systemd_core_la-nm-sd-adapt-core.lo: src/systemd/sd-adapt-core/nm-sd-adapt-core.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libnm_systemd_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/systemd/sd-adapt-core/libnm_systemd_core_la-nm-sd-adapt-core.lo -MD -MP -MF src/systemd/sd-adapt-core/$(DEPDIR)/libnm_systemd_core_la-nm-sd-adapt-core.Tpo -c -o src/systemd/sd-adapt-core/libnm_systemd_core_la-nm-sd-adapt-core.lo `test -f 'src/systemd/sd-adapt-core/nm-sd-adapt-core.c' || echo '$(srcdir)/'`src/systemd/sd-adapt-core/nm-sd-adapt-core.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/systemd/sd-adapt-core/$(DEPDIR)/libnm_systemd_core_la-nm-sd-adapt-core.Tpo src/systemd/sd-adapt-core/$(DEPDIR)/libnm_systemd_core_la-nm-sd-adapt-core.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/systemd/sd-adapt-core/nm-sd-adapt-core.c' object='src/systemd/sd-adapt-core/libnm_systemd_core_la-nm-sd-adapt-core.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libsystemd_nm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/systemd/src/basic/libsystemd_nm_la-alloc-util.lo `test -f 'src/systemd/src/basic/alloc-util.c' || echo '$(srcdir)/'`src/systemd/src/basic/alloc-util.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libnm_systemd_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/systemd/sd-adapt-core/libnm_systemd_core_la-nm-sd-adapt-core.lo `test -f 'src/systemd/sd-adapt-core/nm-sd-adapt-core.c' || echo '$(srcdir)/'`src/systemd/sd-adapt-core/nm-sd-adapt-core.c
 
-src/systemd/src/basic/libsystemd_nm_la-env-util.lo: src/systemd/src/basic/env-util.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libsystemd_nm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/systemd/src/basic/libsystemd_nm_la-env-util.lo -MD -MP -MF src/systemd/src/basic/$(DEPDIR)/libsystemd_nm_la-env-util.Tpo -c -o src/systemd/src/basic/libsystemd_nm_la-env-util.lo `test -f 'src/systemd/src/basic/env-util.c' || echo '$(srcdir)/'`src/systemd/src/basic/env-util.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/systemd/src/basic/$(DEPDIR)/libsystemd_nm_la-env-util.Tpo src/systemd/src/basic/$(DEPDIR)/libsystemd_nm_la-env-util.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/systemd/src/basic/env-util.c' object='src/systemd/src/basic/libsystemd_nm_la-env-util.lo' libtool=yes @AMDEPBACKSLASH@
+src/systemd/src/libsystemd-network/libnm_systemd_core_la-arp-util.lo: src/systemd/src/libsystemd-network/arp-util.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libnm_systemd_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/systemd/src/libsystemd-network/libnm_systemd_core_la-arp-util.lo -MD -MP -MF src/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-arp-util.Tpo -c -o src/systemd/src/libsystemd-network/libnm_systemd_core_la-arp-util.lo `test -f 'src/systemd/src/libsystemd-network/arp-util.c' || echo '$(srcdir)/'`src/systemd/src/libsystemd-network/arp-util.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-arp-util.Tpo src/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-arp-util.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/systemd/src/libsystemd-network/arp-util.c' object='src/systemd/src/libsystemd-network/libnm_systemd_core_la-arp-util.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libsystemd_nm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/systemd/src/basic/libsystemd_nm_la-env-util.lo `test -f 'src/systemd/src/basic/env-util.c' || echo '$(srcdir)/'`src/systemd/src/basic/env-util.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libnm_systemd_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/systemd/src/libsystemd-network/libnm_systemd_core_la-arp-util.lo `test -f 'src/systemd/src/libsystemd-network/arp-util.c' || echo '$(srcdir)/'`src/systemd/src/libsystemd-network/arp-util.c
 
-src/systemd/src/basic/libsystemd_nm_la-escape.lo: src/systemd/src/basic/escape.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libsystemd_nm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/systemd/src/basic/libsystemd_nm_la-escape.lo -MD -MP -MF src/systemd/src/basic/$(DEPDIR)/libsystemd_nm_la-escape.Tpo -c -o src/systemd/src/basic/libsystemd_nm_la-escape.lo `test -f 'src/systemd/src/basic/escape.c' || echo '$(srcdir)/'`src/systemd/src/basic/escape.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/systemd/src/basic/$(DEPDIR)/libsystemd_nm_la-escape.Tpo src/systemd/src/basic/$(DEPDIR)/libsystemd_nm_la-escape.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/systemd/src/basic/escape.c' object='src/systemd/src/basic/libsystemd_nm_la-escape.lo' libtool=yes @AMDEPBACKSLASH@
+src/systemd/src/libsystemd-network/libnm_systemd_core_la-dhcp-identifier.lo: src/systemd/src/libsystemd-network/dhcp-identifier.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libnm_systemd_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/systemd/src/libsystemd-network/libnm_systemd_core_la-dhcp-identifier.lo -MD -MP -MF src/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-dhcp-identifier.Tpo -c -o src/systemd/src/libsystemd-network/libnm_systemd_core_la-dhcp-identifier.lo `test -f 'src/systemd/src/libsystemd-network/dhcp-identifier.c' || echo '$(srcdir)/'`src/systemd/src/libsystemd-network/dhcp-identifier.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-dhcp-identifier.Tpo src/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-dhcp-identifier.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/systemd/src/libsystemd-network/dhcp-identifier.c' object='src/systemd/src/libsystemd-network/libnm_systemd_core_la-dhcp-identifier.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libsystemd_nm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/systemd/src/basic/libsystemd_nm_la-escape.lo `test -f 'src/systemd/src/basic/escape.c' || echo '$(srcdir)/'`src/systemd/src/basic/escape.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libnm_systemd_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/systemd/src/libsystemd-network/libnm_systemd_core_la-dhcp-identifier.lo `test -f 'src/systemd/src/libsystemd-network/dhcp-identifier.c' || echo '$(srcdir)/'`src/systemd/src/libsystemd-network/dhcp-identifier.c
 
-src/systemd/src/basic/libsystemd_nm_la-ether-addr-util.lo: src/systemd/src/basic/ether-addr-util.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libsystemd_nm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/systemd/src/basic/libsystemd_nm_la-ether-addr-util.lo -MD -MP -MF src/systemd/src/basic/$(DEPDIR)/libsystemd_nm_la-ether-addr-util.Tpo -c -o src/systemd/src/basic/libsystemd_nm_la-ether-addr-util.lo `test -f 'src/systemd/src/basic/ether-addr-util.c' || echo '$(srcdir)/'`src/systemd/src/basic/ether-addr-util.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/systemd/src/basic/$(DEPDIR)/libsystemd_nm_la-ether-addr-util.Tpo src/systemd/src/basic/$(DEPDIR)/libsystemd_nm_la-ether-addr-util.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/systemd/src/basic/ether-addr-util.c' object='src/systemd/src/basic/libsystemd_nm_la-ether-addr-util.lo' libtool=yes @AMDEPBACKSLASH@
+src/systemd/src/libsystemd-network/libnm_systemd_core_la-dhcp-network.lo: src/systemd/src/libsystemd-network/dhcp-network.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libnm_systemd_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/systemd/src/libsystemd-network/libnm_systemd_core_la-dhcp-network.lo -MD -MP -MF src/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-dhcp-network.Tpo -c -o src/systemd/src/libsystemd-network/libnm_systemd_core_la-dhcp-network.lo `test -f 'src/systemd/src/libsystemd-network/dhcp-network.c' || echo '$(srcdir)/'`src/systemd/src/libsystemd-network/dhcp-network.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-dhcp-network.Tpo src/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-dhcp-network.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/systemd/src/libsystemd-network/dhcp-network.c' object='src/systemd/src/libsystemd-network/libnm_systemd_core_la-dhcp-network.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libsystemd_nm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/systemd/src/basic/libsystemd_nm_la-ether-addr-util.lo `test -f 'src/systemd/src/basic/ether-addr-util.c' || echo '$(srcdir)/'`src/systemd/src/basic/ether-addr-util.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libnm_systemd_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/systemd/src/libsystemd-network/libnm_systemd_core_la-dhcp-network.lo `test -f 'src/systemd/src/libsystemd-network/dhcp-network.c' || echo '$(srcdir)/'`src/systemd/src/libsystemd-network/dhcp-network.c
 
-src/systemd/src/basic/libsystemd_nm_la-extract-word.lo: src/systemd/src/basic/extract-word.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libsystemd_nm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/systemd/src/basic/libsystemd_nm_la-extract-word.lo -MD -MP -MF src/systemd/src/basic/$(DEPDIR)/libsystemd_nm_la-extract-word.Tpo -c -o src/systemd/src/basic/libsystemd_nm_la-extract-word.lo `test -f 'src/systemd/src/basic/extract-word.c' || echo '$(srcdir)/'`src/systemd/src/basic/extract-word.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/systemd/src/basic/$(DEPDIR)/libsystemd_nm_la-extract-word.Tpo src/systemd/src/basic/$(DEPDIR)/libsystemd_nm_la-extract-word.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/systemd/src/basic/extract-word.c' object='src/systemd/src/basic/libsystemd_nm_la-extract-word.lo' libtool=yes @AMDEPBACKSLASH@
+src/systemd/src/libsystemd-network/libnm_systemd_core_la-dhcp-option.lo: src/systemd/src/libsystemd-network/dhcp-option.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libnm_systemd_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/systemd/src/libsystemd-network/libnm_systemd_core_la-dhcp-option.lo -MD -MP -MF src/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-dhcp-option.Tpo -c -o src/systemd/src/libsystemd-network/libnm_systemd_core_la-dhcp-option.lo `test -f 'src/systemd/src/libsystemd-network/dhcp-option.c' || echo '$(srcdir)/'`src/systemd/src/libsystemd-network/dhcp-option.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-dhcp-option.Tpo src/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-dhcp-option.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/systemd/src/libsystemd-network/dhcp-option.c' object='src/systemd/src/libsystemd-network/libnm_systemd_core_la-dhcp-option.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libsystemd_nm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/systemd/src/basic/libsystemd_nm_la-extract-word.lo `test -f 'src/systemd/src/basic/extract-word.c' || echo '$(srcdir)/'`src/systemd/src/basic/extract-word.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libnm_systemd_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/systemd/src/libsystemd-network/libnm_systemd_core_la-dhcp-option.lo `test -f 'src/systemd/src/libsystemd-network/dhcp-option.c' || echo '$(srcdir)/'`src/systemd/src/libsystemd-network/dhcp-option.c
 
-src/systemd/src/basic/libsystemd_nm_la-fd-util.lo: src/systemd/src/basic/fd-util.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libsystemd_nm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/systemd/src/basic/libsystemd_nm_la-fd-util.lo -MD -MP -MF src/systemd/src/basic/$(DEPDIR)/libsystemd_nm_la-fd-util.Tpo -c -o src/systemd/src/basic/libsystemd_nm_la-fd-util.lo `test -f 'src/systemd/src/basic/fd-util.c' || echo '$(srcdir)/'`src/systemd/src/basic/fd-util.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/systemd/src/basic/$(DEPDIR)/libsystemd_nm_la-fd-util.Tpo src/systemd/src/basic/$(DEPDIR)/libsystemd_nm_la-fd-util.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/systemd/src/basic/fd-util.c' object='src/systemd/src/basic/libsystemd_nm_la-fd-util.lo' libtool=yes @AMDEPBACKSLASH@
+src/systemd/src/libsystemd-network/libnm_systemd_core_la-dhcp-packet.lo: src/systemd/src/libsystemd-network/dhcp-packet.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libnm_systemd_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/systemd/src/libsystemd-network/libnm_systemd_core_la-dhcp-packet.lo -MD -MP -MF src/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-dhcp-packet.Tpo -c -o src/systemd/src/libsystemd-network/libnm_systemd_core_la-dhcp-packet.lo `test -f 'src/systemd/src/libsystemd-network/dhcp-packet.c' || echo '$(srcdir)/'`src/systemd/src/libsystemd-network/dhcp-packet.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-dhcp-packet.Tpo src/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-dhcp-packet.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/systemd/src/libsystemd-network/dhcp-packet.c' object='src/systemd/src/libsystemd-network/libnm_systemd_core_la-dhcp-packet.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libsystemd_nm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/systemd/src/basic/libsystemd_nm_la-fd-util.lo `test -f 'src/systemd/src/basic/fd-util.c' || echo '$(srcdir)/'`src/systemd/src/basic/fd-util.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libnm_systemd_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/systemd/src/libsystemd-network/libnm_systemd_core_la-dhcp-packet.lo `test -f 'src/systemd/src/libsystemd-network/dhcp-packet.c' || echo '$(srcdir)/'`src/systemd/src/libsystemd-network/dhcp-packet.c
 
-src/systemd/src/basic/libsystemd_nm_la-fileio.lo: src/systemd/src/basic/fileio.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libsystemd_nm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/systemd/src/basic/libsystemd_nm_la-fileio.lo -MD -MP -MF src/systemd/src/basic/$(DEPDIR)/libsystemd_nm_la-fileio.Tpo -c -o src/systemd/src/basic/libsystemd_nm_la-fileio.lo `test -f 'src/systemd/src/basic/fileio.c' || echo '$(srcdir)/'`src/systemd/src/basic/fileio.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/systemd/src/basic/$(DEPDIR)/libsystemd_nm_la-fileio.Tpo src/systemd/src/basic/$(DEPDIR)/libsystemd_nm_la-fileio.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/systemd/src/basic/fileio.c' object='src/systemd/src/basic/libsystemd_nm_la-fileio.lo' libtool=yes @AMDEPBACKSLASH@
+src/systemd/src/libsystemd-network/libnm_systemd_core_la-dhcp6-network.lo: src/systemd/src/libsystemd-network/dhcp6-network.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libnm_systemd_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/systemd/src/libsystemd-network/libnm_systemd_core_la-dhcp6-network.lo -MD -MP -MF src/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-dhcp6-network.Tpo -c -o src/systemd/src/libsystemd-network/libnm_systemd_core_la-dhcp6-network.lo `test -f 'src/systemd/src/libsystemd-network/dhcp6-network.c' || echo '$(srcdir)/'`src/systemd/src/libsystemd-network/dhcp6-network.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-dhcp6-network.Tpo src/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-dhcp6-network.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/systemd/src/libsystemd-network/dhcp6-network.c' object='src/systemd/src/libsystemd-network/libnm_systemd_core_la-dhcp6-network.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libsystemd_nm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/systemd/src/basic/libsystemd_nm_la-fileio.lo `test -f 'src/systemd/src/basic/fileio.c' || echo '$(srcdir)/'`src/systemd/src/basic/fileio.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libnm_systemd_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/systemd/src/libsystemd-network/libnm_systemd_core_la-dhcp6-network.lo `test -f 'src/systemd/src/libsystemd-network/dhcp6-network.c' || echo '$(srcdir)/'`src/systemd/src/libsystemd-network/dhcp6-network.c
 
-src/systemd/src/basic/libsystemd_nm_la-fs-util.lo: src/systemd/src/basic/fs-util.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libsystemd_nm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/systemd/src/basic/libsystemd_nm_la-fs-util.lo -MD -MP -MF src/systemd/src/basic/$(DEPDIR)/libsystemd_nm_la-fs-util.Tpo -c -o src/systemd/src/basic/libsystemd_nm_la-fs-util.lo `test -f 'src/systemd/src/basic/fs-util.c' || echo '$(srcdir)/'`src/systemd/src/basic/fs-util.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/systemd/src/basic/$(DEPDIR)/libsystemd_nm_la-fs-util.Tpo src/systemd/src/basic/$(DEPDIR)/libsystemd_nm_la-fs-util.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/systemd/src/basic/fs-util.c' object='src/systemd/src/basic/libsystemd_nm_la-fs-util.lo' libtool=yes @AMDEPBACKSLASH@
+src/systemd/src/libsystemd-network/libnm_systemd_core_la-dhcp6-option.lo: src/systemd/src/libsystemd-network/dhcp6-option.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libnm_systemd_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/systemd/src/libsystemd-network/libnm_systemd_core_la-dhcp6-option.lo -MD -MP -MF src/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-dhcp6-option.Tpo -c -o src/systemd/src/libsystemd-network/libnm_systemd_core_la-dhcp6-option.lo `test -f 'src/systemd/src/libsystemd-network/dhcp6-option.c' || echo '$(srcdir)/'`src/systemd/src/libsystemd-network/dhcp6-option.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-dhcp6-option.Tpo src/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-dhcp6-option.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/systemd/src/libsystemd-network/dhcp6-option.c' object='src/systemd/src/libsystemd-network/libnm_systemd_core_la-dhcp6-option.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libsystemd_nm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/systemd/src/basic/libsystemd_nm_la-fs-util.lo `test -f 'src/systemd/src/basic/fs-util.c' || echo '$(srcdir)/'`src/systemd/src/basic/fs-util.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libnm_systemd_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/systemd/src/libsystemd-network/libnm_systemd_core_la-dhcp6-option.lo `test -f 'src/systemd/src/libsystemd-network/dhcp6-option.c' || echo '$(srcdir)/'`src/systemd/src/libsystemd-network/dhcp6-option.c
 
-src/systemd/src/basic/libsystemd_nm_la-hash-funcs.lo: src/systemd/src/basic/hash-funcs.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libsystemd_nm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/systemd/src/basic/libsystemd_nm_la-hash-funcs.lo -MD -MP -MF src/systemd/src/basic/$(DEPDIR)/libsystemd_nm_la-hash-funcs.Tpo -c -o src/systemd/src/basic/libsystemd_nm_la-hash-funcs.lo `test -f 'src/systemd/src/basic/hash-funcs.c' || echo '$(srcdir)/'`src/systemd/src/basic/hash-funcs.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/systemd/src/basic/$(DEPDIR)/libsystemd_nm_la-hash-funcs.Tpo src/systemd/src/basic/$(DEPDIR)/libsystemd_nm_la-hash-funcs.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/systemd/src/basic/hash-funcs.c' object='src/systemd/src/basic/libsystemd_nm_la-hash-funcs.lo' libtool=yes @AMDEPBACKSLASH@
+src/systemd/src/libsystemd-network/libnm_systemd_core_la-lldp-neighbor.lo: src/systemd/src/libsystemd-network/lldp-neighbor.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libnm_systemd_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/systemd/src/libsystemd-network/libnm_systemd_core_la-lldp-neighbor.lo -MD -MP -MF src/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-lldp-neighbor.Tpo -c -o src/systemd/src/libsystemd-network/libnm_systemd_core_la-lldp-neighbor.lo `test -f 'src/systemd/src/libsystemd-network/lldp-neighbor.c' || echo '$(srcdir)/'`src/systemd/src/libsystemd-network/lldp-neighbor.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-lldp-neighbor.Tpo src/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-lldp-neighbor.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/systemd/src/libsystemd-network/lldp-neighbor.c' object='src/systemd/src/libsystemd-network/libnm_systemd_core_la-lldp-neighbor.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libsystemd_nm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/systemd/src/basic/libsystemd_nm_la-hash-funcs.lo `test -f 'src/systemd/src/basic/hash-funcs.c' || echo '$(srcdir)/'`src/systemd/src/basic/hash-funcs.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libnm_systemd_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/systemd/src/libsystemd-network/libnm_systemd_core_la-lldp-neighbor.lo `test -f 'src/systemd/src/libsystemd-network/lldp-neighbor.c' || echo '$(srcdir)/'`src/systemd/src/libsystemd-network/lldp-neighbor.c
 
-src/systemd/src/basic/libsystemd_nm_la-hashmap.lo: src/systemd/src/basic/hashmap.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libsystemd_nm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/systemd/src/basic/libsystemd_nm_la-hashmap.lo -MD -MP -MF src/systemd/src/basic/$(DEPDIR)/libsystemd_nm_la-hashmap.Tpo -c -o src/systemd/src/basic/libsystemd_nm_la-hashmap.lo `test -f 'src/systemd/src/basic/hashmap.c' || echo '$(srcdir)/'`src/systemd/src/basic/hashmap.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/systemd/src/basic/$(DEPDIR)/libsystemd_nm_la-hashmap.Tpo src/systemd/src/basic/$(DEPDIR)/libsystemd_nm_la-hashmap.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/systemd/src/basic/hashmap.c' object='src/systemd/src/basic/libsystemd_nm_la-hashmap.lo' libtool=yes @AMDEPBACKSLASH@
+src/systemd/src/libsystemd-network/libnm_systemd_core_la-lldp-network.lo: src/systemd/src/libsystemd-network/lldp-network.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libnm_systemd_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/systemd/src/libsystemd-network/libnm_systemd_core_la-lldp-network.lo -MD -MP -MF src/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-lldp-network.Tpo -c -o src/systemd/src/libsystemd-network/libnm_systemd_core_la-lldp-network.lo `test -f 'src/systemd/src/libsystemd-network/lldp-network.c' || echo '$(srcdir)/'`src/systemd/src/libsystemd-network/lldp-network.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-lldp-network.Tpo src/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-lldp-network.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/systemd/src/libsystemd-network/lldp-network.c' object='src/systemd/src/libsystemd-network/libnm_systemd_core_la-lldp-network.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libsystemd_nm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/systemd/src/basic/libsystemd_nm_la-hashmap.lo `test -f 'src/systemd/src/basic/hashmap.c' || echo '$(srcdir)/'`src/systemd/src/basic/hashmap.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libnm_systemd_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/systemd/src/libsystemd-network/libnm_systemd_core_la-lldp-network.lo `test -f 'src/systemd/src/libsystemd-network/lldp-network.c' || echo '$(srcdir)/'`src/systemd/src/libsystemd-network/lldp-network.c
 
-src/systemd/src/basic/libsystemd_nm_la-hexdecoct.lo: src/systemd/src/basic/hexdecoct.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libsystemd_nm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/systemd/src/basic/libsystemd_nm_la-hexdecoct.lo -MD -MP -MF src/systemd/src/basic/$(DEPDIR)/libsystemd_nm_la-hexdecoct.Tpo -c -o src/systemd/src/basic/libsystemd_nm_la-hexdecoct.lo `test -f 'src/systemd/src/basic/hexdecoct.c' || echo '$(srcdir)/'`src/systemd/src/basic/hexdecoct.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/systemd/src/basic/$(DEPDIR)/libsystemd_nm_la-hexdecoct.Tpo src/systemd/src/basic/$(DEPDIR)/libsystemd_nm_la-hexdecoct.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/systemd/src/basic/hexdecoct.c' object='src/systemd/src/basic/libsystemd_nm_la-hexdecoct.lo' libtool=yes @AMDEPBACKSLASH@
+src/systemd/src/libsystemd-network/libnm_systemd_core_la-network-internal.lo: src/systemd/src/libsystemd-network/network-internal.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libnm_systemd_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/systemd/src/libsystemd-network/libnm_systemd_core_la-network-internal.lo -MD -MP -MF src/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-network-internal.Tpo -c -o src/systemd/src/libsystemd-network/libnm_systemd_core_la-network-internal.lo `test -f 'src/systemd/src/libsystemd-network/network-internal.c' || echo '$(srcdir)/'`src/systemd/src/libsystemd-network/network-internal.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-network-internal.Tpo src/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-network-internal.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/systemd/src/libsystemd-network/network-internal.c' object='src/systemd/src/libsystemd-network/libnm_systemd_core_la-network-internal.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libsystemd_nm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/systemd/src/basic/libsystemd_nm_la-hexdecoct.lo `test -f 'src/systemd/src/basic/hexdecoct.c' || echo '$(srcdir)/'`src/systemd/src/basic/hexdecoct.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libnm_systemd_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/systemd/src/libsystemd-network/libnm_systemd_core_la-network-internal.lo `test -f 'src/systemd/src/libsystemd-network/network-internal.c' || echo '$(srcdir)/'`src/systemd/src/libsystemd-network/network-internal.c
 
-src/systemd/src/basic/libsystemd_nm_la-hostname-util.lo: src/systemd/src/basic/hostname-util.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libsystemd_nm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/systemd/src/basic/libsystemd_nm_la-hostname-util.lo -MD -MP -MF src/systemd/src/basic/$(DEPDIR)/libsystemd_nm_la-hostname-util.Tpo -c -o src/systemd/src/basic/libsystemd_nm_la-hostname-util.lo `test -f 'src/systemd/src/basic/hostname-util.c' || echo '$(srcdir)/'`src/systemd/src/basic/hostname-util.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/systemd/src/basic/$(DEPDIR)/libsystemd_nm_la-hostname-util.Tpo src/systemd/src/basic/$(DEPDIR)/libsystemd_nm_la-hostname-util.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/systemd/src/basic/hostname-util.c' object='src/systemd/src/basic/libsystemd_nm_la-hostname-util.lo' libtool=yes @AMDEPBACKSLASH@
+src/systemd/src/libsystemd-network/libnm_systemd_core_la-sd-dhcp-client.lo: src/systemd/src/libsystemd-network/sd-dhcp-client.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libnm_systemd_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/systemd/src/libsystemd-network/libnm_systemd_core_la-sd-dhcp-client.lo -MD -MP -MF src/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-sd-dhcp-client.Tpo -c -o src/systemd/src/libsystemd-network/libnm_systemd_core_la-sd-dhcp-client.lo `test -f 'src/systemd/src/libsystemd-network/sd-dhcp-client.c' || echo '$(srcdir)/'`src/systemd/src/libsystemd-network/sd-dhcp-client.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-sd-dhcp-client.Tpo src/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-sd-dhcp-client.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/systemd/src/libsystemd-network/sd-dhcp-client.c' object='src/systemd/src/libsystemd-network/libnm_systemd_core_la-sd-dhcp-client.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libsystemd_nm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/systemd/src/basic/libsystemd_nm_la-hostname-util.lo `test -f 'src/systemd/src/basic/hostname-util.c' || echo '$(srcdir)/'`src/systemd/src/basic/hostname-util.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libnm_systemd_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/systemd/src/libsystemd-network/libnm_systemd_core_la-sd-dhcp-client.lo `test -f 'src/systemd/src/libsystemd-network/sd-dhcp-client.c' || echo '$(srcdir)/'`src/systemd/src/libsystemd-network/sd-dhcp-client.c
 
-src/systemd/src/basic/libsystemd_nm_la-in-addr-util.lo: src/systemd/src/basic/in-addr-util.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libsystemd_nm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/systemd/src/basic/libsystemd_nm_la-in-addr-util.lo -MD -MP -MF src/systemd/src/basic/$(DEPDIR)/libsystemd_nm_la-in-addr-util.Tpo -c -o src/systemd/src/basic/libsystemd_nm_la-in-addr-util.lo `test -f 'src/systemd/src/basic/in-addr-util.c' || echo '$(srcdir)/'`src/systemd/src/basic/in-addr-util.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/systemd/src/basic/$(DEPDIR)/libsystemd_nm_la-in-addr-util.Tpo src/systemd/src/basic/$(DEPDIR)/libsystemd_nm_la-in-addr-util.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/systemd/src/basic/in-addr-util.c' object='src/systemd/src/basic/libsystemd_nm_la-in-addr-util.lo' libtool=yes @AMDEPBACKSLASH@
+src/systemd/src/libsystemd-network/libnm_systemd_core_la-sd-dhcp-lease.lo: src/systemd/src/libsystemd-network/sd-dhcp-lease.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libnm_systemd_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/systemd/src/libsystemd-network/libnm_systemd_core_la-sd-dhcp-lease.lo -MD -MP -MF src/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-sd-dhcp-lease.Tpo -c -o src/systemd/src/libsystemd-network/libnm_systemd_core_la-sd-dhcp-lease.lo `test -f 'src/systemd/src/libsystemd-network/sd-dhcp-lease.c' || echo '$(srcdir)/'`src/systemd/src/libsystemd-network/sd-dhcp-lease.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-sd-dhcp-lease.Tpo src/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-sd-dhcp-lease.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/systemd/src/libsystemd-network/sd-dhcp-lease.c' object='src/systemd/src/libsystemd-network/libnm_systemd_core_la-sd-dhcp-lease.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libsystemd_nm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/systemd/src/basic/libsystemd_nm_la-in-addr-util.lo `test -f 'src/systemd/src/basic/in-addr-util.c' || echo '$(srcdir)/'`src/systemd/src/basic/in-addr-util.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libnm_systemd_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/systemd/src/libsystemd-network/libnm_systemd_core_la-sd-dhcp-lease.lo `test -f 'src/systemd/src/libsystemd-network/sd-dhcp-lease.c' || echo '$(srcdir)/'`src/systemd/src/libsystemd-network/sd-dhcp-lease.c
 
-src/systemd/src/basic/libsystemd_nm_la-io-util.lo: src/systemd/src/basic/io-util.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libsystemd_nm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/systemd/src/basic/libsystemd_nm_la-io-util.lo -MD -MP -MF src/systemd/src/basic/$(DEPDIR)/libsystemd_nm_la-io-util.Tpo -c -o src/systemd/src/basic/libsystemd_nm_la-io-util.lo `test -f 'src/systemd/src/basic/io-util.c' || echo '$(srcdir)/'`src/systemd/src/basic/io-util.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/systemd/src/basic/$(DEPDIR)/libsystemd_nm_la-io-util.Tpo src/systemd/src/basic/$(DEPDIR)/libsystemd_nm_la-io-util.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/systemd/src/basic/io-util.c' object='src/systemd/src/basic/libsystemd_nm_la-io-util.lo' libtool=yes @AMDEPBACKSLASH@
+src/systemd/src/libsystemd-network/libnm_systemd_core_la-sd-dhcp6-client.lo: src/systemd/src/libsystemd-network/sd-dhcp6-client.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libnm_systemd_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/systemd/src/libsystemd-network/libnm_systemd_core_la-sd-dhcp6-client.lo -MD -MP -MF src/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-sd-dhcp6-client.Tpo -c -o src/systemd/src/libsystemd-network/libnm_systemd_core_la-sd-dhcp6-client.lo `test -f 'src/systemd/src/libsystemd-network/sd-dhcp6-client.c' || echo '$(srcdir)/'`src/systemd/src/libsystemd-network/sd-dhcp6-client.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-sd-dhcp6-client.Tpo src/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-sd-dhcp6-client.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/systemd/src/libsystemd-network/sd-dhcp6-client.c' object='src/systemd/src/libsystemd-network/libnm_systemd_core_la-sd-dhcp6-client.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libsystemd_nm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/systemd/src/basic/libsystemd_nm_la-io-util.lo `test -f 'src/systemd/src/basic/io-util.c' || echo '$(srcdir)/'`src/systemd/src/basic/io-util.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libnm_systemd_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/systemd/src/libsystemd-network/libnm_systemd_core_la-sd-dhcp6-client.lo `test -f 'src/systemd/src/libsystemd-network/sd-dhcp6-client.c' || echo '$(srcdir)/'`src/systemd/src/libsystemd-network/sd-dhcp6-client.c
 
-src/systemd/src/basic/libsystemd_nm_la-mempool.lo: src/systemd/src/basic/mempool.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libsystemd_nm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/systemd/src/basic/libsystemd_nm_la-mempool.lo -MD -MP -MF src/systemd/src/basic/$(DEPDIR)/libsystemd_nm_la-mempool.Tpo -c -o src/systemd/src/basic/libsystemd_nm_la-mempool.lo `test -f 'src/systemd/src/basic/mempool.c' || echo '$(srcdir)/'`src/systemd/src/basic/mempool.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/systemd/src/basic/$(DEPDIR)/libsystemd_nm_la-mempool.Tpo src/systemd/src/basic/$(DEPDIR)/libsystemd_nm_la-mempool.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/systemd/src/basic/mempool.c' object='src/systemd/src/basic/libsystemd_nm_la-mempool.lo' libtool=yes @AMDEPBACKSLASH@
+src/systemd/src/libsystemd-network/libnm_systemd_core_la-sd-dhcp6-lease.lo: src/systemd/src/libsystemd-network/sd-dhcp6-lease.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libnm_systemd_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/systemd/src/libsystemd-network/libnm_systemd_core_la-sd-dhcp6-lease.lo -MD -MP -MF src/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-sd-dhcp6-lease.Tpo -c -o src/systemd/src/libsystemd-network/libnm_systemd_core_la-sd-dhcp6-lease.lo `test -f 'src/systemd/src/libsystemd-network/sd-dhcp6-lease.c' || echo '$(srcdir)/'`src/systemd/src/libsystemd-network/sd-dhcp6-lease.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-sd-dhcp6-lease.Tpo src/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-sd-dhcp6-lease.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/systemd/src/libsystemd-network/sd-dhcp6-lease.c' object='src/systemd/src/libsystemd-network/libnm_systemd_core_la-sd-dhcp6-lease.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libsystemd_nm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/systemd/src/basic/libsystemd_nm_la-mempool.lo `test -f 'src/systemd/src/basic/mempool.c' || echo '$(srcdir)/'`src/systemd/src/basic/mempool.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libnm_systemd_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/systemd/src/libsystemd-network/libnm_systemd_core_la-sd-dhcp6-lease.lo `test -f 'src/systemd/src/libsystemd-network/sd-dhcp6-lease.c' || echo '$(srcdir)/'`src/systemd/src/libsystemd-network/sd-dhcp6-lease.c
 
-src/systemd/src/basic/libsystemd_nm_la-parse-util.lo: src/systemd/src/basic/parse-util.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libsystemd_nm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/systemd/src/basic/libsystemd_nm_la-parse-util.lo -MD -MP -MF src/systemd/src/basic/$(DEPDIR)/libsystemd_nm_la-parse-util.Tpo -c -o src/systemd/src/basic/libsystemd_nm_la-parse-util.lo `test -f 'src/systemd/src/basic/parse-util.c' || echo '$(srcdir)/'`src/systemd/src/basic/parse-util.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/systemd/src/basic/$(DEPDIR)/libsystemd_nm_la-parse-util.Tpo src/systemd/src/basic/$(DEPDIR)/libsystemd_nm_la-parse-util.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/systemd/src/basic/parse-util.c' object='src/systemd/src/basic/libsystemd_nm_la-parse-util.lo' libtool=yes @AMDEPBACKSLASH@
+src/systemd/src/libsystemd-network/libnm_systemd_core_la-sd-ipv4acd.lo: src/systemd/src/libsystemd-network/sd-ipv4acd.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libnm_systemd_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/systemd/src/libsystemd-network/libnm_systemd_core_la-sd-ipv4acd.lo -MD -MP -MF src/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-sd-ipv4acd.Tpo -c -o src/systemd/src/libsystemd-network/libnm_systemd_core_la-sd-ipv4acd.lo `test -f 'src/systemd/src/libsystemd-network/sd-ipv4acd.c' || echo '$(srcdir)/'`src/systemd/src/libsystemd-network/sd-ipv4acd.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-sd-ipv4acd.Tpo src/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-sd-ipv4acd.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/systemd/src/libsystemd-network/sd-ipv4acd.c' object='src/systemd/src/libsystemd-network/libnm_systemd_core_la-sd-ipv4acd.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libsystemd_nm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/systemd/src/basic/libsystemd_nm_la-parse-util.lo `test -f 'src/systemd/src/basic/parse-util.c' || echo '$(srcdir)/'`src/systemd/src/basic/parse-util.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libnm_systemd_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/systemd/src/libsystemd-network/libnm_systemd_core_la-sd-ipv4acd.lo `test -f 'src/systemd/src/libsystemd-network/sd-ipv4acd.c' || echo '$(srcdir)/'`src/systemd/src/libsystemd-network/sd-ipv4acd.c
 
-src/systemd/src/basic/libsystemd_nm_la-path-util.lo: src/systemd/src/basic/path-util.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libsystemd_nm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/systemd/src/basic/libsystemd_nm_la-path-util.lo -MD -MP -MF src/systemd/src/basic/$(DEPDIR)/libsystemd_nm_la-path-util.Tpo -c -o src/systemd/src/basic/libsystemd_nm_la-path-util.lo `test -f 'src/systemd/src/basic/path-util.c' || echo '$(srcdir)/'`src/systemd/src/basic/path-util.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/systemd/src/basic/$(DEPDIR)/libsystemd_nm_la-path-util.Tpo src/systemd/src/basic/$(DEPDIR)/libsystemd_nm_la-path-util.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/systemd/src/basic/path-util.c' object='src/systemd/src/basic/libsystemd_nm_la-path-util.lo' libtool=yes @AMDEPBACKSLASH@
+src/systemd/src/libsystemd-network/libnm_systemd_core_la-sd-ipv4ll.lo: src/systemd/src/libsystemd-network/sd-ipv4ll.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libnm_systemd_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/systemd/src/libsystemd-network/libnm_systemd_core_la-sd-ipv4ll.lo -MD -MP -MF src/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-sd-ipv4ll.Tpo -c -o src/systemd/src/libsystemd-network/libnm_systemd_core_la-sd-ipv4ll.lo `test -f 'src/systemd/src/libsystemd-network/sd-ipv4ll.c' || echo '$(srcdir)/'`src/systemd/src/libsystemd-network/sd-ipv4ll.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-sd-ipv4ll.Tpo src/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-sd-ipv4ll.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/systemd/src/libsystemd-network/sd-ipv4ll.c' object='src/systemd/src/libsystemd-network/libnm_systemd_core_la-sd-ipv4ll.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libsystemd_nm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/systemd/src/basic/libsystemd_nm_la-path-util.lo `test -f 'src/systemd/src/basic/path-util.c' || echo '$(srcdir)/'`src/systemd/src/basic/path-util.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libnm_systemd_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/systemd/src/libsystemd-network/libnm_systemd_core_la-sd-ipv4ll.lo `test -f 'src/systemd/src/libsystemd-network/sd-ipv4ll.c' || echo '$(srcdir)/'`src/systemd/src/libsystemd-network/sd-ipv4ll.c
 
-src/systemd/src/basic/libsystemd_nm_la-prioq.lo: src/systemd/src/basic/prioq.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libsystemd_nm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/systemd/src/basic/libsystemd_nm_la-prioq.lo -MD -MP -MF src/systemd/src/basic/$(DEPDIR)/libsystemd_nm_la-prioq.Tpo -c -o src/systemd/src/basic/libsystemd_nm_la-prioq.lo `test -f 'src/systemd/src/basic/prioq.c' || echo '$(srcdir)/'`src/systemd/src/basic/prioq.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/systemd/src/basic/$(DEPDIR)/libsystemd_nm_la-prioq.Tpo src/systemd/src/basic/$(DEPDIR)/libsystemd_nm_la-prioq.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/systemd/src/basic/prioq.c' object='src/systemd/src/basic/libsystemd_nm_la-prioq.lo' libtool=yes @AMDEPBACKSLASH@
+src/systemd/src/libsystemd-network/libnm_systemd_core_la-sd-lldp.lo: src/systemd/src/libsystemd-network/sd-lldp.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libnm_systemd_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/systemd/src/libsystemd-network/libnm_systemd_core_la-sd-lldp.lo -MD -MP -MF src/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-sd-lldp.Tpo -c -o src/systemd/src/libsystemd-network/libnm_systemd_core_la-sd-lldp.lo `test -f 'src/systemd/src/libsystemd-network/sd-lldp.c' || echo '$(srcdir)/'`src/systemd/src/libsystemd-network/sd-lldp.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-sd-lldp.Tpo src/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-sd-lldp.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/systemd/src/libsystemd-network/sd-lldp.c' object='src/systemd/src/libsystemd-network/libnm_systemd_core_la-sd-lldp.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libsystemd_nm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/systemd/src/basic/libsystemd_nm_la-prioq.lo `test -f 'src/systemd/src/basic/prioq.c' || echo '$(srcdir)/'`src/systemd/src/basic/prioq.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libnm_systemd_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/systemd/src/libsystemd-network/libnm_systemd_core_la-sd-lldp.lo `test -f 'src/systemd/src/libsystemd-network/sd-lldp.c' || echo '$(srcdir)/'`src/systemd/src/libsystemd-network/sd-lldp.c
 
-src/systemd/src/basic/libsystemd_nm_la-process-util.lo: src/systemd/src/basic/process-util.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libsystemd_nm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/systemd/src/basic/libsystemd_nm_la-process-util.lo -MD -MP -MF src/systemd/src/basic/$(DEPDIR)/libsystemd_nm_la-process-util.Tpo -c -o src/systemd/src/basic/libsystemd_nm_la-process-util.lo `test -f 'src/systemd/src/basic/process-util.c' || echo '$(srcdir)/'`src/systemd/src/basic/process-util.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/systemd/src/basic/$(DEPDIR)/libsystemd_nm_la-process-util.Tpo src/systemd/src/basic/$(DEPDIR)/libsystemd_nm_la-process-util.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/systemd/src/basic/process-util.c' object='src/systemd/src/basic/libsystemd_nm_la-process-util.lo' libtool=yes @AMDEPBACKSLASH@
+src/systemd/src/libsystemd/sd-event/libnm_systemd_core_la-event-util.lo: src/systemd/src/libsystemd/sd-event/event-util.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libnm_systemd_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/systemd/src/libsystemd/sd-event/libnm_systemd_core_la-event-util.lo -MD -MP -MF src/systemd/src/libsystemd/sd-event/$(DEPDIR)/libnm_systemd_core_la-event-util.Tpo -c -o src/systemd/src/libsystemd/sd-event/libnm_systemd_core_la-event-util.lo `test -f 'src/systemd/src/libsystemd/sd-event/event-util.c' || echo '$(srcdir)/'`src/systemd/src/libsystemd/sd-event/event-util.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/systemd/src/libsystemd/sd-event/$(DEPDIR)/libnm_systemd_core_la-event-util.Tpo src/systemd/src/libsystemd/sd-event/$(DEPDIR)/libnm_systemd_core_la-event-util.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/systemd/src/libsystemd/sd-event/event-util.c' object='src/systemd/src/libsystemd/sd-event/libnm_systemd_core_la-event-util.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libsystemd_nm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/systemd/src/basic/libsystemd_nm_la-process-util.lo `test -f 'src/systemd/src/basic/process-util.c' || echo '$(srcdir)/'`src/systemd/src/basic/process-util.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libnm_systemd_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/systemd/src/libsystemd/sd-event/libnm_systemd_core_la-event-util.lo `test -f 'src/systemd/src/libsystemd/sd-event/event-util.c' || echo '$(srcdir)/'`src/systemd/src/libsystemd/sd-event/event-util.c
 
-src/systemd/src/basic/libsystemd_nm_la-random-util.lo: src/systemd/src/basic/random-util.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libsystemd_nm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/systemd/src/basic/libsystemd_nm_la-random-util.lo -MD -MP -MF src/systemd/src/basic/$(DEPDIR)/libsystemd_nm_la-random-util.Tpo -c -o src/systemd/src/basic/libsystemd_nm_la-random-util.lo `test -f 'src/systemd/src/basic/random-util.c' || echo '$(srcdir)/'`src/systemd/src/basic/random-util.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/systemd/src/basic/$(DEPDIR)/libsystemd_nm_la-random-util.Tpo src/systemd/src/basic/$(DEPDIR)/libsystemd_nm_la-random-util.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/systemd/src/basic/random-util.c' object='src/systemd/src/basic/libsystemd_nm_la-random-util.lo' libtool=yes @AMDEPBACKSLASH@
+src/systemd/src/libsystemd/sd-event/libnm_systemd_core_la-sd-event.lo: src/systemd/src/libsystemd/sd-event/sd-event.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libnm_systemd_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/systemd/src/libsystemd/sd-event/libnm_systemd_core_la-sd-event.lo -MD -MP -MF src/systemd/src/libsystemd/sd-event/$(DEPDIR)/libnm_systemd_core_la-sd-event.Tpo -c -o src/systemd/src/libsystemd/sd-event/libnm_systemd_core_la-sd-event.lo `test -f 'src/systemd/src/libsystemd/sd-event/sd-event.c' || echo '$(srcdir)/'`src/systemd/src/libsystemd/sd-event/sd-event.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/systemd/src/libsystemd/sd-event/$(DEPDIR)/libnm_systemd_core_la-sd-event.Tpo src/systemd/src/libsystemd/sd-event/$(DEPDIR)/libnm_systemd_core_la-sd-event.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/systemd/src/libsystemd/sd-event/sd-event.c' object='src/systemd/src/libsystemd/sd-event/libnm_systemd_core_la-sd-event.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libsystemd_nm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/systemd/src/basic/libsystemd_nm_la-random-util.lo `test -f 'src/systemd/src/basic/random-util.c' || echo '$(srcdir)/'`src/systemd/src/basic/random-util.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libnm_systemd_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/systemd/src/libsystemd/sd-event/libnm_systemd_core_la-sd-event.lo `test -f 'src/systemd/src/libsystemd/sd-event/sd-event.c' || echo '$(srcdir)/'`src/systemd/src/libsystemd/sd-event/sd-event.c
 
-src/systemd/src/basic/libsystemd_nm_la-socket-util.lo: src/systemd/src/basic/socket-util.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libsystemd_nm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/systemd/src/basic/libsystemd_nm_la-socket-util.lo -MD -MP -MF src/systemd/src/basic/$(DEPDIR)/libsystemd_nm_la-socket-util.Tpo -c -o src/systemd/src/basic/libsystemd_nm_la-socket-util.lo `test -f 'src/systemd/src/basic/socket-util.c' || echo '$(srcdir)/'`src/systemd/src/basic/socket-util.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/systemd/src/basic/$(DEPDIR)/libsystemd_nm_la-socket-util.Tpo src/systemd/src/basic/$(DEPDIR)/libsystemd_nm_la-socket-util.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/systemd/src/basic/socket-util.c' object='src/systemd/src/basic/libsystemd_nm_la-socket-util.lo' libtool=yes @AMDEPBACKSLASH@
+src/systemd/src/libsystemd/sd-id128/libnm_systemd_core_la-id128-util.lo: src/systemd/src/libsystemd/sd-id128/id128-util.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libnm_systemd_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/systemd/src/libsystemd/sd-id128/libnm_systemd_core_la-id128-util.lo -MD -MP -MF src/systemd/src/libsystemd/sd-id128/$(DEPDIR)/libnm_systemd_core_la-id128-util.Tpo -c -o src/systemd/src/libsystemd/sd-id128/libnm_systemd_core_la-id128-util.lo `test -f 'src/systemd/src/libsystemd/sd-id128/id128-util.c' || echo '$(srcdir)/'`src/systemd/src/libsystemd/sd-id128/id128-util.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/systemd/src/libsystemd/sd-id128/$(DEPDIR)/libnm_systemd_core_la-id128-util.Tpo src/systemd/src/libsystemd/sd-id128/$(DEPDIR)/libnm_systemd_core_la-id128-util.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/systemd/src/libsystemd/sd-id128/id128-util.c' object='src/systemd/src/libsystemd/sd-id128/libnm_systemd_core_la-id128-util.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libsystemd_nm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/systemd/src/basic/libsystemd_nm_la-socket-util.lo `test -f 'src/systemd/src/basic/socket-util.c' || echo '$(srcdir)/'`src/systemd/src/basic/socket-util.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libnm_systemd_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/systemd/src/libsystemd/sd-id128/libnm_systemd_core_la-id128-util.lo `test -f 'src/systemd/src/libsystemd/sd-id128/id128-util.c' || echo '$(srcdir)/'`src/systemd/src/libsystemd/sd-id128/id128-util.c
 
-src/systemd/src/basic/libsystemd_nm_la-stat-util.lo: src/systemd/src/basic/stat-util.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libsystemd_nm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/systemd/src/basic/libsystemd_nm_la-stat-util.lo -MD -MP -MF src/systemd/src/basic/$(DEPDIR)/libsystemd_nm_la-stat-util.Tpo -c -o src/systemd/src/basic/libsystemd_nm_la-stat-util.lo `test -f 'src/systemd/src/basic/stat-util.c' || echo '$(srcdir)/'`src/systemd/src/basic/stat-util.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/systemd/src/basic/$(DEPDIR)/libsystemd_nm_la-stat-util.Tpo src/systemd/src/basic/$(DEPDIR)/libsystemd_nm_la-stat-util.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/systemd/src/basic/stat-util.c' object='src/systemd/src/basic/libsystemd_nm_la-stat-util.lo' libtool=yes @AMDEPBACKSLASH@
+src/systemd/src/libsystemd/sd-id128/libnm_systemd_core_la-sd-id128.lo: src/systemd/src/libsystemd/sd-id128/sd-id128.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libnm_systemd_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/systemd/src/libsystemd/sd-id128/libnm_systemd_core_la-sd-id128.lo -MD -MP -MF src/systemd/src/libsystemd/sd-id128/$(DEPDIR)/libnm_systemd_core_la-sd-id128.Tpo -c -o src/systemd/src/libsystemd/sd-id128/libnm_systemd_core_la-sd-id128.lo `test -f 'src/systemd/src/libsystemd/sd-id128/sd-id128.c' || echo '$(srcdir)/'`src/systemd/src/libsystemd/sd-id128/sd-id128.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/systemd/src/libsystemd/sd-id128/$(DEPDIR)/libnm_systemd_core_la-sd-id128.Tpo src/systemd/src/libsystemd/sd-id128/$(DEPDIR)/libnm_systemd_core_la-sd-id128.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/systemd/src/libsystemd/sd-id128/sd-id128.c' object='src/systemd/src/libsystemd/sd-id128/libnm_systemd_core_la-sd-id128.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libsystemd_nm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/systemd/src/basic/libsystemd_nm_la-stat-util.lo `test -f 'src/systemd/src/basic/stat-util.c' || echo '$(srcdir)/'`src/systemd/src/basic/stat-util.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libnm_systemd_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/systemd/src/libsystemd/sd-id128/libnm_systemd_core_la-sd-id128.lo `test -f 'src/systemd/src/libsystemd/sd-id128/sd-id128.c' || echo '$(srcdir)/'`src/systemd/src/libsystemd/sd-id128/sd-id128.c
 
-src/systemd/src/basic/libsystemd_nm_la-string-table.lo: src/systemd/src/basic/string-table.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libsystemd_nm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/systemd/src/basic/libsystemd_nm_la-string-table.lo -MD -MP -MF src/systemd/src/basic/$(DEPDIR)/libsystemd_nm_la-string-table.Tpo -c -o src/systemd/src/basic/libsystemd_nm_la-string-table.lo `test -f 'src/systemd/src/basic/string-table.c' || echo '$(srcdir)/'`src/systemd/src/basic/string-table.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/systemd/src/basic/$(DEPDIR)/libsystemd_nm_la-string-table.Tpo src/systemd/src/basic/$(DEPDIR)/libsystemd_nm_la-string-table.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/systemd/src/basic/string-table.c' object='src/systemd/src/basic/libsystemd_nm_la-string-table.lo' libtool=yes @AMDEPBACKSLASH@
+src/systemd/src/shared/libnm_systemd_core_la-dns-domain.lo: src/systemd/src/shared/dns-domain.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libnm_systemd_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/systemd/src/shared/libnm_systemd_core_la-dns-domain.lo -MD -MP -MF src/systemd/src/shared/$(DEPDIR)/libnm_systemd_core_la-dns-domain.Tpo -c -o src/systemd/src/shared/libnm_systemd_core_la-dns-domain.lo `test -f 'src/systemd/src/shared/dns-domain.c' || echo '$(srcdir)/'`src/systemd/src/shared/dns-domain.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/systemd/src/shared/$(DEPDIR)/libnm_systemd_core_la-dns-domain.Tpo src/systemd/src/shared/$(DEPDIR)/libnm_systemd_core_la-dns-domain.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/systemd/src/shared/dns-domain.c' object='src/systemd/src/shared/libnm_systemd_core_la-dns-domain.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libsystemd_nm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/systemd/src/basic/libsystemd_nm_la-string-table.lo `test -f 'src/systemd/src/basic/string-table.c' || echo '$(srcdir)/'`src/systemd/src/basic/string-table.c
-
-src/systemd/src/basic/libsystemd_nm_la-string-util.lo: src/systemd/src/basic/string-util.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libsystemd_nm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/systemd/src/basic/libsystemd_nm_la-string-util.lo -MD -MP -MF src/systemd/src/basic/$(DEPDIR)/libsystemd_nm_la-string-util.Tpo -c -o src/systemd/src/basic/libsystemd_nm_la-string-util.lo `test -f 'src/systemd/src/basic/string-util.c' || echo '$(srcdir)/'`src/systemd/src/basic/string-util.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/systemd/src/basic/$(DEPDIR)/libsystemd_nm_la-string-util.Tpo src/systemd/src/basic/$(DEPDIR)/libsystemd_nm_la-string-util.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/systemd/src/basic/string-util.c' object='src/systemd/src/basic/libsystemd_nm_la-string-util.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libsystemd_nm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/systemd/src/basic/libsystemd_nm_la-string-util.lo `test -f 'src/systemd/src/basic/string-util.c' || echo '$(srcdir)/'`src/systemd/src/basic/string-util.c
-
-src/systemd/src/basic/libsystemd_nm_la-strv.lo: src/systemd/src/basic/strv.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libsystemd_nm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/systemd/src/basic/libsystemd_nm_la-strv.lo -MD -MP -MF src/systemd/src/basic/$(DEPDIR)/libsystemd_nm_la-strv.Tpo -c -o src/systemd/src/basic/libsystemd_nm_la-strv.lo `test -f 'src/systemd/src/basic/strv.c' || echo '$(srcdir)/'`src/systemd/src/basic/strv.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/systemd/src/basic/$(DEPDIR)/libsystemd_nm_la-strv.Tpo src/systemd/src/basic/$(DEPDIR)/libsystemd_nm_la-strv.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/systemd/src/basic/strv.c' object='src/systemd/src/basic/libsystemd_nm_la-strv.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libsystemd_nm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/systemd/src/basic/libsystemd_nm_la-strv.lo `test -f 'src/systemd/src/basic/strv.c' || echo '$(srcdir)/'`src/systemd/src/basic/strv.c
-
-src/systemd/src/basic/libsystemd_nm_la-time-util.lo: src/systemd/src/basic/time-util.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libsystemd_nm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/systemd/src/basic/libsystemd_nm_la-time-util.lo -MD -MP -MF src/systemd/src/basic/$(DEPDIR)/libsystemd_nm_la-time-util.Tpo -c -o src/systemd/src/basic/libsystemd_nm_la-time-util.lo `test -f 'src/systemd/src/basic/time-util.c' || echo '$(srcdir)/'`src/systemd/src/basic/time-util.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/systemd/src/basic/$(DEPDIR)/libsystemd_nm_la-time-util.Tpo src/systemd/src/basic/$(DEPDIR)/libsystemd_nm_la-time-util.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/systemd/src/basic/time-util.c' object='src/systemd/src/basic/libsystemd_nm_la-time-util.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libsystemd_nm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/systemd/src/basic/libsystemd_nm_la-time-util.lo `test -f 'src/systemd/src/basic/time-util.c' || echo '$(srcdir)/'`src/systemd/src/basic/time-util.c
-
-src/systemd/src/basic/libsystemd_nm_la-utf8.lo: src/systemd/src/basic/utf8.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libsystemd_nm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/systemd/src/basic/libsystemd_nm_la-utf8.lo -MD -MP -MF src/systemd/src/basic/$(DEPDIR)/libsystemd_nm_la-utf8.Tpo -c -o src/systemd/src/basic/libsystemd_nm_la-utf8.lo `test -f 'src/systemd/src/basic/utf8.c' || echo '$(srcdir)/'`src/systemd/src/basic/utf8.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/systemd/src/basic/$(DEPDIR)/libsystemd_nm_la-utf8.Tpo src/systemd/src/basic/$(DEPDIR)/libsystemd_nm_la-utf8.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/systemd/src/basic/utf8.c' object='src/systemd/src/basic/libsystemd_nm_la-utf8.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libsystemd_nm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/systemd/src/basic/libsystemd_nm_la-utf8.lo `test -f 'src/systemd/src/basic/utf8.c' || echo '$(srcdir)/'`src/systemd/src/basic/utf8.c
-
-src/systemd/src/basic/libsystemd_nm_la-util.lo: src/systemd/src/basic/util.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libsystemd_nm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/systemd/src/basic/libsystemd_nm_la-util.lo -MD -MP -MF src/systemd/src/basic/$(DEPDIR)/libsystemd_nm_la-util.Tpo -c -o src/systemd/src/basic/libsystemd_nm_la-util.lo `test -f 'src/systemd/src/basic/util.c' || echo '$(srcdir)/'`src/systemd/src/basic/util.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/systemd/src/basic/$(DEPDIR)/libsystemd_nm_la-util.Tpo src/systemd/src/basic/$(DEPDIR)/libsystemd_nm_la-util.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/systemd/src/basic/util.c' object='src/systemd/src/basic/libsystemd_nm_la-util.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libsystemd_nm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/systemd/src/basic/libsystemd_nm_la-util.lo `test -f 'src/systemd/src/basic/util.c' || echo '$(srcdir)/'`src/systemd/src/basic/util.c
-
-src/systemd/src/libsystemd-network/libsystemd_nm_la-arp-util.lo: src/systemd/src/libsystemd-network/arp-util.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libsystemd_nm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/systemd/src/libsystemd-network/libsystemd_nm_la-arp-util.lo -MD -MP -MF src/systemd/src/libsystemd-network/$(DEPDIR)/libsystemd_nm_la-arp-util.Tpo -c -o src/systemd/src/libsystemd-network/libsystemd_nm_la-arp-util.lo `test -f 'src/systemd/src/libsystemd-network/arp-util.c' || echo '$(srcdir)/'`src/systemd/src/libsystemd-network/arp-util.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/systemd/src/libsystemd-network/$(DEPDIR)/libsystemd_nm_la-arp-util.Tpo src/systemd/src/libsystemd-network/$(DEPDIR)/libsystemd_nm_la-arp-util.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/systemd/src/libsystemd-network/arp-util.c' object='src/systemd/src/libsystemd-network/libsystemd_nm_la-arp-util.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libsystemd_nm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/systemd/src/libsystemd-network/libsystemd_nm_la-arp-util.lo `test -f 'src/systemd/src/libsystemd-network/arp-util.c' || echo '$(srcdir)/'`src/systemd/src/libsystemd-network/arp-util.c
-
-src/systemd/src/libsystemd-network/libsystemd_nm_la-dhcp-identifier.lo: src/systemd/src/libsystemd-network/dhcp-identifier.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libsystemd_nm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/systemd/src/libsystemd-network/libsystemd_nm_la-dhcp-identifier.lo -MD -MP -MF src/systemd/src/libsystemd-network/$(DEPDIR)/libsystemd_nm_la-dhcp-identifier.Tpo -c -o src/systemd/src/libsystemd-network/libsystemd_nm_la-dhcp-identifier.lo `test -f 'src/systemd/src/libsystemd-network/dhcp-identifier.c' || echo '$(srcdir)/'`src/systemd/src/libsystemd-network/dhcp-identifier.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/systemd/src/libsystemd-network/$(DEPDIR)/libsystemd_nm_la-dhcp-identifier.Tpo src/systemd/src/libsystemd-network/$(DEPDIR)/libsystemd_nm_la-dhcp-identifier.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/systemd/src/libsystemd-network/dhcp-identifier.c' object='src/systemd/src/libsystemd-network/libsystemd_nm_la-dhcp-identifier.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libsystemd_nm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/systemd/src/libsystemd-network/libsystemd_nm_la-dhcp-identifier.lo `test -f 'src/systemd/src/libsystemd-network/dhcp-identifier.c' || echo '$(srcdir)/'`src/systemd/src/libsystemd-network/dhcp-identifier.c
-
-src/systemd/src/libsystemd-network/libsystemd_nm_la-dhcp-network.lo: src/systemd/src/libsystemd-network/dhcp-network.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libsystemd_nm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/systemd/src/libsystemd-network/libsystemd_nm_la-dhcp-network.lo -MD -MP -MF src/systemd/src/libsystemd-network/$(DEPDIR)/libsystemd_nm_la-dhcp-network.Tpo -c -o src/systemd/src/libsystemd-network/libsystemd_nm_la-dhcp-network.lo `test -f 'src/systemd/src/libsystemd-network/dhcp-network.c' || echo '$(srcdir)/'`src/systemd/src/libsystemd-network/dhcp-network.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/systemd/src/libsystemd-network/$(DEPDIR)/libsystemd_nm_la-dhcp-network.Tpo src/systemd/src/libsystemd-network/$(DEPDIR)/libsystemd_nm_la-dhcp-network.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/systemd/src/libsystemd-network/dhcp-network.c' object='src/systemd/src/libsystemd-network/libsystemd_nm_la-dhcp-network.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libsystemd_nm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/systemd/src/libsystemd-network/libsystemd_nm_la-dhcp-network.lo `test -f 'src/systemd/src/libsystemd-network/dhcp-network.c' || echo '$(srcdir)/'`src/systemd/src/libsystemd-network/dhcp-network.c
-
-src/systemd/src/libsystemd-network/libsystemd_nm_la-dhcp-option.lo: src/systemd/src/libsystemd-network/dhcp-option.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libsystemd_nm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/systemd/src/libsystemd-network/libsystemd_nm_la-dhcp-option.lo -MD -MP -MF src/systemd/src/libsystemd-network/$(DEPDIR)/libsystemd_nm_la-dhcp-option.Tpo -c -o src/systemd/src/libsystemd-network/libsystemd_nm_la-dhcp-option.lo `test -f 'src/systemd/src/libsystemd-network/dhcp-option.c' || echo '$(srcdir)/'`src/systemd/src/libsystemd-network/dhcp-option.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/systemd/src/libsystemd-network/$(DEPDIR)/libsystemd_nm_la-dhcp-option.Tpo src/systemd/src/libsystemd-network/$(DEPDIR)/libsystemd_nm_la-dhcp-option.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/systemd/src/libsystemd-network/dhcp-option.c' object='src/systemd/src/libsystemd-network/libsystemd_nm_la-dhcp-option.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libsystemd_nm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/systemd/src/libsystemd-network/libsystemd_nm_la-dhcp-option.lo `test -f 'src/systemd/src/libsystemd-network/dhcp-option.c' || echo '$(srcdir)/'`src/systemd/src/libsystemd-network/dhcp-option.c
-
-src/systemd/src/libsystemd-network/libsystemd_nm_la-dhcp-packet.lo: src/systemd/src/libsystemd-network/dhcp-packet.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libsystemd_nm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/systemd/src/libsystemd-network/libsystemd_nm_la-dhcp-packet.lo -MD -MP -MF src/systemd/src/libsystemd-network/$(DEPDIR)/libsystemd_nm_la-dhcp-packet.Tpo -c -o src/systemd/src/libsystemd-network/libsystemd_nm_la-dhcp-packet.lo `test -f 'src/systemd/src/libsystemd-network/dhcp-packet.c' || echo '$(srcdir)/'`src/systemd/src/libsystemd-network/dhcp-packet.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/systemd/src/libsystemd-network/$(DEPDIR)/libsystemd_nm_la-dhcp-packet.Tpo src/systemd/src/libsystemd-network/$(DEPDIR)/libsystemd_nm_la-dhcp-packet.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/systemd/src/libsystemd-network/dhcp-packet.c' object='src/systemd/src/libsystemd-network/libsystemd_nm_la-dhcp-packet.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libsystemd_nm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/systemd/src/libsystemd-network/libsystemd_nm_la-dhcp-packet.lo `test -f 'src/systemd/src/libsystemd-network/dhcp-packet.c' || echo '$(srcdir)/'`src/systemd/src/libsystemd-network/dhcp-packet.c
-
-src/systemd/src/libsystemd-network/libsystemd_nm_la-dhcp6-network.lo: src/systemd/src/libsystemd-network/dhcp6-network.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libsystemd_nm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/systemd/src/libsystemd-network/libsystemd_nm_la-dhcp6-network.lo -MD -MP -MF src/systemd/src/libsystemd-network/$(DEPDIR)/libsystemd_nm_la-dhcp6-network.Tpo -c -o src/systemd/src/libsystemd-network/libsystemd_nm_la-dhcp6-network.lo `test -f 'src/systemd/src/libsystemd-network/dhcp6-network.c' || echo '$(srcdir)/'`src/systemd/src/libsystemd-network/dhcp6-network.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/systemd/src/libsystemd-network/$(DEPDIR)/libsystemd_nm_la-dhcp6-network.Tpo src/systemd/src/libsystemd-network/$(DEPDIR)/libsystemd_nm_la-dhcp6-network.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/systemd/src/libsystemd-network/dhcp6-network.c' object='src/systemd/src/libsystemd-network/libsystemd_nm_la-dhcp6-network.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libsystemd_nm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/systemd/src/libsystemd-network/libsystemd_nm_la-dhcp6-network.lo `test -f 'src/systemd/src/libsystemd-network/dhcp6-network.c' || echo '$(srcdir)/'`src/systemd/src/libsystemd-network/dhcp6-network.c
-
-src/systemd/src/libsystemd-network/libsystemd_nm_la-dhcp6-option.lo: src/systemd/src/libsystemd-network/dhcp6-option.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libsystemd_nm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/systemd/src/libsystemd-network/libsystemd_nm_la-dhcp6-option.lo -MD -MP -MF src/systemd/src/libsystemd-network/$(DEPDIR)/libsystemd_nm_la-dhcp6-option.Tpo -c -o src/systemd/src/libsystemd-network/libsystemd_nm_la-dhcp6-option.lo `test -f 'src/systemd/src/libsystemd-network/dhcp6-option.c' || echo '$(srcdir)/'`src/systemd/src/libsystemd-network/dhcp6-option.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/systemd/src/libsystemd-network/$(DEPDIR)/libsystemd_nm_la-dhcp6-option.Tpo src/systemd/src/libsystemd-network/$(DEPDIR)/libsystemd_nm_la-dhcp6-option.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/systemd/src/libsystemd-network/dhcp6-option.c' object='src/systemd/src/libsystemd-network/libsystemd_nm_la-dhcp6-option.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libsystemd_nm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/systemd/src/libsystemd-network/libsystemd_nm_la-dhcp6-option.lo `test -f 'src/systemd/src/libsystemd-network/dhcp6-option.c' || echo '$(srcdir)/'`src/systemd/src/libsystemd-network/dhcp6-option.c
-
-src/systemd/src/libsystemd-network/libsystemd_nm_la-lldp-neighbor.lo: src/systemd/src/libsystemd-network/lldp-neighbor.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libsystemd_nm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/systemd/src/libsystemd-network/libsystemd_nm_la-lldp-neighbor.lo -MD -MP -MF src/systemd/src/libsystemd-network/$(DEPDIR)/libsystemd_nm_la-lldp-neighbor.Tpo -c -o src/systemd/src/libsystemd-network/libsystemd_nm_la-lldp-neighbor.lo `test -f 'src/systemd/src/libsystemd-network/lldp-neighbor.c' || echo '$(srcdir)/'`src/systemd/src/libsystemd-network/lldp-neighbor.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/systemd/src/libsystemd-network/$(DEPDIR)/libsystemd_nm_la-lldp-neighbor.Tpo src/systemd/src/libsystemd-network/$(DEPDIR)/libsystemd_nm_la-lldp-neighbor.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/systemd/src/libsystemd-network/lldp-neighbor.c' object='src/systemd/src/libsystemd-network/libsystemd_nm_la-lldp-neighbor.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libsystemd_nm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/systemd/src/libsystemd-network/libsystemd_nm_la-lldp-neighbor.lo `test -f 'src/systemd/src/libsystemd-network/lldp-neighbor.c' || echo '$(srcdir)/'`src/systemd/src/libsystemd-network/lldp-neighbor.c
-
-src/systemd/src/libsystemd-network/libsystemd_nm_la-lldp-network.lo: src/systemd/src/libsystemd-network/lldp-network.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libsystemd_nm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/systemd/src/libsystemd-network/libsystemd_nm_la-lldp-network.lo -MD -MP -MF src/systemd/src/libsystemd-network/$(DEPDIR)/libsystemd_nm_la-lldp-network.Tpo -c -o src/systemd/src/libsystemd-network/libsystemd_nm_la-lldp-network.lo `test -f 'src/systemd/src/libsystemd-network/lldp-network.c' || echo '$(srcdir)/'`src/systemd/src/libsystemd-network/lldp-network.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/systemd/src/libsystemd-network/$(DEPDIR)/libsystemd_nm_la-lldp-network.Tpo src/systemd/src/libsystemd-network/$(DEPDIR)/libsystemd_nm_la-lldp-network.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/systemd/src/libsystemd-network/lldp-network.c' object='src/systemd/src/libsystemd-network/libsystemd_nm_la-lldp-network.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libsystemd_nm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/systemd/src/libsystemd-network/libsystemd_nm_la-lldp-network.lo `test -f 'src/systemd/src/libsystemd-network/lldp-network.c' || echo '$(srcdir)/'`src/systemd/src/libsystemd-network/lldp-network.c
-
-src/systemd/src/libsystemd-network/libsystemd_nm_la-network-internal.lo: src/systemd/src/libsystemd-network/network-internal.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libsystemd_nm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/systemd/src/libsystemd-network/libsystemd_nm_la-network-internal.lo -MD -MP -MF src/systemd/src/libsystemd-network/$(DEPDIR)/libsystemd_nm_la-network-internal.Tpo -c -o src/systemd/src/libsystemd-network/libsystemd_nm_la-network-internal.lo `test -f 'src/systemd/src/libsystemd-network/network-internal.c' || echo '$(srcdir)/'`src/systemd/src/libsystemd-network/network-internal.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/systemd/src/libsystemd-network/$(DEPDIR)/libsystemd_nm_la-network-internal.Tpo src/systemd/src/libsystemd-network/$(DEPDIR)/libsystemd_nm_la-network-internal.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/systemd/src/libsystemd-network/network-internal.c' object='src/systemd/src/libsystemd-network/libsystemd_nm_la-network-internal.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libsystemd_nm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/systemd/src/libsystemd-network/libsystemd_nm_la-network-internal.lo `test -f 'src/systemd/src/libsystemd-network/network-internal.c' || echo '$(srcdir)/'`src/systemd/src/libsystemd-network/network-internal.c
-
-src/systemd/src/libsystemd-network/libsystemd_nm_la-sd-dhcp-client.lo: src/systemd/src/libsystemd-network/sd-dhcp-client.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libsystemd_nm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/systemd/src/libsystemd-network/libsystemd_nm_la-sd-dhcp-client.lo -MD -MP -MF src/systemd/src/libsystemd-network/$(DEPDIR)/libsystemd_nm_la-sd-dhcp-client.Tpo -c -o src/systemd/src/libsystemd-network/libsystemd_nm_la-sd-dhcp-client.lo `test -f 'src/systemd/src/libsystemd-network/sd-dhcp-client.c' || echo '$(srcdir)/'`src/systemd/src/libsystemd-network/sd-dhcp-client.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/systemd/src/libsystemd-network/$(DEPDIR)/libsystemd_nm_la-sd-dhcp-client.Tpo src/systemd/src/libsystemd-network/$(DEPDIR)/libsystemd_nm_la-sd-dhcp-client.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/systemd/src/libsystemd-network/sd-dhcp-client.c' object='src/systemd/src/libsystemd-network/libsystemd_nm_la-sd-dhcp-client.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libsystemd_nm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/systemd/src/libsystemd-network/libsystemd_nm_la-sd-dhcp-client.lo `test -f 'src/systemd/src/libsystemd-network/sd-dhcp-client.c' || echo '$(srcdir)/'`src/systemd/src/libsystemd-network/sd-dhcp-client.c
-
-src/systemd/src/libsystemd-network/libsystemd_nm_la-sd-dhcp-lease.lo: src/systemd/src/libsystemd-network/sd-dhcp-lease.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libsystemd_nm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/systemd/src/libsystemd-network/libsystemd_nm_la-sd-dhcp-lease.lo -MD -MP -MF src/systemd/src/libsystemd-network/$(DEPDIR)/libsystemd_nm_la-sd-dhcp-lease.Tpo -c -o src/systemd/src/libsystemd-network/libsystemd_nm_la-sd-dhcp-lease.lo `test -f 'src/systemd/src/libsystemd-network/sd-dhcp-lease.c' || echo '$(srcdir)/'`src/systemd/src/libsystemd-network/sd-dhcp-lease.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/systemd/src/libsystemd-network/$(DEPDIR)/libsystemd_nm_la-sd-dhcp-lease.Tpo src/systemd/src/libsystemd-network/$(DEPDIR)/libsystemd_nm_la-sd-dhcp-lease.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/systemd/src/libsystemd-network/sd-dhcp-lease.c' object='src/systemd/src/libsystemd-network/libsystemd_nm_la-sd-dhcp-lease.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libsystemd_nm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/systemd/src/libsystemd-network/libsystemd_nm_la-sd-dhcp-lease.lo `test -f 'src/systemd/src/libsystemd-network/sd-dhcp-lease.c' || echo '$(srcdir)/'`src/systemd/src/libsystemd-network/sd-dhcp-lease.c
-
-src/systemd/src/libsystemd-network/libsystemd_nm_la-sd-dhcp6-client.lo: src/systemd/src/libsystemd-network/sd-dhcp6-client.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libsystemd_nm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/systemd/src/libsystemd-network/libsystemd_nm_la-sd-dhcp6-client.lo -MD -MP -MF src/systemd/src/libsystemd-network/$(DEPDIR)/libsystemd_nm_la-sd-dhcp6-client.Tpo -c -o src/systemd/src/libsystemd-network/libsystemd_nm_la-sd-dhcp6-client.lo `test -f 'src/systemd/src/libsystemd-network/sd-dhcp6-client.c' || echo '$(srcdir)/'`src/systemd/src/libsystemd-network/sd-dhcp6-client.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/systemd/src/libsystemd-network/$(DEPDIR)/libsystemd_nm_la-sd-dhcp6-client.Tpo src/systemd/src/libsystemd-network/$(DEPDIR)/libsystemd_nm_la-sd-dhcp6-client.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/systemd/src/libsystemd-network/sd-dhcp6-client.c' object='src/systemd/src/libsystemd-network/libsystemd_nm_la-sd-dhcp6-client.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libsystemd_nm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/systemd/src/libsystemd-network/libsystemd_nm_la-sd-dhcp6-client.lo `test -f 'src/systemd/src/libsystemd-network/sd-dhcp6-client.c' || echo '$(srcdir)/'`src/systemd/src/libsystemd-network/sd-dhcp6-client.c
-
-src/systemd/src/libsystemd-network/libsystemd_nm_la-sd-dhcp6-lease.lo: src/systemd/src/libsystemd-network/sd-dhcp6-lease.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libsystemd_nm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/systemd/src/libsystemd-network/libsystemd_nm_la-sd-dhcp6-lease.lo -MD -MP -MF src/systemd/src/libsystemd-network/$(DEPDIR)/libsystemd_nm_la-sd-dhcp6-lease.Tpo -c -o src/systemd/src/libsystemd-network/libsystemd_nm_la-sd-dhcp6-lease.lo `test -f 'src/systemd/src/libsystemd-network/sd-dhcp6-lease.c' || echo '$(srcdir)/'`src/systemd/src/libsystemd-network/sd-dhcp6-lease.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/systemd/src/libsystemd-network/$(DEPDIR)/libsystemd_nm_la-sd-dhcp6-lease.Tpo src/systemd/src/libsystemd-network/$(DEPDIR)/libsystemd_nm_la-sd-dhcp6-lease.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/systemd/src/libsystemd-network/sd-dhcp6-lease.c' object='src/systemd/src/libsystemd-network/libsystemd_nm_la-sd-dhcp6-lease.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libsystemd_nm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/systemd/src/libsystemd-network/libsystemd_nm_la-sd-dhcp6-lease.lo `test -f 'src/systemd/src/libsystemd-network/sd-dhcp6-lease.c' || echo '$(srcdir)/'`src/systemd/src/libsystemd-network/sd-dhcp6-lease.c
-
-src/systemd/src/libsystemd-network/libsystemd_nm_la-sd-ipv4acd.lo: src/systemd/src/libsystemd-network/sd-ipv4acd.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libsystemd_nm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/systemd/src/libsystemd-network/libsystemd_nm_la-sd-ipv4acd.lo -MD -MP -MF src/systemd/src/libsystemd-network/$(DEPDIR)/libsystemd_nm_la-sd-ipv4acd.Tpo -c -o src/systemd/src/libsystemd-network/libsystemd_nm_la-sd-ipv4acd.lo `test -f 'src/systemd/src/libsystemd-network/sd-ipv4acd.c' || echo '$(srcdir)/'`src/systemd/src/libsystemd-network/sd-ipv4acd.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/systemd/src/libsystemd-network/$(DEPDIR)/libsystemd_nm_la-sd-ipv4acd.Tpo src/systemd/src/libsystemd-network/$(DEPDIR)/libsystemd_nm_la-sd-ipv4acd.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/systemd/src/libsystemd-network/sd-ipv4acd.c' object='src/systemd/src/libsystemd-network/libsystemd_nm_la-sd-ipv4acd.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libsystemd_nm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/systemd/src/libsystemd-network/libsystemd_nm_la-sd-ipv4acd.lo `test -f 'src/systemd/src/libsystemd-network/sd-ipv4acd.c' || echo '$(srcdir)/'`src/systemd/src/libsystemd-network/sd-ipv4acd.c
-
-src/systemd/src/libsystemd-network/libsystemd_nm_la-sd-ipv4ll.lo: src/systemd/src/libsystemd-network/sd-ipv4ll.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libsystemd_nm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/systemd/src/libsystemd-network/libsystemd_nm_la-sd-ipv4ll.lo -MD -MP -MF src/systemd/src/libsystemd-network/$(DEPDIR)/libsystemd_nm_la-sd-ipv4ll.Tpo -c -o src/systemd/src/libsystemd-network/libsystemd_nm_la-sd-ipv4ll.lo `test -f 'src/systemd/src/libsystemd-network/sd-ipv4ll.c' || echo '$(srcdir)/'`src/systemd/src/libsystemd-network/sd-ipv4ll.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/systemd/src/libsystemd-network/$(DEPDIR)/libsystemd_nm_la-sd-ipv4ll.Tpo src/systemd/src/libsystemd-network/$(DEPDIR)/libsystemd_nm_la-sd-ipv4ll.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/systemd/src/libsystemd-network/sd-ipv4ll.c' object='src/systemd/src/libsystemd-network/libsystemd_nm_la-sd-ipv4ll.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libsystemd_nm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/systemd/src/libsystemd-network/libsystemd_nm_la-sd-ipv4ll.lo `test -f 'src/systemd/src/libsystemd-network/sd-ipv4ll.c' || echo '$(srcdir)/'`src/systemd/src/libsystemd-network/sd-ipv4ll.c
-
-src/systemd/src/libsystemd-network/libsystemd_nm_la-sd-lldp.lo: src/systemd/src/libsystemd-network/sd-lldp.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libsystemd_nm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/systemd/src/libsystemd-network/libsystemd_nm_la-sd-lldp.lo -MD -MP -MF src/systemd/src/libsystemd-network/$(DEPDIR)/libsystemd_nm_la-sd-lldp.Tpo -c -o src/systemd/src/libsystemd-network/libsystemd_nm_la-sd-lldp.lo `test -f 'src/systemd/src/libsystemd-network/sd-lldp.c' || echo '$(srcdir)/'`src/systemd/src/libsystemd-network/sd-lldp.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/systemd/src/libsystemd-network/$(DEPDIR)/libsystemd_nm_la-sd-lldp.Tpo src/systemd/src/libsystemd-network/$(DEPDIR)/libsystemd_nm_la-sd-lldp.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/systemd/src/libsystemd-network/sd-lldp.c' object='src/systemd/src/libsystemd-network/libsystemd_nm_la-sd-lldp.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libsystemd_nm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/systemd/src/libsystemd-network/libsystemd_nm_la-sd-lldp.lo `test -f 'src/systemd/src/libsystemd-network/sd-lldp.c' || echo '$(srcdir)/'`src/systemd/src/libsystemd-network/sd-lldp.c
-
-src/systemd/src/libsystemd/sd-event/libsystemd_nm_la-sd-event.lo: src/systemd/src/libsystemd/sd-event/sd-event.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libsystemd_nm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/systemd/src/libsystemd/sd-event/libsystemd_nm_la-sd-event.lo -MD -MP -MF src/systemd/src/libsystemd/sd-event/$(DEPDIR)/libsystemd_nm_la-sd-event.Tpo -c -o src/systemd/src/libsystemd/sd-event/libsystemd_nm_la-sd-event.lo `test -f 'src/systemd/src/libsystemd/sd-event/sd-event.c' || echo '$(srcdir)/'`src/systemd/src/libsystemd/sd-event/sd-event.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/systemd/src/libsystemd/sd-event/$(DEPDIR)/libsystemd_nm_la-sd-event.Tpo src/systemd/src/libsystemd/sd-event/$(DEPDIR)/libsystemd_nm_la-sd-event.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/systemd/src/libsystemd/sd-event/sd-event.c' object='src/systemd/src/libsystemd/sd-event/libsystemd_nm_la-sd-event.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libsystemd_nm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/systemd/src/libsystemd/sd-event/libsystemd_nm_la-sd-event.lo `test -f 'src/systemd/src/libsystemd/sd-event/sd-event.c' || echo '$(srcdir)/'`src/systemd/src/libsystemd/sd-event/sd-event.c
-
-src/systemd/src/libsystemd/sd-id128/libsystemd_nm_la-id128-util.lo: src/systemd/src/libsystemd/sd-id128/id128-util.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libsystemd_nm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/systemd/src/libsystemd/sd-id128/libsystemd_nm_la-id128-util.lo -MD -MP -MF src/systemd/src/libsystemd/sd-id128/$(DEPDIR)/libsystemd_nm_la-id128-util.Tpo -c -o src/systemd/src/libsystemd/sd-id128/libsystemd_nm_la-id128-util.lo `test -f 'src/systemd/src/libsystemd/sd-id128/id128-util.c' || echo '$(srcdir)/'`src/systemd/src/libsystemd/sd-id128/id128-util.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/systemd/src/libsystemd/sd-id128/$(DEPDIR)/libsystemd_nm_la-id128-util.Tpo src/systemd/src/libsystemd/sd-id128/$(DEPDIR)/libsystemd_nm_la-id128-util.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/systemd/src/libsystemd/sd-id128/id128-util.c' object='src/systemd/src/libsystemd/sd-id128/libsystemd_nm_la-id128-util.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libsystemd_nm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/systemd/src/libsystemd/sd-id128/libsystemd_nm_la-id128-util.lo `test -f 'src/systemd/src/libsystemd/sd-id128/id128-util.c' || echo '$(srcdir)/'`src/systemd/src/libsystemd/sd-id128/id128-util.c
-
-src/systemd/src/libsystemd/sd-id128/libsystemd_nm_la-sd-id128.lo: src/systemd/src/libsystemd/sd-id128/sd-id128.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libsystemd_nm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/systemd/src/libsystemd/sd-id128/libsystemd_nm_la-sd-id128.lo -MD -MP -MF src/systemd/src/libsystemd/sd-id128/$(DEPDIR)/libsystemd_nm_la-sd-id128.Tpo -c -o src/systemd/src/libsystemd/sd-id128/libsystemd_nm_la-sd-id128.lo `test -f 'src/systemd/src/libsystemd/sd-id128/sd-id128.c' || echo '$(srcdir)/'`src/systemd/src/libsystemd/sd-id128/sd-id128.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/systemd/src/libsystemd/sd-id128/$(DEPDIR)/libsystemd_nm_la-sd-id128.Tpo src/systemd/src/libsystemd/sd-id128/$(DEPDIR)/libsystemd_nm_la-sd-id128.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/systemd/src/libsystemd/sd-id128/sd-id128.c' object='src/systemd/src/libsystemd/sd-id128/libsystemd_nm_la-sd-id128.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libsystemd_nm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/systemd/src/libsystemd/sd-id128/libsystemd_nm_la-sd-id128.lo `test -f 'src/systemd/src/libsystemd/sd-id128/sd-id128.c' || echo '$(srcdir)/'`src/systemd/src/libsystemd/sd-id128/sd-id128.c
-
-src/systemd/src/shared/libsystemd_nm_la-dns-domain.lo: src/systemd/src/shared/dns-domain.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libsystemd_nm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/systemd/src/shared/libsystemd_nm_la-dns-domain.lo -MD -MP -MF src/systemd/src/shared/$(DEPDIR)/libsystemd_nm_la-dns-domain.Tpo -c -o src/systemd/src/shared/libsystemd_nm_la-dns-domain.lo `test -f 'src/systemd/src/shared/dns-domain.c' || echo '$(srcdir)/'`src/systemd/src/shared/dns-domain.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/systemd/src/shared/$(DEPDIR)/libsystemd_nm_la-dns-domain.Tpo src/systemd/src/shared/$(DEPDIR)/libsystemd_nm_la-dns-domain.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/systemd/src/shared/dns-domain.c' object='src/systemd/src/shared/libsystemd_nm_la-dns-domain.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libsystemd_nm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/systemd/src/shared/libsystemd_nm_la-dns-domain.lo `test -f 'src/systemd/src/shared/dns-domain.c' || echo '$(srcdir)/'`src/systemd/src/shared/dns-domain.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libnm_systemd_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/systemd/src/shared/libnm_systemd_core_la-dns-domain.lo `test -f 'src/systemd/src/shared/dns-domain.c' || echo '$(srcdir)/'`src/systemd/src/shared/dns-domain.c
 
 src/ppp/libnm_ppp_plugin_la-nm-ppp-manager.lo: src/ppp/nm-ppp-manager.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_ppp_libnm_ppp_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/ppp/libnm_ppp_plugin_la-nm-ppp-manager.lo -MD -MP -MF src/ppp/$(DEPDIR)/libnm_ppp_plugin_la-nm-ppp-manager.Tpo -c -o src/ppp/libnm_ppp_plugin_la-nm-ppp-manager.lo `test -f 'src/ppp/nm-ppp-manager.c' || echo '$(srcdir)/'`src/ppp/nm-ppp-manager.c
@@ -16398,6 +16927,20 @@ libnm/tests/test_secret_agent-test-secret-agent.obj: libnm/tests/test-secret-age
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_tests_test_secret_agent_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm/tests/test_secret_agent-test-secret-agent.obj `if test -f 'libnm/tests/test-secret-agent.c'; then $(CYGPATH_W) 'libnm/tests/test-secret-agent.c'; else $(CYGPATH_W) '$(srcdir)/libnm/tests/test-secret-agent.c'; fi`
 
+shared/nm-utils/tests/test_shared_general-test-shared-general.o: shared/nm-utils/tests/test-shared-general.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shared_nm_utils_tests_test_shared_general_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT shared/nm-utils/tests/test_shared_general-test-shared-general.o -MD -MP -MF shared/nm-utils/tests/$(DEPDIR)/test_shared_general-test-shared-general.Tpo -c -o shared/nm-utils/tests/test_shared_general-test-shared-general.o `test -f 'shared/nm-utils/tests/test-shared-general.c' || echo '$(srcdir)/'`shared/nm-utils/tests/test-shared-general.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) shared/nm-utils/tests/$(DEPDIR)/test_shared_general-test-shared-general.Tpo shared/nm-utils/tests/$(DEPDIR)/test_shared_general-test-shared-general.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='shared/nm-utils/tests/test-shared-general.c' object='shared/nm-utils/tests/test_shared_general-test-shared-general.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shared_nm_utils_tests_test_shared_general_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o shared/nm-utils/tests/test_shared_general-test-shared-general.o `test -f 'shared/nm-utils/tests/test-shared-general.c' || echo '$(srcdir)/'`shared/nm-utils/tests/test-shared-general.c
+
+shared/nm-utils/tests/test_shared_general-test-shared-general.obj: shared/nm-utils/tests/test-shared-general.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shared_nm_utils_tests_test_shared_general_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT shared/nm-utils/tests/test_shared_general-test-shared-general.obj -MD -MP -MF shared/nm-utils/tests/$(DEPDIR)/test_shared_general-test-shared-general.Tpo -c -o shared/nm-utils/tests/test_shared_general-test-shared-general.obj `if test -f 'shared/nm-utils/tests/test-shared-general.c'; then $(CYGPATH_W) 'shared/nm-utils/tests/test-shared-general.c'; else $(CYGPATH_W) '$(srcdir)/shared/nm-utils/tests/test-shared-general.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) shared/nm-utils/tests/$(DEPDIR)/test_shared_general-test-shared-general.Tpo shared/nm-utils/tests/$(DEPDIR)/test_shared_general-test-shared-general.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='shared/nm-utils/tests/test-shared-general.c' object='shared/nm-utils/tests/test_shared_general-test-shared-general.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shared_nm_utils_tests_test_shared_general_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o shared/nm-utils/tests/test_shared_general-test-shared-general.obj `if test -f 'shared/nm-utils/tests/test-shared-general.c'; then $(CYGPATH_W) 'shared/nm-utils/tests/test-shared-general.c'; else $(CYGPATH_W) '$(srcdir)/shared/nm-utils/tests/test-shared-general.c'; fi`
+
 src/NetworkManager-main.o: src/main.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_NetworkManager_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/NetworkManager-main.o -MD -MP -MF src/$(DEPDIR)/NetworkManager-main.Tpo -c -o src/NetworkManager-main.o `test -f 'src/main.c' || echo '$(srcdir)/'`src/main.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/NetworkManager-main.Tpo src/$(DEPDIR)/NetworkManager-main.Po
@@ -17091,9 +17634,14 @@ clean-libtool:
 	-rm -rf libnm/fake-typelib/.libs libnm/fake-typelib/_libs
 	-rm -rf libnm/tests/.libs libnm/tests/_libs
 	-rm -rf shared/.libs shared/_libs
+	-rm -rf shared/c-rbtree/src/.libs shared/c-rbtree/src/_libs
 	-rm -rf shared/c-siphash/src/.libs shared/c-siphash/src/_libs
 	-rm -rf shared/n-acd/src/.libs shared/n-acd/src/_libs
+	-rm -rf shared/n-acd/src/util/.libs shared/n-acd/src/util/_libs
 	-rm -rf shared/nm-utils/.libs shared/nm-utils/_libs
+	-rm -rf shared/nm-utils/tests/.libs shared/nm-utils/tests/_libs
+	-rm -rf shared/systemd/.libs shared/systemd/_libs
+	-rm -rf shared/systemd/src/basic/.libs shared/systemd/src/basic/_libs
 	-rm -rf src/.libs src/_libs
 	-rm -rf src/devices/.libs src/devices/_libs
 	-rm -rf src/devices/adsl/.libs src/devices/adsl/_libs
@@ -17130,8 +17678,7 @@ clean-libtool:
 	-rm -rf src/supplicant/.libs src/supplicant/_libs
 	-rm -rf src/supplicant/tests/.libs src/supplicant/tests/_libs
 	-rm -rf src/systemd/.libs src/systemd/_libs
-	-rm -rf src/systemd/sd-adapt/.libs src/systemd/sd-adapt/_libs
-	-rm -rf src/systemd/src/basic/.libs src/systemd/src/basic/_libs
+	-rm -rf src/systemd/sd-adapt-core/.libs src/systemd/sd-adapt-core/_libs
 	-rm -rf src/systemd/src/libsystemd-network/.libs src/systemd/src/libsystemd-network/_libs
 	-rm -rf src/systemd/src/libsystemd/sd-event/.libs src/systemd/src/libsystemd/sd-event/_libs
 	-rm -rf src/systemd/src/libsystemd/sd-id128/.libs src/systemd/src/libsystemd/sd-id128/_libs
@@ -18021,6 +18568,13 @@ recheck: all $(check_PROGRAMS) $(check_LTLIBRARIES)
 	        am__force_recheck=am--force-recheck \
 	        TEST_LOGS="$$log_list"; \
 	exit $$?
+shared/nm-utils/tests/test-shared-general.log: shared/nm-utils/tests/test-shared-general$(EXEEXT)
+	@p='shared/nm-utils/tests/test-shared-general$(EXEEXT)'; \
+	b='shared/nm-utils/tests/test-shared-general'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 libnm-core/tests/test-compare.log: libnm-core/tests/test-compare$(EXEEXT)
 	@p='libnm-core/tests/test-compare$(EXEEXT)'; \
 	b='libnm-core/tests/test-compare'; \
@@ -18687,12 +19241,22 @@ distclean-generic:
 	-rm -f libnm/tests/$(am__dirstamp)
 	-rm -f shared/$(DEPDIR)/$(am__dirstamp)
 	-rm -f shared/$(am__dirstamp)
+	-rm -f shared/c-rbtree/src/$(DEPDIR)/$(am__dirstamp)
+	-rm -f shared/c-rbtree/src/$(am__dirstamp)
 	-rm -f shared/c-siphash/src/$(DEPDIR)/$(am__dirstamp)
 	-rm -f shared/c-siphash/src/$(am__dirstamp)
 	-rm -f shared/n-acd/src/$(DEPDIR)/$(am__dirstamp)
 	-rm -f shared/n-acd/src/$(am__dirstamp)
+	-rm -f shared/n-acd/src/util/$(DEPDIR)/$(am__dirstamp)
+	-rm -f shared/n-acd/src/util/$(am__dirstamp)
 	-rm -f shared/nm-utils/$(DEPDIR)/$(am__dirstamp)
 	-rm -f shared/nm-utils/$(am__dirstamp)
+	-rm -f shared/nm-utils/tests/$(DEPDIR)/$(am__dirstamp)
+	-rm -f shared/nm-utils/tests/$(am__dirstamp)
+	-rm -f shared/systemd/$(DEPDIR)/$(am__dirstamp)
+	-rm -f shared/systemd/$(am__dirstamp)
+	-rm -f shared/systemd/src/basic/$(DEPDIR)/$(am__dirstamp)
+	-rm -f shared/systemd/src/basic/$(am__dirstamp)
 	-rm -f src/$(DEPDIR)/$(am__dirstamp)
 	-rm -f src/$(am__dirstamp)
 	-rm -f src/devices/$(DEPDIR)/$(am__dirstamp)
@@ -18765,10 +19329,8 @@ distclean-generic:
 	-rm -f src/supplicant/tests/$(am__dirstamp)
 	-rm -f src/systemd/$(DEPDIR)/$(am__dirstamp)
 	-rm -f src/systemd/$(am__dirstamp)
-	-rm -f src/systemd/sd-adapt/$(DEPDIR)/$(am__dirstamp)
-	-rm -f src/systemd/sd-adapt/$(am__dirstamp)
-	-rm -f src/systemd/src/basic/$(DEPDIR)/$(am__dirstamp)
-	-rm -f src/systemd/src/basic/$(am__dirstamp)
+	-rm -f src/systemd/sd-adapt-core/$(DEPDIR)/$(am__dirstamp)
+	-rm -f src/systemd/sd-adapt-core/$(am__dirstamp)
 	-rm -f src/systemd/src/libsystemd-network/$(DEPDIR)/$(am__dirstamp)
 	-rm -f src/systemd/src/libsystemd-network/$(am__dirstamp)
 	-rm -f src/systemd/src/libsystemd/sd-event/$(DEPDIR)/$(am__dirstamp)
@@ -18923,6 +19485,7 @@ distclean: distclean-recursive
 	-rm -f introspection/$(DEPDIR)/libnmdbus_la-org.freedesktop.NetworkManager.Device.Vlan.Plo
 	-rm -f introspection/$(DEPDIR)/libnmdbus_la-org.freedesktop.NetworkManager.Device.Vxlan.Plo
 	-rm -f introspection/$(DEPDIR)/libnmdbus_la-org.freedesktop.NetworkManager.Device.WiMax.Plo
+	-rm -f introspection/$(DEPDIR)/libnmdbus_la-org.freedesktop.NetworkManager.Device.WifiP2P.Plo
 	-rm -f introspection/$(DEPDIR)/libnmdbus_la-org.freedesktop.NetworkManager.Device.WireGuard.Plo
 	-rm -f introspection/$(DEPDIR)/libnmdbus_la-org.freedesktop.NetworkManager.Device.Wired.Plo
 	-rm -f introspection/$(DEPDIR)/libnmdbus_la-org.freedesktop.NetworkManager.Device.Wireless.Plo
@@ -18937,6 +19500,7 @@ distclean: distclean-recursive
 	-rm -f introspection/$(DEPDIR)/libnmdbus_la-org.freedesktop.NetworkManager.Settings.Plo
 	-rm -f introspection/$(DEPDIR)/libnmdbus_la-org.freedesktop.NetworkManager.VPN.Connection.Plo
 	-rm -f introspection/$(DEPDIR)/libnmdbus_la-org.freedesktop.NetworkManager.VPN.Plugin.Plo
+	-rm -f introspection/$(DEPDIR)/libnmdbus_la-org.freedesktop.NetworkManager.WifiP2PPeer.Plo
 	-rm -f libnm-core/$(DEPDIR)/libnm_core_la-nm-connection.Plo
 	-rm -f libnm-core/$(DEPDIR)/libnm_core_la-nm-core-enum-types.Plo
 	-rm -f libnm-core/$(DEPDIR)/libnm_core_la-nm-crypto.Plo
@@ -18986,8 +19550,10 @@ distclean: distclean-recursive
 	-rm -f libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-vlan.Plo
 	-rm -f libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-vpn.Plo
 	-rm -f libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-vxlan.Plo
+	-rm -f libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-wifi-p2p.Plo
 	-rm -f libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-wimax.Plo
 	-rm -f libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-wired.Plo
+	-rm -f libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-wireguard.Plo
 	-rm -f libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-wireless-security.Plo
 	-rm -f libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-wireless.Plo
 	-rm -f libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-wpan.Plo
@@ -19117,6 +19683,7 @@ distclean: distclean-recursive
 	-rm -f libnm/$(DEPDIR)/libnm_la-nm-device-tun.Plo
 	-rm -f libnm/$(DEPDIR)/libnm_la-nm-device-vlan.Plo
 	-rm -f libnm/$(DEPDIR)/libnm_la-nm-device-vxlan.Plo
+	-rm -f libnm/$(DEPDIR)/libnm_la-nm-device-wifi-p2p.Plo
 	-rm -f libnm/$(DEPDIR)/libnm_la-nm-device-wifi.Plo
 	-rm -f libnm/$(DEPDIR)/libnm_la-nm-device-wimax.Plo
 	-rm -f libnm/$(DEPDIR)/libnm_la-nm-device-wireguard.Plo
@@ -19139,6 +19706,7 @@ distclean: distclean-recursive
 	-rm -f libnm/$(DEPDIR)/libnm_la-nm-vpn-editor.Plo
 	-rm -f libnm/$(DEPDIR)/libnm_la-nm-vpn-plugin-old.Plo
 	-rm -f libnm/$(DEPDIR)/libnm_la-nm-vpn-service-plugin.Plo
+	-rm -f libnm/$(DEPDIR)/libnm_la-nm-wifi-p2p-peer.Plo
 	-rm -f libnm/$(DEPDIR)/libnm_la-nm-wimax-nsp.Plo
 	-rm -f libnm/$(DEPDIR)/libnm_utils_la-nm-libnm-utils.Plo
 	-rm -f libnm/fake-typelib/$(DEPDIR)/libnm_utils_la-typelibs.Plo
@@ -19155,25 +19723,59 @@ distclean: distclean-recursive
 	-rm -f shared/$(DEPDIR)/libnm_tests_test_nm_client-nm-test-utils-impl.Po
 	-rm -f shared/$(DEPDIR)/libnm_tests_test_remote_settings_client-nm-test-utils-impl.Po
 	-rm -f shared/$(DEPDIR)/libnm_tests_test_secret_agent-nm-test-utils-impl.Po
+	-rm -f shared/c-rbtree/src/$(DEPDIR)/libcrbtree_la-c-rbtree.Plo
 	-rm -f shared/c-siphash/src/$(DEPDIR)/libcsiphash_la-c-siphash.Plo
+	-rm -f shared/n-acd/src/$(DEPDIR)/libnacd_la-n-acd-bpf-fallback.Plo
+	-rm -f shared/n-acd/src/$(DEPDIR)/libnacd_la-n-acd-bpf.Plo
+	-rm -f shared/n-acd/src/$(DEPDIR)/libnacd_la-n-acd-probe.Plo
 	-rm -f shared/n-acd/src/$(DEPDIR)/libnacd_la-n-acd.Plo
-	-rm -f shared/nm-utils/$(DEPDIR)/clients_common_libnmc_base_la-nm-enum-utils.Plo
-	-rm -f shared/nm-utils/$(DEPDIR)/clients_common_libnmc_base_la-nm-hash-utils.Plo
-	-rm -f shared/nm-utils/$(DEPDIR)/clients_common_libnmc_base_la-nm-random-utils.Plo
-	-rm -f shared/nm-utils/$(DEPDIR)/clients_common_libnmc_base_la-nm-shared-utils.Plo
-	-rm -f shared/nm-utils/$(DEPDIR)/libnm_core_libnm_core_la-c-list-util.Plo
-	-rm -f shared/nm-utils/$(DEPDIR)/libnm_core_libnm_core_la-nm-dedup-multi.Plo
-	-rm -f shared/nm-utils/$(DEPDIR)/libnm_core_libnm_core_la-nm-enum-utils.Plo
-	-rm -f shared/nm-utils/$(DEPDIR)/libnm_core_libnm_core_la-nm-hash-utils.Plo
-	-rm -f shared/nm-utils/$(DEPDIR)/libnm_core_libnm_core_la-nm-io-utils.Plo
-	-rm -f shared/nm-utils/$(DEPDIR)/libnm_core_libnm_core_la-nm-random-utils.Plo
-	-rm -f shared/nm-utils/$(DEPDIR)/libnm_core_libnm_core_la-nm-secret-utils.Plo
-	-rm -f shared/nm-utils/$(DEPDIR)/libnm_core_libnm_core_la-nm-shared-utils.Plo
-	-rm -f shared/nm-utils/$(DEPDIR)/libnm_core_libnm_core_la-nm-udev-utils.Plo
-	-rm -f shared/nm-utils/$(DEPDIR)/libnm_glib_libnm_glib_la-nm-udev-utils.Plo
+	-rm -f shared/n-acd/src/util/$(DEPDIR)/libnacd_la-timer.Plo
 	-rm -f shared/nm-utils/$(DEPDIR)/libnm_tests_libnm_vpn_plugin_utils_test_la-nm-vpn-plugin-utils.Plo
 	-rm -f shared/nm-utils/$(DEPDIR)/libnm_tests_test_general-nm-compat.Po
-	-rm -f shared/nm-utils/$(DEPDIR)/libnm_util_libnm_util_la-nm-shared-utils.Plo
+	-rm -f shared/nm-utils/$(DEPDIR)/libnm_utils_base_la-c-list-util.Plo
+	-rm -f shared/nm-utils/$(DEPDIR)/libnm_utils_base_la-nm-dedup-multi.Plo
+	-rm -f shared/nm-utils/$(DEPDIR)/libnm_utils_base_la-nm-enum-utils.Plo
+	-rm -f shared/nm-utils/$(DEPDIR)/libnm_utils_base_la-nm-errno.Plo
+	-rm -f shared/nm-utils/$(DEPDIR)/libnm_utils_base_la-nm-hash-utils.Plo
+	-rm -f shared/nm-utils/$(DEPDIR)/libnm_utils_base_la-nm-io-utils.Plo
+	-rm -f shared/nm-utils/$(DEPDIR)/libnm_utils_base_la-nm-random-utils.Plo
+	-rm -f shared/nm-utils/$(DEPDIR)/libnm_utils_base_la-nm-secret-utils.Plo
+	-rm -f shared/nm-utils/$(DEPDIR)/libnm_utils_base_la-nm-shared-utils.Plo
+	-rm -f shared/nm-utils/$(DEPDIR)/libnm_utils_base_la-nm-time-utils.Plo
+	-rm -f shared/nm-utils/$(DEPDIR)/libnm_utils_udev_la-nm-udev-utils.Plo
+	-rm -f shared/nm-utils/tests/$(DEPDIR)/test_shared_general-test-shared-general.Po
+	-rm -f shared/systemd/$(DEPDIR)/libnm_systemd_logging_stub_la-nm-logging-stub.Plo
+	-rm -f shared/systemd/$(DEPDIR)/libnm_systemd_shared_la-nm-sd-utils-shared.Plo
+	-rm -f shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-alloc-util.Plo
+	-rm -f shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-env-file.Plo
+	-rm -f shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-env-util.Plo
+	-rm -f shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-escape.Plo
+	-rm -f shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-ether-addr-util.Plo
+	-rm -f shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-extract-word.Plo
+	-rm -f shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-fd-util.Plo
+	-rm -f shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-fileio.Plo
+	-rm -f shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-fs-util.Plo
+	-rm -f shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-hash-funcs.Plo
+	-rm -f shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-hashmap.Plo
+	-rm -f shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-hexdecoct.Plo
+	-rm -f shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-hostname-util.Plo
+	-rm -f shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-in-addr-util.Plo
+	-rm -f shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-io-util.Plo
+	-rm -f shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-mempool.Plo
+	-rm -f shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-parse-util.Plo
+	-rm -f shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-path-util.Plo
+	-rm -f shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-prioq.Plo
+	-rm -f shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-process-util.Plo
+	-rm -f shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-random-util.Plo
+	-rm -f shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-socket-util.Plo
+	-rm -f shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-stat-util.Plo
+	-rm -f shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-string-table.Plo
+	-rm -f shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-string-util.Plo
+	-rm -f shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-strv.Plo
+	-rm -f shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-time-util.Plo
+	-rm -f shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-tmpfile-util.Plo
+	-rm -f shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-utf8.Plo
+	-rm -f shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-util.Plo
 	-rm -f src/$(DEPDIR)/NetworkManager-main.Po
 	-rm -f src/$(DEPDIR)/libNetworkManagerBase_la-NetworkManagerUtils.Plo
 	-rm -f src/$(DEPDIR)/libNetworkManagerBase_la-main-utils.Plo
@@ -19201,6 +19803,7 @@ distclean: distclean-recursive
 	-rm -f src/$(DEPDIR)/libNetworkManager_la-nm-dispatcher.Plo
 	-rm -f src/$(DEPDIR)/libNetworkManager_la-nm-firewall-manager.Plo
 	-rm -f src/$(DEPDIR)/libNetworkManager_la-nm-hostname-manager.Plo
+	-rm -f src/$(DEPDIR)/libNetworkManager_la-nm-keep-alive.Plo
 	-rm -f src/$(DEPDIR)/libNetworkManager_la-nm-manager.Plo
 	-rm -f src/$(DEPDIR)/libNetworkManager_la-nm-netns.Plo
 	-rm -f src/$(DEPDIR)/libNetworkManager_la-nm-pacrunner-manager.Plo
@@ -19253,11 +19856,13 @@ distclean: distclean-recursive
 	-rm -f src/devices/tests/$(DEPDIR)/test_lldp-test-lldp.Po
 	-rm -f src/devices/wifi/$(DEPDIR)/libnm_device_plugin_wifi_la-nm-device-iwd.Plo
 	-rm -f src/devices/wifi/$(DEPDIR)/libnm_device_plugin_wifi_la-nm-device-olpc-mesh.Plo
+	-rm -f src/devices/wifi/$(DEPDIR)/libnm_device_plugin_wifi_la-nm-device-wifi-p2p.Plo
 	-rm -f src/devices/wifi/$(DEPDIR)/libnm_device_plugin_wifi_la-nm-device-wifi.Plo
 	-rm -f src/devices/wifi/$(DEPDIR)/libnm_device_plugin_wifi_la-nm-iwd-manager.Plo
 	-rm -f src/devices/wifi/$(DEPDIR)/libnm_device_plugin_wifi_la-nm-wifi-ap.Plo
 	-rm -f src/devices/wifi/$(DEPDIR)/libnm_device_plugin_wifi_la-nm-wifi-common.Plo
 	-rm -f src/devices/wifi/$(DEPDIR)/libnm_device_plugin_wifi_la-nm-wifi-factory.Plo
+	-rm -f src/devices/wifi/$(DEPDIR)/libnm_device_plugin_wifi_la-nm-wifi-p2p-peer.Plo
 	-rm -f src/devices/wifi/$(DEPDIR)/libnm_device_plugin_wifi_la-nm-wifi-utils.Plo
 	-rm -f src/devices/wifi/$(DEPDIR)/src_devices_wifi_tests_test_general-nm-wifi-ap.Po
 	-rm -f src/devices/wifi/$(DEPDIR)/src_devices_wifi_tests_test_general-nm-wifi-utils.Po
@@ -19358,58 +19963,31 @@ distclean: distclean-recursive
 	-rm -f src/supplicant/$(DEPDIR)/libNetworkManager_la-nm-supplicant-manager.Plo
 	-rm -f src/supplicant/$(DEPDIR)/libNetworkManager_la-nm-supplicant-settings-verify.Plo
 	-rm -f src/supplicant/tests/$(DEPDIR)/test_supplicant_config-test-supplicant-config.Po
-	-rm -f src/systemd/$(DEPDIR)/libsystemd_nm_la-nm-sd-utils.Plo
-	-rm -f src/systemd/$(DEPDIR)/libsystemd_nm_la-nm-sd.Plo
-	-rm -f src/systemd/sd-adapt/$(DEPDIR)/libsystemd_nm_la-nm-sd-adapt.Plo
-	-rm -f src/systemd/src/basic/$(DEPDIR)/libsystemd_nm_la-alloc-util.Plo
-	-rm -f src/systemd/src/basic/$(DEPDIR)/libsystemd_nm_la-env-util.Plo
-	-rm -f src/systemd/src/basic/$(DEPDIR)/libsystemd_nm_la-escape.Plo
-	-rm -f src/systemd/src/basic/$(DEPDIR)/libsystemd_nm_la-ether-addr-util.Plo
-	-rm -f src/systemd/src/basic/$(DEPDIR)/libsystemd_nm_la-extract-word.Plo
-	-rm -f src/systemd/src/basic/$(DEPDIR)/libsystemd_nm_la-fd-util.Plo
-	-rm -f src/systemd/src/basic/$(DEPDIR)/libsystemd_nm_la-fileio.Plo
-	-rm -f src/systemd/src/basic/$(DEPDIR)/libsystemd_nm_la-fs-util.Plo
-	-rm -f src/systemd/src/basic/$(DEPDIR)/libsystemd_nm_la-hash-funcs.Plo
-	-rm -f src/systemd/src/basic/$(DEPDIR)/libsystemd_nm_la-hashmap.Plo
-	-rm -f src/systemd/src/basic/$(DEPDIR)/libsystemd_nm_la-hexdecoct.Plo
-	-rm -f src/systemd/src/basic/$(DEPDIR)/libsystemd_nm_la-hostname-util.Plo
-	-rm -f src/systemd/src/basic/$(DEPDIR)/libsystemd_nm_la-in-addr-util.Plo
-	-rm -f src/systemd/src/basic/$(DEPDIR)/libsystemd_nm_la-io-util.Plo
-	-rm -f src/systemd/src/basic/$(DEPDIR)/libsystemd_nm_la-mempool.Plo
-	-rm -f src/systemd/src/basic/$(DEPDIR)/libsystemd_nm_la-parse-util.Plo
-	-rm -f src/systemd/src/basic/$(DEPDIR)/libsystemd_nm_la-path-util.Plo
-	-rm -f src/systemd/src/basic/$(DEPDIR)/libsystemd_nm_la-prioq.Plo
-	-rm -f src/systemd/src/basic/$(DEPDIR)/libsystemd_nm_la-process-util.Plo
-	-rm -f src/systemd/src/basic/$(DEPDIR)/libsystemd_nm_la-random-util.Plo
-	-rm -f src/systemd/src/basic/$(DEPDIR)/libsystemd_nm_la-socket-util.Plo
-	-rm -f src/systemd/src/basic/$(DEPDIR)/libsystemd_nm_la-stat-util.Plo
-	-rm -f src/systemd/src/basic/$(DEPDIR)/libsystemd_nm_la-string-table.Plo
-	-rm -f src/systemd/src/basic/$(DEPDIR)/libsystemd_nm_la-string-util.Plo
-	-rm -f src/systemd/src/basic/$(DEPDIR)/libsystemd_nm_la-strv.Plo
-	-rm -f src/systemd/src/basic/$(DEPDIR)/libsystemd_nm_la-time-util.Plo
-	-rm -f src/systemd/src/basic/$(DEPDIR)/libsystemd_nm_la-utf8.Plo
-	-rm -f src/systemd/src/basic/$(DEPDIR)/libsystemd_nm_la-util.Plo
-	-rm -f src/systemd/src/libsystemd-network/$(DEPDIR)/libsystemd_nm_la-arp-util.Plo
-	-rm -f src/systemd/src/libsystemd-network/$(DEPDIR)/libsystemd_nm_la-dhcp-identifier.Plo
-	-rm -f src/systemd/src/libsystemd-network/$(DEPDIR)/libsystemd_nm_la-dhcp-network.Plo
-	-rm -f src/systemd/src/libsystemd-network/$(DEPDIR)/libsystemd_nm_la-dhcp-option.Plo
-	-rm -f src/systemd/src/libsystemd-network/$(DEPDIR)/libsystemd_nm_la-dhcp-packet.Plo
-	-rm -f src/systemd/src/libsystemd-network/$(DEPDIR)/libsystemd_nm_la-dhcp6-network.Plo
-	-rm -f src/systemd/src/libsystemd-network/$(DEPDIR)/libsystemd_nm_la-dhcp6-option.Plo
-	-rm -f src/systemd/src/libsystemd-network/$(DEPDIR)/libsystemd_nm_la-lldp-neighbor.Plo
-	-rm -f src/systemd/src/libsystemd-network/$(DEPDIR)/libsystemd_nm_la-lldp-network.Plo
-	-rm -f src/systemd/src/libsystemd-network/$(DEPDIR)/libsystemd_nm_la-network-internal.Plo
-	-rm -f src/systemd/src/libsystemd-network/$(DEPDIR)/libsystemd_nm_la-sd-dhcp-client.Plo
-	-rm -f src/systemd/src/libsystemd-network/$(DEPDIR)/libsystemd_nm_la-sd-dhcp-lease.Plo
-	-rm -f src/systemd/src/libsystemd-network/$(DEPDIR)/libsystemd_nm_la-sd-dhcp6-client.Plo
-	-rm -f src/systemd/src/libsystemd-network/$(DEPDIR)/libsystemd_nm_la-sd-dhcp6-lease.Plo
-	-rm -f src/systemd/src/libsystemd-network/$(DEPDIR)/libsystemd_nm_la-sd-ipv4acd.Plo
-	-rm -f src/systemd/src/libsystemd-network/$(DEPDIR)/libsystemd_nm_la-sd-ipv4ll.Plo
-	-rm -f src/systemd/src/libsystemd-network/$(DEPDIR)/libsystemd_nm_la-sd-lldp.Plo
-	-rm -f src/systemd/src/libsystemd/sd-event/$(DEPDIR)/libsystemd_nm_la-sd-event.Plo
-	-rm -f src/systemd/src/libsystemd/sd-id128/$(DEPDIR)/libsystemd_nm_la-id128-util.Plo
-	-rm -f src/systemd/src/libsystemd/sd-id128/$(DEPDIR)/libsystemd_nm_la-sd-id128.Plo
-	-rm -f src/systemd/src/shared/$(DEPDIR)/libsystemd_nm_la-dns-domain.Plo
+	-rm -f src/systemd/$(DEPDIR)/libnm_systemd_core_la-nm-sd-utils-core.Plo
+	-rm -f src/systemd/$(DEPDIR)/libnm_systemd_core_la-nm-sd.Plo
+	-rm -f src/systemd/sd-adapt-core/$(DEPDIR)/libnm_systemd_core_la-nm-sd-adapt-core.Plo
+	-rm -f src/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-arp-util.Plo
+	-rm -f src/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-dhcp-identifier.Plo
+	-rm -f src/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-dhcp-network.Plo
+	-rm -f src/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-dhcp-option.Plo
+	-rm -f src/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-dhcp-packet.Plo
+	-rm -f src/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-dhcp6-network.Plo
+	-rm -f src/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-dhcp6-option.Plo
+	-rm -f src/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-lldp-neighbor.Plo
+	-rm -f src/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-lldp-network.Plo
+	-rm -f src/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-network-internal.Plo
+	-rm -f src/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-sd-dhcp-client.Plo
+	-rm -f src/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-sd-dhcp-lease.Plo
+	-rm -f src/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-sd-dhcp6-client.Plo
+	-rm -f src/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-sd-dhcp6-lease.Plo
+	-rm -f src/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-sd-ipv4acd.Plo
+	-rm -f src/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-sd-ipv4ll.Plo
+	-rm -f src/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-sd-lldp.Plo
+	-rm -f src/systemd/src/libsystemd/sd-event/$(DEPDIR)/libnm_systemd_core_la-event-util.Plo
+	-rm -f src/systemd/src/libsystemd/sd-event/$(DEPDIR)/libnm_systemd_core_la-sd-event.Plo
+	-rm -f src/systemd/src/libsystemd/sd-id128/$(DEPDIR)/libnm_systemd_core_la-id128-util.Plo
+	-rm -f src/systemd/src/libsystemd/sd-id128/$(DEPDIR)/libnm_systemd_core_la-sd-id128.Plo
+	-rm -f src/systemd/src/shared/$(DEPDIR)/libnm_systemd_core_la-dns-domain.Plo
 	-rm -f src/tests/$(DEPDIR)/src_tests_test_general-test-general.Po
 	-rm -f src/tests/$(DEPDIR)/test_dcb-test-dcb.Po
 	-rm -f src/tests/$(DEPDIR)/test_general_with_expect-test-general-with-expect.Po
@@ -19611,6 +20189,7 @@ maintainer-clean: maintainer-clean-recursive
 	-rm -f introspection/$(DEPDIR)/libnmdbus_la-org.freedesktop.NetworkManager.Device.Vlan.Plo
 	-rm -f introspection/$(DEPDIR)/libnmdbus_la-org.freedesktop.NetworkManager.Device.Vxlan.Plo
 	-rm -f introspection/$(DEPDIR)/libnmdbus_la-org.freedesktop.NetworkManager.Device.WiMax.Plo
+	-rm -f introspection/$(DEPDIR)/libnmdbus_la-org.freedesktop.NetworkManager.Device.WifiP2P.Plo
 	-rm -f introspection/$(DEPDIR)/libnmdbus_la-org.freedesktop.NetworkManager.Device.WireGuard.Plo
 	-rm -f introspection/$(DEPDIR)/libnmdbus_la-org.freedesktop.NetworkManager.Device.Wired.Plo
 	-rm -f introspection/$(DEPDIR)/libnmdbus_la-org.freedesktop.NetworkManager.Device.Wireless.Plo
@@ -19625,6 +20204,7 @@ maintainer-clean: maintainer-clean-recursive
 	-rm -f introspection/$(DEPDIR)/libnmdbus_la-org.freedesktop.NetworkManager.Settings.Plo
 	-rm -f introspection/$(DEPDIR)/libnmdbus_la-org.freedesktop.NetworkManager.VPN.Connection.Plo
 	-rm -f introspection/$(DEPDIR)/libnmdbus_la-org.freedesktop.NetworkManager.VPN.Plugin.Plo
+	-rm -f introspection/$(DEPDIR)/libnmdbus_la-org.freedesktop.NetworkManager.WifiP2PPeer.Plo
 	-rm -f libnm-core/$(DEPDIR)/libnm_core_la-nm-connection.Plo
 	-rm -f libnm-core/$(DEPDIR)/libnm_core_la-nm-core-enum-types.Plo
 	-rm -f libnm-core/$(DEPDIR)/libnm_core_la-nm-crypto.Plo
@@ -19674,8 +20254,10 @@ maintainer-clean: maintainer-clean-recursive
 	-rm -f libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-vlan.Plo
 	-rm -f libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-vpn.Plo
 	-rm -f libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-vxlan.Plo
+	-rm -f libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-wifi-p2p.Plo
 	-rm -f libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-wimax.Plo
 	-rm -f libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-wired.Plo
+	-rm -f libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-wireguard.Plo
 	-rm -f libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-wireless-security.Plo
 	-rm -f libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-wireless.Plo
 	-rm -f libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-wpan.Plo
@@ -19805,6 +20387,7 @@ maintainer-clean: maintainer-clean-recursive
 	-rm -f libnm/$(DEPDIR)/libnm_la-nm-device-tun.Plo
 	-rm -f libnm/$(DEPDIR)/libnm_la-nm-device-vlan.Plo
 	-rm -f libnm/$(DEPDIR)/libnm_la-nm-device-vxlan.Plo
+	-rm -f libnm/$(DEPDIR)/libnm_la-nm-device-wifi-p2p.Plo
 	-rm -f libnm/$(DEPDIR)/libnm_la-nm-device-wifi.Plo
 	-rm -f libnm/$(DEPDIR)/libnm_la-nm-device-wimax.Plo
 	-rm -f libnm/$(DEPDIR)/libnm_la-nm-device-wireguard.Plo
@@ -19827,6 +20410,7 @@ maintainer-clean: maintainer-clean-recursive
 	-rm -f libnm/$(DEPDIR)/libnm_la-nm-vpn-editor.Plo
 	-rm -f libnm/$(DEPDIR)/libnm_la-nm-vpn-plugin-old.Plo
 	-rm -f libnm/$(DEPDIR)/libnm_la-nm-vpn-service-plugin.Plo
+	-rm -f libnm/$(DEPDIR)/libnm_la-nm-wifi-p2p-peer.Plo
 	-rm -f libnm/$(DEPDIR)/libnm_la-nm-wimax-nsp.Plo
 	-rm -f libnm/$(DEPDIR)/libnm_utils_la-nm-libnm-utils.Plo
 	-rm -f libnm/fake-typelib/$(DEPDIR)/libnm_utils_la-typelibs.Plo
@@ -19843,25 +20427,59 @@ maintainer-clean: maintainer-clean-recursive
 	-rm -f shared/$(DEPDIR)/libnm_tests_test_nm_client-nm-test-utils-impl.Po
 	-rm -f shared/$(DEPDIR)/libnm_tests_test_remote_settings_client-nm-test-utils-impl.Po
 	-rm -f shared/$(DEPDIR)/libnm_tests_test_secret_agent-nm-test-utils-impl.Po
+	-rm -f shared/c-rbtree/src/$(DEPDIR)/libcrbtree_la-c-rbtree.Plo
 	-rm -f shared/c-siphash/src/$(DEPDIR)/libcsiphash_la-c-siphash.Plo
+	-rm -f shared/n-acd/src/$(DEPDIR)/libnacd_la-n-acd-bpf-fallback.Plo
+	-rm -f shared/n-acd/src/$(DEPDIR)/libnacd_la-n-acd-bpf.Plo
+	-rm -f shared/n-acd/src/$(DEPDIR)/libnacd_la-n-acd-probe.Plo
 	-rm -f shared/n-acd/src/$(DEPDIR)/libnacd_la-n-acd.Plo
-	-rm -f shared/nm-utils/$(DEPDIR)/clients_common_libnmc_base_la-nm-enum-utils.Plo
-	-rm -f shared/nm-utils/$(DEPDIR)/clients_common_libnmc_base_la-nm-hash-utils.Plo
-	-rm -f shared/nm-utils/$(DEPDIR)/clients_common_libnmc_base_la-nm-random-utils.Plo
-	-rm -f shared/nm-utils/$(DEPDIR)/clients_common_libnmc_base_la-nm-shared-utils.Plo
-	-rm -f shared/nm-utils/$(DEPDIR)/libnm_core_libnm_core_la-c-list-util.Plo
-	-rm -f shared/nm-utils/$(DEPDIR)/libnm_core_libnm_core_la-nm-dedup-multi.Plo
-	-rm -f shared/nm-utils/$(DEPDIR)/libnm_core_libnm_core_la-nm-enum-utils.Plo
-	-rm -f shared/nm-utils/$(DEPDIR)/libnm_core_libnm_core_la-nm-hash-utils.Plo
-	-rm -f shared/nm-utils/$(DEPDIR)/libnm_core_libnm_core_la-nm-io-utils.Plo
-	-rm -f shared/nm-utils/$(DEPDIR)/libnm_core_libnm_core_la-nm-random-utils.Plo
-	-rm -f shared/nm-utils/$(DEPDIR)/libnm_core_libnm_core_la-nm-secret-utils.Plo
-	-rm -f shared/nm-utils/$(DEPDIR)/libnm_core_libnm_core_la-nm-shared-utils.Plo
-	-rm -f shared/nm-utils/$(DEPDIR)/libnm_core_libnm_core_la-nm-udev-utils.Plo
-	-rm -f shared/nm-utils/$(DEPDIR)/libnm_glib_libnm_glib_la-nm-udev-utils.Plo
+	-rm -f shared/n-acd/src/util/$(DEPDIR)/libnacd_la-timer.Plo
 	-rm -f shared/nm-utils/$(DEPDIR)/libnm_tests_libnm_vpn_plugin_utils_test_la-nm-vpn-plugin-utils.Plo
 	-rm -f shared/nm-utils/$(DEPDIR)/libnm_tests_test_general-nm-compat.Po
-	-rm -f shared/nm-utils/$(DEPDIR)/libnm_util_libnm_util_la-nm-shared-utils.Plo
+	-rm -f shared/nm-utils/$(DEPDIR)/libnm_utils_base_la-c-list-util.Plo
+	-rm -f shared/nm-utils/$(DEPDIR)/libnm_utils_base_la-nm-dedup-multi.Plo
+	-rm -f shared/nm-utils/$(DEPDIR)/libnm_utils_base_la-nm-enum-utils.Plo
+	-rm -f shared/nm-utils/$(DEPDIR)/libnm_utils_base_la-nm-errno.Plo
+	-rm -f shared/nm-utils/$(DEPDIR)/libnm_utils_base_la-nm-hash-utils.Plo
+	-rm -f shared/nm-utils/$(DEPDIR)/libnm_utils_base_la-nm-io-utils.Plo
+	-rm -f shared/nm-utils/$(DEPDIR)/libnm_utils_base_la-nm-random-utils.Plo
+	-rm -f shared/nm-utils/$(DEPDIR)/libnm_utils_base_la-nm-secret-utils.Plo
+	-rm -f shared/nm-utils/$(DEPDIR)/libnm_utils_base_la-nm-shared-utils.Plo
+	-rm -f shared/nm-utils/$(DEPDIR)/libnm_utils_base_la-nm-time-utils.Plo
+	-rm -f shared/nm-utils/$(DEPDIR)/libnm_utils_udev_la-nm-udev-utils.Plo
+	-rm -f shared/nm-utils/tests/$(DEPDIR)/test_shared_general-test-shared-general.Po
+	-rm -f shared/systemd/$(DEPDIR)/libnm_systemd_logging_stub_la-nm-logging-stub.Plo
+	-rm -f shared/systemd/$(DEPDIR)/libnm_systemd_shared_la-nm-sd-utils-shared.Plo
+	-rm -f shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-alloc-util.Plo
+	-rm -f shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-env-file.Plo
+	-rm -f shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-env-util.Plo
+	-rm -f shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-escape.Plo
+	-rm -f shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-ether-addr-util.Plo
+	-rm -f shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-extract-word.Plo
+	-rm -f shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-fd-util.Plo
+	-rm -f shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-fileio.Plo
+	-rm -f shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-fs-util.Plo
+	-rm -f shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-hash-funcs.Plo
+	-rm -f shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-hashmap.Plo
+	-rm -f shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-hexdecoct.Plo
+	-rm -f shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-hostname-util.Plo
+	-rm -f shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-in-addr-util.Plo
+	-rm -f shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-io-util.Plo
+	-rm -f shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-mempool.Plo
+	-rm -f shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-parse-util.Plo
+	-rm -f shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-path-util.Plo
+	-rm -f shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-prioq.Plo
+	-rm -f shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-process-util.Plo
+	-rm -f shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-random-util.Plo
+	-rm -f shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-socket-util.Plo
+	-rm -f shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-stat-util.Plo
+	-rm -f shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-string-table.Plo
+	-rm -f shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-string-util.Plo
+	-rm -f shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-strv.Plo
+	-rm -f shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-time-util.Plo
+	-rm -f shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-tmpfile-util.Plo
+	-rm -f shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-utf8.Plo
+	-rm -f shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-util.Plo
 	-rm -f src/$(DEPDIR)/NetworkManager-main.Po
 	-rm -f src/$(DEPDIR)/libNetworkManagerBase_la-NetworkManagerUtils.Plo
 	-rm -f src/$(DEPDIR)/libNetworkManagerBase_la-main-utils.Plo
@@ -19889,6 +20507,7 @@ maintainer-clean: maintainer-clean-recursive
 	-rm -f src/$(DEPDIR)/libNetworkManager_la-nm-dispatcher.Plo
 	-rm -f src/$(DEPDIR)/libNetworkManager_la-nm-firewall-manager.Plo
 	-rm -f src/$(DEPDIR)/libNetworkManager_la-nm-hostname-manager.Plo
+	-rm -f src/$(DEPDIR)/libNetworkManager_la-nm-keep-alive.Plo
 	-rm -f src/$(DEPDIR)/libNetworkManager_la-nm-manager.Plo
 	-rm -f src/$(DEPDIR)/libNetworkManager_la-nm-netns.Plo
 	-rm -f src/$(DEPDIR)/libNetworkManager_la-nm-pacrunner-manager.Plo
@@ -19941,11 +20560,13 @@ maintainer-clean: maintainer-clean-recursive
 	-rm -f src/devices/tests/$(DEPDIR)/test_lldp-test-lldp.Po
 	-rm -f src/devices/wifi/$(DEPDIR)/libnm_device_plugin_wifi_la-nm-device-iwd.Plo
 	-rm -f src/devices/wifi/$(DEPDIR)/libnm_device_plugin_wifi_la-nm-device-olpc-mesh.Plo
+	-rm -f src/devices/wifi/$(DEPDIR)/libnm_device_plugin_wifi_la-nm-device-wifi-p2p.Plo
 	-rm -f src/devices/wifi/$(DEPDIR)/libnm_device_plugin_wifi_la-nm-device-wifi.Plo
 	-rm -f src/devices/wifi/$(DEPDIR)/libnm_device_plugin_wifi_la-nm-iwd-manager.Plo
 	-rm -f src/devices/wifi/$(DEPDIR)/libnm_device_plugin_wifi_la-nm-wifi-ap.Plo
 	-rm -f src/devices/wifi/$(DEPDIR)/libnm_device_plugin_wifi_la-nm-wifi-common.Plo
 	-rm -f src/devices/wifi/$(DEPDIR)/libnm_device_plugin_wifi_la-nm-wifi-factory.Plo
+	-rm -f src/devices/wifi/$(DEPDIR)/libnm_device_plugin_wifi_la-nm-wifi-p2p-peer.Plo
 	-rm -f src/devices/wifi/$(DEPDIR)/libnm_device_plugin_wifi_la-nm-wifi-utils.Plo
 	-rm -f src/devices/wifi/$(DEPDIR)/src_devices_wifi_tests_test_general-nm-wifi-ap.Po
 	-rm -f src/devices/wifi/$(DEPDIR)/src_devices_wifi_tests_test_general-nm-wifi-utils.Po
@@ -20046,58 +20667,31 @@ maintainer-clean: maintainer-clean-recursive
 	-rm -f src/supplicant/$(DEPDIR)/libNetworkManager_la-nm-supplicant-manager.Plo
 	-rm -f src/supplicant/$(DEPDIR)/libNetworkManager_la-nm-supplicant-settings-verify.Plo
 	-rm -f src/supplicant/tests/$(DEPDIR)/test_supplicant_config-test-supplicant-config.Po
-	-rm -f src/systemd/$(DEPDIR)/libsystemd_nm_la-nm-sd-utils.Plo
-	-rm -f src/systemd/$(DEPDIR)/libsystemd_nm_la-nm-sd.Plo
-	-rm -f src/systemd/sd-adapt/$(DEPDIR)/libsystemd_nm_la-nm-sd-adapt.Plo
-	-rm -f src/systemd/src/basic/$(DEPDIR)/libsystemd_nm_la-alloc-util.Plo
-	-rm -f src/systemd/src/basic/$(DEPDIR)/libsystemd_nm_la-env-util.Plo
-	-rm -f src/systemd/src/basic/$(DEPDIR)/libsystemd_nm_la-escape.Plo
-	-rm -f src/systemd/src/basic/$(DEPDIR)/libsystemd_nm_la-ether-addr-util.Plo
-	-rm -f src/systemd/src/basic/$(DEPDIR)/libsystemd_nm_la-extract-word.Plo
-	-rm -f src/systemd/src/basic/$(DEPDIR)/libsystemd_nm_la-fd-util.Plo
-	-rm -f src/systemd/src/basic/$(DEPDIR)/libsystemd_nm_la-fileio.Plo
-	-rm -f src/systemd/src/basic/$(DEPDIR)/libsystemd_nm_la-fs-util.Plo
-	-rm -f src/systemd/src/basic/$(DEPDIR)/libsystemd_nm_la-hash-funcs.Plo
-	-rm -f src/systemd/src/basic/$(DEPDIR)/libsystemd_nm_la-hashmap.Plo
-	-rm -f src/systemd/src/basic/$(DEPDIR)/libsystemd_nm_la-hexdecoct.Plo
-	-rm -f src/systemd/src/basic/$(DEPDIR)/libsystemd_nm_la-hostname-util.Plo
-	-rm -f src/systemd/src/basic/$(DEPDIR)/libsystemd_nm_la-in-addr-util.Plo
-	-rm -f src/systemd/src/basic/$(DEPDIR)/libsystemd_nm_la-io-util.Plo
-	-rm -f src/systemd/src/basic/$(DEPDIR)/libsystemd_nm_la-mempool.Plo
-	-rm -f src/systemd/src/basic/$(DEPDIR)/libsystemd_nm_la-parse-util.Plo
-	-rm -f src/systemd/src/basic/$(DEPDIR)/libsystemd_nm_la-path-util.Plo
-	-rm -f src/systemd/src/basic/$(DEPDIR)/libsystemd_nm_la-prioq.Plo
-	-rm -f src/systemd/src/basic/$(DEPDIR)/libsystemd_nm_la-process-util.Plo
-	-rm -f src/systemd/src/basic/$(DEPDIR)/libsystemd_nm_la-random-util.Plo
-	-rm -f src/systemd/src/basic/$(DEPDIR)/libsystemd_nm_la-socket-util.Plo
-	-rm -f src/systemd/src/basic/$(DEPDIR)/libsystemd_nm_la-stat-util.Plo
-	-rm -f src/systemd/src/basic/$(DEPDIR)/libsystemd_nm_la-string-table.Plo
-	-rm -f src/systemd/src/basic/$(DEPDIR)/libsystemd_nm_la-string-util.Plo
-	-rm -f src/systemd/src/basic/$(DEPDIR)/libsystemd_nm_la-strv.Plo
-	-rm -f src/systemd/src/basic/$(DEPDIR)/libsystemd_nm_la-time-util.Plo
-	-rm -f src/systemd/src/basic/$(DEPDIR)/libsystemd_nm_la-utf8.Plo
-	-rm -f src/systemd/src/basic/$(DEPDIR)/libsystemd_nm_la-util.Plo
-	-rm -f src/systemd/src/libsystemd-network/$(DEPDIR)/libsystemd_nm_la-arp-util.Plo
-	-rm -f src/systemd/src/libsystemd-network/$(DEPDIR)/libsystemd_nm_la-dhcp-identifier.Plo
-	-rm -f src/systemd/src/libsystemd-network/$(DEPDIR)/libsystemd_nm_la-dhcp-network.Plo
-	-rm -f src/systemd/src/libsystemd-network/$(DEPDIR)/libsystemd_nm_la-dhcp-option.Plo
-	-rm -f src/systemd/src/libsystemd-network/$(DEPDIR)/libsystemd_nm_la-dhcp-packet.Plo
-	-rm -f src/systemd/src/libsystemd-network/$(DEPDIR)/libsystemd_nm_la-dhcp6-network.Plo
-	-rm -f src/systemd/src/libsystemd-network/$(DEPDIR)/libsystemd_nm_la-dhcp6-option.Plo
-	-rm -f src/systemd/src/libsystemd-network/$(DEPDIR)/libsystemd_nm_la-lldp-neighbor.Plo
-	-rm -f src/systemd/src/libsystemd-network/$(DEPDIR)/libsystemd_nm_la-lldp-network.Plo
-	-rm -f src/systemd/src/libsystemd-network/$(DEPDIR)/libsystemd_nm_la-network-internal.Plo
-	-rm -f src/systemd/src/libsystemd-network/$(DEPDIR)/libsystemd_nm_la-sd-dhcp-client.Plo
-	-rm -f src/systemd/src/libsystemd-network/$(DEPDIR)/libsystemd_nm_la-sd-dhcp-lease.Plo
-	-rm -f src/systemd/src/libsystemd-network/$(DEPDIR)/libsystemd_nm_la-sd-dhcp6-client.Plo
-	-rm -f src/systemd/src/libsystemd-network/$(DEPDIR)/libsystemd_nm_la-sd-dhcp6-lease.Plo
-	-rm -f src/systemd/src/libsystemd-network/$(DEPDIR)/libsystemd_nm_la-sd-ipv4acd.Plo
-	-rm -f src/systemd/src/libsystemd-network/$(DEPDIR)/libsystemd_nm_la-sd-ipv4ll.Plo
-	-rm -f src/systemd/src/libsystemd-network/$(DEPDIR)/libsystemd_nm_la-sd-lldp.Plo
-	-rm -f src/systemd/src/libsystemd/sd-event/$(DEPDIR)/libsystemd_nm_la-sd-event.Plo
-	-rm -f src/systemd/src/libsystemd/sd-id128/$(DEPDIR)/libsystemd_nm_la-id128-util.Plo
-	-rm -f src/systemd/src/libsystemd/sd-id128/$(DEPDIR)/libsystemd_nm_la-sd-id128.Plo
-	-rm -f src/systemd/src/shared/$(DEPDIR)/libsystemd_nm_la-dns-domain.Plo
+	-rm -f src/systemd/$(DEPDIR)/libnm_systemd_core_la-nm-sd-utils-core.Plo
+	-rm -f src/systemd/$(DEPDIR)/libnm_systemd_core_la-nm-sd.Plo
+	-rm -f src/systemd/sd-adapt-core/$(DEPDIR)/libnm_systemd_core_la-nm-sd-adapt-core.Plo
+	-rm -f src/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-arp-util.Plo
+	-rm -f src/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-dhcp-identifier.Plo
+	-rm -f src/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-dhcp-network.Plo
+	-rm -f src/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-dhcp-option.Plo
+	-rm -f src/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-dhcp-packet.Plo
+	-rm -f src/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-dhcp6-network.Plo
+	-rm -f src/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-dhcp6-option.Plo
+	-rm -f src/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-lldp-neighbor.Plo
+	-rm -f src/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-lldp-network.Plo
+	-rm -f src/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-network-internal.Plo
+	-rm -f src/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-sd-dhcp-client.Plo
+	-rm -f src/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-sd-dhcp-lease.Plo
+	-rm -f src/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-sd-dhcp6-client.Plo
+	-rm -f src/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-sd-dhcp6-lease.Plo
+	-rm -f src/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-sd-ipv4acd.Plo
+	-rm -f src/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-sd-ipv4ll.Plo
+	-rm -f src/systemd/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-sd-lldp.Plo
+	-rm -f src/systemd/src/libsystemd/sd-event/$(DEPDIR)/libnm_systemd_core_la-event-util.Plo
+	-rm -f src/systemd/src/libsystemd/sd-event/$(DEPDIR)/libnm_systemd_core_la-sd-event.Plo
+	-rm -f src/systemd/src/libsystemd/sd-id128/$(DEPDIR)/libnm_systemd_core_la-id128-util.Plo
+	-rm -f src/systemd/src/libsystemd/sd-id128/$(DEPDIR)/libnm_systemd_core_la-sd-id128.Plo
+	-rm -f src/systemd/src/shared/$(DEPDIR)/libnm_systemd_core_la-dns-domain.Plo
 	-rm -f src/tests/$(DEPDIR)/src_tests_test_general-test-general.Po
 	-rm -f src/tests/$(DEPDIR)/test_dcb-test-dcb.Po
 	-rm -f src/tests/$(DEPDIR)/test_general_with_expect-test-general-with-expect.Po
@@ -20404,7 +20998,10 @@ $(libnm_tests_test_secret_agent_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
 $(libnm_tests_test_nm_client_OBJECTS):              $(libnm_NM_1_0_typelib)
 $(libnm_tests_test_remote_settings_client_OBJECTS): $(libnm_NM_1_0_typelib)
 $(libnm_tests_test_secret_agent_OBJECTS):           $(libnm_NM_1_0_typelib)
-$(src_libsystemd_nm_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
+
+check-config-options:
+	$(srcdir)/tools/check-config-options.sh "$(srcdir)"
+$(src_libnm_systemd_core_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
 
 $(src_libNetworkManagerBase_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
 
@@ -20574,6 +21171,7 @@ install-data-hook-dispatcher:
 $(dispatcher_tests_test_dispatcher_envp_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
 
 $(clients_nm_online_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
+$(clients_nm_online_OBJECTS): $(libnm_lib_h_pub_mkenums)
 
 $(clients_common_libnmc_base_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
 $(clients_common_libnmc_base_la_OBJECTS): $(libnm_lib_h_pub_mkenums)
@@ -20642,9 +21240,6 @@ check-local-clients-tests-test-client: clients/cli/nmcli clients/tests/test-clie
 @HAVE_SYSTEMD_TRUE@data/NetworkManager-dispatcher.service: $(srcdir)/data/NetworkManager-dispatcher.service.in
 @HAVE_SYSTEMD_TRUE@	$(AM_V_GEN) $(data_edit) $< >$@
 
-@HAVE_SYSTEMD_TRUE@data/org.freedesktop.NetworkManager.service: $(srcdir)/data/org.freedesktop.NetworkManager.service.in
-@HAVE_SYSTEMD_TRUE@	$(AM_V_GEN) $(data_edit) $< >$@
-
 data/server.conf: $(srcdir)/data/server.conf.in
 	@$(MKDIR_P) data/
 	$(AM_V_GEN) $(data_edit) $< >$@
@@ -20668,6 +21263,7 @@ data/server.conf: $(srcdir)/data/server.conf.in
 @WITH_LEGACY_LIBRARIES_TRUE@$(libnm_util_tests_test_setting_8021x_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
 @WITH_LEGACY_LIBRARIES_TRUE@$(libnm_util_tests_test_setting_dcb_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
 @WITH_LEGACY_LIBRARIES_TRUE@$(libnm_util_tests_test_libnm_linking_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
+
 @WITH_LEGACY_LIBRARIES_TRUE@$(libnm_glib_libnm_glib_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
 
 @WITH_LEGACY_LIBRARIES_TRUE@$(libnm_glib_libnm_glib_la_OBJECTS): $(libnm_glib_lib_h_pub_mkenums)
diff --git a/NEWS b/NEWS
index 30ebe5e5..9a72dcb8 100644
--- a/NEWS
+++ b/NEWS
@@ -1,12 +1,47 @@
-===============================================
-NetworkManager-1.14.6
-Overview of changes since NetworkManager-1.14.4
-===============================================
+=============================================
+NetworkManager-1.16
+Overview of changes since NetworkManager-1.14
+=============================================
 
 This is a new stable release of NetworkManager.  Notable changes include:
 
+* Check connectivity per address family.
+* Support "main.systemd-resolved" to let NetworkManager configure DNS settings
+  in systemd-resolved without making it the main DNS plugin of NetworkManager.
+* Write "/var/run/NetworkManager/no-stub-resolv.conf" with original nameservers.
+  That is useful with caching DNS plugins like "systemd-resolved" or "dnsmasq" where
+  "/var/run/NetworkManager/resolv.conf" refers to localhost.
+* Change default "ipv4.dhcp-client-id" setting for the internal DHCP plugin from
+  "duid" to "mac". This is a change in behavior on upgrade when using the internal
+  DHCP plugin (unless the default is overwritten in "NetworkManager.conf" or specified
+  per connection profile).
+* Improve handling of DHCP router options with internal DHCP plugin. For one, accept
+  multiple routers and add a default-route to each. On D-Bus expose the original DNS
+  and NTP servers without cleaning up local nameservers.
+* Allow binding a connections lifetime to the DBus client that activated it.
+* Add support for establishing Wi-Fi Direct connections (Wi-Fi P2P).
+* Add support for WireGuard VPN tunnels to NetworkManager. D-Bus API and libnm
+  support all options. nmcli supports creating and managing WireGuard profiles,
+  with the exception of configuring and showing peers.
+* Add initrd generator to be used by dracut and use it as new way of handling
+  iBFT.
+* Deprecated "plugins.monitor-connection-files" setting in NetworkManager.conf.
+  This option will have no effect in future versions.
+* Add AP and Ad-hoc support for iwd Wi-Fi backend.
+* Warn about invalid settings in "NetworkManager.conf".
+* Support announcing "ANDROID_METERED" DHCP option for shared mode.
+* Support SAE authentication as used for 802.11s Meshing and WPA3-Personal.
+* NetworkManager is no longer installed as D-Bus activatable service.
+* Mark docker bridges as unmanaged via udev rule.
+* Add new PolicyKit permission "org.freedesktop.NetworkManager.wifi.scan" for controlling
+  Wi-Fi scanning.
+
+The following changes were backported to 1.14.x releases between 1.14.0
+and 1.14.6 are also present in NetworkManager-1.14:
+
+- 1.14.6:
 * Fix memory corruption in internal DHCPv6 client (CVE-2018-15688).
-* No longer limit number of search entires in resolv.conf to 6.
+* No longer limit number of search entries in resolv.conf to 6.
 * Support restricting NetworkManager.conf device configuration based on used DHCP
   plugin.
 * Add "${MAC}" specifier for connection.stable-id. This uses the current MAC
@@ -19,7 +54,7 @@ This is a new stable release of NetworkManager.  Notable changes include:
   systemd-networkd does by default.
 * Support and use a new kind of secret-key in "/var/lib/NetworkManager/secret_key".
   The secret-key represents the identity of the machine that is used for various
-  purposes like generating IPv6 stable privacy addesses. It is now combined
+  purposes like generating IPv6 stable privacy addresses. It is now combined
   with "/etc/machine-id" so that changing only the machine-id results in new identifiers.
   That matters for example when cloning a virtual machine. Previously, the user
   hard to prune NetworkManager's secret-key to get a new identity, now regenerating
@@ -32,13 +67,7 @@ This is a new stable release of NetworkManager.  Notable changes include:
   rp_filter may break valid use-cases and interacts badly with connectivity checking.
 * Various bug fixes and improvements.
 
-===============================================
-NetworkManager-1.14.4
-Overview of changes since NetworkManager-1.14.2
-===============================================
-
-This is a new stable release of NetworkManager.  Notable changes include:
-
+- 1.14.4:
 * Fix a crash in nmcli when a device is removed while being disconnected.
 * Fix a crash in ifupdown (Debian) configuration plugin.
 * Fix a daemon crash when a generated connection doesn't validate.
@@ -47,13 +76,7 @@ This is a new stable release of NetworkManager.  Notable changes include:
 * Fix a RPATH in bluetooth and wwan plugin when built with Meson (otherwise
   they wouldn't find libnm-wwan.so).
 
-=============================================
-NetworkManager-1.14.2
-Overview of changes since NetworkManager-1.14
-=============================================
-
-This is a new stable release of NetworkManager.  Notable changes include:
-
+- 1.14.2:
 * Fix a bug that could cause NetworkManager to crash after checking
   connectivity status.
 * Correctly apply a default (-1) metric from DHCP.
@@ -181,8 +204,8 @@ Overview of changes since NetworkManager-1.8
 
 This is a new stable release of NetworkManager.  Notable changes include:
 
-* NetworkManager includes now basic OpenVSwitch support, good enough
-    to be capable of setting up simple OpenVSwitch configurations.
+* NetworkManager includes now basic Open vSwitch support, good enough
+    to be capable of setting up simple Open vSwitch configurations.
 * Added support for activating PPP connections on non-Ethernet
   interfaces.
 * It is now possible to authenticate to a Wi-Fi network using WPS
@@ -527,7 +550,7 @@ are also present in NetworkManager-1.2:
     nmcli.
 * Added support for adding ADSL connections in nmcli.
 * Improved capture portal detection.
-* Default route through WiFi connection is now preferred to Mobile
+* Default route through Wi-Fi connection is now preferred to Mobile
     Broadband if both are available.
 * Expose a flag to determine whether a particular connection is metered
     via API and client tools. Configurable in ifcfg with CONNECTION_METERED
@@ -671,7 +694,7 @@ This is a new stable release of NetworkManager.  Notable changes include:
 * Added support for Data Center Bridging (DCB) and FibreChannel over Ethernet (FCoE)
 * IPv6 autoconfiguration is now done in userspace with libndp instead of the kernel
 * The D-Bus daemon is no longer required for root-only operation
-* WiFi, ADSL, WWAN, and Bluetooth are now optional plugins, reducing install size
+* Wi-Fi, ADSL, WWAN, and Bluetooth are now optional plugins, reducing install size
 * Added support for Infiniband Partitions
 * Network connection files are no longer watched by default, use "nmcli con reload"
     to notice changes made externally or set "monitor-connection-files=true" in
@@ -728,16 +751,16 @@ This is a new stable release of NetworkManager.  Notable changes include:
 * Fix crash in dnsmasq plugin when no nameservers were present
 * Add support for 4G LTE network modes
 * Fix signal handling when daemonizing at startup
-* Don't autoconnect to WiFi networks that have never successfully connected
-* Only request new WiFi secrets during the initial association or when the
+* Don't autoconnect to Wi-Fi networks that have never successfully connected
+* Only request new Wi-Fi secrets during the initial association or when the
     secrets are known to be wrong, not every time the connection randomly fails
 * Add capability to autoconnect VPN connections when a parent connection succeeds
 * Add configure-time option for "permissive" system connection editing policy
 * Various libnm-glib fixes for asynchronous usage
 * Fix gateway handling when given with secondary IP addresses
 * Optionally listen to systemd for suspend/resume events instead of UPower
-* Fix 'seen-bssids' property when retrieving WiFi connections via D-Bus
-* Add support for AP-mode WiFi hotspots (instead of just Ad-Hoc)
+* Fix 'seen-bssids' property when retrieving Wi-Fi connections via D-Bus
+* Add support for AP-mode Wi-Fi hotspots (instead of just Ad-Hoc)
 * Add a "slaves" property to Bond devices
 * Add support for ModemManager 0.7/0.8
 * Allow more human-readable formatting of IP address in keyfile connections
@@ -748,7 +771,7 @@ This is a new stable release of NetworkManager.  Notable changes include:
 * Add support for bridge master devices and bridge ports
 * Fix canceling secrets requests in GUI agents
 * Always enable Proactive Key Caching (PKC, also called OKC) for WPA Enterprise
-    WiFi configurations
+    Wi-Fi configurations
 
 
 ==============================================
@@ -761,12 +784,12 @@ This is a new stable release of NetworkManager.  Notable changes include:
 * Many libnm-glib fixes, including crashes when NetworkManager restarts
 * Enhanced IPv6 stability and compatibility
 * Fix regression in carrier handling for devices that don't support carrier detect
-* Add ability to connect to new WiFi networks from nmcli
+* Add ability to connect to new Wi-Fi networks from nmcli
 * Add native support for ADSL modems using PPPoE or PPPoATM
 * Reduce number of changes made to DNS information during connection setup
 * Add support for IPv6-enabled VPN connections
 * Add device driver version, firmware version, and autoconnect properties to D-Bus API
-* Add on-demand WiFi scan support
+* Add on-demand Wi-Fi scan support
 * Fix IPv6 default gateway handling for DHCPv6
 * Add Vala language bindings
 * Fix various crashes and issues in the ifcfg-rh system settings plugin
@@ -784,12 +807,12 @@ Overview of changes since NetworkManager-0.9.2
 
 This is a new stable release of NetworkManager.  Notable changes include:
 
-* Better handling of WiFi devices via nl80211 when available (instead of WEXT)
+* Better handling of Wi-Fi devices via nl80211 when available (instead of WEXT)
 * IP configuration is now non-blocking; waiting for IPv6 RA no longer blocks
     the device from activating if IPv4 is ready and vice versa
 * Added support for firewall "zones" via FirewallD
 * Added basic support for bonded interfaces
-* WiFi connections are no longer locked to a specific MAC address if they are
+* Wi-Fi connections are no longer locked to a specific MAC address if they are
     "locally administered" addresses (ie, 02:::::)
 * New state change reasons have been added for mobile broadband PIN errors
 * Agent-owned secrets are now sent to agents for newly created connections
@@ -814,7 +837,7 @@ This is a new stable release of NetworkManager.  Notable changes include:
 * Enable out-of-the-box IPv6 connectivity by allowing IPv4 to fail if IPv6 succeeds
 * Allow proxying of DNSSEC data when using the dnsmasq local caching nameserver plugin
 * Add support for multiple domain names sent from VPN plugins
-* Removed support for WiFi Ad-Hoc WPA connections due to kernel bugs
+* Removed support for Wi-Fi Ad-Hoc WPA connections due to kernel bugs
 
 
 ==============================================
@@ -933,8 +956,8 @@ This is a new stable release of NetworkManager.  Notable changes include:
 * Native local caching nameserver support using dnsmasq
 * Automatically detect addition and removal of new VPN plugins
 * Support for handling suspend/resume signals from UPower
-* Ensure users are allowed to enable/disable WiFi and networking
-* Ensure WiFi enable state is perserved across reboot and suspend
+* Ensure users are allowed to enable/disable Wi-Fi and networking
+* Ensure Wi-Fi enable state is perserved across reboot and suspend
 * Better handling of /etc/hosts and preservation of custom hostnames
 * Support for the systemd session management service
 * Better handling of 'keyfile' system connection errors
diff --git a/README b/README
index fd3898dd..45632901 100644
--- a/README
+++ b/README
@@ -75,11 +75,15 @@ aren't expecting the dynamic requests that NetworkManager and wpa_supplicant
 make.  Driver bugs should be filed in the bug tracker of the distribution being
 run, since often distributions customize their kernel and drivers.
 
-Sometimes, it really is NetworkManager's fault.  If you think that's the case,
-please file a bug at http://bugzilla.gnome.org and choose the NetworkManager
-component.  Attaching the output of /var/log/messages or /var/log/daemon.log
-(wherever your distribution directs syslog's 'daemon' facility output) is often
-very helpful, and (if you can get) a working wpa_supplicant config file helps
-enormously.
-
-
+Sometimes, it really is NetworkManager's fault.  If you think that's
+the case, please file a bug at:
+
+https://gitlab.freedesktop.org/NetworkManager/NetworkManager/issues
+
+Attaching NetworkManager debug logs from the journal (or wherever your
+distribution directs syslog's 'daemon' facility output, as
+/var/log/messages or /var/log/daemon.log) is often very helpful, and
+(if you can get) a working wpa_supplicant config file helps
+enormously.  See the logging section of file
+contrib/fedora/rpm/NetworkManager.conf for how to enable debug logging
+in NetworkManager.
diff --git a/TODO b/TODO
index e13953de..a8785bbc 100644
--- a/TODO
+++ b/TODO
@@ -18,7 +18,7 @@ of each device's state.  Unfortunately that requires two things:
 The first is the largest obstacle, but ideally we implement this and enable it
 when we have the required glib and libsoup versions available.  One other
 complication is that this checking should be done during the
-NM_DEVICE_STATE_IP_CHECK phase (along with other operations like WiFi hotspot
+NM_DEVICE_STATE_IP_CHECK phase (along with other operations like Wi-Fi hotspot
 auto-login) while the current checks are done globally in nm-manager.c, so
 keeping both code paths might be complex.
 
@@ -97,7 +97,7 @@ same MAC address, the connection with the most recent timestamp should be
 preferred.
 
 Similarly, if the probing/listening process detects 802.1x frames the device
-should be marked as requring 802.1x authentication until the carrier drops.
+should be marked as requiring 802.1x authentication until the carrier drops.
 This would be accomplished by adding a new property to the NMDeviceEthernet
 object and exporting that property through the
 introspection/nm-device-ethernet.xml file.  This would allow clients like
@@ -109,10 +109,10 @@ successfully connect to this network.
 * VPN re-connect (bgo #349151)
 
 NM should remember whether a VPN was connected if a connection disconnects
-(like WiFi drops out or short carrier drop) or if the laptop goes to sleep.
+(like Wi-Fi drops out or short carrier drop) or if the laptop goes to sleep.
 Upon reconnect, if the same Connection is again active, the previously
 connected VPN should be activated again as well.  Basically, don't just drop
-the VPN because WiFi choked for 10 seconds, but reconnect the VPN if it was
+the VPN because Wi-Fi choked for 10 seconds, but reconnect the VPN if it was
 connected before the drop.
 
 
@@ -231,7 +231,7 @@ proceeds with the connection.
 
 NM sends the correct wpa_supplicant config for WPS to the supplicant, and waits
 for the connection to occur.  WPS can only be used the *first* time, so after a
-first successfull connection, NM must request the actual hexadecimal PSK from
+first successful connection, NM must request the actual hexadecimal PSK from
 wpa_supplicant via D-Bus, and store that PSK in the connection, clear any WPS
 PIN code from the connection, and save the connection to backing storage.
 
@@ -248,7 +248,7 @@ There are a few components to this:
 1) kernel driver and hardware capabilities: most mobile devices use periodic
 background scanning to quickly determine whether a known SSID is available and
 notify the connection manager to connect to it.  This typically requires special
-capabilities and good powersave/sleep support from the WiFi kernel driver.
+capabilities and good powersave/sleep support from the Wi-Fi kernel driver.
 There is a background scanning API in nl80211, but we need to determine how many
 SSIDs each driver allows for background scanning, and based on that number, give
 the driver the most recent N SSIDs.  We still need to periodically wake the
@@ -283,7 +283,7 @@ connection process.
 2) single-device-at-a-time with overlapping connections: this is also probably
 the best route to go for desktop use-cases as well.  Instead of bringing all
 available connections up, only bring up the "best" connection at any given
-time based on the current priority list (which is rougly Ethernet > WiFi >
+time based on the current priority list (which is roughly Ethernet > Wi-Fi >
 3G/Bluetooth).  However, to ensure seamless connectivity, when one connection
 begins to degrade, the next-best connection should be started before the
 current one is terminated, such that there is a small amount of overlap.
diff --git a/clients/cli/agent.c b/clients/cli/agent.c
index bbfe47fb..6c116153 100644
--- a/clients/cli/agent.c
+++ b/clients/cli/agent.c
@@ -25,7 +25,6 @@
 
 #include 
 #include 
-#include 
 #include 
 #include 
 
@@ -85,7 +84,8 @@ set_deftext (void)
 }
 
 static gboolean
-get_secrets_from_user (const char *request_id,
+get_secrets_from_user (const NmcConfig *nmc_config,
+                       const char *request_id,
                        const char *title,
                        const char *msg,
                        GPtrArray *secrets)
@@ -104,7 +104,10 @@ get_secrets_from_user (const char *request_id,
 			rl_startup_hook = set_deftext;
 			pre_input_deftext = g_strdup (secret->value);
 		}
-		pwd = nmc_readline ("%s (%s): ", secret->pretty_name, secret->entry_id);
+		if (secret->no_prompt_entry_id)
+			pwd = nmc_readline (nmc_config, "%s: ", secret->pretty_name);
+		else
+			pwd = nmc_readline (nmc_config, "%s (%s): ", secret->pretty_name, secret->entry_id);
 
 		/* No password provided, cancel the secrets. */
 		if (!pwd)
@@ -123,17 +126,16 @@ secrets_requested (NMSecretAgentSimple *agent,
                    GPtrArray           *secrets,
                    gpointer             user_data)
 {
-	NmCli *nmc = (NmCli *) user_data;
-	gboolean success = FALSE;
+	NmCli *nmc = user_data;
+	gboolean success;
 
 	if (nmc->nmc_config.print_output == NMC_PRINT_PRETTY)
 		nmc_terminal_erase_line ();
 
-	success = get_secrets_from_user (request_id, title, msg, secrets);
-	if (success)
-		nm_secret_agent_simple_response (agent, request_id, secrets);
-	else
-		nm_secret_agent_simple_response (agent, request_id, NULL);
+	success = get_secrets_from_user (&nmc->nmc_config, request_id, title, msg, secrets);
+	nm_secret_agent_simple_response (agent,
+	                                 request_id,
+	                                 success ? secrets : NULL);
 }
 
 static NMCResultCode
@@ -149,7 +151,7 @@ do_agent_secret (NmCli *nmc, int argc, char **argv)
 		/* We keep running */
 		nmc->should_wait++;
 
-		nm_secret_agent_simple_enable (NM_SECRET_AGENT_SIMPLE (nmc->secret_agent), NULL);
+		nm_secret_agent_simple_enable (nmc->secret_agent, NULL);
 		g_signal_connect (nmc->secret_agent,
 		                  NM_SECRET_AGENT_SIMPLE_REQUEST_SECRETS,
 		                  G_CALLBACK (secrets_requested),
diff --git a/clients/cli/common.c b/clients/cli/common.c
index d3f5f865..3c1c315d 100644
--- a/clients/cli/common.c
+++ b/clients/cli/common.c
@@ -25,7 +25,6 @@
 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
@@ -661,12 +660,12 @@ vpn_openconnect_get_secrets (NMConnection *connection, GPtrArray *secrets)
 }
 
 static gboolean
-get_secrets_from_user (const char *request_id,
+get_secrets_from_user (const NmcConfig *nmc_config,
+                       const char *request_id,
                        const char *title,
                        const char *msg,
                        NMConnection *connection,
                        gboolean ask,
-                       gboolean echo_on,
                        GHashTable *pwds_hash,
                        GPtrArray *secrets)
 {
@@ -686,6 +685,8 @@ get_secrets_from_user (const char *request_id,
 			pwd = g_strdup (pwd);
 		} else {
 			if (ask) {
+				gboolean echo_on;
+
 				if (secret->value) {
 					if (!g_strcmp0 (secret->vpn_type, NM_DBUS_INTERFACE ".openconnect")) {
 						/* Do not present and ask user for openconnect secrets, we already have them */
@@ -698,10 +699,16 @@ get_secrets_from_user (const char *request_id,
 				}
 				if (msg)
 					g_print ("%s\n", msg);
-				pwd = nmc_readline_echo (secret->is_secret
-				                         ? echo_on
-				                         : TRUE,
-				                         "%s (%s): ", secret->pretty_name, secret->entry_id);
+
+				echo_on = secret->is_secret
+				          ? nmc_config->show_secrets
+				          : TRUE;
+
+				if (secret->no_prompt_entry_id)
+					pwd = nmc_readline_echo (nmc_config, echo_on, "%s: ", secret->pretty_name);
+				else
+					pwd = nmc_readline_echo (nmc_config, echo_on, "%s (%s): ", secret->pretty_name, secret->entry_id);
+
 				if (!pwd)
 					pwd = g_strdup ("");
 			} else {
@@ -763,15 +770,21 @@ nmc_secrets_requested (NMSecretAgentSimple *agent,
 		g_free (path);
 	}
 
-	success = get_secrets_from_user (request_id, title, msg, connection, nmc->nmc_config.in_editor || nmc->ask,
-	                                 nmc->nmc_config.show_secrets, nmc->pwds_hash, secrets);
+	success = get_secrets_from_user (&nmc->nmc_config,
+	                                 request_id,
+	                                 title,
+	                                 msg,
+	                                 connection,
+	                                 nmc->nmc_config.in_editor || nmc->ask,
+	                                 nmc->pwds_hash,
+	                                 secrets);
 	if (success)
 		nm_secret_agent_simple_response (agent, request_id, secrets);
 	else {
 		/* Unregister our secret agent on failure, so that another agent
 		 * may be tried */
 		if (nmc->secret_agent) {
-			nm_secret_agent_old_unregister (nmc->secret_agent, NULL, NULL);
+			nm_secret_agent_old_unregister (NM_SECRET_AGENT_OLD (nmc->secret_agent), NULL, NULL);
 			g_clear_object (&nmc->secret_agent);
 		}
 	}
@@ -847,7 +860,8 @@ stdin_ready_cb (GIOChannel * io, GIOCondition condition, gpointer data)
 }
 
 static char *
-nmc_readline_helper (const char *prompt)
+nmc_readline_helper (const NmcConfig *nmc_config,
+                     const char *prompt)
 {
 	GIOChannel *io = NULL;
 	guint io_watch_id;
@@ -884,7 +898,7 @@ read_again:
 	if (nmc_seen_sigint ()) {
 		/* Ctrl-C */
 		nmc_clear_sigint ();
-		if (   nm_cli.nmc_config.in_editor
+		if (   nmc_config->in_editor
 		    || (rl_string  && *rl_string)) {
 			/* In editor, or the line is not empty */
 			/* Call readline again to get new prompt (repeat) */
@@ -926,22 +940,19 @@ read_again:
  * this function returns NULL.
  */
 char *
-nmc_readline (const char *prompt_fmt, ...)
+nmc_readline (const NmcConfig *nmc_config,
+              const char *prompt_fmt,
+              ...)
 {
 	va_list args;
-	char *prompt, *str;
+	gs_free char *prompt = NULL;
 
 	rl_initialize ();
 
 	va_start (args, prompt_fmt);
 	prompt = g_strdup_vprintf (prompt_fmt, args);
 	va_end (args);
-
-	str = nmc_readline_helper (prompt);
-
-	g_free (prompt);
-
-	return str;
+	return nmc_readline_helper (nmc_config, prompt);
 }
 
 static void
@@ -976,10 +987,14 @@ nmc_secret_redisplay (void)
  * nmc_readline(TRUE, ...) == nmc_readline(...)
  */
 char *
-nmc_readline_echo (gboolean echo_on, const char *prompt_fmt, ...)
+nmc_readline_echo (const NmcConfig *nmc_config,
+                   gboolean echo_on,
+                   const char *prompt_fmt,
+                   ...)
 {
 	va_list args;
-	char *prompt, *str;
+	gs_free char *prompt = NULL;
+	char *str;
 	HISTORY_STATE *saved_history;
 	HISTORY_STATE passwd_history = { 0, };
 
@@ -996,9 +1011,7 @@ nmc_readline_echo (gboolean echo_on, const char *prompt_fmt, ...)
 		rl_redisplay_function = nmc_secret_redisplay;
 	}
 
-	str = nmc_readline_helper (prompt);
-
-	g_free (prompt);
+	str = nmc_readline_helper (nmc_config, prompt);
 
 	/* Restore the non-hiding behavior */
 	if (!echo_on) {
@@ -1336,23 +1349,39 @@ nmc_do_cmd (NmCli *nmc, const NMCCommand cmds[], const char *cmd, int argc, char
 /**
  * nmc_complete_strings:
  * @prefix: a string to match
- * @...: a %NULL-terminated list of candidate strings
+ * @nargs: the number of elements in @args. Or -1 if @args is a NULL terminated
+ *   strv array.
+ * @args: the argument list. If @nargs is not -1, then some elements may
+ *   be %NULL to indicate to silently skip the values.
  *
  * Prints all the matching candidates for completion. Useful when there's
  * no better way to suggest completion other than a hardcoded string list.
  */
 void
-nmc_complete_strings (const char *prefix, ...)
+nmc_complete_strv (const char *prefix, gssize nargs, const char *const*args)
 {
-	va_list args;
-	const char *candidate;
+	gsize i, n;
 
-	va_start (args, prefix);
-	while ((candidate = va_arg (args, const char *))) {
-		if (!*prefix || matches (prefix, candidate))
-			g_print ("%s\n", candidate);
+	if (prefix && !prefix[0])
+		prefix = NULL;
+
+	if (nargs < 0) {
+		nm_assert (nargs == -1);
+		n = NM_PTRARRAY_LEN (args);
+	} else
+		n = (gsize) nargs;
+
+	for (i = 0; i < n; i++) {
+		const char *candidate = args[i];
+
+		if (!candidate)
+			continue;
+		if (   prefix
+		    && !matches (prefix, candidate))
+			continue;
+
+		g_print ("%s\n", candidate);
 	}
-	va_end (args);
 }
 
 /**
@@ -1384,3 +1413,14 @@ nmc_error_get_simple_message (GError *error)
 	else
 		return error->message;
 }
+
+/*****************************************************************************/
+
+NM_UTILS_LOOKUP_STR_DEFINE (nm_connectivity_to_string, NMConnectivityState,
+	NM_UTILS_LOOKUP_DEFAULT (N_("unknown")),
+	NM_UTILS_LOOKUP_ITEM (NM_CONNECTIVITY_NONE,    N_("none")),
+	NM_UTILS_LOOKUP_ITEM (NM_CONNECTIVITY_PORTAL,  N_("portal")),
+	NM_UTILS_LOOKUP_ITEM (NM_CONNECTIVITY_LIMITED, N_("limited")),
+	NM_UTILS_LOOKUP_ITEM (NM_CONNECTIVITY_FULL,    N_("full")),
+	NM_UTILS_LOOKUP_ITEM_IGNORE (NM_CONNECTIVITY_UNKNOWN),
+);
diff --git a/clients/cli/common.h b/clients/cli/common.h
index c180dfb7..688f2819 100644
--- a/clients/cli/common.h
+++ b/clients/cli/common.h
@@ -59,8 +59,13 @@ char *nmc_unique_connection_name (const GPtrArray *connections,
                                   const char *try_name);
 
 void nmc_cleanup_readline (void);
-char *nmc_readline (const char *prompt_fmt, ...) G_GNUC_PRINTF (1, 2);
-char *nmc_readline_echo (gboolean echo_on, const char *prompt_fmt, ...) G_GNUC_PRINTF (2, 3);
+char *nmc_readline (const NmcConfig *nmc_config,
+                    const char *prompt_fmt,
+                    ...) G_GNUC_PRINTF (2, 3);
+char *nmc_readline_echo (const NmcConfig *nmc_config,
+                         gboolean echo_on,
+                         const char *prompt_fmt,
+                         ...) G_GNUC_PRINTF (3, 4);
 NmcCompEntryFunc nmc_rl_compentry_func_wrap (const char *const*values);
 char *nmc_rl_gen_func_basic (const char *text, int state, const char *const*words);
 char *nmc_rl_gen_func_ifnames (const char *text, int state);
@@ -83,7 +88,9 @@ typedef struct {
 
 void nmc_do_cmd (NmCli *nmc, const NMCCommand cmds[], const char *cmd, int argc, char **argv);
 
-void nmc_complete_strings (const char *prefix, ...) G_GNUC_NULL_TERMINATED;
+void nmc_complete_strv (const char *prefix, gssize nargs, const char *const*args);
+
+#define nmc_complete_strings(prefix, ...) nmc_complete_strv ((prefix), NM_NARG (__VA_ARGS__), (const char *const[]) { __VA_ARGS__ })
 
 void nmc_complete_bool (const char *prefix);
 
@@ -93,4 +100,6 @@ extern const NmcMetaGenericInfo *const metagen_ip4_config[];
 extern const NmcMetaGenericInfo *const metagen_ip6_config[];
 extern const NmcMetaGenericInfo *const metagen_dhcp_config[];
 
+const char *nm_connectivity_to_string (NMConnectivityState connectivity);
+
 #endif /* NMC_COMMON_H */
diff --git a/clients/cli/connections.c b/clients/cli/connections.c
index 8a10691e..6db44f87 100644
--- a/clients/cli/connections.c
+++ b/clients/cli/connections.c
@@ -22,14 +22,13 @@
 #include "connections.h"
 
 #include 
-#include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
 #include 
+#include 
 
 #include "nm-client-utils.h"
 #include "nm-vpn-helpers.h"
@@ -140,15 +139,68 @@ active_connection_get_state_ord (NMActiveConnection *active)
 	return -1;
 }
 
-static int
-active_connection_cmp (NMActiveConnection *ac_a, NMActiveConnection *ac_b)
+int
+nmc_active_connection_cmp (NMActiveConnection *ac_a, NMActiveConnection *ac_b)
 {
+	NMSettingIPConfig *s_ip;
+	NMRemoteConnection *conn;
+	NMIPConfig *da_ip;
+	NMIPConfig *db_ip;
+	int da_num_addrs;
+	int db_num_addrs;
+	int cmp = 0;
+
+	/* Non-active sort last. */
 	NM_CMP_SELF (ac_a, ac_b);
 	NM_CMP_DIRECT (active_connection_get_state_ord (ac_b),
 	               active_connection_get_state_ord (ac_a));
-	NM_CMP_DIRECT_STRCMP0 (nm_active_connection_get_id (ac_a), nm_active_connection_get_id (ac_b));
-	NM_CMP_DIRECT_STRCMP0 (nm_active_connection_get_connection_type (ac_a), nm_active_connection_get_connection_type (ac_b));
-	NM_CMP_DIRECT_STRCMP0 (nm_object_get_path (NM_OBJECT (ac_a)), nm_object_get_path (NM_OBJECT (ac_b)));
+
+	/* Shared connections (likely hotspots) go on the top if possible */
+	conn = nm_active_connection_get_connection (ac_a);
+	s_ip = conn ? nm_connection_get_setting_ip6_config (NM_CONNECTION (conn)) : NULL;
+	if (s_ip && strcmp (nm_setting_ip_config_get_method (s_ip), NM_SETTING_IP6_CONFIG_METHOD_SHARED) == 0)
+		cmp++;
+	conn = nm_active_connection_get_connection (ac_b);
+	s_ip = conn ? nm_connection_get_setting_ip6_config (NM_CONNECTION (conn)) : NULL;
+	if (s_ip && strcmp (nm_setting_ip_config_get_method (s_ip), NM_SETTING_IP6_CONFIG_METHOD_SHARED) == 0)
+		cmp--;
+	NM_CMP_RETURN (cmp);
+
+	conn = nm_active_connection_get_connection (ac_a);
+	s_ip = conn ? nm_connection_get_setting_ip4_config (NM_CONNECTION (conn)) : NULL;
+	if (s_ip && strcmp (nm_setting_ip_config_get_method (s_ip), NM_SETTING_IP4_CONFIG_METHOD_SHARED) == 0)
+		cmp++;
+	conn = nm_active_connection_get_connection (ac_b);
+	s_ip = conn ? nm_connection_get_setting_ip4_config (NM_CONNECTION (conn)) : NULL;
+	if (s_ip && strcmp (nm_setting_ip_config_get_method (s_ip), NM_SETTING_IP4_CONFIG_METHOD_SHARED) == 0)
+		cmp--;
+	NM_CMP_RETURN (cmp);
+
+	/* VPNs go next */
+	NM_CMP_DIRECT (!!nm_active_connection_get_vpn (ac_a),
+	               !!nm_active_connection_get_vpn (ac_b));
+
+	/* Default devices are prioritized */
+	NM_CMP_DIRECT (nm_active_connection_get_default (ac_a),
+	               nm_active_connection_get_default (ac_b));
+
+	/* Default IPv6 devices are prioritized */
+	NM_CMP_DIRECT (nm_active_connection_get_default6 (ac_a),
+	               nm_active_connection_get_default6 (ac_b));
+
+	/* Sort by number of addresses. */
+	da_ip = nm_active_connection_get_ip4_config (ac_a);
+	da_num_addrs = da_ip ? nm_ip_config_get_addresses (da_ip)->len : 0;
+	db_ip = nm_active_connection_get_ip4_config (ac_b);
+	db_num_addrs = db_ip ? nm_ip_config_get_addresses (db_ip)->len : 0;
+
+	da_ip = nm_active_connection_get_ip6_config (ac_a);
+	da_num_addrs += da_ip ? nm_ip_config_get_addresses (da_ip)->len : 0;
+	db_ip = nm_active_connection_get_ip6_config (ac_b);
+	db_num_addrs += db_ip ? nm_ip_config_get_addresses (db_ip)->len : 0;
+
+	NM_CMP_DIRECT (da_num_addrs, db_num_addrs);
+
 	return 0;
 }
 
@@ -742,6 +794,7 @@ const NmcMetaGenericInfo *const metagen_con_active_vpn[_NMC_GENERIC_INFO_TYPE_CO
                                          NM_SETTING_IP4_CONFIG_SETTING_NAME","\
                                          NM_SETTING_IP6_CONFIG_SETTING_NAME","\
                                          NM_SETTING_SERIAL_SETTING_NAME","\
+                                         NM_SETTING_WIFI_P2P_SETTING_NAME","\
                                          NM_SETTING_PPP_SETTING_NAME","\
                                          NM_SETTING_PPPOE_SETTING_NAME","\
                                          NM_SETTING_ADSL_SETTING_NAME","\
@@ -769,6 +822,7 @@ const NmcMetaGenericInfo *const metagen_con_active_vpn[_NMC_GENERIC_INFO_TYPE_CO
                                          NM_SETTING_VXLAN_SETTING_NAME"," \
                                          NM_SETTING_WPAN_SETTING_NAME","\
                                          NM_SETTING_6LOWPAN_SETTING_NAME","\
+                                         NM_SETTING_WIREGUARD_SETTING_NAME","\
                                          NM_SETTING_PROXY_SETTING_NAME"," \
                                          NM_SETTING_TC_CONFIG_SETTING_NAME"," \
                                          NM_SETTING_SRIOV_SETTING_NAME"," \
@@ -991,8 +1045,10 @@ usage_connection_add (void)
 	              "                  [source-port-min <0-65535>]\n"
 	              "                  [source-port-max <0-65535>]\n"
 	              "                  [destination-port <0-65535>]\n\n"
-	              "    wpan:         [short-addr <0x0000-0xffff>]\n\n"
-	              "                  [pan-id <0x0000-0xffff>]\n\n"
+	              "    wpan:         [short-addr <0x0000-0xffff>]\n"
+	              "                  [pan-id <0x0000-0xffff>]\n"
+	              "                  [page ]\n"
+	              "                  [channel ]\n"
 	              "                  [mac ]\n\n"
 	              "    6lowpan:      dev \n"
 	              "    dummy:\n\n"
@@ -1141,12 +1197,20 @@ construct_header_name (const char *base, const char *spec)
 }
 
 static int
-get_ac_for_connection_cmp (gconstpointer pa, gconstpointer pb, gpointer user_data)
+get_ac_for_connection_cmp (gconstpointer pa, gconstpointer pb)
 {
 	NMActiveConnection *ac_a = *((NMActiveConnection *const*) pa);
 	NMActiveConnection *ac_b = *((NMActiveConnection *const*) pb);
 
-	return active_connection_cmp (ac_a, ac_b);
+	NM_CMP_RETURN (nmc_active_connection_cmp (ac_a, ac_b));
+	NM_CMP_DIRECT_STRCMP0 (nm_active_connection_get_id (ac_a),
+	                       nm_active_connection_get_id (ac_b));
+	NM_CMP_DIRECT_STRCMP0 (nm_active_connection_get_connection_type (ac_a),
+	                       nm_active_connection_get_connection_type (ac_b));
+	NM_CMP_DIRECT_STRCMP0 (nm_object_get_path (NM_OBJECT (ac_a)),
+	                       nm_object_get_path (NM_OBJECT (ac_b)));
+
+	g_return_val_if_reached (0);
 }
 
 static NMActiveConnection *
@@ -1172,7 +1236,7 @@ get_ac_for_connection (const GPtrArray *active_cons, NMConnection *connection, G
 	}
 
 	if (result) {
-		g_ptr_array_sort_with_data (result, get_ac_for_connection_cmp, NULL);
+		g_ptr_array_sort (result, get_ac_for_connection_cmp);
 		best_candidate = result->pdata[0];
 	}
 
@@ -1629,12 +1693,10 @@ con_show_get_items_cmp (gconstpointer pa, gconstpointer pb, gpointer user_data)
 			switch (item) {
 
 			case NMC_SORT_ACTIVE:
-				NM_CMP_DIRECT (active_connection_get_state_ord (ac_b),
-				               active_connection_get_state_ord (ac_a));
+				NM_CMP_RETURN (nmc_active_connection_cmp (ac_b, ac_a));
 				break;
 			case NMC_SORT_ACTIVE_INV:
-				NM_CMP_DIRECT (active_connection_get_state_ord (ac_a),
-				               active_connection_get_state_ord (ac_b));
+				NM_CMP_RETURN (nmc_active_connection_cmp (ac_a, ac_b));
 				break;
 
 			case NMC_SORT_TYPE:
@@ -1673,13 +1735,12 @@ con_show_get_items_cmp (gconstpointer pa, gconstpointer pb, gpointer user_data)
 		                       nm_connection_get_uuid (c_b));
 		NM_CMP_DIRECT_STRCMP0 (nm_connection_get_path (c_a),
 		                       nm_connection_get_path (c_b));
-
-		/* This line is not expected to be reached, because there shouldn't be two
-		 * different connections with the same path. Anyway, fall-through and compare by
-		 * active connections... */
 	}
 
-	return active_connection_cmp (ac_a, ac_b);
+	NM_CMP_DIRECT_STRCMP0 (nm_object_get_path (NM_OBJECT (ac_a)),
+	                       nm_object_get_path (NM_OBJECT (ac_b)));
+
+	g_return_val_if_reached (0);
 }
 
 static GPtrArray *
@@ -1755,7 +1816,7 @@ con_show_get_items (NmCli *nmc, gboolean active_only, gboolean show_active_field
 		 * color (activated or not) based on primary_active. */
 		if (!row_data) {
 			/* this is unexpected. The active connection references a connection that
-			 * seemingly no longer exists. It's a bug in libnm. Add a row nontheless. */
+			 * seemingly no longer exists. It's a bug in libnm. Add a row nonetheless. */
 			row_data = _metagen_con_show_row_data_new_for_connection (c, show_active_fields);
 			g_hash_table_insert (row_hash, c, row_data);
 		}
@@ -1985,8 +2046,7 @@ do_connections_show (NmCli *nmc, int argc, char **argv)
 			}
 		}
 
-		/* Optionally start paging the output. */
-		nmc_terminal_spawn_pager (&nmc->nmc_config);
+		nm_cli_spawn_pager (nmc);
 
 		items = con_show_get_items (nmc, active_only, show_active_fields, order);
 		g_ptr_array_add (items, NULL);
@@ -2287,7 +2347,7 @@ find_device_for_connection (NmCli *nmc,
 					continue;
 
 				if (!nm_device_connection_compatible (dev, connection, error)) {
-					g_prefix_error (error, _("device '%s' not compatible with connection '%s':"),
+					g_prefix_error (error, _("device '%s' not compatible with connection '%s': "),
 					                iface, nm_setting_connection_get_id (s_con));
 					return FALSE;
 				}
@@ -2340,6 +2400,43 @@ typedef struct {
 	NMActiveConnection *active;
 } ActivateConnectionInfo;
 
+static void
+active_connection_hint (GString *return_text,
+                        NMActiveConnection *active,
+                        NMDevice *device)
+{
+	NMRemoteConnection *connection;
+	nm_auto_free_gstring GString *hint = NULL;
+	const GPtrArray *devices;
+	guint i;
+
+	if (!active)
+		return;
+
+	if (!nm_streq (NM_CONFIG_DEFAULT_LOGGING_BACKEND, "journal"))
+		return;
+
+	connection = nm_active_connection_get_connection (active);
+	g_return_if_fail (connection);
+
+	hint = g_string_new ("journalctl -xe ");
+	g_string_append_printf (hint, "NM_CONNECTION=%s",
+	                        nm_connection_get_uuid (NM_CONNECTION (connection)));
+
+	if (device)
+		g_string_append_printf (hint, " + NM_DEVICE=%s", nm_device_get_iface (device));
+	else {
+		devices = nm_active_connection_get_devices (active);
+		for (i = 0; i < devices->len; i++) {
+			g_string_append_printf (hint, " + NM_DEVICE=%s",
+			                        nm_device_get_iface (NM_DEVICE (g_ptr_array_index (devices, i))));
+		}
+	}
+
+	g_string_append (return_text, "\n");
+	g_string_append_printf (return_text, _("Hint: use '%s' to get more details."), hint->str);
+}
+
 static void activate_connection_info_finish (ActivateConnectionInfo *info);
 
 static void
@@ -2368,6 +2465,7 @@ check_activated (ActivateConnectionInfo *info)
 		nm_assert (reason);
 		g_string_printf (nmc->return_text, _("Error: Connection activation failed: %s"),
 		                 reason);
+		active_connection_hint (nmc->return_text, info->active, info->device);
 		nmc->return_value = NMC_RESULT_ERROR_CON_ACTIVATION;
 		activate_connection_info_finish (info);
 		break;
@@ -2375,7 +2473,7 @@ check_activated (ActivateConnectionInfo *info)
 		if (nmc->secret_agent) {
 			NMRemoteConnection *connection = nm_active_connection_get_connection (info->active);
 
-			nm_secret_agent_simple_enable (NM_SECRET_AGENT_SIMPLE (nmc->secret_agent),
+			nm_secret_agent_simple_enable (nmc->secret_agent,
 			                               nm_connection_get_path (NM_CONNECTION (connection)));
 		}
 		break;
@@ -2490,6 +2588,7 @@ activate_connection_cb (GObject *client, GAsyncResult *result, gpointer user_dat
 		g_string_printf (nmc->return_text, _("Error: Connection activation failed: %s"),
 		                 error->message);
 		g_error_free (error);
+		active_connection_hint (nmc->return_text, info->active, info->device);
 		nmc->return_value = NMC_RESULT_ERROR_CON_ACTIVATION;
 		activate_connection_info_finish (info);
 	} else {
@@ -2676,7 +2775,6 @@ nmc_activate_connection (NmCli *nmc,
 		g_hash_table_destroy (nmc->pwds_hash);
 	nmc->pwds_hash = pwds_hash;
 
-	/* Create secret agent */
 	nmc->secret_agent = nm_secret_agent_simple_new ("nmcli-connect");
 	if (nmc->secret_agent) {
 		g_signal_connect (nmc->secret_agent,
@@ -2726,14 +2824,14 @@ do_connection_up (NmCli *nmc, int argc, char **argv)
 	argc_ptr = &argc;
 
 	if (argc == 0 && nmc->ask) {
-		char *line;
+		gs_free char *line = NULL;
 
 		/* nmc_do_cmd() should not call this with argc=0. */
 		g_assert (!nmc->complete);
 
-		line = nmc_readline (PROMPT_CONNECTION);
+		line = nmc_readline (&nmc->nmc_config,
+		                     PROMPT_CONNECTION);
 		nmc_string_to_arg_array (line, NULL, TRUE, &arg_arr, &arg_num);
-		g_free (line);
 		argv_ptr = &arg_arr;
 		argc_ptr = &arg_num;
 	}
@@ -2906,6 +3004,7 @@ connection_cb_info_finish (ConnectionCbInfo *info, gpointer obj)
 
 	nm_clear_g_source (&info->timeout_id);
 	nm_clear_g_cancellable (&info->cancellable);
+	g_ptr_array_free (info->obj_list, TRUE);
 
 	g_signal_handlers_disconnect_by_func (info->nmc->client, connection_removed_cb, info);
 
@@ -2980,9 +3079,11 @@ do_connection_down (NmCli *nmc, int argc, char **argv)
 		g_assert (!nmc->complete);
 
 		if (nmc->ask) {
-			char *line = nmc_readline (PROMPT_ACTIVE_CONNECTIONS);
+			gs_free char *line = NULL;
+
+			line = nmc_readline (&nmc->nmc_config,
+			                     PROMPT_ACTIVE_CONNECTIONS);
 			nmc_string_to_arg_array (line, NULL, TRUE, &arg_arr, &arg_num);
-			g_free (line);
 			arg_ptr = arg_arr;
 		}
 		if (arg_num == 0) {
@@ -3204,7 +3305,7 @@ get_valid_properties_string (const NMMetaSettingValidPartItem *const*array,
 	str = g_string_sized_new (1024);
 
 	for (i = 0; i < 2; i++, iter = array_slv) {
-		for(; !full_match && iter && *iter; iter++) {
+		for (; !full_match && iter && *iter; iter++) {
 			const NMMetaSettingInfoEditor *setting_info = (*iter)->setting_info;
 
 			if (   !(g_str_has_prefix (setting_info->general->setting_name, prefix))
@@ -3850,9 +3951,13 @@ reset_options (void)
 }
 
 static gboolean
-set_property (NMConnection *connection,
-              const char *setting_name, const char *property, const char *value,
-              char modifier, GError **error)
+set_property (NMClient *client,
+              NMConnection *connection,
+              const char *setting_name,
+              const char *property,
+              const char *value,
+              char modifier,
+              GError **error)
 {
 	gs_free char *property_name = NULL, *value_free = NULL;
 	NMSetting *setting;
@@ -3885,7 +3990,7 @@ set_property (NMConnection *connection,
 			value = value_free = g_strdup (value);
 			nmc_setting_reset_property (setting, property_name, NULL);
 		}
-		if (!nmc_setting_set_property (setting, property_name, value, &local)) {
+		if (!nmc_setting_set_property (client, setting, property_name, value, &local)) {
 			g_set_error (error, NMCLI_ERROR, NMC_RESULT_ERROR_USER_INPUT,
 			             _("Error: failed to modify %s.%s: %s."),
 			             setting_name, property, local->message);
@@ -3937,7 +4042,7 @@ set_option (NmCli *nmc, NMConnection *connection, const NMMetaAbstractInfo *abst
 	if (option && option->check_and_set) {
 		return option->check_and_set (nmc, connection, option, value, error);
 	} else if (value) {
-		return set_property (connection, setting_name, property_name,
+		return set_property (nmc->client, connection, setting_name, property_name,
 		                     value, inf_flags & NM_META_PROPERTY_INF_FLAG_MULTI ? '+' : '\0', error);
 	} else if (inf_flags & NM_META_PROPERTY_INF_FLAG_REQD) {
 		g_set_error (error, NMCLI_ERROR, NMC_RESULT_ERROR_USER_INPUT,
@@ -3985,7 +4090,7 @@ con_settings (NMConnection *connection, const NMMetaSettingValidPartItem *const*
 
 /*
  * Make sure all required settings are in place (should be called when
- * it's possible that a type is aready set).
+ * it's possible that a type is already set).
  */
 static void
 ensure_settings (NMConnection *connection, const NMMetaSettingValidPartItem *const*item)
@@ -4059,7 +4164,7 @@ set_connection_type (NmCli *nmc, NMConnection *con, const OptionInfo *option, co
 	}
 
 	if (slave_type) {
-		if (!set_property (con, NM_SETTING_CONNECTION_SETTING_NAME,
+		if (!set_property (nmc->client, con, NM_SETTING_CONNECTION_SETTING_NAME,
 		                   NM_SETTING_CONNECTION_SLAVE_TYPE, slave_type,
 		                   '\0', error)) {
 			return FALSE;
@@ -4076,7 +4181,7 @@ set_connection_type (NmCli *nmc, NMConnection *con, const OptionInfo *option, co
 		                 NM_SETTING_CONNECTION_INTERFACE_NAME);
 	}
 
-	if (!set_property (con, option->setting_info->general->setting_name, option->property, value, '\0', error))
+	if (!set_property (nmc->client, con, option->setting_info->general->setting_name, option->property, value, '\0', error))
 		return FALSE;
 
 	if (!con_settings (con, &type_settings, &slv_settings, error))
@@ -4105,7 +4210,7 @@ set_connection_iface (NmCli *nmc, NMConnection *con, const OptionInfo *option, c
 		}
 	}
 
-	return set_property (con, option->setting_info->general->setting_name, option->property, value, '\0', error);
+	return set_property (nmc->client, con, option->setting_info->general->setting_name, option->property, value, '\0', error);
 }
 
 static gboolean
@@ -4128,13 +4233,13 @@ set_connection_master (NmCli *nmc, NMConnection *con, const OptionInfo *option,
 	connections = nm_client_get_connections (nmc->client);
 	value = normalized_master_for_slave (connections, value, slave_type, &slave_type);
 
-	if (!set_property (con, NM_SETTING_CONNECTION_SETTING_NAME,
+	if (!set_property (nmc->client, con, NM_SETTING_CONNECTION_SETTING_NAME,
 	                   NM_SETTING_CONNECTION_SLAVE_TYPE, slave_type,
 	                   '\0', error)) {
 		return FALSE;
 	}
 
-	return set_property (con, option->setting_info->general->setting_name, option->property, value, '\0', error);
+	return set_property (nmc->client, con, option->setting_info->general->setting_name, option->property, value, '\0', error);
 }
 
 static gboolean
@@ -4248,7 +4353,7 @@ set_bluetooth_type (NmCli *nmc, NMConnection *con, const OptionInfo *option, con
 		return FALSE;
 	}
 
-	return set_property (con, option->setting_info->general->setting_name, option->property, value, '\0', error);
+	return set_property (nmc->client, con, option->setting_info->general->setting_name, option->property, value, '\0', error);
 }
 
 static gboolean
@@ -4267,7 +4372,7 @@ set_ip4_address (NmCli *nmc, NMConnection *con, const OptionInfo *option, const
 		              NM_SETTING_IP_CONFIG_METHOD, NM_SETTING_IP4_CONFIG_METHOD_MANUAL,
 		              NULL);
 	}
-	return set_property (con, option->setting_info->general->setting_name, option->property, value,
+	return set_property (nmc->client, con, option->setting_info->general->setting_name, option->property, value,
 	                     '+', error);
 }
 
@@ -4287,7 +4392,7 @@ set_ip6_address (NmCli *nmc, NMConnection *con, const OptionInfo *option, const
 		              NM_SETTING_IP_CONFIG_METHOD, NM_SETTING_IP6_CONFIG_METHOD_MANUAL,
 		              NULL);
 	}
-	return set_property (con, option->setting_info->general->setting_name, option->property, value,
+	return set_property (nmc->client, con, option->setting_info->general->setting_name, option->property, value,
 	                     '+', error);
 }
 
@@ -4573,7 +4678,7 @@ nmc_read_connection_properties (NmCli *nmc,
 			if (!*argc && nmc->complete)
 				complete_property (setting, strv[1], value ?: "", connection);
 
-			if (!set_property (connection, setting_name, strv[1], value, modifier, error))
+			if (!set_property (nmc->client, connection, setting_name, strv[1], value, modifier, error))
 				return FALSE;
 		} else {
 			NMMetaSettingType s;
@@ -4853,7 +4958,9 @@ ask_option (NmCli *nmc, NMConnection *connection, const NMMetaAbstractInfo *abst
 		g_print (_("You can specify this option more than once. Press  when you're done.\n"));
 
 again:
-	value = nmc_readline ("%s", prompt);
+	value = nmc_readline (&nmc->nmc_config,
+	                      "%s",
+	                      prompt);
 	if (multi && !value)
 		return;
 
@@ -4943,23 +5050,25 @@ questionnaire_mandatory (NmCli *nmc, NMConnection *connection)
 }
 
 static gboolean
-want_provide_opt_args (const char *type, int num)
+want_provide_opt_args (const NmcConfig *nmc_config,
+                       const char *type,
+                       guint num)
 {
-	char *answer;
-	gboolean ret = TRUE;
+	gs_free char *answer = NULL;
 
 	/* Ask for optional arguments. */
 	g_print (ngettext ("There is %d optional setting for %s.\n",
-	                   "There are %d optional settings for %s.\n", num),
-	         num, type);
-	answer = nmc_readline (ngettext ("Do you want to provide it? %s",
-	                                 "Do you want to provide them? %s", num),
+	                   "There are %d optional settings for %s.\n",
+	                   num),
+	         (int) num,
+	         type);
+	answer = nmc_readline (nmc_config,
+	                       ngettext ("Do you want to provide it? %s",
+	                                 "Do you want to provide them? %s",
+	                                 num),
 	                       prompt_yes_no (TRUE, NULL));
-	answer = answer ? g_strstrip (answer) : NULL;
-	if (answer && !matches (answer, WORD_YES))
-		ret = FALSE;
-	g_free (answer);
-	return ret;
+	nm_strstrip (answer);
+	return !answer || matches (answer, WORD_YES);
 }
 
 static gboolean
@@ -5029,7 +5138,9 @@ again:
 
 		/* Now ask for the settings. */
 		if (   already_confirmed
-			|| want_provide_opt_args (_(setting_info->pretty_name), infos->len)) {
+		    || want_provide_opt_args (&nmc->nmc_config,
+		                              _(setting_info->pretty_name),
+		                              infos->len)) {
 			ask_option (nmc, connection, infos->pdata[0]);
 			already_confirmed = TRUE;
 			/* asking for an option may enable other options. Create the list again. */
@@ -5059,7 +5170,7 @@ do_connection_add (NmCli *nmc, int argc, char **argv)
 
 	next_arg (nmc, &argc, &argv, NULL);
 
-	rl_attempted_completion_function = (rl_completion_func_t *) nmcli_con_add_tab_completion;
+	rl_attempted_completion_function = nmcli_con_add_tab_completion;
 
 	nmc->return_value = NMC_RESULT_SUCCESS;
 
@@ -6615,7 +6726,7 @@ progress_activation_editor_cb (gpointer user_data)
 		NMRemoteConnection *connection;
 
 		connection = nm_active_connection_get_connection (ac);
-		nm_secret_agent_simple_enable (NM_SECRET_AGENT_SIMPLE (info->nmc->secret_agent),
+		nm_secret_agent_simple_enable (info->nmc->secret_agent,
 		                               nm_object_get_path (NM_OBJECT (connection)));
 	}
 
@@ -6656,6 +6767,10 @@ activate_connection_editor_cb (GObject *client,
 		} else
 			g_object_unref (active);
 	}
+
+	nm_g_object_unref (info->device);
+	g_free (info);
+
 	set_info_and_signal_editor_thread (error, monitor_ac_info);
 	g_clear_error (&error);
 }
@@ -6749,20 +6864,16 @@ is_connection_dirty (NMConnection *connection, NMRemoteConnection *remote)
 }
 
 static gboolean
-confirm_quit (void)
+confirm_quit (const NmcConfig *nmc_config)
 {
-	char *answer;
-	gboolean want_quit = FALSE;
+	gs_free char *answer = NULL;
 
-	answer = nmc_readline (_("The connection is not saved. "
+	answer = nmc_readline (nmc_config,
+	                       _("The connection is not saved. "
 	                         "Do you really want to quit? %s"),
 	                       prompt_yes_no (FALSE, NULL));
-	answer = answer ? g_strstrip (answer) : NULL;
-	if (answer && matches (answer, WORD_YES))
-		want_quit = TRUE;
-
-	g_free (answer);
-	return want_quit;
+	nm_strstrip (answer);
+	return (answer && matches (answer, WORD_YES));
 }
 
 /*
@@ -6797,7 +6908,7 @@ property_edit_submenu (NmCli *nmc,
 		gboolean removed;
 		gboolean dirty;
 
-		/* Get the remote connection again, it may have disapeared */
+		/* Get the remote connection again, it may have disappeared */
 		removed = refresh_remote_connection (rem_con_weak, rem_con);
 		if (removed) {
 			g_print (_("The connection profile has been removed from another client. "
@@ -6810,10 +6921,13 @@ property_edit_submenu (NmCli *nmc,
 		if (nmc->editor_status_line)
 			editor_show_status_line (connection, dirty, temp_changes);
 
-		cmd_property_user = nmc_readline ("%s", prompt);
+		cmd_property_user = nmc_readline (&nmc->nmc_config,
+		                                  "%s",
+		                                  prompt);
 		if (!cmd_property_user || !*cmd_property_user)
 			continue;
-		cmdsub = parse_editor_sub_cmd (g_strstrip (cmd_property_user), &cmd_property_arg);
+		g_strstrip (cmd_property_user);
+		cmdsub = parse_editor_sub_cmd (cmd_property_user, &cmd_property_arg);
 
 		switch (cmdsub) {
 		case NMC_EDITOR_SUB_CMD_SET:
@@ -6834,7 +6948,9 @@ property_edit_submenu (NmCli *nmc,
 					g_print (_("Allowed values for '%s' property: %s\n"),
 					         prop_name, avals_str);
 				}
-				prop_val_user = nmc_readline (_("Enter '%s' value: "), prop_name);
+				prop_val_user = nmc_readline (&nmc->nmc_config,
+				                              _("Enter '%s' value: "),
+				                              prop_name);
 			} else
 				prop_val_user = g_strdup (cmd_property_arg);
 
@@ -6846,7 +6962,7 @@ property_edit_submenu (NmCli *nmc,
 				nmc_property_set_default_value (curr_setting, prop_name);
 			}
 
-			set_result = nmc_setting_set_property (curr_setting, prop_name, prop_val_user, &tmp_err);
+			set_result = nmc_setting_set_property (nmc->client, curr_setting, prop_name, prop_val_user, &tmp_err);
 			if (!set_result) {
 				g_print (_("Error: failed to set '%s' property: %s\n"), prop_name, tmp_err->message);
 				g_clear_error (&tmp_err);
@@ -6862,12 +6978,14 @@ property_edit_submenu (NmCli *nmc,
 		case NMC_EDITOR_SUB_CMD_CHANGE:
 			rl_startup_hook = nmc_rl_set_deftext;
 			nmc_rl_pre_input_deftext = nmc_setting_get_property_parsable (curr_setting, prop_name, NULL);
-			prop_val_user = nmc_readline (_("Edit '%s' value: "), prop_name);
+			prop_val_user = nmc_readline (&nmc->nmc_config,
+			                              _("Edit '%s' value: "),
+			                              prop_name);
 
 			nmc_property_get_gvalue (curr_setting, prop_name, &prop_g_value);
 			nmc_property_set_default_value (curr_setting, prop_name);
 
-			if (!nmc_setting_set_property (curr_setting, prop_name, prop_val_user, &tmp_err)) {
+			if (!nmc_setting_set_property (nmc->client, curr_setting, prop_name, prop_val_user, &tmp_err)) {
 				g_print (_("Error: failed to set '%s' property: %s\n"), prop_name, tmp_err->message);
 				g_clear_error (&tmp_err);
 				g_signal_handlers_block_matched (curr_setting, G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, NULL);
@@ -6879,19 +6997,20 @@ property_edit_submenu (NmCli *nmc,
 		case NMC_EDITOR_SUB_CMD_REMOVE:
 			if (cmd_property_arg) {
 				unsigned long val_int = G_MAXUINT32;
-				char *option = NULL;
+				gs_free char *option = NULL;
 
-				if (!nmc_string_to_uint (cmd_property_arg, TRUE, 0, G_MAXUINT32, &val_int))
+				if (!nmc_string_to_uint (cmd_property_arg, TRUE, 0, G_MAXUINT32, &val_int)) {
 					option = g_strdup (cmd_property_arg);
+					g_strstrip (option);
+				}
 
 				if (!nmc_setting_remove_property_option (curr_setting, prop_name,
-				                                         option ? g_strstrip (option) : NULL,
+				                                         option,
 				                                         (guint32) val_int,
 				                                         &tmp_err)) {
 					g_print (_("Error: %s\n"), tmp_err->message);
 					g_clear_error (&tmp_err);
 				}
-				g_free (option);
 			} else {
 				if (!nmc_setting_reset_property (curr_setting, prop_name, &tmp_err)) {
 					g_print (_("Error: failed to remove value of '%s': %s\n"), prop_name,
@@ -6934,7 +7053,7 @@ property_edit_submenu (NmCli *nmc,
 
 		case NMC_EDITOR_SUB_CMD_QUIT:
 			if (is_connection_dirty (connection, *rem_con)) {
-				if (confirm_quit ())
+				if (confirm_quit (&nmc->nmc_config))
 					return FALSE;
 			} else
 				return FALSE;
@@ -6995,7 +7114,8 @@ create_setting_by_name (const char *name, const NMMetaSettingValidPartItem *cons
 }
 
 static const char *
-ask_check_setting (const char *arg,
+ask_check_setting (const NmcConfig *nmc_config,
+                   const char *arg,
                    const NMMetaSettingValidPartItem *const*valid_settings_main,
                    const NMMetaSettingValidPartItem *const*valid_settings_slave,
                    const char *valid_settings_str)
@@ -7006,12 +7126,12 @@ ask_check_setting (const char *arg,
 
 	if (!arg) {
 		g_print (_("Available settings: %s\n"), valid_settings_str);
-		setting_name_user = nmc_readline (EDITOR_PROMPT_SETTING);
+		setting_name_user = nmc_readline (nmc_config,
+		                                  EDITOR_PROMPT_SETTING);
 	} else
 		setting_name_user = g_strdup (arg);
 
-	if (setting_name_user)
-		g_strstrip (setting_name_user);
+	nm_strstrip (setting_name_user);
 
 	if (!(setting_name = check_valid_name (setting_name_user,
 	                                       valid_settings_main,
@@ -7025,7 +7145,8 @@ ask_check_setting (const char *arg,
 }
 
 static const char *
-ask_check_property (const char *arg,
+ask_check_property (const NmcConfig *nmc_config,
+                    const char *arg,
                     const char **valid_props,
                     const char *valid_props_str)
 {
@@ -7035,9 +7156,9 @@ ask_check_property (const char *arg,
 
 	if (!arg) {
 		g_print (_("Available properties: %s\n"), valid_props_str);
-		prop_name_user = nmc_readline (EDITOR_PROMPT_PROPERTY);
-		if (prop_name_user)
-			g_strstrip (prop_name_user);
+		prop_name_user = nmc_readline (nmc_config,
+		                               EDITOR_PROMPT_PROPERTY);
+		nm_strstrip (prop_name_user);
 	} else
 		prop_name_user = g_strdup (arg);
 
@@ -7064,7 +7185,9 @@ update_connection_timestamp (NMConnection *src, NMConnection *dst)
 }
 
 static gboolean
-confirm_connection_saving (NMConnection *local, NMConnection *remote)
+confirm_connection_saving (const NmcConfig *nmc_config,
+                           NMConnection *local,
+                           NMConnection *remote)
 {
 	NMSettingConnection *s_con_loc, *s_con_rem;
 	gboolean ac_local, ac_remote;
@@ -7082,16 +7205,15 @@ confirm_connection_saving (NMConnection *local, NMConnection *remote)
 		ac_remote = FALSE;
 
 	if (ac_local && !ac_remote) {
-		char *answer;
-		answer = nmc_readline (_("Saving the connection with 'autoconnect=yes'. "
+		gs_free char *answer = NULL;
+
+		answer = nmc_readline (nmc_config,
+		                       _("Saving the connection with 'autoconnect=yes'. "
 		                         "That might result in an immediate activation of the connection.\n"
-		                         "Do you still want to save? %s"), prompt_yes_no (TRUE, NULL));
-		answer = answer ? g_strstrip (answer) : NULL;
-		if (!answer || matches (answer, WORD_YES))
-			confirmed = TRUE;
-		else
-			confirmed = FALSE;
-		g_free (answer);
+		                         "Do you still want to save? %s"),
+		                       prompt_yes_no (TRUE, NULL));
+		nm_strstrip (answer);
+		confirmed = (!answer || matches (answer, WORD_YES));
 	}
 	return confirmed;
 }
@@ -7196,9 +7318,11 @@ editor_menu_main (NmCli *nmc, NMConnection *connection, const char *connection_t
 		if (nmc->editor_status_line)
 			editor_show_status_line (connection, dirty, temp_changes);
 
-		cmd_user = nmc_readline ("%s", menu_ctx.main_prompt);
+		cmd_user = nmc_readline (&nmc->nmc_config,
+		                         "%s",
+		                         menu_ctx.main_prompt);
 
-		/* Get the remote connection again, it may have disapeared */
+		/* Get the remote connection again, it may have disappeared */
 		removed = refresh_remote_connection (&weak, &rem_con);
 		if (removed) {
 			g_print (_("The connection profile has been removed from another client. "
@@ -7208,7 +7332,9 @@ editor_menu_main (NmCli *nmc, NMConnection *connection, const char *connection_t
 		if (!cmd_user || !*cmd_user)
 			continue;
 
-		cmd = parse_editor_main_cmd (g_strstrip (cmd_user), &cmd_arg);
+		g_strstrip (cmd_user);
+
+		cmd = parse_editor_main_cmd (cmd_user, &cmd_arg);
 
 		split_editor_main_cmd_args (cmd_arg, &cmd_arg_s, &cmd_arg_p, &cmd_arg_v);
 		switch (cmd) {
@@ -7222,7 +7348,8 @@ editor_menu_main (NmCli *nmc, NMConnection *connection, const char *connection_t
 					const char *const*avals;
 					GError *tmp_err = NULL;
 
-					prop_name = ask_check_property (cmd_arg,
+					prop_name = ask_check_property (&nmc->nmc_config,
+					                                cmd_arg,
 					                                (const char **) menu_ctx.valid_props,
 					                                menu_ctx.valid_props_str);
 					if (!prop_name)
@@ -7236,10 +7363,12 @@ editor_menu_main (NmCli *nmc, NMConnection *connection, const char *connection_t
 						g_print (_("Allowed values for '%s' property: %s\n"),
 						         prop_name, avals_str);
 					}
-					prop_val_user = nmc_readline (_("Enter '%s' value: "), prop_name);
+					prop_val_user = nmc_readline (&nmc->nmc_config,
+					                              _("Enter '%s' value: "),
+					                              prop_name);
 
 					/* Set property value */
-					if (!nmc_setting_set_property (menu_ctx.curr_setting, prop_name, prop_val_user, &tmp_err)) {
+					if (!nmc_setting_set_property (nmc->client, menu_ctx.curr_setting, prop_name, prop_val_user, &tmp_err)) {
 						g_print (_("Error: failed to set '%s' property: %s\n"), prop_name, tmp_err->message);
 						g_clear_error (&tmp_err);
 					}
@@ -7294,11 +7423,13 @@ editor_menu_main (NmCli *nmc, NMConnection *connection, const char *connection_t
 						g_print (_("Allowed values for '%s' property: %s\n"),
 						         prop_name, avals_str);
 					}
-					cmd_arg_v = nmc_readline (_("Enter '%s' value: "), prop_name);
+					cmd_arg_v = nmc_readline (&nmc->nmc_config,
+					                          _("Enter '%s' value: "),
+					                          prop_name);
 				}
 
 				/* Set property value */
-				if (!nmc_setting_set_property (ss, prop_name, cmd_arg_v, &tmp_err)) {
+				if (!nmc_setting_set_property (nmc->client, ss, prop_name, cmd_arg_v, &tmp_err)) {
 					g_print (_("Error: failed to set '%s' property: %s\n"),
 					         prop_name, tmp_err->message);
 					g_clear_error (&tmp_err);
@@ -7317,7 +7448,8 @@ editor_menu_main (NmCli *nmc, NMConnection *connection, const char *connection_t
 				NMSetting *setting;
 				const char *user_arg = cmd_arg_s ?: cmd_arg_p;
 
-				setting_name = ask_check_setting (user_arg,
+				setting_name = ask_check_setting (&nmc->nmc_config,
+				                                  user_arg,
 				                                  valid_settings_main,
 				                                  valid_settings_slave,
 				                                  valid_settings_str);
@@ -7363,7 +7495,8 @@ editor_menu_main (NmCli *nmc, NMConnection *connection, const char *connection_t
 				/* level 1 - setting selected */
 				const char *prop_name;
 
-				prop_name = ask_check_property (cmd_arg_p,
+				prop_name = ask_check_property (&nmc->nmc_config,
+				                                cmd_arg_p,
 				                                (const char **) menu_ctx.valid_props,
 				                                menu_ctx.valid_props_str);
 				if (!prop_name)
@@ -7386,7 +7519,8 @@ editor_menu_main (NmCli *nmc, NMConnection *connection, const char *connection_t
 					GError *tmp_err = NULL;
 					const char *prop_name;
 
-					prop_name = ask_check_property (cmd_arg,
+					prop_name = ask_check_property (&nmc->nmc_config,
+					                                cmd_arg,
 					                                (const char **) menu_ctx.valid_props,
 					                                menu_ctx.valid_props_str);
 					if (!prop_name)
@@ -7480,7 +7614,8 @@ editor_menu_main (NmCli *nmc, NMConnection *connection, const char *connection_t
 				if (menu_ctx.level == 1) {
 					const char *prop_name;
 
-					prop_name = ask_check_property (cmd_arg,
+					prop_name = ask_check_property (&nmc->nmc_config,
+					                                cmd_arg,
 					                                (const char **) menu_ctx.valid_props,
 					                                menu_ctx.valid_props_str);
 					if (!prop_name)
@@ -7682,9 +7817,12 @@ editor_menu_main (NmCli *nmc, NMConnection *connection, const char *connection_t
 				}
 
 				/* Ask for save confirmation if the connection changes to autoconnect=yes */
-				if (nmc->editor_save_confirmation)
-					if (!confirm_connection_saving (connection, NM_CONNECTION (rem_con)))
+				if (nmc->editor_save_confirmation) {
+					if (!confirm_connection_saving (&nmc->nmc_config,
+					                                connection,
+					                                NM_CONNECTION (rem_con)))
 						break;
+				}
 
 				if (!rem_con) {
 					/* Tell the settings service to add the new connection */
@@ -7823,7 +7961,8 @@ editor_menu_main (NmCli *nmc, NMConnection *connection, const char *connection_t
 				         nmc_editor_error->message);
 				g_error_free (nmc_editor_error);
 			} else {
-				nmc_readline (_("Monitoring connection activation (press any key to continue)\n"));
+				nmc_readline (&nmc->nmc_config,
+				              _("Monitoring connection activation (press any key to continue)\n"));
 			}
 
 			if (nmc_editor_monitor_ac) {
@@ -7897,7 +8036,7 @@ editor_menu_main (NmCli *nmc, NMConnection *connection, const char *connection_t
 
 		case NMC_EDITOR_MAIN_CMD_QUIT:
 			if (is_connection_dirty (connection, rem_con)) {
-				if (confirm_quit ())
+				if (confirm_quit (&nmc->nmc_config))
 					cmd_loop = FALSE;  /* quit command loop */
 			} else
 				cmd_loop = FALSE;  /* quit command loop */
@@ -8085,7 +8224,7 @@ do_connection_edit (NmCli *nmc, int argc, char **argv)
 
 	/* Setup some readline completion stuff */
 	/* Set a pointer to an alternative function to create matches */
-	rl_attempted_completion_function = (rl_completion_func_t *) nmcli_editor_tab_completion;
+	rl_attempted_completion_function = nmcli_editor_tab_completion;
 	/* Use ' ' and '.' as word break characters */
 	rl_completer_word_break_characters = ". ";
 
@@ -8173,8 +8312,9 @@ do_connection_edit (NmCli *nmc, int argc, char **argv)
 				g_print (_("Error: invalid connection type; %s\n"), err1->message);
 			g_clear_error (&err1);
 
-			type_ask = nmc_readline (EDITOR_PROMPT_CON_TYPE);
-			type = type_ask = type_ask ? g_strstrip (type_ask) : NULL;
+			type_ask = nmc_readline (&nmc->nmc_config,
+			                         EDITOR_PROMPT_CON_TYPE);
+			type = type_ask = nm_strstrip (type_ask);
 			connection_type = check_valid_name_toplevel (type_ask, &slave_type, &err1);
 		}
 		nm_clear_g_free (&tmp_str);
@@ -8367,14 +8507,14 @@ do_connection_clone (NmCli *nmc, int argc, char **argv)
 	argc_ptr = &argc;
 
 	if (argc == 0 && nmc->ask) {
-		char *line;
+		gs_free char *line = NULL;
 
 		/* nmc_do_cmd() should not call this with argc=0. */
 		g_assert (!nmc->complete);
 
-		line = nmc_readline (PROMPT_CONNECTION);
+		line = nmc_readline (&nmc->nmc_config,
+		                     PROMPT_CONNECTION);
 		nmc_string_to_arg_array (line, NULL, TRUE, &arg_arr, &arg_num);
-		g_free (line);
 		argv_ptr = &arg_arr;
 		argc_ptr = &arg_num;
 	}
@@ -8390,9 +8530,10 @@ do_connection_clone (NmCli *nmc, int argc, char **argv)
 
 	if (argv[0])
 		new_name = *argv;
-	else if (nmc->ask)
-		new_name = new_name_ask = nmc_readline (_("New connection name: "));
-	else {
+	else if (nmc->ask) {
+		new_name = new_name_ask = nmc_readline (&nmc->nmc_config,
+		                                        _("New connection name: "));
+	} else {
 		g_string_printf (nmc->return_text, _("Error:  argument is missing."));
 		NMC_RETURN (nmc, NMC_RESULT_ERROR_USER_INPUT);
 	}
@@ -8477,14 +8618,14 @@ do_connection_delete (NmCli *nmc, int argc, char **argv)
 
 	if (argc == 0) {
 		if (nmc->ask) {
-			char *line;
+			gs_free char *line = NULL;
 
 			/* nmc_do_cmd() should not call this with argc=0. */
 			g_assert (!nmc->complete);
 
-			line = nmc_readline (PROMPT_CONNECTIONS);
+			line = nmc_readline (&nmc->nmc_config,
+			                     PROMPT_CONNECTIONS);
 			nmc_string_to_arg_array (line, NULL, TRUE, &arg_arr, &arg_num);
-			g_free (line);
 			arg_ptr = arg_arr;
 		}
 		if (arg_num == 0) {
@@ -8733,10 +8874,13 @@ do_connection_import (NmCli *nmc, int argc, char **argv)
 		g_assert (!nmc->complete);
 
 		if (nmc->ask) {
-			type_ask = nmc_readline ("%s: ", gettext (NM_META_TEXT_PROMPT_VPN_TYPE));
-			filename_ask = nmc_readline (gettext (PROMPT_IMPORT_FILE));
-			type = type_ask = type_ask ? g_strstrip (type_ask) : NULL;
-			filename = filename_ask = filename_ask ? g_strstrip (filename_ask) : NULL;
+			type_ask = nmc_readline (&nmc->nmc_config,
+			                         "%s: ",
+			                         gettext (NM_META_TEXT_PROMPT_VPN_TYPE));
+			type = nm_strstrip (type_ask);
+			filename_ask = nmc_readline (&nmc->nmc_config,
+			                             gettext (PROMPT_IMPORT_FILE));
+			filename = nm_strstrip (filename_ask);
 		} else {
 			g_string_printf (nmc->return_text, _("Error: No arguments provided."));
 			NMC_RETURN (nmc, NMC_RESULT_ERROR_USER_INPUT);
@@ -8744,8 +8888,11 @@ do_connection_import (NmCli *nmc, int argc, char **argv)
 	}
 
 	while (argc > 0) {
-		if (argc == 1 && nmc->complete)
-			nmc_complete_strings (*argv, "type", "file", NULL);
+		if (argc == 1 && nmc->complete) {
+			nmc_complete_strings (*argv,
+			                      type ? NULL : "type",
+			                      filename ? NULL : "file");
+		}
 
 		if (strcmp (*argv, "type") == 0) {
 			argc--;
@@ -8755,8 +8902,13 @@ do_connection_import (NmCli *nmc, int argc, char **argv)
 				NMC_RETURN (nmc, NMC_RESULT_ERROR_USER_INPUT);
 			}
 
-			if (argc == 1 && nmc->complete)
-				complete_option ((const NMMetaAbstractInfo *) nm_meta_property_info_vpn_service_type, *argv, NULL);
+			if (   argc == 1
+			    && nmc->complete) {
+				nmc_complete_strings (*argv, "wireguard");
+				complete_option ((const NMMetaAbstractInfo *) nm_meta_property_info_vpn_service_type,
+				                 *argv,
+				                 NULL);
+			}
 
 			if (!type)
 				type = *argv;
@@ -8796,21 +8948,26 @@ do_connection_import (NmCli *nmc, int argc, char **argv)
 		NMC_RETURN (nmc, NMC_RESULT_ERROR_USER_INPUT);
 	}
 
-	service_type = nm_vpn_plugin_info_list_find_service_type (nm_vpn_get_plugin_infos (), type);
-	if (!service_type) {
-		g_string_printf (nmc->return_text, _("Error: failed to find VPN plugin for %s."), type);
-		NMC_RETURN (nmc, NMC_RESULT_ERROR_UNKNOWN);
-	}
+	if (nm_streq (type, "wireguard"))
+		connection = nm_vpn_wireguard_import (filename, &error);
+	else {
+		service_type = nm_vpn_plugin_info_list_find_service_type (nm_vpn_get_plugin_infos (), type);
+		if (!service_type) {
+			g_string_printf (nmc->return_text, _("Error: failed to find VPN plugin for %s."), type);
+			NMC_RETURN (nmc, NMC_RESULT_ERROR_UNKNOWN);
+		}
 
-	/* Import VPN configuration */
-	plugin = nm_vpn_get_editor_plugin (service_type, &error);
-	if (!plugin) {
-		g_string_printf (nmc->return_text, _("Error: failed to load VPN plugin: %s."),
-		                 error->message);
-		NMC_RETURN (nmc, NMC_RESULT_ERROR_UNKNOWN);
+		/* Import VPN configuration */
+		plugin = nm_vpn_get_editor_plugin (service_type, &error);
+		if (!plugin) {
+			g_string_printf (nmc->return_text, _("Error: failed to load VPN plugin: %s."),
+			                 error->message);
+			NMC_RETURN (nmc, NMC_RESULT_ERROR_UNKNOWN);
+		}
+
+		connection = nm_vpn_editor_plugin_import (plugin, filename, &error);
 	}
 
-	connection = nm_vpn_editor_plugin_import (plugin, filename, &error);
 	if (!connection) {
 		g_string_printf (nmc->return_text, _("Error: failed to import '%s': %s."),
 		                 filename, error->message);
@@ -8853,14 +9010,14 @@ do_connection_export (NmCli *nmc, int argc, char **argv)
 	argc_ptr = &argc;
 
 	if (argc == 0 && nmc->ask) {
-		char *line;
+		gs_free char *line = NULL;
 
 		/* nmc_do_cmd() should not call this with argc=0. */
 		g_assert (!nmc->complete);
 
-		line = nmc_readline (PROMPT_VPN_CONNECTION);
+		line = nmc_readline (&nmc->nmc_config,
+		                     PROMPT_VPN_CONNECTION);
 		nmc_string_to_arg_array (line, NULL, TRUE, &arg_arr, &arg_num);
-		g_free (line);
 		argv_ptr = &arg_arr;
 		argc_ptr = &arg_num;
 	}
@@ -8883,8 +9040,10 @@ do_connection_export (NmCli *nmc, int argc, char **argv)
 		goto finish;
 	}
 
-	if (out_name == NULL && nmc->ask)
-		out_name = out_name_ask = nmc_readline (_("Output file name: "));
+	if (!out_name && nmc->ask) {
+		out_name = out_name_ask = nmc_readline (&nmc->nmc_config,
+		                                        _("Output file name: "));
+	}
 
 	type = nm_connection_get_connection_type (connection);
 	if (g_strcmp0 (type, NM_SETTING_VPN_SETTING_NAME) != 0) {
@@ -8908,7 +9067,7 @@ do_connection_export (NmCli *nmc, int argc, char **argv)
 	else {
 		nm_auto_close int fd = -1;
 
-		fd = g_mkstemp (tmpfile);
+		fd = g_mkstemp_full (tmpfile, O_RDWR | O_CLOEXEC, 0600);
 		if (fd == -1) {
 			g_string_printf (nmc->return_text, _("Error: failed to create temporary file %s."), tmpfile);
 			nmc->return_value = NMC_RESULT_ERROR_UNKNOWN;
@@ -9060,7 +9219,7 @@ do_connections (NmCli *nmc, int argc, char **argv)
 	nmc_start_polkit_agent_start_try (nmc);
 
 	/* Set completion function for 'nmcli con' */
-	rl_attempted_completion_function = (rl_completion_func_t *) nmcli_con_tab_completion;
+	rl_attempted_completion_function = nmcli_con_tab_completion;
 
 	nmc_do_cmd (nmc, connection_cmds, *argv, argc, argv);
 
diff --git a/clients/cli/connections.h b/clients/cli/connections.h
index 22bfa8ec..122a7e27 100644
--- a/clients/cli/connections.h
+++ b/clients/cli/connections.h
@@ -35,6 +35,8 @@ nmc_read_connection_properties (NmCli *nmc,
 
 NMMetaColor nmc_active_connection_state_to_color (NMActiveConnectionState state);
 
+int nmc_active_connection_cmp (NMActiveConnection *ac_a, NMActiveConnection *ac_b);
+
 extern const NmcMetaGenericInfo *const metagen_con_show[];
 extern const NmcMetaGenericInfo *const metagen_con_active_general[];
 extern const NmcMetaGenericInfo *const metagen_con_active_vpn[];
diff --git a/clients/cli/devices.c b/clients/cli/devices.c
index 5aaf4ef8..04a8c988 100644
--- a/clients/cli/devices.c
+++ b/clients/cli/devices.c
@@ -22,9 +22,7 @@
 #include "devices.h"
 
 #include 
-#include 
 #include 
-#include 
 #include 
 
 #include "nm-secret-agent-simple.h"
@@ -44,43 +42,39 @@
 static char *
 ap_wpa_rsn_flags_to_string (NM80211ApSecurityFlags flags)
 {
-	char *flags_str[16]; /* Enough space for flags and terminating NULL */
-	char *ret_str;
+	char *flags_str[13];
 	int i = 0;
 
 	if (flags & NM_802_11_AP_SEC_PAIR_WEP40)
-		flags_str[i++] = g_strdup ("pair_wpe40");
+		flags_str[i++] = "pair_wpe40";
 	if (flags & NM_802_11_AP_SEC_PAIR_WEP104)
-		flags_str[i++] = g_strdup ("pair_wpe104");
+		flags_str[i++] = "pair_wpe104";
 	if (flags & NM_802_11_AP_SEC_PAIR_TKIP)
-		flags_str[i++] = g_strdup ("pair_tkip");
+		flags_str[i++] = "pair_tkip";
 	if (flags & NM_802_11_AP_SEC_PAIR_CCMP)
-		flags_str[i++] = g_strdup ("pair_ccmp");
+		flags_str[i++] = "pair_ccmp";
 	if (flags & NM_802_11_AP_SEC_GROUP_WEP40)
-		flags_str[i++] = g_strdup ("group_wpe40");
+		flags_str[i++] = "group_wpe40";
 	if (flags & NM_802_11_AP_SEC_GROUP_WEP104)
-		flags_str[i++] = g_strdup ("group_wpe104");
+		flags_str[i++] = "group_wpe104";
 	if (flags & NM_802_11_AP_SEC_GROUP_TKIP)
-		flags_str[i++] = g_strdup ("group_tkip");
+		flags_str[i++] = "group_tkip";
 	if (flags & NM_802_11_AP_SEC_GROUP_CCMP)
-		flags_str[i++] = g_strdup ("group_ccmp");
+		flags_str[i++] = "group_ccmp";
 	if (flags & NM_802_11_AP_SEC_KEY_MGMT_PSK)
-		flags_str[i++] = g_strdup ("psk");
+		flags_str[i++] = "psk";
 	if (flags & NM_802_11_AP_SEC_KEY_MGMT_802_1X)
-		flags_str[i++] = g_strdup ("802.1X");
+		flags_str[i++] = "802.1X";
+	if (flags & NM_802_11_AP_SEC_KEY_MGMT_SAE)
+		flags_str[i++] = "sae";
+	/* Make sure you grow flags_str when adding items here. */
 
 	if (i == 0)
-		flags_str[i++] = g_strdup (_("(none)"));
+		flags_str[i++] = _("(none)");
 
 	flags_str[i] = NULL;
 
-	ret_str = g_strjoinv (" ", flags_str);
-
-	i = 0;
-	while (flags_str[i])
-		g_free (flags_str[i++]);
-
-	return ret_str;
+	return g_strjoinv (" ", flags_str);
 }
 
 static NMMetaColor
@@ -116,6 +110,12 @@ _metagen_device_status_get_fcn (NMC_META_GENERIC_INFO_GET_FCN_ARGS)
 	case NMC_GENERIC_INFO_TYPE_DEVICE_STATUS_STATE:
 		return nmc_meta_generic_get_str_i18n (nmc_device_state_to_string (nm_device_get_state (d)),
 		                                      get_type);
+	case NMC_GENERIC_INFO_TYPE_DEVICE_STATUS_IP4_CONNECTIVITY:
+		return nmc_meta_generic_get_str_i18n (nm_connectivity_to_string (nm_device_get_connectivity (d, AF_INET)),
+		                                      get_type);
+	case NMC_GENERIC_INFO_TYPE_DEVICE_STATUS_IP6_CONNECTIVITY:
+		return nmc_meta_generic_get_str_i18n (nm_connectivity_to_string (nm_device_get_connectivity (d, AF_INET6)),
+		                                      get_type);
 	case NMC_GENERIC_INFO_TYPE_DEVICE_STATUS_DBUS_PATH:
 		return nm_object_get_path (NM_OBJECT (d));
 	case NMC_GENERIC_INFO_TYPE_DEVICE_STATUS_CONNECTION:
@@ -137,13 +137,15 @@ _metagen_device_status_get_fcn (NMC_META_GENERIC_INFO_GET_FCN_ARGS)
 const NmcMetaGenericInfo *const metagen_device_status[_NMC_GENERIC_INFO_TYPE_DEVICE_STATUS_NUM + 1] = {
 #define _METAGEN_DEVICE_STATUS(type, name) \
 	[type] = NMC_META_GENERIC(name, .info_type = type, .get_fcn = _metagen_device_status_get_fcn)
-	_METAGEN_DEVICE_STATUS (NMC_GENERIC_INFO_TYPE_DEVICE_STATUS_DEVICE,     "DEVICE"),
-	_METAGEN_DEVICE_STATUS (NMC_GENERIC_INFO_TYPE_DEVICE_STATUS_TYPE,       "TYPE"),
-	_METAGEN_DEVICE_STATUS (NMC_GENERIC_INFO_TYPE_DEVICE_STATUS_STATE,      "STATE"),
-	_METAGEN_DEVICE_STATUS (NMC_GENERIC_INFO_TYPE_DEVICE_STATUS_DBUS_PATH,  "DBUS-PATH"),
-	_METAGEN_DEVICE_STATUS (NMC_GENERIC_INFO_TYPE_DEVICE_STATUS_CONNECTION, "CONNECTION"),
-	_METAGEN_DEVICE_STATUS (NMC_GENERIC_INFO_TYPE_DEVICE_STATUS_CON_UUID,   "CON-UUID"),
-	_METAGEN_DEVICE_STATUS (NMC_GENERIC_INFO_TYPE_DEVICE_STATUS_CON_PATH,   "CON-PATH"),
+	_METAGEN_DEVICE_STATUS (NMC_GENERIC_INFO_TYPE_DEVICE_STATUS_DEVICE,             "DEVICE"),
+	_METAGEN_DEVICE_STATUS (NMC_GENERIC_INFO_TYPE_DEVICE_STATUS_TYPE,               "TYPE"),
+	_METAGEN_DEVICE_STATUS (NMC_GENERIC_INFO_TYPE_DEVICE_STATUS_STATE,              "STATE"),
+	_METAGEN_DEVICE_STATUS (NMC_GENERIC_INFO_TYPE_DEVICE_STATUS_IP4_CONNECTIVITY,   "IP4-CONNECTIVITY"),
+	_METAGEN_DEVICE_STATUS (NMC_GENERIC_INFO_TYPE_DEVICE_STATUS_IP6_CONNECTIVITY,   "IP6-CONNECTIVITY"),
+	_METAGEN_DEVICE_STATUS (NMC_GENERIC_INFO_TYPE_DEVICE_STATUS_DBUS_PATH,          "DBUS-PATH"),
+	_METAGEN_DEVICE_STATUS (NMC_GENERIC_INFO_TYPE_DEVICE_STATUS_CONNECTION,         "CONNECTION"),
+	_METAGEN_DEVICE_STATUS (NMC_GENERIC_INFO_TYPE_DEVICE_STATUS_CON_UUID,           "CON-UUID"),
+	_METAGEN_DEVICE_STATUS (NMC_GENERIC_INFO_TYPE_DEVICE_STATUS_CON_PATH,           "CON-PATH"),
 };
 
 /*****************************************************************************/
@@ -155,6 +157,7 @@ _metagen_device_detail_general_get_fcn (NMC_META_GENERIC_INFO_GET_FCN_ARGS)
 	NMActiveConnection *ac;
 	NMDeviceState state;
 	NMDeviceStateReason state_reason;
+	NMConnectivityState connectivity;
 	const char *s;
 
 	NMC_HANDLE_COLOR (NM_META_COLOR_NONE);
@@ -194,6 +197,18 @@ _metagen_device_detail_general_get_fcn (NMC_META_GENERIC_INFO_GET_FCN_ARGS)
 		                                                              state_reason,
 		                                                              nmc_device_reason_to_string (state_reason),
 		                                                              get_type));
+	case NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_GENERAL_IP4_CONNECTIVITY:
+		connectivity = nm_device_get_connectivity (d, AF_INET);
+		return (*out_to_free = nmc_meta_generic_get_enum_with_detail (NMC_META_GENERIC_GET_ENUM_TYPE_PARENTHESES,
+		                                                              connectivity,
+		                                                              nm_connectivity_to_string (connectivity),
+		                                                              get_type));
+	case NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_GENERAL_IP6_CONNECTIVITY:
+		connectivity = nm_device_get_connectivity (d, AF_INET6);
+		return (*out_to_free = nmc_meta_generic_get_enum_with_detail (NMC_META_GENERIC_GET_ENUM_TYPE_PARENTHESES,
+		                                                              connectivity,
+		                                                              nm_connectivity_to_string (connectivity),
+		                                                              get_type));
 	case NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_GENERAL_UDI:
 		return nm_device_get_udi (d);
 	case NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_GENERAL_IP_IFACE:
@@ -244,6 +259,8 @@ const NmcMetaGenericInfo *const metagen_device_detail_general[_NMC_GENERIC_INFO_
 	_METAGEN_DEVICE_DETAIL_GENERAL (NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_GENERAL_MTU,               "MTU"),
 	_METAGEN_DEVICE_DETAIL_GENERAL (NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_GENERAL_STATE,             "STATE"),
 	_METAGEN_DEVICE_DETAIL_GENERAL (NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_GENERAL_REASON,            "REASON"),
+	_METAGEN_DEVICE_DETAIL_GENERAL (NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_GENERAL_IP4_CONNECTIVITY,  "IP4-CONNECTIVITY"),
+	_METAGEN_DEVICE_DETAIL_GENERAL (NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_GENERAL_IP6_CONNECTIVITY,  "IP6-CONNECTIVITY"),
 	_METAGEN_DEVICE_DETAIL_GENERAL (NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_GENERAL_UDI,               "UDI"),
 	_METAGEN_DEVICE_DETAIL_GENERAL (NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_GENERAL_IP_IFACE,          "IP-IFACE"),
 	_METAGEN_DEVICE_DETAIL_GENERAL (NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_GENERAL_IS_SOFTWARE,       "IS-SOFTWARE"),
@@ -680,7 +697,7 @@ usage (void)
 	              "  disconnect  ...\n\n"
 	              "  delete  ...\n\n"
 	              "  monitor  ...\n\n"
-	              "  wifi [list [ifname ] [bssid ]]\n\n"
+	              "  wifi [list [ifname ] [bssid ] [--rescan yes|no|auto]]\n\n"
 	              "  wifi connect <(B)SSID> [password ] [wep-key-type key|phrase] [ifname ]\n"
 	              "                         [bssid ] [name ] [private yes|no] [hidden yes|no]\n\n"
 	              "  wifi hotspot [ifname ] [con-name ] [ssid ] [band a|bg] [channel ] [password ]\n\n"
@@ -815,22 +832,22 @@ usage_device_wifi (void)
 	              "\n"
 	              "Perform operation on Wi-Fi devices.\n"
 	              "\n"
-	              "ARGUMENTS := [list [ifname ] [bssid ]]\n"
+	              "ARGUMENTS := [list [ifname ] [bssid ] [--rescan yes|no|auto]]\n"
 	              "\n"
 	              "List available Wi-Fi access points. The 'ifname' and 'bssid' options can be\n"
-	              "used to list APs for a particular interface, or with a specific BSSID.\n"
+	              "used to list APs for a particular interface, or with a specific BSSID. The\n"
+	              "--rescan flag tells whether a new Wi-Fi scan should be triggered.\n"
 	              "\n"
 	              "ARGUMENTS := connect <(B)SSID> [password ] [wep-key-type key|phrase] [ifname ]\n"
 	              "                     [bssid ] [name ] [private yes|no] [hidden yes|no]\n"
 	              "\n"
-	              "Connect to a Wi-Fi network specified by SSID or BSSID. The command creates\n"
-	              "a new connection and then activates it on a device. This is a command-line\n"
-	              "counterpart of clicking an SSID in a GUI client. The command always creates\n"
-	              "a new connection and thus it is mainly useful for connecting to new Wi-Fi\n"
-	              "networks. If a connection for the network already exists, it is better to\n"
-	              "bring up the existing profile as follows: nmcli con up id . Note that\n"
-	              "only open, WEP and WPA-PSK networks are supported at the moment. It is also\n"
-	              "assumed that IP configuration is obtained via DHCP.\n"
+	              "Connect to a Wi-Fi network specified by SSID or BSSID. The command finds a\n"
+	              "matching connection or creates one and then activates it on a device. This\n"
+	              "is a command-line counterpart of clicking an SSID in a GUI client. If a\n"
+	              "connection for the network already exists, it is possible to bring up the\n"
+	              "existing profile as follows: nmcli con up id . Note that only open,\n"
+	              "WEP and WPA-PSK networks are supported if no previous connection exists.\n"
+	              "It is also assumed that IP configuration is obtained via DHCP.\n"
 	              "\n"
 	              "ARGUMENTS := hotspot [ifname ] [con-name ] [ssid ]\n"
 	              "                     [band a|bg] [channel ] [password ]\n"
@@ -879,77 +896,19 @@ compare_devices (const void *a, const void *b)
 {
 	NMDevice *da = *(NMDevice **)a;
 	NMDevice *db = *(NMDevice **)b;
-	NMActiveConnection *da_ac;
-	NMActiveConnection *db_ac;
-	NMIPConfig *da_ip;
-	NMIPConfig *db_ip;
-	int da_num_addrs;
-	int db_num_addrs;
-	int cmp;
-
-	/* Sort by later device states first */
-	cmp = nm_device_get_state (db) - nm_device_get_state (da);
-	if (cmp != 0)
-		return cmp;
-
-	da_ac = nm_device_get_active_connection (da);
-	db_ac = nm_device_get_active_connection (db);
-
-	/* Prioritize devices with active connections */
-	if (da_ac)
-		cmp++;
-	if (db_ac)
-		cmp--;
-	if (cmp != 0)
-		return cmp;
-
-	/* VPNs go on the top if possible */
-	if (da_ac && !nm_active_connection_get_vpn (da_ac))
-		cmp++;
-	if (db_ac && !nm_active_connection_get_vpn (db_ac))
-		cmp--;
-	if (cmp != 0)
-		return cmp;
-
-	/* Default devices are prioritized */
-	if (da_ac && !nm_active_connection_get_default (da_ac))
-		cmp++;
-	if (db_ac && !nm_active_connection_get_default (db_ac))
-		cmp--;
-	if (cmp != 0)
-		return cmp;
-
-	/* Default IPv6 devices are prioritized */
-	if (da_ac && !nm_active_connection_get_default6 (da_ac))
-		cmp++;
-	if (db_ac && !nm_active_connection_get_default6 (db_ac))
-		cmp--;
-	if (cmp != 0)
-		return cmp;
-
-	/* Sort by number of addresses. */
-	da_ip = da_ac ? nm_active_connection_get_ip4_config (da_ac) : NULL;
-	da_num_addrs = da_ip ? nm_ip_config_get_addresses (da_ip)->len : 0;
-	db_ip = db_ac ? nm_active_connection_get_ip4_config (db_ac) : NULL;
-	db_num_addrs = db_ip ? nm_ip_config_get_addresses (db_ip)->len : 0;
-
-	da_ip = da_ac ? nm_active_connection_get_ip6_config (da_ac) : NULL;
-	da_num_addrs += da_ip ? nm_ip_config_get_addresses (da_ip)->len : 0;
-	db_ip = db_ac ? nm_active_connection_get_ip6_config (db_ac) : NULL;
-	db_num_addrs += db_ip ? nm_ip_config_get_addresses (db_ip)->len : 0;
-
-	cmp = db_num_addrs - da_num_addrs;
-	if (cmp != 0)
-		return cmp;
-
-	/* Fall back to alphanumeric sort by description and interface. */
-	cmp = g_strcmp0 (nm_device_get_type_description (da),
-	                 nm_device_get_type_description (db));
-	if (cmp != 0)
-		return cmp;
-
-	return g_strcmp0 (nm_device_get_iface (da),
-	                  nm_device_get_iface (db));
+	NMActiveConnection *da_ac = nm_device_get_active_connection (da);
+	NMActiveConnection *db_ac = nm_device_get_active_connection (db);
+
+	NM_CMP_DIRECT (nm_device_get_state (db), nm_device_get_state (da));
+	NM_CMP_RETURN (nmc_active_connection_cmp (db_ac, da_ac));
+	NM_CMP_DIRECT_STRCMP0 (nm_device_get_type_description (da),
+	                       nm_device_get_type_description (db));
+	NM_CMP_DIRECT_STRCMP0 (nm_device_get_iface (da),
+	                       nm_device_get_iface (db));
+	NM_CMP_DIRECT_STRCMP0 (nm_object_get_path (NM_OBJECT (da)),
+	                       nm_object_get_path (NM_OBJECT (db)));
+
+	g_return_val_if_reached (0);
 }
 
 NMDevice **
@@ -1006,9 +965,11 @@ get_device_list (NmCli *nmc, int argc, char **argv)
 
 	if (argc == 0) {
 		if (nmc->ask) {
-			char *line = nmc_readline (PROMPT_INTERFACES);
+			gs_free char *line = NULL;
+
+			line = nmc_readline (&nmc->nmc_config,
+			                     PROMPT_INTERFACES);
 			nmc_string_to_arg_array (line, NULL, FALSE, &arg_arr, &arg_num);
-			g_free (line);
 			arg_ptr = arg_arr;
 		}
 		if (arg_num == 0) {
@@ -1063,8 +1024,10 @@ get_device (NmCli *nmc, int *argc, char ***argv, GError **error)
 	int i;
 
 	if (*argc == 0) {
-		if (nmc->ask)
-			ifname = ifname_ask = nmc_readline (PROMPT_INTERFACE);
+		if (nmc->ask) {
+			ifname = ifname_ask = nmc_readline (&nmc->nmc_config,
+			                                    PROMPT_INTERFACE);
+		}
 
 		if (!ifname_ask) {
 			g_set_error_literal (error, NMCLI_ERROR, NMC_RESULT_ERROR_USER_INPUT,
@@ -1195,21 +1158,21 @@ fill_output_access_point (gpointer data, gpointer user_data)
 	if (   (flags & NM_802_11_AP_FLAGS_PRIVACY)
 	    && (wpa_flags == NM_802_11_AP_SEC_NONE)
 	    && (rsn_flags == NM_802_11_AP_SEC_NONE)) {
-		g_string_append (security_str, _("WEP"));
-		g_string_append_c (security_str, ' ');
+		g_string_append (security_str, "WEP ");
 	}
 	if (wpa_flags != NM_802_11_AP_SEC_NONE) {
-		g_string_append (security_str, _("WPA1"));
-		g_string_append_c (security_str, ' ');
+		g_string_append (security_str, "WPA1 ");
+	}
+	if (   (rsn_flags & NM_802_11_AP_SEC_KEY_MGMT_PSK)
+	    || (rsn_flags & NM_802_11_AP_SEC_KEY_MGMT_802_1X)) {
+		g_string_append (security_str, "WPA2 ");
 	}
-	if (rsn_flags != NM_802_11_AP_SEC_NONE) {
-		g_string_append (security_str, _("WPA2"));
-		g_string_append_c (security_str, ' ');
+	if (rsn_flags & NM_802_11_AP_SEC_KEY_MGMT_SAE) {
+		g_string_append (security_str, "WPA3 ");
 	}
 	if (   (wpa_flags & NM_802_11_AP_SEC_KEY_MGMT_802_1X)
 	    || (rsn_flags & NM_802_11_AP_SEC_KEY_MGMT_802_1X)) {
-		g_string_append   (security_str, _("802.1X"));
-		g_string_append_c (security_str, ' ');
+		g_string_append   (security_str, "802.1X ");
 	}
 
 	if (security_str->len > 0)
@@ -1869,6 +1832,7 @@ typedef struct {
 	NmCli *nmc;
 	NMDevice *device;
 	gboolean hotspot;
+	gboolean create;
 } AddAndActivateInfo;
 
 static void
@@ -1879,47 +1843,29 @@ add_and_activate_cb (GObject *client,
 	AddAndActivateInfo *info = (AddAndActivateInfo *) user_data;
 	NmCli *nmc = info->nmc;
 	NMDevice *device = info->device;
-	NMActiveConnectionState state;
 	NMActiveConnection *active;
 	GError *error = NULL;
 
-	active = nm_client_add_and_activate_connection_finish (NM_CLIENT (client), result, &error);
+	if (info->create)
+		active = nm_client_add_and_activate_connection_finish (NM_CLIENT (client), result, &error);
+	else
+		active = nm_client_activate_connection_finish (NM_CLIENT (client), result, &error);
 
 	if (error) {
 		if (info->hotspot)
 			g_string_printf (nmc->return_text, _("Error: Failed to setup a Wi-Fi hotspot: %s"),
 			                 error->message);
-		else
+		else if (info->create)
 			g_string_printf (nmc->return_text, _("Error: Failed to add/activate new connection: %s"),
 			                 error->message);
+		else
+			g_string_printf (nmc->return_text, _("Error: Failed to activate connection: %s"),
+			                 error->message);
 		g_error_free (error);
 		nmc->return_value = NMC_RESULT_ERROR_CON_ACTIVATION;
 		quit ();
 	} else {
-		state = nm_active_connection_get_state (active);
-
-		if (state == NM_ACTIVE_CONNECTION_STATE_UNKNOWN) {
-			if (info->hotspot)
-				g_string_printf (nmc->return_text, _("Error: Failed to setup a Wi-Fi hotspot"));
-			else
-				g_string_printf (nmc->return_text, _("Error: Failed to add/activate new connection: Unknown error"));
-			nmc->return_value = NMC_RESULT_ERROR_CON_ACTIVATION;
-			g_object_unref (active);
-			quit ();
-		}
-
-		if (nmc->nowait_flag || state == NM_ACTIVE_CONNECTION_STATE_ACTIVATED) {
-			/* User doesn't want to wait or already activated */
-			if (state == NM_ACTIVE_CONNECTION_STATE_ACTIVATED) {
-				if (nmc->nmc_config.print_output == NMC_PRINT_PRETTY)
-					nmc_terminal_erase_line ();
-				if (!info->hotspot)
-					g_print (_("Connection with UUID '%s' created and activated on device '%s'\n"),
-					         nm_active_connection_get_uuid (active), nm_device_get_iface (device));
-				else
-					g_print (_("Hotspot '%s' activated on device '%s'\n"),
-					         nm_active_connection_get_id (active), nm_device_get_iface (device));
-			}
+		if (nmc->nowait_flag) {
 			g_object_unref (active);
 			quit ();
 		} else {
@@ -1927,6 +1873,8 @@ add_and_activate_cb (GObject *client,
 			g_signal_connect (device, "notify::state", G_CALLBACK (device_state_cb), active);
 			g_signal_connect (active, "notify::state", G_CALLBACK (active_state_cb), device);
 
+			connected_state_cb (device, active);
+
 			g_timeout_add_seconds (nmc->timeout, timeout_cb, nmc);  /* Exit if timeout expires */
 
 			if (nmc->nmc_config.print_output == NMC_PRINT_PRETTY)
@@ -1970,13 +1918,13 @@ connect_device_cb (GObject *client, GAsyncResult *result, gpointer user_data)
 	GError *error = NULL;
 	const GPtrArray *devices;
 	NMDevice *device;
-	NMDeviceState state;
 
 	active = nm_client_activate_connection_finish (NM_CLIENT (client), result, &error);
 
 	if (error) {
 		/* If no connection existed for the device, create one and activate it */
 		if (g_error_matches (error, NM_MANAGER_ERROR, NM_MANAGER_ERROR_UNKNOWN_CONNECTION)) {
+			info->create = TRUE;
 			create_connect_connection_for_device (info);
 			return;
 		}
@@ -1999,27 +1947,24 @@ connect_device_cb (GObject *client, GAsyncResult *result, gpointer user_data)
 		}
 
 		device = g_ptr_array_index (devices, 0);
-		state = nm_device_get_state (device);
 
-		if (nmc->nowait_flag || state == NM_DEVICE_STATE_ACTIVATED) {
-			/* Don't want to wait or device already activated */
-			if (state == NM_DEVICE_STATE_ACTIVATED && nmc->nmc_config.print_output == NMC_PRINT_PRETTY) {
-				nmc_terminal_erase_line ();
-				g_print (_("Device '%s' has been connected.\n"), nm_device_get_iface (device));
-			}
+		if (nmc->nowait_flag) {
 			g_object_unref (active);
 			quit ();
 		} else {
 			if (nmc->secret_agent) {
 				NMRemoteConnection *connection = nm_active_connection_get_connection (active);
 
-				nm_secret_agent_simple_enable (NM_SECRET_AGENT_SIMPLE (nmc->secret_agent),
+				nm_secret_agent_simple_enable (nmc->secret_agent,
 				                               nm_connection_get_path (NM_CONNECTION (connection)));
 			}
 
 			g_object_ref (device);
 			g_signal_connect (device, "notify::state", G_CALLBACK (device_state_cb), active);
 			g_signal_connect (active, "notify::state", G_CALLBACK (active_state_cb), device);
+
+			connected_state_cb (device, active);
+
 			/* Start timer not to loop forever if "notify::state" signal is not issued */
 			g_timeout_add_seconds (nmc->timeout, timeout_cb, nmc);
 		}
@@ -2518,7 +2463,7 @@ do_device_set (NmCli *nmc, int argc, char **argv)
 		return error->code;
 	}
 
-        if (!argc) {
+	if (!argc) {
 		g_string_printf (nmc->return_text, _("Error: No property specified."));
 		return NMC_RESULT_ERROR_USER_INPUT;
 	}
@@ -2717,7 +2662,7 @@ find_wifi_device_by_iface (NMDevice **devices, const char *iface, int *idx)
 }
 
 /*
- * Find AP on 'device' according to 'bssid' or 'ssid' parameter.
+ * Find AP on 'device' according to 'bssid' and 'ssid' parameters.
  * Returns: found AP or NULL
  */
 static NMAccessPoint *
@@ -2734,17 +2679,17 @@ find_ap_on_device (NMDevice *device, const char *bssid, const char *ssid, gboole
 		NMAccessPoint *candidate_ap = g_ptr_array_index (aps, i);
 
 		if (bssid) {
-			/* Parameter is BSSID */
 			const char *candidate_bssid = nm_access_point_get_bssid (candidate_ap);
 
+			if (!candidate_bssid)
+				continue;
+
 			/* Compare BSSIDs */
 			if (complete) {
 				if (g_str_has_prefix (candidate_bssid, bssid))
 					g_print ("%s\n", candidate_bssid);
-			} else if (strcmp (bssid, candidate_bssid) == 0) {
-				ap = candidate_ap;
-				break;
-			}
+			} else if (strcmp (bssid, candidate_bssid) != 0)
+				continue;
 		}
 
 		if (ssid) {
@@ -2763,13 +2708,18 @@ find_ap_on_device (NMDevice *device, const char *bssid, const char *ssid, gboole
 			if (complete) {
 				if (g_str_has_prefix (ssid_tmp, ssid))
 					g_print ("%s\n", ssid_tmp);
-			} else if (strcmp (ssid, ssid_tmp) == 0) {
-				ap = candidate_ap;
+			} else if (strcmp (ssid, ssid_tmp) != 0) {
 				g_free (ssid_tmp);
-				break;
+				continue;
 			}
 			g_free (ssid_tmp);
 		}
+
+		if (complete)
+			continue;
+
+		ap = candidate_ap;
+		break;
 	}
 
 	return ap;
@@ -3173,7 +3123,6 @@ do_device_wifi_connect_network (NmCli *nmc, int argc, char **argv)
 	NMConnection *connection = NULL;
 	NMSettingConnection *s_con;
 	NMSettingWireless *s_wifi;
-	NMSettingWirelessSecurity *s_wsec;
 	AddAndActivateInfo *info;
 	const char *param_user = NULL;
 	const char *ifname = NULL;
@@ -3189,6 +3138,10 @@ do_device_wifi_connect_network (NmCli *nmc, int argc, char **argv)
 	int devices_idx;
 	char *ssid_ask = NULL;
 	char *passwd_ask = NULL;
+	const GPtrArray *avail_cons;
+	gboolean name_match = FALSE;
+	gboolean existing_con = FALSE;
+	int i;
 
 	/* Set default timeout waiting for operation completion. */
 	if (nmc->timeout == -1)
@@ -3211,7 +3164,7 @@ do_device_wifi_connect_network (NmCli *nmc, int argc, char **argv)
 		g_assert (!nmc->complete);
 
 		if (nmc->ask) {
-			ssid_ask = nmc_readline (_("SSID or BSSID: "));
+			ssid_ask = nmc_readline (&nmc->nmc_config, _("SSID or BSSID: "));
 			param_user = ssid_ask ?: "";
 			bssid1_arr = nm_utils_hwaddr_atoba (param_user, ETH_ALEN);
 		}
@@ -3393,14 +3346,14 @@ do_device_wifi_connect_network (NmCli *nmc, int argc, char **argv)
 	}
 
 	/* Find an AP to connect to */
-	ap = find_ap_on_device (device, bssid1_arr ? param_user : NULL,
+	ap = find_ap_on_device (device, bssid1_arr ? param_user : bssid,
 	                                bssid1_arr ? NULL : param_user, FALSE);
 	if (!ap && !ifname) {
 		NMDevice *dev;
 
 		/* AP not found, ifname was not specified, so try finding the AP on another device. */
 		while ((dev = find_wifi_device_by_iface (devices, NULL, &devices_idx)) != NULL) {
-			ap = find_ap_on_device (dev, bssid1_arr ? param_user : NULL,
+			ap = find_ap_on_device (dev, bssid1_arr ? param_user : bssid,
 			                             bssid1_arr ? NULL : param_user, FALSE);
 			if (ap) {
 				device = dev;
@@ -3418,45 +3371,75 @@ do_device_wifi_connect_network (NmCli *nmc, int argc, char **argv)
 		goto finish;
 	}
 
-	/* If there are some connection data from user, create a connection and
-	 * fill them into proper settings. */
-	if (con_name || private || bssid2_arr || password || hidden)
-		connection = nm_simple_connection_new ();
+	avail_cons = nm_device_get_available_connections (device);
+	for (i = 0; i < avail_cons->len; i++) {
+		NMRemoteConnection *avail_con = g_ptr_array_index (avail_cons, i);
+		const char *id = nm_connection_get_id (NM_CONNECTION (avail_con));
 
-	if (con_name || private) {
-		s_con =  (NMSettingConnection *) nm_setting_connection_new ();
-		nm_connection_add_setting (connection, NM_SETTING (s_con));
+		if (con_name) {
+			if (!id || strcmp (id, con_name))
+				continue;
 
-		/* Set user provided connection name */
-		if (con_name)
-			g_object_set (s_con, NM_SETTING_CONNECTION_ID, con_name, NULL);
+			name_match = TRUE;
+		}
 
-		/* Connection will only be visible to this user when 'private' is specified */
-		if (private)
-			nm_setting_connection_add_permission (s_con, "user", g_get_user_name (), NULL);
+		if (nm_access_point_connection_valid (ap, NM_CONNECTION (avail_con))) {
+			/* ap has been checked against bssid1, bssid2 and the ssid
+			 * and now avail_con has been checked against ap.
+			 */
+			connection = NM_CONNECTION (avail_con);
+			existing_con = TRUE;
+			break;
+		}
 	}
-	if (bssid2_arr || hidden) {
-		s_wifi = (NMSettingWireless *) nm_setting_wireless_new ();
-		nm_connection_add_setting (connection, NM_SETTING (s_wifi));
-
-		/* 'bssid' parameter is used to restrict the connection only to the BSSID */
-		if (bssid2_arr)
-			g_object_set (s_wifi, NM_SETTING_WIRELESS_BSSID, bssid2_arr, NULL);
-
-		/* 'hidden' parameter is used to indicate that SSID is not broadcasted */
-		if (hidden) {
-			GBytes *ssid = g_bytes_new (param_user, strlen (param_user));
-
-			g_object_set (s_wifi,
-			              NM_SETTING_WIRELESS_SSID, ssid,
-			              NM_SETTING_WIRELESS_HIDDEN, hidden,
-			              NULL);
-			g_bytes_unref (ssid);
-
-			/* Warn when the provided AP identifier looks like BSSID instead of SSID */
-			if (bssid1_arr)
-				g_printerr (_("Warning: '%s' should be SSID for hidden APs; but it looks like a BSSID.\n"),
-				               param_user);
+
+	if (name_match && !existing_con) {
+		g_string_printf (nmc->return_text, _("Error: Connection '%s' exists but properties don't match."), con_name);
+		nmc->return_value = NMC_RESULT_ERROR_NOT_FOUND;
+		goto finish;
+	}
+
+	if (!existing_con) {
+		/* If there are some connection data from user, create a connection and
+		 * fill them into proper settings. */
+		if (con_name || private || bssid2_arr || password || hidden)
+			connection = nm_simple_connection_new ();
+
+		if (con_name || private) {
+			s_con =  (NMSettingConnection *) nm_setting_connection_new ();
+			nm_connection_add_setting (connection, NM_SETTING (s_con));
+
+			/* Set user provided connection name */
+			if (con_name)
+				g_object_set (s_con, NM_SETTING_CONNECTION_ID, con_name, NULL);
+
+			/* Connection will only be visible to this user when 'private' is specified */
+			if (private)
+				nm_setting_connection_add_permission (s_con, "user", g_get_user_name (), NULL);
+		}
+		if (bssid2_arr || hidden) {
+			s_wifi = (NMSettingWireless *) nm_setting_wireless_new ();
+			nm_connection_add_setting (connection, NM_SETTING (s_wifi));
+
+			/* 'bssid' parameter is used to restrict the connection only to the BSSID */
+			if (bssid2_arr)
+				g_object_set (s_wifi, NM_SETTING_WIRELESS_BSSID, bssid2_arr, NULL);
+
+			/* 'hidden' parameter is used to indicate that SSID is not broadcasted */
+			if (hidden) {
+				GBytes *ssid = g_bytes_new (param_user, strlen (param_user));
+
+				g_object_set (s_wifi,
+				              NM_SETTING_WIRELESS_SSID, ssid,
+				              NM_SETTING_WIRELESS_HIDDEN, hidden,
+				              NULL);
+				g_bytes_unref (ssid);
+
+				/* Warn when the provided AP identifier looks like BSSID instead of SSID */
+				if (bssid1_arr)
+					g_printerr (_("Warning: '%s' should be SSID for hidden APs; but it looks like a BSSID.\n"),
+					               param_user);
+			}
 		}
 	}
 
@@ -3469,15 +3452,38 @@ do_device_wifi_connect_network (NmCli *nmc, int argc, char **argv)
 	if (   (ap_flags & NM_802_11_AP_FLAGS_PRIVACY)
 	    || ap_wpa_flags != NM_802_11_AP_SEC_NONE
 	    || ap_rsn_flags != NM_802_11_AP_SEC_NONE) {
+		const char *con_password = NULL;
+		NMSettingWirelessSecurity *s_wsec = NULL;
+
+		if (connection) {
+			s_wsec = nm_connection_get_setting_wireless_security (connection);
+			if (s_wsec) {
+				if (ap_wpa_flags == NM_802_11_AP_SEC_NONE && ap_rsn_flags == NM_802_11_AP_SEC_NONE) {
+					/* WEP */
+					con_password = nm_setting_wireless_security_get_wep_key (s_wsec, 0);
+				} else if (   (ap_wpa_flags & NM_802_11_AP_SEC_KEY_MGMT_PSK)
+				           || (ap_rsn_flags & NM_802_11_AP_SEC_KEY_MGMT_PSK)
+				           || (ap_rsn_flags & NM_802_11_AP_SEC_KEY_MGMT_SAE)) {
+					/* WPA PSK */
+					con_password = nm_setting_wireless_security_get_psk (s_wsec);
+				}
+			}
+		}
+
 		/* Ask for missing password when one is expected and '--ask' is used */
-		if (!password && nmc->ask)
-			password = passwd_ask = nmc_readline_echo (nmc->nmc_config.show_secrets, _("Password: "));
+		if (!password && !con_password && nmc->ask) {
+			password = passwd_ask = nmc_readline_echo (&nmc->nmc_config,
+			                                           nmc->nmc_config.show_secrets,
+			                                           _("Password: "));
+		}
 
 		if (password) {
 			if (!connection)
 				connection = nm_simple_connection_new ();
-			s_wsec = (NMSettingWirelessSecurity *) nm_setting_wireless_security_new ();
-			nm_connection_add_setting (connection, NM_SETTING (s_wsec));
+			if (!s_wsec) {
+				s_wsec = (NMSettingWirelessSecurity *) nm_setting_wireless_security_new ();
+				nm_connection_add_setting (connection, NM_SETTING (s_wsec));
+			}
 
 			if (ap_wpa_flags == NM_802_11_AP_SEC_NONE && ap_rsn_flags == NM_802_11_AP_SEC_NONE) {
 				/* WEP */
@@ -3487,13 +3493,14 @@ do_device_wifi_connect_network (NmCli *nmc, int argc, char **argv)
 				              wep_passphrase ? NM_WEP_KEY_TYPE_PASSPHRASE: NM_WEP_KEY_TYPE_KEY,
 				              NULL);
 			} else if (   (ap_wpa_flags & NM_802_11_AP_SEC_KEY_MGMT_PSK)
-			           || (ap_rsn_flags & NM_802_11_AP_SEC_KEY_MGMT_PSK)) {
+			           || (ap_rsn_flags & NM_802_11_AP_SEC_KEY_MGMT_PSK)
+			           || (ap_rsn_flags & NM_802_11_AP_SEC_KEY_MGMT_SAE)) {
 				/* WPA PSK */
 				g_object_set (s_wsec, NM_SETTING_WIRELESS_SECURITY_PSK, password, NULL);
 			}
 		}
 	}
-	// FIXME: WPA-Enterprise is not supported yet.
+	// FIXME: Creating WPA-Enterprise connections is not supported yet.
 	// We are not able to determine and fill all the parameters for
 	// 802.1X authentication automatically without user providing
 	// the data. Adding nmcli options for the 8021x setting would
@@ -3511,14 +3518,24 @@ do_device_wifi_connect_network (NmCli *nmc, int argc, char **argv)
 	info->nmc = nmc;
 	info->device = device;
 	info->hotspot = FALSE;
-
-	nm_client_add_and_activate_connection_async (nmc->client,
-	                                             connection,
-	                                             device,
-	                                             nm_object_get_path (NM_OBJECT (ap)),
-	                                             NULL,
-	                                             add_and_activate_cb,
-	                                             info);
+	info->create = !existing_con;
+	if (existing_con) {
+		nm_client_activate_connection_async (nmc->client,
+		                                     connection,
+		                                     device,
+		                                     nm_object_get_path (NM_OBJECT (ap)),
+		                                     NULL,
+		                                     add_and_activate_cb,
+		                                     info);
+	} else {
+		nm_client_add_and_activate_connection_async (nmc->client,
+		                                             connection,
+		                                             device,
+		                                             nm_object_get_path (NM_OBJECT (ap)),
+		                                             NULL,
+		                                             add_and_activate_cb,
+		                                             info);
+	}
 
 finish:
 	if (bssid1_arr)
diff --git a/clients/cli/general.c b/clients/cli/general.c
index cb87c110..2c22bdc9 100644
--- a/clients/cli/general.c
+++ b/clients/cli/general.c
@@ -21,7 +21,6 @@
 
 #include "general.h"
 
-#include 
 #include 
 
 #include "nm-common-macros.h"
@@ -37,7 +36,7 @@
 
 /*****************************************************************************/
 
-NM_UTILS_LOOKUP_STR_DEFINE_STATIC (nm_state_to_string_no_l10n, NMState,
+NM_UTILS_LOOKUP_STR_DEFINE_STATIC (nm_state_to_string, NMState,
 	NM_UTILS_LOOKUP_DEFAULT (N_("unknown")),
 	NM_UTILS_LOOKUP_ITEM (NM_STATE_ASLEEP,           N_("asleep")),
 	NM_UTILS_LOOKUP_ITEM (NM_STATE_CONNECTING,       N_("connecting")),
@@ -49,12 +48,6 @@ NM_UTILS_LOOKUP_STR_DEFINE_STATIC (nm_state_to_string_no_l10n, NMState,
 	NM_UTILS_LOOKUP_ITEM_IGNORE (NM_STATE_UNKNOWN),
 );
 
-static const char *
-nm_state_to_string (NMState state)
-{
-	return _(nm_state_to_string_no_l10n (state));
-}
-
 static NMMetaColor
 state_to_color (NMState state)
 {
@@ -78,21 +71,6 @@ state_to_color (NMState state)
 	}
 }
 
-NM_UTILS_LOOKUP_STR_DEFINE_STATIC (nm_connectivity_to_string_no_l10n, NMConnectivityState,
-	NM_UTILS_LOOKUP_DEFAULT (N_("unknown")),
-	NM_UTILS_LOOKUP_ITEM (NM_CONNECTIVITY_NONE,    N_("none")),
-	NM_UTILS_LOOKUP_ITEM (NM_CONNECTIVITY_PORTAL,  N_("portal")),
-	NM_UTILS_LOOKUP_ITEM (NM_CONNECTIVITY_LIMITED, N_("limited")),
-	NM_UTILS_LOOKUP_ITEM (NM_CONNECTIVITY_FULL,    N_("full")),
-	NM_UTILS_LOOKUP_ITEM_IGNORE (NM_CONNECTIVITY_UNKNOWN),
-);
-
-static const char *
-nm_connectivity_to_string (NMConnectivityState connectivity)
-{
-	return _(nm_connectivity_to_string_no_l10n (connectivity));
-}
-
 static NMMetaColor
 connectivity_to_color (NMConnectivityState connectivity)
 {
@@ -146,12 +124,14 @@ permission_to_string (NMClientPermission perm)
 		return NM_AUTH_PERMISSION_ENABLE_DISABLE_STATISTICS;
 	case NM_CLIENT_PERMISSION_ENABLE_DISABLE_CONNECTIVITY_CHECK:
 		return NM_AUTH_PERMISSION_ENABLE_DISABLE_CONNECTIVITY_CHECK;
+	case NM_CLIENT_PERMISSION_WIFI_SCAN:
+		return NM_AUTH_PERMISSION_WIFI_SCAN;
 	default:
 		return _("unknown");
 	}
 }
 
-NM_UTILS_LOOKUP_STR_DEFINE_STATIC (permission_result_to_string_no_l10n, NMClientPermissionResult,
+NM_UTILS_LOOKUP_STR_DEFINE_STATIC (permission_result_to_string, NMClientPermissionResult,
 	NM_UTILS_LOOKUP_DEFAULT (N_("unknown")),
 	NM_UTILS_LOOKUP_ITEM (NM_CLIENT_PERMISSION_RESULT_YES,  N_("yes")),
 	NM_UTILS_LOOKUP_ITEM (NM_CLIENT_PERMISSION_RESULT_NO,   N_("no")),
@@ -192,7 +172,7 @@ _metagen_general_status_get_fcn (NMC_META_GENERIC_INFO_GET_FCN_ARGS)
 	case NMC_GENERIC_INFO_TYPE_GENERAL_STATUS_STATE:
 		state = nm_client_get_state (nmc->client);
 		NMC_HANDLE_COLOR (state_to_color (state));
-		value = nm_state_to_string_no_l10n (state);
+		value = nm_state_to_string (state);
 		goto translate_and_out;
 	case NMC_GENERIC_INFO_TYPE_GENERAL_STATUS_STARTUP:
 		v_bool = nm_client_get_startup (nmc->client);
@@ -202,7 +182,7 @@ _metagen_general_status_get_fcn (NMC_META_GENERIC_INFO_GET_FCN_ARGS)
 	case NMC_GENERIC_INFO_TYPE_GENERAL_STATUS_CONNECTIVITY:
 		connectivity = nm_client_get_connectivity (nmc->client);
 		NMC_HANDLE_COLOR (connectivity_to_color (connectivity));
-		value = nm_connectivity_to_string_no_l10n (connectivity);
+		value = nm_connectivity_to_string (connectivity);
 		goto translate_and_out;
 	case NMC_GENERIC_INFO_TYPE_GENERAL_STATUS_NETWORKING:
 		v_bool = nm_client_networking_get_enabled (nmc->client);
@@ -221,7 +201,7 @@ _metagen_general_status_get_fcn (NMC_META_GENERIC_INFO_GET_FCN_ARGS)
 		goto enabled_out;
 	case NMC_GENERIC_INFO_TYPE_GENERAL_STATUS_WIMAX_HW:
 	case NMC_GENERIC_INFO_TYPE_GENERAL_STATUS_WIMAX:
-		/* deprected fields. Don't return anything. */
+		/* deprecated fields. Don't return anything. */
 		return NULL;
 	default:
 		break;
@@ -286,7 +266,7 @@ _metagen_general_permissions_get_fcn (NMC_META_GENERIC_INFO_GET_FCN_ARGS)
 	case NMC_GENERIC_INFO_TYPE_GENERAL_PERMISSIONS_VALUE:
 		perm_result = nm_client_get_permission_result (nmc->client, perm);
 		NMC_HANDLE_COLOR (permission_result_to_color (perm_result));
-		s = permission_result_to_string_no_l10n (perm_result);
+		s = permission_result_to_string (perm_result);
 		if (get_type == NM_META_ACCESSOR_GET_TYPE_PRETTY)
 			return _(s);
 		return s;
@@ -561,8 +541,7 @@ print_permissions (void *user_data)
 		permissions[i++] = GINT_TO_POINTER (perm);
 	permissions[i++] = NULL;
 
-	/* Optionally start paging the output. */
-	nmc_terminal_spawn_pager (&nmc->nmc_config);
+	nm_cli_spawn_pager (nmc);
 
 	if (!nmc_print (&nmc->nmc_config,
 	                permissions,
@@ -998,7 +977,7 @@ do_radio_wifi (NmCli *nmc, int argc, char **argv)
 		if (nmc->complete)
 			return nmc->return_value;
 
-		/* no argument, show current WiFi state */
+		/* no argument, show current Wi-Fi state */
 		nmc_switch_show (nmc, NMC_FIELDS_NM_WIFI, N_("Wi-Fi radio switch"));
 	} else {
 		if (nmc->complete) {
@@ -1114,7 +1093,8 @@ client_connectivity (NMClient *client, GParamSpec *param, NmCli *nmc)
 
 	g_object_get (client, NM_CLIENT_CONNECTIVITY, &connectivity, NULL);
 	str = nmc_colorize (&nmc->nmc_config, connectivity_to_color (connectivity),
-	                    _("Connectivity is now '%s'\n"), nm_connectivity_to_string (connectivity));
+	                    _("Connectivity is now '%s'\n"),
+	                    gettext (nm_connectivity_to_string (connectivity)));
 	g_print ("%s", str);
 	g_free (str);
 }
@@ -1128,7 +1108,7 @@ client_state (NMClient *client, GParamSpec *param, NmCli *nmc)
 	g_object_get (client, NM_CLIENT_STATE, &state, NULL);
 	str = nmc_colorize (&nmc->nmc_config, state_to_color (state),
 	                    _("Networkmanager is now in the '%s' state\n"),
-	                    nm_state_to_string (state));
+	                    gettext (nm_state_to_string (state)));
 	g_print ("%s", str);
 	g_free (str);
 }
@@ -1285,8 +1265,7 @@ do_overview (NmCli *nmc, int argc, char **argv)
 	/* Register polkit agent */
 	nmc_start_polkit_agent_start_try (nmc);
 
-	/* Optionally start paging the output. */
-	nmc_terminal_spawn_pager (&nmc->nmc_config);
+	nm_cli_spawn_pager (nmc);
 
 	/* The VPN connections don't have devices (yet?). */
 	p = nm_client_get_active_connections (nmc->client);
diff --git a/clients/cli/meson.build b/clients/cli/meson.build
index c5669c96..11fe1cd1 100644
--- a/clients/cli/meson.build
+++ b/clients/cli/meson.build
@@ -3,7 +3,7 @@ name = 'nmcli'
 # FIXME: nmcli-completion should be renamed to nmcli
 install_data(
   'nmcli-completion',
-  install_dir: join_paths(nm_datadir, 'bash-completion', 'completions')
+  install_dir: join_paths(nm_datadir, 'bash-completion', 'completions'),
 )
 
 sources = files(
@@ -15,7 +15,7 @@ sources = files(
   'nmcli.c',
   'polkit-agent.c',
   'settings.c',
-  'utils.c'
+  'utils.c',
 )
 
 deps = [
@@ -23,7 +23,7 @@ deps = [
   libnmc_base_dep,
   libnmc_dep,
   nm_core_dep,
-  readline_dep
+  readline_dep,
 ]
 
 cflags = clients_cflags + [
@@ -43,5 +43,5 @@ executable(
   c_args: cflags,
   link_args: ldflags_linker_script_binary,
   link_depends: linker_script_binary,
-  install: true
+  install: true,
 )
diff --git a/clients/cli/nmcli.c b/clients/cli/nmcli.c
index bbfc310d..d7bc2a46 100644
--- a/clients/cli/nmcli.c
+++ b/clients/cli/nmcli.c
@@ -24,7 +24,6 @@
 #include "nmcli.h"
 
 #include 
-#include 
 #include 
 #include 
 #include 
@@ -245,19 +244,19 @@ usage (void)
 	g_printerr (_("Usage: nmcli [OPTIONS] OBJECT { COMMAND | help }\n"
 	              "\n"
 	              "OPTIONS\n"
-	              "  -o[verview]                                    overview mode (hide default values)\n"
-	              "  -t[erse]                                       terse output\n"
-	              "  -p[retty]                                      pretty output\n"
-	              "  -m[ode] tabular|multiline                      output mode\n"
-	              "  -c[olors] auto|yes|no                          whether to use colors in output\n"
-	              "  -f[ields] |all|common       specify fields to output\n"
-	              "  -g[et-values] |all|common   shortcut for -m tabular -t -f\n"
-	              "  -e[scape] yes|no                               escape columns separators in values\n"
-	              "  -a[sk]                                         ask for missing parameters\n"
-	              "  -s[how-secrets]                                allow displaying passwords\n"
-	              "  -w[ait]                               set timeout waiting for finishing operations\n"
-	              "  -v[ersion]                                     show program version\n"
-	              "  -h[elp]                                        print this help\n"
+	              "  -a, --ask                                ask for missing parameters\n"
+	              "  -c, --colors auto|yes|no                 whether to use colors in output\n"
+	              "  -e, --escape yes|no                      escape columns separators in values\n"
+	              "  -f, --fields |all|common      specify fields to output\n"
+	              "  -g, --get-values |all|common  shortcut for -m tabular -t -f\n"
+	              "  -h, --help                               print this help\n"
+	              "  -m, --mode tabular|multiline             output mode\n"
+	              "  -o, --overview                           overview mode\n"
+	              "  -p, --pretty                             pretty output\n"
+	              "  -s, --show-secrets                       allow displaying passwords\n"
+	              "  -t, --terse                              terse output\n"
+	              "  -v, --version                            show program version\n"
+	              "  -w, --wait                      set timeout waiting for finishing operations\n"
 	              "\n"
 	              "OBJECT\n"
 	              "  g[eneral]       NetworkManager's general status and operations\n"
@@ -504,7 +503,7 @@ resolve_color_alias (const char *color)
 	static const struct {
 		const char *name;
 		const char *alias;
-	} const aliases[] = {
+	} aliases[] = {
 		{ "reset",        "0" },
 		{ "bold",         "1" },
 		{ "white",        "1;37" },
@@ -998,6 +997,14 @@ nmc_value_transforms_register (void)
 	                                 nmc_convert_bytes_to_string);
 }
 
+void
+nm_cli_spawn_pager (NmCli *nmc)
+{
+	if (nmc->pager_pid > 0)
+		return;
+	nmc->pager_pid = nmc_terminal_spawn_pager (&nmc->nmc_config);
+}
+
 static void
 nmc_cleanup (NmCli *nmc)
 {
@@ -1005,15 +1012,15 @@ nmc_cleanup (NmCli *nmc)
 
 	g_clear_object (&nmc->client);
 
-	g_string_free (nmc->return_text, TRUE);
+	if (nmc->return_text)
+		g_string_free (g_steal_pointer (&nmc->return_text), TRUE);
 
 	if (nmc->secret_agent) {
-		/* Destroy secret agent if we have one. */
-		nm_secret_agent_old_unregister (nmc->secret_agent, NULL, NULL);
-		g_object_unref (nmc->secret_agent);
+		nm_secret_agent_old_unregister (NM_SECRET_AGENT_OLD (nmc->secret_agent), NULL, NULL);
+		g_clear_object (&nmc->secret_agent);
 	}
-	if (nmc->pwds_hash)
-		g_hash_table_destroy (nmc->pwds_hash);
+
+	nm_clear_pointer (&nmc->pwds_hash, g_hash_table_destroy);
 
 	nm_clear_g_free (&nmc->required_fields);
 
diff --git a/clients/cli/nmcli.h b/clients/cli/nmcli.h
index 28616855..cd50333a 100644
--- a/clients/cli/nmcli.h
+++ b/clients/cli/nmcli.h
@@ -20,7 +20,7 @@
 #ifndef NMC_NMCLI_H
 #define NMC_NMCLI_H
 
-#include "nm-secret-agent-old.h"
+#include "nm-secret-agent-simple.h"
 #include "nm-meta-setting-desc.h"
 
 struct _NMPolkitListener;
@@ -129,7 +129,7 @@ typedef struct _NmCli {
 
 	int timeout;                                      /* Operation timeout */
 
-	NMSecretAgentOld *secret_agent;                   /* Secret agent */
+	NMSecretAgentSimple *secret_agent;                /* Secret agent */
 	GHashTable *pwds_hash;                            /* Hash table with passwords in passwd-file */
 	struct _NMPolkitListener *pk_listener;            /* polkit agent listener */
 
@@ -167,6 +167,8 @@ void     nmc_clear_sigint (void);
 void     nmc_set_sigquit_internal (void);
 void     nmc_exit (void);
 
+void nm_cli_spawn_pager (NmCli *nmc);
+
 void nmc_empty_output_fields (NmcOutputData *output_data);
 
 #define NMC_OUTPUT_DATA_DEFINE_SCOPED(out) \
diff --git a/clients/cli/polkit-agent.c b/clients/cli/polkit-agent.c
index 338f0b15..accb567f 100644
--- a/clients/cli/polkit-agent.c
+++ b/clients/cli/polkit-agent.c
@@ -22,7 +22,6 @@
 #include "polkit-agent.h"
 
 #include 
-#include 
 #include 
 #include 
 
@@ -40,24 +39,25 @@ polkit_request (NMPolkitListener *listener,
                 gboolean echo_on,
                 gpointer user_data)
 {
-	char *response, *tmp, *p;
+	NmCli *nmc = user_data;
 
 	g_print ("%s\n", message);
 	g_print ("(action_id: %s)\n", action_id);
 
 	/* Ask user for polkit authorization password */
 	if (user) {
+		gs_free char *tmp = NULL;
+		char *p;
+
 		/* chop of ": " if present */
 		tmp = g_strdup (request);
 		p = strrchr (tmp, ':');
-		if (p && !strcmp (p, ": "))
+		if (p && nm_streq (p, ": "))
 			*p = '\0';
-		response = nmc_readline_echo (echo_on, "%s (%s): ", tmp, user);
-		g_free (tmp);
-	} else
-		response = nmc_readline_echo (echo_on, "%s", request);
+		return nmc_readline_echo (&nmc->nmc_config, echo_on, "%s (%s): ", tmp, user);
+	}
 
-	return response;
+	return nmc_readline_echo (&nmc->nmc_config, echo_on, "%s", request);
 }
 
 static void
diff --git a/clients/cli/settings.c b/clients/cli/settings.c
index 2d231e1c..a04c8eb6 100644
--- a/clients/cli/settings.c
+++ b/clients/cli/settings.c
@@ -307,7 +307,8 @@ nmc_setting_connection_connect_handlers (NMSettingConnection *setting, NMConnect
 /*****************************************************************************/
 
 static gboolean
-_set_fcn_precheck_connection_secondaries (const char *value,
+_set_fcn_precheck_connection_secondaries (NMClient *client,
+                                          const char *value,
                                           char **value_coerced,
                                           GError **error)
 {
@@ -322,7 +323,7 @@ _set_fcn_precheck_connection_secondaries (const char *value,
 	if (!strv0)
 		return TRUE;
 
-	connections = nm_client_get_connections (nm_cli.client);
+	connections = nm_client_get_connections (client);
 
 	strv = g_strdupv ((char **) strv0);
 	for (iter = strv; *iter; iter++) {
@@ -332,7 +333,7 @@ _set_fcn_precheck_connection_secondaries (const char *value,
 				g_print (_("Warning: %s is not an UUID of any existing connection profile\n"),
 				         *iter);
 			} else {
-				/* Currenly NM only supports VPN connections as secondaries */
+				/* Currently NM only supports VPN connections as secondaries */
 				if (!nm_connection_is_type (con, NM_SETTING_VPN_SETTING_NAME)) {
 					g_set_error (error, 1, 0, _("'%s' is not a VPN connection profile"), *iter);
 					return FALSE;
@@ -345,7 +346,7 @@ _set_fcn_precheck_connection_secondaries (const char *value,
 				return FALSE;
 			}
 
-			/* Currenly NM only supports VPN connections as secondaries */
+			/* Currently NM only supports VPN connections as secondaries */
 			if (!nm_connection_is_type (con, NM_SETTING_VPN_SETTING_NAME)) {
 				g_set_error (error, 1, 0, _("'%s' is not a VPN connection profile"), *iter);
 				return FALSE;
@@ -531,7 +532,7 @@ _set_fcn_call (const NMMetaPropertyInfo *property_info,
  * Returns: TRUE on success; FALSE on failure and sets error
  */
 gboolean
-nmc_setting_set_property (NMSetting *setting, const char *prop, const char *value, GError **error)
+nmc_setting_set_property (NMClient *client, NMSetting *setting, const char *prop, const char *value, GError **error)
 {
 	const NMMetaPropertyInfo *property_info;
 
@@ -552,7 +553,7 @@ nmc_setting_set_property (NMSetting *setting, const char *prop, const char *valu
 				if (nm_streq (property_info->property_name, NM_SETTING_CONNECTION_SECONDARIES)) {
 					gs_free char *value_coerced = NULL;
 
-					if (!_set_fcn_precheck_connection_secondaries (value, &value_coerced, error))
+					if (!_set_fcn_precheck_connection_secondaries (client, value, &value_coerced, error))
 						return FALSE;
 
 					return _set_fcn_call (property_info,
@@ -590,11 +591,11 @@ nmc_property_set_default_value (NMSetting *setting, const char *prop)
 }
 
 /*
- * Generic function for reseting (single value) properties.
+ * Generic function for resetting (single value) properties.
  *
  * The function resets the property value to the default one. It respects
  * nmcli restrictions for changing properties. So if 'set_func' is NULL,
- * reseting the value is denied.
+ * resetting the value is denied.
  *
  * Returns: TRUE on success; FALSE on failure and sets error
  */
diff --git a/clients/cli/settings.h b/clients/cli/settings.h
index 7dad622b..4e7e38df 100644
--- a/clients/cli/settings.h
+++ b/clients/cli/settings.h
@@ -42,7 +42,8 @@ char       *nmc_setting_get_property (NMSetting *setting,
 char       *nmc_setting_get_property_parsable (NMSetting *setting,
                                                const char *prop,
                                                GError **error);
-gboolean    nmc_setting_set_property (NMSetting *setting,
+gboolean    nmc_setting_set_property (NMClient *client,
+                                      NMSetting *setting,
                                       const char *prop,
                                       const char *val,
                                       GError **error);
diff --git a/clients/cli/utils.c b/clients/cli/utils.c
index feb67221..0e74ba88 100644
--- a/clients/cli/utils.c
+++ b/clients/cli/utils.c
@@ -23,9 +23,7 @@
 #include "utils.h"
 
 #include 
-#include 
 #include 
-#include 
 #include 
 #include 
 #include 
@@ -36,6 +34,7 @@
 #include "nm-meta-setting-access.h"
 
 #include "common.h"
+#include "nmcli.h"
 #include "settings.h"
 
 #define ML_HEADER_WIDTH 79
@@ -1100,7 +1099,7 @@ _print_fill (const NmcConfig *nmc_config,
 				/* don't mark the entry for display. This is to shorten the output in case
 				 * the property is the default value. But we only do that, if the user
 				 * opts in to this behavior (-overview), or of the property marks itself
-				 * elegible to be hidden.
+				 * eligible to be hidden.
 				 *
 				 * In general, only new API shall mark itself eligible to be hidden.
 				 * Long established properties cannot, because it would be a change
@@ -1275,7 +1274,7 @@ _print_do (const NmcConfig *nmc_config,
 			title = header_cell->title;
 
 			width1 = strlen (title);
-			width2 = nmc_string_screen_width (title, NULL);  /* Width of the string (in screen colums) */
+			width2 = nmc_string_screen_width (title, NULL);  /* Width of the string (in screen columns) */
 			g_string_append_printf (str, "%-*s", (int) (header_cell->width + width1 - width2), title);
 			g_string_append_c (str, ' ');  /* Column separator */
 			table_width += header_cell->width + width1 - width2 + 1;
@@ -1357,7 +1356,7 @@ _print_do (const NmcConfig *nmc_config,
 						const PrintDataHeaderCell *header_cell = &header_row[i_col];
 
 						width1 = strlen (text);
-						width2 = nmc_string_screen_width (text, NULL);  /* Width of the string (in screen colums) */
+						width2 = nmc_string_screen_width (text, NULL);  /* Width of the string (in screen columns) */
 						g_string_append_printf (str, "%-*s", (int) (header_cell->width + width1 - width2), text);
 						g_string_append_c (str, ' ');  /* Column separator */
 						table_width += header_cell->width + width1 - width2 + 1;
@@ -1427,19 +1426,20 @@ pager_fallback (void)
 {
 	char buf[64];
 	int rb;
+	int errsv;
 
 	do {
 		rb = read (STDIN_FILENO, buf, sizeof (buf));
 		if (rb == -1) {
-			if (errno == EINTR) {
+			errsv = errno;
+			if (errsv == EINTR)
 				continue;
-			} else {
-				g_printerr (_("Error reading nmcli output: %s\n"), strerror (errno));
-				_exit(EXIT_FAILURE);
-			}
+			g_printerr (_("Error reading nmcli output: %s\n"), nm_strerror_native (errsv));
+			_exit(EXIT_FAILURE);
 		}
 		if (write (STDOUT_FILENO, buf, rb) == -1) {
-			g_printerr (_("Error writing nmcli output: %s\n"), strerror (errno));
+			errsv = errno;
+			g_printerr (_("Error writing nmcli output: %s\n"), nm_strerror_native (errsv));
 			_exit(EXIT_FAILURE);
 		}
 	} while (rb > 0);
@@ -1447,38 +1447,41 @@ pager_fallback (void)
 	_exit(EXIT_SUCCESS);
 }
 
-void
+pid_t
 nmc_terminal_spawn_pager (const NmcConfig *nmc_config)
 {
 	const char *pager = getenv ("PAGER");
+	pid_t pager_pid;
 	pid_t parent_pid;
 	int fd[2];
+	int errsv;
 
-	if (   nm_cli.nmc_config.in_editor
-	    || nm_cli.pager_pid > 0
+	if (   nmc_config->in_editor
 	    || nmc_config->print_output == NMC_PRINT_TERSE
 	    || !nmc_config->use_colors
 	    || g_strcmp0 (pager, "") == 0
 	    || getauxval (AT_SECURE))
-		return;
+		return 0;
 
 	if (pipe (fd) == -1) {
-		g_printerr (_("Failed to create pager pipe: %s\n"), strerror (errno));
-		return;
+		errsv = errno;
+		g_printerr (_("Failed to create pager pipe: %s\n"), nm_strerror_native (errsv));
+		return 0;
 	}
 
 	parent_pid = getpid ();
 
-	nm_cli.pager_pid = fork ();
-	if (nm_cli.pager_pid == -1) {
-		g_printerr (_("Failed to fork pager: %s\n"), strerror (errno));
+	pager_pid = fork ();
+	if (pager_pid == -1) {
+		errsv = errno;
+		g_printerr (_("Failed to fork pager: %s\n"), nm_strerror_native (errsv));
 		nm_close (fd[0]);
 		nm_close (fd[1]);
-		return;
+		return 0;
 	}
 
 	/* In the child start the pager */
-	if (nm_cli.pager_pid == 0) {
+	if (pager_pid == 0) {
 		dup2 (fd[0], STDIN_FILENO);
 		nm_close (fd[0]);
 		nm_close (fd[1]);
@@ -1516,13 +1519,18 @@ nmc_terminal_spawn_pager (const NmcConfig *nmc_config)
 	}
 
 	/* Return in the parent */
-	if (dup2 (fd[1], STDOUT_FILENO) < 0)
-		g_printerr (_("Failed to duplicate pager pipe: %s\n"), strerror (errno));
-	if (dup2 (fd[1], STDERR_FILENO) < 0)
-		g_printerr (_("Failed to duplicate pager pipe: %s\n"), strerror (errno));
+	if (dup2 (fd[1], STDOUT_FILENO) < 0) {
+		errsv = errno;
+		g_printerr (_("Failed to duplicate pager pipe: %s\n"), nm_strerror_native (errsv));
+	}
+	if (dup2 (fd[1], STDERR_FILENO) < 0) {
+		errsv = errno;
+		g_printerr (_("Failed to duplicate pager pipe: %s\n"), nm_strerror_native (errsv));
+	}
 
 	nm_close (fd[0]);
 	nm_close (fd[1]);
+	return pager_pid;
 }
 
 /*****************************************************************************/
@@ -1589,8 +1597,7 @@ print_required_fields (const NmcConfig *nmc_config,
 	gboolean field_names = of_flags & NMC_OF_FLAG_FIELD_NAMES;
 	gboolean section_prefix = of_flags & NMC_OF_FLAG_SECTION_PREFIX;
 
-	/* Optionally start paging the output. */
-	nmc_terminal_spawn_pager (nmc_config);
+	nm_cli_spawn_pager (&nm_cli);
 
 	/* --- Main header --- */
 	if (   nmc_config->print_output == NMC_PRINT_PRETTY
@@ -1730,7 +1737,7 @@ print_required_fields (const NmcConfig *nmc_config,
 			g_string_append_c (str, ':');  /* Column separator */
 		} else {
 			width1 = strlen (value);
-			width2 = nmc_string_screen_width (value, NULL);  /* Width of the string (in screen colums) */
+			width2 = nmc_string_screen_width (value, NULL);  /* Width of the string (in screen columns) */
 			g_string_append_printf (str, "%-*s", field_values[idx].width + width1 - width2, strlen (value) > 0 ? value : not_set_str);
 			g_string_append_c (str, ' ');  /* Column separator */
 			table_width += field_values[idx].width + width1 - width2 + 1;
diff --git a/clients/cli/utils.h b/clients/cli/utils.h
index b2a3e5eb..b84b35bf 100644
--- a/clients/cli/utils.h
+++ b/clients/cli/utils.h
@@ -40,7 +40,7 @@ gboolean nmc_parse_args (nmc_arg_t *arg_arr, gboolean last, int *argc, char ***a
 char *ssid_to_hex (const char *str, gsize len);
 void nmc_terminal_erase_line (void);
 void nmc_terminal_show_progress (const char *str);
-void nmc_terminal_spawn_pager (const NmcConfig *nmc_config);
+pid_t nmc_terminal_spawn_pager (const NmcConfig *nmc_config);
 char *nmc_colorize (const NmcConfig *nmc_config, NMMetaColor color, const char * fmt, ...)  _nm_printf (3, 4);
 void nmc_filter_out_colors_inplace (char *str);
 char *nmc_filter_out_colors (const char *str);
@@ -166,6 +166,8 @@ typedef enum {
 	NMC_GENERIC_INFO_TYPE_DEVICE_STATUS_DEVICE = 0,
 	NMC_GENERIC_INFO_TYPE_DEVICE_STATUS_TYPE,
 	NMC_GENERIC_INFO_TYPE_DEVICE_STATUS_STATE,
+	NMC_GENERIC_INFO_TYPE_DEVICE_STATUS_IP4_CONNECTIVITY,
+	NMC_GENERIC_INFO_TYPE_DEVICE_STATUS_IP6_CONNECTIVITY,
 	NMC_GENERIC_INFO_TYPE_DEVICE_STATUS_DBUS_PATH,
 	NMC_GENERIC_INFO_TYPE_DEVICE_STATUS_CONNECTION,
 	NMC_GENERIC_INFO_TYPE_DEVICE_STATUS_CON_UUID,
@@ -184,6 +186,8 @@ typedef enum {
 	NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_GENERAL_MTU,
 	NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_GENERAL_STATE,
 	NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_GENERAL_REASON,
+	NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_GENERAL_IP4_CONNECTIVITY,
+	NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_GENERAL_IP6_CONNECTIVITY,
 	NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_GENERAL_UDI,
 	NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_GENERAL_IP_IFACE,
 	NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_GENERAL_IS_SOFTWARE,
diff --git a/clients/common/meson.build b/clients/common/meson.build
index 30fd2cfa..b4b6bcac 100644
--- a/clients/common/meson.build
+++ b/clients/common/meson.build
@@ -4,7 +4,7 @@ nm_polkit_listener = files('nm-polkit-listener.c')
 
 deps = [
   libnm_dep,
-  nm_core_dep
+  nm_core_dep,
 ]
 
 cflags = clients_cflags + [
@@ -13,18 +13,18 @@ cflags = clients_cflags + [
 
 libnmc_base = static_library(
   'nmc-base',
-  sources: shared_files_clients_common + files(
+  sources: files(
     'nm-client-utils.c',
     'nm-secret-agent-simple.c',
     'nm-vpn-helpers.c',
   ),
   dependencies: deps,
-  c_args: cflags
+  c_args: cflags,
 )
 
 libnmc_base_dep = declare_dependency(
   include_directories: common_inc,
-  link_with: libnmc_base
+  link_with: libnmc_base,
 )
 
 settings_docs = 'settings-docs.h'
@@ -34,7 +34,7 @@ if enable_introspection
     settings_docs,
     input: nm_property_docs,
     output: settings_docs,
-    command: [xsltproc, '--output', '@OUTPUT@', join_paths(meson.current_source_dir(), 'settings-docs.xsl'), '@INPUT@']
+    command: [xsltproc, '--output', '@OUTPUT@', join_paths(meson.current_source_dir(), 'settings-docs.xsl'), '@INPUT@'],
   )
 
   test(
@@ -46,7 +46,7 @@ else
   settings_docs_source = configure_file(
     input: settings_docs + '.in',
     output: settings_docs,
-    configuration: configuration_data()
+    configuration: configuration_data(),
   )
 endif
 
@@ -54,17 +54,17 @@ libnmc = static_library(
   'nmc',
   sources: files(
     'nm-meta-setting-access.c',
-    'nm-meta-setting-desc.c'
+    'nm-meta-setting-desc.c',
   ) + shared_nm_meta_setting_c + shared_nm_ethtool_utils_c + [settings_docs_source],
   dependencies: deps,
   c_args: cflags,
   link_with: libnmc_base,
-  link_depends: settings_docs_source
+  link_depends: settings_docs_source,
 )
 
 libnmc_dep = declare_dependency(
   include_directories: common_inc,
-  link_with: libnmc
+  link_with: libnmc,
 )
 
 if (enable_introspection or enable_nmtui) and enable_tests
diff --git a/clients/common/nm-client-utils.c b/clients/common/nm-client-utils.c
index 8c7553d8..1241131a 100644
--- a/clients/common/nm-client-utils.c
+++ b/clients/common/nm-client-utils.c
@@ -348,10 +348,11 @@ NM_UTILS_LOOKUP_STR_DEFINE (nmc_device_reason_to_string, NMDeviceStateReason,
 	NM_UTILS_LOOKUP_ITEM (NM_DEVICE_STATE_REASON_NEW_ACTIVATION,                 N_("New connection activation was enqueued")),
 	NM_UTILS_LOOKUP_ITEM (NM_DEVICE_STATE_REASON_PARENT_CHANGED,                 N_("The device's parent changed")),
 	NM_UTILS_LOOKUP_ITEM (NM_DEVICE_STATE_REASON_PARENT_MANAGED_CHANGED,         N_("The device parent's management changed")),
-	NM_UTILS_LOOKUP_ITEM (NM_DEVICE_STATE_REASON_OVSDB_FAILED,                   N_("OpenVSwitch database connection failed")),
+	NM_UTILS_LOOKUP_ITEM (NM_DEVICE_STATE_REASON_OVSDB_FAILED,                   N_("Open vSwitch database connection failed")),
 	NM_UTILS_LOOKUP_ITEM (NM_DEVICE_STATE_REASON_IP_ADDRESS_DUPLICATE,           N_("A duplicate IP address was detected")),
 	NM_UTILS_LOOKUP_ITEM (NM_DEVICE_STATE_REASON_IP_METHOD_UNSUPPORTED,          N_("The selected IP method is not supported")),
 	NM_UTILS_LOOKUP_ITEM (NM_DEVICE_STATE_REASON_SRIOV_CONFIGURATION_FAILED,     N_("Failed to configure SR-IOV parameters")),
+	NM_UTILS_LOOKUP_ITEM (NM_DEVICE_STATE_REASON_PEER_NOT_FOUND,                 N_("The Wi-Fi P2P peer could not be found")),
 )
 
 NM_UTILS_LOOKUP_STR_DEFINE (nm_active_connection_state_reason_to_string, NMActiveConnectionStateReason,
diff --git a/clients/common/nm-client-utils.h b/clients/common/nm-client-utils.h
index 9d818873..a5bc05fa 100644
--- a/clients/common/nm-client-utils.h
+++ b/clients/common/nm-client-utils.h
@@ -24,6 +24,13 @@
 #include "nm-active-connection.h"
 #include "nm-device.h"
 
+
+#define nm_auto_unref_ip_address nm_auto (_nm_ip_address_unref)
+NM_AUTO_DEFINE_FCN0 (NMIPAddress *, _nm_ip_address_unref, nm_ip_address_unref)
+
+#define nm_auto_unref_wgpeer nm_auto (_nm_auto_unref_wgpeer)
+NM_AUTO_DEFINE_FCN0 (NMWireGuardPeer *, _nm_auto_unref_wgpeer, nm_wireguard_peer_unref)
+
 const NMObject **nmc_objects_sort_by_path (const NMObject *const*objs, gssize len);
 
 const char *nmc_string_is_valid (const char *input, const char **allowed, GError **error);
diff --git a/clients/common/nm-meta-setting-desc.c b/clients/common/nm-meta-setting-desc.c
index d13ee4ce..6e35228a 100644
--- a/clients/common/nm-meta-setting-desc.c
+++ b/clients/common/nm-meta-setting-desc.c
@@ -117,7 +117,6 @@ _parse_ip_route (int family,
 {
 	const int MAX_PREFIX = (family == AF_INET) ? 32 : 128;
 	const char *next_hop = NULL;
-	const char *canon_dest;
 	int prefix;
 	NMIPRoute *route = NULL;
 	GError *local = NULL;
@@ -229,18 +228,6 @@ _parse_ip_route (int family,
 		return NULL;
 	}
 
-	/* We don't accept default routes as NetworkManager handles it
-	 * itself. But we have to check this after @route has normalized the
-	 * dest string.
-	 */
-	canon_dest = nm_ip_route_get_dest (route);
-	if (!strcmp (canon_dest, "0.0.0.0") || !strcmp (canon_dest, "::")) {
-		g_set_error_literal (error, NM_UTILS_ERROR, NM_UTILS_ERROR_INVALID_ARGUMENT,
-		                     _("default route cannot be added (NetworkManager handles it by itself)"));
-		g_clear_pointer (&route, nm_ip_route_unref);
-		return NULL;
-	}
-
 	if (attrs) {
 		GHashTableIter iter;
 		char *name;
@@ -285,13 +272,14 @@ _dump_team_link_watcher (NMTeamLinkWatcher *watcher)
 	DUMP_WATCHER_INT (w_dump, watcher, "init-wait", init_wait);
 	DUMP_WATCHER_INT (w_dump, watcher, "interval", interval);
 	DUMP_WATCHER_INT (w_dump, watcher, "missed-max", missed_max);
-#undef DUMP_WATCHER_INT
 	g_string_append_printf (w_dump, " target-host=%s",
 	                        nm_team_link_watcher_get_target_host (watcher));
 
 	if (nm_streq (name, NM_TEAM_LINK_WATCHER_NSNA_PING))
 		return g_string_free (w_dump, FALSE);
 
+	DUMP_WATCHER_INT (w_dump, watcher, "vlanid", vlanid);
+#undef DUMP_WATCHER_INT
 	g_string_append_printf (w_dump, " source-host=%s",
 	                        nm_team_link_watcher_get_source_host (watcher));
 	flags = nm_team_link_watcher_get_flags (watcher);
@@ -313,7 +301,7 @@ _parse_team_link_watcher (const char *str,
 	gs_free char *str_clean = NULL;
 	guint i;
 	gs_free const char *name = NULL;
-	int val1 = 0, val2 = 0, val3 = 3;
+	int val1 = 0, val2 = 0, val3 = 3, val4 = -1;
 	gs_free const char *target_host = NULL;
 	gs_free const char *source_host = NULL;
 	NMTeamLinkWatcherArpPingFlags flags = 0;
@@ -358,6 +346,8 @@ _parse_team_link_watcher (const char *str,
 			val2 = _nm_utils_ascii_str_to_int64 (pair[1], 10, 0, G_MAXINT32, -1);
 		else if (nm_streq (pair[0], "missed-max"))
 			val3 = _nm_utils_ascii_str_to_int64 (pair[1], 10, 0, G_MAXINT32, -1);
+		else if (nm_streq (pair[0], "vlanid"))
+			val4 = _nm_utils_ascii_str_to_int64 (pair[1], 10, -1, 4094, -2);
 		else if (nm_streq (pair[0], "target-host"))
 			target_host = g_strdup (pair[1]);
 		else if (nm_streq (pair[0], "source-host"))
@@ -382,6 +372,11 @@ _parse_team_link_watcher (const char *str,
 			             "value is not a valid number [0, MAXINT]");
 			return NULL;
 		}
+		if (val4 < -1) {
+			g_set_error (error, 1, 0, "'%s' is not valid: %s", watcherv[i],
+			             "value is not a valid number [-1, 4094]");
+			return NULL;
+		}
 	}
 
 	if (nm_streq0 (name, NM_TEAM_LINK_WATCHER_ETHTOOL))
@@ -389,7 +384,7 @@ _parse_team_link_watcher (const char *str,
 	else if (nm_streq0 (name, NM_TEAM_LINK_WATCHER_NSNA_PING))
 		return nm_team_link_watcher_new_nsna_ping (val1, val2, val3, target_host, error);
 	else if (nm_streq0 (name, NM_TEAM_LINK_WATCHER_ARP_PING))
-		return nm_team_link_watcher_new_arp_ping (val1, val2, val3, target_host, source_host, flags, error);
+		return nm_team_link_watcher_new_arp_ping2 (val1, val2, val3, val4, target_host, source_host, flags, error);
 
 	if (!name)
 		g_set_error (error, 1, 0, "link watcher name missing");
@@ -1518,18 +1513,16 @@ bytes_to_string (GBytes *bytes)
 {
 	const guint8 *data;
 	gsize len;
-	GString *cert = NULL;
-	int i;
 
 	if (!bytes)
 		return NULL;
-	data = g_bytes_get_data (bytes, &len);
 
-	cert = g_string_new (NULL);
-	for (i = 0; i < len; i++)
-		g_string_append_printf (cert, "%02X", data[i]);
-
-	return g_string_free (cert, FALSE);
+	data = g_bytes_get_data (bytes, &len);
+	return nm_utils_bin2hexstr_full (data,
+	                                 len,
+	                                 '\0',
+	                                 TRUE,
+	                                 NULL);
 }
 
 static char *
@@ -1948,26 +1941,36 @@ nmc_util_is_domain (const char *domain)
 }
 
 static gboolean
-nmc_property_set_bytes (NMSetting *setting, const char *prop, const char *value, GError **error)
+_set_fcn_gobject_bytes (ARGS_SET_FCN)
 {
-	gs_free char *val_strip = NULL;
+	gs_free char *val_strip_free = NULL;
 	gs_free const char **strv = NULL;
+	const char *val_strip;
 	const char **iter;
-	GBytes *bytes;
-	GByteArray *array = NULL;
-	gboolean success = TRUE;
+	gs_unref_bytes GBytes *bytes = NULL;
+	GByteArray *array;
 
 	nm_assert (!error || !*error);
 
-	val_strip = g_strstrip (g_strdup (value));
+	val_strip = nm_strstrip_avoid_copy (value, &val_strip_free);
 
 	/* First try hex string in the format of AAbbCCDd */
 	bytes = nm_utils_hexstr2bin (val_strip);
 	if (bytes)
 		goto done;
 
+	if (   !property_info->property_typ_data
+	    || !property_info->property_typ_data->subtype.gobject_bytes.legacy_format) {
+		if (value && value[0]) {
+			g_set_error_literal (error, 1, 0, _("not a valid hex-string"));
+			return FALSE;
+		}
+		/* accept the empty word to reset the property to %NULL. */
+		goto done;
+	}
+
 	/* Otherwise, consider the following format: AA b 0xCc D */
-	strv = nm_utils_strsplit_set (val_strip, " \t", FALSE);
+	strv = nm_utils_strsplit_set (value, " \t", FALSE);
 	array = g_byte_array_sized_new (NM_PTRARRAY_LEN (strv));
 	for (iter = strv; iter && *iter; iter++) {
 		int v;
@@ -1977,8 +1980,7 @@ nmc_property_set_bytes (NMSetting *setting, const char *prop, const char *value,
 		if (v == -1) {
 			g_set_error (error, 1, 0, _("'%s' is not a valid hex character"), *iter);
 			g_byte_array_free (array, TRUE);
-			success = FALSE;
-			goto done;
+			return FALSE;
 		}
 		v8 = v;
 		g_byte_array_append (array, &v8, 1);
@@ -1986,13 +1988,8 @@ nmc_property_set_bytes (NMSetting *setting, const char *prop, const char *value,
 	bytes = g_byte_array_free_to_bytes (array);
 
 done:
-	if (success)
-		g_object_set (setting, prop, bytes, NULL);
-
-	if (bytes)
-		g_bytes_unref (bytes);
-
-	return success;
+	g_object_set (setting, property_info->property_name, bytes, NULL);
+	return TRUE;
 }
 
 /*****************************************************************************/
@@ -2108,14 +2105,16 @@ _get_fcn_802_1x_phase2_client_cert (ARGS_GET_FCN)
 }
 
 static gconstpointer
-_get_fcn_802_1x_password_raw (ARGS_GET_FCN)
+_get_fcn_gobject_bytes (ARGS_GET_FCN)
 {
-	NMSetting8021x *s_8021X = NM_SETTING_802_1X (setting);
+	gs_unref_bytes GBytes *bytes = NULL;
 	char *str;
 
 	RETURN_UNSUPPORTED_GET_TYPE ();
 
-	str = bytes_to_string (nm_setting_802_1x_get_password_raw (s_8021X));
+	g_object_get (setting, property_info->property_name, &bytes, NULL);
+
+	str = bytes_to_string (bytes);
 	NM_SET_OUT (out_is_default, !str || !str[0]);
 	RETURN_STR_TO_FREE (str);
 }
@@ -2333,12 +2332,6 @@ DEFINE_SETTER_PRIV_KEY (_set_fcn_802_1x_phase2_private_key,
                         nm_setting_802_1x_get_phase2_private_key_password,
                         nm_setting_802_1x_set_phase2_private_key)
 
-static gboolean
-_set_fcn_802_1x_password_raw (ARGS_SET_FCN)
-{
-	return nmc_property_set_bytes (setting, property_info->property_name, value, error);
-}
-
 static gconstpointer
 _get_fcn_bond_options (ARGS_GET_FCN)
 {
@@ -4847,16 +4840,6 @@ _gobject_enum_pre_set_notify_fcn_wireless_security_wep_key_type (const NMMetaPro
 	}
 }
 
-static const char *
-_validate_fcn_wireless_security_psk (const char *value, char **out_to_free, GError **error)
-{
-	if (!nm_utils_wpa_psk_valid (value)) {
-		g_set_error (error, 1, 0, _("'%s' is not a valid PSK"), value);
-		return NULL;
-	}
-	return value;
-}
-
 /*****************************************************************************/
 
 static gconstpointer
@@ -5071,6 +5054,11 @@ static const NMMetaPropertyType _pt_gobject_mtu = {
 	.set_fcn =                      _set_fcn_gobject_mtu,
 };
 
+static const NMMetaPropertyType _pt_gobject_bytes = {
+	.get_fcn =                     _get_fcn_gobject_bytes,
+	.set_fcn =                     _set_fcn_gobject_bytes,
+};
+
 static const NMMetaPropertyType _pt_gobject_mac = {
 	.get_fcn =                      _get_fcn_gobject,
 	.set_fcn =                      _set_fcn_gobject_mac,
@@ -5121,10 +5109,8 @@ static const NMMetaPropertyType _pt_ethtool = {
 #define PROPERTY_INFO_WITH_DESC(name, ...) \
 	PROPERTY_INFO (name, DESCRIBE_DOC_##name, ##__VA_ARGS__)
 
-#define VALUES_STATIC(...)  (((const char *[]) { __VA_ARGS__, NULL }))
-
-#define ENUM_VALUE_INFOS(...)  (((const NMUtilsEnumValueInfo []) { __VA_ARGS__, { 0 } }))
-#define INT_VALUE_INFOS(...)  (((const NMMetaUtilsIntValueInfo []) { __VA_ARGS__, { 0 } }))
+#define ENUM_VALUE_INFOS(...)  (((const NMUtilsEnumValueInfo    []) { __VA_ARGS__ { .nick = NULL, }, }))
+#define INT_VALUE_INFOS(...)   (((const NMMetaUtilsIntValueInfo []) { __VA_ARGS__ { .nick = NULL, }, }))
 
 #define GET_FCN_WITH_DEFAULT(type, func) \
 	/* macro that returns @func as const (gboolean(*)(NMSetting*)) type, but checks
@@ -5166,12 +5152,25 @@ static const NMMetaPropertyType _pt_ethtool = {
 		.property_typ_data = DEFINE_PROPERTY_TYP_DATA_SUBTYPE (gobject_int, \
 			.value_infos =              INT_VALUE_INFOS ( \
 				{ \
-					.value = -1, \
+					.value.i64 = -1, \
 					.nick = "unset", \
-				} \
+				}, \
 			), \
 		),
 
+#define _CURRENT_NM_META_SETTING_TYPE NM_META_SETTING_TYPE_6LOWPAN
+static const NMMetaPropertyInfo *const property_infos_6LOWPAN[] = {
+	PROPERTY_INFO_WITH_DESC (NM_SETTING_6LOWPAN_PARENT,
+		.is_cli_option =                TRUE,
+		.property_alias =               "dev",
+		.inf_flags =                    NM_META_PROPERTY_INF_FLAG_REQD,
+		.prompt =                       N_("IEEE 802.15.4 (WPAN) parent device or connection UUID"),
+		.property_type =                &_pt_gobject_string,
+	),
+	NULL
+};
+
+#undef  _CURRENT_NM_META_SETTING_TYPE
 #define _CURRENT_NM_META_SETTING_TYPE NM_META_SETTING_TYPE_802_1X
 static const NMMetaPropertyInfo *const property_infos_802_1X[] = {
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_802_1X_EAP,
@@ -5181,7 +5180,7 @@ static const NMMetaPropertyInfo *const property_infos_802_1X[] = {
 			.remove_fcn =               _remove_fcn_802_1x_eap,
 		),
 		.property_typ_data = DEFINE_PROPERTY_TYP_DATA (
-			.values_static =            VALUES_STATIC ("leap", "md5", "tls", "peap", "ttls", "sim", "fast", "pwd"),
+			.values_static =            NM_MAKE_STRV ("leap", "md5", "tls", "peap", "ttls", "sim", "fast", "pwd"),
 		),
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_802_1X_IDENTITY,
@@ -5248,19 +5247,19 @@ static const NMMetaPropertyInfo *const property_infos_802_1X[] = {
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_802_1X_PHASE1_PEAPVER,
 		.property_type =                &_pt_gobject_string,
 		.property_typ_data = DEFINE_PROPERTY_TYP_DATA (
-			.values_static =            VALUES_STATIC ("0", "1"),
+			.values_static =            NM_MAKE_STRV ("0", "1"),
 		),
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_802_1X_PHASE1_PEAPLABEL,
 		.property_type =                &_pt_gobject_string,
 		.property_typ_data = DEFINE_PROPERTY_TYP_DATA (
-			.values_static =            VALUES_STATIC ("0", "1"),
+			.values_static =            NM_MAKE_STRV ("0", "1"),
 		),
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_802_1X_PHASE1_FAST_PROVISIONING,
 		.property_type =                &_pt_gobject_string,
 		.property_typ_data = DEFINE_PROPERTY_TYP_DATA (
-			.values_static =            VALUES_STATIC ("0", "1", "2", "3"),
+			.values_static =            NM_MAKE_STRV ("0", "1", "2", "3"),
 		),
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_802_1X_PHASE1_AUTH_FLAGS,
@@ -5275,13 +5274,13 @@ static const NMMetaPropertyInfo *const property_infos_802_1X[] = {
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_802_1X_PHASE2_AUTH,
 		.property_type =                &_pt_gobject_string,
 		.property_typ_data = DEFINE_PROPERTY_TYP_DATA (
-			.values_static =            VALUES_STATIC ("pap", "chap", "mschap", "mschapv2", "gtc", "otp", "md5", "tls"),
+			.values_static =            NM_MAKE_STRV ("pap", "chap", "mschap", "mschapv2", "gtc", "otp", "md5", "tls"),
 		),
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_802_1X_PHASE2_AUTHEAP,
 		.property_type =                &_pt_gobject_string,
 		.property_typ_data = DEFINE_PROPERTY_TYP_DATA (
-			.values_static =            VALUES_STATIC ("md5", "mschapv2", "otp", "gtc", "tls"),
+			.values_static =            NM_MAKE_STRV ("md5", "mschapv2", "otp", "gtc", "tls"),
 		),
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_802_1X_PHASE2_CA_CERT,
@@ -5355,9 +5354,9 @@ static const NMMetaPropertyInfo *const property_infos_802_1X[] = {
 		       "(with optional 0x/0X prefix, and optional leading 0).\n\n"
 		       "Examples: ab0455a6ea3a74C2\n"
 		       "          ab 4 55 0xa6 ea 3a 74 C2\n"),
-		.property_type = DEFINE_PROPERTY_TYPE (
-			.get_fcn =                  _get_fcn_802_1x_password_raw,
-			.set_fcn =                  _set_fcn_802_1x_password_raw,
+		.property_type =                 &_pt_gobject_bytes,
+		.property_typ_data = DEFINE_PROPERTY_TYP_DATA_SUBTYPE (gobject_bytes,
+			.legacy_format =            TRUE,
 		),
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_802_1X_PASSWORD_RAW_FLAGS,
@@ -5443,9 +5442,9 @@ static const NMMetaPropertyInfo *const property_infos_ADSL[] = {
 		.def_hint =                     NM_META_TEXT_PROMPT_ADSL_PROTO_CHOICES,
 		.property_type =                &_pt_gobject_string,
 		.property_typ_data = DEFINE_PROPERTY_TYP_DATA (
-			.values_static =            VALUES_STATIC (NM_SETTING_ADSL_PROTOCOL_PPPOA,
-			                                           NM_SETTING_ADSL_PROTOCOL_PPPOE,
-			                                           NM_SETTING_ADSL_PROTOCOL_IPOATM),
+			.values_static =            NM_MAKE_STRV (NM_SETTING_ADSL_PROTOCOL_PPPOA,
+			                                          NM_SETTING_ADSL_PROTOCOL_PPPOE,
+			                                          NM_SETTING_ADSL_PROTOCOL_IPOATM),
 		),
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_ADSL_ENCAPSULATION,
@@ -5455,8 +5454,8 @@ static const NMMetaPropertyInfo *const property_infos_ADSL[] = {
 		.def_hint =                     NM_META_TEXT_PROMPT_ADSL_ENCAP_CHOICES,
 		.property_type =                &_pt_gobject_string,
 		.property_typ_data = DEFINE_PROPERTY_TYP_DATA (
-			.values_static =            VALUES_STATIC (NM_SETTING_ADSL_ENCAPSULATION_VCMUX,
-			                                           NM_SETTING_ADSL_ENCAPSULATION_LLC),
+			.values_static =            NM_MAKE_STRV (NM_SETTING_ADSL_ENCAPSULATION_VCMUX,
+			                                          NM_SETTING_ADSL_ENCAPSULATION_LLC),
 		),
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_ADSL_VPI,
@@ -5484,9 +5483,9 @@ static const NMMetaPropertyInfo *const property_infos_BLUETOOTH[] = {
 		.def_hint =                     NM_META_TEXT_PROMPT_BT_TYPE_CHOICES,
 		.property_type =                &_pt_gobject_string,
 		.property_typ_data = DEFINE_PROPERTY_TYP_DATA (
-			.values_static =            VALUES_STATIC (NM_SETTING_BLUETOOTH_TYPE_DUN,
-			                                           NM_SETTING_BLUETOOTH_TYPE_PANU,
-			                                           NM_SETTING_BLUETOOTH_TYPE_NAP),
+			.values_static =            NM_MAKE_STRV (NM_SETTING_BLUETOOTH_TYPE_DUN,
+			                                          NM_SETTING_BLUETOOTH_TYPE_PANU,
+			                                          NM_SETTING_BLUETOOTH_TYPE_NAP),
 		),
 	),
 	NULL
@@ -5680,13 +5679,13 @@ static const NMMetaPropertyInfo *const property_infos_CONNECTION[] = {
 		.property_typ_data = DEFINE_PROPERTY_TYP_DATA_SUBTYPE (gobject_int,
 			.value_infos =              INT_VALUE_INFOS (
 				{
-					.value = -1,
+					.value.i64 = -1,
 					.nick = "default",
 				},
 				{
-					.value = 0,
+					.value.i64 = 0,
 					.nick = "forever",
-				}
+				},
 			),
 		),
 	),
@@ -5739,11 +5738,11 @@ static const NMMetaPropertyInfo *const property_infos_CONNECTION[] = {
 		.inf_flags =                    NM_META_PROPERTY_INF_FLAG_DONT_ASK,
 		.property_type =                &_pt_gobject_string,
 		.property_typ_data = DEFINE_PROPERTY_TYP_DATA (
-			.values_static =            VALUES_STATIC (NM_SETTING_BOND_SETTING_NAME,
-			                                           NM_SETTING_BRIDGE_SETTING_NAME,
-			                                           NM_SETTING_OVS_BRIDGE_SETTING_NAME,
-			                                           NM_SETTING_OVS_PORT_SETTING_NAME,
-			                                           NM_SETTING_TEAM_SETTING_NAME),
+			.values_static =            NM_MAKE_STRV (NM_SETTING_BOND_SETTING_NAME,
+			                                          NM_SETTING_BRIDGE_SETTING_NAME,
+			                                          NM_SETTING_OVS_BRIDGE_SETTING_NAME,
+			                                          NM_SETTING_OVS_PORT_SETTING_NAME,
+			                                          NM_SETTING_TEAM_SETTING_NAME),
 		),
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_CONNECTION_AUTOCONNECT_SLAVES,
@@ -5778,7 +5777,7 @@ static const NMMetaPropertyInfo *const property_infos_CONNECTION[] = {
 			.set_fcn =                  _set_fcn_connection_metered,
 		),
 		.property_typ_data = DEFINE_PROPERTY_TYP_DATA (
-			.values_static =            VALUES_STATIC ("yes", "no", "unknown"),
+			.values_static =            NM_MAKE_STRV ("yes", "no", "unknown"),
 		),
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_CONNECTION_LLDP,
@@ -5790,7 +5789,7 @@ static const NMMetaPropertyInfo *const property_infos_CONNECTION[] = {
 					{
 						.value = NM_SETTING_CONNECTION_LLDP_ENABLE_RX,
 						.nick = "enable",
-					}
+					},
 				),
 			),
 			.typ_flags =                  NM_META_PROPERTY_TYP_FLAG_ENUM_GET_PARSABLE_TEXT
@@ -5831,7 +5830,7 @@ static const NMMetaPropertyInfo *const property_infos_DCB[] = {
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_DCB_APP_FCOE_MODE,
 		.property_type =                &_pt_gobject_string,
 		.property_typ_data = DEFINE_PROPERTY_TYP_DATA (
-			.values_static =            VALUES_STATIC (NM_SETTING_DCB_FCOE_MODE_FABRIC,
+			.values_static =            NM_MAKE_STRV (NM_SETTING_DCB_FCOE_MODE_FABRIC,
 			                                           NM_SETTING_DCB_FCOE_MODE_VN2VN),
 		),
 	),
@@ -6061,7 +6060,7 @@ static const NMMetaPropertyInfo *const property_infos_INFINIBAND[] = {
 		.def_hint =                     NM_META_TEXT_PROMPT_IB_MODE_CHOICES,
 		.property_type =                &_pt_gobject_string,
 		.property_typ_data = DEFINE_PROPERTY_TYP_DATA (
-			.values_static =            VALUES_STATIC ("datagram", "connected"),
+			.values_static =            NM_MAKE_STRV ("datagram", "connected"),
 		),
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_INFINIBAND_P_KEY,
@@ -6173,15 +6172,15 @@ static const NMMetaPropertyInfo *const property_infos_IP4_CONFIG[] = {
 	PROPERTY_INFO (NM_SETTING_IP_CONFIG_ROUTE_TABLE, DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_ROUTE_TABLE,
 		.property_type =                &_pt_gobject_int,
 		.property_typ_data = DEFINE_PROPERTY_TYP_DATA_SUBTYPE (gobject_int,
-			.value_infos = INT_VALUE_INFOS (
+			.value_infos =              INT_VALUE_INFOS (
 				{
-					.value = 0,
+					.value.i64 = 0,
 					.nick = "unspec",
 				},
 				{
-					.value = 254,
+					.value.i64 = 254,
 					.nick = "main",
-				}
+				},
 			),
 		),
 	),
@@ -6197,15 +6196,15 @@ static const NMMetaPropertyInfo *const property_infos_IP4_CONFIG[] = {
 	PROPERTY_INFO (NM_SETTING_IP_CONFIG_DHCP_TIMEOUT, DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_DHCP_TIMEOUT,
 		.property_type =                &_pt_gobject_int,
 		.property_typ_data = DEFINE_PROPERTY_TYP_DATA_SUBTYPE (gobject_int,
-			.value_infos =          INT_VALUE_INFOS (
+			.value_infos =              INT_VALUE_INFOS (
 				{
-					.value = 0,
+					.value.i64 = 0,
 					.nick = "default",
 				},
 				{
-					.value = G_MAXINT32,
+					.value.i64 = G_MAXINT32,
 					.nick = "infinity",
-				}
+				},
 			),
 		),
 	),
@@ -6229,13 +6228,13 @@ static const NMMetaPropertyInfo *const property_infos_IP4_CONFIG[] = {
 		.property_typ_data = DEFINE_PROPERTY_TYP_DATA_SUBTYPE (gobject_int,
 			.value_infos =              INT_VALUE_INFOS (
 				{
-					.value = -1,
+					.value.i64 = -1,
 					.nick = "default",
 				},
 				{
-					.value = 0,
+					.value.i64 = 0,
 					.nick = "off",
-				}
+				},
 			),
 		),
 	),
@@ -6336,15 +6335,15 @@ static const NMMetaPropertyInfo *const property_infos_IP6_CONFIG[] = {
 	PROPERTY_INFO (NM_SETTING_IP_CONFIG_ROUTE_TABLE, DESCRIBE_DOC_NM_SETTING_IP6_CONFIG_ROUTE_TABLE,
 		.property_type =                &_pt_gobject_int,
 		.property_typ_data = DEFINE_PROPERTY_TYP_DATA_SUBTYPE (gobject_int,
-			.value_infos =          INT_VALUE_INFOS (
+			.value_infos =              INT_VALUE_INFOS (
 				{
-					.value = 0,
+					.value.i64 = 0,
 					.nick = "unspec",
 				},
 				{
-					.value = 254,
+					.value.i64 = 254,
 					.nick = "main",
-				}
+				},
 			),
 		),
 	),
@@ -6371,7 +6370,7 @@ static const NMMetaPropertyInfo *const property_infos_IP6_CONFIG[] = {
 				{
 					.value = NM_SETTING_IP6_CONFIG_PRIVACY_PREFER_TEMP_ADDR,
 					.nick = "enabled, prefer temporary IP",
-				}
+				},
 			),
 		),
 	),
@@ -6620,48 +6619,13 @@ static const NMMetaPropertyInfo *const property_infos_OLPC_MESH[] = {
 	NULL
 };
 
-#undef  _CURRENT_NM_META_SETTING_TYPE
-#define _CURRENT_NM_META_SETTING_TYPE NM_META_SETTING_TYPE_PPPOE
-static const NMMetaPropertyInfo *const property_infos_PPPOE[] = {
-	PROPERTY_INFO_WITH_DESC (NM_SETTING_PPPOE_PARENT,
-		.is_cli_option =                TRUE,
-		.property_alias =               "parent",
-		.prompt =                       N_("PPPoE parent device"),
-		.property_type =                &_pt_gobject_string,
-	),
-	PROPERTY_INFO_WITH_DESC (NM_SETTING_PPPOE_SERVICE,
-		.is_cli_option =                TRUE,
-		.property_alias =               "service",
-		.prompt =                       N_("Service [none]"),
-		.property_type =                &_pt_gobject_string,
-	),
-	PROPERTY_INFO_WITH_DESC (NM_SETTING_PPPOE_USERNAME,
-		.is_cli_option =                TRUE,
-		.property_alias =               "username",
-		.inf_flags =                    NM_META_PROPERTY_INF_FLAG_REQD,
-		.prompt =                       N_("PPPoE username"),
-		.property_type =                &_pt_gobject_string,
-	),
-	PROPERTY_INFO_WITH_DESC (NM_SETTING_PPPOE_PASSWORD,
-		.is_cli_option =                TRUE,
-		.property_alias =               "password",
-		.prompt =                       N_("Password [none]"),
-		.is_secret =                    TRUE,
-		.property_type =                &_pt_gobject_string,
-	),
-	PROPERTY_INFO_WITH_DESC (NM_SETTING_PPPOE_PASSWORD_FLAGS,
-		.property_type =                &_pt_gobject_secret_flags,
-	),
-	NULL
-};
-
 #undef  _CURRENT_NM_META_SETTING_TYPE
 #define _CURRENT_NM_META_SETTING_TYPE NM_META_SETTING_TYPE_OVS_BRIDGE
 static const NMMetaPropertyInfo *const property_infos_OVS_BRIDGE[] = {
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_OVS_BRIDGE_FAIL_MODE,
 		.property_type =                &_pt_gobject_string,
 		.property_typ_data = DEFINE_PROPERTY_TYP_DATA (
-			.values_static =        VALUES_STATIC ("secure", "standalone"),
+			.values_static =            NM_MAKE_STRV ("secure", "standalone"),
 		),
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_OVS_BRIDGE_MCAST_SNOOPING_ENABLE,
@@ -6682,7 +6646,7 @@ static const NMMetaPropertyInfo *const property_infos_OVS_INTERFACE[] = {
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_OVS_INTERFACE_TYPE,
 		.property_type =                &_pt_gobject_string,
 		.property_typ_data = DEFINE_PROPERTY_TYP_DATA (
-			.values_static =        VALUES_STATIC ("internal", "patch"),
+			.values_static =            NM_MAKE_STRV ("internal", "patch"),
 		),
 	),
 	NULL
@@ -6703,7 +6667,7 @@ static const NMMetaPropertyInfo *const property_infos_OVS_PORT[] = {
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_OVS_PORT_VLAN_MODE,
 		.property_type =                &_pt_gobject_string,
 		.property_typ_data = DEFINE_PROPERTY_TYP_DATA (
-			.values_static =        VALUES_STATIC ("access", "native-tagged", "native-untagged", "trunk"),
+			.values_static =            NM_MAKE_STRV ("access", "native-tagged", "native-untagged", "trunk"),
 		),
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_OVS_PORT_TAG,
@@ -6712,13 +6676,13 @@ static const NMMetaPropertyInfo *const property_infos_OVS_PORT[] = {
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_OVS_PORT_LACP,
 		.property_type =                &_pt_gobject_string,
 		.property_typ_data = DEFINE_PROPERTY_TYP_DATA (
-			.values_static =        VALUES_STATIC ("active", "off", "passive"),
+			.values_static =            NM_MAKE_STRV ("active", "off", "passive"),
 		),
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_OVS_PORT_BOND_MODE,
 		.property_type =                &_pt_gobject_string,
 		.property_typ_data = DEFINE_PROPERTY_TYP_DATA (
-			.values_static =        VALUES_STATIC ("active-backup", "balance-slb", "balance-tcp"),
+			.values_static =            NM_MAKE_STRV ("active-backup", "balance-slb", "balance-tcp"),
 		),
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_OVS_PORT_BOND_UPDELAY,
@@ -6793,6 +6757,41 @@ static const NMMetaPropertyInfo *const property_infos_PPP[] = {
 	NULL
 };
 
+#undef  _CURRENT_NM_META_SETTING_TYPE
+#define _CURRENT_NM_META_SETTING_TYPE NM_META_SETTING_TYPE_PPPOE
+static const NMMetaPropertyInfo *const property_infos_PPPOE[] = {
+	PROPERTY_INFO_WITH_DESC (NM_SETTING_PPPOE_PARENT,
+		.is_cli_option =                TRUE,
+		.property_alias =               "parent",
+		.prompt =                       N_("PPPoE parent device"),
+		.property_type =                &_pt_gobject_string,
+	),
+	PROPERTY_INFO_WITH_DESC (NM_SETTING_PPPOE_SERVICE,
+		.is_cli_option =                TRUE,
+		.property_alias =               "service",
+		.prompt =                       N_("Service [none]"),
+		.property_type =                &_pt_gobject_string,
+	),
+	PROPERTY_INFO_WITH_DESC (NM_SETTING_PPPOE_USERNAME,
+		.is_cli_option =                TRUE,
+		.property_alias =               "username",
+		.inf_flags =                    NM_META_PROPERTY_INF_FLAG_REQD,
+		.prompt =                       N_("PPPoE username"),
+		.property_type =                &_pt_gobject_string,
+	),
+	PROPERTY_INFO_WITH_DESC (NM_SETTING_PPPOE_PASSWORD,
+		.is_cli_option =                TRUE,
+		.property_alias =               "password",
+		.prompt =                       N_("Password [none]"),
+		.is_secret =                    TRUE,
+		.property_type =                &_pt_gobject_string,
+	),
+	PROPERTY_INFO_WITH_DESC (NM_SETTING_PPPOE_PASSWORD_FLAGS,
+		.property_type =                &_pt_gobject_secret_flags,
+	),
+	NULL
+};
+
 #undef  _CURRENT_NM_META_SETTING_TYPE
 #define _CURRENT_NM_META_SETTING_TYPE NM_META_SETTING_TYPE_PROXY
 static const NMMetaPropertyInfo *const property_infos_PROXY[] = {
@@ -6834,6 +6833,78 @@ static const NMMetaPropertyInfo *const property_infos_PROXY[] = {
 	NULL
 };
 
+#undef  _CURRENT_NM_META_SETTING_TYPE
+#define _CURRENT_NM_META_SETTING_TYPE NM_META_SETTING_TYPE_SERIAL
+static const NMMetaPropertyInfo *const property_infos_SERIAL[] = {
+	PROPERTY_INFO_WITH_DESC (NM_SETTING_SERIAL_BAUD,
+		.property_type =                &_pt_gobject_int,
+	),
+	PROPERTY_INFO_WITH_DESC (NM_SETTING_SERIAL_BITS,
+		.property_type =                &_pt_gobject_int,
+	),
+	PROPERTY_INFO_WITH_DESC (NM_SETTING_SERIAL_PARITY,
+		.property_type =                &_pt_gobject_enum,
+		.property_typ_data = DEFINE_PROPERTY_TYP_DATA (
+			PROPERTY_TYP_DATA_SUBTYPE (gobject_enum,
+				.value_infos =          ENUM_VALUE_INFOS (
+					{
+						.value = NM_SETTING_SERIAL_PARITY_EVEN,
+						.nick = "E",
+					},
+					{
+						.value = NM_SETTING_SERIAL_PARITY_EVEN,
+						.nick = "e",
+					},
+					{
+						.value = NM_SETTING_SERIAL_PARITY_ODD,
+						.nick = "O",
+					},
+					{
+						.value = NM_SETTING_SERIAL_PARITY_ODD,
+						.nick = "o",
+					},
+					{
+						.value = NM_SETTING_SERIAL_PARITY_NONE,
+						.nick = "N",
+					},
+					{
+						.value = NM_SETTING_SERIAL_PARITY_NONE,
+						.nick = "n",
+					},
+				),
+			),
+			.typ_flags =                  NM_META_PROPERTY_TYP_FLAG_ENUM_GET_PARSABLE_TEXT
+			                            | NM_META_PROPERTY_TYP_FLAG_ENUM_GET_PRETTY_TEXT,
+		),
+	),
+	PROPERTY_INFO_WITH_DESC (NM_SETTING_SERIAL_STOPBITS,
+		.property_type =                &_pt_gobject_int,
+	),
+	PROPERTY_INFO_WITH_DESC (NM_SETTING_SERIAL_SEND_DELAY,
+		.property_type =                &_pt_gobject_int,
+	),
+	NULL
+};
+
+#undef  _CURRENT_NM_META_SETTING_TYPE
+#define _CURRENT_NM_META_SETTING_TYPE NM_META_SETTING_TYPE_SRIOV
+static const NMMetaPropertyInfo *const property_infos_SRIOV[] = {
+	PROPERTY_INFO_WITH_DESC (NM_SETTING_SRIOV_TOTAL_VFS,
+		.property_type =                &_pt_gobject_int,
+	),
+	PROPERTY_INFO_WITH_DESC (NM_SETTING_SRIOV_VFS,
+		.property_type = DEFINE_PROPERTY_TYPE (
+			.get_fcn =                  _get_fcn_sriov_vfs,
+			.set_fcn =                  _set_fcn_sriov_vfs,
+			.remove_fcn =               _remove_fcn_sriov_vfs,
+		),
+	),
+	PROPERTY_INFO_WITH_DESC (NM_SETTING_SRIOV_AUTOPROBE_DRIVERS,
+		.property_type =                &_pt_gobject_enum,
+	),
+	NULL
+};
+
 #undef  _CURRENT_NM_META_SETTING_TYPE
 #define _CURRENT_NM_META_SETTING_TYPE NM_META_SETTING_TYPE_TC_CONFIG
 static const NMMetaPropertyInfo *const property_infos_TC_CONFIG[] = {
@@ -6870,64 +6941,64 @@ static const NMMetaPropertyInfo *const property_infos_TEAM[] = {
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_TEAM_NOTIFY_PEERS_COUNT,
 		.property_type =                &_pt_gobject_int,
 		.property_typ_data = DEFINE_PROPERTY_TYP_DATA_SUBTYPE (gobject_int,
-		        .value_infos =          INT_VALUE_INFOS (
+			.value_infos =              INT_VALUE_INFOS (
 				{
-					.value = 0,
+					.value.i64 = 0,
 					.nick = "disabled",
-				}
+				},
 			),
 		),
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_TEAM_NOTIFY_PEERS_INTERVAL,
 		.property_type =                &_pt_gobject_int,
 		.property_typ_data = DEFINE_PROPERTY_TYP_DATA_SUBTYPE (gobject_int,
-		        .value_infos =          INT_VALUE_INFOS (
+			.value_infos =              INT_VALUE_INFOS (
 				{
-					.value = 0,
+					.value.i64 = 0,
 					.nick = "default",
-				}
+				},
 			),
 		),
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_TEAM_MCAST_REJOIN_COUNT,
 		.property_type =                &_pt_gobject_int,
 		.property_typ_data = DEFINE_PROPERTY_TYP_DATA_SUBTYPE (gobject_int,
-		        .value_infos =          INT_VALUE_INFOS (
+			.value_infos =              INT_VALUE_INFOS (
 				{
-					.value = 0,
+					.value.i64 = 0,
 					.nick = "disabled",
-				}
+				},
 			),
 		),
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_TEAM_MCAST_REJOIN_INTERVAL,
 		.property_type =                &_pt_gobject_int,
 		.property_typ_data = DEFINE_PROPERTY_TYP_DATA_SUBTYPE (gobject_int,
-		        .value_infos =          INT_VALUE_INFOS (
+			.value_infos =              INT_VALUE_INFOS (
 				{
-					.value = 0,
+					.value.i64 = 0,
 					.nick = "default",
-				}
+				},
 			),
 		),
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_TEAM_RUNNER,
 		.property_type =                &_pt_gobject_string,
 		.property_typ_data = DEFINE_PROPERTY_TYP_DATA (
-			.values_static =            VALUES_STATIC (NM_SETTING_TEAM_RUNNER_BROADCAST,
-			                                           NM_SETTING_TEAM_RUNNER_ROUNDROBIN,
-			                                           NM_SETTING_TEAM_RUNNER_RANDOM,
-			                                           NM_SETTING_TEAM_RUNNER_ACTIVEBACKUP,
-			                                           NM_SETTING_TEAM_RUNNER_LOADBALANCE,
-			                                           NM_SETTING_TEAM_RUNNER_LACP),
+			.values_static =            NM_MAKE_STRV (NM_SETTING_TEAM_RUNNER_BROADCAST,
+			                                          NM_SETTING_TEAM_RUNNER_ROUNDROBIN,
+			                                          NM_SETTING_TEAM_RUNNER_RANDOM,
+			                                          NM_SETTING_TEAM_RUNNER_ACTIVEBACKUP,
+			                                          NM_SETTING_TEAM_RUNNER_LOADBALANCE,
+			                                          NM_SETTING_TEAM_RUNNER_LACP),
 		),
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_TEAM_RUNNER_HWADDR_POLICY,
 		.property_type =                &_pt_gobject_string,
 		.property_typ_data = DEFINE_PROPERTY_TYP_DATA (
-			.values_static =            VALUES_STATIC (NM_SETTING_TEAM_RUNNER_HWADDR_POLICY_SAME_ALL,
-			                                           NM_SETTING_TEAM_RUNNER_HWADDR_POLICY_BY_ACTIVE,
-			                                           NM_SETTING_TEAM_RUNNER_HWADDR_POLICY_ONLY_ACTIVE),
+			.values_static =            NM_MAKE_STRV (NM_SETTING_TEAM_RUNNER_HWADDR_POLICY_SAME_ALL,
+			                                          NM_SETTING_TEAM_RUNNER_HWADDR_POLICY_BY_ACTIVE,
+			                                          NM_SETTING_TEAM_RUNNER_HWADDR_POLICY_ONLY_ACTIVE),
 		),
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_TEAM_RUNNER_TX_HASH,
@@ -6940,17 +7011,17 @@ static const NMMetaPropertyInfo *const property_infos_TEAM[] = {
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_TEAM_RUNNER_TX_BALANCER,
 		.property_type =                &_pt_gobject_string,
 		.property_typ_data = DEFINE_PROPERTY_TYP_DATA (
-			.values_static =            VALUES_STATIC ("basic"),
+			.values_static =            NM_MAKE_STRV ("basic"),
 		),
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_TEAM_RUNNER_TX_BALANCER_INTERVAL,
 		.property_type =                &_pt_gobject_int,
 		.property_typ_data = DEFINE_PROPERTY_TYP_DATA_SUBTYPE (gobject_int,
-		        .value_infos =          INT_VALUE_INFOS (
+			.value_infos =              INT_VALUE_INFOS (
 				{
-					.value = NM_SETTING_TEAM_RUNNER_TX_BALANCER_INTERVAL_DEFAULT,
+					.value.i64 = NM_SETTING_TEAM_RUNNER_TX_BALANCER_INTERVAL_DEFAULT,
 					.nick = "default",
-				}
+				},
 			),
 		),
 	),
@@ -6963,33 +7034,33 @@ static const NMMetaPropertyInfo *const property_infos_TEAM[] = {
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_TEAM_RUNNER_SYS_PRIO,
 		.property_type =                &_pt_gobject_int,
 		.property_typ_data = DEFINE_PROPERTY_TYP_DATA_SUBTYPE (gobject_int,
-		        .value_infos =          INT_VALUE_INFOS (
+			.value_infos =              INT_VALUE_INFOS (
 				{
-					.value = NM_SETTING_TEAM_RUNNER_SYS_PRIO_DEFAULT,
+					.value.i64 = NM_SETTING_TEAM_RUNNER_SYS_PRIO_DEFAULT,
 					.nick = "default",
-				}
+				},
 			),
 		),
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_TEAM_RUNNER_MIN_PORTS,
 		.property_type =                &_pt_gobject_int,
 		.property_typ_data = DEFINE_PROPERTY_TYP_DATA_SUBTYPE (gobject_int,
-		        .value_infos =          INT_VALUE_INFOS (
+			.value_infos =              INT_VALUE_INFOS (
 				{
-					.value = 0,
+					.value.i64 = 0,
 					.nick = "default",
-				}
+				},
 			),
 		),
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_TEAM_RUNNER_AGG_SELECT_POLICY,
 		.property_type =                &_pt_gobject_string,
 		.property_typ_data = DEFINE_PROPERTY_TYP_DATA (
-			.values_static =            VALUES_STATIC (NM_SETTING_TEAM_RUNNER_AGG_SELECT_POLICY_LACP_PRIO,
-			                                           NM_SETTING_TEAM_RUNNER_AGG_SELECT_POLICY_LACP_PRIO_STABLE,
-			                                           NM_SETTING_TEAM_RUNNER_AGG_SELECT_POLICY_BANDWIDTH,
-			                                           NM_SETTING_TEAM_RUNNER_AGG_SELECT_POLICY_COUNT,
-			                                           NM_SETTING_TEAM_RUNNER_AGG_SELECT_POLICY_PORT_CONFIG),
+			.values_static =            NM_MAKE_STRV (NM_SETTING_TEAM_RUNNER_AGG_SELECT_POLICY_LACP_PRIO,
+			                                          NM_SETTING_TEAM_RUNNER_AGG_SELECT_POLICY_LACP_PRIO_STABLE,
+			                                          NM_SETTING_TEAM_RUNNER_AGG_SELECT_POLICY_BANDWIDTH,
+			                                          NM_SETTING_TEAM_RUNNER_AGG_SELECT_POLICY_COUNT,
+			                                          NM_SETTING_TEAM_RUNNER_AGG_SELECT_POLICY_PORT_CONFIG),
 		),
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_TEAM_LINK_WATCHERS,
@@ -7019,22 +7090,22 @@ static const NMMetaPropertyInfo *const property_infos_TEAM_PORT[] = {
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_TEAM_PORT_QUEUE_ID,
 		.property_type =                &_pt_gobject_int,
 		.property_typ_data = DEFINE_PROPERTY_TYP_DATA_SUBTYPE (gobject_int,
-			.value_infos =          INT_VALUE_INFOS (
+			.value_infos =              INT_VALUE_INFOS (
 				{
-					.value = NM_SETTING_TEAM_PORT_QUEUE_ID_DEFAULT,
+					.value.i64 = NM_SETTING_TEAM_PORT_QUEUE_ID_DEFAULT,
 					.nick = "default",
-				}
+				},
 			),
 		),
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_TEAM_PORT_PRIO,
 		.property_type =                &_pt_gobject_int,
 		.property_typ_data = DEFINE_PROPERTY_TYP_DATA_SUBTYPE (gobject_int,
-			.value_infos =          INT_VALUE_INFOS (
+			.value_infos =              INT_VALUE_INFOS (
 				{
-					.value = 0,
+					.value.i64 = 0,
 					.nick = "default",
-				}
+				},
 			),
 		),
 	),
@@ -7044,22 +7115,22 @@ static const NMMetaPropertyInfo *const property_infos_TEAM_PORT[] = {
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_TEAM_PORT_LACP_PRIO,
 		.property_type =                &_pt_gobject_int,
 		.property_typ_data = DEFINE_PROPERTY_TYP_DATA_SUBTYPE (gobject_int,
-			.value_infos =          INT_VALUE_INFOS (
+			.value_infos =              INT_VALUE_INFOS (
 				{
-					.value = NM_SETTING_TEAM_PORT_LACP_PRIO_DEFAULT,
+					.value.i64 = NM_SETTING_TEAM_PORT_LACP_PRIO_DEFAULT,
 					.nick = "default",
-				}
+				},
 			),
 		),
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_TEAM_PORT_LACP_KEY,
 		.property_type =                &_pt_gobject_int,
 		.property_typ_data = DEFINE_PROPERTY_TYP_DATA_SUBTYPE (gobject_int,
-			.value_infos =          INT_VALUE_INFOS (
+			.value_infos =              INT_VALUE_INFOS (
 				{
-					.value = 0,
+					.value.i64 = 0,
 					.nick = "default",
-				}
+				},
 			),
 		),
 	),
@@ -7074,78 +7145,6 @@ static const NMMetaPropertyInfo *const property_infos_TEAM_PORT[] = {
 	NULL
 };
 
-#undef  _CURRENT_NM_META_SETTING_TYPE
-#define _CURRENT_NM_META_SETTING_TYPE NM_META_SETTING_TYPE_SERIAL
-static const NMMetaPropertyInfo *const property_infos_SERIAL[] = {
-	PROPERTY_INFO_WITH_DESC (NM_SETTING_SERIAL_BAUD,
-		.property_type =                &_pt_gobject_int,
-	),
-	PROPERTY_INFO_WITH_DESC (NM_SETTING_SERIAL_BITS,
-		.property_type =                &_pt_gobject_int,
-	),
-	PROPERTY_INFO_WITH_DESC (NM_SETTING_SERIAL_PARITY,
-		.property_type =                &_pt_gobject_enum,
-		.property_typ_data = DEFINE_PROPERTY_TYP_DATA (
-			PROPERTY_TYP_DATA_SUBTYPE (gobject_enum,
-				.value_infos =          ENUM_VALUE_INFOS (
-					{
-						.value = NM_SETTING_SERIAL_PARITY_EVEN,
-						.nick = "E",
-					},
-					{
-						.value = NM_SETTING_SERIAL_PARITY_EVEN,
-						.nick = "e",
-					},
-					{
-						.value = NM_SETTING_SERIAL_PARITY_ODD,
-						.nick = "O",
-					},
-					{
-						.value = NM_SETTING_SERIAL_PARITY_ODD,
-						.nick = "o",
-					},
-					{
-						.value = NM_SETTING_SERIAL_PARITY_NONE,
-						.nick = "N",
-					},
-					{
-						.value = NM_SETTING_SERIAL_PARITY_NONE,
-						.nick = "n",
-					}
-				),
-			),
-			.typ_flags =                  NM_META_PROPERTY_TYP_FLAG_ENUM_GET_PARSABLE_TEXT
-			                            | NM_META_PROPERTY_TYP_FLAG_ENUM_GET_PRETTY_TEXT,
-		),
-	),
-	PROPERTY_INFO_WITH_DESC (NM_SETTING_SERIAL_STOPBITS,
-		.property_type =                &_pt_gobject_int,
-	),
-	PROPERTY_INFO_WITH_DESC (NM_SETTING_SERIAL_SEND_DELAY,
-		.property_type =                &_pt_gobject_int,
-	),
-	NULL
-};
-
-#undef  _CURRENT_NM_META_SETTING_TYPE
-#define _CURRENT_NM_META_SETTING_TYPE NM_META_SETTING_TYPE_SRIOV
-static const NMMetaPropertyInfo *const property_infos_SRIOV[] = {
-	PROPERTY_INFO_WITH_DESC (NM_SETTING_SRIOV_TOTAL_VFS,
-		.property_type =                &_pt_gobject_int,
-	),
-	PROPERTY_INFO_WITH_DESC (NM_SETTING_SRIOV_VFS,
-		.property_type = DEFINE_PROPERTY_TYPE (
-			.get_fcn =                  _get_fcn_sriov_vfs,
-			.set_fcn =                  _set_fcn_sriov_vfs,
-			.remove_fcn =               _remove_fcn_sriov_vfs,
-		),
-	),
-	PROPERTY_INFO_WITH_DESC (NM_SETTING_SRIOV_AUTOPROBE_DRIVERS,
-		.property_type =                &_pt_gobject_enum,
-	),
-	NULL
-};
-
 #undef  _CURRENT_NM_META_SETTING_TYPE
 #define _CURRENT_NM_META_SETTING_TYPE NM_META_SETTING_TYPE_TUN
 static const NMMetaPropertyInfo *const property_infos_TUN[] = {
@@ -7365,6 +7364,30 @@ static const NMMetaPropertyInfo *const property_infos_VXLAN[] = {
 	NULL
 };
 
+#undef  _CURRENT_NM_META_SETTING_TYPE
+#define _CURRENT_NM_META_SETTING_TYPE NM_META_SETTING_TYPE_WIFI_P2P
+static const NMMetaPropertyInfo *const property_infos_WIFI_P2P[] = {
+	PROPERTY_INFO_WITH_DESC (NM_SETTING_WIFI_P2P_PEER,
+		.is_cli_option =                TRUE,
+		.property_alias =               "peer",
+		.inf_flags =                    NM_META_PROPERTY_INF_FLAG_REQD,
+		.prompt =                       N_("Peer"),
+		.property_type =                &_pt_gobject_mac,
+	),
+	PROPERTY_INFO_WITH_DESC (NM_SETTING_WIFI_P2P_WPS_METHOD,
+		.property_type =                &_pt_gobject_enum,
+		.property_typ_data = DEFINE_PROPERTY_TYP_DATA (
+			PROPERTY_TYP_DATA_SUBTYPE (gobject_enum,
+				.get_gtype =            nm_setting_wireless_security_wps_method_get_type,
+			),
+		),
+	),
+	PROPERTY_INFO_WITH_DESC (NM_SETTING_WIFI_P2P_WFD_IES,
+		.property_type =                &_pt_gobject_bytes,
+	),
+	NULL
+};
+
 #undef  _CURRENT_NM_META_SETTING_TYPE
 #define _CURRENT_NM_META_SETTING_TYPE NM_META_SETTING_TYPE_WIMAX
 static const NMMetaPropertyInfo *const property_infos_WIMAX[] = {
@@ -7400,7 +7423,7 @@ static const NMMetaPropertyInfo *const property_infos_WIRED[] = {
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_WIRED_DUPLEX,
 		.property_type =                &_pt_gobject_string,
 		.property_typ_data = DEFINE_PROPERTY_TYP_DATA (
-			.values_static =            VALUES_STATIC ("half", "full"),
+			.values_static =            NM_MAKE_STRV ("half", "full"),
 		),
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_WIRED_AUTO_NEGOTIATE,
@@ -7452,7 +7475,7 @@ static const NMMetaPropertyInfo *const property_infos_WIRED[] = {
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_WIRED_S390_NETTYPE,
 		.property_type =                &_pt_gobject_string,
 		.property_typ_data = DEFINE_PROPERTY_TYP_DATA (
-			.values_static =            VALUES_STATIC ("qeth", "lcs", "ctc"),
+			.values_static =            NM_MAKE_STRV ("qeth", "lcs", "ctc"),
 		),
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_WIRED_S390_OPTIONS,
@@ -7481,7 +7504,7 @@ static const NMMetaPropertyInfo *const property_infos_WIRED[] = {
 					{
 						.value = NM_SETTING_WIRED_WAKE_ON_LAN_NONE,
 						.nick = "disabled",
-					}
+					},
 				),
 			),
 			.typ_flags =                  NM_META_PROPERTY_TYP_FLAG_ENUM_GET_PARSABLE_TEXT
@@ -7494,6 +7517,34 @@ static const NMMetaPropertyInfo *const property_infos_WIRED[] = {
 	NULL
 };
 
+#undef  _CURRENT_NM_META_SETTING_TYPE
+#define _CURRENT_NM_META_SETTING_TYPE NM_META_SETTING_TYPE_WIREGUARD
+static const NMMetaPropertyInfo *const property_infos_WIREGUARD[] = {
+	PROPERTY_INFO_WITH_DESC (NM_SETTING_WIREGUARD_PRIVATE_KEY,
+		.is_secret =                    TRUE,
+		.property_type =                &_pt_gobject_string,
+	),
+	PROPERTY_INFO_WITH_DESC (NM_SETTING_WIREGUARD_PRIVATE_KEY_FLAGS,
+		.property_type =                &_pt_gobject_secret_flags,
+	),
+	PROPERTY_INFO_WITH_DESC (NM_SETTING_WIREGUARD_LISTEN_PORT,
+		.property_type =                &_pt_gobject_int,
+	),
+	PROPERTY_INFO_WITH_DESC (NM_SETTING_WIREGUARD_FWMARK,
+		.property_type =                &_pt_gobject_int,
+		.property_typ_data = DEFINE_PROPERTY_TYP_DATA_SUBTYPE (gobject_int, \
+			.base =                     16,
+		),
+	),
+	PROPERTY_INFO_WITH_DESC (NM_SETTING_WIREGUARD_PEER_ROUTES,
+		.property_type =                &_pt_gobject_bool,
+	),
+	PROPERTY_INFO_WITH_DESC (NM_SETTING_WIREGUARD_MTU,
+		.property_type =                &_pt_gobject_mtu,
+	),
+	NULL
+};
+
 #undef  _CURRENT_NM_META_SETTING_TYPE
 #define _CURRENT_NM_META_SETTING_TYPE NM_META_SETTING_TYPE_WIRELESS
 static const NMMetaPropertyInfo *const property_infos_WIRELESS[] = {
@@ -7514,15 +7565,15 @@ static const NMMetaPropertyInfo *const property_infos_WIRELESS[] = {
 		.def_hint =                     NM_META_TEXT_PROMPT_WIFI_MODE_CHOICES,
 		.property_type =                &_pt_gobject_string,
 		.property_typ_data = DEFINE_PROPERTY_TYP_DATA (
-			.values_static =            VALUES_STATIC (NM_SETTING_WIRELESS_MODE_INFRA,
-			                                           NM_SETTING_WIRELESS_MODE_ADHOC,
-			                                           NM_SETTING_WIRELESS_MODE_AP),
+			.values_static =            NM_MAKE_STRV (NM_SETTING_WIRELESS_MODE_INFRA,
+			                                          NM_SETTING_WIRELESS_MODE_ADHOC,
+			                                          NM_SETTING_WIRELESS_MODE_AP),
 		),
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_WIRELESS_BAND,
 		.property_type =                &_pt_gobject_string,
 		.property_typ_data = DEFINE_PROPERTY_TYP_DATA (
-			.values_static =            VALUES_STATIC ("a", "bg"),
+			.values_static =            NM_MAKE_STRV ("a", "bg"),
 		),
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_WIRELESS_CHANNEL,
@@ -7610,7 +7661,7 @@ static const NMMetaPropertyInfo *const property_infos_WIRELESS[] = {
 					{
 						.value = NM_SETTING_WIRELESS_WAKE_ON_WLAN_NONE,
 						.nick = "disabled",
-					}
+					},
 				),
 			),
 		),
@@ -7624,7 +7675,7 @@ static const NMMetaPropertyInfo *const property_infos_WIRELESS_SECURITY[] = {
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_WIRELESS_SECURITY_KEY_MGMT,
 		.property_type =                &_pt_gobject_string,
 		.property_typ_data = DEFINE_PROPERTY_TYP_DATA (
-			.values_static =            VALUES_STATIC ("none", "ieee8021x", "wpa-none", "wpa-psk", "wpa-eap"),
+			.values_static =            NM_MAKE_STRV ("none", "ieee8021x", "wpa-none", "wpa-psk", "wpa-eap", "sae"),
 		),
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_WIRELESS_SECURITY_WEP_TX_KEYIDX,
@@ -7633,7 +7684,7 @@ static const NMMetaPropertyInfo *const property_infos_WIRELESS_SECURITY[] = {
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_WIRELESS_SECURITY_AUTH_ALG,
 		.property_type =                &_pt_gobject_string,
 		.property_typ_data = DEFINE_PROPERTY_TYP_DATA (
-			.values_static =            VALUES_STATIC ("open", "shared", "leap"),
+			.values_static =            NM_MAKE_STRV ("open", "shared", "leap"),
 		),
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_WIRELESS_SECURITY_PROTO,
@@ -7724,9 +7775,6 @@ static const NMMetaPropertyInfo *const property_infos_WIRELESS_SECURITY[] = {
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_WIRELESS_SECURITY_PSK,
 		.is_secret =                    TRUE,
 		.property_type =                &_pt_gobject_string,
-		.property_typ_data = DEFINE_PROPERTY_TYP_DATA_SUBTYPE (gobject_string,
-			.validate_fcn =             _validate_fcn_wireless_security_psk,
-		),
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_WIRELESS_SECURITY_PSK_FLAGS,
 		.property_type =                &_pt_gobject_secret_flags,
@@ -7775,12 +7823,12 @@ static const NMMetaPropertyInfo *const property_infos_WPAN[] = {
 		.prompt =                       N_("Short address (<0x0000-0xffff>)"),
 		.property_type =                &_pt_gobject_int,
 		.property_typ_data = DEFINE_PROPERTY_TYP_DATA_SUBTYPE (gobject_int, \
-			.base =			16,
-			.value_infos =          INT_VALUE_INFOS (
+			.base =                     16,
+			.value_infos =              INT_VALUE_INFOS (
 				{
-					.value = G_MAXUINT16,
+					.value.i64 = G_MAXUINT16,
 					.nick = "unset",
-				}
+				},
 			),
 		),
 	),
@@ -7791,27 +7839,42 @@ static const NMMetaPropertyInfo *const property_infos_WPAN[] = {
 		.prompt =                       N_("PAN Identifier (<0x0000-0xffff>)"),
 		.property_type =                &_pt_gobject_int,
 		.property_typ_data = DEFINE_PROPERTY_TYP_DATA_SUBTYPE (gobject_int, \
-			.base =			16,
-			.value_infos =          INT_VALUE_INFOS (
+			.base =                     16,
+			.value_infos =              INT_VALUE_INFOS (
 				{
-					.value = G_MAXUINT16,
+					.value.i64 = G_MAXUINT16,
 					.nick = "unset",
-				}
+				},
 			),
 		),
 	),
-	NULL
-};
-
-#undef  _CURRENT_NM_META_SETTING_TYPE
-#define _CURRENT_NM_META_SETTING_TYPE NM_META_SETTING_TYPE_6LOWPAN
-static const NMMetaPropertyInfo *const property_infos_6LOWPAN[] = {
-	PROPERTY_INFO_WITH_DESC (NM_SETTING_6LOWPAN_PARENT,
+	PROPERTY_INFO_WITH_DESC (NM_SETTING_WPAN_PAGE,
 		.is_cli_option =                TRUE,
-		.property_alias =               "dev",
-		.inf_flags =                    NM_META_PROPERTY_INF_FLAG_REQD,
-		.prompt =                       N_("IEEE 802.15.4 (WPAN) parent device or connection UUID"),
-		.property_type =                &_pt_gobject_string,
+		.property_alias =               "page",
+		.prompt =                       N_("Page ()"),
+		.property_type =                &_pt_gobject_int,
+		.property_typ_data = DEFINE_PROPERTY_TYP_DATA_SUBTYPE (gobject_int, \
+			.value_infos =              INT_VALUE_INFOS (
+				{
+					.value.i64 = NM_SETTING_WPAN_PAGE_DEFAULT,
+					.nick = "default",
+				},
+			),
+		),
+	),
+	PROPERTY_INFO_WITH_DESC (NM_SETTING_WPAN_CHANNEL,
+		.is_cli_option =                TRUE,
+		.property_alias =               "channel",
+		.prompt =                       N_("Channel ()"),
+		.property_type =                &_pt_gobject_int,
+		.property_typ_data = DEFINE_PROPERTY_TYP_DATA_SUBTYPE (gobject_int, \
+			.value_infos =              INT_VALUE_INFOS (
+				{
+					.value.i64 = NM_SETTING_WPAN_CHANNEL_DEFAULT,
+					.nick = "default",
+				},
+			),
+		),
 	),
 	NULL
 };
@@ -7844,9 +7907,9 @@ static void
 _setting_init_fcn_gsm (ARGS_SETTING_INIT_FCN)
 {
 	if (init_type == NM_META_ACCESSOR_SETTING_INIT_TYPE_CLI) {
-		/* Initialize 'number' so that 'gsm' is valid */
+		/* Initialize 'apn' so that 'gsm' is valid */
 		g_object_set (NM_SETTING_GSM (setting),
-		              NM_SETTING_GSM_NUMBER, "*99#",
+		              NM_SETTING_GSM_APN, "internet",
 		              NULL);
 	}
 }
@@ -7937,6 +8000,7 @@ _setting_init_fcn_wireless (ARGS_SETTING_INIT_FCN)
 
 /*****************************************************************************/
 
+#define SETTING_PRETTY_NAME_6LOWPAN             N_("6LOWPAN settings")
 #define SETTING_PRETTY_NAME_802_1X              N_("802-1x settings")
 #define SETTING_PRETTY_NAME_ADSL                N_("ADSL connection")
 #define SETTING_PRETTY_NAME_BLUETOOTH           N_("bluetooth connection")
@@ -7958,10 +8022,10 @@ _setting_init_fcn_wireless (ARGS_SETTING_INIT_FCN)
 #define SETTING_PRETTY_NAME_MACVLAN             N_("macvlan connection")
 #define SETTING_PRETTY_NAME_MATCH               N_("Match")
 #define SETTING_PRETTY_NAME_OLPC_MESH           N_("OLPC Mesh connection")
-#define SETTING_PRETTY_NAME_OVS_BRIDGE          N_("OpenVSwitch bridge settings")
-#define SETTING_PRETTY_NAME_OVS_INTERFACE       N_("OpenVSwitch interface settings")
-#define SETTING_PRETTY_NAME_OVS_PATCH           N_("OpenVSwitch patch interface settings")
-#define SETTING_PRETTY_NAME_OVS_PORT            N_("OpenVSwitch port settings")
+#define SETTING_PRETTY_NAME_OVS_BRIDGE          N_("Open vSwitch bridge settings")
+#define SETTING_PRETTY_NAME_OVS_INTERFACE       N_("Open vSwitch interface settings")
+#define SETTING_PRETTY_NAME_OVS_PATCH           N_("Open vSwitch patch interface settings")
+#define SETTING_PRETTY_NAME_OVS_PORT            N_("Open vSwitch port settings")
 #define SETTING_PRETTY_NAME_PPP                 N_("PPP settings")
 #define SETTING_PRETTY_NAME_PPPOE               N_("PPPoE")
 #define SETTING_PRETTY_NAME_PROXY               N_("Proxy")
@@ -7975,12 +8039,13 @@ _setting_init_fcn_wireless (ARGS_SETTING_INIT_FCN)
 #define SETTING_PRETTY_NAME_VLAN                N_("VLAN connection")
 #define SETTING_PRETTY_NAME_VPN                 N_("VPN connection")
 #define SETTING_PRETTY_NAME_VXLAN               N_("VXLAN connection")
+#define SETTING_PRETTY_NAME_WIFI_P2P            N_("Wi-Fi P2P connection")
 #define SETTING_PRETTY_NAME_WIMAX               N_("WiMAX connection")
 #define SETTING_PRETTY_NAME_WIRED               N_("Wired Ethernet")
+#define SETTING_PRETTY_NAME_WIREGUARD           N_("WireGuard VPN settings")
 #define SETTING_PRETTY_NAME_WIRELESS            N_("Wi-Fi connection")
 #define SETTING_PRETTY_NAME_WIRELESS_SECURITY   N_("Wi-Fi security settings")
 #define SETTING_PRETTY_NAME_WPAN                N_("WPAN settings")
-#define SETTING_PRETTY_NAME_6LOWPAN             N_("6LOWPAN settings")
 
 #define NM_META_SETTING_VALID_PARTS(...) \
 	((const NMMetaSettingValidPartItem *const[]) { __VA_ARGS__  NULL })
@@ -8218,6 +8283,12 @@ const NMMetaSettingInfoEditor nm_meta_setting_infos_editor[] = {
 			NM_META_SETTING_VALID_PART_ITEM (ETHTOOL,               FALSE),
 		),
 	),
+	SETTING_INFO (WIFI_P2P,
+		.valid_parts = NM_META_SETTING_VALID_PARTS (
+			NM_META_SETTING_VALID_PART_ITEM (CONNECTION,            TRUE),
+			NM_META_SETTING_VALID_PART_ITEM (WIFI_P2P,              TRUE),
+		),
+	),
 	SETTING_INFO (WIMAX,
 		.valid_parts = NM_META_SETTING_VALID_PARTS (
 			NM_META_SETTING_VALID_PART_ITEM (CONNECTION,            TRUE),
@@ -8235,6 +8306,12 @@ const NMMetaSettingInfoEditor nm_meta_setting_infos_editor[] = {
 			NM_META_SETTING_VALID_PART_ITEM (ETHTOOL,               FALSE),
 		),
 	),
+	SETTING_INFO (WIREGUARD,
+		.valid_parts = NM_META_SETTING_VALID_PARTS (
+			NM_META_SETTING_VALID_PART_ITEM (CONNECTION,            TRUE),
+			NM_META_SETTING_VALID_PART_ITEM (WIREGUARD,             TRUE),
+		),
+	),
 	SETTING_INFO (WIRELESS,
 		.alias =                            "wifi",
 		.valid_parts = NM_META_SETTING_VALID_PARTS (
diff --git a/clients/common/nm-meta-setting-desc.h b/clients/common/nm-meta-setting-desc.h
index 163dcf2e..e3f9d230 100644
--- a/clients/common/nm-meta-setting-desc.h
+++ b/clients/common/nm-meta-setting-desc.h
@@ -268,6 +268,9 @@ struct _NMMetaPropertyTypData {
 		struct {
 			const char *(*validate_fcn) (const char *value, char **out_to_free, GError **error);
 		} gobject_string;
+		struct {
+			bool legacy_format:1;
+		} gobject_bytes;
 		struct {
 			guint32 (*get_fcn) (NMSetting *setting);
 		} mtu;
@@ -412,7 +415,7 @@ typedef enum {
 
 /* the settings-meta data is supposed to be independent of an actual client
  * implementation. Hence, there is a need for hooks to the meta-data.
- * The meta-data handlers may call back to the enviroment with certain
+ * The meta-data handlers may call back to the environment with certain
  * actions. */
 struct _NMMetaEnvironment {
 
diff --git a/clients/common/nm-polkit-listener.c b/clients/common/nm-polkit-listener.c
index a7bce6ad..7367459d 100644
--- a/clients/common/nm-polkit-listener.c
+++ b/clients/common/nm-polkit-listener.c
@@ -35,7 +35,6 @@
 
 #include "nm-polkit-listener.h"
 
-#include 
 #include 
 #include 
 
@@ -198,7 +197,7 @@ choose_identity (GList *identities)
 	GList *elem;
 
 	/* Choose identity. First try current user, then root, and else
-	 * take the firts one */
+	 * take the first one */
 	user = getenv("USER");
 	elem = g_list_find_custom (identities, user, (GCompareFunc) compare_users);
 	if (!elem) {
diff --git a/clients/common/nm-polkit-listener.h b/clients/common/nm-polkit-listener.h
index d69f8eca..ee86104b 100644
--- a/clients/common/nm-polkit-listener.h
+++ b/clients/common/nm-polkit-listener.h
@@ -66,7 +66,7 @@ typedef struct {
 	                       gpointer user_data);
 
 	/*
-	 * @gained_authorization: whether the autorization was successful
+	 * @gained_authorization: whether the authorization was successful
 	 *
 	 * Called as a result of completed signal by polkit.
 	 */
@@ -123,7 +123,7 @@ typedef void (*NMPolkitListenerOnShowInfoFunc) (const char *text);
 typedef void (*NMPolkitListenerOnShowErrorFunc) (const char *text);
 /**
  * NMPolkitListenerCompletedFunc:
- * @gained_authorization: whether the autorization was successful
+ * @gained_authorization: whether the authorization was successful
  *
  * Called as a result of completed signal by polkit.
  */
diff --git a/clients/common/nm-secret-agent-simple.c b/clients/common/nm-secret-agent-simple.c
index cab0c15a..cd3ce2ee 100644
--- a/clients/common/nm-secret-agent-simple.c
+++ b/clients/common/nm-secret-agent-simple.c
@@ -31,16 +31,30 @@
 
 #include "nm-default.h"
 
-#include 
+#include "nm-secret-agent-simple.h"
 
-#include "nm-vpn-service-plugin.h"
+#include 
+#include 
 
+#include "nm-vpn-service-plugin.h"
 #include "nm-vpn-helpers.h"
-#include "nm-secret-agent-simple.h"
+#include "nm-utils/nm-secret-utils.h"
 
-G_DEFINE_TYPE (NMSecretAgentSimple, nm_secret_agent_simple, NM_TYPE_SECRET_AGENT_OLD)
+/*****************************************************************************/
+
+typedef struct {
+	char                          *request_id;
+
+	NMSecretAgentSimple           *self;
 
-#define NM_SECRET_AGENT_SIMPLE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_SECRET_AGENT_SIMPLE, NMSecretAgentSimplePrivate))
+	NMConnection                  *connection;
+	const char                    *setting_name;
+	char                         **hints;
+	NMSecretAgentOldGetSecretsFunc callback;
+	gpointer                       callback_data;
+	GCancellable                  *cancellable;
+	NMSecretAgentGetSecretsFlags   flags;
+} RequestData;
 
 enum {
 	REQUEST_SECRETS,
@@ -51,89 +65,65 @@ enum {
 static guint signals[LAST_SIGNAL] = { 0 };
 
 typedef struct {
-	NMSecretAgentSimple           *self;
-
-	char                          *request_id;
-	NMConnection                  *connection;
-	char                         **hints;
-	NMSecretAgentOldGetSecretsFunc callback;
-	gpointer                       callback_data;
-} NMSecretAgentSimpleRequest;
-
-typedef struct {
-	/*  */
 	GHashTable *requests;
 
 	char *path;
 	gboolean enabled;
 } NMSecretAgentSimplePrivate;
 
-static void
-nm_secret_agent_simple_request_free (gpointer data)
-{
-	NMSecretAgentSimpleRequest *request = data;
+struct _NMSecretAgentSimple {
+	NMSecretAgentOld parent;
+	NMSecretAgentSimplePrivate _priv;
+};
 
-	g_object_unref (request->self);
-	g_object_unref (request->connection);
-	g_strfreev (request->hints);
+struct _NMSecretAgentSimpleClass {
+	NMSecretAgentOldClass parent;
+};
 
-	g_slice_free (NMSecretAgentSimpleRequest, request);
-}
+G_DEFINE_TYPE (NMSecretAgentSimple, nm_secret_agent_simple, NM_TYPE_SECRET_AGENT_OLD)
 
-static void
-nm_secret_agent_simple_init (NMSecretAgentSimple *agent)
-{
-	NMSecretAgentSimplePrivate *priv = NM_SECRET_AGENT_SIMPLE_GET_PRIVATE (agent);
+#define NM_SECRET_AGENT_SIMPLE_GET_PRIVATE(self)  _NM_GET_PRIVATE (self, NMSecretAgentSimple, NM_IS_SECRET_AGENT_SIMPLE, NMSecretAgentOld)
 
-	priv->requests = g_hash_table_new_full (nm_str_hash, g_str_equal,
-	                                        g_free, nm_secret_agent_simple_request_free);
-}
+/*****************************************************************************/
 
 static void
-nm_secret_agent_simple_finalize (GObject *object)
+_request_data_free (gpointer data)
 {
-	NMSecretAgentSimplePrivate *priv = NM_SECRET_AGENT_SIMPLE_GET_PRIVATE (object);
-	GError *error;
-	GHashTableIter iter;
-	gpointer key;
-	gpointer value;
-
-	error = g_error_new (NM_SECRET_AGENT_ERROR,
-	                     NM_SECRET_AGENT_ERROR_AGENT_CANCELED,
-	                     "The secret agent is going away");
-
-	g_hash_table_iter_init (&iter, priv->requests);
-	while (g_hash_table_iter_next (&iter, &key, &value)) {
-		NMSecretAgentSimpleRequest *request = value;
-
-		request->callback (NM_SECRET_AGENT_OLD (object),
-		                   request->connection,
-		                   NULL, error,
-		                   request->callback_data);
-	}
-
-	g_hash_table_destroy (priv->requests);
-	g_error_free (error);
+	RequestData *request = data;
 
-	g_free (priv->path);
+	g_free (request->request_id);
+	nm_clear_g_cancellable (&request->cancellable);
+	g_object_unref (request->connection);
+	g_strfreev (request->hints);
 
-	G_OBJECT_CLASS (nm_secret_agent_simple_parent_class)->finalize (object);
+	g_slice_free (RequestData, request);
 }
 
-static gboolean
-strv_has (char **haystack,
-          char   *needle)
+static void
+_request_data_complete (RequestData *request,
+                        GVariant *secrets,
+                        GError *error,
+                        GHashTableIter *iter_to_remove)
 {
-	char **iter;
+	NMSecretAgentSimple *self = request->self;
+	NMSecretAgentSimplePrivate *priv = NM_SECRET_AGENT_SIMPLE_GET_PRIVATE (self);
 
-	for (iter = haystack; iter && *iter; iter++) {
-		if (g_strcmp0 (*iter, needle) == 0)
-			return TRUE;
-	}
+	nm_assert ((secrets != NULL) != (error != NULL));
 
-	return FALSE;
+	request->callback (NM_SECRET_AGENT_OLD (request->self),
+	                   request->connection,
+	                   secrets,
+	                   error,
+	                   request->callback_data);
+
+	if (iter_to_remove)
+		g_hash_table_iter_remove (iter_to_remove);
+	else
+		g_hash_table_remove (priv->requests, request);
 }
 
+/*****************************************************************************/
+
 /**
  * NMSecretAgentSimpleSecret:
  * @name: the user-visible name of the secret. Eg, "WEP Passphrase".
@@ -148,70 +138,113 @@ typedef struct {
 	NMSecretAgentSimpleSecret base;
 	NMSetting *setting;
 	char *property;
-} NMSecretAgentSimpleSecretReal;
+} SecretReal;
 
 static void
-nm_secret_agent_simple_secret_free (NMSecretAgentSimpleSecret *secret)
+_secret_real_free (NMSecretAgentSimpleSecret *secret)
 {
-	NMSecretAgentSimpleSecretReal *real = (NMSecretAgentSimpleSecretReal *)secret;
+	SecretReal *real = (SecretReal *)secret;
 
 	g_free ((char *) secret->pretty_name);
 	g_free ((char *) secret->entry_id);
-	g_free (secret->value);
+	nm_free_secret (secret->value);
 	g_free ((char *) secret->vpn_type);
 	g_free (real->property);
 	g_clear_object (&real->setting);
 
-	g_slice_free (NMSecretAgentSimpleSecretReal, real);
+	g_slice_free (SecretReal, real);
 }
 
 static NMSecretAgentSimpleSecret *
-nm_secret_agent_simple_secret_new (NMSecretAgentSecretType secret_type,
-                                   const char *pretty_name,
-                                   NMSetting  *setting,
-                                   const char *property,
-                                   const char *vpn_type)
-{
-	NMSecretAgentSimpleSecretReal *real;
-	const char *vpn_prefix;
-	const char *value;
+_secret_real_new_plain (NMSecretAgentSecretType secret_type,
+                       const char *pretty_name,
+                       NMSetting  *setting,
+                       const char *property)
+{
+	SecretReal *real;
+	gs_free char *value= NULL;
 
 	nm_assert (property);
 	nm_assert (NM_IS_SETTING (setting));
+	nm_assert (NM_IN_SET (secret_type, NM_SECRET_AGENT_SECRET_TYPE_PROPERTY, NM_SECRET_AGENT_SECRET_TYPE_SECRET));
+	nm_assert (g_object_class_find_property (G_OBJECT_GET_CLASS (setting), property));
+	nm_assert ((secret_type == NM_SECRET_AGENT_SECRET_TYPE_SECRET) == nm_setting_get_secret_flags (setting, property, NULL, NULL));
+
+	g_object_get (setting, property, &value, NULL);
+
+	real = g_slice_new (SecretReal);
+	*real = (SecretReal) {
+		.base.secret_type = secret_type,
+		.base.pretty_name = g_strdup (pretty_name),
+		.base.entry_id    = g_strdup_printf ("%s.%s", nm_setting_get_name (setting), property),
+		.base.value       = g_steal_pointer (&value),
+		.base.is_secret   = (secret_type != NM_SECRET_AGENT_SECRET_TYPE_PROPERTY),
+		.setting          = g_object_ref (setting),
+		.property         = g_strdup (property),
+	};
+	return &real->base;
+}
 
-	real = g_slice_new0 (NMSecretAgentSimpleSecretReal);
-	*((NMSecretAgentSecretType *) &real->base.secret_type) = secret_type;
-	real->setting = g_object_ref (setting);
-	real->base.pretty_name = g_strdup (pretty_name);
-	real->property = g_strdup (property);
-	switch (secret_type) {
-	case NM_SECRET_AGENT_SECRET_TYPE_PROPERTY:
-	case NM_SECRET_AGENT_SECRET_TYPE_SECRET:
-		nm_assert (!vpn_type);
-		nm_assert (g_object_class_find_property (G_OBJECT_GET_CLASS (setting), property));
-		nm_assert ((secret_type == NM_SECRET_AGENT_SECRET_TYPE_SECRET) == nm_setting_get_secret_flags (setting, property, NULL, NULL));
-		real->base.entry_id = g_strdup_printf ("%s.%s", nm_setting_get_name (setting), property);
-		g_object_get (setting, property, &real->base.value, NULL);
-		real->base.is_secret = (secret_type != NM_SECRET_AGENT_SECRET_TYPE_PROPERTY);
-		break;
-	case NM_SECRET_AGENT_SECRET_TYPE_VPN_SECRET:
-		vpn_prefix = NM_SECRET_AGENT_ENTRY_ID_PREFX_VPN_SECRETS;
-		value = nm_setting_vpn_get_secret (NM_SETTING_VPN (setting), property);
-		real->base.entry_id = g_strdup_printf ("%s%s", vpn_prefix, property);
-		nm_assert (vpn_type);
-		real->base.vpn_type = g_strdup (vpn_type);
-		real->base.value = g_strdup (value);
-		real->base.is_secret = TRUE;
-		break;
-	}
-	nm_assert (real->base.entry_id);
+static NMSecretAgentSimpleSecret *
+_secret_real_new_vpn_secret (const char *pretty_name,
+                             NMSetting  *setting,
+                             const char *property,
+                             const char *vpn_type)
+{
+	SecretReal *real;
+	const char *value;
+
+	nm_assert (property);
+	nm_assert (NM_IS_SETTING_VPN (setting));
+	nm_assert (vpn_type);
+
+	value = nm_setting_vpn_get_secret (NM_SETTING_VPN (setting), property);
+
+	real = g_slice_new (SecretReal);
+	*real = (SecretReal) {
+		.base.secret_type = NM_SECRET_AGENT_SECRET_TYPE_VPN_SECRET,
+		.base.pretty_name = g_strdup (pretty_name),
+		.base.entry_id    = g_strdup_printf ("%s%s", NM_SECRET_AGENT_ENTRY_ID_PREFX_VPN_SECRETS, property),
+		.base.value       = g_strdup (value),
+		.base.is_secret   = TRUE,
+		.base.vpn_type    = g_strdup (vpn_type),
+		.setting          = g_object_ref (setting),
+		.property         = g_strdup (property),
+	};
+	return &real->base;
+}
 
+static NMSecretAgentSimpleSecret *
+_secret_real_new_wireguard_peer_psk (NMSettingWireGuard *s_wg,
+                                     const char *public_key,
+                                     const char *preshared_key)
+{
+	SecretReal *real;
+
+	nm_assert (NM_IS_SETTING_WIREGUARD (s_wg));
+	nm_assert (public_key);
+
+	real = g_slice_new (SecretReal);
+	*real = (SecretReal) {
+		.base.secret_type        = NM_SECRET_AGENT_SECRET_TYPE_WIREGUARD_PEER_PSK,
+		.base.pretty_name        = g_strdup_printf (_("Preshared-key for %s"),
+		                                            public_key),
+		.base.entry_id           = g_strdup_printf (NM_SETTING_WIREGUARD_SETTING_NAME"."NM_SETTING_WIREGUARD_PEERS".%s."NM_WIREGUARD_PEER_ATTR_PRESHARED_KEY,
+		                                            public_key),
+		.base.value              = g_strdup (preshared_key),
+		.base.is_secret          = TRUE,
+		.base.no_prompt_entry_id = TRUE,
+		.setting                 = NM_SETTING (g_object_ref (s_wg)),
+		.property                = g_strdup (public_key),
+	};
 	return &real->base;
 }
 
+/*****************************************************************************/
+
 static gboolean
-add_8021x_secrets (NMSecretAgentSimpleRequest *request,
-                   GPtrArray                  *secrets)
+add_8021x_secrets (RequestData *request,
+                   GPtrArray *secrets)
 {
 	NMSetting8021x *s_8021x = nm_connection_get_setting_802_1x (request->connection);
 	const char *eap_method;
@@ -222,11 +255,10 @@ add_8021x_secrets (NMSecretAgentSimpleRequest *request,
 		char **iter;
 
 		for (iter = request->hints; *iter; iter++) {
-			secret = nm_secret_agent_simple_secret_new (NM_SECRET_AGENT_SECRET_TYPE_SECRET,
-			                                            _(*iter),
-			                                            NM_SETTING (s_8021x),
-			                                            *iter,
-			                                            NULL);
+			secret = _secret_real_new_plain (NM_SECRET_AGENT_SECRET_TYPE_SECRET,
+			                                 _(*iter),
+			                                 NM_SETTING (s_8021x),
+			                                 *iter);
 			g_ptr_array_add (secrets, secret);
 		}
 
@@ -237,41 +269,37 @@ add_8021x_secrets (NMSecretAgentSimpleRequest *request,
 	if (!eap_method)
 		return FALSE;
 
-	if (   !strcmp (eap_method, "md5")
-	    || !strcmp (eap_method, "leap")
-	    || !strcmp (eap_method, "ttls")
-	    || !strcmp (eap_method, "peap")) {
+	if (NM_IN_STRSET (eap_method, "md5",
+	                              "leap",
+	                              "ttls",
+	                              "peap")) {
 		/* TTLS and PEAP are actually much more complicated, but this complication
 		 * is not visible here since we only care about phase2 authentication
 		 * (and don't even care of which one)
 		 */
-		secret = nm_secret_agent_simple_secret_new (NM_SECRET_AGENT_SECRET_TYPE_PROPERTY,
-		                                            _("Username"),
-		                                            NM_SETTING (s_8021x),
-		                                            NM_SETTING_802_1X_IDENTITY,
-		                                            NULL);
+		secret = _secret_real_new_plain (NM_SECRET_AGENT_SECRET_TYPE_PROPERTY,
+		                                 _("Username"),
+		                                 NM_SETTING (s_8021x),
+		                                 NM_SETTING_802_1X_IDENTITY);
 		g_ptr_array_add (secrets, secret);
-		secret = nm_secret_agent_simple_secret_new (NM_SECRET_AGENT_SECRET_TYPE_SECRET,
-		                                            _("Password"),
-		                                            NM_SETTING (s_8021x),
-		                                            NM_SETTING_802_1X_PASSWORD,
-		                                            NULL);
+		secret = _secret_real_new_plain (NM_SECRET_AGENT_SECRET_TYPE_SECRET,
+		                                 _("Password"),
+		                                 NM_SETTING (s_8021x),
+		                                 NM_SETTING_802_1X_PASSWORD);
 		g_ptr_array_add (secrets, secret);
 		return TRUE;
 	}
 
-	if (!strcmp (eap_method, "tls")) {
-		secret = nm_secret_agent_simple_secret_new (NM_SECRET_AGENT_SECRET_TYPE_PROPERTY,
-		                                            _("Identity"),
-		                                            NM_SETTING (s_8021x),
-		                                            NM_SETTING_802_1X_IDENTITY,
-		                                            NULL);
+	if (nm_streq (eap_method, "tls")) {
+		secret = _secret_real_new_plain (NM_SECRET_AGENT_SECRET_TYPE_PROPERTY,
+		                                 _("Identity"),
+		                                 NM_SETTING (s_8021x),
+		                                 NM_SETTING_802_1X_IDENTITY);
 		g_ptr_array_add (secrets, secret);
-		secret = nm_secret_agent_simple_secret_new (NM_SECRET_AGENT_SECRET_TYPE_SECRET,
-		                                            _("Private key password"),
-		                                            NM_SETTING (s_8021x),
-		                                            NM_SETTING_802_1X_PRIVATE_KEY_PASSWORD,
-		                                            NULL);
+		secret = _secret_real_new_plain (NM_SECRET_AGENT_SECRET_TYPE_SECRET,
+		                                 _("Private key password"),
+		                                 NM_SETTING (s_8021x),
+		                                 NM_SETTING_802_1X_PRIVATE_KEY_PASSWORD);
 		g_ptr_array_add (secrets, secret);
 		return TRUE;
 	}
@@ -280,7 +308,7 @@ add_8021x_secrets (NMSecretAgentSimpleRequest *request,
 }
 
 static gboolean
-add_wireless_secrets (NMSecretAgentSimpleRequest *request,
+add_wireless_secrets (RequestData *request,
                       GPtrArray                  *secrets)
 {
 	NMSettingWirelessSecurity *s_wsec = nm_connection_get_setting_wireless_security (request->connection);
@@ -290,76 +318,67 @@ add_wireless_secrets (NMSecretAgentSimpleRequest *request,
 	if (!key_mgmt)
 		return FALSE;
 
-	if (!strcmp (key_mgmt, "wpa-none") || !strcmp (key_mgmt, "wpa-psk")) {
-		secret = nm_secret_agent_simple_secret_new (NM_SECRET_AGENT_SECRET_TYPE_SECRET,
-		                                            _("Password"),
-		                                            NM_SETTING (s_wsec),
-		                                            NM_SETTING_WIRELESS_SECURITY_PSK,
-		                                            NULL);
+	if (NM_IN_STRSET (key_mgmt, "wpa-none", "wpa-psk", "sae")) {
+		secret = _secret_real_new_plain (NM_SECRET_AGENT_SECRET_TYPE_SECRET,
+		                                 _("Password"),
+		                                 NM_SETTING (s_wsec),
+		                                 NM_SETTING_WIRELESS_SECURITY_PSK);
 		g_ptr_array_add (secrets, secret);
 		return TRUE;
 	}
 
-	if (!strcmp (key_mgmt, "none")) {
-		int index;
-		char *key;
+	if (nm_streq (key_mgmt, "none")) {
+		guint32 index;
+		char key[100];
 
 		index = nm_setting_wireless_security_get_wep_tx_keyidx (s_wsec);
-		key = g_strdup_printf ("wep-key%d", index);
-		secret = nm_secret_agent_simple_secret_new (NM_SECRET_AGENT_SECRET_TYPE_SECRET,
-		                                            _("Key"),
-		                                            NM_SETTING (s_wsec),
-		                                            key,
-		                                            NULL);
-		g_free (key);
-
+		secret = _secret_real_new_plain (NM_SECRET_AGENT_SECRET_TYPE_SECRET,
+		                                 _("Key"),
+		                                 NM_SETTING (s_wsec),
+		                                 nm_sprintf_buf (key, "wep-key%u", (guint) index));
 		g_ptr_array_add (secrets, secret);
 		return TRUE;
 	}
 
-	if (!strcmp (key_mgmt, "iee8021x")) {
-		if (!g_strcmp0 (nm_setting_wireless_security_get_auth_alg (s_wsec), "leap")) {
-			secret = nm_secret_agent_simple_secret_new (NM_SECRET_AGENT_SECRET_TYPE_SECRET,
-			                                            _("Password"),
-			                                            NM_SETTING (s_wsec),
-			                                            NM_SETTING_WIRELESS_SECURITY_LEAP_PASSWORD,
-			                                            NULL);
+	if (nm_streq (key_mgmt, "iee8021x")) {
+		if (nm_streq0 (nm_setting_wireless_security_get_auth_alg (s_wsec), "leap")) {
+			secret = _secret_real_new_plain (NM_SECRET_AGENT_SECRET_TYPE_SECRET,
+			                                 _("Password"),
+			                                 NM_SETTING (s_wsec),
+			                                 NM_SETTING_WIRELESS_SECURITY_LEAP_PASSWORD);
 			g_ptr_array_add (secrets, secret);
 			return TRUE;
 		} else
 			return add_8021x_secrets (request, secrets);
 	}
 
-	if (!strcmp (key_mgmt, "wpa-eap"))
+	if (nm_streq (key_mgmt, "wpa-eap"))
 		return add_8021x_secrets (request, secrets);
 
 	return FALSE;
 }
 
 static gboolean
-add_pppoe_secrets (NMSecretAgentSimpleRequest *request,
+add_pppoe_secrets (RequestData *request,
                    GPtrArray                  *secrets)
 {
 	NMSettingPppoe *s_pppoe = nm_connection_get_setting_pppoe (request->connection);
 	NMSecretAgentSimpleSecret *secret;
 
-	secret = nm_secret_agent_simple_secret_new (NM_SECRET_AGENT_SECRET_TYPE_PROPERTY,
-	                                            _("Username"),
-	                                            NM_SETTING (s_pppoe),
-	                                            NM_SETTING_PPPOE_USERNAME,
-	                                            NULL);
+	secret = _secret_real_new_plain (NM_SECRET_AGENT_SECRET_TYPE_PROPERTY,
+	                                 _("Username"),
+	                                 NM_SETTING (s_pppoe),
+	                                 NM_SETTING_PPPOE_USERNAME);
 	g_ptr_array_add (secrets, secret);
-	secret = nm_secret_agent_simple_secret_new (NM_SECRET_AGENT_SECRET_TYPE_PROPERTY,
-	                                            _("Service"),
-	                                            NM_SETTING (s_pppoe),
-	                                            NM_SETTING_PPPOE_SERVICE,
-	                                            NULL);
+	secret = _secret_real_new_plain (NM_SECRET_AGENT_SECRET_TYPE_PROPERTY,
+	                                 _("Service"),
+	                                 NM_SETTING (s_pppoe),
+	                                 NM_SETTING_PPPOE_SERVICE);
 	g_ptr_array_add (secrets, secret);
-	secret = nm_secret_agent_simple_secret_new (NM_SECRET_AGENT_SECRET_TYPE_SECRET,
-	                                            _("Password"),
-	                                            NM_SETTING (s_pppoe),
-	                                            NM_SETTING_PPPOE_PASSWORD,
-	                                            NULL);
+	secret = _secret_real_new_plain (NM_SECRET_AGENT_SECRET_TYPE_SECRET,
+	                                 _("Password"),
+	                                 NM_SETTING (s_pppoe),
+	                                 NM_SETTING_PPPOE_PASSWORD);
 	g_ptr_array_add (secrets, secret);
 	return TRUE;
 }
@@ -387,11 +406,10 @@ add_vpn_secret_helper (GPtrArray *secrets, NMSettingVpn *s_vpn, const char *name
 	flags = get_vpn_secret_flags (s_vpn, name);
 	if (   flags & NM_SETTING_SECRET_FLAG_AGENT_OWNED
 	    || flags & NM_SETTING_SECRET_FLAG_NOT_SAVED) {
-		secret = nm_secret_agent_simple_secret_new (NM_SECRET_AGENT_SECRET_TYPE_VPN_SECRET,
-		                                            ui_name,
-		                                            NM_SETTING (s_vpn),
-		                                            name,
-		                                            nm_setting_vpn_get_service_type (s_vpn));
+		secret = _secret_real_new_vpn_secret (ui_name,
+		                                      NM_SETTING (s_vpn),
+		                                      name,
+		                                      nm_setting_vpn_get_service_type (s_vpn));
 
 		/* Check for duplicates */
 		for (i = 0; i < secrets->len; i++) {
@@ -400,7 +418,7 @@ add_vpn_secret_helper (GPtrArray *secrets, NMSettingVpn *s_vpn, const char *name
 			if (   s->secret_type == secret->secret_type
 			    && nm_streq0 (s->vpn_type, secret->vpn_type)
 			    && nm_streq0 (s->entry_id, secret->entry_id)) {
-				nm_secret_agent_simple_secret_free (secret);
+				_secret_real_free (secret);
 				return;
 			}
 		}
@@ -412,9 +430,9 @@ add_vpn_secret_helper (GPtrArray *secrets, NMSettingVpn *s_vpn, const char *name
 #define VPN_MSG_TAG "x-vpn-message:"
 
 static gboolean
-add_vpn_secrets (NMSecretAgentSimpleRequest *request,
-                 GPtrArray                  *secrets,
-                 char                       **msg)
+add_vpn_secrets (RequestData *request,
+                 GPtrArray *secrets,
+                 char **msg)
 {
 	NMSettingVpn *s_vpn = nm_connection_get_setting_vpn (request->connection);
 	const VpnPasswordName *secret_names, *p;
@@ -443,33 +461,397 @@ add_vpn_secrets (NMSecretAgentSimpleRequest *request,
 	return TRUE;
 }
 
-static void
-request_secrets_from_ui (NMSecretAgentSimpleRequest *request)
+static gboolean
+add_wireguard_secrets (RequestData *request,
+                       GPtrArray *secrets,
+                       char **msg,
+                       GError **error)
 {
+	NMSettingWireGuard *s_wg;
+	NMSecretAgentSimpleSecret *secret;
+	guint i;
+
+	s_wg = NM_SETTING_WIREGUARD (nm_connection_get_setting (request->connection, NM_TYPE_SETTING_WIREGUARD));
+	if (!s_wg) {
+		g_set_error (error, NM_SECRET_AGENT_ERROR, NM_SECRET_AGENT_ERROR_FAILED,
+		             "Cannot service a WireGuard secrets request %s for a connection without WireGuard settings",
+		             request->request_id);
+		return FALSE;
+	}
+
+	if (   !request->hints
+	    || !request->hints[0]
+	    || g_strv_contains (NM_CAST_STRV_CC (request->hints), NM_SETTING_WIREGUARD_PRIVATE_KEY)) {
+		secret = _secret_real_new_plain (NM_SECRET_AGENT_SECRET_TYPE_SECRET,
+		                                 _("WireGuard private-key"),
+		                                 NM_SETTING (s_wg),
+		                                 NM_SETTING_WIREGUARD_PRIVATE_KEY);
+		g_ptr_array_add (secrets, secret);
+	}
+
+	if (request->hints) {
+
+		for (i = 0; request->hints[i]; i++) {
+			NMWireGuardPeer *peer;
+			const char *name = request->hints[i];
+			gs_free char *public_key = NULL;
+
+			if (nm_streq (name, NM_SETTING_WIREGUARD_PRIVATE_KEY))
+				continue;
+
+			if (NM_STR_HAS_PREFIX (name, NM_SETTING_WIREGUARD_PEERS".")) {
+				const char *tmp;
+
+				tmp = &name[NM_STRLEN (NM_SETTING_WIREGUARD_PEERS".")];
+				if (NM_STR_HAS_SUFFIX (tmp, "."NM_WIREGUARD_PEER_ATTR_PRESHARED_KEY)) {
+					public_key = g_strndup (tmp,
+					                       strlen (tmp) - NM_STRLEN ("."NM_WIREGUARD_PEER_ATTR_PRESHARED_KEY));
+				}
+			}
+
+			if (!public_key)
+				continue;
+
+			peer = nm_setting_wireguard_get_peer_by_public_key (s_wg, public_key, NULL);
+
+			g_ptr_array_add (secrets, _secret_real_new_wireguard_peer_psk (s_wg,
+			                                                               (  peer
+			                                                                ? nm_wireguard_peer_get_public_key (peer)
+			                                                                : public_key),
+			                                                               (  peer
+			                                                                ? nm_wireguard_peer_get_preshared_key (peer)
+			                                                                : NULL)));
+		}
+	}
+
+	*msg = g_strdup_printf (_("Secrets are required to connect WireGuard VPN '%s'"),
+	                        nm_connection_get_id (request->connection));
+	return TRUE;
+}
+
+typedef struct {
+	GPid auth_dialog_pid;
+	GString *auth_dialog_response;
+	RequestData *request;
 	GPtrArray *secrets;
+	GCancellable *cancellable;
+	gulong cancellable_id;
+	guint child_watch_id;
+	GInputStream *input_stream;
+	GOutputStream *output_stream;
+	char read_buf[5];
+} AuthDialogData;
+
+static void
+_auth_dialog_data_free (AuthDialogData *data)
+{
+	nm_clear_g_signal_handler (data->cancellable, &data->cancellable_id);
+	g_clear_object (&data->cancellable);
+	nm_clear_g_source (&data->child_watch_id);
+	g_ptr_array_unref (data->secrets);
+	g_spawn_close_pid (data->auth_dialog_pid);
+	g_string_free (data->auth_dialog_response, TRUE);
+	g_object_unref (data->input_stream);
+	g_object_unref (data->output_stream);
+	g_slice_free (AuthDialogData, data);
+}
+
+static void
+_auth_dialog_exited (GPid pid, int status, gpointer user_data)
+{
+	AuthDialogData *data = user_data;
+	RequestData *request = data->request;
+	GPtrArray *secrets = data->secrets;
+	NMSettingVpn *s_vpn = nm_connection_get_setting_vpn (request->connection);
+	gs_unref_keyfile GKeyFile *keyfile = NULL;
+	gs_strfreev char **groups = NULL;
+	gs_free char *title = NULL;
+	gs_free char *message = NULL;
+	int i;
+	gs_free_error GError *error = NULL;
+
+	data->child_watch_id = 0;
+
+	nm_clear_g_cancellable_disconnect (data->cancellable, &data->cancellable_id);
+
+	if (status != 0) {
+		g_set_error (&error, NM_SECRET_AGENT_ERROR, NM_SECRET_AGENT_ERROR_FAILED,
+		             "Auth dialog failed with error code %d\n", status);
+		goto out;
+	}
+
+	keyfile = g_key_file_new ();
+	if (!g_key_file_load_from_data (keyfile,
+	                                data->auth_dialog_response->str,
+	                                data->auth_dialog_response->len, G_KEY_FILE_NONE,
+	                                &error)) {
+		goto out;
+	}
+
+	groups = g_key_file_get_groups (keyfile, NULL);
+	if (!nm_streq0 (groups[0], "VPN Plugin UI")) {
+		g_set_error (&error, NM_SECRET_AGENT_ERROR, NM_SECRET_AGENT_ERROR_FAILED,
+		             "Expected [VPN Plugin UI] in auth dialog response");
+		goto out;
+	}
+
+	title = g_key_file_get_string (keyfile, "VPN Plugin UI", "Title", &error);
+	if (!title)
+		goto out;
+
+	message = g_key_file_get_string (keyfile, "VPN Plugin UI", "Description", &error);
+	if (!message)
+		goto out;
+
+	for (i = 1; groups[i]; i++) {
+		gs_free char *pretty_name = NULL;
+
+		if (!g_key_file_get_boolean (keyfile, groups[i], "IsSecret", NULL))
+			continue;
+		if (!g_key_file_get_boolean (keyfile, groups[i], "ShouldAsk", NULL))
+			continue;
+
+		pretty_name = g_key_file_get_string (keyfile, groups[i], "Label", NULL);
+		g_ptr_array_add (secrets, _secret_real_new_vpn_secret (pretty_name,
+		                                                       NM_SETTING (s_vpn),
+		                                                       groups[i],
+		                                                       nm_setting_vpn_get_service_type (s_vpn)));
+	}
+
+out:
+	/* Try to fall back to the hardwired VPN support if the auth dialog fails.
+	 * We may eventually get rid of the whole hardwired secrets handling at some point,
+	 * when the auth helpers are goode enough.. */
+	if (error && add_vpn_secrets (request, secrets, &message)) {
+		g_clear_error (&error);
+		if (!message) {
+			message = g_strdup_printf (_("A password is required to connect to '%s'."),
+			                           nm_connection_get_id (request->connection));
+		}
+	}
+
+	if (error)
+		_request_data_complete (request, NULL, error, NULL);
+	else {
+		g_signal_emit (request->self, signals[REQUEST_SECRETS], 0,
+		               request->request_id, title, message, secrets);
+	}
+
+	_auth_dialog_data_free (data);
+}
+
+static void
+_request_cancelled (GObject *object, gpointer user_data)
+{
+	_auth_dialog_data_free (user_data);
+}
+
+static void
+_auth_dialog_read_done (GObject *source_object,
+                        GAsyncResult *res,
+                        gpointer user_data)
+{
+	GInputStream *auth_dialog_out = G_INPUT_STREAM (source_object);
+	AuthDialogData *data = user_data;
+	gssize read_size;
+	gs_free_error GError *error = NULL;
+
+	read_size = g_input_stream_read_finish (auth_dialog_out, res, &error);
+	switch (read_size) {
+	case -1:
+		if (!g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED))
+			_request_data_complete (data->request, NULL, error, NULL);
+		_auth_dialog_data_free (data);
+		break;
+	case 0:
+		/* Done reading. Let's wait for the auth dialog to exit so that we're able to collect the status.
+		 * Remember we can be cancelled in between. */
+		data->child_watch_id = g_child_watch_add (data->auth_dialog_pid, _auth_dialog_exited, data);
+		data->cancellable = g_object_ref (data->request->cancellable);
+		data->cancellable_id = g_cancellable_connect (data->cancellable,
+		                                              G_CALLBACK (_request_cancelled), data, NULL);
+		break;
+	default:
+		g_string_append_len (data->auth_dialog_response, data->read_buf, read_size);
+		g_input_stream_read_async (auth_dialog_out,
+		                           data->read_buf,
+		                           sizeof (data->read_buf),
+		                           G_PRIORITY_DEFAULT,
+		                           NULL,
+		                           _auth_dialog_read_done,
+		                           data);
+		return;
+	}
+
+	g_input_stream_close (auth_dialog_out, NULL, NULL);
+}
+
+static void
+_auth_dialog_write_done (GObject *source_object,
+                        GAsyncResult *res,
+                        gpointer user_data)
+{
+	GOutputStream *auth_dialog_out = G_OUTPUT_STREAM (source_object);
+	_nm_unused gs_free char *auth_dialog_request_free = user_data;
+
+	/* We don't care about write errors. If there are any problems, the
+	 * reader shall notice. */
+	g_output_stream_write_finish (auth_dialog_out, res, NULL);
+	g_output_stream_close (auth_dialog_out, NULL, NULL);
+}
+
+static void
+_add_to_string (GString *string, const char *key, const char *value)
+{
+	gs_strfreev char **lines = NULL;
+	int i;
+
+	lines = g_strsplit (value, "\n", -1);
+
+	g_string_append (string, key);
+	for (i = 0; lines[i]; i++) {
+		g_string_append_c (string, '=');
+		g_string_append (string, lines[i]);
+		g_string_append_c (string, '\n');
+	}
+}
+
+static void
+_add_data_item_to_string (const char *key, const char *value, gpointer user_data)
+{
+	GString *string = user_data;
+
+	_add_to_string (string, "DATA_KEY", key);
+	_add_to_string (string, "DATA_VAL", value);
+	g_string_append_c (string, '\n');
+}
+
+static void
+_add_secret_to_string (const char *key, const char *value, gpointer user_data)
+{
+	GString *string = user_data;
+
+	_add_to_string (string, "SECRET_KEY", key);
+	_add_to_string (string, "SECRET_VAL", value);
+	g_string_append_c (string, '\n');
+}
+
+static gboolean
+try_spawn_vpn_auth_helper (RequestData *request,
+                           GPtrArray *secrets)
+{
+	NMSettingVpn *s_vpn = nm_connection_get_setting_vpn (request->connection);
+        NMVpnPluginInfo *plugin_info;
+	gboolean supports_external;
+	const char *auth_dialog_argv[] = { NULL,
+		"-u", nm_connection_get_uuid (request->connection),
+		"-n", nm_connection_get_id (request->connection),
+		"-s", nm_setting_vpn_get_service_type (s_vpn),
+		"--external-ui-mode",
+		"-i",
+		NULL, /* [9], slot for "-r" */
+		NULL };
+	const char *s;
+	GPid auth_dialog_pid;
+	int auth_dialog_in_fd;
+	int auth_dialog_out_fd;
+	GOutputStream *auth_dialog_in;
+	GInputStream *auth_dialog_out;
+	GError *error = NULL;
+	GString *auth_dialog_request;
+	char *auth_dialog_request_str;
+	gsize auth_dialog_request_len;
+	AuthDialogData *data;
+
+	plugin_info = nm_vpn_plugin_info_list_find_by_service (nm_vpn_get_plugin_infos (),
+	                                                       nm_setting_vpn_get_service_type (s_vpn));
+	if (!plugin_info)
+		return FALSE;
+
+	s = nm_vpn_plugin_info_lookup_property (plugin_info, "GNOME", "supports-external-ui-mode");
+	supports_external = _nm_utils_ascii_str_to_bool (s, FALSE);
+	if (!supports_external)
+		return FALSE;
+
+	auth_dialog_argv[0] = nm_vpn_plugin_info_lookup_property (plugin_info, "GNOME", "auth-dialog");
+	g_return_val_if_fail (auth_dialog_argv[0], FALSE);
+
+	if (request->flags & NM_SECRET_AGENT_GET_SECRETS_FLAG_REQUEST_NEW)
+		auth_dialog_argv[9] = "-r";
+
+	if (!g_spawn_async_with_pipes (NULL, (char **)auth_dialog_argv, NULL,
+	                               G_SPAWN_DO_NOT_REAP_CHILD,
+	                               NULL, NULL,
+	                               &auth_dialog_pid,
+	                               &auth_dialog_in_fd,
+	                               &auth_dialog_out_fd,
+	                               NULL,
+	                               &error)) {
+		g_warning ("Failed to spawn the auth dialog%s\n", error->message);
+		return FALSE;
+	}
+
+	auth_dialog_in = g_unix_output_stream_new (auth_dialog_in_fd, TRUE);
+	auth_dialog_out =  g_unix_input_stream_new (auth_dialog_out_fd, TRUE);
+
+	auth_dialog_request = g_string_new_len (NULL, 1024);
+	nm_setting_vpn_foreach_data_item (s_vpn, _add_data_item_to_string, auth_dialog_request);
+	nm_setting_vpn_foreach_secret (s_vpn, _add_secret_to_string, auth_dialog_request);
+	g_string_append (auth_dialog_request, "DONE\nQUIT\n");
+	auth_dialog_request_len = auth_dialog_request->len;
+	auth_dialog_request_str = g_string_free (auth_dialog_request, FALSE);
+
+	data = g_slice_new (AuthDialogData);
+	*data = (AuthDialogData) {
+		.auth_dialog_response = g_string_new_len (NULL, sizeof (data->read_buf)),
+		.auth_dialog_pid = auth_dialog_pid,
+		.request = request,
+		.secrets = g_ptr_array_ref (secrets),
+		.input_stream = auth_dialog_out,
+		.output_stream = auth_dialog_in,
+	};
+
+	g_output_stream_write_async (auth_dialog_in,
+	                             auth_dialog_request_str,
+	                             auth_dialog_request_len,
+	                             G_PRIORITY_DEFAULT,
+	                             request->cancellable,
+	                             _auth_dialog_write_done,
+	                             auth_dialog_request_str);
+
+	g_input_stream_read_async (auth_dialog_out,
+	                           data->read_buf,
+	                           sizeof (data->read_buf),
+	                            G_PRIORITY_DEFAULT,
+	                           request->cancellable,
+	                           _auth_dialog_read_done,
+	                           data);
+
+	return TRUE;
+}
+
+static void
+request_secrets_from_ui (RequestData *request)
+{
+	gs_unref_ptrarray GPtrArray *secrets = NULL;
+	gs_free_error GError *error = NULL;
 	NMSecretAgentSimplePrivate *priv;
 	NMSecretAgentSimpleSecret *secret;
 	const char *title;
-	char *msg;
-	gboolean ok = TRUE;
+	gs_free char *msg = NULL;
 
 	priv = NM_SECRET_AGENT_SIMPLE_GET_PRIVATE (request->self);
 	g_return_if_fail (priv->enabled);
 
 	/* We only handle requests for connection with @path if set. */
 	if (priv->path && !g_str_has_prefix (request->request_id, priv->path)) {
-		gs_free_error GError *error = NULL;
-
-		error = g_error_new (NM_SECRET_AGENT_ERROR, NM_SECRET_AGENT_ERROR_FAILED,
-		                     "Request for %s secrets doesn't match path %s",
-		                     request->request_id, priv->path);
-		request->callback (NM_SECRET_AGENT_OLD (request->self), request->connection,
-		                   NULL, error, request->callback_data);
-		g_hash_table_remove (priv->requests, request->request_id);
-		return;
+		g_set_error (&error, NM_SECRET_AGENT_ERROR, NM_SECRET_AGENT_ERROR_FAILED,
+		             "Request for %s secrets doesn't match path %s",
+		             request->request_id, priv->path);
+		goto out_fail_error;
 	}
 
-	secrets = g_ptr_array_new_with_free_func ((GDestroyNotify) nm_secret_agent_simple_secret_free);
+	secrets = g_ptr_array_new_with_free_func ((GDestroyNotify) _secret_real_free);
 
 	if (nm_connection_is_type (request->connection, NM_SETTING_WIRELESS_SETTING_NAME)) {
 		NMSettingWireless *s_wireless;
@@ -484,42 +866,43 @@ request_secrets_from_ui (NMSecretAgentSimpleRequest *request)
 		title = _("Authentication required by wireless network");
 		msg = g_strdup_printf (_("Passwords or encryption keys are required to access the wireless network '%s'."), ssid_utf8);
 
-		ok = add_wireless_secrets (request, secrets);
+		if (!add_wireless_secrets (request, secrets))
+			goto out_fail;
 	} else if (nm_connection_is_type (request->connection, NM_SETTING_WIRED_SETTING_NAME)) {
 		title = _("Wired 802.1X authentication");
 		msg = g_strdup_printf (_("Secrets are required to access the wired network '%s'"),
 		                       nm_connection_get_id (request->connection));
 
-		ok = add_8021x_secrets (request, secrets);
+		if (!add_8021x_secrets (request, secrets))
+			goto out_fail;
 	} else if (nm_connection_is_type (request->connection, NM_SETTING_PPPOE_SETTING_NAME)) {
 		title = _("DSL authentication");
 		msg = g_strdup_printf (_("Secrets are required for the DSL connection '%s'"),
 		                       nm_connection_get_id (request->connection));
 
-		ok = add_pppoe_secrets (request, secrets);
+		if (!add_pppoe_secrets (request, secrets))
+			goto out_fail;
 	} else if (nm_connection_is_type (request->connection, NM_SETTING_GSM_SETTING_NAME)) {
 		NMSettingGsm *s_gsm = nm_connection_get_setting_gsm (request->connection);
 
-		if (strv_has (request->hints, "pin")) {
+		if (g_strv_contains (NM_CAST_STRV_CC (request->hints), NM_SETTING_GSM_PIN)) {
 			title = _("PIN code required");
 			msg = g_strdup (_("PIN code is needed for the mobile broadband device"));
 
-			secret = nm_secret_agent_simple_secret_new (NM_SECRET_AGENT_SECRET_TYPE_PROPERTY,
-			                                            _("PIN"),
-			                                            NM_SETTING (s_gsm),
-			                                            NM_SETTING_GSM_PIN,
-			                                            NULL);
+			secret = _secret_real_new_plain (NM_SECRET_AGENT_SECRET_TYPE_PROPERTY,
+			                                 _("PIN"),
+			                                 NM_SETTING (s_gsm),
+			                                 NM_SETTING_GSM_PIN);
 			g_ptr_array_add (secrets, secret);
 		} else {
 			title = _("Mobile broadband network password");
 			msg = g_strdup_printf (_("A password is required to connect to '%s'."),
 			                       nm_connection_get_id (request->connection));
 
-			secret = nm_secret_agent_simple_secret_new (NM_SECRET_AGENT_SECRET_TYPE_SECRET,
-			                                            _("Password"),
-			                                            NM_SETTING (s_gsm),
-			                                            NM_SETTING_GSM_PASSWORD,
-			                                            NULL);
+			secret = _secret_real_new_plain (NM_SECRET_AGENT_SECRET_TYPE_SECRET,
+			                                 _("Password"),
+			                                 NM_SETTING (s_gsm),
+			                                 NM_SETTING_GSM_PASSWORD);
 			g_ptr_array_add (secrets, secret);
 		}
 	} else if (nm_connection_is_type (request->connection, NM_SETTING_MACSEC_SETTING_NAME)) {
@@ -530,16 +913,20 @@ request_secrets_from_ui (NMSecretAgentSimpleRequest *request)
 
 		if (nm_setting_macsec_get_mode (s_macsec) == NM_SETTING_MACSEC_MODE_PSK) {
 			title = _("MACsec PSK authentication");
-			secret = nm_secret_agent_simple_secret_new (NM_SECRET_AGENT_SECRET_TYPE_SECRET,
-			                                            _("MKA CAK"),
-			                                            NM_SETTING (s_macsec),
-			                                            NM_SETTING_MACSEC_MKA_CAK,
-			                                            NULL);
+			secret = _secret_real_new_plain (NM_SECRET_AGENT_SECRET_TYPE_SECRET,
+			                                 _("MKA CAK"),
+			                                 NM_SETTING (s_macsec),
+			                                 NM_SETTING_MACSEC_MKA_CAK);
 			g_ptr_array_add (secrets, secret);
 		} else {
 			title = _("MACsec EAP authentication");
-			ok = add_8021x_secrets (request, secrets);
+			if (!add_8021x_secrets (request, secrets))
+				goto out_fail;
 		}
+	} else if (nm_connection_is_type (request->connection, NM_SETTING_WIREGUARD_SETTING_NAME)) {
+		title = _("WireGuard VPN secret");
+		if (!add_wireguard_secrets (request, secrets, &msg, &error))
+			goto out_fail_error;
 	} else if (nm_connection_is_type (request->connection, NM_SETTING_CDMA_SETTING_NAME)) {
 		NMSettingCdma *s_cdma = nm_connection_get_setting_cdma (request->connection);
 
@@ -547,11 +934,10 @@ request_secrets_from_ui (NMSecretAgentSimpleRequest *request)
 		msg = g_strdup_printf (_("A password is required to connect to '%s'."),
 		                       nm_connection_get_id (request->connection));
 
-		secret = nm_secret_agent_simple_secret_new (NM_SECRET_AGENT_SECRET_TYPE_SECRET,
-		                                            _("Password"),
-		                                            NM_SETTING (s_cdma),
-		                                            NM_SETTING_CDMA_PASSWORD,
-		                                            NULL);
+		secret = _secret_real_new_plain (NM_SECRET_AGENT_SECRET_TYPE_SECRET,
+		                                 _("Password"),
+		                                 NM_SETTING (s_cdma),
+		                                 NM_SETTING_CDMA_PASSWORD);
 		g_ptr_array_add (secrets, secret);
 	} else if (nm_connection_is_type (request->connection, NM_SETTING_BLUETOOTH_SETTING_NAME)) {
 		NMSetting *setting = NULL;
@@ -564,73 +950,76 @@ request_secrets_from_ui (NMSecretAgentSimpleRequest *request)
 				setting = nm_connection_get_setting_by_name (request->connection, NM_SETTING_CDMA_SETTING_NAME);
 		}
 
-		if (setting) {
-			title = _("Mobile broadband network password");
-			msg = g_strdup_printf (_("A password is required to connect to '%s'."),
-			                       nm_connection_get_id (request->connection));
+		if (!setting)
+			goto out_fail;
 
-			secret = nm_secret_agent_simple_secret_new (NM_SECRET_AGENT_SECRET_TYPE_SECRET,
-			                                            _("Password"),
-			                                            setting,
-			                                            "password",
-			                                            NULL);
-			g_ptr_array_add (secrets, secret);
-		} else
-			ok = FALSE;
+		title = _("Mobile broadband network password");
+		msg = g_strdup_printf (_("A password is required to connect to '%s'."),
+		                       nm_connection_get_id (request->connection));
+
+		secret = _secret_real_new_plain (NM_SECRET_AGENT_SECRET_TYPE_SECRET,
+		                                 _("Password"),
+		                                 setting,
+		                                 "password");
+		g_ptr_array_add (secrets, secret);
 	} else if (nm_connection_is_type (request->connection, NM_SETTING_VPN_SETTING_NAME)) {
 		title = _("VPN password required");
-		msg = NULL;
 
-		ok = add_vpn_secrets (request, secrets, &msg);
-		if (!msg)
+		if (try_spawn_vpn_auth_helper (request, secrets)) {
+			/* This will emit REQUEST_SECRETS when ready */
+			return;
+		}
+
+		if (!add_vpn_secrets (request, secrets, &msg))
+			goto out_fail;
+		if (!msg) {
 			msg = g_strdup_printf (_("A password is required to connect to '%s'."),
 			                       nm_connection_get_id (request->connection));
+		}
 	} else
-		ok = FALSE;
-
-	if (!ok) {
-		gs_free_error GError *error = NULL;
+		goto out_fail;
 
-		error = g_error_new (NM_SECRET_AGENT_ERROR, NM_SECRET_AGENT_ERROR_FAILED,
-		                     "Cannot service a secrets request %s for a %s connection",
-		                     request->request_id,
-		                     nm_connection_get_connection_type (request->connection));
-		request->callback (NM_SECRET_AGENT_OLD (request->self), request->connection,
-		                   NULL, error, request->callback_data);
-		g_hash_table_remove (priv->requests, request->request_id);
-		g_ptr_array_unref (secrets);
-		return;
-	}
+	if (secrets->len == 0)
+		goto out_fail;
 
 	g_signal_emit (request->self, signals[REQUEST_SECRETS], 0,
 	               request->request_id, title, msg, secrets);
+	return;
+
+out_fail:
+	g_set_error (&error, NM_SECRET_AGENT_ERROR, NM_SECRET_AGENT_ERROR_FAILED,
+	             "Cannot service a secrets request %s for a %s connection",
+	             request->request_id,
+	             nm_connection_get_connection_type (request->connection));
+out_fail_error:
+	_request_data_complete (request, NULL, error, NULL);
+
 }
 
 static void
-nm_secret_agent_simple_get_secrets (NMSecretAgentOld                 *agent,
-                                    NMConnection                     *connection,
-                                    const char                       *connection_path,
-                                    const char                       *setting_name,
-                                    const char                      **hints,
-                                    NMSecretAgentGetSecretsFlags      flags,
-                                    NMSecretAgentOldGetSecretsFunc    callback,
-                                    gpointer                          callback_data)
+get_secrets (NMSecretAgentOld                 *agent,
+             NMConnection                     *connection,
+             const char                       *connection_path,
+             const char                       *setting_name,
+             const char                      **hints,
+             NMSecretAgentGetSecretsFlags      flags,
+             NMSecretAgentOldGetSecretsFunc    callback,
+             gpointer                          callback_data)
 {
 	NMSecretAgentSimple *self = NM_SECRET_AGENT_SIMPLE (agent);
 	NMSecretAgentSimplePrivate *priv = NM_SECRET_AGENT_SIMPLE_GET_PRIVATE (self);
-	NMSecretAgentSimpleRequest *request;
-	char *request_id;
-	GError *error;
+	RequestData *request;
+	gs_free_error GError *error = NULL;
+	gs_free char *request_id = NULL;
+	const char *request_id_setting_name;
 
 	request_id = g_strdup_printf ("%s/%s", connection_path, setting_name);
-	if (g_hash_table_lookup (priv->requests, request_id) != NULL) {
+
+	if (g_hash_table_contains (priv->requests, &request_id)) {
 		/* We already have a request pending for this (connection, setting) */
 		error = g_error_new (NM_SECRET_AGENT_ERROR, NM_SECRET_AGENT_ERROR_FAILED,
 		                     "Request for %s secrets already pending", request_id);
-	nope:
 		callback (agent, connection, NULL, error, callback_data);
-		g_error_free (error);
-		g_free (request_id);
 		return;
 	}
 
@@ -638,17 +1027,27 @@ nm_secret_agent_simple_get_secrets (NMSecretAgentOld                 *agent,
 		/* We don't do stored passwords */
 		error = g_error_new (NM_SECRET_AGENT_ERROR, NM_SECRET_AGENT_ERROR_NO_SECRETS,
 		                     "Stored passwords not supported");
-		goto nope;
+		callback (agent, connection, NULL, error, callback_data);
+		return;
 	}
 
-	request = g_slice_new (NMSecretAgentSimpleRequest);
-	request->self = g_object_ref (self);
-	request->connection = g_object_ref (connection);
-	request->hints = g_strdupv ((char **)hints);
-	request->callback = callback;
-	request->callback_data = callback_data;
-	request->request_id = request_id;
-	g_hash_table_replace (priv->requests, request->request_id, request);
+	nm_assert (g_str_has_suffix (request_id, setting_name));
+	request_id_setting_name = &request_id[strlen (request_id) - strlen (setting_name)];
+	nm_assert (nm_streq (request_id_setting_name, setting_name));
+
+	request = g_slice_new (RequestData);
+	*request = (RequestData) {
+		.self = self,
+		.connection = g_object_ref (connection),
+		.setting_name = request_id_setting_name,
+		.hints = g_strdupv ((char **) hints),
+		.callback = callback,
+		.callback_data = callback_data,
+		.request_id = g_steal_pointer (&request_id),
+		.flags = flags,
+		.cancellable = g_cancellable_new (),
+	};
+	g_hash_table_add (priv->requests, request);
 
 	if (priv->enabled)
 		request_secrets_from_ui (request);
@@ -674,28 +1073,34 @@ nm_secret_agent_simple_response (NMSecretAgentSimple *self,
                                  GPtrArray           *secrets)
 {
 	NMSecretAgentSimplePrivate *priv;
-	NMSecretAgentSimpleRequest *request;
-	GVariant *dict = NULL;
-	GError *error = NULL;
+	RequestData *request;
+	gs_unref_variant GVariant *secrets_dict = NULL;
+	gs_free_error GError *error = NULL;
 	int i;
 
 	g_return_if_fail (NM_IS_SECRET_AGENT_SIMPLE (self));
 
 	priv = NM_SECRET_AGENT_SIMPLE_GET_PRIVATE (self);
-	request = g_hash_table_lookup (priv->requests, request_id);
+	request = g_hash_table_lookup (priv->requests, &request_id);
 	g_return_if_fail (request != NULL);
 
 	if (secrets) {
 		GVariantBuilder conn_builder, *setting_builder;
 		GVariantBuilder vpn_secrets_builder;
+		GVariantBuilder wg_secrets_builder;
+		GVariantBuilder wg_peer_builder;
 		GHashTable *settings;
 		GHashTableIter iter;
 		const char *name;
 		gboolean has_vpn = FALSE;
+		gboolean has_wg = FALSE;
 
-		settings = g_hash_table_new (nm_str_hash, g_str_equal);
+		settings = g_hash_table_new_full (nm_str_hash,
+		                                  g_str_equal,
+		                                  NULL,
+		                                  (GDestroyNotify) g_variant_builder_unref);
 		for (i = 0; i < secrets->len; i++) {
-			NMSecretAgentSimpleSecretReal *secret = secrets->pdata[i];
+			SecretReal *secret = secrets->pdata[i];
 
 			setting_builder = g_hash_table_lookup (settings, nm_setting_get_name (secret->setting));
 			if (!setting_builder) {
@@ -719,6 +1124,19 @@ nm_secret_agent_simple_response (NMSecretAgentSimple *self,
 				g_variant_builder_add (&vpn_secrets_builder, "{ss}",
 				                       secret->property, secret->base.value);
 				break;
+			case NM_SECRET_AGENT_SECRET_TYPE_WIREGUARD_PEER_PSK:
+				if (!has_wg) {
+					g_variant_builder_init (&wg_secrets_builder, G_VARIANT_TYPE ("aa{sv}"));
+					has_wg = TRUE;
+				}
+				g_variant_builder_init (&wg_peer_builder, G_VARIANT_TYPE ("a{sv}"));
+				g_variant_builder_add (&wg_peer_builder, "{sv}",
+				                       NM_WIREGUARD_PEER_ATTR_PUBLIC_KEY, g_variant_new_string (secret->property));
+				g_variant_builder_add (&wg_peer_builder, "{sv}",
+				                       NM_WIREGUARD_PEER_ATTR_PRESHARED_KEY, g_variant_new_string (secret->base.value));
+				g_variant_builder_add (&wg_secrets_builder, "a{sv}",
+				                       &wg_peer_builder);
+				break;
 			}
 		}
 
@@ -728,53 +1146,69 @@ nm_secret_agent_simple_response (NMSecretAgentSimple *self,
 			                       g_variant_builder_end (&vpn_secrets_builder));
 		}
 
+		if (has_wg) {
+			g_variant_builder_add (setting_builder, "{sv}",
+			                       NM_SETTING_WIREGUARD_PEERS,
+			                       g_variant_builder_end (&wg_secrets_builder));
+		}
+
 		g_variant_builder_init (&conn_builder, NM_VARIANT_TYPE_CONNECTION);
 		g_hash_table_iter_init (&iter, settings);
 		while (g_hash_table_iter_next (&iter, (gpointer *) &name, (gpointer *) &setting_builder))
 			g_variant_builder_add (&conn_builder, "{sa{sv}}", name, setting_builder);
-		dict = g_variant_builder_end (&conn_builder);
+		secrets_dict = g_variant_ref_sink (g_variant_builder_end (&conn_builder));
 		g_hash_table_destroy (settings);
 	} else {
 		error = g_error_new (NM_SECRET_AGENT_ERROR, NM_SECRET_AGENT_ERROR_USER_CANCELED,
 		                     "User cancelled");
 	}
 
-	request->callback (NM_SECRET_AGENT_OLD (self), request->connection, dict, error, request->callback_data);
-
-	g_clear_error (&error);
-	g_hash_table_remove (priv->requests, request_id);
+	_request_data_complete (request, secrets_dict, error, NULL);
 }
 
 static void
-nm_secret_agent_simple_cancel_get_secrets (NMSecretAgentOld *agent,
-                                           const char       *connection_path,
-                                           const char       *setting_name)
+cancel_get_secrets (NMSecretAgentOld *agent,
+                    const char       *connection_path,
+                    const char       *setting_name)
 {
 	NMSecretAgentSimple *self = NM_SECRET_AGENT_SIMPLE (agent);
 	NMSecretAgentSimplePrivate *priv = NM_SECRET_AGENT_SIMPLE_GET_PRIVATE (self);
+	gs_free_error GError *error = NULL;
 	gs_free char *request_id = NULL;
+	RequestData *request;
 
 	request_id = g_strdup_printf ("%s/%s", connection_path, setting_name);
-	g_hash_table_remove (priv->requests, request_id);
+	request = g_hash_table_lookup (priv->requests, &request_id);
+	if (!request) {
+		/* this is really a bug of the caller (or us?). We cannot invoke a callback,
+		 * hence the caller cannot cleanup the request. */
+		g_return_if_reached ();
+	}
+
+	g_set_error (&error,
+	             NM_SECRET_AGENT_ERROR,
+	             NM_SECRET_AGENT_ERROR_AGENT_CANCELED,
+	             "The secret agent is going away");
+	_request_data_complete (request, NULL, error, NULL);
 }
 
 static void
-nm_secret_agent_simple_save_secrets (NMSecretAgentOld                *agent,
-                                     NMConnection                    *connection,
-                                     const char                      *connection_path,
-                                     NMSecretAgentOldSaveSecretsFunc  callback,
-                                     gpointer                         callback_data)
+save_secrets (NMSecretAgentOld                *agent,
+              NMConnection                    *connection,
+              const char                      *connection_path,
+              NMSecretAgentOldSaveSecretsFunc  callback,
+              gpointer                         callback_data)
 {
 	/* We don't support secret storage */
 	callback (agent, connection, NULL, callback_data);
 }
 
 static void
-nm_secret_agent_simple_delete_secrets (NMSecretAgentOld                  *agent,
-                                       NMConnection                      *connection,
-                                       const char                        *connection_path,
-                                       NMSecretAgentOldDeleteSecretsFunc  callback,
-                                       gpointer                           callback_data)
+delete_secrets (NMSecretAgentOld                  *agent,
+                NMConnection                      *connection,
+                const char                        *connection_path,
+                NMSecretAgentOldDeleteSecretsFunc  callback,
+                gpointer                           callback_data)
 {
 	/* We don't support secret storage, so there's nothing to delete. */
 	callback (agent, connection, NULL, callback_data);
@@ -794,7 +1228,8 @@ void
 nm_secret_agent_simple_enable (NMSecretAgentSimple *self, const char *path)
 {
 	NMSecretAgentSimplePrivate *priv = NM_SECRET_AGENT_SIMPLE_GET_PRIVATE (self);
-	GList *requests, *iter;
+	gs_free RequestData **requests = NULL;
+	gsize i;
 	gs_free char *path_full = NULL;
 
 	/* The path is only used to match a request_id with the current
@@ -803,10 +1238,9 @@ nm_secret_agent_simple_enable (NMSecretAgentSimple *self, const char *path)
 	 */
 	path_full = path ? g_strdup_printf ("%s/", path) : NULL;
 
-	if (g_strcmp0 (path_full, priv->path) != 0) {
+	if (!nm_streq0 (path_full, priv->path)) {
 		g_free (priv->path);
-		priv->path = path_full;
-		path_full = NULL;
+		priv->path = g_steal_pointer (&path_full);
 	}
 
 	if (priv->enabled)
@@ -814,27 +1248,85 @@ nm_secret_agent_simple_enable (NMSecretAgentSimple *self, const char *path)
 	priv->enabled = TRUE;
 
 	/* Service pending secret requests. */
-	requests = g_hash_table_get_values (priv->requests);
-	for (iter = requests; iter; iter = g_list_next (iter))
-		request_secrets_from_ui (iter->data);
+	requests = (RequestData **) g_hash_table_get_keys_as_array (priv->requests, NULL);
+	for (i = 0; requests[i]; i++)
+		request_secrets_from_ui (requests[i]);
+}
+
+/*****************************************************************************/
+
+static void
+nm_secret_agent_simple_init (NMSecretAgentSimple *agent)
+{
+	NMSecretAgentSimplePrivate *priv = NM_SECRET_AGENT_SIMPLE_GET_PRIVATE (agent);
+
+	G_STATIC_ASSERT_EXPR (G_STRUCT_OFFSET (RequestData, request_id) == 0);
+	priv->requests = g_hash_table_new_full (nm_pstr_hash, nm_pstr_equal,
+	                                        NULL, _request_data_free);
+}
+
+/**
+ * nm_secret_agent_simple_new:
+ * @name: the identifier of secret agent
+ *
+ * Creates a new #NMSecretAgentSimple. It does not serve any requests until
+ * nm_secret_agent_simple_enable() is called.
+ *
+ * Returns: a new #NMSecretAgentSimple if the agent creation is successful
+ * or %NULL in case of a failure.
+ */
+NMSecretAgentSimple *
+nm_secret_agent_simple_new (const char *name)
+{
+	return g_initable_new (NM_TYPE_SECRET_AGENT_SIMPLE, NULL, NULL,
+	                       NM_SECRET_AGENT_OLD_IDENTIFIER, name,
+	                       NM_SECRET_AGENT_OLD_CAPABILITIES, NM_SECRET_AGENT_CAPABILITY_VPN_HINTS,
+	                       NULL);
+}
+
+static void
+dispose (GObject *object)
+{
+	NMSecretAgentSimplePrivate *priv = NM_SECRET_AGENT_SIMPLE_GET_PRIVATE (object);
+	gs_free_error GError *error = NULL;
+	GHashTableIter iter;
+	RequestData *request;
+
+	g_hash_table_iter_init (&iter, priv->requests);
+	while (g_hash_table_iter_next (&iter, NULL, (gpointer *) &request)) {
+		if (!error)
+			nm_utils_error_set_cancelled (&error, TRUE, "NMSecretAgentSimple");
+		_request_data_complete (request, NULL, error, &iter);
+	}
+
+	G_OBJECT_CLASS (nm_secret_agent_simple_parent_class)->dispose (object);
+}
+
+static void
+finalize (GObject *object)
+{
+	NMSecretAgentSimplePrivate *priv = NM_SECRET_AGENT_SIMPLE_GET_PRIVATE (object);
+
+	g_hash_table_destroy (priv->requests);
 
-	g_list_free (requests);
+	g_free (priv->path);
+
+	G_OBJECT_CLASS (nm_secret_agent_simple_parent_class)->finalize (object);
 }
 
 void
 nm_secret_agent_simple_class_init (NMSecretAgentSimpleClass *klass)
 {
-	GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
+	GObjectClass *object_class = G_OBJECT_CLASS (klass);
 	NMSecretAgentOldClass *agent_class = NM_SECRET_AGENT_OLD_CLASS (klass);
 
-	g_type_class_add_private (klass, sizeof (NMSecretAgentSimplePrivate));
-
-	gobject_class->finalize = nm_secret_agent_simple_finalize;
+	object_class->dispose = dispose;
+	object_class->finalize = finalize;
 
-	agent_class->get_secrets = nm_secret_agent_simple_get_secrets;
-	agent_class->cancel_get_secrets = nm_secret_agent_simple_cancel_get_secrets;
-	agent_class->save_secrets = nm_secret_agent_simple_save_secrets;
-	agent_class->delete_secrets = nm_secret_agent_simple_delete_secrets;
+	agent_class->get_secrets        = get_secrets;
+	agent_class->cancel_get_secrets = cancel_get_secrets;
+	agent_class->save_secrets       = save_secrets;
+	agent_class->delete_secrets     = delete_secrets;
 
 	/**
 	 * NMSecretAgentSimple::request-secrets:
@@ -868,22 +1360,3 @@ nm_secret_agent_simple_class_init (NMSecretAgentSimpleClass *klass)
 	                                         G_TYPE_STRING, /* prompt */
 	                                         G_TYPE_PTR_ARRAY);
 }
-
-/**
- * nm_secret_agent_simple_new:
- * @name: the identifier of secret agent
- *
- * Creates a new #NMSecretAgentSimple. It does not serve any requests until
- * nm_secret_agent_simple_enable() is called.
- *
- * Returns: a new #NMSecretAgentSimple if the agent creation is successful
- * or %NULL in case of a failure.
- */
-NMSecretAgentOld *
-nm_secret_agent_simple_new (const char *name)
-{
-	return g_initable_new (NM_TYPE_SECRET_AGENT_SIMPLE, NULL, NULL,
-	                       NM_SECRET_AGENT_OLD_IDENTIFIER, name,
-	                       NM_SECRET_AGENT_OLD_CAPABILITIES, NM_SECRET_AGENT_CAPABILITY_VPN_HINTS,
-	                       NULL);
-}
diff --git a/clients/common/nm-secret-agent-simple.h b/clients/common/nm-secret-agent-simple.h
index 529aaeac..4a666d17 100644
--- a/clients/common/nm-secret-agent-simple.h
+++ b/clients/common/nm-secret-agent-simple.h
@@ -21,48 +21,44 @@
 
 #include "nm-secret-agent-old.h"
 
-#define NM_TYPE_SECRET_AGENT_SIMPLE            (nm_secret_agent_simple_get_type ())
-#define NM_SECRET_AGENT_SIMPLE(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_SECRET_AGENT_SIMPLE, NMSecretAgentSimple))
-#define NM_SECRET_AGENT_SIMPLE_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_SECRET_AGENT_SIMPLE, NMSecretAgentSimpleClass))
-#define NM_IS_SECRET_AGENT_SIMPLE(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NM_TYPE_SECRET_AGENT_SIMPLE))
-#define NM_IS_SECRET_AGENT_SIMPLE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), NM_TYPE_SECRET_AGENT_SIMPLE))
-#define NM_SECRET_AGENT_SIMPLE_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_SECRET_AGENT_SIMPLE, NMSecretAgentSimpleClass))
-
-/* Signals */
-#define NM_SECRET_AGENT_SIMPLE_REQUEST_SECRETS  "request-secrets"
-
-typedef struct {
-	NMSecretAgentOld parent;
-
-} NMSecretAgentSimple;
-
-typedef struct {
-	NMSecretAgentOldClass parent;
-
-} NMSecretAgentSimpleClass;
-
 typedef enum {
 	NM_SECRET_AGENT_SECRET_TYPE_PROPERTY,
 	NM_SECRET_AGENT_SECRET_TYPE_SECRET,
 	NM_SECRET_AGENT_SECRET_TYPE_VPN_SECRET,
+	NM_SECRET_AGENT_SECRET_TYPE_WIREGUARD_PEER_PSK,
 } NMSecretAgentSecretType;
 
 typedef struct {
-	const NMSecretAgentSecretType secret_type;
+	NMSecretAgentSecretType secret_type;
 	const char *pretty_name;
 	const char *entry_id;
 	char *value;
 	const char *vpn_type;
-	gboolean is_secret;
+	bool is_secret:1;
+	bool no_prompt_entry_id:1;
 } NMSecretAgentSimpleSecret;
 
 #define NM_SECRET_AGENT_ENTRY_ID_PREFX_VPN_SECRETS "vpn.secrets."
 
 #define NM_SECRET_AGENT_VPN_TYPE_OPENCONNECT  NM_DBUS_INTERFACE".openconnect"
 
+/*****************************************************************************/
+
+#define NM_TYPE_SECRET_AGENT_SIMPLE            (nm_secret_agent_simple_get_type ())
+#define NM_SECRET_AGENT_SIMPLE(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_SECRET_AGENT_SIMPLE, NMSecretAgentSimple))
+#define NM_SECRET_AGENT_SIMPLE_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_SECRET_AGENT_SIMPLE, NMSecretAgentSimpleClass))
+#define NM_IS_SECRET_AGENT_SIMPLE(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NM_TYPE_SECRET_AGENT_SIMPLE))
+#define NM_IS_SECRET_AGENT_SIMPLE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), NM_TYPE_SECRET_AGENT_SIMPLE))
+#define NM_SECRET_AGENT_SIMPLE_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_SECRET_AGENT_SIMPLE, NMSecretAgentSimpleClass))
+
+#define NM_SECRET_AGENT_SIMPLE_REQUEST_SECRETS  "request-secrets"
+
+typedef struct _NMSecretAgentSimple      NMSecretAgentSimple;
+typedef struct _NMSecretAgentSimpleClass NMSecretAgentSimpleClass;
+
 GType nm_secret_agent_simple_get_type (void);
 
-NMSecretAgentOld *nm_secret_agent_simple_new                 (const char          *name);
+NMSecretAgentSimple *nm_secret_agent_simple_new              (const char          *name);
 
 void              nm_secret_agent_simple_response            (NMSecretAgentSimple *self,
                                                               const char          *request_id,
diff --git a/clients/common/nm-vpn-helpers.c b/clients/common/nm-vpn-helpers.c
index c3237f12..ea905972 100644
--- a/clients/common/nm-vpn-helpers.c
+++ b/clients/common/nm-vpn-helpers.c
@@ -25,9 +25,13 @@
 
 #include "nm-vpn-helpers.h"
 
-#include 
+#include 
+#include 
 
+#include "nm-client-utils.h"
 #include "nm-utils.h"
+#include "nm-utils/nm-io-utils.h"
+#include "nm-utils/nm-secret-utils.h"
 
 /*****************************************************************************/
 
@@ -115,27 +119,27 @@ nm_vpn_supports_ipv6 (NMConnection *connection)
 const VpnPasswordName *
 nm_vpn_get_secret_names (const char *service_type)
 {
-	static const VpnPasswordName const generic_vpn_secrets[] = {
+	static const VpnPasswordName generic_vpn_secrets[] = {
 		{ "password", N_("Password") },
 		{ 0 }
 	};
-	static const VpnPasswordName const openvpn_secrets[] = {
+	static const VpnPasswordName openvpn_secrets[] = {
 		{ "password", N_("Password") },
 		{ "cert-pass", N_("Certificate password") },
 		{ "http-proxy-password", N_("HTTP proxy password") },
 		{ 0 }
 	};
-	static const VpnPasswordName const vpnc_secrets[] = {
+	static const VpnPasswordName vpnc_secrets[] = {
 		{ "Xauth password", N_("Password") },
 		{ "IPSec secret", N_("Group password") },
 		{ 0 }
 	};
-	static const VpnPasswordName const swan_secrets[] = {
+	static const VpnPasswordName swan_secrets[] = {
 		{ "xauthpassword", N_("Password") },
 		{ "pskvalue", N_("Group password") },
 		{ 0 }
 	};
-	static const VpnPasswordName const openconnect_secrets[] = {
+	static const VpnPasswordName openconnect_secrets[] = {
 		{ "gateway", N_("Gateway") },
 		{ "cookie", N_("Cookie") },
 		{ "gwcert", N_("Gateway certificate hash") },
@@ -249,3 +253,556 @@ nm_vpn_openconnect_authenticate_helper (const char *host,
 	return TRUE;
 }
 
+static gboolean
+_wg_complete_peer (GPtrArray **p_peers,
+                   NMWireGuardPeer *peer_take,
+                   gsize peer_start_line_nr,
+                   const char *filename,
+                   GError **error)
+{
+	nm_auto_unref_wgpeer NMWireGuardPeer *peer = peer_take;
+	gs_free_error GError *local = NULL;
+
+	if (!peer)
+		return TRUE;
+
+	if (!nm_wireguard_peer_is_valid (peer, TRUE, TRUE, &local)) {
+		nm_utils_error_set (error, NM_UTILS_ERROR_UNKNOWN,
+		                    _("Invalid peer starting at %s:%zu: %s"),
+		                    filename,
+		                    peer_start_line_nr,
+		                    local->message);
+		return FALSE;
+	}
+
+	if (!*p_peers)
+		*p_peers = g_ptr_array_new_with_free_func ((GDestroyNotify) nm_wireguard_peer_unref);
+	g_ptr_array_add (*p_peers, g_steal_pointer (&peer));
+	return TRUE;
+}
+
+static gboolean
+_line_match (char *line, const char *key, gsize key_len, const char **out_key, char **out_value)
+{
+	nm_assert (line);
+	nm_assert (key);
+	nm_assert (strlen (key) == key_len);
+	nm_assert (!strchr (key, '='));
+	nm_assert (out_key && !*out_key);
+	nm_assert (out_value && !*out_value);
+
+	/* Note that `wg-quick` (linux.bash) does case-insensitive comparison (shopt -s nocasematch).
+	 * `wg setconf` does case-insensitive comparison too (with strncasecmp, which is locale dependent).
+	 *
+	 * We do a case-insensitive comparison of the key, however in a locale-independent manner. */
+
+	if (g_ascii_strncasecmp (line, key, key_len) != 0)
+		return FALSE;
+
+	if (line[key_len] != '=')
+		return FALSE;
+
+	*out_key = key;
+	*out_value = &line[key_len + 1];
+	return TRUE;
+}
+
+#define line_match(line, key, out_key, out_value) \
+	_line_match ((line), ""key"", NM_STRLEN (key), (out_key), (out_value))
+
+static gboolean
+value_split_word (char **line_remainder, char **out_word)
+{
+	char *str;
+
+	if ((*line_remainder)[0] == '\0')
+		return FALSE;
+
+	*out_word = *line_remainder;
+
+	str = strchrnul (*line_remainder, ',');
+	if (str[0] == ',') {
+		str[0] = '\0';
+		*line_remainder = &str[1];
+	} else
+		*line_remainder = str;
+	return TRUE;
+}
+
+NMConnection *
+nm_vpn_wireguard_import (const char *filename,
+                         GError **error)
+{
+	nm_auto_clear_secret_ptr NMSecretPtr file_content = NM_SECRET_PTR_INIT ();
+	char ifname[IFNAMSIZ];
+	gs_free char *uuid = NULL;
+	gboolean ifname_valid = FALSE;
+	const char *cstr;
+	char *line_remainder;
+	gs_unref_object NMConnection *connection = NULL;
+	NMSettingConnection *s_con;
+	NMSettingIPConfig *s_ip4;
+	NMSettingIPConfig *s_ip6;
+	NMSettingWireGuard *s_wg;
+	gs_free_error GError *local = NULL;
+	enum {
+		LINE_CONTEXT_INIT,
+		LINE_CONTEXT_INTERFACE,
+		LINE_CONTEXT_PEER,
+	} line_context;
+	gsize line_nr;
+	gsize current_peer_start_line_nr = 0;
+	nm_auto_unref_wgpeer NMWireGuardPeer *current_peer = NULL;
+	gs_unref_ptrarray GPtrArray *data_dns_v4 = NULL;
+	gs_unref_ptrarray GPtrArray *data_dns_v6 = NULL;
+	gs_unref_ptrarray GPtrArray *data_addr_v4 = NULL;
+	gs_unref_ptrarray GPtrArray *data_addr_v6 = NULL;
+	gs_unref_ptrarray GPtrArray *data_peers = NULL;
+	const char *data_private_key = NULL;
+	gint64 data_table;
+	guint data_listen_port = 0;
+	guint data_fwmark = 0;
+	guint data_mtu = 0;
+	int is_v4;
+	guint i;
+
+	g_return_val_if_fail (filename, NULL);
+	g_return_val_if_fail (!error || !*error, NULL);
+
+	/* contrary to "wg-quick", we never interpret the filename as "/etc/wireguard/$INTERFACE.conf".
+	 * If the filename has no '/', it is interpreted as relative to the current working directory.
+	 * However, we do require a suitable filename suffix and that the name corresponds to the interface
+	 * name. */
+	cstr = strrchr (filename, '/');
+	cstr = cstr ? &cstr[1] : filename;
+	if (NM_STR_HAS_SUFFIX (cstr, ".conf")) {
+		gsize len = strlen (cstr) - NM_STRLEN (".conf");
+
+		if (len > 0 && len < sizeof (ifname)) {
+			memcpy (ifname, cstr, len);
+			ifname[len] = '\0';
+
+			if (nm_utils_is_valid_iface_name (ifname, NULL))
+				ifname_valid = TRUE;
+		}
+	}
+	if (!ifname_valid) {
+		nm_utils_error_set_literal (error, NM_UTILS_ERROR_UNKNOWN,
+		                            _("The WireGuard config file must be a valid interface name followed by \".conf\""));
+		return FALSE;
+	}
+
+	if (nm_utils_file_get_contents (-1,
+	                                filename,
+	                                10*1024*1024,
+	                                NM_UTILS_FILE_GET_CONTENTS_FLAG_SECRET,
+	                                &file_content.str,
+	                                &file_content.len,
+	                                error) < 0)
+		return NULL;
+
+	/* We interpret the file like `wg-quick up` and `wg setconf` do.
+	 *
+	 * Of course the WireGuard scripts do something fundamentlly different. They
+	 * perform actions to configure the WireGuard link in kernel, add routes and
+	 * addresses, and call resolvconf. It all happens at the time when the script
+	 * run.
+	 *
+	 * This code here instead generates a NetworkManager connection profile so that
+	 * NetworkManager will apply a similar configuration when later activating the profile. */
+
+#define _TABLE_AUTO  ((gint64) -1)
+#define _TABLE_OFF   ((gint64) -2)
+
+	data_table = _TABLE_AUTO;
+
+	line_remainder = file_content.str;
+	line_context = LINE_CONTEXT_INIT;
+	line_nr = 0;
+	while (line_remainder[0] != '\0') {
+		const char *matched_key = NULL;
+		char *value = NULL;
+		char *line;
+		char ch;
+		gint64 i64;
+
+		line_nr++;
+
+		line = line_remainder;
+		line_remainder = strchrnul (line, '\n');
+		if (line_remainder[0] != '\0')
+			(line_remainder++)[0] = '\0';
+
+		/* Drop all spaces and truncate at first '#'.
+		 * See wg's config_read_line().
+		 *
+		 * Note that wg-quick doesn't do that.
+		 *
+		 * Neither `wg setconf` nor `wg-quick` does a strict parsing.
+		 * We don't either. Just try to interpret the file (mostly) the same as
+		 * they would.
+		 */
+		{
+			gsize l, n;
+
+			n = 0;
+			for (l = 0; (ch = line[l]); l++) {
+				if (g_ascii_isspace (ch)) {
+					/* wg-setconf strips all whitespace before parsing the content. That means,
+					 * *[I nterface]" will be accepted. We do that too. */
+					continue;
+				}
+				if (ch == '#')
+					break;
+				line[n++] = line[l];
+			}
+			if (n == 0)
+				continue;
+			line[n] = '\0';
+		}
+
+		if (g_ascii_strcasecmp (line, "[Interface]") == 0) {
+			if (!_wg_complete_peer (&data_peers,
+			                        g_steal_pointer (¤t_peer),
+			                        current_peer_start_line_nr,
+			                        filename,
+			                        error))
+				return FALSE;
+			line_context = LINE_CONTEXT_INTERFACE;
+			continue;
+		}
+
+		if (g_ascii_strcasecmp (line, "[Peer]") == 0) {
+			if (!_wg_complete_peer (&data_peers,
+			                        g_steal_pointer (¤t_peer),
+			                        current_peer_start_line_nr,
+			                        filename,
+			                        error))
+				return FALSE;
+			current_peer_start_line_nr = line_nr;
+			current_peer = nm_wireguard_peer_new ();
+			line_context = LINE_CONTEXT_PEER;
+			continue;
+		}
+
+		if (line_context == LINE_CONTEXT_INTERFACE) {
+
+			if (line_match (line, "Address", &matched_key, &value)) {
+				char *value_word;
+
+				while (value_split_word (&value, &value_word)) {
+					GPtrArray **p_data_addr;
+					NMIPAddr addr_bin;
+					int addr_family;
+					int prefix_len;
+
+					if (!nm_utils_parse_inaddr_prefix_bin (AF_UNSPEC,
+					                                       value_word,
+					                                       &addr_family,
+					                                       &addr_bin,
+					                                       &prefix_len))
+						goto fail_invalid_value;
+
+					p_data_addr =   (addr_family == AF_INET)
+					              ? &data_addr_v4
+					              : &data_addr_v6;
+
+					if (!*p_data_addr)
+						*p_data_addr = g_ptr_array_new_with_free_func ((GDestroyNotify) nm_ip_address_unref);
+
+					g_ptr_array_add (*p_data_addr,
+					                 nm_ip_address_new_binary (addr_family,
+					                                           &addr_bin,
+					                                             prefix_len == -1
+					                                           ? ((addr_family == AF_INET) ? 32 : 128)
+					                                           : prefix_len,
+					                                           NULL));
+				}
+				continue;
+			}
+
+			if (line_match (line, "MTU", &matched_key, &value)) {
+				i64 = _nm_utils_ascii_str_to_int64 (value, 0, 0, G_MAXUINT32, -1);
+				if (i64 == -1)
+					goto fail_invalid_value;
+
+				/* wg-quick accepts the "MTU" value, but it also fetches routes to
+				 * autodetect it. NetworkManager won't do that, we can only configure
+				 * an explicit MTU or no autodetection will be performed. */
+				data_mtu = i64;
+				continue;
+			}
+
+			if (line_match (line, "DNS", &matched_key, &value)) {
+				char *value_word;
+
+				while (value_split_word (&value, &value_word)) {
+					char addr_s[NM_CONST_MAX (INET_ADDRSTRLEN, INET6_ADDRSTRLEN)];
+					GPtrArray **p_data_dns;
+					NMIPAddr addr_bin;
+					int addr_family;
+
+					if (!nm_utils_parse_inaddr_bin (AF_UNSPEC,
+					                                value_word,
+					                                &addr_family,
+					                                &addr_bin))
+						goto fail_invalid_value;
+
+					p_data_dns =   (addr_family == AF_INET)
+					             ? &data_dns_v4
+					             : &data_dns_v6;
+					if (!*p_data_dns)
+						*p_data_dns = g_ptr_array_new_with_free_func (g_free);
+
+					inet_ntop (addr_family, &addr_bin, addr_s, sizeof (addr_s));
+					g_ptr_array_add (*p_data_dns, g_strdup (addr_s));
+				}
+				continue;
+			}
+
+			if (line_match (line, "Table", &matched_key, &value)) {
+
+				if (nm_streq (value, "auto"))
+					data_table = _TABLE_AUTO;
+				else if (nm_streq (value, "off"))
+					data_table = _TABLE_OFF;
+				else {
+					/* we don't support table names from /etc/iproute2/rt_tables
+					 * But we accept hex like `ip route add` would. */
+					i64 = _nm_utils_ascii_str_to_int64 (value, 0, 0, G_MAXINT32, -1);
+					if (i64 == -1)
+						goto fail_invalid_value;
+					data_table = i64;
+				}
+				continue;
+			}
+
+			if (   line_match (line, "PreUp", &matched_key, &value)
+			    || line_match (line, "PreDown", &matched_key, &value)
+			    || line_match (line, "PostUp", &matched_key, &value)
+			    || line_match (line, "PostDown", &matched_key, &value)) {
+				/* we don't run any scripts. Silently ignore these parameters. */
+				continue;
+			}
+
+			if (line_match (line, "SaveConfig", &matched_key, &value)) {
+				/* we ignore the setting, but enforce that it's either true or false (like
+				 * wg-quick. */
+				if (!NM_IN_STRSET (value, "true", "false"))
+					goto fail_invalid_value;
+				continue;
+			}
+
+			if (line_match (line, "ListenPort", &matched_key, &value)) {
+				/* we don't use getaddrinfo(), unlike `wg setconf`. Just interpret
+				 * the port as plain decimal number. */
+				i64 = _nm_utils_ascii_str_to_int64 (value, 10, 0, 0xFFFF, -1);
+				if (i64 == -1)
+					goto fail_invalid_value;
+				data_listen_port = i64;
+				continue;
+			}
+
+			if (line_match (line, "FwMark", &matched_key, &value)) {
+				if (nm_streq (value, "off"))
+					data_fwmark = 0;
+				else {
+					i64 = _nm_utils_ascii_str_to_int64 (value, 0, 0, G_MAXINT32, -1);
+					if (i64 == -1)
+						goto fail_invalid_value;
+					data_fwmark = i64;
+				}
+				continue;
+			}
+
+			if (line_match (line, "PrivateKey", &matched_key, &value)) {
+				if (!nm_utils_base64secret_decode (value, NM_WIREGUARD_PUBLIC_KEY_LEN, NULL))
+					goto fail_invalid_secret;
+				data_private_key = value;
+				continue;
+			}
+
+			goto fail_invalid_line;
+		}
+
+
+		if (line_context == LINE_CONTEXT_PEER) {
+
+			if (line_match (line, "Endpoint", &matched_key, &value)) {
+				if (!nm_wireguard_peer_set_endpoint (current_peer, value, FALSE))
+					goto fail_invalid_value;
+				continue;
+			}
+
+			if (line_match (line, "PublicKey", &matched_key, &value)) {
+				if (!nm_wireguard_peer_set_public_key (current_peer, value, FALSE))
+					goto fail_invalid_value;
+				continue;
+			}
+
+			if (line_match (line, "AllowedIPs", &matched_key, &value)) {
+				char *value_word;
+
+				while (value_split_word (&value, &value_word)) {
+					if (!nm_wireguard_peer_append_allowed_ip (current_peer,
+					                                          value_word,
+					                                          FALSE))
+						goto fail_invalid_value;
+				}
+				continue;
+			}
+
+			if (line_match (line, "PersistentKeepalive", &matched_key, &value)) {
+				if (nm_streq (value, "off"))
+					i64 = 0;
+				else {
+					i64 = _nm_utils_ascii_str_to_int64 (value, 10, 0, G_MAXUINT16, -1);
+					if (i64 == -1)
+						goto fail_invalid_value;
+				}
+				nm_wireguard_peer_set_persistent_keepalive (current_peer, i64);
+				continue;
+			}
+
+			if (line_match (line, "PresharedKey", &matched_key, &value)) {
+				if (!nm_wireguard_peer_set_preshared_key (current_peer, value, FALSE))
+					goto fail_invalid_secret;
+				nm_wireguard_peer_set_preshared_key_flags (current_peer, NM_SETTING_SECRET_FLAG_NONE);
+				continue;
+			}
+
+			goto fail_invalid_line;
+		}
+
+fail_invalid_line:
+		nm_utils_error_set (error, NM_UTILS_ERROR_INVALID_ARGUMENT,
+		                    _("unrecognized line at %s:%zu"),
+		                    filename, line_nr);
+		return FALSE;
+fail_invalid_value:
+		nm_utils_error_set (error, NM_UTILS_ERROR_INVALID_ARGUMENT,
+		                    _("invalid value for '%s' at %s:%zu"),
+		                    matched_key, filename, line_nr);
+		return FALSE;
+fail_invalid_secret:
+		nm_utils_error_set (error, NM_UTILS_ERROR_INVALID_ARGUMENT,
+		                    _("invalid secret '%s' at %s:%zu"),
+		                    matched_key, filename, line_nr);
+		return FALSE;
+	}
+
+	if (!_wg_complete_peer (&data_peers,
+	                        g_steal_pointer (¤t_peer),
+	                        current_peer_start_line_nr,
+	                        filename,
+	                        error))
+		return FALSE;
+
+	connection = nm_simple_connection_new ();
+	s_con = NM_SETTING_CONNECTION (nm_setting_connection_new ());
+	nm_connection_add_setting (connection, NM_SETTING (s_con));
+	s_ip4 = NM_SETTING_IP_CONFIG (nm_setting_ip4_config_new ());
+	nm_connection_add_setting (connection, NM_SETTING (s_ip4));
+	s_ip6 = NM_SETTING_IP_CONFIG (nm_setting_ip6_config_new ());
+	nm_connection_add_setting (connection, NM_SETTING (s_ip6));
+	s_wg = NM_SETTING_WIREGUARD (nm_setting_wireguard_new ());
+	nm_connection_add_setting (connection, NM_SETTING (s_wg));
+
+	uuid = nm_utils_uuid_generate ();
+
+	g_object_set (s_con,
+	              NM_SETTING_CONNECTION_ID,
+	              ifname,
+	              NM_SETTING_CONNECTION_UUID,
+	              uuid,
+	              NM_SETTING_CONNECTION_TYPE,
+	              NM_SETTING_WIREGUARD_SETTING_NAME,
+	              NM_SETTING_CONNECTION_INTERFACE_NAME,
+	              ifname,
+	              NULL);
+
+	g_object_set (s_wg,
+	              NM_SETTING_WIREGUARD_PRIVATE_KEY,
+	              data_private_key,
+	              NM_SETTING_WIREGUARD_LISTEN_PORT,
+	              data_listen_port,
+	              NM_SETTING_WIREGUARD_FWMARK,
+	              data_fwmark,
+	              NM_SETTING_WIREGUARD_MTU,
+	              data_mtu,
+	              NULL);
+
+	if (data_peers) {
+		for (i = 0; i < data_peers->len; i++)
+			nm_setting_wireguard_append_peer (s_wg, data_peers->pdata[i]);
+	}
+
+	for (is_v4 = 0; is_v4 < 2; is_v4++) {
+		const char *method_disabled = is_v4 ? NM_SETTING_IP4_CONFIG_METHOD_DISABLED : NM_SETTING_IP6_CONFIG_METHOD_IGNORE;
+		const char *method_manual   = is_v4 ? NM_SETTING_IP4_CONFIG_METHOD_MANUAL   : NM_SETTING_IP6_CONFIG_METHOD_MANUAL;
+		NMSettingIPConfig *s_ip     = is_v4 ? s_ip4                                 : s_ip6;
+		GPtrArray *data_dns         = is_v4 ? data_dns_v4                           : data_dns_v6;
+		GPtrArray *data_addr        = is_v4 ? data_addr_v4                          : data_addr_v6;
+
+		if (data_dns && !data_addr) {
+			/* When specifying "DNS", we also require an "Address" for the same address
+			 * family. That is because a NMSettingIPConfig cannot have @method_disabled
+			 * and DNS settings at the same time.
+			 *
+			 * We don't have addresses. Silently ignore the DNS setting. */
+			data_dns = NULL;
+		}
+
+		g_object_set (s_ip,
+		              NM_SETTING_IP_CONFIG_METHOD,
+		              data_addr ? method_manual : method_disabled,
+		              NULL);
+
+		if (data_addr) {
+			for (i = 0; i < data_addr->len; i++)
+				nm_setting_ip_config_add_address (s_ip, data_addr->pdata[i]);
+		}
+		if (data_dns) {
+			for (i = 0; i < data_dns->len; i++)
+				nm_setting_ip_config_add_dns (s_ip, data_dns->pdata[i]);
+		}
+
+		if (data_table == _TABLE_AUTO) {
+			/* in the "auto" setting, wg-quick adds peer-routes automatically to the main
+			 * table. NetworkManager will do that too, but there are differences:
+			 *
+			 * - NetworkManager (contrary to wg-quick) does not check whether the peer-route is necessary.
+			 *   It will always add a route for each allowed-ips range, even if there is already another
+			 *   route that would ensure packets to the endpoint are routed via the WireGuard interface.
+			 *   If you don't want that, disable "wireguard.peer-routes", and add the necessary routes
+			 *   yourself to "ipv4.routes" and "ipv6.routes".
+			 *
+			 * - With "auto", wg-quick also configures policy routing to handle default-routes (/0) to
+			 *   avoid routing loops. That is not yet solved by NetworkManager, you need to configure
+			 *   that explicitly (for example, by adding a direct route to the gateway on the interface
+			 *   that has the default-route, or by using a script (possibly dispatcher script).
+			 */
+		} else if (data_table == _TABLE_OFF) {
+			if (is_v4) {
+				g_object_set (s_wg,
+				              NM_SETTING_WIREGUARD_PEER_ROUTES,
+				              FALSE,
+				              NULL);
+			}
+		} else {
+			g_object_set (s_ip,
+			              NM_SETTING_IP_CONFIG_ROUTE_TABLE,
+			              (guint) data_table,
+			              NULL);
+		}
+	}
+
+	if (!nm_connection_normalize (connection, NULL, NULL, &local)) {
+		nm_utils_error_set (error, NM_UTILS_ERROR_INVALID_ARGUMENT,
+		                    _("Failed to create WireGuard connection: %s"),
+		                    local->message);
+		return FALSE;
+	}
+
+	return g_steal_pointer (&connection);
+}
diff --git a/clients/common/nm-vpn-helpers.h b/clients/common/nm-vpn-helpers.h
index 4c15faa1..686687ba 100644
--- a/clients/common/nm-vpn-helpers.h
+++ b/clients/common/nm-vpn-helpers.h
@@ -39,4 +39,7 @@ gboolean nm_vpn_openconnect_authenticate_helper (const char *host,
                                                  int *status,
                                                  GError **error);
 
+NMConnection *nm_vpn_wireguard_import (const char *filename,
+                                       GError **error);
+
 #endif  /* __NM_VPN_HELPERS_H__ */
diff --git a/clients/common/settings-docs.h b/clients/common/settings-docs.h
index bc56edae..7b958faa 100644
--- a/clients/common/settings-docs.h
+++ b/clients/common/settings-docs.h
@@ -24,14 +24,14 @@
 #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.")
 #define DESCRIBE_DOC_NM_SETTING_WIRELESS_SECURITY_GROUP N_("A list of group/broadcast encryption algorithms which prevents connections to Wi-Fi networks that do not utilize one of the algorithms in the list.  For maximum compatibility leave this property empty.  Each list element may be one of \"wep40\", \"wep104\", \"tkip\", or \"ccmp\".")
-#define DESCRIBE_DOC_NM_SETTING_WIRELESS_SECURITY_KEY_MGMT N_("Key management used for the connection.  One of \"none\" (WEP), \"ieee8021x\" (Dynamic WEP), \"wpa-none\" (Ad-Hoc WPA-PSK), \"wpa-psk\" (infrastructure WPA-PSK), or \"wpa-eap\" (WPA-Enterprise).  This property must be set for any Wi-Fi connection that uses security.")
+#define DESCRIBE_DOC_NM_SETTING_WIRELESS_SECURITY_KEY_MGMT N_("Key management used for the connection.  One of \"none\" (WEP), \"ieee8021x\" (Dynamic WEP), \"wpa-none\" (Ad-Hoc WPA-PSK), \"wpa-psk\" (infrastructure WPA-PSK), \"sae\" (SAE) or \"wpa-eap\" (WPA-Enterprise). This property must be set for any Wi-Fi connection that uses security.")
 #define DESCRIBE_DOC_NM_SETTING_WIRELESS_SECURITY_LEAP_PASSWORD N_("The login password for legacy LEAP connections (ie, key-mgmt = \"ieee8021x\" and auth-alg = \"leap\").")
 #define DESCRIBE_DOC_NM_SETTING_WIRELESS_SECURITY_LEAP_PASSWORD_FLAGS N_("Flags indicating how to handle the \"leap-password\" property.")
 #define DESCRIBE_DOC_NM_SETTING_WIRELESS_SECURITY_LEAP_USERNAME N_("The login username for legacy LEAP connections (ie, key-mgmt = \"ieee8021x\" and auth-alg = \"leap\").")
 #define DESCRIBE_DOC_NM_SETTING_WIRELESS_SECURITY_PAIRWISE N_("A list of pairwise encryption algorithms which prevents connections to Wi-Fi networks that do not utilize one of the algorithms in the list. For maximum compatibility leave this property empty.  Each list element may be one of \"tkip\" or \"ccmp\".")
 #define DESCRIBE_DOC_NM_SETTING_WIRELESS_SECURITY_PMF N_("Indicates whether Protected Management Frames (802.11w) must be enabled for the connection.  One of NM_SETTING_WIRELESS_SECURITY_PMF_DEFAULT (0) (use global default value), NM_SETTING_WIRELESS_SECURITY_PMF_DISABLE (1) (disable PMF), NM_SETTING_WIRELESS_SECURITY_PMF_OPTIONAL (2) (enable PMF if the supplicant and the access point support it) or NM_SETTING_WIRELESS_SECURITY_PMF_REQUIRED (3) (enable PMF and fail if not supported).  When set to NM_SETTING_WIRELESS_SECURITY_PMF_DEFAULT (0) and no global default is set, PMF will be optionally enabled.")
 #define DESCRIBE_DOC_NM_SETTING_WIRELESS_SECURITY_PROTO N_("List of strings specifying the allowed WPA protocol versions to use. Each element may be one \"wpa\" (allow WPA) or \"rsn\" (allow WPA2/RSN).  If not specified, both WPA and RSN connections are allowed.")
-#define DESCRIBE_DOC_NM_SETTING_WIRELESS_SECURITY_PSK N_("Pre-Shared-Key for WPA networks.  If the key is 64-characters long, it must contain only hexadecimal characters and is interpreted as a hexadecimal WPA key.  Otherwise, the key must be between 8 and 63 ASCII characters (as specified in the 802.11i standard) and is interpreted as a WPA passphrase, and is hashed to derive the actual WPA-PSK used when connecting to the Wi-Fi network.")
+#define DESCRIBE_DOC_NM_SETTING_WIRELESS_SECURITY_PSK N_("Pre-Shared-Key for WPA networks. For WPA-PSK, it's either an ASCII passphrase of 8 to 63 characters that is (as specified in the 802.11i standard) hashed to derive the actual key, or the key in form of 64 hexadecimal character. The WPA3-Personal networks use a passphrase of any length for SAE authentication.")
 #define DESCRIBE_DOC_NM_SETTING_WIRELESS_SECURITY_PSK_FLAGS N_("Flags indicating how to handle the \"psk\" property.")
 #define DESCRIBE_DOC_NM_SETTING_WIRELESS_SECURITY_WEP_KEY_FLAGS N_("Flags indicating how to handle the \"wep-key0\", \"wep-key1\", \"wep-key2\", and \"wep-key3\" properties.")
 #define DESCRIBE_DOC_NM_SETTING_WIRELESS_SECURITY_WEP_KEY_TYPE N_("Controls the interpretation of WEP keys.  Allowed values are NM_WEP_KEY_TYPE_KEY (1), in which case the key is either a 10- or 26-character hexadecimal string, or a 5- or 13-character ASCII password; or NM_WEP_KEY_TYPE_PASSPHRASE (2), in which case the passphrase is provided as a string and will be hashed using the de-facto MD5 method to derive the actual WEP key.")
@@ -144,7 +144,7 @@
 #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_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 as DHCP client identifier with ipv4.dhcp-client-id=stable and to derive the DHCP DUID with ipv6.dhcp-duid=stable-[llt,ll,uuid]. 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 '$' 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 the 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.")
+#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 as DHCP client identifier with ipv4.dhcp-client-id=stable and to derive the DHCP DUID with ipv6.dhcp-duid=stable-[llt,ll,uuid]. 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 '$' 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.")
 #define DESCRIBE_DOC_NM_SETTING_CONNECTION_TIMESTAMP N_("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).")
 #define DESCRIBE_DOC_NM_SETTING_CONNECTION_TYPE N_("Base type of the connection. For hardware-dependent connections, should contain the setting name of the hardware-type specific setting (ie, \"802-3-ethernet\" or \"802-11-wireless\" or \"bluetooth\", etc), and for non-hardware dependent connections like VPN or otherwise, should contain the setting name of that setting type (ie, \"vpn\" or \"bridge\", etc).")
 #define DESCRIBE_DOC_NM_SETTING_CONNECTION_UUID N_("A universally unique identifier for the connection, for example generated with libuuid.  It should be assigned when the connection is created, and never changed as long as the connection still applies to the same network.  For example, it should not be changed when the \"id\" property or NMSettingIP4Config changes, but might need to be re-created when the Wi-Fi SSID, mobile broadband network provider, or \"type\" property changes. The UUID must be in the format \"2815492f-7e56-435e-b2e9-246bd7cdc664\" (ie, contains only hexadecimal characters and \"-\").")
@@ -169,7 +169,7 @@
 #define DESCRIBE_DOC_NM_SETTING_GSM_HOME_ONLY N_("When TRUE, only connections to the home network will be allowed. Connections to roaming networks will not be made.")
 #define DESCRIBE_DOC_NM_SETTING_GSM_MTU N_("If non-zero, only transmit packets of the specified size or smaller, breaking larger packets up into multiple frames.")
 #define DESCRIBE_DOC_NM_SETTING_GSM_NETWORK_ID N_("The Network ID (GSM LAI format, ie MCC-MNC) to force specific network registration.  If the Network ID is specified, NetworkManager will attempt to force the device to register only on the specified network. This can be used to ensure that the device does not roam when direct roaming control of the device is not otherwise possible.")
-#define DESCRIBE_DOC_NM_SETTING_GSM_NUMBER N_("Number to dial when establishing a PPP data session with the GSM-based mobile broadband network.  Many modems do not require PPP for connections to the mobile network and thus this property should be left blank, which allows NetworkManager to select the appropriate settings automatically.")
+#define DESCRIBE_DOC_NM_SETTING_GSM_NUMBER N_("Legacy setting that used to help establishing PPP data sessions for GSM-based modems. Deprecated: 1")
 #define DESCRIBE_DOC_NM_SETTING_GSM_PASSWORD N_("The password used to authenticate with the network, if required.  Many providers do not require a password, or accept any password.  But if a password is required, it is specified here.")
 #define DESCRIBE_DOC_NM_SETTING_GSM_PASSWORD_FLAGS N_("Flags indicating how to handle the \"password\" property.")
 #define DESCRIBE_DOC_NM_SETTING_GSM_PIN N_("If the SIM is locked with a PIN it must be unlocked before any other operations are requested.  Specify the PIN here to allow operation of the device.")
@@ -204,7 +204,7 @@
 #define DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_DHCP_TIMEOUT N_("A timeout for a DHCP transaction in seconds.")
 #define DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_DNS N_("Array of IP addresses of DNS servers.")
 #define DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_DNS_OPTIONS N_("Array of DNS options as described in man 5 resolv.conf. NULL means that the options are unset and left at the default. In this case NetworkManager will use default options. This is distinct from an empty list of properties.")
-#define DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_DNS_PRIORITY N_("DNS servers priority. The relative priority for DNS servers specified by this setting.  A lower value is better (higher priority).  Zero selects the default value, which is 50 for VPNs and 100 for other connections. Note that the priority is to order DNS settings for multiple active connections.  It does not disambiguate multiple DNS servers within the same connection profile. When using dns=default, servers with higher priority will be on top of resolv.conf.  To prioritize a given server over another one within the same connection, just specify them in the desired order.  When multiple devices have configurations with the same priority, the one with an active default route will be preferred.  Negative values have the special effect of excluding other configurations with a greater priority value; so in presence of at least a negative priority, only DNS servers from connections with the lowest priority value will be used. When using a DNS resolver that supports split-DNS as dns=dnsmasq or dns=systemd-resolved, each connection is used to query domains in its search list.  Queries for domains not present in any search list are routed through connections having the '~.' special wildcard domain, which is added automatically to connections with the default route (or can be added manually).  When multiple connections specify the same domain, the one with the highest priority (lowest numerical value) wins.  If a connection specifies a domain which is subdomain of another domain with a negative DNS priority value, the subdomain is ignored.")
+#define DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_DNS_PRIORITY N_("DNS servers priority. The relative priority for DNS servers specified by this setting.  A lower value is better (higher priority). Zero selects a globally configured default value. If the latter is missing or zero too, it defaults to 50 for VPNs and 100 for other connections. Note that the priority is to order DNS settings for multiple active connections.  It does not disambiguate multiple DNS servers within the same connection profile. When using dns=default, servers with higher priority will be on top of resolv.conf.  To prioritize a given server over another one within the same connection, just specify them in the desired order.  When multiple devices have configurations with the same priority, the one with an active default route will be preferred.  Negative values have the special effect of excluding other configurations with a greater priority value; so in presence of at least a negative priority, only DNS servers from connections with the lowest priority value will be used. When using a DNS resolver that supports split-DNS as dns=dnsmasq or dns=systemd-resolved, each connection is used to query domains in its search list.  Queries for domains not present in any search list are routed through connections having the '~.' special wildcard domain, which is added automatically to connections with the default route (or can be added manually).  When multiple connections specify the same domain, the one with the highest priority (lowest numerical value) wins.  If a connection specifies a domain which is subdomain of another domain with a negative DNS priority value, the subdomain is ignored.")
 #define DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_DNS_SEARCH N_("Array of DNS search domains. Domains starting with a tilde ('~') are considered 'routing' domains and are used only to decide the interface over which a query must be forwarded; they are not used to complete unqualified host names.")
 #define DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_GATEWAY N_("The gateway associated with this configuration. This is only meaningful if \"addresses\" is also set.")
 #define DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_IGNORE_AUTO_DNS N_("When \"method\" is set to \"auto\" and this property to TRUE, automatically configured nameservers and search domains are ignored and only nameservers and search domains specified in the \"dns\" and \"dns-search\" properties, if any, are used.")
@@ -224,7 +224,7 @@
 #define DESCRIBE_DOC_NM_SETTING_IP6_CONFIG_DHCP_TIMEOUT N_("A timeout for a DHCP transaction in seconds.")
 #define DESCRIBE_DOC_NM_SETTING_IP6_CONFIG_DNS N_("Array of IP addresses of DNS servers.")
 #define DESCRIBE_DOC_NM_SETTING_IP6_CONFIG_DNS_OPTIONS N_("Array of DNS options as described in man 5 resolv.conf. NULL means that the options are unset and left at the default. In this case NetworkManager will use default options. This is distinct from an empty list of properties.")
-#define DESCRIBE_DOC_NM_SETTING_IP6_CONFIG_DNS_PRIORITY N_("DNS servers priority. The relative priority for DNS servers specified by this setting.  A lower value is better (higher priority).  Zero selects the default value, which is 50 for VPNs and 100 for other connections. Note that the priority is to order DNS settings for multiple active connections.  It does not disambiguate multiple DNS servers within the same connection profile. When using dns=default, servers with higher priority will be on top of resolv.conf.  To prioritize a given server over another one within the same connection, just specify them in the desired order.  When multiple devices have configurations with the same priority, the one with an active default route will be preferred.  Negative values have the special effect of excluding other configurations with a greater priority value; so in presence of at least a negative priority, only DNS servers from connections with the lowest priority value will be used. When using a DNS resolver that supports split-DNS as dns=dnsmasq or dns=systemd-resolved, each connection is used to query domains in its search list.  Queries for domains not present in any search list are routed through connections having the '~.' special wildcard domain, which is added automatically to connections with the default route (or can be added manually).  When multiple connections specify the same domain, the one with the highest priority (lowest numerical value) wins.  If a connection specifies a domain which is subdomain of another domain with a negative DNS priority value, the subdomain is ignored.")
+#define DESCRIBE_DOC_NM_SETTING_IP6_CONFIG_DNS_PRIORITY N_("DNS servers priority. The relative priority for DNS servers specified by this setting.  A lower value is better (higher priority). Zero selects a globally configured default value. If the latter is missing or zero too, it defaults to 50 for VPNs and 100 for other connections. Note that the priority is to order DNS settings for multiple active connections.  It does not disambiguate multiple DNS servers within the same connection profile. When using dns=default, servers with higher priority will be on top of resolv.conf.  To prioritize a given server over another one within the same connection, just specify them in the desired order.  When multiple devices have configurations with the same priority, the one with an active default route will be preferred.  Negative values have the special effect of excluding other configurations with a greater priority value; so in presence of at least a negative priority, only DNS servers from connections with the lowest priority value will be used. When using a DNS resolver that supports split-DNS as dns=dnsmasq or dns=systemd-resolved, each connection is used to query domains in its search list.  Queries for domains not present in any search list are routed through connections having the '~.' special wildcard domain, which is added automatically to connections with the default route (or can be added manually).  When multiple connections specify the same domain, the one with the highest priority (lowest numerical value) wins.  If a connection specifies a domain which is subdomain of another domain with a negative DNS priority value, the subdomain is ignored.")
 #define DESCRIBE_DOC_NM_SETTING_IP6_CONFIG_DNS_SEARCH N_("Array of DNS search domains. Domains starting with a tilde ('~') are considered 'routing' domains and are used only to decide the interface over which a query must be forwarded; they are not used to complete unqualified host names.")
 #define DESCRIBE_DOC_NM_SETTING_IP6_CONFIG_GATEWAY N_("The gateway associated with this configuration. This is only meaningful if \"addresses\" is also set.")
 #define DESCRIBE_DOC_NM_SETTING_IP6_CONFIG_IGNORE_AUTO_DNS N_("When \"method\" is set to \"auto\" and this property to TRUE, automatically configured nameservers and search domains are ignored and only nameservers and search domains specified in the \"dns\" and \"dns-search\" properties, if any, are used.")
@@ -301,7 +301,7 @@
 #define DESCRIBE_DOC_NM_SETTING_TC_CONFIG_QDISCS N_("Array of TC queueing disciplines.")
 #define DESCRIBE_DOC_NM_SETTING_TC_CONFIG_TFILTERS N_("Array of TC traffic filters.")
 #define DESCRIBE_DOC_NM_SETTING_TEAM_CONFIG N_("The JSON configuration for the team network interface.  The property should contain raw JSON configuration data suitable for teamd, because the value is passed directly to teamd. If not specified, the default configuration is used.  See man teamd.conf for the format details.")
-#define DESCRIBE_DOC_NM_SETTING_TEAM_LINK_WATCHERS N_("Link watchers configuration for the connection: each link watcher is defined by a dictionary, whose keys depend upon the selected link watcher. Available link watchers are 'ethtool', 'nsna_ping' and 'arp_ping' and it is specified in the dictionary with the key 'name'. Available keys are:   ethtool: 'delay-up', 'delay-down', 'init-wait'; nsna_ping: 'init-wait', 'interval', 'missed-max', 'target-host'; arp_ping: all the ones in nsna_ping and 'source-host', 'validate-active', 'validate-incative', 'send-always'. See teamd.conf man for more details.")
+#define DESCRIBE_DOC_NM_SETTING_TEAM_LINK_WATCHERS N_("Link watchers configuration for the connection: each link watcher is defined by a dictionary, whose keys depend upon the selected link watcher. Available link watchers are 'ethtool', 'nsna_ping' and 'arp_ping' and it is specified in the dictionary with the key 'name'. Available keys are:   ethtool: 'delay-up', 'delay-down', 'init-wait'; nsna_ping: 'init-wait', 'interval', 'missed-max', 'target-host'; arp_ping: all the ones in nsna_ping and 'source-host', 'validate-active', 'validate-inactive', 'send-always'. See teamd.conf man for more details.")
 #define DESCRIBE_DOC_NM_SETTING_TEAM_MCAST_REJOIN_COUNT N_("Corresponds to the teamd mcast_rejoin.count.")
 #define DESCRIBE_DOC_NM_SETTING_TEAM_MCAST_REJOIN_INTERVAL N_("Corresponds to the teamd mcast_rejoin.interval.")
 #define DESCRIBE_DOC_NM_SETTING_TEAM_NOTIFY_PEERS_COUNT N_("Corresponds to the teamd notify_peers.count.")
@@ -319,7 +319,7 @@
 #define DESCRIBE_DOC_NM_SETTING_TEAM_PORT_CONFIG N_("The JSON configuration for the team port. The property should contain raw JSON configuration data suitable for teamd, because the value is passed directly to teamd. If not specified, the default configuration is used. See man teamd.conf for the format details.")
 #define DESCRIBE_DOC_NM_SETTING_TEAM_PORT_LACP_KEY N_("Corresponds to the teamd ports.PORTIFNAME.lacp_key.")
 #define DESCRIBE_DOC_NM_SETTING_TEAM_PORT_LACP_PRIO N_("Corresponds to the teamd ports.PORTIFNAME.lacp_prio.")
-#define DESCRIBE_DOC_NM_SETTING_TEAM_PORT_LINK_WATCHERS N_("Link watchers configuration for the connection: each link watcher is defined by a dictionary, whose keys depend upon the selected link watcher. Available link watchers are 'ethtool', 'nsna_ping' and 'arp_ping' and it is specified in the dictionary with the key 'name'. Available keys are:   ethtool: 'delay-up', 'delay-down', 'init-wait'; nsna_ping: 'init-wait', 'interval', 'missed-max', 'target-host'; arp_ping: all the ones in nsna_ping and 'source-host', 'validate-active', 'validate-incative', 'send-always'. See teamd.conf man for more details.")
+#define DESCRIBE_DOC_NM_SETTING_TEAM_PORT_LINK_WATCHERS N_("Link watchers configuration for the connection: each link watcher is defined by a dictionary, whose keys depend upon the selected link watcher. Available link watchers are 'ethtool', 'nsna_ping' and 'arp_ping' and it is specified in the dictionary with the key 'name'. Available keys are:   ethtool: 'delay-up', 'delay-down', 'init-wait'; nsna_ping: 'init-wait', 'interval', 'missed-max', 'target-host'; arp_ping: all the ones in nsna_ping and 'source-host', 'validate-active', 'validate-inactive', 'send-always'. See teamd.conf man for more details.")
 #define DESCRIBE_DOC_NM_SETTING_TEAM_PORT_PRIO N_("Corresponds to the teamd ports.PORTIFNAME.prio.")
 #define DESCRIBE_DOC_NM_SETTING_TEAM_PORT_QUEUE_ID N_("Corresponds to the teamd ports.PORTIFNAME.queue_id. When set to -1 means the parameter is skipped from the json config.")
 #define DESCRIBE_DOC_NM_SETTING_TEAM_PORT_STICKY N_("Corresponds to the teamd ports.PORTIFNAME.sticky.")
@@ -357,8 +357,19 @@
 #define DESCRIBE_DOC_NM_SETTING_VXLAN_SOURCE_PORT_MIN N_("Specifies the minimum UDP source port to communicate to the remote VXLAN tunnel endpoint.")
 #define DESCRIBE_DOC_NM_SETTING_VXLAN_TOS N_("Specifies the TOS value to use in outgoing packets.")
 #define DESCRIBE_DOC_NM_SETTING_VXLAN_TTL N_("Specifies the time-to-live value to use in outgoing packets.")
+#define DESCRIBE_DOC_NM_SETTING_WIFI_P2P_PEER N_("The P2P device that should be connected to. Currently this is the only way to create or join a group.")
+#define DESCRIBE_DOC_NM_SETTING_WIFI_P2P_WFD_IES N_("The Wi-Fi Display (WFD) Information Elements (IEs) to set. Wi-Fi Display requires a protocol specific information element to be set in certain Wi-Fi frames. These can be specified here for the purpose of establishing a connection. This setting is only useful when implementing a Wi-Fi Display client.")
+#define DESCRIBE_DOC_NM_SETTING_WIFI_P2P_WPS_METHOD N_("Flags indicating which mode of WPS is to be used. There's little point in changing the default setting as NetworkManager will automatically determine the best method to use.")
 #define DESCRIBE_DOC_NM_SETTING_WIMAX_MAC_ADDRESS N_("If specified, this connection will only apply to the WiMAX device whose MAC address matches. This property does not change the MAC address of the device (known as MAC spoofing). Deprecated: 1")
 #define DESCRIBE_DOC_NM_SETTING_WIMAX_NETWORK_NAME N_("Network Service Provider (NSP) name of the WiMAX network this connection should use. Deprecated: 1")
+#define DESCRIBE_DOC_NM_SETTING_WIREGUARD_FWMARK N_("The use of fwmark is optional and is by default off. Setting it to 0 disables it. Otherwise it is a 32-bit fwmark for outgoing packets.")
+#define DESCRIBE_DOC_NM_SETTING_WIREGUARD_LISTEN_PORT N_("The listen-port. If listen-port is not specified, the port will be chosen randomly when the interface comes up.")
+#define DESCRIBE_DOC_NM_SETTING_WIREGUARD_MTU N_("If non-zero, only transmit packets of the specified size or smaller, breaking larger packets up into multiple fragments. If zero a default MTU is used. Note that contrary to wg-quick's MTU setting, this does not take into account the current routes at the time of activation.")
+#define DESCRIBE_DOC_NM_SETTING_WIREGUARD_PEER_ROUTES N_("Whether to automatically add routes for the AllowedIPs ranges of the peers. If TRUE (the default), NetworkManager will automatically add routes in the routing tables according to ipv4.route-table and ipv6.route-table. If FALSE, no such routes are added automatically. In this case, the user may want to configure static routes in ipv4.routes and ipv6.routes, respectively.")
+#define DESCRIBE_DOC_NM_SETTING_WIREGUARD_PRIVATE_KEY N_("The 256 bit private-key in base64 encoding.")
+#define DESCRIBE_DOC_NM_SETTING_WIREGUARD_PRIVATE_KEY_FLAGS N_("Flags indicating how to handle the \"private-key\" property.")
+#define DESCRIBE_DOC_NM_SETTING_WPAN_CHANNEL N_("IEEE 802.15.4 channel. A positive integer or -1, meaning \"do not set, use whatever the device is already set to\".")
 #define DESCRIBE_DOC_NM_SETTING_WPAN_MAC_ADDRESS N_("If specified, this connection will only apply to the IEEE 802.15.4 (WPAN) MAC layer device whose permanent MAC address matches.")
+#define DESCRIBE_DOC_NM_SETTING_WPAN_PAGE N_("IEEE 802.15.4 channel page. A positive integer or -1, meaning \"do not set, use whatever the device is already set to\".")
 #define DESCRIBE_DOC_NM_SETTING_WPAN_PAN_ID N_("IEEE 802.15.4 Personal Area Network (PAN) identifier.")
 #define DESCRIBE_DOC_NM_SETTING_WPAN_SHORT_ADDRESS N_("Short IEEE 802.15.4 address to be used within a restricted environment.")
diff --git a/clients/common/settings-docs.h.in b/clients/common/settings-docs.h.in
index bc56edae..7b958faa 100644
--- a/clients/common/settings-docs.h.in
+++ b/clients/common/settings-docs.h.in
@@ -24,14 +24,14 @@
 #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.")
 #define DESCRIBE_DOC_NM_SETTING_WIRELESS_SECURITY_GROUP N_("A list of group/broadcast encryption algorithms which prevents connections to Wi-Fi networks that do not utilize one of the algorithms in the list.  For maximum compatibility leave this property empty.  Each list element may be one of \"wep40\", \"wep104\", \"tkip\", or \"ccmp\".")
-#define DESCRIBE_DOC_NM_SETTING_WIRELESS_SECURITY_KEY_MGMT N_("Key management used for the connection.  One of \"none\" (WEP), \"ieee8021x\" (Dynamic WEP), \"wpa-none\" (Ad-Hoc WPA-PSK), \"wpa-psk\" (infrastructure WPA-PSK), or \"wpa-eap\" (WPA-Enterprise).  This property must be set for any Wi-Fi connection that uses security.")
+#define DESCRIBE_DOC_NM_SETTING_WIRELESS_SECURITY_KEY_MGMT N_("Key management used for the connection.  One of \"none\" (WEP), \"ieee8021x\" (Dynamic WEP), \"wpa-none\" (Ad-Hoc WPA-PSK), \"wpa-psk\" (infrastructure WPA-PSK), \"sae\" (SAE) or \"wpa-eap\" (WPA-Enterprise). This property must be set for any Wi-Fi connection that uses security.")
 #define DESCRIBE_DOC_NM_SETTING_WIRELESS_SECURITY_LEAP_PASSWORD N_("The login password for legacy LEAP connections (ie, key-mgmt = \"ieee8021x\" and auth-alg = \"leap\").")
 #define DESCRIBE_DOC_NM_SETTING_WIRELESS_SECURITY_LEAP_PASSWORD_FLAGS N_("Flags indicating how to handle the \"leap-password\" property.")
 #define DESCRIBE_DOC_NM_SETTING_WIRELESS_SECURITY_LEAP_USERNAME N_("The login username for legacy LEAP connections (ie, key-mgmt = \"ieee8021x\" and auth-alg = \"leap\").")
 #define DESCRIBE_DOC_NM_SETTING_WIRELESS_SECURITY_PAIRWISE N_("A list of pairwise encryption algorithms which prevents connections to Wi-Fi networks that do not utilize one of the algorithms in the list. For maximum compatibility leave this property empty.  Each list element may be one of \"tkip\" or \"ccmp\".")
 #define DESCRIBE_DOC_NM_SETTING_WIRELESS_SECURITY_PMF N_("Indicates whether Protected Management Frames (802.11w) must be enabled for the connection.  One of NM_SETTING_WIRELESS_SECURITY_PMF_DEFAULT (0) (use global default value), NM_SETTING_WIRELESS_SECURITY_PMF_DISABLE (1) (disable PMF), NM_SETTING_WIRELESS_SECURITY_PMF_OPTIONAL (2) (enable PMF if the supplicant and the access point support it) or NM_SETTING_WIRELESS_SECURITY_PMF_REQUIRED (3) (enable PMF and fail if not supported).  When set to NM_SETTING_WIRELESS_SECURITY_PMF_DEFAULT (0) and no global default is set, PMF will be optionally enabled.")
 #define DESCRIBE_DOC_NM_SETTING_WIRELESS_SECURITY_PROTO N_("List of strings specifying the allowed WPA protocol versions to use. Each element may be one \"wpa\" (allow WPA) or \"rsn\" (allow WPA2/RSN).  If not specified, both WPA and RSN connections are allowed.")
-#define DESCRIBE_DOC_NM_SETTING_WIRELESS_SECURITY_PSK N_("Pre-Shared-Key for WPA networks.  If the key is 64-characters long, it must contain only hexadecimal characters and is interpreted as a hexadecimal WPA key.  Otherwise, the key must be between 8 and 63 ASCII characters (as specified in the 802.11i standard) and is interpreted as a WPA passphrase, and is hashed to derive the actual WPA-PSK used when connecting to the Wi-Fi network.")
+#define DESCRIBE_DOC_NM_SETTING_WIRELESS_SECURITY_PSK N_("Pre-Shared-Key for WPA networks. For WPA-PSK, it's either an ASCII passphrase of 8 to 63 characters that is (as specified in the 802.11i standard) hashed to derive the actual key, or the key in form of 64 hexadecimal character. The WPA3-Personal networks use a passphrase of any length for SAE authentication.")
 #define DESCRIBE_DOC_NM_SETTING_WIRELESS_SECURITY_PSK_FLAGS N_("Flags indicating how to handle the \"psk\" property.")
 #define DESCRIBE_DOC_NM_SETTING_WIRELESS_SECURITY_WEP_KEY_FLAGS N_("Flags indicating how to handle the \"wep-key0\", \"wep-key1\", \"wep-key2\", and \"wep-key3\" properties.")
 #define DESCRIBE_DOC_NM_SETTING_WIRELESS_SECURITY_WEP_KEY_TYPE N_("Controls the interpretation of WEP keys.  Allowed values are NM_WEP_KEY_TYPE_KEY (1), in which case the key is either a 10- or 26-character hexadecimal string, or a 5- or 13-character ASCII password; or NM_WEP_KEY_TYPE_PASSPHRASE (2), in which case the passphrase is provided as a string and will be hashed using the de-facto MD5 method to derive the actual WEP key.")
@@ -144,7 +144,7 @@
 #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_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 as DHCP client identifier with ipv4.dhcp-client-id=stable and to derive the DHCP DUID with ipv6.dhcp-duid=stable-[llt,ll,uuid]. 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 '$' 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 the 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.")
+#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 as DHCP client identifier with ipv4.dhcp-client-id=stable and to derive the DHCP DUID with ipv6.dhcp-duid=stable-[llt,ll,uuid]. 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 '$' 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.")
 #define DESCRIBE_DOC_NM_SETTING_CONNECTION_TIMESTAMP N_("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).")
 #define DESCRIBE_DOC_NM_SETTING_CONNECTION_TYPE N_("Base type of the connection. For hardware-dependent connections, should contain the setting name of the hardware-type specific setting (ie, \"802-3-ethernet\" or \"802-11-wireless\" or \"bluetooth\", etc), and for non-hardware dependent connections like VPN or otherwise, should contain the setting name of that setting type (ie, \"vpn\" or \"bridge\", etc).")
 #define DESCRIBE_DOC_NM_SETTING_CONNECTION_UUID N_("A universally unique identifier for the connection, for example generated with libuuid.  It should be assigned when the connection is created, and never changed as long as the connection still applies to the same network.  For example, it should not be changed when the \"id\" property or NMSettingIP4Config changes, but might need to be re-created when the Wi-Fi SSID, mobile broadband network provider, or \"type\" property changes. The UUID must be in the format \"2815492f-7e56-435e-b2e9-246bd7cdc664\" (ie, contains only hexadecimal characters and \"-\").")
@@ -169,7 +169,7 @@
 #define DESCRIBE_DOC_NM_SETTING_GSM_HOME_ONLY N_("When TRUE, only connections to the home network will be allowed. Connections to roaming networks will not be made.")
 #define DESCRIBE_DOC_NM_SETTING_GSM_MTU N_("If non-zero, only transmit packets of the specified size or smaller, breaking larger packets up into multiple frames.")
 #define DESCRIBE_DOC_NM_SETTING_GSM_NETWORK_ID N_("The Network ID (GSM LAI format, ie MCC-MNC) to force specific network registration.  If the Network ID is specified, NetworkManager will attempt to force the device to register only on the specified network. This can be used to ensure that the device does not roam when direct roaming control of the device is not otherwise possible.")
-#define DESCRIBE_DOC_NM_SETTING_GSM_NUMBER N_("Number to dial when establishing a PPP data session with the GSM-based mobile broadband network.  Many modems do not require PPP for connections to the mobile network and thus this property should be left blank, which allows NetworkManager to select the appropriate settings automatically.")
+#define DESCRIBE_DOC_NM_SETTING_GSM_NUMBER N_("Legacy setting that used to help establishing PPP data sessions for GSM-based modems. Deprecated: 1")
 #define DESCRIBE_DOC_NM_SETTING_GSM_PASSWORD N_("The password used to authenticate with the network, if required.  Many providers do not require a password, or accept any password.  But if a password is required, it is specified here.")
 #define DESCRIBE_DOC_NM_SETTING_GSM_PASSWORD_FLAGS N_("Flags indicating how to handle the \"password\" property.")
 #define DESCRIBE_DOC_NM_SETTING_GSM_PIN N_("If the SIM is locked with a PIN it must be unlocked before any other operations are requested.  Specify the PIN here to allow operation of the device.")
@@ -204,7 +204,7 @@
 #define DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_DHCP_TIMEOUT N_("A timeout for a DHCP transaction in seconds.")
 #define DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_DNS N_("Array of IP addresses of DNS servers.")
 #define DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_DNS_OPTIONS N_("Array of DNS options as described in man 5 resolv.conf. NULL means that the options are unset and left at the default. In this case NetworkManager will use default options. This is distinct from an empty list of properties.")
-#define DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_DNS_PRIORITY N_("DNS servers priority. The relative priority for DNS servers specified by this setting.  A lower value is better (higher priority).  Zero selects the default value, which is 50 for VPNs and 100 for other connections. Note that the priority is to order DNS settings for multiple active connections.  It does not disambiguate multiple DNS servers within the same connection profile. When using dns=default, servers with higher priority will be on top of resolv.conf.  To prioritize a given server over another one within the same connection, just specify them in the desired order.  When multiple devices have configurations with the same priority, the one with an active default route will be preferred.  Negative values have the special effect of excluding other configurations with a greater priority value; so in presence of at least a negative priority, only DNS servers from connections with the lowest priority value will be used. When using a DNS resolver that supports split-DNS as dns=dnsmasq or dns=systemd-resolved, each connection is used to query domains in its search list.  Queries for domains not present in any search list are routed through connections having the '~.' special wildcard domain, which is added automatically to connections with the default route (or can be added manually).  When multiple connections specify the same domain, the one with the highest priority (lowest numerical value) wins.  If a connection specifies a domain which is subdomain of another domain with a negative DNS priority value, the subdomain is ignored.")
+#define DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_DNS_PRIORITY N_("DNS servers priority. The relative priority for DNS servers specified by this setting.  A lower value is better (higher priority). Zero selects a globally configured default value. If the latter is missing or zero too, it defaults to 50 for VPNs and 100 for other connections. Note that the priority is to order DNS settings for multiple active connections.  It does not disambiguate multiple DNS servers within the same connection profile. When using dns=default, servers with higher priority will be on top of resolv.conf.  To prioritize a given server over another one within the same connection, just specify them in the desired order.  When multiple devices have configurations with the same priority, the one with an active default route will be preferred.  Negative values have the special effect of excluding other configurations with a greater priority value; so in presence of at least a negative priority, only DNS servers from connections with the lowest priority value will be used. When using a DNS resolver that supports split-DNS as dns=dnsmasq or dns=systemd-resolved, each connection is used to query domains in its search list.  Queries for domains not present in any search list are routed through connections having the '~.' special wildcard domain, which is added automatically to connections with the default route (or can be added manually).  When multiple connections specify the same domain, the one with the highest priority (lowest numerical value) wins.  If a connection specifies a domain which is subdomain of another domain with a negative DNS priority value, the subdomain is ignored.")
 #define DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_DNS_SEARCH N_("Array of DNS search domains. Domains starting with a tilde ('~') are considered 'routing' domains and are used only to decide the interface over which a query must be forwarded; they are not used to complete unqualified host names.")
 #define DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_GATEWAY N_("The gateway associated with this configuration. This is only meaningful if \"addresses\" is also set.")
 #define DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_IGNORE_AUTO_DNS N_("When \"method\" is set to \"auto\" and this property to TRUE, automatically configured nameservers and search domains are ignored and only nameservers and search domains specified in the \"dns\" and \"dns-search\" properties, if any, are used.")
@@ -224,7 +224,7 @@
 #define DESCRIBE_DOC_NM_SETTING_IP6_CONFIG_DHCP_TIMEOUT N_("A timeout for a DHCP transaction in seconds.")
 #define DESCRIBE_DOC_NM_SETTING_IP6_CONFIG_DNS N_("Array of IP addresses of DNS servers.")
 #define DESCRIBE_DOC_NM_SETTING_IP6_CONFIG_DNS_OPTIONS N_("Array of DNS options as described in man 5 resolv.conf. NULL means that the options are unset and left at the default. In this case NetworkManager will use default options. This is distinct from an empty list of properties.")
-#define DESCRIBE_DOC_NM_SETTING_IP6_CONFIG_DNS_PRIORITY N_("DNS servers priority. The relative priority for DNS servers specified by this setting.  A lower value is better (higher priority).  Zero selects the default value, which is 50 for VPNs and 100 for other connections. Note that the priority is to order DNS settings for multiple active connections.  It does not disambiguate multiple DNS servers within the same connection profile. When using dns=default, servers with higher priority will be on top of resolv.conf.  To prioritize a given server over another one within the same connection, just specify them in the desired order.  When multiple devices have configurations with the same priority, the one with an active default route will be preferred.  Negative values have the special effect of excluding other configurations with a greater priority value; so in presence of at least a negative priority, only DNS servers from connections with the lowest priority value will be used. When using a DNS resolver that supports split-DNS as dns=dnsmasq or dns=systemd-resolved, each connection is used to query domains in its search list.  Queries for domains not present in any search list are routed through connections having the '~.' special wildcard domain, which is added automatically to connections with the default route (or can be added manually).  When multiple connections specify the same domain, the one with the highest priority (lowest numerical value) wins.  If a connection specifies a domain which is subdomain of another domain with a negative DNS priority value, the subdomain is ignored.")
+#define DESCRIBE_DOC_NM_SETTING_IP6_CONFIG_DNS_PRIORITY N_("DNS servers priority. The relative priority for DNS servers specified by this setting.  A lower value is better (higher priority). Zero selects a globally configured default value. If the latter is missing or zero too, it defaults to 50 for VPNs and 100 for other connections. Note that the priority is to order DNS settings for multiple active connections.  It does not disambiguate multiple DNS servers within the same connection profile. When using dns=default, servers with higher priority will be on top of resolv.conf.  To prioritize a given server over another one within the same connection, just specify them in the desired order.  When multiple devices have configurations with the same priority, the one with an active default route will be preferred.  Negative values have the special effect of excluding other configurations with a greater priority value; so in presence of at least a negative priority, only DNS servers from connections with the lowest priority value will be used. When using a DNS resolver that supports split-DNS as dns=dnsmasq or dns=systemd-resolved, each connection is used to query domains in its search list.  Queries for domains not present in any search list are routed through connections having the '~.' special wildcard domain, which is added automatically to connections with the default route (or can be added manually).  When multiple connections specify the same domain, the one with the highest priority (lowest numerical value) wins.  If a connection specifies a domain which is subdomain of another domain with a negative DNS priority value, the subdomain is ignored.")
 #define DESCRIBE_DOC_NM_SETTING_IP6_CONFIG_DNS_SEARCH N_("Array of DNS search domains. Domains starting with a tilde ('~') are considered 'routing' domains and are used only to decide the interface over which a query must be forwarded; they are not used to complete unqualified host names.")
 #define DESCRIBE_DOC_NM_SETTING_IP6_CONFIG_GATEWAY N_("The gateway associated with this configuration. This is only meaningful if \"addresses\" is also set.")
 #define DESCRIBE_DOC_NM_SETTING_IP6_CONFIG_IGNORE_AUTO_DNS N_("When \"method\" is set to \"auto\" and this property to TRUE, automatically configured nameservers and search domains are ignored and only nameservers and search domains specified in the \"dns\" and \"dns-search\" properties, if any, are used.")
@@ -301,7 +301,7 @@
 #define DESCRIBE_DOC_NM_SETTING_TC_CONFIG_QDISCS N_("Array of TC queueing disciplines.")
 #define DESCRIBE_DOC_NM_SETTING_TC_CONFIG_TFILTERS N_("Array of TC traffic filters.")
 #define DESCRIBE_DOC_NM_SETTING_TEAM_CONFIG N_("The JSON configuration for the team network interface.  The property should contain raw JSON configuration data suitable for teamd, because the value is passed directly to teamd. If not specified, the default configuration is used.  See man teamd.conf for the format details.")
-#define DESCRIBE_DOC_NM_SETTING_TEAM_LINK_WATCHERS N_("Link watchers configuration for the connection: each link watcher is defined by a dictionary, whose keys depend upon the selected link watcher. Available link watchers are 'ethtool', 'nsna_ping' and 'arp_ping' and it is specified in the dictionary with the key 'name'. Available keys are:   ethtool: 'delay-up', 'delay-down', 'init-wait'; nsna_ping: 'init-wait', 'interval', 'missed-max', 'target-host'; arp_ping: all the ones in nsna_ping and 'source-host', 'validate-active', 'validate-incative', 'send-always'. See teamd.conf man for more details.")
+#define DESCRIBE_DOC_NM_SETTING_TEAM_LINK_WATCHERS N_("Link watchers configuration for the connection: each link watcher is defined by a dictionary, whose keys depend upon the selected link watcher. Available link watchers are 'ethtool', 'nsna_ping' and 'arp_ping' and it is specified in the dictionary with the key 'name'. Available keys are:   ethtool: 'delay-up', 'delay-down', 'init-wait'; nsna_ping: 'init-wait', 'interval', 'missed-max', 'target-host'; arp_ping: all the ones in nsna_ping and 'source-host', 'validate-active', 'validate-inactive', 'send-always'. See teamd.conf man for more details.")
 #define DESCRIBE_DOC_NM_SETTING_TEAM_MCAST_REJOIN_COUNT N_("Corresponds to the teamd mcast_rejoin.count.")
 #define DESCRIBE_DOC_NM_SETTING_TEAM_MCAST_REJOIN_INTERVAL N_("Corresponds to the teamd mcast_rejoin.interval.")
 #define DESCRIBE_DOC_NM_SETTING_TEAM_NOTIFY_PEERS_COUNT N_("Corresponds to the teamd notify_peers.count.")
@@ -319,7 +319,7 @@
 #define DESCRIBE_DOC_NM_SETTING_TEAM_PORT_CONFIG N_("The JSON configuration for the team port. The property should contain raw JSON configuration data suitable for teamd, because the value is passed directly to teamd. If not specified, the default configuration is used. See man teamd.conf for the format details.")
 #define DESCRIBE_DOC_NM_SETTING_TEAM_PORT_LACP_KEY N_("Corresponds to the teamd ports.PORTIFNAME.lacp_key.")
 #define DESCRIBE_DOC_NM_SETTING_TEAM_PORT_LACP_PRIO N_("Corresponds to the teamd ports.PORTIFNAME.lacp_prio.")
-#define DESCRIBE_DOC_NM_SETTING_TEAM_PORT_LINK_WATCHERS N_("Link watchers configuration for the connection: each link watcher is defined by a dictionary, whose keys depend upon the selected link watcher. Available link watchers are 'ethtool', 'nsna_ping' and 'arp_ping' and it is specified in the dictionary with the key 'name'. Available keys are:   ethtool: 'delay-up', 'delay-down', 'init-wait'; nsna_ping: 'init-wait', 'interval', 'missed-max', 'target-host'; arp_ping: all the ones in nsna_ping and 'source-host', 'validate-active', 'validate-incative', 'send-always'. See teamd.conf man for more details.")
+#define DESCRIBE_DOC_NM_SETTING_TEAM_PORT_LINK_WATCHERS N_("Link watchers configuration for the connection: each link watcher is defined by a dictionary, whose keys depend upon the selected link watcher. Available link watchers are 'ethtool', 'nsna_ping' and 'arp_ping' and it is specified in the dictionary with the key 'name'. Available keys are:   ethtool: 'delay-up', 'delay-down', 'init-wait'; nsna_ping: 'init-wait', 'interval', 'missed-max', 'target-host'; arp_ping: all the ones in nsna_ping and 'source-host', 'validate-active', 'validate-inactive', 'send-always'. See teamd.conf man for more details.")
 #define DESCRIBE_DOC_NM_SETTING_TEAM_PORT_PRIO N_("Corresponds to the teamd ports.PORTIFNAME.prio.")
 #define DESCRIBE_DOC_NM_SETTING_TEAM_PORT_QUEUE_ID N_("Corresponds to the teamd ports.PORTIFNAME.queue_id. When set to -1 means the parameter is skipped from the json config.")
 #define DESCRIBE_DOC_NM_SETTING_TEAM_PORT_STICKY N_("Corresponds to the teamd ports.PORTIFNAME.sticky.")
@@ -357,8 +357,19 @@
 #define DESCRIBE_DOC_NM_SETTING_VXLAN_SOURCE_PORT_MIN N_("Specifies the minimum UDP source port to communicate to the remote VXLAN tunnel endpoint.")
 #define DESCRIBE_DOC_NM_SETTING_VXLAN_TOS N_("Specifies the TOS value to use in outgoing packets.")
 #define DESCRIBE_DOC_NM_SETTING_VXLAN_TTL N_("Specifies the time-to-live value to use in outgoing packets.")
+#define DESCRIBE_DOC_NM_SETTING_WIFI_P2P_PEER N_("The P2P device that should be connected to. Currently this is the only way to create or join a group.")
+#define DESCRIBE_DOC_NM_SETTING_WIFI_P2P_WFD_IES N_("The Wi-Fi Display (WFD) Information Elements (IEs) to set. Wi-Fi Display requires a protocol specific information element to be set in certain Wi-Fi frames. These can be specified here for the purpose of establishing a connection. This setting is only useful when implementing a Wi-Fi Display client.")
+#define DESCRIBE_DOC_NM_SETTING_WIFI_P2P_WPS_METHOD N_("Flags indicating which mode of WPS is to be used. There's little point in changing the default setting as NetworkManager will automatically determine the best method to use.")
 #define DESCRIBE_DOC_NM_SETTING_WIMAX_MAC_ADDRESS N_("If specified, this connection will only apply to the WiMAX device whose MAC address matches. This property does not change the MAC address of the device (known as MAC spoofing). Deprecated: 1")
 #define DESCRIBE_DOC_NM_SETTING_WIMAX_NETWORK_NAME N_("Network Service Provider (NSP) name of the WiMAX network this connection should use. Deprecated: 1")
+#define DESCRIBE_DOC_NM_SETTING_WIREGUARD_FWMARK N_("The use of fwmark is optional and is by default off. Setting it to 0 disables it. Otherwise it is a 32-bit fwmark for outgoing packets.")
+#define DESCRIBE_DOC_NM_SETTING_WIREGUARD_LISTEN_PORT N_("The listen-port. If listen-port is not specified, the port will be chosen randomly when the interface comes up.")
+#define DESCRIBE_DOC_NM_SETTING_WIREGUARD_MTU N_("If non-zero, only transmit packets of the specified size or smaller, breaking larger packets up into multiple fragments. If zero a default MTU is used. Note that contrary to wg-quick's MTU setting, this does not take into account the current routes at the time of activation.")
+#define DESCRIBE_DOC_NM_SETTING_WIREGUARD_PEER_ROUTES N_("Whether to automatically add routes for the AllowedIPs ranges of the peers. If TRUE (the default), NetworkManager will automatically add routes in the routing tables according to ipv4.route-table and ipv6.route-table. If FALSE, no such routes are added automatically. In this case, the user may want to configure static routes in ipv4.routes and ipv6.routes, respectively.")
+#define DESCRIBE_DOC_NM_SETTING_WIREGUARD_PRIVATE_KEY N_("The 256 bit private-key in base64 encoding.")
+#define DESCRIBE_DOC_NM_SETTING_WIREGUARD_PRIVATE_KEY_FLAGS N_("Flags indicating how to handle the \"private-key\" property.")
+#define DESCRIBE_DOC_NM_SETTING_WPAN_CHANNEL N_("IEEE 802.15.4 channel. A positive integer or -1, meaning \"do not set, use whatever the device is already set to\".")
 #define DESCRIBE_DOC_NM_SETTING_WPAN_MAC_ADDRESS N_("If specified, this connection will only apply to the IEEE 802.15.4 (WPAN) MAC layer device whose permanent MAC address matches.")
+#define DESCRIBE_DOC_NM_SETTING_WPAN_PAGE N_("IEEE 802.15.4 channel page. A positive integer or -1, meaning \"do not set, use whatever the device is already set to\".")
 #define DESCRIBE_DOC_NM_SETTING_WPAN_PAN_ID N_("IEEE 802.15.4 Personal Area Network (PAN) identifier.")
 #define DESCRIBE_DOC_NM_SETTING_WPAN_SHORT_ADDRESS N_("Short IEEE 802.15.4 address to be used within a restricted environment.")
diff --git a/clients/common/tests/meson.build b/clients/common/tests/meson.build
index cc357cdc..060bab48 100644
--- a/clients/common/tests/meson.build
+++ b/clients/common/tests/meson.build
@@ -4,7 +4,7 @@ deps = [
   libnm_dep,
   libnmc_dep,
   libnmc_base_dep,
-  nm_core_dep
+  nm_core_dep,
 ]
 
 exe = executable(
@@ -19,5 +19,5 @@ exe = executable(
 test(
   'clients/' + test_unit,
   test_script,
-  args: test_args + [exe.full_path()]
+  args: test_args + [exe.full_path()],
 )
diff --git a/clients/common/tests/test-general.c b/clients/common/tests/test-general.c
index 8f96eb26..c39901ba 100644
--- a/clients/common/tests/test-general.c
+++ b/clients/common/tests/test-general.c
@@ -20,6 +20,7 @@
 #include "nm-default.h"
 
 #include "nm-meta-setting-access.h"
+#include "nm-vpn-helpers.h"
 
 #include "nm-utils/nm-test-utils.h"
 
@@ -145,6 +146,96 @@ test_client_meta_check (void)
 
 /*****************************************************************************/
 
+static void
+test_client_import_wireguard_test0 (void)
+{
+	gs_unref_object NMConnection *connection;
+	NMSettingWireGuard *s_wg;
+	NMWireGuardPeer *peer;
+	gs_free_error GError *error = NULL;
+
+	connection = nm_vpn_wireguard_import (NM_BUILD_SRCDIR"/clients/common/tests/wg-test0.conf",
+	                                      &error);
+
+	g_assert_no_error (error);
+
+	g_assert_cmpstr (nm_connection_get_id (connection), ==, "wg-test0");
+	g_assert_cmpstr (nm_connection_get_interface_name (connection), ==, "wg-test0");
+	g_assert_cmpstr (nm_connection_get_connection_type (connection), ==, NM_SETTING_WIREGUARD_SETTING_NAME);
+
+	s_wg = NM_SETTING_WIREGUARD (nm_connection_get_setting (connection, NM_TYPE_SETTING_WIREGUARD));
+
+	g_assert_cmpint (nm_setting_wireguard_get_listen_port (s_wg), ==, 51820);
+	g_assert_cmpstr (nm_setting_wireguard_get_private_key (s_wg), ==, "yAnz5TF+lXXJte14tji3zlMNq+hd2rYUIgJBgB3fBmk=");
+
+	g_assert_cmpint (nm_setting_wireguard_get_peers_len (s_wg), ==, 3);
+
+	peer = nm_setting_wireguard_get_peer (s_wg, 0);
+	g_assert_cmpstr (nm_wireguard_peer_get_public_key (peer), ==, "xTIBA5rboUvnH4htodjb6e697QjLERt1NAB4mZqp8Dg=");
+	g_assert_cmpstr (nm_wireguard_peer_get_endpoint (peer), ==, "192.95.5.67:1234");
+	g_assert_cmpint (nm_wireguard_peer_get_allowed_ips_len (peer), ==, 2);
+	g_assert_cmpstr (nm_wireguard_peer_get_allowed_ip (peer, 0, NULL), ==, "10.192.122.3/32");
+	g_assert_cmpstr (nm_wireguard_peer_get_allowed_ip (peer, 1, NULL), ==, "10.192.124.1/24");
+
+	peer = nm_setting_wireguard_get_peer (s_wg, 1);
+	g_assert_cmpstr (nm_wireguard_peer_get_public_key (peer), ==, "TrMvSoP4jYQlY6RIzBgbssQqY3vxI2Pi+y71lOWWXX0=");
+	g_assert_cmpstr (nm_wireguard_peer_get_endpoint (peer), ==, "[2607:5300:60:6b0::c05f:543]:2468");
+	g_assert_cmpint (nm_wireguard_peer_get_allowed_ips_len (peer), ==, 2);
+	g_assert_cmpstr (nm_wireguard_peer_get_allowed_ip (peer, 0, NULL), ==, "10.192.122.4/32");
+	g_assert_cmpstr (nm_wireguard_peer_get_allowed_ip (peer, 1, NULL), ==, "192.168.0.0/16");
+
+	peer = nm_setting_wireguard_get_peer (s_wg, 2);
+	g_assert_cmpstr (nm_wireguard_peer_get_public_key (peer), ==, "gN65BkIKy1eCE9pP1wdc8ROUtkHLF2PfAqYdyYBz6EA=");
+	g_assert_cmpstr (nm_wireguard_peer_get_endpoint (peer), ==, "test.wireguard.com:18981");
+	g_assert_cmpint (nm_wireguard_peer_get_allowed_ips_len (peer), ==, 1);
+	g_assert_cmpstr (nm_wireguard_peer_get_allowed_ip (peer, 0, NULL), ==, "10.10.10.230/32");
+}
+
+static void
+test_client_import_wireguard_test1 (void)
+{
+	gs_free_error GError *error = NULL;
+
+	nm_vpn_wireguard_import (NM_BUILD_SRCDIR"/clients/common/tests/wg-test1.conf", &error);
+	g_assert_error (error, NM_UTILS_ERROR, NM_UTILS_ERROR_INVALID_ARGUMENT);
+	g_assert (g_str_has_prefix (error->message, "invalid secret 'PrivateKey'"));
+	g_assert (g_str_has_suffix (error->message, "wg-test1.conf:2"));
+}
+
+static void
+test_client_import_wireguard_test2 (void)
+{
+	gs_free_error GError *error = NULL;
+
+	nm_vpn_wireguard_import (NM_BUILD_SRCDIR"/clients/common/tests/wg-test2.conf", &error);
+
+	g_assert_error (error, NM_UTILS_ERROR, NM_UTILS_ERROR_INVALID_ARGUMENT);
+	g_assert (g_str_has_prefix (error->message, "unrecognized line at"));
+	g_assert (g_str_has_suffix (error->message, "wg-test2.conf:5"));
+}
+
+static void
+test_client_import_wireguard_test3 (void)
+{
+	gs_free_error GError *error = NULL;
+
+	nm_vpn_wireguard_import (NM_BUILD_SRCDIR"/clients/common/tests/wg-test3.conf", &error);
+	g_assert_error (error, NM_UTILS_ERROR, NM_UTILS_ERROR_INVALID_ARGUMENT);
+	g_assert (g_str_has_prefix (error->message, "invalid value for 'ListenPort'"));
+	g_assert (g_str_has_suffix (error->message, "wg-test3.conf:3"));
+}
+
+static void
+test_client_import_wireguard_missing (void)
+{
+	gs_free_error GError *error = NULL;
+
+	nm_vpn_wireguard_import (NM_BUILD_SRCDIR"/clients/common/tests/wg-missing.conf", &error);
+	g_assert_error (error, G_FILE_ERROR, G_FILE_ERROR_NOENT);
+}
+
+/*****************************************************************************/
+
 NMTST_DEFINE ();
 
 int
@@ -153,6 +244,11 @@ main (int argc, char **argv)
 	nmtst_init (&argc, &argv, TRUE);
 
 	g_test_add_func ("/client/meta/check", test_client_meta_check);
+	g_test_add_func ("/client/import/wireguard/test0", test_client_import_wireguard_test0);
+	g_test_add_func ("/client/import/wireguard/test1", test_client_import_wireguard_test1);
+	g_test_add_func ("/client/import/wireguard/test2", test_client_import_wireguard_test2);
+	g_test_add_func ("/client/import/wireguard/test3", test_client_import_wireguard_test3);
+	g_test_add_func ("/client/import/wireguard/missing", test_client_import_wireguard_missing);
 
 	return g_test_run ();
 }
diff --git a/clients/common/tests/wg-test0.conf b/clients/common/tests/wg-test0.conf
new file mode 100644
index 00000000..61438c29
--- /dev/null
+++ b/clients/common/tests/wg-test0.conf
@@ -0,0 +1,18 @@
+[Interface]
+PrivateKey = yAnz5TF+lXXJte14tji3zlMNq+hd2rYUIgJBgB3fBmk=
+ListenPort = 51820
+
+[Peer]
+PublicKey = xTIBA5rboUvnH4htodjb6e697QjLERt1NAB4mZqp8Dg=
+Endpoint = 192.95.5.67:1234
+AllowedIPs = 10.192.122.3/32, 10.192.124.1/24
+
+[Peer]
+PublicKey = TrMvSoP4jYQlY6RIzBgbssQqY3vxI2Pi+y71lOWWXX0=
+Endpoint = [2607:5300:60:6b0::c05f:543]:2468
+AllowedIPs = 10.192.122.4/32, 192.168.0.0/16
+
+[Peer]
+PublicKey = gN65BkIKy1eCE9pP1wdc8ROUtkHLF2PfAqYdyYBz6EA=
+Endpoint = test.wireguard.com:18981
+AllowedIPs = 10.10.10.230/32
diff --git a/clients/common/tests/wg-test1.conf b/clients/common/tests/wg-test1.conf
new file mode 100644
index 00000000..ceb267ac
--- /dev/null
+++ b/clients/common/tests/wg-test1.conf
@@ -0,0 +1,3 @@
+[Interface]
+PrivateKey = bad
+ListenPort = 51820
diff --git a/clients/common/tests/wg-test2.conf b/clients/common/tests/wg-test2.conf
new file mode 100644
index 00000000..f691c2af
--- /dev/null
+++ b/clients/common/tests/wg-test2.conf
@@ -0,0 +1,8 @@
+[Interface]
+PrivateKey = yAnz5TF+lXXJte14tji3zlMNq+hd2rYUIgJBgB3fBmk=
+ListenPort = 51820
+
+[Beer]
+PublicKey = xTIBA5rboUvnH4htodjb6e697QjLERt1NAB4mZqp8Dg=
+Endpoint = 192.95.5.67:1234
+AllowedIPs = 10.192.122.3/32, 10.192.124.1/24
diff --git a/clients/common/tests/wg-test3.conf b/clients/common/tests/wg-test3.conf
new file mode 100644
index 00000000..9956e400
--- /dev/null
+++ b/clients/common/tests/wg-test3.conf
@@ -0,0 +1,3 @@
+[Interface]
+PrivateKey = yAnz5TF+lXXJte14tji3zlMNq+hd2rYUIgJBgB3fBmk=
+ListenPort = 666666666
diff --git a/clients/meson.build b/clients/meson.build
index 68170c4a..1b98ebcb 100644
--- a/clients/meson.build
+++ b/clients/meson.build
@@ -2,7 +2,7 @@ name = 'nm-online'
 
 deps = [
   libnm_dep,
-  nm_core_dep
+  nm_core_dep,
 ]
 
 clients_cflags = [
@@ -20,7 +20,7 @@ executable(
   c_args: cflags,
   link_args: ldflags_linker_script_binary,
   link_depends: linker_script_binary,
-  install: true
+  install: true,
 )
 
 subdir('common')
diff --git a/clients/nm-online.c b/clients/nm-online.c
index 38ce03c8..18ca713b 100644
--- a/clients/nm-online.c
+++ b/clients/nm-online.c
@@ -249,10 +249,10 @@ main (int argc, char *argv[])
 	GOptionContext *opt_ctx = NULL;
 	gboolean success;
 	GOptionEntry options[] = {
-		{"timeout", 't', 0, G_OPTION_ARG_INT, &t_secs, N_("Time to wait for a connection, in seconds (without the option, default value is 30)"), ""},
-		{"exit", 'x', 0, G_OPTION_ARG_NONE, &data.exit_no_nm, N_("Exit immediately if NetworkManager is not running or connecting"), NULL},
 		{"quiet", 'q', 0, G_OPTION_ARG_NONE, &data.quiet, N_("Don't print anything"), NULL},
 		{"wait-for-startup", 's', 0, G_OPTION_ARG_NONE, &data.wait_startup, N_("Wait for NetworkManager startup instead of a connection"), NULL},
+		{"timeout", 't', 0, G_OPTION_ARG_INT, &t_secs, N_("Time to wait for a connection, in seconds (without the option, default value is 30)"), ""},
+		{"exit", 'x', 0, G_OPTION_ARG_NONE, &data.exit_no_nm, N_("Exit immediately if NetworkManager is not running or connecting"), NULL},
 		{ NULL },
 	};
 
diff --git a/clients/tests/test-client.check-on-disk/test_001.expected b/clients/tests/test-client.check-on-disk/test_001.expected
index 17f9d760..616e457c 100644
--- a/clients/tests/test-client.check-on-disk/test_001.expected
+++ b/clients/tests/test-client.check-on-disk/test_001.expected
@@ -1,5 +1,5 @@
 size: 395
-location: clients/tests/test-client.py:827:test_001()/1
+location: clients/tests/test-client.py:841:test_001()/1
 cmd: $NMCLI 
 lang: C
 returncode: 0
@@ -15,7 +15,7 @@ Consult nmcli(1) and nmcli-examples(5) manual pages for complete usage details.
 
 <<<
 size: 438
-location: clients/tests/test-client.py:827:test_001()/2
+location: clients/tests/test-client.py:841:test_001()/2
 cmd: $NMCLI 
 lang: pl_PL.UTF-8
 returncode: 0
@@ -33,7 +33,7 @@ o użyciu.
 
 <<<
 size: 188
-location: clients/tests/test-client.py:829:test_001()/3
+location: clients/tests/test-client.py:843:test_001()/3
 cmd: $NMCLI -f AP -mode multiline -p d show wlan0
 lang: C
 returncode: 10
@@ -43,7 +43,7 @@ Error: Device 'wlan0' not found.
 
 <<<
 size: 214
-location: clients/tests/test-client.py:829:test_001()/4
+location: clients/tests/test-client.py:843:test_001()/4
 cmd: $NMCLI -f AP -mode multiline -p d show wlan0
 lang: pl_PL.UTF-8
 returncode: 10
@@ -53,7 +53,7 @@ Błąd: Nie odnaleziono urządzenia „wlan0”.
 
 <<<
 size: 120
-location: clients/tests/test-client.py:831:test_001()/5
+location: clients/tests/test-client.py:845:test_001()/5
 cmd: $NMCLI c s
 lang: C
 returncode: 0
@@ -63,7 +63,7 @@ stdout: 1 bytes
 
 <<<
 size: 130
-location: clients/tests/test-client.py:831:test_001()/6
+location: clients/tests/test-client.py:845:test_001()/6
 cmd: $NMCLI c s
 lang: pl_PL.UTF-8
 returncode: 0
@@ -73,7 +73,7 @@ stdout: 1 bytes
 
 <<<
 size: 192
-location: clients/tests/test-client.py:833:test_001()/7
+location: clients/tests/test-client.py:847:test_001()/7
 cmd: $NMCLI bogus s
 lang: C
 returncode: 2
@@ -83,7 +83,7 @@ Error: argument 'bogus' not understood. Try passing --help instead.
 
 <<<
 size: 221
-location: clients/tests/test-client.py:833:test_001()/8
+location: clients/tests/test-client.py:847:test_001()/8
 cmd: $NMCLI bogus s
 lang: pl_PL.UTF-8
 returncode: 2
@@ -92,12 +92,12 @@ stderr: 87 bytes
 Błąd: nie zrozumiano parametru „bogus”. Można użyć „--help” zamiast tego.
 
 <<<
-size: 1413
-location: clients/tests/test-client.py:836:test_001()/9
+size: 1488
+location: clients/tests/test-client.py:850:test_001()/9
 cmd: $NMCLI general permissions
 lang: C
 returncode: 0
-stdout: 1275 bytes
+stdout: 1350 bytes
 >>>
 PERMISSION                                                        VALUE   
 org.freedesktop.NetworkManager.enable-disable-network             yes     
@@ -116,14 +116,15 @@ org.freedesktop.NetworkManager.reload                             no
 org.freedesktop.NetworkManager.checkpoint-rollback                unknown 
 org.freedesktop.NetworkManager.enable-disable-statistics          unknown 
 org.freedesktop.NetworkManager.enable-disable-connectivity-check  unknown 
+org.freedesktop.NetworkManager.wifi.scan                          unknown 
 
 <<<
-size: 1441
-location: clients/tests/test-client.py:836:test_001()/10
+size: 1517
+location: clients/tests/test-client.py:850:test_001()/10
 cmd: $NMCLI general permissions
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 1292 bytes
+stdout: 1368 bytes
 >>>
 PERMISSION                                                        VALUE    
 org.freedesktop.NetworkManager.enable-disable-network             tak      
@@ -142,14 +143,15 @@ org.freedesktop.NetworkManager.reload                             nie
 org.freedesktop.NetworkManager.checkpoint-rollback                nieznane 
 org.freedesktop.NetworkManager.enable-disable-statistics          nieznane 
 org.freedesktop.NetworkManager.enable-disable-connectivity-check  nieznane 
+org.freedesktop.NetworkManager.wifi.scan                          nieznane 
 
 <<<
-size: 1543
-location: clients/tests/test-client.py:836:test_001()/11
+size: 1618
+location: clients/tests/test-client.py:850:test_001()/11
 cmd: $NMCLI --color yes general permissions
 lang: C
 returncode: 0
-stdout: 1392 bytes
+stdout: 1467 bytes
 >>>
 PERMISSION                                                        VALUE   
 org.freedesktop.NetworkManager.enable-disable-network             yes     
@@ -168,14 +170,15 @@ org.freedesktop.NetworkManager.reload                             no
 org.freedesktop.NetworkManager.checkpoint-rollback                unknown 
 org.freedesktop.NetworkManager.enable-disable-statistics          unknown 
 org.freedesktop.NetworkManager.enable-disable-connectivity-check  unknown 
+org.freedesktop.NetworkManager.wifi.scan                          unknown 
 
 <<<
-size: 1570
-location: clients/tests/test-client.py:836:test_001()/12
+size: 1646
+location: clients/tests/test-client.py:850:test_001()/12
 cmd: $NMCLI --color yes general permissions
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 1409 bytes
+stdout: 1485 bytes
 >>>
 PERMISSION                                                        VALUE    
 org.freedesktop.NetworkManager.enable-disable-network             tak      
@@ -194,14 +197,15 @@ org.freedesktop.NetworkManager.reload                             nie
 org.freedesktop.NetworkManager.checkpoint-rollback                nieznane 
 org.freedesktop.NetworkManager.enable-disable-statistics          nieznane 
 org.freedesktop.NetworkManager.enable-disable-connectivity-check  nieznane 
+org.freedesktop.NetworkManager.wifi.scan                          nieznane 
 
 <<<
-size: 1620
-location: clients/tests/test-client.py:836:test_001()/13
+size: 1695
+location: clients/tests/test-client.py:850:test_001()/13
 cmd: $NMCLI --pretty general permissions
 lang: C
 returncode: 0
-stdout: 1472 bytes
+stdout: 1547 bytes
 >>>
 ==============================
   NetworkManager permissions
@@ -224,14 +228,15 @@ org.freedesktop.NetworkManager.reload                             no
 org.freedesktop.NetworkManager.checkpoint-rollback                unknown 
 org.freedesktop.NetworkManager.enable-disable-statistics          unknown 
 org.freedesktop.NetworkManager.enable-disable-connectivity-check  unknown 
+org.freedesktop.NetworkManager.wifi.scan                          unknown 
 
 <<<
-size: 1677
-location: clients/tests/test-client.py:836:test_001()/14
+size: 1753
+location: clients/tests/test-client.py:850:test_001()/14
 cmd: $NMCLI --pretty general permissions
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 1519 bytes
+stdout: 1595 bytes
 >>>
 =====================================
   Uprawnienia usługi NetworkManager
@@ -254,14 +259,15 @@ org.freedesktop.NetworkManager.reload                             nie
 org.freedesktop.NetworkManager.checkpoint-rollback                nieznane 
 org.freedesktop.NetworkManager.enable-disable-statistics          nieznane 
 org.freedesktop.NetworkManager.enable-disable-connectivity-check  nieznane 
+org.freedesktop.NetworkManager.wifi.scan                          nieznane 
 
 <<<
-size: 1749
-location: clients/tests/test-client.py:836:test_001()/15
+size: 1824
+location: clients/tests/test-client.py:850:test_001()/15
 cmd: $NMCLI --pretty --color yes general permissions
 lang: C
 returncode: 0
-stdout: 1589 bytes
+stdout: 1664 bytes
 >>>
 ==============================
   NetworkManager permissions
@@ -284,14 +290,15 @@ org.freedesktop.NetworkManager.reload                             no
 org.freedesktop.NetworkManager.checkpoint-rollback                unknown 
 org.freedesktop.NetworkManager.enable-disable-statistics          unknown 
 org.freedesktop.NetworkManager.enable-disable-connectivity-check  unknown 
+org.freedesktop.NetworkManager.wifi.scan                          unknown 
 
 <<<
-size: 1806
-location: clients/tests/test-client.py:836:test_001()/16
+size: 1882
+location: clients/tests/test-client.py:850:test_001()/16
 cmd: $NMCLI --pretty --color yes general permissions
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 1636 bytes
+stdout: 1712 bytes
 >>>
 =====================================
   Uprawnienia usługi NetworkManager
@@ -314,14 +321,15 @@ org.freedesktop.NetworkManager.reload                             nie
 org.freedesktop.NetworkManager.checkpoint-rollback                nieznane 
 org.freedesktop.NetworkManager.enable-disable-statistics          nieznane 
 org.freedesktop.NetworkManager.enable-disable-connectivity-check  nieznane 
+org.freedesktop.NetworkManager.wifi.scan                          nieznane 
 
 <<<
-size: 1045
-location: clients/tests/test-client.py:836:test_001()/17
+size: 1094
+location: clients/tests/test-client.py:850:test_001()/17
 cmd: $NMCLI --terse general permissions
 lang: C
 returncode: 0
-stdout: 899 bytes
+stdout: 948 bytes
 >>>
 org.freedesktop.NetworkManager.enable-disable-network:yes
 org.freedesktop.NetworkManager.enable-disable-wifi:yes
@@ -339,14 +347,15 @@ org.freedesktop.NetworkManager.reload:no
 org.freedesktop.NetworkManager.checkpoint-rollback:unknown
 org.freedesktop.NetworkManager.enable-disable-statistics:unknown
 org.freedesktop.NetworkManager.enable-disable-connectivity-check:unknown
+org.freedesktop.NetworkManager.wifi.scan:unknown
 
 <<<
-size: 1055
-location: clients/tests/test-client.py:836:test_001()/18
+size: 1104
+location: clients/tests/test-client.py:850:test_001()/18
 cmd: $NMCLI --terse general permissions
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 899 bytes
+stdout: 948 bytes
 >>>
 org.freedesktop.NetworkManager.enable-disable-network:yes
 org.freedesktop.NetworkManager.enable-disable-wifi:yes
@@ -364,14 +373,15 @@ org.freedesktop.NetworkManager.reload:no
 org.freedesktop.NetworkManager.checkpoint-rollback:unknown
 org.freedesktop.NetworkManager.enable-disable-statistics:unknown
 org.freedesktop.NetworkManager.enable-disable-connectivity-check:unknown
+org.freedesktop.NetworkManager.wifi.scan:unknown
 
 <<<
-size: 1175
-location: clients/tests/test-client.py:836:test_001()/19
+size: 1224
+location: clients/tests/test-client.py:850:test_001()/19
 cmd: $NMCLI --terse --color yes general permissions
 lang: C
 returncode: 0
-stdout: 1016 bytes
+stdout: 1065 bytes
 >>>
 org.freedesktop.NetworkManager.enable-disable-network:yes
 org.freedesktop.NetworkManager.enable-disable-wifi:yes
@@ -389,14 +399,15 @@ org.freedesktop.NetworkManager.reload:no
 org.freedesktop.NetworkManager.checkpoint-rollback:unknown
 org.freedesktop.NetworkManager.enable-disable-statistics:unknown
 org.freedesktop.NetworkManager.enable-disable-connectivity-check:unknown
+org.freedesktop.NetworkManager.wifi.scan:unknown
 
 <<<
-size: 1185
-location: clients/tests/test-client.py:836:test_001()/20
+size: 1234
+location: clients/tests/test-client.py:850:test_001()/20
 cmd: $NMCLI --terse --color yes general permissions
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 1016 bytes
+stdout: 1065 bytes
 >>>
 org.freedesktop.NetworkManager.enable-disable-network:yes
 org.freedesktop.NetworkManager.enable-disable-wifi:yes
@@ -414,14 +425,15 @@ org.freedesktop.NetworkManager.reload:no
 org.freedesktop.NetworkManager.checkpoint-rollback:unknown
 org.freedesktop.NetworkManager.enable-disable-statistics:unknown
 org.freedesktop.NetworkManager.enable-disable-connectivity-check:unknown
+org.freedesktop.NetworkManager.wifi.scan:unknown
 
 <<<
-size: 1429
-location: clients/tests/test-client.py:836:test_001()/21
+size: 1504
+location: clients/tests/test-client.py:850:test_001()/21
 cmd: $NMCLI --mode tabular general permissions
 lang: C
 returncode: 0
-stdout: 1275 bytes
+stdout: 1350 bytes
 >>>
 PERMISSION                                                        VALUE   
 org.freedesktop.NetworkManager.enable-disable-network             yes     
@@ -440,14 +452,15 @@ org.freedesktop.NetworkManager.reload                             no
 org.freedesktop.NetworkManager.checkpoint-rollback                unknown 
 org.freedesktop.NetworkManager.enable-disable-statistics          unknown 
 org.freedesktop.NetworkManager.enable-disable-connectivity-check  unknown 
+org.freedesktop.NetworkManager.wifi.scan                          unknown 
 
 <<<
-size: 1456
-location: clients/tests/test-client.py:836:test_001()/22
+size: 1532
+location: clients/tests/test-client.py:850:test_001()/22
 cmd: $NMCLI --mode tabular general permissions
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 1292 bytes
+stdout: 1368 bytes
 >>>
 PERMISSION                                                        VALUE    
 org.freedesktop.NetworkManager.enable-disable-network             tak      
@@ -466,14 +479,15 @@ org.freedesktop.NetworkManager.reload                             nie
 org.freedesktop.NetworkManager.checkpoint-rollback                nieznane 
 org.freedesktop.NetworkManager.enable-disable-statistics          nieznane 
 org.freedesktop.NetworkManager.enable-disable-connectivity-check  nieznane 
+org.freedesktop.NetworkManager.wifi.scan                          nieznane 
 
 <<<
-size: 1558
-location: clients/tests/test-client.py:836:test_001()/23
+size: 1633
+location: clients/tests/test-client.py:850:test_001()/23
 cmd: $NMCLI --mode tabular --color yes general permissions
 lang: C
 returncode: 0
-stdout: 1392 bytes
+stdout: 1467 bytes
 >>>
 PERMISSION                                                        VALUE   
 org.freedesktop.NetworkManager.enable-disable-network             yes     
@@ -492,14 +506,15 @@ org.freedesktop.NetworkManager.reload                             no
 org.freedesktop.NetworkManager.checkpoint-rollback                unknown 
 org.freedesktop.NetworkManager.enable-disable-statistics          unknown 
 org.freedesktop.NetworkManager.enable-disable-connectivity-check  unknown 
+org.freedesktop.NetworkManager.wifi.scan                          unknown 
 
 <<<
-size: 1585
-location: clients/tests/test-client.py:836:test_001()/24
+size: 1661
+location: clients/tests/test-client.py:850:test_001()/24
 cmd: $NMCLI --mode tabular --color yes general permissions
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 1409 bytes
+stdout: 1485 bytes
 >>>
 PERMISSION                                                        VALUE    
 org.freedesktop.NetworkManager.enable-disable-network             tak      
@@ -518,14 +533,15 @@ org.freedesktop.NetworkManager.reload                             nie
 org.freedesktop.NetworkManager.checkpoint-rollback                nieznane 
 org.freedesktop.NetworkManager.enable-disable-statistics          nieznane 
 org.freedesktop.NetworkManager.enable-disable-connectivity-check  nieznane 
+org.freedesktop.NetworkManager.wifi.scan                          nieznane 
 
 <<<
-size: 1635
-location: clients/tests/test-client.py:836:test_001()/25
+size: 1710
+location: clients/tests/test-client.py:850:test_001()/25
 cmd: $NMCLI --mode tabular --pretty general permissions
 lang: C
 returncode: 0
-stdout: 1472 bytes
+stdout: 1547 bytes
 >>>
 ==============================
   NetworkManager permissions
@@ -548,14 +564,15 @@ org.freedesktop.NetworkManager.reload                             no
 org.freedesktop.NetworkManager.checkpoint-rollback                unknown 
 org.freedesktop.NetworkManager.enable-disable-statistics          unknown 
 org.freedesktop.NetworkManager.enable-disable-connectivity-check  unknown 
+org.freedesktop.NetworkManager.wifi.scan                          unknown 
 
 <<<
-size: 1692
-location: clients/tests/test-client.py:836:test_001()/26
+size: 1768
+location: clients/tests/test-client.py:850:test_001()/26
 cmd: $NMCLI --mode tabular --pretty general permissions
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 1519 bytes
+stdout: 1595 bytes
 >>>
 =====================================
   Uprawnienia usługi NetworkManager
@@ -578,14 +595,15 @@ org.freedesktop.NetworkManager.reload                             nie
 org.freedesktop.NetworkManager.checkpoint-rollback                nieznane 
 org.freedesktop.NetworkManager.enable-disable-statistics          nieznane 
 org.freedesktop.NetworkManager.enable-disable-connectivity-check  nieznane 
+org.freedesktop.NetworkManager.wifi.scan                          nieznane 
 
 <<<
-size: 1764
-location: clients/tests/test-client.py:836:test_001()/27
+size: 1839
+location: clients/tests/test-client.py:850:test_001()/27
 cmd: $NMCLI --mode tabular --pretty --color yes general permissions
 lang: C
 returncode: 0
-stdout: 1589 bytes
+stdout: 1664 bytes
 >>>
 ==============================
   NetworkManager permissions
@@ -608,14 +626,15 @@ org.freedesktop.NetworkManager.reload                             no
 org.freedesktop.NetworkManager.checkpoint-rollback                unknown 
 org.freedesktop.NetworkManager.enable-disable-statistics          unknown 
 org.freedesktop.NetworkManager.enable-disable-connectivity-check  unknown 
+org.freedesktop.NetworkManager.wifi.scan                          unknown 
 
 <<<
-size: 1821
-location: clients/tests/test-client.py:836:test_001()/28
+size: 1897
+location: clients/tests/test-client.py:850:test_001()/28
 cmd: $NMCLI --mode tabular --pretty --color yes general permissions
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 1636 bytes
+stdout: 1712 bytes
 >>>
 =====================================
   Uprawnienia usługi NetworkManager
@@ -638,14 +657,15 @@ org.freedesktop.NetworkManager.reload                             nie
 org.freedesktop.NetworkManager.checkpoint-rollback                nieznane 
 org.freedesktop.NetworkManager.enable-disable-statistics          nieznane 
 org.freedesktop.NetworkManager.enable-disable-connectivity-check  nieznane 
+org.freedesktop.NetworkManager.wifi.scan                          nieznane 
 
 <<<
-size: 1060
-location: clients/tests/test-client.py:836:test_001()/29
+size: 1109
+location: clients/tests/test-client.py:850:test_001()/29
 cmd: $NMCLI --mode tabular --terse general permissions
 lang: C
 returncode: 0
-stdout: 899 bytes
+stdout: 948 bytes
 >>>
 org.freedesktop.NetworkManager.enable-disable-network:yes
 org.freedesktop.NetworkManager.enable-disable-wifi:yes
@@ -663,14 +683,15 @@ org.freedesktop.NetworkManager.reload:no
 org.freedesktop.NetworkManager.checkpoint-rollback:unknown
 org.freedesktop.NetworkManager.enable-disable-statistics:unknown
 org.freedesktop.NetworkManager.enable-disable-connectivity-check:unknown
+org.freedesktop.NetworkManager.wifi.scan:unknown
 
 <<<
-size: 1070
-location: clients/tests/test-client.py:836:test_001()/30
+size: 1119
+location: clients/tests/test-client.py:850:test_001()/30
 cmd: $NMCLI --mode tabular --terse general permissions
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 899 bytes
+stdout: 948 bytes
 >>>
 org.freedesktop.NetworkManager.enable-disable-network:yes
 org.freedesktop.NetworkManager.enable-disable-wifi:yes
@@ -688,14 +709,15 @@ org.freedesktop.NetworkManager.reload:no
 org.freedesktop.NetworkManager.checkpoint-rollback:unknown
 org.freedesktop.NetworkManager.enable-disable-statistics:unknown
 org.freedesktop.NetworkManager.enable-disable-connectivity-check:unknown
+org.freedesktop.NetworkManager.wifi.scan:unknown
 
 <<<
-size: 1190
-location: clients/tests/test-client.py:836:test_001()/31
+size: 1239
+location: clients/tests/test-client.py:850:test_001()/31
 cmd: $NMCLI --mode tabular --terse --color yes general permissions
 lang: C
 returncode: 0
-stdout: 1016 bytes
+stdout: 1065 bytes
 >>>
 org.freedesktop.NetworkManager.enable-disable-network:yes
 org.freedesktop.NetworkManager.enable-disable-wifi:yes
@@ -713,14 +735,15 @@ org.freedesktop.NetworkManager.reload:no
 org.freedesktop.NetworkManager.checkpoint-rollback:unknown
 org.freedesktop.NetworkManager.enable-disable-statistics:unknown
 org.freedesktop.NetworkManager.enable-disable-connectivity-check:unknown
+org.freedesktop.NetworkManager.wifi.scan:unknown
 
 <<<
-size: 1200
-location: clients/tests/test-client.py:836:test_001()/32
+size: 1249
+location: clients/tests/test-client.py:850:test_001()/32
 cmd: $NMCLI --mode tabular --terse --color yes general permissions
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 1016 bytes
+stdout: 1065 bytes
 >>>
 org.freedesktop.NetworkManager.enable-disable-network:yes
 org.freedesktop.NetworkManager.enable-disable-wifi:yes
@@ -738,14 +761,15 @@ org.freedesktop.NetworkManager.reload:no
 org.freedesktop.NetworkManager.checkpoint-rollback:unknown
 org.freedesktop.NetworkManager.enable-disable-statistics:unknown
 org.freedesktop.NetworkManager.enable-disable-connectivity-check:unknown
+org.freedesktop.NetworkManager.wifi.scan:unknown
 
 <<<
-size: 2335
-location: clients/tests/test-client.py:836:test_001()/33
+size: 2464
+location: clients/tests/test-client.py:850:test_001()/33
 cmd: $NMCLI --mode multiline general permissions
 lang: C
 returncode: 0
-stdout: 2179 bytes
+stdout: 2308 bytes
 >>>
 PERMISSION:                             org.freedesktop.NetworkManager.enable-disable-network
 VALUE:                                  yes
@@ -779,14 +803,16 @@ PERMISSION:                             org.freedesktop.NetworkManager.enable-di
 VALUE:                                  unknown
 PERMISSION:                             org.freedesktop.NetworkManager.enable-disable-connectivity-check
 VALUE:                                  unknown
+PERMISSION:                             org.freedesktop.NetworkManager.wifi.scan
+VALUE:                                  unknown
 
 <<<
-size: 2351
-location: clients/tests/test-client.py:836:test_001()/34
+size: 2481
+location: clients/tests/test-client.py:850:test_001()/34
 cmd: $NMCLI --mode multiline general permissions
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2185 bytes
+stdout: 2315 bytes
 >>>
 PERMISSION:                             org.freedesktop.NetworkManager.enable-disable-network
 VALUE:                                  tak
@@ -820,14 +846,16 @@ PERMISSION:                             org.freedesktop.NetworkManager.enable-di
 VALUE:                                  nieznane
 PERMISSION:                             org.freedesktop.NetworkManager.enable-disable-connectivity-check
 VALUE:                                  nieznane
+PERMISSION:                             org.freedesktop.NetworkManager.wifi.scan
+VALUE:                                  nieznane
 
 <<<
-size: 2464
-location: clients/tests/test-client.py:836:test_001()/35
+size: 2593
+location: clients/tests/test-client.py:850:test_001()/35
 cmd: $NMCLI --mode multiline --color yes general permissions
 lang: C
 returncode: 0
-stdout: 2296 bytes
+stdout: 2425 bytes
 >>>
 PERMISSION:                             org.freedesktop.NetworkManager.enable-disable-network
 VALUE:                                  yes
@@ -861,14 +889,16 @@ PERMISSION:                             org.freedesktop.NetworkManager.enable-di
 VALUE:                                  unknown
 PERMISSION:                             org.freedesktop.NetworkManager.enable-disable-connectivity-check
 VALUE:                                  unknown
+PERMISSION:                             org.freedesktop.NetworkManager.wifi.scan
+VALUE:                                  unknown
 
 <<<
-size: 2480
-location: clients/tests/test-client.py:836:test_001()/36
+size: 2610
+location: clients/tests/test-client.py:850:test_001()/36
 cmd: $NMCLI --mode multiline --color yes general permissions
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2302 bytes
+stdout: 2432 bytes
 >>>
 PERMISSION:                             org.freedesktop.NetworkManager.enable-disable-network
 VALUE:                                  tak
@@ -902,14 +932,16 @@ PERMISSION:                             org.freedesktop.NetworkManager.enable-di
 VALUE:                                  nieznane
 PERMISSION:                             org.freedesktop.NetworkManager.enable-disable-connectivity-check
 VALUE:                                  nieznane
+PERMISSION:                             org.freedesktop.NetworkManager.wifi.scan
+VALUE:                                  nieznane
 
 <<<
-size: 3837
-location: clients/tests/test-client.py:836:test_001()/37
+size: 4046
+location: clients/tests/test-client.py:850:test_001()/37
 cmd: $NMCLI --mode multiline --pretty general permissions
 lang: C
 returncode: 0
-stdout: 3672 bytes
+stdout: 3881 bytes
 >>>
 ===============================================================================
                           NetworkManager permissions
@@ -962,14 +994,17 @@ VALUE:                                  unknown
 PERMISSION:                             org.freedesktop.NetworkManager.enable-disable-connectivity-check
 VALUE:                                  unknown
 -------------------------------------------------------------------------------
+PERMISSION:                             org.freedesktop.NetworkManager.wifi.scan
+VALUE:                                  unknown
+-------------------------------------------------------------------------------
 
 <<<
-size: 3858
-location: clients/tests/test-client.py:836:test_001()/38
+size: 4068
+location: clients/tests/test-client.py:850:test_001()/38
 cmd: $NMCLI --mode multiline --pretty general permissions
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 3683 bytes
+stdout: 3893 bytes
 >>>
 ===============================================================================
                        Uprawnienia usługi NetworkManager
@@ -1022,14 +1057,17 @@ VALUE:                                  nieznane
 PERMISSION:                             org.freedesktop.NetworkManager.enable-disable-connectivity-check
 VALUE:                                  nieznane
 -------------------------------------------------------------------------------
+PERMISSION:                             org.freedesktop.NetworkManager.wifi.scan
+VALUE:                                  nieznane
+-------------------------------------------------------------------------------
 
 <<<
-size: 3966
-location: clients/tests/test-client.py:836:test_001()/39
+size: 4175
+location: clients/tests/test-client.py:850:test_001()/39
 cmd: $NMCLI --mode multiline --pretty --color yes general permissions
 lang: C
 returncode: 0
-stdout: 3789 bytes
+stdout: 3998 bytes
 >>>
 ===============================================================================
                           NetworkManager permissions
@@ -1082,14 +1120,17 @@ VALUE:                                  unknown
 PERMISSION:                             org.freedesktop.NetworkManager.enable-disable-connectivity-check
 VALUE:                                  unknown
 -------------------------------------------------------------------------------
+PERMISSION:                             org.freedesktop.NetworkManager.wifi.scan
+VALUE:                                  unknown
+-------------------------------------------------------------------------------
 
 <<<
-size: 3987
-location: clients/tests/test-client.py:836:test_001()/40
+size: 4197
+location: clients/tests/test-client.py:850:test_001()/40
 cmd: $NMCLI --mode multiline --pretty --color yes general permissions
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 3800 bytes
+stdout: 4010 bytes
 >>>
 ===============================================================================
                        Uprawnienia usługi NetworkManager
@@ -1142,14 +1183,17 @@ VALUE:                                  nieznane
 PERMISSION:                             org.freedesktop.NetworkManager.enable-disable-connectivity-check
 VALUE:                                  nieznane
 -------------------------------------------------------------------------------
+PERMISSION:                             org.freedesktop.NetworkManager.wifi.scan
+VALUE:                                  nieznane
+-------------------------------------------------------------------------------
 
 <<<
-size: 1335
-location: clients/tests/test-client.py:836:test_001()/41
+size: 1401
+location: clients/tests/test-client.py:850:test_001()/41
 cmd: $NMCLI --mode multiline --terse general permissions
 lang: C
 returncode: 0
-stdout: 1171 bytes
+stdout: 1237 bytes
 >>>
 PERMISSION:org.freedesktop.NetworkManager.enable-disable-network
 VALUE:yes
@@ -1183,14 +1227,16 @@ PERMISSION:org.freedesktop.NetworkManager.enable-disable-statistics
 VALUE:unknown
 PERMISSION:org.freedesktop.NetworkManager.enable-disable-connectivity-check
 VALUE:unknown
+PERMISSION:org.freedesktop.NetworkManager.wifi.scan
+VALUE:unknown
 
 <<<
-size: 1345
-location: clients/tests/test-client.py:836:test_001()/42
+size: 1411
+location: clients/tests/test-client.py:850:test_001()/42
 cmd: $NMCLI --mode multiline --terse general permissions
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 1171 bytes
+stdout: 1237 bytes
 >>>
 PERMISSION:org.freedesktop.NetworkManager.enable-disable-network
 VALUE:yes
@@ -1224,14 +1270,16 @@ PERMISSION:org.freedesktop.NetworkManager.enable-disable-statistics
 VALUE:unknown
 PERMISSION:org.freedesktop.NetworkManager.enable-disable-connectivity-check
 VALUE:unknown
+PERMISSION:org.freedesktop.NetworkManager.wifi.scan
+VALUE:unknown
 
 <<<
-size: 1464
-location: clients/tests/test-client.py:836:test_001()/43
+size: 1530
+location: clients/tests/test-client.py:850:test_001()/43
 cmd: $NMCLI --mode multiline --terse --color yes general permissions
 lang: C
 returncode: 0
-stdout: 1288 bytes
+stdout: 1354 bytes
 >>>
 PERMISSION:org.freedesktop.NetworkManager.enable-disable-network
 VALUE:yes
@@ -1265,14 +1313,16 @@ PERMISSION:org.freedesktop.NetworkManager.enable-disable-statistics
 VALUE:unknown
 PERMISSION:org.freedesktop.NetworkManager.enable-disable-connectivity-check
 VALUE:unknown
+PERMISSION:org.freedesktop.NetworkManager.wifi.scan
+VALUE:unknown
 
 <<<
-size: 1474
-location: clients/tests/test-client.py:836:test_001()/44
+size: 1540
+location: clients/tests/test-client.py:850:test_001()/44
 cmd: $NMCLI --mode multiline --terse --color yes general permissions
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 1288 bytes
+stdout: 1354 bytes
 >>>
 PERMISSION:org.freedesktop.NetworkManager.enable-disable-network
 VALUE:yes
@@ -1306,5 +1356,7 @@ PERMISSION:org.freedesktop.NetworkManager.enable-disable-statistics
 VALUE:unknown
 PERMISSION:org.freedesktop.NetworkManager.enable-disable-connectivity-check
 VALUE:unknown
+PERMISSION:org.freedesktop.NetworkManager.wifi.scan
+VALUE:unknown
 
 <<<
diff --git a/clients/tests/test-client.check-on-disk/test_002.expected b/clients/tests/test-client.check-on-disk/test_002.expected
index 3802657b..a80fa009 100644
--- a/clients/tests/test-client.check-on-disk/test_002.expected
+++ b/clients/tests/test-client.check-on-disk/test_002.expected
@@ -1,5 +1,5 @@
 size: 377
-location: clients/tests/test-client.py:842:test_002()/1
+location: clients/tests/test-client.py:856:test_002()/1
 cmd: $NMCLI d
 lang: C
 returncode: 0
@@ -14,7 +14,7 @@ wlan1   wifi      unavailable  --
 
 <<<
 size: 392
-location: clients/tests/test-client.py:842:test_002()/2
+location: clients/tests/test-client.py:856:test_002()/2
 cmd: $NMCLI d
 lang: pl_PL.UTF-8
 returncode: 0
@@ -28,38 +28,38 @@ wlan1   wifi      niedostępne  --
 wlan1   wifi      niedostępne  --         
 
 <<<
-size: 762
-location: clients/tests/test-client.py:844:test_002()/3
+size: 978
+location: clients/tests/test-client.py:858:test_002()/3
 cmd: $NMCLI -f all d
 lang: C
 returncode: 0
-stdout: 636 bytes
+stdout: 852 bytes
 >>>
-DEVICE  TYPE      STATE        DBUS-PATH                                  CONNECTION  CON-UUID  CON-PATH 
-eth0    ethernet  unavailable  /org/freedesktop/NetworkManager/Devices/1  --          --        --       
-eth1    ethernet  unavailable  /org/freedesktop/NetworkManager/Devices/2  --          --        --       
-wlan0   wifi      unavailable  /org/freedesktop/NetworkManager/Devices/3  --          --        --       
-wlan1   wifi      unavailable  /org/freedesktop/NetworkManager/Devices/4  --          --        --       
-wlan1   wifi      unavailable  /org/freedesktop/NetworkManager/Devices/5  --          --        --       
+DEVICE  TYPE      STATE        IP4-CONNECTIVITY  IP6-CONNECTIVITY  DBUS-PATH                                  CONNECTION  CON-UUID  CON-PATH 
+eth0    ethernet  unavailable  unknown           unknown           /org/freedesktop/NetworkManager/Devices/1  --          --        --       
+eth1    ethernet  unavailable  unknown           unknown           /org/freedesktop/NetworkManager/Devices/2  --          --        --       
+wlan0   wifi      unavailable  unknown           unknown           /org/freedesktop/NetworkManager/Devices/3  --          --        --       
+wlan1   wifi      unavailable  unknown           unknown           /org/freedesktop/NetworkManager/Devices/4  --          --        --       
+wlan1   wifi      unavailable  unknown           unknown           /org/freedesktop/NetworkManager/Devices/5  --          --        --       
 
 <<<
-size: 777
-location: clients/tests/test-client.py:844:test_002()/4
+size: 993
+location: clients/tests/test-client.py:858:test_002()/4
 cmd: $NMCLI -f all d
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 641 bytes
+stdout: 857 bytes
 >>>
-DEVICE  TYPE      STATE        DBUS-PATH                                  CONNECTION  CON-UUID  CON-PATH 
-eth0    ethernet  niedostępne  /org/freedesktop/NetworkManager/Devices/1  --          --        --       
-eth1    ethernet  niedostępne  /org/freedesktop/NetworkManager/Devices/2  --          --        --       
-wlan0   wifi      niedostępne  /org/freedesktop/NetworkManager/Devices/3  --          --        --       
-wlan1   wifi      niedostępne  /org/freedesktop/NetworkManager/Devices/4  --          --        --       
-wlan1   wifi      niedostępne  /org/freedesktop/NetworkManager/Devices/5  --          --        --       
+DEVICE  TYPE      STATE        IP4-CONNECTIVITY  IP6-CONNECTIVITY  DBUS-PATH                                  CONNECTION  CON-UUID  CON-PATH 
+eth0    ethernet  niedostępne  nieznane          nieznane          /org/freedesktop/NetworkManager/Devices/1  --          --        --       
+eth1    ethernet  niedostępne  nieznane          nieznane          /org/freedesktop/NetworkManager/Devices/2  --          --        --       
+wlan0   wifi      niedostępne  nieznane          nieznane          /org/freedesktop/NetworkManager/Devices/3  --          --        --       
+wlan1   wifi      niedostępne  nieznane          nieznane          /org/freedesktop/NetworkManager/Devices/4  --          --        --       
+wlan1   wifi      niedostępne  nieznane          nieznane          /org/freedesktop/NetworkManager/Devices/5  --          --        --       
 
 <<<
 size: 739
-location: clients/tests/test-client.py:846:test_002()/5
+location: clients/tests/test-client.py:860:test_002()/5
 cmd: $NMCLI 
 lang: C
 returncode: 0
@@ -95,7 +95,7 @@ Consult nmcli(1) and nmcli-examples(5) manual pages for complete usage details.
 
 <<<
 size: 812
-location: clients/tests/test-client.py:846:test_002()/6
+location: clients/tests/test-client.py:860:test_002()/6
 cmd: $NMCLI 
 lang: pl_PL.UTF-8
 returncode: 0
@@ -132,12 +132,12 @@ Strony podręcznika nmcli(1) i nmcli-examples(5) zawierają pełne informacje
 o użyciu.
 
 <<<
-size: 1260
-location: clients/tests/test-client.py:848:test_002()/7
+size: 1250
+location: clients/tests/test-client.py:862:test_002()/7
 cmd: $NMCLI -f AP -mode multiline d show wlan0
 lang: C
 returncode: 0
-stdout: 1107 bytes
+stdout: 1097 bytes
 >>>
 AP[1].IN-USE:                            
 AP[1].SSID:                             wlan0-ap-3
@@ -146,7 +146,7 @@ AP[1].CHAN:                             1
 AP[1].RATE:                             54 Mbit/s
 AP[1].SIGNAL:                           55
 AP[1].BARS:                             **  
-AP[1].SECURITY:                         WPA1 WPA2
+AP[1].SECURITY:                         WPA3
 AP[2].IN-USE:                            
 AP[2].SSID:                             wlan0-ap-1
 AP[2].MODE:                             Infra
@@ -154,7 +154,7 @@ AP[2].CHAN:                             1
 AP[2].RATE:                             54 Mbit/s
 AP[2].SIGNAL:                           44
 AP[2].BARS:                             **  
-AP[2].SECURITY:                         WPA1 WPA2
+AP[2].SECURITY:                         WPA1
 AP[3].IN-USE:                            
 AP[3].SSID:                             wlan0-ap-2
 AP[3].MODE:                             Infra
@@ -165,12 +165,12 @@ AP[3].BARS:                             **
 AP[3].SECURITY:                         WPA1 WPA2
 
 <<<
-size: 1297
-location: clients/tests/test-client.py:848:test_002()/8
+size: 1287
+location: clients/tests/test-client.py:862:test_002()/8
 cmd: $NMCLI -f AP -mode multiline d show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 1134 bytes
+stdout: 1124 bytes
 >>>
 AP[1].IN-USE:                            
 AP[1].SSID:                             wlan0-ap-3
@@ -179,7 +179,7 @@ AP[1].CHAN:                             1
 AP[1].RATE:                             54 Mb/s
 AP[1].SIGNAL:                           55
 AP[1].BARS:                             **  
-AP[1].SECURITY:                         WPA1 WPA2
+AP[1].SECURITY:                         WPA3
 AP[2].IN-USE:                            
 AP[2].SSID:                             wlan0-ap-1
 AP[2].MODE:                             Infrastruktura
@@ -187,7 +187,7 @@ AP[2].CHAN:                             1
 AP[2].RATE:                             54 Mb/s
 AP[2].SIGNAL:                           44
 AP[2].BARS:                             **  
-AP[2].SECURITY:                         WPA1 WPA2
+AP[2].SECURITY:                         WPA1
 AP[3].IN-USE:                            
 AP[3].SSID:                             wlan0-ap-2
 AP[3].MODE:                             Infrastruktura
@@ -198,12 +198,12 @@ AP[3].BARS:                             **
 AP[3].SECURITY:                         WPA1 WPA2
 
 <<<
-size: 1714
-location: clients/tests/test-client.py:849:test_002()/9
+size: 1704
+location: clients/tests/test-client.py:863:test_002()/9
 cmd: $NMCLI -f AP -mode multiline -p d show wlan0
 lang: C
 returncode: 0
-stdout: 1558 bytes
+stdout: 1548 bytes
 >>>
 ===============================================================================
                             Device details (wlan0)
@@ -215,7 +215,7 @@ AP[1].CHAN:                             1
 AP[1].RATE:                             54 Mbit/s
 AP[1].SIGNAL:                           55
 AP[1].BARS:                             **  
-AP[1].SECURITY:                         WPA1 WPA2
+AP[1].SECURITY:                         WPA3
 -------------------------------------------------------------------------------
 AP[2].IN-USE:                            
 AP[2].SSID:                             wlan0-ap-1
@@ -224,7 +224,7 @@ AP[2].CHAN:                             1
 AP[2].RATE:                             54 Mbit/s
 AP[2].SIGNAL:                           44
 AP[2].BARS:                             **  
-AP[2].SECURITY:                         WPA1 WPA2
+AP[2].SECURITY:                         WPA1
 -------------------------------------------------------------------------------
 AP[3].IN-USE:                            
 AP[3].SSID:                             wlan0-ap-2
@@ -237,12 +237,12 @@ AP[3].SECURITY:                         WPA1 WPA2
 -------------------------------------------------------------------------------
 
 <<<
-size: 1759
-location: clients/tests/test-client.py:849:test_002()/10
+size: 1749
+location: clients/tests/test-client.py:863:test_002()/10
 cmd: $NMCLI -f AP -mode multiline -p d show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 1592 bytes
+stdout: 1582 bytes
 >>>
 ===============================================================================
                         Informacje o urządzeniu (wlan0)
@@ -254,7 +254,7 @@ AP[1].CHAN:                             1
 AP[1].RATE:                             54 Mb/s
 AP[1].SIGNAL:                           55
 AP[1].BARS:                             **  
-AP[1].SECURITY:                         WPA1 WPA2
+AP[1].SECURITY:                         WPA3
 -------------------------------------------------------------------------------
 AP[2].IN-USE:                            
 AP[2].SSID:                             wlan0-ap-1
@@ -263,7 +263,7 @@ AP[2].CHAN:                             1
 AP[2].RATE:                             54 Mb/s
 AP[2].SIGNAL:                           44
 AP[2].BARS:                             **  
-AP[2].SECURITY:                         WPA1 WPA2
+AP[2].SECURITY:                         WPA1
 -------------------------------------------------------------------------------
 AP[3].IN-USE:                            
 AP[3].SSID:                             wlan0-ap-2
@@ -276,12 +276,12 @@ AP[3].SECURITY:                         WPA1 WPA2
 -------------------------------------------------------------------------------
 
 <<<
-size: 591
-location: clients/tests/test-client.py:850:test_002()/11
+size: 581
+location: clients/tests/test-client.py:864:test_002()/11
 cmd: $NMCLI -f AP -mode multiline -t d show wlan0
 lang: C
 returncode: 0
-stdout: 435 bytes
+stdout: 425 bytes
 >>>
 AP[1].IN-USE: 
 AP[1].SSID:wlan0-ap-3
@@ -290,7 +290,7 @@ AP[1].CHAN:1
 AP[1].RATE:54 Mbit/s
 AP[1].SIGNAL:55
 AP[1].BARS:**  
-AP[1].SECURITY:WPA1 WPA2
+AP[1].SECURITY:WPA3
 AP[2].IN-USE: 
 AP[2].SSID:wlan0-ap-1
 AP[2].MODE:Infra
@@ -298,7 +298,7 @@ AP[2].CHAN:1
 AP[2].RATE:54 Mbit/s
 AP[2].SIGNAL:44
 AP[2].BARS:**  
-AP[2].SECURITY:WPA1 WPA2
+AP[2].SECURITY:WPA1
 AP[3].IN-USE: 
 AP[3].SSID:wlan0-ap-2
 AP[3].MODE:Infra
@@ -309,12 +309,12 @@ AP[3].BARS:**
 AP[3].SECURITY:WPA1 WPA2
 
 <<<
-size: 628
-location: clients/tests/test-client.py:850:test_002()/12
+size: 618
+location: clients/tests/test-client.py:864:test_002()/12
 cmd: $NMCLI -f AP -mode multiline -t d show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 462 bytes
+stdout: 452 bytes
 >>>
 AP[1].IN-USE: 
 AP[1].SSID:wlan0-ap-3
@@ -323,7 +323,7 @@ AP[1].CHAN:1
 AP[1].RATE:54 Mb/s
 AP[1].SIGNAL:55
 AP[1].BARS:**  
-AP[1].SECURITY:WPA1 WPA2
+AP[1].SECURITY:WPA3
 AP[2].IN-USE: 
 AP[2].SSID:wlan0-ap-1
 AP[2].MODE:Infrastruktura
@@ -331,7 +331,7 @@ AP[2].CHAN:1
 AP[2].RATE:54 Mb/s
 AP[2].SIGNAL:44
 AP[2].BARS:**  
-AP[2].SECURITY:WPA1 WPA2
+AP[2].SECURITY:WPA1
 AP[3].IN-USE: 
 AP[3].SSID:wlan0-ap-2
 AP[3].MODE:Infrastruktura
@@ -343,33 +343,33 @@ AP[3].SECURITY:WPA1 WPA2
 
 <<<
 size: 455
-location: clients/tests/test-client.py:851:test_002()/13
+location: clients/tests/test-client.py:865:test_002()/13
 cmd: $NMCLI -f AP -mode tabular d show wlan0
 lang: C
 returncode: 0
 stdout: 304 bytes
 >>>
 NAME   IN-USE  SSID        MODE   CHAN  RATE       SIGNAL  BARS  SECURITY  
-AP[1]          wlan0-ap-3  Infra  1     54 Mbit/s  55      **    WPA1 WPA2 
-AP[2]          wlan0-ap-1  Infra  1     54 Mbit/s  44      **    WPA1 WPA2 
+AP[1]          wlan0-ap-3  Infra  1     54 Mbit/s  55      **    WPA3      
+AP[2]          wlan0-ap-1  Infra  1     54 Mbit/s  44      **    WPA1      
 AP[3]          wlan0-ap-2  Infra  1     54 Mbit/s  34      **    WPA1 WPA2 
 
 <<<
 size: 499
-location: clients/tests/test-client.py:851:test_002()/14
+location: clients/tests/test-client.py:865:test_002()/14
 cmd: $NMCLI -f AP -mode tabular d show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
 stdout: 338 bytes
 >>>
 NAME   IN-USE  SSID        MODE            CHAN  RATE     SIGNAL  BARS  SECURITY  
-AP[1]          wlan0-ap-3  Infrastruktura  1     54 Mb/s  55      **    WPA1 WPA2 
-AP[2]          wlan0-ap-1  Infrastruktura  1     54 Mb/s  44      **    WPA1 WPA2 
+AP[1]          wlan0-ap-3  Infrastruktura  1     54 Mb/s  55      **    WPA3      
+AP[2]          wlan0-ap-1  Infrastruktura  1     54 Mb/s  44      **    WPA1      
 AP[3]          wlan0-ap-2  Infrastruktura  1     54 Mb/s  34      **    WPA1 WPA2 
 
 <<<
 size: 614
-location: clients/tests/test-client.py:852:test_002()/15
+location: clients/tests/test-client.py:866:test_002()/15
 cmd: $NMCLI -f AP -mode tabular -p d show wlan0
 lang: C
 returncode: 0
@@ -380,13 +380,13 @@ stdout: 460 bytes
 ==========================
 NAME   IN-USE  SSID        MODE   CHAN  RATE       SIGNAL  BARS  SECURITY  
 ----------------------------------------------------------------------------
-AP[1]          wlan0-ap-3  Infra  1     54 Mbit/s  55      **    WPA1 WPA2 
-AP[2]          wlan0-ap-1  Infra  1     54 Mbit/s  44      **    WPA1 WPA2 
+AP[1]          wlan0-ap-3  Infra  1     54 Mbit/s  55      **    WPA3      
+AP[2]          wlan0-ap-1  Infra  1     54 Mbit/s  44      **    WPA1      
 AP[3]          wlan0-ap-2  Infra  1     54 Mbit/s  34      **    WPA1 WPA2 
 
 <<<
 size: 694
-location: clients/tests/test-client.py:852:test_002()/16
+location: clients/tests/test-client.py:866:test_002()/16
 cmd: $NMCLI -f AP -mode tabular -p d show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
@@ -397,45 +397,45 @@ stdout: 530 bytes
 ===================================
 NAME   IN-USE  SSID        MODE            CHAN  RATE     SIGNAL  BARS  SECURITY  
 -----------------------------------------------------------------------------------
-AP[1]          wlan0-ap-3  Infrastruktura  1     54 Mb/s  55      **    WPA1 WPA2 
-AP[2]          wlan0-ap-1  Infrastruktura  1     54 Mb/s  44      **    WPA1 WPA2 
+AP[1]          wlan0-ap-3  Infrastruktura  1     54 Mb/s  55      **    WPA3      
+AP[2]          wlan0-ap-1  Infrastruktura  1     54 Mb/s  44      **    WPA1      
 AP[3]          wlan0-ap-2  Infrastruktura  1     54 Mb/s  34      **    WPA1 WPA2 
 
 <<<
-size: 319
-location: clients/tests/test-client.py:853:test_002()/17
+size: 309
+location: clients/tests/test-client.py:867:test_002()/17
 cmd: $NMCLI -f AP -mode tabular -t d show wlan0
 lang: C
 returncode: 0
-stdout: 165 bytes
+stdout: 155 bytes
 >>>
-AP[1]: :wlan0-ap-3:Infra:1:54 Mbit/s:55:**  :WPA1 WPA2
-AP[2]: :wlan0-ap-1:Infra:1:54 Mbit/s:44:**  :WPA1 WPA2
+AP[1]: :wlan0-ap-3:Infra:1:54 Mbit/s:55:**  :WPA3
+AP[2]: :wlan0-ap-1:Infra:1:54 Mbit/s:44:**  :WPA1
 AP[3]: :wlan0-ap-2:Infra:1:54 Mbit/s:34:**  :WPA1 WPA2
 
 <<<
-size: 356
-location: clients/tests/test-client.py:853:test_002()/18
+size: 346
+location: clients/tests/test-client.py:867:test_002()/18
 cmd: $NMCLI -f AP -mode tabular -t d show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 192 bytes
+stdout: 182 bytes
 >>>
-AP[1]: :wlan0-ap-3:Infrastruktura:1:54 Mb/s:55:**  :WPA1 WPA2
-AP[2]: :wlan0-ap-1:Infrastruktura:1:54 Mb/s:44:**  :WPA1 WPA2
+AP[1]: :wlan0-ap-3:Infrastruktura:1:54 Mb/s:55:**  :WPA3
+AP[2]: :wlan0-ap-1:Infrastruktura:1:54 Mb/s:44:**  :WPA1
 AP[3]: :wlan0-ap-2:Infrastruktura:1:54 Mb/s:34:**  :WPA1 WPA2
 
 <<<
 size: 1973
-location: clients/tests/test-client.py:855:test_002()/19
+location: clients/tests/test-client.py:869:test_002()/19
 cmd: $NMCLI -f ALL d wifi
 lang: C
 returncode: 0
 stdout: 1840 bytes
 >>>
 NAME   SSID        SSID-HEX              BSSID              MODE   CHAN  FREQ      RATE       SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
-AP[1]  wlan0-ap-3  776C616E302D61702D33  60:B3:25:25:E2:C8  Infra  1     2412 MHz  54 Mbit/s  55      **    WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/3 
-AP[2]  wlan0-ap-1  776C616E302D61702D31  90:B1:5F:9E:E0:E3  Infra  1     2412 MHz  54 Mbit/s  44      **    WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/1 
+AP[1]  wlan0-ap-3  776C616E302D61702D33  60:B3:25:25:E2:C8  Infra  1     2412 MHz  54 Mbit/s  55      **    WPA3       (none)                                         pair_tkip pair_ccmp group_tkip group_ccmp sae  wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/3 
+AP[2]  wlan0-ap-1  776C616E302D61702D31  90:B1:5F:9E:E0:E3  Infra  1     2412 MHz  54 Mbit/s  44      **    WPA1       pair_tkip pair_ccmp group_tkip group_ccmp psk  (none)                                         wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/1 
 AP[3]  wlan0-ap-2  776C616E302D61702D32  61:66:D2:E7:44:A2  Infra  1     2412 MHz  54 Mbit/s  34      **    WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/2 
 
 NAME   SSID        SSID-HEX              BSSID              MODE   CHAN  FREQ      RATE       SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
@@ -445,15 +445,15 @@ NAME  SSID  SSID-HEX  BSSID  MODE  CHAN  FREQ  RATE  SIGNAL  BARS  SECURITY  WPA
 
 <<<
 size: 2041
-location: clients/tests/test-client.py:855:test_002()/20
+location: clients/tests/test-client.py:869:test_002()/20
 cmd: $NMCLI -f ALL d wifi
 lang: pl_PL.UTF-8
 returncode: 0
 stdout: 1898 bytes
 >>>
 NAME   SSID        SSID-HEX              BSSID              MODE            CHAN  FREQ      RATE     SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
-AP[1]  wlan0-ap-3  776C616E302D61702D33  60:B3:25:25:E2:C8  Infrastruktura  1     2412 MHz  54 Mb/s  55      **    WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/3 
-AP[2]  wlan0-ap-1  776C616E302D61702D31  90:B1:5F:9E:E0:E3  Infrastruktura  1     2412 MHz  54 Mb/s  44      **    WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/1 
+AP[1]  wlan0-ap-3  776C616E302D61702D33  60:B3:25:25:E2:C8  Infrastruktura  1     2412 MHz  54 Mb/s  55      **    WPA3       (brak)                                         pair_tkip pair_ccmp group_tkip group_ccmp sae  wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/3 
+AP[2]  wlan0-ap-1  776C616E302D61702D31  90:B1:5F:9E:E0:E3  Infrastruktura  1     2412 MHz  54 Mb/s  44      **    WPA1       pair_tkip pair_ccmp group_tkip group_ccmp psk  (brak)                                         wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/1 
 AP[3]  wlan0-ap-2  776C616E302D61702D32  61:66:D2:E7:44:A2  Infrastruktura  1     2412 MHz  54 Mb/s  34      **    WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/2 
 
 NAME   SSID        SSID-HEX              BSSID              MODE            CHAN  FREQ      RATE     SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
@@ -463,7 +463,7 @@ NAME  SSID  SSID-HEX  BSSID  MODE  CHAN  FREQ  RATE  SIGNAL  BARS  SECURITY  WPA
 
 <<<
 size: 246
-location: clients/tests/test-client.py:857:test_002()/21
+location: clients/tests/test-client.py:871:test_002()/21
 cmd: $NMCLI c
 lang: C
 returncode: 0
@@ -474,7 +474,7 @@ con-1  5fcfd6d7-1e63-3332-8826-a7eda103792d  ethernet  --
 
 <<<
 size: 256
-location: clients/tests/test-client.py:857:test_002()/22
+location: clients/tests/test-client.py:871:test_002()/22
 cmd: $NMCLI c
 lang: pl_PL.UTF-8
 returncode: 0
@@ -485,7 +485,7 @@ con-1  5fcfd6d7-1e63-3332-8826-a7eda103792d  ethernet  --
 
 <<<
 size: 1224
-location: clients/tests/test-client.py:859:test_002()/23
+location: clients/tests/test-client.py:873:test_002()/23
 cmd: $NMCLI c s con-1
 lang: C
 returncode: 0
@@ -517,7 +517,7 @@ connection.llmnr:                       -1 (default)
 
 <<<
 size: 1236
-location: clients/tests/test-client.py:859:test_002()/24
+location: clients/tests/test-client.py:873:test_002()/24
 cmd: $NMCLI c s con-1
 lang: pl_PL.UTF-8
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_003.expected b/clients/tests/test-client.check-on-disk/test_003.expected
index 5c522e51..c2eac2c6 100644
--- a/clients/tests/test-client.check-on-disk/test_003.expected
+++ b/clients/tests/test-client.check-on-disk/test_003.expected
@@ -1,5 +1,5 @@
 size: 244
-location: clients/tests/test-client.py:870:test_003()/1
+location: clients/tests/test-client.py:884:test_003()/1
 cmd: $NMCLI c add type ethernet ifname '*' con-name con-xx1
 lang: C
 returncode: 0
@@ -9,7 +9,7 @@ Connection 'con-xx1' (UUID-con-xx1-REPLACED-REPLACED-REPLA) successfully added.
 
 <<<
 size: 316
-location: clients/tests/test-client.py:873:test_003()/2
+location: clients/tests/test-client.py:887:test_003()/2
 cmd: $NMCLI c s
 lang: C
 returncode: 0
@@ -21,7 +21,7 @@ con-xx1  UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet  --
 
 <<<
 size: 326
-location: clients/tests/test-client.py:873:test_003()/3
+location: clients/tests/test-client.py:887:test_003()/3
 cmd: $NMCLI c s
 lang: pl_PL.UTF-8
 returncode: 0
@@ -33,7 +33,7 @@ con-xx1  UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet  --
 
 <<<
 size: 332
-location: clients/tests/test-client.py:878:test_003()/4
+location: clients/tests/test-client.py:892:test_003()/4
 cmd: $NMCLI connection add type gsm autoconnect no con-name con-gsm1 ifname '*' apn xyz.con-gsm1 serial.baud 5 serial.send-delay 100 serial.pari 1
 lang: C
 returncode: 0
@@ -43,7 +43,7 @@ Connection 'con-gsm1' (UUID-con-gsm1-REPLACED-REPLACED-REPL) successfully added.
 
 <<<
 size: 228
-location: clients/tests/test-client.py:883:test_003()/5
+location: clients/tests/test-client.py:897:test_003()/5
 cmd: $NMCLI c add type ethernet ifname '*'
 lang: C
 returncode: 0
@@ -53,7 +53,7 @@ Connection 'ethernet' (UUID-ethernet-REPLACED-REPLACED-REPL) successfully added.
 
 <<<
 size: 451
-location: clients/tests/test-client.py:886:test_003()/6
+location: clients/tests/test-client.py:900:test_003()/6
 cmd: $NMCLI c s
 lang: C
 returncode: 0
@@ -67,7 +67,7 @@ ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  --
 
 <<<
 size: 461
-location: clients/tests/test-client.py:886:test_003()/7
+location: clients/tests/test-client.py:900:test_003()/7
 cmd: $NMCLI c s
 lang: pl_PL.UTF-8
 returncode: 0
@@ -81,7 +81,7 @@ ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  --
 
 <<<
 size: 1514
-location: clients/tests/test-client.py:889:test_003()/8
+location: clients/tests/test-client.py:903:test_003()/8
 cmd: $NMCLI -f ALL c s
 lang: C
 returncode: 0
@@ -95,7 +95,7 @@ ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  0          never
 
 <<<
 size: 1524
-location: clients/tests/test-client.py:889:test_003()/9
+location: clients/tests/test-client.py:903:test_003()/9
 cmd: $NMCLI -f ALL c s
 lang: pl_PL.UTF-8
 returncode: 0
@@ -109,7 +109,7 @@ ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  0          nigdy
 
 <<<
 size: 229
-location: clients/tests/test-client.py:893:test_003()/10
+location: clients/tests/test-client.py:907:test_003()/10
 cmd: $NMCLI --complete-args -f ALL c s ''
 lang: C
 returncode: 0
@@ -130,7 +130,7 @@ path
 uuid
 <<<
 size: 239
-location: clients/tests/test-client.py:893:test_003()/11
+location: clients/tests/test-client.py:907:test_003()/11
 cmd: $NMCLI --complete-args -f ALL c s ''
 lang: pl_PL.UTF-8
 returncode: 0
@@ -150,12 +150,12 @@ id
 path
 uuid
 <<<
-size: 3989
-location: clients/tests/test-client.py:896:test_003()/12
+size: 3987
+location: clients/tests/test-client.py:910:test_003()/12
 cmd: $NMCLI con s con-gsm1
 lang: C
 returncode: 0
-stdout: 3855 bytes
+stdout: 3853 bytes
 >>>
 connection.id:                          con-gsm1
 connection.uuid:                        UUID-con-gsm1-REPLACED-REPLACED-REPL
@@ -225,7 +225,7 @@ serial.bits:                            8
 serial.parity:                          even
 serial.stopbits:                        1
 serial.send-delay:                      100
-gsm.number:                             *99#
+gsm.number:                             --
 gsm.username:                           --
 gsm.password:                           
 gsm.password-flags:                     0 (none)
@@ -244,12 +244,12 @@ proxy.pac-url:                          --
 proxy.pac-script:                       --
 
 <<<
-size: 4018
-location: clients/tests/test-client.py:896:test_003()/13
+size: 4016
+location: clients/tests/test-client.py:910:test_003()/13
 cmd: $NMCLI con s con-gsm1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 3874 bytes
+stdout: 3872 bytes
 >>>
 connection.id:                          con-gsm1
 connection.uuid:                        UUID-con-gsm1-REPLACED-REPLACED-REPL
@@ -319,7 +319,7 @@ serial.bits:                            8
 serial.parity:                          even
 serial.stopbits:                        1
 serial.send-delay:                      100
-gsm.number:                             *99#
+gsm.number:                             --
 gsm.username:                           --
 gsm.password:                           
 gsm.password-flags:                     0 (brak)
@@ -339,7 +339,7 @@ proxy.pac-script:                       --
 
 <<<
 size: 252
-location: clients/tests/test-client.py:909:test_003()/14
+location: clients/tests/test-client.py:923:test_003()/14
 cmd: $NMCLI con up ethernet ifname eth0
 lang: C
 returncode: 0
@@ -349,7 +349,7 @@ Connection successfully activated (D-Bus active path: /org/freedesktop/NetworkMa
 
 <<<
 size: 452
-location: clients/tests/test-client.py:912:test_003()/15
+location: clients/tests/test-client.py:926:test_003()/15
 cmd: $NMCLI con
 lang: C
 returncode: 0
@@ -363,7 +363,7 @@ con-xx1   UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet  --
 
 <<<
 size: 462
-location: clients/tests/test-client.py:912:test_003()/16
+location: clients/tests/test-client.py:926:test_003()/16
 cmd: $NMCLI con
 lang: pl_PL.UTF-8
 returncode: 0
@@ -377,7 +377,7 @@ con-xx1   UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet  --
 
 <<<
 size: 1730
-location: clients/tests/test-client.py:915:test_003()/17
+location: clients/tests/test-client.py:929:test_003()/17
 cmd: $NMCLI -f ALL con
 lang: C
 returncode: 0
@@ -391,7 +391,7 @@ con-xx1   UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet  0          never
 
 <<<
 size: 1745
-location: clients/tests/test-client.py:915:test_003()/18
+location: clients/tests/test-client.py:929:test_003()/18
 cmd: $NMCLI -f ALL con
 lang: pl_PL.UTF-8
 returncode: 0
@@ -405,7 +405,7 @@ con-xx1   UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet  0          nigdy
 
 <<<
 size: 774
-location: clients/tests/test-client.py:918:test_003()/19
+location: clients/tests/test-client.py:932:test_003()/19
 cmd: $NMCLI -f ALL con s -a
 lang: C
 returncode: 0
@@ -416,7 +416,7 @@ ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  0          never
 
 <<<
 size: 786
-location: clients/tests/test-client.py:918:test_003()/20
+location: clients/tests/test-client.py:932:test_003()/20
 cmd: $NMCLI -f ALL con s -a
 lang: pl_PL.UTF-8
 returncode: 0
@@ -427,7 +427,7 @@ ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  0          nigdy
 
 <<<
 size: 352
-location: clients/tests/test-client.py:921:test_003()/21
+location: clients/tests/test-client.py:935:test_003()/21
 cmd: $NMCLI -f ACTIVE-PATH,DEVICE,UUID con s -act
 lang: C
 returncode: 0
@@ -438,7 +438,7 @@ ACTIVE-PATH                                         DEVICE  UUID
 
 <<<
 size: 362
-location: clients/tests/test-client.py:921:test_003()/22
+location: clients/tests/test-client.py:935:test_003()/22
 cmd: $NMCLI -f ACTIVE-PATH,DEVICE,UUID con s -act
 lang: pl_PL.UTF-8
 returncode: 0
@@ -449,7 +449,7 @@ ACTIVE-PATH                                         DEVICE  UUID
 
 <<<
 size: 241
-location: clients/tests/test-client.py:924:test_003()/23
+location: clients/tests/test-client.py:938:test_003()/23
 cmd: $NMCLI -f UUID,NAME con s --active
 lang: C
 returncode: 0
@@ -460,7 +460,7 @@ UUID-ethernet-REPLACED-REPLACED-REPL  ethernet
 
 <<<
 size: 251
-location: clients/tests/test-client.py:924:test_003()/24
+location: clients/tests/test-client.py:938:test_003()/24
 cmd: $NMCLI -f UUID,NAME con s --active
 lang: pl_PL.UTF-8
 returncode: 0
@@ -471,7 +471,7 @@ UUID-ethernet-REPLACED-REPLACED-REPL  ethernet
 
 <<<
 size: 3805
-location: clients/tests/test-client.py:927:test_003()/25
+location: clients/tests/test-client.py:941:test_003()/25
 cmd: $NMCLI -f ALL con s ethernet
 lang: C
 returncode: 0
@@ -561,7 +561,7 @@ proxy.pac-script:                       --
 
 <<<
 size: 3833
-location: clients/tests/test-client.py:927:test_003()/26
+location: clients/tests/test-client.py:941:test_003()/26
 cmd: $NMCLI -f ALL con s ethernet
 lang: pl_PL.UTF-8
 returncode: 0
@@ -651,7 +651,7 @@ proxy.pac-script:                       --
 
 <<<
 size: 199
-location: clients/tests/test-client.py:930:test_003()/27
+location: clients/tests/test-client.py:944:test_003()/27
 cmd: $NMCLI -f GENERAL.STATE con s ethernet
 lang: C
 returncode: 0
@@ -661,7 +661,7 @@ GENERAL.STATE:                          activated
 
 <<<
 size: 210
-location: clients/tests/test-client.py:930:test_003()/28
+location: clients/tests/test-client.py:944:test_003()/28
 cmd: $NMCLI -f GENERAL.STATE con s ethernet
 lang: pl_PL.UTF-8
 returncode: 0
@@ -671,7 +671,7 @@ GENERAL.STATE:                          aktywowano
 
 <<<
 size: 4462
-location: clients/tests/test-client.py:933:test_003()/29
+location: clients/tests/test-client.py:947:test_003()/29
 cmd: $NMCLI con s ethernet
 lang: C
 returncode: 0
@@ -773,7 +773,7 @@ GENERAL.MASTER-PATH:                    --
 
 <<<
 size: 4494
-location: clients/tests/test-client.py:933:test_003()/30
+location: clients/tests/test-client.py:947:test_003()/30
 cmd: $NMCLI con s ethernet
 lang: pl_PL.UTF-8
 returncode: 0
@@ -874,19 +874,19 @@ GENERAL.ZONE:                           --
 GENERAL.MASTER-PATH:                    --
 
 <<<
-size: 1243
-location: clients/tests/test-client.py:936:test_003()/31
+size: 1459
+location: clients/tests/test-client.py:950:test_003()/31
 cmd: $NMCLI -f ALL dev s eth0
 lang: C
 returncode: 0
-stdout: 1056 bytes
+stdout: 1272 bytes
 >>>
-DEVICE  TYPE      STATE        DBUS-PATH                                  CONNECTION  CON-UUID                              CON-PATH                                           
-eth1    ethernet  unavailable  /org/freedesktop/NetworkManager/Devices/2  --          --                                    --                                                 
-wlan0   wifi      unavailable  /org/freedesktop/NetworkManager/Devices/3  --          --                                    --                                                 
-wlan1   wifi      unavailable  /org/freedesktop/NetworkManager/Devices/4  --          --                                    --                                                 
-wlan1   wifi      unavailable  /org/freedesktop/NetworkManager/Devices/5  --          --                                    --                                                 
-eth0    ethernet  unavailable  /org/freedesktop/NetworkManager/Devices/1  ethernet    UUID-ethernet-REPLACED-REPLACED-REPL  /org/freedesktop/NetworkManager/ActiveConnection/1 
+DEVICE  TYPE      STATE        IP4-CONNECTIVITY  IP6-CONNECTIVITY  DBUS-PATH                                  CONNECTION  CON-UUID                              CON-PATH                                           
+eth0    ethernet  unavailable  unknown           unknown           /org/freedesktop/NetworkManager/Devices/1  ethernet    UUID-ethernet-REPLACED-REPLACED-REPL  /org/freedesktop/NetworkManager/ActiveConnection/1 
+eth1    ethernet  unavailable  unknown           unknown           /org/freedesktop/NetworkManager/Devices/2  --          --                                    --                                                 
+wlan0   wifi      unavailable  unknown           unknown           /org/freedesktop/NetworkManager/Devices/3  --          --                                    --                                                 
+wlan1   wifi      unavailable  unknown           unknown           /org/freedesktop/NetworkManager/Devices/4  --          --                                    --                                                 
+wlan1   wifi      unavailable  unknown           unknown           /org/freedesktop/NetworkManager/Devices/5  --          --                                    --                                                 
 
 <<<
 stderr: 24 bytes
@@ -894,19 +894,19 @@ stderr: 24 bytes
 Unknown parameter: eth0
 
 <<<
-size: 1258
-location: clients/tests/test-client.py:936:test_003()/32
+size: 1474
+location: clients/tests/test-client.py:950:test_003()/32
 cmd: $NMCLI -f ALL dev s eth0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 1061 bytes
+stdout: 1277 bytes
 >>>
-DEVICE  TYPE      STATE        DBUS-PATH                                  CONNECTION  CON-UUID                              CON-PATH                                           
-eth1    ethernet  niedostępne  /org/freedesktop/NetworkManager/Devices/2  --          --                                    --                                                 
-wlan0   wifi      niedostępne  /org/freedesktop/NetworkManager/Devices/3  --          --                                    --                                                 
-wlan1   wifi      niedostępne  /org/freedesktop/NetworkManager/Devices/4  --          --                                    --                                                 
-wlan1   wifi      niedostępne  /org/freedesktop/NetworkManager/Devices/5  --          --                                    --                                                 
-eth0    ethernet  niedostępne  /org/freedesktop/NetworkManager/Devices/1  ethernet    UUID-ethernet-REPLACED-REPLACED-REPL  /org/freedesktop/NetworkManager/ActiveConnection/1 
+DEVICE  TYPE      STATE        IP4-CONNECTIVITY  IP6-CONNECTIVITY  DBUS-PATH                                  CONNECTION  CON-UUID                              CON-PATH                                           
+eth0    ethernet  niedostępne  nieznane          nieznane          /org/freedesktop/NetworkManager/Devices/1  ethernet    UUID-ethernet-REPLACED-REPLACED-REPL  /org/freedesktop/NetworkManager/ActiveConnection/1 
+eth1    ethernet  niedostępne  nieznane          nieznane          /org/freedesktop/NetworkManager/Devices/2  --          --                                    --                                                 
+wlan0   wifi      niedostępne  nieznane          nieznane          /org/freedesktop/NetworkManager/Devices/3  --          --                                    --                                                 
+wlan1   wifi      niedostępne  nieznane          nieznane          /org/freedesktop/NetworkManager/Devices/4  --          --                                    --                                                 
+wlan1   wifi      niedostępne  nieznane          nieznane          /org/freedesktop/NetworkManager/Devices/5  --          --                                    --                                                 
 
 <<<
 stderr: 24 bytes
@@ -914,12 +914,12 @@ stderr: 24 bytes
 Nieznany parametr: eth0
 
 <<<
-size: 3390
-location: clients/tests/test-client.py:939:test_003()/33
+size: 3494
+location: clients/tests/test-client.py:953:test_003()/33
 cmd: $NMCLI -f ALL dev show eth0
 lang: C
 returncode: 0
-stdout: 3250 bytes
+stdout: 3354 bytes
 >>>
 GENERAL.DEVICE:                         eth0
 GENERAL.TYPE:                           ethernet
@@ -933,6 +933,8 @@ GENERAL.HWADDR:                         C0:61:AE:26:4D:D7
 GENERAL.MTU:                            0
 GENERAL.STATE:                          20 (unavailable)
 GENERAL.REASON:                         0 (No reason given)
+GENERAL.IP4-CONNECTIVITY:               0 (unknown)
+GENERAL.IP6-CONNECTIVITY:               0 (unknown)
 GENERAL.UDI:                            /sys/devices/virtual/eth0
 GENERAL.IP-IFACE:                       --
 GENERAL.IS-SOFTWARE:                    no
@@ -978,12 +980,12 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[2]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | c
 CONNECTIONS.AVAILABLE-CONNECTIONS[3]:   UUID-ethernet-REPLACED-REPLACED-REPL | ethernet
 
 <<<
-size: 3423
-location: clients/tests/test-client.py:939:test_003()/34
+size: 3529
+location: clients/tests/test-client.py:953:test_003()/34
 cmd: $NMCLI -f ALL dev show eth0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 3273 bytes
+stdout: 3379 bytes
 >>>
 GENERAL.DEVICE:                         eth0
 GENERAL.TYPE:                           ethernet
@@ -997,6 +999,8 @@ GENERAL.HWADDR:                         C0:61:AE:26:4D:D7
 GENERAL.MTU:                            0
 GENERAL.STATE:                          20 (niedostępne)
 GENERAL.REASON:                         0 (Nie podano przyczyny)
+GENERAL.IP4-CONNECTIVITY:               0 (nieznane)
+GENERAL.IP6-CONNECTIVITY:               0 (nieznane)
 GENERAL.UDI:                            /sys/devices/virtual/eth0
 GENERAL.IP-IFACE:                       --
 GENERAL.IS-SOFTWARE:                    nie
@@ -1042,12 +1046,12 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[2]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | c
 CONNECTIONS.AVAILABLE-CONNECTIONS[3]:   UUID-ethernet-REPLACED-REPLACED-REPL | ethernet
 
 <<<
-size: 2165
-location: clients/tests/test-client.py:942:test_003()/35
+size: 2239
+location: clients/tests/test-client.py:956:test_003()/35
 cmd: $NMCLI -f ALL -t dev show eth0
 lang: C
 returncode: 0
-stdout: 2022 bytes
+stdout: 2096 bytes
 >>>
 GENERAL.DEVICE:eth0
 GENERAL.TYPE:ethernet
@@ -1061,6 +1065,8 @@ GENERAL.HWADDR:C0:61:AE:26:4D:D7
 GENERAL.MTU:0
 GENERAL.STATE:20 (unavailable)
 GENERAL.REASON:0 (No reason given)
+GENERAL.IP4-CONNECTIVITY:0 (unknown)
+GENERAL.IP6-CONNECTIVITY:0 (unknown)
 GENERAL.UDI:/sys/devices/virtual/eth0
 GENERAL.IP-IFACE:
 GENERAL.IS-SOFTWARE:no
@@ -1106,12 +1112,12 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[2]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-
 CONNECTIONS.AVAILABLE-CONNECTIONS[3]:UUID-ethernet-REPLACED-REPLACED-REPL | ethernet
 
 <<<
-size: 2175
-location: clients/tests/test-client.py:942:test_003()/36
+size: 2249
+location: clients/tests/test-client.py:956:test_003()/36
 cmd: $NMCLI -f ALL -t dev show eth0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2022 bytes
+stdout: 2096 bytes
 >>>
 GENERAL.DEVICE:eth0
 GENERAL.TYPE:ethernet
@@ -1125,6 +1131,8 @@ GENERAL.HWADDR:C0:61:AE:26:4D:D7
 GENERAL.MTU:0
 GENERAL.STATE:20 (unavailable)
 GENERAL.REASON:0 (No reason given)
+GENERAL.IP4-CONNECTIVITY:0 (unknown)
+GENERAL.IP6-CONNECTIVITY:0 (unknown)
 GENERAL.UDI:/sys/devices/virtual/eth0
 GENERAL.IP-IFACE:
 GENERAL.IS-SOFTWARE:no
@@ -1171,7 +1179,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[3]:UUID-ethernet-REPLACED-REPLACED-REPL | ethe
 
 <<<
 size: 252
-location: clients/tests/test-client.py:909:test_003()/37
+location: clients/tests/test-client.py:923:test_003()/37
 cmd: $NMCLI con up ethernet ifname eth1
 lang: C
 returncode: 0
@@ -1181,7 +1189,7 @@ Connection successfully activated (D-Bus active path: /org/freedesktop/NetworkMa
 
 <<<
 size: 518
-location: clients/tests/test-client.py:912:test_003()/38
+location: clients/tests/test-client.py:926:test_003()/38
 cmd: $NMCLI con
 lang: C
 returncode: 0
@@ -1196,7 +1204,7 @@ con-xx1   UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet  --
 
 <<<
 size: 528
-location: clients/tests/test-client.py:912:test_003()/39
+location: clients/tests/test-client.py:926:test_003()/39
 cmd: $NMCLI con
 lang: pl_PL.UTF-8
 returncode: 0
@@ -1211,7 +1219,7 @@ con-xx1   UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet  --
 
 <<<
 size: 2050
-location: clients/tests/test-client.py:915:test_003()/40
+location: clients/tests/test-client.py:929:test_003()/40
 cmd: $NMCLI -f ALL con
 lang: C
 returncode: 0
@@ -1226,7 +1234,7 @@ con-xx1   UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet  0          never
 
 <<<
 size: 2066
-location: clients/tests/test-client.py:915:test_003()/41
+location: clients/tests/test-client.py:929:test_003()/41
 cmd: $NMCLI -f ALL con
 lang: pl_PL.UTF-8
 returncode: 0
@@ -1241,7 +1249,7 @@ con-xx1   UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet  0          nigdy
 
 <<<
 size: 1094
-location: clients/tests/test-client.py:918:test_003()/42
+location: clients/tests/test-client.py:932:test_003()/42
 cmd: $NMCLI -f ALL con s -a
 lang: C
 returncode: 0
@@ -1253,7 +1261,7 @@ ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  0          never
 
 <<<
 size: 1107
-location: clients/tests/test-client.py:918:test_003()/43
+location: clients/tests/test-client.py:932:test_003()/43
 cmd: $NMCLI -f ALL con s -a
 lang: pl_PL.UTF-8
 returncode: 0
@@ -1265,7 +1273,7 @@ ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  0          nigdy
 
 <<<
 size: 450
-location: clients/tests/test-client.py:921:test_003()/44
+location: clients/tests/test-client.py:935:test_003()/44
 cmd: $NMCLI -f ACTIVE-PATH,DEVICE,UUID con s -act
 lang: C
 returncode: 0
@@ -1277,7 +1285,7 @@ ACTIVE-PATH                                         DEVICE  UUID
 
 <<<
 size: 460
-location: clients/tests/test-client.py:921:test_003()/45
+location: clients/tests/test-client.py:935:test_003()/45
 cmd: $NMCLI -f ACTIVE-PATH,DEVICE,UUID con s -act
 lang: pl_PL.UTF-8
 returncode: 0
@@ -1289,7 +1297,7 @@ ACTIVE-PATH                                         DEVICE  UUID
 
 <<<
 size: 241
-location: clients/tests/test-client.py:924:test_003()/46
+location: clients/tests/test-client.py:938:test_003()/46
 cmd: $NMCLI -f UUID,NAME con s --active
 lang: C
 returncode: 0
@@ -1300,7 +1308,7 @@ UUID-ethernet-REPLACED-REPLACED-REPL  ethernet
 
 <<<
 size: 251
-location: clients/tests/test-client.py:924:test_003()/47
+location: clients/tests/test-client.py:938:test_003()/47
 cmd: $NMCLI -f UUID,NAME con s --active
 lang: pl_PL.UTF-8
 returncode: 0
@@ -1311,7 +1319,7 @@ UUID-ethernet-REPLACED-REPLACED-REPL  ethernet
 
 <<<
 size: 3805
-location: clients/tests/test-client.py:927:test_003()/48
+location: clients/tests/test-client.py:941:test_003()/48
 cmd: $NMCLI -f ALL con s ethernet
 lang: C
 returncode: 0
@@ -1401,7 +1409,7 @@ proxy.pac-script:                       --
 
 <<<
 size: 3833
-location: clients/tests/test-client.py:927:test_003()/49
+location: clients/tests/test-client.py:941:test_003()/49
 cmd: $NMCLI -f ALL con s ethernet
 lang: pl_PL.UTF-8
 returncode: 0
@@ -1491,7 +1499,7 @@ proxy.pac-script:                       --
 
 <<<
 size: 251
-location: clients/tests/test-client.py:930:test_003()/50
+location: clients/tests/test-client.py:944:test_003()/50
 cmd: $NMCLI -f GENERAL.STATE con s ethernet
 lang: C
 returncode: 0
@@ -1503,7 +1511,7 @@ GENERAL.STATE:                          activated
 
 <<<
 size: 263
-location: clients/tests/test-client.py:930:test_003()/51
+location: clients/tests/test-client.py:944:test_003()/51
 cmd: $NMCLI -f GENERAL.STATE con s ethernet
 lang: pl_PL.UTF-8
 returncode: 0
@@ -1515,7 +1523,7 @@ GENERAL.STATE:                          aktywowano
 
 <<<
 size: 5127
-location: clients/tests/test-client.py:933:test_003()/52
+location: clients/tests/test-client.py:947:test_003()/52
 cmd: $NMCLI con s ethernet
 lang: C
 returncode: 0
@@ -1630,7 +1638,7 @@ GENERAL.MASTER-PATH:                    --
 
 <<<
 size: 5163
-location: clients/tests/test-client.py:933:test_003()/53
+location: clients/tests/test-client.py:947:test_003()/53
 cmd: $NMCLI con s ethernet
 lang: pl_PL.UTF-8
 returncode: 0
@@ -1744,19 +1752,19 @@ GENERAL.ZONE:                           --
 GENERAL.MASTER-PATH:                    --
 
 <<<
-size: 1243
-location: clients/tests/test-client.py:936:test_003()/54
+size: 1459
+location: clients/tests/test-client.py:950:test_003()/54
 cmd: $NMCLI -f ALL dev s eth0
 lang: C
 returncode: 0
-stdout: 1056 bytes
+stdout: 1272 bytes
 >>>
-DEVICE  TYPE      STATE        DBUS-PATH                                  CONNECTION  CON-UUID                              CON-PATH                                           
-wlan0   wifi      unavailable  /org/freedesktop/NetworkManager/Devices/3  --          --                                    --                                                 
-wlan1   wifi      unavailable  /org/freedesktop/NetworkManager/Devices/4  --          --                                    --                                                 
-wlan1   wifi      unavailable  /org/freedesktop/NetworkManager/Devices/5  --          --                                    --                                                 
-eth0    ethernet  unavailable  /org/freedesktop/NetworkManager/Devices/1  ethernet    UUID-ethernet-REPLACED-REPLACED-REPL  /org/freedesktop/NetworkManager/ActiveConnection/1 
-eth1    ethernet  unavailable  /org/freedesktop/NetworkManager/Devices/2  ethernet    UUID-ethernet-REPLACED-REPLACED-REPL  /org/freedesktop/NetworkManager/ActiveConnection/2 
+DEVICE  TYPE      STATE        IP4-CONNECTIVITY  IP6-CONNECTIVITY  DBUS-PATH                                  CONNECTION  CON-UUID                              CON-PATH                                           
+eth0    ethernet  unavailable  unknown           unknown           /org/freedesktop/NetworkManager/Devices/1  ethernet    UUID-ethernet-REPLACED-REPLACED-REPL  /org/freedesktop/NetworkManager/ActiveConnection/1 
+eth1    ethernet  unavailable  unknown           unknown           /org/freedesktop/NetworkManager/Devices/2  ethernet    UUID-ethernet-REPLACED-REPLACED-REPL  /org/freedesktop/NetworkManager/ActiveConnection/2 
+wlan0   wifi      unavailable  unknown           unknown           /org/freedesktop/NetworkManager/Devices/3  --          --                                    --                                                 
+wlan1   wifi      unavailable  unknown           unknown           /org/freedesktop/NetworkManager/Devices/4  --          --                                    --                                                 
+wlan1   wifi      unavailable  unknown           unknown           /org/freedesktop/NetworkManager/Devices/5  --          --                                    --                                                 
 
 <<<
 stderr: 24 bytes
@@ -1764,19 +1772,19 @@ stderr: 24 bytes
 Unknown parameter: eth0
 
 <<<
-size: 1258
-location: clients/tests/test-client.py:936:test_003()/55
+size: 1474
+location: clients/tests/test-client.py:950:test_003()/55
 cmd: $NMCLI -f ALL dev s eth0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 1061 bytes
+stdout: 1277 bytes
 >>>
-DEVICE  TYPE      STATE        DBUS-PATH                                  CONNECTION  CON-UUID                              CON-PATH                                           
-wlan0   wifi      niedostępne  /org/freedesktop/NetworkManager/Devices/3  --          --                                    --                                                 
-wlan1   wifi      niedostępne  /org/freedesktop/NetworkManager/Devices/4  --          --                                    --                                                 
-wlan1   wifi      niedostępne  /org/freedesktop/NetworkManager/Devices/5  --          --                                    --                                                 
-eth0    ethernet  niedostępne  /org/freedesktop/NetworkManager/Devices/1  ethernet    UUID-ethernet-REPLACED-REPLACED-REPL  /org/freedesktop/NetworkManager/ActiveConnection/1 
-eth1    ethernet  niedostępne  /org/freedesktop/NetworkManager/Devices/2  ethernet    UUID-ethernet-REPLACED-REPLACED-REPL  /org/freedesktop/NetworkManager/ActiveConnection/2 
+DEVICE  TYPE      STATE        IP4-CONNECTIVITY  IP6-CONNECTIVITY  DBUS-PATH                                  CONNECTION  CON-UUID                              CON-PATH                                           
+eth0    ethernet  niedostępne  nieznane          nieznane          /org/freedesktop/NetworkManager/Devices/1  ethernet    UUID-ethernet-REPLACED-REPLACED-REPL  /org/freedesktop/NetworkManager/ActiveConnection/1 
+eth1    ethernet  niedostępne  nieznane          nieznane          /org/freedesktop/NetworkManager/Devices/2  ethernet    UUID-ethernet-REPLACED-REPLACED-REPL  /org/freedesktop/NetworkManager/ActiveConnection/2 
+wlan0   wifi      niedostępne  nieznane          nieznane          /org/freedesktop/NetworkManager/Devices/3  --          --                                    --                                                 
+wlan1   wifi      niedostępne  nieznane          nieznane          /org/freedesktop/NetworkManager/Devices/4  --          --                                    --                                                 
+wlan1   wifi      niedostępne  nieznane          nieznane          /org/freedesktop/NetworkManager/Devices/5  --          --                                    --                                                 
 
 <<<
 stderr: 24 bytes
@@ -1784,12 +1792,12 @@ stderr: 24 bytes
 Nieznany parametr: eth0
 
 <<<
-size: 3390
-location: clients/tests/test-client.py:939:test_003()/56
+size: 3494
+location: clients/tests/test-client.py:953:test_003()/56
 cmd: $NMCLI -f ALL dev show eth0
 lang: C
 returncode: 0
-stdout: 3250 bytes
+stdout: 3354 bytes
 >>>
 GENERAL.DEVICE:                         eth0
 GENERAL.TYPE:                           ethernet
@@ -1803,6 +1811,8 @@ GENERAL.HWADDR:                         C0:61:AE:26:4D:D7
 GENERAL.MTU:                            0
 GENERAL.STATE:                          20 (unavailable)
 GENERAL.REASON:                         0 (No reason given)
+GENERAL.IP4-CONNECTIVITY:               0 (unknown)
+GENERAL.IP6-CONNECTIVITY:               0 (unknown)
 GENERAL.UDI:                            /sys/devices/virtual/eth0
 GENERAL.IP-IFACE:                       --
 GENERAL.IS-SOFTWARE:                    no
@@ -1848,12 +1858,12 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[2]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | c
 CONNECTIONS.AVAILABLE-CONNECTIONS[3]:   UUID-ethernet-REPLACED-REPLACED-REPL | ethernet
 
 <<<
-size: 3423
-location: clients/tests/test-client.py:939:test_003()/57
+size: 3529
+location: clients/tests/test-client.py:953:test_003()/57
 cmd: $NMCLI -f ALL dev show eth0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 3273 bytes
+stdout: 3379 bytes
 >>>
 GENERAL.DEVICE:                         eth0
 GENERAL.TYPE:                           ethernet
@@ -1867,6 +1877,8 @@ GENERAL.HWADDR:                         C0:61:AE:26:4D:D7
 GENERAL.MTU:                            0
 GENERAL.STATE:                          20 (niedostępne)
 GENERAL.REASON:                         0 (Nie podano przyczyny)
+GENERAL.IP4-CONNECTIVITY:               0 (nieznane)
+GENERAL.IP6-CONNECTIVITY:               0 (nieznane)
 GENERAL.UDI:                            /sys/devices/virtual/eth0
 GENERAL.IP-IFACE:                       --
 GENERAL.IS-SOFTWARE:                    nie
@@ -1912,12 +1924,12 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[2]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | c
 CONNECTIONS.AVAILABLE-CONNECTIONS[3]:   UUID-ethernet-REPLACED-REPLACED-REPL | ethernet
 
 <<<
-size: 2165
-location: clients/tests/test-client.py:942:test_003()/58
+size: 2239
+location: clients/tests/test-client.py:956:test_003()/58
 cmd: $NMCLI -f ALL -t dev show eth0
 lang: C
 returncode: 0
-stdout: 2022 bytes
+stdout: 2096 bytes
 >>>
 GENERAL.DEVICE:eth0
 GENERAL.TYPE:ethernet
@@ -1931,6 +1943,8 @@ GENERAL.HWADDR:C0:61:AE:26:4D:D7
 GENERAL.MTU:0
 GENERAL.STATE:20 (unavailable)
 GENERAL.REASON:0 (No reason given)
+GENERAL.IP4-CONNECTIVITY:0 (unknown)
+GENERAL.IP6-CONNECTIVITY:0 (unknown)
 GENERAL.UDI:/sys/devices/virtual/eth0
 GENERAL.IP-IFACE:
 GENERAL.IS-SOFTWARE:no
@@ -1976,12 +1990,12 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[2]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-
 CONNECTIONS.AVAILABLE-CONNECTIONS[3]:UUID-ethernet-REPLACED-REPLACED-REPL | ethernet
 
 <<<
-size: 2175
-location: clients/tests/test-client.py:942:test_003()/59
+size: 2249
+location: clients/tests/test-client.py:956:test_003()/59
 cmd: $NMCLI -f ALL -t dev show eth0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2022 bytes
+stdout: 2096 bytes
 >>>
 GENERAL.DEVICE:eth0
 GENERAL.TYPE:ethernet
@@ -1995,6 +2009,8 @@ GENERAL.HWADDR:C0:61:AE:26:4D:D7
 GENERAL.MTU:0
 GENERAL.STATE:20 (unavailable)
 GENERAL.REASON:0 (No reason given)
+GENERAL.IP4-CONNECTIVITY:0 (unknown)
+GENERAL.IP6-CONNECTIVITY:0 (unknown)
 GENERAL.UDI:/sys/devices/virtual/eth0
 GENERAL.IP-IFACE:
 GENERAL.IS-SOFTWARE:no
@@ -2041,37 +2057,37 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[3]:UUID-ethernet-REPLACED-REPLACED-REPL | ethe
 
 <<<
 size: 2068
-location: clients/tests/test-client.py:957:test_003()/60
+location: clients/tests/test-client.py:971:test_003()/60
 cmd: $NMCLI -f ALL con
 lang: C
 returncode: 0
 stdout: 1938 bytes
 >>>
 NAME      UUID                                  TYPE      TIMESTAMP  TIMESTAMP-REAL  AUTOCONNECT  AUTOCONNECT-PRIORITY  READONLY  DBUS-PATH                                              ACTIVE  DEVICE  STATE         ACTIVE-PATH                                         SLAVE  FILENAME                                        
-ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  0          never           yes          0                     no        /org/freedesktop/NetworkManager/Settings/Connection/4  yes     eth1    activated     /org/freedesktop/NetworkManager/ActiveConnection/2  --     /etc/NetworkManager/system-connections/ethernet 
 ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  0          never           yes          0                     no        /org/freedesktop/NetworkManager/Settings/Connection/4  yes     eth0    deactivating  /org/freedesktop/NetworkManager/ActiveConnection/1  --     /etc/NetworkManager/system-connections/ethernet 
+ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  0          never           yes          0                     no        /org/freedesktop/NetworkManager/Settings/Connection/4  yes     eth1    activated     /org/freedesktop/NetworkManager/ActiveConnection/2  --     /etc/NetworkManager/system-connections/ethernet 
 con-1     5fcfd6d7-1e63-3332-8826-a7eda103792d  ethernet  0          never           yes          0                     no        /org/freedesktop/NetworkManager/Settings/Connection/1  no      --      --            --                                                  --     /etc/NetworkManager/system-connections/con-1    
 con-gsm1  UUID-con-gsm1-REPLACED-REPLACED-REPL  gsm       0          never           no           0                     no        /org/freedesktop/NetworkManager/Settings/Connection/3  no      --      --            --                                                  --     /etc/NetworkManager/system-connections/con-gsm1 
 con-xx1   UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet  0          never           yes          0                     no        /org/freedesktop/NetworkManager/Settings/Connection/2  no      --      --            --                                                  --     /etc/NetworkManager/system-connections/con-xx1  
 
 <<<
 size: 2090
-location: clients/tests/test-client.py:957:test_003()/61
+location: clients/tests/test-client.py:971:test_003()/61
 cmd: $NMCLI -f ALL con
 lang: pl_PL.UTF-8
 returncode: 0
 stdout: 1950 bytes
 >>>
 NAME      UUID                                  TYPE      TIMESTAMP  TIMESTAMP-REAL  AUTOCONNECT  AUTOCONNECT-PRIORITY  READONLY  DBUS-PATH                                              ACTIVE  DEVICE  STATE           ACTIVE-PATH                                         SLAVE  FILENAME                                        
-ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  0          nigdy           tak          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/4  tak     eth1    aktywowano      /org/freedesktop/NetworkManager/ActiveConnection/2  --     /etc/NetworkManager/system-connections/ethernet 
 ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  0          nigdy           tak          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/4  tak     eth0    dezaktywowanie  /org/freedesktop/NetworkManager/ActiveConnection/1  --     /etc/NetworkManager/system-connections/ethernet 
+ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  0          nigdy           tak          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/4  tak     eth1    aktywowano      /org/freedesktop/NetworkManager/ActiveConnection/2  --     /etc/NetworkManager/system-connections/ethernet 
 con-1     5fcfd6d7-1e63-3332-8826-a7eda103792d  ethernet  0          nigdy           tak          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/1  nie     --      --              --                                                  --     /etc/NetworkManager/system-connections/con-1    
 con-gsm1  UUID-con-gsm1-REPLACED-REPLACED-REPL  gsm       0          nigdy           nie          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/3  nie     --      --              --                                                  --     /etc/NetworkManager/system-connections/con-gsm1 
 con-xx1   UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet  0          nigdy           tak          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/2  nie     --      --              --                                                  --     /etc/NetworkManager/system-connections/con-xx1  
 
 <<<
 size: 375
-location: clients/tests/test-client.py:960:test_003()/62
+location: clients/tests/test-client.py:974:test_003()/62
 cmd: $NMCLI -f UUID,TYPE con
 lang: C
 returncode: 0
@@ -2085,7 +2101,7 @@ UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet
 
 <<<
 size: 385
-location: clients/tests/test-client.py:960:test_003()/63
+location: clients/tests/test-client.py:974:test_003()/63
 cmd: $NMCLI -f UUID,TYPE con
 lang: pl_PL.UTF-8
 returncode: 0
@@ -2099,7 +2115,7 @@ UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet
 
 <<<
 size: 5130
-location: clients/tests/test-client.py:963:test_003()/64
+location: clients/tests/test-client.py:977:test_003()/64
 cmd: $NMCLI con s ethernet
 lang: C
 returncode: 0
@@ -2214,7 +2230,7 @@ GENERAL.MASTER-PATH:                    --
 
 <<<
 size: 5167
-location: clients/tests/test-client.py:963:test_003()/65
+location: clients/tests/test-client.py:977:test_003()/65
 cmd: $NMCLI con s ethernet
 lang: pl_PL.UTF-8
 returncode: 0
@@ -2329,7 +2345,7 @@ GENERAL.MASTER-PATH:                    --
 
 <<<
 size: 4505
-location: clients/tests/test-client.py:966:test_003()/66
+location: clients/tests/test-client.py:980:test_003()/66
 cmd: $NMCLI c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: C
 returncode: 0
@@ -2431,7 +2447,7 @@ GENERAL.MASTER-PATH:                    --
 
 <<<
 size: 4538
-location: clients/tests/test-client.py:966:test_003()/67
+location: clients/tests/test-client.py:980:test_003()/67
 cmd: $NMCLI c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: pl_PL.UTF-8
 returncode: 0
@@ -2532,12 +2548,12 @@ GENERAL.ZONE:                           --
 GENERAL.MASTER-PATH:                    --
 
 <<<
-size: 3390
-location: clients/tests/test-client.py:969:test_003()/68
+size: 3494
+location: clients/tests/test-client.py:983:test_003()/68
 cmd: $NMCLI -f all dev show eth0
 lang: C
 returncode: 0
-stdout: 3250 bytes
+stdout: 3354 bytes
 >>>
 GENERAL.DEVICE:                         eth0
 GENERAL.TYPE:                           ethernet
@@ -2551,6 +2567,8 @@ GENERAL.HWADDR:                         C0:61:AE:26:4D:D7
 GENERAL.MTU:                            0
 GENERAL.STATE:                          20 (unavailable)
 GENERAL.REASON:                         0 (No reason given)
+GENERAL.IP4-CONNECTIVITY:               0 (unknown)
+GENERAL.IP6-CONNECTIVITY:               0 (unknown)
 GENERAL.UDI:                            /sys/devices/virtual/eth0
 GENERAL.IP-IFACE:                       --
 GENERAL.IS-SOFTWARE:                    no
@@ -2596,12 +2614,12 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[2]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | c
 CONNECTIONS.AVAILABLE-CONNECTIONS[3]:   UUID-ethernet-REPLACED-REPLACED-REPL | ethernet
 
 <<<
-size: 3423
-location: clients/tests/test-client.py:969:test_003()/69
+size: 3529
+location: clients/tests/test-client.py:983:test_003()/69
 cmd: $NMCLI -f all dev show eth0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 3273 bytes
+stdout: 3379 bytes
 >>>
 GENERAL.DEVICE:                         eth0
 GENERAL.TYPE:                           ethernet
@@ -2615,6 +2633,8 @@ GENERAL.HWADDR:                         C0:61:AE:26:4D:D7
 GENERAL.MTU:                            0
 GENERAL.STATE:                          20 (niedostępne)
 GENERAL.REASON:                         0 (Nie podano przyczyny)
+GENERAL.IP4-CONNECTIVITY:               0 (nieznane)
+GENERAL.IP6-CONNECTIVITY:               0 (nieznane)
 GENERAL.UDI:                            /sys/devices/virtual/eth0
 GENERAL.IP-IFACE:                       --
 GENERAL.IS-SOFTWARE:                    nie
@@ -2661,37 +2681,37 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[3]:   UUID-ethernet-REPLACED-REPLACED-REPL | e
 
 <<<
 size: 2350
-location: clients/tests/test-client.py:957:test_003()/70
+location: clients/tests/test-client.py:971:test_003()/70
 cmd: $NMCLI --color yes -f ALL con
 lang: C
 returncode: 0
 stdout: 2208 bytes
 >>>
 NAME      UUID                                  TYPE      TIMESTAMP  TIMESTAMP-REAL  AUTOCONNECT  AUTOCONNECT-PRIORITY  READONLY  DBUS-PATH                                              ACTIVE  DEVICE  STATE         ACTIVE-PATH                                         SLAVE  FILENAME                                        
-ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  0          never           yes          0                     no        /org/freedesktop/NetworkManager/Settings/Connection/4  yes     eth1    activated     /org/freedesktop/NetworkManager/ActiveConnection/2  --     /etc/NetworkManager/system-connections/ethernet 
 ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  0          never           yes          0                     no        /org/freedesktop/NetworkManager/Settings/Connection/4  yes     eth0    deactivating  /org/freedesktop/NetworkManager/ActiveConnection/1  --     /etc/NetworkManager/system-connections/ethernet 
+ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  0          never           yes          0                     no        /org/freedesktop/NetworkManager/Settings/Connection/4  yes     eth1    activated     /org/freedesktop/NetworkManager/ActiveConnection/2  --     /etc/NetworkManager/system-connections/ethernet 
 con-1     5fcfd6d7-1e63-3332-8826-a7eda103792d  ethernet  0          never           yes          0                     no        /org/freedesktop/NetworkManager/Settings/Connection/1  no      --      --            --                                                  --     /etc/NetworkManager/system-connections/con-1    
 con-gsm1  UUID-con-gsm1-REPLACED-REPLACED-REPL  gsm       0          never           no           0                     no        /org/freedesktop/NetworkManager/Settings/Connection/3  no      --      --            --                                                  --     /etc/NetworkManager/system-connections/con-gsm1 
 con-xx1   UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet  0          never           yes          0                     no        /org/freedesktop/NetworkManager/Settings/Connection/2  no      --      --            --                                                  --     /etc/NetworkManager/system-connections/con-xx1  
 
 <<<
 size: 2372
-location: clients/tests/test-client.py:957:test_003()/71
+location: clients/tests/test-client.py:971:test_003()/71
 cmd: $NMCLI --color yes -f ALL con
 lang: pl_PL.UTF-8
 returncode: 0
 stdout: 2220 bytes
 >>>
 NAME      UUID                                  TYPE      TIMESTAMP  TIMESTAMP-REAL  AUTOCONNECT  AUTOCONNECT-PRIORITY  READONLY  DBUS-PATH                                              ACTIVE  DEVICE  STATE           ACTIVE-PATH                                         SLAVE  FILENAME                                        
-ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  0          nigdy           tak          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/4  tak     eth1    aktywowano      /org/freedesktop/NetworkManager/ActiveConnection/2  --     /etc/NetworkManager/system-connections/ethernet 
 ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  0          nigdy           tak          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/4  tak     eth0    dezaktywowanie  /org/freedesktop/NetworkManager/ActiveConnection/1  --     /etc/NetworkManager/system-connections/ethernet 
+ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  0          nigdy           tak          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/4  tak     eth1    aktywowano      /org/freedesktop/NetworkManager/ActiveConnection/2  --     /etc/NetworkManager/system-connections/ethernet 
 con-1     5fcfd6d7-1e63-3332-8826-a7eda103792d  ethernet  0          nigdy           tak          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/1  nie     --      --              --                                                  --     /etc/NetworkManager/system-connections/con-1    
 con-gsm1  UUID-con-gsm1-REPLACED-REPLACED-REPL  gsm       0          nigdy           nie          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/3  nie     --      --              --                                                  --     /etc/NetworkManager/system-connections/con-gsm1 
 con-xx1   UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet  0          nigdy           tak          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/2  nie     --      --              --                                                  --     /etc/NetworkManager/system-connections/con-xx1  
 
 <<<
 size: 405
-location: clients/tests/test-client.py:960:test_003()/72
+location: clients/tests/test-client.py:974:test_003()/72
 cmd: $NMCLI --color yes -f UUID,TYPE con
 lang: C
 returncode: 0
@@ -2705,7 +2725,7 @@ UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet
 
 <<<
 size: 415
-location: clients/tests/test-client.py:960:test_003()/73
+location: clients/tests/test-client.py:974:test_003()/73
 cmd: $NMCLI --color yes -f UUID,TYPE con
 lang: pl_PL.UTF-8
 returncode: 0
@@ -2719,7 +2739,7 @@ UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet
 
 <<<
 size: 5142
-location: clients/tests/test-client.py:963:test_003()/74
+location: clients/tests/test-client.py:977:test_003()/74
 cmd: $NMCLI --color yes con s ethernet
 lang: C
 returncode: 0
@@ -2834,7 +2854,7 @@ GENERAL.MASTER-PATH:                    --
 
 <<<
 size: 5179
-location: clients/tests/test-client.py:963:test_003()/75
+location: clients/tests/test-client.py:977:test_003()/75
 cmd: $NMCLI --color yes con s ethernet
 lang: pl_PL.UTF-8
 returncode: 0
@@ -2949,7 +2969,7 @@ GENERAL.MASTER-PATH:                    --
 
 <<<
 size: 4517
-location: clients/tests/test-client.py:966:test_003()/76
+location: clients/tests/test-client.py:980:test_003()/76
 cmd: $NMCLI --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: C
 returncode: 0
@@ -3051,7 +3071,7 @@ GENERAL.MASTER-PATH:                    --
 
 <<<
 size: 4550
-location: clients/tests/test-client.py:966:test_003()/77
+location: clients/tests/test-client.py:980:test_003()/77
 cmd: $NMCLI --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: pl_PL.UTF-8
 returncode: 0
@@ -3152,12 +3172,12 @@ GENERAL.ZONE:                           --
 GENERAL.MASTER-PATH:                    --
 
 <<<
-size: 3402
-location: clients/tests/test-client.py:969:test_003()/78
+size: 3506
+location: clients/tests/test-client.py:983:test_003()/78
 cmd: $NMCLI --color yes -f all dev show eth0
 lang: C
 returncode: 0
-stdout: 3250 bytes
+stdout: 3354 bytes
 >>>
 GENERAL.DEVICE:                         eth0
 GENERAL.TYPE:                           ethernet
@@ -3171,6 +3191,8 @@ GENERAL.HWADDR:                         C0:61:AE:26:4D:D7
 GENERAL.MTU:                            0
 GENERAL.STATE:                          20 (unavailable)
 GENERAL.REASON:                         0 (No reason given)
+GENERAL.IP4-CONNECTIVITY:               0 (unknown)
+GENERAL.IP6-CONNECTIVITY:               0 (unknown)
 GENERAL.UDI:                            /sys/devices/virtual/eth0
 GENERAL.IP-IFACE:                       --
 GENERAL.IS-SOFTWARE:                    no
@@ -3216,12 +3238,12 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[2]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | c
 CONNECTIONS.AVAILABLE-CONNECTIONS[3]:   UUID-ethernet-REPLACED-REPLACED-REPL | ethernet
 
 <<<
-size: 3435
-location: clients/tests/test-client.py:969:test_003()/79
+size: 3541
+location: clients/tests/test-client.py:983:test_003()/79
 cmd: $NMCLI --color yes -f all dev show eth0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 3273 bytes
+stdout: 3379 bytes
 >>>
 GENERAL.DEVICE:                         eth0
 GENERAL.TYPE:                           ethernet
@@ -3235,6 +3257,8 @@ GENERAL.HWADDR:                         C0:61:AE:26:4D:D7
 GENERAL.MTU:                            0
 GENERAL.STATE:                          20 (niedostępne)
 GENERAL.REASON:                         0 (Nie podano przyczyny)
+GENERAL.IP4-CONNECTIVITY:               0 (nieznane)
+GENERAL.IP6-CONNECTIVITY:               0 (nieznane)
 GENERAL.UDI:                            /sys/devices/virtual/eth0
 GENERAL.IP-IFACE:                       --
 GENERAL.IS-SOFTWARE:                    nie
@@ -3281,7 +3305,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[3]:   UUID-ethernet-REPLACED-REPLACED-REPL | e
 
 <<<
 size: 2554
-location: clients/tests/test-client.py:957:test_003()/80
+location: clients/tests/test-client.py:971:test_003()/80
 cmd: $NMCLI --pretty -f ALL con
 lang: C
 returncode: 0
@@ -3292,15 +3316,15 @@ stdout: 2415 bytes
 ======================================
 NAME      UUID                                  TYPE      TIMESTAMP  TIMESTAMP-REAL  AUTOCONNECT  AUTOCONNECT-PRIORITY  READONLY  DBUS-PATH                                              ACTIVE  DEVICE  STATE         ACTIVE-PATH                                         SLAVE  FILENAME                                        
 -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  0          never           yes          0                     no        /org/freedesktop/NetworkManager/Settings/Connection/4  yes     eth1    activated     /org/freedesktop/NetworkManager/ActiveConnection/2  --     /etc/NetworkManager/system-connections/ethernet 
 ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  0          never           yes          0                     no        /org/freedesktop/NetworkManager/Settings/Connection/4  yes     eth0    deactivating  /org/freedesktop/NetworkManager/ActiveConnection/1  --     /etc/NetworkManager/system-connections/ethernet 
+ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  0          never           yes          0                     no        /org/freedesktop/NetworkManager/Settings/Connection/4  yes     eth1    activated     /org/freedesktop/NetworkManager/ActiveConnection/2  --     /etc/NetworkManager/system-connections/ethernet 
 con-1     5fcfd6d7-1e63-3332-8826-a7eda103792d  ethernet  0          never           yes          0                     no        /org/freedesktop/NetworkManager/Settings/Connection/1  no      --      --            --                                                  --     /etc/NetworkManager/system-connections/con-1    
 con-gsm1  UUID-con-gsm1-REPLACED-REPLACED-REPL  gsm       0          never           no           0                     no        /org/freedesktop/NetworkManager/Settings/Connection/3  no      --      --            --                                                  --     /etc/NetworkManager/system-connections/con-gsm1 
 con-xx1   UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet  0          never           yes          0                     no        /org/freedesktop/NetworkManager/Settings/Connection/2  no      --      --            --                                                  --     /etc/NetworkManager/system-connections/con-xx1  
 
 <<<
 size: 2598
-location: clients/tests/test-client.py:957:test_003()/81
+location: clients/tests/test-client.py:971:test_003()/81
 cmd: $NMCLI --pretty -f ALL con
 lang: pl_PL.UTF-8
 returncode: 0
@@ -3311,15 +3335,15 @@ stdout: 2449 bytes
 ==========================================
 NAME      UUID                                  TYPE      TIMESTAMP  TIMESTAMP-REAL  AUTOCONNECT  AUTOCONNECT-PRIORITY  READONLY  DBUS-PATH                                              ACTIVE  DEVICE  STATE           ACTIVE-PATH                                         SLAVE  FILENAME                                        
 -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  0          nigdy           tak          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/4  tak     eth1    aktywowano      /org/freedesktop/NetworkManager/ActiveConnection/2  --     /etc/NetworkManager/system-connections/ethernet 
 ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  0          nigdy           tak          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/4  tak     eth0    dezaktywowanie  /org/freedesktop/NetworkManager/ActiveConnection/1  --     /etc/NetworkManager/system-connections/ethernet 
+ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  0          nigdy           tak          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/4  tak     eth1    aktywowano      /org/freedesktop/NetworkManager/ActiveConnection/2  --     /etc/NetworkManager/system-connections/ethernet 
 con-1     5fcfd6d7-1e63-3332-8826-a7eda103792d  ethernet  0          nigdy           tak          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/1  nie     --      --              --                                                  --     /etc/NetworkManager/system-connections/con-1    
 con-gsm1  UUID-con-gsm1-REPLACED-REPLACED-REPL  gsm       0          nigdy           nie          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/3  nie     --      --              --                                                  --     /etc/NetworkManager/system-connections/con-gsm1 
 con-xx1   UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet  0          nigdy           tak          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/2  nie     --      --              --                                                  --     /etc/NetworkManager/system-connections/con-xx1  
 
 <<<
 size: 586
-location: clients/tests/test-client.py:960:test_003()/82
+location: clients/tests/test-client.py:974:test_003()/82
 cmd: $NMCLI --pretty -f UUID,TYPE con
 lang: C
 returncode: 0
@@ -3337,7 +3361,7 @@ UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet
 
 <<<
 size: 616
-location: clients/tests/test-client.py:960:test_003()/83
+location: clients/tests/test-client.py:974:test_003()/83
 cmd: $NMCLI --pretty -f UUID,TYPE con
 lang: pl_PL.UTF-8
 returncode: 0
@@ -3355,7 +3379,7 @@ UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet
 
 <<<
 size: 6384
-location: clients/tests/test-client.py:963:test_003()/84
+location: clients/tests/test-client.py:977:test_003()/84
 cmd: $NMCLI --pretty con s ethernet
 lang: C
 returncode: 0
@@ -3486,7 +3510,7 @@ GENERAL.MASTER-PATH:                    --
 
 <<<
 size: 6440
-location: clients/tests/test-client.py:963:test_003()/85
+location: clients/tests/test-client.py:977:test_003()/85
 cmd: $NMCLI --pretty con s ethernet
 lang: pl_PL.UTF-8
 returncode: 0
@@ -3617,7 +3641,7 @@ GENERAL.MASTER-PATH:                    --
 
 <<<
 size: 5446
-location: clients/tests/test-client.py:966:test_003()/86
+location: clients/tests/test-client.py:980:test_003()/86
 cmd: $NMCLI --pretty c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: C
 returncode: 0
@@ -3731,7 +3755,7 @@ GENERAL.MASTER-PATH:                    --
 
 <<<
 size: 5491
-location: clients/tests/test-client.py:966:test_003()/87
+location: clients/tests/test-client.py:980:test_003()/87
 cmd: $NMCLI --pretty c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: pl_PL.UTF-8
 returncode: 0
@@ -3844,12 +3868,12 @@ GENERAL.MASTER-PATH:                    --
 -------------------------------------------------------------------------------
 
 <<<
-size: 4250
-location: clients/tests/test-client.py:969:test_003()/88
+size: 4354
+location: clients/tests/test-client.py:983:test_003()/88
 cmd: $NMCLI --pretty -f all dev show eth0
 lang: C
 returncode: 0
-stdout: 4101 bytes
+stdout: 4205 bytes
 >>>
 ===============================================================================
                              Device details (eth0)
@@ -3866,6 +3890,8 @@ GENERAL.HWADDR:                         C0:61:AE:26:4D:D7
 GENERAL.MTU:                            0
 GENERAL.STATE:                          20 (unavailable)
 GENERAL.REASON:                         0 (No reason given)
+GENERAL.IP4-CONNECTIVITY:               0 (unknown)
+GENERAL.IP6-CONNECTIVITY:               0 (unknown)
 GENERAL.UDI:                            /sys/devices/virtual/eth0
 GENERAL.IP-IFACE:                       --
 GENERAL.IS-SOFTWARE:                    no
@@ -3919,12 +3945,12 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[3]:   UUID-ethernet-REPLACED-REPLACED-REPL | e
 -------------------------------------------------------------------------------
 
 <<<
-size: 4289
-location: clients/tests/test-client.py:969:test_003()/89
+size: 4395
+location: clients/tests/test-client.py:983:test_003()/89
 cmd: $NMCLI --pretty -f all dev show eth0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 4130 bytes
+stdout: 4236 bytes
 >>>
 ===============================================================================
                         Informacje o urządzeniu (eth0)
@@ -3941,6 +3967,8 @@ GENERAL.HWADDR:                         C0:61:AE:26:4D:D7
 GENERAL.MTU:                            0
 GENERAL.STATE:                          20 (niedostępne)
 GENERAL.REASON:                         0 (Nie podano przyczyny)
+GENERAL.IP4-CONNECTIVITY:               0 (nieznane)
+GENERAL.IP6-CONNECTIVITY:               0 (nieznane)
 GENERAL.UDI:                            /sys/devices/virtual/eth0
 GENERAL.IP-IFACE:                       --
 GENERAL.IS-SOFTWARE:                    nie
@@ -3995,7 +4023,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[3]:   UUID-ethernet-REPLACED-REPLACED-REPL | e
 
 <<<
 size: 2836
-location: clients/tests/test-client.py:957:test_003()/90
+location: clients/tests/test-client.py:971:test_003()/90
 cmd: $NMCLI --pretty --color yes -f ALL con
 lang: C
 returncode: 0
@@ -4006,15 +4034,15 @@ stdout: 2685 bytes
 ======================================
 NAME      UUID                                  TYPE      TIMESTAMP  TIMESTAMP-REAL  AUTOCONNECT  AUTOCONNECT-PRIORITY  READONLY  DBUS-PATH                                              ACTIVE  DEVICE  STATE         ACTIVE-PATH                                         SLAVE  FILENAME                                        
 -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  0          never           yes          0                     no        /org/freedesktop/NetworkManager/Settings/Connection/4  yes     eth1    activated     /org/freedesktop/NetworkManager/ActiveConnection/2  --     /etc/NetworkManager/system-connections/ethernet 
 ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  0          never           yes          0                     no        /org/freedesktop/NetworkManager/Settings/Connection/4  yes     eth0    deactivating  /org/freedesktop/NetworkManager/ActiveConnection/1  --     /etc/NetworkManager/system-connections/ethernet 
+ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  0          never           yes          0                     no        /org/freedesktop/NetworkManager/Settings/Connection/4  yes     eth1    activated     /org/freedesktop/NetworkManager/ActiveConnection/2  --     /etc/NetworkManager/system-connections/ethernet 
 con-1     5fcfd6d7-1e63-3332-8826-a7eda103792d  ethernet  0          never           yes          0                     no        /org/freedesktop/NetworkManager/Settings/Connection/1  no      --      --            --                                                  --     /etc/NetworkManager/system-connections/con-1    
 con-gsm1  UUID-con-gsm1-REPLACED-REPLACED-REPL  gsm       0          never           no           0                     no        /org/freedesktop/NetworkManager/Settings/Connection/3  no      --      --            --                                                  --     /etc/NetworkManager/system-connections/con-gsm1 
 con-xx1   UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet  0          never           yes          0                     no        /org/freedesktop/NetworkManager/Settings/Connection/2  no      --      --            --                                                  --     /etc/NetworkManager/system-connections/con-xx1  
 
 <<<
 size: 2880
-location: clients/tests/test-client.py:957:test_003()/91
+location: clients/tests/test-client.py:971:test_003()/91
 cmd: $NMCLI --pretty --color yes -f ALL con
 lang: pl_PL.UTF-8
 returncode: 0
@@ -4025,15 +4053,15 @@ stdout: 2719 bytes
 ==========================================
 NAME      UUID                                  TYPE      TIMESTAMP  TIMESTAMP-REAL  AUTOCONNECT  AUTOCONNECT-PRIORITY  READONLY  DBUS-PATH                                              ACTIVE  DEVICE  STATE           ACTIVE-PATH                                         SLAVE  FILENAME                                        
 -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  0          nigdy           tak          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/4  tak     eth1    aktywowano      /org/freedesktop/NetworkManager/ActiveConnection/2  --     /etc/NetworkManager/system-connections/ethernet 
 ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  0          nigdy           tak          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/4  tak     eth0    dezaktywowanie  /org/freedesktop/NetworkManager/ActiveConnection/1  --     /etc/NetworkManager/system-connections/ethernet 
+ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  0          nigdy           tak          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/4  tak     eth1    aktywowano      /org/freedesktop/NetworkManager/ActiveConnection/2  --     /etc/NetworkManager/system-connections/ethernet 
 con-1     5fcfd6d7-1e63-3332-8826-a7eda103792d  ethernet  0          nigdy           tak          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/1  nie     --      --              --                                                  --     /etc/NetworkManager/system-connections/con-1    
 con-gsm1  UUID-con-gsm1-REPLACED-REPLACED-REPL  gsm       0          nigdy           nie          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/3  nie     --      --              --                                                  --     /etc/NetworkManager/system-connections/con-gsm1 
 con-xx1   UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet  0          nigdy           tak          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/2  nie     --      --              --                                                  --     /etc/NetworkManager/system-connections/con-xx1  
 
 <<<
 size: 616
-location: clients/tests/test-client.py:960:test_003()/92
+location: clients/tests/test-client.py:974:test_003()/92
 cmd: $NMCLI --pretty --color yes -f UUID,TYPE con
 lang: C
 returncode: 0
@@ -4051,7 +4079,7 @@ UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet
 
 <<<
 size: 646
-location: clients/tests/test-client.py:960:test_003()/93
+location: clients/tests/test-client.py:974:test_003()/93
 cmd: $NMCLI --pretty --color yes -f UUID,TYPE con
 lang: pl_PL.UTF-8
 returncode: 0
@@ -4069,7 +4097,7 @@ UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet
 
 <<<
 size: 6396
-location: clients/tests/test-client.py:963:test_003()/94
+location: clients/tests/test-client.py:977:test_003()/94
 cmd: $NMCLI --pretty --color yes con s ethernet
 lang: C
 returncode: 0
@@ -4200,7 +4228,7 @@ GENERAL.MASTER-PATH:                    --
 
 <<<
 size: 6452
-location: clients/tests/test-client.py:963:test_003()/95
+location: clients/tests/test-client.py:977:test_003()/95
 cmd: $NMCLI --pretty --color yes con s ethernet
 lang: pl_PL.UTF-8
 returncode: 0
@@ -4331,7 +4359,7 @@ GENERAL.MASTER-PATH:                    --
 
 <<<
 size: 5458
-location: clients/tests/test-client.py:966:test_003()/96
+location: clients/tests/test-client.py:980:test_003()/96
 cmd: $NMCLI --pretty --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: C
 returncode: 0
@@ -4445,7 +4473,7 @@ GENERAL.MASTER-PATH:                    --
 
 <<<
 size: 5503
-location: clients/tests/test-client.py:966:test_003()/97
+location: clients/tests/test-client.py:980:test_003()/97
 cmd: $NMCLI --pretty --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: pl_PL.UTF-8
 returncode: 0
@@ -4558,12 +4586,12 @@ GENERAL.MASTER-PATH:                    --
 -------------------------------------------------------------------------------
 
 <<<
-size: 4262
-location: clients/tests/test-client.py:969:test_003()/98
+size: 4366
+location: clients/tests/test-client.py:983:test_003()/98
 cmd: $NMCLI --pretty --color yes -f all dev show eth0
 lang: C
 returncode: 0
-stdout: 4101 bytes
+stdout: 4205 bytes
 >>>
 ===============================================================================
                              Device details (eth0)
@@ -4580,6 +4608,8 @@ GENERAL.HWADDR:                         C0:61:AE:26:4D:D7
 GENERAL.MTU:                            0
 GENERAL.STATE:                          20 (unavailable)
 GENERAL.REASON:                         0 (No reason given)
+GENERAL.IP4-CONNECTIVITY:               0 (unknown)
+GENERAL.IP6-CONNECTIVITY:               0 (unknown)
 GENERAL.UDI:                            /sys/devices/virtual/eth0
 GENERAL.IP-IFACE:                       --
 GENERAL.IS-SOFTWARE:                    no
@@ -4633,12 +4663,12 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[3]:   UUID-ethernet-REPLACED-REPLACED-REPL | e
 -------------------------------------------------------------------------------
 
 <<<
-size: 4301
-location: clients/tests/test-client.py:969:test_003()/99
+size: 4407
+location: clients/tests/test-client.py:983:test_003()/99
 cmd: $NMCLI --pretty --color yes -f all dev show eth0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 4130 bytes
+stdout: 4236 bytes
 >>>
 ===============================================================================
                         Informacje o urządzeniu (eth0)
@@ -4655,6 +4685,8 @@ GENERAL.HWADDR:                         C0:61:AE:26:4D:D7
 GENERAL.MTU:                            0
 GENERAL.STATE:                          20 (niedostępne)
 GENERAL.REASON:                         0 (Nie podano przyczyny)
+GENERAL.IP4-CONNECTIVITY:               0 (nieznane)
+GENERAL.IP6-CONNECTIVITY:               0 (nieznane)
 GENERAL.UDI:                            /sys/devices/virtual/eth0
 GENERAL.IP-IFACE:                       --
 GENERAL.IS-SOFTWARE:                    nie
@@ -4709,35 +4741,35 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[3]:   UUID-ethernet-REPLACED-REPLACED-REPL | e
 
 <<<
 size: 1185
-location: clients/tests/test-client.py:957:test_003()/100
+location: clients/tests/test-client.py:971:test_003()/100
 cmd: $NMCLI --terse -f ALL con
 lang: C
 returncode: 0
 stdout: 1046 bytes
 >>>
-ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:802-3-ethernet:0:never:yes:0:no:/org/freedesktop/NetworkManager/Settings/Connection/4:yes:eth1:activated:/org/freedesktop/NetworkManager/ActiveConnection/2::/etc/NetworkManager/system-connections/ethernet
 ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:802-3-ethernet:0:never:yes:0:no:/org/freedesktop/NetworkManager/Settings/Connection/4:yes:eth0:deactivating:/org/freedesktop/NetworkManager/ActiveConnection/1::/etc/NetworkManager/system-connections/ethernet
+ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:802-3-ethernet:0:never:yes:0:no:/org/freedesktop/NetworkManager/Settings/Connection/4:yes:eth1:activated:/org/freedesktop/NetworkManager/ActiveConnection/2::/etc/NetworkManager/system-connections/ethernet
 con-1:5fcfd6d7-1e63-3332-8826-a7eda103792d:802-3-ethernet:0:never:yes:0:no:/org/freedesktop/NetworkManager/Settings/Connection/1:no:::::/etc/NetworkManager/system-connections/con-1
 con-gsm1:UUID-con-gsm1-REPLACED-REPLACED-REPL:gsm:0:never:no:0:no:/org/freedesktop/NetworkManager/Settings/Connection/3:no:::::/etc/NetworkManager/system-connections/con-gsm1
 con-xx1:UUID-con-xx1-REPLACED-REPLACED-REPLA:802-3-ethernet:0:never:yes:0:no:/org/freedesktop/NetworkManager/Settings/Connection/2:no:::::/etc/NetworkManager/system-connections/con-xx1
 
 <<<
 size: 1195
-location: clients/tests/test-client.py:957:test_003()/101
+location: clients/tests/test-client.py:971:test_003()/101
 cmd: $NMCLI --terse -f ALL con
 lang: pl_PL.UTF-8
 returncode: 0
 stdout: 1046 bytes
 >>>
-ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:802-3-ethernet:0:never:yes:0:no:/org/freedesktop/NetworkManager/Settings/Connection/4:yes:eth1:activated:/org/freedesktop/NetworkManager/ActiveConnection/2::/etc/NetworkManager/system-connections/ethernet
 ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:802-3-ethernet:0:never:yes:0:no:/org/freedesktop/NetworkManager/Settings/Connection/4:yes:eth0:deactivating:/org/freedesktop/NetworkManager/ActiveConnection/1::/etc/NetworkManager/system-connections/ethernet
+ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:802-3-ethernet:0:never:yes:0:no:/org/freedesktop/NetworkManager/Settings/Connection/4:yes:eth1:activated:/org/freedesktop/NetworkManager/ActiveConnection/2::/etc/NetworkManager/system-connections/ethernet
 con-1:5fcfd6d7-1e63-3332-8826-a7eda103792d:802-3-ethernet:0:never:yes:0:no:/org/freedesktop/NetworkManager/Settings/Connection/1:no:::::/etc/NetworkManager/system-connections/con-1
 con-gsm1:UUID-con-gsm1-REPLACED-REPLACED-REPL:gsm:0:never:no:0:no:/org/freedesktop/NetworkManager/Settings/Connection/3:no:::::/etc/NetworkManager/system-connections/con-gsm1
 con-xx1:UUID-con-xx1-REPLACED-REPLACED-REPLA:802-3-ethernet:0:never:yes:0:no:/org/freedesktop/NetworkManager/Settings/Connection/2:no:::::/etc/NetworkManager/system-connections/con-xx1
 
 <<<
 size: 341
-location: clients/tests/test-client.py:960:test_003()/102
+location: clients/tests/test-client.py:974:test_003()/102
 cmd: $NMCLI --terse -f UUID,TYPE con
 lang: C
 returncode: 0
@@ -4750,7 +4782,7 @@ UUID-con-xx1-REPLACED-REPLACED-REPLA:802-3-ethernet
 
 <<<
 size: 351
-location: clients/tests/test-client.py:960:test_003()/103
+location: clients/tests/test-client.py:974:test_003()/103
 cmd: $NMCLI --terse -f UUID,TYPE con
 lang: pl_PL.UTF-8
 returncode: 0
@@ -4763,7 +4795,7 @@ UUID-con-xx1-REPLACED-REPLACED-REPLA:802-3-ethernet
 
 <<<
 size: 2769
-location: clients/tests/test-client.py:963:test_003()/104
+location: clients/tests/test-client.py:977:test_003()/104
 cmd: $NMCLI --terse con s ethernet
 lang: C
 returncode: 0
@@ -4878,7 +4910,7 @@ GENERAL.MASTER-PATH:
 
 <<<
 size: 2779
-location: clients/tests/test-client.py:963:test_003()/105
+location: clients/tests/test-client.py:977:test_003()/105
 cmd: $NMCLI --terse con s ethernet
 lang: pl_PL.UTF-8
 returncode: 0
@@ -4993,7 +5025,7 @@ GENERAL.MASTER-PATH:
 
 <<<
 size: 2441
-location: clients/tests/test-client.py:966:test_003()/106
+location: clients/tests/test-client.py:980:test_003()/106
 cmd: $NMCLI --terse c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: C
 returncode: 0
@@ -5095,7 +5127,7 @@ GENERAL.MASTER-PATH:
 
 <<<
 size: 2451
-location: clients/tests/test-client.py:966:test_003()/107
+location: clients/tests/test-client.py:980:test_003()/107
 cmd: $NMCLI --terse c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: pl_PL.UTF-8
 returncode: 0
@@ -5196,12 +5228,12 @@ GENERAL.ZONE:
 GENERAL.MASTER-PATH:
 
 <<<
-size: 2171
-location: clients/tests/test-client.py:969:test_003()/108
+size: 2245
+location: clients/tests/test-client.py:983:test_003()/108
 cmd: $NMCLI --terse -f all dev show eth0
 lang: C
 returncode: 0
-stdout: 2022 bytes
+stdout: 2096 bytes
 >>>
 GENERAL.DEVICE:eth0
 GENERAL.TYPE:ethernet
@@ -5215,6 +5247,8 @@ GENERAL.HWADDR:C0:61:AE:26:4D:D7
 GENERAL.MTU:0
 GENERAL.STATE:20 (unavailable)
 GENERAL.REASON:0 (No reason given)
+GENERAL.IP4-CONNECTIVITY:0 (unknown)
+GENERAL.IP6-CONNECTIVITY:0 (unknown)
 GENERAL.UDI:/sys/devices/virtual/eth0
 GENERAL.IP-IFACE:
 GENERAL.IS-SOFTWARE:no
@@ -5260,12 +5294,12 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[2]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-
 CONNECTIONS.AVAILABLE-CONNECTIONS[3]:UUID-ethernet-REPLACED-REPLACED-REPL | ethernet
 
 <<<
-size: 2181
-location: clients/tests/test-client.py:969:test_003()/109
+size: 2255
+location: clients/tests/test-client.py:983:test_003()/109
 cmd: $NMCLI --terse -f all dev show eth0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2022 bytes
+stdout: 2096 bytes
 >>>
 GENERAL.DEVICE:eth0
 GENERAL.TYPE:ethernet
@@ -5279,6 +5313,8 @@ GENERAL.HWADDR:C0:61:AE:26:4D:D7
 GENERAL.MTU:0
 GENERAL.STATE:20 (unavailable)
 GENERAL.REASON:0 (No reason given)
+GENERAL.IP4-CONNECTIVITY:0 (unknown)
+GENERAL.IP6-CONNECTIVITY:0 (unknown)
 GENERAL.UDI:/sys/devices/virtual/eth0
 GENERAL.IP-IFACE:
 GENERAL.IS-SOFTWARE:no
@@ -5325,35 +5361,35 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[3]:UUID-ethernet-REPLACED-REPLACED-REPL | ethe
 
 <<<
 size: 1467
-location: clients/tests/test-client.py:957:test_003()/110
+location: clients/tests/test-client.py:971:test_003()/110
 cmd: $NMCLI --terse --color yes -f ALL con
 lang: C
 returncode: 0
 stdout: 1316 bytes
 >>>
-ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:802-3-ethernet:0:never:yes:0:no:/org/freedesktop/NetworkManager/Settings/Connection/4:yes:eth1:activated:/org/freedesktop/NetworkManager/ActiveConnection/2::/etc/NetworkManager/system-connections/ethernet
 ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:802-3-ethernet:0:never:yes:0:no:/org/freedesktop/NetworkManager/Settings/Connection/4:yes:eth0:deactivating:/org/freedesktop/NetworkManager/ActiveConnection/1::/etc/NetworkManager/system-connections/ethernet
+ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:802-3-ethernet:0:never:yes:0:no:/org/freedesktop/NetworkManager/Settings/Connection/4:yes:eth1:activated:/org/freedesktop/NetworkManager/ActiveConnection/2::/etc/NetworkManager/system-connections/ethernet
 con-1:5fcfd6d7-1e63-3332-8826-a7eda103792d:802-3-ethernet:0:never:yes:0:no:/org/freedesktop/NetworkManager/Settings/Connection/1:no:::::/etc/NetworkManager/system-connections/con-1
 con-gsm1:UUID-con-gsm1-REPLACED-REPLACED-REPL:gsm:0:never:no:0:no:/org/freedesktop/NetworkManager/Settings/Connection/3:no:::::/etc/NetworkManager/system-connections/con-gsm1
 con-xx1:UUID-con-xx1-REPLACED-REPLACED-REPLA:802-3-ethernet:0:never:yes:0:no:/org/freedesktop/NetworkManager/Settings/Connection/2:no:::::/etc/NetworkManager/system-connections/con-xx1
 
 <<<
 size: 1477
-location: clients/tests/test-client.py:957:test_003()/111
+location: clients/tests/test-client.py:971:test_003()/111
 cmd: $NMCLI --terse --color yes -f ALL con
 lang: pl_PL.UTF-8
 returncode: 0
 stdout: 1316 bytes
 >>>
-ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:802-3-ethernet:0:never:yes:0:no:/org/freedesktop/NetworkManager/Settings/Connection/4:yes:eth1:activated:/org/freedesktop/NetworkManager/ActiveConnection/2::/etc/NetworkManager/system-connections/ethernet
 ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:802-3-ethernet:0:never:yes:0:no:/org/freedesktop/NetworkManager/Settings/Connection/4:yes:eth0:deactivating:/org/freedesktop/NetworkManager/ActiveConnection/1::/etc/NetworkManager/system-connections/ethernet
+ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:802-3-ethernet:0:never:yes:0:no:/org/freedesktop/NetworkManager/Settings/Connection/4:yes:eth1:activated:/org/freedesktop/NetworkManager/ActiveConnection/2::/etc/NetworkManager/system-connections/ethernet
 con-1:5fcfd6d7-1e63-3332-8826-a7eda103792d:802-3-ethernet:0:never:yes:0:no:/org/freedesktop/NetworkManager/Settings/Connection/1:no:::::/etc/NetworkManager/system-connections/con-1
 con-gsm1:UUID-con-gsm1-REPLACED-REPLACED-REPL:gsm:0:never:no:0:no:/org/freedesktop/NetworkManager/Settings/Connection/3:no:::::/etc/NetworkManager/system-connections/con-gsm1
 con-xx1:UUID-con-xx1-REPLACED-REPLACED-REPLA:802-3-ethernet:0:never:yes:0:no:/org/freedesktop/NetworkManager/Settings/Connection/2:no:::::/etc/NetworkManager/system-connections/con-xx1
 
 <<<
 size: 371
-location: clients/tests/test-client.py:960:test_003()/112
+location: clients/tests/test-client.py:974:test_003()/112
 cmd: $NMCLI --terse --color yes -f UUID,TYPE con
 lang: C
 returncode: 0
@@ -5366,7 +5402,7 @@ UUID-con-xx1-REPLACED-REPLACED-REPLA:802-3-ethernet
 
 <<<
 size: 381
-location: clients/tests/test-client.py:960:test_003()/113
+location: clients/tests/test-client.py:974:test_003()/113
 cmd: $NMCLI --terse --color yes -f UUID,TYPE con
 lang: pl_PL.UTF-8
 returncode: 0
@@ -5379,7 +5415,7 @@ UUID-con-xx1-REPLACED-REPLACED-REPLA:802-3-ethernet
 
 <<<
 size: 2781
-location: clients/tests/test-client.py:963:test_003()/114
+location: clients/tests/test-client.py:977:test_003()/114
 cmd: $NMCLI --terse --color yes con s ethernet
 lang: C
 returncode: 0
@@ -5494,7 +5530,7 @@ GENERAL.MASTER-PATH:
 
 <<<
 size: 2791
-location: clients/tests/test-client.py:963:test_003()/115
+location: clients/tests/test-client.py:977:test_003()/115
 cmd: $NMCLI --terse --color yes con s ethernet
 lang: pl_PL.UTF-8
 returncode: 0
@@ -5609,7 +5645,7 @@ GENERAL.MASTER-PATH:
 
 <<<
 size: 2453
-location: clients/tests/test-client.py:966:test_003()/116
+location: clients/tests/test-client.py:980:test_003()/116
 cmd: $NMCLI --terse --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: C
 returncode: 0
@@ -5711,7 +5747,7 @@ GENERAL.MASTER-PATH:
 
 <<<
 size: 2463
-location: clients/tests/test-client.py:966:test_003()/117
+location: clients/tests/test-client.py:980:test_003()/117
 cmd: $NMCLI --terse --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: pl_PL.UTF-8
 returncode: 0
@@ -5812,12 +5848,12 @@ GENERAL.ZONE:
 GENERAL.MASTER-PATH:
 
 <<<
-size: 2183
-location: clients/tests/test-client.py:969:test_003()/118
+size: 2257
+location: clients/tests/test-client.py:983:test_003()/118
 cmd: $NMCLI --terse --color yes -f all dev show eth0
 lang: C
 returncode: 0
-stdout: 2022 bytes
+stdout: 2096 bytes
 >>>
 GENERAL.DEVICE:eth0
 GENERAL.TYPE:ethernet
@@ -5831,6 +5867,8 @@ GENERAL.HWADDR:C0:61:AE:26:4D:D7
 GENERAL.MTU:0
 GENERAL.STATE:20 (unavailable)
 GENERAL.REASON:0 (No reason given)
+GENERAL.IP4-CONNECTIVITY:0 (unknown)
+GENERAL.IP6-CONNECTIVITY:0 (unknown)
 GENERAL.UDI:/sys/devices/virtual/eth0
 GENERAL.IP-IFACE:
 GENERAL.IS-SOFTWARE:no
@@ -5876,12 +5914,12 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[2]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-
 CONNECTIONS.AVAILABLE-CONNECTIONS[3]:UUID-ethernet-REPLACED-REPLACED-REPL | ethernet
 
 <<<
-size: 2193
-location: clients/tests/test-client.py:969:test_003()/119
+size: 2267
+location: clients/tests/test-client.py:983:test_003()/119
 cmd: $NMCLI --terse --color yes -f all dev show eth0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2022 bytes
+stdout: 2096 bytes
 >>>
 GENERAL.DEVICE:eth0
 GENERAL.TYPE:ethernet
@@ -5895,6 +5933,8 @@ GENERAL.HWADDR:C0:61:AE:26:4D:D7
 GENERAL.MTU:0
 GENERAL.STATE:20 (unavailable)
 GENERAL.REASON:0 (No reason given)
+GENERAL.IP4-CONNECTIVITY:0 (unknown)
+GENERAL.IP6-CONNECTIVITY:0 (unknown)
 GENERAL.UDI:/sys/devices/virtual/eth0
 GENERAL.IP-IFACE:
 GENERAL.IS-SOFTWARE:no
@@ -5941,37 +5981,37 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[3]:UUID-ethernet-REPLACED-REPLACED-REPL | ethe
 
 <<<
 size: 2084
-location: clients/tests/test-client.py:957:test_003()/120
+location: clients/tests/test-client.py:971:test_003()/120
 cmd: $NMCLI --mode tabular -f ALL con
 lang: C
 returncode: 0
 stdout: 1938 bytes
 >>>
 NAME      UUID                                  TYPE      TIMESTAMP  TIMESTAMP-REAL  AUTOCONNECT  AUTOCONNECT-PRIORITY  READONLY  DBUS-PATH                                              ACTIVE  DEVICE  STATE         ACTIVE-PATH                                         SLAVE  FILENAME                                        
-ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  0          never           yes          0                     no        /org/freedesktop/NetworkManager/Settings/Connection/4  yes     eth1    activated     /org/freedesktop/NetworkManager/ActiveConnection/2  --     /etc/NetworkManager/system-connections/ethernet 
 ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  0          never           yes          0                     no        /org/freedesktop/NetworkManager/Settings/Connection/4  yes     eth0    deactivating  /org/freedesktop/NetworkManager/ActiveConnection/1  --     /etc/NetworkManager/system-connections/ethernet 
+ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  0          never           yes          0                     no        /org/freedesktop/NetworkManager/Settings/Connection/4  yes     eth1    activated     /org/freedesktop/NetworkManager/ActiveConnection/2  --     /etc/NetworkManager/system-connections/ethernet 
 con-1     5fcfd6d7-1e63-3332-8826-a7eda103792d  ethernet  0          never           yes          0                     no        /org/freedesktop/NetworkManager/Settings/Connection/1  no      --      --            --                                                  --     /etc/NetworkManager/system-connections/con-1    
 con-gsm1  UUID-con-gsm1-REPLACED-REPLACED-REPL  gsm       0          never           no           0                     no        /org/freedesktop/NetworkManager/Settings/Connection/3  no      --      --            --                                                  --     /etc/NetworkManager/system-connections/con-gsm1 
 con-xx1   UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet  0          never           yes          0                     no        /org/freedesktop/NetworkManager/Settings/Connection/2  no      --      --            --                                                  --     /etc/NetworkManager/system-connections/con-xx1  
 
 <<<
 size: 2106
-location: clients/tests/test-client.py:957:test_003()/121
+location: clients/tests/test-client.py:971:test_003()/121
 cmd: $NMCLI --mode tabular -f ALL con
 lang: pl_PL.UTF-8
 returncode: 0
 stdout: 1950 bytes
 >>>
 NAME      UUID                                  TYPE      TIMESTAMP  TIMESTAMP-REAL  AUTOCONNECT  AUTOCONNECT-PRIORITY  READONLY  DBUS-PATH                                              ACTIVE  DEVICE  STATE           ACTIVE-PATH                                         SLAVE  FILENAME                                        
-ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  0          nigdy           tak          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/4  tak     eth1    aktywowano      /org/freedesktop/NetworkManager/ActiveConnection/2  --     /etc/NetworkManager/system-connections/ethernet 
 ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  0          nigdy           tak          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/4  tak     eth0    dezaktywowanie  /org/freedesktop/NetworkManager/ActiveConnection/1  --     /etc/NetworkManager/system-connections/ethernet 
+ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  0          nigdy           tak          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/4  tak     eth1    aktywowano      /org/freedesktop/NetworkManager/ActiveConnection/2  --     /etc/NetworkManager/system-connections/ethernet 
 con-1     5fcfd6d7-1e63-3332-8826-a7eda103792d  ethernet  0          nigdy           tak          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/1  nie     --      --              --                                                  --     /etc/NetworkManager/system-connections/con-1    
 con-gsm1  UUID-con-gsm1-REPLACED-REPLACED-REPL  gsm       0          nigdy           nie          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/3  nie     --      --              --                                                  --     /etc/NetworkManager/system-connections/con-gsm1 
 con-xx1   UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet  0          nigdy           tak          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/2  nie     --      --              --                                                  --     /etc/NetworkManager/system-connections/con-xx1  
 
 <<<
 size: 391
-location: clients/tests/test-client.py:960:test_003()/122
+location: clients/tests/test-client.py:974:test_003()/122
 cmd: $NMCLI --mode tabular -f UUID,TYPE con
 lang: C
 returncode: 0
@@ -5985,7 +6025,7 @@ UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet
 
 <<<
 size: 401
-location: clients/tests/test-client.py:960:test_003()/123
+location: clients/tests/test-client.py:974:test_003()/123
 cmd: $NMCLI --mode tabular -f UUID,TYPE con
 lang: pl_PL.UTF-8
 returncode: 0
@@ -5999,7 +6039,7 @@ UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet
 
 <<<
 size: 3416
-location: clients/tests/test-client.py:963:test_003()/124
+location: clients/tests/test-client.py:977:test_003()/124
 cmd: $NMCLI --mode tabular con s ethernet
 lang: C
 returncode: 0
@@ -6030,7 +6070,7 @@ GENERAL  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  eth0     deactivating
 
 <<<
 size: 3450
-location: clients/tests/test-client.py:963:test_003()/125
+location: clients/tests/test-client.py:977:test_003()/125
 cmd: $NMCLI --mode tabular con s ethernet
 lang: pl_PL.UTF-8
 returncode: 0
@@ -6061,7 +6101,7 @@ GENERAL  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  eth0     dezaktywowanie
 
 <<<
 size: 2974
-location: clients/tests/test-client.py:966:test_003()/126
+location: clients/tests/test-client.py:980:test_003()/126
 cmd: $NMCLI --mode tabular c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: C
 returncode: 0
@@ -6088,7 +6128,7 @@ GENERAL  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  eth0     deactivating
 
 <<<
 size: 3006
-location: clients/tests/test-client.py:966:test_003()/127
+location: clients/tests/test-client.py:980:test_003()/127
 cmd: $NMCLI --mode tabular c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: pl_PL.UTF-8
 returncode: 0
@@ -6114,15 +6154,15 @@ GENERAL  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  eth0     dezaktywowanie
 
 
 <<<
-size: 2899
-location: clients/tests/test-client.py:969:test_003()/128
+size: 2971
+location: clients/tests/test-client.py:983:test_003()/128
 cmd: $NMCLI --mode tabular -f all dev show eth0
 lang: C
 returncode: 0
-stdout: 2743 bytes
+stdout: 2815 bytes
 >>>
-NAME     DEVICE  TYPE      NM-TYPE           VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON               UDI                        IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED 
-GENERAL  eth0    ethernet  NMDeviceEthernet  --      --       virtual  --              --                C0:61:AE:26:4D:D7  0    20 (unavailable)  0 (No reason given)  /sys/devices/virtual/eth0  --        no           yes         yes          no                no                 --            ethernet    UUID-ethernet-REPLACED-REPLACED-REPL  /org/freedesktop/NetworkManager/ActiveConnection/1  unknown 
+NAME     DEVICE  TYPE      NM-TYPE           VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON               IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                        IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED 
+GENERAL  eth0    ethernet  NMDeviceEthernet  --      --       virtual  --              --                C0:61:AE:26:4D:D7  0    20 (unavailable)  0 (No reason given)  0 (unknown)       0 (unknown)       /sys/devices/virtual/eth0  --        no           yes         yes          no                no                 --            ethernet    UUID-ethernet-REPLACED-REPLACED-REPL  /org/freedesktop/NetworkManager/ActiveConnection/1  unknown 
 
 NAME          CARRIER-DETECT  SPEED     IS-SOFTWARE  SRIOV 
 CAPABILITIES  no              100 Mb/s  no           no    
@@ -6146,15 +6186,15 @@ NAME         AVAILABLE-CONNECTION-PATHS                                   AVAILA
 CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{1,2,4}  5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 | UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 | UUID-ethernet-REPLACED-REPLACED-REPL | ethernet 
 
 <<<
-size: 2930
-location: clients/tests/test-client.py:969:test_003()/129
+size: 3002
+location: clients/tests/test-client.py:983:test_003()/129
 cmd: $NMCLI --mode tabular -f all dev show eth0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2764 bytes
+stdout: 2836 bytes
 >>>
-NAME     DEVICE  TYPE      NM-TYPE           VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON                    UDI                        IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED  
-GENERAL  eth0    ethernet  NMDeviceEthernet  --      --       virtual  --              --                C0:61:AE:26:4D:D7  0    20 (niedostępne)  0 (Nie podano przyczyny)  /sys/devices/virtual/eth0  --        nie          tak         tak          nie               nie                --            ethernet    UUID-ethernet-REPLACED-REPLACED-REPL  /org/freedesktop/NetworkManager/ActiveConnection/1  nieznane 
+NAME     DEVICE  TYPE      NM-TYPE           VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON                    IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                        IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED  
+GENERAL  eth0    ethernet  NMDeviceEthernet  --      --       virtual  --              --                C0:61:AE:26:4D:D7  0    20 (niedostępne)  0 (Nie podano przyczyny)  0 (nieznane)      0 (nieznane)      /sys/devices/virtual/eth0  --        nie          tak         tak          nie               nie                --            ethernet    UUID-ethernet-REPLACED-REPLACED-REPL  /org/freedesktop/NetworkManager/ActiveConnection/1  nieznane 
 
 NAME          CARRIER-DETECT  SPEED     IS-SOFTWARE  SRIOV 
 CAPABILITIES  nie             100 Mb/s  nie          nie   
@@ -6179,37 +6219,37 @@ CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{1,2,4}  5fcfd6
 
 <<<
 size: 2366
-location: clients/tests/test-client.py:957:test_003()/130
+location: clients/tests/test-client.py:971:test_003()/130
 cmd: $NMCLI --mode tabular --color yes -f ALL con
 lang: C
 returncode: 0
 stdout: 2208 bytes
 >>>
 NAME      UUID                                  TYPE      TIMESTAMP  TIMESTAMP-REAL  AUTOCONNECT  AUTOCONNECT-PRIORITY  READONLY  DBUS-PATH                                              ACTIVE  DEVICE  STATE         ACTIVE-PATH                                         SLAVE  FILENAME                                        
-ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  0          never           yes          0                     no        /org/freedesktop/NetworkManager/Settings/Connection/4  yes     eth1    activated     /org/freedesktop/NetworkManager/ActiveConnection/2  --     /etc/NetworkManager/system-connections/ethernet 
 ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  0          never           yes          0                     no        /org/freedesktop/NetworkManager/Settings/Connection/4  yes     eth0    deactivating  /org/freedesktop/NetworkManager/ActiveConnection/1  --     /etc/NetworkManager/system-connections/ethernet 
+ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  0          never           yes          0                     no        /org/freedesktop/NetworkManager/Settings/Connection/4  yes     eth1    activated     /org/freedesktop/NetworkManager/ActiveConnection/2  --     /etc/NetworkManager/system-connections/ethernet 
 con-1     5fcfd6d7-1e63-3332-8826-a7eda103792d  ethernet  0          never           yes          0                     no        /org/freedesktop/NetworkManager/Settings/Connection/1  no      --      --            --                                                  --     /etc/NetworkManager/system-connections/con-1    
 con-gsm1  UUID-con-gsm1-REPLACED-REPLACED-REPL  gsm       0          never           no           0                     no        /org/freedesktop/NetworkManager/Settings/Connection/3  no      --      --            --                                                  --     /etc/NetworkManager/system-connections/con-gsm1 
 con-xx1   UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet  0          never           yes          0                     no        /org/freedesktop/NetworkManager/Settings/Connection/2  no      --      --            --                                                  --     /etc/NetworkManager/system-connections/con-xx1  
 
 <<<
 size: 2388
-location: clients/tests/test-client.py:957:test_003()/131
+location: clients/tests/test-client.py:971:test_003()/131
 cmd: $NMCLI --mode tabular --color yes -f ALL con
 lang: pl_PL.UTF-8
 returncode: 0
 stdout: 2220 bytes
 >>>
 NAME      UUID                                  TYPE      TIMESTAMP  TIMESTAMP-REAL  AUTOCONNECT  AUTOCONNECT-PRIORITY  READONLY  DBUS-PATH                                              ACTIVE  DEVICE  STATE           ACTIVE-PATH                                         SLAVE  FILENAME                                        
-ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  0          nigdy           tak          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/4  tak     eth1    aktywowano      /org/freedesktop/NetworkManager/ActiveConnection/2  --     /etc/NetworkManager/system-connections/ethernet 
 ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  0          nigdy           tak          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/4  tak     eth0    dezaktywowanie  /org/freedesktop/NetworkManager/ActiveConnection/1  --     /etc/NetworkManager/system-connections/ethernet 
+ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  0          nigdy           tak          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/4  tak     eth1    aktywowano      /org/freedesktop/NetworkManager/ActiveConnection/2  --     /etc/NetworkManager/system-connections/ethernet 
 con-1     5fcfd6d7-1e63-3332-8826-a7eda103792d  ethernet  0          nigdy           tak          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/1  nie     --      --              --                                                  --     /etc/NetworkManager/system-connections/con-1    
 con-gsm1  UUID-con-gsm1-REPLACED-REPLACED-REPL  gsm       0          nigdy           nie          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/3  nie     --      --              --                                                  --     /etc/NetworkManager/system-connections/con-gsm1 
 con-xx1   UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet  0          nigdy           tak          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/2  nie     --      --              --                                                  --     /etc/NetworkManager/system-connections/con-xx1  
 
 <<<
 size: 421
-location: clients/tests/test-client.py:960:test_003()/132
+location: clients/tests/test-client.py:974:test_003()/132
 cmd: $NMCLI --mode tabular --color yes -f UUID,TYPE con
 lang: C
 returncode: 0
@@ -6223,7 +6263,7 @@ UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet
 
 <<<
 size: 431
-location: clients/tests/test-client.py:960:test_003()/133
+location: clients/tests/test-client.py:974:test_003()/133
 cmd: $NMCLI --mode tabular --color yes -f UUID,TYPE con
 lang: pl_PL.UTF-8
 returncode: 0
@@ -6237,7 +6277,7 @@ UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet
 
 <<<
 size: 3428
-location: clients/tests/test-client.py:963:test_003()/134
+location: clients/tests/test-client.py:977:test_003()/134
 cmd: $NMCLI --mode tabular --color yes con s ethernet
 lang: C
 returncode: 0
@@ -6268,7 +6308,7 @@ GENERAL  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  eth0     deactivating
 
 <<<
 size: 3462
-location: clients/tests/test-client.py:963:test_003()/135
+location: clients/tests/test-client.py:977:test_003()/135
 cmd: $NMCLI --mode tabular --color yes con s ethernet
 lang: pl_PL.UTF-8
 returncode: 0
@@ -6299,7 +6339,7 @@ GENERAL  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  eth0     dezaktywowanie
 
 <<<
 size: 2986
-location: clients/tests/test-client.py:966:test_003()/136
+location: clients/tests/test-client.py:980:test_003()/136
 cmd: $NMCLI --mode tabular --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: C
 returncode: 0
@@ -6326,7 +6366,7 @@ GENERAL  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  eth0     deactivating
 
 <<<
 size: 3018
-location: clients/tests/test-client.py:966:test_003()/137
+location: clients/tests/test-client.py:980:test_003()/137
 cmd: $NMCLI --mode tabular --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: pl_PL.UTF-8
 returncode: 0
@@ -6352,15 +6392,15 @@ GENERAL  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  eth0     dezaktywowanie
 
 
 <<<
-size: 2911
-location: clients/tests/test-client.py:969:test_003()/138
+size: 2983
+location: clients/tests/test-client.py:983:test_003()/138
 cmd: $NMCLI --mode tabular --color yes -f all dev show eth0
 lang: C
 returncode: 0
-stdout: 2743 bytes
+stdout: 2815 bytes
 >>>
-NAME     DEVICE  TYPE      NM-TYPE           VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON               UDI                        IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED 
-GENERAL  eth0    ethernet  NMDeviceEthernet  --      --       virtual  --              --                C0:61:AE:26:4D:D7  0    20 (unavailable)  0 (No reason given)  /sys/devices/virtual/eth0  --        no           yes         yes          no                no                 --            ethernet    UUID-ethernet-REPLACED-REPLACED-REPL  /org/freedesktop/NetworkManager/ActiveConnection/1  unknown 
+NAME     DEVICE  TYPE      NM-TYPE           VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON               IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                        IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED 
+GENERAL  eth0    ethernet  NMDeviceEthernet  --      --       virtual  --              --                C0:61:AE:26:4D:D7  0    20 (unavailable)  0 (No reason given)  0 (unknown)       0 (unknown)       /sys/devices/virtual/eth0  --        no           yes         yes          no                no                 --            ethernet    UUID-ethernet-REPLACED-REPLACED-REPL  /org/freedesktop/NetworkManager/ActiveConnection/1  unknown 
 
 NAME          CARRIER-DETECT  SPEED     IS-SOFTWARE  SRIOV 
 CAPABILITIES  no              100 Mb/s  no           no    
@@ -6384,15 +6424,15 @@ NAME         AVAILABLE-CONNECTION-PATHS                                   AVAILA
 CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{1,2,4}  5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 | UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 | UUID-ethernet-REPLACED-REPLACED-REPL | ethernet 
 
 <<<
-size: 2942
-location: clients/tests/test-client.py:969:test_003()/139
+size: 3014
+location: clients/tests/test-client.py:983:test_003()/139
 cmd: $NMCLI --mode tabular --color yes -f all dev show eth0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2764 bytes
+stdout: 2836 bytes
 >>>
-NAME     DEVICE  TYPE      NM-TYPE           VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON                    UDI                        IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED  
-GENERAL  eth0    ethernet  NMDeviceEthernet  --      --       virtual  --              --                C0:61:AE:26:4D:D7  0    20 (niedostępne)  0 (Nie podano przyczyny)  /sys/devices/virtual/eth0  --        nie          tak         tak          nie               nie                --            ethernet    UUID-ethernet-REPLACED-REPLACED-REPL  /org/freedesktop/NetworkManager/ActiveConnection/1  nieznane 
+NAME     DEVICE  TYPE      NM-TYPE           VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON                    IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                        IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED  
+GENERAL  eth0    ethernet  NMDeviceEthernet  --      --       virtual  --              --                C0:61:AE:26:4D:D7  0    20 (niedostępne)  0 (Nie podano przyczyny)  0 (nieznane)      0 (nieznane)      /sys/devices/virtual/eth0  --        nie          tak         tak          nie               nie                --            ethernet    UUID-ethernet-REPLACED-REPLACED-REPL  /org/freedesktop/NetworkManager/ActiveConnection/1  nieznane 
 
 NAME          CARRIER-DETECT  SPEED     IS-SOFTWARE  SRIOV 
 CAPABILITIES  nie             100 Mb/s  nie          nie   
@@ -6417,7 +6457,7 @@ CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{1,2,4}  5fcfd6
 
 <<<
 size: 2570
-location: clients/tests/test-client.py:957:test_003()/140
+location: clients/tests/test-client.py:971:test_003()/140
 cmd: $NMCLI --mode tabular --pretty -f ALL con
 lang: C
 returncode: 0
@@ -6428,15 +6468,15 @@ stdout: 2415 bytes
 ======================================
 NAME      UUID                                  TYPE      TIMESTAMP  TIMESTAMP-REAL  AUTOCONNECT  AUTOCONNECT-PRIORITY  READONLY  DBUS-PATH                                              ACTIVE  DEVICE  STATE         ACTIVE-PATH                                         SLAVE  FILENAME                                        
 -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  0          never           yes          0                     no        /org/freedesktop/NetworkManager/Settings/Connection/4  yes     eth1    activated     /org/freedesktop/NetworkManager/ActiveConnection/2  --     /etc/NetworkManager/system-connections/ethernet 
 ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  0          never           yes          0                     no        /org/freedesktop/NetworkManager/Settings/Connection/4  yes     eth0    deactivating  /org/freedesktop/NetworkManager/ActiveConnection/1  --     /etc/NetworkManager/system-connections/ethernet 
+ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  0          never           yes          0                     no        /org/freedesktop/NetworkManager/Settings/Connection/4  yes     eth1    activated     /org/freedesktop/NetworkManager/ActiveConnection/2  --     /etc/NetworkManager/system-connections/ethernet 
 con-1     5fcfd6d7-1e63-3332-8826-a7eda103792d  ethernet  0          never           yes          0                     no        /org/freedesktop/NetworkManager/Settings/Connection/1  no      --      --            --                                                  --     /etc/NetworkManager/system-connections/con-1    
 con-gsm1  UUID-con-gsm1-REPLACED-REPLACED-REPL  gsm       0          never           no           0                     no        /org/freedesktop/NetworkManager/Settings/Connection/3  no      --      --            --                                                  --     /etc/NetworkManager/system-connections/con-gsm1 
 con-xx1   UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet  0          never           yes          0                     no        /org/freedesktop/NetworkManager/Settings/Connection/2  no      --      --            --                                                  --     /etc/NetworkManager/system-connections/con-xx1  
 
 <<<
 size: 2614
-location: clients/tests/test-client.py:957:test_003()/141
+location: clients/tests/test-client.py:971:test_003()/141
 cmd: $NMCLI --mode tabular --pretty -f ALL con
 lang: pl_PL.UTF-8
 returncode: 0
@@ -6447,15 +6487,15 @@ stdout: 2449 bytes
 ==========================================
 NAME      UUID                                  TYPE      TIMESTAMP  TIMESTAMP-REAL  AUTOCONNECT  AUTOCONNECT-PRIORITY  READONLY  DBUS-PATH                                              ACTIVE  DEVICE  STATE           ACTIVE-PATH                                         SLAVE  FILENAME                                        
 -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  0          nigdy           tak          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/4  tak     eth1    aktywowano      /org/freedesktop/NetworkManager/ActiveConnection/2  --     /etc/NetworkManager/system-connections/ethernet 
 ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  0          nigdy           tak          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/4  tak     eth0    dezaktywowanie  /org/freedesktop/NetworkManager/ActiveConnection/1  --     /etc/NetworkManager/system-connections/ethernet 
+ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  0          nigdy           tak          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/4  tak     eth1    aktywowano      /org/freedesktop/NetworkManager/ActiveConnection/2  --     /etc/NetworkManager/system-connections/ethernet 
 con-1     5fcfd6d7-1e63-3332-8826-a7eda103792d  ethernet  0          nigdy           tak          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/1  nie     --      --              --                                                  --     /etc/NetworkManager/system-connections/con-1    
 con-gsm1  UUID-con-gsm1-REPLACED-REPLACED-REPL  gsm       0          nigdy           nie          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/3  nie     --      --              --                                                  --     /etc/NetworkManager/system-connections/con-gsm1 
 con-xx1   UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet  0          nigdy           tak          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/2  nie     --      --              --                                                  --     /etc/NetworkManager/system-connections/con-xx1  
 
 <<<
 size: 602
-location: clients/tests/test-client.py:960:test_003()/142
+location: clients/tests/test-client.py:974:test_003()/142
 cmd: $NMCLI --mode tabular --pretty -f UUID,TYPE con
 lang: C
 returncode: 0
@@ -6473,7 +6513,7 @@ UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet
 
 <<<
 size: 632
-location: clients/tests/test-client.py:960:test_003()/143
+location: clients/tests/test-client.py:974:test_003()/143
 cmd: $NMCLI --mode tabular --pretty -f UUID,TYPE con
 lang: pl_PL.UTF-8
 returncode: 0
@@ -6491,7 +6531,7 @@ UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet
 
 <<<
 size: 5607
-location: clients/tests/test-client.py:963:test_003()/144
+location: clients/tests/test-client.py:977:test_003()/144
 cmd: $NMCLI --mode tabular --pretty con s ethernet
 lang: C
 returncode: 0
@@ -6538,7 +6578,7 @@ GENERAL  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  eth0     deactivating
 
 <<<
 size: 5701
-location: clients/tests/test-client.py:963:test_003()/145
+location: clients/tests/test-client.py:977:test_003()/145
 cmd: $NMCLI --mode tabular --pretty con s ethernet
 lang: pl_PL.UTF-8
 returncode: 0
@@ -6585,7 +6625,7 @@ GENERAL  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  eth0     dezaktywowanie
 
 <<<
 size: 4713
-location: clients/tests/test-client.py:966:test_003()/146
+location: clients/tests/test-client.py:980:test_003()/146
 cmd: $NMCLI --mode tabular --pretty c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: C
 returncode: 0
@@ -6624,7 +6664,7 @@ GENERAL  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  eth0     deactivating
 
 <<<
 size: 4785
-location: clients/tests/test-client.py:966:test_003()/147
+location: clients/tests/test-client.py:980:test_003()/147
 cmd: $NMCLI --mode tabular --pretty c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: pl_PL.UTF-8
 returncode: 0
@@ -6662,19 +6702,19 @@ GENERAL  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  eth0     dezaktywowanie
 
 
 <<<
-size: 4360
-location: clients/tests/test-client.py:969:test_003()/148
+size: 4468
+location: clients/tests/test-client.py:983:test_003()/148
 cmd: $NMCLI --mode tabular --pretty -f all dev show eth0
 lang: C
 returncode: 0
-stdout: 4195 bytes
+stdout: 4303 bytes
 >>>
 =========================
   Device details (eth0)
 =========================
-NAME     DEVICE  TYPE      NM-TYPE           VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON               UDI                        IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED 
----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-GENERAL  eth0    ethernet  NMDeviceEthernet  --      --       virtual  --              --                C0:61:AE:26:4D:D7  0    20 (unavailable)  0 (No reason given)  /sys/devices/virtual/eth0  --        no           yes         yes          no                no                 --            ethernet    UUID-ethernet-REPLACED-REPLACED-REPL  /org/freedesktop/NetworkManager/ActiveConnection/1  unknown 
+NAME     DEVICE  TYPE      NM-TYPE           VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON               IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                        IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED 
+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+GENERAL  eth0    ethernet  NMDeviceEthernet  --      --       virtual  --              --                C0:61:AE:26:4D:D7  0    20 (unavailable)  0 (No reason given)  0 (unknown)       0 (unknown)       /sys/devices/virtual/eth0  --        no           yes         yes          no                no                 --            ethernet    UUID-ethernet-REPLACED-REPLACED-REPL  /org/freedesktop/NetworkManager/ActiveConnection/1  unknown 
 
 NAME          CARRIER-DETECT  SPEED     IS-SOFTWARE  SRIOV 
 ------------------------------------------------------------
@@ -6705,19 +6745,19 @@ NAME         AVAILABLE-CONNECTION-PATHS                                   AVAILA
 CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{1,2,4}  5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 | UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 | UUID-ethernet-REPLACED-REPLACED-REPL | ethernet 
 
 <<<
-size: 4428
-location: clients/tests/test-client.py:969:test_003()/149
+size: 4536
+location: clients/tests/test-client.py:983:test_003()/149
 cmd: $NMCLI --mode tabular --pretty -f all dev show eth0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 4253 bytes
+stdout: 4361 bytes
 >>>
 ==================================
   Informacje o urządzeniu (eth0)
 ==================================
-NAME     DEVICE  TYPE      NM-TYPE           VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON                    UDI                        IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED  
----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-GENERAL  eth0    ethernet  NMDeviceEthernet  --      --       virtual  --              --                C0:61:AE:26:4D:D7  0    20 (niedostępne)  0 (Nie podano przyczyny)  /sys/devices/virtual/eth0  --        nie          tak         tak          nie               nie                --            ethernet    UUID-ethernet-REPLACED-REPLACED-REPL  /org/freedesktop/NetworkManager/ActiveConnection/1  nieznane 
+NAME     DEVICE  TYPE      NM-TYPE           VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON                    IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                        IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED  
+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+GENERAL  eth0    ethernet  NMDeviceEthernet  --      --       virtual  --              --                C0:61:AE:26:4D:D7  0    20 (niedostępne)  0 (Nie podano przyczyny)  0 (nieznane)      0 (nieznane)      /sys/devices/virtual/eth0  --        nie          tak         tak          nie               nie                --            ethernet    UUID-ethernet-REPLACED-REPLACED-REPL  /org/freedesktop/NetworkManager/ActiveConnection/1  nieznane 
 
 NAME          CARRIER-DETECT  SPEED     IS-SOFTWARE  SRIOV 
 ------------------------------------------------------------
@@ -6749,7 +6789,7 @@ CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{1,2,4}  5fcfd6
 
 <<<
 size: 2852
-location: clients/tests/test-client.py:957:test_003()/150
+location: clients/tests/test-client.py:971:test_003()/150
 cmd: $NMCLI --mode tabular --pretty --color yes -f ALL con
 lang: C
 returncode: 0
@@ -6760,15 +6800,15 @@ stdout: 2685 bytes
 ======================================
 NAME      UUID                                  TYPE      TIMESTAMP  TIMESTAMP-REAL  AUTOCONNECT  AUTOCONNECT-PRIORITY  READONLY  DBUS-PATH                                              ACTIVE  DEVICE  STATE         ACTIVE-PATH                                         SLAVE  FILENAME                                        
 -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  0          never           yes          0                     no        /org/freedesktop/NetworkManager/Settings/Connection/4  yes     eth1    activated     /org/freedesktop/NetworkManager/ActiveConnection/2  --     /etc/NetworkManager/system-connections/ethernet 
 ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  0          never           yes          0                     no        /org/freedesktop/NetworkManager/Settings/Connection/4  yes     eth0    deactivating  /org/freedesktop/NetworkManager/ActiveConnection/1  --     /etc/NetworkManager/system-connections/ethernet 
+ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  0          never           yes          0                     no        /org/freedesktop/NetworkManager/Settings/Connection/4  yes     eth1    activated     /org/freedesktop/NetworkManager/ActiveConnection/2  --     /etc/NetworkManager/system-connections/ethernet 
 con-1     5fcfd6d7-1e63-3332-8826-a7eda103792d  ethernet  0          never           yes          0                     no        /org/freedesktop/NetworkManager/Settings/Connection/1  no      --      --            --                                                  --     /etc/NetworkManager/system-connections/con-1    
 con-gsm1  UUID-con-gsm1-REPLACED-REPLACED-REPL  gsm       0          never           no           0                     no        /org/freedesktop/NetworkManager/Settings/Connection/3  no      --      --            --                                                  --     /etc/NetworkManager/system-connections/con-gsm1 
 con-xx1   UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet  0          never           yes          0                     no        /org/freedesktop/NetworkManager/Settings/Connection/2  no      --      --            --                                                  --     /etc/NetworkManager/system-connections/con-xx1  
 
 <<<
 size: 2896
-location: clients/tests/test-client.py:957:test_003()/151
+location: clients/tests/test-client.py:971:test_003()/151
 cmd: $NMCLI --mode tabular --pretty --color yes -f ALL con
 lang: pl_PL.UTF-8
 returncode: 0
@@ -6779,15 +6819,15 @@ stdout: 2719 bytes
 ==========================================
 NAME      UUID                                  TYPE      TIMESTAMP  TIMESTAMP-REAL  AUTOCONNECT  AUTOCONNECT-PRIORITY  READONLY  DBUS-PATH                                              ACTIVE  DEVICE  STATE           ACTIVE-PATH                                         SLAVE  FILENAME                                        
 -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  0          nigdy           tak          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/4  tak     eth1    aktywowano      /org/freedesktop/NetworkManager/ActiveConnection/2  --     /etc/NetworkManager/system-connections/ethernet 
 ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  0          nigdy           tak          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/4  tak     eth0    dezaktywowanie  /org/freedesktop/NetworkManager/ActiveConnection/1  --     /etc/NetworkManager/system-connections/ethernet 
+ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  0          nigdy           tak          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/4  tak     eth1    aktywowano      /org/freedesktop/NetworkManager/ActiveConnection/2  --     /etc/NetworkManager/system-connections/ethernet 
 con-1     5fcfd6d7-1e63-3332-8826-a7eda103792d  ethernet  0          nigdy           tak          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/1  nie     --      --              --                                                  --     /etc/NetworkManager/system-connections/con-1    
 con-gsm1  UUID-con-gsm1-REPLACED-REPLACED-REPL  gsm       0          nigdy           nie          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/3  nie     --      --              --                                                  --     /etc/NetworkManager/system-connections/con-gsm1 
 con-xx1   UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet  0          nigdy           tak          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/2  nie     --      --              --                                                  --     /etc/NetworkManager/system-connections/con-xx1  
 
 <<<
 size: 632
-location: clients/tests/test-client.py:960:test_003()/152
+location: clients/tests/test-client.py:974:test_003()/152
 cmd: $NMCLI --mode tabular --pretty --color yes -f UUID,TYPE con
 lang: C
 returncode: 0
@@ -6805,7 +6845,7 @@ UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet
 
 <<<
 size: 662
-location: clients/tests/test-client.py:960:test_003()/153
+location: clients/tests/test-client.py:974:test_003()/153
 cmd: $NMCLI --mode tabular --pretty --color yes -f UUID,TYPE con
 lang: pl_PL.UTF-8
 returncode: 0
@@ -6823,7 +6863,7 @@ UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet
 
 <<<
 size: 5619
-location: clients/tests/test-client.py:963:test_003()/154
+location: clients/tests/test-client.py:977:test_003()/154
 cmd: $NMCLI --mode tabular --pretty --color yes con s ethernet
 lang: C
 returncode: 0
@@ -6870,7 +6910,7 @@ GENERAL  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  eth0     deactivating
 
 <<<
 size: 5713
-location: clients/tests/test-client.py:963:test_003()/155
+location: clients/tests/test-client.py:977:test_003()/155
 cmd: $NMCLI --mode tabular --pretty --color yes con s ethernet
 lang: pl_PL.UTF-8
 returncode: 0
@@ -6917,7 +6957,7 @@ GENERAL  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  eth0     dezaktywowanie
 
 <<<
 size: 4725
-location: clients/tests/test-client.py:966:test_003()/156
+location: clients/tests/test-client.py:980:test_003()/156
 cmd: $NMCLI --mode tabular --pretty --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: C
 returncode: 0
@@ -6956,7 +6996,7 @@ GENERAL  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  eth0     deactivating
 
 <<<
 size: 4797
-location: clients/tests/test-client.py:966:test_003()/157
+location: clients/tests/test-client.py:980:test_003()/157
 cmd: $NMCLI --mode tabular --pretty --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: pl_PL.UTF-8
 returncode: 0
@@ -6994,19 +7034,19 @@ GENERAL  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  eth0     dezaktywowanie
 
 
 <<<
-size: 4372
-location: clients/tests/test-client.py:969:test_003()/158
+size: 4480
+location: clients/tests/test-client.py:983:test_003()/158
 cmd: $NMCLI --mode tabular --pretty --color yes -f all dev show eth0
 lang: C
 returncode: 0
-stdout: 4195 bytes
+stdout: 4303 bytes
 >>>
 =========================
   Device details (eth0)
 =========================
-NAME     DEVICE  TYPE      NM-TYPE           VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON               UDI                        IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED 
----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-GENERAL  eth0    ethernet  NMDeviceEthernet  --      --       virtual  --              --                C0:61:AE:26:4D:D7  0    20 (unavailable)  0 (No reason given)  /sys/devices/virtual/eth0  --        no           yes         yes          no                no                 --            ethernet    UUID-ethernet-REPLACED-REPLACED-REPL  /org/freedesktop/NetworkManager/ActiveConnection/1  unknown 
+NAME     DEVICE  TYPE      NM-TYPE           VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON               IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                        IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED 
+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+GENERAL  eth0    ethernet  NMDeviceEthernet  --      --       virtual  --              --                C0:61:AE:26:4D:D7  0    20 (unavailable)  0 (No reason given)  0 (unknown)       0 (unknown)       /sys/devices/virtual/eth0  --        no           yes         yes          no                no                 --            ethernet    UUID-ethernet-REPLACED-REPLACED-REPL  /org/freedesktop/NetworkManager/ActiveConnection/1  unknown 
 
 NAME          CARRIER-DETECT  SPEED     IS-SOFTWARE  SRIOV 
 ------------------------------------------------------------
@@ -7037,19 +7077,19 @@ NAME         AVAILABLE-CONNECTION-PATHS                                   AVAILA
 CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{1,2,4}  5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 | UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 | UUID-ethernet-REPLACED-REPLACED-REPL | ethernet 
 
 <<<
-size: 4440
-location: clients/tests/test-client.py:969:test_003()/159
+size: 4548
+location: clients/tests/test-client.py:983:test_003()/159
 cmd: $NMCLI --mode tabular --pretty --color yes -f all dev show eth0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 4253 bytes
+stdout: 4361 bytes
 >>>
 ==================================
   Informacje o urządzeniu (eth0)
 ==================================
-NAME     DEVICE  TYPE      NM-TYPE           VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON                    UDI                        IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED  
----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-GENERAL  eth0    ethernet  NMDeviceEthernet  --      --       virtual  --              --                C0:61:AE:26:4D:D7  0    20 (niedostępne)  0 (Nie podano przyczyny)  /sys/devices/virtual/eth0  --        nie          tak         tak          nie               nie                --            ethernet    UUID-ethernet-REPLACED-REPLACED-REPL  /org/freedesktop/NetworkManager/ActiveConnection/1  nieznane 
+NAME     DEVICE  TYPE      NM-TYPE           VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON                    IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                        IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED  
+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+GENERAL  eth0    ethernet  NMDeviceEthernet  --      --       virtual  --              --                C0:61:AE:26:4D:D7  0    20 (niedostępne)  0 (Nie podano przyczyny)  0 (nieznane)      0 (nieznane)      /sys/devices/virtual/eth0  --        nie          tak         tak          nie               nie                --            ethernet    UUID-ethernet-REPLACED-REPLACED-REPL  /org/freedesktop/NetworkManager/ActiveConnection/1  nieznane 
 
 NAME          CARRIER-DETECT  SPEED     IS-SOFTWARE  SRIOV 
 ------------------------------------------------------------
@@ -7081,35 +7121,35 @@ CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{1,2,4}  5fcfd6
 
 <<<
 size: 1200
-location: clients/tests/test-client.py:957:test_003()/160
+location: clients/tests/test-client.py:971:test_003()/160
 cmd: $NMCLI --mode tabular --terse -f ALL con
 lang: C
 returncode: 0
 stdout: 1046 bytes
 >>>
-ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:802-3-ethernet:0:never:yes:0:no:/org/freedesktop/NetworkManager/Settings/Connection/4:yes:eth1:activated:/org/freedesktop/NetworkManager/ActiveConnection/2::/etc/NetworkManager/system-connections/ethernet
 ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:802-3-ethernet:0:never:yes:0:no:/org/freedesktop/NetworkManager/Settings/Connection/4:yes:eth0:deactivating:/org/freedesktop/NetworkManager/ActiveConnection/1::/etc/NetworkManager/system-connections/ethernet
+ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:802-3-ethernet:0:never:yes:0:no:/org/freedesktop/NetworkManager/Settings/Connection/4:yes:eth1:activated:/org/freedesktop/NetworkManager/ActiveConnection/2::/etc/NetworkManager/system-connections/ethernet
 con-1:5fcfd6d7-1e63-3332-8826-a7eda103792d:802-3-ethernet:0:never:yes:0:no:/org/freedesktop/NetworkManager/Settings/Connection/1:no:::::/etc/NetworkManager/system-connections/con-1
 con-gsm1:UUID-con-gsm1-REPLACED-REPLACED-REPL:gsm:0:never:no:0:no:/org/freedesktop/NetworkManager/Settings/Connection/3:no:::::/etc/NetworkManager/system-connections/con-gsm1
 con-xx1:UUID-con-xx1-REPLACED-REPLACED-REPLA:802-3-ethernet:0:never:yes:0:no:/org/freedesktop/NetworkManager/Settings/Connection/2:no:::::/etc/NetworkManager/system-connections/con-xx1
 
 <<<
 size: 1210
-location: clients/tests/test-client.py:957:test_003()/161
+location: clients/tests/test-client.py:971:test_003()/161
 cmd: $NMCLI --mode tabular --terse -f ALL con
 lang: pl_PL.UTF-8
 returncode: 0
 stdout: 1046 bytes
 >>>
-ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:802-3-ethernet:0:never:yes:0:no:/org/freedesktop/NetworkManager/Settings/Connection/4:yes:eth1:activated:/org/freedesktop/NetworkManager/ActiveConnection/2::/etc/NetworkManager/system-connections/ethernet
 ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:802-3-ethernet:0:never:yes:0:no:/org/freedesktop/NetworkManager/Settings/Connection/4:yes:eth0:deactivating:/org/freedesktop/NetworkManager/ActiveConnection/1::/etc/NetworkManager/system-connections/ethernet
+ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:802-3-ethernet:0:never:yes:0:no:/org/freedesktop/NetworkManager/Settings/Connection/4:yes:eth1:activated:/org/freedesktop/NetworkManager/ActiveConnection/2::/etc/NetworkManager/system-connections/ethernet
 con-1:5fcfd6d7-1e63-3332-8826-a7eda103792d:802-3-ethernet:0:never:yes:0:no:/org/freedesktop/NetworkManager/Settings/Connection/1:no:::::/etc/NetworkManager/system-connections/con-1
 con-gsm1:UUID-con-gsm1-REPLACED-REPLACED-REPL:gsm:0:never:no:0:no:/org/freedesktop/NetworkManager/Settings/Connection/3:no:::::/etc/NetworkManager/system-connections/con-gsm1
 con-xx1:UUID-con-xx1-REPLACED-REPLACED-REPLA:802-3-ethernet:0:never:yes:0:no:/org/freedesktop/NetworkManager/Settings/Connection/2:no:::::/etc/NetworkManager/system-connections/con-xx1
 
 <<<
 size: 356
-location: clients/tests/test-client.py:960:test_003()/162
+location: clients/tests/test-client.py:974:test_003()/162
 cmd: $NMCLI --mode tabular --terse -f UUID,TYPE con
 lang: C
 returncode: 0
@@ -7122,7 +7162,7 @@ UUID-con-xx1-REPLACED-REPLACED-REPLA:802-3-ethernet
 
 <<<
 size: 366
-location: clients/tests/test-client.py:960:test_003()/163
+location: clients/tests/test-client.py:974:test_003()/163
 cmd: $NMCLI --mode tabular --terse -f UUID,TYPE con
 lang: pl_PL.UTF-8
 returncode: 0
@@ -7135,7 +7175,7 @@ UUID-con-xx1-REPLACED-REPLACED-REPLA:802-3-ethernet
 
 <<<
 size: 828
-location: clients/tests/test-client.py:963:test_003()/164
+location: clients/tests/test-client.py:977:test_003()/164
 cmd: $NMCLI --mode tabular --terse con s ethernet
 lang: C
 returncode: 0
@@ -7152,7 +7192,7 @@ GENERAL:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:eth0:deactivating:no:no::n
 
 <<<
 size: 838
-location: clients/tests/test-client.py:963:test_003()/165
+location: clients/tests/test-client.py:977:test_003()/165
 cmd: $NMCLI --mode tabular --terse con s ethernet
 lang: pl_PL.UTF-8
 returncode: 0
@@ -7169,7 +7209,7 @@ GENERAL:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:eth0:deactivating:no:no::n
 
 <<<
 size: 681
-location: clients/tests/test-client.py:966:test_003()/166
+location: clients/tests/test-client.py:980:test_003()/166
 cmd: $NMCLI --mode tabular --terse c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: C
 returncode: 0
@@ -7184,7 +7224,7 @@ GENERAL:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:eth0:deactivating:no:no::n
 
 <<<
 size: 691
-location: clients/tests/test-client.py:966:test_003()/167
+location: clients/tests/test-client.py:980:test_003()/167
 cmd: $NMCLI --mode tabular --terse c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: pl_PL.UTF-8
 returncode: 0
@@ -7198,14 +7238,14 @@ proxy:none:no::
 GENERAL:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:eth0:deactivating:no:no::no:/org/freedesktop/NetworkManager/ActiveConnection/1:/org/freedesktop/NetworkManager/Settings/Connection/4::
 
 <<<
-size: 1351
-location: clients/tests/test-client.py:969:test_003()/168
+size: 1375
+location: clients/tests/test-client.py:983:test_003()/168
 cmd: $NMCLI --mode tabular --terse -f all dev show eth0
 lang: C
 returncode: 0
-stdout: 1187 bytes
+stdout: 1211 bytes
 >>>
-GENERAL:eth0:ethernet:NMDeviceEthernet:::virtual:::C0\:61\:AE\:26\:4D\:D7:0:20 (unavailable):0 (No reason given):/sys/devices/virtual/eth0::no:yes:yes:no:no::ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:/org/freedesktop/NetworkManager/ActiveConnection/1:unknown
+GENERAL:eth0:ethernet:NMDeviceEthernet:::virtual:::C0\:61\:AE\:26\:4D\:D7:0:20 (unavailable):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/eth0::no:yes:yes:no:no::ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:/org/freedesktop/NetworkManager/ActiveConnection/1:unknown
 CAPABILITIES:no:100 Mb/s:no:no
 WIRED-PROPERTIES:off:
 IP4:192.168.6.238/29::dst = 192.168.58.133/31, nh = 192.168.50.116, mt = 3130348792 | dst = 192.168.155.50/19, nh = 192.168.127.64:192.168.213.113:sear4.foo4.bar:192.168.156.115 | 192.168.8.33
@@ -7215,14 +7255,14 @@ DHCP6:dhcp-6-opt-1 = val-1 | dhcp-6-opt-5 = val-5 | dhcp-6-opt-6 = val-6 | dhcp-
 CONNECTIONS:/org/freedesktop/NetworkManager/Settings/Connection/{1,2,4}:5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 | UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 | UUID-ethernet-REPLACED-REPLACED-REPL | ethernet
 
 <<<
-size: 1361
-location: clients/tests/test-client.py:969:test_003()/169
+size: 1385
+location: clients/tests/test-client.py:983:test_003()/169
 cmd: $NMCLI --mode tabular --terse -f all dev show eth0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 1187 bytes
+stdout: 1211 bytes
 >>>
-GENERAL:eth0:ethernet:NMDeviceEthernet:::virtual:::C0\:61\:AE\:26\:4D\:D7:0:20 (unavailable):0 (No reason given):/sys/devices/virtual/eth0::no:yes:yes:no:no::ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:/org/freedesktop/NetworkManager/ActiveConnection/1:unknown
+GENERAL:eth0:ethernet:NMDeviceEthernet:::virtual:::C0\:61\:AE\:26\:4D\:D7:0:20 (unavailable):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/eth0::no:yes:yes:no:no::ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:/org/freedesktop/NetworkManager/ActiveConnection/1:unknown
 CAPABILITIES:no:100 Mb/s:no:no
 WIRED-PROPERTIES:off:
 IP4:192.168.6.238/29::dst = 192.168.58.133/31, nh = 192.168.50.116, mt = 3130348792 | dst = 192.168.155.50/19, nh = 192.168.127.64:192.168.213.113:sear4.foo4.bar:192.168.156.115 | 192.168.8.33
@@ -7233,35 +7273,35 @@ CONNECTIONS:/org/freedesktop/NetworkManager/Settings/Connection/{1,2,4}:5fcfd6d7
 
 <<<
 size: 1482
-location: clients/tests/test-client.py:957:test_003()/170
+location: clients/tests/test-client.py:971:test_003()/170
 cmd: $NMCLI --mode tabular --terse --color yes -f ALL con
 lang: C
 returncode: 0
 stdout: 1316 bytes
 >>>
-ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:802-3-ethernet:0:never:yes:0:no:/org/freedesktop/NetworkManager/Settings/Connection/4:yes:eth1:activated:/org/freedesktop/NetworkManager/ActiveConnection/2::/etc/NetworkManager/system-connections/ethernet
 ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:802-3-ethernet:0:never:yes:0:no:/org/freedesktop/NetworkManager/Settings/Connection/4:yes:eth0:deactivating:/org/freedesktop/NetworkManager/ActiveConnection/1::/etc/NetworkManager/system-connections/ethernet
+ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:802-3-ethernet:0:never:yes:0:no:/org/freedesktop/NetworkManager/Settings/Connection/4:yes:eth1:activated:/org/freedesktop/NetworkManager/ActiveConnection/2::/etc/NetworkManager/system-connections/ethernet
 con-1:5fcfd6d7-1e63-3332-8826-a7eda103792d:802-3-ethernet:0:never:yes:0:no:/org/freedesktop/NetworkManager/Settings/Connection/1:no:::::/etc/NetworkManager/system-connections/con-1
 con-gsm1:UUID-con-gsm1-REPLACED-REPLACED-REPL:gsm:0:never:no:0:no:/org/freedesktop/NetworkManager/Settings/Connection/3:no:::::/etc/NetworkManager/system-connections/con-gsm1
 con-xx1:UUID-con-xx1-REPLACED-REPLACED-REPLA:802-3-ethernet:0:never:yes:0:no:/org/freedesktop/NetworkManager/Settings/Connection/2:no:::::/etc/NetworkManager/system-connections/con-xx1
 
 <<<
 size: 1492
-location: clients/tests/test-client.py:957:test_003()/171
+location: clients/tests/test-client.py:971:test_003()/171
 cmd: $NMCLI --mode tabular --terse --color yes -f ALL con
 lang: pl_PL.UTF-8
 returncode: 0
 stdout: 1316 bytes
 >>>
-ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:802-3-ethernet:0:never:yes:0:no:/org/freedesktop/NetworkManager/Settings/Connection/4:yes:eth1:activated:/org/freedesktop/NetworkManager/ActiveConnection/2::/etc/NetworkManager/system-connections/ethernet
 ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:802-3-ethernet:0:never:yes:0:no:/org/freedesktop/NetworkManager/Settings/Connection/4:yes:eth0:deactivating:/org/freedesktop/NetworkManager/ActiveConnection/1::/etc/NetworkManager/system-connections/ethernet
+ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:802-3-ethernet:0:never:yes:0:no:/org/freedesktop/NetworkManager/Settings/Connection/4:yes:eth1:activated:/org/freedesktop/NetworkManager/ActiveConnection/2::/etc/NetworkManager/system-connections/ethernet
 con-1:5fcfd6d7-1e63-3332-8826-a7eda103792d:802-3-ethernet:0:never:yes:0:no:/org/freedesktop/NetworkManager/Settings/Connection/1:no:::::/etc/NetworkManager/system-connections/con-1
 con-gsm1:UUID-con-gsm1-REPLACED-REPLACED-REPL:gsm:0:never:no:0:no:/org/freedesktop/NetworkManager/Settings/Connection/3:no:::::/etc/NetworkManager/system-connections/con-gsm1
 con-xx1:UUID-con-xx1-REPLACED-REPLACED-REPLA:802-3-ethernet:0:never:yes:0:no:/org/freedesktop/NetworkManager/Settings/Connection/2:no:::::/etc/NetworkManager/system-connections/con-xx1
 
 <<<
 size: 386
-location: clients/tests/test-client.py:960:test_003()/172
+location: clients/tests/test-client.py:974:test_003()/172
 cmd: $NMCLI --mode tabular --terse --color yes -f UUID,TYPE con
 lang: C
 returncode: 0
@@ -7274,7 +7314,7 @@ UUID-con-xx1-REPLACED-REPLACED-REPLA:802-3-ethernet
 
 <<<
 size: 396
-location: clients/tests/test-client.py:960:test_003()/173
+location: clients/tests/test-client.py:974:test_003()/173
 cmd: $NMCLI --mode tabular --terse --color yes -f UUID,TYPE con
 lang: pl_PL.UTF-8
 returncode: 0
@@ -7287,7 +7327,7 @@ UUID-con-xx1-REPLACED-REPLACED-REPLA:802-3-ethernet
 
 <<<
 size: 840
-location: clients/tests/test-client.py:963:test_003()/174
+location: clients/tests/test-client.py:977:test_003()/174
 cmd: $NMCLI --mode tabular --terse --color yes con s ethernet
 lang: C
 returncode: 0
@@ -7304,7 +7344,7 @@ GENERAL:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:eth0:deactivating:no:no::n
 
 <<<
 size: 850
-location: clients/tests/test-client.py:963:test_003()/175
+location: clients/tests/test-client.py:977:test_003()/175
 cmd: $NMCLI --mode tabular --terse --color yes con s ethernet
 lang: pl_PL.UTF-8
 returncode: 0
@@ -7321,7 +7361,7 @@ GENERAL:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:eth0:deactivating:no:no::n
 
 <<<
 size: 693
-location: clients/tests/test-client.py:966:test_003()/176
+location: clients/tests/test-client.py:980:test_003()/176
 cmd: $NMCLI --mode tabular --terse --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: C
 returncode: 0
@@ -7336,7 +7376,7 @@ GENERAL:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:eth0:deactivating:no:no::n
 
 <<<
 size: 703
-location: clients/tests/test-client.py:966:test_003()/177
+location: clients/tests/test-client.py:980:test_003()/177
 cmd: $NMCLI --mode tabular --terse --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: pl_PL.UTF-8
 returncode: 0
@@ -7350,14 +7390,14 @@ proxy:none:no::
 GENERAL:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:eth0:deactivating:no:no::no:/org/freedesktop/NetworkManager/ActiveConnection/1:/org/freedesktop/NetworkManager/Settings/Connection/4::
 
 <<<
-size: 1363
-location: clients/tests/test-client.py:969:test_003()/178
+size: 1387
+location: clients/tests/test-client.py:983:test_003()/178
 cmd: $NMCLI --mode tabular --terse --color yes -f all dev show eth0
 lang: C
 returncode: 0
-stdout: 1187 bytes
+stdout: 1211 bytes
 >>>
-GENERAL:eth0:ethernet:NMDeviceEthernet:::virtual:::C0\:61\:AE\:26\:4D\:D7:0:20 (unavailable):0 (No reason given):/sys/devices/virtual/eth0::no:yes:yes:no:no::ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:/org/freedesktop/NetworkManager/ActiveConnection/1:unknown
+GENERAL:eth0:ethernet:NMDeviceEthernet:::virtual:::C0\:61\:AE\:26\:4D\:D7:0:20 (unavailable):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/eth0::no:yes:yes:no:no::ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:/org/freedesktop/NetworkManager/ActiveConnection/1:unknown
 CAPABILITIES:no:100 Mb/s:no:no
 WIRED-PROPERTIES:off:
 IP4:192.168.6.238/29::dst = 192.168.58.133/31, nh = 192.168.50.116, mt = 3130348792 | dst = 192.168.155.50/19, nh = 192.168.127.64:192.168.213.113:sear4.foo4.bar:192.168.156.115 | 192.168.8.33
@@ -7367,14 +7407,14 @@ DHCP6:dhcp-6-opt-1 = val-1 | dhcp-6-opt-5 = val-5 | dhcp-6-opt-6 = val-6 | dhcp-
 CONNECTIONS:/org/freedesktop/NetworkManager/Settings/Connection/{1,2,4}:5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 | UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 | UUID-ethernet-REPLACED-REPLACED-REPL | ethernet
 
 <<<
-size: 1373
-location: clients/tests/test-client.py:969:test_003()/179
+size: 1397
+location: clients/tests/test-client.py:983:test_003()/179
 cmd: $NMCLI --mode tabular --terse --color yes -f all dev show eth0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 1187 bytes
+stdout: 1211 bytes
 >>>
-GENERAL:eth0:ethernet:NMDeviceEthernet:::virtual:::C0\:61\:AE\:26\:4D\:D7:0:20 (unavailable):0 (No reason given):/sys/devices/virtual/eth0::no:yes:yes:no:no::ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:/org/freedesktop/NetworkManager/ActiveConnection/1:unknown
+GENERAL:eth0:ethernet:NMDeviceEthernet:::virtual:::C0\:61\:AE\:26\:4D\:D7:0:20 (unavailable):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/eth0::no:yes:yes:no:no::ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:/org/freedesktop/NetworkManager/ActiveConnection/1:unknown
 CAPABILITIES:no:100 Mb/s:no:no
 WIRED-PROPERTIES:off:
 IP4:192.168.6.238/29::dst = 192.168.58.133/31, nh = 192.168.50.116, mt = 3130348792 | dst = 192.168.155.50/19, nh = 192.168.127.64:192.168.213.113:sear4.foo4.bar:192.168.156.115 | 192.168.8.33
@@ -7385,7 +7425,7 @@ CONNECTIONS:/org/freedesktop/NetworkManager/Settings/Connection/{1,2,4}:5fcfd6d7
 
 <<<
 size: 4198
-location: clients/tests/test-client.py:957:test_003()/180
+location: clients/tests/test-client.py:971:test_003()/180
 cmd: $NMCLI --mode multiline -f ALL con
 lang: C
 returncode: 0
@@ -7401,9 +7441,9 @@ AUTOCONNECT-PRIORITY:                   0
 READONLY:                               no
 DBUS-PATH:                              /org/freedesktop/NetworkManager/Settings/Connection/4
 ACTIVE:                                 yes
-DEVICE:                                 eth1
-STATE:                                  activated
-ACTIVE-PATH:                            /org/freedesktop/NetworkManager/ActiveConnection/2
+DEVICE:                                 eth0
+STATE:                                  deactivating
+ACTIVE-PATH:                            /org/freedesktop/NetworkManager/ActiveConnection/1
 SLAVE:                                  --
 FILENAME:                               /etc/NetworkManager/system-connections/ethernet
 NAME:                                   ethernet
@@ -7416,9 +7456,9 @@ AUTOCONNECT-PRIORITY:                   0
 READONLY:                               no
 DBUS-PATH:                              /org/freedesktop/NetworkManager/Settings/Connection/4
 ACTIVE:                                 yes
-DEVICE:                                 eth0
-STATE:                                  deactivating
-ACTIVE-PATH:                            /org/freedesktop/NetworkManager/ActiveConnection/1
+DEVICE:                                 eth1
+STATE:                                  activated
+ACTIVE-PATH:                            /org/freedesktop/NetworkManager/ActiveConnection/2
 SLAVE:                                  --
 FILENAME:                               /etc/NetworkManager/system-connections/ethernet
 NAME:                                   con-1
@@ -7469,7 +7509,7 @@ FILENAME:                               /etc/NetworkManager/system-connections/c
 
 <<<
 size: 4220
-location: clients/tests/test-client.py:957:test_003()/181
+location: clients/tests/test-client.py:971:test_003()/181
 cmd: $NMCLI --mode multiline -f ALL con
 lang: pl_PL.UTF-8
 returncode: 0
@@ -7485,9 +7525,9 @@ AUTOCONNECT-PRIORITY:                   0
 READONLY:                               nie
 DBUS-PATH:                              /org/freedesktop/NetworkManager/Settings/Connection/4
 ACTIVE:                                 tak
-DEVICE:                                 eth1
-STATE:                                  aktywowano
-ACTIVE-PATH:                            /org/freedesktop/NetworkManager/ActiveConnection/2
+DEVICE:                                 eth0
+STATE:                                  dezaktywowanie
+ACTIVE-PATH:                            /org/freedesktop/NetworkManager/ActiveConnection/1
 SLAVE:                                  --
 FILENAME:                               /etc/NetworkManager/system-connections/ethernet
 NAME:                                   ethernet
@@ -7500,9 +7540,9 @@ AUTOCONNECT-PRIORITY:                   0
 READONLY:                               nie
 DBUS-PATH:                              /org/freedesktop/NetworkManager/Settings/Connection/4
 ACTIVE:                                 tak
-DEVICE:                                 eth0
-STATE:                                  dezaktywowanie
-ACTIVE-PATH:                            /org/freedesktop/NetworkManager/ActiveConnection/1
+DEVICE:                                 eth1
+STATE:                                  aktywowano
+ACTIVE-PATH:                            /org/freedesktop/NetworkManager/ActiveConnection/2
 SLAVE:                                  --
 FILENAME:                               /etc/NetworkManager/system-connections/ethernet
 NAME:                                   con-1
@@ -7553,7 +7593,7 @@ FILENAME:                               /etc/NetworkManager/system-connections/c
 
 <<<
 size: 652
-location: clients/tests/test-client.py:960:test_003()/182
+location: clients/tests/test-client.py:974:test_003()/182
 cmd: $NMCLI --mode multiline -f UUID,TYPE con
 lang: C
 returncode: 0
@@ -7570,7 +7610,7 @@ TYPE:                                   ethernet
 
 <<<
 size: 662
-location: clients/tests/test-client.py:960:test_003()/183
+location: clients/tests/test-client.py:974:test_003()/183
 cmd: $NMCLI --mode multiline -f UUID,TYPE con
 lang: pl_PL.UTF-8
 returncode: 0
@@ -7587,7 +7627,7 @@ TYPE:                                   ethernet
 
 <<<
 size: 5148
-location: clients/tests/test-client.py:963:test_003()/184
+location: clients/tests/test-client.py:977:test_003()/184
 cmd: $NMCLI --mode multiline con s ethernet
 lang: C
 returncode: 0
@@ -7702,7 +7742,7 @@ GENERAL.MASTER-PATH:                    --
 
 <<<
 size: 5185
-location: clients/tests/test-client.py:963:test_003()/185
+location: clients/tests/test-client.py:977:test_003()/185
 cmd: $NMCLI --mode multiline con s ethernet
 lang: pl_PL.UTF-8
 returncode: 0
@@ -7817,7 +7857,7 @@ GENERAL.MASTER-PATH:                    --
 
 <<<
 size: 4523
-location: clients/tests/test-client.py:966:test_003()/186
+location: clients/tests/test-client.py:980:test_003()/186
 cmd: $NMCLI --mode multiline c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: C
 returncode: 0
@@ -7919,7 +7959,7 @@ GENERAL.MASTER-PATH:                    --
 
 <<<
 size: 4556
-location: clients/tests/test-client.py:966:test_003()/187
+location: clients/tests/test-client.py:980:test_003()/187
 cmd: $NMCLI --mode multiline c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: pl_PL.UTF-8
 returncode: 0
@@ -8020,12 +8060,12 @@ GENERAL.ZONE:                           --
 GENERAL.MASTER-PATH:                    --
 
 <<<
-size: 3408
-location: clients/tests/test-client.py:969:test_003()/188
+size: 3512
+location: clients/tests/test-client.py:983:test_003()/188
 cmd: $NMCLI --mode multiline -f all dev show eth0
 lang: C
 returncode: 0
-stdout: 3250 bytes
+stdout: 3354 bytes
 >>>
 GENERAL.DEVICE:                         eth0
 GENERAL.TYPE:                           ethernet
@@ -8039,6 +8079,8 @@ GENERAL.HWADDR:                         C0:61:AE:26:4D:D7
 GENERAL.MTU:                            0
 GENERAL.STATE:                          20 (unavailable)
 GENERAL.REASON:                         0 (No reason given)
+GENERAL.IP4-CONNECTIVITY:               0 (unknown)
+GENERAL.IP6-CONNECTIVITY:               0 (unknown)
 GENERAL.UDI:                            /sys/devices/virtual/eth0
 GENERAL.IP-IFACE:                       --
 GENERAL.IS-SOFTWARE:                    no
@@ -8084,12 +8126,12 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[2]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | c
 CONNECTIONS.AVAILABLE-CONNECTIONS[3]:   UUID-ethernet-REPLACED-REPLACED-REPL | ethernet
 
 <<<
-size: 3441
-location: clients/tests/test-client.py:969:test_003()/189
+size: 3547
+location: clients/tests/test-client.py:983:test_003()/189
 cmd: $NMCLI --mode multiline -f all dev show eth0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 3273 bytes
+stdout: 3379 bytes
 >>>
 GENERAL.DEVICE:                         eth0
 GENERAL.TYPE:                           ethernet
@@ -8103,6 +8145,8 @@ GENERAL.HWADDR:                         C0:61:AE:26:4D:D7
 GENERAL.MTU:                            0
 GENERAL.STATE:                          20 (niedostępne)
 GENERAL.REASON:                         0 (Nie podano przyczyny)
+GENERAL.IP4-CONNECTIVITY:               0 (nieznane)
+GENERAL.IP6-CONNECTIVITY:               0 (nieznane)
 GENERAL.UDI:                            /sys/devices/virtual/eth0
 GENERAL.IP-IFACE:                       --
 GENERAL.IS-SOFTWARE:                    nie
@@ -8149,27 +8193,12 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[3]:   UUID-ethernet-REPLACED-REPLACED-REPL | e
 
 <<<
 size: 4480
-location: clients/tests/test-client.py:957:test_003()/190
+location: clients/tests/test-client.py:971:test_003()/190
 cmd: $NMCLI --mode multiline --color yes -f ALL con
 lang: C
 returncode: 0
 stdout: 4320 bytes
 >>>
-NAME:                                   ethernet
-UUID:                                   UUID-ethernet-REPLACED-REPLACED-REPL
-TYPE:                                   ethernet
-TIMESTAMP:                              0
-TIMESTAMP-REAL:                         never
-AUTOCONNECT:                            yes
-AUTOCONNECT-PRIORITY:                   0
-READONLY:                               no
-DBUS-PATH:                              /org/freedesktop/NetworkManager/Settings/Connection/4
-ACTIVE:                                 yes
-DEVICE:                                 eth1
-STATE:                                  activated
-ACTIVE-PATH:                            /org/freedesktop/NetworkManager/ActiveConnection/2
-SLAVE:                                  --
-FILENAME:                               /etc/NetworkManager/system-connections/ethernet
 NAME:                                   ethernet
 UUID:                                   UUID-ethernet-REPLACED-REPLACED-REPL
 TYPE:                                   ethernet
@@ -8185,6 +8214,21 @@ STATE:                                  deactivating
 ACTIVE-PATH:                            /org/freedesktop/NetworkManager/ActiveConnection/1
 SLAVE:                                  --
 FILENAME:                               /etc/NetworkManager/system-connections/ethernet
+NAME:                                   ethernet
+UUID:                                   UUID-ethernet-REPLACED-REPLACED-REPL
+TYPE:                                   ethernet
+TIMESTAMP:                              0
+TIMESTAMP-REAL:                         never
+AUTOCONNECT:                            yes
+AUTOCONNECT-PRIORITY:                   0
+READONLY:                               no
+DBUS-PATH:                              /org/freedesktop/NetworkManager/Settings/Connection/4
+ACTIVE:                                 yes
+DEVICE:                                 eth1
+STATE:                                  activated
+ACTIVE-PATH:                            /org/freedesktop/NetworkManager/ActiveConnection/2
+SLAVE:                                  --
+FILENAME:                               /etc/NetworkManager/system-connections/ethernet
 NAME:                                   con-1
 UUID:                                   5fcfd6d7-1e63-3332-8826-a7eda103792d
 TYPE:                                   ethernet
@@ -8233,27 +8277,12 @@ FILENAME:                               /etc/NetworkManager/system-connections/c
 
 <<<
 size: 4502
-location: clients/tests/test-client.py:957:test_003()/191
+location: clients/tests/test-client.py:971:test_003()/191
 cmd: $NMCLI --mode multiline --color yes -f ALL con
 lang: pl_PL.UTF-8
 returncode: 0
 stdout: 4332 bytes
 >>>
-NAME:                                   ethernet
-UUID:                                   UUID-ethernet-REPLACED-REPLACED-REPL
-TYPE:                                   ethernet
-TIMESTAMP:                              0
-TIMESTAMP-REAL:                         nigdy
-AUTOCONNECT:                            tak
-AUTOCONNECT-PRIORITY:                   0
-READONLY:                               nie
-DBUS-PATH:                              /org/freedesktop/NetworkManager/Settings/Connection/4
-ACTIVE:                                 tak
-DEVICE:                                 eth1
-STATE:                                  aktywowano
-ACTIVE-PATH:                            /org/freedesktop/NetworkManager/ActiveConnection/2
-SLAVE:                                  --
-FILENAME:                               /etc/NetworkManager/system-connections/ethernet
 NAME:                                   ethernet
 UUID:                                   UUID-ethernet-REPLACED-REPLACED-REPL
 TYPE:                                   ethernet
@@ -8269,6 +8298,21 @@ STATE:                                  dezaktywowanie
 ACTIVE-PATH:                            /org/freedesktop/NetworkManager/ActiveConnection/1
 SLAVE:                                  --
 FILENAME:                               /etc/NetworkManager/system-connections/ethernet
+NAME:                                   ethernet
+UUID:                                   UUID-ethernet-REPLACED-REPLACED-REPL
+TYPE:                                   ethernet
+TIMESTAMP:                              0
+TIMESTAMP-REAL:                         nigdy
+AUTOCONNECT:                            tak
+AUTOCONNECT-PRIORITY:                   0
+READONLY:                               nie
+DBUS-PATH:                              /org/freedesktop/NetworkManager/Settings/Connection/4
+ACTIVE:                                 tak
+DEVICE:                                 eth1
+STATE:                                  aktywowano
+ACTIVE-PATH:                            /org/freedesktop/NetworkManager/ActiveConnection/2
+SLAVE:                                  --
+FILENAME:                               /etc/NetworkManager/system-connections/ethernet
 NAME:                                   con-1
 UUID:                                   5fcfd6d7-1e63-3332-8826-a7eda103792d
 TYPE:                                   ethernet
@@ -8317,7 +8361,7 @@ FILENAME:                               /etc/NetworkManager/system-connections/c
 
 <<<
 size: 682
-location: clients/tests/test-client.py:960:test_003()/192
+location: clients/tests/test-client.py:974:test_003()/192
 cmd: $NMCLI --mode multiline --color yes -f UUID,TYPE con
 lang: C
 returncode: 0
@@ -8334,7 +8378,7 @@ TYPE:                                   ethernet
 
 <<<
 size: 692
-location: clients/tests/test-client.py:960:test_003()/193
+location: clients/tests/test-client.py:974:test_003()/193
 cmd: $NMCLI --mode multiline --color yes -f UUID,TYPE con
 lang: pl_PL.UTF-8
 returncode: 0
@@ -8351,7 +8395,7 @@ TYPE:                                   ethernet
 
 <<<
 size: 5160
-location: clients/tests/test-client.py:963:test_003()/194
+location: clients/tests/test-client.py:977:test_003()/194
 cmd: $NMCLI --mode multiline --color yes con s ethernet
 lang: C
 returncode: 0
@@ -8466,7 +8510,7 @@ GENERAL.MASTER-PATH:                    --
 
 <<<
 size: 5197
-location: clients/tests/test-client.py:963:test_003()/195
+location: clients/tests/test-client.py:977:test_003()/195
 cmd: $NMCLI --mode multiline --color yes con s ethernet
 lang: pl_PL.UTF-8
 returncode: 0
@@ -8581,7 +8625,7 @@ GENERAL.MASTER-PATH:                    --
 
 <<<
 size: 4535
-location: clients/tests/test-client.py:966:test_003()/196
+location: clients/tests/test-client.py:980:test_003()/196
 cmd: $NMCLI --mode multiline --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: C
 returncode: 0
@@ -8683,7 +8727,7 @@ GENERAL.MASTER-PATH:                    --
 
 <<<
 size: 4568
-location: clients/tests/test-client.py:966:test_003()/197
+location: clients/tests/test-client.py:980:test_003()/197
 cmd: $NMCLI --mode multiline --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: pl_PL.UTF-8
 returncode: 0
@@ -8784,12 +8828,12 @@ GENERAL.ZONE:                           --
 GENERAL.MASTER-PATH:                    --
 
 <<<
-size: 3420
-location: clients/tests/test-client.py:969:test_003()/198
+size: 3524
+location: clients/tests/test-client.py:983:test_003()/198
 cmd: $NMCLI --mode multiline --color yes -f all dev show eth0
 lang: C
 returncode: 0
-stdout: 3250 bytes
+stdout: 3354 bytes
 >>>
 GENERAL.DEVICE:                         eth0
 GENERAL.TYPE:                           ethernet
@@ -8803,6 +8847,8 @@ GENERAL.HWADDR:                         C0:61:AE:26:4D:D7
 GENERAL.MTU:                            0
 GENERAL.STATE:                          20 (unavailable)
 GENERAL.REASON:                         0 (No reason given)
+GENERAL.IP4-CONNECTIVITY:               0 (unknown)
+GENERAL.IP6-CONNECTIVITY:               0 (unknown)
 GENERAL.UDI:                            /sys/devices/virtual/eth0
 GENERAL.IP-IFACE:                       --
 GENERAL.IS-SOFTWARE:                    no
@@ -8848,12 +8894,12 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[2]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | c
 CONNECTIONS.AVAILABLE-CONNECTIONS[3]:   UUID-ethernet-REPLACED-REPLACED-REPL | ethernet
 
 <<<
-size: 3453
-location: clients/tests/test-client.py:969:test_003()/199
+size: 3559
+location: clients/tests/test-client.py:983:test_003()/199
 cmd: $NMCLI --mode multiline --color yes -f all dev show eth0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 3273 bytes
+stdout: 3379 bytes
 >>>
 GENERAL.DEVICE:                         eth0
 GENERAL.TYPE:                           ethernet
@@ -8867,6 +8913,8 @@ GENERAL.HWADDR:                         C0:61:AE:26:4D:D7
 GENERAL.MTU:                            0
 GENERAL.STATE:                          20 (niedostępne)
 GENERAL.REASON:                         0 (Nie podano przyczyny)
+GENERAL.IP4-CONNECTIVITY:               0 (nieznane)
+GENERAL.IP6-CONNECTIVITY:               0 (nieznane)
 GENERAL.UDI:                            /sys/devices/virtual/eth0
 GENERAL.IP-IFACE:                       --
 GENERAL.IS-SOFTWARE:                    nie
@@ -8913,7 +8961,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[3]:   UUID-ethernet-REPLACED-REPLACED-REPL | e
 
 <<<
 size: 4824
-location: clients/tests/test-client.py:957:test_003()/200
+location: clients/tests/test-client.py:971:test_003()/200
 cmd: $NMCLI --mode multiline --pretty -f ALL con
 lang: C
 returncode: 0
@@ -8932,9 +8980,9 @@ AUTOCONNECT-PRIORITY:                   0
 READONLY:                               no
 DBUS-PATH:                              /org/freedesktop/NetworkManager/Settings/Connection/4
 ACTIVE:                                 yes
-DEVICE:                                 eth1
-STATE:                                  activated
-ACTIVE-PATH:                            /org/freedesktop/NetworkManager/ActiveConnection/2
+DEVICE:                                 eth0
+STATE:                                  deactivating
+ACTIVE-PATH:                            /org/freedesktop/NetworkManager/ActiveConnection/1
 SLAVE:                                  --
 FILENAME:                               /etc/NetworkManager/system-connections/ethernet
 -------------------------------------------------------------------------------
@@ -8948,9 +8996,9 @@ AUTOCONNECT-PRIORITY:                   0
 READONLY:                               no
 DBUS-PATH:                              /org/freedesktop/NetworkManager/Settings/Connection/4
 ACTIVE:                                 yes
-DEVICE:                                 eth0
-STATE:                                  deactivating
-ACTIVE-PATH:                            /org/freedesktop/NetworkManager/ActiveConnection/1
+DEVICE:                                 eth1
+STATE:                                  activated
+ACTIVE-PATH:                            /org/freedesktop/NetworkManager/ActiveConnection/2
 SLAVE:                                  --
 FILENAME:                               /etc/NetworkManager/system-connections/ethernet
 -------------------------------------------------------------------------------
@@ -9005,7 +9053,7 @@ FILENAME:                               /etc/NetworkManager/system-connections/c
 
 <<<
 size: 4852
-location: clients/tests/test-client.py:957:test_003()/201
+location: clients/tests/test-client.py:971:test_003()/201
 cmd: $NMCLI --mode multiline --pretty -f ALL con
 lang: pl_PL.UTF-8
 returncode: 0
@@ -9024,9 +9072,9 @@ AUTOCONNECT-PRIORITY:                   0
 READONLY:                               nie
 DBUS-PATH:                              /org/freedesktop/NetworkManager/Settings/Connection/4
 ACTIVE:                                 tak
-DEVICE:                                 eth1
-STATE:                                  aktywowano
-ACTIVE-PATH:                            /org/freedesktop/NetworkManager/ActiveConnection/2
+DEVICE:                                 eth0
+STATE:                                  dezaktywowanie
+ACTIVE-PATH:                            /org/freedesktop/NetworkManager/ActiveConnection/1
 SLAVE:                                  --
 FILENAME:                               /etc/NetworkManager/system-connections/ethernet
 -------------------------------------------------------------------------------
@@ -9040,9 +9088,9 @@ AUTOCONNECT-PRIORITY:                   0
 READONLY:                               nie
 DBUS-PATH:                              /org/freedesktop/NetworkManager/Settings/Connection/4
 ACTIVE:                                 tak
-DEVICE:                                 eth0
-STATE:                                  dezaktywowanie
-ACTIVE-PATH:                            /org/freedesktop/NetworkManager/ActiveConnection/1
+DEVICE:                                 eth1
+STATE:                                  aktywowano
+ACTIVE-PATH:                            /org/freedesktop/NetworkManager/ActiveConnection/2
 SLAVE:                                  --
 FILENAME:                               /etc/NetworkManager/system-connections/ethernet
 -------------------------------------------------------------------------------
@@ -9097,7 +9145,7 @@ FILENAME:                               /etc/NetworkManager/system-connections/c
 
 <<<
 size: 1199
-location: clients/tests/test-client.py:960:test_003()/202
+location: clients/tests/test-client.py:974:test_003()/202
 cmd: $NMCLI --mode multiline --pretty -f UUID,TYPE con
 lang: C
 returncode: 0
@@ -9121,7 +9169,7 @@ TYPE:                                   ethernet
 
 <<<
 size: 1215
-location: clients/tests/test-client.py:960:test_003()/203
+location: clients/tests/test-client.py:974:test_003()/203
 cmd: $NMCLI --mode multiline --pretty -f UUID,TYPE con
 lang: pl_PL.UTF-8
 returncode: 0
@@ -9145,7 +9193,7 @@ TYPE:                                   ethernet
 
 <<<
 size: 6402
-location: clients/tests/test-client.py:963:test_003()/204
+location: clients/tests/test-client.py:977:test_003()/204
 cmd: $NMCLI --mode multiline --pretty con s ethernet
 lang: C
 returncode: 0
@@ -9276,7 +9324,7 @@ GENERAL.MASTER-PATH:                    --
 
 <<<
 size: 6458
-location: clients/tests/test-client.py:963:test_003()/205
+location: clients/tests/test-client.py:977:test_003()/205
 cmd: $NMCLI --mode multiline --pretty con s ethernet
 lang: pl_PL.UTF-8
 returncode: 0
@@ -9407,7 +9455,7 @@ GENERAL.MASTER-PATH:                    --
 
 <<<
 size: 5464
-location: clients/tests/test-client.py:966:test_003()/206
+location: clients/tests/test-client.py:980:test_003()/206
 cmd: $NMCLI --mode multiline --pretty c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: C
 returncode: 0
@@ -9521,7 +9569,7 @@ GENERAL.MASTER-PATH:                    --
 
 <<<
 size: 5509
-location: clients/tests/test-client.py:966:test_003()/207
+location: clients/tests/test-client.py:980:test_003()/207
 cmd: $NMCLI --mode multiline --pretty c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: pl_PL.UTF-8
 returncode: 0
@@ -9634,12 +9682,12 @@ GENERAL.MASTER-PATH:                    --
 -------------------------------------------------------------------------------
 
 <<<
-size: 4268
-location: clients/tests/test-client.py:969:test_003()/208
+size: 4372
+location: clients/tests/test-client.py:983:test_003()/208
 cmd: $NMCLI --mode multiline --pretty -f all dev show eth0
 lang: C
 returncode: 0
-stdout: 4101 bytes
+stdout: 4205 bytes
 >>>
 ===============================================================================
                              Device details (eth0)
@@ -9656,6 +9704,8 @@ GENERAL.HWADDR:                         C0:61:AE:26:4D:D7
 GENERAL.MTU:                            0
 GENERAL.STATE:                          20 (unavailable)
 GENERAL.REASON:                         0 (No reason given)
+GENERAL.IP4-CONNECTIVITY:               0 (unknown)
+GENERAL.IP6-CONNECTIVITY:               0 (unknown)
 GENERAL.UDI:                            /sys/devices/virtual/eth0
 GENERAL.IP-IFACE:                       --
 GENERAL.IS-SOFTWARE:                    no
@@ -9709,12 +9759,12 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[3]:   UUID-ethernet-REPLACED-REPLACED-REPL | e
 -------------------------------------------------------------------------------
 
 <<<
-size: 4307
-location: clients/tests/test-client.py:969:test_003()/209
+size: 4413
+location: clients/tests/test-client.py:983:test_003()/209
 cmd: $NMCLI --mode multiline --pretty -f all dev show eth0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 4130 bytes
+stdout: 4236 bytes
 >>>
 ===============================================================================
                         Informacje o urządzeniu (eth0)
@@ -9731,6 +9781,8 @@ GENERAL.HWADDR:                         C0:61:AE:26:4D:D7
 GENERAL.MTU:                            0
 GENERAL.STATE:                          20 (niedostępne)
 GENERAL.REASON:                         0 (Nie podano przyczyny)
+GENERAL.IP4-CONNECTIVITY:               0 (nieznane)
+GENERAL.IP6-CONNECTIVITY:               0 (nieznane)
 GENERAL.UDI:                            /sys/devices/virtual/eth0
 GENERAL.IP-IFACE:                       --
 GENERAL.IS-SOFTWARE:                    nie
@@ -9785,7 +9837,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[3]:   UUID-ethernet-REPLACED-REPLACED-REPL | e
 
 <<<
 size: 5106
-location: clients/tests/test-client.py:957:test_003()/210
+location: clients/tests/test-client.py:971:test_003()/210
 cmd: $NMCLI --mode multiline --pretty --color yes -f ALL con
 lang: C
 returncode: 0
@@ -9794,22 +9846,6 @@ stdout: 4937 bytes
 ===============================================================================
                       NetworkManager connection profiles
 ===============================================================================
-NAME:                                   ethernet
-UUID:                                   UUID-ethernet-REPLACED-REPLACED-REPL
-TYPE:                                   ethernet
-TIMESTAMP:                              0
-TIMESTAMP-REAL:                         never
-AUTOCONNECT:                            yes
-AUTOCONNECT-PRIORITY:                   0
-READONLY:                               no
-DBUS-PATH:                              /org/freedesktop/NetworkManager/Settings/Connection/4
-ACTIVE:                                 yes
-DEVICE:                                 eth1
-STATE:                                  activated
-ACTIVE-PATH:                            /org/freedesktop/NetworkManager/ActiveConnection/2
-SLAVE:                                  --
-FILENAME:                               /etc/NetworkManager/system-connections/ethernet
--------------------------------------------------------------------------------
 NAME:                                   ethernet
 UUID:                                   UUID-ethernet-REPLACED-REPLACED-REPL
 TYPE:                                   ethernet
@@ -9826,6 +9862,22 @@ ACTIVE-PATH:                            /org/freedesktop/NetworkManager/Act
 SLAVE:                                  --
 FILENAME:                               /etc/NetworkManager/system-connections/ethernet
 -------------------------------------------------------------------------------
+NAME:                                   ethernet
+UUID:                                   UUID-ethernet-REPLACED-REPLACED-REPL
+TYPE:                                   ethernet
+TIMESTAMP:                              0
+TIMESTAMP-REAL:                         never
+AUTOCONNECT:                            yes
+AUTOCONNECT-PRIORITY:                   0
+READONLY:                               no
+DBUS-PATH:                              /org/freedesktop/NetworkManager/Settings/Connection/4
+ACTIVE:                                 yes
+DEVICE:                                 eth1
+STATE:                                  activated
+ACTIVE-PATH:                            /org/freedesktop/NetworkManager/ActiveConnection/2
+SLAVE:                                  --
+FILENAME:                               /etc/NetworkManager/system-connections/ethernet
+-------------------------------------------------------------------------------
 NAME:                                   con-1
 UUID:                                   5fcfd6d7-1e63-3332-8826-a7eda103792d
 TYPE:                                   ethernet
@@ -9877,7 +9929,7 @@ FILENAME:                               /etc/NetworkManager/system-connections/c
 
 <<<
 size: 5134
-location: clients/tests/test-client.py:957:test_003()/211
+location: clients/tests/test-client.py:971:test_003()/211
 cmd: $NMCLI --mode multiline --pretty --color yes -f ALL con
 lang: pl_PL.UTF-8
 returncode: 0
@@ -9886,22 +9938,6 @@ stdout: 4955 bytes
 ===============================================================================
                     Profile połączeń usługi NetworkManager
 ===============================================================================
-NAME:                                   ethernet
-UUID:                                   UUID-ethernet-REPLACED-REPLACED-REPL
-TYPE:                                   ethernet
-TIMESTAMP:                              0
-TIMESTAMP-REAL:                         nigdy
-AUTOCONNECT:                            tak
-AUTOCONNECT-PRIORITY:                   0
-READONLY:                               nie
-DBUS-PATH:                              /org/freedesktop/NetworkManager/Settings/Connection/4
-ACTIVE:                                 tak
-DEVICE:                                 eth1
-STATE:                                  aktywowano
-ACTIVE-PATH:                            /org/freedesktop/NetworkManager/ActiveConnection/2
-SLAVE:                                  --
-FILENAME:                               /etc/NetworkManager/system-connections/ethernet
--------------------------------------------------------------------------------
 NAME:                                   ethernet
 UUID:                                   UUID-ethernet-REPLACED-REPLACED-REPL
 TYPE:                                   ethernet
@@ -9918,6 +9954,22 @@ ACTIVE-PATH:                            /org/freedesktop/NetworkManager/Act
 SLAVE:                                  --
 FILENAME:                               /etc/NetworkManager/system-connections/ethernet
 -------------------------------------------------------------------------------
+NAME:                                   ethernet
+UUID:                                   UUID-ethernet-REPLACED-REPLACED-REPL
+TYPE:                                   ethernet
+TIMESTAMP:                              0
+TIMESTAMP-REAL:                         nigdy
+AUTOCONNECT:                            tak
+AUTOCONNECT-PRIORITY:                   0
+READONLY:                               nie
+DBUS-PATH:                              /org/freedesktop/NetworkManager/Settings/Connection/4
+ACTIVE:                                 tak
+DEVICE:                                 eth1
+STATE:                                  aktywowano
+ACTIVE-PATH:                            /org/freedesktop/NetworkManager/ActiveConnection/2
+SLAVE:                                  --
+FILENAME:                               /etc/NetworkManager/system-connections/ethernet
+-------------------------------------------------------------------------------
 NAME:                                   con-1
 UUID:                                   5fcfd6d7-1e63-3332-8826-a7eda103792d
 TYPE:                                   ethernet
@@ -9969,7 +10021,7 @@ FILENAME:                               /etc/NetworkManager/system-connections/c
 
 <<<
 size: 1229
-location: clients/tests/test-client.py:960:test_003()/212
+location: clients/tests/test-client.py:974:test_003()/212
 cmd: $NMCLI --mode multiline --pretty --color yes -f UUID,TYPE con
 lang: C
 returncode: 0
@@ -9993,7 +10045,7 @@ TYPE:                                   ethernet
 
 <<<
 size: 1245
-location: clients/tests/test-client.py:960:test_003()/213
+location: clients/tests/test-client.py:974:test_003()/213
 cmd: $NMCLI --mode multiline --pretty --color yes -f UUID,TYPE con
 lang: pl_PL.UTF-8
 returncode: 0
@@ -10017,7 +10069,7 @@ TYPE:                                   ethernet
 
 <<<
 size: 6414
-location: clients/tests/test-client.py:963:test_003()/214
+location: clients/tests/test-client.py:977:test_003()/214
 cmd: $NMCLI --mode multiline --pretty --color yes con s ethernet
 lang: C
 returncode: 0
@@ -10148,7 +10200,7 @@ GENERAL.MASTER-PATH:                    --
 
 <<<
 size: 6470
-location: clients/tests/test-client.py:963:test_003()/215
+location: clients/tests/test-client.py:977:test_003()/215
 cmd: $NMCLI --mode multiline --pretty --color yes con s ethernet
 lang: pl_PL.UTF-8
 returncode: 0
@@ -10279,7 +10331,7 @@ GENERAL.MASTER-PATH:                    --
 
 <<<
 size: 5476
-location: clients/tests/test-client.py:966:test_003()/216
+location: clients/tests/test-client.py:980:test_003()/216
 cmd: $NMCLI --mode multiline --pretty --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: C
 returncode: 0
@@ -10393,7 +10445,7 @@ GENERAL.MASTER-PATH:                    --
 
 <<<
 size: 5521
-location: clients/tests/test-client.py:966:test_003()/217
+location: clients/tests/test-client.py:980:test_003()/217
 cmd: $NMCLI --mode multiline --pretty --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: pl_PL.UTF-8
 returncode: 0
@@ -10506,12 +10558,12 @@ GENERAL.MASTER-PATH:                    --
 -------------------------------------------------------------------------------
 
 <<<
-size: 4280
-location: clients/tests/test-client.py:969:test_003()/218
+size: 4384
+location: clients/tests/test-client.py:983:test_003()/218
 cmd: $NMCLI --mode multiline --pretty --color yes -f all dev show eth0
 lang: C
 returncode: 0
-stdout: 4101 bytes
+stdout: 4205 bytes
 >>>
 ===============================================================================
                              Device details (eth0)
@@ -10528,6 +10580,8 @@ GENERAL.HWADDR:                         C0:61:AE:26:4D:D7
 GENERAL.MTU:                            0
 GENERAL.STATE:                          20 (unavailable)
 GENERAL.REASON:                         0 (No reason given)
+GENERAL.IP4-CONNECTIVITY:               0 (unknown)
+GENERAL.IP6-CONNECTIVITY:               0 (unknown)
 GENERAL.UDI:                            /sys/devices/virtual/eth0
 GENERAL.IP-IFACE:                       --
 GENERAL.IS-SOFTWARE:                    no
@@ -10581,12 +10635,12 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[3]:   UUID-ethernet-REPLACED-REPLACED-REPL | e
 -------------------------------------------------------------------------------
 
 <<<
-size: 4319
-location: clients/tests/test-client.py:969:test_003()/219
+size: 4425
+location: clients/tests/test-client.py:983:test_003()/219
 cmd: $NMCLI --mode multiline --pretty --color yes -f all dev show eth0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 4130 bytes
+stdout: 4236 bytes
 >>>
 ===============================================================================
                         Informacje o urządzeniu (eth0)
@@ -10603,6 +10657,8 @@ GENERAL.HWADDR:                         C0:61:AE:26:4D:D7
 GENERAL.MTU:                            0
 GENERAL.STATE:                          20 (niedostępne)
 GENERAL.REASON:                         0 (Nie podano przyczyny)
+GENERAL.IP4-CONNECTIVITY:               0 (nieznane)
+GENERAL.IP6-CONNECTIVITY:               0 (nieznane)
 GENERAL.UDI:                            /sys/devices/virtual/eth0
 GENERAL.IP-IFACE:                       --
 GENERAL.IS-SOFTWARE:                    nie
@@ -10657,7 +10713,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[3]:   UUID-ethernet-REPLACED-REPLACED-REPL | e
 
 <<<
 size: 1897
-location: clients/tests/test-client.py:957:test_003()/220
+location: clients/tests/test-client.py:971:test_003()/220
 cmd: $NMCLI --mode multiline --terse -f ALL con
 lang: C
 returncode: 0
@@ -10673,9 +10729,9 @@ AUTOCONNECT-PRIORITY:0
 READONLY:no
 DBUS-PATH:/org/freedesktop/NetworkManager/Settings/Connection/4
 ACTIVE:yes
-DEVICE:eth1
-STATE:activated
-ACTIVE-PATH:/org/freedesktop/NetworkManager/ActiveConnection/2
+DEVICE:eth0
+STATE:deactivating
+ACTIVE-PATH:/org/freedesktop/NetworkManager/ActiveConnection/1
 SLAVE:
 FILENAME:/etc/NetworkManager/system-connections/ethernet
 NAME:ethernet
@@ -10688,9 +10744,9 @@ AUTOCONNECT-PRIORITY:0
 READONLY:no
 DBUS-PATH:/org/freedesktop/NetworkManager/Settings/Connection/4
 ACTIVE:yes
-DEVICE:eth0
-STATE:deactivating
-ACTIVE-PATH:/org/freedesktop/NetworkManager/ActiveConnection/1
+DEVICE:eth1
+STATE:activated
+ACTIVE-PATH:/org/freedesktop/NetworkManager/ActiveConnection/2
 SLAVE:
 FILENAME:/etc/NetworkManager/system-connections/ethernet
 NAME:con-1
@@ -10741,7 +10797,7 @@ FILENAME:/etc/NetworkManager/system-connections/con-xx1
 
 <<<
 size: 1907
-location: clients/tests/test-client.py:957:test_003()/221
+location: clients/tests/test-client.py:971:test_003()/221
 cmd: $NMCLI --mode multiline --terse -f ALL con
 lang: pl_PL.UTF-8
 returncode: 0
@@ -10757,9 +10813,9 @@ AUTOCONNECT-PRIORITY:0
 READONLY:no
 DBUS-PATH:/org/freedesktop/NetworkManager/Settings/Connection/4
 ACTIVE:yes
-DEVICE:eth1
-STATE:activated
-ACTIVE-PATH:/org/freedesktop/NetworkManager/ActiveConnection/2
+DEVICE:eth0
+STATE:deactivating
+ACTIVE-PATH:/org/freedesktop/NetworkManager/ActiveConnection/1
 SLAVE:
 FILENAME:/etc/NetworkManager/system-connections/ethernet
 NAME:ethernet
@@ -10772,9 +10828,9 @@ AUTOCONNECT-PRIORITY:0
 READONLY:no
 DBUS-PATH:/org/freedesktop/NetworkManager/Settings/Connection/4
 ACTIVE:yes
-DEVICE:eth0
-STATE:deactivating
-ACTIVE-PATH:/org/freedesktop/NetworkManager/ActiveConnection/1
+DEVICE:eth1
+STATE:activated
+ACTIVE-PATH:/org/freedesktop/NetworkManager/ActiveConnection/2
 SLAVE:
 FILENAME:/etc/NetworkManager/system-connections/ethernet
 NAME:con-1
@@ -10825,7 +10881,7 @@ FILENAME:/etc/NetworkManager/system-connections/con-xx1
 
 <<<
 size: 398
-location: clients/tests/test-client.py:960:test_003()/222
+location: clients/tests/test-client.py:974:test_003()/222
 cmd: $NMCLI --mode multiline --terse -f UUID,TYPE con
 lang: C
 returncode: 0
@@ -10842,7 +10898,7 @@ TYPE:802-3-ethernet
 
 <<<
 size: 408
-location: clients/tests/test-client.py:960:test_003()/223
+location: clients/tests/test-client.py:974:test_003()/223
 cmd: $NMCLI --mode multiline --terse -f UUID,TYPE con
 lang: pl_PL.UTF-8
 returncode: 0
@@ -10859,7 +10915,7 @@ TYPE:802-3-ethernet
 
 <<<
 size: 2786
-location: clients/tests/test-client.py:963:test_003()/224
+location: clients/tests/test-client.py:977:test_003()/224
 cmd: $NMCLI --mode multiline --terse con s ethernet
 lang: C
 returncode: 0
@@ -10974,7 +11030,7 @@ GENERAL.MASTER-PATH:
 
 <<<
 size: 2796
-location: clients/tests/test-client.py:963:test_003()/225
+location: clients/tests/test-client.py:977:test_003()/225
 cmd: $NMCLI --mode multiline --terse con s ethernet
 lang: pl_PL.UTF-8
 returncode: 0
@@ -11089,7 +11145,7 @@ GENERAL.MASTER-PATH:
 
 <<<
 size: 2458
-location: clients/tests/test-client.py:966:test_003()/226
+location: clients/tests/test-client.py:980:test_003()/226
 cmd: $NMCLI --mode multiline --terse c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: C
 returncode: 0
@@ -11191,7 +11247,7 @@ GENERAL.MASTER-PATH:
 
 <<<
 size: 2468
-location: clients/tests/test-client.py:966:test_003()/227
+location: clients/tests/test-client.py:980:test_003()/227
 cmd: $NMCLI --mode multiline --terse c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: pl_PL.UTF-8
 returncode: 0
@@ -11292,12 +11348,12 @@ GENERAL.ZONE:
 GENERAL.MASTER-PATH:
 
 <<<
-size: 2188
-location: clients/tests/test-client.py:969:test_003()/228
+size: 2262
+location: clients/tests/test-client.py:983:test_003()/228
 cmd: $NMCLI --mode multiline --terse -f all dev show eth0
 lang: C
 returncode: 0
-stdout: 2022 bytes
+stdout: 2096 bytes
 >>>
 GENERAL.DEVICE:eth0
 GENERAL.TYPE:ethernet
@@ -11311,6 +11367,8 @@ GENERAL.HWADDR:C0:61:AE:26:4D:D7
 GENERAL.MTU:0
 GENERAL.STATE:20 (unavailable)
 GENERAL.REASON:0 (No reason given)
+GENERAL.IP4-CONNECTIVITY:0 (unknown)
+GENERAL.IP6-CONNECTIVITY:0 (unknown)
 GENERAL.UDI:/sys/devices/virtual/eth0
 GENERAL.IP-IFACE:
 GENERAL.IS-SOFTWARE:no
@@ -11356,12 +11414,12 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[2]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-
 CONNECTIONS.AVAILABLE-CONNECTIONS[3]:UUID-ethernet-REPLACED-REPLACED-REPL | ethernet
 
 <<<
-size: 2198
-location: clients/tests/test-client.py:969:test_003()/229
+size: 2272
+location: clients/tests/test-client.py:983:test_003()/229
 cmd: $NMCLI --mode multiline --terse -f all dev show eth0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2022 bytes
+stdout: 2096 bytes
 >>>
 GENERAL.DEVICE:eth0
 GENERAL.TYPE:ethernet
@@ -11375,6 +11433,8 @@ GENERAL.HWADDR:C0:61:AE:26:4D:D7
 GENERAL.MTU:0
 GENERAL.STATE:20 (unavailable)
 GENERAL.REASON:0 (No reason given)
+GENERAL.IP4-CONNECTIVITY:0 (unknown)
+GENERAL.IP6-CONNECTIVITY:0 (unknown)
 GENERAL.UDI:/sys/devices/virtual/eth0
 GENERAL.IP-IFACE:
 GENERAL.IS-SOFTWARE:no
@@ -11421,27 +11481,12 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[3]:UUID-ethernet-REPLACED-REPLACED-REPL | ethe
 
 <<<
 size: 2179
-location: clients/tests/test-client.py:957:test_003()/230
+location: clients/tests/test-client.py:971:test_003()/230
 cmd: $NMCLI --mode multiline --terse --color yes -f ALL con
 lang: C
 returncode: 0
 stdout: 2011 bytes
 >>>
-NAME:ethernet
-UUID:UUID-ethernet-REPLACED-REPLACED-REPL
-TYPE:802-3-ethernet
-TIMESTAMP:0
-TIMESTAMP-REAL:never
-AUTOCONNECT:yes
-AUTOCONNECT-PRIORITY:0
-READONLY:no
-DBUS-PATH:/org/freedesktop/NetworkManager/Settings/Connection/4
-ACTIVE:yes
-DEVICE:eth1
-STATE:activated
-ACTIVE-PATH:/org/freedesktop/NetworkManager/ActiveConnection/2
-SLAVE:
-FILENAME:/etc/NetworkManager/system-connections/ethernet
 NAME:ethernet
 UUID:UUID-ethernet-REPLACED-REPLACED-REPL
 TYPE:802-3-ethernet
@@ -11457,6 +11502,21 @@ STATE:deactivating
 ACTIVE-PATH:/org/freedesktop/NetworkManager/ActiveConnection/1
 SLAVE:
 FILENAME:/etc/NetworkManager/system-connections/ethernet
+NAME:ethernet
+UUID:UUID-ethernet-REPLACED-REPLACED-REPL
+TYPE:802-3-ethernet
+TIMESTAMP:0
+TIMESTAMP-REAL:never
+AUTOCONNECT:yes
+AUTOCONNECT-PRIORITY:0
+READONLY:no
+DBUS-PATH:/org/freedesktop/NetworkManager/Settings/Connection/4
+ACTIVE:yes
+DEVICE:eth1
+STATE:activated
+ACTIVE-PATH:/org/freedesktop/NetworkManager/ActiveConnection/2
+SLAVE:
+FILENAME:/etc/NetworkManager/system-connections/ethernet
 NAME:con-1
 UUID:5fcfd6d7-1e63-3332-8826-a7eda103792d
 TYPE:802-3-ethernet
@@ -11505,27 +11565,12 @@ FILENAME:/etc/NetworkManager/system-connections/con-xx1
 
 <<<
 size: 2189
-location: clients/tests/test-client.py:957:test_003()/231
+location: clients/tests/test-client.py:971:test_003()/231
 cmd: $NMCLI --mode multiline --terse --color yes -f ALL con
 lang: pl_PL.UTF-8
 returncode: 0
 stdout: 2011 bytes
 >>>
-NAME:ethernet
-UUID:UUID-ethernet-REPLACED-REPLACED-REPL
-TYPE:802-3-ethernet
-TIMESTAMP:0
-TIMESTAMP-REAL:never
-AUTOCONNECT:yes
-AUTOCONNECT-PRIORITY:0
-READONLY:no
-DBUS-PATH:/org/freedesktop/NetworkManager/Settings/Connection/4
-ACTIVE:yes
-DEVICE:eth1
-STATE:activated
-ACTIVE-PATH:/org/freedesktop/NetworkManager/ActiveConnection/2
-SLAVE:
-FILENAME:/etc/NetworkManager/system-connections/ethernet
 NAME:ethernet
 UUID:UUID-ethernet-REPLACED-REPLACED-REPL
 TYPE:802-3-ethernet
@@ -11541,6 +11586,21 @@ STATE:deactivating
 ACTIVE-PATH:/org/freedesktop/NetworkManager/ActiveConnection/1
 SLAVE:
 FILENAME:/etc/NetworkManager/system-connections/ethernet
+NAME:ethernet
+UUID:UUID-ethernet-REPLACED-REPLACED-REPL
+TYPE:802-3-ethernet
+TIMESTAMP:0
+TIMESTAMP-REAL:never
+AUTOCONNECT:yes
+AUTOCONNECT-PRIORITY:0
+READONLY:no
+DBUS-PATH:/org/freedesktop/NetworkManager/Settings/Connection/4
+ACTIVE:yes
+DEVICE:eth1
+STATE:activated
+ACTIVE-PATH:/org/freedesktop/NetworkManager/ActiveConnection/2
+SLAVE:
+FILENAME:/etc/NetworkManager/system-connections/ethernet
 NAME:con-1
 UUID:5fcfd6d7-1e63-3332-8826-a7eda103792d
 TYPE:802-3-ethernet
@@ -11589,7 +11649,7 @@ FILENAME:/etc/NetworkManager/system-connections/con-xx1
 
 <<<
 size: 428
-location: clients/tests/test-client.py:960:test_003()/232
+location: clients/tests/test-client.py:974:test_003()/232
 cmd: $NMCLI --mode multiline --terse --color yes -f UUID,TYPE con
 lang: C
 returncode: 0
@@ -11606,7 +11666,7 @@ TYPE:802-3-ethernet
 
 <<<
 size: 438
-location: clients/tests/test-client.py:960:test_003()/233
+location: clients/tests/test-client.py:974:test_003()/233
 cmd: $NMCLI --mode multiline --terse --color yes -f UUID,TYPE con
 lang: pl_PL.UTF-8
 returncode: 0
@@ -11623,7 +11683,7 @@ TYPE:802-3-ethernet
 
 <<<
 size: 2798
-location: clients/tests/test-client.py:963:test_003()/234
+location: clients/tests/test-client.py:977:test_003()/234
 cmd: $NMCLI --mode multiline --terse --color yes con s ethernet
 lang: C
 returncode: 0
@@ -11738,7 +11798,7 @@ GENERAL.MASTER-PATH:
 
 <<<
 size: 2808
-location: clients/tests/test-client.py:963:test_003()/235
+location: clients/tests/test-client.py:977:test_003()/235
 cmd: $NMCLI --mode multiline --terse --color yes con s ethernet
 lang: pl_PL.UTF-8
 returncode: 0
@@ -11853,7 +11913,7 @@ GENERAL.MASTER-PATH:
 
 <<<
 size: 2470
-location: clients/tests/test-client.py:966:test_003()/236
+location: clients/tests/test-client.py:980:test_003()/236
 cmd: $NMCLI --mode multiline --terse --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: C
 returncode: 0
@@ -11955,7 +12015,7 @@ GENERAL.MASTER-PATH:
 
 <<<
 size: 2480
-location: clients/tests/test-client.py:966:test_003()/237
+location: clients/tests/test-client.py:980:test_003()/237
 cmd: $NMCLI --mode multiline --terse --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: pl_PL.UTF-8
 returncode: 0
@@ -12056,12 +12116,12 @@ GENERAL.ZONE:
 GENERAL.MASTER-PATH:
 
 <<<
-size: 2200
-location: clients/tests/test-client.py:969:test_003()/238
+size: 2274
+location: clients/tests/test-client.py:983:test_003()/238
 cmd: $NMCLI --mode multiline --terse --color yes -f all dev show eth0
 lang: C
 returncode: 0
-stdout: 2022 bytes
+stdout: 2096 bytes
 >>>
 GENERAL.DEVICE:eth0
 GENERAL.TYPE:ethernet
@@ -12075,6 +12135,8 @@ GENERAL.HWADDR:C0:61:AE:26:4D:D7
 GENERAL.MTU:0
 GENERAL.STATE:20 (unavailable)
 GENERAL.REASON:0 (No reason given)
+GENERAL.IP4-CONNECTIVITY:0 (unknown)
+GENERAL.IP6-CONNECTIVITY:0 (unknown)
 GENERAL.UDI:/sys/devices/virtual/eth0
 GENERAL.IP-IFACE:
 GENERAL.IS-SOFTWARE:no
@@ -12120,12 +12182,12 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[2]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-
 CONNECTIONS.AVAILABLE-CONNECTIONS[3]:UUID-ethernet-REPLACED-REPLACED-REPL | ethernet
 
 <<<
-size: 2210
-location: clients/tests/test-client.py:969:test_003()/239
+size: 2284
+location: clients/tests/test-client.py:983:test_003()/239
 cmd: $NMCLI --mode multiline --terse --color yes -f all dev show eth0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2022 bytes
+stdout: 2096 bytes
 >>>
 GENERAL.DEVICE:eth0
 GENERAL.TYPE:ethernet
@@ -12139,6 +12201,8 @@ GENERAL.HWADDR:C0:61:AE:26:4D:D7
 GENERAL.MTU:0
 GENERAL.STATE:20 (unavailable)
 GENERAL.REASON:0 (No reason given)
+GENERAL.IP4-CONNECTIVITY:0 (unknown)
+GENERAL.IP6-CONNECTIVITY:0 (unknown)
 GENERAL.UDI:/sys/devices/virtual/eth0
 GENERAL.IP-IFACE:
 GENERAL.IS-SOFTWARE:no
@@ -12185,37 +12249,37 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[3]:UUID-ethernet-REPLACED-REPLACED-REPL | ethe
 
 <<<
 size: 2069
-location: clients/tests/test-client.py:957:test_003()/240
+location: clients/tests/test-client.py:971:test_003()/240
 cmd: $NMCLI -f ALL con
 lang: C
 returncode: 0
 stdout: 1938 bytes
 >>>
 NAME      UUID                                  TYPE      TIMESTAMP  TIMESTAMP-REAL  AUTOCONNECT  AUTOCONNECT-PRIORITY  READONLY  DBUS-PATH                                              ACTIVE  DEVICE  STATE         ACTIVE-PATH                                         SLAVE  FILENAME                                        
-ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  --         --              --           --                    --        /org/freedesktop/NetworkManager/Settings/Connection/4  yes     eth1    activated     /org/freedesktop/NetworkManager/ActiveConnection/2  --     /etc/NetworkManager/system-connections/ethernet 
 ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  --         --              --           --                    --        /org/freedesktop/NetworkManager/Settings/Connection/4  yes     eth0    deactivating  /org/freedesktop/NetworkManager/ActiveConnection/1  --     /etc/NetworkManager/system-connections/ethernet 
+ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  --         --              --           --                    --        /org/freedesktop/NetworkManager/Settings/Connection/4  yes     eth1    activated     /org/freedesktop/NetworkManager/ActiveConnection/2  --     /etc/NetworkManager/system-connections/ethernet 
 con-1     5fcfd6d7-1e63-3332-8826-a7eda103792d  ethernet  0          never           yes          0                     no        /org/freedesktop/NetworkManager/Settings/Connection/1  no      --      --            --                                                  --     /etc/NetworkManager/system-connections/con-1    
 con-gsm1  UUID-con-gsm1-REPLACED-REPLACED-REPL  gsm       0          never           no           0                     no        /org/freedesktop/NetworkManager/Settings/Connection/3  no      --      --            --                                                  --     /etc/NetworkManager/system-connections/con-gsm1 
 con-xx1   UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet  0          never           yes          0                     no        /org/freedesktop/NetworkManager/Settings/Connection/2  no      --      --            --                                                  --     /etc/NetworkManager/system-connections/con-xx1  
 
 <<<
 size: 2091
-location: clients/tests/test-client.py:957:test_003()/241
+location: clients/tests/test-client.py:971:test_003()/241
 cmd: $NMCLI -f ALL con
 lang: pl_PL.UTF-8
 returncode: 0
 stdout: 1950 bytes
 >>>
 NAME      UUID                                  TYPE      TIMESTAMP  TIMESTAMP-REAL  AUTOCONNECT  AUTOCONNECT-PRIORITY  READONLY  DBUS-PATH                                              ACTIVE  DEVICE  STATE           ACTIVE-PATH                                         SLAVE  FILENAME                                        
-ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  --         --              --           --                    --        /org/freedesktop/NetworkManager/Settings/Connection/4  tak     eth1    aktywowano      /org/freedesktop/NetworkManager/ActiveConnection/2  --     /etc/NetworkManager/system-connections/ethernet 
 ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  --         --              --           --                    --        /org/freedesktop/NetworkManager/Settings/Connection/4  tak     eth0    dezaktywowanie  /org/freedesktop/NetworkManager/ActiveConnection/1  --     /etc/NetworkManager/system-connections/ethernet 
+ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  --         --              --           --                    --        /org/freedesktop/NetworkManager/Settings/Connection/4  tak     eth1    aktywowano      /org/freedesktop/NetworkManager/ActiveConnection/2  --     /etc/NetworkManager/system-connections/ethernet 
 con-1     5fcfd6d7-1e63-3332-8826-a7eda103792d  ethernet  0          nigdy           tak          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/1  nie     --      --              --                                                  --     /etc/NetworkManager/system-connections/con-1    
 con-gsm1  UUID-con-gsm1-REPLACED-REPLACED-REPL  gsm       0          nigdy           nie          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/3  nie     --      --              --                                                  --     /etc/NetworkManager/system-connections/con-gsm1 
 con-xx1   UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet  0          nigdy           tak          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/2  nie     --      --              --                                                  --     /etc/NetworkManager/system-connections/con-xx1  
 
 <<<
 size: 328
-location: clients/tests/test-client.py:960:test_003()/242
+location: clients/tests/test-client.py:974:test_003()/242
 cmd: $NMCLI -f UUID,TYPE con
 lang: C
 returncode: 0
@@ -12228,7 +12292,7 @@ UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet
 
 <<<
 size: 338
-location: clients/tests/test-client.py:960:test_003()/243
+location: clients/tests/test-client.py:974:test_003()/243
 cmd: $NMCLI -f UUID,TYPE con
 lang: pl_PL.UTF-8
 returncode: 0
@@ -12241,7 +12305,7 @@ UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet
 
 <<<
 size: 180
-location: clients/tests/test-client.py:963:test_003()/244
+location: clients/tests/test-client.py:977:test_003()/244
 cmd: $NMCLI con s ethernet
 lang: C
 returncode: 10
@@ -12251,7 +12315,7 @@ Error: ethernet - no such connection profile.
 
 <<<
 size: 202
-location: clients/tests/test-client.py:963:test_003()/245
+location: clients/tests/test-client.py:977:test_003()/245
 cmd: $NMCLI con s ethernet
 lang: pl_PL.UTF-8
 returncode: 10
@@ -12261,7 +12325,7 @@ Błąd: ethernet — nie ma takiego profilu połączenia.
 
 <<<
 size: 841
-location: clients/tests/test-client.py:966:test_003()/246
+location: clients/tests/test-client.py:980:test_003()/246
 cmd: $NMCLI c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: C
 returncode: 0
@@ -12282,7 +12346,7 @@ GENERAL.MASTER-PATH:                    --
 
 <<<
 size: 856
-location: clients/tests/test-client.py:966:test_003()/247
+location: clients/tests/test-client.py:980:test_003()/247
 cmd: $NMCLI c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: pl_PL.UTF-8
 returncode: 0
@@ -12302,12 +12366,12 @@ GENERAL.ZONE:                           --
 GENERAL.MASTER-PATH:                    --
 
 <<<
-size: 3411
-location: clients/tests/test-client.py:969:test_003()/248
+size: 3515
+location: clients/tests/test-client.py:983:test_003()/248
 cmd: $NMCLI -f all dev show eth0
 lang: C
 returncode: 0
-stdout: 3270 bytes
+stdout: 3374 bytes
 >>>
 GENERAL.DEVICE:                         eth0
 GENERAL.TYPE:                           ethernet
@@ -12321,6 +12385,8 @@ GENERAL.HWADDR:                         C0:61:AE:26:4D:D7
 GENERAL.MTU:                            0
 GENERAL.STATE:                          20 (unavailable)
 GENERAL.REASON:                         0 (No reason given)
+GENERAL.IP4-CONNECTIVITY:               0 (unknown)
+GENERAL.IP6-CONNECTIVITY:               0 (unknown)
 GENERAL.UDI:                            /sys/devices/virtual/eth0
 GENERAL.IP-IFACE:                       --
 GENERAL.IS-SOFTWARE:                    no
@@ -12366,12 +12432,12 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[2]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | c
 CONNECTIONS.AVAILABLE-CONNECTIONS[3]:    | /org/freedesktop/NetworkManager/Settings/Connection/4
 
 <<<
-size: 3444
-location: clients/tests/test-client.py:969:test_003()/249
+size: 3552
+location: clients/tests/test-client.py:983:test_003()/249
 cmd: $NMCLI -f all dev show eth0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 3293 bytes
+stdout: 3401 bytes
 >>>
 GENERAL.DEVICE:                         eth0
 GENERAL.TYPE:                           ethernet
@@ -12385,6 +12451,8 @@ GENERAL.HWADDR:                         C0:61:AE:26:4D:D7
 GENERAL.MTU:                            0
 GENERAL.STATE:                          20 (niedostępne)
 GENERAL.REASON:                         0 (Nie podano przyczyny)
+GENERAL.IP4-CONNECTIVITY:               0 (nieznane)
+GENERAL.IP6-CONNECTIVITY:               0 (nieznane)
 GENERAL.UDI:                            /sys/devices/virtual/eth0
 GENERAL.IP-IFACE:                       --
 GENERAL.IS-SOFTWARE:                    nie
@@ -12427,41 +12495,41 @@ DHCP6.OPTION[4]:                        dhcp-6-opt-8 = val-8
 CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings/Connection/{1,2,4}
 CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1
 CONNECTIONS.AVAILABLE-CONNECTIONS[2]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
-CONNECTIONS.AVAILABLE-CONNECTIONS[3]:    | /org/freedesktop/NetworkManager/Settings/Connection/4
+CONNECTIONS.AVAILABLE-CONNECTIONS[3]:    | /org/freedesktop/NetworkManager/Settings/Connection/4
 
 <<<
 size: 2351
-location: clients/tests/test-client.py:957:test_003()/250
+location: clients/tests/test-client.py:971:test_003()/250
 cmd: $NMCLI --color yes -f ALL con
 lang: C
 returncode: 0
 stdout: 2208 bytes
 >>>
 NAME      UUID                                  TYPE      TIMESTAMP  TIMESTAMP-REAL  AUTOCONNECT  AUTOCONNECT-PRIORITY  READONLY  DBUS-PATH                                              ACTIVE  DEVICE  STATE         ACTIVE-PATH                                         SLAVE  FILENAME                                        
-ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  --         --              --           --                    --        /org/freedesktop/NetworkManager/Settings/Connection/4  yes     eth1    activated     /org/freedesktop/NetworkManager/ActiveConnection/2  --     /etc/NetworkManager/system-connections/ethernet 
 ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  --         --              --           --                    --        /org/freedesktop/NetworkManager/Settings/Connection/4  yes     eth0    deactivating  /org/freedesktop/NetworkManager/ActiveConnection/1  --     /etc/NetworkManager/system-connections/ethernet 
+ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  --         --              --           --                    --        /org/freedesktop/NetworkManager/Settings/Connection/4  yes     eth1    activated     /org/freedesktop/NetworkManager/ActiveConnection/2  --     /etc/NetworkManager/system-connections/ethernet 
 con-1     5fcfd6d7-1e63-3332-8826-a7eda103792d  ethernet  0          never           yes          0                     no        /org/freedesktop/NetworkManager/Settings/Connection/1  no      --      --            --                                                  --     /etc/NetworkManager/system-connections/con-1    
 con-gsm1  UUID-con-gsm1-REPLACED-REPLACED-REPL  gsm       0          never           no           0                     no        /org/freedesktop/NetworkManager/Settings/Connection/3  no      --      --            --                                                  --     /etc/NetworkManager/system-connections/con-gsm1 
 con-xx1   UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet  0          never           yes          0                     no        /org/freedesktop/NetworkManager/Settings/Connection/2  no      --      --            --                                                  --     /etc/NetworkManager/system-connections/con-xx1  
 
 <<<
 size: 2373
-location: clients/tests/test-client.py:957:test_003()/251
+location: clients/tests/test-client.py:971:test_003()/251
 cmd: $NMCLI --color yes -f ALL con
 lang: pl_PL.UTF-8
 returncode: 0
 stdout: 2220 bytes
 >>>
 NAME      UUID                                  TYPE      TIMESTAMP  TIMESTAMP-REAL  AUTOCONNECT  AUTOCONNECT-PRIORITY  READONLY  DBUS-PATH                                              ACTIVE  DEVICE  STATE           ACTIVE-PATH                                         SLAVE  FILENAME                                        
-ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  --         --              --           --                    --        /org/freedesktop/NetworkManager/Settings/Connection/4  tak     eth1    aktywowano      /org/freedesktop/NetworkManager/ActiveConnection/2  --     /etc/NetworkManager/system-connections/ethernet 
 ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  --         --              --           --                    --        /org/freedesktop/NetworkManager/Settings/Connection/4  tak     eth0    dezaktywowanie  /org/freedesktop/NetworkManager/ActiveConnection/1  --     /etc/NetworkManager/system-connections/ethernet 
+ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  --         --              --           --                    --        /org/freedesktop/NetworkManager/Settings/Connection/4  tak     eth1    aktywowano      /org/freedesktop/NetworkManager/ActiveConnection/2  --     /etc/NetworkManager/system-connections/ethernet 
 con-1     5fcfd6d7-1e63-3332-8826-a7eda103792d  ethernet  0          nigdy           tak          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/1  nie     --      --              --                                                  --     /etc/NetworkManager/system-connections/con-1    
 con-gsm1  UUID-con-gsm1-REPLACED-REPLACED-REPL  gsm       0          nigdy           nie          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/3  nie     --      --              --                                                  --     /etc/NetworkManager/system-connections/con-gsm1 
 con-xx1   UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet  0          nigdy           tak          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/2  nie     --      --              --                                                  --     /etc/NetworkManager/system-connections/con-xx1  
 
 <<<
 size: 340
-location: clients/tests/test-client.py:960:test_003()/252
+location: clients/tests/test-client.py:974:test_003()/252
 cmd: $NMCLI --color yes -f UUID,TYPE con
 lang: C
 returncode: 0
@@ -12474,7 +12542,7 @@ UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet
 
 <<<
 size: 350
-location: clients/tests/test-client.py:960:test_003()/253
+location: clients/tests/test-client.py:974:test_003()/253
 cmd: $NMCLI --color yes -f UUID,TYPE con
 lang: pl_PL.UTF-8
 returncode: 0
@@ -12487,7 +12555,7 @@ UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet
 
 <<<
 size: 192
-location: clients/tests/test-client.py:963:test_003()/254
+location: clients/tests/test-client.py:977:test_003()/254
 cmd: $NMCLI --color yes con s ethernet
 lang: C
 returncode: 10
@@ -12497,7 +12565,7 @@ Error: ethernet - no such connection profile.
 
 <<<
 size: 214
-location: clients/tests/test-client.py:963:test_003()/255
+location: clients/tests/test-client.py:977:test_003()/255
 cmd: $NMCLI --color yes con s ethernet
 lang: pl_PL.UTF-8
 returncode: 10
@@ -12507,7 +12575,7 @@ Błąd: ethernet — nie ma takiego profilu połączenia.
 
 <<<
 size: 853
-location: clients/tests/test-client.py:966:test_003()/256
+location: clients/tests/test-client.py:980:test_003()/256
 cmd: $NMCLI --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: C
 returncode: 0
@@ -12528,7 +12596,7 @@ GENERAL.MASTER-PATH:                    --
 
 <<<
 size: 868
-location: clients/tests/test-client.py:966:test_003()/257
+location: clients/tests/test-client.py:980:test_003()/257
 cmd: $NMCLI --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: pl_PL.UTF-8
 returncode: 0
@@ -12548,12 +12616,12 @@ GENERAL.ZONE:                           --
 GENERAL.MASTER-PATH:                    --
 
 <<<
-size: 3423
-location: clients/tests/test-client.py:969:test_003()/258
+size: 3527
+location: clients/tests/test-client.py:983:test_003()/258
 cmd: $NMCLI --color yes -f all dev show eth0
 lang: C
 returncode: 0
-stdout: 3270 bytes
+stdout: 3374 bytes
 >>>
 GENERAL.DEVICE:                         eth0
 GENERAL.TYPE:                           ethernet
@@ -12567,6 +12635,8 @@ GENERAL.HWADDR:                         C0:61:AE:26:4D:D7
 GENERAL.MTU:                            0
 GENERAL.STATE:                          20 (unavailable)
 GENERAL.REASON:                         0 (No reason given)
+GENERAL.IP4-CONNECTIVITY:               0 (unknown)
+GENERAL.IP6-CONNECTIVITY:               0 (unknown)
 GENERAL.UDI:                            /sys/devices/virtual/eth0
 GENERAL.IP-IFACE:                       --
 GENERAL.IS-SOFTWARE:                    no
@@ -12612,12 +12682,12 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[2]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | c
 CONNECTIONS.AVAILABLE-CONNECTIONS[3]:    | /org/freedesktop/NetworkManager/Settings/Connection/4
 
 <<<
-size: 3456
-location: clients/tests/test-client.py:969:test_003()/259
+size: 3564
+location: clients/tests/test-client.py:983:test_003()/259
 cmd: $NMCLI --color yes -f all dev show eth0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 3293 bytes
+stdout: 3401 bytes
 >>>
 GENERAL.DEVICE:                         eth0
 GENERAL.TYPE:                           ethernet
@@ -12631,6 +12701,8 @@ GENERAL.HWADDR:                         C0:61:AE:26:4D:D7
 GENERAL.MTU:                            0
 GENERAL.STATE:                          20 (niedostępne)
 GENERAL.REASON:                         0 (Nie podano przyczyny)
+GENERAL.IP4-CONNECTIVITY:               0 (nieznane)
+GENERAL.IP6-CONNECTIVITY:               0 (nieznane)
 GENERAL.UDI:                            /sys/devices/virtual/eth0
 GENERAL.IP-IFACE:                       --
 GENERAL.IS-SOFTWARE:                    nie
@@ -12673,11 +12745,11 @@ DHCP6.OPTION[4]:                        dhcp-6-opt-8 = val-8
 CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings/Connection/{1,2,4}
 CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1
 CONNECTIONS.AVAILABLE-CONNECTIONS[2]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
-CONNECTIONS.AVAILABLE-CONNECTIONS[3]:    | /org/freedesktop/NetworkManager/Settings/Connection/4
+CONNECTIONS.AVAILABLE-CONNECTIONS[3]:    | /org/freedesktop/NetworkManager/Settings/Connection/4
 
 <<<
 size: 2555
-location: clients/tests/test-client.py:957:test_003()/260
+location: clients/tests/test-client.py:971:test_003()/260
 cmd: $NMCLI --pretty -f ALL con
 lang: C
 returncode: 0
@@ -12688,15 +12760,15 @@ stdout: 2415 bytes
 ======================================
 NAME      UUID                                  TYPE      TIMESTAMP  TIMESTAMP-REAL  AUTOCONNECT  AUTOCONNECT-PRIORITY  READONLY  DBUS-PATH                                              ACTIVE  DEVICE  STATE         ACTIVE-PATH                                         SLAVE  FILENAME                                        
 -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  --         --              --           --                    --        /org/freedesktop/NetworkManager/Settings/Connection/4  yes     eth1    activated     /org/freedesktop/NetworkManager/ActiveConnection/2  --     /etc/NetworkManager/system-connections/ethernet 
 ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  --         --              --           --                    --        /org/freedesktop/NetworkManager/Settings/Connection/4  yes     eth0    deactivating  /org/freedesktop/NetworkManager/ActiveConnection/1  --     /etc/NetworkManager/system-connections/ethernet 
+ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  --         --              --           --                    --        /org/freedesktop/NetworkManager/Settings/Connection/4  yes     eth1    activated     /org/freedesktop/NetworkManager/ActiveConnection/2  --     /etc/NetworkManager/system-connections/ethernet 
 con-1     5fcfd6d7-1e63-3332-8826-a7eda103792d  ethernet  0          never           yes          0                     no        /org/freedesktop/NetworkManager/Settings/Connection/1  no      --      --            --                                                  --     /etc/NetworkManager/system-connections/con-1    
 con-gsm1  UUID-con-gsm1-REPLACED-REPLACED-REPL  gsm       0          never           no           0                     no        /org/freedesktop/NetworkManager/Settings/Connection/3  no      --      --            --                                                  --     /etc/NetworkManager/system-connections/con-gsm1 
 con-xx1   UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet  0          never           yes          0                     no        /org/freedesktop/NetworkManager/Settings/Connection/2  no      --      --            --                                                  --     /etc/NetworkManager/system-connections/con-xx1  
 
 <<<
 size: 2599
-location: clients/tests/test-client.py:957:test_003()/261
+location: clients/tests/test-client.py:971:test_003()/261
 cmd: $NMCLI --pretty -f ALL con
 lang: pl_PL.UTF-8
 returncode: 0
@@ -12707,15 +12779,15 @@ stdout: 2449 bytes
 ==========================================
 NAME      UUID                                  TYPE      TIMESTAMP  TIMESTAMP-REAL  AUTOCONNECT  AUTOCONNECT-PRIORITY  READONLY  DBUS-PATH                                              ACTIVE  DEVICE  STATE           ACTIVE-PATH                                         SLAVE  FILENAME                                        
 -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  --         --              --           --                    --        /org/freedesktop/NetworkManager/Settings/Connection/4  tak     eth1    aktywowano      /org/freedesktop/NetworkManager/ActiveConnection/2  --     /etc/NetworkManager/system-connections/ethernet 
 ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  --         --              --           --                    --        /org/freedesktop/NetworkManager/Settings/Connection/4  tak     eth0    dezaktywowanie  /org/freedesktop/NetworkManager/ActiveConnection/1  --     /etc/NetworkManager/system-connections/ethernet 
+ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  --         --              --           --                    --        /org/freedesktop/NetworkManager/Settings/Connection/4  tak     eth1    aktywowano      /org/freedesktop/NetworkManager/ActiveConnection/2  --     /etc/NetworkManager/system-connections/ethernet 
 con-1     5fcfd6d7-1e63-3332-8826-a7eda103792d  ethernet  0          nigdy           tak          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/1  nie     --      --              --                                                  --     /etc/NetworkManager/system-connections/con-1    
 con-gsm1  UUID-con-gsm1-REPLACED-REPLACED-REPL  gsm       0          nigdy           nie          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/3  nie     --      --              --                                                  --     /etc/NetworkManager/system-connections/con-gsm1 
 con-xx1   UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet  0          nigdy           tak          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/2  nie     --      --              --                                                  --     /etc/NetworkManager/system-connections/con-xx1  
 
 <<<
 size: 539
-location: clients/tests/test-client.py:960:test_003()/262
+location: clients/tests/test-client.py:974:test_003()/262
 cmd: $NMCLI --pretty -f UUID,TYPE con
 lang: C
 returncode: 0
@@ -12732,7 +12804,7 @@ UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet
 
 <<<
 size: 569
-location: clients/tests/test-client.py:960:test_003()/263
+location: clients/tests/test-client.py:974:test_003()/263
 cmd: $NMCLI --pretty -f UUID,TYPE con
 lang: pl_PL.UTF-8
 returncode: 0
@@ -12749,7 +12821,7 @@ UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet
 
 <<<
 size: 189
-location: clients/tests/test-client.py:963:test_003()/264
+location: clients/tests/test-client.py:977:test_003()/264
 cmd: $NMCLI --pretty con s ethernet
 lang: C
 returncode: 10
@@ -12759,7 +12831,7 @@ Error: ethernet - no such connection profile.
 
 <<<
 size: 211
-location: clients/tests/test-client.py:963:test_003()/265
+location: clients/tests/test-client.py:977:test_003()/265
 cmd: $NMCLI --pretty con s ethernet
 lang: pl_PL.UTF-8
 returncode: 10
@@ -12769,7 +12841,7 @@ Błąd: ethernet — nie ma takiego profilu połączenia.
 
 <<<
 size: 1377
-location: clients/tests/test-client.py:966:test_003()/266
+location: clients/tests/test-client.py:980:test_003()/266
 cmd: $NMCLI --pretty c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: C
 returncode: 0
@@ -12797,7 +12869,7 @@ GENERAL.MASTER-PATH:                    --
 
 <<<
 size: 1404
-location: clients/tests/test-client.py:966:test_003()/267
+location: clients/tests/test-client.py:980:test_003()/267
 cmd: $NMCLI --pretty c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: pl_PL.UTF-8
 returncode: 0
@@ -12824,12 +12896,12 @@ GENERAL.MASTER-PATH:                    --
 -------------------------------------------------------------------------------
 
 <<<
-size: 4271
-location: clients/tests/test-client.py:969:test_003()/268
+size: 4375
+location: clients/tests/test-client.py:983:test_003()/268
 cmd: $NMCLI --pretty -f all dev show eth0
 lang: C
 returncode: 0
-stdout: 4121 bytes
+stdout: 4225 bytes
 >>>
 ===============================================================================
                              Device details (eth0)
@@ -12846,6 +12918,8 @@ GENERAL.HWADDR:                         C0:61:AE:26:4D:D7
 GENERAL.MTU:                            0
 GENERAL.STATE:                          20 (unavailable)
 GENERAL.REASON:                         0 (No reason given)
+GENERAL.IP4-CONNECTIVITY:               0 (unknown)
+GENERAL.IP6-CONNECTIVITY:               0 (unknown)
 GENERAL.UDI:                            /sys/devices/virtual/eth0
 GENERAL.IP-IFACE:                       --
 GENERAL.IS-SOFTWARE:                    no
@@ -12899,12 +12973,12 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[3]:    | /org/freedesktop/NetworkMa
 -------------------------------------------------------------------------------
 
 <<<
-size: 4310
-location: clients/tests/test-client.py:969:test_003()/269
+size: 4418
+location: clients/tests/test-client.py:983:test_003()/269
 cmd: $NMCLI --pretty -f all dev show eth0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 4150 bytes
+stdout: 4258 bytes
 >>>
 ===============================================================================
                         Informacje o urządzeniu (eth0)
@@ -12921,6 +12995,8 @@ GENERAL.HWADDR:                         C0:61:AE:26:4D:D7
 GENERAL.MTU:                            0
 GENERAL.STATE:                          20 (niedostępne)
 GENERAL.REASON:                         0 (Nie podano przyczyny)
+GENERAL.IP4-CONNECTIVITY:               0 (nieznane)
+GENERAL.IP6-CONNECTIVITY:               0 (nieznane)
 GENERAL.UDI:                            /sys/devices/virtual/eth0
 GENERAL.IP-IFACE:                       --
 GENERAL.IS-SOFTWARE:                    nie
@@ -12970,12 +13046,12 @@ DHCP6.OPTION[4]:                        dhcp-6-opt-8 = val-8
 CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings/Connection/{1,2,4}
 CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1
 CONNECTIONS.AVAILABLE-CONNECTIONS[2]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
-CONNECTIONS.AVAILABLE-CONNECTIONS[3]:    | /org/freedesktop/NetworkManager/Settings/Connection/4
+CONNECTIONS.AVAILABLE-CONNECTIONS[3]:    | /org/freedesktop/NetworkManager/Settings/Connection/4
 -------------------------------------------------------------------------------
 
 <<<
 size: 2837
-location: clients/tests/test-client.py:957:test_003()/270
+location: clients/tests/test-client.py:971:test_003()/270
 cmd: $NMCLI --pretty --color yes -f ALL con
 lang: C
 returncode: 0
@@ -12986,15 +13062,15 @@ stdout: 2685 bytes
 ======================================
 NAME      UUID                                  TYPE      TIMESTAMP  TIMESTAMP-REAL  AUTOCONNECT  AUTOCONNECT-PRIORITY  READONLY  DBUS-PATH                                              ACTIVE  DEVICE  STATE         ACTIVE-PATH                                         SLAVE  FILENAME                                        
 -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  --         --              --           --                    --        /org/freedesktop/NetworkManager/Settings/Connection/4  yes     eth1    activated     /org/freedesktop/NetworkManager/ActiveConnection/2  --     /etc/NetworkManager/system-connections/ethernet 
 ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  --         --              --           --                    --        /org/freedesktop/NetworkManager/Settings/Connection/4  yes     eth0    deactivating  /org/freedesktop/NetworkManager/ActiveConnection/1  --     /etc/NetworkManager/system-connections/ethernet 
+ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  --         --              --           --                    --        /org/freedesktop/NetworkManager/Settings/Connection/4  yes     eth1    activated     /org/freedesktop/NetworkManager/ActiveConnection/2  --     /etc/NetworkManager/system-connections/ethernet 
 con-1     5fcfd6d7-1e63-3332-8826-a7eda103792d  ethernet  0          never           yes          0                     no        /org/freedesktop/NetworkManager/Settings/Connection/1  no      --      --            --                                                  --     /etc/NetworkManager/system-connections/con-1    
 con-gsm1  UUID-con-gsm1-REPLACED-REPLACED-REPL  gsm       0          never           no           0                     no        /org/freedesktop/NetworkManager/Settings/Connection/3  no      --      --            --                                                  --     /etc/NetworkManager/system-connections/con-gsm1 
 con-xx1   UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet  0          never           yes          0                     no        /org/freedesktop/NetworkManager/Settings/Connection/2  no      --      --            --                                                  --     /etc/NetworkManager/system-connections/con-xx1  
 
 <<<
 size: 2881
-location: clients/tests/test-client.py:957:test_003()/271
+location: clients/tests/test-client.py:971:test_003()/271
 cmd: $NMCLI --pretty --color yes -f ALL con
 lang: pl_PL.UTF-8
 returncode: 0
@@ -13005,15 +13081,15 @@ stdout: 2719 bytes
 ==========================================
 NAME      UUID                                  TYPE      TIMESTAMP  TIMESTAMP-REAL  AUTOCONNECT  AUTOCONNECT-PRIORITY  READONLY  DBUS-PATH                                              ACTIVE  DEVICE  STATE           ACTIVE-PATH                                         SLAVE  FILENAME                                        
 -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  --         --              --           --                    --        /org/freedesktop/NetworkManager/Settings/Connection/4  tak     eth1    aktywowano      /org/freedesktop/NetworkManager/ActiveConnection/2  --     /etc/NetworkManager/system-connections/ethernet 
 ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  --         --              --           --                    --        /org/freedesktop/NetworkManager/Settings/Connection/4  tak     eth0    dezaktywowanie  /org/freedesktop/NetworkManager/ActiveConnection/1  --     /etc/NetworkManager/system-connections/ethernet 
+ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  --         --              --           --                    --        /org/freedesktop/NetworkManager/Settings/Connection/4  tak     eth1    aktywowano      /org/freedesktop/NetworkManager/ActiveConnection/2  --     /etc/NetworkManager/system-connections/ethernet 
 con-1     5fcfd6d7-1e63-3332-8826-a7eda103792d  ethernet  0          nigdy           tak          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/1  nie     --      --              --                                                  --     /etc/NetworkManager/system-connections/con-1    
 con-gsm1  UUID-con-gsm1-REPLACED-REPLACED-REPL  gsm       0          nigdy           nie          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/3  nie     --      --              --                                                  --     /etc/NetworkManager/system-connections/con-gsm1 
 con-xx1   UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet  0          nigdy           tak          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/2  nie     --      --              --                                                  --     /etc/NetworkManager/system-connections/con-xx1  
 
 <<<
 size: 551
-location: clients/tests/test-client.py:960:test_003()/272
+location: clients/tests/test-client.py:974:test_003()/272
 cmd: $NMCLI --pretty --color yes -f UUID,TYPE con
 lang: C
 returncode: 0
@@ -13030,7 +13106,7 @@ UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet
 
 <<<
 size: 581
-location: clients/tests/test-client.py:960:test_003()/273
+location: clients/tests/test-client.py:974:test_003()/273
 cmd: $NMCLI --pretty --color yes -f UUID,TYPE con
 lang: pl_PL.UTF-8
 returncode: 0
@@ -13047,7 +13123,7 @@ UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet
 
 <<<
 size: 201
-location: clients/tests/test-client.py:963:test_003()/274
+location: clients/tests/test-client.py:977:test_003()/274
 cmd: $NMCLI --pretty --color yes con s ethernet
 lang: C
 returncode: 10
@@ -13057,7 +13133,7 @@ Error: ethernet - no such connection profile.
 
 <<<
 size: 223
-location: clients/tests/test-client.py:963:test_003()/275
+location: clients/tests/test-client.py:977:test_003()/275
 cmd: $NMCLI --pretty --color yes con s ethernet
 lang: pl_PL.UTF-8
 returncode: 10
@@ -13067,7 +13143,7 @@ Błąd: ethernet — nie ma takiego profilu połączenia.
 
 <<<
 size: 1389
-location: clients/tests/test-client.py:966:test_003()/276
+location: clients/tests/test-client.py:980:test_003()/276
 cmd: $NMCLI --pretty --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: C
 returncode: 0
@@ -13095,7 +13171,7 @@ GENERAL.MASTER-PATH:                    --
 
 <<<
 size: 1416
-location: clients/tests/test-client.py:966:test_003()/277
+location: clients/tests/test-client.py:980:test_003()/277
 cmd: $NMCLI --pretty --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: pl_PL.UTF-8
 returncode: 0
@@ -13122,12 +13198,12 @@ GENERAL.MASTER-PATH:                    --
 -------------------------------------------------------------------------------
 
 <<<
-size: 4283
-location: clients/tests/test-client.py:969:test_003()/278
+size: 4387
+location: clients/tests/test-client.py:983:test_003()/278
 cmd: $NMCLI --pretty --color yes -f all dev show eth0
 lang: C
 returncode: 0
-stdout: 4121 bytes
+stdout: 4225 bytes
 >>>
 ===============================================================================
                              Device details (eth0)
@@ -13144,6 +13220,8 @@ GENERAL.HWADDR:                         C0:61:AE:26:4D:D7
 GENERAL.MTU:                            0
 GENERAL.STATE:                          20 (unavailable)
 GENERAL.REASON:                         0 (No reason given)
+GENERAL.IP4-CONNECTIVITY:               0 (unknown)
+GENERAL.IP6-CONNECTIVITY:               0 (unknown)
 GENERAL.UDI:                            /sys/devices/virtual/eth0
 GENERAL.IP-IFACE:                       --
 GENERAL.IS-SOFTWARE:                    no
@@ -13197,12 +13275,12 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[3]:    | /org/freedesktop/NetworkMa
 -------------------------------------------------------------------------------
 
 <<<
-size: 4322
-location: clients/tests/test-client.py:969:test_003()/279
+size: 4430
+location: clients/tests/test-client.py:983:test_003()/279
 cmd: $NMCLI --pretty --color yes -f all dev show eth0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 4150 bytes
+stdout: 4258 bytes
 >>>
 ===============================================================================
                         Informacje o urządzeniu (eth0)
@@ -13219,6 +13297,8 @@ GENERAL.HWADDR:                         C0:61:AE:26:4D:D7
 GENERAL.MTU:                            0
 GENERAL.STATE:                          20 (niedostępne)
 GENERAL.REASON:                         0 (Nie podano przyczyny)
+GENERAL.IP4-CONNECTIVITY:               0 (nieznane)
+GENERAL.IP6-CONNECTIVITY:               0 (nieznane)
 GENERAL.UDI:                            /sys/devices/virtual/eth0
 GENERAL.IP-IFACE:                       --
 GENERAL.IS-SOFTWARE:                    nie
@@ -13268,40 +13348,40 @@ DHCP6.OPTION[4]:                        dhcp-6-opt-8 = val-8
 CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings/Connection/{1,2,4}
 CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1
 CONNECTIONS.AVAILABLE-CONNECTIONS[2]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
-CONNECTIONS.AVAILABLE-CONNECTIONS[3]:    | /org/freedesktop/NetworkManager/Settings/Connection/4
+CONNECTIONS.AVAILABLE-CONNECTIONS[3]:    | /org/freedesktop/NetworkManager/Settings/Connection/4
 -------------------------------------------------------------------------------
 
 <<<
 size: 1161
-location: clients/tests/test-client.py:957:test_003()/280
+location: clients/tests/test-client.py:971:test_003()/280
 cmd: $NMCLI --terse -f ALL con
 lang: C
 returncode: 0
 stdout: 1022 bytes
 >>>
-ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:802-3-ethernet::::::/org/freedesktop/NetworkManager/Settings/Connection/4:yes:eth1:activated:/org/freedesktop/NetworkManager/ActiveConnection/2::/etc/NetworkManager/system-connections/ethernet
 ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:802-3-ethernet::::::/org/freedesktop/NetworkManager/Settings/Connection/4:yes:eth0:deactivating:/org/freedesktop/NetworkManager/ActiveConnection/1::/etc/NetworkManager/system-connections/ethernet
+ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:802-3-ethernet::::::/org/freedesktop/NetworkManager/Settings/Connection/4:yes:eth1:activated:/org/freedesktop/NetworkManager/ActiveConnection/2::/etc/NetworkManager/system-connections/ethernet
 con-1:5fcfd6d7-1e63-3332-8826-a7eda103792d:802-3-ethernet:0:never:yes:0:no:/org/freedesktop/NetworkManager/Settings/Connection/1:no:::::/etc/NetworkManager/system-connections/con-1
 con-gsm1:UUID-con-gsm1-REPLACED-REPLACED-REPL:gsm:0:never:no:0:no:/org/freedesktop/NetworkManager/Settings/Connection/3:no:::::/etc/NetworkManager/system-connections/con-gsm1
 con-xx1:UUID-con-xx1-REPLACED-REPLACED-REPLA:802-3-ethernet:0:never:yes:0:no:/org/freedesktop/NetworkManager/Settings/Connection/2:no:::::/etc/NetworkManager/system-connections/con-xx1
 
 <<<
 size: 1171
-location: clients/tests/test-client.py:957:test_003()/281
+location: clients/tests/test-client.py:971:test_003()/281
 cmd: $NMCLI --terse -f ALL con
 lang: pl_PL.UTF-8
 returncode: 0
 stdout: 1022 bytes
 >>>
-ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:802-3-ethernet::::::/org/freedesktop/NetworkManager/Settings/Connection/4:yes:eth1:activated:/org/freedesktop/NetworkManager/ActiveConnection/2::/etc/NetworkManager/system-connections/ethernet
 ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:802-3-ethernet::::::/org/freedesktop/NetworkManager/Settings/Connection/4:yes:eth0:deactivating:/org/freedesktop/NetworkManager/ActiveConnection/1::/etc/NetworkManager/system-connections/ethernet
+ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:802-3-ethernet::::::/org/freedesktop/NetworkManager/Settings/Connection/4:yes:eth1:activated:/org/freedesktop/NetworkManager/ActiveConnection/2::/etc/NetworkManager/system-connections/ethernet
 con-1:5fcfd6d7-1e63-3332-8826-a7eda103792d:802-3-ethernet:0:never:yes:0:no:/org/freedesktop/NetworkManager/Settings/Connection/1:no:::::/etc/NetworkManager/system-connections/con-1
 con-gsm1:UUID-con-gsm1-REPLACED-REPLACED-REPL:gsm:0:never:no:0:no:/org/freedesktop/NetworkManager/Settings/Connection/3:no:::::/etc/NetworkManager/system-connections/con-gsm1
 con-xx1:UUID-con-xx1-REPLACED-REPLACED-REPLA:802-3-ethernet:0:never:yes:0:no:/org/freedesktop/NetworkManager/Settings/Connection/2:no:::::/etc/NetworkManager/system-connections/con-xx1
 
 <<<
 size: 289
-location: clients/tests/test-client.py:960:test_003()/282
+location: clients/tests/test-client.py:974:test_003()/282
 cmd: $NMCLI --terse -f UUID,TYPE con
 lang: C
 returncode: 0
@@ -13313,7 +13393,7 @@ UUID-con-xx1-REPLACED-REPLACED-REPLA:802-3-ethernet
 
 <<<
 size: 299
-location: clients/tests/test-client.py:960:test_003()/283
+location: clients/tests/test-client.py:974:test_003()/283
 cmd: $NMCLI --terse -f UUID,TYPE con
 lang: pl_PL.UTF-8
 returncode: 0
@@ -13325,7 +13405,7 @@ UUID-con-xx1-REPLACED-REPLACED-REPLA:802-3-ethernet
 
 <<<
 size: 188
-location: clients/tests/test-client.py:963:test_003()/284
+location: clients/tests/test-client.py:977:test_003()/284
 cmd: $NMCLI --terse con s ethernet
 lang: C
 returncode: 10
@@ -13335,7 +13415,7 @@ Error: ethernet - no such connection profile.
 
 <<<
 size: 210
-location: clients/tests/test-client.py:963:test_003()/285
+location: clients/tests/test-client.py:977:test_003()/285
 cmd: $NMCLI --terse con s ethernet
 lang: pl_PL.UTF-8
 returncode: 10
@@ -13345,7 +13425,7 @@ Błąd: ethernet — nie ma takiego profilu połączenia.
 
 <<<
 size: 552
-location: clients/tests/test-client.py:966:test_003()/286
+location: clients/tests/test-client.py:980:test_003()/286
 cmd: $NMCLI --terse c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: C
 returncode: 0
@@ -13366,7 +13446,7 @@ GENERAL.MASTER-PATH:
 
 <<<
 size: 562
-location: clients/tests/test-client.py:966:test_003()/287
+location: clients/tests/test-client.py:980:test_003()/287
 cmd: $NMCLI --terse c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: pl_PL.UTF-8
 returncode: 0
@@ -13386,12 +13466,12 @@ GENERAL.ZONE:
 GENERAL.MASTER-PATH:
 
 <<<
-size: 2191
-location: clients/tests/test-client.py:969:test_003()/288
+size: 2265
+location: clients/tests/test-client.py:983:test_003()/288
 cmd: $NMCLI --terse -f all dev show eth0
 lang: C
 returncode: 0
-stdout: 2042 bytes
+stdout: 2116 bytes
 >>>
 GENERAL.DEVICE:eth0
 GENERAL.TYPE:ethernet
@@ -13405,6 +13485,8 @@ GENERAL.HWADDR:C0:61:AE:26:4D:D7
 GENERAL.MTU:0
 GENERAL.STATE:20 (unavailable)
 GENERAL.REASON:0 (No reason given)
+GENERAL.IP4-CONNECTIVITY:0 (unknown)
+GENERAL.IP6-CONNECTIVITY:0 (unknown)
 GENERAL.UDI:/sys/devices/virtual/eth0
 GENERAL.IP-IFACE:
 GENERAL.IS-SOFTWARE:no
@@ -13450,12 +13532,12 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[2]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-
 CONNECTIONS.AVAILABLE-CONNECTIONS[3]: | /org/freedesktop/NetworkManager/Settings/Connection/4
 
 <<<
-size: 2201
-location: clients/tests/test-client.py:969:test_003()/289
+size: 2275
+location: clients/tests/test-client.py:983:test_003()/289
 cmd: $NMCLI --terse -f all dev show eth0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2042 bytes
+stdout: 2116 bytes
 >>>
 GENERAL.DEVICE:eth0
 GENERAL.TYPE:ethernet
@@ -13469,6 +13551,8 @@ GENERAL.HWADDR:C0:61:AE:26:4D:D7
 GENERAL.MTU:0
 GENERAL.STATE:20 (unavailable)
 GENERAL.REASON:0 (No reason given)
+GENERAL.IP4-CONNECTIVITY:0 (unknown)
+GENERAL.IP6-CONNECTIVITY:0 (unknown)
 GENERAL.UDI:/sys/devices/virtual/eth0
 GENERAL.IP-IFACE:
 GENERAL.IS-SOFTWARE:no
@@ -13515,35 +13599,35 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[3]: | /org/freedesktop/NetworkManag
 
 <<<
 size: 1443
-location: clients/tests/test-client.py:957:test_003()/290
+location: clients/tests/test-client.py:971:test_003()/290
 cmd: $NMCLI --terse --color yes -f ALL con
 lang: C
 returncode: 0
 stdout: 1292 bytes
 >>>
-ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:802-3-ethernet::::::/org/freedesktop/NetworkManager/Settings/Connection/4:yes:eth1:activated:/org/freedesktop/NetworkManager/ActiveConnection/2::/etc/NetworkManager/system-connections/ethernet
 ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:802-3-ethernet::::::/org/freedesktop/NetworkManager/Settings/Connection/4:yes:eth0:deactivating:/org/freedesktop/NetworkManager/ActiveConnection/1::/etc/NetworkManager/system-connections/ethernet
+ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:802-3-ethernet::::::/org/freedesktop/NetworkManager/Settings/Connection/4:yes:eth1:activated:/org/freedesktop/NetworkManager/ActiveConnection/2::/etc/NetworkManager/system-connections/ethernet
 con-1:5fcfd6d7-1e63-3332-8826-a7eda103792d:802-3-ethernet:0:never:yes:0:no:/org/freedesktop/NetworkManager/Settings/Connection/1:no:::::/etc/NetworkManager/system-connections/con-1
 con-gsm1:UUID-con-gsm1-REPLACED-REPLACED-REPL:gsm:0:never:no:0:no:/org/freedesktop/NetworkManager/Settings/Connection/3:no:::::/etc/NetworkManager/system-connections/con-gsm1
 con-xx1:UUID-con-xx1-REPLACED-REPLACED-REPLA:802-3-ethernet:0:never:yes:0:no:/org/freedesktop/NetworkManager/Settings/Connection/2:no:::::/etc/NetworkManager/system-connections/con-xx1
 
 <<<
 size: 1453
-location: clients/tests/test-client.py:957:test_003()/291
+location: clients/tests/test-client.py:971:test_003()/291
 cmd: $NMCLI --terse --color yes -f ALL con
 lang: pl_PL.UTF-8
 returncode: 0
 stdout: 1292 bytes
 >>>
-ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:802-3-ethernet::::::/org/freedesktop/NetworkManager/Settings/Connection/4:yes:eth1:activated:/org/freedesktop/NetworkManager/ActiveConnection/2::/etc/NetworkManager/system-connections/ethernet
 ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:802-3-ethernet::::::/org/freedesktop/NetworkManager/Settings/Connection/4:yes:eth0:deactivating:/org/freedesktop/NetworkManager/ActiveConnection/1::/etc/NetworkManager/system-connections/ethernet
+ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:802-3-ethernet::::::/org/freedesktop/NetworkManager/Settings/Connection/4:yes:eth1:activated:/org/freedesktop/NetworkManager/ActiveConnection/2::/etc/NetworkManager/system-connections/ethernet
 con-1:5fcfd6d7-1e63-3332-8826-a7eda103792d:802-3-ethernet:0:never:yes:0:no:/org/freedesktop/NetworkManager/Settings/Connection/1:no:::::/etc/NetworkManager/system-connections/con-1
 con-gsm1:UUID-con-gsm1-REPLACED-REPLACED-REPL:gsm:0:never:no:0:no:/org/freedesktop/NetworkManager/Settings/Connection/3:no:::::/etc/NetworkManager/system-connections/con-gsm1
 con-xx1:UUID-con-xx1-REPLACED-REPLACED-REPLA:802-3-ethernet:0:never:yes:0:no:/org/freedesktop/NetworkManager/Settings/Connection/2:no:::::/etc/NetworkManager/system-connections/con-xx1
 
 <<<
 size: 301
-location: clients/tests/test-client.py:960:test_003()/292
+location: clients/tests/test-client.py:974:test_003()/292
 cmd: $NMCLI --terse --color yes -f UUID,TYPE con
 lang: C
 returncode: 0
@@ -13555,7 +13639,7 @@ UUID-con-xx1-REPLACED-REPLACED-REPLA:802-3-ethernet
 
 <<<
 size: 311
-location: clients/tests/test-client.py:960:test_003()/293
+location: clients/tests/test-client.py:974:test_003()/293
 cmd: $NMCLI --terse --color yes -f UUID,TYPE con
 lang: pl_PL.UTF-8
 returncode: 0
@@ -13567,7 +13651,7 @@ UUID-con-xx1-REPLACED-REPLACED-REPLA:802-3-ethernet
 
 <<<
 size: 200
-location: clients/tests/test-client.py:963:test_003()/294
+location: clients/tests/test-client.py:977:test_003()/294
 cmd: $NMCLI --terse --color yes con s ethernet
 lang: C
 returncode: 10
@@ -13577,7 +13661,7 @@ Error: ethernet - no such connection profile.
 
 <<<
 size: 222
-location: clients/tests/test-client.py:963:test_003()/295
+location: clients/tests/test-client.py:977:test_003()/295
 cmd: $NMCLI --terse --color yes con s ethernet
 lang: pl_PL.UTF-8
 returncode: 10
@@ -13587,7 +13671,7 @@ Błąd: ethernet — nie ma takiego profilu połączenia.
 
 <<<
 size: 564
-location: clients/tests/test-client.py:966:test_003()/296
+location: clients/tests/test-client.py:980:test_003()/296
 cmd: $NMCLI --terse --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: C
 returncode: 0
@@ -13608,7 +13692,7 @@ GENERAL.MASTER-PATH:
 
 <<<
 size: 574
-location: clients/tests/test-client.py:966:test_003()/297
+location: clients/tests/test-client.py:980:test_003()/297
 cmd: $NMCLI --terse --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: pl_PL.UTF-8
 returncode: 0
@@ -13628,12 +13712,12 @@ GENERAL.ZONE:
 GENERAL.MASTER-PATH:
 
 <<<
-size: 2203
-location: clients/tests/test-client.py:969:test_003()/298
+size: 2277
+location: clients/tests/test-client.py:983:test_003()/298
 cmd: $NMCLI --terse --color yes -f all dev show eth0
 lang: C
 returncode: 0
-stdout: 2042 bytes
+stdout: 2116 bytes
 >>>
 GENERAL.DEVICE:eth0
 GENERAL.TYPE:ethernet
@@ -13647,6 +13731,8 @@ GENERAL.HWADDR:C0:61:AE:26:4D:D7
 GENERAL.MTU:0
 GENERAL.STATE:20 (unavailable)
 GENERAL.REASON:0 (No reason given)
+GENERAL.IP4-CONNECTIVITY:0 (unknown)
+GENERAL.IP6-CONNECTIVITY:0 (unknown)
 GENERAL.UDI:/sys/devices/virtual/eth0
 GENERAL.IP-IFACE:
 GENERAL.IS-SOFTWARE:no
@@ -13692,12 +13778,12 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[2]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-
 CONNECTIONS.AVAILABLE-CONNECTIONS[3]: | /org/freedesktop/NetworkManager/Settings/Connection/4
 
 <<<
-size: 2213
-location: clients/tests/test-client.py:969:test_003()/299
+size: 2287
+location: clients/tests/test-client.py:983:test_003()/299
 cmd: $NMCLI --terse --color yes -f all dev show eth0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2042 bytes
+stdout: 2116 bytes
 >>>
 GENERAL.DEVICE:eth0
 GENERAL.TYPE:ethernet
@@ -13711,6 +13797,8 @@ GENERAL.HWADDR:C0:61:AE:26:4D:D7
 GENERAL.MTU:0
 GENERAL.STATE:20 (unavailable)
 GENERAL.REASON:0 (No reason given)
+GENERAL.IP4-CONNECTIVITY:0 (unknown)
+GENERAL.IP6-CONNECTIVITY:0 (unknown)
 GENERAL.UDI:/sys/devices/virtual/eth0
 GENERAL.IP-IFACE:
 GENERAL.IS-SOFTWARE:no
@@ -13757,37 +13845,37 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[3]: | /org/freedesktop/NetworkManag
 
 <<<
 size: 2084
-location: clients/tests/test-client.py:957:test_003()/300
+location: clients/tests/test-client.py:971:test_003()/300
 cmd: $NMCLI --mode tabular -f ALL con
 lang: C
 returncode: 0
 stdout: 1938 bytes
 >>>
 NAME      UUID                                  TYPE      TIMESTAMP  TIMESTAMP-REAL  AUTOCONNECT  AUTOCONNECT-PRIORITY  READONLY  DBUS-PATH                                              ACTIVE  DEVICE  STATE         ACTIVE-PATH                                         SLAVE  FILENAME                                        
-ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  --         --              --           --                    --        /org/freedesktop/NetworkManager/Settings/Connection/4  yes     eth1    activated     /org/freedesktop/NetworkManager/ActiveConnection/2  --     /etc/NetworkManager/system-connections/ethernet 
 ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  --         --              --           --                    --        /org/freedesktop/NetworkManager/Settings/Connection/4  yes     eth0    deactivating  /org/freedesktop/NetworkManager/ActiveConnection/1  --     /etc/NetworkManager/system-connections/ethernet 
+ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  --         --              --           --                    --        /org/freedesktop/NetworkManager/Settings/Connection/4  yes     eth1    activated     /org/freedesktop/NetworkManager/ActiveConnection/2  --     /etc/NetworkManager/system-connections/ethernet 
 con-1     5fcfd6d7-1e63-3332-8826-a7eda103792d  ethernet  0          never           yes          0                     no        /org/freedesktop/NetworkManager/Settings/Connection/1  no      --      --            --                                                  --     /etc/NetworkManager/system-connections/con-1    
 con-gsm1  UUID-con-gsm1-REPLACED-REPLACED-REPL  gsm       0          never           no           0                     no        /org/freedesktop/NetworkManager/Settings/Connection/3  no      --      --            --                                                  --     /etc/NetworkManager/system-connections/con-gsm1 
 con-xx1   UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet  0          never           yes          0                     no        /org/freedesktop/NetworkManager/Settings/Connection/2  no      --      --            --                                                  --     /etc/NetworkManager/system-connections/con-xx1  
 
 <<<
 size: 2106
-location: clients/tests/test-client.py:957:test_003()/301
+location: clients/tests/test-client.py:971:test_003()/301
 cmd: $NMCLI --mode tabular -f ALL con
 lang: pl_PL.UTF-8
 returncode: 0
 stdout: 1950 bytes
 >>>
 NAME      UUID                                  TYPE      TIMESTAMP  TIMESTAMP-REAL  AUTOCONNECT  AUTOCONNECT-PRIORITY  READONLY  DBUS-PATH                                              ACTIVE  DEVICE  STATE           ACTIVE-PATH                                         SLAVE  FILENAME                                        
-ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  --         --              --           --                    --        /org/freedesktop/NetworkManager/Settings/Connection/4  tak     eth1    aktywowano      /org/freedesktop/NetworkManager/ActiveConnection/2  --     /etc/NetworkManager/system-connections/ethernet 
 ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  --         --              --           --                    --        /org/freedesktop/NetworkManager/Settings/Connection/4  tak     eth0    dezaktywowanie  /org/freedesktop/NetworkManager/ActiveConnection/1  --     /etc/NetworkManager/system-connections/ethernet 
+ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  --         --              --           --                    --        /org/freedesktop/NetworkManager/Settings/Connection/4  tak     eth1    aktywowano      /org/freedesktop/NetworkManager/ActiveConnection/2  --     /etc/NetworkManager/system-connections/ethernet 
 con-1     5fcfd6d7-1e63-3332-8826-a7eda103792d  ethernet  0          nigdy           tak          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/1  nie     --      --              --                                                  --     /etc/NetworkManager/system-connections/con-1    
 con-gsm1  UUID-con-gsm1-REPLACED-REPLACED-REPL  gsm       0          nigdy           nie          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/3  nie     --      --              --                                                  --     /etc/NetworkManager/system-connections/con-gsm1 
 con-xx1   UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet  0          nigdy           tak          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/2  nie     --      --              --                                                  --     /etc/NetworkManager/system-connections/con-xx1  
 
 <<<
 size: 343
-location: clients/tests/test-client.py:960:test_003()/302
+location: clients/tests/test-client.py:974:test_003()/302
 cmd: $NMCLI --mode tabular -f UUID,TYPE con
 lang: C
 returncode: 0
@@ -13800,7 +13888,7 @@ UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet
 
 <<<
 size: 353
-location: clients/tests/test-client.py:960:test_003()/303
+location: clients/tests/test-client.py:974:test_003()/303
 cmd: $NMCLI --mode tabular -f UUID,TYPE con
 lang: pl_PL.UTF-8
 returncode: 0
@@ -13813,7 +13901,7 @@ UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet
 
 <<<
 size: 195
-location: clients/tests/test-client.py:963:test_003()/304
+location: clients/tests/test-client.py:977:test_003()/304
 cmd: $NMCLI --mode tabular con s ethernet
 lang: C
 returncode: 10
@@ -13823,7 +13911,7 @@ Error: ethernet - no such connection profile.
 
 <<<
 size: 217
-location: clients/tests/test-client.py:963:test_003()/305
+location: clients/tests/test-client.py:977:test_003()/305
 cmd: $NMCLI --mode tabular con s ethernet
 lang: pl_PL.UTF-8
 returncode: 10
@@ -13833,7 +13921,7 @@ Błąd: ethernet — nie ma takiego profilu połączenia.
 
 <<<
 size: 676
-location: clients/tests/test-client.py:966:test_003()/306
+location: clients/tests/test-client.py:980:test_003()/306
 cmd: $NMCLI --mode tabular c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: C
 returncode: 0
@@ -13845,7 +13933,7 @@ GENERAL  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  eth0     deactivating
 
 <<<
 size: 690
-location: clients/tests/test-client.py:966:test_003()/307
+location: clients/tests/test-client.py:980:test_003()/307
 cmd: $NMCLI --mode tabular c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: pl_PL.UTF-8
 returncode: 0
@@ -13856,15 +13944,15 @@ GENERAL  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  eth0     dezaktywowanie
 
 
 <<<
-size: 2939
-location: clients/tests/test-client.py:969:test_003()/308
+size: 3011
+location: clients/tests/test-client.py:983:test_003()/308
 cmd: $NMCLI --mode tabular -f all dev show eth0
 lang: C
 returncode: 0
-stdout: 2783 bytes
+stdout: 2855 bytes
 >>>
-NAME     DEVICE  TYPE      NM-TYPE           VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON               UDI                        IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED 
-GENERAL  eth0    ethernet  NMDeviceEthernet  --      --       virtual  --              --                C0:61:AE:26:4D:D7  0    20 (unavailable)  0 (No reason given)  /sys/devices/virtual/eth0  --        no           yes         yes          no                no                 --            ethernet    UUID-ethernet-REPLACED-REPLACED-REPL  /org/freedesktop/NetworkManager/ActiveConnection/1  unknown 
+NAME     DEVICE  TYPE      NM-TYPE           VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON               IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                        IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED 
+GENERAL  eth0    ethernet  NMDeviceEthernet  --      --       virtual  --              --                C0:61:AE:26:4D:D7  0    20 (unavailable)  0 (No reason given)  0 (unknown)       0 (unknown)       /sys/devices/virtual/eth0  --        no           yes         yes          no                no                 --            ethernet    UUID-ethernet-REPLACED-REPLACED-REPL  /org/freedesktop/NetworkManager/ActiveConnection/1  unknown 
 
 NAME          CARRIER-DETECT  SPEED     IS-SOFTWARE  SRIOV 
 CAPABILITIES  no              100 Mb/s  no           no    
@@ -13888,15 +13976,15 @@ NAME         AVAILABLE-CONNECTION-PATHS                                   AVAILA
 CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{1,2,4}  5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 | UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 |  | /org/freedesktop/NetworkManager/Settings/Connection/4 
 
 <<<
-size: 2970
-location: clients/tests/test-client.py:969:test_003()/309
+size: 3046
+location: clients/tests/test-client.py:983:test_003()/309
 cmd: $NMCLI --mode tabular -f all dev show eth0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2804 bytes
+stdout: 2880 bytes
 >>>
-NAME     DEVICE  TYPE      NM-TYPE           VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON                    UDI                        IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED  
-GENERAL  eth0    ethernet  NMDeviceEthernet  --      --       virtual  --              --                C0:61:AE:26:4D:D7  0    20 (niedostępne)  0 (Nie podano przyczyny)  /sys/devices/virtual/eth0  --        nie          tak         tak          nie               nie                --            ethernet    UUID-ethernet-REPLACED-REPLACED-REPL  /org/freedesktop/NetworkManager/ActiveConnection/1  nieznane 
+NAME     DEVICE  TYPE      NM-TYPE           VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON                    IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                        IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED  
+GENERAL  eth0    ethernet  NMDeviceEthernet  --      --       virtual  --              --                C0:61:AE:26:4D:D7  0    20 (niedostępne)  0 (Nie podano przyczyny)  0 (nieznane)      0 (nieznane)      /sys/devices/virtual/eth0  --        nie          tak         tak          nie               nie                --            ethernet    UUID-ethernet-REPLACED-REPLACED-REPL  /org/freedesktop/NetworkManager/ActiveConnection/1  nieznane 
 
 NAME          CARRIER-DETECT  SPEED     IS-SOFTWARE  SRIOV 
 CAPABILITIES  nie             100 Mb/s  nie          nie   
@@ -13916,42 +14004,42 @@ IP6    2001:a::29c0:62b9:2e01:30a/69 | 2001:a::6433:6420:34f9:3801/115 | 2001:a:
 GROUP  OPTION                                                                                    
 DHCP6  dhcp-6-opt-1 = val-1 | dhcp-6-opt-5 = val-5 | dhcp-6-opt-6 = val-6 | dhcp-6-opt-8 = val-8 
 
-NAME         AVAILABLE-CONNECTION-PATHS                                   AVAILABLE-CONNECTIONS                                                                                                                                               
-CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{1,2,4}  5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 | UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 |  | /org/freedesktop/NetworkManager/Settings/Connection/4 
+NAME         AVAILABLE-CONNECTION-PATHS                                   AVAILABLE-CONNECTIONS                                                                                                                                                 
+CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{1,2,4}  5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 | UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 |  | /org/freedesktop/NetworkManager/Settings/Connection/4 
 
 <<<
 size: 2366
-location: clients/tests/test-client.py:957:test_003()/310
+location: clients/tests/test-client.py:971:test_003()/310
 cmd: $NMCLI --mode tabular --color yes -f ALL con
 lang: C
 returncode: 0
 stdout: 2208 bytes
 >>>
 NAME      UUID                                  TYPE      TIMESTAMP  TIMESTAMP-REAL  AUTOCONNECT  AUTOCONNECT-PRIORITY  READONLY  DBUS-PATH                                              ACTIVE  DEVICE  STATE         ACTIVE-PATH                                         SLAVE  FILENAME                                        
-ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  --         --              --           --                    --        /org/freedesktop/NetworkManager/Settings/Connection/4  yes     eth1    activated     /org/freedesktop/NetworkManager/ActiveConnection/2  --     /etc/NetworkManager/system-connections/ethernet 
 ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  --         --              --           --                    --        /org/freedesktop/NetworkManager/Settings/Connection/4  yes     eth0    deactivating  /org/freedesktop/NetworkManager/ActiveConnection/1  --     /etc/NetworkManager/system-connections/ethernet 
+ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  --         --              --           --                    --        /org/freedesktop/NetworkManager/Settings/Connection/4  yes     eth1    activated     /org/freedesktop/NetworkManager/ActiveConnection/2  --     /etc/NetworkManager/system-connections/ethernet 
 con-1     5fcfd6d7-1e63-3332-8826-a7eda103792d  ethernet  0          never           yes          0                     no        /org/freedesktop/NetworkManager/Settings/Connection/1  no      --      --            --                                                  --     /etc/NetworkManager/system-connections/con-1    
 con-gsm1  UUID-con-gsm1-REPLACED-REPLACED-REPL  gsm       0          never           no           0                     no        /org/freedesktop/NetworkManager/Settings/Connection/3  no      --      --            --                                                  --     /etc/NetworkManager/system-connections/con-gsm1 
 con-xx1   UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet  0          never           yes          0                     no        /org/freedesktop/NetworkManager/Settings/Connection/2  no      --      --            --                                                  --     /etc/NetworkManager/system-connections/con-xx1  
 
 <<<
 size: 2388
-location: clients/tests/test-client.py:957:test_003()/311
+location: clients/tests/test-client.py:971:test_003()/311
 cmd: $NMCLI --mode tabular --color yes -f ALL con
 lang: pl_PL.UTF-8
 returncode: 0
 stdout: 2220 bytes
 >>>
 NAME      UUID                                  TYPE      TIMESTAMP  TIMESTAMP-REAL  AUTOCONNECT  AUTOCONNECT-PRIORITY  READONLY  DBUS-PATH                                              ACTIVE  DEVICE  STATE           ACTIVE-PATH                                         SLAVE  FILENAME                                        
-ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  --         --              --           --                    --        /org/freedesktop/NetworkManager/Settings/Connection/4  tak     eth1    aktywowano      /org/freedesktop/NetworkManager/ActiveConnection/2  --     /etc/NetworkManager/system-connections/ethernet 
 ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  --         --              --           --                    --        /org/freedesktop/NetworkManager/Settings/Connection/4  tak     eth0    dezaktywowanie  /org/freedesktop/NetworkManager/ActiveConnection/1  --     /etc/NetworkManager/system-connections/ethernet 
+ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  --         --              --           --                    --        /org/freedesktop/NetworkManager/Settings/Connection/4  tak     eth1    aktywowano      /org/freedesktop/NetworkManager/ActiveConnection/2  --     /etc/NetworkManager/system-connections/ethernet 
 con-1     5fcfd6d7-1e63-3332-8826-a7eda103792d  ethernet  0          nigdy           tak          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/1  nie     --      --              --                                                  --     /etc/NetworkManager/system-connections/con-1    
 con-gsm1  UUID-con-gsm1-REPLACED-REPLACED-REPL  gsm       0          nigdy           nie          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/3  nie     --      --              --                                                  --     /etc/NetworkManager/system-connections/con-gsm1 
 con-xx1   UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet  0          nigdy           tak          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/2  nie     --      --              --                                                  --     /etc/NetworkManager/system-connections/con-xx1  
 
 <<<
 size: 355
-location: clients/tests/test-client.py:960:test_003()/312
+location: clients/tests/test-client.py:974:test_003()/312
 cmd: $NMCLI --mode tabular --color yes -f UUID,TYPE con
 lang: C
 returncode: 0
@@ -13964,7 +14052,7 @@ UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet
 
 <<<
 size: 365
-location: clients/tests/test-client.py:960:test_003()/313
+location: clients/tests/test-client.py:974:test_003()/313
 cmd: $NMCLI --mode tabular --color yes -f UUID,TYPE con
 lang: pl_PL.UTF-8
 returncode: 0
@@ -13977,7 +14065,7 @@ UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet
 
 <<<
 size: 207
-location: clients/tests/test-client.py:963:test_003()/314
+location: clients/tests/test-client.py:977:test_003()/314
 cmd: $NMCLI --mode tabular --color yes con s ethernet
 lang: C
 returncode: 10
@@ -13987,7 +14075,7 @@ Error: ethernet - no such connection profile.
 
 <<<
 size: 229
-location: clients/tests/test-client.py:963:test_003()/315
+location: clients/tests/test-client.py:977:test_003()/315
 cmd: $NMCLI --mode tabular --color yes con s ethernet
 lang: pl_PL.UTF-8
 returncode: 10
@@ -13997,7 +14085,7 @@ Błąd: ethernet — nie ma takiego profilu połączenia.
 
 <<<
 size: 688
-location: clients/tests/test-client.py:966:test_003()/316
+location: clients/tests/test-client.py:980:test_003()/316
 cmd: $NMCLI --mode tabular --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: C
 returncode: 0
@@ -14009,7 +14097,7 @@ GENERAL  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  eth0     deactivating
 
 <<<
 size: 702
-location: clients/tests/test-client.py:966:test_003()/317
+location: clients/tests/test-client.py:980:test_003()/317
 cmd: $NMCLI --mode tabular --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: pl_PL.UTF-8
 returncode: 0
@@ -14020,15 +14108,15 @@ GENERAL  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  eth0     dezaktywowanie
 
 
 <<<
-size: 2951
-location: clients/tests/test-client.py:969:test_003()/318
+size: 3023
+location: clients/tests/test-client.py:983:test_003()/318
 cmd: $NMCLI --mode tabular --color yes -f all dev show eth0
 lang: C
 returncode: 0
-stdout: 2783 bytes
+stdout: 2855 bytes
 >>>
-NAME     DEVICE  TYPE      NM-TYPE           VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON               UDI                        IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED 
-GENERAL  eth0    ethernet  NMDeviceEthernet  --      --       virtual  --              --                C0:61:AE:26:4D:D7  0    20 (unavailable)  0 (No reason given)  /sys/devices/virtual/eth0  --        no           yes         yes          no                no                 --            ethernet    UUID-ethernet-REPLACED-REPLACED-REPL  /org/freedesktop/NetworkManager/ActiveConnection/1  unknown 
+NAME     DEVICE  TYPE      NM-TYPE           VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON               IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                        IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED 
+GENERAL  eth0    ethernet  NMDeviceEthernet  --      --       virtual  --              --                C0:61:AE:26:4D:D7  0    20 (unavailable)  0 (No reason given)  0 (unknown)       0 (unknown)       /sys/devices/virtual/eth0  --        no           yes         yes          no                no                 --            ethernet    UUID-ethernet-REPLACED-REPLACED-REPL  /org/freedesktop/NetworkManager/ActiveConnection/1  unknown 
 
 NAME          CARRIER-DETECT  SPEED     IS-SOFTWARE  SRIOV 
 CAPABILITIES  no              100 Mb/s  no           no    
@@ -14052,15 +14140,15 @@ NAME         AVAILABLE-CONNECTION-PATHS                                   AVAILA
 CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{1,2,4}  5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 | UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 |  | /org/freedesktop/NetworkManager/Settings/Connection/4 
 
 <<<
-size: 2982
-location: clients/tests/test-client.py:969:test_003()/319
+size: 3058
+location: clients/tests/test-client.py:983:test_003()/319
 cmd: $NMCLI --mode tabular --color yes -f all dev show eth0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2804 bytes
+stdout: 2880 bytes
 >>>
-NAME     DEVICE  TYPE      NM-TYPE           VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON                    UDI                        IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED  
-GENERAL  eth0    ethernet  NMDeviceEthernet  --      --       virtual  --              --                C0:61:AE:26:4D:D7  0    20 (niedostępne)  0 (Nie podano przyczyny)  /sys/devices/virtual/eth0  --        nie          tak         tak          nie               nie                --            ethernet    UUID-ethernet-REPLACED-REPLACED-REPL  /org/freedesktop/NetworkManager/ActiveConnection/1  nieznane 
+NAME     DEVICE  TYPE      NM-TYPE           VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON                    IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                        IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED  
+GENERAL  eth0    ethernet  NMDeviceEthernet  --      --       virtual  --              --                C0:61:AE:26:4D:D7  0    20 (niedostępne)  0 (Nie podano przyczyny)  0 (nieznane)      0 (nieznane)      /sys/devices/virtual/eth0  --        nie          tak         tak          nie               nie                --            ethernet    UUID-ethernet-REPLACED-REPLACED-REPL  /org/freedesktop/NetworkManager/ActiveConnection/1  nieznane 
 
 NAME          CARRIER-DETECT  SPEED     IS-SOFTWARE  SRIOV 
 CAPABILITIES  nie             100 Mb/s  nie          nie   
@@ -14080,12 +14168,12 @@ IP6    2001:a::29c0:62b9:2e01:30a/69 | 2001:a::6433:6420:34f9:3801/115 | 2001:a:
 GROUP  OPTION                                                                                    
 DHCP6  dhcp-6-opt-1 = val-1 | dhcp-6-opt-5 = val-5 | dhcp-6-opt-6 = val-6 | dhcp-6-opt-8 = val-8 
 
-NAME         AVAILABLE-CONNECTION-PATHS                                   AVAILABLE-CONNECTIONS                                                                                                                                               
-CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{1,2,4}  5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 | UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 |  | /org/freedesktop/NetworkManager/Settings/Connection/4 
+NAME         AVAILABLE-CONNECTION-PATHS                                   AVAILABLE-CONNECTIONS                                                                                                                                                 
+CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{1,2,4}  5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 | UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 |  | /org/freedesktop/NetworkManager/Settings/Connection/4 
 
 <<<
 size: 2570
-location: clients/tests/test-client.py:957:test_003()/320
+location: clients/tests/test-client.py:971:test_003()/320
 cmd: $NMCLI --mode tabular --pretty -f ALL con
 lang: C
 returncode: 0
@@ -14096,15 +14184,15 @@ stdout: 2415 bytes
 ======================================
 NAME      UUID                                  TYPE      TIMESTAMP  TIMESTAMP-REAL  AUTOCONNECT  AUTOCONNECT-PRIORITY  READONLY  DBUS-PATH                                              ACTIVE  DEVICE  STATE         ACTIVE-PATH                                         SLAVE  FILENAME                                        
 -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  --         --              --           --                    --        /org/freedesktop/NetworkManager/Settings/Connection/4  yes     eth1    activated     /org/freedesktop/NetworkManager/ActiveConnection/2  --     /etc/NetworkManager/system-connections/ethernet 
 ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  --         --              --           --                    --        /org/freedesktop/NetworkManager/Settings/Connection/4  yes     eth0    deactivating  /org/freedesktop/NetworkManager/ActiveConnection/1  --     /etc/NetworkManager/system-connections/ethernet 
+ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  --         --              --           --                    --        /org/freedesktop/NetworkManager/Settings/Connection/4  yes     eth1    activated     /org/freedesktop/NetworkManager/ActiveConnection/2  --     /etc/NetworkManager/system-connections/ethernet 
 con-1     5fcfd6d7-1e63-3332-8826-a7eda103792d  ethernet  0          never           yes          0                     no        /org/freedesktop/NetworkManager/Settings/Connection/1  no      --      --            --                                                  --     /etc/NetworkManager/system-connections/con-1    
 con-gsm1  UUID-con-gsm1-REPLACED-REPLACED-REPL  gsm       0          never           no           0                     no        /org/freedesktop/NetworkManager/Settings/Connection/3  no      --      --            --                                                  --     /etc/NetworkManager/system-connections/con-gsm1 
 con-xx1   UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet  0          never           yes          0                     no        /org/freedesktop/NetworkManager/Settings/Connection/2  no      --      --            --                                                  --     /etc/NetworkManager/system-connections/con-xx1  
 
 <<<
 size: 2614
-location: clients/tests/test-client.py:957:test_003()/321
+location: clients/tests/test-client.py:971:test_003()/321
 cmd: $NMCLI --mode tabular --pretty -f ALL con
 lang: pl_PL.UTF-8
 returncode: 0
@@ -14115,15 +14203,15 @@ stdout: 2449 bytes
 ==========================================
 NAME      UUID                                  TYPE      TIMESTAMP  TIMESTAMP-REAL  AUTOCONNECT  AUTOCONNECT-PRIORITY  READONLY  DBUS-PATH                                              ACTIVE  DEVICE  STATE           ACTIVE-PATH                                         SLAVE  FILENAME                                        
 -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  --         --              --           --                    --        /org/freedesktop/NetworkManager/Settings/Connection/4  tak     eth1    aktywowano      /org/freedesktop/NetworkManager/ActiveConnection/2  --     /etc/NetworkManager/system-connections/ethernet 
 ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  --         --              --           --                    --        /org/freedesktop/NetworkManager/Settings/Connection/4  tak     eth0    dezaktywowanie  /org/freedesktop/NetworkManager/ActiveConnection/1  --     /etc/NetworkManager/system-connections/ethernet 
+ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  --         --              --           --                    --        /org/freedesktop/NetworkManager/Settings/Connection/4  tak     eth1    aktywowano      /org/freedesktop/NetworkManager/ActiveConnection/2  --     /etc/NetworkManager/system-connections/ethernet 
 con-1     5fcfd6d7-1e63-3332-8826-a7eda103792d  ethernet  0          nigdy           tak          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/1  nie     --      --              --                                                  --     /etc/NetworkManager/system-connections/con-1    
 con-gsm1  UUID-con-gsm1-REPLACED-REPLACED-REPL  gsm       0          nigdy           nie          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/3  nie     --      --              --                                                  --     /etc/NetworkManager/system-connections/con-gsm1 
 con-xx1   UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet  0          nigdy           tak          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/2  nie     --      --              --                                                  --     /etc/NetworkManager/system-connections/con-xx1  
 
 <<<
 size: 554
-location: clients/tests/test-client.py:960:test_003()/322
+location: clients/tests/test-client.py:974:test_003()/322
 cmd: $NMCLI --mode tabular --pretty -f UUID,TYPE con
 lang: C
 returncode: 0
@@ -14140,7 +14228,7 @@ UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet
 
 <<<
 size: 584
-location: clients/tests/test-client.py:960:test_003()/323
+location: clients/tests/test-client.py:974:test_003()/323
 cmd: $NMCLI --mode tabular --pretty -f UUID,TYPE con
 lang: pl_PL.UTF-8
 returncode: 0
@@ -14157,7 +14245,7 @@ UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet
 
 <<<
 size: 204
-location: clients/tests/test-client.py:963:test_003()/324
+location: clients/tests/test-client.py:977:test_003()/324
 cmd: $NMCLI --mode tabular --pretty con s ethernet
 lang: C
 returncode: 10
@@ -14167,7 +14255,7 @@ Error: ethernet - no such connection profile.
 
 <<<
 size: 226
-location: clients/tests/test-client.py:963:test_003()/325
+location: clients/tests/test-client.py:977:test_003()/325
 cmd: $NMCLI --mode tabular --pretty con s ethernet
 lang: pl_PL.UTF-8
 returncode: 10
@@ -14177,7 +14265,7 @@ Błąd: ethernet — nie ma takiego profilu połączenia.
 
 <<<
 size: 1232
-location: clients/tests/test-client.py:966:test_003()/326
+location: clients/tests/test-client.py:980:test_003()/326
 cmd: $NMCLI --mode tabular --pretty c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: C
 returncode: 0
@@ -14196,7 +14284,7 @@ GENERAL  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  eth0     deactivating
 
 <<<
 size: 1277
-location: clients/tests/test-client.py:966:test_003()/327
+location: clients/tests/test-client.py:980:test_003()/327
 cmd: $NMCLI --mode tabular --pretty c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: pl_PL.UTF-8
 returncode: 0
@@ -14214,19 +14302,19 @@ GENERAL  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  eth0     dezaktywowanie
 
 
 <<<
-size: 4420
-location: clients/tests/test-client.py:969:test_003()/328
+size: 4528
+location: clients/tests/test-client.py:983:test_003()/328
 cmd: $NMCLI --mode tabular --pretty -f all dev show eth0
 lang: C
 returncode: 0
-stdout: 4255 bytes
+stdout: 4363 bytes
 >>>
 =========================
   Device details (eth0)
 =========================
-NAME     DEVICE  TYPE      NM-TYPE           VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON               UDI                        IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED 
----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-GENERAL  eth0    ethernet  NMDeviceEthernet  --      --       virtual  --              --                C0:61:AE:26:4D:D7  0    20 (unavailable)  0 (No reason given)  /sys/devices/virtual/eth0  --        no           yes         yes          no                no                 --            ethernet    UUID-ethernet-REPLACED-REPLACED-REPL  /org/freedesktop/NetworkManager/ActiveConnection/1  unknown 
+NAME     DEVICE  TYPE      NM-TYPE           VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON               IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                        IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED 
+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+GENERAL  eth0    ethernet  NMDeviceEthernet  --      --       virtual  --              --                C0:61:AE:26:4D:D7  0    20 (unavailable)  0 (No reason given)  0 (unknown)       0 (unknown)       /sys/devices/virtual/eth0  --        no           yes         yes          no                no                 --            ethernet    UUID-ethernet-REPLACED-REPLACED-REPL  /org/freedesktop/NetworkManager/ActiveConnection/1  unknown 
 
 NAME          CARRIER-DETECT  SPEED     IS-SOFTWARE  SRIOV 
 ------------------------------------------------------------
@@ -14257,19 +14345,19 @@ NAME         AVAILABLE-CONNECTION-PATHS                                   AVAILA
 CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{1,2,4}  5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 | UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 |  | /org/freedesktop/NetworkManager/Settings/Connection/4 
 
 <<<
-size: 4488
-location: clients/tests/test-client.py:969:test_003()/329
+size: 4602
+location: clients/tests/test-client.py:983:test_003()/329
 cmd: $NMCLI --mode tabular --pretty -f all dev show eth0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 4313 bytes
+stdout: 4427 bytes
 >>>
 ==================================
   Informacje o urządzeniu (eth0)
 ==================================
-NAME     DEVICE  TYPE      NM-TYPE           VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON                    UDI                        IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED  
----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-GENERAL  eth0    ethernet  NMDeviceEthernet  --      --       virtual  --              --                C0:61:AE:26:4D:D7  0    20 (niedostępne)  0 (Nie podano przyczyny)  /sys/devices/virtual/eth0  --        nie          tak         tak          nie               nie                --            ethernet    UUID-ethernet-REPLACED-REPLACED-REPL  /org/freedesktop/NetworkManager/ActiveConnection/1  nieznane 
+NAME     DEVICE  TYPE      NM-TYPE           VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON                    IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                        IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED  
+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+GENERAL  eth0    ethernet  NMDeviceEthernet  --      --       virtual  --              --                C0:61:AE:26:4D:D7  0    20 (niedostępne)  0 (Nie podano przyczyny)  0 (nieznane)      0 (nieznane)      /sys/devices/virtual/eth0  --        nie          tak         tak          nie               nie                --            ethernet    UUID-ethernet-REPLACED-REPLACED-REPL  /org/freedesktop/NetworkManager/ActiveConnection/1  nieznane 
 
 NAME          CARRIER-DETECT  SPEED     IS-SOFTWARE  SRIOV 
 ------------------------------------------------------------
@@ -14295,13 +14383,13 @@ GROUP  OPTION
 --------------------------------------------------------------------------------------------------
 DHCP6  dhcp-6-opt-1 = val-1 | dhcp-6-opt-5 = val-5 | dhcp-6-opt-6 = val-6 | dhcp-6-opt-8 = val-8 
 
-NAME         AVAILABLE-CONNECTION-PATHS                                   AVAILABLE-CONNECTIONS                                                                                                                                               
------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{1,2,4}  5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 | UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 |  | /org/freedesktop/NetworkManager/Settings/Connection/4 
+NAME         AVAILABLE-CONNECTION-PATHS                                   AVAILABLE-CONNECTIONS                                                                                                                                                 
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{1,2,4}  5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 | UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 |  | /org/freedesktop/NetworkManager/Settings/Connection/4 
 
 <<<
 size: 2852
-location: clients/tests/test-client.py:957:test_003()/330
+location: clients/tests/test-client.py:971:test_003()/330
 cmd: $NMCLI --mode tabular --pretty --color yes -f ALL con
 lang: C
 returncode: 0
@@ -14312,15 +14400,15 @@ stdout: 2685 bytes
 ======================================
 NAME      UUID                                  TYPE      TIMESTAMP  TIMESTAMP-REAL  AUTOCONNECT  AUTOCONNECT-PRIORITY  READONLY  DBUS-PATH                                              ACTIVE  DEVICE  STATE         ACTIVE-PATH                                         SLAVE  FILENAME                                        
 -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  --         --              --           --                    --        /org/freedesktop/NetworkManager/Settings/Connection/4  yes     eth1    activated     /org/freedesktop/NetworkManager/ActiveConnection/2  --     /etc/NetworkManager/system-connections/ethernet 
 ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  --         --              --           --                    --        /org/freedesktop/NetworkManager/Settings/Connection/4  yes     eth0    deactivating  /org/freedesktop/NetworkManager/ActiveConnection/1  --     /etc/NetworkManager/system-connections/ethernet 
+ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  --         --              --           --                    --        /org/freedesktop/NetworkManager/Settings/Connection/4  yes     eth1    activated     /org/freedesktop/NetworkManager/ActiveConnection/2  --     /etc/NetworkManager/system-connections/ethernet 
 con-1     5fcfd6d7-1e63-3332-8826-a7eda103792d  ethernet  0          never           yes          0                     no        /org/freedesktop/NetworkManager/Settings/Connection/1  no      --      --            --                                                  --     /etc/NetworkManager/system-connections/con-1    
 con-gsm1  UUID-con-gsm1-REPLACED-REPLACED-REPL  gsm       0          never           no           0                     no        /org/freedesktop/NetworkManager/Settings/Connection/3  no      --      --            --                                                  --     /etc/NetworkManager/system-connections/con-gsm1 
 con-xx1   UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet  0          never           yes          0                     no        /org/freedesktop/NetworkManager/Settings/Connection/2  no      --      --            --                                                  --     /etc/NetworkManager/system-connections/con-xx1  
 
 <<<
 size: 2896
-location: clients/tests/test-client.py:957:test_003()/331
+location: clients/tests/test-client.py:971:test_003()/331
 cmd: $NMCLI --mode tabular --pretty --color yes -f ALL con
 lang: pl_PL.UTF-8
 returncode: 0
@@ -14331,15 +14419,15 @@ stdout: 2719 bytes
 ==========================================
 NAME      UUID                                  TYPE      TIMESTAMP  TIMESTAMP-REAL  AUTOCONNECT  AUTOCONNECT-PRIORITY  READONLY  DBUS-PATH                                              ACTIVE  DEVICE  STATE           ACTIVE-PATH                                         SLAVE  FILENAME                                        
 -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  --         --              --           --                    --        /org/freedesktop/NetworkManager/Settings/Connection/4  tak     eth1    aktywowano      /org/freedesktop/NetworkManager/ActiveConnection/2  --     /etc/NetworkManager/system-connections/ethernet 
 ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  --         --              --           --                    --        /org/freedesktop/NetworkManager/Settings/Connection/4  tak     eth0    dezaktywowanie  /org/freedesktop/NetworkManager/ActiveConnection/1  --     /etc/NetworkManager/system-connections/ethernet 
+ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  --         --              --           --                    --        /org/freedesktop/NetworkManager/Settings/Connection/4  tak     eth1    aktywowano      /org/freedesktop/NetworkManager/ActiveConnection/2  --     /etc/NetworkManager/system-connections/ethernet 
 con-1     5fcfd6d7-1e63-3332-8826-a7eda103792d  ethernet  0          nigdy           tak          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/1  nie     --      --              --                                                  --     /etc/NetworkManager/system-connections/con-1    
 con-gsm1  UUID-con-gsm1-REPLACED-REPLACED-REPL  gsm       0          nigdy           nie          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/3  nie     --      --              --                                                  --     /etc/NetworkManager/system-connections/con-gsm1 
 con-xx1   UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet  0          nigdy           tak          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/2  nie     --      --              --                                                  --     /etc/NetworkManager/system-connections/con-xx1  
 
 <<<
 size: 566
-location: clients/tests/test-client.py:960:test_003()/332
+location: clients/tests/test-client.py:974:test_003()/332
 cmd: $NMCLI --mode tabular --pretty --color yes -f UUID,TYPE con
 lang: C
 returncode: 0
@@ -14356,7 +14444,7 @@ UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet
 
 <<<
 size: 596
-location: clients/tests/test-client.py:960:test_003()/333
+location: clients/tests/test-client.py:974:test_003()/333
 cmd: $NMCLI --mode tabular --pretty --color yes -f UUID,TYPE con
 lang: pl_PL.UTF-8
 returncode: 0
@@ -14373,7 +14461,7 @@ UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet
 
 <<<
 size: 216
-location: clients/tests/test-client.py:963:test_003()/334
+location: clients/tests/test-client.py:977:test_003()/334
 cmd: $NMCLI --mode tabular --pretty --color yes con s ethernet
 lang: C
 returncode: 10
@@ -14383,7 +14471,7 @@ Error: ethernet - no such connection profile.
 
 <<<
 size: 238
-location: clients/tests/test-client.py:963:test_003()/335
+location: clients/tests/test-client.py:977:test_003()/335
 cmd: $NMCLI --mode tabular --pretty --color yes con s ethernet
 lang: pl_PL.UTF-8
 returncode: 10
@@ -14393,7 +14481,7 @@ Błąd: ethernet — nie ma takiego profilu połączenia.
 
 <<<
 size: 1244
-location: clients/tests/test-client.py:966:test_003()/336
+location: clients/tests/test-client.py:980:test_003()/336
 cmd: $NMCLI --mode tabular --pretty --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: C
 returncode: 0
@@ -14412,7 +14500,7 @@ GENERAL  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  eth0     deactivating
 
 <<<
 size: 1289
-location: clients/tests/test-client.py:966:test_003()/337
+location: clients/tests/test-client.py:980:test_003()/337
 cmd: $NMCLI --mode tabular --pretty --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: pl_PL.UTF-8
 returncode: 0
@@ -14430,19 +14518,19 @@ GENERAL  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  eth0     dezaktywowanie
 
 
 <<<
-size: 4432
-location: clients/tests/test-client.py:969:test_003()/338
+size: 4540
+location: clients/tests/test-client.py:983:test_003()/338
 cmd: $NMCLI --mode tabular --pretty --color yes -f all dev show eth0
 lang: C
 returncode: 0
-stdout: 4255 bytes
+stdout: 4363 bytes
 >>>
 =========================
   Device details (eth0)
 =========================
-NAME     DEVICE  TYPE      NM-TYPE           VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON               UDI                        IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED 
----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-GENERAL  eth0    ethernet  NMDeviceEthernet  --      --       virtual  --              --                C0:61:AE:26:4D:D7  0    20 (unavailable)  0 (No reason given)  /sys/devices/virtual/eth0  --        no           yes         yes          no                no                 --            ethernet    UUID-ethernet-REPLACED-REPLACED-REPL  /org/freedesktop/NetworkManager/ActiveConnection/1  unknown 
+NAME     DEVICE  TYPE      NM-TYPE           VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON               IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                        IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED 
+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+GENERAL  eth0    ethernet  NMDeviceEthernet  --      --       virtual  --              --                C0:61:AE:26:4D:D7  0    20 (unavailable)  0 (No reason given)  0 (unknown)       0 (unknown)       /sys/devices/virtual/eth0  --        no           yes         yes          no                no                 --            ethernet    UUID-ethernet-REPLACED-REPLACED-REPL  /org/freedesktop/NetworkManager/ActiveConnection/1  unknown 
 
 NAME          CARRIER-DETECT  SPEED     IS-SOFTWARE  SRIOV 
 ------------------------------------------------------------
@@ -14473,19 +14561,19 @@ NAME         AVAILABLE-CONNECTION-PATHS                                   AVAILA
 CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{1,2,4}  5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 | UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 |  | /org/freedesktop/NetworkManager/Settings/Connection/4 
 
 <<<
-size: 4500
-location: clients/tests/test-client.py:969:test_003()/339
+size: 4614
+location: clients/tests/test-client.py:983:test_003()/339
 cmd: $NMCLI --mode tabular --pretty --color yes -f all dev show eth0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 4313 bytes
+stdout: 4427 bytes
 >>>
 ==================================
   Informacje o urządzeniu (eth0)
 ==================================
-NAME     DEVICE  TYPE      NM-TYPE           VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON                    UDI                        IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED  
----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-GENERAL  eth0    ethernet  NMDeviceEthernet  --      --       virtual  --              --                C0:61:AE:26:4D:D7  0    20 (niedostępne)  0 (Nie podano przyczyny)  /sys/devices/virtual/eth0  --        nie          tak         tak          nie               nie                --            ethernet    UUID-ethernet-REPLACED-REPLACED-REPL  /org/freedesktop/NetworkManager/ActiveConnection/1  nieznane 
+NAME     DEVICE  TYPE      NM-TYPE           VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON                    IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                        IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED  
+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+GENERAL  eth0    ethernet  NMDeviceEthernet  --      --       virtual  --              --                C0:61:AE:26:4D:D7  0    20 (niedostępne)  0 (Nie podano przyczyny)  0 (nieznane)      0 (nieznane)      /sys/devices/virtual/eth0  --        nie          tak         tak          nie               nie                --            ethernet    UUID-ethernet-REPLACED-REPLACED-REPL  /org/freedesktop/NetworkManager/ActiveConnection/1  nieznane 
 
 NAME          CARRIER-DETECT  SPEED     IS-SOFTWARE  SRIOV 
 ------------------------------------------------------------
@@ -14511,41 +14599,41 @@ GROUP  OPTION
 --------------------------------------------------------------------------------------------------
 DHCP6  dhcp-6-opt-1 = val-1 | dhcp-6-opt-5 = val-5 | dhcp-6-opt-6 = val-6 | dhcp-6-opt-8 = val-8 
 
-NAME         AVAILABLE-CONNECTION-PATHS                                   AVAILABLE-CONNECTIONS                                                                                                                                               
------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{1,2,4}  5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 | UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 |  | /org/freedesktop/NetworkManager/Settings/Connection/4 
+NAME         AVAILABLE-CONNECTION-PATHS                                   AVAILABLE-CONNECTIONS                                                                                                                                                 
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{1,2,4}  5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 | UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 |  | /org/freedesktop/NetworkManager/Settings/Connection/4 
 
 <<<
 size: 1176
-location: clients/tests/test-client.py:957:test_003()/340
+location: clients/tests/test-client.py:971:test_003()/340
 cmd: $NMCLI --mode tabular --terse -f ALL con
 lang: C
 returncode: 0
 stdout: 1022 bytes
 >>>
-ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:802-3-ethernet::::::/org/freedesktop/NetworkManager/Settings/Connection/4:yes:eth1:activated:/org/freedesktop/NetworkManager/ActiveConnection/2::/etc/NetworkManager/system-connections/ethernet
 ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:802-3-ethernet::::::/org/freedesktop/NetworkManager/Settings/Connection/4:yes:eth0:deactivating:/org/freedesktop/NetworkManager/ActiveConnection/1::/etc/NetworkManager/system-connections/ethernet
+ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:802-3-ethernet::::::/org/freedesktop/NetworkManager/Settings/Connection/4:yes:eth1:activated:/org/freedesktop/NetworkManager/ActiveConnection/2::/etc/NetworkManager/system-connections/ethernet
 con-1:5fcfd6d7-1e63-3332-8826-a7eda103792d:802-3-ethernet:0:never:yes:0:no:/org/freedesktop/NetworkManager/Settings/Connection/1:no:::::/etc/NetworkManager/system-connections/con-1
 con-gsm1:UUID-con-gsm1-REPLACED-REPLACED-REPL:gsm:0:never:no:0:no:/org/freedesktop/NetworkManager/Settings/Connection/3:no:::::/etc/NetworkManager/system-connections/con-gsm1
 con-xx1:UUID-con-xx1-REPLACED-REPLACED-REPLA:802-3-ethernet:0:never:yes:0:no:/org/freedesktop/NetworkManager/Settings/Connection/2:no:::::/etc/NetworkManager/system-connections/con-xx1
 
 <<<
 size: 1186
-location: clients/tests/test-client.py:957:test_003()/341
+location: clients/tests/test-client.py:971:test_003()/341
 cmd: $NMCLI --mode tabular --terse -f ALL con
 lang: pl_PL.UTF-8
 returncode: 0
 stdout: 1022 bytes
 >>>
-ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:802-3-ethernet::::::/org/freedesktop/NetworkManager/Settings/Connection/4:yes:eth1:activated:/org/freedesktop/NetworkManager/ActiveConnection/2::/etc/NetworkManager/system-connections/ethernet
 ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:802-3-ethernet::::::/org/freedesktop/NetworkManager/Settings/Connection/4:yes:eth0:deactivating:/org/freedesktop/NetworkManager/ActiveConnection/1::/etc/NetworkManager/system-connections/ethernet
+ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:802-3-ethernet::::::/org/freedesktop/NetworkManager/Settings/Connection/4:yes:eth1:activated:/org/freedesktop/NetworkManager/ActiveConnection/2::/etc/NetworkManager/system-connections/ethernet
 con-1:5fcfd6d7-1e63-3332-8826-a7eda103792d:802-3-ethernet:0:never:yes:0:no:/org/freedesktop/NetworkManager/Settings/Connection/1:no:::::/etc/NetworkManager/system-connections/con-1
 con-gsm1:UUID-con-gsm1-REPLACED-REPLACED-REPL:gsm:0:never:no:0:no:/org/freedesktop/NetworkManager/Settings/Connection/3:no:::::/etc/NetworkManager/system-connections/con-gsm1
 con-xx1:UUID-con-xx1-REPLACED-REPLACED-REPLA:802-3-ethernet:0:never:yes:0:no:/org/freedesktop/NetworkManager/Settings/Connection/2:no:::::/etc/NetworkManager/system-connections/con-xx1
 
 <<<
 size: 304
-location: clients/tests/test-client.py:960:test_003()/342
+location: clients/tests/test-client.py:974:test_003()/342
 cmd: $NMCLI --mode tabular --terse -f UUID,TYPE con
 lang: C
 returncode: 0
@@ -14557,7 +14645,7 @@ UUID-con-xx1-REPLACED-REPLACED-REPLA:802-3-ethernet
 
 <<<
 size: 314
-location: clients/tests/test-client.py:960:test_003()/343
+location: clients/tests/test-client.py:974:test_003()/343
 cmd: $NMCLI --mode tabular --terse -f UUID,TYPE con
 lang: pl_PL.UTF-8
 returncode: 0
@@ -14569,7 +14657,7 @@ UUID-con-xx1-REPLACED-REPLACED-REPLA:802-3-ethernet
 
 <<<
 size: 203
-location: clients/tests/test-client.py:963:test_003()/344
+location: clients/tests/test-client.py:977:test_003()/344
 cmd: $NMCLI --mode tabular --terse con s ethernet
 lang: C
 returncode: 10
@@ -14579,7 +14667,7 @@ Error: ethernet - no such connection profile.
 
 <<<
 size: 225
-location: clients/tests/test-client.py:963:test_003()/345
+location: clients/tests/test-client.py:977:test_003()/345
 cmd: $NMCLI --mode tabular --terse con s ethernet
 lang: pl_PL.UTF-8
 returncode: 10
@@ -14589,7 +14677,7 @@ Błąd: ethernet — nie ma takiego profilu połączenia.
 
 <<<
 size: 386
-location: clients/tests/test-client.py:966:test_003()/346
+location: clients/tests/test-client.py:980:test_003()/346
 cmd: $NMCLI --mode tabular --terse c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: C
 returncode: 0
@@ -14599,7 +14687,7 @@ GENERAL:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:eth0:deactivating:no:no::n
 
 <<<
 size: 396
-location: clients/tests/test-client.py:966:test_003()/347
+location: clients/tests/test-client.py:980:test_003()/347
 cmd: $NMCLI --mode tabular --terse c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: pl_PL.UTF-8
 returncode: 0
@@ -14608,14 +14696,14 @@ stdout: 189 bytes
 GENERAL:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:eth0:deactivating:no:no::no:/org/freedesktop/NetworkManager/ActiveConnection/1:/org/freedesktop/NetworkManager/Settings/Connection/4::
 
 <<<
-size: 1371
-location: clients/tests/test-client.py:969:test_003()/348
+size: 1395
+location: clients/tests/test-client.py:983:test_003()/348
 cmd: $NMCLI --mode tabular --terse -f all dev show eth0
 lang: C
 returncode: 0
-stdout: 1207 bytes
+stdout: 1231 bytes
 >>>
-GENERAL:eth0:ethernet:NMDeviceEthernet:::virtual:::C0\:61\:AE\:26\:4D\:D7:0:20 (unavailable):0 (No reason given):/sys/devices/virtual/eth0::no:yes:yes:no:no::ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:/org/freedesktop/NetworkManager/ActiveConnection/1:unknown
+GENERAL:eth0:ethernet:NMDeviceEthernet:::virtual:::C0\:61\:AE\:26\:4D\:D7:0:20 (unavailable):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/eth0::no:yes:yes:no:no::ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:/org/freedesktop/NetworkManager/ActiveConnection/1:unknown
 CAPABILITIES:no:100 Mb/s:no:no
 WIRED-PROPERTIES:off:
 IP4:192.168.6.238/29::dst = 192.168.58.133/31, nh = 192.168.50.116, mt = 3130348792 | dst = 192.168.155.50/19, nh = 192.168.127.64:192.168.213.113:sear4.foo4.bar:192.168.156.115 | 192.168.8.33
@@ -14625,14 +14713,14 @@ DHCP6:dhcp-6-opt-1 = val-1 | dhcp-6-opt-5 = val-5 | dhcp-6-opt-6 = val-6 | dhcp-
 CONNECTIONS:/org/freedesktop/NetworkManager/Settings/Connection/{1,2,4}:5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 | UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 |  | /org/freedesktop/NetworkManager/Settings/Connection/4
 
 <<<
-size: 1381
-location: clients/tests/test-client.py:969:test_003()/349
+size: 1405
+location: clients/tests/test-client.py:983:test_003()/349
 cmd: $NMCLI --mode tabular --terse -f all dev show eth0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 1207 bytes
+stdout: 1231 bytes
 >>>
-GENERAL:eth0:ethernet:NMDeviceEthernet:::virtual:::C0\:61\:AE\:26\:4D\:D7:0:20 (unavailable):0 (No reason given):/sys/devices/virtual/eth0::no:yes:yes:no:no::ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:/org/freedesktop/NetworkManager/ActiveConnection/1:unknown
+GENERAL:eth0:ethernet:NMDeviceEthernet:::virtual:::C0\:61\:AE\:26\:4D\:D7:0:20 (unavailable):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/eth0::no:yes:yes:no:no::ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:/org/freedesktop/NetworkManager/ActiveConnection/1:unknown
 CAPABILITIES:no:100 Mb/s:no:no
 WIRED-PROPERTIES:off:
 IP4:192.168.6.238/29::dst = 192.168.58.133/31, nh = 192.168.50.116, mt = 3130348792 | dst = 192.168.155.50/19, nh = 192.168.127.64:192.168.213.113:sear4.foo4.bar:192.168.156.115 | 192.168.8.33
@@ -14643,35 +14731,35 @@ CONNECTIONS:/org/freedesktop/NetworkManager/Settings/Connection/{1,2,4}:5fcfd6d7
 
 <<<
 size: 1458
-location: clients/tests/test-client.py:957:test_003()/350
+location: clients/tests/test-client.py:971:test_003()/350
 cmd: $NMCLI --mode tabular --terse --color yes -f ALL con
 lang: C
 returncode: 0
 stdout: 1292 bytes
 >>>
-ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:802-3-ethernet::::::/org/freedesktop/NetworkManager/Settings/Connection/4:yes:eth1:activated:/org/freedesktop/NetworkManager/ActiveConnection/2::/etc/NetworkManager/system-connections/ethernet
 ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:802-3-ethernet::::::/org/freedesktop/NetworkManager/Settings/Connection/4:yes:eth0:deactivating:/org/freedesktop/NetworkManager/ActiveConnection/1::/etc/NetworkManager/system-connections/ethernet
+ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:802-3-ethernet::::::/org/freedesktop/NetworkManager/Settings/Connection/4:yes:eth1:activated:/org/freedesktop/NetworkManager/ActiveConnection/2::/etc/NetworkManager/system-connections/ethernet
 con-1:5fcfd6d7-1e63-3332-8826-a7eda103792d:802-3-ethernet:0:never:yes:0:no:/org/freedesktop/NetworkManager/Settings/Connection/1:no:::::/etc/NetworkManager/system-connections/con-1
 con-gsm1:UUID-con-gsm1-REPLACED-REPLACED-REPL:gsm:0:never:no:0:no:/org/freedesktop/NetworkManager/Settings/Connection/3:no:::::/etc/NetworkManager/system-connections/con-gsm1
 con-xx1:UUID-con-xx1-REPLACED-REPLACED-REPLA:802-3-ethernet:0:never:yes:0:no:/org/freedesktop/NetworkManager/Settings/Connection/2:no:::::/etc/NetworkManager/system-connections/con-xx1
 
 <<<
 size: 1468
-location: clients/tests/test-client.py:957:test_003()/351
+location: clients/tests/test-client.py:971:test_003()/351
 cmd: $NMCLI --mode tabular --terse --color yes -f ALL con
 lang: pl_PL.UTF-8
 returncode: 0
 stdout: 1292 bytes
 >>>
-ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:802-3-ethernet::::::/org/freedesktop/NetworkManager/Settings/Connection/4:yes:eth1:activated:/org/freedesktop/NetworkManager/ActiveConnection/2::/etc/NetworkManager/system-connections/ethernet
 ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:802-3-ethernet::::::/org/freedesktop/NetworkManager/Settings/Connection/4:yes:eth0:deactivating:/org/freedesktop/NetworkManager/ActiveConnection/1::/etc/NetworkManager/system-connections/ethernet
+ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:802-3-ethernet::::::/org/freedesktop/NetworkManager/Settings/Connection/4:yes:eth1:activated:/org/freedesktop/NetworkManager/ActiveConnection/2::/etc/NetworkManager/system-connections/ethernet
 con-1:5fcfd6d7-1e63-3332-8826-a7eda103792d:802-3-ethernet:0:never:yes:0:no:/org/freedesktop/NetworkManager/Settings/Connection/1:no:::::/etc/NetworkManager/system-connections/con-1
 con-gsm1:UUID-con-gsm1-REPLACED-REPLACED-REPL:gsm:0:never:no:0:no:/org/freedesktop/NetworkManager/Settings/Connection/3:no:::::/etc/NetworkManager/system-connections/con-gsm1
 con-xx1:UUID-con-xx1-REPLACED-REPLACED-REPLA:802-3-ethernet:0:never:yes:0:no:/org/freedesktop/NetworkManager/Settings/Connection/2:no:::::/etc/NetworkManager/system-connections/con-xx1
 
 <<<
 size: 316
-location: clients/tests/test-client.py:960:test_003()/352
+location: clients/tests/test-client.py:974:test_003()/352
 cmd: $NMCLI --mode tabular --terse --color yes -f UUID,TYPE con
 lang: C
 returncode: 0
@@ -14683,7 +14771,7 @@ UUID-con-xx1-REPLACED-REPLACED-REPLA:802-3-ethernet
 
 <<<
 size: 326
-location: clients/tests/test-client.py:960:test_003()/353
+location: clients/tests/test-client.py:974:test_003()/353
 cmd: $NMCLI --mode tabular --terse --color yes -f UUID,TYPE con
 lang: pl_PL.UTF-8
 returncode: 0
@@ -14695,7 +14783,7 @@ UUID-con-xx1-REPLACED-REPLACED-REPLA:802-3-ethernet
 
 <<<
 size: 215
-location: clients/tests/test-client.py:963:test_003()/354
+location: clients/tests/test-client.py:977:test_003()/354
 cmd: $NMCLI --mode tabular --terse --color yes con s ethernet
 lang: C
 returncode: 10
@@ -14705,7 +14793,7 @@ Error: ethernet - no such connection profile.
 
 <<<
 size: 237
-location: clients/tests/test-client.py:963:test_003()/355
+location: clients/tests/test-client.py:977:test_003()/355
 cmd: $NMCLI --mode tabular --terse --color yes con s ethernet
 lang: pl_PL.UTF-8
 returncode: 10
@@ -14715,7 +14803,7 @@ Błąd: ethernet — nie ma takiego profilu połączenia.
 
 <<<
 size: 398
-location: clients/tests/test-client.py:966:test_003()/356
+location: clients/tests/test-client.py:980:test_003()/356
 cmd: $NMCLI --mode tabular --terse --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: C
 returncode: 0
@@ -14725,7 +14813,7 @@ GENERAL:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:eth0:deactivating:no:no::n
 
 <<<
 size: 408
-location: clients/tests/test-client.py:966:test_003()/357
+location: clients/tests/test-client.py:980:test_003()/357
 cmd: $NMCLI --mode tabular --terse --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: pl_PL.UTF-8
 returncode: 0
@@ -14734,14 +14822,14 @@ stdout: 189 bytes
 GENERAL:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:eth0:deactivating:no:no::no:/org/freedesktop/NetworkManager/ActiveConnection/1:/org/freedesktop/NetworkManager/Settings/Connection/4::
 
 <<<
-size: 1383
-location: clients/tests/test-client.py:969:test_003()/358
+size: 1407
+location: clients/tests/test-client.py:983:test_003()/358
 cmd: $NMCLI --mode tabular --terse --color yes -f all dev show eth0
 lang: C
 returncode: 0
-stdout: 1207 bytes
+stdout: 1231 bytes
 >>>
-GENERAL:eth0:ethernet:NMDeviceEthernet:::virtual:::C0\:61\:AE\:26\:4D\:D7:0:20 (unavailable):0 (No reason given):/sys/devices/virtual/eth0::no:yes:yes:no:no::ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:/org/freedesktop/NetworkManager/ActiveConnection/1:unknown
+GENERAL:eth0:ethernet:NMDeviceEthernet:::virtual:::C0\:61\:AE\:26\:4D\:D7:0:20 (unavailable):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/eth0::no:yes:yes:no:no::ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:/org/freedesktop/NetworkManager/ActiveConnection/1:unknown
 CAPABILITIES:no:100 Mb/s:no:no
 WIRED-PROPERTIES:off:
 IP4:192.168.6.238/29::dst = 192.168.58.133/31, nh = 192.168.50.116, mt = 3130348792 | dst = 192.168.155.50/19, nh = 192.168.127.64:192.168.213.113:sear4.foo4.bar:192.168.156.115 | 192.168.8.33
@@ -14751,14 +14839,14 @@ DHCP6:dhcp-6-opt-1 = val-1 | dhcp-6-opt-5 = val-5 | dhcp-6-opt-6 = val-6 | dhcp-
 CONNECTIONS:/org/freedesktop/NetworkManager/Settings/Connection/{1,2,4}:5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 | UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 |  | /org/freedesktop/NetworkManager/Settings/Connection/4
 
 <<<
-size: 1393
-location: clients/tests/test-client.py:969:test_003()/359
+size: 1417
+location: clients/tests/test-client.py:983:test_003()/359
 cmd: $NMCLI --mode tabular --terse --color yes -f all dev show eth0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 1207 bytes
+stdout: 1231 bytes
 >>>
-GENERAL:eth0:ethernet:NMDeviceEthernet:::virtual:::C0\:61\:AE\:26\:4D\:D7:0:20 (unavailable):0 (No reason given):/sys/devices/virtual/eth0::no:yes:yes:no:no::ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:/org/freedesktop/NetworkManager/ActiveConnection/1:unknown
+GENERAL:eth0:ethernet:NMDeviceEthernet:::virtual:::C0\:61\:AE\:26\:4D\:D7:0:20 (unavailable):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/eth0::no:yes:yes:no:no::ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:/org/freedesktop/NetworkManager/ActiveConnection/1:unknown
 CAPABILITIES:no:100 Mb/s:no:no
 WIRED-PROPERTIES:off:
 IP4:192.168.6.238/29::dst = 192.168.58.133/31, nh = 192.168.50.116, mt = 3130348792 | dst = 192.168.155.50/19, nh = 192.168.127.64:192.168.213.113:sear4.foo4.bar:192.168.156.115 | 192.168.8.33
@@ -14769,7 +14857,7 @@ CONNECTIONS:/org/freedesktop/NetworkManager/Settings/Connection/{1,2,4}:5fcfd6d7
 
 <<<
 size: 4194
-location: clients/tests/test-client.py:957:test_003()/360
+location: clients/tests/test-client.py:971:test_003()/360
 cmd: $NMCLI --mode multiline -f ALL con
 lang: C
 returncode: 0
@@ -14785,9 +14873,9 @@ AUTOCONNECT-PRIORITY:                   --
 READONLY:                               --
 DBUS-PATH:                              /org/freedesktop/NetworkManager/Settings/Connection/4
 ACTIVE:                                 yes
-DEVICE:                                 eth1
-STATE:                                  activated
-ACTIVE-PATH:                            /org/freedesktop/NetworkManager/ActiveConnection/2
+DEVICE:                                 eth0
+STATE:                                  deactivating
+ACTIVE-PATH:                            /org/freedesktop/NetworkManager/ActiveConnection/1
 SLAVE:                                  --
 FILENAME:                               /etc/NetworkManager/system-connections/ethernet
 NAME:                                   ethernet
@@ -14800,9 +14888,9 @@ AUTOCONNECT-PRIORITY:                   --
 READONLY:                               --
 DBUS-PATH:                              /org/freedesktop/NetworkManager/Settings/Connection/4
 ACTIVE:                                 yes
-DEVICE:                                 eth0
-STATE:                                  deactivating
-ACTIVE-PATH:                            /org/freedesktop/NetworkManager/ActiveConnection/1
+DEVICE:                                 eth1
+STATE:                                  activated
+ACTIVE-PATH:                            /org/freedesktop/NetworkManager/ActiveConnection/2
 SLAVE:                                  --
 FILENAME:                               /etc/NetworkManager/system-connections/ethernet
 NAME:                                   con-1
@@ -14853,7 +14941,7 @@ FILENAME:                               /etc/NetworkManager/system-connections/c
 
 <<<
 size: 4214
-location: clients/tests/test-client.py:957:test_003()/361
+location: clients/tests/test-client.py:971:test_003()/361
 cmd: $NMCLI --mode multiline -f ALL con
 lang: pl_PL.UTF-8
 returncode: 0
@@ -14869,9 +14957,9 @@ AUTOCONNECT-PRIORITY:                   --
 READONLY:                               --
 DBUS-PATH:                              /org/freedesktop/NetworkManager/Settings/Connection/4
 ACTIVE:                                 tak
-DEVICE:                                 eth1
-STATE:                                  aktywowano
-ACTIVE-PATH:                            /org/freedesktop/NetworkManager/ActiveConnection/2
+DEVICE:                                 eth0
+STATE:                                  dezaktywowanie
+ACTIVE-PATH:                            /org/freedesktop/NetworkManager/ActiveConnection/1
 SLAVE:                                  --
 FILENAME:                               /etc/NetworkManager/system-connections/ethernet
 NAME:                                   ethernet
@@ -14884,9 +14972,9 @@ AUTOCONNECT-PRIORITY:                   --
 READONLY:                               --
 DBUS-PATH:                              /org/freedesktop/NetworkManager/Settings/Connection/4
 ACTIVE:                                 tak
-DEVICE:                                 eth0
-STATE:                                  dezaktywowanie
-ACTIVE-PATH:                            /org/freedesktop/NetworkManager/ActiveConnection/1
+DEVICE:                                 eth1
+STATE:                                  aktywowano
+ACTIVE-PATH:                            /org/freedesktop/NetworkManager/ActiveConnection/2
 SLAVE:                                  --
 FILENAME:                               /etc/NetworkManager/system-connections/ethernet
 NAME:                                   con-1
@@ -14937,7 +15025,7 @@ FILENAME:                               /etc/NetworkManager/system-connections/c
 
 <<<
 size: 526
-location: clients/tests/test-client.py:960:test_003()/362
+location: clients/tests/test-client.py:974:test_003()/362
 cmd: $NMCLI --mode multiline -f UUID,TYPE con
 lang: C
 returncode: 0
@@ -14952,7 +15040,7 @@ TYPE:                                   ethernet
 
 <<<
 size: 536
-location: clients/tests/test-client.py:960:test_003()/363
+location: clients/tests/test-client.py:974:test_003()/363
 cmd: $NMCLI --mode multiline -f UUID,TYPE con
 lang: pl_PL.UTF-8
 returncode: 0
@@ -14967,7 +15055,7 @@ TYPE:                                   ethernet
 
 <<<
 size: 197
-location: clients/tests/test-client.py:963:test_003()/364
+location: clients/tests/test-client.py:977:test_003()/364
 cmd: $NMCLI --mode multiline con s ethernet
 lang: C
 returncode: 10
@@ -14977,7 +15065,7 @@ Error: ethernet - no such connection profile.
 
 <<<
 size: 219
-location: clients/tests/test-client.py:963:test_003()/365
+location: clients/tests/test-client.py:977:test_003()/365
 cmd: $NMCLI --mode multiline con s ethernet
 lang: pl_PL.UTF-8
 returncode: 10
@@ -14987,7 +15075,7 @@ Błąd: ethernet — nie ma takiego profilu połączenia.
 
 <<<
 size: 858
-location: clients/tests/test-client.py:966:test_003()/366
+location: clients/tests/test-client.py:980:test_003()/366
 cmd: $NMCLI --mode multiline c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: C
 returncode: 0
@@ -15008,7 +15096,7 @@ GENERAL.MASTER-PATH:                    --
 
 <<<
 size: 873
-location: clients/tests/test-client.py:966:test_003()/367
+location: clients/tests/test-client.py:980:test_003()/367
 cmd: $NMCLI --mode multiline c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: pl_PL.UTF-8
 returncode: 0
@@ -15028,12 +15116,12 @@ GENERAL.ZONE:                           --
 GENERAL.MASTER-PATH:                    --
 
 <<<
-size: 3428
-location: clients/tests/test-client.py:969:test_003()/368
+size: 3532
+location: clients/tests/test-client.py:983:test_003()/368
 cmd: $NMCLI --mode multiline -f all dev show eth0
 lang: C
 returncode: 0
-stdout: 3270 bytes
+stdout: 3374 bytes
 >>>
 GENERAL.DEVICE:                         eth0
 GENERAL.TYPE:                           ethernet
@@ -15047,6 +15135,8 @@ GENERAL.HWADDR:                         C0:61:AE:26:4D:D7
 GENERAL.MTU:                            0
 GENERAL.STATE:                          20 (unavailable)
 GENERAL.REASON:                         0 (No reason given)
+GENERAL.IP4-CONNECTIVITY:               0 (unknown)
+GENERAL.IP6-CONNECTIVITY:               0 (unknown)
 GENERAL.UDI:                            /sys/devices/virtual/eth0
 GENERAL.IP-IFACE:                       --
 GENERAL.IS-SOFTWARE:                    no
@@ -15092,12 +15182,12 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[2]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | c
 CONNECTIONS.AVAILABLE-CONNECTIONS[3]:    | /org/freedesktop/NetworkManager/Settings/Connection/4
 
 <<<
-size: 3461
-location: clients/tests/test-client.py:969:test_003()/369
+size: 3569
+location: clients/tests/test-client.py:983:test_003()/369
 cmd: $NMCLI --mode multiline -f all dev show eth0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 3293 bytes
+stdout: 3401 bytes
 >>>
 GENERAL.DEVICE:                         eth0
 GENERAL.TYPE:                           ethernet
@@ -15111,6 +15201,8 @@ GENERAL.HWADDR:                         C0:61:AE:26:4D:D7
 GENERAL.MTU:                            0
 GENERAL.STATE:                          20 (niedostępne)
 GENERAL.REASON:                         0 (Nie podano przyczyny)
+GENERAL.IP4-CONNECTIVITY:               0 (nieznane)
+GENERAL.IP6-CONNECTIVITY:               0 (nieznane)
 GENERAL.UDI:                            /sys/devices/virtual/eth0
 GENERAL.IP-IFACE:                       --
 GENERAL.IS-SOFTWARE:                    nie
@@ -15153,31 +15245,16 @@ DHCP6.OPTION[4]:                        dhcp-6-opt-8 = val-8
 CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings/Connection/{1,2,4}
 CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1
 CONNECTIONS.AVAILABLE-CONNECTIONS[2]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
-CONNECTIONS.AVAILABLE-CONNECTIONS[3]:    | /org/freedesktop/NetworkManager/Settings/Connection/4
+CONNECTIONS.AVAILABLE-CONNECTIONS[3]:    | /org/freedesktop/NetworkManager/Settings/Connection/4
 
 <<<
 size: 4476
-location: clients/tests/test-client.py:957:test_003()/370
+location: clients/tests/test-client.py:971:test_003()/370
 cmd: $NMCLI --mode multiline --color yes -f ALL con
 lang: C
 returncode: 0
 stdout: 4316 bytes
 >>>
-NAME:                                   ethernet
-UUID:                                   UUID-ethernet-REPLACED-REPLACED-REPL
-TYPE:                                   ethernet
-TIMESTAMP:                              --
-TIMESTAMP-REAL:                         --
-AUTOCONNECT:                            --
-AUTOCONNECT-PRIORITY:                   --
-READONLY:                               --
-DBUS-PATH:                              /org/freedesktop/NetworkManager/Settings/Connection/4
-ACTIVE:                                 yes
-DEVICE:                                 eth1
-STATE:                                  activated
-ACTIVE-PATH:                            /org/freedesktop/NetworkManager/ActiveConnection/2
-SLAVE:                                  --
-FILENAME:                               /etc/NetworkManager/system-connections/ethernet
 NAME:                                   ethernet
 UUID:                                   UUID-ethernet-REPLACED-REPLACED-REPL
 TYPE:                                   ethernet
@@ -15193,6 +15270,21 @@ STATE:                                  deactivating
 ACTIVE-PATH:                            /org/freedesktop/NetworkManager/ActiveConnection/1
 SLAVE:                                  --
 FILENAME:                               /etc/NetworkManager/system-connections/ethernet
+NAME:                                   ethernet
+UUID:                                   UUID-ethernet-REPLACED-REPLACED-REPL
+TYPE:                                   ethernet
+TIMESTAMP:                              --
+TIMESTAMP-REAL:                         --
+AUTOCONNECT:                            --
+AUTOCONNECT-PRIORITY:                   --
+READONLY:                               --
+DBUS-PATH:                              /org/freedesktop/NetworkManager/Settings/Connection/4
+ACTIVE:                                 yes
+DEVICE:                                 eth1
+STATE:                                  activated
+ACTIVE-PATH:                            /org/freedesktop/NetworkManager/ActiveConnection/2
+SLAVE:                                  --
+FILENAME:                               /etc/NetworkManager/system-connections/ethernet
 NAME:                                   con-1
 UUID:                                   5fcfd6d7-1e63-3332-8826-a7eda103792d
 TYPE:                                   ethernet
@@ -15241,27 +15333,12 @@ FILENAME:                               /etc/NetworkManager/system-connections/c
 
 <<<
 size: 4496
-location: clients/tests/test-client.py:957:test_003()/371
+location: clients/tests/test-client.py:971:test_003()/371
 cmd: $NMCLI --mode multiline --color yes -f ALL con
 lang: pl_PL.UTF-8
 returncode: 0
 stdout: 4326 bytes
 >>>
-NAME:                                   ethernet
-UUID:                                   UUID-ethernet-REPLACED-REPLACED-REPL
-TYPE:                                   ethernet
-TIMESTAMP:                              --
-TIMESTAMP-REAL:                         --
-AUTOCONNECT:                            --
-AUTOCONNECT-PRIORITY:                   --
-READONLY:                               --
-DBUS-PATH:                              /org/freedesktop/NetworkManager/Settings/Connection/4
-ACTIVE:                                 tak
-DEVICE:                                 eth1
-STATE:                                  aktywowano
-ACTIVE-PATH:                            /org/freedesktop/NetworkManager/ActiveConnection/2
-SLAVE:                                  --
-FILENAME:                               /etc/NetworkManager/system-connections/ethernet
 NAME:                                   ethernet
 UUID:                                   UUID-ethernet-REPLACED-REPLACED-REPL
 TYPE:                                   ethernet
@@ -15277,6 +15354,21 @@ STATE:                                  dezaktywowanie
 ACTIVE-PATH:                            /org/freedesktop/NetworkManager/ActiveConnection/1
 SLAVE:                                  --
 FILENAME:                               /etc/NetworkManager/system-connections/ethernet
+NAME:                                   ethernet
+UUID:                                   UUID-ethernet-REPLACED-REPLACED-REPL
+TYPE:                                   ethernet
+TIMESTAMP:                              --
+TIMESTAMP-REAL:                         --
+AUTOCONNECT:                            --
+AUTOCONNECT-PRIORITY:                   --
+READONLY:                               --
+DBUS-PATH:                              /org/freedesktop/NetworkManager/Settings/Connection/4
+ACTIVE:                                 tak
+DEVICE:                                 eth1
+STATE:                                  aktywowano
+ACTIVE-PATH:                            /org/freedesktop/NetworkManager/ActiveConnection/2
+SLAVE:                                  --
+FILENAME:                               /etc/NetworkManager/system-connections/ethernet
 NAME:                                   con-1
 UUID:                                   5fcfd6d7-1e63-3332-8826-a7eda103792d
 TYPE:                                   ethernet
@@ -15325,7 +15417,7 @@ FILENAME:                               /etc/NetworkManager/system-connections/c
 
 <<<
 size: 538
-location: clients/tests/test-client.py:960:test_003()/372
+location: clients/tests/test-client.py:974:test_003()/372
 cmd: $NMCLI --mode multiline --color yes -f UUID,TYPE con
 lang: C
 returncode: 0
@@ -15340,7 +15432,7 @@ TYPE:                                   ethernet
 
 <<<
 size: 548
-location: clients/tests/test-client.py:960:test_003()/373
+location: clients/tests/test-client.py:974:test_003()/373
 cmd: $NMCLI --mode multiline --color yes -f UUID,TYPE con
 lang: pl_PL.UTF-8
 returncode: 0
@@ -15355,7 +15447,7 @@ TYPE:                                   ethernet
 
 <<<
 size: 209
-location: clients/tests/test-client.py:963:test_003()/374
+location: clients/tests/test-client.py:977:test_003()/374
 cmd: $NMCLI --mode multiline --color yes con s ethernet
 lang: C
 returncode: 10
@@ -15365,7 +15457,7 @@ Error: ethernet - no such connection profile.
 
 <<<
 size: 231
-location: clients/tests/test-client.py:963:test_003()/375
+location: clients/tests/test-client.py:977:test_003()/375
 cmd: $NMCLI --mode multiline --color yes con s ethernet
 lang: pl_PL.UTF-8
 returncode: 10
@@ -15375,7 +15467,7 @@ Błąd: ethernet — nie ma takiego profilu połączenia.
 
 <<<
 size: 870
-location: clients/tests/test-client.py:966:test_003()/376
+location: clients/tests/test-client.py:980:test_003()/376
 cmd: $NMCLI --mode multiline --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: C
 returncode: 0
@@ -15396,7 +15488,7 @@ GENERAL.MASTER-PATH:                    --
 
 <<<
 size: 885
-location: clients/tests/test-client.py:966:test_003()/377
+location: clients/tests/test-client.py:980:test_003()/377
 cmd: $NMCLI --mode multiline --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: pl_PL.UTF-8
 returncode: 0
@@ -15416,12 +15508,12 @@ GENERAL.ZONE:                           --
 GENERAL.MASTER-PATH:                    --
 
 <<<
-size: 3440
-location: clients/tests/test-client.py:969:test_003()/378
+size: 3544
+location: clients/tests/test-client.py:983:test_003()/378
 cmd: $NMCLI --mode multiline --color yes -f all dev show eth0
 lang: C
 returncode: 0
-stdout: 3270 bytes
+stdout: 3374 bytes
 >>>
 GENERAL.DEVICE:                         eth0
 GENERAL.TYPE:                           ethernet
@@ -15435,6 +15527,8 @@ GENERAL.HWADDR:                         C0:61:AE:26:4D:D7
 GENERAL.MTU:                            0
 GENERAL.STATE:                          20 (unavailable)
 GENERAL.REASON:                         0 (No reason given)
+GENERAL.IP4-CONNECTIVITY:               0 (unknown)
+GENERAL.IP6-CONNECTIVITY:               0 (unknown)
 GENERAL.UDI:                            /sys/devices/virtual/eth0
 GENERAL.IP-IFACE:                       --
 GENERAL.IS-SOFTWARE:                    no
@@ -15480,12 +15574,12 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[2]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | c
 CONNECTIONS.AVAILABLE-CONNECTIONS[3]:    | /org/freedesktop/NetworkManager/Settings/Connection/4
 
 <<<
-size: 3473
-location: clients/tests/test-client.py:969:test_003()/379
+size: 3581
+location: clients/tests/test-client.py:983:test_003()/379
 cmd: $NMCLI --mode multiline --color yes -f all dev show eth0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 3293 bytes
+stdout: 3401 bytes
 >>>
 GENERAL.DEVICE:                         eth0
 GENERAL.TYPE:                           ethernet
@@ -15499,6 +15593,8 @@ GENERAL.HWADDR:                         C0:61:AE:26:4D:D7
 GENERAL.MTU:                            0
 GENERAL.STATE:                          20 (niedostępne)
 GENERAL.REASON:                         0 (Nie podano przyczyny)
+GENERAL.IP4-CONNECTIVITY:               0 (nieznane)
+GENERAL.IP6-CONNECTIVITY:               0 (nieznane)
 GENERAL.UDI:                            /sys/devices/virtual/eth0
 GENERAL.IP-IFACE:                       --
 GENERAL.IS-SOFTWARE:                    nie
@@ -15541,11 +15637,11 @@ DHCP6.OPTION[4]:                        dhcp-6-opt-8 = val-8
 CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings/Connection/{1,2,4}
 CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1
 CONNECTIONS.AVAILABLE-CONNECTIONS[2]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
-CONNECTIONS.AVAILABLE-CONNECTIONS[3]:    | /org/freedesktop/NetworkManager/Settings/Connection/4
+CONNECTIONS.AVAILABLE-CONNECTIONS[3]:    | /org/freedesktop/NetworkManager/Settings/Connection/4
 
 <<<
 size: 4820
-location: clients/tests/test-client.py:957:test_003()/380
+location: clients/tests/test-client.py:971:test_003()/380
 cmd: $NMCLI --mode multiline --pretty -f ALL con
 lang: C
 returncode: 0
@@ -15564,9 +15660,9 @@ AUTOCONNECT-PRIORITY:                   --
 READONLY:                               --
 DBUS-PATH:                              /org/freedesktop/NetworkManager/Settings/Connection/4
 ACTIVE:                                 yes
-DEVICE:                                 eth1
-STATE:                                  activated
-ACTIVE-PATH:                            /org/freedesktop/NetworkManager/ActiveConnection/2
+DEVICE:                                 eth0
+STATE:                                  deactivating
+ACTIVE-PATH:                            /org/freedesktop/NetworkManager/ActiveConnection/1
 SLAVE:                                  --
 FILENAME:                               /etc/NetworkManager/system-connections/ethernet
 -------------------------------------------------------------------------------
@@ -15580,9 +15676,9 @@ AUTOCONNECT-PRIORITY:                   --
 READONLY:                               --
 DBUS-PATH:                              /org/freedesktop/NetworkManager/Settings/Connection/4
 ACTIVE:                                 yes
-DEVICE:                                 eth0
-STATE:                                  deactivating
-ACTIVE-PATH:                            /org/freedesktop/NetworkManager/ActiveConnection/1
+DEVICE:                                 eth1
+STATE:                                  activated
+ACTIVE-PATH:                            /org/freedesktop/NetworkManager/ActiveConnection/2
 SLAVE:                                  --
 FILENAME:                               /etc/NetworkManager/system-connections/ethernet
 -------------------------------------------------------------------------------
@@ -15637,7 +15733,7 @@ FILENAME:                               /etc/NetworkManager/system-connections/c
 
 <<<
 size: 4846
-location: clients/tests/test-client.py:957:test_003()/381
+location: clients/tests/test-client.py:971:test_003()/381
 cmd: $NMCLI --mode multiline --pretty -f ALL con
 lang: pl_PL.UTF-8
 returncode: 0
@@ -15656,9 +15752,9 @@ AUTOCONNECT-PRIORITY:                   --
 READONLY:                               --
 DBUS-PATH:                              /org/freedesktop/NetworkManager/Settings/Connection/4
 ACTIVE:                                 tak
-DEVICE:                                 eth1
-STATE:                                  aktywowano
-ACTIVE-PATH:                            /org/freedesktop/NetworkManager/ActiveConnection/2
+DEVICE:                                 eth0
+STATE:                                  dezaktywowanie
+ACTIVE-PATH:                            /org/freedesktop/NetworkManager/ActiveConnection/1
 SLAVE:                                  --
 FILENAME:                               /etc/NetworkManager/system-connections/ethernet
 -------------------------------------------------------------------------------
@@ -15672,9 +15768,9 @@ AUTOCONNECT-PRIORITY:                   --
 READONLY:                               --
 DBUS-PATH:                              /org/freedesktop/NetworkManager/Settings/Connection/4
 ACTIVE:                                 tak
-DEVICE:                                 eth0
-STATE:                                  dezaktywowanie
-ACTIVE-PATH:                            /org/freedesktop/NetworkManager/ActiveConnection/1
+DEVICE:                                 eth1
+STATE:                                  aktywowano
+ACTIVE-PATH:                            /org/freedesktop/NetworkManager/ActiveConnection/2
 SLAVE:                                  --
 FILENAME:                               /etc/NetworkManager/system-connections/ethernet
 -------------------------------------------------------------------------------
@@ -15729,7 +15825,7 @@ FILENAME:                               /etc/NetworkManager/system-connections/c
 
 <<<
 size: 992
-location: clients/tests/test-client.py:960:test_003()/382
+location: clients/tests/test-client.py:974:test_003()/382
 cmd: $NMCLI --mode multiline --pretty -f UUID,TYPE con
 lang: C
 returncode: 0
@@ -15750,7 +15846,7 @@ TYPE:                                   ethernet
 
 <<<
 size: 1008
-location: clients/tests/test-client.py:960:test_003()/383
+location: clients/tests/test-client.py:974:test_003()/383
 cmd: $NMCLI --mode multiline --pretty -f UUID,TYPE con
 lang: pl_PL.UTF-8
 returncode: 0
@@ -15771,7 +15867,7 @@ TYPE:                                   ethernet
 
 <<<
 size: 206
-location: clients/tests/test-client.py:963:test_003()/384
+location: clients/tests/test-client.py:977:test_003()/384
 cmd: $NMCLI --mode multiline --pretty con s ethernet
 lang: C
 returncode: 10
@@ -15781,7 +15877,7 @@ Error: ethernet - no such connection profile.
 
 <<<
 size: 228
-location: clients/tests/test-client.py:963:test_003()/385
+location: clients/tests/test-client.py:977:test_003()/385
 cmd: $NMCLI --mode multiline --pretty con s ethernet
 lang: pl_PL.UTF-8
 returncode: 10
@@ -15791,7 +15887,7 @@ Błąd: ethernet — nie ma takiego profilu połączenia.
 
 <<<
 size: 1394
-location: clients/tests/test-client.py:966:test_003()/386
+location: clients/tests/test-client.py:980:test_003()/386
 cmd: $NMCLI --mode multiline --pretty c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: C
 returncode: 0
@@ -15819,7 +15915,7 @@ GENERAL.MASTER-PATH:                    --
 
 <<<
 size: 1421
-location: clients/tests/test-client.py:966:test_003()/387
+location: clients/tests/test-client.py:980:test_003()/387
 cmd: $NMCLI --mode multiline --pretty c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: pl_PL.UTF-8
 returncode: 0
@@ -15846,12 +15942,12 @@ GENERAL.MASTER-PATH:                    --
 -------------------------------------------------------------------------------
 
 <<<
-size: 4288
-location: clients/tests/test-client.py:969:test_003()/388
+size: 4392
+location: clients/tests/test-client.py:983:test_003()/388
 cmd: $NMCLI --mode multiline --pretty -f all dev show eth0
 lang: C
 returncode: 0
-stdout: 4121 bytes
+stdout: 4225 bytes
 >>>
 ===============================================================================
                              Device details (eth0)
@@ -15868,6 +15964,8 @@ GENERAL.HWADDR:                         C0:61:AE:26:4D:D7
 GENERAL.MTU:                            0
 GENERAL.STATE:                          20 (unavailable)
 GENERAL.REASON:                         0 (No reason given)
+GENERAL.IP4-CONNECTIVITY:               0 (unknown)
+GENERAL.IP6-CONNECTIVITY:               0 (unknown)
 GENERAL.UDI:                            /sys/devices/virtual/eth0
 GENERAL.IP-IFACE:                       --
 GENERAL.IS-SOFTWARE:                    no
@@ -15921,12 +16019,12 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[3]:    | /org/freedesktop/NetworkMa
 -------------------------------------------------------------------------------
 
 <<<
-size: 4327
-location: clients/tests/test-client.py:969:test_003()/389
+size: 4435
+location: clients/tests/test-client.py:983:test_003()/389
 cmd: $NMCLI --mode multiline --pretty -f all dev show eth0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 4150 bytes
+stdout: 4258 bytes
 >>>
 ===============================================================================
                         Informacje o urządzeniu (eth0)
@@ -15943,6 +16041,8 @@ GENERAL.HWADDR:                         C0:61:AE:26:4D:D7
 GENERAL.MTU:                            0
 GENERAL.STATE:                          20 (niedostępne)
 GENERAL.REASON:                         0 (Nie podano przyczyny)
+GENERAL.IP4-CONNECTIVITY:               0 (nieznane)
+GENERAL.IP6-CONNECTIVITY:               0 (nieznane)
 GENERAL.UDI:                            /sys/devices/virtual/eth0
 GENERAL.IP-IFACE:                       --
 GENERAL.IS-SOFTWARE:                    nie
@@ -15992,12 +16092,12 @@ DHCP6.OPTION[4]:                        dhcp-6-opt-8 = val-8
 CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings/Connection/{1,2,4}
 CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1
 CONNECTIONS.AVAILABLE-CONNECTIONS[2]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
-CONNECTIONS.AVAILABLE-CONNECTIONS[3]:    | /org/freedesktop/NetworkManager/Settings/Connection/4
+CONNECTIONS.AVAILABLE-CONNECTIONS[3]:    | /org/freedesktop/NetworkManager/Settings/Connection/4
 -------------------------------------------------------------------------------
 
 <<<
 size: 5102
-location: clients/tests/test-client.py:957:test_003()/390
+location: clients/tests/test-client.py:971:test_003()/390
 cmd: $NMCLI --mode multiline --pretty --color yes -f ALL con
 lang: C
 returncode: 0
@@ -16006,22 +16106,6 @@ stdout: 4933 bytes
 ===============================================================================
                       NetworkManager connection profiles
 ===============================================================================
-NAME:                                   ethernet
-UUID:                                   UUID-ethernet-REPLACED-REPLACED-REPL
-TYPE:                                   ethernet
-TIMESTAMP:                              --
-TIMESTAMP-REAL:                         --
-AUTOCONNECT:                            --
-AUTOCONNECT-PRIORITY:                   --
-READONLY:                               --
-DBUS-PATH:                              /org/freedesktop/NetworkManager/Settings/Connection/4
-ACTIVE:                                 yes
-DEVICE:                                 eth1
-STATE:                                  activated
-ACTIVE-PATH:                            /org/freedesktop/NetworkManager/ActiveConnection/2
-SLAVE:                                  --
-FILENAME:                               /etc/NetworkManager/system-connections/ethernet
--------------------------------------------------------------------------------
 NAME:                                   ethernet
 UUID:                                   UUID-ethernet-REPLACED-REPLACED-REPL
 TYPE:                                   ethernet
@@ -16038,6 +16122,22 @@ ACTIVE-PATH:                            /org/freedesktop/NetworkManager/Act
 SLAVE:                                  --
 FILENAME:                               /etc/NetworkManager/system-connections/ethernet
 -------------------------------------------------------------------------------
+NAME:                                   ethernet
+UUID:                                   UUID-ethernet-REPLACED-REPLACED-REPL
+TYPE:                                   ethernet
+TIMESTAMP:                              --
+TIMESTAMP-REAL:                         --
+AUTOCONNECT:                            --
+AUTOCONNECT-PRIORITY:                   --
+READONLY:                               --
+DBUS-PATH:                              /org/freedesktop/NetworkManager/Settings/Connection/4
+ACTIVE:                                 yes
+DEVICE:                                 eth1
+STATE:                                  activated
+ACTIVE-PATH:                            /org/freedesktop/NetworkManager/ActiveConnection/2
+SLAVE:                                  --
+FILENAME:                               /etc/NetworkManager/system-connections/ethernet
+-------------------------------------------------------------------------------
 NAME:                                   con-1
 UUID:                                   5fcfd6d7-1e63-3332-8826-a7eda103792d
 TYPE:                                   ethernet
@@ -16089,7 +16189,7 @@ FILENAME:                               /etc/NetworkManager/system-connections/c
 
 <<<
 size: 5128
-location: clients/tests/test-client.py:957:test_003()/391
+location: clients/tests/test-client.py:971:test_003()/391
 cmd: $NMCLI --mode multiline --pretty --color yes -f ALL con
 lang: pl_PL.UTF-8
 returncode: 0
@@ -16098,22 +16198,6 @@ stdout: 4949 bytes
 ===============================================================================
                     Profile połączeń usługi NetworkManager
 ===============================================================================
-NAME:                                   ethernet
-UUID:                                   UUID-ethernet-REPLACED-REPLACED-REPL
-TYPE:                                   ethernet
-TIMESTAMP:                              --
-TIMESTAMP-REAL:                         --
-AUTOCONNECT:                            --
-AUTOCONNECT-PRIORITY:                   --
-READONLY:                               --
-DBUS-PATH:                              /org/freedesktop/NetworkManager/Settings/Connection/4
-ACTIVE:                                 tak
-DEVICE:                                 eth1
-STATE:                                  aktywowano
-ACTIVE-PATH:                            /org/freedesktop/NetworkManager/ActiveConnection/2
-SLAVE:                                  --
-FILENAME:                               /etc/NetworkManager/system-connections/ethernet
--------------------------------------------------------------------------------
 NAME:                                   ethernet
 UUID:                                   UUID-ethernet-REPLACED-REPLACED-REPL
 TYPE:                                   ethernet
@@ -16130,6 +16214,22 @@ ACTIVE-PATH:                            /org/freedesktop/NetworkManager/Act
 SLAVE:                                  --
 FILENAME:                               /etc/NetworkManager/system-connections/ethernet
 -------------------------------------------------------------------------------
+NAME:                                   ethernet
+UUID:                                   UUID-ethernet-REPLACED-REPLACED-REPL
+TYPE:                                   ethernet
+TIMESTAMP:                              --
+TIMESTAMP-REAL:                         --
+AUTOCONNECT:                            --
+AUTOCONNECT-PRIORITY:                   --
+READONLY:                               --
+DBUS-PATH:                              /org/freedesktop/NetworkManager/Settings/Connection/4
+ACTIVE:                                 tak
+DEVICE:                                 eth1
+STATE:                                  aktywowano
+ACTIVE-PATH:                            /org/freedesktop/NetworkManager/ActiveConnection/2
+SLAVE:                                  --
+FILENAME:                               /etc/NetworkManager/system-connections/ethernet
+-------------------------------------------------------------------------------
 NAME:                                   con-1
 UUID:                                   5fcfd6d7-1e63-3332-8826-a7eda103792d
 TYPE:                                   ethernet
@@ -16181,7 +16281,7 @@ FILENAME:                               /etc/NetworkManager/system-connections/c
 
 <<<
 size: 1004
-location: clients/tests/test-client.py:960:test_003()/392
+location: clients/tests/test-client.py:974:test_003()/392
 cmd: $NMCLI --mode multiline --pretty --color yes -f UUID,TYPE con
 lang: C
 returncode: 0
@@ -16202,7 +16302,7 @@ TYPE:                                   ethernet
 
 <<<
 size: 1020
-location: clients/tests/test-client.py:960:test_003()/393
+location: clients/tests/test-client.py:974:test_003()/393
 cmd: $NMCLI --mode multiline --pretty --color yes -f UUID,TYPE con
 lang: pl_PL.UTF-8
 returncode: 0
@@ -16223,7 +16323,7 @@ TYPE:                                   ethernet
 
 <<<
 size: 218
-location: clients/tests/test-client.py:963:test_003()/394
+location: clients/tests/test-client.py:977:test_003()/394
 cmd: $NMCLI --mode multiline --pretty --color yes con s ethernet
 lang: C
 returncode: 10
@@ -16233,7 +16333,7 @@ Error: ethernet - no such connection profile.
 
 <<<
 size: 240
-location: clients/tests/test-client.py:963:test_003()/395
+location: clients/tests/test-client.py:977:test_003()/395
 cmd: $NMCLI --mode multiline --pretty --color yes con s ethernet
 lang: pl_PL.UTF-8
 returncode: 10
@@ -16243,7 +16343,7 @@ Błąd: ethernet — nie ma takiego profilu połączenia.
 
 <<<
 size: 1406
-location: clients/tests/test-client.py:966:test_003()/396
+location: clients/tests/test-client.py:980:test_003()/396
 cmd: $NMCLI --mode multiline --pretty --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: C
 returncode: 0
@@ -16271,7 +16371,7 @@ GENERAL.MASTER-PATH:                    --
 
 <<<
 size: 1433
-location: clients/tests/test-client.py:966:test_003()/397
+location: clients/tests/test-client.py:980:test_003()/397
 cmd: $NMCLI --mode multiline --pretty --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: pl_PL.UTF-8
 returncode: 0
@@ -16298,12 +16398,12 @@ GENERAL.MASTER-PATH:                    --
 -------------------------------------------------------------------------------
 
 <<<
-size: 4300
-location: clients/tests/test-client.py:969:test_003()/398
+size: 4404
+location: clients/tests/test-client.py:983:test_003()/398
 cmd: $NMCLI --mode multiline --pretty --color yes -f all dev show eth0
 lang: C
 returncode: 0
-stdout: 4121 bytes
+stdout: 4225 bytes
 >>>
 ===============================================================================
                              Device details (eth0)
@@ -16320,6 +16420,8 @@ GENERAL.HWADDR:                         C0:61:AE:26:4D:D7
 GENERAL.MTU:                            0
 GENERAL.STATE:                          20 (unavailable)
 GENERAL.REASON:                         0 (No reason given)
+GENERAL.IP4-CONNECTIVITY:               0 (unknown)
+GENERAL.IP6-CONNECTIVITY:               0 (unknown)
 GENERAL.UDI:                            /sys/devices/virtual/eth0
 GENERAL.IP-IFACE:                       --
 GENERAL.IS-SOFTWARE:                    no
@@ -16373,12 +16475,12 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[3]:    | /org/freedesktop/NetworkMa
 -------------------------------------------------------------------------------
 
 <<<
-size: 4339
-location: clients/tests/test-client.py:969:test_003()/399
+size: 4447
+location: clients/tests/test-client.py:983:test_003()/399
 cmd: $NMCLI --mode multiline --pretty --color yes -f all dev show eth0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 4150 bytes
+stdout: 4258 bytes
 >>>
 ===============================================================================
                         Informacje o urządzeniu (eth0)
@@ -16395,6 +16497,8 @@ GENERAL.HWADDR:                         C0:61:AE:26:4D:D7
 GENERAL.MTU:                            0
 GENERAL.STATE:                          20 (niedostępne)
 GENERAL.REASON:                         0 (Nie podano przyczyny)
+GENERAL.IP4-CONNECTIVITY:               0 (nieznane)
+GENERAL.IP6-CONNECTIVITY:               0 (nieznane)
 GENERAL.UDI:                            /sys/devices/virtual/eth0
 GENERAL.IP-IFACE:                       --
 GENERAL.IS-SOFTWARE:                    nie
@@ -16444,12 +16548,12 @@ DHCP6.OPTION[4]:                        dhcp-6-opt-8 = val-8
 CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings/Connection/{1,2,4}
 CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1
 CONNECTIONS.AVAILABLE-CONNECTIONS[2]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
-CONNECTIONS.AVAILABLE-CONNECTIONS[3]:    | /org/freedesktop/NetworkManager/Settings/Connection/4
+CONNECTIONS.AVAILABLE-CONNECTIONS[3]:    | /org/freedesktop/NetworkManager/Settings/Connection/4
 -------------------------------------------------------------------------------
 
 <<<
 size: 1873
-location: clients/tests/test-client.py:957:test_003()/400
+location: clients/tests/test-client.py:971:test_003()/400
 cmd: $NMCLI --mode multiline --terse -f ALL con
 lang: C
 returncode: 0
@@ -16465,9 +16569,9 @@ AUTOCONNECT-PRIORITY:
 READONLY:
 DBUS-PATH:/org/freedesktop/NetworkManager/Settings/Connection/4
 ACTIVE:yes
-DEVICE:eth1
-STATE:activated
-ACTIVE-PATH:/org/freedesktop/NetworkManager/ActiveConnection/2
+DEVICE:eth0
+STATE:deactivating
+ACTIVE-PATH:/org/freedesktop/NetworkManager/ActiveConnection/1
 SLAVE:
 FILENAME:/etc/NetworkManager/system-connections/ethernet
 NAME:ethernet
@@ -16480,9 +16584,9 @@ AUTOCONNECT-PRIORITY:
 READONLY:
 DBUS-PATH:/org/freedesktop/NetworkManager/Settings/Connection/4
 ACTIVE:yes
-DEVICE:eth0
-STATE:deactivating
-ACTIVE-PATH:/org/freedesktop/NetworkManager/ActiveConnection/1
+DEVICE:eth1
+STATE:activated
+ACTIVE-PATH:/org/freedesktop/NetworkManager/ActiveConnection/2
 SLAVE:
 FILENAME:/etc/NetworkManager/system-connections/ethernet
 NAME:con-1
@@ -16533,7 +16637,7 @@ FILENAME:/etc/NetworkManager/system-connections/con-xx1
 
 <<<
 size: 1883
-location: clients/tests/test-client.py:957:test_003()/401
+location: clients/tests/test-client.py:971:test_003()/401
 cmd: $NMCLI --mode multiline --terse -f ALL con
 lang: pl_PL.UTF-8
 returncode: 0
@@ -16549,9 +16653,9 @@ AUTOCONNECT-PRIORITY:
 READONLY:
 DBUS-PATH:/org/freedesktop/NetworkManager/Settings/Connection/4
 ACTIVE:yes
-DEVICE:eth1
-STATE:activated
-ACTIVE-PATH:/org/freedesktop/NetworkManager/ActiveConnection/2
+DEVICE:eth0
+STATE:deactivating
+ACTIVE-PATH:/org/freedesktop/NetworkManager/ActiveConnection/1
 SLAVE:
 FILENAME:/etc/NetworkManager/system-connections/ethernet
 NAME:ethernet
@@ -16564,9 +16668,9 @@ AUTOCONNECT-PRIORITY:
 READONLY:
 DBUS-PATH:/org/freedesktop/NetworkManager/Settings/Connection/4
 ACTIVE:yes
-DEVICE:eth0
-STATE:deactivating
-ACTIVE-PATH:/org/freedesktop/NetworkManager/ActiveConnection/1
+DEVICE:eth1
+STATE:activated
+ACTIVE-PATH:/org/freedesktop/NetworkManager/ActiveConnection/2
 SLAVE:
 FILENAME:/etc/NetworkManager/system-connections/ethernet
 NAME:con-1
@@ -16617,7 +16721,7 @@ FILENAME:/etc/NetworkManager/system-connections/con-xx1
 
 <<<
 size: 336
-location: clients/tests/test-client.py:960:test_003()/402
+location: clients/tests/test-client.py:974:test_003()/402
 cmd: $NMCLI --mode multiline --terse -f UUID,TYPE con
 lang: C
 returncode: 0
@@ -16632,7 +16736,7 @@ TYPE:802-3-ethernet
 
 <<<
 size: 346
-location: clients/tests/test-client.py:960:test_003()/403
+location: clients/tests/test-client.py:974:test_003()/403
 cmd: $NMCLI --mode multiline --terse -f UUID,TYPE con
 lang: pl_PL.UTF-8
 returncode: 0
@@ -16647,7 +16751,7 @@ TYPE:802-3-ethernet
 
 <<<
 size: 205
-location: clients/tests/test-client.py:963:test_003()/404
+location: clients/tests/test-client.py:977:test_003()/404
 cmd: $NMCLI --mode multiline --terse con s ethernet
 lang: C
 returncode: 10
@@ -16657,7 +16761,7 @@ Error: ethernet - no such connection profile.
 
 <<<
 size: 227
-location: clients/tests/test-client.py:963:test_003()/405
+location: clients/tests/test-client.py:977:test_003()/405
 cmd: $NMCLI --mode multiline --terse con s ethernet
 lang: pl_PL.UTF-8
 returncode: 10
@@ -16667,7 +16771,7 @@ Błąd: ethernet — nie ma takiego profilu połączenia.
 
 <<<
 size: 569
-location: clients/tests/test-client.py:966:test_003()/406
+location: clients/tests/test-client.py:980:test_003()/406
 cmd: $NMCLI --mode multiline --terse c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: C
 returncode: 0
@@ -16688,7 +16792,7 @@ GENERAL.MASTER-PATH:
 
 <<<
 size: 579
-location: clients/tests/test-client.py:966:test_003()/407
+location: clients/tests/test-client.py:980:test_003()/407
 cmd: $NMCLI --mode multiline --terse c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: pl_PL.UTF-8
 returncode: 0
@@ -16708,12 +16812,12 @@ GENERAL.ZONE:
 GENERAL.MASTER-PATH:
 
 <<<
-size: 2208
-location: clients/tests/test-client.py:969:test_003()/408
+size: 2282
+location: clients/tests/test-client.py:983:test_003()/408
 cmd: $NMCLI --mode multiline --terse -f all dev show eth0
 lang: C
 returncode: 0
-stdout: 2042 bytes
+stdout: 2116 bytes
 >>>
 GENERAL.DEVICE:eth0
 GENERAL.TYPE:ethernet
@@ -16727,6 +16831,8 @@ GENERAL.HWADDR:C0:61:AE:26:4D:D7
 GENERAL.MTU:0
 GENERAL.STATE:20 (unavailable)
 GENERAL.REASON:0 (No reason given)
+GENERAL.IP4-CONNECTIVITY:0 (unknown)
+GENERAL.IP6-CONNECTIVITY:0 (unknown)
 GENERAL.UDI:/sys/devices/virtual/eth0
 GENERAL.IP-IFACE:
 GENERAL.IS-SOFTWARE:no
@@ -16772,12 +16878,12 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[2]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-
 CONNECTIONS.AVAILABLE-CONNECTIONS[3]: | /org/freedesktop/NetworkManager/Settings/Connection/4
 
 <<<
-size: 2218
-location: clients/tests/test-client.py:969:test_003()/409
+size: 2292
+location: clients/tests/test-client.py:983:test_003()/409
 cmd: $NMCLI --mode multiline --terse -f all dev show eth0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2042 bytes
+stdout: 2116 bytes
 >>>
 GENERAL.DEVICE:eth0
 GENERAL.TYPE:ethernet
@@ -16791,6 +16897,8 @@ GENERAL.HWADDR:C0:61:AE:26:4D:D7
 GENERAL.MTU:0
 GENERAL.STATE:20 (unavailable)
 GENERAL.REASON:0 (No reason given)
+GENERAL.IP4-CONNECTIVITY:0 (unknown)
+GENERAL.IP6-CONNECTIVITY:0 (unknown)
 GENERAL.UDI:/sys/devices/virtual/eth0
 GENERAL.IP-IFACE:
 GENERAL.IS-SOFTWARE:no
@@ -16837,27 +16945,12 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[3]: | /org/freedesktop/NetworkManag
 
 <<<
 size: 2155
-location: clients/tests/test-client.py:957:test_003()/410
+location: clients/tests/test-client.py:971:test_003()/410
 cmd: $NMCLI --mode multiline --terse --color yes -f ALL con
 lang: C
 returncode: 0
 stdout: 1987 bytes
 >>>
-NAME:ethernet
-UUID:UUID-ethernet-REPLACED-REPLACED-REPL
-TYPE:802-3-ethernet
-TIMESTAMP:
-TIMESTAMP-REAL:
-AUTOCONNECT:
-AUTOCONNECT-PRIORITY:
-READONLY:
-DBUS-PATH:/org/freedesktop/NetworkManager/Settings/Connection/4
-ACTIVE:yes
-DEVICE:eth1
-STATE:activated
-ACTIVE-PATH:/org/freedesktop/NetworkManager/ActiveConnection/2
-SLAVE:
-FILENAME:/etc/NetworkManager/system-connections/ethernet
 NAME:ethernet
 UUID:UUID-ethernet-REPLACED-REPLACED-REPL
 TYPE:802-3-ethernet
@@ -16873,6 +16966,21 @@ STATE:deactivating
 ACTIVE-PATH:/org/freedesktop/NetworkManager/ActiveConnection/1
 SLAVE:
 FILENAME:/etc/NetworkManager/system-connections/ethernet
+NAME:ethernet
+UUID:UUID-ethernet-REPLACED-REPLACED-REPL
+TYPE:802-3-ethernet
+TIMESTAMP:
+TIMESTAMP-REAL:
+AUTOCONNECT:
+AUTOCONNECT-PRIORITY:
+READONLY:
+DBUS-PATH:/org/freedesktop/NetworkManager/Settings/Connection/4
+ACTIVE:yes
+DEVICE:eth1
+STATE:activated
+ACTIVE-PATH:/org/freedesktop/NetworkManager/ActiveConnection/2
+SLAVE:
+FILENAME:/etc/NetworkManager/system-connections/ethernet
 NAME:con-1
 UUID:5fcfd6d7-1e63-3332-8826-a7eda103792d
 TYPE:802-3-ethernet
@@ -16921,27 +17029,12 @@ FILENAME:/etc/NetworkManager/system-connections/con-xx1
 
 <<<
 size: 2165
-location: clients/tests/test-client.py:957:test_003()/411
+location: clients/tests/test-client.py:971:test_003()/411
 cmd: $NMCLI --mode multiline --terse --color yes -f ALL con
 lang: pl_PL.UTF-8
 returncode: 0
 stdout: 1987 bytes
 >>>
-NAME:ethernet
-UUID:UUID-ethernet-REPLACED-REPLACED-REPL
-TYPE:802-3-ethernet
-TIMESTAMP:
-TIMESTAMP-REAL:
-AUTOCONNECT:
-AUTOCONNECT-PRIORITY:
-READONLY:
-DBUS-PATH:/org/freedesktop/NetworkManager/Settings/Connection/4
-ACTIVE:yes
-DEVICE:eth1
-STATE:activated
-ACTIVE-PATH:/org/freedesktop/NetworkManager/ActiveConnection/2
-SLAVE:
-FILENAME:/etc/NetworkManager/system-connections/ethernet
 NAME:ethernet
 UUID:UUID-ethernet-REPLACED-REPLACED-REPL
 TYPE:802-3-ethernet
@@ -16957,6 +17050,21 @@ STATE:deactivating
 ACTIVE-PATH:/org/freedesktop/NetworkManager/ActiveConnection/1
 SLAVE:
 FILENAME:/etc/NetworkManager/system-connections/ethernet
+NAME:ethernet
+UUID:UUID-ethernet-REPLACED-REPLACED-REPL
+TYPE:802-3-ethernet
+TIMESTAMP:
+TIMESTAMP-REAL:
+AUTOCONNECT:
+AUTOCONNECT-PRIORITY:
+READONLY:
+DBUS-PATH:/org/freedesktop/NetworkManager/Settings/Connection/4
+ACTIVE:yes
+DEVICE:eth1
+STATE:activated
+ACTIVE-PATH:/org/freedesktop/NetworkManager/ActiveConnection/2
+SLAVE:
+FILENAME:/etc/NetworkManager/system-connections/ethernet
 NAME:con-1
 UUID:5fcfd6d7-1e63-3332-8826-a7eda103792d
 TYPE:802-3-ethernet
@@ -17005,7 +17113,7 @@ FILENAME:/etc/NetworkManager/system-connections/con-xx1
 
 <<<
 size: 348
-location: clients/tests/test-client.py:960:test_003()/412
+location: clients/tests/test-client.py:974:test_003()/412
 cmd: $NMCLI --mode multiline --terse --color yes -f UUID,TYPE con
 lang: C
 returncode: 0
@@ -17020,7 +17128,7 @@ TYPE:802-3-ethernet
 
 <<<
 size: 358
-location: clients/tests/test-client.py:960:test_003()/413
+location: clients/tests/test-client.py:974:test_003()/413
 cmd: $NMCLI --mode multiline --terse --color yes -f UUID,TYPE con
 lang: pl_PL.UTF-8
 returncode: 0
@@ -17035,7 +17143,7 @@ TYPE:802-3-ethernet
 
 <<<
 size: 217
-location: clients/tests/test-client.py:963:test_003()/414
+location: clients/tests/test-client.py:977:test_003()/414
 cmd: $NMCLI --mode multiline --terse --color yes con s ethernet
 lang: C
 returncode: 10
@@ -17045,7 +17153,7 @@ Error: ethernet - no such connection profile.
 
 <<<
 size: 239
-location: clients/tests/test-client.py:963:test_003()/415
+location: clients/tests/test-client.py:977:test_003()/415
 cmd: $NMCLI --mode multiline --terse --color yes con s ethernet
 lang: pl_PL.UTF-8
 returncode: 10
@@ -17055,7 +17163,7 @@ Błąd: ethernet — nie ma takiego profilu połączenia.
 
 <<<
 size: 581
-location: clients/tests/test-client.py:966:test_003()/416
+location: clients/tests/test-client.py:980:test_003()/416
 cmd: $NMCLI --mode multiline --terse --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: C
 returncode: 0
@@ -17076,7 +17184,7 @@ GENERAL.MASTER-PATH:
 
 <<<
 size: 591
-location: clients/tests/test-client.py:966:test_003()/417
+location: clients/tests/test-client.py:980:test_003()/417
 cmd: $NMCLI --mode multiline --terse --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: pl_PL.UTF-8
 returncode: 0
@@ -17096,12 +17204,12 @@ GENERAL.ZONE:
 GENERAL.MASTER-PATH:
 
 <<<
-size: 2220
-location: clients/tests/test-client.py:969:test_003()/418
+size: 2294
+location: clients/tests/test-client.py:983:test_003()/418
 cmd: $NMCLI --mode multiline --terse --color yes -f all dev show eth0
 lang: C
 returncode: 0
-stdout: 2042 bytes
+stdout: 2116 bytes
 >>>
 GENERAL.DEVICE:eth0
 GENERAL.TYPE:ethernet
@@ -17115,6 +17223,8 @@ GENERAL.HWADDR:C0:61:AE:26:4D:D7
 GENERAL.MTU:0
 GENERAL.STATE:20 (unavailable)
 GENERAL.REASON:0 (No reason given)
+GENERAL.IP4-CONNECTIVITY:0 (unknown)
+GENERAL.IP6-CONNECTIVITY:0 (unknown)
 GENERAL.UDI:/sys/devices/virtual/eth0
 GENERAL.IP-IFACE:
 GENERAL.IS-SOFTWARE:no
@@ -17160,12 +17270,12 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[2]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-
 CONNECTIONS.AVAILABLE-CONNECTIONS[3]: | /org/freedesktop/NetworkManager/Settings/Connection/4
 
 <<<
-size: 2230
-location: clients/tests/test-client.py:969:test_003()/419
+size: 2304
+location: clients/tests/test-client.py:983:test_003()/419
 cmd: $NMCLI --mode multiline --terse --color yes -f all dev show eth0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2042 bytes
+stdout: 2116 bytes
 >>>
 GENERAL.DEVICE:eth0
 GENERAL.TYPE:ethernet
@@ -17179,6 +17289,8 @@ GENERAL.HWADDR:C0:61:AE:26:4D:D7
 GENERAL.MTU:0
 GENERAL.STATE:20 (unavailable)
 GENERAL.REASON:0 (No reason given)
+GENERAL.IP4-CONNECTIVITY:0 (unknown)
+GENERAL.IP6-CONNECTIVITY:0 (unknown)
 GENERAL.UDI:/sys/devices/virtual/eth0
 GENERAL.IP-IFACE:
 GENERAL.IS-SOFTWARE:no
diff --git a/clients/tests/test-client.check-on-disk/test_004.expected b/clients/tests/test-client.check-on-disk/test_004.expected
index 26915dd3..d62778c5 100644
--- a/clients/tests/test-client.check-on-disk/test_004.expected
+++ b/clients/tests/test-client.check-on-disk/test_004.expected
@@ -1,5 +1,5 @@
 size: 252
-location: clients/tests/test-client.py:980:test_004()/1
+location: clients/tests/test-client.py:994:test_004()/1
 cmd: $NMCLI c add type wifi ifname '*' ssid foobar con-name con-xx1
 lang: C
 returncode: 0
@@ -9,7 +9,7 @@ Connection 'con-xx1' (UUID-con-xx1-REPLACED-REPLACED-REPLA) successfully added.
 
 <<<
 size: 228
-location: clients/tests/test-client.py:982:test_004()/2
+location: clients/tests/test-client.py:996:test_004()/2
 cmd: $NMCLI connection mod con-xx1 ip.gateway ''
 lang: C
 returncode: 2
@@ -19,7 +19,7 @@ Error: invalid or not allowed setting 'ip': 'ip' is ambiguous: ipv4, ipv6.
 
 <<<
 size: 317
-location: clients/tests/test-client.py:983:test_004()/3
+location: clients/tests/test-client.py:997:test_004()/3
 cmd: $NMCLI connection mod con-xx1 ipv4.gateway 172.16.0.1
 lang: pl_PL.UTF-8
 returncode: 1
@@ -29,7 +29,7 @@ Błąd: zmodyfikowanie połączenia „con-xx1” się nie powiodło: ipv4.gatew
 
 <<<
 size: 277
-location: clients/tests/test-client.py:984:test_004()/4
+location: clients/tests/test-client.py:998:test_004()/4
 cmd: $NMCLI connection mod con-xx1 ipv6.gateway ::99
 lang: C
 returncode: 1
@@ -39,7 +39,7 @@ Error: Failed to modify connection 'con-xx1': ipv6.gateway: gateway cannot be se
 
 <<<
 size: 267
-location: clients/tests/test-client.py:985:test_004()/5
+location: clients/tests/test-client.py:999:test_004()/5
 cmd: $NMCLI connection mod con-xx1 802.abc ''
 lang: C
 returncode: 2
@@ -48,18 +48,18 @@ stderr: 116 bytes
 Error: invalid or not allowed setting '802': '802' is ambiguous: 802-11-wireless, 802-11-wireless-security, 802-1x.
 
 <<<
-size: 136
-location: clients/tests/test-client.py:986:test_004()/6
+size: 137
+location: clients/tests/test-client.py:1000:test_004()/6
 cmd: $NMCLI connection mod con-xx1 802-11-wireless.band a
 lang: C
 returncode: 0
-size: 242
-location: clients/tests/test-client.py:987:test_004()/7
+size: 243
+location: clients/tests/test-client.py:1001:test_004()/7
 cmd: $NMCLI connection mod con-xx1 ipv4.addresses 192.168.77.5/24 ipv4.routes '2.3.4.5/32 192.168.77.1' ipv6.addresses 1:2:3:4::6/64 ipv6.routes 1:2:3:4:5:6::5/128
 lang: C
 returncode: 0
-size: 4047
-location: clients/tests/test-client.py:989:test_004()/8
+size: 4048
+location: clients/tests/test-client.py:1003:test_004()/8
 cmd: $NMCLI con s con-xx1
 lang: C
 returncode: 0
@@ -151,8 +151,8 @@ proxy.pac-url:                          --
 proxy.pac-script:                       --
 
 <<<
-size: 4075
-location: clients/tests/test-client.py:989:test_004()/9
+size: 4076
+location: clients/tests/test-client.py:1003:test_004()/9
 cmd: $NMCLI con s con-xx1
 lang: pl_PL.UTF-8
 returncode: 0
@@ -244,8 +244,8 @@ proxy.pac-url:                          --
 proxy.pac-script:                       --
 
 <<<
-size: 320
-location: clients/tests/test-client.py:996:test_004()/10
+size: 321
+location: clients/tests/test-client.py:1010:test_004()/10
 cmd: $NMCLI connection add type vpn con-name con-vpn-1 ifname '*' vpn-type openvpn vpn.data 'key1 = val1,   key2  = val2, key3=val3'
 lang: C
 returncode: 0
@@ -254,8 +254,8 @@ stdout: 82 bytes
 Connection 'con-vpn-1' (UUID-con-vpn-1-REPLACED-REPLACED-REP) successfully added.
 
 <<<
-size: 392
-location: clients/tests/test-client.py:999:test_004()/11
+size: 393
+location: clients/tests/test-client.py:1013:test_004()/11
 cmd: $NMCLI con s
 lang: C
 returncode: 0
@@ -267,8 +267,8 @@ con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  vpn       --
 con-xx1    UUID-con-xx1-REPLACED-REPLACED-REPLA  wifi      --     
 
 <<<
-size: 402
-location: clients/tests/test-client.py:999:test_004()/12
+size: 403
+location: clients/tests/test-client.py:1013:test_004()/12
 cmd: $NMCLI con s
 lang: pl_PL.UTF-8
 returncode: 0
@@ -281,7 +281,7 @@ con-xx1    UUID-con-xx1-REPLACED-REPLACED-REPLA  wifi      --
 
 <<<
 size: 3515
-location: clients/tests/test-client.py:1001:test_004()/13
+location: clients/tests/test-client.py:1015:test_004()/13
 cmd: $NMCLI con s con-vpn-1
 lang: C
 returncode: 0
@@ -363,7 +363,7 @@ proxy.pac-script:                       --
 
 <<<
 size: 3535
-location: clients/tests/test-client.py:1001:test_004()/14
+location: clients/tests/test-client.py:1015:test_004()/14
 cmd: $NMCLI con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
@@ -445,7 +445,7 @@ proxy.pac-script:                       --
 
 <<<
 size: 240
-location: clients/tests/test-client.py:1003:test_004()/15
+location: clients/tests/test-client.py:1017:test_004()/15
 cmd: $NMCLI con up con-xx1
 lang: C
 returncode: 0
@@ -455,7 +455,7 @@ Connection successfully activated (D-Bus active path: /org/freedesktop/NetworkMa
 
 <<<
 size: 393
-location: clients/tests/test-client.py:1005:test_004()/16
+location: clients/tests/test-client.py:1019:test_004()/16
 cmd: $NMCLI con s
 lang: C
 returncode: 0
@@ -468,7 +468,7 @@ con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  vpn       --
 
 <<<
 size: 403
-location: clients/tests/test-client.py:1005:test_004()/17
+location: clients/tests/test-client.py:1019:test_004()/17
 cmd: $NMCLI con s
 lang: pl_PL.UTF-8
 returncode: 0
@@ -481,7 +481,7 @@ con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  vpn       --
 
 <<<
 size: 242
-location: clients/tests/test-client.py:1007:test_004()/18
+location: clients/tests/test-client.py:1021:test_004()/18
 cmd: $NMCLI con up con-vpn-1
 lang: C
 returncode: 0
@@ -491,7 +491,7 @@ Connection successfully activated (D-Bus active path: /org/freedesktop/NetworkMa
 
 <<<
 size: 393
-location: clients/tests/test-client.py:1009:test_004()/19
+location: clients/tests/test-client.py:1023:test_004()/19
 cmd: $NMCLI con s
 lang: C
 returncode: 0
@@ -504,7 +504,7 @@ con-1      5fcfd6d7-1e63-3332-8826-a7eda103792d  ethernet  --
 
 <<<
 size: 403
-location: clients/tests/test-client.py:1009:test_004()/20
+location: clients/tests/test-client.py:1023:test_004()/20
 cmd: $NMCLI con s
 lang: pl_PL.UTF-8
 returncode: 0
@@ -517,7 +517,7 @@ con-1      5fcfd6d7-1e63-3332-8826-a7eda103792d  ethernet  --
 
 <<<
 size: 4597
-location: clients/tests/test-client.py:1011:test_004()/21
+location: clients/tests/test-client.py:1025:test_004()/21
 cmd: $NMCLI con s con-vpn-1
 lang: C
 returncode: 0
@@ -618,12 +618,12 @@ VPN.CFG[2]:                             key2 = val2
 VPN.CFG[3]:                             key3 = val3
 
 <<<
-size: 4621
-location: clients/tests/test-client.py:1011:test_004()/22
+size: 4623
+location: clients/tests/test-client.py:1025:test_004()/22
 cmd: $NMCLI con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 4475 bytes
+stdout: 4477 bytes
 >>>
 connection.id:                          con-vpn-1
 connection.uuid:                        UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -714,14 +714,14 @@ VPN.TYPE:                               openvpn
 VPN.USERNAME:                           --
 VPN.GATEWAY:                            --
 VPN.BANNER:                             *** VPN connection con-vpn-1 ***
-VPN.VPN-STATE:                          0 - nieznane
+VPN.VPN-STATE:                          0 — nieznane
 VPN.CFG[1]:                             key1 = val1
 VPN.CFG[2]:                             key2 = val2
 VPN.CFG[3]:                             key3 = val3
 
 <<<
 size: 4603
-location: clients/tests/test-client.py:1022:test_004()/23
+location: clients/tests/test-client.py:1036:test_004()/23
 cmd: $NMCLI con s con-vpn-1
 lang: C
 returncode: 0
@@ -822,12 +822,12 @@ VPN.CFG[2]:                             key2 = val2
 VPN.CFG[3]:                             key3 = val3
 
 <<<
-size: 4631
-location: clients/tests/test-client.py:1022:test_004()/24
+size: 4633
+location: clients/tests/test-client.py:1036:test_004()/24
 cmd: $NMCLI con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 4485 bytes
+stdout: 4487 bytes
 >>>
 connection.id:                          con-vpn-1
 connection.uuid:                        UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -918,14 +918,14 @@ VPN.TYPE:                               openvpn
 VPN.USERNAME:                           --
 VPN.GATEWAY:                            --
 VPN.BANNER:                             *** VPN connection con-vpn-1 ***
-VPN.VPN-STATE:                          5 - Połączono z VPN
+VPN.VPN-STATE:                          5 — Połączono z VPN
 VPN.CFG[1]:                             key1 = val1
 VPN.CFG[2]:                             key2 = val2
 VPN.CFG[3]:                             key3 = val3
 
 <<<
 size: 4603
-location: clients/tests/test-client.py:1024:test_004()/25
+location: clients/tests/test-client.py:1038:test_004()/25
 cmd: $NMCLI con s con-vpn-1
 lang: C
 returncode: 0
@@ -1026,12 +1026,12 @@ VPN.CFG[2]:                             key2 = val2
 VPN.CFG[3]:                             key3 = val3
 
 <<<
-size: 4631
-location: clients/tests/test-client.py:1024:test_004()/26
+size: 4633
+location: clients/tests/test-client.py:1038:test_004()/26
 cmd: $NMCLI con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 4485 bytes
+stdout: 4487 bytes
 >>>
 connection.id:                          con-vpn-1
 connection.uuid:                        UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -1122,14 +1122,14 @@ VPN.TYPE:                               openvpn
 VPN.USERNAME:                           --
 VPN.GATEWAY:                            --
 VPN.BANNER:                             *** VPN connection con-vpn-1 ***
-VPN.VPN-STATE:                          5 - Połączono z VPN
+VPN.VPN-STATE:                          5 — Połączono z VPN
 VPN.CFG[1]:                             key1 = val1
 VPN.CFG[2]:                             key2 = val2
 VPN.CFG[3]:                             key3 = val3
 
 <<<
 size: 3522
-location: clients/tests/test-client.py:1027:test_004()/27
+location: clients/tests/test-client.py:1041:test_004()/27
 cmd: $NMCLI -f ALL con s con-vpn-1
 lang: C
 returncode: 0
@@ -1211,7 +1211,7 @@ proxy.pac-script:                       --
 
 <<<
 size: 3542
-location: clients/tests/test-client.py:1027:test_004()/28
+location: clients/tests/test-client.py:1041:test_004()/28
 cmd: $NMCLI -f ALL con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
@@ -1293,7 +1293,7 @@ proxy.pac-script:                       --
 
 <<<
 size: 476
-location: clients/tests/test-client.py:1033:test_004()/29
+location: clients/tests/test-client.py:1047:test_004()/29
 cmd: $NMCLI -f VPN con s con-vpn-1
 lang: C
 returncode: 0
@@ -1308,7 +1308,7 @@ vpn.timeout:                            0
 
 <<<
 size: 487
-location: clients/tests/test-client.py:1033:test_004()/30
+location: clients/tests/test-client.py:1047:test_004()/30
 cmd: $NMCLI -f VPN con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
@@ -1323,7 +1323,7 @@ vpn.timeout:                            0
 
 <<<
 size: 813
-location: clients/tests/test-client.py:1036:test_004()/31
+location: clients/tests/test-client.py:1050:test_004()/31
 cmd: $NMCLI -f GENERAL con s con-vpn-1
 lang: C
 returncode: 0
@@ -1344,7 +1344,7 @@ GENERAL.MASTER-PATH:                    --
 
 <<<
 size: 826
-location: clients/tests/test-client.py:1036:test_004()/32
+location: clients/tests/test-client.py:1050:test_004()/32
 cmd: $NMCLI -f GENERAL con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
@@ -1365,72 +1365,97 @@ GENERAL.MASTER-PATH:                    --
 
 <<<
 size: 383
-location: clients/tests/test-client.py:1039:test_004()/33
+location: clients/tests/test-client.py:1053:test_004()/33
 cmd: $NMCLI dev s
 lang: C
 returncode: 0
 stdout: 258 bytes
 >>>
 DEVICE  TYPE      STATE        CONNECTION 
+wlan0   wifi      unavailable  con-vpn-1  
 eth0    ethernet  unavailable  --         
 eth1    ethernet  unavailable  --         
 wlan1   wifi      unavailable  --         
 wlan1   wifi      unavailable  --         
-wlan0   wifi      unavailable  con-vpn-1  
 
 <<<
 size: 398
-location: clients/tests/test-client.py:1039:test_004()/34
+location: clients/tests/test-client.py:1053:test_004()/34
 cmd: $NMCLI dev s
 lang: pl_PL.UTF-8
 returncode: 0
 stdout: 263 bytes
 >>>
 DEVICE  TYPE      STATE        CONNECTION 
+wlan0   wifi      niedostępne  con-vpn-1  
 eth0    ethernet  niedostępne  --         
 eth1    ethernet  niedostępne  --         
 wlan1   wifi      niedostępne  --         
 wlan1   wifi      niedostępne  --         
-wlan0   wifi      niedostępne  con-vpn-1  
 
 <<<
-size: 1194
-location: clients/tests/test-client.py:1042:test_004()/35
+size: 1410
+location: clients/tests/test-client.py:1056:test_004()/35
 cmd: $NMCLI -f all dev status
 lang: C
 returncode: 0
-stdout: 1056 bytes
+stdout: 1272 bytes
 >>>
-DEVICE  TYPE      STATE        DBUS-PATH                                  CONNECTION  CON-UUID                              CON-PATH                                           
-eth0    ethernet  unavailable  /org/freedesktop/NetworkManager/Devices/1  --          --                                    --                                                 
-eth1    ethernet  unavailable  /org/freedesktop/NetworkManager/Devices/2  --          --                                    --                                                 
-wlan1   wifi      unavailable  /org/freedesktop/NetworkManager/Devices/4  --          --                                    --                                                 
-wlan1   wifi      unavailable  /org/freedesktop/NetworkManager/Devices/5  --          --                                    --                                                 
-wlan0   wifi      unavailable  /org/freedesktop/NetworkManager/Devices/3  con-vpn-1   UUID-con-vpn-1-REPLACED-REPLACED-REP  /org/freedesktop/NetworkManager/ActiveConnection/2 
+DEVICE  TYPE      STATE        IP4-CONNECTIVITY  IP6-CONNECTIVITY  DBUS-PATH                                  CONNECTION  CON-UUID                              CON-PATH                                           
+wlan0   wifi      unavailable  unknown           unknown           /org/freedesktop/NetworkManager/Devices/3  con-vpn-1   UUID-con-vpn-1-REPLACED-REPLACED-REP  /org/freedesktop/NetworkManager/ActiveConnection/2 
+eth0    ethernet  unavailable  unknown           unknown           /org/freedesktop/NetworkManager/Devices/1  --          --                                    --                                                 
+eth1    ethernet  unavailable  unknown           unknown           /org/freedesktop/NetworkManager/Devices/2  --          --                                    --                                                 
+wlan1   wifi      unavailable  unknown           unknown           /org/freedesktop/NetworkManager/Devices/4  --          --                                    --                                                 
+wlan1   wifi      unavailable  unknown           unknown           /org/freedesktop/NetworkManager/Devices/5  --          --                                    --                                                 
 
 <<<
-size: 1209
-location: clients/tests/test-client.py:1042:test_004()/36
+size: 1425
+location: clients/tests/test-client.py:1056:test_004()/36
 cmd: $NMCLI -f all dev status
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 1061 bytes
+stdout: 1277 bytes
 >>>
-DEVICE  TYPE      STATE        DBUS-PATH                                  CONNECTION  CON-UUID                              CON-PATH                                           
-eth0    ethernet  niedostępne  /org/freedesktop/NetworkManager/Devices/1  --          --                                    --                                                 
-eth1    ethernet  niedostępne  /org/freedesktop/NetworkManager/Devices/2  --          --                                    --                                                 
-wlan1   wifi      niedostępne  /org/freedesktop/NetworkManager/Devices/4  --          --                                    --                                                 
-wlan1   wifi      niedostępne  /org/freedesktop/NetworkManager/Devices/5  --          --                                    --                                                 
-wlan0   wifi      niedostępne  /org/freedesktop/NetworkManager/Devices/3  con-vpn-1   UUID-con-vpn-1-REPLACED-REPLACED-REP  /org/freedesktop/NetworkManager/ActiveConnection/2 
+DEVICE  TYPE      STATE        IP4-CONNECTIVITY  IP6-CONNECTIVITY  DBUS-PATH                                  CONNECTION  CON-UUID                              CON-PATH                                           
+wlan0   wifi      niedostępne  nieznane          nieznane          /org/freedesktop/NetworkManager/Devices/3  con-vpn-1   UUID-con-vpn-1-REPLACED-REPLACED-REP  /org/freedesktop/NetworkManager/ActiveConnection/2 
+eth0    ethernet  niedostępne  nieznane          nieznane          /org/freedesktop/NetworkManager/Devices/1  --          --                                    --                                                 
+eth1    ethernet  niedostępne  nieznane          nieznane          /org/freedesktop/NetworkManager/Devices/2  --          --                                    --                                                 
+wlan1   wifi      niedostępne  nieznane          nieznane          /org/freedesktop/NetworkManager/Devices/4  --          --                                    --                                                 
+wlan1   wifi      niedostępne  nieznane          nieznane          /org/freedesktop/NetworkManager/Devices/5  --          --                                    --                                                 
 
 <<<
 size: 8047
-location: clients/tests/test-client.py:1045:test_004()/37
+location: clients/tests/test-client.py:1059:test_004()/37
 cmd: $NMCLI dev show
 lang: C
 returncode: 0
 stdout: 7918 bytes
 >>>
+GENERAL.DEVICE:                         wlan0
+GENERAL.TYPE:                           wifi
+GENERAL.HWADDR:                         13:E0:74:85:7C:D9
+GENERAL.MTU:                            0
+GENERAL.STATE:                          20 (unavailable)
+GENERAL.CONNECTION:                     con-vpn-1
+GENERAL.CON-PATH:                       /org/freedesktop/NetworkManager/ActiveConnection/2
+IP4.ADDRESS[1]:                         192.168.228.18/32
+IP4.ADDRESS[2]:                         192.168.209.179/25
+IP4.GATEWAY:                            192.168.41.120
+IP4.DOMAIN[1]:                          sear4.foo2.bar
+IP4.DOMAIN[2]:                          sear4.fo.x.y
+IP4.DOMAIN[3]:                          sear4.foo1.bar
+IP4.DOMAIN[4]:                          sear4.foo4.bar
+IP4.DOMAIN[5]:                          sear4.fo.o.bar
+IP4.WINS[1]:                            192.168.120.79
+IP6.GATEWAY:                            --
+IP6.ROUTE[1]:                           dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086
+IP6.DOMAIN[1]:                          sear6.foo2.bar
+IP6.DOMAIN[2]:                          sear6.foo1.bar
+IP6.DOMAIN[3]:                          sear6.fo.x.y
+IP6.DOMAIN[4]:                          sear6.fo.o.bar
+IP6.DOMAIN[5]:                          sear6.foo3.bar
+IP6.DOMAIN[6]:                          sear6.foo4.bar
+
 GENERAL.DEVICE:                         eth0
 GENERAL.TYPE:                           ethernet
 GENERAL.HWADDR:                         AB:B7:BF:E2:48:E8
@@ -1544,11 +1569,19 @@ IP6.ROUTE[3]:                           dst = 2001:a::afb7:4449:3787:8bb4/123, n
 IP6.DNS[1]:                             2001:a::2934:bd66:550d:ec19
 IP6.DOMAIN[1]:                          sear6.fo.x.y
 
+<<<
+size: 8078
+location: clients/tests/test-client.py:1059:test_004()/38
+cmd: $NMCLI dev show
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 7939 bytes
+>>>
 GENERAL.DEVICE:                         wlan0
 GENERAL.TYPE:                           wifi
 GENERAL.HWADDR:                         13:E0:74:85:7C:D9
 GENERAL.MTU:                            0
-GENERAL.STATE:                          20 (unavailable)
+GENERAL.STATE:                          20 (niedostępne)
 GENERAL.CONNECTION:                     con-vpn-1
 GENERAL.CON-PATH:                       /org/freedesktop/NetworkManager/ActiveConnection/2
 IP4.ADDRESS[1]:                         192.168.228.18/32
@@ -1569,14 +1602,6 @@ IP6.DOMAIN[4]:                          sear6.fo.o.bar
 IP6.DOMAIN[5]:                          sear6.foo3.bar
 IP6.DOMAIN[6]:                          sear6.foo4.bar
 
-<<<
-size: 8078
-location: clients/tests/test-client.py:1045:test_004()/38
-cmd: $NMCLI dev show
-lang: pl_PL.UTF-8
-returncode: 0
-stdout: 7939 bytes
->>>
 GENERAL.DEVICE:                         eth0
 GENERAL.TYPE:                           ethernet
 GENERAL.HWADDR:                         AB:B7:BF:E2:48:E8
@@ -1690,13 +1715,77 @@ IP6.ROUTE[3]:                           dst = 2001:a::afb7:4449:3787:8bb4/123, n
 IP6.DNS[1]:                             2001:a::2934:bd66:550d:ec19
 IP6.DOMAIN[1]:                          sear6.fo.x.y
 
+<<<
+size: 20660
+location: clients/tests/test-client.py:1062:test_004()/39
+cmd: $NMCLI -f all dev show
+lang: C
+returncode: 0
+stdout: 20523 bytes
+>>>
 GENERAL.DEVICE:                         wlan0
 GENERAL.TYPE:                           wifi
+GENERAL.NM-TYPE:                        NMDeviceWifi
+GENERAL.VENDOR:                         --
+GENERAL.PRODUCT:                        --
+GENERAL.DRIVER:                         virtual
+GENERAL.DRIVER-VERSION:                 --
+GENERAL.FIRMWARE-VERSION:               --
 GENERAL.HWADDR:                         13:E0:74:85:7C:D9
 GENERAL.MTU:                            0
-GENERAL.STATE:                          20 (niedostępne)
+GENERAL.STATE:                          20 (unavailable)
+GENERAL.REASON:                         0 (No reason given)
+GENERAL.IP4-CONNECTIVITY:               0 (unknown)
+GENERAL.IP6-CONNECTIVITY:               0 (unknown)
+GENERAL.UDI:                            /sys/devices/virtual/wlan0
+GENERAL.IP-IFACE:                       --
+GENERAL.IS-SOFTWARE:                    no
+GENERAL.NM-MANAGED:                     yes
+GENERAL.AUTOCONNECT:                    yes
+GENERAL.FIRMWARE-MISSING:               no
+GENERAL.NM-PLUGIN-MISSING:              no
+GENERAL.PHYS-PORT-ID:                   --
 GENERAL.CONNECTION:                     con-vpn-1
+GENERAL.CON-UUID:                       UUID-con-vpn-1-REPLACED-REPLACED-REP
 GENERAL.CON-PATH:                       /org/freedesktop/NetworkManager/ActiveConnection/2
+GENERAL.METERED:                        unknown
+CAPABILITIES.CARRIER-DETECT:            no
+CAPABILITIES.SPEED:                     unknown
+CAPABILITIES.IS-SOFTWARE:               no
+CAPABILITIES.SRIOV:                     no
+WIFI-PROPERTIES.WEP:                    yes
+WIFI-PROPERTIES.WPA:                    yes
+WIFI-PROPERTIES.WPA2:                   yes
+WIFI-PROPERTIES.TKIP:                   yes
+WIFI-PROPERTIES.CCMP:                   yes
+WIFI-PROPERTIES.AP:                     yes
+WIFI-PROPERTIES.ADHOC:                  yes
+WIFI-PROPERTIES.2GHZ:                   unknown
+WIFI-PROPERTIES.5GHZ:                   unknown
+AP[1].IN-USE:                            
+AP[1].SSID:                             wlan0-ap-2
+AP[1].MODE:                             Infra
+AP[1].CHAN:                             1
+AP[1].RATE:                             54 Mbit/s
+AP[1].SIGNAL:                           92
+AP[1].BARS:                             ****
+AP[1].SECURITY:                         WPA1 WPA2
+AP[2].IN-USE:                            
+AP[2].SSID:                             wlan0-ap-1
+AP[2].MODE:                             Infra
+AP[2].CHAN:                             1
+AP[2].RATE:                             54 Mbit/s
+AP[2].SIGNAL:                           81
+AP[2].BARS:                             ****
+AP[2].SECURITY:                         WPA1
+AP[3].IN-USE:                            
+AP[3].SSID:                             wlan0-ap-3
+AP[3].MODE:                             Infra
+AP[3].CHAN:                             1
+AP[3].RATE:                             54 Mbit/s
+AP[3].SIGNAL:                           55
+AP[3].BARS:                             **  
+AP[3].SECURITY:                         WPA3
 IP4.ADDRESS[1]:                         192.168.228.18/32
 IP4.ADDRESS[2]:                         192.168.209.179/25
 IP4.GATEWAY:                            192.168.41.120
@@ -1706,6 +1795,10 @@ IP4.DOMAIN[3]:                          sear4.foo1.bar
 IP4.DOMAIN[4]:                          sear4.foo4.bar
 IP4.DOMAIN[5]:                          sear4.fo.o.bar
 IP4.WINS[1]:                            192.168.120.79
+DHCP4.OPTION[1]:                        dhcp-4-opt-0 = val-0
+DHCP4.OPTION[2]:                        dhcp-4-opt-2 = val-2
+DHCP4.OPTION[3]:                        dhcp-4-opt-4 = val-4
+DHCP4.OPTION[4]:                        dhcp-4-opt-7 = val-7
 IP6.GATEWAY:                            --
 IP6.ROUTE[1]:                           dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086
 IP6.DOMAIN[1]:                          sear6.foo2.bar
@@ -1714,15 +1807,14 @@ IP6.DOMAIN[3]:                          sear6.fo.x.y
 IP6.DOMAIN[4]:                          sear6.fo.o.bar
 IP6.DOMAIN[5]:                          sear6.foo3.bar
 IP6.DOMAIN[6]:                          sear6.foo4.bar
+DHCP6.OPTION[1]:                        dhcp-6-opt-1 = val-1
+DHCP6.OPTION[2]:                        dhcp-6-opt-2 = val-2
+DHCP6.OPTION[3]:                        dhcp-6-opt-3 = val-3
+DHCP6.OPTION[4]:                        dhcp-6-opt-4 = val-4
+DHCP6.OPTION[5]:                        dhcp-6-opt-5 = val-5
+CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings/Connection/{2}
+CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 
-<<<
-size: 20150
-location: clients/tests/test-client.py:1048:test_004()/39
-cmd: $NMCLI -f all dev show
-lang: C
-returncode: 0
-stdout: 20013 bytes
->>>
 GENERAL.DEVICE:                         eth0
 GENERAL.TYPE:                           ethernet
 GENERAL.NM-TYPE:                        NMDeviceEthernet
@@ -1735,6 +1827,8 @@ GENERAL.HWADDR:                         AB:B7:BF:E2:48:E8
 GENERAL.MTU:                            0
 GENERAL.STATE:                          20 (unavailable)
 GENERAL.REASON:                         0 (No reason given)
+GENERAL.IP4-CONNECTIVITY:               0 (unknown)
+GENERAL.IP6-CONNECTIVITY:               0 (unknown)
 GENERAL.UDI:                            /sys/devices/virtual/eth0
 GENERAL.IP-IFACE:                       --
 GENERAL.IS-SOFTWARE:                    no
@@ -1796,6 +1890,8 @@ GENERAL.HWADDR:                         E7:78:B1:93:2B:22
 GENERAL.MTU:                            0
 GENERAL.STATE:                          20 (unavailable)
 GENERAL.REASON:                         0 (No reason given)
+GENERAL.IP4-CONNECTIVITY:               0 (unknown)
+GENERAL.IP6-CONNECTIVITY:               0 (unknown)
 GENERAL.UDI:                            /sys/devices/virtual/eth1
 GENERAL.IP-IFACE:                       --
 GENERAL.IS-SOFTWARE:                    no
@@ -1864,6 +1960,8 @@ GENERAL.HWADDR:                         21:E9:64:81:8C:A8
 GENERAL.MTU:                            0
 GENERAL.STATE:                          20 (unavailable)
 GENERAL.REASON:                         0 (No reason given)
+GENERAL.IP4-CONNECTIVITY:               0 (unknown)
+GENERAL.IP6-CONNECTIVITY:               0 (unknown)
 GENERAL.UDI:                            /sys/devices/virtual/wlan1
 GENERAL.IP-IFACE:                       --
 GENERAL.IS-SOFTWARE:                    no
@@ -1950,6 +2048,8 @@ GENERAL.HWADDR:                         71:52:AD:63:5C:7C
 GENERAL.MTU:                            0
 GENERAL.STATE:                          20 (unavailable)
 GENERAL.REASON:                         0 (No reason given)
+GENERAL.IP4-CONNECTIVITY:               0 (unknown)
+GENERAL.IP6-CONNECTIVITY:               0 (unknown)
 GENERAL.UDI:                            /sys/devices/virtual/wlan1
 GENERAL.IP-IFACE:                       --
 GENERAL.IS-SOFTWARE:                    no
@@ -2004,6 +2104,14 @@ DHCP6.OPTION[5]:                        dhcp-6-opt-9 = val-9
 CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings/Connection/{2}
 CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 
+<<<
+size: 20810
+location: clients/tests/test-client.py:1062:test_004()/40
+cmd: $NMCLI -f all dev show
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 20663 bytes
+>>>
 GENERAL.DEVICE:                         wlan0
 GENERAL.TYPE:                           wifi
 GENERAL.NM-TYPE:                        NMDeviceWifi
@@ -2014,57 +2122,59 @@ GENERAL.DRIVER-VERSION:                 --
 GENERAL.FIRMWARE-VERSION:               --
 GENERAL.HWADDR:                         13:E0:74:85:7C:D9
 GENERAL.MTU:                            0
-GENERAL.STATE:                          20 (unavailable)
-GENERAL.REASON:                         0 (No reason given)
+GENERAL.STATE:                          20 (niedostępne)
+GENERAL.REASON:                         0 (Nie podano przyczyny)
+GENERAL.IP4-CONNECTIVITY:               0 (nieznane)
+GENERAL.IP6-CONNECTIVITY:               0 (nieznane)
 GENERAL.UDI:                            /sys/devices/virtual/wlan0
 GENERAL.IP-IFACE:                       --
-GENERAL.IS-SOFTWARE:                    no
-GENERAL.NM-MANAGED:                     yes
-GENERAL.AUTOCONNECT:                    yes
-GENERAL.FIRMWARE-MISSING:               no
-GENERAL.NM-PLUGIN-MISSING:              no
+GENERAL.IS-SOFTWARE:                    nie
+GENERAL.NM-MANAGED:                     tak
+GENERAL.AUTOCONNECT:                    tak
+GENERAL.FIRMWARE-MISSING:               nie
+GENERAL.NM-PLUGIN-MISSING:              nie
 GENERAL.PHYS-PORT-ID:                   --
 GENERAL.CONNECTION:                     con-vpn-1
 GENERAL.CON-UUID:                       UUID-con-vpn-1-REPLACED-REPLACED-REP
 GENERAL.CON-PATH:                       /org/freedesktop/NetworkManager/ActiveConnection/2
-GENERAL.METERED:                        unknown
-CAPABILITIES.CARRIER-DETECT:            no
-CAPABILITIES.SPEED:                     unknown
-CAPABILITIES.IS-SOFTWARE:               no
-CAPABILITIES.SRIOV:                     no
-WIFI-PROPERTIES.WEP:                    yes
-WIFI-PROPERTIES.WPA:                    yes
-WIFI-PROPERTIES.WPA2:                   yes
-WIFI-PROPERTIES.TKIP:                   yes
-WIFI-PROPERTIES.CCMP:                   yes
-WIFI-PROPERTIES.AP:                     yes
-WIFI-PROPERTIES.ADHOC:                  yes
-WIFI-PROPERTIES.2GHZ:                   unknown
-WIFI-PROPERTIES.5GHZ:                   unknown
+GENERAL.METERED:                        nieznane
+CAPABILITIES.CARRIER-DETECT:            nie
+CAPABILITIES.SPEED:                     nieznane
+CAPABILITIES.IS-SOFTWARE:               nie
+CAPABILITIES.SRIOV:                     nie
+WIFI-PROPERTIES.WEP:                    tak
+WIFI-PROPERTIES.WPA:                    tak
+WIFI-PROPERTIES.WPA2:                   tak
+WIFI-PROPERTIES.TKIP:                   tak
+WIFI-PROPERTIES.CCMP:                   tak
+WIFI-PROPERTIES.AP:                     tak
+WIFI-PROPERTIES.ADHOC:                  tak
+WIFI-PROPERTIES.2GHZ:                   nieznane
+WIFI-PROPERTIES.5GHZ:                   nieznane
 AP[1].IN-USE:                            
 AP[1].SSID:                             wlan0-ap-2
-AP[1].MODE:                             Infra
+AP[1].MODE:                             Infrastruktura
 AP[1].CHAN:                             1
-AP[1].RATE:                             54 Mbit/s
+AP[1].RATE:                             54 Mb/s
 AP[1].SIGNAL:                           92
 AP[1].BARS:                             ****
 AP[1].SECURITY:                         WPA1 WPA2
 AP[2].IN-USE:                            
 AP[2].SSID:                             wlan0-ap-1
-AP[2].MODE:                             Infra
+AP[2].MODE:                             Infrastruktura
 AP[2].CHAN:                             1
-AP[2].RATE:                             54 Mbit/s
+AP[2].RATE:                             54 Mb/s
 AP[2].SIGNAL:                           81
 AP[2].BARS:                             ****
-AP[2].SECURITY:                         WPA1 WPA2
+AP[2].SECURITY:                         WPA1
 AP[3].IN-USE:                            
 AP[3].SSID:                             wlan0-ap-3
-AP[3].MODE:                             Infra
+AP[3].MODE:                             Infrastruktura
 AP[3].CHAN:                             1
-AP[3].RATE:                             54 Mbit/s
+AP[3].RATE:                             54 Mb/s
 AP[3].SIGNAL:                           55
 AP[3].BARS:                             **  
-AP[3].SECURITY:                         WPA1 WPA2
+AP[3].SECURITY:                         WPA3
 IP4.ADDRESS[1]:                         192.168.228.18/32
 IP4.ADDRESS[2]:                         192.168.209.179/25
 IP4.GATEWAY:                            192.168.41.120
@@ -2094,14 +2204,6 @@ DHCP6.OPTION[5]:                        dhcp-6-opt-5 = val-5
 CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings/Connection/{2}
 CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 
-<<<
-size: 20290
-location: clients/tests/test-client.py:1048:test_004()/40
-cmd: $NMCLI -f all dev show
-lang: pl_PL.UTF-8
-returncode: 0
-stdout: 20143 bytes
->>>
 GENERAL.DEVICE:                         eth0
 GENERAL.TYPE:                           ethernet
 GENERAL.NM-TYPE:                        NMDeviceEthernet
@@ -2114,6 +2216,8 @@ GENERAL.HWADDR:                         AB:B7:BF:E2:48:E8
 GENERAL.MTU:                            0
 GENERAL.STATE:                          20 (niedostępne)
 GENERAL.REASON:                         0 (Nie podano przyczyny)
+GENERAL.IP4-CONNECTIVITY:               0 (nieznane)
+GENERAL.IP6-CONNECTIVITY:               0 (nieznane)
 GENERAL.UDI:                            /sys/devices/virtual/eth0
 GENERAL.IP-IFACE:                       --
 GENERAL.IS-SOFTWARE:                    nie
@@ -2175,6 +2279,8 @@ GENERAL.HWADDR:                         E7:78:B1:93:2B:22
 GENERAL.MTU:                            0
 GENERAL.STATE:                          20 (niedostępne)
 GENERAL.REASON:                         0 (Nie podano przyczyny)
+GENERAL.IP4-CONNECTIVITY:               0 (nieznane)
+GENERAL.IP6-CONNECTIVITY:               0 (nieznane)
 GENERAL.UDI:                            /sys/devices/virtual/eth1
 GENERAL.IP-IFACE:                       --
 GENERAL.IS-SOFTWARE:                    nie
@@ -2243,6 +2349,8 @@ GENERAL.HWADDR:                         21:E9:64:81:8C:A8
 GENERAL.MTU:                            0
 GENERAL.STATE:                          20 (niedostępne)
 GENERAL.REASON:                         0 (Nie podano przyczyny)
+GENERAL.IP4-CONNECTIVITY:               0 (nieznane)
+GENERAL.IP6-CONNECTIVITY:               0 (nieznane)
 GENERAL.UDI:                            /sys/devices/virtual/wlan1
 GENERAL.IP-IFACE:                       --
 GENERAL.IS-SOFTWARE:                    nie
@@ -2329,6 +2437,8 @@ GENERAL.HWADDR:                         71:52:AD:63:5C:7C
 GENERAL.MTU:                            0
 GENERAL.STATE:                          20 (niedostępne)
 GENERAL.REASON:                         0 (Nie podano przyczyny)
+GENERAL.IP4-CONNECTIVITY:               0 (nieznane)
+GENERAL.IP6-CONNECTIVITY:               0 (nieznane)
 GENERAL.UDI:                            /sys/devices/virtual/wlan1
 GENERAL.IP-IFACE:                       --
 GENERAL.IS-SOFTWARE:                    nie
@@ -2383,67 +2493,21 @@ DHCP6.OPTION[5]:                        dhcp-6-opt-9 = val-9
 CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings/Connection/{2}
 CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 
+<<<
+size: 1498
+location: clients/tests/test-client.py:1065:test_004()/41
+cmd: $NMCLI dev show wlan0
+lang: C
+returncode: 0
+stdout: 1363 bytes
+>>>
 GENERAL.DEVICE:                         wlan0
 GENERAL.TYPE:                           wifi
-GENERAL.NM-TYPE:                        NMDeviceWifi
-GENERAL.VENDOR:                         --
-GENERAL.PRODUCT:                        --
-GENERAL.DRIVER:                         virtual
-GENERAL.DRIVER-VERSION:                 --
-GENERAL.FIRMWARE-VERSION:               --
 GENERAL.HWADDR:                         13:E0:74:85:7C:D9
 GENERAL.MTU:                            0
-GENERAL.STATE:                          20 (niedostępne)
-GENERAL.REASON:                         0 (Nie podano przyczyny)
-GENERAL.UDI:                            /sys/devices/virtual/wlan0
-GENERAL.IP-IFACE:                       --
-GENERAL.IS-SOFTWARE:                    nie
-GENERAL.NM-MANAGED:                     tak
-GENERAL.AUTOCONNECT:                    tak
-GENERAL.FIRMWARE-MISSING:               nie
-GENERAL.NM-PLUGIN-MISSING:              nie
-GENERAL.PHYS-PORT-ID:                   --
+GENERAL.STATE:                          20 (unavailable)
 GENERAL.CONNECTION:                     con-vpn-1
-GENERAL.CON-UUID:                       UUID-con-vpn-1-REPLACED-REPLACED-REP
 GENERAL.CON-PATH:                       /org/freedesktop/NetworkManager/ActiveConnection/2
-GENERAL.METERED:                        nieznane
-CAPABILITIES.CARRIER-DETECT:            nie
-CAPABILITIES.SPEED:                     nieznane
-CAPABILITIES.IS-SOFTWARE:               nie
-CAPABILITIES.SRIOV:                     nie
-WIFI-PROPERTIES.WEP:                    tak
-WIFI-PROPERTIES.WPA:                    tak
-WIFI-PROPERTIES.WPA2:                   tak
-WIFI-PROPERTIES.TKIP:                   tak
-WIFI-PROPERTIES.CCMP:                   tak
-WIFI-PROPERTIES.AP:                     tak
-WIFI-PROPERTIES.ADHOC:                  tak
-WIFI-PROPERTIES.2GHZ:                   nieznane
-WIFI-PROPERTIES.5GHZ:                   nieznane
-AP[1].IN-USE:                            
-AP[1].SSID:                             wlan0-ap-2
-AP[1].MODE:                             Infrastruktura
-AP[1].CHAN:                             1
-AP[1].RATE:                             54 Mb/s
-AP[1].SIGNAL:                           92
-AP[1].BARS:                             ****
-AP[1].SECURITY:                         WPA1 WPA2
-AP[2].IN-USE:                            
-AP[2].SSID:                             wlan0-ap-1
-AP[2].MODE:                             Infrastruktura
-AP[2].CHAN:                             1
-AP[2].RATE:                             54 Mb/s
-AP[2].SIGNAL:                           81
-AP[2].BARS:                             ****
-AP[2].SECURITY:                         WPA1 WPA2
-AP[3].IN-USE:                            
-AP[3].SSID:                             wlan0-ap-3
-AP[3].MODE:                             Infrastruktura
-AP[3].CHAN:                             1
-AP[3].RATE:                             54 Mb/s
-AP[3].SIGNAL:                           55
-AP[3].BARS:                             **  
-AP[3].SECURITY:                         WPA1 WPA2
 IP4.ADDRESS[1]:                         192.168.228.18/32
 IP4.ADDRESS[2]:                         192.168.209.179/25
 IP4.GATEWAY:                            192.168.41.120
@@ -2453,10 +2517,6 @@ IP4.DOMAIN[3]:                          sear4.foo1.bar
 IP4.DOMAIN[4]:                          sear4.foo4.bar
 IP4.DOMAIN[5]:                          sear4.fo.o.bar
 IP4.WINS[1]:                            192.168.120.79
-DHCP4.OPTION[1]:                        dhcp-4-opt-0 = val-0
-DHCP4.OPTION[2]:                        dhcp-4-opt-2 = val-2
-DHCP4.OPTION[3]:                        dhcp-4-opt-4 = val-4
-DHCP4.OPTION[4]:                        dhcp-4-opt-7 = val-7
 IP6.GATEWAY:                            --
 IP6.ROUTE[1]:                           dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086
 IP6.DOMAIN[1]:                          sear6.foo2.bar
@@ -2465,27 +2525,20 @@ IP6.DOMAIN[3]:                          sear6.fo.x.y
 IP6.DOMAIN[4]:                          sear6.fo.o.bar
 IP6.DOMAIN[5]:                          sear6.foo3.bar
 IP6.DOMAIN[6]:                          sear6.foo4.bar
-DHCP6.OPTION[1]:                        dhcp-6-opt-1 = val-1
-DHCP6.OPTION[2]:                        dhcp-6-opt-2 = val-2
-DHCP6.OPTION[3]:                        dhcp-6-opt-3 = val-3
-DHCP6.OPTION[4]:                        dhcp-6-opt-4 = val-4
-DHCP6.OPTION[5]:                        dhcp-6-opt-5 = val-5
-CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings/Connection/{2}
-CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 
 <<<
-size: 1498
-location: clients/tests/test-client.py:1051:test_004()/41
+size: 1509
+location: clients/tests/test-client.py:1065:test_004()/42
 cmd: $NMCLI dev show wlan0
-lang: C
+lang: pl_PL.UTF-8
 returncode: 0
-stdout: 1363 bytes
+stdout: 1364 bytes
 >>>
 GENERAL.DEVICE:                         wlan0
 GENERAL.TYPE:                           wifi
 GENERAL.HWADDR:                         13:E0:74:85:7C:D9
 GENERAL.MTU:                            0
-GENERAL.STATE:                          20 (unavailable)
+GENERAL.STATE:                          20 (niedostępne)
 GENERAL.CONNECTION:                     con-vpn-1
 GENERAL.CON-PATH:                       /org/freedesktop/NetworkManager/ActiveConnection/2
 IP4.ADDRESS[1]:                         192.168.228.18/32
@@ -2507,45 +2560,12 @@ IP6.DOMAIN[5]:                          sear6.foo3.bar
 IP6.DOMAIN[6]:                          sear6.foo4.bar
 
 <<<
-size: 1509
-location: clients/tests/test-client.py:1051:test_004()/42
-cmd: $NMCLI dev show wlan0
-lang: pl_PL.UTF-8
-returncode: 0
-stdout: 1364 bytes
->>>
-GENERAL.DEVICE:                         wlan0
-GENERAL.TYPE:                           wifi
-GENERAL.HWADDR:                         13:E0:74:85:7C:D9
-GENERAL.MTU:                            0
-GENERAL.STATE:                          20 (niedostępne)
-GENERAL.CONNECTION:                     con-vpn-1
-GENERAL.CON-PATH:                       /org/freedesktop/NetworkManager/ActiveConnection/2
-IP4.ADDRESS[1]:                         192.168.228.18/32
-IP4.ADDRESS[2]:                         192.168.209.179/25
-IP4.GATEWAY:                            192.168.41.120
-IP4.DOMAIN[1]:                          sear4.foo2.bar
-IP4.DOMAIN[2]:                          sear4.fo.x.y
-IP4.DOMAIN[3]:                          sear4.foo1.bar
-IP4.DOMAIN[4]:                          sear4.foo4.bar
-IP4.DOMAIN[5]:                          sear4.fo.o.bar
-IP4.WINS[1]:                            192.168.120.79
-IP6.GATEWAY:                            --
-IP6.ROUTE[1]:                           dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086
-IP6.DOMAIN[1]:                          sear6.foo2.bar
-IP6.DOMAIN[2]:                          sear6.foo1.bar
-IP6.DOMAIN[3]:                          sear6.fo.x.y
-IP6.DOMAIN[4]:                          sear6.fo.o.bar
-IP6.DOMAIN[5]:                          sear6.foo3.bar
-IP6.DOMAIN[6]:                          sear6.foo4.bar
-
-<<<
-size: 4753
-location: clients/tests/test-client.py:1054:test_004()/43
+size: 4847
+location: clients/tests/test-client.py:1068:test_004()/43
 cmd: $NMCLI -f all dev show wlan0
 lang: C
 returncode: 0
-stdout: 4611 bytes
+stdout: 4705 bytes
 >>>
 GENERAL.DEVICE:                         wlan0
 GENERAL.TYPE:                           wifi
@@ -2559,6 +2579,8 @@ GENERAL.HWADDR:                         13:E0:74:85:7C:D9
 GENERAL.MTU:                            0
 GENERAL.STATE:                          20 (unavailable)
 GENERAL.REASON:                         0 (No reason given)
+GENERAL.IP4-CONNECTIVITY:               0 (unknown)
+GENERAL.IP6-CONNECTIVITY:               0 (unknown)
 GENERAL.UDI:                            /sys/devices/virtual/wlan0
 GENERAL.IP-IFACE:                       --
 GENERAL.IS-SOFTWARE:                    no
@@ -2599,7 +2621,7 @@ AP[2].CHAN:                             1
 AP[2].RATE:                             54 Mbit/s
 AP[2].SIGNAL:                           81
 AP[2].BARS:                             ****
-AP[2].SECURITY:                         WPA1 WPA2
+AP[2].SECURITY:                         WPA1
 AP[3].IN-USE:                            
 AP[3].SSID:                             wlan0-ap-3
 AP[3].MODE:                             Infra
@@ -2607,7 +2629,7 @@ AP[3].CHAN:                             1
 AP[3].RATE:                             54 Mbit/s
 AP[3].SIGNAL:                           55
 AP[3].BARS:                             **  
-AP[3].SECURITY:                         WPA1 WPA2
+AP[3].SECURITY:                         WPA3
 IP4.ADDRESS[1]:                         192.168.228.18/32
 IP4.ADDRESS[2]:                         192.168.209.179/25
 IP4.GATEWAY:                            192.168.41.120
@@ -2638,12 +2660,12 @@ CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings
 CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 
 <<<
-size: 4806
-location: clients/tests/test-client.py:1054:test_004()/44
+size: 4902
+location: clients/tests/test-client.py:1068:test_004()/44
 cmd: $NMCLI -f all dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 4654 bytes
+stdout: 4750 bytes
 >>>
 GENERAL.DEVICE:                         wlan0
 GENERAL.TYPE:                           wifi
@@ -2657,6 +2679,8 @@ GENERAL.HWADDR:                         13:E0:74:85:7C:D9
 GENERAL.MTU:                            0
 GENERAL.STATE:                          20 (niedostępne)
 GENERAL.REASON:                         0 (Nie podano przyczyny)
+GENERAL.IP4-CONNECTIVITY:               0 (nieznane)
+GENERAL.IP6-CONNECTIVITY:               0 (nieznane)
 GENERAL.UDI:                            /sys/devices/virtual/wlan0
 GENERAL.IP-IFACE:                       --
 GENERAL.IS-SOFTWARE:                    nie
@@ -2697,7 +2721,7 @@ AP[2].CHAN:                             1
 AP[2].RATE:                             54 Mb/s
 AP[2].SIGNAL:                           81
 AP[2].BARS:                             ****
-AP[2].SECURITY:                         WPA1 WPA2
+AP[2].SECURITY:                         WPA1
 AP[3].IN-USE:                            
 AP[3].SSID:                             wlan0-ap-3
 AP[3].MODE:                             Infrastruktura
@@ -2705,7 +2729,7 @@ AP[3].CHAN:                             1
 AP[3].RATE:                             54 Mb/s
 AP[3].SIGNAL:                           55
 AP[3].BARS:                             **  
-AP[3].SECURITY:                         WPA1 WPA2
+AP[3].SECURITY:                         WPA3
 IP4.ADDRESS[1]:                         192.168.228.18/32
 IP4.ADDRESS[2]:                         192.168.209.179/25
 IP4.GATEWAY:                            192.168.41.120
@@ -2736,12 +2760,12 @@ CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings
 CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 
 <<<
-size: 1856
-location: clients/tests/test-client.py:1057:test_004()/45
+size: 1960
+location: clients/tests/test-client.py:1071:test_004()/45
 cmd: $NMCLI -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: C
 returncode: 0
-stdout: 1679 bytes
+stdout: 1783 bytes
 >>>
 GENERAL.DEVICE:                         wlan0
 GENERAL.TYPE:                           wifi
@@ -2755,6 +2779,8 @@ GENERAL.HWADDR:                         13:E0:74:85:7C:D9
 GENERAL.MTU:                            0
 GENERAL.STATE:                          20 (unavailable)
 GENERAL.REASON:                         0 (No reason given)
+GENERAL.IP4-CONNECTIVITY:               0 (unknown)
+GENERAL.IP6-CONNECTIVITY:               0 (unknown)
 GENERAL.UDI:                            /sys/devices/virtual/wlan0
 GENERAL.IP-IFACE:                       --
 GENERAL.IS-SOFTWARE:                    no
@@ -2779,12 +2805,12 @@ WIFI-PROPERTIES.2GHZ:                   unknown
 WIFI-PROPERTIES.5GHZ:                   unknown
 
 <<<
-size: 1878
-location: clients/tests/test-client.py:1057:test_004()/46
+size: 1984
+location: clients/tests/test-client.py:1071:test_004()/46
 cmd: $NMCLI -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 1691 bytes
+stdout: 1797 bytes
 >>>
 GENERAL.DEVICE:                         wlan0
 GENERAL.TYPE:                           wifi
@@ -2798,6 +2824,8 @@ GENERAL.HWADDR:                         13:E0:74:85:7C:D9
 GENERAL.MTU:                            0
 GENERAL.STATE:                          20 (niedostępne)
 GENERAL.REASON:                         0 (Nie podano przyczyny)
+GENERAL.IP4-CONNECTIVITY:               0 (nieznane)
+GENERAL.IP6-CONNECTIVITY:               0 (nieznane)
 GENERAL.UDI:                            /sys/devices/virtual/wlan0
 GENERAL.IP-IFACE:                       --
 GENERAL.IS-SOFTWARE:                    nie
@@ -2822,12 +2850,12 @@ WIFI-PROPERTIES.2GHZ:                   nieznane
 WIFI-PROPERTIES.5GHZ:                   nieznane
 
 <<<
-size: 1856
-location: clients/tests/test-client.py:1060:test_004()/47
+size: 1960
+location: clients/tests/test-client.py:1074:test_004()/47
 cmd: $NMCLI -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: C
 returncode: 0
-stdout: 1679 bytes
+stdout: 1783 bytes
 >>>
 GENERAL.DEVICE:                         wlan0
 GENERAL.TYPE:                           wifi
@@ -2841,6 +2869,8 @@ GENERAL.HWADDR:                         13:E0:74:85:7C:D9
 GENERAL.MTU:                            0
 GENERAL.STATE:                          20 (unavailable)
 GENERAL.REASON:                         0 (No reason given)
+GENERAL.IP4-CONNECTIVITY:               0 (unknown)
+GENERAL.IP6-CONNECTIVITY:               0 (unknown)
 GENERAL.UDI:                            /sys/devices/virtual/wlan0
 GENERAL.IP-IFACE:                       --
 GENERAL.IS-SOFTWARE:                    no
@@ -2865,12 +2895,12 @@ WIFI-PROPERTIES.2GHZ:                   unknown
 WIFI-PROPERTIES.5GHZ:                   unknown
 
 <<<
-size: 1878
-location: clients/tests/test-client.py:1060:test_004()/48
+size: 1984
+location: clients/tests/test-client.py:1074:test_004()/48
 cmd: $NMCLI -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 1691 bytes
+stdout: 1797 bytes
 >>>
 GENERAL.DEVICE:                         wlan0
 GENERAL.TYPE:                           wifi
@@ -2884,6 +2914,8 @@ GENERAL.HWADDR:                         13:E0:74:85:7C:D9
 GENERAL.MTU:                            0
 GENERAL.STATE:                          20 (niedostępne)
 GENERAL.REASON:                         0 (Nie podano przyczyny)
+GENERAL.IP4-CONNECTIVITY:               0 (nieznane)
+GENERAL.IP6-CONNECTIVITY:               0 (nieznane)
 GENERAL.UDI:                            /sys/devices/virtual/wlan0
 GENERAL.IP-IFACE:                       --
 GENERAL.IS-SOFTWARE:                    nie
@@ -2909,215 +2941,227 @@ WIFI-PROPERTIES.5GHZ:                   nieznane
 
 <<<
 size: 514
-location: clients/tests/test-client.py:1063:test_004()/49
+location: clients/tests/test-client.py:1077:test_004()/49
 cmd: $NMCLI -f DEVICE,TYPE,DBUS-PATH dev
 lang: C
 returncode: 0
 stdout: 366 bytes
 >>>
 DEVICE  TYPE      DBUS-PATH                                 
+wlan0   wifi      /org/freedesktop/NetworkManager/Devices/3 
 eth0    ethernet  /org/freedesktop/NetworkManager/Devices/1 
 eth1    ethernet  /org/freedesktop/NetworkManager/Devices/2 
 wlan1   wifi      /org/freedesktop/NetworkManager/Devices/4 
 wlan1   wifi      /org/freedesktop/NetworkManager/Devices/5 
-wlan0   wifi      /org/freedesktop/NetworkManager/Devices/3 
 
 <<<
 size: 524
-location: clients/tests/test-client.py:1063:test_004()/50
+location: clients/tests/test-client.py:1077:test_004()/50
 cmd: $NMCLI -f DEVICE,TYPE,DBUS-PATH dev
 lang: pl_PL.UTF-8
 returncode: 0
 stdout: 366 bytes
 >>>
 DEVICE  TYPE      DBUS-PATH                                 
+wlan0   wifi      /org/freedesktop/NetworkManager/Devices/3 
 eth0    ethernet  /org/freedesktop/NetworkManager/Devices/1 
 eth1    ethernet  /org/freedesktop/NetworkManager/Devices/2 
 wlan1   wifi      /org/freedesktop/NetworkManager/Devices/4 
 wlan1   wifi      /org/freedesktop/NetworkManager/Devices/5 
-wlan0   wifi      /org/freedesktop/NetworkManager/Devices/3 
 
 <<<
 size: 1984
-location: clients/tests/test-client.py:1066:test_004()/51
+location: clients/tests/test-client.py:1080:test_004()/51
 cmd: $NMCLI -f ALL device wifi list
 lang: C
 returncode: 0
 stdout: 1840 bytes
 >>>
+NAME   SSID        SSID-HEX              BSSID              MODE   CHAN  FREQ      RATE       SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
+AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infra  1     2412 MHz  54 Mbit/s  92      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/2 
+AP[2]  wlan0-ap-1  776C616E302D61702D31  61:95:77:AC:1E:4C  Infra  1     2412 MHz  54 Mbit/s  81      ****  WPA1       pair_tkip pair_ccmp group_tkip group_ccmp psk  (none)                                         wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/1 
+AP[3]  wlan0-ap-3  776C616E302D61702D33  9B:F6:B7:EC:97:76  Infra  1     2412 MHz  54 Mbit/s  55      **    WPA3       (none)                                         pair_tkip pair_ccmp group_tkip group_ccmp sae  wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/3 
+
 NAME   SSID        SSID-HEX              BSSID              MODE   CHAN  FREQ      RATE       SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
 AP[1]  wlan1-ap-4  776C616E312D61702D34  94:2B:E8:F6:D2:86  Infra  1     2412 MHz  54 Mbit/s  48      **    WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan1   no              /org/freedesktop/NetworkManager/AccessPoint/4 
 
 NAME  SSID  SSID-HEX  BSSID  MODE  CHAN  FREQ  RATE  SIGNAL  BARS  SECURITY  WPA-FLAGS  RSN-FLAGS  DEVICE  ACTIVE  IN-USE  DBUS-PATH 
 
-NAME   SSID        SSID-HEX              BSSID              MODE   CHAN  FREQ      RATE       SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
-AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infra  1     2412 MHz  54 Mbit/s  92      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/2 
-AP[2]  wlan0-ap-1  776C616E302D61702D31  61:95:77:AC:1E:4C  Infra  1     2412 MHz  54 Mbit/s  81      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/1 
-AP[3]  wlan0-ap-3  776C616E302D61702D33  9B:F6:B7:EC:97:76  Infra  1     2412 MHz  54 Mbit/s  55      **    WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/3 
-
 <<<
 size: 2052
-location: clients/tests/test-client.py:1066:test_004()/52
+location: clients/tests/test-client.py:1080:test_004()/52
 cmd: $NMCLI -f ALL device wifi list
 lang: pl_PL.UTF-8
 returncode: 0
 stdout: 1898 bytes
 >>>
+NAME   SSID        SSID-HEX              BSSID              MODE            CHAN  FREQ      RATE     SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
+AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infrastruktura  1     2412 MHz  54 Mb/s  92      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/2 
+AP[2]  wlan0-ap-1  776C616E302D61702D31  61:95:77:AC:1E:4C  Infrastruktura  1     2412 MHz  54 Mb/s  81      ****  WPA1       pair_tkip pair_ccmp group_tkip group_ccmp psk  (brak)                                         wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/1 
+AP[3]  wlan0-ap-3  776C616E302D61702D33  9B:F6:B7:EC:97:76  Infrastruktura  1     2412 MHz  54 Mb/s  55      **    WPA3       (brak)                                         pair_tkip pair_ccmp group_tkip group_ccmp sae  wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/3 
+
 NAME   SSID        SSID-HEX              BSSID              MODE            CHAN  FREQ      RATE     SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
 AP[1]  wlan1-ap-4  776C616E312D61702D34  94:2B:E8:F6:D2:86  Infrastruktura  1     2412 MHz  54 Mb/s  48      **    WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan1   nie             /org/freedesktop/NetworkManager/AccessPoint/4 
 
 NAME  SSID  SSID-HEX  BSSID  MODE  CHAN  FREQ  RATE  SIGNAL  BARS  SECURITY  WPA-FLAGS  RSN-FLAGS  DEVICE  ACTIVE  IN-USE  DBUS-PATH 
 
-NAME   SSID        SSID-HEX              BSSID              MODE            CHAN  FREQ      RATE     SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
-AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infrastruktura  1     2412 MHz  54 Mb/s  92      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/2 
-AP[2]  wlan0-ap-1  776C616E302D61702D31  61:95:77:AC:1E:4C  Infrastruktura  1     2412 MHz  54 Mb/s  81      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/1 
-AP[3]  wlan0-ap-3  776C616E302D61702D33  9B:F6:B7:EC:97:76  Infrastruktura  1     2412 MHz  54 Mb/s  55      **    WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/3 
-
 <<<
 size: 618
-location: clients/tests/test-client.py:1068:test_004()/53
+location: clients/tests/test-client.py:1082:test_004()/53
 cmd: $NMCLI -f COMMON device wifi list
 lang: C
 returncode: 0
 stdout: 472 bytes
 >>>
+IN-USE  SSID        MODE   CHAN  RATE       SIGNAL  BARS  SECURITY  
+        wlan0-ap-2  Infra  1     54 Mbit/s  92      ****  WPA1 WPA2 
+        wlan0-ap-1  Infra  1     54 Mbit/s  81      ****  WPA1      
+        wlan0-ap-3  Infra  1     54 Mbit/s  55      **    WPA3      
+
 IN-USE  SSID        MODE   CHAN  RATE       SIGNAL  BARS  SECURITY  
         wlan1-ap-4  Infra  1     54 Mbit/s  48      **    WPA1 WPA2 
 
 IN-USE  SSID  MODE  CHAN  RATE  SIGNAL  BARS  SECURITY 
 
-IN-USE  SSID        MODE   CHAN  RATE       SIGNAL  BARS  SECURITY  
-        wlan0-ap-2  Infra  1     54 Mbit/s  92      ****  WPA1 WPA2 
-        wlan0-ap-1  Infra  1     54 Mbit/s  81      ****  WPA1 WPA2 
-        wlan0-ap-3  Infra  1     54 Mbit/s  55      **    WPA1 WPA2 
-
 <<<
 size: 678
-location: clients/tests/test-client.py:1068:test_004()/54
+location: clients/tests/test-client.py:1082:test_004()/54
 cmd: $NMCLI -f COMMON device wifi list
 lang: pl_PL.UTF-8
 returncode: 0
 stdout: 522 bytes
 >>>
+IN-USE  SSID        MODE            CHAN  RATE     SIGNAL  BARS  SECURITY  
+        wlan0-ap-2  Infrastruktura  1     54 Mb/s  92      ****  WPA1 WPA2 
+        wlan0-ap-1  Infrastruktura  1     54 Mb/s  81      ****  WPA1      
+        wlan0-ap-3  Infrastruktura  1     54 Mb/s  55      **    WPA3      
+
 IN-USE  SSID        MODE            CHAN  RATE     SIGNAL  BARS  SECURITY  
         wlan1-ap-4  Infrastruktura  1     54 Mb/s  48      **    WPA1 WPA2 
 
 IN-USE  SSID  MODE  CHAN  RATE  SIGNAL  BARS  SECURITY 
 
-IN-USE  SSID        MODE            CHAN  RATE     SIGNAL  BARS  SECURITY  
-        wlan0-ap-2  Infrastruktura  1     54 Mb/s  92      ****  WPA1 WPA2 
-        wlan0-ap-1  Infrastruktura  1     54 Mb/s  81      ****  WPA1 WPA2 
-        wlan0-ap-3  Infrastruktura  1     54 Mb/s  55      **    WPA1 WPA2 
-
 <<<
 size: 2097
-location: clients/tests/test-client.py:1071:test_004()/55
+location: clients/tests/test-client.py:1085:test_004()/55
 cmd: $NMCLI -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list
 lang: C
 returncode: 0
 stdout: 1840 bytes
 >>>
+NAME   SSID        SSID-HEX              BSSID              MODE   CHAN  FREQ      RATE       SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
+AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infra  1     2412 MHz  54 Mbit/s  92      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/2 
+AP[2]  wlan0-ap-1  776C616E302D61702D31  61:95:77:AC:1E:4C  Infra  1     2412 MHz  54 Mbit/s  81      ****  WPA1       pair_tkip pair_ccmp group_tkip group_ccmp psk  (none)                                         wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/1 
+AP[3]  wlan0-ap-3  776C616E302D61702D33  9B:F6:B7:EC:97:76  Infra  1     2412 MHz  54 Mbit/s  55      **    WPA3       (none)                                         pair_tkip pair_ccmp group_tkip group_ccmp sae  wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/3 
+
 NAME   SSID        SSID-HEX              BSSID              MODE   CHAN  FREQ      RATE       SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
 AP[1]  wlan1-ap-4  776C616E312D61702D34  94:2B:E8:F6:D2:86  Infra  1     2412 MHz  54 Mbit/s  48      **    WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan1   no              /org/freedesktop/NetworkManager/AccessPoint/4 
 
 NAME  SSID  SSID-HEX  BSSID  MODE  CHAN  FREQ  RATE  SIGNAL  BARS  SECURITY  WPA-FLAGS  RSN-FLAGS  DEVICE  ACTIVE  IN-USE  DBUS-PATH 
 
-NAME   SSID        SSID-HEX              BSSID              MODE   CHAN  FREQ      RATE       SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
-AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infra  1     2412 MHz  54 Mbit/s  92      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/2 
-AP[2]  wlan0-ap-1  776C616E302D61702D31  61:95:77:AC:1E:4C  Infra  1     2412 MHz  54 Mbit/s  81      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/1 
-AP[3]  wlan0-ap-3  776C616E302D61702D33  9B:F6:B7:EC:97:76  Infra  1     2412 MHz  54 Mbit/s  55      **    WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/3 
-
 <<<
 size: 2165
-location: clients/tests/test-client.py:1071:test_004()/56
+location: clients/tests/test-client.py:1085:test_004()/56
 cmd: $NMCLI -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list
 lang: pl_PL.UTF-8
 returncode: 0
 stdout: 1898 bytes
 >>>
+NAME   SSID        SSID-HEX              BSSID              MODE            CHAN  FREQ      RATE     SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
+AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infrastruktura  1     2412 MHz  54 Mb/s  92      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/2 
+AP[2]  wlan0-ap-1  776C616E302D61702D31  61:95:77:AC:1E:4C  Infrastruktura  1     2412 MHz  54 Mb/s  81      ****  WPA1       pair_tkip pair_ccmp group_tkip group_ccmp psk  (brak)                                         wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/1 
+AP[3]  wlan0-ap-3  776C616E302D61702D33  9B:F6:B7:EC:97:76  Infrastruktura  1     2412 MHz  54 Mb/s  55      **    WPA3       (brak)                                         pair_tkip pair_ccmp group_tkip group_ccmp sae  wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/3 
+
 NAME   SSID        SSID-HEX              BSSID              MODE            CHAN  FREQ      RATE     SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
 AP[1]  wlan1-ap-4  776C616E312D61702D34  94:2B:E8:F6:D2:86  Infrastruktura  1     2412 MHz  54 Mb/s  48      **    WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan1   nie             /org/freedesktop/NetworkManager/AccessPoint/4 
 
 NAME  SSID  SSID-HEX  BSSID  MODE  CHAN  FREQ  RATE  SIGNAL  BARS  SECURITY  WPA-FLAGS  RSN-FLAGS  DEVICE  ACTIVE  IN-USE  DBUS-PATH 
 
-NAME   SSID        SSID-HEX              BSSID              MODE            CHAN  FREQ      RATE     SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
-AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infrastruktura  1     2412 MHz  54 Mb/s  92      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/2 
-AP[2]  wlan0-ap-1  776C616E302D61702D31  61:95:77:AC:1E:4C  Infrastruktura  1     2412 MHz  54 Mb/s  81      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/1 
-AP[3]  wlan0-ap-3  776C616E302D61702D33  9B:F6:B7:EC:97:76  Infrastruktura  1     2412 MHz  54 Mb/s  55      **    WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/3 
-
 <<<
-size: 735
-location: clients/tests/test-client.py:1073:test_004()/57
+size: 737
+location: clients/tests/test-client.py:1087:test_004()/57
 cmd: $NMCLI -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: C
 returncode: 0
-stdout: 568 bytes
+stdout: 570 bytes
 >>>
 NAME   SSID        SSID-HEX              BSSID              MODE   CHAN  FREQ      RATE       SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
 AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infra  1     2412 MHz  54 Mbit/s  92      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/2 
 
+
+
 <<<
-size: 763
-location: clients/tests/test-client.py:1073:test_004()/58
+size: 765
+location: clients/tests/test-client.py:1087:test_004()/58
 cmd: $NMCLI -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 586 bytes
+stdout: 588 bytes
 >>>
 NAME   SSID        SSID-HEX              BSSID              MODE            CHAN  FREQ      RATE     SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
 AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infrastruktura  1     2412 MHz  54 Mb/s  92      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/2 
 
+
+
 <<<
-size: 308
-location: clients/tests/test-client.py:1075:test_004()/59
+size: 310
+location: clients/tests/test-client.py:1089:test_004()/59
 cmd: $NMCLI -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: C
 returncode: 0
-stdout: 138 bytes
+stdout: 140 bytes
 >>>
 IN-USE  SSID        MODE   CHAN  RATE       SIGNAL  BARS  SECURITY  
         wlan0-ap-2  Infra  1     54 Mbit/s  92      ****  WPA1 WPA2 
 
+
+
 <<<
-size: 334
-location: clients/tests/test-client.py:1075:test_004()/60
+size: 336
+location: clients/tests/test-client.py:1089:test_004()/60
 cmd: $NMCLI -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 154 bytes
+stdout: 156 bytes
 >>>
 IN-USE  SSID        MODE            CHAN  RATE     SIGNAL  BARS  SECURITY  
         wlan0-ap-2  Infrastruktura  1     54 Mb/s  92      ****  WPA1 WPA2 
 
+
+
 <<<
-size: 848
-location: clients/tests/test-client.py:1078:test_004()/61
+size: 850
+location: clients/tests/test-client.py:1092:test_004()/61
 cmd: $NMCLI -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: C
 returncode: 0
-stdout: 568 bytes
+stdout: 570 bytes
 >>>
 NAME   SSID        SSID-HEX              BSSID              MODE   CHAN  FREQ      RATE       SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
 AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infra  1     2412 MHz  54 Mbit/s  92      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/2 
 
+
+
 <<<
-size: 876
-location: clients/tests/test-client.py:1078:test_004()/62
+size: 878
+location: clients/tests/test-client.py:1092:test_004()/62
 cmd: $NMCLI -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 586 bytes
+stdout: 588 bytes
 >>>
 NAME   SSID        SSID-HEX              BSSID              MODE            CHAN  FREQ      RATE     SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
 AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infrastruktura  1     2412 MHz  54 Mb/s  92      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/2 
 
+
+
 <<<
-size: 4756
-location: clients/tests/test-client.py:1080:test_004()/63
+size: 4850
+location: clients/tests/test-client.py:1094:test_004()/63
 cmd: $NMCLI -f ALL device show wlan0
 lang: C
 returncode: 0
-stdout: 4611 bytes
+stdout: 4705 bytes
 >>>
 GENERAL.DEVICE:                         wlan0
 GENERAL.TYPE:                           wifi
@@ -3131,6 +3175,8 @@ GENERAL.HWADDR:                         13:E0:74:85:7C:D9
 GENERAL.MTU:                            0
 GENERAL.STATE:                          20 (unavailable)
 GENERAL.REASON:                         0 (No reason given)
+GENERAL.IP4-CONNECTIVITY:               0 (unknown)
+GENERAL.IP6-CONNECTIVITY:               0 (unknown)
 GENERAL.UDI:                            /sys/devices/virtual/wlan0
 GENERAL.IP-IFACE:                       --
 GENERAL.IS-SOFTWARE:                    no
@@ -3171,7 +3217,7 @@ AP[2].CHAN:                             1
 AP[2].RATE:                             54 Mbit/s
 AP[2].SIGNAL:                           81
 AP[2].BARS:                             ****
-AP[2].SECURITY:                         WPA1 WPA2
+AP[2].SECURITY:                         WPA1
 AP[3].IN-USE:                            
 AP[3].SSID:                             wlan0-ap-3
 AP[3].MODE:                             Infra
@@ -3179,7 +3225,7 @@ AP[3].CHAN:                             1
 AP[3].RATE:                             54 Mbit/s
 AP[3].SIGNAL:                           55
 AP[3].BARS:                             **  
-AP[3].SECURITY:                         WPA1 WPA2
+AP[3].SECURITY:                         WPA3
 IP4.ADDRESS[1]:                         192.168.228.18/32
 IP4.ADDRESS[2]:                         192.168.209.179/25
 IP4.GATEWAY:                            192.168.41.120
@@ -3210,12 +3256,12 @@ CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings
 CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 
 <<<
-size: 4809
-location: clients/tests/test-client.py:1080:test_004()/64
+size: 4905
+location: clients/tests/test-client.py:1094:test_004()/64
 cmd: $NMCLI -f ALL device show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 4654 bytes
+stdout: 4750 bytes
 >>>
 GENERAL.DEVICE:                         wlan0
 GENERAL.TYPE:                           wifi
@@ -3229,6 +3275,8 @@ GENERAL.HWADDR:                         13:E0:74:85:7C:D9
 GENERAL.MTU:                            0
 GENERAL.STATE:                          20 (niedostępne)
 GENERAL.REASON:                         0 (Nie podano przyczyny)
+GENERAL.IP4-CONNECTIVITY:               0 (nieznane)
+GENERAL.IP6-CONNECTIVITY:               0 (nieznane)
 GENERAL.UDI:                            /sys/devices/virtual/wlan0
 GENERAL.IP-IFACE:                       --
 GENERAL.IS-SOFTWARE:                    nie
@@ -3269,7 +3317,7 @@ AP[2].CHAN:                             1
 AP[2].RATE:                             54 Mb/s
 AP[2].SIGNAL:                           81
 AP[2].BARS:                             ****
-AP[2].SECURITY:                         WPA1 WPA2
+AP[2].SECURITY:                         WPA1
 AP[3].IN-USE:                            
 AP[3].SSID:                             wlan0-ap-3
 AP[3].MODE:                             Infrastruktura
@@ -3277,7 +3325,7 @@ AP[3].CHAN:                             1
 AP[3].RATE:                             54 Mb/s
 AP[3].SIGNAL:                           55
 AP[3].BARS:                             **  
-AP[3].SECURITY:                         WPA1 WPA2
+AP[3].SECURITY:                         WPA3
 IP4.ADDRESS[1]:                         192.168.228.18/32
 IP4.ADDRESS[2]:                         192.168.209.179/25
 IP4.GATEWAY:                            192.168.41.120
@@ -3309,7 +3357,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | c
 
 <<<
 size: 1511
-location: clients/tests/test-client.py:1082:test_004()/65
+location: clients/tests/test-client.py:1096:test_004()/65
 cmd: $NMCLI -f COMMON device show wlan0
 lang: C
 returncode: 0
@@ -3342,7 +3390,7 @@ IP6.DOMAIN[6]:                          sear6.foo4.bar
 
 <<<
 size: 1522
-location: clients/tests/test-client.py:1082:test_004()/66
+location: clients/tests/test-client.py:1096:test_004()/66
 cmd: $NMCLI -f COMMON device show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
@@ -3374,12 +3422,12 @@ IP6.DOMAIN[5]:                          sear6.foo3.bar
 IP6.DOMAIN[6]:                          sear6.foo4.bar
 
 <<<
-size: 4894
-location: clients/tests/test-client.py:1084:test_004()/67
+size: 4988
+location: clients/tests/test-client.py:1098:test_004()/67
 cmd: $NMCLI -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0
 lang: C
 returncode: 0
-stdout: 4611 bytes
+stdout: 4705 bytes
 >>>
 GENERAL.DEVICE:                         wlan0
 GENERAL.TYPE:                           wifi
@@ -3393,6 +3441,8 @@ GENERAL.HWADDR:                         13:E0:74:85:7C:D9
 GENERAL.MTU:                            0
 GENERAL.STATE:                          20 (unavailable)
 GENERAL.REASON:                         0 (No reason given)
+GENERAL.IP4-CONNECTIVITY:               0 (unknown)
+GENERAL.IP6-CONNECTIVITY:               0 (unknown)
 GENERAL.UDI:                            /sys/devices/virtual/wlan0
 GENERAL.IP-IFACE:                       --
 GENERAL.IS-SOFTWARE:                    no
@@ -3433,7 +3483,7 @@ AP[2].CHAN:                             1
 AP[2].RATE:                             54 Mbit/s
 AP[2].SIGNAL:                           81
 AP[2].BARS:                             ****
-AP[2].SECURITY:                         WPA1 WPA2
+AP[2].SECURITY:                         WPA1
 AP[3].IN-USE:                            
 AP[3].SSID:                             wlan0-ap-3
 AP[3].MODE:                             Infra
@@ -3441,7 +3491,7 @@ AP[3].CHAN:                             1
 AP[3].RATE:                             54 Mbit/s
 AP[3].SIGNAL:                           55
 AP[3].BARS:                             **  
-AP[3].SECURITY:                         WPA1 WPA2
+AP[3].SECURITY:                         WPA3
 IP4.ADDRESS[1]:                         192.168.228.18/32
 IP4.ADDRESS[2]:                         192.168.209.179/25
 IP4.GATEWAY:                            192.168.41.120
@@ -3472,12 +3522,12 @@ CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings
 CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 
 <<<
-size: 4947
-location: clients/tests/test-client.py:1084:test_004()/68
+size: 5043
+location: clients/tests/test-client.py:1098:test_004()/68
 cmd: $NMCLI -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 4654 bytes
+stdout: 4750 bytes
 >>>
 GENERAL.DEVICE:                         wlan0
 GENERAL.TYPE:                           wifi
@@ -3491,6 +3541,8 @@ GENERAL.HWADDR:                         13:E0:74:85:7C:D9
 GENERAL.MTU:                            0
 GENERAL.STATE:                          20 (niedostępne)
 GENERAL.REASON:                         0 (Nie podano przyczyny)
+GENERAL.IP4-CONNECTIVITY:               0 (nieznane)
+GENERAL.IP6-CONNECTIVITY:               0 (nieznane)
 GENERAL.UDI:                            /sys/devices/virtual/wlan0
 GENERAL.IP-IFACE:                       --
 GENERAL.IS-SOFTWARE:                    nie
@@ -3531,7 +3583,7 @@ AP[2].CHAN:                             1
 AP[2].RATE:                             54 Mb/s
 AP[2].SIGNAL:                           81
 AP[2].BARS:                             ****
-AP[2].SECURITY:                         WPA1 WPA2
+AP[2].SECURITY:                         WPA1
 AP[3].IN-USE:                            
 AP[3].SSID:                             wlan0-ap-3
 AP[3].MODE:                             Infrastruktura
@@ -3539,7 +3591,7 @@ AP[3].CHAN:                             1
 AP[3].RATE:                             54 Mb/s
 AP[3].SIGNAL:                           55
 AP[3].BARS:                             **  
-AP[3].SECURITY:                         WPA1 WPA2
+AP[3].SECURITY:                         WPA3
 IP4.ADDRESS[1]:                         192.168.228.18/32
 IP4.ADDRESS[2]:                         192.168.209.179/25
 IP4.GATEWAY:                            192.168.41.120
@@ -3571,7 +3623,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | c
 
 <<<
 size: 4615
-location: clients/tests/test-client.py:1022:test_004()/69
+location: clients/tests/test-client.py:1036:test_004()/69
 cmd: $NMCLI --color yes con s con-vpn-1
 lang: C
 returncode: 0
@@ -3672,12 +3724,12 @@ VPN.CFG[2]:                             key2 = val2
 VPN.CFG[3]:                             key3 = val3
 
 <<<
-size: 4643
-location: clients/tests/test-client.py:1022:test_004()/70
+size: 4645
+location: clients/tests/test-client.py:1036:test_004()/70
 cmd: $NMCLI --color yes con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 4485 bytes
+stdout: 4487 bytes
 >>>
 connection.id:                          con-vpn-1
 connection.uuid:                        UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -3768,14 +3820,14 @@ VPN.TYPE:                               openvpn
 VPN.USERNAME:                           --
 VPN.GATEWAY:                            --
 VPN.BANNER:                             *** VPN connection con-vpn-1 ***
-VPN.VPN-STATE:                          5 - Połączono z VPN
+VPN.VPN-STATE:                          5 — Połączono z VPN
 VPN.CFG[1]:                             key1 = val1
 VPN.CFG[2]:                             key2 = val2
 VPN.CFG[3]:                             key3 = val3
 
 <<<
 size: 4615
-location: clients/tests/test-client.py:1024:test_004()/71
+location: clients/tests/test-client.py:1038:test_004()/71
 cmd: $NMCLI --color yes con s con-vpn-1
 lang: C
 returncode: 0
@@ -3876,12 +3928,12 @@ VPN.CFG[2]:                             key2 = val2
 VPN.CFG[3]:                             key3 = val3
 
 <<<
-size: 4643
-location: clients/tests/test-client.py:1024:test_004()/72
+size: 4645
+location: clients/tests/test-client.py:1038:test_004()/72
 cmd: $NMCLI --color yes con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 4485 bytes
+stdout: 4487 bytes
 >>>
 connection.id:                          con-vpn-1
 connection.uuid:                        UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -3972,14 +4024,14 @@ VPN.TYPE:                               openvpn
 VPN.USERNAME:                           --
 VPN.GATEWAY:                            --
 VPN.BANNER:                             *** VPN connection con-vpn-1 ***
-VPN.VPN-STATE:                          5 - Połączono z VPN
+VPN.VPN-STATE:                          5 — Połączono z VPN
 VPN.CFG[1]:                             key1 = val1
 VPN.CFG[2]:                             key2 = val2
 VPN.CFG[3]:                             key3 = val3
 
 <<<
 size: 3534
-location: clients/tests/test-client.py:1027:test_004()/73
+location: clients/tests/test-client.py:1041:test_004()/73
 cmd: $NMCLI --color yes -f ALL con s con-vpn-1
 lang: C
 returncode: 0
@@ -4061,7 +4113,7 @@ proxy.pac-script:                       --
 
 <<<
 size: 3554
-location: clients/tests/test-client.py:1027:test_004()/74
+location: clients/tests/test-client.py:1041:test_004()/74
 cmd: $NMCLI --color yes -f ALL con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
@@ -4143,7 +4195,7 @@ proxy.pac-script:                       --
 
 <<<
 size: 488
-location: clients/tests/test-client.py:1033:test_004()/75
+location: clients/tests/test-client.py:1047:test_004()/75
 cmd: $NMCLI --color yes -f VPN con s con-vpn-1
 lang: C
 returncode: 0
@@ -4158,7 +4210,7 @@ vpn.timeout:                            0
 
 <<<
 size: 499
-location: clients/tests/test-client.py:1033:test_004()/76
+location: clients/tests/test-client.py:1047:test_004()/76
 cmd: $NMCLI --color yes -f VPN con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
@@ -4173,7 +4225,7 @@ vpn.timeout:                            0
 
 <<<
 size: 825
-location: clients/tests/test-client.py:1036:test_004()/77
+location: clients/tests/test-client.py:1050:test_004()/77
 cmd: $NMCLI --color yes -f GENERAL con s con-vpn-1
 lang: C
 returncode: 0
@@ -4194,7 +4246,7 @@ GENERAL.MASTER-PATH:                    --
 
 <<<
 size: 838
-location: clients/tests/test-client.py:1036:test_004()/78
+location: clients/tests/test-client.py:1050:test_004()/78
 cmd: $NMCLI --color yes -f GENERAL con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
@@ -4215,72 +4267,97 @@ GENERAL.MASTER-PATH:                    --
 
 <<<
 size: 555
-location: clients/tests/test-client.py:1039:test_004()/79
+location: clients/tests/test-client.py:1053:test_004()/79
 cmd: $NMCLI --color yes dev s
 lang: C
 returncode: 0
 stdout: 418 bytes
 >>>
 DEVICE  TYPE      STATE        CONNECTION 
+wlan0   wifi      unavailable  con-vpn-1  
 eth0    ethernet  unavailable  --         
 eth1    ethernet  unavailable  --         
 wlan1   wifi      unavailable  --         
 wlan1   wifi      unavailable  --         
-wlan0   wifi      unavailable  con-vpn-1  
 
 <<<
 size: 570
-location: clients/tests/test-client.py:1039:test_004()/80
+location: clients/tests/test-client.py:1053:test_004()/80
 cmd: $NMCLI --color yes dev s
 lang: pl_PL.UTF-8
 returncode: 0
 stdout: 423 bytes
 >>>
 DEVICE  TYPE      STATE        CONNECTION 
+wlan0   wifi      niedostępne  con-vpn-1  
 eth0    ethernet  niedostępne  --         
 eth1    ethernet  niedostępne  --         
 wlan1   wifi      niedostępne  --         
 wlan1   wifi      niedostępne  --         
-wlan0   wifi      niedostępne  con-vpn-1  
 
 <<<
-size: 1486
-location: clients/tests/test-client.py:1042:test_004()/81
+size: 1782
+location: clients/tests/test-client.py:1056:test_004()/81
 cmd: $NMCLI --color yes -f all dev status
 lang: C
 returncode: 0
-stdout: 1336 bytes
+stdout: 1632 bytes
 >>>
-DEVICE  TYPE      STATE        DBUS-PATH                                  CONNECTION  CON-UUID                              CON-PATH                                           
-eth0    ethernet  unavailable  /org/freedesktop/NetworkManager/Devices/1  --          --                                    --                                                 
-eth1    ethernet  unavailable  /org/freedesktop/NetworkManager/Devices/2  --          --                                    --                                                 
-wlan1   wifi      unavailable  /org/freedesktop/NetworkManager/Devices/4  --          --                                    --                                                 
-wlan1   wifi      unavailable  /org/freedesktop/NetworkManager/Devices/5  --          --                                    --                                                 
-wlan0   wifi      unavailable  /org/freedesktop/NetworkManager/Devices/3  con-vpn-1   UUID-con-vpn-1-REPLACED-REPLACED-REP  /org/freedesktop/NetworkManager/ActiveConnection/2 
+DEVICE  TYPE      STATE        IP4-CONNECTIVITY  IP6-CONNECTIVITY  DBUS-PATH                                  CONNECTION  CON-UUID                              CON-PATH                                           
+wlan0   wifi      unavailable  unknown           unknown           /org/freedesktop/NetworkManager/Devices/3  con-vpn-1   UUID-con-vpn-1-REPLACED-REPLACED-REP  /org/freedesktop/NetworkManager/ActiveConnection/2 
+eth0    ethernet  unavailable  unknown           unknown           /org/freedesktop/NetworkManager/Devices/1  --          --                                    --                                                 
+eth1    ethernet  unavailable  unknown           unknown           /org/freedesktop/NetworkManager/Devices/2  --          --                                    --                                                 
+wlan1   wifi      unavailable  unknown           unknown           /org/freedesktop/NetworkManager/Devices/4  --          --                                    --                                                 
+wlan1   wifi      unavailable  unknown           unknown           /org/freedesktop/NetworkManager/Devices/5  --          --                                    --                                                 
 
 <<<
-size: 1501
-location: clients/tests/test-client.py:1042:test_004()/82
+size: 1797
+location: clients/tests/test-client.py:1056:test_004()/82
 cmd: $NMCLI --color yes -f all dev status
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 1341 bytes
+stdout: 1637 bytes
 >>>
-DEVICE  TYPE      STATE        DBUS-PATH                                  CONNECTION  CON-UUID                              CON-PATH                                           
-eth0    ethernet  niedostępne  /org/freedesktop/NetworkManager/Devices/1  --          --                                    --                                                 
-eth1    ethernet  niedostępne  /org/freedesktop/NetworkManager/Devices/2  --          --                                    --                                                 
-wlan1   wifi      niedostępne  /org/freedesktop/NetworkManager/Devices/4  --          --                                    --                                                 
-wlan1   wifi      niedostępne  /org/freedesktop/NetworkManager/Devices/5  --          --                                    --                                                 
-wlan0   wifi      niedostępne  /org/freedesktop/NetworkManager/Devices/3  con-vpn-1   UUID-con-vpn-1-REPLACED-REPLACED-REP  /org/freedesktop/NetworkManager/ActiveConnection/2 
+DEVICE  TYPE      STATE        IP4-CONNECTIVITY  IP6-CONNECTIVITY  DBUS-PATH                                  CONNECTION  CON-UUID                              CON-PATH                                           
+wlan0   wifi      niedostępne  nieznane          nieznane          /org/freedesktop/NetworkManager/Devices/3  con-vpn-1   UUID-con-vpn-1-REPLACED-REPLACED-REP  /org/freedesktop/NetworkManager/ActiveConnection/2 
+eth0    ethernet  niedostępne  nieznane          nieznane          /org/freedesktop/NetworkManager/Devices/1  --          --                                    --                                                 
+eth1    ethernet  niedostępne  nieznane          nieznane          /org/freedesktop/NetworkManager/Devices/2  --          --                                    --                                                 
+wlan1   wifi      niedostępne  nieznane          nieznane          /org/freedesktop/NetworkManager/Devices/4  --          --                                    --                                                 
+wlan1   wifi      niedostępne  nieznane          nieznane          /org/freedesktop/NetworkManager/Devices/5  --          --                                    --                                                 
 
 <<<
 size: 8059
-location: clients/tests/test-client.py:1045:test_004()/83
+location: clients/tests/test-client.py:1059:test_004()/83
 cmd: $NMCLI --color yes dev show
 lang: C
 returncode: 0
 stdout: 7918 bytes
 >>>
+GENERAL.DEVICE:                         wlan0
+GENERAL.TYPE:                           wifi
+GENERAL.HWADDR:                         13:E0:74:85:7C:D9
+GENERAL.MTU:                            0
+GENERAL.STATE:                          20 (unavailable)
+GENERAL.CONNECTION:                     con-vpn-1
+GENERAL.CON-PATH:                       /org/freedesktop/NetworkManager/ActiveConnection/2
+IP4.ADDRESS[1]:                         192.168.228.18/32
+IP4.ADDRESS[2]:                         192.168.209.179/25
+IP4.GATEWAY:                            192.168.41.120
+IP4.DOMAIN[1]:                          sear4.foo2.bar
+IP4.DOMAIN[2]:                          sear4.fo.x.y
+IP4.DOMAIN[3]:                          sear4.foo1.bar
+IP4.DOMAIN[4]:                          sear4.foo4.bar
+IP4.DOMAIN[5]:                          sear4.fo.o.bar
+IP4.WINS[1]:                            192.168.120.79
+IP6.GATEWAY:                            --
+IP6.ROUTE[1]:                           dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086
+IP6.DOMAIN[1]:                          sear6.foo2.bar
+IP6.DOMAIN[2]:                          sear6.foo1.bar
+IP6.DOMAIN[3]:                          sear6.fo.x.y
+IP6.DOMAIN[4]:                          sear6.fo.o.bar
+IP6.DOMAIN[5]:                          sear6.foo3.bar
+IP6.DOMAIN[6]:                          sear6.foo4.bar
+
 GENERAL.DEVICE:                         eth0
 GENERAL.TYPE:                           ethernet
 GENERAL.HWADDR:                         AB:B7:BF:E2:48:E8
@@ -4394,11 +4471,19 @@ IP6.ROUTE[3]:                           dst = 2001:a::afb7:4449:3787:8bb4/123, n
 IP6.DNS[1]:                             2001:a::2934:bd66:550d:ec19
 IP6.DOMAIN[1]:                          sear6.fo.x.y
 
+<<<
+size: 8090
+location: clients/tests/test-client.py:1059:test_004()/84
+cmd: $NMCLI --color yes dev show
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 7939 bytes
+>>>
 GENERAL.DEVICE:                         wlan0
 GENERAL.TYPE:                           wifi
 GENERAL.HWADDR:                         13:E0:74:85:7C:D9
 GENERAL.MTU:                            0
-GENERAL.STATE:                          20 (unavailable)
+GENERAL.STATE:                          20 (niedostępne)
 GENERAL.CONNECTION:                     con-vpn-1
 GENERAL.CON-PATH:                       /org/freedesktop/NetworkManager/ActiveConnection/2
 IP4.ADDRESS[1]:                         192.168.228.18/32
@@ -4419,14 +4504,6 @@ IP6.DOMAIN[4]:                          sear6.fo.o.bar
 IP6.DOMAIN[5]:                          sear6.foo3.bar
 IP6.DOMAIN[6]:                          sear6.foo4.bar
 
-<<<
-size: 8090
-location: clients/tests/test-client.py:1045:test_004()/84
-cmd: $NMCLI --color yes dev show
-lang: pl_PL.UTF-8
-returncode: 0
-stdout: 7939 bytes
->>>
 GENERAL.DEVICE:                         eth0
 GENERAL.TYPE:                           ethernet
 GENERAL.HWADDR:                         AB:B7:BF:E2:48:E8
@@ -4540,13 +4617,77 @@ IP6.ROUTE[3]:                           dst = 2001:a::afb7:4449:3787:8bb4/123, n
 IP6.DNS[1]:                             2001:a::2934:bd66:550d:ec19
 IP6.DOMAIN[1]:                          sear6.fo.x.y
 
+<<<
+size: 20960
+location: clients/tests/test-client.py:1062:test_004()/85
+cmd: $NMCLI --color yes -f all dev show
+lang: C
+returncode: 0
+stdout: 20811 bytes
+>>>
 GENERAL.DEVICE:                         wlan0
 GENERAL.TYPE:                           wifi
+GENERAL.NM-TYPE:                        NMDeviceWifi
+GENERAL.VENDOR:                         --
+GENERAL.PRODUCT:                        --
+GENERAL.DRIVER:                         virtual
+GENERAL.DRIVER-VERSION:                 --
+GENERAL.FIRMWARE-VERSION:               --
 GENERAL.HWADDR:                         13:E0:74:85:7C:D9
 GENERAL.MTU:                            0
-GENERAL.STATE:                          20 (niedostępne)
+GENERAL.STATE:                          20 (unavailable)
+GENERAL.REASON:                         0 (No reason given)
+GENERAL.IP4-CONNECTIVITY:               0 (unknown)
+GENERAL.IP6-CONNECTIVITY:               0 (unknown)
+GENERAL.UDI:                            /sys/devices/virtual/wlan0
+GENERAL.IP-IFACE:                       --
+GENERAL.IS-SOFTWARE:                    no
+GENERAL.NM-MANAGED:                     yes
+GENERAL.AUTOCONNECT:                    yes
+GENERAL.FIRMWARE-MISSING:               no
+GENERAL.NM-PLUGIN-MISSING:              no
+GENERAL.PHYS-PORT-ID:                   --
 GENERAL.CONNECTION:                     con-vpn-1
+GENERAL.CON-UUID:                       UUID-con-vpn-1-REPLACED-REPLACED-REP
 GENERAL.CON-PATH:                       /org/freedesktop/NetworkManager/ActiveConnection/2
+GENERAL.METERED:                        unknown
+CAPABILITIES.CARRIER-DETECT:            no
+CAPABILITIES.SPEED:                     unknown
+CAPABILITIES.IS-SOFTWARE:               no
+CAPABILITIES.SRIOV:                     no
+WIFI-PROPERTIES.WEP:                    yes
+WIFI-PROPERTIES.WPA:                    yes
+WIFI-PROPERTIES.WPA2:                   yes
+WIFI-PROPERTIES.TKIP:                   yes
+WIFI-PROPERTIES.CCMP:                   yes
+WIFI-PROPERTIES.AP:                     yes
+WIFI-PROPERTIES.ADHOC:                  yes
+WIFI-PROPERTIES.2GHZ:                   unknown
+WIFI-PROPERTIES.5GHZ:                   unknown
+AP[1].IN-USE:                            
+AP[1].SSID:                             wlan0-ap-2
+AP[1].MODE:                             Infra
+AP[1].CHAN:                             1
+AP[1].RATE:                             54 Mbit/s
+AP[1].SIGNAL:                           92
+AP[1].BARS:                             ****
+AP[1].SECURITY:                         WPA1 WPA2
+AP[2].IN-USE:                            
+AP[2].SSID:                             wlan0-ap-1
+AP[2].MODE:                             Infra
+AP[2].CHAN:                             1
+AP[2].RATE:                             54 Mbit/s
+AP[2].SIGNAL:                           81
+AP[2].BARS:                             ****
+AP[2].SECURITY:                         WPA1
+AP[3].IN-USE:                            
+AP[3].SSID:                             wlan0-ap-3
+AP[3].MODE:                             Infra
+AP[3].CHAN:                             1
+AP[3].RATE:                             54 Mbit/s
+AP[3].SIGNAL:                           55
+AP[3].BARS:                             **  
+AP[3].SECURITY:                         WPA3
 IP4.ADDRESS[1]:                         192.168.228.18/32
 IP4.ADDRESS[2]:                         192.168.209.179/25
 IP4.GATEWAY:                            192.168.41.120
@@ -4556,6 +4697,10 @@ IP4.DOMAIN[3]:                          sear4.foo1.bar
 IP4.DOMAIN[4]:                          sear4.foo4.bar
 IP4.DOMAIN[5]:                          sear4.fo.o.bar
 IP4.WINS[1]:                            192.168.120.79
+DHCP4.OPTION[1]:                        dhcp-4-opt-0 = val-0
+DHCP4.OPTION[2]:                        dhcp-4-opt-2 = val-2
+DHCP4.OPTION[3]:                        dhcp-4-opt-4 = val-4
+DHCP4.OPTION[4]:                        dhcp-4-opt-7 = val-7
 IP6.GATEWAY:                            --
 IP6.ROUTE[1]:                           dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086
 IP6.DOMAIN[1]:                          sear6.foo2.bar
@@ -4564,15 +4709,14 @@ IP6.DOMAIN[3]:                          sear6.fo.x.y
 IP6.DOMAIN[4]:                          sear6.fo.o.bar
 IP6.DOMAIN[5]:                          sear6.foo3.bar
 IP6.DOMAIN[6]:                          sear6.foo4.bar
+DHCP6.OPTION[1]:                        dhcp-6-opt-1 = val-1
+DHCP6.OPTION[2]:                        dhcp-6-opt-2 = val-2
+DHCP6.OPTION[3]:                        dhcp-6-opt-3 = val-3
+DHCP6.OPTION[4]:                        dhcp-6-opt-4 = val-4
+DHCP6.OPTION[5]:                        dhcp-6-opt-5 = val-5
+CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings/Connection/{2}
+CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 
-<<<
-size: 20450
-location: clients/tests/test-client.py:1048:test_004()/85
-cmd: $NMCLI --color yes -f all dev show
-lang: C
-returncode: 0
-stdout: 20301 bytes
->>>
 GENERAL.DEVICE:                         eth0
 GENERAL.TYPE:                           ethernet
 GENERAL.NM-TYPE:                        NMDeviceEthernet
@@ -4585,6 +4729,8 @@ GENERAL.HWADDR:                         AB:B7:BF:E2:48:E8
 GENERAL.MTU:                            0
 GENERAL.STATE:                          20 (unavailable)
 GENERAL.REASON:                         0 (No reason given)
+GENERAL.IP4-CONNECTIVITY:               0 (unknown)
+GENERAL.IP6-CONNECTIVITY:               0 (unknown)
 GENERAL.UDI:                            /sys/devices/virtual/eth0
 GENERAL.IP-IFACE:                       --
 GENERAL.IS-SOFTWARE:                    no
@@ -4646,6 +4792,8 @@ GENERAL.HWADDR:                         E7:78:B1:93:2B:22
 GENERAL.MTU:                            0
 GENERAL.STATE:                          20 (unavailable)
 GENERAL.REASON:                         0 (No reason given)
+GENERAL.IP4-CONNECTIVITY:               0 (unknown)
+GENERAL.IP6-CONNECTIVITY:               0 (unknown)
 GENERAL.UDI:                            /sys/devices/virtual/eth1
 GENERAL.IP-IFACE:                       --
 GENERAL.IS-SOFTWARE:                    no
@@ -4714,6 +4862,8 @@ GENERAL.HWADDR:                         21:E9:64:81:8C:A8
 GENERAL.MTU:                            0
 GENERAL.STATE:                          20 (unavailable)
 GENERAL.REASON:                         0 (No reason given)
+GENERAL.IP4-CONNECTIVITY:               0 (unknown)
+GENERAL.IP6-CONNECTIVITY:               0 (unknown)
 GENERAL.UDI:                            /sys/devices/virtual/wlan1
 GENERAL.IP-IFACE:                       --
 GENERAL.IS-SOFTWARE:                    no
@@ -4800,6 +4950,8 @@ GENERAL.HWADDR:                         71:52:AD:63:5C:7C
 GENERAL.MTU:                            0
 GENERAL.STATE:                          20 (unavailable)
 GENERAL.REASON:                         0 (No reason given)
+GENERAL.IP4-CONNECTIVITY:               0 (unknown)
+GENERAL.IP6-CONNECTIVITY:               0 (unknown)
 GENERAL.UDI:                            /sys/devices/virtual/wlan1
 GENERAL.IP-IFACE:                       --
 GENERAL.IS-SOFTWARE:                    no
@@ -4854,6 +5006,14 @@ DHCP6.OPTION[5]:                        dhcp-6-opt-9 = val-9
 CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings/Connection/{2}
 CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 
+<<<
+size: 21110
+location: clients/tests/test-client.py:1062:test_004()/86
+cmd: $NMCLI --color yes -f all dev show
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 20951 bytes
+>>>
 GENERAL.DEVICE:                         wlan0
 GENERAL.TYPE:                           wifi
 GENERAL.NM-TYPE:                        NMDeviceWifi
@@ -4864,57 +5024,59 @@ GENERAL.DRIVER-VERSION:                 --
 GENERAL.FIRMWARE-VERSION:               --
 GENERAL.HWADDR:                         13:E0:74:85:7C:D9
 GENERAL.MTU:                            0
-GENERAL.STATE:                          20 (unavailable)
-GENERAL.REASON:                         0 (No reason given)
+GENERAL.STATE:                          20 (niedostępne)
+GENERAL.REASON:                         0 (Nie podano przyczyny)
+GENERAL.IP4-CONNECTIVITY:               0 (nieznane)
+GENERAL.IP6-CONNECTIVITY:               0 (nieznane)
 GENERAL.UDI:                            /sys/devices/virtual/wlan0
 GENERAL.IP-IFACE:                       --
-GENERAL.IS-SOFTWARE:                    no
-GENERAL.NM-MANAGED:                     yes
-GENERAL.AUTOCONNECT:                    yes
-GENERAL.FIRMWARE-MISSING:               no
-GENERAL.NM-PLUGIN-MISSING:              no
+GENERAL.IS-SOFTWARE:                    nie
+GENERAL.NM-MANAGED:                     tak
+GENERAL.AUTOCONNECT:                    tak
+GENERAL.FIRMWARE-MISSING:               nie
+GENERAL.NM-PLUGIN-MISSING:              nie
 GENERAL.PHYS-PORT-ID:                   --
 GENERAL.CONNECTION:                     con-vpn-1
 GENERAL.CON-UUID:                       UUID-con-vpn-1-REPLACED-REPLACED-REP
 GENERAL.CON-PATH:                       /org/freedesktop/NetworkManager/ActiveConnection/2
-GENERAL.METERED:                        unknown
-CAPABILITIES.CARRIER-DETECT:            no
-CAPABILITIES.SPEED:                     unknown
-CAPABILITIES.IS-SOFTWARE:               no
-CAPABILITIES.SRIOV:                     no
-WIFI-PROPERTIES.WEP:                    yes
-WIFI-PROPERTIES.WPA:                    yes
-WIFI-PROPERTIES.WPA2:                   yes
-WIFI-PROPERTIES.TKIP:                   yes
-WIFI-PROPERTIES.CCMP:                   yes
-WIFI-PROPERTIES.AP:                     yes
-WIFI-PROPERTIES.ADHOC:                  yes
-WIFI-PROPERTIES.2GHZ:                   unknown
-WIFI-PROPERTIES.5GHZ:                   unknown
+GENERAL.METERED:                        nieznane
+CAPABILITIES.CARRIER-DETECT:            nie
+CAPABILITIES.SPEED:                     nieznane
+CAPABILITIES.IS-SOFTWARE:               nie
+CAPABILITIES.SRIOV:                     nie
+WIFI-PROPERTIES.WEP:                    tak
+WIFI-PROPERTIES.WPA:                    tak
+WIFI-PROPERTIES.WPA2:                   tak
+WIFI-PROPERTIES.TKIP:                   tak
+WIFI-PROPERTIES.CCMP:                   tak
+WIFI-PROPERTIES.AP:                     tak
+WIFI-PROPERTIES.ADHOC:                  tak
+WIFI-PROPERTIES.2GHZ:                   nieznane
+WIFI-PROPERTIES.5GHZ:                   nieznane
 AP[1].IN-USE:                            
 AP[1].SSID:                             wlan0-ap-2
-AP[1].MODE:                             Infra
+AP[1].MODE:                             Infrastruktura
 AP[1].CHAN:                             1
-AP[1].RATE:                             54 Mbit/s
+AP[1].RATE:                             54 Mb/s
 AP[1].SIGNAL:                           92
 AP[1].BARS:                             ****
 AP[1].SECURITY:                         WPA1 WPA2
 AP[2].IN-USE:                            
 AP[2].SSID:                             wlan0-ap-1
-AP[2].MODE:                             Infra
+AP[2].MODE:                             Infrastruktura
 AP[2].CHAN:                             1
-AP[2].RATE:                             54 Mbit/s
+AP[2].RATE:                             54 Mb/s
 AP[2].SIGNAL:                           81
 AP[2].BARS:                             ****
-AP[2].SECURITY:                         WPA1 WPA2
+AP[2].SECURITY:                         WPA1
 AP[3].IN-USE:                            
 AP[3].SSID:                             wlan0-ap-3
-AP[3].MODE:                             Infra
+AP[3].MODE:                             Infrastruktura
 AP[3].CHAN:                             1
-AP[3].RATE:                             54 Mbit/s
+AP[3].RATE:                             54 Mb/s
 AP[3].SIGNAL:                           55
 AP[3].BARS:                             **  
-AP[3].SECURITY:                         WPA1 WPA2
+AP[3].SECURITY:                         WPA3
 IP4.ADDRESS[1]:                         192.168.228.18/32
 IP4.ADDRESS[2]:                         192.168.209.179/25
 IP4.GATEWAY:                            192.168.41.120
@@ -4944,14 +5106,6 @@ DHCP6.OPTION[5]:                        dhcp-6-opt-5 = val-5
 CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings/Connection/{2}
 CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 
-<<<
-size: 20590
-location: clients/tests/test-client.py:1048:test_004()/86
-cmd: $NMCLI --color yes -f all dev show
-lang: pl_PL.UTF-8
-returncode: 0
-stdout: 20431 bytes
->>>
 GENERAL.DEVICE:                         eth0
 GENERAL.TYPE:                           ethernet
 GENERAL.NM-TYPE:                        NMDeviceEthernet
@@ -4964,6 +5118,8 @@ GENERAL.HWADDR:                         AB:B7:BF:E2:48:E8
 GENERAL.MTU:                            0
 GENERAL.STATE:                          20 (niedostępne)
 GENERAL.REASON:                         0 (Nie podano przyczyny)
+GENERAL.IP4-CONNECTIVITY:               0 (nieznane)
+GENERAL.IP6-CONNECTIVITY:               0 (nieznane)
 GENERAL.UDI:                            /sys/devices/virtual/eth0
 GENERAL.IP-IFACE:                       --
 GENERAL.IS-SOFTWARE:                    nie
@@ -5025,6 +5181,8 @@ GENERAL.HWADDR:                         E7:78:B1:93:2B:22
 GENERAL.MTU:                            0
 GENERAL.STATE:                          20 (niedostępne)
 GENERAL.REASON:                         0 (Nie podano przyczyny)
+GENERAL.IP4-CONNECTIVITY:               0 (nieznane)
+GENERAL.IP6-CONNECTIVITY:               0 (nieznane)
 GENERAL.UDI:                            /sys/devices/virtual/eth1
 GENERAL.IP-IFACE:                       --
 GENERAL.IS-SOFTWARE:                    nie
@@ -5093,6 +5251,8 @@ GENERAL.HWADDR:                         21:E9:64:81:8C:A8
 GENERAL.MTU:                            0
 GENERAL.STATE:                          20 (niedostępne)
 GENERAL.REASON:                         0 (Nie podano przyczyny)
+GENERAL.IP4-CONNECTIVITY:               0 (nieznane)
+GENERAL.IP6-CONNECTIVITY:               0 (nieznane)
 GENERAL.UDI:                            /sys/devices/virtual/wlan1
 GENERAL.IP-IFACE:                       --
 GENERAL.IS-SOFTWARE:                    nie
@@ -5179,6 +5339,8 @@ GENERAL.HWADDR:                         71:52:AD:63:5C:7C
 GENERAL.MTU:                            0
 GENERAL.STATE:                          20 (niedostępne)
 GENERAL.REASON:                         0 (Nie podano przyczyny)
+GENERAL.IP4-CONNECTIVITY:               0 (nieznane)
+GENERAL.IP6-CONNECTIVITY:               0 (nieznane)
 GENERAL.UDI:                            /sys/devices/virtual/wlan1
 GENERAL.IP-IFACE:                       --
 GENERAL.IS-SOFTWARE:                    nie
@@ -5233,99 +5395,9 @@ DHCP6.OPTION[5]:                        dhcp-6-opt-9 = val-9
 CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings/Connection/{2}
 CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 
-GENERAL.DEVICE:                         wlan0
-GENERAL.TYPE:                           wifi
-GENERAL.NM-TYPE:                        NMDeviceWifi
-GENERAL.VENDOR:                         --
-GENERAL.PRODUCT:                        --
-GENERAL.DRIVER:                         virtual
-GENERAL.DRIVER-VERSION:                 --
-GENERAL.FIRMWARE-VERSION:               --
-GENERAL.HWADDR:                         13:E0:74:85:7C:D9
-GENERAL.MTU:                            0
-GENERAL.STATE:                          20 (niedostępne)
-GENERAL.REASON:                         0 (Nie podano przyczyny)
-GENERAL.UDI:                            /sys/devices/virtual/wlan0
-GENERAL.IP-IFACE:                       --
-GENERAL.IS-SOFTWARE:                    nie
-GENERAL.NM-MANAGED:                     tak
-GENERAL.AUTOCONNECT:                    tak
-GENERAL.FIRMWARE-MISSING:               nie
-GENERAL.NM-PLUGIN-MISSING:              nie
-GENERAL.PHYS-PORT-ID:                   --
-GENERAL.CONNECTION:                     con-vpn-1
-GENERAL.CON-UUID:                       UUID-con-vpn-1-REPLACED-REPLACED-REP
-GENERAL.CON-PATH:                       /org/freedesktop/NetworkManager/ActiveConnection/2
-GENERAL.METERED:                        nieznane
-CAPABILITIES.CARRIER-DETECT:            nie
-CAPABILITIES.SPEED:                     nieznane
-CAPABILITIES.IS-SOFTWARE:               nie
-CAPABILITIES.SRIOV:                     nie
-WIFI-PROPERTIES.WEP:                    tak
-WIFI-PROPERTIES.WPA:                    tak
-WIFI-PROPERTIES.WPA2:                   tak
-WIFI-PROPERTIES.TKIP:                   tak
-WIFI-PROPERTIES.CCMP:                   tak
-WIFI-PROPERTIES.AP:                     tak
-WIFI-PROPERTIES.ADHOC:                  tak
-WIFI-PROPERTIES.2GHZ:                   nieznane
-WIFI-PROPERTIES.5GHZ:                   nieznane
-AP[1].IN-USE:                            
-AP[1].SSID:                             wlan0-ap-2
-AP[1].MODE:                             Infrastruktura
-AP[1].CHAN:                             1
-AP[1].RATE:                             54 Mb/s
-AP[1].SIGNAL:                           92
-AP[1].BARS:                             ****
-AP[1].SECURITY:                         WPA1 WPA2
-AP[2].IN-USE:                            
-AP[2].SSID:                             wlan0-ap-1
-AP[2].MODE:                             Infrastruktura
-AP[2].CHAN:                             1
-AP[2].RATE:                             54 Mb/s
-AP[2].SIGNAL:                           81
-AP[2].BARS:                             ****
-AP[2].SECURITY:                         WPA1 WPA2
-AP[3].IN-USE:                            
-AP[3].SSID:                             wlan0-ap-3
-AP[3].MODE:                             Infrastruktura
-AP[3].CHAN:                             1
-AP[3].RATE:                             54 Mb/s
-AP[3].SIGNAL:                           55
-AP[3].BARS:                             **  
-AP[3].SECURITY:                         WPA1 WPA2
-IP4.ADDRESS[1]:                         192.168.228.18/32
-IP4.ADDRESS[2]:                         192.168.209.179/25
-IP4.GATEWAY:                            192.168.41.120
-IP4.DOMAIN[1]:                          sear4.foo2.bar
-IP4.DOMAIN[2]:                          sear4.fo.x.y
-IP4.DOMAIN[3]:                          sear4.foo1.bar
-IP4.DOMAIN[4]:                          sear4.foo4.bar
-IP4.DOMAIN[5]:                          sear4.fo.o.bar
-IP4.WINS[1]:                            192.168.120.79
-DHCP4.OPTION[1]:                        dhcp-4-opt-0 = val-0
-DHCP4.OPTION[2]:                        dhcp-4-opt-2 = val-2
-DHCP4.OPTION[3]:                        dhcp-4-opt-4 = val-4
-DHCP4.OPTION[4]:                        dhcp-4-opt-7 = val-7
-IP6.GATEWAY:                            --
-IP6.ROUTE[1]:                           dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086
-IP6.DOMAIN[1]:                          sear6.foo2.bar
-IP6.DOMAIN[2]:                          sear6.foo1.bar
-IP6.DOMAIN[3]:                          sear6.fo.x.y
-IP6.DOMAIN[4]:                          sear6.fo.o.bar
-IP6.DOMAIN[5]:                          sear6.foo3.bar
-IP6.DOMAIN[6]:                          sear6.foo4.bar
-DHCP6.OPTION[1]:                        dhcp-6-opt-1 = val-1
-DHCP6.OPTION[2]:                        dhcp-6-opt-2 = val-2
-DHCP6.OPTION[3]:                        dhcp-6-opt-3 = val-3
-DHCP6.OPTION[4]:                        dhcp-6-opt-4 = val-4
-DHCP6.OPTION[5]:                        dhcp-6-opt-5 = val-5
-CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings/Connection/{2}
-CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
-
 <<<
 size: 1510
-location: clients/tests/test-client.py:1051:test_004()/87
+location: clients/tests/test-client.py:1065:test_004()/87
 cmd: $NMCLI --color yes dev show wlan0
 lang: C
 returncode: 0
@@ -5358,7 +5430,7 @@ IP6.DOMAIN[6]:                          sear6.foo4.bar
 
 <<<
 size: 1521
-location: clients/tests/test-client.py:1051:test_004()/88
+location: clients/tests/test-client.py:1065:test_004()/88
 cmd: $NMCLI --color yes dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
@@ -5390,12 +5462,12 @@ IP6.DOMAIN[5]:                          sear6.foo3.bar
 IP6.DOMAIN[6]:                          sear6.foo4.bar
 
 <<<
-size: 4981
-location: clients/tests/test-client.py:1054:test_004()/89
+size: 5075
+location: clients/tests/test-client.py:1068:test_004()/89
 cmd: $NMCLI --color yes -f all dev show wlan0
 lang: C
 returncode: 0
-stdout: 4827 bytes
+stdout: 4921 bytes
 >>>
 GENERAL.DEVICE:                         wlan0
 GENERAL.TYPE:                           wifi
@@ -5409,6 +5481,8 @@ GENERAL.HWADDR:                         13:E0:74:85:7C:D9
 GENERAL.MTU:                            0
 GENERAL.STATE:                          20 (unavailable)
 GENERAL.REASON:                         0 (No reason given)
+GENERAL.IP4-CONNECTIVITY:               0 (unknown)
+GENERAL.IP6-CONNECTIVITY:               0 (unknown)
 GENERAL.UDI:                            /sys/devices/virtual/wlan0
 GENERAL.IP-IFACE:                       --
 GENERAL.IS-SOFTWARE:                    no
@@ -5449,7 +5523,7 @@ AP[2].CHAN:                             1
 AP[2].RATE:                             54 Mbit/s
 AP[2].SIGNAL:                           81
 AP[2].BARS:                             ****
-AP[2].SECURITY:                         WPA1 WPA2
+AP[2].SECURITY:                         WPA1
 AP[3].IN-USE:                            
 AP[3].SSID:                             wlan0-ap-3
 AP[3].MODE:                             Infra
@@ -5457,7 +5531,7 @@ AP[3].CHAN:                             1
 AP[3].RATE:                             54 Mbit/s
 AP[3].SIGNAL:                           55
 AP[3].BARS:                             **  
-AP[3].SECURITY:                         WPA1 WPA2
+AP[3].SECURITY:                         WPA3
 IP4.ADDRESS[1]:                         192.168.228.18/32
 IP4.ADDRESS[2]:                         192.168.209.179/25
 IP4.GATEWAY:                            192.168.41.120
@@ -5488,12 +5562,12 @@ CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings
 CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 
 <<<
-size: 5034
-location: clients/tests/test-client.py:1054:test_004()/90
+size: 5130
+location: clients/tests/test-client.py:1068:test_004()/90
 cmd: $NMCLI --color yes -f all dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 4870 bytes
+stdout: 4966 bytes
 >>>
 GENERAL.DEVICE:                         wlan0
 GENERAL.TYPE:                           wifi
@@ -5507,6 +5581,8 @@ GENERAL.HWADDR:                         13:E0:74:85:7C:D9
 GENERAL.MTU:                            0
 GENERAL.STATE:                          20 (niedostępne)
 GENERAL.REASON:                         0 (Nie podano przyczyny)
+GENERAL.IP4-CONNECTIVITY:               0 (nieznane)
+GENERAL.IP6-CONNECTIVITY:               0 (nieznane)
 GENERAL.UDI:                            /sys/devices/virtual/wlan0
 GENERAL.IP-IFACE:                       --
 GENERAL.IS-SOFTWARE:                    nie
@@ -5547,7 +5623,7 @@ AP[2].CHAN:                             1
 AP[2].RATE:                             54 Mb/s
 AP[2].SIGNAL:                           81
 AP[2].BARS:                             ****
-AP[2].SECURITY:                         WPA1 WPA2
+AP[2].SECURITY:                         WPA1
 AP[3].IN-USE:                            
 AP[3].SSID:                             wlan0-ap-3
 AP[3].MODE:                             Infrastruktura
@@ -5555,7 +5631,7 @@ AP[3].CHAN:                             1
 AP[3].RATE:                             54 Mb/s
 AP[3].SIGNAL:                           55
 AP[3].BARS:                             **  
-AP[3].SECURITY:                         WPA1 WPA2
+AP[3].SECURITY:                         WPA3
 IP4.ADDRESS[1]:                         192.168.228.18/32
 IP4.ADDRESS[2]:                         192.168.209.179/25
 IP4.GATEWAY:                            192.168.41.120
@@ -5586,12 +5662,12 @@ CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings
 CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 
 <<<
-size: 1868
-location: clients/tests/test-client.py:1057:test_004()/91
+size: 1972
+location: clients/tests/test-client.py:1071:test_004()/91
 cmd: $NMCLI --color yes -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: C
 returncode: 0
-stdout: 1679 bytes
+stdout: 1783 bytes
 >>>
 GENERAL.DEVICE:                         wlan0
 GENERAL.TYPE:                           wifi
@@ -5605,6 +5681,8 @@ GENERAL.HWADDR:                         13:E0:74:85:7C:D9
 GENERAL.MTU:                            0
 GENERAL.STATE:                          20 (unavailable)
 GENERAL.REASON:                         0 (No reason given)
+GENERAL.IP4-CONNECTIVITY:               0 (unknown)
+GENERAL.IP6-CONNECTIVITY:               0 (unknown)
 GENERAL.UDI:                            /sys/devices/virtual/wlan0
 GENERAL.IP-IFACE:                       --
 GENERAL.IS-SOFTWARE:                    no
@@ -5629,12 +5707,12 @@ WIFI-PROPERTIES.2GHZ:                   unknown
 WIFI-PROPERTIES.5GHZ:                   unknown
 
 <<<
-size: 1890
-location: clients/tests/test-client.py:1057:test_004()/92
+size: 1996
+location: clients/tests/test-client.py:1071:test_004()/92
 cmd: $NMCLI --color yes -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 1691 bytes
+stdout: 1797 bytes
 >>>
 GENERAL.DEVICE:                         wlan0
 GENERAL.TYPE:                           wifi
@@ -5648,6 +5726,8 @@ GENERAL.HWADDR:                         13:E0:74:85:7C:D9
 GENERAL.MTU:                            0
 GENERAL.STATE:                          20 (niedostępne)
 GENERAL.REASON:                         0 (Nie podano przyczyny)
+GENERAL.IP4-CONNECTIVITY:               0 (nieznane)
+GENERAL.IP6-CONNECTIVITY:               0 (nieznane)
 GENERAL.UDI:                            /sys/devices/virtual/wlan0
 GENERAL.IP-IFACE:                       --
 GENERAL.IS-SOFTWARE:                    nie
@@ -5672,12 +5752,12 @@ WIFI-PROPERTIES.2GHZ:                   nieznane
 WIFI-PROPERTIES.5GHZ:                   nieznane
 
 <<<
-size: 1868
-location: clients/tests/test-client.py:1060:test_004()/93
+size: 1972
+location: clients/tests/test-client.py:1074:test_004()/93
 cmd: $NMCLI --color yes -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: C
 returncode: 0
-stdout: 1679 bytes
+stdout: 1783 bytes
 >>>
 GENERAL.DEVICE:                         wlan0
 GENERAL.TYPE:                           wifi
@@ -5691,6 +5771,8 @@ GENERAL.HWADDR:                         13:E0:74:85:7C:D9
 GENERAL.MTU:                            0
 GENERAL.STATE:                          20 (unavailable)
 GENERAL.REASON:                         0 (No reason given)
+GENERAL.IP4-CONNECTIVITY:               0 (unknown)
+GENERAL.IP6-CONNECTIVITY:               0 (unknown)
 GENERAL.UDI:                            /sys/devices/virtual/wlan0
 GENERAL.IP-IFACE:                       --
 GENERAL.IS-SOFTWARE:                    no
@@ -5715,12 +5797,12 @@ WIFI-PROPERTIES.2GHZ:                   unknown
 WIFI-PROPERTIES.5GHZ:                   unknown
 
 <<<
-size: 1890
-location: clients/tests/test-client.py:1060:test_004()/94
+size: 1996
+location: clients/tests/test-client.py:1074:test_004()/94
 cmd: $NMCLI --color yes -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 1691 bytes
+stdout: 1797 bytes
 >>>
 GENERAL.DEVICE:                         wlan0
 GENERAL.TYPE:                           wifi
@@ -5734,6 +5816,8 @@ GENERAL.HWADDR:                         13:E0:74:85:7C:D9
 GENERAL.MTU:                            0
 GENERAL.STATE:                          20 (niedostępne)
 GENERAL.REASON:                         0 (Nie podano przyczyny)
+GENERAL.IP4-CONNECTIVITY:               0 (nieznane)
+GENERAL.IP6-CONNECTIVITY:               0 (nieznane)
 GENERAL.UDI:                            /sys/devices/virtual/wlan0
 GENERAL.IP-IFACE:                       --
 GENERAL.IS-SOFTWARE:                    nie
@@ -5759,215 +5843,227 @@ WIFI-PROPERTIES.5GHZ:                   nieznane
 
 <<<
 size: 646
-location: clients/tests/test-client.py:1063:test_004()/95
+location: clients/tests/test-client.py:1077:test_004()/95
 cmd: $NMCLI --color yes -f DEVICE,TYPE,DBUS-PATH dev
 lang: C
 returncode: 0
 stdout: 486 bytes
 >>>
 DEVICE  TYPE      DBUS-PATH                                 
+wlan0   wifi      /org/freedesktop/NetworkManager/Devices/3 
 eth0    ethernet  /org/freedesktop/NetworkManager/Devices/1 
 eth1    ethernet  /org/freedesktop/NetworkManager/Devices/2 
 wlan1   wifi      /org/freedesktop/NetworkManager/Devices/4 
 wlan1   wifi      /org/freedesktop/NetworkManager/Devices/5 
-wlan0   wifi      /org/freedesktop/NetworkManager/Devices/3 
 
 <<<
 size: 656
-location: clients/tests/test-client.py:1063:test_004()/96
+location: clients/tests/test-client.py:1077:test_004()/96
 cmd: $NMCLI --color yes -f DEVICE,TYPE,DBUS-PATH dev
 lang: pl_PL.UTF-8
 returncode: 0
 stdout: 486 bytes
 >>>
 DEVICE  TYPE      DBUS-PATH                                 
+wlan0   wifi      /org/freedesktop/NetworkManager/Devices/3 
 eth0    ethernet  /org/freedesktop/NetworkManager/Devices/1 
 eth1    ethernet  /org/freedesktop/NetworkManager/Devices/2 
 wlan1   wifi      /org/freedesktop/NetworkManager/Devices/4 
 wlan1   wifi      /org/freedesktop/NetworkManager/Devices/5 
-wlan0   wifi      /org/freedesktop/NetworkManager/Devices/3 
 
 <<<
 size: 2608
-location: clients/tests/test-client.py:1066:test_004()/97
+location: clients/tests/test-client.py:1080:test_004()/97
 cmd: $NMCLI --color yes -f ALL device wifi list
 lang: C
 returncode: 0
 stdout: 2452 bytes
 >>>
+NAME   SSID        SSID-HEX              BSSID              MODE   CHAN  FREQ      RATE       SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
+AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infra  1     2412 MHz  54 Mbit/s  92      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/2 
+AP[2]  wlan0-ap-1  776C616E302D61702D31  61:95:77:AC:1E:4C  Infra  1     2412 MHz  54 Mbit/s  81      ****  WPA1       pair_tkip pair_ccmp group_tkip group_ccmp psk  (none)                                         wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/1 
+AP[3]  wlan0-ap-3  776C616E302D61702D33  9B:F6:B7:EC:97:76  Infra  1     2412 MHz  54 Mbit/s  55      **    WPA3       (none)                                         pair_tkip pair_ccmp group_tkip group_ccmp sae  wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/3 
+
 NAME   SSID        SSID-HEX              BSSID              MODE   CHAN  FREQ      RATE       SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
 AP[1]  wlan1-ap-4  776C616E312D61702D34  94:2B:E8:F6:D2:86  Infra  1     2412 MHz  54 Mbit/s  48      **    WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan1   no              /org/freedesktop/NetworkManager/AccessPoint/4 
 
 NAME  SSID  SSID-HEX  BSSID  MODE  CHAN  FREQ  RATE  SIGNAL  BARS  SECURITY  WPA-FLAGS  RSN-FLAGS  DEVICE  ACTIVE  IN-USE  DBUS-PATH 
 
-NAME   SSID        SSID-HEX              BSSID              MODE   CHAN  FREQ      RATE       SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
-AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infra  1     2412 MHz  54 Mbit/s  92      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/2 
-AP[2]  wlan0-ap-1  776C616E302D61702D31  61:95:77:AC:1E:4C  Infra  1     2412 MHz  54 Mbit/s  81      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/1 
-AP[3]  wlan0-ap-3  776C616E302D61702D33  9B:F6:B7:EC:97:76  Infra  1     2412 MHz  54 Mbit/s  55      **    WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/3 
-
 <<<
 size: 2676
-location: clients/tests/test-client.py:1066:test_004()/98
+location: clients/tests/test-client.py:1080:test_004()/98
 cmd: $NMCLI --color yes -f ALL device wifi list
 lang: pl_PL.UTF-8
 returncode: 0
 stdout: 2510 bytes
 >>>
+NAME   SSID        SSID-HEX              BSSID              MODE            CHAN  FREQ      RATE     SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
+AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infrastruktura  1     2412 MHz  54 Mb/s  92      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/2 
+AP[2]  wlan0-ap-1  776C616E302D61702D31  61:95:77:AC:1E:4C  Infrastruktura  1     2412 MHz  54 Mb/s  81      ****  WPA1       pair_tkip pair_ccmp group_tkip group_ccmp psk  (brak)                                         wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/1 
+AP[3]  wlan0-ap-3  776C616E302D61702D33  9B:F6:B7:EC:97:76  Infrastruktura  1     2412 MHz  54 Mb/s  55      **    WPA3       (brak)                                         pair_tkip pair_ccmp group_tkip group_ccmp sae  wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/3 
+
 NAME   SSID        SSID-HEX              BSSID              MODE            CHAN  FREQ      RATE     SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
 AP[1]  wlan1-ap-4  776C616E312D61702D34  94:2B:E8:F6:D2:86  Infrastruktura  1     2412 MHz  54 Mb/s  48      **    WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan1   nie             /org/freedesktop/NetworkManager/AccessPoint/4 
 
 NAME  SSID  SSID-HEX  BSSID  MODE  CHAN  FREQ  RATE  SIGNAL  BARS  SECURITY  WPA-FLAGS  RSN-FLAGS  DEVICE  ACTIVE  IN-USE  DBUS-PATH 
 
-NAME   SSID        SSID-HEX              BSSID              MODE            CHAN  FREQ      RATE     SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
-AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infrastruktura  1     2412 MHz  54 Mb/s  92      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/2 
-AP[2]  wlan0-ap-1  776C616E302D61702D31  61:95:77:AC:1E:4C  Infrastruktura  1     2412 MHz  54 Mb/s  81      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/1 
-AP[3]  wlan0-ap-3  776C616E302D61702D33  9B:F6:B7:EC:97:76  Infrastruktura  1     2412 MHz  54 Mb/s  55      **    WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/3 
-
 <<<
 size: 918
-location: clients/tests/test-client.py:1068:test_004()/99
+location: clients/tests/test-client.py:1082:test_004()/99
 cmd: $NMCLI --color yes -f COMMON device wifi list
 lang: C
 returncode: 0
 stdout: 760 bytes
 >>>
+IN-USE  SSID        MODE   CHAN  RATE       SIGNAL  BARS  SECURITY  
+        wlan0-ap-2  Infra  1     54 Mbit/s  92      ****  WPA1 WPA2 
+        wlan0-ap-1  Infra  1     54 Mbit/s  81      ****  WPA1      
+        wlan0-ap-3  Infra  1     54 Mbit/s  55      **    WPA3      
+
 IN-USE  SSID        MODE   CHAN  RATE       SIGNAL  BARS  SECURITY  
         wlan1-ap-4  Infra  1     54 Mbit/s  48      **    WPA1 WPA2 
 
 IN-USE  SSID  MODE  CHAN  RATE  SIGNAL  BARS  SECURITY 
 
-IN-USE  SSID        MODE   CHAN  RATE       SIGNAL  BARS  SECURITY  
-        wlan0-ap-2  Infra  1     54 Mbit/s  92      ****  WPA1 WPA2 
-        wlan0-ap-1  Infra  1     54 Mbit/s  81      ****  WPA1 WPA2 
-        wlan0-ap-3  Infra  1     54 Mbit/s  55      **    WPA1 WPA2 
-
 <<<
 size: 979
-location: clients/tests/test-client.py:1068:test_004()/100
+location: clients/tests/test-client.py:1082:test_004()/100
 cmd: $NMCLI --color yes -f COMMON device wifi list
 lang: pl_PL.UTF-8
 returncode: 0
 stdout: 810 bytes
 >>>
+IN-USE  SSID        MODE            CHAN  RATE     SIGNAL  BARS  SECURITY  
+        wlan0-ap-2  Infrastruktura  1     54 Mb/s  92      ****  WPA1 WPA2 
+        wlan0-ap-1  Infrastruktura  1     54 Mb/s  81      ****  WPA1      
+        wlan0-ap-3  Infrastruktura  1     54 Mb/s  55      **    WPA3      
+
 IN-USE  SSID        MODE            CHAN  RATE     SIGNAL  BARS  SECURITY  
         wlan1-ap-4  Infrastruktura  1     54 Mb/s  48      **    WPA1 WPA2 
 
 IN-USE  SSID  MODE  CHAN  RATE  SIGNAL  BARS  SECURITY 
 
-IN-USE  SSID        MODE            CHAN  RATE     SIGNAL  BARS  SECURITY  
-        wlan0-ap-2  Infrastruktura  1     54 Mb/s  92      ****  WPA1 WPA2 
-        wlan0-ap-1  Infrastruktura  1     54 Mb/s  81      ****  WPA1 WPA2 
-        wlan0-ap-3  Infrastruktura  1     54 Mb/s  55      **    WPA1 WPA2 
-
 <<<
 size: 2722
-location: clients/tests/test-client.py:1071:test_004()/101
+location: clients/tests/test-client.py:1085:test_004()/101
 cmd: $NMCLI --color yes -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list
 lang: C
 returncode: 0
 stdout: 2452 bytes
 >>>
+NAME   SSID        SSID-HEX              BSSID              MODE   CHAN  FREQ      RATE       SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
+AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infra  1     2412 MHz  54 Mbit/s  92      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/2 
+AP[2]  wlan0-ap-1  776C616E302D61702D31  61:95:77:AC:1E:4C  Infra  1     2412 MHz  54 Mbit/s  81      ****  WPA1       pair_tkip pair_ccmp group_tkip group_ccmp psk  (none)                                         wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/1 
+AP[3]  wlan0-ap-3  776C616E302D61702D33  9B:F6:B7:EC:97:76  Infra  1     2412 MHz  54 Mbit/s  55      **    WPA3       (none)                                         pair_tkip pair_ccmp group_tkip group_ccmp sae  wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/3 
+
 NAME   SSID        SSID-HEX              BSSID              MODE   CHAN  FREQ      RATE       SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
 AP[1]  wlan1-ap-4  776C616E312D61702D34  94:2B:E8:F6:D2:86  Infra  1     2412 MHz  54 Mbit/s  48      **    WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan1   no              /org/freedesktop/NetworkManager/AccessPoint/4 
 
 NAME  SSID  SSID-HEX  BSSID  MODE  CHAN  FREQ  RATE  SIGNAL  BARS  SECURITY  WPA-FLAGS  RSN-FLAGS  DEVICE  ACTIVE  IN-USE  DBUS-PATH 
 
-NAME   SSID        SSID-HEX              BSSID              MODE   CHAN  FREQ      RATE       SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
-AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infra  1     2412 MHz  54 Mbit/s  92      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/2 
-AP[2]  wlan0-ap-1  776C616E302D61702D31  61:95:77:AC:1E:4C  Infra  1     2412 MHz  54 Mbit/s  81      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/1 
-AP[3]  wlan0-ap-3  776C616E302D61702D33  9B:F6:B7:EC:97:76  Infra  1     2412 MHz  54 Mbit/s  55      **    WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/3 
-
 <<<
 size: 2790
-location: clients/tests/test-client.py:1071:test_004()/102
+location: clients/tests/test-client.py:1085:test_004()/102
 cmd: $NMCLI --color yes -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list
 lang: pl_PL.UTF-8
 returncode: 0
 stdout: 2510 bytes
 >>>
+NAME   SSID        SSID-HEX              BSSID              MODE            CHAN  FREQ      RATE     SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
+AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infrastruktura  1     2412 MHz  54 Mb/s  92      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/2 
+AP[2]  wlan0-ap-1  776C616E302D61702D31  61:95:77:AC:1E:4C  Infrastruktura  1     2412 MHz  54 Mb/s  81      ****  WPA1       pair_tkip pair_ccmp group_tkip group_ccmp psk  (brak)                                         wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/1 
+AP[3]  wlan0-ap-3  776C616E302D61702D33  9B:F6:B7:EC:97:76  Infrastruktura  1     2412 MHz  54 Mb/s  55      **    WPA3       (brak)                                         pair_tkip pair_ccmp group_tkip group_ccmp sae  wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/3 
+
 NAME   SSID        SSID-HEX              BSSID              MODE            CHAN  FREQ      RATE     SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
 AP[1]  wlan1-ap-4  776C616E312D61702D34  94:2B:E8:F6:D2:86  Infrastruktura  1     2412 MHz  54 Mb/s  48      **    WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan1   nie             /org/freedesktop/NetworkManager/AccessPoint/4 
 
 NAME  SSID  SSID-HEX  BSSID  MODE  CHAN  FREQ  RATE  SIGNAL  BARS  SECURITY  WPA-FLAGS  RSN-FLAGS  DEVICE  ACTIVE  IN-USE  DBUS-PATH 
 
-NAME   SSID        SSID-HEX              BSSID              MODE            CHAN  FREQ      RATE     SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
-AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infrastruktura  1     2412 MHz  54 Mb/s  92      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/2 
-AP[2]  wlan0-ap-1  776C616E302D61702D31  61:95:77:AC:1E:4C  Infrastruktura  1     2412 MHz  54 Mb/s  81      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/1 
-AP[3]  wlan0-ap-3  776C616E302D61702D33  9B:F6:B7:EC:97:76  Infrastruktura  1     2412 MHz  54 Mb/s  55      **    WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/3 
-
 <<<
-size: 901
-location: clients/tests/test-client.py:1073:test_004()/103
+size: 903
+location: clients/tests/test-client.py:1087:test_004()/103
 cmd: $NMCLI --color yes -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: C
 returncode: 0
-stdout: 721 bytes
+stdout: 723 bytes
 >>>
 NAME   SSID        SSID-HEX              BSSID              MODE   CHAN  FREQ      RATE       SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
 AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infra  1     2412 MHz  54 Mbit/s  92      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/2 
 
+
+
 <<<
-size: 929
-location: clients/tests/test-client.py:1073:test_004()/104
+size: 931
+location: clients/tests/test-client.py:1087:test_004()/104
 cmd: $NMCLI --color yes -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 739 bytes
+stdout: 741 bytes
 >>>
 NAME   SSID        SSID-HEX              BSSID              MODE            CHAN  FREQ      RATE     SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
 AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infrastruktura  1     2412 MHz  54 Mb/s  92      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/2 
 
+
+
 <<<
-size: 393
-location: clients/tests/test-client.py:1075:test_004()/105
+size: 395
+location: clients/tests/test-client.py:1089:test_004()/105
 cmd: $NMCLI --color yes -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: C
 returncode: 0
-stdout: 210 bytes
+stdout: 212 bytes
 >>>
 IN-USE  SSID        MODE   CHAN  RATE       SIGNAL  BARS  SECURITY  
         wlan0-ap-2  Infra  1     54 Mbit/s  92      ****  WPA1 WPA2 
 
+
+
 <<<
-size: 419
-location: clients/tests/test-client.py:1075:test_004()/106
+size: 421
+location: clients/tests/test-client.py:1089:test_004()/106
 cmd: $NMCLI --color yes -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 226 bytes
+stdout: 228 bytes
 >>>
 IN-USE  SSID        MODE            CHAN  RATE     SIGNAL  BARS  SECURITY  
         wlan0-ap-2  Infrastruktura  1     54 Mb/s  92      ****  WPA1 WPA2 
 
+
+
 <<<
-size: 1014
-location: clients/tests/test-client.py:1078:test_004()/107
+size: 1016
+location: clients/tests/test-client.py:1092:test_004()/107
 cmd: $NMCLI --color yes -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: C
 returncode: 0
-stdout: 721 bytes
+stdout: 723 bytes
 >>>
 NAME   SSID        SSID-HEX              BSSID              MODE   CHAN  FREQ      RATE       SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
 AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infra  1     2412 MHz  54 Mbit/s  92      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/2 
 
+
+
 <<<
-size: 1042
-location: clients/tests/test-client.py:1078:test_004()/108
+size: 1044
+location: clients/tests/test-client.py:1092:test_004()/108
 cmd: $NMCLI --color yes -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 739 bytes
+stdout: 741 bytes
 >>>
 NAME   SSID        SSID-HEX              BSSID              MODE            CHAN  FREQ      RATE     SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
 AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infrastruktura  1     2412 MHz  54 Mb/s  92      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/2 
 
+
+
 <<<
-size: 4985
-location: clients/tests/test-client.py:1080:test_004()/109
+size: 5079
+location: clients/tests/test-client.py:1094:test_004()/109
 cmd: $NMCLI --color yes -f ALL device show wlan0
 lang: C
 returncode: 0
-stdout: 4827 bytes
+stdout: 4921 bytes
 >>>
 GENERAL.DEVICE:                         wlan0
 GENERAL.TYPE:                           wifi
@@ -5981,6 +6077,8 @@ GENERAL.HWADDR:                         13:E0:74:85:7C:D9
 GENERAL.MTU:                            0
 GENERAL.STATE:                          20 (unavailable)
 GENERAL.REASON:                         0 (No reason given)
+GENERAL.IP4-CONNECTIVITY:               0 (unknown)
+GENERAL.IP6-CONNECTIVITY:               0 (unknown)
 GENERAL.UDI:                            /sys/devices/virtual/wlan0
 GENERAL.IP-IFACE:                       --
 GENERAL.IS-SOFTWARE:                    no
@@ -6021,7 +6119,7 @@ AP[2].CHAN:                             1
 AP[2].RATE:                             54 Mbit/s
 AP[2].SIGNAL:                           81
 AP[2].BARS:                             ****
-AP[2].SECURITY:                         WPA1 WPA2
+AP[2].SECURITY:                         WPA1
 AP[3].IN-USE:                            
 AP[3].SSID:                             wlan0-ap-3
 AP[3].MODE:                             Infra
@@ -6029,7 +6127,7 @@ AP[3].CHAN:                             1
 AP[3].RATE:                             54 Mbit/s
 AP[3].SIGNAL:                           55
 AP[3].BARS:                             **  
-AP[3].SECURITY:                         WPA1 WPA2
+AP[3].SECURITY:                         WPA3
 IP4.ADDRESS[1]:                         192.168.228.18/32
 IP4.ADDRESS[2]:                         192.168.209.179/25
 IP4.GATEWAY:                            192.168.41.120
@@ -6060,12 +6158,12 @@ CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings
 CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 
 <<<
-size: 5038
-location: clients/tests/test-client.py:1080:test_004()/110
+size: 5134
+location: clients/tests/test-client.py:1094:test_004()/110
 cmd: $NMCLI --color yes -f ALL device show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 4870 bytes
+stdout: 4966 bytes
 >>>
 GENERAL.DEVICE:                         wlan0
 GENERAL.TYPE:                           wifi
@@ -6079,6 +6177,8 @@ GENERAL.HWADDR:                         13:E0:74:85:7C:D9
 GENERAL.MTU:                            0
 GENERAL.STATE:                          20 (niedostępne)
 GENERAL.REASON:                         0 (Nie podano przyczyny)
+GENERAL.IP4-CONNECTIVITY:               0 (nieznane)
+GENERAL.IP6-CONNECTIVITY:               0 (nieznane)
 GENERAL.UDI:                            /sys/devices/virtual/wlan0
 GENERAL.IP-IFACE:                       --
 GENERAL.IS-SOFTWARE:                    nie
@@ -6119,7 +6219,7 @@ AP[2].CHAN:                             1
 AP[2].RATE:                             54 Mb/s
 AP[2].SIGNAL:                           81
 AP[2].BARS:                             ****
-AP[2].SECURITY:                         WPA1 WPA2
+AP[2].SECURITY:                         WPA1
 AP[3].IN-USE:                            
 AP[3].SSID:                             wlan0-ap-3
 AP[3].MODE:                             Infrastruktura
@@ -6127,7 +6227,7 @@ AP[3].CHAN:                             1
 AP[3].RATE:                             54 Mb/s
 AP[3].SIGNAL:                           55
 AP[3].BARS:                             **  
-AP[3].SECURITY:                         WPA1 WPA2
+AP[3].SECURITY:                         WPA3
 IP4.ADDRESS[1]:                         192.168.228.18/32
 IP4.ADDRESS[2]:                         192.168.209.179/25
 IP4.GATEWAY:                            192.168.41.120
@@ -6159,7 +6259,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | c
 
 <<<
 size: 1524
-location: clients/tests/test-client.py:1082:test_004()/111
+location: clients/tests/test-client.py:1096:test_004()/111
 cmd: $NMCLI --color yes -f COMMON device show wlan0
 lang: C
 returncode: 0
@@ -6192,7 +6292,7 @@ IP6.DOMAIN[6]:                          sear6.foo4.bar
 
 <<<
 size: 1535
-location: clients/tests/test-client.py:1082:test_004()/112
+location: clients/tests/test-client.py:1096:test_004()/112
 cmd: $NMCLI --color yes -f COMMON device show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
@@ -6224,12 +6324,12 @@ IP6.DOMAIN[5]:                          sear6.foo3.bar
 IP6.DOMAIN[6]:                          sear6.foo4.bar
 
 <<<
-size: 5123
-location: clients/tests/test-client.py:1084:test_004()/113
+size: 5217
+location: clients/tests/test-client.py:1098:test_004()/113
 cmd: $NMCLI --color yes -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0
 lang: C
 returncode: 0
-stdout: 4827 bytes
+stdout: 4921 bytes
 >>>
 GENERAL.DEVICE:                         wlan0
 GENERAL.TYPE:                           wifi
@@ -6243,6 +6343,8 @@ GENERAL.HWADDR:                         13:E0:74:85:7C:D9
 GENERAL.MTU:                            0
 GENERAL.STATE:                          20 (unavailable)
 GENERAL.REASON:                         0 (No reason given)
+GENERAL.IP4-CONNECTIVITY:               0 (unknown)
+GENERAL.IP6-CONNECTIVITY:               0 (unknown)
 GENERAL.UDI:                            /sys/devices/virtual/wlan0
 GENERAL.IP-IFACE:                       --
 GENERAL.IS-SOFTWARE:                    no
@@ -6283,7 +6385,7 @@ AP[2].CHAN:                             1
 AP[2].RATE:                             54 Mbit/s
 AP[2].SIGNAL:                           81
 AP[2].BARS:                             ****
-AP[2].SECURITY:                         WPA1 WPA2
+AP[2].SECURITY:                         WPA1
 AP[3].IN-USE:                            
 AP[3].SSID:                             wlan0-ap-3
 AP[3].MODE:                             Infra
@@ -6291,7 +6393,7 @@ AP[3].CHAN:                             1
 AP[3].RATE:                             54 Mbit/s
 AP[3].SIGNAL:                           55
 AP[3].BARS:                             **  
-AP[3].SECURITY:                         WPA1 WPA2
+AP[3].SECURITY:                         WPA3
 IP4.ADDRESS[1]:                         192.168.228.18/32
 IP4.ADDRESS[2]:                         192.168.209.179/25
 IP4.GATEWAY:                            192.168.41.120
@@ -6322,12 +6424,12 @@ CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings
 CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 
 <<<
-size: 5176
-location: clients/tests/test-client.py:1084:test_004()/114
+size: 5272
+location: clients/tests/test-client.py:1098:test_004()/114
 cmd: $NMCLI --color yes -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 4870 bytes
+stdout: 4966 bytes
 >>>
 GENERAL.DEVICE:                         wlan0
 GENERAL.TYPE:                           wifi
@@ -6341,6 +6443,8 @@ GENERAL.HWADDR:                         13:E0:74:85:7C:D9
 GENERAL.MTU:                            0
 GENERAL.STATE:                          20 (niedostępne)
 GENERAL.REASON:                         0 (Nie podano przyczyny)
+GENERAL.IP4-CONNECTIVITY:               0 (nieznane)
+GENERAL.IP6-CONNECTIVITY:               0 (nieznane)
 GENERAL.UDI:                            /sys/devices/virtual/wlan0
 GENERAL.IP-IFACE:                       --
 GENERAL.IS-SOFTWARE:                    nie
@@ -6381,7 +6485,7 @@ AP[2].CHAN:                             1
 AP[2].RATE:                             54 Mb/s
 AP[2].SIGNAL:                           81
 AP[2].BARS:                             ****
-AP[2].SECURITY:                         WPA1 WPA2
+AP[2].SECURITY:                         WPA1
 AP[3].IN-USE:                            
 AP[3].SSID:                             wlan0-ap-3
 AP[3].MODE:                             Infrastruktura
@@ -6389,7 +6493,7 @@ AP[3].CHAN:                             1
 AP[3].RATE:                             54 Mb/s
 AP[3].SIGNAL:                           55
 AP[3].BARS:                             **  
-AP[3].SECURITY:                         WPA1 WPA2
+AP[3].SECURITY:                         WPA3
 IP4.ADDRESS[1]:                         192.168.228.18/32
 IP4.ADDRESS[2]:                         192.168.209.179/25
 IP4.GATEWAY:                            192.168.41.120
@@ -6421,7 +6525,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | c
 
 <<<
 size: 5625
-location: clients/tests/test-client.py:1022:test_004()/115
+location: clients/tests/test-client.py:1036:test_004()/115
 cmd: $NMCLI --pretty con s con-vpn-1
 lang: C
 returncode: 0
@@ -6535,12 +6639,12 @@ VPN.CFG[3]:                             key3 = val3
 -------------------------------------------------------------------------------
 
 <<<
-size: 5665
-location: clients/tests/test-client.py:1022:test_004()/116
+size: 5667
+location: clients/tests/test-client.py:1036:test_004()/116
 cmd: $NMCLI --pretty con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 5509 bytes
+stdout: 5511 bytes
 >>>
 ===============================================================================
                    Szczegóły profilu połączenia (con-vpn-1)
@@ -6643,7 +6747,7 @@ VPN.TYPE:                               openvpn
 VPN.USERNAME:                           --
 VPN.GATEWAY:                            --
 VPN.BANNER:                             *** VPN connection con-vpn-1 ***
-VPN.VPN-STATE:                          5 - Połączono z VPN
+VPN.VPN-STATE:                          5 — Połączono z VPN
 VPN.CFG[1]:                             key1 = val1
 VPN.CFG[2]:                             key2 = val2
 VPN.CFG[3]:                             key3 = val3
@@ -6651,7 +6755,7 @@ VPN.CFG[3]:                             key3 = val3
 
 <<<
 size: 5625
-location: clients/tests/test-client.py:1024:test_004()/117
+location: clients/tests/test-client.py:1038:test_004()/117
 cmd: $NMCLI --pretty con s con-vpn-1
 lang: C
 returncode: 0
@@ -6765,12 +6869,12 @@ VPN.CFG[3]:                             key3 = val3
 -------------------------------------------------------------------------------
 
 <<<
-size: 5665
-location: clients/tests/test-client.py:1024:test_004()/118
+size: 5667
+location: clients/tests/test-client.py:1038:test_004()/118
 cmd: $NMCLI --pretty con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 5509 bytes
+stdout: 5511 bytes
 >>>
 ===============================================================================
                    Szczegóły profilu połączenia (con-vpn-1)
@@ -6873,7 +6977,7 @@ VPN.TYPE:                               openvpn
 VPN.USERNAME:                           --
 VPN.GATEWAY:                            --
 VPN.BANNER:                             *** VPN connection con-vpn-1 ***
-VPN.VPN-STATE:                          5 - Połączono z VPN
+VPN.VPN-STATE:                          5 — Połączono z VPN
 VPN.CFG[1]:                             key1 = val1
 VPN.CFG[2]:                             key2 = val2
 VPN.CFG[3]:                             key3 = val3
@@ -6881,7 +6985,7 @@ VPN.CFG[3]:                             key3 = val3
 
 <<<
 size: 4151
-location: clients/tests/test-client.py:1027:test_004()/119
+location: clients/tests/test-client.py:1041:test_004()/119
 cmd: $NMCLI --pretty -f ALL con s con-vpn-1
 lang: C
 returncode: 0
@@ -6971,7 +7075,7 @@ proxy.pac-script:                       --
 
 <<<
 size: 4176
-location: clients/tests/test-client.py:1027:test_004()/120
+location: clients/tests/test-client.py:1041:test_004()/120
 cmd: $NMCLI --pretty -f ALL con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
@@ -7061,7 +7165,7 @@ proxy.pac-script:                       --
 
 <<<
 size: 785
-location: clients/tests/test-client.py:1033:test_004()/121
+location: clients/tests/test-client.py:1047:test_004()/121
 cmd: $NMCLI --pretty -f VPN con s con-vpn-1
 lang: C
 returncode: 0
@@ -7080,7 +7184,7 @@ vpn.timeout:                            0
 
 <<<
 size: 801
-location: clients/tests/test-client.py:1033:test_004()/122
+location: clients/tests/test-client.py:1047:test_004()/122
 cmd: $NMCLI --pretty -f VPN con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
@@ -7099,7 +7203,7 @@ vpn.timeout:                            0
 
 <<<
 size: 1136
-location: clients/tests/test-client.py:1036:test_004()/123
+location: clients/tests/test-client.py:1050:test_004()/123
 cmd: $NMCLI --pretty -f GENERAL con s con-vpn-1
 lang: C
 returncode: 0
@@ -7124,7 +7228,7 @@ GENERAL.MASTER-PATH:                    --
 
 <<<
 size: 1156
-location: clients/tests/test-client.py:1036:test_004()/124
+location: clients/tests/test-client.py:1050:test_004()/124
 cmd: $NMCLI --pretty -f GENERAL con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
@@ -7149,7 +7253,7 @@ GENERAL.MASTER-PATH:                    --
 
 <<<
 size: 522
-location: clients/tests/test-client.py:1039:test_004()/125
+location: clients/tests/test-client.py:1053:test_004()/125
 cmd: $NMCLI --pretty dev s
 lang: C
 returncode: 0
@@ -7160,15 +7264,15 @@ stdout: 387 bytes
 =====================
 DEVICE  TYPE      STATE        CONNECTION 
 ----------------------------------------------------------------
+wlan0   wifi      unavailable  con-vpn-1  
 eth0    ethernet  unavailable  --         
 eth1    ethernet  unavailable  --         
 wlan1   wifi      unavailable  --         
 wlan1   wifi      unavailable  --         
-wlan0   wifi      unavailable  con-vpn-1  
 
 <<<
 size: 530
-location: clients/tests/test-client.py:1039:test_004()/126
+location: clients/tests/test-client.py:1053:test_004()/126
 cmd: $NMCLI --pretty dev s
 lang: pl_PL.UTF-8
 returncode: 0
@@ -7179,58 +7283,95 @@ stdout: 385 bytes
 ===================
 DEVICE  TYPE      STATE        CONNECTION 
 --------------------------------------------------------------
+wlan0   wifi      niedostępne  con-vpn-1  
 eth0    ethernet  niedostępne  --         
 eth1    ethernet  niedostępne  --         
 wlan1   wifi      niedostępne  --         
 wlan1   wifi      niedostępne  --         
-wlan0   wifi      niedostępne  con-vpn-1  
 
 <<<
-size: 1466
-location: clients/tests/test-client.py:1042:test_004()/127
+size: 1718
+location: clients/tests/test-client.py:1056:test_004()/127
 cmd: $NMCLI --pretty -f all dev status
 lang: C
 returncode: 0
-stdout: 1318 bytes
+stdout: 1570 bytes
 >>>
 =====================
   Status of devices
 =====================
-DEVICE  TYPE      STATE        DBUS-PATH                                  CONNECTION  CON-UUID                              CON-PATH                                           
------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-eth0    ethernet  unavailable  /org/freedesktop/NetworkManager/Devices/1  --          --                                    --                                                 
-eth1    ethernet  unavailable  /org/freedesktop/NetworkManager/Devices/2  --          --                                    --                                                 
-wlan1   wifi      unavailable  /org/freedesktop/NetworkManager/Devices/4  --          --                                    --                                                 
-wlan1   wifi      unavailable  /org/freedesktop/NetworkManager/Devices/5  --          --                                    --                                                 
-wlan0   wifi      unavailable  /org/freedesktop/NetworkManager/Devices/3  con-vpn-1   UUID-con-vpn-1-REPLACED-REPLACED-REP  /org/freedesktop/NetworkManager/ActiveConnection/2 
+DEVICE  TYPE      STATE        IP4-CONNECTIVITY  IP6-CONNECTIVITY  DBUS-PATH                                  CONNECTION  CON-UUID                              CON-PATH                                           
+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+wlan0   wifi      unavailable  unknown           unknown           /org/freedesktop/NetworkManager/Devices/3  con-vpn-1   UUID-con-vpn-1-REPLACED-REPLACED-REP  /org/freedesktop/NetworkManager/ActiveConnection/2 
+eth0    ethernet  unavailable  unknown           unknown           /org/freedesktop/NetworkManager/Devices/1  --          --                                    --                                                 
+eth1    ethernet  unavailable  unknown           unknown           /org/freedesktop/NetworkManager/Devices/2  --          --                                    --                                                 
+wlan1   wifi      unavailable  unknown           unknown           /org/freedesktop/NetworkManager/Devices/4  --          --                                    --                                                 
+wlan1   wifi      unavailable  unknown           unknown           /org/freedesktop/NetworkManager/Devices/5  --          --                                    --                                                 
 
 <<<
-size: 1474
-location: clients/tests/test-client.py:1042:test_004()/128
+size: 1726
+location: clients/tests/test-client.py:1056:test_004()/128
 cmd: $NMCLI --pretty -f all dev status
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 1316 bytes
+stdout: 1568 bytes
 >>>
 ===================
   Stan urządzenia
 ===================
-DEVICE  TYPE      STATE        DBUS-PATH                                  CONNECTION  CON-UUID                              CON-PATH                                           
----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-eth0    ethernet  niedostępne  /org/freedesktop/NetworkManager/Devices/1  --          --                                    --                                                 
-eth1    ethernet  niedostępne  /org/freedesktop/NetworkManager/Devices/2  --          --                                    --                                                 
-wlan1   wifi      niedostępne  /org/freedesktop/NetworkManager/Devices/4  --          --                                    --                                                 
-wlan1   wifi      niedostępne  /org/freedesktop/NetworkManager/Devices/5  --          --                                    --                                                 
-wlan0   wifi      niedostępne  /org/freedesktop/NetworkManager/Devices/3  con-vpn-1   UUID-con-vpn-1-REPLACED-REPLACED-REP  /org/freedesktop/NetworkManager/ActiveConnection/2 
+DEVICE  TYPE      STATE        IP4-CONNECTIVITY  IP6-CONNECTIVITY  DBUS-PATH                                  CONNECTION  CON-UUID                              CON-PATH                                           
+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+wlan0   wifi      niedostępne  nieznane          nieznane          /org/freedesktop/NetworkManager/Devices/3  con-vpn-1   UUID-con-vpn-1-REPLACED-REPLACED-REP  /org/freedesktop/NetworkManager/ActiveConnection/2 
+eth0    ethernet  niedostępne  nieznane          nieznane          /org/freedesktop/NetworkManager/Devices/1  --          --                                    --                                                 
+eth1    ethernet  niedostępne  nieznane          nieznane          /org/freedesktop/NetworkManager/Devices/2  --          --                                    --                                                 
+wlan1   wifi      niedostępne  nieznane          nieznane          /org/freedesktop/NetworkManager/Devices/4  --          --                                    --                                                 
+wlan1   wifi      niedostępne  nieznane          nieznane          /org/freedesktop/NetworkManager/Devices/5  --          --                                    --                                                 
 
 <<<
 size: 12873
-location: clients/tests/test-client.py:1045:test_004()/129
+location: clients/tests/test-client.py:1059:test_004()/129
 cmd: $NMCLI --pretty dev show
 lang: C
 returncode: 0
 stdout: 12733 bytes
 >>>
+===============================================================================
+                            Device details (wlan0)
+===============================================================================
+GENERAL.DEVICE:                         wlan0
+-------------------------------------------------------------------------------
+GENERAL.TYPE:                           wifi
+-------------------------------------------------------------------------------
+GENERAL.HWADDR:                         13:E0:74:85:7C:D9
+-------------------------------------------------------------------------------
+GENERAL.MTU:                            0
+-------------------------------------------------------------------------------
+GENERAL.STATE:                          20 (unavailable)
+-------------------------------------------------------------------------------
+GENERAL.CONNECTION:                     con-vpn-1
+-------------------------------------------------------------------------------
+GENERAL.CON-PATH:                       /org/freedesktop/NetworkManager/ActiveConnection/2
+-------------------------------------------------------------------------------
+IP4.ADDRESS[1]:                         192.168.228.18/32
+IP4.ADDRESS[2]:                         192.168.209.179/25
+IP4.GATEWAY:                            192.168.41.120
+IP4.DOMAIN[1]:                          sear4.foo2.bar
+IP4.DOMAIN[2]:                          sear4.fo.x.y
+IP4.DOMAIN[3]:                          sear4.foo1.bar
+IP4.DOMAIN[4]:                          sear4.foo4.bar
+IP4.DOMAIN[5]:                          sear4.fo.o.bar
+IP4.WINS[1]:                            192.168.120.79
+-------------------------------------------------------------------------------
+IP6.GATEWAY:                            --
+IP6.ROUTE[1]:                           dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086
+IP6.DOMAIN[1]:                          sear6.foo2.bar
+IP6.DOMAIN[2]:                          sear6.foo1.bar
+IP6.DOMAIN[3]:                          sear6.fo.x.y
+IP6.DOMAIN[4]:                          sear6.fo.o.bar
+IP6.DOMAIN[5]:                          sear6.foo3.bar
+IP6.DOMAIN[6]:                          sear6.foo4.bar
+-------------------------------------------------------------------------------
+
 ===============================================================================
                              Device details (eth0)
 ===============================================================================
@@ -7394,8 +7535,16 @@ IP6.DNS[1]:                             2001:a::2934:bd66:550d:ec19
 IP6.DOMAIN[1]:                          sear6.fo.x.y
 -------------------------------------------------------------------------------
 
+<<<
+size: 12937
+location: clients/tests/test-client.py:1059:test_004()/130
+cmd: $NMCLI --pretty dev show
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 12787 bytes
+>>>
 ===============================================================================
-                            Device details (wlan0)
+                        Informacje o urządzeniu (wlan0)
 ===============================================================================
 GENERAL.DEVICE:                         wlan0
 -------------------------------------------------------------------------------
@@ -7405,7 +7554,7 @@ GENERAL.HWADDR:                         13:E0:74:85:7C:D9
 -------------------------------------------------------------------------------
 GENERAL.MTU:                            0
 -------------------------------------------------------------------------------
-GENERAL.STATE:                          20 (unavailable)
+GENERAL.STATE:                          20 (niedostępne)
 -------------------------------------------------------------------------------
 GENERAL.CONNECTION:                     con-vpn-1
 -------------------------------------------------------------------------------
@@ -7431,14 +7580,6 @@ IP6.DOMAIN[5]:                          sear6.foo3.bar
 IP6.DOMAIN[6]:                          sear6.foo4.bar
 -------------------------------------------------------------------------------
 
-<<<
-size: 12937
-location: clients/tests/test-client.py:1045:test_004()/130
-cmd: $NMCLI --pretty dev show
-lang: pl_PL.UTF-8
-returncode: 0
-stdout: 12787 bytes
->>>
 ===============================================================================
                         Informacje o urządzeniu (eth0)
 ===============================================================================
@@ -7602,22 +7743,85 @@ IP6.DNS[1]:                             2001:a::2934:bd66:550d:ec19
 IP6.DOMAIN[1]:                          sear6.fo.x.y
 -------------------------------------------------------------------------------
 
+<<<
+size: 25245
+location: clients/tests/test-client.py:1062:test_004()/131
+cmd: $NMCLI --pretty -f all dev show
+lang: C
+returncode: 0
+stdout: 25098 bytes
+>>>
 ===============================================================================
-                        Informacje o urządzeniu (wlan0)
+                            Device details (wlan0)
 ===============================================================================
 GENERAL.DEVICE:                         wlan0
--------------------------------------------------------------------------------
 GENERAL.TYPE:                           wifi
--------------------------------------------------------------------------------
+GENERAL.NM-TYPE:                        NMDeviceWifi
+GENERAL.VENDOR:                         --
+GENERAL.PRODUCT:                        --
+GENERAL.DRIVER:                         virtual
+GENERAL.DRIVER-VERSION:                 --
+GENERAL.FIRMWARE-VERSION:               --
 GENERAL.HWADDR:                         13:E0:74:85:7C:D9
--------------------------------------------------------------------------------
 GENERAL.MTU:                            0
+GENERAL.STATE:                          20 (unavailable)
+GENERAL.REASON:                         0 (No reason given)
+GENERAL.IP4-CONNECTIVITY:               0 (unknown)
+GENERAL.IP6-CONNECTIVITY:               0 (unknown)
+GENERAL.UDI:                            /sys/devices/virtual/wlan0
+GENERAL.IP-IFACE:                       --
+GENERAL.IS-SOFTWARE:                    no
+GENERAL.NM-MANAGED:                     yes
+GENERAL.AUTOCONNECT:                    yes
+GENERAL.FIRMWARE-MISSING:               no
+GENERAL.NM-PLUGIN-MISSING:              no
+GENERAL.PHYS-PORT-ID:                   --
+GENERAL.CONNECTION:                     con-vpn-1
+GENERAL.CON-UUID:                       UUID-con-vpn-1-REPLACED-REPLACED-REP
+GENERAL.CON-PATH:                       /org/freedesktop/NetworkManager/ActiveConnection/2
+GENERAL.METERED:                        unknown
 -------------------------------------------------------------------------------
-GENERAL.STATE:                          20 (niedostępne)
+CAPABILITIES.CARRIER-DETECT:            no
+CAPABILITIES.SPEED:                     unknown
+CAPABILITIES.IS-SOFTWARE:               no
+CAPABILITIES.SRIOV:                     no
 -------------------------------------------------------------------------------
-GENERAL.CONNECTION:                     con-vpn-1
+WIFI-PROPERTIES.WEP:                    yes
+WIFI-PROPERTIES.WPA:                    yes
+WIFI-PROPERTIES.WPA2:                   yes
+WIFI-PROPERTIES.TKIP:                   yes
+WIFI-PROPERTIES.CCMP:                   yes
+WIFI-PROPERTIES.AP:                     yes
+WIFI-PROPERTIES.ADHOC:                  yes
+WIFI-PROPERTIES.2GHZ:                   unknown
+WIFI-PROPERTIES.5GHZ:                   unknown
 -------------------------------------------------------------------------------
-GENERAL.CON-PATH:                       /org/freedesktop/NetworkManager/ActiveConnection/2
+AP[1].IN-USE:                            
+AP[1].SSID:                             wlan0-ap-2
+AP[1].MODE:                             Infra
+AP[1].CHAN:                             1
+AP[1].RATE:                             54 Mbit/s
+AP[1].SIGNAL:                           92
+AP[1].BARS:                             ****
+AP[1].SECURITY:                         WPA1 WPA2
+-------------------------------------------------------------------------------
+AP[2].IN-USE:                            
+AP[2].SSID:                             wlan0-ap-1
+AP[2].MODE:                             Infra
+AP[2].CHAN:                             1
+AP[2].RATE:                             54 Mbit/s
+AP[2].SIGNAL:                           81
+AP[2].BARS:                             ****
+AP[2].SECURITY:                         WPA1
+-------------------------------------------------------------------------------
+AP[3].IN-USE:                            
+AP[3].SSID:                             wlan0-ap-3
+AP[3].MODE:                             Infra
+AP[3].CHAN:                             1
+AP[3].RATE:                             54 Mbit/s
+AP[3].SIGNAL:                           55
+AP[3].BARS:                             **  
+AP[3].SECURITY:                         WPA3
 -------------------------------------------------------------------------------
 IP4.ADDRESS[1]:                         192.168.228.18/32
 IP4.ADDRESS[2]:                         192.168.209.179/25
@@ -7629,6 +7833,11 @@ IP4.DOMAIN[4]:                          sear4.foo4.bar
 IP4.DOMAIN[5]:                          sear4.fo.o.bar
 IP4.WINS[1]:                            192.168.120.79
 -------------------------------------------------------------------------------
+DHCP4.OPTION[1]:                        dhcp-4-opt-0 = val-0
+DHCP4.OPTION[2]:                        dhcp-4-opt-2 = val-2
+DHCP4.OPTION[3]:                        dhcp-4-opt-4 = val-4
+DHCP4.OPTION[4]:                        dhcp-4-opt-7 = val-7
+-------------------------------------------------------------------------------
 IP6.GATEWAY:                            --
 IP6.ROUTE[1]:                           dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086
 IP6.DOMAIN[1]:                          sear6.foo2.bar
@@ -7638,15 +7847,16 @@ IP6.DOMAIN[4]:                          sear6.fo.o.bar
 IP6.DOMAIN[5]:                          sear6.foo3.bar
 IP6.DOMAIN[6]:                          sear6.foo4.bar
 -------------------------------------------------------------------------------
+DHCP6.OPTION[1]:                        dhcp-6-opt-1 = val-1
+DHCP6.OPTION[2]:                        dhcp-6-opt-2 = val-2
+DHCP6.OPTION[3]:                        dhcp-6-opt-3 = val-3
+DHCP6.OPTION[4]:                        dhcp-6-opt-4 = val-4
+DHCP6.OPTION[5]:                        dhcp-6-opt-5 = val-5
+-------------------------------------------------------------------------------
+CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings/Connection/{2}
+CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
+-------------------------------------------------------------------------------
 
-<<<
-size: 24735
-location: clients/tests/test-client.py:1048:test_004()/131
-cmd: $NMCLI --pretty -f all dev show
-lang: C
-returncode: 0
-stdout: 24588 bytes
->>>
 ===============================================================================
                              Device details (eth0)
 ===============================================================================
@@ -7662,6 +7872,8 @@ GENERAL.HWADDR:                         AB:B7:BF:E2:48:E8
 GENERAL.MTU:                            0
 GENERAL.STATE:                          20 (unavailable)
 GENERAL.REASON:                         0 (No reason given)
+GENERAL.IP4-CONNECTIVITY:               0 (unknown)
+GENERAL.IP6-CONNECTIVITY:               0 (unknown)
 GENERAL.UDI:                            /sys/devices/virtual/eth0
 GENERAL.IP-IFACE:                       --
 GENERAL.IS-SOFTWARE:                    no
@@ -7734,6 +7946,8 @@ GENERAL.HWADDR:                         E7:78:B1:93:2B:22
 GENERAL.MTU:                            0
 GENERAL.STATE:                          20 (unavailable)
 GENERAL.REASON:                         0 (No reason given)
+GENERAL.IP4-CONNECTIVITY:               0 (unknown)
+GENERAL.IP6-CONNECTIVITY:               0 (unknown)
 GENERAL.UDI:                            /sys/devices/virtual/eth1
 GENERAL.IP-IFACE:                       --
 GENERAL.IS-SOFTWARE:                    no
@@ -7813,6 +8027,8 @@ GENERAL.HWADDR:                         21:E9:64:81:8C:A8
 GENERAL.MTU:                            0
 GENERAL.STATE:                          20 (unavailable)
 GENERAL.REASON:                         0 (No reason given)
+GENERAL.IP4-CONNECTIVITY:               0 (unknown)
+GENERAL.IP6-CONNECTIVITY:               0 (unknown)
 GENERAL.UDI:                            /sys/devices/virtual/wlan1
 GENERAL.IP-IFACE:                       --
 GENERAL.IS-SOFTWARE:                    no
@@ -7911,6 +8127,8 @@ GENERAL.HWADDR:                         71:52:AD:63:5C:7C
 GENERAL.MTU:                            0
 GENERAL.STATE:                          20 (unavailable)
 GENERAL.REASON:                         0 (No reason given)
+GENERAL.IP4-CONNECTIVITY:               0 (unknown)
+GENERAL.IP6-CONNECTIVITY:               0 (unknown)
 GENERAL.UDI:                            /sys/devices/virtual/wlan1
 GENERAL.IP-IFACE:                       --
 GENERAL.IS-SOFTWARE:                    no
@@ -7973,8 +8191,16 @@ CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings
 CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 -------------------------------------------------------------------------------
 
+<<<
+size: 25428
+location: clients/tests/test-client.py:1062:test_004()/132
+cmd: $NMCLI --pretty -f all dev show
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 25271 bytes
+>>>
 ===============================================================================
-                            Device details (wlan0)
+                        Informacje o urządzeniu (wlan0)
 ===============================================================================
 GENERAL.DEVICE:                         wlan0
 GENERAL.TYPE:                           wifi
@@ -7986,62 +8212,64 @@ GENERAL.DRIVER-VERSION:                 --
 GENERAL.FIRMWARE-VERSION:               --
 GENERAL.HWADDR:                         13:E0:74:85:7C:D9
 GENERAL.MTU:                            0
-GENERAL.STATE:                          20 (unavailable)
-GENERAL.REASON:                         0 (No reason given)
+GENERAL.STATE:                          20 (niedostępne)
+GENERAL.REASON:                         0 (Nie podano przyczyny)
+GENERAL.IP4-CONNECTIVITY:               0 (nieznane)
+GENERAL.IP6-CONNECTIVITY:               0 (nieznane)
 GENERAL.UDI:                            /sys/devices/virtual/wlan0
 GENERAL.IP-IFACE:                       --
-GENERAL.IS-SOFTWARE:                    no
-GENERAL.NM-MANAGED:                     yes
-GENERAL.AUTOCONNECT:                    yes
-GENERAL.FIRMWARE-MISSING:               no
-GENERAL.NM-PLUGIN-MISSING:              no
+GENERAL.IS-SOFTWARE:                    nie
+GENERAL.NM-MANAGED:                     tak
+GENERAL.AUTOCONNECT:                    tak
+GENERAL.FIRMWARE-MISSING:               nie
+GENERAL.NM-PLUGIN-MISSING:              nie
 GENERAL.PHYS-PORT-ID:                   --
 GENERAL.CONNECTION:                     con-vpn-1
 GENERAL.CON-UUID:                       UUID-con-vpn-1-REPLACED-REPLACED-REP
 GENERAL.CON-PATH:                       /org/freedesktop/NetworkManager/ActiveConnection/2
-GENERAL.METERED:                        unknown
+GENERAL.METERED:                        nieznane
 -------------------------------------------------------------------------------
-CAPABILITIES.CARRIER-DETECT:            no
-CAPABILITIES.SPEED:                     unknown
-CAPABILITIES.IS-SOFTWARE:               no
-CAPABILITIES.SRIOV:                     no
+CAPABILITIES.CARRIER-DETECT:            nie
+CAPABILITIES.SPEED:                     nieznane
+CAPABILITIES.IS-SOFTWARE:               nie
+CAPABILITIES.SRIOV:                     nie
 -------------------------------------------------------------------------------
-WIFI-PROPERTIES.WEP:                    yes
-WIFI-PROPERTIES.WPA:                    yes
-WIFI-PROPERTIES.WPA2:                   yes
-WIFI-PROPERTIES.TKIP:                   yes
-WIFI-PROPERTIES.CCMP:                   yes
-WIFI-PROPERTIES.AP:                     yes
-WIFI-PROPERTIES.ADHOC:                  yes
-WIFI-PROPERTIES.2GHZ:                   unknown
-WIFI-PROPERTIES.5GHZ:                   unknown
+WIFI-PROPERTIES.WEP:                    tak
+WIFI-PROPERTIES.WPA:                    tak
+WIFI-PROPERTIES.WPA2:                   tak
+WIFI-PROPERTIES.TKIP:                   tak
+WIFI-PROPERTIES.CCMP:                   tak
+WIFI-PROPERTIES.AP:                     tak
+WIFI-PROPERTIES.ADHOC:                  tak
+WIFI-PROPERTIES.2GHZ:                   nieznane
+WIFI-PROPERTIES.5GHZ:                   nieznane
 -------------------------------------------------------------------------------
 AP[1].IN-USE:                            
 AP[1].SSID:                             wlan0-ap-2
-AP[1].MODE:                             Infra
+AP[1].MODE:                             Infrastruktura
 AP[1].CHAN:                             1
-AP[1].RATE:                             54 Mbit/s
+AP[1].RATE:                             54 Mb/s
 AP[1].SIGNAL:                           92
 AP[1].BARS:                             ****
 AP[1].SECURITY:                         WPA1 WPA2
 -------------------------------------------------------------------------------
 AP[2].IN-USE:                            
 AP[2].SSID:                             wlan0-ap-1
-AP[2].MODE:                             Infra
+AP[2].MODE:                             Infrastruktura
 AP[2].CHAN:                             1
-AP[2].RATE:                             54 Mbit/s
+AP[2].RATE:                             54 Mb/s
 AP[2].SIGNAL:                           81
 AP[2].BARS:                             ****
-AP[2].SECURITY:                         WPA1 WPA2
+AP[2].SECURITY:                         WPA1
 -------------------------------------------------------------------------------
 AP[3].IN-USE:                            
 AP[3].SSID:                             wlan0-ap-3
-AP[3].MODE:                             Infra
+AP[3].MODE:                             Infrastruktura
 AP[3].CHAN:                             1
-AP[3].RATE:                             54 Mbit/s
+AP[3].RATE:                             54 Mb/s
 AP[3].SIGNAL:                           55
 AP[3].BARS:                             **  
-AP[3].SECURITY:                         WPA1 WPA2
+AP[3].SECURITY:                         WPA3
 -------------------------------------------------------------------------------
 IP4.ADDRESS[1]:                         192.168.228.18/32
 IP4.ADDRESS[2]:                         192.168.209.179/25
@@ -8077,14 +8305,6 @@ CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings
 CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 -------------------------------------------------------------------------------
 
-<<<
-size: 24908
-location: clients/tests/test-client.py:1048:test_004()/132
-cmd: $NMCLI --pretty -f all dev show
-lang: pl_PL.UTF-8
-returncode: 0
-stdout: 24751 bytes
->>>
 ===============================================================================
                         Informacje o urządzeniu (eth0)
 ===============================================================================
@@ -8100,6 +8320,8 @@ GENERAL.HWADDR:                         AB:B7:BF:E2:48:E8
 GENERAL.MTU:                            0
 GENERAL.STATE:                          20 (niedostępne)
 GENERAL.REASON:                         0 (Nie podano przyczyny)
+GENERAL.IP4-CONNECTIVITY:               0 (nieznane)
+GENERAL.IP6-CONNECTIVITY:               0 (nieznane)
 GENERAL.UDI:                            /sys/devices/virtual/eth0
 GENERAL.IP-IFACE:                       --
 GENERAL.IS-SOFTWARE:                    nie
@@ -8172,6 +8394,8 @@ GENERAL.HWADDR:                         E7:78:B1:93:2B:22
 GENERAL.MTU:                            0
 GENERAL.STATE:                          20 (niedostępne)
 GENERAL.REASON:                         0 (Nie podano przyczyny)
+GENERAL.IP4-CONNECTIVITY:               0 (nieznane)
+GENERAL.IP6-CONNECTIVITY:               0 (nieznane)
 GENERAL.UDI:                            /sys/devices/virtual/eth1
 GENERAL.IP-IFACE:                       --
 GENERAL.IS-SOFTWARE:                    nie
@@ -8251,6 +8475,8 @@ GENERAL.HWADDR:                         21:E9:64:81:8C:A8
 GENERAL.MTU:                            0
 GENERAL.STATE:                          20 (niedostępne)
 GENERAL.REASON:                         0 (Nie podano przyczyny)
+GENERAL.IP4-CONNECTIVITY:               0 (nieznane)
+GENERAL.IP6-CONNECTIVITY:               0 (nieznane)
 GENERAL.UDI:                            /sys/devices/virtual/wlan1
 GENERAL.IP-IFACE:                       --
 GENERAL.IS-SOFTWARE:                    nie
@@ -8349,6 +8575,8 @@ GENERAL.HWADDR:                         71:52:AD:63:5C:7C
 GENERAL.MTU:                            0
 GENERAL.STATE:                          20 (niedostępne)
 GENERAL.REASON:                         0 (Nie podano przyczyny)
+GENERAL.IP4-CONNECTIVITY:               0 (nieznane)
+GENERAL.IP6-CONNECTIVITY:               0 (nieznane)
 GENERAL.UDI:                            /sys/devices/virtual/wlan1
 GENERAL.IP-IFACE:                       --
 GENERAL.IS-SOFTWARE:                    nie
@@ -8411,6 +8639,218 @@ CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings
 CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 -------------------------------------------------------------------------------
 
+<<<
+size: 2439
+location: clients/tests/test-client.py:1065:test_004()/133
+cmd: $NMCLI --pretty dev show wlan0
+lang: C
+returncode: 0
+stdout: 2294 bytes
+>>>
+===============================================================================
+                            Device details (wlan0)
+===============================================================================
+GENERAL.DEVICE:                         wlan0
+-------------------------------------------------------------------------------
+GENERAL.TYPE:                           wifi
+-------------------------------------------------------------------------------
+GENERAL.HWADDR:                         13:E0:74:85:7C:D9
+-------------------------------------------------------------------------------
+GENERAL.MTU:                            0
+-------------------------------------------------------------------------------
+GENERAL.STATE:                          20 (unavailable)
+-------------------------------------------------------------------------------
+GENERAL.CONNECTION:                     con-vpn-1
+-------------------------------------------------------------------------------
+GENERAL.CON-PATH:                       /org/freedesktop/NetworkManager/ActiveConnection/2
+-------------------------------------------------------------------------------
+IP4.ADDRESS[1]:                         192.168.228.18/32
+IP4.ADDRESS[2]:                         192.168.209.179/25
+IP4.GATEWAY:                            192.168.41.120
+IP4.DOMAIN[1]:                          sear4.foo2.bar
+IP4.DOMAIN[2]:                          sear4.fo.x.y
+IP4.DOMAIN[3]:                          sear4.foo1.bar
+IP4.DOMAIN[4]:                          sear4.foo4.bar
+IP4.DOMAIN[5]:                          sear4.fo.o.bar
+IP4.WINS[1]:                            192.168.120.79
+-------------------------------------------------------------------------------
+IP6.GATEWAY:                            --
+IP6.ROUTE[1]:                           dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086
+IP6.DOMAIN[1]:                          sear6.foo2.bar
+IP6.DOMAIN[2]:                          sear6.foo1.bar
+IP6.DOMAIN[3]:                          sear6.fo.x.y
+IP6.DOMAIN[4]:                          sear6.fo.o.bar
+IP6.DOMAIN[5]:                          sear6.foo3.bar
+IP6.DOMAIN[6]:                          sear6.foo4.bar
+-------------------------------------------------------------------------------
+
+<<<
+size: 2457
+location: clients/tests/test-client.py:1065:test_004()/134
+cmd: $NMCLI --pretty dev show wlan0
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 2302 bytes
+>>>
+===============================================================================
+                        Informacje o urządzeniu (wlan0)
+===============================================================================
+GENERAL.DEVICE:                         wlan0
+-------------------------------------------------------------------------------
+GENERAL.TYPE:                           wifi
+-------------------------------------------------------------------------------
+GENERAL.HWADDR:                         13:E0:74:85:7C:D9
+-------------------------------------------------------------------------------
+GENERAL.MTU:                            0
+-------------------------------------------------------------------------------
+GENERAL.STATE:                          20 (niedostępne)
+-------------------------------------------------------------------------------
+GENERAL.CONNECTION:                     con-vpn-1
+-------------------------------------------------------------------------------
+GENERAL.CON-PATH:                       /org/freedesktop/NetworkManager/ActiveConnection/2
+-------------------------------------------------------------------------------
+IP4.ADDRESS[1]:                         192.168.228.18/32
+IP4.ADDRESS[2]:                         192.168.209.179/25
+IP4.GATEWAY:                            192.168.41.120
+IP4.DOMAIN[1]:                          sear4.foo2.bar
+IP4.DOMAIN[2]:                          sear4.fo.x.y
+IP4.DOMAIN[3]:                          sear4.foo1.bar
+IP4.DOMAIN[4]:                          sear4.foo4.bar
+IP4.DOMAIN[5]:                          sear4.fo.o.bar
+IP4.WINS[1]:                            192.168.120.79
+-------------------------------------------------------------------------------
+IP6.GATEWAY:                            --
+IP6.ROUTE[1]:                           dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086
+IP6.DOMAIN[1]:                          sear6.foo2.bar
+IP6.DOMAIN[2]:                          sear6.foo1.bar
+IP6.DOMAIN[3]:                          sear6.fo.x.y
+IP6.DOMAIN[4]:                          sear6.fo.o.bar
+IP6.DOMAIN[5]:                          sear6.foo3.bar
+IP6.DOMAIN[6]:                          sear6.foo4.bar
+-------------------------------------------------------------------------------
+
+<<<
+size: 5948
+location: clients/tests/test-client.py:1068:test_004()/135
+cmd: $NMCLI --pretty -f all dev show wlan0
+lang: C
+returncode: 0
+stdout: 5796 bytes
+>>>
+===============================================================================
+                            Device details (wlan0)
+===============================================================================
+GENERAL.DEVICE:                         wlan0
+GENERAL.TYPE:                           wifi
+GENERAL.NM-TYPE:                        NMDeviceWifi
+GENERAL.VENDOR:                         --
+GENERAL.PRODUCT:                        --
+GENERAL.DRIVER:                         virtual
+GENERAL.DRIVER-VERSION:                 --
+GENERAL.FIRMWARE-VERSION:               --
+GENERAL.HWADDR:                         13:E0:74:85:7C:D9
+GENERAL.MTU:                            0
+GENERAL.STATE:                          20 (unavailable)
+GENERAL.REASON:                         0 (No reason given)
+GENERAL.IP4-CONNECTIVITY:               0 (unknown)
+GENERAL.IP6-CONNECTIVITY:               0 (unknown)
+GENERAL.UDI:                            /sys/devices/virtual/wlan0
+GENERAL.IP-IFACE:                       --
+GENERAL.IS-SOFTWARE:                    no
+GENERAL.NM-MANAGED:                     yes
+GENERAL.AUTOCONNECT:                    yes
+GENERAL.FIRMWARE-MISSING:               no
+GENERAL.NM-PLUGIN-MISSING:              no
+GENERAL.PHYS-PORT-ID:                   --
+GENERAL.CONNECTION:                     con-vpn-1
+GENERAL.CON-UUID:                       UUID-con-vpn-1-REPLACED-REPLACED-REP
+GENERAL.CON-PATH:                       /org/freedesktop/NetworkManager/ActiveConnection/2
+GENERAL.METERED:                        unknown
+-------------------------------------------------------------------------------
+CAPABILITIES.CARRIER-DETECT:            no
+CAPABILITIES.SPEED:                     unknown
+CAPABILITIES.IS-SOFTWARE:               no
+CAPABILITIES.SRIOV:                     no
+-------------------------------------------------------------------------------
+WIFI-PROPERTIES.WEP:                    yes
+WIFI-PROPERTIES.WPA:                    yes
+WIFI-PROPERTIES.WPA2:                   yes
+WIFI-PROPERTIES.TKIP:                   yes
+WIFI-PROPERTIES.CCMP:                   yes
+WIFI-PROPERTIES.AP:                     yes
+WIFI-PROPERTIES.ADHOC:                  yes
+WIFI-PROPERTIES.2GHZ:                   unknown
+WIFI-PROPERTIES.5GHZ:                   unknown
+-------------------------------------------------------------------------------
+AP[1].IN-USE:                            
+AP[1].SSID:                             wlan0-ap-2
+AP[1].MODE:                             Infra
+AP[1].CHAN:                             1
+AP[1].RATE:                             54 Mbit/s
+AP[1].SIGNAL:                           92
+AP[1].BARS:                             ****
+AP[1].SECURITY:                         WPA1 WPA2
+-------------------------------------------------------------------------------
+AP[2].IN-USE:                            
+AP[2].SSID:                             wlan0-ap-1
+AP[2].MODE:                             Infra
+AP[2].CHAN:                             1
+AP[2].RATE:                             54 Mbit/s
+AP[2].SIGNAL:                           81
+AP[2].BARS:                             ****
+AP[2].SECURITY:                         WPA1
+-------------------------------------------------------------------------------
+AP[3].IN-USE:                            
+AP[3].SSID:                             wlan0-ap-3
+AP[3].MODE:                             Infra
+AP[3].CHAN:                             1
+AP[3].RATE:                             54 Mbit/s
+AP[3].SIGNAL:                           55
+AP[3].BARS:                             **  
+AP[3].SECURITY:                         WPA3
+-------------------------------------------------------------------------------
+IP4.ADDRESS[1]:                         192.168.228.18/32
+IP4.ADDRESS[2]:                         192.168.209.179/25
+IP4.GATEWAY:                            192.168.41.120
+IP4.DOMAIN[1]:                          sear4.foo2.bar
+IP4.DOMAIN[2]:                          sear4.fo.x.y
+IP4.DOMAIN[3]:                          sear4.foo1.bar
+IP4.DOMAIN[4]:                          sear4.foo4.bar
+IP4.DOMAIN[5]:                          sear4.fo.o.bar
+IP4.WINS[1]:                            192.168.120.79
+-------------------------------------------------------------------------------
+DHCP4.OPTION[1]:                        dhcp-4-opt-0 = val-0
+DHCP4.OPTION[2]:                        dhcp-4-opt-2 = val-2
+DHCP4.OPTION[3]:                        dhcp-4-opt-4 = val-4
+DHCP4.OPTION[4]:                        dhcp-4-opt-7 = val-7
+-------------------------------------------------------------------------------
+IP6.GATEWAY:                            --
+IP6.ROUTE[1]:                           dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086
+IP6.DOMAIN[1]:                          sear6.foo2.bar
+IP6.DOMAIN[2]:                          sear6.foo1.bar
+IP6.DOMAIN[3]:                          sear6.fo.x.y
+IP6.DOMAIN[4]:                          sear6.fo.o.bar
+IP6.DOMAIN[5]:                          sear6.foo3.bar
+IP6.DOMAIN[6]:                          sear6.foo4.bar
+-------------------------------------------------------------------------------
+DHCP6.OPTION[1]:                        dhcp-6-opt-1 = val-1
+DHCP6.OPTION[2]:                        dhcp-6-opt-2 = val-2
+DHCP6.OPTION[3]:                        dhcp-6-opt-3 = val-3
+DHCP6.OPTION[4]:                        dhcp-6-opt-4 = val-4
+DHCP6.OPTION[5]:                        dhcp-6-opt-5 = val-5
+-------------------------------------------------------------------------------
+CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings/Connection/{2}
+CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
+-------------------------------------------------------------------------------
+
+<<<
+size: 6010
+location: clients/tests/test-client.py:1068:test_004()/136
+cmd: $NMCLI --pretty -f all dev show wlan0
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 5848 bytes
+>>>
 ===============================================================================
                         Informacje o urządzeniu (wlan0)
 ===============================================================================
@@ -8426,6 +8866,8 @@ GENERAL.HWADDR:                         13:E0:74:85:7C:D9
 GENERAL.MTU:                            0
 GENERAL.STATE:                          20 (niedostępne)
 GENERAL.REASON:                         0 (Nie podano przyczyny)
+GENERAL.IP4-CONNECTIVITY:               0 (nieznane)
+GENERAL.IP6-CONNECTIVITY:               0 (nieznane)
 GENERAL.UDI:                            /sys/devices/virtual/wlan0
 GENERAL.IP-IFACE:                       --
 GENERAL.IS-SOFTWARE:                    nie
@@ -8470,7 +8912,7 @@ AP[2].CHAN:                             1
 AP[2].RATE:                             54 Mb/s
 AP[2].SIGNAL:                           81
 AP[2].BARS:                             ****
-AP[2].SECURITY:                         WPA1 WPA2
+AP[2].SECURITY:                         WPA1
 -------------------------------------------------------------------------------
 AP[3].IN-USE:                            
 AP[3].SSID:                             wlan0-ap-3
@@ -8479,7 +8921,7 @@ AP[3].CHAN:                             1
 AP[3].RATE:                             54 Mb/s
 AP[3].SIGNAL:                           55
 AP[3].BARS:                             **  
-AP[3].SECURITY:                         WPA1 WPA2
+AP[3].SECURITY:                         WPA3
 -------------------------------------------------------------------------------
 IP4.ADDRESS[1]:                         192.168.228.18/32
 IP4.ADDRESS[2]:                         192.168.209.179/25
@@ -8516,326 +8958,12 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | c
 -------------------------------------------------------------------------------
 
 <<<
-size: 2439
-location: clients/tests/test-client.py:1051:test_004()/133
-cmd: $NMCLI --pretty dev show wlan0
-lang: C
-returncode: 0
-stdout: 2294 bytes
->>>
-===============================================================================
-                            Device details (wlan0)
-===============================================================================
-GENERAL.DEVICE:                         wlan0
--------------------------------------------------------------------------------
-GENERAL.TYPE:                           wifi
--------------------------------------------------------------------------------
-GENERAL.HWADDR:                         13:E0:74:85:7C:D9
--------------------------------------------------------------------------------
-GENERAL.MTU:                            0
--------------------------------------------------------------------------------
-GENERAL.STATE:                          20 (unavailable)
--------------------------------------------------------------------------------
-GENERAL.CONNECTION:                     con-vpn-1
--------------------------------------------------------------------------------
-GENERAL.CON-PATH:                       /org/freedesktop/NetworkManager/ActiveConnection/2
--------------------------------------------------------------------------------
-IP4.ADDRESS[1]:                         192.168.228.18/32
-IP4.ADDRESS[2]:                         192.168.209.179/25
-IP4.GATEWAY:                            192.168.41.120
-IP4.DOMAIN[1]:                          sear4.foo2.bar
-IP4.DOMAIN[2]:                          sear4.fo.x.y
-IP4.DOMAIN[3]:                          sear4.foo1.bar
-IP4.DOMAIN[4]:                          sear4.foo4.bar
-IP4.DOMAIN[5]:                          sear4.fo.o.bar
-IP4.WINS[1]:                            192.168.120.79
--------------------------------------------------------------------------------
-IP6.GATEWAY:                            --
-IP6.ROUTE[1]:                           dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086
-IP6.DOMAIN[1]:                          sear6.foo2.bar
-IP6.DOMAIN[2]:                          sear6.foo1.bar
-IP6.DOMAIN[3]:                          sear6.fo.x.y
-IP6.DOMAIN[4]:                          sear6.fo.o.bar
-IP6.DOMAIN[5]:                          sear6.foo3.bar
-IP6.DOMAIN[6]:                          sear6.foo4.bar
--------------------------------------------------------------------------------
-
-<<<
-size: 2457
-location: clients/tests/test-client.py:1051:test_004()/134
-cmd: $NMCLI --pretty dev show wlan0
-lang: pl_PL.UTF-8
-returncode: 0
-stdout: 2302 bytes
->>>
-===============================================================================
-                        Informacje o urządzeniu (wlan0)
-===============================================================================
-GENERAL.DEVICE:                         wlan0
--------------------------------------------------------------------------------
-GENERAL.TYPE:                           wifi
--------------------------------------------------------------------------------
-GENERAL.HWADDR:                         13:E0:74:85:7C:D9
--------------------------------------------------------------------------------
-GENERAL.MTU:                            0
--------------------------------------------------------------------------------
-GENERAL.STATE:                          20 (niedostępne)
--------------------------------------------------------------------------------
-GENERAL.CONNECTION:                     con-vpn-1
--------------------------------------------------------------------------------
-GENERAL.CON-PATH:                       /org/freedesktop/NetworkManager/ActiveConnection/2
--------------------------------------------------------------------------------
-IP4.ADDRESS[1]:                         192.168.228.18/32
-IP4.ADDRESS[2]:                         192.168.209.179/25
-IP4.GATEWAY:                            192.168.41.120
-IP4.DOMAIN[1]:                          sear4.foo2.bar
-IP4.DOMAIN[2]:                          sear4.fo.x.y
-IP4.DOMAIN[3]:                          sear4.foo1.bar
-IP4.DOMAIN[4]:                          sear4.foo4.bar
-IP4.DOMAIN[5]:                          sear4.fo.o.bar
-IP4.WINS[1]:                            192.168.120.79
--------------------------------------------------------------------------------
-IP6.GATEWAY:                            --
-IP6.ROUTE[1]:                           dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086
-IP6.DOMAIN[1]:                          sear6.foo2.bar
-IP6.DOMAIN[2]:                          sear6.foo1.bar
-IP6.DOMAIN[3]:                          sear6.fo.x.y
-IP6.DOMAIN[4]:                          sear6.fo.o.bar
-IP6.DOMAIN[5]:                          sear6.foo3.bar
-IP6.DOMAIN[6]:                          sear6.foo4.bar
--------------------------------------------------------------------------------
-
-<<<
-size: 5854
-location: clients/tests/test-client.py:1054:test_004()/135
-cmd: $NMCLI --pretty -f all dev show wlan0
-lang: C
-returncode: 0
-stdout: 5702 bytes
->>>
-===============================================================================
-                            Device details (wlan0)
-===============================================================================
-GENERAL.DEVICE:                         wlan0
-GENERAL.TYPE:                           wifi
-GENERAL.NM-TYPE:                        NMDeviceWifi
-GENERAL.VENDOR:                         --
-GENERAL.PRODUCT:                        --
-GENERAL.DRIVER:                         virtual
-GENERAL.DRIVER-VERSION:                 --
-GENERAL.FIRMWARE-VERSION:               --
-GENERAL.HWADDR:                         13:E0:74:85:7C:D9
-GENERAL.MTU:                            0
-GENERAL.STATE:                          20 (unavailable)
-GENERAL.REASON:                         0 (No reason given)
-GENERAL.UDI:                            /sys/devices/virtual/wlan0
-GENERAL.IP-IFACE:                       --
-GENERAL.IS-SOFTWARE:                    no
-GENERAL.NM-MANAGED:                     yes
-GENERAL.AUTOCONNECT:                    yes
-GENERAL.FIRMWARE-MISSING:               no
-GENERAL.NM-PLUGIN-MISSING:              no
-GENERAL.PHYS-PORT-ID:                   --
-GENERAL.CONNECTION:                     con-vpn-1
-GENERAL.CON-UUID:                       UUID-con-vpn-1-REPLACED-REPLACED-REP
-GENERAL.CON-PATH:                       /org/freedesktop/NetworkManager/ActiveConnection/2
-GENERAL.METERED:                        unknown
--------------------------------------------------------------------------------
-CAPABILITIES.CARRIER-DETECT:            no
-CAPABILITIES.SPEED:                     unknown
-CAPABILITIES.IS-SOFTWARE:               no
-CAPABILITIES.SRIOV:                     no
--------------------------------------------------------------------------------
-WIFI-PROPERTIES.WEP:                    yes
-WIFI-PROPERTIES.WPA:                    yes
-WIFI-PROPERTIES.WPA2:                   yes
-WIFI-PROPERTIES.TKIP:                   yes
-WIFI-PROPERTIES.CCMP:                   yes
-WIFI-PROPERTIES.AP:                     yes
-WIFI-PROPERTIES.ADHOC:                  yes
-WIFI-PROPERTIES.2GHZ:                   unknown
-WIFI-PROPERTIES.5GHZ:                   unknown
--------------------------------------------------------------------------------
-AP[1].IN-USE:                            
-AP[1].SSID:                             wlan0-ap-2
-AP[1].MODE:                             Infra
-AP[1].CHAN:                             1
-AP[1].RATE:                             54 Mbit/s
-AP[1].SIGNAL:                           92
-AP[1].BARS:                             ****
-AP[1].SECURITY:                         WPA1 WPA2
--------------------------------------------------------------------------------
-AP[2].IN-USE:                            
-AP[2].SSID:                             wlan0-ap-1
-AP[2].MODE:                             Infra
-AP[2].CHAN:                             1
-AP[2].RATE:                             54 Mbit/s
-AP[2].SIGNAL:                           81
-AP[2].BARS:                             ****
-AP[2].SECURITY:                         WPA1 WPA2
--------------------------------------------------------------------------------
-AP[3].IN-USE:                            
-AP[3].SSID:                             wlan0-ap-3
-AP[3].MODE:                             Infra
-AP[3].CHAN:                             1
-AP[3].RATE:                             54 Mbit/s
-AP[3].SIGNAL:                           55
-AP[3].BARS:                             **  
-AP[3].SECURITY:                         WPA1 WPA2
--------------------------------------------------------------------------------
-IP4.ADDRESS[1]:                         192.168.228.18/32
-IP4.ADDRESS[2]:                         192.168.209.179/25
-IP4.GATEWAY:                            192.168.41.120
-IP4.DOMAIN[1]:                          sear4.foo2.bar
-IP4.DOMAIN[2]:                          sear4.fo.x.y
-IP4.DOMAIN[3]:                          sear4.foo1.bar
-IP4.DOMAIN[4]:                          sear4.foo4.bar
-IP4.DOMAIN[5]:                          sear4.fo.o.bar
-IP4.WINS[1]:                            192.168.120.79
--------------------------------------------------------------------------------
-DHCP4.OPTION[1]:                        dhcp-4-opt-0 = val-0
-DHCP4.OPTION[2]:                        dhcp-4-opt-2 = val-2
-DHCP4.OPTION[3]:                        dhcp-4-opt-4 = val-4
-DHCP4.OPTION[4]:                        dhcp-4-opt-7 = val-7
--------------------------------------------------------------------------------
-IP6.GATEWAY:                            --
-IP6.ROUTE[1]:                           dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086
-IP6.DOMAIN[1]:                          sear6.foo2.bar
-IP6.DOMAIN[2]:                          sear6.foo1.bar
-IP6.DOMAIN[3]:                          sear6.fo.x.y
-IP6.DOMAIN[4]:                          sear6.fo.o.bar
-IP6.DOMAIN[5]:                          sear6.foo3.bar
-IP6.DOMAIN[6]:                          sear6.foo4.bar
--------------------------------------------------------------------------------
-DHCP6.OPTION[1]:                        dhcp-6-opt-1 = val-1
-DHCP6.OPTION[2]:                        dhcp-6-opt-2 = val-2
-DHCP6.OPTION[3]:                        dhcp-6-opt-3 = val-3
-DHCP6.OPTION[4]:                        dhcp-6-opt-4 = val-4
-DHCP6.OPTION[5]:                        dhcp-6-opt-5 = val-5
--------------------------------------------------------------------------------
-CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings/Connection/{2}
-CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
--------------------------------------------------------------------------------
-
-<<<
-size: 5914
-location: clients/tests/test-client.py:1054:test_004()/136
-cmd: $NMCLI --pretty -f all dev show wlan0
-lang: pl_PL.UTF-8
-returncode: 0
-stdout: 5752 bytes
->>>
-===============================================================================
-                        Informacje o urządzeniu (wlan0)
-===============================================================================
-GENERAL.DEVICE:                         wlan0
-GENERAL.TYPE:                           wifi
-GENERAL.NM-TYPE:                        NMDeviceWifi
-GENERAL.VENDOR:                         --
-GENERAL.PRODUCT:                        --
-GENERAL.DRIVER:                         virtual
-GENERAL.DRIVER-VERSION:                 --
-GENERAL.FIRMWARE-VERSION:               --
-GENERAL.HWADDR:                         13:E0:74:85:7C:D9
-GENERAL.MTU:                            0
-GENERAL.STATE:                          20 (niedostępne)
-GENERAL.REASON:                         0 (Nie podano przyczyny)
-GENERAL.UDI:                            /sys/devices/virtual/wlan0
-GENERAL.IP-IFACE:                       --
-GENERAL.IS-SOFTWARE:                    nie
-GENERAL.NM-MANAGED:                     tak
-GENERAL.AUTOCONNECT:                    tak
-GENERAL.FIRMWARE-MISSING:               nie
-GENERAL.NM-PLUGIN-MISSING:              nie
-GENERAL.PHYS-PORT-ID:                   --
-GENERAL.CONNECTION:                     con-vpn-1
-GENERAL.CON-UUID:                       UUID-con-vpn-1-REPLACED-REPLACED-REP
-GENERAL.CON-PATH:                       /org/freedesktop/NetworkManager/ActiveConnection/2
-GENERAL.METERED:                        nieznane
--------------------------------------------------------------------------------
-CAPABILITIES.CARRIER-DETECT:            nie
-CAPABILITIES.SPEED:                     nieznane
-CAPABILITIES.IS-SOFTWARE:               nie
-CAPABILITIES.SRIOV:                     nie
--------------------------------------------------------------------------------
-WIFI-PROPERTIES.WEP:                    tak
-WIFI-PROPERTIES.WPA:                    tak
-WIFI-PROPERTIES.WPA2:                   tak
-WIFI-PROPERTIES.TKIP:                   tak
-WIFI-PROPERTIES.CCMP:                   tak
-WIFI-PROPERTIES.AP:                     tak
-WIFI-PROPERTIES.ADHOC:                  tak
-WIFI-PROPERTIES.2GHZ:                   nieznane
-WIFI-PROPERTIES.5GHZ:                   nieznane
--------------------------------------------------------------------------------
-AP[1].IN-USE:                            
-AP[1].SSID:                             wlan0-ap-2
-AP[1].MODE:                             Infrastruktura
-AP[1].CHAN:                             1
-AP[1].RATE:                             54 Mb/s
-AP[1].SIGNAL:                           92
-AP[1].BARS:                             ****
-AP[1].SECURITY:                         WPA1 WPA2
--------------------------------------------------------------------------------
-AP[2].IN-USE:                            
-AP[2].SSID:                             wlan0-ap-1
-AP[2].MODE:                             Infrastruktura
-AP[2].CHAN:                             1
-AP[2].RATE:                             54 Mb/s
-AP[2].SIGNAL:                           81
-AP[2].BARS:                             ****
-AP[2].SECURITY:                         WPA1 WPA2
--------------------------------------------------------------------------------
-AP[3].IN-USE:                            
-AP[3].SSID:                             wlan0-ap-3
-AP[3].MODE:                             Infrastruktura
-AP[3].CHAN:                             1
-AP[3].RATE:                             54 Mb/s
-AP[3].SIGNAL:                           55
-AP[3].BARS:                             **  
-AP[3].SECURITY:                         WPA1 WPA2
--------------------------------------------------------------------------------
-IP4.ADDRESS[1]:                         192.168.228.18/32
-IP4.ADDRESS[2]:                         192.168.209.179/25
-IP4.GATEWAY:                            192.168.41.120
-IP4.DOMAIN[1]:                          sear4.foo2.bar
-IP4.DOMAIN[2]:                          sear4.fo.x.y
-IP4.DOMAIN[3]:                          sear4.foo1.bar
-IP4.DOMAIN[4]:                          sear4.foo4.bar
-IP4.DOMAIN[5]:                          sear4.fo.o.bar
-IP4.WINS[1]:                            192.168.120.79
--------------------------------------------------------------------------------
-DHCP4.OPTION[1]:                        dhcp-4-opt-0 = val-0
-DHCP4.OPTION[2]:                        dhcp-4-opt-2 = val-2
-DHCP4.OPTION[3]:                        dhcp-4-opt-4 = val-4
-DHCP4.OPTION[4]:                        dhcp-4-opt-7 = val-7
--------------------------------------------------------------------------------
-IP6.GATEWAY:                            --
-IP6.ROUTE[1]:                           dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086
-IP6.DOMAIN[1]:                          sear6.foo2.bar
-IP6.DOMAIN[2]:                          sear6.foo1.bar
-IP6.DOMAIN[3]:                          sear6.fo.x.y
-IP6.DOMAIN[4]:                          sear6.fo.o.bar
-IP6.DOMAIN[5]:                          sear6.foo3.bar
-IP6.DOMAIN[6]:                          sear6.foo4.bar
--------------------------------------------------------------------------------
-DHCP6.OPTION[1]:                        dhcp-6-opt-1 = val-1
-DHCP6.OPTION[2]:                        dhcp-6-opt-2 = val-2
-DHCP6.OPTION[3]:                        dhcp-6-opt-3 = val-3
-DHCP6.OPTION[4]:                        dhcp-6-opt-4 = val-4
-DHCP6.OPTION[5]:                        dhcp-6-opt-5 = val-5
--------------------------------------------------------------------------------
-CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings/Connection/{2}
-CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
--------------------------------------------------------------------------------
-
-<<<
-size: 2317
-location: clients/tests/test-client.py:1057:test_004()/137
+size: 2421
+location: clients/tests/test-client.py:1071:test_004()/137
 cmd: $NMCLI --pretty -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: C
 returncode: 0
-stdout: 2130 bytes
+stdout: 2234 bytes
 >>>
 ===============================================================================
                             Device details (wlan0)
@@ -8852,6 +8980,8 @@ GENERAL.HWADDR:                         13:E0:74:85:7C:D9
 GENERAL.MTU:                            0
 GENERAL.STATE:                          20 (unavailable)
 GENERAL.REASON:                         0 (No reason given)
+GENERAL.IP4-CONNECTIVITY:               0 (unknown)
+GENERAL.IP6-CONNECTIVITY:               0 (unknown)
 GENERAL.UDI:                            /sys/devices/virtual/wlan0
 GENERAL.IP-IFACE:                       --
 GENERAL.IS-SOFTWARE:                    no
@@ -8879,12 +9009,12 @@ WIFI-PROPERTIES.5GHZ:                   unknown
 -------------------------------------------------------------------------------
 
 <<<
-size: 2346
-location: clients/tests/test-client.py:1057:test_004()/138
+size: 2452
+location: clients/tests/test-client.py:1071:test_004()/138
 cmd: $NMCLI --pretty -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2149 bytes
+stdout: 2255 bytes
 >>>
 ===============================================================================
                         Informacje o urządzeniu (wlan0)
@@ -8901,6 +9031,8 @@ GENERAL.HWADDR:                         13:E0:74:85:7C:D9
 GENERAL.MTU:                            0
 GENERAL.STATE:                          20 (niedostępne)
 GENERAL.REASON:                         0 (Nie podano przyczyny)
+GENERAL.IP4-CONNECTIVITY:               0 (nieznane)
+GENERAL.IP6-CONNECTIVITY:               0 (nieznane)
 GENERAL.UDI:                            /sys/devices/virtual/wlan0
 GENERAL.IP-IFACE:                       --
 GENERAL.IS-SOFTWARE:                    nie
@@ -8928,12 +9060,12 @@ WIFI-PROPERTIES.5GHZ:                   nieznane
 -------------------------------------------------------------------------------
 
 <<<
-size: 2317
-location: clients/tests/test-client.py:1060:test_004()/139
+size: 2421
+location: clients/tests/test-client.py:1074:test_004()/139
 cmd: $NMCLI --pretty -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: C
 returncode: 0
-stdout: 2130 bytes
+stdout: 2234 bytes
 >>>
 ===============================================================================
                             Device details (wlan0)
@@ -8950,6 +9082,8 @@ GENERAL.HWADDR:                         13:E0:74:85:7C:D9
 GENERAL.MTU:                            0
 GENERAL.STATE:                          20 (unavailable)
 GENERAL.REASON:                         0 (No reason given)
+GENERAL.IP4-CONNECTIVITY:               0 (unknown)
+GENERAL.IP6-CONNECTIVITY:               0 (unknown)
 GENERAL.UDI:                            /sys/devices/virtual/wlan0
 GENERAL.IP-IFACE:                       --
 GENERAL.IS-SOFTWARE:                    no
@@ -8977,12 +9111,12 @@ WIFI-PROPERTIES.5GHZ:                   unknown
 -------------------------------------------------------------------------------
 
 <<<
-size: 2346
-location: clients/tests/test-client.py:1060:test_004()/140
+size: 2452
+location: clients/tests/test-client.py:1074:test_004()/140
 cmd: $NMCLI --pretty -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2149 bytes
+stdout: 2255 bytes
 >>>
 ===============================================================================
                         Informacje o urządzeniu (wlan0)
@@ -8999,6 +9133,8 @@ GENERAL.HWADDR:                         13:E0:74:85:7C:D9
 GENERAL.MTU:                            0
 GENERAL.STATE:                          20 (niedostępne)
 GENERAL.REASON:                         0 (Nie podano przyczyny)
+GENERAL.IP4-CONNECTIVITY:               0 (nieznane)
+GENERAL.IP6-CONNECTIVITY:               0 (nieznane)
 GENERAL.UDI:                            /sys/devices/virtual/wlan0
 GENERAL.IP-IFACE:                       --
 GENERAL.IS-SOFTWARE:                    nie
@@ -9027,7 +9163,7 @@ WIFI-PROPERTIES.5GHZ:                   nieznane
 
 <<<
 size: 671
-location: clients/tests/test-client.py:1063:test_004()/141
+location: clients/tests/test-client.py:1077:test_004()/141
 cmd: $NMCLI --pretty -f DEVICE,TYPE,DBUS-PATH dev
 lang: C
 returncode: 0
@@ -9038,15 +9174,15 @@ stdout: 513 bytes
 =====================
 DEVICE  TYPE      DBUS-PATH                                 
 ----------------------------------------------------------------------------------
+wlan0   wifi      /org/freedesktop/NetworkManager/Devices/3 
 eth0    ethernet  /org/freedesktop/NetworkManager/Devices/1 
 eth1    ethernet  /org/freedesktop/NetworkManager/Devices/2 
 wlan1   wifi      /org/freedesktop/NetworkManager/Devices/4 
 wlan1   wifi      /org/freedesktop/NetworkManager/Devices/5 
-wlan0   wifi      /org/freedesktop/NetworkManager/Devices/3 
 
 <<<
 size: 674
-location: clients/tests/test-client.py:1063:test_004()/142
+location: clients/tests/test-client.py:1077:test_004()/142
 cmd: $NMCLI --pretty -f DEVICE,TYPE,DBUS-PATH dev
 lang: pl_PL.UTF-8
 returncode: 0
@@ -9057,20 +9193,29 @@ stdout: 506 bytes
 ===================
 DEVICE  TYPE      DBUS-PATH                                 
 --------------------------------------------------------------------------------
+wlan0   wifi      /org/freedesktop/NetworkManager/Devices/3 
 eth0    ethernet  /org/freedesktop/NetworkManager/Devices/1 
 eth1    ethernet  /org/freedesktop/NetworkManager/Devices/2 
 wlan1   wifi      /org/freedesktop/NetworkManager/Devices/4 
 wlan1   wifi      /org/freedesktop/NetworkManager/Devices/5 
-wlan0   wifi      /org/freedesktop/NetworkManager/Devices/3 
 
 <<<
 size: 3026
-location: clients/tests/test-client.py:1066:test_004()/143
+location: clients/tests/test-client.py:1080:test_004()/143
 cmd: $NMCLI --pretty -f ALL device wifi list
 lang: C
 returncode: 0
 stdout: 2872 bytes
 >>>
+===========================
+  Wi-Fi scan list (wlan0)
+===========================
+NAME   SSID        SSID-HEX              BSSID              MODE   CHAN  FREQ      RATE       SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infra  1     2412 MHz  54 Mbit/s  92      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/2 
+AP[2]  wlan0-ap-1  776C616E302D61702D31  61:95:77:AC:1E:4C  Infra  1     2412 MHz  54 Mbit/s  81      ****  WPA1       pair_tkip pair_ccmp group_tkip group_ccmp psk  (none)                                         wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/1 
+AP[3]  wlan0-ap-3  776C616E302D61702D33  9B:F6:B7:EC:97:76  Infra  1     2412 MHz  54 Mbit/s  55      **    WPA3       (none)                                         pair_tkip pair_ccmp group_tkip group_ccmp sae  wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/3 
+
 ===========================
   Wi-Fi scan list (wlan1)
 ===========================
@@ -9084,23 +9229,23 @@ AP[1]  wlan1-ap-4  776C616E312D61702D34  94:2B:E8:F6:D2:86  Infra  1     2412 MH
 NAME  SSID  SSID-HEX  BSSID  MODE  CHAN  FREQ  RATE  SIGNAL  BARS  SECURITY  WPA-FLAGS  RSN-FLAGS  DEVICE  ACTIVE  IN-USE  DBUS-PATH 
 -----------------------------------------------------------------------------------------------------------------------------------------------------------------
 
-===========================
-  Wi-Fi scan list (wlan0)
-===========================
-NAME   SSID        SSID-HEX              BSSID              MODE   CHAN  FREQ      RATE       SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infra  1     2412 MHz  54 Mbit/s  92      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/2 
-AP[2]  wlan0-ap-1  776C616E302D61702D31  61:95:77:AC:1E:4C  Infra  1     2412 MHz  54 Mbit/s  81      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/1 
-AP[3]  wlan0-ap-3  776C616E302D61702D33  9B:F6:B7:EC:97:76  Infra  1     2412 MHz  54 Mbit/s  55      **    WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/3 
-
 <<<
 size: 3264
-location: clients/tests/test-client.py:1066:test_004()/144
+location: clients/tests/test-client.py:1080:test_004()/144
 cmd: $NMCLI --pretty -f ALL device wifi list
 lang: pl_PL.UTF-8
 returncode: 0
 stdout: 3100 bytes
 >>>
+========================================
+  Lista skanowania sieci Wi-Fi (wlan0)
+========================================
+NAME   SSID        SSID-HEX              BSSID              MODE            CHAN  FREQ      RATE     SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infrastruktura  1     2412 MHz  54 Mb/s  92      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/2 
+AP[2]  wlan0-ap-1  776C616E302D61702D31  61:95:77:AC:1E:4C  Infrastruktura  1     2412 MHz  54 Mb/s  81      ****  WPA1       pair_tkip pair_ccmp group_tkip group_ccmp psk  (brak)                                         wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/1 
+AP[3]  wlan0-ap-3  776C616E302D61702D33  9B:F6:B7:EC:97:76  Infrastruktura  1     2412 MHz  54 Mb/s  55      **    WPA3       (brak)                                         pair_tkip pair_ccmp group_tkip group_ccmp sae  wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/3 
+
 ========================================
   Lista skanowania sieci Wi-Fi (wlan1)
 ========================================
@@ -9114,23 +9259,23 @@ AP[1]  wlan1-ap-4  776C616E312D61702D34  94:2B:E8:F6:D2:86  Infrastruktura  1
 NAME  SSID  SSID-HEX  BSSID  MODE  CHAN  FREQ  RATE  SIGNAL  BARS  SECURITY  WPA-FLAGS  RSN-FLAGS  DEVICE  ACTIVE  IN-USE  DBUS-PATH 
 ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 
-========================================
-  Lista skanowania sieci Wi-Fi (wlan0)
-========================================
-NAME   SSID        SSID-HEX              BSSID              MODE            CHAN  FREQ      RATE     SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infrastruktura  1     2412 MHz  54 Mb/s  92      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/2 
-AP[2]  wlan0-ap-1  776C616E302D61702D31  61:95:77:AC:1E:4C  Infrastruktura  1     2412 MHz  54 Mb/s  81      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/1 
-AP[3]  wlan0-ap-3  776C616E302D61702D33  9B:F6:B7:EC:97:76  Infrastruktura  1     2412 MHz  54 Mb/s  55      **    WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/3 
-
 <<<
 size: 1152
-location: clients/tests/test-client.py:1068:test_004()/145
+location: clients/tests/test-client.py:1082:test_004()/145
 cmd: $NMCLI --pretty -f COMMON device wifi list
 lang: C
 returncode: 0
 stdout: 996 bytes
 >>>
+===========================
+  Wi-Fi scan list (wlan0)
+===========================
+IN-USE  SSID        MODE   CHAN  RATE       SIGNAL  BARS  SECURITY  
+------------------------------------------------------------------------------------------------
+        wlan0-ap-2  Infra  1     54 Mbit/s  92      ****  WPA1 WPA2 
+        wlan0-ap-1  Infra  1     54 Mbit/s  81      ****  WPA1      
+        wlan0-ap-3  Infra  1     54 Mbit/s  55      **    WPA3      
+
 ===========================
   Wi-Fi scan list (wlan1)
 ===========================
@@ -9144,23 +9289,23 @@ IN-USE  SSID        MODE   CHAN  RATE       SIGNAL  BARS  SECURITY
 IN-USE  SSID  MODE  CHAN  RATE  SIGNAL  BARS  SECURITY 
 -----------------------------------------------------------------------------------
 
-===========================
-  Wi-Fi scan list (wlan0)
-===========================
-IN-USE  SSID        MODE   CHAN  RATE       SIGNAL  BARS  SECURITY  
-------------------------------------------------------------------------------------------------
-        wlan0-ap-2  Infra  1     54 Mbit/s  92      ****  WPA1 WPA2 
-        wlan0-ap-1  Infra  1     54 Mbit/s  81      ****  WPA1 WPA2 
-        wlan0-ap-3  Infra  1     54 Mbit/s  55      **    WPA1 WPA2 
-
 <<<
 size: 1383
-location: clients/tests/test-client.py:1068:test_004()/146
+location: clients/tests/test-client.py:1082:test_004()/146
 cmd: $NMCLI --pretty -f COMMON device wifi list
 lang: pl_PL.UTF-8
 returncode: 0
 stdout: 1216 bytes
 >>>
+========================================
+  Lista skanowania sieci Wi-Fi (wlan0)
+========================================
+IN-USE  SSID        MODE            CHAN  RATE     SIGNAL  BARS  SECURITY  
+--------------------------------------------------------------------------------------------------------------------
+        wlan0-ap-2  Infrastruktura  1     54 Mb/s  92      ****  WPA1 WPA2 
+        wlan0-ap-1  Infrastruktura  1     54 Mb/s  81      ****  WPA1      
+        wlan0-ap-3  Infrastruktura  1     54 Mb/s  55      **    WPA3      
+
 ========================================
   Lista skanowania sieci Wi-Fi (wlan1)
 ========================================
@@ -9174,23 +9319,23 @@ IN-USE  SSID        MODE            CHAN  RATE     SIGNAL  BARS  SECURITY
 IN-USE  SSID  MODE  CHAN  RATE  SIGNAL  BARS  SECURITY 
 ------------------------------------------------------------------------------------------------
 
-========================================
-  Lista skanowania sieci Wi-Fi (wlan0)
-========================================
-IN-USE  SSID        MODE            CHAN  RATE     SIGNAL  BARS  SECURITY  
---------------------------------------------------------------------------------------------------------------------
-        wlan0-ap-2  Infrastruktura  1     54 Mb/s  92      ****  WPA1 WPA2 
-        wlan0-ap-1  Infrastruktura  1     54 Mb/s  81      ****  WPA1 WPA2 
-        wlan0-ap-3  Infrastruktura  1     54 Mb/s  55      **    WPA1 WPA2 
-
 <<<
 size: 3139
-location: clients/tests/test-client.py:1071:test_004()/147
+location: clients/tests/test-client.py:1085:test_004()/147
 cmd: $NMCLI --pretty -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list
 lang: C
 returncode: 0
 stdout: 2872 bytes
 >>>
+===========================
+  Wi-Fi scan list (wlan0)
+===========================
+NAME   SSID        SSID-HEX              BSSID              MODE   CHAN  FREQ      RATE       SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infra  1     2412 MHz  54 Mbit/s  92      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/2 
+AP[2]  wlan0-ap-1  776C616E302D61702D31  61:95:77:AC:1E:4C  Infra  1     2412 MHz  54 Mbit/s  81      ****  WPA1       pair_tkip pair_ccmp group_tkip group_ccmp psk  (none)                                         wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/1 
+AP[3]  wlan0-ap-3  776C616E302D61702D33  9B:F6:B7:EC:97:76  Infra  1     2412 MHz  54 Mbit/s  55      **    WPA3       (none)                                         pair_tkip pair_ccmp group_tkip group_ccmp sae  wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/3 
+
 ===========================
   Wi-Fi scan list (wlan1)
 ===========================
@@ -9204,23 +9349,23 @@ AP[1]  wlan1-ap-4  776C616E312D61702D34  94:2B:E8:F6:D2:86  Infra  1     2412 MH
 NAME  SSID  SSID-HEX  BSSID  MODE  CHAN  FREQ  RATE  SIGNAL  BARS  SECURITY  WPA-FLAGS  RSN-FLAGS  DEVICE  ACTIVE  IN-USE  DBUS-PATH 
 -----------------------------------------------------------------------------------------------------------------------------------------------------------------
 
-===========================
-  Wi-Fi scan list (wlan0)
-===========================
-NAME   SSID        SSID-HEX              BSSID              MODE   CHAN  FREQ      RATE       SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infra  1     2412 MHz  54 Mbit/s  92      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/2 
-AP[2]  wlan0-ap-1  776C616E302D61702D31  61:95:77:AC:1E:4C  Infra  1     2412 MHz  54 Mbit/s  81      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/1 
-AP[3]  wlan0-ap-3  776C616E302D61702D33  9B:F6:B7:EC:97:76  Infra  1     2412 MHz  54 Mbit/s  55      **    WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/3 
-
 <<<
 size: 3377
-location: clients/tests/test-client.py:1071:test_004()/148
+location: clients/tests/test-client.py:1085:test_004()/148
 cmd: $NMCLI --pretty -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list
 lang: pl_PL.UTF-8
 returncode: 0
 stdout: 3100 bytes
 >>>
+========================================
+  Lista skanowania sieci Wi-Fi (wlan0)
+========================================
+NAME   SSID        SSID-HEX              BSSID              MODE            CHAN  FREQ      RATE     SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infrastruktura  1     2412 MHz  54 Mb/s  92      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/2 
+AP[2]  wlan0-ap-1  776C616E302D61702D31  61:95:77:AC:1E:4C  Infrastruktura  1     2412 MHz  54 Mb/s  81      ****  WPA1       pair_tkip pair_ccmp group_tkip group_ccmp psk  (brak)                                         wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/1 
+AP[3]  wlan0-ap-3  776C616E302D61702D33  9B:F6:B7:EC:97:76  Infrastruktura  1     2412 MHz  54 Mb/s  55      **    WPA3       (brak)                                         pair_tkip pair_ccmp group_tkip group_ccmp sae  wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/3 
+
 ========================================
   Lista skanowania sieci Wi-Fi (wlan1)
 ========================================
@@ -9234,22 +9379,13 @@ AP[1]  wlan1-ap-4  776C616E312D61702D34  94:2B:E8:F6:D2:86  Infrastruktura  1
 NAME  SSID  SSID-HEX  BSSID  MODE  CHAN  FREQ  RATE  SIGNAL  BARS  SECURITY  WPA-FLAGS  RSN-FLAGS  DEVICE  ACTIVE  IN-USE  DBUS-PATH 
 ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 
-========================================
-  Lista skanowania sieci Wi-Fi (wlan0)
-========================================
-NAME   SSID        SSID-HEX              BSSID              MODE            CHAN  FREQ      RATE     SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infrastruktura  1     2412 MHz  54 Mb/s  92      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/2 
-AP[2]  wlan0-ap-1  776C616E302D61702D31  61:95:77:AC:1E:4C  Infrastruktura  1     2412 MHz  54 Mb/s  81      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/1 
-AP[3]  wlan0-ap-3  776C616E302D61702D33  9B:F6:B7:EC:97:76  Infrastruktura  1     2412 MHz  54 Mb/s  55      **    WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/3 
-
 <<<
-size: 1139
-location: clients/tests/test-client.py:1073:test_004()/149
+size: 1141
+location: clients/tests/test-client.py:1087:test_004()/149
 cmd: $NMCLI --pretty -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: C
 returncode: 0
-stdout: 962 bytes
+stdout: 964 bytes
 >>>
 ===========================
   Wi-Fi scan list (wlan0)
@@ -9258,13 +9394,15 @@ NAME   SSID        SSID-HEX              BSSID              MODE   CHAN  FREQ
 -----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infra  1     2412 MHz  54 Mbit/s  92      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/2 
 
+
+
 <<<
-size: 1227
-location: clients/tests/test-client.py:1073:test_004()/150
+size: 1229
+location: clients/tests/test-client.py:1087:test_004()/150
 cmd: $NMCLI --pretty -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 1039 bytes
+stdout: 1041 bytes
 >>>
 ========================================
   Lista skanowania sieci Wi-Fi (wlan0)
@@ -9273,13 +9411,15 @@ NAME   SSID        SSID-HEX              BSSID              MODE            CHAN
 -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infrastruktura  1     2412 MHz  54 Mb/s  92      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/2 
 
+
+
 <<<
-size: 497
-location: clients/tests/test-client.py:1075:test_004()/151
+size: 499
+location: clients/tests/test-client.py:1089:test_004()/151
 cmd: $NMCLI --pretty -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: C
 returncode: 0
-stdout: 317 bytes
+stdout: 319 bytes
 >>>
 ===========================
   Wi-Fi scan list (wlan0)
@@ -9288,13 +9428,15 @@ IN-USE  SSID        MODE   CHAN  RATE       SIGNAL  BARS  SECURITY
 ------------------------------------------------------------------------------------------------
         wlan0-ap-2  Infra  1     54 Mbit/s  92      ****  WPA1 WPA2 
 
+
+
 <<<
-size: 582
-location: clients/tests/test-client.py:1075:test_004()/152
+size: 584
+location: clients/tests/test-client.py:1089:test_004()/152
 cmd: $NMCLI --pretty -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 392 bytes
+stdout: 394 bytes
 >>>
 ========================================
   Lista skanowania sieci Wi-Fi (wlan0)
@@ -9303,13 +9445,15 @@ IN-USE  SSID        MODE            CHAN  RATE     SIGNAL  BARS  SECURITY
 --------------------------------------------------------------------------------------------------------------------
         wlan0-ap-2  Infrastruktura  1     54 Mb/s  92      ****  WPA1 WPA2 
 
+
+
 <<<
-size: 1252
-location: clients/tests/test-client.py:1078:test_004()/153
+size: 1254
+location: clients/tests/test-client.py:1092:test_004()/153
 cmd: $NMCLI --pretty -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: C
 returncode: 0
-stdout: 962 bytes
+stdout: 964 bytes
 >>>
 ===========================
   Wi-Fi scan list (wlan0)
@@ -9318,13 +9462,15 @@ NAME   SSID        SSID-HEX              BSSID              MODE   CHAN  FREQ
 -----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infra  1     2412 MHz  54 Mbit/s  92      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/2 
 
+
+
 <<<
-size: 1340
-location: clients/tests/test-client.py:1078:test_004()/154
+size: 1342
+location: clients/tests/test-client.py:1092:test_004()/154
 cmd: $NMCLI --pretty -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 1039 bytes
+stdout: 1041 bytes
 >>>
 ========================================
   Lista skanowania sieci Wi-Fi (wlan0)
@@ -9333,13 +9479,15 @@ NAME   SSID        SSID-HEX              BSSID              MODE            CHAN
 -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infrastruktura  1     2412 MHz  54 Mb/s  92      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/2 
 
+
+
 <<<
-size: 5857
-location: clients/tests/test-client.py:1080:test_004()/155
+size: 5951
+location: clients/tests/test-client.py:1094:test_004()/155
 cmd: $NMCLI --pretty -f ALL device show wlan0
 lang: C
 returncode: 0
-stdout: 5702 bytes
+stdout: 5796 bytes
 >>>
 ===============================================================================
                             Device details (wlan0)
@@ -9356,6 +9504,8 @@ GENERAL.HWADDR:                         13:E0:74:85:7C:D9
 GENERAL.MTU:                            0
 GENERAL.STATE:                          20 (unavailable)
 GENERAL.REASON:                         0 (No reason given)
+GENERAL.IP4-CONNECTIVITY:               0 (unknown)
+GENERAL.IP6-CONNECTIVITY:               0 (unknown)
 GENERAL.UDI:                            /sys/devices/virtual/wlan0
 GENERAL.IP-IFACE:                       --
 GENERAL.IS-SOFTWARE:                    no
@@ -9400,7 +9550,7 @@ AP[2].CHAN:                             1
 AP[2].RATE:                             54 Mbit/s
 AP[2].SIGNAL:                           81
 AP[2].BARS:                             ****
-AP[2].SECURITY:                         WPA1 WPA2
+AP[2].SECURITY:                         WPA1
 -------------------------------------------------------------------------------
 AP[3].IN-USE:                            
 AP[3].SSID:                             wlan0-ap-3
@@ -9409,7 +9559,7 @@ AP[3].CHAN:                             1
 AP[3].RATE:                             54 Mbit/s
 AP[3].SIGNAL:                           55
 AP[3].BARS:                             **  
-AP[3].SECURITY:                         WPA1 WPA2
+AP[3].SECURITY:                         WPA3
 -------------------------------------------------------------------------------
 IP4.ADDRESS[1]:                         192.168.228.18/32
 IP4.ADDRESS[2]:                         192.168.209.179/25
@@ -9446,12 +9596,12 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | c
 -------------------------------------------------------------------------------
 
 <<<
-size: 5917
-location: clients/tests/test-client.py:1080:test_004()/156
+size: 6013
+location: clients/tests/test-client.py:1094:test_004()/156
 cmd: $NMCLI --pretty -f ALL device show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 5752 bytes
+stdout: 5848 bytes
 >>>
 ===============================================================================
                         Informacje o urządzeniu (wlan0)
@@ -9468,6 +9618,8 @@ GENERAL.HWADDR:                         13:E0:74:85:7C:D9
 GENERAL.MTU:                            0
 GENERAL.STATE:                          20 (niedostępne)
 GENERAL.REASON:                         0 (Nie podano przyczyny)
+GENERAL.IP4-CONNECTIVITY:               0 (nieznane)
+GENERAL.IP6-CONNECTIVITY:               0 (nieznane)
 GENERAL.UDI:                            /sys/devices/virtual/wlan0
 GENERAL.IP-IFACE:                       --
 GENERAL.IS-SOFTWARE:                    nie
@@ -9512,7 +9664,7 @@ AP[2].CHAN:                             1
 AP[2].RATE:                             54 Mb/s
 AP[2].SIGNAL:                           81
 AP[2].BARS:                             ****
-AP[2].SECURITY:                         WPA1 WPA2
+AP[2].SECURITY:                         WPA1
 -------------------------------------------------------------------------------
 AP[3].IN-USE:                            
 AP[3].SSID:                             wlan0-ap-3
@@ -9521,7 +9673,7 @@ AP[3].CHAN:                             1
 AP[3].RATE:                             54 Mb/s
 AP[3].SIGNAL:                           55
 AP[3].BARS:                             **  
-AP[3].SECURITY:                         WPA1 WPA2
+AP[3].SECURITY:                         WPA3
 -------------------------------------------------------------------------------
 IP4.ADDRESS[1]:                         192.168.228.18/32
 IP4.ADDRESS[2]:                         192.168.209.179/25
@@ -9559,7 +9711,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | c
 
 <<<
 size: 2452
-location: clients/tests/test-client.py:1082:test_004()/157
+location: clients/tests/test-client.py:1096:test_004()/157
 cmd: $NMCLI --pretty -f COMMON device show wlan0
 lang: C
 returncode: 0
@@ -9604,7 +9756,7 @@ IP6.DOMAIN[6]:                          sear6.foo4.bar
 
 <<<
 size: 2470
-location: clients/tests/test-client.py:1082:test_004()/158
+location: clients/tests/test-client.py:1096:test_004()/158
 cmd: $NMCLI --pretty -f COMMON device show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
@@ -9648,12 +9800,12 @@ IP6.DOMAIN[6]:                          sear6.foo4.bar
 -------------------------------------------------------------------------------
 
 <<<
-size: 5995
-location: clients/tests/test-client.py:1084:test_004()/159
+size: 6089
+location: clients/tests/test-client.py:1098:test_004()/159
 cmd: $NMCLI --pretty -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0
 lang: C
 returncode: 0
-stdout: 5702 bytes
+stdout: 5796 bytes
 >>>
 ===============================================================================
                             Device details (wlan0)
@@ -9670,6 +9822,8 @@ GENERAL.HWADDR:                         13:E0:74:85:7C:D9
 GENERAL.MTU:                            0
 GENERAL.STATE:                          20 (unavailable)
 GENERAL.REASON:                         0 (No reason given)
+GENERAL.IP4-CONNECTIVITY:               0 (unknown)
+GENERAL.IP6-CONNECTIVITY:               0 (unknown)
 GENERAL.UDI:                            /sys/devices/virtual/wlan0
 GENERAL.IP-IFACE:                       --
 GENERAL.IS-SOFTWARE:                    no
@@ -9714,7 +9868,7 @@ AP[2].CHAN:                             1
 AP[2].RATE:                             54 Mbit/s
 AP[2].SIGNAL:                           81
 AP[2].BARS:                             ****
-AP[2].SECURITY:                         WPA1 WPA2
+AP[2].SECURITY:                         WPA1
 -------------------------------------------------------------------------------
 AP[3].IN-USE:                            
 AP[3].SSID:                             wlan0-ap-3
@@ -9723,7 +9877,7 @@ AP[3].CHAN:                             1
 AP[3].RATE:                             54 Mbit/s
 AP[3].SIGNAL:                           55
 AP[3].BARS:                             **  
-AP[3].SECURITY:                         WPA1 WPA2
+AP[3].SECURITY:                         WPA3
 -------------------------------------------------------------------------------
 IP4.ADDRESS[1]:                         192.168.228.18/32
 IP4.ADDRESS[2]:                         192.168.209.179/25
@@ -9760,12 +9914,12 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | c
 -------------------------------------------------------------------------------
 
 <<<
-size: 6055
-location: clients/tests/test-client.py:1084:test_004()/160
+size: 6151
+location: clients/tests/test-client.py:1098:test_004()/160
 cmd: $NMCLI --pretty -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 5752 bytes
+stdout: 5848 bytes
 >>>
 ===============================================================================
                         Informacje o urządzeniu (wlan0)
@@ -9782,6 +9936,8 @@ GENERAL.HWADDR:                         13:E0:74:85:7C:D9
 GENERAL.MTU:                            0
 GENERAL.STATE:                          20 (niedostępne)
 GENERAL.REASON:                         0 (Nie podano przyczyny)
+GENERAL.IP4-CONNECTIVITY:               0 (nieznane)
+GENERAL.IP6-CONNECTIVITY:               0 (nieznane)
 GENERAL.UDI:                            /sys/devices/virtual/wlan0
 GENERAL.IP-IFACE:                       --
 GENERAL.IS-SOFTWARE:                    nie
@@ -9826,7 +9982,7 @@ AP[2].CHAN:                             1
 AP[2].RATE:                             54 Mb/s
 AP[2].SIGNAL:                           81
 AP[2].BARS:                             ****
-AP[2].SECURITY:                         WPA1 WPA2
+AP[2].SECURITY:                         WPA1
 -------------------------------------------------------------------------------
 AP[3].IN-USE:                            
 AP[3].SSID:                             wlan0-ap-3
@@ -9835,7 +9991,7 @@ AP[3].CHAN:                             1
 AP[3].RATE:                             54 Mb/s
 AP[3].SIGNAL:                           55
 AP[3].BARS:                             **  
-AP[3].SECURITY:                         WPA1 WPA2
+AP[3].SECURITY:                         WPA3
 -------------------------------------------------------------------------------
 IP4.ADDRESS[1]:                         192.168.228.18/32
 IP4.ADDRESS[2]:                         192.168.209.179/25
@@ -9873,7 +10029,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | c
 
 <<<
 size: 5637
-location: clients/tests/test-client.py:1022:test_004()/161
+location: clients/tests/test-client.py:1036:test_004()/161
 cmd: $NMCLI --pretty --color yes con s con-vpn-1
 lang: C
 returncode: 0
@@ -9987,12 +10143,12 @@ VPN.CFG[3]:                             key3 = val3
 -------------------------------------------------------------------------------
 
 <<<
-size: 5677
-location: clients/tests/test-client.py:1022:test_004()/162
+size: 5679
+location: clients/tests/test-client.py:1036:test_004()/162
 cmd: $NMCLI --pretty --color yes con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 5509 bytes
+stdout: 5511 bytes
 >>>
 ===============================================================================
                    Szczegóły profilu połączenia (con-vpn-1)
@@ -10095,7 +10251,7 @@ VPN.TYPE:                               openvpn
 VPN.USERNAME:                           --
 VPN.GATEWAY:                            --
 VPN.BANNER:                             *** VPN connection con-vpn-1 ***
-VPN.VPN-STATE:                          5 - Połączono z VPN
+VPN.VPN-STATE:                          5 — Połączono z VPN
 VPN.CFG[1]:                             key1 = val1
 VPN.CFG[2]:                             key2 = val2
 VPN.CFG[3]:                             key3 = val3
@@ -10103,7 +10259,7 @@ VPN.CFG[3]:                             key3 = val3
 
 <<<
 size: 5637
-location: clients/tests/test-client.py:1024:test_004()/163
+location: clients/tests/test-client.py:1038:test_004()/163
 cmd: $NMCLI --pretty --color yes con s con-vpn-1
 lang: C
 returncode: 0
@@ -10217,12 +10373,12 @@ VPN.CFG[3]:                             key3 = val3
 -------------------------------------------------------------------------------
 
 <<<
-size: 5677
-location: clients/tests/test-client.py:1024:test_004()/164
+size: 5679
+location: clients/tests/test-client.py:1038:test_004()/164
 cmd: $NMCLI --pretty --color yes con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 5509 bytes
+stdout: 5511 bytes
 >>>
 ===============================================================================
                    Szczegóły profilu połączenia (con-vpn-1)
@@ -10325,7 +10481,7 @@ VPN.TYPE:                               openvpn
 VPN.USERNAME:                           --
 VPN.GATEWAY:                            --
 VPN.BANNER:                             *** VPN connection con-vpn-1 ***
-VPN.VPN-STATE:                          5 - Połączono z VPN
+VPN.VPN-STATE:                          5 — Połączono z VPN
 VPN.CFG[1]:                             key1 = val1
 VPN.CFG[2]:                             key2 = val2
 VPN.CFG[3]:                             key3 = val3
@@ -10333,7 +10489,7 @@ VPN.CFG[3]:                             key3 = val3
 
 <<<
 size: 4163
-location: clients/tests/test-client.py:1027:test_004()/165
+location: clients/tests/test-client.py:1041:test_004()/165
 cmd: $NMCLI --pretty --color yes -f ALL con s con-vpn-1
 lang: C
 returncode: 0
@@ -10423,7 +10579,7 @@ proxy.pac-script:                       --
 
 <<<
 size: 4188
-location: clients/tests/test-client.py:1027:test_004()/166
+location: clients/tests/test-client.py:1041:test_004()/166
 cmd: $NMCLI --pretty --color yes -f ALL con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
@@ -10513,7 +10669,7 @@ proxy.pac-script:                       --
 
 <<<
 size: 797
-location: clients/tests/test-client.py:1033:test_004()/167
+location: clients/tests/test-client.py:1047:test_004()/167
 cmd: $NMCLI --pretty --color yes -f VPN con s con-vpn-1
 lang: C
 returncode: 0
@@ -10532,7 +10688,7 @@ vpn.timeout:                            0
 
 <<<
 size: 813
-location: clients/tests/test-client.py:1033:test_004()/168
+location: clients/tests/test-client.py:1047:test_004()/168
 cmd: $NMCLI --pretty --color yes -f VPN con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
@@ -10551,7 +10707,7 @@ vpn.timeout:                            0
 
 <<<
 size: 1148
-location: clients/tests/test-client.py:1036:test_004()/169
+location: clients/tests/test-client.py:1050:test_004()/169
 cmd: $NMCLI --pretty --color yes -f GENERAL con s con-vpn-1
 lang: C
 returncode: 0
@@ -10576,7 +10732,7 @@ GENERAL.MASTER-PATH:                    --
 
 <<<
 size: 1168
-location: clients/tests/test-client.py:1036:test_004()/170
+location: clients/tests/test-client.py:1050:test_004()/170
 cmd: $NMCLI --pretty --color yes -f GENERAL con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
@@ -10601,7 +10757,7 @@ GENERAL.MASTER-PATH:                    --
 
 <<<
 size: 694
-location: clients/tests/test-client.py:1039:test_004()/171
+location: clients/tests/test-client.py:1053:test_004()/171
 cmd: $NMCLI --pretty --color yes dev s
 lang: C
 returncode: 0
@@ -10612,15 +10768,15 @@ stdout: 547 bytes
 =====================
 DEVICE  TYPE      STATE        CONNECTION 
 ----------------------------------------------------------------
+wlan0   wifi      unavailable  con-vpn-1  
 eth0    ethernet  unavailable  --         
 eth1    ethernet  unavailable  --         
 wlan1   wifi      unavailable  --         
 wlan1   wifi      unavailable  --         
-wlan0   wifi      unavailable  con-vpn-1  
 
 <<<
 size: 702
-location: clients/tests/test-client.py:1039:test_004()/172
+location: clients/tests/test-client.py:1053:test_004()/172
 cmd: $NMCLI --pretty --color yes dev s
 lang: pl_PL.UTF-8
 returncode: 0
@@ -10631,58 +10787,95 @@ stdout: 545 bytes
 ===================
 DEVICE  TYPE      STATE        CONNECTION 
 --------------------------------------------------------------
+wlan0   wifi      niedostępne  con-vpn-1  
 eth0    ethernet  niedostępne  --         
 eth1    ethernet  niedostępne  --         
 wlan1   wifi      niedostępne  --         
 wlan1   wifi      niedostępne  --         
-wlan0   wifi      niedostępne  con-vpn-1  
 
 <<<
-size: 1758
-location: clients/tests/test-client.py:1042:test_004()/173
+size: 2090
+location: clients/tests/test-client.py:1056:test_004()/173
 cmd: $NMCLI --pretty --color yes -f all dev status
 lang: C
 returncode: 0
-stdout: 1598 bytes
+stdout: 1930 bytes
 >>>
 =====================
   Status of devices
 =====================
-DEVICE  TYPE      STATE        DBUS-PATH                                  CONNECTION  CON-UUID                              CON-PATH                                           
------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-eth0    ethernet  unavailable  /org/freedesktop/NetworkManager/Devices/1  --          --                                    --                                                 
-eth1    ethernet  unavailable  /org/freedesktop/NetworkManager/Devices/2  --          --                                    --                                                 
-wlan1   wifi      unavailable  /org/freedesktop/NetworkManager/Devices/4  --          --                                    --                                                 
-wlan1   wifi      unavailable  /org/freedesktop/NetworkManager/Devices/5  --          --                                    --                                                 
-wlan0   wifi      unavailable  /org/freedesktop/NetworkManager/Devices/3  con-vpn-1   UUID-con-vpn-1-REPLACED-REPLACED-REP  /org/freedesktop/NetworkManager/ActiveConnection/2 
+DEVICE  TYPE      STATE        IP4-CONNECTIVITY  IP6-CONNECTIVITY  DBUS-PATH                                  CONNECTION  CON-UUID                              CON-PATH                                           
+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+wlan0   wifi      unavailable  unknown           unknown           /org/freedesktop/NetworkManager/Devices/3  con-vpn-1   UUID-con-vpn-1-REPLACED-REPLACED-REP  /org/freedesktop/NetworkManager/ActiveConnection/2 
+eth0    ethernet  unavailable  unknown           unknown           /org/freedesktop/NetworkManager/Devices/1  --          --                                    --                                                 
+eth1    ethernet  unavailable  unknown           unknown           /org/freedesktop/NetworkManager/Devices/2  --          --                                    --                                                 
+wlan1   wifi      unavailable  unknown           unknown           /org/freedesktop/NetworkManager/Devices/4  --          --                                    --                                                 
+wlan1   wifi      unavailable  unknown           unknown           /org/freedesktop/NetworkManager/Devices/5  --          --                                    --                                                 
 
 <<<
-size: 1766
-location: clients/tests/test-client.py:1042:test_004()/174
+size: 2098
+location: clients/tests/test-client.py:1056:test_004()/174
 cmd: $NMCLI --pretty --color yes -f all dev status
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 1596 bytes
+stdout: 1928 bytes
 >>>
 ===================
   Stan urządzenia
 ===================
-DEVICE  TYPE      STATE        DBUS-PATH                                  CONNECTION  CON-UUID                              CON-PATH                                           
----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-eth0    ethernet  niedostępne  /org/freedesktop/NetworkManager/Devices/1  --          --                                    --                                                 
-eth1    ethernet  niedostępne  /org/freedesktop/NetworkManager/Devices/2  --          --                                    --                                                 
-wlan1   wifi      niedostępne  /org/freedesktop/NetworkManager/Devices/4  --          --                                    --                                                 
-wlan1   wifi      niedostępne  /org/freedesktop/NetworkManager/Devices/5  --          --                                    --                                                 
-wlan0   wifi      niedostępne  /org/freedesktop/NetworkManager/Devices/3  con-vpn-1   UUID-con-vpn-1-REPLACED-REPLACED-REP  /org/freedesktop/NetworkManager/ActiveConnection/2 
+DEVICE  TYPE      STATE        IP4-CONNECTIVITY  IP6-CONNECTIVITY  DBUS-PATH                                  CONNECTION  CON-UUID                              CON-PATH                                           
+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+wlan0   wifi      niedostępne  nieznane          nieznane          /org/freedesktop/NetworkManager/Devices/3  con-vpn-1   UUID-con-vpn-1-REPLACED-REPLACED-REP  /org/freedesktop/NetworkManager/ActiveConnection/2 
+eth0    ethernet  niedostępne  nieznane          nieznane          /org/freedesktop/NetworkManager/Devices/1  --          --                                    --                                                 
+eth1    ethernet  niedostępne  nieznane          nieznane          /org/freedesktop/NetworkManager/Devices/2  --          --                                    --                                                 
+wlan1   wifi      niedostępne  nieznane          nieznane          /org/freedesktop/NetworkManager/Devices/4  --          --                                    --                                                 
+wlan1   wifi      niedostępne  nieznane          nieznane          /org/freedesktop/NetworkManager/Devices/5  --          --                                    --                                                 
 
 <<<
 size: 12885
-location: clients/tests/test-client.py:1045:test_004()/175
+location: clients/tests/test-client.py:1059:test_004()/175
 cmd: $NMCLI --pretty --color yes dev show
 lang: C
 returncode: 0
 stdout: 12733 bytes
 >>>
+===============================================================================
+                            Device details (wlan0)
+===============================================================================
+GENERAL.DEVICE:                         wlan0
+-------------------------------------------------------------------------------
+GENERAL.TYPE:                           wifi
+-------------------------------------------------------------------------------
+GENERAL.HWADDR:                         13:E0:74:85:7C:D9
+-------------------------------------------------------------------------------
+GENERAL.MTU:                            0
+-------------------------------------------------------------------------------
+GENERAL.STATE:                          20 (unavailable)
+-------------------------------------------------------------------------------
+GENERAL.CONNECTION:                     con-vpn-1
+-------------------------------------------------------------------------------
+GENERAL.CON-PATH:                       /org/freedesktop/NetworkManager/ActiveConnection/2
+-------------------------------------------------------------------------------
+IP4.ADDRESS[1]:                         192.168.228.18/32
+IP4.ADDRESS[2]:                         192.168.209.179/25
+IP4.GATEWAY:                            192.168.41.120
+IP4.DOMAIN[1]:                          sear4.foo2.bar
+IP4.DOMAIN[2]:                          sear4.fo.x.y
+IP4.DOMAIN[3]:                          sear4.foo1.bar
+IP4.DOMAIN[4]:                          sear4.foo4.bar
+IP4.DOMAIN[5]:                          sear4.fo.o.bar
+IP4.WINS[1]:                            192.168.120.79
+-------------------------------------------------------------------------------
+IP6.GATEWAY:                            --
+IP6.ROUTE[1]:                           dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086
+IP6.DOMAIN[1]:                          sear6.foo2.bar
+IP6.DOMAIN[2]:                          sear6.foo1.bar
+IP6.DOMAIN[3]:                          sear6.fo.x.y
+IP6.DOMAIN[4]:                          sear6.fo.o.bar
+IP6.DOMAIN[5]:                          sear6.foo3.bar
+IP6.DOMAIN[6]:                          sear6.foo4.bar
+-------------------------------------------------------------------------------
+
 ===============================================================================
                              Device details (eth0)
 ===============================================================================
@@ -10846,8 +11039,16 @@ IP6.DNS[1]:                             2001:a::2934:bd66:550d:ec19
 IP6.DOMAIN[1]:                          sear6.fo.x.y
 -------------------------------------------------------------------------------
 
+<<<
+size: 12949
+location: clients/tests/test-client.py:1059:test_004()/176
+cmd: $NMCLI --pretty --color yes dev show
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 12787 bytes
+>>>
 ===============================================================================
-                            Device details (wlan0)
+                        Informacje o urządzeniu (wlan0)
 ===============================================================================
 GENERAL.DEVICE:                         wlan0
 -------------------------------------------------------------------------------
@@ -10857,7 +11058,7 @@ GENERAL.HWADDR:                         13:E0:74:85:7C:D9
 -------------------------------------------------------------------------------
 GENERAL.MTU:                            0
 -------------------------------------------------------------------------------
-GENERAL.STATE:                          20 (unavailable)
+GENERAL.STATE:                          20 (niedostępne)
 -------------------------------------------------------------------------------
 GENERAL.CONNECTION:                     con-vpn-1
 -------------------------------------------------------------------------------
@@ -10883,14 +11084,6 @@ IP6.DOMAIN[5]:                          sear6.foo3.bar
 IP6.DOMAIN[6]:                          sear6.foo4.bar
 -------------------------------------------------------------------------------
 
-<<<
-size: 12949
-location: clients/tests/test-client.py:1045:test_004()/176
-cmd: $NMCLI --pretty --color yes dev show
-lang: pl_PL.UTF-8
-returncode: 0
-stdout: 12787 bytes
->>>
 ===============================================================================
                         Informacje o urządzeniu (eth0)
 ===============================================================================
@@ -11054,22 +11247,85 @@ IP6.DNS[1]:                             2001:a::2934:bd66:550d:ec19
 IP6.DOMAIN[1]:                          sear6.fo.x.y
 -------------------------------------------------------------------------------
 
+<<<
+size: 25545
+location: clients/tests/test-client.py:1062:test_004()/177
+cmd: $NMCLI --pretty --color yes -f all dev show
+lang: C
+returncode: 0
+stdout: 25386 bytes
+>>>
 ===============================================================================
-                        Informacje o urządzeniu (wlan0)
+                            Device details (wlan0)
 ===============================================================================
 GENERAL.DEVICE:                         wlan0
--------------------------------------------------------------------------------
 GENERAL.TYPE:                           wifi
--------------------------------------------------------------------------------
+GENERAL.NM-TYPE:                        NMDeviceWifi
+GENERAL.VENDOR:                         --
+GENERAL.PRODUCT:                        --
+GENERAL.DRIVER:                         virtual
+GENERAL.DRIVER-VERSION:                 --
+GENERAL.FIRMWARE-VERSION:               --
 GENERAL.HWADDR:                         13:E0:74:85:7C:D9
--------------------------------------------------------------------------------
 GENERAL.MTU:                            0
+GENERAL.STATE:                          20 (unavailable)
+GENERAL.REASON:                         0 (No reason given)
+GENERAL.IP4-CONNECTIVITY:               0 (unknown)
+GENERAL.IP6-CONNECTIVITY:               0 (unknown)
+GENERAL.UDI:                            /sys/devices/virtual/wlan0
+GENERAL.IP-IFACE:                       --
+GENERAL.IS-SOFTWARE:                    no
+GENERAL.NM-MANAGED:                     yes
+GENERAL.AUTOCONNECT:                    yes
+GENERAL.FIRMWARE-MISSING:               no
+GENERAL.NM-PLUGIN-MISSING:              no
+GENERAL.PHYS-PORT-ID:                   --
+GENERAL.CONNECTION:                     con-vpn-1
+GENERAL.CON-UUID:                       UUID-con-vpn-1-REPLACED-REPLACED-REP
+GENERAL.CON-PATH:                       /org/freedesktop/NetworkManager/ActiveConnection/2
+GENERAL.METERED:                        unknown
 -------------------------------------------------------------------------------
-GENERAL.STATE:                          20 (niedostępne)
+CAPABILITIES.CARRIER-DETECT:            no
+CAPABILITIES.SPEED:                     unknown
+CAPABILITIES.IS-SOFTWARE:               no
+CAPABILITIES.SRIOV:                     no
 -------------------------------------------------------------------------------
-GENERAL.CONNECTION:                     con-vpn-1
+WIFI-PROPERTIES.WEP:                    yes
+WIFI-PROPERTIES.WPA:                    yes
+WIFI-PROPERTIES.WPA2:                   yes
+WIFI-PROPERTIES.TKIP:                   yes
+WIFI-PROPERTIES.CCMP:                   yes
+WIFI-PROPERTIES.AP:                     yes
+WIFI-PROPERTIES.ADHOC:                  yes
+WIFI-PROPERTIES.2GHZ:                   unknown
+WIFI-PROPERTIES.5GHZ:                   unknown
 -------------------------------------------------------------------------------
-GENERAL.CON-PATH:                       /org/freedesktop/NetworkManager/ActiveConnection/2
+AP[1].IN-USE:                            
+AP[1].SSID:                             wlan0-ap-2
+AP[1].MODE:                             Infra
+AP[1].CHAN:                             1
+AP[1].RATE:                             54 Mbit/s
+AP[1].SIGNAL:                           92
+AP[1].BARS:                             ****
+AP[1].SECURITY:                         WPA1 WPA2
+-------------------------------------------------------------------------------
+AP[2].IN-USE:                            
+AP[2].SSID:                             wlan0-ap-1
+AP[2].MODE:                             Infra
+AP[2].CHAN:                             1
+AP[2].RATE:                             54 Mbit/s
+AP[2].SIGNAL:                           81
+AP[2].BARS:                             ****
+AP[2].SECURITY:                         WPA1
+-------------------------------------------------------------------------------
+AP[3].IN-USE:                            
+AP[3].SSID:                             wlan0-ap-3
+AP[3].MODE:                             Infra
+AP[3].CHAN:                             1
+AP[3].RATE:                             54 Mbit/s
+AP[3].SIGNAL:                           55
+AP[3].BARS:                             **  
+AP[3].SECURITY:                         WPA3
 -------------------------------------------------------------------------------
 IP4.ADDRESS[1]:                         192.168.228.18/32
 IP4.ADDRESS[2]:                         192.168.209.179/25
@@ -11081,6 +11337,11 @@ IP4.DOMAIN[4]:                          sear4.foo4.bar
 IP4.DOMAIN[5]:                          sear4.fo.o.bar
 IP4.WINS[1]:                            192.168.120.79
 -------------------------------------------------------------------------------
+DHCP4.OPTION[1]:                        dhcp-4-opt-0 = val-0
+DHCP4.OPTION[2]:                        dhcp-4-opt-2 = val-2
+DHCP4.OPTION[3]:                        dhcp-4-opt-4 = val-4
+DHCP4.OPTION[4]:                        dhcp-4-opt-7 = val-7
+-------------------------------------------------------------------------------
 IP6.GATEWAY:                            --
 IP6.ROUTE[1]:                           dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086
 IP6.DOMAIN[1]:                          sear6.foo2.bar
@@ -11090,15 +11351,16 @@ IP6.DOMAIN[4]:                          sear6.fo.o.bar
 IP6.DOMAIN[5]:                          sear6.foo3.bar
 IP6.DOMAIN[6]:                          sear6.foo4.bar
 -------------------------------------------------------------------------------
+DHCP6.OPTION[1]:                        dhcp-6-opt-1 = val-1
+DHCP6.OPTION[2]:                        dhcp-6-opt-2 = val-2
+DHCP6.OPTION[3]:                        dhcp-6-opt-3 = val-3
+DHCP6.OPTION[4]:                        dhcp-6-opt-4 = val-4
+DHCP6.OPTION[5]:                        dhcp-6-opt-5 = val-5
+-------------------------------------------------------------------------------
+CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings/Connection/{2}
+CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
+-------------------------------------------------------------------------------
 
-<<<
-size: 25035
-location: clients/tests/test-client.py:1048:test_004()/177
-cmd: $NMCLI --pretty --color yes -f all dev show
-lang: C
-returncode: 0
-stdout: 24876 bytes
->>>
 ===============================================================================
                              Device details (eth0)
 ===============================================================================
@@ -11114,6 +11376,8 @@ GENERAL.HWADDR:                         AB:B7:BF:E2:48:E8
 GENERAL.MTU:                            0
 GENERAL.STATE:                          20 (unavailable)
 GENERAL.REASON:                         0 (No reason given)
+GENERAL.IP4-CONNECTIVITY:               0 (unknown)
+GENERAL.IP6-CONNECTIVITY:               0 (unknown)
 GENERAL.UDI:                            /sys/devices/virtual/eth0
 GENERAL.IP-IFACE:                       --
 GENERAL.IS-SOFTWARE:                    no
@@ -11186,6 +11450,8 @@ GENERAL.HWADDR:                         E7:78:B1:93:2B:22
 GENERAL.MTU:                            0
 GENERAL.STATE:                          20 (unavailable)
 GENERAL.REASON:                         0 (No reason given)
+GENERAL.IP4-CONNECTIVITY:               0 (unknown)
+GENERAL.IP6-CONNECTIVITY:               0 (unknown)
 GENERAL.UDI:                            /sys/devices/virtual/eth1
 GENERAL.IP-IFACE:                       --
 GENERAL.IS-SOFTWARE:                    no
@@ -11265,6 +11531,8 @@ GENERAL.HWADDR:                         21:E9:64:81:8C:A8
 GENERAL.MTU:                            0
 GENERAL.STATE:                          20 (unavailable)
 GENERAL.REASON:                         0 (No reason given)
+GENERAL.IP4-CONNECTIVITY:               0 (unknown)
+GENERAL.IP6-CONNECTIVITY:               0 (unknown)
 GENERAL.UDI:                            /sys/devices/virtual/wlan1
 GENERAL.IP-IFACE:                       --
 GENERAL.IS-SOFTWARE:                    no
@@ -11363,6 +11631,8 @@ GENERAL.HWADDR:                         71:52:AD:63:5C:7C
 GENERAL.MTU:                            0
 GENERAL.STATE:                          20 (unavailable)
 GENERAL.REASON:                         0 (No reason given)
+GENERAL.IP4-CONNECTIVITY:               0 (unknown)
+GENERAL.IP6-CONNECTIVITY:               0 (unknown)
 GENERAL.UDI:                            /sys/devices/virtual/wlan1
 GENERAL.IP-IFACE:                       --
 GENERAL.IS-SOFTWARE:                    no
@@ -11425,8 +11695,16 @@ CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings
 CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 -------------------------------------------------------------------------------
 
+<<<
+size: 25728
+location: clients/tests/test-client.py:1062:test_004()/178
+cmd: $NMCLI --pretty --color yes -f all dev show
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 25559 bytes
+>>>
 ===============================================================================
-                            Device details (wlan0)
+                        Informacje o urządzeniu (wlan0)
 ===============================================================================
 GENERAL.DEVICE:                         wlan0
 GENERAL.TYPE:                           wifi
@@ -11438,62 +11716,64 @@ GENERAL.DRIVER-VERSION:                 --
 GENERAL.FIRMWARE-VERSION:               --
 GENERAL.HWADDR:                         13:E0:74:85:7C:D9
 GENERAL.MTU:                            0
-GENERAL.STATE:                          20 (unavailable)
-GENERAL.REASON:                         0 (No reason given)
+GENERAL.STATE:                          20 (niedostępne)
+GENERAL.REASON:                         0 (Nie podano przyczyny)
+GENERAL.IP4-CONNECTIVITY:               0 (nieznane)
+GENERAL.IP6-CONNECTIVITY:               0 (nieznane)
 GENERAL.UDI:                            /sys/devices/virtual/wlan0
 GENERAL.IP-IFACE:                       --
-GENERAL.IS-SOFTWARE:                    no
-GENERAL.NM-MANAGED:                     yes
-GENERAL.AUTOCONNECT:                    yes
-GENERAL.FIRMWARE-MISSING:               no
-GENERAL.NM-PLUGIN-MISSING:              no
+GENERAL.IS-SOFTWARE:                    nie
+GENERAL.NM-MANAGED:                     tak
+GENERAL.AUTOCONNECT:                    tak
+GENERAL.FIRMWARE-MISSING:               nie
+GENERAL.NM-PLUGIN-MISSING:              nie
 GENERAL.PHYS-PORT-ID:                   --
 GENERAL.CONNECTION:                     con-vpn-1
 GENERAL.CON-UUID:                       UUID-con-vpn-1-REPLACED-REPLACED-REP
 GENERAL.CON-PATH:                       /org/freedesktop/NetworkManager/ActiveConnection/2
-GENERAL.METERED:                        unknown
+GENERAL.METERED:                        nieznane
 -------------------------------------------------------------------------------
-CAPABILITIES.CARRIER-DETECT:            no
-CAPABILITIES.SPEED:                     unknown
-CAPABILITIES.IS-SOFTWARE:               no
-CAPABILITIES.SRIOV:                     no
+CAPABILITIES.CARRIER-DETECT:            nie
+CAPABILITIES.SPEED:                     nieznane
+CAPABILITIES.IS-SOFTWARE:               nie
+CAPABILITIES.SRIOV:                     nie
 -------------------------------------------------------------------------------
-WIFI-PROPERTIES.WEP:                    yes
-WIFI-PROPERTIES.WPA:                    yes
-WIFI-PROPERTIES.WPA2:                   yes
-WIFI-PROPERTIES.TKIP:                   yes
-WIFI-PROPERTIES.CCMP:                   yes
-WIFI-PROPERTIES.AP:                     yes
-WIFI-PROPERTIES.ADHOC:                  yes
-WIFI-PROPERTIES.2GHZ:                   unknown
-WIFI-PROPERTIES.5GHZ:                   unknown
+WIFI-PROPERTIES.WEP:                    tak
+WIFI-PROPERTIES.WPA:                    tak
+WIFI-PROPERTIES.WPA2:                   tak
+WIFI-PROPERTIES.TKIP:                   tak
+WIFI-PROPERTIES.CCMP:                   tak
+WIFI-PROPERTIES.AP:                     tak
+WIFI-PROPERTIES.ADHOC:                  tak
+WIFI-PROPERTIES.2GHZ:                   nieznane
+WIFI-PROPERTIES.5GHZ:                   nieznane
 -------------------------------------------------------------------------------
 AP[1].IN-USE:                            
 AP[1].SSID:                             wlan0-ap-2
-AP[1].MODE:                             Infra
+AP[1].MODE:                             Infrastruktura
 AP[1].CHAN:                             1
-AP[1].RATE:                             54 Mbit/s
+AP[1].RATE:                             54 Mb/s
 AP[1].SIGNAL:                           92
 AP[1].BARS:                             ****
 AP[1].SECURITY:                         WPA1 WPA2
 -------------------------------------------------------------------------------
 AP[2].IN-USE:                            
 AP[2].SSID:                             wlan0-ap-1
-AP[2].MODE:                             Infra
+AP[2].MODE:                             Infrastruktura
 AP[2].CHAN:                             1
-AP[2].RATE:                             54 Mbit/s
+AP[2].RATE:                             54 Mb/s
 AP[2].SIGNAL:                           81
 AP[2].BARS:                             ****
-AP[2].SECURITY:                         WPA1 WPA2
+AP[2].SECURITY:                         WPA1
 -------------------------------------------------------------------------------
 AP[3].IN-USE:                            
 AP[3].SSID:                             wlan0-ap-3
-AP[3].MODE:                             Infra
+AP[3].MODE:                             Infrastruktura
 AP[3].CHAN:                             1
-AP[3].RATE:                             54 Mbit/s
+AP[3].RATE:                             54 Mb/s
 AP[3].SIGNAL:                           55
 AP[3].BARS:                             **  
-AP[3].SECURITY:                         WPA1 WPA2
+AP[3].SECURITY:                         WPA3
 -------------------------------------------------------------------------------
 IP4.ADDRESS[1]:                         192.168.228.18/32
 IP4.ADDRESS[2]:                         192.168.209.179/25
@@ -11529,14 +11809,6 @@ CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings
 CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 -------------------------------------------------------------------------------
 
-<<<
-size: 25208
-location: clients/tests/test-client.py:1048:test_004()/178
-cmd: $NMCLI --pretty --color yes -f all dev show
-lang: pl_PL.UTF-8
-returncode: 0
-stdout: 25039 bytes
->>>
 ===============================================================================
                         Informacje o urządzeniu (eth0)
 ===============================================================================
@@ -11552,6 +11824,8 @@ GENERAL.HWADDR:                         AB:B7:BF:E2:48:E8
 GENERAL.MTU:                            0
 GENERAL.STATE:                          20 (niedostępne)
 GENERAL.REASON:                         0 (Nie podano przyczyny)
+GENERAL.IP4-CONNECTIVITY:               0 (nieznane)
+GENERAL.IP6-CONNECTIVITY:               0 (nieznane)
 GENERAL.UDI:                            /sys/devices/virtual/eth0
 GENERAL.IP-IFACE:                       --
 GENERAL.IS-SOFTWARE:                    nie
@@ -11624,6 +11898,8 @@ GENERAL.HWADDR:                         E7:78:B1:93:2B:22
 GENERAL.MTU:                            0
 GENERAL.STATE:                          20 (niedostępne)
 GENERAL.REASON:                         0 (Nie podano przyczyny)
+GENERAL.IP4-CONNECTIVITY:               0 (nieznane)
+GENERAL.IP6-CONNECTIVITY:               0 (nieznane)
 GENERAL.UDI:                            /sys/devices/virtual/eth1
 GENERAL.IP-IFACE:                       --
 GENERAL.IS-SOFTWARE:                    nie
@@ -11703,6 +11979,8 @@ GENERAL.HWADDR:                         21:E9:64:81:8C:A8
 GENERAL.MTU:                            0
 GENERAL.STATE:                          20 (niedostępne)
 GENERAL.REASON:                         0 (Nie podano przyczyny)
+GENERAL.IP4-CONNECTIVITY:               0 (nieznane)
+GENERAL.IP6-CONNECTIVITY:               0 (nieznane)
 GENERAL.UDI:                            /sys/devices/virtual/wlan1
 GENERAL.IP-IFACE:                       --
 GENERAL.IS-SOFTWARE:                    nie
@@ -11801,6 +12079,8 @@ GENERAL.HWADDR:                         71:52:AD:63:5C:7C
 GENERAL.MTU:                            0
 GENERAL.STATE:                          20 (niedostępne)
 GENERAL.REASON:                         0 (Nie podano przyczyny)
+GENERAL.IP4-CONNECTIVITY:               0 (nieznane)
+GENERAL.IP6-CONNECTIVITY:               0 (nieznane)
 GENERAL.UDI:                            /sys/devices/virtual/wlan1
 GENERAL.IP-IFACE:                       --
 GENERAL.IS-SOFTWARE:                    nie
@@ -11863,113 +12143,9 @@ CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings
 CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 -------------------------------------------------------------------------------
 
-===============================================================================
-                        Informacje o urządzeniu (wlan0)
-===============================================================================
-GENERAL.DEVICE:                         wlan0
-GENERAL.TYPE:                           wifi
-GENERAL.NM-TYPE:                        NMDeviceWifi
-GENERAL.VENDOR:                         --
-GENERAL.PRODUCT:                        --
-GENERAL.DRIVER:                         virtual
-GENERAL.DRIVER-VERSION:                 --
-GENERAL.FIRMWARE-VERSION:               --
-GENERAL.HWADDR:                         13:E0:74:85:7C:D9
-GENERAL.MTU:                            0
-GENERAL.STATE:                          20 (niedostępne)
-GENERAL.REASON:                         0 (Nie podano przyczyny)
-GENERAL.UDI:                            /sys/devices/virtual/wlan0
-GENERAL.IP-IFACE:                       --
-GENERAL.IS-SOFTWARE:                    nie
-GENERAL.NM-MANAGED:                     tak
-GENERAL.AUTOCONNECT:                    tak
-GENERAL.FIRMWARE-MISSING:               nie
-GENERAL.NM-PLUGIN-MISSING:              nie
-GENERAL.PHYS-PORT-ID:                   --
-GENERAL.CONNECTION:                     con-vpn-1
-GENERAL.CON-UUID:                       UUID-con-vpn-1-REPLACED-REPLACED-REP
-GENERAL.CON-PATH:                       /org/freedesktop/NetworkManager/ActiveConnection/2
-GENERAL.METERED:                        nieznane
--------------------------------------------------------------------------------
-CAPABILITIES.CARRIER-DETECT:            nie
-CAPABILITIES.SPEED:                     nieznane
-CAPABILITIES.IS-SOFTWARE:               nie
-CAPABILITIES.SRIOV:                     nie
--------------------------------------------------------------------------------
-WIFI-PROPERTIES.WEP:                    tak
-WIFI-PROPERTIES.WPA:                    tak
-WIFI-PROPERTIES.WPA2:                   tak
-WIFI-PROPERTIES.TKIP:                   tak
-WIFI-PROPERTIES.CCMP:                   tak
-WIFI-PROPERTIES.AP:                     tak
-WIFI-PROPERTIES.ADHOC:                  tak
-WIFI-PROPERTIES.2GHZ:                   nieznane
-WIFI-PROPERTIES.5GHZ:                   nieznane
--------------------------------------------------------------------------------
-AP[1].IN-USE:                            
-AP[1].SSID:                             wlan0-ap-2
-AP[1].MODE:                             Infrastruktura
-AP[1].CHAN:                             1
-AP[1].RATE:                             54 Mb/s
-AP[1].SIGNAL:                           92
-AP[1].BARS:                             ****
-AP[1].SECURITY:                         WPA1 WPA2
--------------------------------------------------------------------------------
-AP[2].IN-USE:                            
-AP[2].SSID:                             wlan0-ap-1
-AP[2].MODE:                             Infrastruktura
-AP[2].CHAN:                             1
-AP[2].RATE:                             54 Mb/s
-AP[2].SIGNAL:                           81
-AP[2].BARS:                             ****
-AP[2].SECURITY:                         WPA1 WPA2
--------------------------------------------------------------------------------
-AP[3].IN-USE:                            
-AP[3].SSID:                             wlan0-ap-3
-AP[3].MODE:                             Infrastruktura
-AP[3].CHAN:                             1
-AP[3].RATE:                             54 Mb/s
-AP[3].SIGNAL:                           55
-AP[3].BARS:                             **  
-AP[3].SECURITY:                         WPA1 WPA2
--------------------------------------------------------------------------------
-IP4.ADDRESS[1]:                         192.168.228.18/32
-IP4.ADDRESS[2]:                         192.168.209.179/25
-IP4.GATEWAY:                            192.168.41.120
-IP4.DOMAIN[1]:                          sear4.foo2.bar
-IP4.DOMAIN[2]:                          sear4.fo.x.y
-IP4.DOMAIN[3]:                          sear4.foo1.bar
-IP4.DOMAIN[4]:                          sear4.foo4.bar
-IP4.DOMAIN[5]:                          sear4.fo.o.bar
-IP4.WINS[1]:                            192.168.120.79
--------------------------------------------------------------------------------
-DHCP4.OPTION[1]:                        dhcp-4-opt-0 = val-0
-DHCP4.OPTION[2]:                        dhcp-4-opt-2 = val-2
-DHCP4.OPTION[3]:                        dhcp-4-opt-4 = val-4
-DHCP4.OPTION[4]:                        dhcp-4-opt-7 = val-7
--------------------------------------------------------------------------------
-IP6.GATEWAY:                            --
-IP6.ROUTE[1]:                           dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086
-IP6.DOMAIN[1]:                          sear6.foo2.bar
-IP6.DOMAIN[2]:                          sear6.foo1.bar
-IP6.DOMAIN[3]:                          sear6.fo.x.y
-IP6.DOMAIN[4]:                          sear6.fo.o.bar
-IP6.DOMAIN[5]:                          sear6.foo3.bar
-IP6.DOMAIN[6]:                          sear6.foo4.bar
--------------------------------------------------------------------------------
-DHCP6.OPTION[1]:                        dhcp-6-opt-1 = val-1
-DHCP6.OPTION[2]:                        dhcp-6-opt-2 = val-2
-DHCP6.OPTION[3]:                        dhcp-6-opt-3 = val-3
-DHCP6.OPTION[4]:                        dhcp-6-opt-4 = val-4
-DHCP6.OPTION[5]:                        dhcp-6-opt-5 = val-5
--------------------------------------------------------------------------------
-CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings/Connection/{2}
-CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
--------------------------------------------------------------------------------
-
 <<<
 size: 2451
-location: clients/tests/test-client.py:1051:test_004()/179
+location: clients/tests/test-client.py:1065:test_004()/179
 cmd: $NMCLI --pretty --color yes dev show wlan0
 lang: C
 returncode: 0
@@ -12014,7 +12190,7 @@ IP6.DOMAIN[6]:                          sear6.foo4.bar
 
 <<<
 size: 2469
-location: clients/tests/test-client.py:1051:test_004()/180
+location: clients/tests/test-client.py:1065:test_004()/180
 cmd: $NMCLI --pretty --color yes dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
@@ -12058,12 +12234,12 @@ IP6.DOMAIN[6]:                          sear6.foo4.bar
 -------------------------------------------------------------------------------
 
 <<<
-size: 6082
-location: clients/tests/test-client.py:1054:test_004()/181
+size: 6176
+location: clients/tests/test-client.py:1068:test_004()/181
 cmd: $NMCLI --pretty --color yes -f all dev show wlan0
 lang: C
 returncode: 0
-stdout: 5918 bytes
+stdout: 6012 bytes
 >>>
 ===============================================================================
                             Device details (wlan0)
@@ -12080,6 +12256,8 @@ GENERAL.HWADDR:                         13:E0:74:85:7C:D9
 GENERAL.MTU:                            0
 GENERAL.STATE:                          20 (unavailable)
 GENERAL.REASON:                         0 (No reason given)
+GENERAL.IP4-CONNECTIVITY:               0 (unknown)
+GENERAL.IP6-CONNECTIVITY:               0 (unknown)
 GENERAL.UDI:                            /sys/devices/virtual/wlan0
 GENERAL.IP-IFACE:                       --
 GENERAL.IS-SOFTWARE:                    no
@@ -12124,7 +12302,7 @@ AP[2].CHAN:                             1
 AP[2].RATE:                             54 Mbit/s
 AP[2].SIGNAL:                           81
 AP[2].BARS:                             ****
-AP[2].SECURITY:                         WPA1 WPA2
+AP[2].SECURITY:                         WPA1
 -------------------------------------------------------------------------------
 AP[3].IN-USE:                            
 AP[3].SSID:                             wlan0-ap-3
@@ -12133,7 +12311,7 @@ AP[3].CHAN:                             1
 AP[3].RATE:                             54 Mbit/s
 AP[3].SIGNAL:                           55
 AP[3].BARS:                             **  
-AP[3].SECURITY:                         WPA1 WPA2
+AP[3].SECURITY:                         WPA3
 -------------------------------------------------------------------------------
 IP4.ADDRESS[1]:                         192.168.228.18/32
 IP4.ADDRESS[2]:                         192.168.209.179/25
@@ -12170,12 +12348,12 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | c
 -------------------------------------------------------------------------------
 
 <<<
-size: 6142
-location: clients/tests/test-client.py:1054:test_004()/182
+size: 6238
+location: clients/tests/test-client.py:1068:test_004()/182
 cmd: $NMCLI --pretty --color yes -f all dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 5968 bytes
+stdout: 6064 bytes
 >>>
 ===============================================================================
                         Informacje o urządzeniu (wlan0)
@@ -12192,6 +12370,8 @@ GENERAL.HWADDR:                         13:E0:74:85:7C:D9
 GENERAL.MTU:                            0
 GENERAL.STATE:                          20 (niedostępne)
 GENERAL.REASON:                         0 (Nie podano przyczyny)
+GENERAL.IP4-CONNECTIVITY:               0 (nieznane)
+GENERAL.IP6-CONNECTIVITY:               0 (nieznane)
 GENERAL.UDI:                            /sys/devices/virtual/wlan0
 GENERAL.IP-IFACE:                       --
 GENERAL.IS-SOFTWARE:                    nie
@@ -12236,7 +12416,7 @@ AP[2].CHAN:                             1
 AP[2].RATE:                             54 Mb/s
 AP[2].SIGNAL:                           81
 AP[2].BARS:                             ****
-AP[2].SECURITY:                         WPA1 WPA2
+AP[2].SECURITY:                         WPA1
 -------------------------------------------------------------------------------
 AP[3].IN-USE:                            
 AP[3].SSID:                             wlan0-ap-3
@@ -12245,7 +12425,7 @@ AP[3].CHAN:                             1
 AP[3].RATE:                             54 Mb/s
 AP[3].SIGNAL:                           55
 AP[3].BARS:                             **  
-AP[3].SECURITY:                         WPA1 WPA2
+AP[3].SECURITY:                         WPA3
 -------------------------------------------------------------------------------
 IP4.ADDRESS[1]:                         192.168.228.18/32
 IP4.ADDRESS[2]:                         192.168.209.179/25
@@ -12282,12 +12462,12 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | c
 -------------------------------------------------------------------------------
 
 <<<
-size: 2329
-location: clients/tests/test-client.py:1057:test_004()/183
+size: 2433
+location: clients/tests/test-client.py:1071:test_004()/183
 cmd: $NMCLI --pretty --color yes -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: C
 returncode: 0
-stdout: 2130 bytes
+stdout: 2234 bytes
 >>>
 ===============================================================================
                             Device details (wlan0)
@@ -12304,6 +12484,8 @@ GENERAL.HWADDR:                         13:E0:74:85:7C:D9
 GENERAL.MTU:                            0
 GENERAL.STATE:                          20 (unavailable)
 GENERAL.REASON:                         0 (No reason given)
+GENERAL.IP4-CONNECTIVITY:               0 (unknown)
+GENERAL.IP6-CONNECTIVITY:               0 (unknown)
 GENERAL.UDI:                            /sys/devices/virtual/wlan0
 GENERAL.IP-IFACE:                       --
 GENERAL.IS-SOFTWARE:                    no
@@ -12331,12 +12513,12 @@ WIFI-PROPERTIES.5GHZ:                   unknown
 -------------------------------------------------------------------------------
 
 <<<
-size: 2358
-location: clients/tests/test-client.py:1057:test_004()/184
+size: 2464
+location: clients/tests/test-client.py:1071:test_004()/184
 cmd: $NMCLI --pretty --color yes -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2149 bytes
+stdout: 2255 bytes
 >>>
 ===============================================================================
                         Informacje o urządzeniu (wlan0)
@@ -12353,6 +12535,8 @@ GENERAL.HWADDR:                         13:E0:74:85:7C:D9
 GENERAL.MTU:                            0
 GENERAL.STATE:                          20 (niedostępne)
 GENERAL.REASON:                         0 (Nie podano przyczyny)
+GENERAL.IP4-CONNECTIVITY:               0 (nieznane)
+GENERAL.IP6-CONNECTIVITY:               0 (nieznane)
 GENERAL.UDI:                            /sys/devices/virtual/wlan0
 GENERAL.IP-IFACE:                       --
 GENERAL.IS-SOFTWARE:                    nie
@@ -12380,12 +12564,12 @@ WIFI-PROPERTIES.5GHZ:                   nieznane
 -------------------------------------------------------------------------------
 
 <<<
-size: 2329
-location: clients/tests/test-client.py:1060:test_004()/185
+size: 2433
+location: clients/tests/test-client.py:1074:test_004()/185
 cmd: $NMCLI --pretty --color yes -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: C
 returncode: 0
-stdout: 2130 bytes
+stdout: 2234 bytes
 >>>
 ===============================================================================
                             Device details (wlan0)
@@ -12402,6 +12586,8 @@ GENERAL.HWADDR:                         13:E0:74:85:7C:D9
 GENERAL.MTU:                            0
 GENERAL.STATE:                          20 (unavailable)
 GENERAL.REASON:                         0 (No reason given)
+GENERAL.IP4-CONNECTIVITY:               0 (unknown)
+GENERAL.IP6-CONNECTIVITY:               0 (unknown)
 GENERAL.UDI:                            /sys/devices/virtual/wlan0
 GENERAL.IP-IFACE:                       --
 GENERAL.IS-SOFTWARE:                    no
@@ -12429,12 +12615,12 @@ WIFI-PROPERTIES.5GHZ:                   unknown
 -------------------------------------------------------------------------------
 
 <<<
-size: 2358
-location: clients/tests/test-client.py:1060:test_004()/186
+size: 2464
+location: clients/tests/test-client.py:1074:test_004()/186
 cmd: $NMCLI --pretty --color yes -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2149 bytes
+stdout: 2255 bytes
 >>>
 ===============================================================================
                         Informacje o urządzeniu (wlan0)
@@ -12451,6 +12637,8 @@ GENERAL.HWADDR:                         13:E0:74:85:7C:D9
 GENERAL.MTU:                            0
 GENERAL.STATE:                          20 (niedostępne)
 GENERAL.REASON:                         0 (Nie podano przyczyny)
+GENERAL.IP4-CONNECTIVITY:               0 (nieznane)
+GENERAL.IP6-CONNECTIVITY:               0 (nieznane)
 GENERAL.UDI:                            /sys/devices/virtual/wlan0
 GENERAL.IP-IFACE:                       --
 GENERAL.IS-SOFTWARE:                    nie
@@ -12479,7 +12667,7 @@ WIFI-PROPERTIES.5GHZ:                   nieznane
 
 <<<
 size: 803
-location: clients/tests/test-client.py:1063:test_004()/187
+location: clients/tests/test-client.py:1077:test_004()/187
 cmd: $NMCLI --pretty --color yes -f DEVICE,TYPE,DBUS-PATH dev
 lang: C
 returncode: 0
@@ -12490,15 +12678,15 @@ stdout: 633 bytes
 =====================
 DEVICE  TYPE      DBUS-PATH                                 
 ----------------------------------------------------------------------------------
+wlan0   wifi      /org/freedesktop/NetworkManager/Devices/3 
 eth0    ethernet  /org/freedesktop/NetworkManager/Devices/1 
 eth1    ethernet  /org/freedesktop/NetworkManager/Devices/2 
 wlan1   wifi      /org/freedesktop/NetworkManager/Devices/4 
 wlan1   wifi      /org/freedesktop/NetworkManager/Devices/5 
-wlan0   wifi      /org/freedesktop/NetworkManager/Devices/3 
 
 <<<
 size: 806
-location: clients/tests/test-client.py:1063:test_004()/188
+location: clients/tests/test-client.py:1077:test_004()/188
 cmd: $NMCLI --pretty --color yes -f DEVICE,TYPE,DBUS-PATH dev
 lang: pl_PL.UTF-8
 returncode: 0
@@ -12509,20 +12697,29 @@ stdout: 626 bytes
 ===================
 DEVICE  TYPE      DBUS-PATH                                 
 --------------------------------------------------------------------------------
+wlan0   wifi      /org/freedesktop/NetworkManager/Devices/3 
 eth0    ethernet  /org/freedesktop/NetworkManager/Devices/1 
 eth1    ethernet  /org/freedesktop/NetworkManager/Devices/2 
 wlan1   wifi      /org/freedesktop/NetworkManager/Devices/4 
 wlan1   wifi      /org/freedesktop/NetworkManager/Devices/5 
-wlan0   wifi      /org/freedesktop/NetworkManager/Devices/3 
 
 <<<
 size: 3650
-location: clients/tests/test-client.py:1066:test_004()/189
+location: clients/tests/test-client.py:1080:test_004()/189
 cmd: $NMCLI --pretty --color yes -f ALL device wifi list
 lang: C
 returncode: 0
 stdout: 3484 bytes
 >>>
+===========================
+  Wi-Fi scan list (wlan0)
+===========================
+NAME   SSID        SSID-HEX              BSSID              MODE   CHAN  FREQ      RATE       SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infra  1     2412 MHz  54 Mbit/s  92      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/2 
+AP[2]  wlan0-ap-1  776C616E302D61702D31  61:95:77:AC:1E:4C  Infra  1     2412 MHz  54 Mbit/s  81      ****  WPA1       pair_tkip pair_ccmp group_tkip group_ccmp psk  (none)                                         wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/1 
+AP[3]  wlan0-ap-3  776C616E302D61702D33  9B:F6:B7:EC:97:76  Infra  1     2412 MHz  54 Mbit/s  55      **    WPA3       (none)                                         pair_tkip pair_ccmp group_tkip group_ccmp sae  wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/3 
+
 ===========================
   Wi-Fi scan list (wlan1)
 ===========================
@@ -12536,23 +12733,23 @@ NAME   SSID        SSID-HEX              BSSID              MODE   CHAN  FREQ
 NAME  SSID  SSID-HEX  BSSID  MODE  CHAN  FREQ  RATE  SIGNAL  BARS  SECURITY  WPA-FLAGS  RSN-FLAGS  DEVICE  ACTIVE  IN-USE  DBUS-PATH 
 -----------------------------------------------------------------------------------------------------------------------------------------------------------------
 
-===========================
-  Wi-Fi scan list (wlan0)
-===========================
-NAME   SSID        SSID-HEX              BSSID              MODE   CHAN  FREQ      RATE       SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infra  1     2412 MHz  54 Mbit/s  92      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/2 
-AP[2]  wlan0-ap-1  776C616E302D61702D31  61:95:77:AC:1E:4C  Infra  1     2412 MHz  54 Mbit/s  81      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/1 
-AP[3]  wlan0-ap-3  776C616E302D61702D33  9B:F6:B7:EC:97:76  Infra  1     2412 MHz  54 Mbit/s  55      **    WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/3 
-
 <<<
 size: 3888
-location: clients/tests/test-client.py:1066:test_004()/190
+location: clients/tests/test-client.py:1080:test_004()/190
 cmd: $NMCLI --pretty --color yes -f ALL device wifi list
 lang: pl_PL.UTF-8
 returncode: 0
 stdout: 3712 bytes
 >>>
+========================================
+  Lista skanowania sieci Wi-Fi (wlan0)
+========================================
+NAME   SSID        SSID-HEX              BSSID              MODE            CHAN  FREQ      RATE     SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infrastruktura  1     2412 MHz  54 Mb/s  92      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/2 
+AP[2]  wlan0-ap-1  776C616E302D61702D31  61:95:77:AC:1E:4C  Infrastruktura  1     2412 MHz  54 Mb/s  81      ****  WPA1       pair_tkip pair_ccmp group_tkip group_ccmp psk  (brak)                                         wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/1 
+AP[3]  wlan0-ap-3  776C616E302D61702D33  9B:F6:B7:EC:97:76  Infrastruktura  1     2412 MHz  54 Mb/s  55      **    WPA3       (brak)                                         pair_tkip pair_ccmp group_tkip group_ccmp sae  wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/3 
+
 ========================================
   Lista skanowania sieci Wi-Fi (wlan1)
 ========================================
@@ -12566,23 +12763,23 @@ NAME   SSID        SSID-HEX              BSSID              MODE            CHAN
 NAME  SSID  SSID-HEX  BSSID  MODE  CHAN  FREQ  RATE  SIGNAL  BARS  SECURITY  WPA-FLAGS  RSN-FLAGS  DEVICE  ACTIVE  IN-USE  DBUS-PATH 
 ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 
-========================================
-  Lista skanowania sieci Wi-Fi (wlan0)
-========================================
-NAME   SSID        SSID-HEX              BSSID              MODE            CHAN  FREQ      RATE     SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infrastruktura  1     2412 MHz  54 Mb/s  92      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/2 
-AP[2]  wlan0-ap-1  776C616E302D61702D31  61:95:77:AC:1E:4C  Infrastruktura  1     2412 MHz  54 Mb/s  81      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/1 
-AP[3]  wlan0-ap-3  776C616E302D61702D33  9B:F6:B7:EC:97:76  Infrastruktura  1     2412 MHz  54 Mb/s  55      **    WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/3 
-
 <<<
 size: 1453
-location: clients/tests/test-client.py:1068:test_004()/191
+location: clients/tests/test-client.py:1082:test_004()/191
 cmd: $NMCLI --pretty --color yes -f COMMON device wifi list
 lang: C
 returncode: 0
 stdout: 1284 bytes
 >>>
+===========================
+  Wi-Fi scan list (wlan0)
+===========================
+IN-USE  SSID        MODE   CHAN  RATE       SIGNAL  BARS  SECURITY  
+------------------------------------------------------------------------------------------------
+        wlan0-ap-2  Infra  1     54 Mbit/s  92      ****  WPA1 WPA2 
+        wlan0-ap-1  Infra  1     54 Mbit/s  81      ****  WPA1      
+        wlan0-ap-3  Infra  1     54 Mbit/s  55      **    WPA3      
+
 ===========================
   Wi-Fi scan list (wlan1)
 ===========================
@@ -12596,23 +12793,23 @@ IN-USE  SSID        MODE   CHAN  RATE       SIGNAL  BARS  SECURITY
 IN-USE  SSID  MODE  CHAN  RATE  SIGNAL  BARS  SECURITY 
 -----------------------------------------------------------------------------------
 
-===========================
-  Wi-Fi scan list (wlan0)
-===========================
-IN-USE  SSID        MODE   CHAN  RATE       SIGNAL  BARS  SECURITY  
-------------------------------------------------------------------------------------------------
-        wlan0-ap-2  Infra  1     54 Mbit/s  92      ****  WPA1 WPA2 
-        wlan0-ap-1  Infra  1     54 Mbit/s  81      ****  WPA1 WPA2 
-        wlan0-ap-3  Infra  1     54 Mbit/s  55      **    WPA1 WPA2 
-
 <<<
 size: 1683
-location: clients/tests/test-client.py:1068:test_004()/192
+location: clients/tests/test-client.py:1082:test_004()/192
 cmd: $NMCLI --pretty --color yes -f COMMON device wifi list
 lang: pl_PL.UTF-8
 returncode: 0
 stdout: 1504 bytes
 >>>
+========================================
+  Lista skanowania sieci Wi-Fi (wlan0)
+========================================
+IN-USE  SSID        MODE            CHAN  RATE     SIGNAL  BARS  SECURITY  
+--------------------------------------------------------------------------------------------------------------------
+        wlan0-ap-2  Infrastruktura  1     54 Mb/s  92      ****  WPA1 WPA2 
+        wlan0-ap-1  Infrastruktura  1     54 Mb/s  81      ****  WPA1      
+        wlan0-ap-3  Infrastruktura  1     54 Mb/s  55      **    WPA3      
+
 ========================================
   Lista skanowania sieci Wi-Fi (wlan1)
 ========================================
@@ -12626,23 +12823,23 @@ IN-USE  SSID        MODE            CHAN  RATE     SIGNAL  BARS  SECURITY
 IN-USE  SSID  MODE  CHAN  RATE  SIGNAL  BARS  SECURITY 
 ------------------------------------------------------------------------------------------------
 
-========================================
-  Lista skanowania sieci Wi-Fi (wlan0)
-========================================
-IN-USE  SSID        MODE            CHAN  RATE     SIGNAL  BARS  SECURITY  
---------------------------------------------------------------------------------------------------------------------
-        wlan0-ap-2  Infrastruktura  1     54 Mb/s  92      ****  WPA1 WPA2 
-        wlan0-ap-1  Infrastruktura  1     54 Mb/s  81      ****  WPA1 WPA2 
-        wlan0-ap-3  Infrastruktura  1     54 Mb/s  55      **    WPA1 WPA2 
-
 <<<
 size: 3763
-location: clients/tests/test-client.py:1071:test_004()/193
+location: clients/tests/test-client.py:1085:test_004()/193
 cmd: $NMCLI --pretty --color yes -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list
 lang: C
 returncode: 0
 stdout: 3484 bytes
 >>>
+===========================
+  Wi-Fi scan list (wlan0)
+===========================
+NAME   SSID        SSID-HEX              BSSID              MODE   CHAN  FREQ      RATE       SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infra  1     2412 MHz  54 Mbit/s  92      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/2 
+AP[2]  wlan0-ap-1  776C616E302D61702D31  61:95:77:AC:1E:4C  Infra  1     2412 MHz  54 Mbit/s  81      ****  WPA1       pair_tkip pair_ccmp group_tkip group_ccmp psk  (none)                                         wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/1 
+AP[3]  wlan0-ap-3  776C616E302D61702D33  9B:F6:B7:EC:97:76  Infra  1     2412 MHz  54 Mbit/s  55      **    WPA3       (none)                                         pair_tkip pair_ccmp group_tkip group_ccmp sae  wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/3 
+
 ===========================
   Wi-Fi scan list (wlan1)
 ===========================
@@ -12656,23 +12853,23 @@ NAME   SSID        SSID-HEX              BSSID              MODE   CHAN  FREQ
 NAME  SSID  SSID-HEX  BSSID  MODE  CHAN  FREQ  RATE  SIGNAL  BARS  SECURITY  WPA-FLAGS  RSN-FLAGS  DEVICE  ACTIVE  IN-USE  DBUS-PATH 
 -----------------------------------------------------------------------------------------------------------------------------------------------------------------
 
-===========================
-  Wi-Fi scan list (wlan0)
-===========================
-NAME   SSID        SSID-HEX              BSSID              MODE   CHAN  FREQ      RATE       SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infra  1     2412 MHz  54 Mbit/s  92      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/2 
-AP[2]  wlan0-ap-1  776C616E302D61702D31  61:95:77:AC:1E:4C  Infra  1     2412 MHz  54 Mbit/s  81      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/1 
-AP[3]  wlan0-ap-3  776C616E302D61702D33  9B:F6:B7:EC:97:76  Infra  1     2412 MHz  54 Mbit/s  55      **    WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/3 
-
 <<<
 size: 4001
-location: clients/tests/test-client.py:1071:test_004()/194
+location: clients/tests/test-client.py:1085:test_004()/194
 cmd: $NMCLI --pretty --color yes -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list
 lang: pl_PL.UTF-8
 returncode: 0
 stdout: 3712 bytes
 >>>
+========================================
+  Lista skanowania sieci Wi-Fi (wlan0)
+========================================
+NAME   SSID        SSID-HEX              BSSID              MODE            CHAN  FREQ      RATE     SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infrastruktura  1     2412 MHz  54 Mb/s  92      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/2 
+AP[2]  wlan0-ap-1  776C616E302D61702D31  61:95:77:AC:1E:4C  Infrastruktura  1     2412 MHz  54 Mb/s  81      ****  WPA1       pair_tkip pair_ccmp group_tkip group_ccmp psk  (brak)                                         wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/1 
+AP[3]  wlan0-ap-3  776C616E302D61702D33  9B:F6:B7:EC:97:76  Infrastruktura  1     2412 MHz  54 Mb/s  55      **    WPA3       (brak)                                         pair_tkip pair_ccmp group_tkip group_ccmp sae  wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/3 
+
 ========================================
   Lista skanowania sieci Wi-Fi (wlan1)
 ========================================
@@ -12686,22 +12883,13 @@ NAME   SSID        SSID-HEX              BSSID              MODE            CHAN
 NAME  SSID  SSID-HEX  BSSID  MODE  CHAN  FREQ  RATE  SIGNAL  BARS  SECURITY  WPA-FLAGS  RSN-FLAGS  DEVICE  ACTIVE  IN-USE  DBUS-PATH 
 ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 
-========================================
-  Lista skanowania sieci Wi-Fi (wlan0)
-========================================
-NAME   SSID        SSID-HEX              BSSID              MODE            CHAN  FREQ      RATE     SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infrastruktura  1     2412 MHz  54 Mb/s  92      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/2 
-AP[2]  wlan0-ap-1  776C616E302D61702D31  61:95:77:AC:1E:4C  Infrastruktura  1     2412 MHz  54 Mb/s  81      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/1 
-AP[3]  wlan0-ap-3  776C616E302D61702D33  9B:F6:B7:EC:97:76  Infrastruktura  1     2412 MHz  54 Mb/s  55      **    WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/3 
-
 <<<
-size: 1305
-location: clients/tests/test-client.py:1073:test_004()/195
+size: 1307
+location: clients/tests/test-client.py:1087:test_004()/195
 cmd: $NMCLI --pretty --color yes -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: C
 returncode: 0
-stdout: 1115 bytes
+stdout: 1117 bytes
 >>>
 ===========================
   Wi-Fi scan list (wlan0)
@@ -12710,13 +12898,15 @@ NAME   SSID        SSID-HEX              BSSID              MODE   CHAN  FREQ
 -----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infra  1     2412 MHz  54 Mbit/s  92      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/2 
 
+
+
 <<<
-size: 1392
-location: clients/tests/test-client.py:1073:test_004()/196
+size: 1394
+location: clients/tests/test-client.py:1087:test_004()/196
 cmd: $NMCLI --pretty --color yes -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 1192 bytes
+stdout: 1194 bytes
 >>>
 ========================================
   Lista skanowania sieci Wi-Fi (wlan0)
@@ -12725,13 +12915,15 @@ NAME   SSID        SSID-HEX              BSSID              MODE            CHAN
 -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infrastruktura  1     2412 MHz  54 Mb/s  92      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/2 
 
+
+
 <<<
-size: 581
-location: clients/tests/test-client.py:1075:test_004()/197
+size: 583
+location: clients/tests/test-client.py:1089:test_004()/197
 cmd: $NMCLI --pretty --color yes -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: C
 returncode: 0
-stdout: 389 bytes
+stdout: 391 bytes
 >>>
 ===========================
   Wi-Fi scan list (wlan0)
@@ -12740,13 +12932,15 @@ IN-USE  SSID        MODE   CHAN  RATE       SIGNAL  BARS  SECURITY
 ------------------------------------------------------------------------------------------------
         wlan0-ap-2  Infra  1     54 Mbit/s  92      ****  WPA1 WPA2 
 
+
+
 <<<
-size: 666
-location: clients/tests/test-client.py:1075:test_004()/198
+size: 668
+location: clients/tests/test-client.py:1089:test_004()/198
 cmd: $NMCLI --pretty --color yes -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 464 bytes
+stdout: 466 bytes
 >>>
 ========================================
   Lista skanowania sieci Wi-Fi (wlan0)
@@ -12755,13 +12949,15 @@ IN-USE  SSID        MODE            CHAN  RATE     SIGNAL  BARS  SECURITY
 --------------------------------------------------------------------------------------------------------------------
         wlan0-ap-2  Infrastruktura  1     54 Mb/s  92      ****  WPA1 WPA2 
 
+
+
 <<<
-size: 1418
-location: clients/tests/test-client.py:1078:test_004()/199
+size: 1420
+location: clients/tests/test-client.py:1092:test_004()/199
 cmd: $NMCLI --pretty --color yes -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: C
 returncode: 0
-stdout: 1115 bytes
+stdout: 1117 bytes
 >>>
 ===========================
   Wi-Fi scan list (wlan0)
@@ -12770,13 +12966,15 @@ NAME   SSID        SSID-HEX              BSSID              MODE   CHAN  FREQ
 -----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infra  1     2412 MHz  54 Mbit/s  92      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/2 
 
+
+
 <<<
-size: 1505
-location: clients/tests/test-client.py:1078:test_004()/200
+size: 1507
+location: clients/tests/test-client.py:1092:test_004()/200
 cmd: $NMCLI --pretty --color yes -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 1192 bytes
+stdout: 1194 bytes
 >>>
 ========================================
   Lista skanowania sieci Wi-Fi (wlan0)
@@ -12785,13 +12983,15 @@ NAME   SSID        SSID-HEX              BSSID              MODE            CHAN
 -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infrastruktura  1     2412 MHz  54 Mb/s  92      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/2 
 
+
+
 <<<
-size: 6085
-location: clients/tests/test-client.py:1080:test_004()/201
+size: 6179
+location: clients/tests/test-client.py:1094:test_004()/201
 cmd: $NMCLI --pretty --color yes -f ALL device show wlan0
 lang: C
 returncode: 0
-stdout: 5918 bytes
+stdout: 6012 bytes
 >>>
 ===============================================================================
                             Device details (wlan0)
@@ -12808,6 +13008,8 @@ GENERAL.HWADDR:                         13:E0:74:85:7C:D9
 GENERAL.MTU:                            0
 GENERAL.STATE:                          20 (unavailable)
 GENERAL.REASON:                         0 (No reason given)
+GENERAL.IP4-CONNECTIVITY:               0 (unknown)
+GENERAL.IP6-CONNECTIVITY:               0 (unknown)
 GENERAL.UDI:                            /sys/devices/virtual/wlan0
 GENERAL.IP-IFACE:                       --
 GENERAL.IS-SOFTWARE:                    no
@@ -12852,7 +13054,7 @@ AP[2].CHAN:                             1
 AP[2].RATE:                             54 Mbit/s
 AP[2].SIGNAL:                           81
 AP[2].BARS:                             ****
-AP[2].SECURITY:                         WPA1 WPA2
+AP[2].SECURITY:                         WPA1
 -------------------------------------------------------------------------------
 AP[3].IN-USE:                            
 AP[3].SSID:                             wlan0-ap-3
@@ -12861,7 +13063,7 @@ AP[3].CHAN:                             1
 AP[3].RATE:                             54 Mbit/s
 AP[3].SIGNAL:                           55
 AP[3].BARS:                             **  
-AP[3].SECURITY:                         WPA1 WPA2
+AP[3].SECURITY:                         WPA3
 -------------------------------------------------------------------------------
 IP4.ADDRESS[1]:                         192.168.228.18/32
 IP4.ADDRESS[2]:                         192.168.209.179/25
@@ -12898,12 +13100,12 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | c
 -------------------------------------------------------------------------------
 
 <<<
-size: 6145
-location: clients/tests/test-client.py:1080:test_004()/202
+size: 6241
+location: clients/tests/test-client.py:1094:test_004()/202
 cmd: $NMCLI --pretty --color yes -f ALL device show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 5968 bytes
+stdout: 6064 bytes
 >>>
 ===============================================================================
                         Informacje o urządzeniu (wlan0)
@@ -12920,6 +13122,8 @@ GENERAL.HWADDR:                         13:E0:74:85:7C:D9
 GENERAL.MTU:                            0
 GENERAL.STATE:                          20 (niedostępne)
 GENERAL.REASON:                         0 (Nie podano przyczyny)
+GENERAL.IP4-CONNECTIVITY:               0 (nieznane)
+GENERAL.IP6-CONNECTIVITY:               0 (nieznane)
 GENERAL.UDI:                            /sys/devices/virtual/wlan0
 GENERAL.IP-IFACE:                       --
 GENERAL.IS-SOFTWARE:                    nie
@@ -12964,7 +13168,7 @@ AP[2].CHAN:                             1
 AP[2].RATE:                             54 Mb/s
 AP[2].SIGNAL:                           81
 AP[2].BARS:                             ****
-AP[2].SECURITY:                         WPA1 WPA2
+AP[2].SECURITY:                         WPA1
 -------------------------------------------------------------------------------
 AP[3].IN-USE:                            
 AP[3].SSID:                             wlan0-ap-3
@@ -12973,7 +13177,7 @@ AP[3].CHAN:                             1
 AP[3].RATE:                             54 Mb/s
 AP[3].SIGNAL:                           55
 AP[3].BARS:                             **  
-AP[3].SECURITY:                         WPA1 WPA2
+AP[3].SECURITY:                         WPA3
 -------------------------------------------------------------------------------
 IP4.ADDRESS[1]:                         192.168.228.18/32
 IP4.ADDRESS[2]:                         192.168.209.179/25
@@ -13011,7 +13215,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | c
 
 <<<
 size: 2464
-location: clients/tests/test-client.py:1082:test_004()/203
+location: clients/tests/test-client.py:1096:test_004()/203
 cmd: $NMCLI --pretty --color yes -f COMMON device show wlan0
 lang: C
 returncode: 0
@@ -13056,7 +13260,7 @@ IP6.DOMAIN[6]:                          sear6.foo4.bar
 
 <<<
 size: 2482
-location: clients/tests/test-client.py:1082:test_004()/204
+location: clients/tests/test-client.py:1096:test_004()/204
 cmd: $NMCLI --pretty --color yes -f COMMON device show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
@@ -13100,12 +13304,12 @@ IP6.DOMAIN[6]:                          sear6.foo4.bar
 -------------------------------------------------------------------------------
 
 <<<
-size: 6223
-location: clients/tests/test-client.py:1084:test_004()/205
+size: 6317
+location: clients/tests/test-client.py:1098:test_004()/205
 cmd: $NMCLI --pretty --color yes -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0
 lang: C
 returncode: 0
-stdout: 5918 bytes
+stdout: 6012 bytes
 >>>
 ===============================================================================
                             Device details (wlan0)
@@ -13122,6 +13326,8 @@ GENERAL.HWADDR:                         13:E0:74:85:7C:D9
 GENERAL.MTU:                            0
 GENERAL.STATE:                          20 (unavailable)
 GENERAL.REASON:                         0 (No reason given)
+GENERAL.IP4-CONNECTIVITY:               0 (unknown)
+GENERAL.IP6-CONNECTIVITY:               0 (unknown)
 GENERAL.UDI:                            /sys/devices/virtual/wlan0
 GENERAL.IP-IFACE:                       --
 GENERAL.IS-SOFTWARE:                    no
@@ -13166,7 +13372,7 @@ AP[2].CHAN:                             1
 AP[2].RATE:                             54 Mbit/s
 AP[2].SIGNAL:                           81
 AP[2].BARS:                             ****
-AP[2].SECURITY:                         WPA1 WPA2
+AP[2].SECURITY:                         WPA1
 -------------------------------------------------------------------------------
 AP[3].IN-USE:                            
 AP[3].SSID:                             wlan0-ap-3
@@ -13175,7 +13381,7 @@ AP[3].CHAN:                             1
 AP[3].RATE:                             54 Mbit/s
 AP[3].SIGNAL:                           55
 AP[3].BARS:                             **  
-AP[3].SECURITY:                         WPA1 WPA2
+AP[3].SECURITY:                         WPA3
 -------------------------------------------------------------------------------
 IP4.ADDRESS[1]:                         192.168.228.18/32
 IP4.ADDRESS[2]:                         192.168.209.179/25
@@ -13212,12 +13418,12 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | c
 -------------------------------------------------------------------------------
 
 <<<
-size: 6283
-location: clients/tests/test-client.py:1084:test_004()/206
+size: 6379
+location: clients/tests/test-client.py:1098:test_004()/206
 cmd: $NMCLI --pretty --color yes -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 5968 bytes
+stdout: 6064 bytes
 >>>
 ===============================================================================
                         Informacje o urządzeniu (wlan0)
@@ -13234,6 +13440,8 @@ GENERAL.HWADDR:                         13:E0:74:85:7C:D9
 GENERAL.MTU:                            0
 GENERAL.STATE:                          20 (niedostępne)
 GENERAL.REASON:                         0 (Nie podano przyczyny)
+GENERAL.IP4-CONNECTIVITY:               0 (nieznane)
+GENERAL.IP6-CONNECTIVITY:               0 (nieznane)
 GENERAL.UDI:                            /sys/devices/virtual/wlan0
 GENERAL.IP-IFACE:                       --
 GENERAL.IS-SOFTWARE:                    nie
@@ -13278,7 +13486,7 @@ AP[2].CHAN:                             1
 AP[2].RATE:                             54 Mb/s
 AP[2].SIGNAL:                           81
 AP[2].BARS:                             ****
-AP[2].SECURITY:                         WPA1 WPA2
+AP[2].SECURITY:                         WPA1
 -------------------------------------------------------------------------------
 AP[3].IN-USE:                            
 AP[3].SSID:                             wlan0-ap-3
@@ -13287,7 +13495,7 @@ AP[3].CHAN:                             1
 AP[3].RATE:                             54 Mb/s
 AP[3].SIGNAL:                           55
 AP[3].BARS:                             **  
-AP[3].SECURITY:                         WPA1 WPA2
+AP[3].SECURITY:                         WPA3
 -------------------------------------------------------------------------------
 IP4.ADDRESS[1]:                         192.168.228.18/32
 IP4.ADDRESS[2]:                         192.168.209.179/25
@@ -13325,7 +13533,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | c
 
 <<<
 size: 2323
-location: clients/tests/test-client.py:1022:test_004()/207
+location: clients/tests/test-client.py:1036:test_004()/207
 cmd: $NMCLI --terse con s con-vpn-1
 lang: C
 returncode: 0
@@ -13427,7 +13635,7 @@ VPN.CFG[3]:key3 = val3
 
 <<<
 size: 2333
-location: clients/tests/test-client.py:1022:test_004()/208
+location: clients/tests/test-client.py:1036:test_004()/208
 cmd: $NMCLI --terse con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
@@ -13529,7 +13737,7 @@ VPN.CFG[3]:key3 = val3
 
 <<<
 size: 2323
-location: clients/tests/test-client.py:1024:test_004()/209
+location: clients/tests/test-client.py:1038:test_004()/209
 cmd: $NMCLI --terse con s con-vpn-1
 lang: C
 returncode: 0
@@ -13631,7 +13839,7 @@ VPN.CFG[3]:key3 = val3
 
 <<<
 size: 2333
-location: clients/tests/test-client.py:1024:test_004()/210
+location: clients/tests/test-client.py:1038:test_004()/210
 cmd: $NMCLI --terse con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
@@ -13733,7 +13941,7 @@ VPN.CFG[3]:key3 = val3
 
 <<<
 size: 1771
-location: clients/tests/test-client.py:1027:test_004()/211
+location: clients/tests/test-client.py:1041:test_004()/211
 cmd: $NMCLI --terse -f ALL con s con-vpn-1
 lang: C
 returncode: 0
@@ -13815,7 +14023,7 @@ proxy.pac-script:
 
 <<<
 size: 1781
-location: clients/tests/test-client.py:1027:test_004()/212
+location: clients/tests/test-client.py:1041:test_004()/212
 cmd: $NMCLI --terse -f ALL con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
@@ -13897,7 +14105,7 @@ proxy.pac-script:
 
 <<<
 size: 322
-location: clients/tests/test-client.py:1033:test_004()/213
+location: clients/tests/test-client.py:1047:test_004()/213
 cmd: $NMCLI --terse -f VPN con s con-vpn-1
 lang: C
 returncode: 0
@@ -13912,7 +14120,7 @@ vpn.timeout:0
 
 <<<
 size: 332
-location: clients/tests/test-client.py:1033:test_004()/214
+location: clients/tests/test-client.py:1047:test_004()/214
 cmd: $NMCLI --terse -f VPN con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
@@ -13927,7 +14135,7 @@ vpn.timeout:0
 
 <<<
 size: 525
-location: clients/tests/test-client.py:1036:test_004()/215
+location: clients/tests/test-client.py:1050:test_004()/215
 cmd: $NMCLI --terse -f GENERAL con s con-vpn-1
 lang: C
 returncode: 0
@@ -13948,7 +14156,7 @@ GENERAL.MASTER-PATH:
 
 <<<
 size: 535
-location: clients/tests/test-client.py:1036:test_004()/216
+location: clients/tests/test-client.py:1050:test_004()/216
 cmd: $NMCLI --terse -f GENERAL con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
@@ -13969,68 +14177,93 @@ GENERAL.MASTER-PATH:
 
 <<<
 size: 269
-location: clients/tests/test-client.py:1039:test_004()/217
+location: clients/tests/test-client.py:1053:test_004()/217
 cmd: $NMCLI --terse dev s
 lang: C
 returncode: 0
 stdout: 135 bytes
 >>>
+wlan0:wifi:unavailable:con-vpn-1
 eth0:ethernet:unavailable:
 eth1:ethernet:unavailable:
 wlan1:wifi:unavailable:
 wlan1:wifi:unavailable:
-wlan0:wifi:unavailable:con-vpn-1
 
 <<<
 size: 279
-location: clients/tests/test-client.py:1039:test_004()/218
+location: clients/tests/test-client.py:1053:test_004()/218
 cmd: $NMCLI --terse dev s
 lang: pl_PL.UTF-8
 returncode: 0
 stdout: 135 bytes
 >>>
+wlan0:wifi:unavailable:con-vpn-1
 eth0:ethernet:unavailable:
 eth1:ethernet:unavailable:
 wlan1:wifi:unavailable:
 wlan1:wifi:unavailable:
-wlan0:wifi:unavailable:con-vpn-1
 
 <<<
-size: 587
-location: clients/tests/test-client.py:1042:test_004()/219
+size: 667
+location: clients/tests/test-client.py:1056:test_004()/219
 cmd: $NMCLI --terse -f all dev status
 lang: C
 returncode: 0
-stdout: 441 bytes
+stdout: 521 bytes
 >>>
-eth0:ethernet:unavailable:/org/freedesktop/NetworkManager/Devices/1:::
-eth1:ethernet:unavailable:/org/freedesktop/NetworkManager/Devices/2:::
-wlan1:wifi:unavailable:/org/freedesktop/NetworkManager/Devices/4:::
-wlan1:wifi:unavailable:/org/freedesktop/NetworkManager/Devices/5:::
-wlan0:wifi:unavailable:/org/freedesktop/NetworkManager/Devices/3:con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:/org/freedesktop/NetworkManager/ActiveConnection/2
+wlan0:wifi:unavailable:unknown:unknown:/org/freedesktop/NetworkManager/Devices/3:con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:/org/freedesktop/NetworkManager/ActiveConnection/2
+eth0:ethernet:unavailable:unknown:unknown:/org/freedesktop/NetworkManager/Devices/1:::
+eth1:ethernet:unavailable:unknown:unknown:/org/freedesktop/NetworkManager/Devices/2:::
+wlan1:wifi:unavailable:unknown:unknown:/org/freedesktop/NetworkManager/Devices/4:::
+wlan1:wifi:unavailable:unknown:unknown:/org/freedesktop/NetworkManager/Devices/5:::
 
 <<<
-size: 597
-location: clients/tests/test-client.py:1042:test_004()/220
+size: 677
+location: clients/tests/test-client.py:1056:test_004()/220
 cmd: $NMCLI --terse -f all dev status
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 441 bytes
+stdout: 521 bytes
 >>>
-eth0:ethernet:unavailable:/org/freedesktop/NetworkManager/Devices/1:::
-eth1:ethernet:unavailable:/org/freedesktop/NetworkManager/Devices/2:::
-wlan1:wifi:unavailable:/org/freedesktop/NetworkManager/Devices/4:::
-wlan1:wifi:unavailable:/org/freedesktop/NetworkManager/Devices/5:::
-wlan0:wifi:unavailable:/org/freedesktop/NetworkManager/Devices/3:con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:/org/freedesktop/NetworkManager/ActiveConnection/2
+wlan0:wifi:unavailable:unknown:unknown:/org/freedesktop/NetworkManager/Devices/3:con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:/org/freedesktop/NetworkManager/ActiveConnection/2
+eth0:ethernet:unavailable:unknown:unknown:/org/freedesktop/NetworkManager/Devices/1:::
+eth1:ethernet:unavailable:unknown:unknown:/org/freedesktop/NetworkManager/Devices/2:::
+wlan1:wifi:unavailable:unknown:unknown:/org/freedesktop/NetworkManager/Devices/4:::
+wlan1:wifi:unavailable:unknown:unknown:/org/freedesktop/NetworkManager/Devices/5:::
 
 <<<
 size: 4540
-location: clients/tests/test-client.py:1045:test_004()/221
+location: clients/tests/test-client.py:1059:test_004()/221
 cmd: $NMCLI --terse dev show
 lang: C
 returncode: 0
 stdout: 4402 bytes
 >>>
+GENERAL.DEVICE:wlan0
+GENERAL.TYPE:wifi
+GENERAL.HWADDR:13:E0:74:85:7C:D9
+GENERAL.MTU:0
+GENERAL.STATE:20 (unavailable)
+GENERAL.CONNECTION:con-vpn-1
+GENERAL.CON-PATH:/org/freedesktop/NetworkManager/ActiveConnection/2
+IP4.ADDRESS[1]:192.168.228.18/32
+IP4.ADDRESS[2]:192.168.209.179/25
+IP4.GATEWAY:192.168.41.120
+IP4.DOMAIN[1]:sear4.foo2.bar
+IP4.DOMAIN[2]:sear4.fo.x.y
+IP4.DOMAIN[3]:sear4.foo1.bar
+IP4.DOMAIN[4]:sear4.foo4.bar
+IP4.DOMAIN[5]:sear4.fo.o.bar
+IP4.WINS[1]:192.168.120.79
+IP6.GATEWAY:
+IP6.ROUTE[1]:dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086
+IP6.DOMAIN[1]:sear6.foo2.bar
+IP6.DOMAIN[2]:sear6.foo1.bar
+IP6.DOMAIN[3]:sear6.fo.x.y
+IP6.DOMAIN[4]:sear6.fo.o.bar
+IP6.DOMAIN[5]:sear6.foo3.bar
+IP6.DOMAIN[6]:sear6.foo4.bar
+
 GENERAL.DEVICE:eth0
 GENERAL.TYPE:ethernet
 GENERAL.HWADDR:AB:B7:BF:E2:48:E8
@@ -14144,6 +14377,14 @@ IP6.ROUTE[3]:dst = 2001:a::afb7:4449:3787:8bb4/123, nh = ::
 IP6.DNS[1]:2001:a::2934:bd66:550d:ec19
 IP6.DOMAIN[1]:sear6.fo.x.y
 
+<<<
+size: 4550
+location: clients/tests/test-client.py:1059:test_004()/222
+cmd: $NMCLI --terse dev show
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 4402 bytes
+>>>
 GENERAL.DEVICE:wlan0
 GENERAL.TYPE:wifi
 GENERAL.HWADDR:13:E0:74:85:7C:D9
@@ -14169,14 +14410,6 @@ IP6.DOMAIN[4]:sear6.fo.o.bar
 IP6.DOMAIN[5]:sear6.foo3.bar
 IP6.DOMAIN[6]:sear6.foo4.bar
 
-<<<
-size: 4550
-location: clients/tests/test-client.py:1045:test_004()/222
-cmd: $NMCLI --terse dev show
-lang: pl_PL.UTF-8
-returncode: 0
-stdout: 4402 bytes
->>>
 GENERAL.DEVICE:eth0
 GENERAL.TYPE:ethernet
 GENERAL.HWADDR:AB:B7:BF:E2:48:E8
@@ -14290,13 +14523,77 @@ IP6.ROUTE[3]:dst = 2001:a::afb7:4449:3787:8bb4/123, nh = ::
 IP6.DNS[1]:2001:a::2934:bd66:550d:ec19
 IP6.DOMAIN[1]:sear6.fo.x.y
 
+<<<
+size: 11927
+location: clients/tests/test-client.py:1062:test_004()/223
+cmd: $NMCLI --terse -f all dev show
+lang: C
+returncode: 0
+stdout: 11781 bytes
+>>>
 GENERAL.DEVICE:wlan0
 GENERAL.TYPE:wifi
+GENERAL.NM-TYPE:NMDeviceWifi
+GENERAL.VENDOR:
+GENERAL.PRODUCT:
+GENERAL.DRIVER:virtual
+GENERAL.DRIVER-VERSION:
+GENERAL.FIRMWARE-VERSION:
 GENERAL.HWADDR:13:E0:74:85:7C:D9
 GENERAL.MTU:0
 GENERAL.STATE:20 (unavailable)
+GENERAL.REASON:0 (No reason given)
+GENERAL.IP4-CONNECTIVITY:0 (unknown)
+GENERAL.IP6-CONNECTIVITY:0 (unknown)
+GENERAL.UDI:/sys/devices/virtual/wlan0
+GENERAL.IP-IFACE:
+GENERAL.IS-SOFTWARE:no
+GENERAL.NM-MANAGED:yes
+GENERAL.AUTOCONNECT:yes
+GENERAL.FIRMWARE-MISSING:no
+GENERAL.NM-PLUGIN-MISSING:no
+GENERAL.PHYS-PORT-ID:
 GENERAL.CONNECTION:con-vpn-1
+GENERAL.CON-UUID:UUID-con-vpn-1-REPLACED-REPLACED-REP
 GENERAL.CON-PATH:/org/freedesktop/NetworkManager/ActiveConnection/2
+GENERAL.METERED:unknown
+CAPABILITIES.CARRIER-DETECT:no
+CAPABILITIES.SPEED:unknown
+CAPABILITIES.IS-SOFTWARE:no
+CAPABILITIES.SRIOV:no
+WIFI-PROPERTIES.WEP:yes
+WIFI-PROPERTIES.WPA:yes
+WIFI-PROPERTIES.WPA2:yes
+WIFI-PROPERTIES.TKIP:yes
+WIFI-PROPERTIES.CCMP:yes
+WIFI-PROPERTIES.AP:yes
+WIFI-PROPERTIES.ADHOC:yes
+WIFI-PROPERTIES.2GHZ:unknown
+WIFI-PROPERTIES.5GHZ:unknown
+AP[1].IN-USE: 
+AP[1].SSID:wlan0-ap-2
+AP[1].MODE:Infra
+AP[1].CHAN:1
+AP[1].RATE:54 Mbit/s
+AP[1].SIGNAL:92
+AP[1].BARS:****
+AP[1].SECURITY:WPA1 WPA2
+AP[2].IN-USE: 
+AP[2].SSID:wlan0-ap-1
+AP[2].MODE:Infra
+AP[2].CHAN:1
+AP[2].RATE:54 Mbit/s
+AP[2].SIGNAL:81
+AP[2].BARS:****
+AP[2].SECURITY:WPA1
+AP[3].IN-USE: 
+AP[3].SSID:wlan0-ap-3
+AP[3].MODE:Infra
+AP[3].CHAN:1
+AP[3].RATE:54 Mbit/s
+AP[3].SIGNAL:55
+AP[3].BARS:**  
+AP[3].SECURITY:WPA3
 IP4.ADDRESS[1]:192.168.228.18/32
 IP4.ADDRESS[2]:192.168.209.179/25
 IP4.GATEWAY:192.168.41.120
@@ -14306,6 +14603,10 @@ IP4.DOMAIN[3]:sear4.foo1.bar
 IP4.DOMAIN[4]:sear4.foo4.bar
 IP4.DOMAIN[5]:sear4.fo.o.bar
 IP4.WINS[1]:192.168.120.79
+DHCP4.OPTION[1]:dhcp-4-opt-0 = val-0
+DHCP4.OPTION[2]:dhcp-4-opt-2 = val-2
+DHCP4.OPTION[3]:dhcp-4-opt-4 = val-4
+DHCP4.OPTION[4]:dhcp-4-opt-7 = val-7
 IP6.GATEWAY:
 IP6.ROUTE[1]:dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086
 IP6.DOMAIN[1]:sear6.foo2.bar
@@ -14314,15 +14615,14 @@ IP6.DOMAIN[3]:sear6.fo.x.y
 IP6.DOMAIN[4]:sear6.fo.o.bar
 IP6.DOMAIN[5]:sear6.foo3.bar
 IP6.DOMAIN[6]:sear6.foo4.bar
+DHCP6.OPTION[1]:dhcp-6-opt-1 = val-1
+DHCP6.OPTION[2]:dhcp-6-opt-2 = val-2
+DHCP6.OPTION[3]:dhcp-6-opt-3 = val-3
+DHCP6.OPTION[4]:dhcp-6-opt-4 = val-4
+DHCP6.OPTION[5]:dhcp-6-opt-5 = val-5
+CONNECTIONS.AVAILABLE-CONNECTION-PATHS:/org/freedesktop/NetworkManager/Settings/Connection/{2}
+CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 
-<<<
-size: 11567
-location: clients/tests/test-client.py:1048:test_004()/223
-cmd: $NMCLI --terse -f all dev show
-lang: C
-returncode: 0
-stdout: 11421 bytes
->>>
 GENERAL.DEVICE:eth0
 GENERAL.TYPE:ethernet
 GENERAL.NM-TYPE:NMDeviceEthernet
@@ -14335,6 +14635,8 @@ GENERAL.HWADDR:AB:B7:BF:E2:48:E8
 GENERAL.MTU:0
 GENERAL.STATE:20 (unavailable)
 GENERAL.REASON:0 (No reason given)
+GENERAL.IP4-CONNECTIVITY:0 (unknown)
+GENERAL.IP6-CONNECTIVITY:0 (unknown)
 GENERAL.UDI:/sys/devices/virtual/eth0
 GENERAL.IP-IFACE:
 GENERAL.IS-SOFTWARE:no
@@ -14396,6 +14698,8 @@ GENERAL.HWADDR:E7:78:B1:93:2B:22
 GENERAL.MTU:0
 GENERAL.STATE:20 (unavailable)
 GENERAL.REASON:0 (No reason given)
+GENERAL.IP4-CONNECTIVITY:0 (unknown)
+GENERAL.IP6-CONNECTIVITY:0 (unknown)
 GENERAL.UDI:/sys/devices/virtual/eth1
 GENERAL.IP-IFACE:
 GENERAL.IS-SOFTWARE:no
@@ -14464,6 +14768,8 @@ GENERAL.HWADDR:21:E9:64:81:8C:A8
 GENERAL.MTU:0
 GENERAL.STATE:20 (unavailable)
 GENERAL.REASON:0 (No reason given)
+GENERAL.IP4-CONNECTIVITY:0 (unknown)
+GENERAL.IP6-CONNECTIVITY:0 (unknown)
 GENERAL.UDI:/sys/devices/virtual/wlan1
 GENERAL.IP-IFACE:
 GENERAL.IS-SOFTWARE:no
@@ -14550,6 +14856,8 @@ GENERAL.HWADDR:71:52:AD:63:5C:7C
 GENERAL.MTU:0
 GENERAL.STATE:20 (unavailable)
 GENERAL.REASON:0 (No reason given)
+GENERAL.IP4-CONNECTIVITY:0 (unknown)
+GENERAL.IP6-CONNECTIVITY:0 (unknown)
 GENERAL.UDI:/sys/devices/virtual/wlan1
 GENERAL.IP-IFACE:
 GENERAL.IS-SOFTWARE:no
@@ -14604,6 +14912,14 @@ DHCP6.OPTION[5]:dhcp-6-opt-9 = val-9
 CONNECTIONS.AVAILABLE-CONNECTION-PATHS:/org/freedesktop/NetworkManager/Settings/Connection/{2}
 CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 
+<<<
+size: 11973
+location: clients/tests/test-client.py:1062:test_004()/224
+cmd: $NMCLI --terse -f all dev show
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 11817 bytes
+>>>
 GENERAL.DEVICE:wlan0
 GENERAL.TYPE:wifi
 GENERAL.NM-TYPE:NMDeviceWifi
@@ -14616,6 +14932,8 @@ GENERAL.HWADDR:13:E0:74:85:7C:D9
 GENERAL.MTU:0
 GENERAL.STATE:20 (unavailable)
 GENERAL.REASON:0 (No reason given)
+GENERAL.IP4-CONNECTIVITY:0 (unknown)
+GENERAL.IP6-CONNECTIVITY:0 (unknown)
 GENERAL.UDI:/sys/devices/virtual/wlan0
 GENERAL.IP-IFACE:
 GENERAL.IS-SOFTWARE:no
@@ -14643,28 +14961,28 @@ WIFI-PROPERTIES.2GHZ:unknown
 WIFI-PROPERTIES.5GHZ:unknown
 AP[1].IN-USE: 
 AP[1].SSID:wlan0-ap-2
-AP[1].MODE:Infra
+AP[1].MODE:Infrastruktura
 AP[1].CHAN:1
-AP[1].RATE:54 Mbit/s
+AP[1].RATE:54 Mb/s
 AP[1].SIGNAL:92
 AP[1].BARS:****
 AP[1].SECURITY:WPA1 WPA2
 AP[2].IN-USE: 
 AP[2].SSID:wlan0-ap-1
-AP[2].MODE:Infra
+AP[2].MODE:Infrastruktura
 AP[2].CHAN:1
-AP[2].RATE:54 Mbit/s
+AP[2].RATE:54 Mb/s
 AP[2].SIGNAL:81
 AP[2].BARS:****
-AP[2].SECURITY:WPA1 WPA2
+AP[2].SECURITY:WPA1
 AP[3].IN-USE: 
 AP[3].SSID:wlan0-ap-3
-AP[3].MODE:Infra
+AP[3].MODE:Infrastruktura
 AP[3].CHAN:1
-AP[3].RATE:54 Mbit/s
+AP[3].RATE:54 Mb/s
 AP[3].SIGNAL:55
 AP[3].BARS:**  
-AP[3].SECURITY:WPA1 WPA2
+AP[3].SECURITY:WPA3
 IP4.ADDRESS[1]:192.168.228.18/32
 IP4.ADDRESS[2]:192.168.209.179/25
 IP4.GATEWAY:192.168.41.120
@@ -14694,14 +15012,6 @@ DHCP6.OPTION[5]:dhcp-6-opt-5 = val-5
 CONNECTIONS.AVAILABLE-CONNECTION-PATHS:/org/freedesktop/NetworkManager/Settings/Connection/{2}
 CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 
-<<<
-size: 11613
-location: clients/tests/test-client.py:1048:test_004()/224
-cmd: $NMCLI --terse -f all dev show
-lang: pl_PL.UTF-8
-returncode: 0
-stdout: 11457 bytes
->>>
 GENERAL.DEVICE:eth0
 GENERAL.TYPE:ethernet
 GENERAL.NM-TYPE:NMDeviceEthernet
@@ -14714,6 +15024,8 @@ GENERAL.HWADDR:AB:B7:BF:E2:48:E8
 GENERAL.MTU:0
 GENERAL.STATE:20 (unavailable)
 GENERAL.REASON:0 (No reason given)
+GENERAL.IP4-CONNECTIVITY:0 (unknown)
+GENERAL.IP6-CONNECTIVITY:0 (unknown)
 GENERAL.UDI:/sys/devices/virtual/eth0
 GENERAL.IP-IFACE:
 GENERAL.IS-SOFTWARE:no
@@ -14775,6 +15087,8 @@ GENERAL.HWADDR:E7:78:B1:93:2B:22
 GENERAL.MTU:0
 GENERAL.STATE:20 (unavailable)
 GENERAL.REASON:0 (No reason given)
+GENERAL.IP4-CONNECTIVITY:0 (unknown)
+GENERAL.IP6-CONNECTIVITY:0 (unknown)
 GENERAL.UDI:/sys/devices/virtual/eth1
 GENERAL.IP-IFACE:
 GENERAL.IS-SOFTWARE:no
@@ -14843,6 +15157,8 @@ GENERAL.HWADDR:21:E9:64:81:8C:A8
 GENERAL.MTU:0
 GENERAL.STATE:20 (unavailable)
 GENERAL.REASON:0 (No reason given)
+GENERAL.IP4-CONNECTIVITY:0 (unknown)
+GENERAL.IP6-CONNECTIVITY:0 (unknown)
 GENERAL.UDI:/sys/devices/virtual/wlan1
 GENERAL.IP-IFACE:
 GENERAL.IS-SOFTWARE:no
@@ -14929,6 +15245,8 @@ GENERAL.HWADDR:71:52:AD:63:5C:7C
 GENERAL.MTU:0
 GENERAL.STATE:20 (unavailable)
 GENERAL.REASON:0 (No reason given)
+GENERAL.IP4-CONNECTIVITY:0 (unknown)
+GENERAL.IP6-CONNECTIVITY:0 (unknown)
 GENERAL.UDI:/sys/devices/virtual/wlan1
 GENERAL.IP-IFACE:
 GENERAL.IS-SOFTWARE:no
@@ -14983,99 +15301,9 @@ DHCP6.OPTION[5]:dhcp-6-opt-9 = val-9
 CONNECTIONS.AVAILABLE-CONNECTION-PATHS:/org/freedesktop/NetworkManager/Settings/Connection/{2}
 CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 
-GENERAL.DEVICE:wlan0
-GENERAL.TYPE:wifi
-GENERAL.NM-TYPE:NMDeviceWifi
-GENERAL.VENDOR:
-GENERAL.PRODUCT:
-GENERAL.DRIVER:virtual
-GENERAL.DRIVER-VERSION:
-GENERAL.FIRMWARE-VERSION:
-GENERAL.HWADDR:13:E0:74:85:7C:D9
-GENERAL.MTU:0
-GENERAL.STATE:20 (unavailable)
-GENERAL.REASON:0 (No reason given)
-GENERAL.UDI:/sys/devices/virtual/wlan0
-GENERAL.IP-IFACE:
-GENERAL.IS-SOFTWARE:no
-GENERAL.NM-MANAGED:yes
-GENERAL.AUTOCONNECT:yes
-GENERAL.FIRMWARE-MISSING:no
-GENERAL.NM-PLUGIN-MISSING:no
-GENERAL.PHYS-PORT-ID:
-GENERAL.CONNECTION:con-vpn-1
-GENERAL.CON-UUID:UUID-con-vpn-1-REPLACED-REPLACED-REP
-GENERAL.CON-PATH:/org/freedesktop/NetworkManager/ActiveConnection/2
-GENERAL.METERED:unknown
-CAPABILITIES.CARRIER-DETECT:no
-CAPABILITIES.SPEED:unknown
-CAPABILITIES.IS-SOFTWARE:no
-CAPABILITIES.SRIOV:no
-WIFI-PROPERTIES.WEP:yes
-WIFI-PROPERTIES.WPA:yes
-WIFI-PROPERTIES.WPA2:yes
-WIFI-PROPERTIES.TKIP:yes
-WIFI-PROPERTIES.CCMP:yes
-WIFI-PROPERTIES.AP:yes
-WIFI-PROPERTIES.ADHOC:yes
-WIFI-PROPERTIES.2GHZ:unknown
-WIFI-PROPERTIES.5GHZ:unknown
-AP[1].IN-USE: 
-AP[1].SSID:wlan0-ap-2
-AP[1].MODE:Infrastruktura
-AP[1].CHAN:1
-AP[1].RATE:54 Mb/s
-AP[1].SIGNAL:92
-AP[1].BARS:****
-AP[1].SECURITY:WPA1 WPA2
-AP[2].IN-USE: 
-AP[2].SSID:wlan0-ap-1
-AP[2].MODE:Infrastruktura
-AP[2].CHAN:1
-AP[2].RATE:54 Mb/s
-AP[2].SIGNAL:81
-AP[2].BARS:****
-AP[2].SECURITY:WPA1 WPA2
-AP[3].IN-USE: 
-AP[3].SSID:wlan0-ap-3
-AP[3].MODE:Infrastruktura
-AP[3].CHAN:1
-AP[3].RATE:54 Mb/s
-AP[3].SIGNAL:55
-AP[3].BARS:**  
-AP[3].SECURITY:WPA1 WPA2
-IP4.ADDRESS[1]:192.168.228.18/32
-IP4.ADDRESS[2]:192.168.209.179/25
-IP4.GATEWAY:192.168.41.120
-IP4.DOMAIN[1]:sear4.foo2.bar
-IP4.DOMAIN[2]:sear4.fo.x.y
-IP4.DOMAIN[3]:sear4.foo1.bar
-IP4.DOMAIN[4]:sear4.foo4.bar
-IP4.DOMAIN[5]:sear4.fo.o.bar
-IP4.WINS[1]:192.168.120.79
-DHCP4.OPTION[1]:dhcp-4-opt-0 = val-0
-DHCP4.OPTION[2]:dhcp-4-opt-2 = val-2
-DHCP4.OPTION[3]:dhcp-4-opt-4 = val-4
-DHCP4.OPTION[4]:dhcp-4-opt-7 = val-7
-IP6.GATEWAY:
-IP6.ROUTE[1]:dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086
-IP6.DOMAIN[1]:sear6.foo2.bar
-IP6.DOMAIN[2]:sear6.foo1.bar
-IP6.DOMAIN[3]:sear6.fo.x.y
-IP6.DOMAIN[4]:sear6.fo.o.bar
-IP6.DOMAIN[5]:sear6.foo3.bar
-IP6.DOMAIN[6]:sear6.foo4.bar
-DHCP6.OPTION[1]:dhcp-6-opt-1 = val-1
-DHCP6.OPTION[2]:dhcp-6-opt-2 = val-2
-DHCP6.OPTION[3]:dhcp-6-opt-3 = val-3
-DHCP6.OPTION[4]:dhcp-6-opt-4 = val-4
-DHCP6.OPTION[5]:dhcp-6-opt-5 = val-5
-CONNECTIONS.AVAILABLE-CONNECTION-PATHS:/org/freedesktop/NetworkManager/Settings/Connection/{2}
-CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
-
 <<<
 size: 882
-location: clients/tests/test-client.py:1051:test_004()/225
+location: clients/tests/test-client.py:1065:test_004()/225
 cmd: $NMCLI --terse dev show wlan0
 lang: C
 returncode: 0
@@ -15108,7 +15336,7 @@ IP6.DOMAIN[6]:sear6.foo4.bar
 
 <<<
 size: 892
-location: clients/tests/test-client.py:1051:test_004()/226
+location: clients/tests/test-client.py:1065:test_004()/226
 cmd: $NMCLI --terse dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
@@ -15140,12 +15368,12 @@ IP6.DOMAIN[5]:sear6.foo3.bar
 IP6.DOMAIN[6]:sear6.foo4.bar
 
 <<<
-size: 2629
-location: clients/tests/test-client.py:1054:test_004()/227
+size: 2693
+location: clients/tests/test-client.py:1068:test_004()/227
 cmd: $NMCLI --terse -f all dev show wlan0
 lang: C
 returncode: 0
-stdout: 2478 bytes
+stdout: 2542 bytes
 >>>
 GENERAL.DEVICE:wlan0
 GENERAL.TYPE:wifi
@@ -15159,6 +15387,8 @@ GENERAL.HWADDR:13:E0:74:85:7C:D9
 GENERAL.MTU:0
 GENERAL.STATE:20 (unavailable)
 GENERAL.REASON:0 (No reason given)
+GENERAL.IP4-CONNECTIVITY:0 (unknown)
+GENERAL.IP6-CONNECTIVITY:0 (unknown)
 GENERAL.UDI:/sys/devices/virtual/wlan0
 GENERAL.IP-IFACE:
 GENERAL.IS-SOFTWARE:no
@@ -15199,7 +15429,7 @@ AP[2].CHAN:1
 AP[2].RATE:54 Mbit/s
 AP[2].SIGNAL:81
 AP[2].BARS:****
-AP[2].SECURITY:WPA1 WPA2
+AP[2].SECURITY:WPA1
 AP[3].IN-USE: 
 AP[3].SSID:wlan0-ap-3
 AP[3].MODE:Infra
@@ -15207,7 +15437,7 @@ AP[3].CHAN:1
 AP[3].RATE:54 Mbit/s
 AP[3].SIGNAL:55
 AP[3].BARS:**  
-AP[3].SECURITY:WPA1 WPA2
+AP[3].SECURITY:WPA3
 IP4.ADDRESS[1]:192.168.228.18/32
 IP4.ADDRESS[2]:192.168.209.179/25
 IP4.GATEWAY:192.168.41.120
@@ -15238,12 +15468,12 @@ CONNECTIONS.AVAILABLE-CONNECTION-PATHS:/org/freedesktop/NetworkManager/Settings/
 CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 
 <<<
-size: 2666
-location: clients/tests/test-client.py:1054:test_004()/228
+size: 2730
+location: clients/tests/test-client.py:1068:test_004()/228
 cmd: $NMCLI --terse -f all dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2505 bytes
+stdout: 2569 bytes
 >>>
 GENERAL.DEVICE:wlan0
 GENERAL.TYPE:wifi
@@ -15257,6 +15487,8 @@ GENERAL.HWADDR:13:E0:74:85:7C:D9
 GENERAL.MTU:0
 GENERAL.STATE:20 (unavailable)
 GENERAL.REASON:0 (No reason given)
+GENERAL.IP4-CONNECTIVITY:0 (unknown)
+GENERAL.IP6-CONNECTIVITY:0 (unknown)
 GENERAL.UDI:/sys/devices/virtual/wlan0
 GENERAL.IP-IFACE:
 GENERAL.IS-SOFTWARE:no
@@ -15297,7 +15529,7 @@ AP[2].CHAN:1
 AP[2].RATE:54 Mb/s
 AP[2].SIGNAL:81
 AP[2].BARS:****
-AP[2].SECURITY:WPA1 WPA2
+AP[2].SECURITY:WPA1
 AP[3].IN-USE: 
 AP[3].SSID:wlan0-ap-3
 AP[3].MODE:Infrastruktura
@@ -15305,7 +15537,7 @@ AP[3].CHAN:1
 AP[3].RATE:54 Mb/s
 AP[3].SIGNAL:55
 AP[3].BARS:**  
-AP[3].SECURITY:WPA1 WPA2
+AP[3].SECURITY:WPA3
 IP4.ADDRESS[1]:192.168.228.18/32
 IP4.ADDRESS[2]:192.168.209.179/25
 IP4.GATEWAY:192.168.41.120
@@ -15336,12 +15568,12 @@ CONNECTIONS.AVAILABLE-CONNECTION-PATHS:/org/freedesktop/NetworkManager/Settings/
 CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 
 <<<
-size: 1116
-location: clients/tests/test-client.py:1057:test_004()/229
+size: 1191
+location: clients/tests/test-client.py:1071:test_004()/229
 cmd: $NMCLI --terse -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: C
 returncode: 0
-stdout: 931 bytes
+stdout: 1005 bytes
 >>>
 GENERAL.DEVICE:wlan0
 GENERAL.TYPE:wifi
@@ -15355,6 +15587,8 @@ GENERAL.HWADDR:13:E0:74:85:7C:D9
 GENERAL.MTU:0
 GENERAL.STATE:20 (unavailable)
 GENERAL.REASON:0 (No reason given)
+GENERAL.IP4-CONNECTIVITY:0 (unknown)
+GENERAL.IP6-CONNECTIVITY:0 (unknown)
 GENERAL.UDI:/sys/devices/virtual/wlan0
 GENERAL.IP-IFACE:
 GENERAL.IS-SOFTWARE:no
@@ -15379,12 +15613,12 @@ WIFI-PROPERTIES.2GHZ:unknown
 WIFI-PROPERTIES.5GHZ:unknown
 
 <<<
-size: 1126
-location: clients/tests/test-client.py:1057:test_004()/230
+size: 1201
+location: clients/tests/test-client.py:1071:test_004()/230
 cmd: $NMCLI --terse -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 931 bytes
+stdout: 1005 bytes
 >>>
 GENERAL.DEVICE:wlan0
 GENERAL.TYPE:wifi
@@ -15398,6 +15632,8 @@ GENERAL.HWADDR:13:E0:74:85:7C:D9
 GENERAL.MTU:0
 GENERAL.STATE:20 (unavailable)
 GENERAL.REASON:0 (No reason given)
+GENERAL.IP4-CONNECTIVITY:0 (unknown)
+GENERAL.IP6-CONNECTIVITY:0 (unknown)
 GENERAL.UDI:/sys/devices/virtual/wlan0
 GENERAL.IP-IFACE:
 GENERAL.IS-SOFTWARE:no
@@ -15422,12 +15658,12 @@ WIFI-PROPERTIES.2GHZ:unknown
 WIFI-PROPERTIES.5GHZ:unknown
 
 <<<
-size: 1116
-location: clients/tests/test-client.py:1060:test_004()/231
+size: 1191
+location: clients/tests/test-client.py:1074:test_004()/231
 cmd: $NMCLI --terse -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: C
 returncode: 0
-stdout: 931 bytes
+stdout: 1005 bytes
 >>>
 GENERAL.DEVICE:wlan0
 GENERAL.TYPE:wifi
@@ -15441,6 +15677,8 @@ GENERAL.HWADDR:13:E0:74:85:7C:D9
 GENERAL.MTU:0
 GENERAL.STATE:20 (unavailable)
 GENERAL.REASON:0 (No reason given)
+GENERAL.IP4-CONNECTIVITY:0 (unknown)
+GENERAL.IP6-CONNECTIVITY:0 (unknown)
 GENERAL.UDI:/sys/devices/virtual/wlan0
 GENERAL.IP-IFACE:
 GENERAL.IS-SOFTWARE:no
@@ -15465,12 +15703,12 @@ WIFI-PROPERTIES.2GHZ:unknown
 WIFI-PROPERTIES.5GHZ:unknown
 
 <<<
-size: 1126
-location: clients/tests/test-client.py:1060:test_004()/232
+size: 1201
+location: clients/tests/test-client.py:1074:test_004()/232
 cmd: $NMCLI --terse -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 931 bytes
+stdout: 1005 bytes
 >>>
 GENERAL.DEVICE:wlan0
 GENERAL.TYPE:wifi
@@ -15484,6 +15722,8 @@ GENERAL.HWADDR:13:E0:74:85:7C:D9
 GENERAL.MTU:0
 GENERAL.STATE:20 (unavailable)
 GENERAL.REASON:0 (No reason given)
+GENERAL.IP4-CONNECTIVITY:0 (unknown)
+GENERAL.IP6-CONNECTIVITY:0 (unknown)
 GENERAL.UDI:/sys/devices/virtual/wlan0
 GENERAL.IP-IFACE:
 GENERAL.IS-SOFTWARE:no
@@ -15509,189 +15749,201 @@ WIFI-PROPERTIES.5GHZ:unknown
 
 <<<
 size: 428
-location: clients/tests/test-client.py:1063:test_004()/233
+location: clients/tests/test-client.py:1077:test_004()/233
 cmd: $NMCLI --terse -f DEVICE,TYPE,DBUS-PATH dev
 lang: C
 returncode: 0
 stdout: 271 bytes
 >>>
+wlan0:wifi:/org/freedesktop/NetworkManager/Devices/3
 eth0:ethernet:/org/freedesktop/NetworkManager/Devices/1
 eth1:ethernet:/org/freedesktop/NetworkManager/Devices/2
 wlan1:wifi:/org/freedesktop/NetworkManager/Devices/4
 wlan1:wifi:/org/freedesktop/NetworkManager/Devices/5
-wlan0:wifi:/org/freedesktop/NetworkManager/Devices/3
 
 <<<
 size: 438
-location: clients/tests/test-client.py:1063:test_004()/234
+location: clients/tests/test-client.py:1077:test_004()/234
 cmd: $NMCLI --terse -f DEVICE,TYPE,DBUS-PATH dev
 lang: pl_PL.UTF-8
 returncode: 0
 stdout: 271 bytes
 >>>
+wlan0:wifi:/org/freedesktop/NetworkManager/Devices/3
 eth0:ethernet:/org/freedesktop/NetworkManager/Devices/1
 eth1:ethernet:/org/freedesktop/NetworkManager/Devices/2
 wlan1:wifi:/org/freedesktop/NetworkManager/Devices/4
 wlan1:wifi:/org/freedesktop/NetworkManager/Devices/5
-wlan0:wifi:/org/freedesktop/NetworkManager/Devices/3
 
 <<<
-size: 1175
-location: clients/tests/test-client.py:1066:test_004()/235
+size: 1086
+location: clients/tests/test-client.py:1080:test_004()/235
 cmd: $NMCLI --terse -f ALL device wifi list
 lang: C
 returncode: 0
-stdout: 1022 bytes
+stdout: 934 bytes
 >>>
-AP[1]:wlan1-ap-4:776C616E312D61702D34:94\:2B\:E8\:F6\:D2\:86:Infra:1:2412 MHz:54 Mbit/s:48:**  :WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan1:no: :/org/freedesktop/NetworkManager/AccessPoint/4
+AP[1]:wlan0-ap-2:776C616E302D61702D32:C0\:E2\:BE\:E8\:EF\:B6:Infra:1:2412 MHz:54 Mbit/s:92:****:WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:no: :/org/freedesktop/NetworkManager/AccessPoint/2
+AP[2]:wlan0-ap-1:776C616E302D61702D31:61\:95\:77\:AC\:1E\:4C:Infra:1:2412 MHz:54 Mbit/s:81:****:WPA1:pair_tkip pair_ccmp group_tkip group_ccmp psk:(none):wlan0:no: :/org/freedesktop/NetworkManager/AccessPoint/1
+AP[3]:wlan0-ap-3:776C616E302D61702D33:9B\:F6\:B7\:EC\:97\:76:Infra:1:2412 MHz:54 Mbit/s:55:**  :WPA3:(none):pair_tkip pair_ccmp group_tkip group_ccmp sae:wlan0:no: :/org/freedesktop/NetworkManager/AccessPoint/3
 
+AP[1]:wlan1-ap-4:776C616E312D61702D34:94\:2B\:E8\:F6\:D2\:86:Infra:1:2412 MHz:54 Mbit/s:48:**  :WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan1:no: :/org/freedesktop/NetworkManager/AccessPoint/4
 
-AP[1]:wlan0-ap-2:776C616E302D61702D32:C0\:E2\:BE\:E8\:EF\:B6:Infra:1:2412 MHz:54 Mbit/s:92:****:WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:no: :/org/freedesktop/NetworkManager/AccessPoint/2
-AP[2]:wlan0-ap-1:776C616E302D61702D31:61\:95\:77\:AC\:1E\:4C:Infra:1:2412 MHz:54 Mbit/s:81:****:WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:no: :/org/freedesktop/NetworkManager/AccessPoint/1
-AP[3]:wlan0-ap-3:776C616E302D61702D33:9B\:F6\:B7\:EC\:97\:76:Infra:1:2412 MHz:54 Mbit/s:55:**  :WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:no: :/org/freedesktop/NetworkManager/AccessPoint/3
 
 <<<
-size: 1233
-location: clients/tests/test-client.py:1066:test_004()/236
+size: 1144
+location: clients/tests/test-client.py:1080:test_004()/236
 cmd: $NMCLI --terse -f ALL device wifi list
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 1070 bytes
+stdout: 982 bytes
 >>>
-AP[1]:wlan1-ap-4:776C616E312D61702D34:94\:2B\:E8\:F6\:D2\:86:Infrastruktura:1:2412 MHz:54 Mb/s:48:**  :WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan1:nie: :/org/freedesktop/NetworkManager/AccessPoint/4
+AP[1]:wlan0-ap-2:776C616E302D61702D32:C0\:E2\:BE\:E8\:EF\:B6:Infrastruktura:1:2412 MHz:54 Mb/s:92:****:WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:nie: :/org/freedesktop/NetworkManager/AccessPoint/2
+AP[2]:wlan0-ap-1:776C616E302D61702D31:61\:95\:77\:AC\:1E\:4C:Infrastruktura:1:2412 MHz:54 Mb/s:81:****:WPA1:pair_tkip pair_ccmp group_tkip group_ccmp psk:(brak):wlan0:nie: :/org/freedesktop/NetworkManager/AccessPoint/1
+AP[3]:wlan0-ap-3:776C616E302D61702D33:9B\:F6\:B7\:EC\:97\:76:Infrastruktura:1:2412 MHz:54 Mb/s:55:**  :WPA3:(brak):pair_tkip pair_ccmp group_tkip group_ccmp sae:wlan0:nie: :/org/freedesktop/NetworkManager/AccessPoint/3
 
+AP[1]:wlan1-ap-4:776C616E312D61702D34:94\:2B\:E8\:F6\:D2\:86:Infrastruktura:1:2412 MHz:54 Mb/s:48:**  :WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan1:nie: :/org/freedesktop/NetworkManager/AccessPoint/4
 
-AP[1]:wlan0-ap-2:776C616E302D61702D32:C0\:E2\:BE\:E8\:EF\:B6:Infrastruktura:1:2412 MHz:54 Mb/s:92:****:WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:nie: :/org/freedesktop/NetworkManager/AccessPoint/2
-AP[2]:wlan0-ap-1:776C616E302D61702D31:61\:95\:77\:AC\:1E\:4C:Infrastruktura:1:2412 MHz:54 Mb/s:81:****:WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:nie: :/org/freedesktop/NetworkManager/AccessPoint/1
-AP[3]:wlan0-ap-3:776C616E302D61702D33:9B\:F6\:B7\:EC\:97\:76:Infrastruktura:1:2412 MHz:54 Mb/s:55:**  :WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:nie: :/org/freedesktop/NetworkManager/AccessPoint/3
 
 <<<
-size: 353
-location: clients/tests/test-client.py:1068:test_004()/237
+size: 343
+location: clients/tests/test-client.py:1082:test_004()/237
 cmd: $NMCLI --terse -f COMMON device wifi list
 lang: C
 returncode: 0
-stdout: 198 bytes
+stdout: 188 bytes
 >>>
- :wlan1-ap-4:Infra:1:54 Mbit/s:48:**  :WPA1 WPA2
+ :wlan0-ap-2:Infra:1:54 Mbit/s:92:****:WPA1 WPA2
+ :wlan0-ap-1:Infra:1:54 Mbit/s:81:****:WPA1
+ :wlan0-ap-3:Infra:1:54 Mbit/s:55:**  :WPA3
 
+ :wlan1-ap-4:Infra:1:54 Mbit/s:48:**  :WPA1 WPA2
 
- :wlan0-ap-2:Infra:1:54 Mbit/s:92:****:WPA1 WPA2
- :wlan0-ap-1:Infra:1:54 Mbit/s:81:****:WPA1 WPA2
- :wlan0-ap-3:Infra:1:54 Mbit/s:55:**  :WPA1 WPA2
 
 <<<
-size: 399
-location: clients/tests/test-client.py:1068:test_004()/238
+size: 389
+location: clients/tests/test-client.py:1082:test_004()/238
 cmd: $NMCLI --terse -f COMMON device wifi list
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 234 bytes
+stdout: 224 bytes
 >>>
- :wlan1-ap-4:Infrastruktura:1:54 Mb/s:48:**  :WPA1 WPA2
+ :wlan0-ap-2:Infrastruktura:1:54 Mb/s:92:****:WPA1 WPA2
+ :wlan0-ap-1:Infrastruktura:1:54 Mb/s:81:****:WPA1
+ :wlan0-ap-3:Infrastruktura:1:54 Mb/s:55:**  :WPA3
 
+ :wlan1-ap-4:Infrastruktura:1:54 Mb/s:48:**  :WPA1 WPA2
 
- :wlan0-ap-2:Infrastruktura:1:54 Mb/s:92:****:WPA1 WPA2
- :wlan0-ap-1:Infrastruktura:1:54 Mb/s:81:****:WPA1 WPA2
- :wlan0-ap-3:Infrastruktura:1:54 Mb/s:55:**  :WPA1 WPA2
 
 <<<
-size: 1288
-location: clients/tests/test-client.py:1071:test_004()/239
+size: 1199
+location: clients/tests/test-client.py:1085:test_004()/239
 cmd: $NMCLI --terse -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list
 lang: C
 returncode: 0
-stdout: 1022 bytes
+stdout: 934 bytes
 >>>
-AP[1]:wlan1-ap-4:776C616E312D61702D34:94\:2B\:E8\:F6\:D2\:86:Infra:1:2412 MHz:54 Mbit/s:48:**  :WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan1:no: :/org/freedesktop/NetworkManager/AccessPoint/4
+AP[1]:wlan0-ap-2:776C616E302D61702D32:C0\:E2\:BE\:E8\:EF\:B6:Infra:1:2412 MHz:54 Mbit/s:92:****:WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:no: :/org/freedesktop/NetworkManager/AccessPoint/2
+AP[2]:wlan0-ap-1:776C616E302D61702D31:61\:95\:77\:AC\:1E\:4C:Infra:1:2412 MHz:54 Mbit/s:81:****:WPA1:pair_tkip pair_ccmp group_tkip group_ccmp psk:(none):wlan0:no: :/org/freedesktop/NetworkManager/AccessPoint/1
+AP[3]:wlan0-ap-3:776C616E302D61702D33:9B\:F6\:B7\:EC\:97\:76:Infra:1:2412 MHz:54 Mbit/s:55:**  :WPA3:(none):pair_tkip pair_ccmp group_tkip group_ccmp sae:wlan0:no: :/org/freedesktop/NetworkManager/AccessPoint/3
 
+AP[1]:wlan1-ap-4:776C616E312D61702D34:94\:2B\:E8\:F6\:D2\:86:Infra:1:2412 MHz:54 Mbit/s:48:**  :WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan1:no: :/org/freedesktop/NetworkManager/AccessPoint/4
 
-AP[1]:wlan0-ap-2:776C616E302D61702D32:C0\:E2\:BE\:E8\:EF\:B6:Infra:1:2412 MHz:54 Mbit/s:92:****:WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:no: :/org/freedesktop/NetworkManager/AccessPoint/2
-AP[2]:wlan0-ap-1:776C616E302D61702D31:61\:95\:77\:AC\:1E\:4C:Infra:1:2412 MHz:54 Mbit/s:81:****:WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:no: :/org/freedesktop/NetworkManager/AccessPoint/1
-AP[3]:wlan0-ap-3:776C616E302D61702D33:9B\:F6\:B7\:EC\:97\:76:Infra:1:2412 MHz:54 Mbit/s:55:**  :WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:no: :/org/freedesktop/NetworkManager/AccessPoint/3
 
 <<<
-size: 1346
-location: clients/tests/test-client.py:1071:test_004()/240
+size: 1257
+location: clients/tests/test-client.py:1085:test_004()/240
 cmd: $NMCLI --terse -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 1070 bytes
+stdout: 982 bytes
 >>>
-AP[1]:wlan1-ap-4:776C616E312D61702D34:94\:2B\:E8\:F6\:D2\:86:Infrastruktura:1:2412 MHz:54 Mb/s:48:**  :WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan1:nie: :/org/freedesktop/NetworkManager/AccessPoint/4
+AP[1]:wlan0-ap-2:776C616E302D61702D32:C0\:E2\:BE\:E8\:EF\:B6:Infrastruktura:1:2412 MHz:54 Mb/s:92:****:WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:nie: :/org/freedesktop/NetworkManager/AccessPoint/2
+AP[2]:wlan0-ap-1:776C616E302D61702D31:61\:95\:77\:AC\:1E\:4C:Infrastruktura:1:2412 MHz:54 Mb/s:81:****:WPA1:pair_tkip pair_ccmp group_tkip group_ccmp psk:(brak):wlan0:nie: :/org/freedesktop/NetworkManager/AccessPoint/1
+AP[3]:wlan0-ap-3:776C616E302D61702D33:9B\:F6\:B7\:EC\:97\:76:Infrastruktura:1:2412 MHz:54 Mb/s:55:**  :WPA3:(brak):pair_tkip pair_ccmp group_tkip group_ccmp sae:wlan0:nie: :/org/freedesktop/NetworkManager/AccessPoint/3
 
+AP[1]:wlan1-ap-4:776C616E312D61702D34:94\:2B\:E8\:F6\:D2\:86:Infrastruktura:1:2412 MHz:54 Mb/s:48:**  :WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan1:nie: :/org/freedesktop/NetworkManager/AccessPoint/4
 
-AP[1]:wlan0-ap-2:776C616E302D61702D32:C0\:E2\:BE\:E8\:EF\:B6:Infrastruktura:1:2412 MHz:54 Mb/s:92:****:WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:nie: :/org/freedesktop/NetworkManager/AccessPoint/2
-AP[2]:wlan0-ap-1:776C616E302D61702D31:61\:95\:77\:AC\:1E\:4C:Infrastruktura:1:2412 MHz:54 Mb/s:81:****:WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:nie: :/org/freedesktop/NetworkManager/AccessPoint/1
-AP[3]:wlan0-ap-3:776C616E302D61702D33:9B\:F6\:B7\:EC\:97\:76:Infrastruktura:1:2412 MHz:54 Mb/s:55:**  :WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:nie: :/org/freedesktop/NetworkManager/AccessPoint/3
 
 <<<
-size: 431
-location: clients/tests/test-client.py:1073:test_004()/241
+size: 433
+location: clients/tests/test-client.py:1087:test_004()/241
 cmd: $NMCLI --terse -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: C
 returncode: 0
-stdout: 255 bytes
+stdout: 257 bytes
 >>>
 AP[1]:wlan0-ap-2:776C616E302D61702D32:C0\:E2\:BE\:E8\:EF\:B6:Infra:1:2412 MHz:54 Mbit/s:92:****:WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:no: :/org/freedesktop/NetworkManager/AccessPoint/2
 
+
+
 <<<
-size: 453
-location: clients/tests/test-client.py:1073:test_004()/242
+size: 455
+location: clients/tests/test-client.py:1087:test_004()/242
 cmd: $NMCLI --terse -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 267 bytes
+stdout: 269 bytes
 >>>
 AP[1]:wlan0-ap-2:776C616E302D61702D32:C0\:E2\:BE\:E8\:EF\:B6:Infrastruktura:1:2412 MHz:54 Mb/s:92:****:WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:nie: :/org/freedesktop/NetworkManager/AccessPoint/2
 
+
+
 <<<
-size: 227
-location: clients/tests/test-client.py:1075:test_004()/243
+size: 229
+location: clients/tests/test-client.py:1089:test_004()/243
 cmd: $NMCLI --terse -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: C
 returncode: 0
-stdout: 49 bytes
+stdout: 51 bytes
 >>>
  :wlan0-ap-2:Infra:1:54 Mbit/s:92:****:WPA1 WPA2
 
+
+
 <<<
-size: 246
-location: clients/tests/test-client.py:1075:test_004()/244
+size: 248
+location: clients/tests/test-client.py:1089:test_004()/244
 cmd: $NMCLI --terse -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 58 bytes
+stdout: 60 bytes
 >>>
  :wlan0-ap-2:Infrastruktura:1:54 Mb/s:92:****:WPA1 WPA2
 
+
+
 <<<
-size: 544
-location: clients/tests/test-client.py:1078:test_004()/245
+size: 546
+location: clients/tests/test-client.py:1092:test_004()/245
 cmd: $NMCLI --terse -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: C
 returncode: 0
-stdout: 255 bytes
+stdout: 257 bytes
 >>>
 AP[1]:wlan0-ap-2:776C616E302D61702D32:C0\:E2\:BE\:E8\:EF\:B6:Infra:1:2412 MHz:54 Mbit/s:92:****:WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:no: :/org/freedesktop/NetworkManager/AccessPoint/2
 
+
+
 <<<
-size: 566
-location: clients/tests/test-client.py:1078:test_004()/246
+size: 568
+location: clients/tests/test-client.py:1092:test_004()/246
 cmd: $NMCLI --terse -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 267 bytes
+stdout: 269 bytes
 >>>
 AP[1]:wlan0-ap-2:776C616E302D61702D32:C0\:E2\:BE\:E8\:EF\:B6:Infrastruktura:1:2412 MHz:54 Mb/s:92:****:WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:nie: :/org/freedesktop/NetworkManager/AccessPoint/2
 
+
+
 <<<
-size: 2632
-location: clients/tests/test-client.py:1080:test_004()/247
+size: 2696
+location: clients/tests/test-client.py:1094:test_004()/247
 cmd: $NMCLI --terse -f ALL device show wlan0
 lang: C
 returncode: 0
-stdout: 2478 bytes
+stdout: 2542 bytes
 >>>
 GENERAL.DEVICE:wlan0
 GENERAL.TYPE:wifi
@@ -15705,6 +15957,8 @@ GENERAL.HWADDR:13:E0:74:85:7C:D9
 GENERAL.MTU:0
 GENERAL.STATE:20 (unavailable)
 GENERAL.REASON:0 (No reason given)
+GENERAL.IP4-CONNECTIVITY:0 (unknown)
+GENERAL.IP6-CONNECTIVITY:0 (unknown)
 GENERAL.UDI:/sys/devices/virtual/wlan0
 GENERAL.IP-IFACE:
 GENERAL.IS-SOFTWARE:no
@@ -15745,7 +15999,7 @@ AP[2].CHAN:1
 AP[2].RATE:54 Mbit/s
 AP[2].SIGNAL:81
 AP[2].BARS:****
-AP[2].SECURITY:WPA1 WPA2
+AP[2].SECURITY:WPA1
 AP[3].IN-USE: 
 AP[3].SSID:wlan0-ap-3
 AP[3].MODE:Infra
@@ -15753,7 +16007,7 @@ AP[3].CHAN:1
 AP[3].RATE:54 Mbit/s
 AP[3].SIGNAL:55
 AP[3].BARS:**  
-AP[3].SECURITY:WPA1 WPA2
+AP[3].SECURITY:WPA3
 IP4.ADDRESS[1]:192.168.228.18/32
 IP4.ADDRESS[2]:192.168.209.179/25
 IP4.GATEWAY:192.168.41.120
@@ -15784,12 +16038,12 @@ CONNECTIONS.AVAILABLE-CONNECTION-PATHS:/org/freedesktop/NetworkManager/Settings/
 CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 
 <<<
-size: 2669
-location: clients/tests/test-client.py:1080:test_004()/248
+size: 2733
+location: clients/tests/test-client.py:1094:test_004()/248
 cmd: $NMCLI --terse -f ALL device show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2505 bytes
+stdout: 2569 bytes
 >>>
 GENERAL.DEVICE:wlan0
 GENERAL.TYPE:wifi
@@ -15803,6 +16057,8 @@ GENERAL.HWADDR:13:E0:74:85:7C:D9
 GENERAL.MTU:0
 GENERAL.STATE:20 (unavailable)
 GENERAL.REASON:0 (No reason given)
+GENERAL.IP4-CONNECTIVITY:0 (unknown)
+GENERAL.IP6-CONNECTIVITY:0 (unknown)
 GENERAL.UDI:/sys/devices/virtual/wlan0
 GENERAL.IP-IFACE:
 GENERAL.IS-SOFTWARE:no
@@ -15843,7 +16099,7 @@ AP[2].CHAN:1
 AP[2].RATE:54 Mb/s
 AP[2].SIGNAL:81
 AP[2].BARS:****
-AP[2].SECURITY:WPA1 WPA2
+AP[2].SECURITY:WPA1
 AP[3].IN-USE: 
 AP[3].SSID:wlan0-ap-3
 AP[3].MODE:Infrastruktura
@@ -15851,7 +16107,7 @@ AP[3].CHAN:1
 AP[3].RATE:54 Mb/s
 AP[3].SIGNAL:55
 AP[3].BARS:**  
-AP[3].SECURITY:WPA1 WPA2
+AP[3].SECURITY:WPA3
 IP4.ADDRESS[1]:192.168.228.18/32
 IP4.ADDRESS[2]:192.168.209.179/25
 IP4.GATEWAY:192.168.41.120
@@ -15883,7 +16139,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-
 
 <<<
 size: 895
-location: clients/tests/test-client.py:1082:test_004()/249
+location: clients/tests/test-client.py:1096:test_004()/249
 cmd: $NMCLI --terse -f COMMON device show wlan0
 lang: C
 returncode: 0
@@ -15916,7 +16172,7 @@ IP6.DOMAIN[6]:sear6.foo4.bar
 
 <<<
 size: 905
-location: clients/tests/test-client.py:1082:test_004()/250
+location: clients/tests/test-client.py:1096:test_004()/250
 cmd: $NMCLI --terse -f COMMON device show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
@@ -15948,12 +16204,12 @@ IP6.DOMAIN[5]:sear6.foo3.bar
 IP6.DOMAIN[6]:sear6.foo4.bar
 
 <<<
-size: 2770
-location: clients/tests/test-client.py:1084:test_004()/251
+size: 2834
+location: clients/tests/test-client.py:1098:test_004()/251
 cmd: $NMCLI --terse -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0
 lang: C
 returncode: 0
-stdout: 2478 bytes
+stdout: 2542 bytes
 >>>
 GENERAL.DEVICE:wlan0
 GENERAL.TYPE:wifi
@@ -15967,6 +16223,8 @@ GENERAL.HWADDR:13:E0:74:85:7C:D9
 GENERAL.MTU:0
 GENERAL.STATE:20 (unavailable)
 GENERAL.REASON:0 (No reason given)
+GENERAL.IP4-CONNECTIVITY:0 (unknown)
+GENERAL.IP6-CONNECTIVITY:0 (unknown)
 GENERAL.UDI:/sys/devices/virtual/wlan0
 GENERAL.IP-IFACE:
 GENERAL.IS-SOFTWARE:no
@@ -16007,7 +16265,7 @@ AP[2].CHAN:1
 AP[2].RATE:54 Mbit/s
 AP[2].SIGNAL:81
 AP[2].BARS:****
-AP[2].SECURITY:WPA1 WPA2
+AP[2].SECURITY:WPA1
 AP[3].IN-USE: 
 AP[3].SSID:wlan0-ap-3
 AP[3].MODE:Infra
@@ -16015,7 +16273,7 @@ AP[3].CHAN:1
 AP[3].RATE:54 Mbit/s
 AP[3].SIGNAL:55
 AP[3].BARS:**  
-AP[3].SECURITY:WPA1 WPA2
+AP[3].SECURITY:WPA3
 IP4.ADDRESS[1]:192.168.228.18/32
 IP4.ADDRESS[2]:192.168.209.179/25
 IP4.GATEWAY:192.168.41.120
@@ -16046,12 +16304,12 @@ CONNECTIONS.AVAILABLE-CONNECTION-PATHS:/org/freedesktop/NetworkManager/Settings/
 CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 
 <<<
-size: 2807
-location: clients/tests/test-client.py:1084:test_004()/252
+size: 2871
+location: clients/tests/test-client.py:1098:test_004()/252
 cmd: $NMCLI --terse -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2505 bytes
+stdout: 2569 bytes
 >>>
 GENERAL.DEVICE:wlan0
 GENERAL.TYPE:wifi
@@ -16065,6 +16323,8 @@ GENERAL.HWADDR:13:E0:74:85:7C:D9
 GENERAL.MTU:0
 GENERAL.STATE:20 (unavailable)
 GENERAL.REASON:0 (No reason given)
+GENERAL.IP4-CONNECTIVITY:0 (unknown)
+GENERAL.IP6-CONNECTIVITY:0 (unknown)
 GENERAL.UDI:/sys/devices/virtual/wlan0
 GENERAL.IP-IFACE:
 GENERAL.IS-SOFTWARE:no
@@ -16105,7 +16365,7 @@ AP[2].CHAN:1
 AP[2].RATE:54 Mb/s
 AP[2].SIGNAL:81
 AP[2].BARS:****
-AP[2].SECURITY:WPA1 WPA2
+AP[2].SECURITY:WPA1
 AP[3].IN-USE: 
 AP[3].SSID:wlan0-ap-3
 AP[3].MODE:Infrastruktura
@@ -16113,7 +16373,7 @@ AP[3].CHAN:1
 AP[3].RATE:54 Mb/s
 AP[3].SIGNAL:55
 AP[3].BARS:**  
-AP[3].SECURITY:WPA1 WPA2
+AP[3].SECURITY:WPA3
 IP4.ADDRESS[1]:192.168.228.18/32
 IP4.ADDRESS[2]:192.168.209.179/25
 IP4.GATEWAY:192.168.41.120
@@ -16145,7 +16405,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-
 
 <<<
 size: 2335
-location: clients/tests/test-client.py:1022:test_004()/253
+location: clients/tests/test-client.py:1036:test_004()/253
 cmd: $NMCLI --terse --color yes con s con-vpn-1
 lang: C
 returncode: 0
@@ -16247,7 +16507,7 @@ VPN.CFG[3]:key3 = val3
 
 <<<
 size: 2345
-location: clients/tests/test-client.py:1022:test_004()/254
+location: clients/tests/test-client.py:1036:test_004()/254
 cmd: $NMCLI --terse --color yes con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
@@ -16349,7 +16609,7 @@ VPN.CFG[3]:key3 = val3
 
 <<<
 size: 2335
-location: clients/tests/test-client.py:1024:test_004()/255
+location: clients/tests/test-client.py:1038:test_004()/255
 cmd: $NMCLI --terse --color yes con s con-vpn-1
 lang: C
 returncode: 0
@@ -16451,7 +16711,7 @@ VPN.CFG[3]:key3 = val3
 
 <<<
 size: 2345
-location: clients/tests/test-client.py:1024:test_004()/256
+location: clients/tests/test-client.py:1038:test_004()/256
 cmd: $NMCLI --terse --color yes con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
@@ -16553,7 +16813,7 @@ VPN.CFG[3]:key3 = val3
 
 <<<
 size: 1783
-location: clients/tests/test-client.py:1027:test_004()/257
+location: clients/tests/test-client.py:1041:test_004()/257
 cmd: $NMCLI --terse --color yes -f ALL con s con-vpn-1
 lang: C
 returncode: 0
@@ -16635,7 +16895,7 @@ proxy.pac-script:
 
 <<<
 size: 1793
-location: clients/tests/test-client.py:1027:test_004()/258
+location: clients/tests/test-client.py:1041:test_004()/258
 cmd: $NMCLI --terse --color yes -f ALL con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
@@ -16717,7 +16977,7 @@ proxy.pac-script:
 
 <<<
 size: 334
-location: clients/tests/test-client.py:1033:test_004()/259
+location: clients/tests/test-client.py:1047:test_004()/259
 cmd: $NMCLI --terse --color yes -f VPN con s con-vpn-1
 lang: C
 returncode: 0
@@ -16732,7 +16992,7 @@ vpn.timeout:0
 
 <<<
 size: 344
-location: clients/tests/test-client.py:1033:test_004()/260
+location: clients/tests/test-client.py:1047:test_004()/260
 cmd: $NMCLI --terse --color yes -f VPN con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
@@ -16747,7 +17007,7 @@ vpn.timeout:0
 
 <<<
 size: 537
-location: clients/tests/test-client.py:1036:test_004()/261
+location: clients/tests/test-client.py:1050:test_004()/261
 cmd: $NMCLI --terse --color yes -f GENERAL con s con-vpn-1
 lang: C
 returncode: 0
@@ -16768,7 +17028,7 @@ GENERAL.MASTER-PATH:
 
 <<<
 size: 547
-location: clients/tests/test-client.py:1036:test_004()/262
+location: clients/tests/test-client.py:1050:test_004()/262
 cmd: $NMCLI --terse --color yes -f GENERAL con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
@@ -16789,68 +17049,93 @@ GENERAL.MASTER-PATH:
 
 <<<
 size: 441
-location: clients/tests/test-client.py:1039:test_004()/263
+location: clients/tests/test-client.py:1053:test_004()/263
 cmd: $NMCLI --terse --color yes dev s
 lang: C
 returncode: 0
 stdout: 295 bytes
 >>>
+wlan0:wifi:unavailable:con-vpn-1
 eth0:ethernet:unavailable:
 eth1:ethernet:unavailable:
 wlan1:wifi:unavailable:
 wlan1:wifi:unavailable:
-wlan0:wifi:unavailable:con-vpn-1
 
 <<<
 size: 451
-location: clients/tests/test-client.py:1039:test_004()/264
+location: clients/tests/test-client.py:1053:test_004()/264
 cmd: $NMCLI --terse --color yes dev s
 lang: pl_PL.UTF-8
 returncode: 0
 stdout: 295 bytes
 >>>
+wlan0:wifi:unavailable:con-vpn-1
 eth0:ethernet:unavailable:
 eth1:ethernet:unavailable:
 wlan1:wifi:unavailable:
 wlan1:wifi:unavailable:
-wlan0:wifi:unavailable:con-vpn-1
 
 <<<
-size: 879
-location: clients/tests/test-client.py:1042:test_004()/265
+size: 1039
+location: clients/tests/test-client.py:1056:test_004()/265
 cmd: $NMCLI --terse --color yes -f all dev status
 lang: C
 returncode: 0
-stdout: 721 bytes
+stdout: 881 bytes
 >>>
-eth0:ethernet:unavailable:/org/freedesktop/NetworkManager/Devices/1:::
-eth1:ethernet:unavailable:/org/freedesktop/NetworkManager/Devices/2:::
-wlan1:wifi:unavailable:/org/freedesktop/NetworkManager/Devices/4:::
-wlan1:wifi:unavailable:/org/freedesktop/NetworkManager/Devices/5:::
-wlan0:wifi:unavailable:/org/freedesktop/NetworkManager/Devices/3:con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:/org/freedesktop/NetworkManager/ActiveConnection/2
+wlan0:wifi:unavailable:unknown:unknown:/org/freedesktop/NetworkManager/Devices/3:con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:/org/freedesktop/NetworkManager/ActiveConnection/2
+eth0:ethernet:unavailable:unknown:unknown:/org/freedesktop/NetworkManager/Devices/1:::
+eth1:ethernet:unavailable:unknown:unknown:/org/freedesktop/NetworkManager/Devices/2:::
+wlan1:wifi:unavailable:unknown:unknown:/org/freedesktop/NetworkManager/Devices/4:::
+wlan1:wifi:unavailable:unknown:unknown:/org/freedesktop/NetworkManager/Devices/5:::
 
 <<<
-size: 889
-location: clients/tests/test-client.py:1042:test_004()/266
+size: 1049
+location: clients/tests/test-client.py:1056:test_004()/266
 cmd: $NMCLI --terse --color yes -f all dev status
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 721 bytes
+stdout: 881 bytes
 >>>
-eth0:ethernet:unavailable:/org/freedesktop/NetworkManager/Devices/1:::
-eth1:ethernet:unavailable:/org/freedesktop/NetworkManager/Devices/2:::
-wlan1:wifi:unavailable:/org/freedesktop/NetworkManager/Devices/4:::
-wlan1:wifi:unavailable:/org/freedesktop/NetworkManager/Devices/5:::
-wlan0:wifi:unavailable:/org/freedesktop/NetworkManager/Devices/3:con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:/org/freedesktop/NetworkManager/ActiveConnection/2
+wlan0:wifi:unavailable:unknown:unknown:/org/freedesktop/NetworkManager/Devices/3:con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:/org/freedesktop/NetworkManager/ActiveConnection/2
+eth0:ethernet:unavailable:unknown:unknown:/org/freedesktop/NetworkManager/Devices/1:::
+eth1:ethernet:unavailable:unknown:unknown:/org/freedesktop/NetworkManager/Devices/2:::
+wlan1:wifi:unavailable:unknown:unknown:/org/freedesktop/NetworkManager/Devices/4:::
+wlan1:wifi:unavailable:unknown:unknown:/org/freedesktop/NetworkManager/Devices/5:::
 
 <<<
 size: 4552
-location: clients/tests/test-client.py:1045:test_004()/267
+location: clients/tests/test-client.py:1059:test_004()/267
 cmd: $NMCLI --terse --color yes dev show
 lang: C
 returncode: 0
 stdout: 4402 bytes
 >>>
+GENERAL.DEVICE:wlan0
+GENERAL.TYPE:wifi
+GENERAL.HWADDR:13:E0:74:85:7C:D9
+GENERAL.MTU:0
+GENERAL.STATE:20 (unavailable)
+GENERAL.CONNECTION:con-vpn-1
+GENERAL.CON-PATH:/org/freedesktop/NetworkManager/ActiveConnection/2
+IP4.ADDRESS[1]:192.168.228.18/32
+IP4.ADDRESS[2]:192.168.209.179/25
+IP4.GATEWAY:192.168.41.120
+IP4.DOMAIN[1]:sear4.foo2.bar
+IP4.DOMAIN[2]:sear4.fo.x.y
+IP4.DOMAIN[3]:sear4.foo1.bar
+IP4.DOMAIN[4]:sear4.foo4.bar
+IP4.DOMAIN[5]:sear4.fo.o.bar
+IP4.WINS[1]:192.168.120.79
+IP6.GATEWAY:
+IP6.ROUTE[1]:dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086
+IP6.DOMAIN[1]:sear6.foo2.bar
+IP6.DOMAIN[2]:sear6.foo1.bar
+IP6.DOMAIN[3]:sear6.fo.x.y
+IP6.DOMAIN[4]:sear6.fo.o.bar
+IP6.DOMAIN[5]:sear6.foo3.bar
+IP6.DOMAIN[6]:sear6.foo4.bar
+
 GENERAL.DEVICE:eth0
 GENERAL.TYPE:ethernet
 GENERAL.HWADDR:AB:B7:BF:E2:48:E8
@@ -16964,6 +17249,14 @@ IP6.ROUTE[3]:dst = 2001:a::afb7:4449:3787:8bb4/123, nh = ::
 IP6.DNS[1]:2001:a::2934:bd66:550d:ec19
 IP6.DOMAIN[1]:sear6.fo.x.y
 
+<<<
+size: 4562
+location: clients/tests/test-client.py:1059:test_004()/268
+cmd: $NMCLI --terse --color yes dev show
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 4402 bytes
+>>>
 GENERAL.DEVICE:wlan0
 GENERAL.TYPE:wifi
 GENERAL.HWADDR:13:E0:74:85:7C:D9
@@ -16989,14 +17282,6 @@ IP6.DOMAIN[4]:sear6.fo.o.bar
 IP6.DOMAIN[5]:sear6.foo3.bar
 IP6.DOMAIN[6]:sear6.foo4.bar
 
-<<<
-size: 4562
-location: clients/tests/test-client.py:1045:test_004()/268
-cmd: $NMCLI --terse --color yes dev show
-lang: pl_PL.UTF-8
-returncode: 0
-stdout: 4402 bytes
->>>
 GENERAL.DEVICE:eth0
 GENERAL.TYPE:ethernet
 GENERAL.HWADDR:AB:B7:BF:E2:48:E8
@@ -17110,13 +17395,77 @@ IP6.ROUTE[3]:dst = 2001:a::afb7:4449:3787:8bb4/123, nh = ::
 IP6.DNS[1]:2001:a::2934:bd66:550d:ec19
 IP6.DOMAIN[1]:sear6.fo.x.y
 
+<<<
+size: 12227
+location: clients/tests/test-client.py:1062:test_004()/269
+cmd: $NMCLI --terse --color yes -f all dev show
+lang: C
+returncode: 0
+stdout: 12069 bytes
+>>>
 GENERAL.DEVICE:wlan0
 GENERAL.TYPE:wifi
+GENERAL.NM-TYPE:NMDeviceWifi
+GENERAL.VENDOR:
+GENERAL.PRODUCT:
+GENERAL.DRIVER:virtual
+GENERAL.DRIVER-VERSION:
+GENERAL.FIRMWARE-VERSION:
 GENERAL.HWADDR:13:E0:74:85:7C:D9
 GENERAL.MTU:0
 GENERAL.STATE:20 (unavailable)
+GENERAL.REASON:0 (No reason given)
+GENERAL.IP4-CONNECTIVITY:0 (unknown)
+GENERAL.IP6-CONNECTIVITY:0 (unknown)
+GENERAL.UDI:/sys/devices/virtual/wlan0
+GENERAL.IP-IFACE:
+GENERAL.IS-SOFTWARE:no
+GENERAL.NM-MANAGED:yes
+GENERAL.AUTOCONNECT:yes
+GENERAL.FIRMWARE-MISSING:no
+GENERAL.NM-PLUGIN-MISSING:no
+GENERAL.PHYS-PORT-ID:
 GENERAL.CONNECTION:con-vpn-1
+GENERAL.CON-UUID:UUID-con-vpn-1-REPLACED-REPLACED-REP
 GENERAL.CON-PATH:/org/freedesktop/NetworkManager/ActiveConnection/2
+GENERAL.METERED:unknown
+CAPABILITIES.CARRIER-DETECT:no
+CAPABILITIES.SPEED:unknown
+CAPABILITIES.IS-SOFTWARE:no
+CAPABILITIES.SRIOV:no
+WIFI-PROPERTIES.WEP:yes
+WIFI-PROPERTIES.WPA:yes
+WIFI-PROPERTIES.WPA2:yes
+WIFI-PROPERTIES.TKIP:yes
+WIFI-PROPERTIES.CCMP:yes
+WIFI-PROPERTIES.AP:yes
+WIFI-PROPERTIES.ADHOC:yes
+WIFI-PROPERTIES.2GHZ:unknown
+WIFI-PROPERTIES.5GHZ:unknown
+AP[1].IN-USE: 
+AP[1].SSID:wlan0-ap-2
+AP[1].MODE:Infra
+AP[1].CHAN:1
+AP[1].RATE:54 Mbit/s
+AP[1].SIGNAL:92
+AP[1].BARS:****
+AP[1].SECURITY:WPA1 WPA2
+AP[2].IN-USE: 
+AP[2].SSID:wlan0-ap-1
+AP[2].MODE:Infra
+AP[2].CHAN:1
+AP[2].RATE:54 Mbit/s
+AP[2].SIGNAL:81
+AP[2].BARS:****
+AP[2].SECURITY:WPA1
+AP[3].IN-USE: 
+AP[3].SSID:wlan0-ap-3
+AP[3].MODE:Infra
+AP[3].CHAN:1
+AP[3].RATE:54 Mbit/s
+AP[3].SIGNAL:55
+AP[3].BARS:**  
+AP[3].SECURITY:WPA3
 IP4.ADDRESS[1]:192.168.228.18/32
 IP4.ADDRESS[2]:192.168.209.179/25
 IP4.GATEWAY:192.168.41.120
@@ -17126,6 +17475,10 @@ IP4.DOMAIN[3]:sear4.foo1.bar
 IP4.DOMAIN[4]:sear4.foo4.bar
 IP4.DOMAIN[5]:sear4.fo.o.bar
 IP4.WINS[1]:192.168.120.79
+DHCP4.OPTION[1]:dhcp-4-opt-0 = val-0
+DHCP4.OPTION[2]:dhcp-4-opt-2 = val-2
+DHCP4.OPTION[3]:dhcp-4-opt-4 = val-4
+DHCP4.OPTION[4]:dhcp-4-opt-7 = val-7
 IP6.GATEWAY:
 IP6.ROUTE[1]:dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086
 IP6.DOMAIN[1]:sear6.foo2.bar
@@ -17134,15 +17487,14 @@ IP6.DOMAIN[3]:sear6.fo.x.y
 IP6.DOMAIN[4]:sear6.fo.o.bar
 IP6.DOMAIN[5]:sear6.foo3.bar
 IP6.DOMAIN[6]:sear6.foo4.bar
+DHCP6.OPTION[1]:dhcp-6-opt-1 = val-1
+DHCP6.OPTION[2]:dhcp-6-opt-2 = val-2
+DHCP6.OPTION[3]:dhcp-6-opt-3 = val-3
+DHCP6.OPTION[4]:dhcp-6-opt-4 = val-4
+DHCP6.OPTION[5]:dhcp-6-opt-5 = val-5
+CONNECTIONS.AVAILABLE-CONNECTION-PATHS:/org/freedesktop/NetworkManager/Settings/Connection/{2}
+CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 
-<<<
-size: 11867
-location: clients/tests/test-client.py:1048:test_004()/269
-cmd: $NMCLI --terse --color yes -f all dev show
-lang: C
-returncode: 0
-stdout: 11709 bytes
->>>
 GENERAL.DEVICE:eth0
 GENERAL.TYPE:ethernet
 GENERAL.NM-TYPE:NMDeviceEthernet
@@ -17155,6 +17507,8 @@ GENERAL.HWADDR:AB:B7:BF:E2:48:E8
 GENERAL.MTU:0
 GENERAL.STATE:20 (unavailable)
 GENERAL.REASON:0 (No reason given)
+GENERAL.IP4-CONNECTIVITY:0 (unknown)
+GENERAL.IP6-CONNECTIVITY:0 (unknown)
 GENERAL.UDI:/sys/devices/virtual/eth0
 GENERAL.IP-IFACE:
 GENERAL.IS-SOFTWARE:no
@@ -17216,6 +17570,8 @@ GENERAL.HWADDR:E7:78:B1:93:2B:22
 GENERAL.MTU:0
 GENERAL.STATE:20 (unavailable)
 GENERAL.REASON:0 (No reason given)
+GENERAL.IP4-CONNECTIVITY:0 (unknown)
+GENERAL.IP6-CONNECTIVITY:0 (unknown)
 GENERAL.UDI:/sys/devices/virtual/eth1
 GENERAL.IP-IFACE:
 GENERAL.IS-SOFTWARE:no
@@ -17284,6 +17640,8 @@ GENERAL.HWADDR:21:E9:64:81:8C:A8
 GENERAL.MTU:0
 GENERAL.STATE:20 (unavailable)
 GENERAL.REASON:0 (No reason given)
+GENERAL.IP4-CONNECTIVITY:0 (unknown)
+GENERAL.IP6-CONNECTIVITY:0 (unknown)
 GENERAL.UDI:/sys/devices/virtual/wlan1
 GENERAL.IP-IFACE:
 GENERAL.IS-SOFTWARE:no
@@ -17370,6 +17728,8 @@ GENERAL.HWADDR:71:52:AD:63:5C:7C
 GENERAL.MTU:0
 GENERAL.STATE:20 (unavailable)
 GENERAL.REASON:0 (No reason given)
+GENERAL.IP4-CONNECTIVITY:0 (unknown)
+GENERAL.IP6-CONNECTIVITY:0 (unknown)
 GENERAL.UDI:/sys/devices/virtual/wlan1
 GENERAL.IP-IFACE:
 GENERAL.IS-SOFTWARE:no
@@ -17424,6 +17784,14 @@ DHCP6.OPTION[5]:dhcp-6-opt-9 = val-9
 CONNECTIONS.AVAILABLE-CONNECTION-PATHS:/org/freedesktop/NetworkManager/Settings/Connection/{2}
 CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 
+<<<
+size: 12273
+location: clients/tests/test-client.py:1062:test_004()/270
+cmd: $NMCLI --terse --color yes -f all dev show
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 12105 bytes
+>>>
 GENERAL.DEVICE:wlan0
 GENERAL.TYPE:wifi
 GENERAL.NM-TYPE:NMDeviceWifi
@@ -17436,6 +17804,8 @@ GENERAL.HWADDR:13:E0:74:85:7C:D9
 GENERAL.MTU:0
 GENERAL.STATE:20 (unavailable)
 GENERAL.REASON:0 (No reason given)
+GENERAL.IP4-CONNECTIVITY:0 (unknown)
+GENERAL.IP6-CONNECTIVITY:0 (unknown)
 GENERAL.UDI:/sys/devices/virtual/wlan0
 GENERAL.IP-IFACE:
 GENERAL.IS-SOFTWARE:no
@@ -17463,28 +17833,28 @@ WIFI-PROPERTIES.2GHZ:unknown
 WIFI-PROPERTIES.5GHZ:unknown
 AP[1].IN-USE: 
 AP[1].SSID:wlan0-ap-2
-AP[1].MODE:Infra
+AP[1].MODE:Infrastruktura
 AP[1].CHAN:1
-AP[1].RATE:54 Mbit/s
+AP[1].RATE:54 Mb/s
 AP[1].SIGNAL:92
 AP[1].BARS:****
 AP[1].SECURITY:WPA1 WPA2
 AP[2].IN-USE: 
 AP[2].SSID:wlan0-ap-1
-AP[2].MODE:Infra
+AP[2].MODE:Infrastruktura
 AP[2].CHAN:1
-AP[2].RATE:54 Mbit/s
+AP[2].RATE:54 Mb/s
 AP[2].SIGNAL:81
 AP[2].BARS:****
-AP[2].SECURITY:WPA1 WPA2
+AP[2].SECURITY:WPA1
 AP[3].IN-USE: 
 AP[3].SSID:wlan0-ap-3
-AP[3].MODE:Infra
+AP[3].MODE:Infrastruktura
 AP[3].CHAN:1
-AP[3].RATE:54 Mbit/s
+AP[3].RATE:54 Mb/s
 AP[3].SIGNAL:55
 AP[3].BARS:**  
-AP[3].SECURITY:WPA1 WPA2
+AP[3].SECURITY:WPA3
 IP4.ADDRESS[1]:192.168.228.18/32
 IP4.ADDRESS[2]:192.168.209.179/25
 IP4.GATEWAY:192.168.41.120
@@ -17514,14 +17884,6 @@ DHCP6.OPTION[5]:dhcp-6-opt-5 = val-5
 CONNECTIONS.AVAILABLE-CONNECTION-PATHS:/org/freedesktop/NetworkManager/Settings/Connection/{2}
 CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 
-<<<
-size: 11913
-location: clients/tests/test-client.py:1048:test_004()/270
-cmd: $NMCLI --terse --color yes -f all dev show
-lang: pl_PL.UTF-8
-returncode: 0
-stdout: 11745 bytes
->>>
 GENERAL.DEVICE:eth0
 GENERAL.TYPE:ethernet
 GENERAL.NM-TYPE:NMDeviceEthernet
@@ -17534,6 +17896,8 @@ GENERAL.HWADDR:AB:B7:BF:E2:48:E8
 GENERAL.MTU:0
 GENERAL.STATE:20 (unavailable)
 GENERAL.REASON:0 (No reason given)
+GENERAL.IP4-CONNECTIVITY:0 (unknown)
+GENERAL.IP6-CONNECTIVITY:0 (unknown)
 GENERAL.UDI:/sys/devices/virtual/eth0
 GENERAL.IP-IFACE:
 GENERAL.IS-SOFTWARE:no
@@ -17595,6 +17959,8 @@ GENERAL.HWADDR:E7:78:B1:93:2B:22
 GENERAL.MTU:0
 GENERAL.STATE:20 (unavailable)
 GENERAL.REASON:0 (No reason given)
+GENERAL.IP4-CONNECTIVITY:0 (unknown)
+GENERAL.IP6-CONNECTIVITY:0 (unknown)
 GENERAL.UDI:/sys/devices/virtual/eth1
 GENERAL.IP-IFACE:
 GENERAL.IS-SOFTWARE:no
@@ -17663,6 +18029,8 @@ GENERAL.HWADDR:21:E9:64:81:8C:A8
 GENERAL.MTU:0
 GENERAL.STATE:20 (unavailable)
 GENERAL.REASON:0 (No reason given)
+GENERAL.IP4-CONNECTIVITY:0 (unknown)
+GENERAL.IP6-CONNECTIVITY:0 (unknown)
 GENERAL.UDI:/sys/devices/virtual/wlan1
 GENERAL.IP-IFACE:
 GENERAL.IS-SOFTWARE:no
@@ -17749,6 +18117,8 @@ GENERAL.HWADDR:71:52:AD:63:5C:7C
 GENERAL.MTU:0
 GENERAL.STATE:20 (unavailable)
 GENERAL.REASON:0 (No reason given)
+GENERAL.IP4-CONNECTIVITY:0 (unknown)
+GENERAL.IP6-CONNECTIVITY:0 (unknown)
 GENERAL.UDI:/sys/devices/virtual/wlan1
 GENERAL.IP-IFACE:
 GENERAL.IS-SOFTWARE:no
@@ -17803,99 +18173,9 @@ DHCP6.OPTION[5]:dhcp-6-opt-9 = val-9
 CONNECTIONS.AVAILABLE-CONNECTION-PATHS:/org/freedesktop/NetworkManager/Settings/Connection/{2}
 CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 
-GENERAL.DEVICE:wlan0
-GENERAL.TYPE:wifi
-GENERAL.NM-TYPE:NMDeviceWifi
-GENERAL.VENDOR:
-GENERAL.PRODUCT:
-GENERAL.DRIVER:virtual
-GENERAL.DRIVER-VERSION:
-GENERAL.FIRMWARE-VERSION:
-GENERAL.HWADDR:13:E0:74:85:7C:D9
-GENERAL.MTU:0
-GENERAL.STATE:20 (unavailable)
-GENERAL.REASON:0 (No reason given)
-GENERAL.UDI:/sys/devices/virtual/wlan0
-GENERAL.IP-IFACE:
-GENERAL.IS-SOFTWARE:no
-GENERAL.NM-MANAGED:yes
-GENERAL.AUTOCONNECT:yes
-GENERAL.FIRMWARE-MISSING:no
-GENERAL.NM-PLUGIN-MISSING:no
-GENERAL.PHYS-PORT-ID:
-GENERAL.CONNECTION:con-vpn-1
-GENERAL.CON-UUID:UUID-con-vpn-1-REPLACED-REPLACED-REP
-GENERAL.CON-PATH:/org/freedesktop/NetworkManager/ActiveConnection/2
-GENERAL.METERED:unknown
-CAPABILITIES.CARRIER-DETECT:no
-CAPABILITIES.SPEED:unknown
-CAPABILITIES.IS-SOFTWARE:no
-CAPABILITIES.SRIOV:no
-WIFI-PROPERTIES.WEP:yes
-WIFI-PROPERTIES.WPA:yes
-WIFI-PROPERTIES.WPA2:yes
-WIFI-PROPERTIES.TKIP:yes
-WIFI-PROPERTIES.CCMP:yes
-WIFI-PROPERTIES.AP:yes
-WIFI-PROPERTIES.ADHOC:yes
-WIFI-PROPERTIES.2GHZ:unknown
-WIFI-PROPERTIES.5GHZ:unknown
-AP[1].IN-USE: 
-AP[1].SSID:wlan0-ap-2
-AP[1].MODE:Infrastruktura
-AP[1].CHAN:1
-AP[1].RATE:54 Mb/s
-AP[1].SIGNAL:92
-AP[1].BARS:****
-AP[1].SECURITY:WPA1 WPA2
-AP[2].IN-USE: 
-AP[2].SSID:wlan0-ap-1
-AP[2].MODE:Infrastruktura
-AP[2].CHAN:1
-AP[2].RATE:54 Mb/s
-AP[2].SIGNAL:81
-AP[2].BARS:****
-AP[2].SECURITY:WPA1 WPA2
-AP[3].IN-USE: 
-AP[3].SSID:wlan0-ap-3
-AP[3].MODE:Infrastruktura
-AP[3].CHAN:1
-AP[3].RATE:54 Mb/s
-AP[3].SIGNAL:55
-AP[3].BARS:**  
-AP[3].SECURITY:WPA1 WPA2
-IP4.ADDRESS[1]:192.168.228.18/32
-IP4.ADDRESS[2]:192.168.209.179/25
-IP4.GATEWAY:192.168.41.120
-IP4.DOMAIN[1]:sear4.foo2.bar
-IP4.DOMAIN[2]:sear4.fo.x.y
-IP4.DOMAIN[3]:sear4.foo1.bar
-IP4.DOMAIN[4]:sear4.foo4.bar
-IP4.DOMAIN[5]:sear4.fo.o.bar
-IP4.WINS[1]:192.168.120.79
-DHCP4.OPTION[1]:dhcp-4-opt-0 = val-0
-DHCP4.OPTION[2]:dhcp-4-opt-2 = val-2
-DHCP4.OPTION[3]:dhcp-4-opt-4 = val-4
-DHCP4.OPTION[4]:dhcp-4-opt-7 = val-7
-IP6.GATEWAY:
-IP6.ROUTE[1]:dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086
-IP6.DOMAIN[1]:sear6.foo2.bar
-IP6.DOMAIN[2]:sear6.foo1.bar
-IP6.DOMAIN[3]:sear6.fo.x.y
-IP6.DOMAIN[4]:sear6.fo.o.bar
-IP6.DOMAIN[5]:sear6.foo3.bar
-IP6.DOMAIN[6]:sear6.foo4.bar
-DHCP6.OPTION[1]:dhcp-6-opt-1 = val-1
-DHCP6.OPTION[2]:dhcp-6-opt-2 = val-2
-DHCP6.OPTION[3]:dhcp-6-opt-3 = val-3
-DHCP6.OPTION[4]:dhcp-6-opt-4 = val-4
-DHCP6.OPTION[5]:dhcp-6-opt-5 = val-5
-CONNECTIONS.AVAILABLE-CONNECTION-PATHS:/org/freedesktop/NetworkManager/Settings/Connection/{2}
-CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
-
 <<<
 size: 894
-location: clients/tests/test-client.py:1051:test_004()/271
+location: clients/tests/test-client.py:1065:test_004()/271
 cmd: $NMCLI --terse --color yes dev show wlan0
 lang: C
 returncode: 0
@@ -17928,7 +18208,7 @@ IP6.DOMAIN[6]:sear6.foo4.bar
 
 <<<
 size: 904
-location: clients/tests/test-client.py:1051:test_004()/272
+location: clients/tests/test-client.py:1065:test_004()/272
 cmd: $NMCLI --terse --color yes dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
@@ -17960,12 +18240,12 @@ IP6.DOMAIN[5]:sear6.foo3.bar
 IP6.DOMAIN[6]:sear6.foo4.bar
 
 <<<
-size: 2857
-location: clients/tests/test-client.py:1054:test_004()/273
+size: 2921
+location: clients/tests/test-client.py:1068:test_004()/273
 cmd: $NMCLI --terse --color yes -f all dev show wlan0
 lang: C
 returncode: 0
-stdout: 2694 bytes
+stdout: 2758 bytes
 >>>
 GENERAL.DEVICE:wlan0
 GENERAL.TYPE:wifi
@@ -17979,6 +18259,8 @@ GENERAL.HWADDR:13:E0:74:85:7C:D9
 GENERAL.MTU:0
 GENERAL.STATE:20 (unavailable)
 GENERAL.REASON:0 (No reason given)
+GENERAL.IP4-CONNECTIVITY:0 (unknown)
+GENERAL.IP6-CONNECTIVITY:0 (unknown)
 GENERAL.UDI:/sys/devices/virtual/wlan0
 GENERAL.IP-IFACE:
 GENERAL.IS-SOFTWARE:no
@@ -18019,7 +18301,7 @@ AP[2].CHAN:1
 AP[2].RATE:54 Mbit/s
 AP[2].SIGNAL:81
 AP[2].BARS:****
-AP[2].SECURITY:WPA1 WPA2
+AP[2].SECURITY:WPA1
 AP[3].IN-USE: 
 AP[3].SSID:wlan0-ap-3
 AP[3].MODE:Infra
@@ -18027,7 +18309,7 @@ AP[3].CHAN:1
 AP[3].RATE:54 Mbit/s
 AP[3].SIGNAL:55
 AP[3].BARS:**  
-AP[3].SECURITY:WPA1 WPA2
+AP[3].SECURITY:WPA3
 IP4.ADDRESS[1]:192.168.228.18/32
 IP4.ADDRESS[2]:192.168.209.179/25
 IP4.GATEWAY:192.168.41.120
@@ -18058,12 +18340,12 @@ CONNECTIONS.AVAILABLE-CONNECTION-PATHS:/org/freedesktop/NetworkManager/Settings/
 CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 
 <<<
-size: 2894
-location: clients/tests/test-client.py:1054:test_004()/274
+size: 2958
+location: clients/tests/test-client.py:1068:test_004()/274
 cmd: $NMCLI --terse --color yes -f all dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2721 bytes
+stdout: 2785 bytes
 >>>
 GENERAL.DEVICE:wlan0
 GENERAL.TYPE:wifi
@@ -18077,6 +18359,8 @@ GENERAL.HWADDR:13:E0:74:85:7C:D9
 GENERAL.MTU:0
 GENERAL.STATE:20 (unavailable)
 GENERAL.REASON:0 (No reason given)
+GENERAL.IP4-CONNECTIVITY:0 (unknown)
+GENERAL.IP6-CONNECTIVITY:0 (unknown)
 GENERAL.UDI:/sys/devices/virtual/wlan0
 GENERAL.IP-IFACE:
 GENERAL.IS-SOFTWARE:no
@@ -18117,7 +18401,7 @@ AP[2].CHAN:1
 AP[2].RATE:54 Mb/s
 AP[2].SIGNAL:81
 AP[2].BARS:****
-AP[2].SECURITY:WPA1 WPA2
+AP[2].SECURITY:WPA1
 AP[3].IN-USE: 
 AP[3].SSID:wlan0-ap-3
 AP[3].MODE:Infrastruktura
@@ -18125,7 +18409,7 @@ AP[3].CHAN:1
 AP[3].RATE:54 Mb/s
 AP[3].SIGNAL:55
 AP[3].BARS:**  
-AP[3].SECURITY:WPA1 WPA2
+AP[3].SECURITY:WPA3
 IP4.ADDRESS[1]:192.168.228.18/32
 IP4.ADDRESS[2]:192.168.209.179/25
 IP4.GATEWAY:192.168.41.120
@@ -18156,12 +18440,12 @@ CONNECTIONS.AVAILABLE-CONNECTION-PATHS:/org/freedesktop/NetworkManager/Settings/
 CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 
 <<<
-size: 1128
-location: clients/tests/test-client.py:1057:test_004()/275
+size: 1203
+location: clients/tests/test-client.py:1071:test_004()/275
 cmd: $NMCLI --terse --color yes -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: C
 returncode: 0
-stdout: 931 bytes
+stdout: 1005 bytes
 >>>
 GENERAL.DEVICE:wlan0
 GENERAL.TYPE:wifi
@@ -18175,6 +18459,8 @@ GENERAL.HWADDR:13:E0:74:85:7C:D9
 GENERAL.MTU:0
 GENERAL.STATE:20 (unavailable)
 GENERAL.REASON:0 (No reason given)
+GENERAL.IP4-CONNECTIVITY:0 (unknown)
+GENERAL.IP6-CONNECTIVITY:0 (unknown)
 GENERAL.UDI:/sys/devices/virtual/wlan0
 GENERAL.IP-IFACE:
 GENERAL.IS-SOFTWARE:no
@@ -18199,12 +18485,12 @@ WIFI-PROPERTIES.2GHZ:unknown
 WIFI-PROPERTIES.5GHZ:unknown
 
 <<<
-size: 1138
-location: clients/tests/test-client.py:1057:test_004()/276
+size: 1213
+location: clients/tests/test-client.py:1071:test_004()/276
 cmd: $NMCLI --terse --color yes -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 931 bytes
+stdout: 1005 bytes
 >>>
 GENERAL.DEVICE:wlan0
 GENERAL.TYPE:wifi
@@ -18218,6 +18504,8 @@ GENERAL.HWADDR:13:E0:74:85:7C:D9
 GENERAL.MTU:0
 GENERAL.STATE:20 (unavailable)
 GENERAL.REASON:0 (No reason given)
+GENERAL.IP4-CONNECTIVITY:0 (unknown)
+GENERAL.IP6-CONNECTIVITY:0 (unknown)
 GENERAL.UDI:/sys/devices/virtual/wlan0
 GENERAL.IP-IFACE:
 GENERAL.IS-SOFTWARE:no
@@ -18242,12 +18530,12 @@ WIFI-PROPERTIES.2GHZ:unknown
 WIFI-PROPERTIES.5GHZ:unknown
 
 <<<
-size: 1128
-location: clients/tests/test-client.py:1060:test_004()/277
+size: 1203
+location: clients/tests/test-client.py:1074:test_004()/277
 cmd: $NMCLI --terse --color yes -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: C
 returncode: 0
-stdout: 931 bytes
+stdout: 1005 bytes
 >>>
 GENERAL.DEVICE:wlan0
 GENERAL.TYPE:wifi
@@ -18261,6 +18549,8 @@ GENERAL.HWADDR:13:E0:74:85:7C:D9
 GENERAL.MTU:0
 GENERAL.STATE:20 (unavailable)
 GENERAL.REASON:0 (No reason given)
+GENERAL.IP4-CONNECTIVITY:0 (unknown)
+GENERAL.IP6-CONNECTIVITY:0 (unknown)
 GENERAL.UDI:/sys/devices/virtual/wlan0
 GENERAL.IP-IFACE:
 GENERAL.IS-SOFTWARE:no
@@ -18285,12 +18575,12 @@ WIFI-PROPERTIES.2GHZ:unknown
 WIFI-PROPERTIES.5GHZ:unknown
 
 <<<
-size: 1138
-location: clients/tests/test-client.py:1060:test_004()/278
+size: 1213
+location: clients/tests/test-client.py:1074:test_004()/278
 cmd: $NMCLI --terse --color yes -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 931 bytes
+stdout: 1005 bytes
 >>>
 GENERAL.DEVICE:wlan0
 GENERAL.TYPE:wifi
@@ -18304,6 +18594,8 @@ GENERAL.HWADDR:13:E0:74:85:7C:D9
 GENERAL.MTU:0
 GENERAL.STATE:20 (unavailable)
 GENERAL.REASON:0 (No reason given)
+GENERAL.IP4-CONNECTIVITY:0 (unknown)
+GENERAL.IP6-CONNECTIVITY:0 (unknown)
 GENERAL.UDI:/sys/devices/virtual/wlan0
 GENERAL.IP-IFACE:
 GENERAL.IS-SOFTWARE:no
@@ -18329,189 +18621,201 @@ WIFI-PROPERTIES.5GHZ:unknown
 
 <<<
 size: 560
-location: clients/tests/test-client.py:1063:test_004()/279
+location: clients/tests/test-client.py:1077:test_004()/279
 cmd: $NMCLI --terse --color yes -f DEVICE,TYPE,DBUS-PATH dev
 lang: C
 returncode: 0
 stdout: 391 bytes
 >>>
+wlan0:wifi:/org/freedesktop/NetworkManager/Devices/3
 eth0:ethernet:/org/freedesktop/NetworkManager/Devices/1
 eth1:ethernet:/org/freedesktop/NetworkManager/Devices/2
 wlan1:wifi:/org/freedesktop/NetworkManager/Devices/4
 wlan1:wifi:/org/freedesktop/NetworkManager/Devices/5
-wlan0:wifi:/org/freedesktop/NetworkManager/Devices/3
 
 <<<
 size: 570
-location: clients/tests/test-client.py:1063:test_004()/280
+location: clients/tests/test-client.py:1077:test_004()/280
 cmd: $NMCLI --terse --color yes -f DEVICE,TYPE,DBUS-PATH dev
 lang: pl_PL.UTF-8
 returncode: 0
 stdout: 391 bytes
 >>>
+wlan0:wifi:/org/freedesktop/NetworkManager/Devices/3
 eth0:ethernet:/org/freedesktop/NetworkManager/Devices/1
 eth1:ethernet:/org/freedesktop/NetworkManager/Devices/2
 wlan1:wifi:/org/freedesktop/NetworkManager/Devices/4
 wlan1:wifi:/org/freedesktop/NetworkManager/Devices/5
-wlan0:wifi:/org/freedesktop/NetworkManager/Devices/3
 
 <<<
-size: 1799
-location: clients/tests/test-client.py:1066:test_004()/281
+size: 1711
+location: clients/tests/test-client.py:1080:test_004()/281
 cmd: $NMCLI --terse --color yes -f ALL device wifi list
 lang: C
 returncode: 0
-stdout: 1634 bytes
+stdout: 1546 bytes
 >>>
-AP[1]:wlan1-ap-4:776C616E312D61702D34:94\:2B\:E8\:F6\:D2\:86:Infra:1:2412 MHz:54 Mbit/s:48:**  :WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan1:no: :/org/freedesktop/NetworkManager/AccessPoint/4
+AP[1]:wlan0-ap-2:776C616E302D61702D32:C0\:E2\:BE\:E8\:EF\:B6:Infra:1:2412 MHz:54 Mbit/s:92:****:WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:no: :/org/freedesktop/NetworkManager/AccessPoint/2
+AP[2]:wlan0-ap-1:776C616E302D61702D31:61\:95\:77\:AC\:1E\:4C:Infra:1:2412 MHz:54 Mbit/s:81:****:WPA1:pair_tkip pair_ccmp group_tkip group_ccmp psk:(none):wlan0:no: :/org/freedesktop/NetworkManager/AccessPoint/1
+AP[3]:wlan0-ap-3:776C616E302D61702D33:9B\:F6\:B7\:EC\:97\:76:Infra:1:2412 MHz:54 Mbit/s:55:**  :WPA3:(none):pair_tkip pair_ccmp group_tkip group_ccmp sae:wlan0:no: :/org/freedesktop/NetworkManager/AccessPoint/3
 
+AP[1]:wlan1-ap-4:776C616E312D61702D34:94\:2B\:E8\:F6\:D2\:86:Infra:1:2412 MHz:54 Mbit/s:48:**  :WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan1:no: :/org/freedesktop/NetworkManager/AccessPoint/4
 
-AP[1]:wlan0-ap-2:776C616E302D61702D32:C0\:E2\:BE\:E8\:EF\:B6:Infra:1:2412 MHz:54 Mbit/s:92:****:WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:no: :/org/freedesktop/NetworkManager/AccessPoint/2
-AP[2]:wlan0-ap-1:776C616E302D61702D31:61\:95\:77\:AC\:1E\:4C:Infra:1:2412 MHz:54 Mbit/s:81:****:WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:no: :/org/freedesktop/NetworkManager/AccessPoint/1
-AP[3]:wlan0-ap-3:776C616E302D61702D33:9B\:F6\:B7\:EC\:97\:76:Infra:1:2412 MHz:54 Mbit/s:55:**  :WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:no: :/org/freedesktop/NetworkManager/AccessPoint/3
 
 <<<
-size: 1857
-location: clients/tests/test-client.py:1066:test_004()/282
+size: 1769
+location: clients/tests/test-client.py:1080:test_004()/282
 cmd: $NMCLI --terse --color yes -f ALL device wifi list
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 1682 bytes
+stdout: 1594 bytes
 >>>
+AP[1]:wlan0-ap-2:776C616E302D61702D32:C0\:E2\:BE\:E8\:EF\:B6:Infrastruktura:1:2412 MHz:54 Mb/s:92:****:WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:nie: :/org/freedesktop/NetworkManager/AccessPoint/2
+AP[2]:wlan0-ap-1:776C616E302D61702D31:61\:95\:77\:AC\:1E\:4C:Infrastruktura:1:2412 MHz:54 Mb/s:81:****:WPA1:pair_tkip pair_ccmp group_tkip group_ccmp psk:(brak):wlan0:nie: :/org/freedesktop/NetworkManager/AccessPoint/1
+AP[3]:wlan0-ap-3:776C616E302D61702D33:9B\:F6\:B7\:EC\:97\:76:Infrastruktura:1:2412 MHz:54 Mb/s:55:**  :WPA3:(brak):pair_tkip pair_ccmp group_tkip group_ccmp sae:wlan0:nie: :/org/freedesktop/NetworkManager/AccessPoint/3
+
 AP[1]:wlan1-ap-4:776C616E312D61702D34:94\:2B\:E8\:F6\:D2\:86:Infrastruktura:1:2412 MHz:54 Mb/s:48:**  :WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan1:nie: :/org/freedesktop/NetworkManager/AccessPoint/4
 
 
-AP[1]:wlan0-ap-2:776C616E302D61702D32:C0\:E2\:BE\:E8\:EF\:B6:Infrastruktura:1:2412 MHz:54 Mb/s:92:****:WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:nie: :/org/freedesktop/NetworkManager/AccessPoint/2
-AP[2]:wlan0-ap-1:776C616E302D61702D31:61\:95\:77\:AC\:1E\:4C:Infrastruktura:1:2412 MHz:54 Mb/s:81:****:WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:nie: :/org/freedesktop/NetworkManager/AccessPoint/1
-AP[3]:wlan0-ap-3:776C616E302D61702D33:9B\:F6\:B7\:EC\:97\:76:Infrastruktura:1:2412 MHz:54 Mb/s:55:**  :WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:nie: :/org/freedesktop/NetworkManager/AccessPoint/3
-
 <<<
-size: 653
-location: clients/tests/test-client.py:1068:test_004()/283
+size: 643
+location: clients/tests/test-client.py:1082:test_004()/283
 cmd: $NMCLI --terse --color yes -f COMMON device wifi list
 lang: C
 returncode: 0
-stdout: 486 bytes
+stdout: 476 bytes
 >>>
- :wlan1-ap-4:Infra:1:54 Mbit/s:48:**  :WPA1 WPA2
+ :wlan0-ap-2:Infra:1:54 Mbit/s:92:****:WPA1 WPA2
+ :wlan0-ap-1:Infra:1:54 Mbit/s:81:****:WPA1
+ :wlan0-ap-3:Infra:1:54 Mbit/s:55:**  :WPA3
 
+ :wlan1-ap-4:Infra:1:54 Mbit/s:48:**  :WPA1 WPA2
 
- :wlan0-ap-2:Infra:1:54 Mbit/s:92:****:WPA1 WPA2
- :wlan0-ap-1:Infra:1:54 Mbit/s:81:****:WPA1 WPA2
- :wlan0-ap-3:Infra:1:54 Mbit/s:55:**  :WPA1 WPA2
 
 <<<
-size: 699
-location: clients/tests/test-client.py:1068:test_004()/284
+size: 689
+location: clients/tests/test-client.py:1082:test_004()/284
 cmd: $NMCLI --terse --color yes -f COMMON device wifi list
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 522 bytes
+stdout: 512 bytes
 >>>
- :wlan1-ap-4:Infrastruktura:1:54 Mb/s:48:**  :WPA1 WPA2
+ :wlan0-ap-2:Infrastruktura:1:54 Mb/s:92:****:WPA1 WPA2
+ :wlan0-ap-1:Infrastruktura:1:54 Mb/s:81:****:WPA1
+ :wlan0-ap-3:Infrastruktura:1:54 Mb/s:55:**  :WPA3
 
+ :wlan1-ap-4:Infrastruktura:1:54 Mb/s:48:**  :WPA1 WPA2
 
- :wlan0-ap-2:Infrastruktura:1:54 Mb/s:92:****:WPA1 WPA2
- :wlan0-ap-1:Infrastruktura:1:54 Mb/s:81:****:WPA1 WPA2
- :wlan0-ap-3:Infrastruktura:1:54 Mb/s:55:**  :WPA1 WPA2
 
 <<<
-size: 1912
-location: clients/tests/test-client.py:1071:test_004()/285
+size: 1824
+location: clients/tests/test-client.py:1085:test_004()/285
 cmd: $NMCLI --terse --color yes -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list
 lang: C
 returncode: 0
-stdout: 1634 bytes
+stdout: 1546 bytes
 >>>
+AP[1]:wlan0-ap-2:776C616E302D61702D32:C0\:E2\:BE\:E8\:EF\:B6:Infra:1:2412 MHz:54 Mbit/s:92:****:WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:no: :/org/freedesktop/NetworkManager/AccessPoint/2
+AP[2]:wlan0-ap-1:776C616E302D61702D31:61\:95\:77\:AC\:1E\:4C:Infra:1:2412 MHz:54 Mbit/s:81:****:WPA1:pair_tkip pair_ccmp group_tkip group_ccmp psk:(none):wlan0:no: :/org/freedesktop/NetworkManager/AccessPoint/1
+AP[3]:wlan0-ap-3:776C616E302D61702D33:9B\:F6\:B7\:EC\:97\:76:Infra:1:2412 MHz:54 Mbit/s:55:**  :WPA3:(none):pair_tkip pair_ccmp group_tkip group_ccmp sae:wlan0:no: :/org/freedesktop/NetworkManager/AccessPoint/3
+
 AP[1]:wlan1-ap-4:776C616E312D61702D34:94\:2B\:E8\:F6\:D2\:86:Infra:1:2412 MHz:54 Mbit/s:48:**  :WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan1:no: :/org/freedesktop/NetworkManager/AccessPoint/4
 
 
-AP[1]:wlan0-ap-2:776C616E302D61702D32:C0\:E2\:BE\:E8\:EF\:B6:Infra:1:2412 MHz:54 Mbit/s:92:****:WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:no: :/org/freedesktop/NetworkManager/AccessPoint/2
-AP[2]:wlan0-ap-1:776C616E302D61702D31:61\:95\:77\:AC\:1E\:4C:Infra:1:2412 MHz:54 Mbit/s:81:****:WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:no: :/org/freedesktop/NetworkManager/AccessPoint/1
-AP[3]:wlan0-ap-3:776C616E302D61702D33:9B\:F6\:B7\:EC\:97\:76:Infra:1:2412 MHz:54 Mbit/s:55:**  :WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:no: :/org/freedesktop/NetworkManager/AccessPoint/3
-
 <<<
-size: 1970
-location: clients/tests/test-client.py:1071:test_004()/286
+size: 1882
+location: clients/tests/test-client.py:1085:test_004()/286
 cmd: $NMCLI --terse --color yes -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 1682 bytes
+stdout: 1594 bytes
 >>>
-AP[1]:wlan1-ap-4:776C616E312D61702D34:94\:2B\:E8\:F6\:D2\:86:Infrastruktura:1:2412 MHz:54 Mb/s:48:**  :WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan1:nie: :/org/freedesktop/NetworkManager/AccessPoint/4
+AP[1]:wlan0-ap-2:776C616E302D61702D32:C0\:E2\:BE\:E8\:EF\:B6:Infrastruktura:1:2412 MHz:54 Mb/s:92:****:WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:nie: :/org/freedesktop/NetworkManager/AccessPoint/2
+AP[2]:wlan0-ap-1:776C616E302D61702D31:61\:95\:77\:AC\:1E\:4C:Infrastruktura:1:2412 MHz:54 Mb/s:81:****:WPA1:pair_tkip pair_ccmp group_tkip group_ccmp psk:(brak):wlan0:nie: :/org/freedesktop/NetworkManager/AccessPoint/1
+AP[3]:wlan0-ap-3:776C616E302D61702D33:9B\:F6\:B7\:EC\:97\:76:Infrastruktura:1:2412 MHz:54 Mb/s:55:**  :WPA3:(brak):pair_tkip pair_ccmp group_tkip group_ccmp sae:wlan0:nie: :/org/freedesktop/NetworkManager/AccessPoint/3
 
+AP[1]:wlan1-ap-4:776C616E312D61702D34:94\:2B\:E8\:F6\:D2\:86:Infrastruktura:1:2412 MHz:54 Mb/s:48:**  :WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan1:nie: :/org/freedesktop/NetworkManager/AccessPoint/4
 
-AP[1]:wlan0-ap-2:776C616E302D61702D32:C0\:E2\:BE\:E8\:EF\:B6:Infrastruktura:1:2412 MHz:54 Mb/s:92:****:WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:nie: :/org/freedesktop/NetworkManager/AccessPoint/2
-AP[2]:wlan0-ap-1:776C616E302D61702D31:61\:95\:77\:AC\:1E\:4C:Infrastruktura:1:2412 MHz:54 Mb/s:81:****:WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:nie: :/org/freedesktop/NetworkManager/AccessPoint/1
-AP[3]:wlan0-ap-3:776C616E302D61702D33:9B\:F6\:B7\:EC\:97\:76:Infrastruktura:1:2412 MHz:54 Mb/s:55:**  :WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:nie: :/org/freedesktop/NetworkManager/AccessPoint/3
 
 <<<
-size: 596
-location: clients/tests/test-client.py:1073:test_004()/287
+size: 598
+location: clients/tests/test-client.py:1087:test_004()/287
 cmd: $NMCLI --terse --color yes -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: C
 returncode: 0
-stdout: 408 bytes
+stdout: 410 bytes
 >>>
 AP[1]:wlan0-ap-2:776C616E302D61702D32:C0\:E2\:BE\:E8\:EF\:B6:Infra:1:2412 MHz:54 Mbit/s:92:****:WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:no: :/org/freedesktop/NetworkManager/AccessPoint/2
 
+
+
 <<<
-size: 618
-location: clients/tests/test-client.py:1073:test_004()/288
+size: 620
+location: clients/tests/test-client.py:1087:test_004()/288
 cmd: $NMCLI --terse --color yes -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 420 bytes
+stdout: 422 bytes
 >>>
 AP[1]:wlan0-ap-2:776C616E302D61702D32:C0\:E2\:BE\:E8\:EF\:B6:Infrastruktura:1:2412 MHz:54 Mb/s:92:****:WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:nie: :/org/freedesktop/NetworkManager/AccessPoint/2
 
+
+
 <<<
-size: 312
-location: clients/tests/test-client.py:1075:test_004()/289
+size: 314
+location: clients/tests/test-client.py:1089:test_004()/289
 cmd: $NMCLI --terse --color yes -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: C
 returncode: 0
-stdout: 121 bytes
+stdout: 123 bytes
 >>>
  :wlan0-ap-2:Infra:1:54 Mbit/s:92:****:WPA1 WPA2
 
+
+
 <<<
-size: 331
-location: clients/tests/test-client.py:1075:test_004()/290
+size: 333
+location: clients/tests/test-client.py:1089:test_004()/290
 cmd: $NMCLI --terse --color yes -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 130 bytes
+stdout: 132 bytes
 >>>
  :wlan0-ap-2:Infrastruktura:1:54 Mb/s:92:****:WPA1 WPA2
 
+
+
 <<<
-size: 709
-location: clients/tests/test-client.py:1078:test_004()/291
+size: 711
+location: clients/tests/test-client.py:1092:test_004()/291
 cmd: $NMCLI --terse --color yes -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: C
 returncode: 0
-stdout: 408 bytes
+stdout: 410 bytes
 >>>
 AP[1]:wlan0-ap-2:776C616E302D61702D32:C0\:E2\:BE\:E8\:EF\:B6:Infra:1:2412 MHz:54 Mbit/s:92:****:WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:no: :/org/freedesktop/NetworkManager/AccessPoint/2
 
+
+
 <<<
-size: 731
-location: clients/tests/test-client.py:1078:test_004()/292
+size: 733
+location: clients/tests/test-client.py:1092:test_004()/292
 cmd: $NMCLI --terse --color yes -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 420 bytes
+stdout: 422 bytes
 >>>
 AP[1]:wlan0-ap-2:776C616E302D61702D32:C0\:E2\:BE\:E8\:EF\:B6:Infrastruktura:1:2412 MHz:54 Mb/s:92:****:WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:nie: :/org/freedesktop/NetworkManager/AccessPoint/2
 
+
+
 <<<
-size: 2860
-location: clients/tests/test-client.py:1080:test_004()/293
+size: 2924
+location: clients/tests/test-client.py:1094:test_004()/293
 cmd: $NMCLI --terse --color yes -f ALL device show wlan0
 lang: C
 returncode: 0
-stdout: 2694 bytes
+stdout: 2758 bytes
 >>>
 GENERAL.DEVICE:wlan0
 GENERAL.TYPE:wifi
@@ -18525,6 +18829,8 @@ GENERAL.HWADDR:13:E0:74:85:7C:D9
 GENERAL.MTU:0
 GENERAL.STATE:20 (unavailable)
 GENERAL.REASON:0 (No reason given)
+GENERAL.IP4-CONNECTIVITY:0 (unknown)
+GENERAL.IP6-CONNECTIVITY:0 (unknown)
 GENERAL.UDI:/sys/devices/virtual/wlan0
 GENERAL.IP-IFACE:
 GENERAL.IS-SOFTWARE:no
@@ -18565,7 +18871,7 @@ AP[2].CHAN:1
 AP[2].RATE:54 Mbit/s
 AP[2].SIGNAL:81
 AP[2].BARS:****
-AP[2].SECURITY:WPA1 WPA2
+AP[2].SECURITY:WPA1
 AP[3].IN-USE: 
 AP[3].SSID:wlan0-ap-3
 AP[3].MODE:Infra
@@ -18573,7 +18879,7 @@ AP[3].CHAN:1
 AP[3].RATE:54 Mbit/s
 AP[3].SIGNAL:55
 AP[3].BARS:**  
-AP[3].SECURITY:WPA1 WPA2
+AP[3].SECURITY:WPA3
 IP4.ADDRESS[1]:192.168.228.18/32
 IP4.ADDRESS[2]:192.168.209.179/25
 IP4.GATEWAY:192.168.41.120
@@ -18604,12 +18910,12 @@ CONNECTIONS.AVAILABLE-CONNECTION-PATHS:/org/freedesktop/NetworkManager/Settings/
 CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 
 <<<
-size: 2897
-location: clients/tests/test-client.py:1080:test_004()/294
+size: 2961
+location: clients/tests/test-client.py:1094:test_004()/294
 cmd: $NMCLI --terse --color yes -f ALL device show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2721 bytes
+stdout: 2785 bytes
 >>>
 GENERAL.DEVICE:wlan0
 GENERAL.TYPE:wifi
@@ -18623,6 +18929,8 @@ GENERAL.HWADDR:13:E0:74:85:7C:D9
 GENERAL.MTU:0
 GENERAL.STATE:20 (unavailable)
 GENERAL.REASON:0 (No reason given)
+GENERAL.IP4-CONNECTIVITY:0 (unknown)
+GENERAL.IP6-CONNECTIVITY:0 (unknown)
 GENERAL.UDI:/sys/devices/virtual/wlan0
 GENERAL.IP-IFACE:
 GENERAL.IS-SOFTWARE:no
@@ -18663,7 +18971,7 @@ AP[2].CHAN:1
 AP[2].RATE:54 Mb/s
 AP[2].SIGNAL:81
 AP[2].BARS:****
-AP[2].SECURITY:WPA1 WPA2
+AP[2].SECURITY:WPA1
 AP[3].IN-USE: 
 AP[3].SSID:wlan0-ap-3
 AP[3].MODE:Infrastruktura
@@ -18671,7 +18979,7 @@ AP[3].CHAN:1
 AP[3].RATE:54 Mb/s
 AP[3].SIGNAL:55
 AP[3].BARS:**  
-AP[3].SECURITY:WPA1 WPA2
+AP[3].SECURITY:WPA3
 IP4.ADDRESS[1]:192.168.228.18/32
 IP4.ADDRESS[2]:192.168.209.179/25
 IP4.GATEWAY:192.168.41.120
@@ -18703,7 +19011,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-
 
 <<<
 size: 907
-location: clients/tests/test-client.py:1082:test_004()/295
+location: clients/tests/test-client.py:1096:test_004()/295
 cmd: $NMCLI --terse --color yes -f COMMON device show wlan0
 lang: C
 returncode: 0
@@ -18736,7 +19044,7 @@ IP6.DOMAIN[6]:sear6.foo4.bar
 
 <<<
 size: 917
-location: clients/tests/test-client.py:1082:test_004()/296
+location: clients/tests/test-client.py:1096:test_004()/296
 cmd: $NMCLI --terse --color yes -f COMMON device show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
@@ -18768,12 +19076,12 @@ IP6.DOMAIN[5]:sear6.foo3.bar
 IP6.DOMAIN[6]:sear6.foo4.bar
 
 <<<
-size: 2998
-location: clients/tests/test-client.py:1084:test_004()/297
+size: 3062
+location: clients/tests/test-client.py:1098:test_004()/297
 cmd: $NMCLI --terse --color yes -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0
 lang: C
 returncode: 0
-stdout: 2694 bytes
+stdout: 2758 bytes
 >>>
 GENERAL.DEVICE:wlan0
 GENERAL.TYPE:wifi
@@ -18787,6 +19095,8 @@ GENERAL.HWADDR:13:E0:74:85:7C:D9
 GENERAL.MTU:0
 GENERAL.STATE:20 (unavailable)
 GENERAL.REASON:0 (No reason given)
+GENERAL.IP4-CONNECTIVITY:0 (unknown)
+GENERAL.IP6-CONNECTIVITY:0 (unknown)
 GENERAL.UDI:/sys/devices/virtual/wlan0
 GENERAL.IP-IFACE:
 GENERAL.IS-SOFTWARE:no
@@ -18827,7 +19137,7 @@ AP[2].CHAN:1
 AP[2].RATE:54 Mbit/s
 AP[2].SIGNAL:81
 AP[2].BARS:****
-AP[2].SECURITY:WPA1 WPA2
+AP[2].SECURITY:WPA1
 AP[3].IN-USE: 
 AP[3].SSID:wlan0-ap-3
 AP[3].MODE:Infra
@@ -18835,7 +19145,7 @@ AP[3].CHAN:1
 AP[3].RATE:54 Mbit/s
 AP[3].SIGNAL:55
 AP[3].BARS:**  
-AP[3].SECURITY:WPA1 WPA2
+AP[3].SECURITY:WPA3
 IP4.ADDRESS[1]:192.168.228.18/32
 IP4.ADDRESS[2]:192.168.209.179/25
 IP4.GATEWAY:192.168.41.120
@@ -18866,12 +19176,12 @@ CONNECTIONS.AVAILABLE-CONNECTION-PATHS:/org/freedesktop/NetworkManager/Settings/
 CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 
 <<<
-size: 3035
-location: clients/tests/test-client.py:1084:test_004()/298
+size: 3099
+location: clients/tests/test-client.py:1098:test_004()/298
 cmd: $NMCLI --terse --color yes -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2721 bytes
+stdout: 2785 bytes
 >>>
 GENERAL.DEVICE:wlan0
 GENERAL.TYPE:wifi
@@ -18885,6 +19195,8 @@ GENERAL.HWADDR:13:E0:74:85:7C:D9
 GENERAL.MTU:0
 GENERAL.STATE:20 (unavailable)
 GENERAL.REASON:0 (No reason given)
+GENERAL.IP4-CONNECTIVITY:0 (unknown)
+GENERAL.IP6-CONNECTIVITY:0 (unknown)
 GENERAL.UDI:/sys/devices/virtual/wlan0
 GENERAL.IP-IFACE:
 GENERAL.IS-SOFTWARE:no
@@ -18925,7 +19237,7 @@ AP[2].CHAN:1
 AP[2].RATE:54 Mb/s
 AP[2].SIGNAL:81
 AP[2].BARS:****
-AP[2].SECURITY:WPA1 WPA2
+AP[2].SECURITY:WPA1
 AP[3].IN-USE: 
 AP[3].SSID:wlan0-ap-3
 AP[3].MODE:Infrastruktura
@@ -18933,7 +19245,7 @@ AP[3].CHAN:1
 AP[3].RATE:54 Mb/s
 AP[3].SIGNAL:55
 AP[3].BARS:**  
-AP[3].SECURITY:WPA1 WPA2
+AP[3].SECURITY:WPA3
 IP4.ADDRESS[1]:192.168.228.18/32
 IP4.ADDRESS[2]:192.168.209.179/25
 IP4.GATEWAY:192.168.41.120
@@ -18965,7 +19277,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-
 
 <<<
 size: 2978
-location: clients/tests/test-client.py:1022:test_004()/299
+location: clients/tests/test-client.py:1036:test_004()/299
 cmd: $NMCLI --mode tabular con s con-vpn-1
 lang: C
 returncode: 0
@@ -18993,12 +19305,12 @@ NAME  TYPE     USERNAME  GATEWAY  BANNER                            VPN-STATE
 VPN   openvpn  --        --       *** VPN connection con-vpn-1 ***  5 - VPN connected  key1 = val1 | key2 = val2 | key3 = val3 
 
 <<<
-size: 2999
-location: clients/tests/test-client.py:1022:test_004()/300
+size: 3001
+location: clients/tests/test-client.py:1036:test_004()/300
 cmd: $NMCLI --mode tabular con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2837 bytes
+stdout: 2839 bytes
 >>>
 name        id         uuid                                  stable-id  type  interface-name  autoconnect  autoconnect-priority  autoconnect-retries  multi-connect  auth-retries  timestamp  read-only  permissions  zone  master  slave-type  autoconnect-slaves  secondaries  gateway-ping-timeout  metered   lldp     mdns          llmnr        
 connection  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  --         vpn   --              tak          0                     -1 (default)         0 (default)    -1            0          nie        --           --    --      --          -1 (default)        --           0                     nieznane  default  -1 (default)  -1 (default) 
@@ -19019,11 +19331,11 @@ GROUP    NAME       UUID                                  DEVICES  STATE       D
 GENERAL  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  wlan0    aktywowano  nie      nie       --           tak  /org/freedesktop/NetworkManager/ActiveConnection/2  /org/freedesktop/NetworkManager/Settings/Connection/3  --    --          
 
 NAME  TYPE     USERNAME  GATEWAY  BANNER                            VPN-STATE            CFG                                     
-VPN   openvpn  --        --       *** VPN connection con-vpn-1 ***  5 - Połączono z VPN  key1 = val1 | key2 = val2 | key3 = val3 
+VPN   openvpn  --        --       *** VPN connection con-vpn-1 ***  5 — Połączono z VPN  key1 = val1 | key2 = val2 | key3 = val3 
 
 <<<
 size: 2978
-location: clients/tests/test-client.py:1024:test_004()/301
+location: clients/tests/test-client.py:1038:test_004()/301
 cmd: $NMCLI --mode tabular con s con-vpn-1
 lang: C
 returncode: 0
@@ -19051,12 +19363,12 @@ NAME  TYPE     USERNAME  GATEWAY  BANNER                            VPN-STATE
 VPN   openvpn  --        --       *** VPN connection con-vpn-1 ***  5 - VPN connected  key1 = val1 | key2 = val2 | key3 = val3 
 
 <<<
-size: 2999
-location: clients/tests/test-client.py:1024:test_004()/302
+size: 3001
+location: clients/tests/test-client.py:1038:test_004()/302
 cmd: $NMCLI --mode tabular con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2837 bytes
+stdout: 2839 bytes
 >>>
 name        id         uuid                                  stable-id  type  interface-name  autoconnect  autoconnect-priority  autoconnect-retries  multi-connect  auth-retries  timestamp  read-only  permissions  zone  master  slave-type  autoconnect-slaves  secondaries  gateway-ping-timeout  metered   lldp     mdns          llmnr        
 connection  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  --         vpn   --              tak          0                     -1 (default)         0 (default)    -1            0          nie        --           --    --      --          -1 (default)        --           0                     nieznane  default  -1 (default)  -1 (default) 
@@ -19077,11 +19389,11 @@ GROUP    NAME       UUID                                  DEVICES  STATE       D
 GENERAL  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  wlan0    aktywowano  nie      nie       --           tak  /org/freedesktop/NetworkManager/ActiveConnection/2  /org/freedesktop/NetworkManager/Settings/Connection/3  --    --          
 
 NAME  TYPE     USERNAME  GATEWAY  BANNER                            VPN-STATE            CFG                                     
-VPN   openvpn  --        --       *** VPN connection con-vpn-1 ***  5 - Połączono z VPN  key1 = val1 | key2 = val2 | key3 = val3 
+VPN   openvpn  --        --       *** VPN connection con-vpn-1 ***  5 — Połączono z VPN  key1 = val1 | key2 = val2 | key3 = val3 
 
 <<<
 size: 2246
-location: clients/tests/test-client.py:1027:test_004()/303
+location: clients/tests/test-client.py:1041:test_004()/303
 cmd: $NMCLI --mode tabular -f ALL con s con-vpn-1
 lang: C
 returncode: 0
@@ -19105,7 +19417,7 @@ proxy  none    no            --       --
 
 <<<
 size: 2258
-location: clients/tests/test-client.py:1027:test_004()/304
+location: clients/tests/test-client.py:1041:test_004()/304
 cmd: $NMCLI --mode tabular -f ALL con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
@@ -19129,7 +19441,7 @@ proxy  none    nie           --       --
 
 <<<
 size: 412
-location: clients/tests/test-client.py:1033:test_004()/305
+location: clients/tests/test-client.py:1047:test_004()/305
 cmd: $NMCLI --mode tabular -f VPN con s con-vpn-1
 lang: C
 returncode: 0
@@ -19140,7 +19452,7 @@ vpn   org.freedesktop.NetworkManager.openvpn  --         key1 = val1, key2 = val
 
 <<<
 size: 422
-location: clients/tests/test-client.py:1033:test_004()/306
+location: clients/tests/test-client.py:1047:test_004()/306
 cmd: $NMCLI --mode tabular -f VPN con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
@@ -19151,7 +19463,7 @@ vpn   org.freedesktop.NetworkManager.openvpn  --         key1 = val1, key2 = val
 
 <<<
 size: 644
-location: clients/tests/test-client.py:1036:test_004()/307
+location: clients/tests/test-client.py:1050:test_004()/307
 cmd: $NMCLI --mode tabular -f GENERAL con s con-vpn-1
 lang: C
 returncode: 0
@@ -19162,7 +19474,7 @@ GENERAL  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  wlan0    activated  no
 
 <<<
 size: 656
-location: clients/tests/test-client.py:1036:test_004()/308
+location: clients/tests/test-client.py:1050:test_004()/308
 cmd: $NMCLI --mode tabular -f GENERAL con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
@@ -19173,72 +19485,99 @@ GENERAL  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  wlan0    aktywowano  n
 
 <<<
 size: 399
-location: clients/tests/test-client.py:1039:test_004()/309
+location: clients/tests/test-client.py:1053:test_004()/309
 cmd: $NMCLI --mode tabular dev s
 lang: C
 returncode: 0
 stdout: 258 bytes
 >>>
 DEVICE  TYPE      STATE        CONNECTION 
+wlan0   wifi      unavailable  con-vpn-1  
 eth0    ethernet  unavailable  --         
 eth1    ethernet  unavailable  --         
 wlan1   wifi      unavailable  --         
 wlan1   wifi      unavailable  --         
-wlan0   wifi      unavailable  con-vpn-1  
 
 <<<
 size: 414
-location: clients/tests/test-client.py:1039:test_004()/310
+location: clients/tests/test-client.py:1053:test_004()/310
 cmd: $NMCLI --mode tabular dev s
 lang: pl_PL.UTF-8
 returncode: 0
 stdout: 263 bytes
 >>>
 DEVICE  TYPE      STATE        CONNECTION 
+wlan0   wifi      niedostępne  con-vpn-1  
 eth0    ethernet  niedostępne  --         
 eth1    ethernet  niedostępne  --         
 wlan1   wifi      niedostępne  --         
 wlan1   wifi      niedostępne  --         
-wlan0   wifi      niedostępne  con-vpn-1  
 
 <<<
-size: 1210
-location: clients/tests/test-client.py:1042:test_004()/311
+size: 1426
+location: clients/tests/test-client.py:1056:test_004()/311
 cmd: $NMCLI --mode tabular -f all dev status
 lang: C
 returncode: 0
-stdout: 1056 bytes
+stdout: 1272 bytes
 >>>
-DEVICE  TYPE      STATE        DBUS-PATH                                  CONNECTION  CON-UUID                              CON-PATH                                           
-eth0    ethernet  unavailable  /org/freedesktop/NetworkManager/Devices/1  --          --                                    --                                                 
-eth1    ethernet  unavailable  /org/freedesktop/NetworkManager/Devices/2  --          --                                    --                                                 
-wlan1   wifi      unavailable  /org/freedesktop/NetworkManager/Devices/4  --          --                                    --                                                 
-wlan1   wifi      unavailable  /org/freedesktop/NetworkManager/Devices/5  --          --                                    --                                                 
-wlan0   wifi      unavailable  /org/freedesktop/NetworkManager/Devices/3  con-vpn-1   UUID-con-vpn-1-REPLACED-REPLACED-REP  /org/freedesktop/NetworkManager/ActiveConnection/2 
+DEVICE  TYPE      STATE        IP4-CONNECTIVITY  IP6-CONNECTIVITY  DBUS-PATH                                  CONNECTION  CON-UUID                              CON-PATH                                           
+wlan0   wifi      unavailable  unknown           unknown           /org/freedesktop/NetworkManager/Devices/3  con-vpn-1   UUID-con-vpn-1-REPLACED-REPLACED-REP  /org/freedesktop/NetworkManager/ActiveConnection/2 
+eth0    ethernet  unavailable  unknown           unknown           /org/freedesktop/NetworkManager/Devices/1  --          --                                    --                                                 
+eth1    ethernet  unavailable  unknown           unknown           /org/freedesktop/NetworkManager/Devices/2  --          --                                    --                                                 
+wlan1   wifi      unavailable  unknown           unknown           /org/freedesktop/NetworkManager/Devices/4  --          --                                    --                                                 
+wlan1   wifi      unavailable  unknown           unknown           /org/freedesktop/NetworkManager/Devices/5  --          --                                    --                                                 
 
 <<<
-size: 1225
-location: clients/tests/test-client.py:1042:test_004()/312
+size: 1441
+location: clients/tests/test-client.py:1056:test_004()/312
 cmd: $NMCLI --mode tabular -f all dev status
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 1061 bytes
+stdout: 1277 bytes
 >>>
-DEVICE  TYPE      STATE        DBUS-PATH                                  CONNECTION  CON-UUID                              CON-PATH                                           
-eth0    ethernet  niedostępne  /org/freedesktop/NetworkManager/Devices/1  --          --                                    --                                                 
-eth1    ethernet  niedostępne  /org/freedesktop/NetworkManager/Devices/2  --          --                                    --                                                 
-wlan1   wifi      niedostępne  /org/freedesktop/NetworkManager/Devices/4  --          --                                    --                                                 
-wlan1   wifi      niedostępne  /org/freedesktop/NetworkManager/Devices/5  --          --                                    --                                                 
-wlan0   wifi      niedostępne  /org/freedesktop/NetworkManager/Devices/3  con-vpn-1   UUID-con-vpn-1-REPLACED-REPLACED-REP  /org/freedesktop/NetworkManager/ActiveConnection/2 
+DEVICE  TYPE      STATE        IP4-CONNECTIVITY  IP6-CONNECTIVITY  DBUS-PATH                                  CONNECTION  CON-UUID                              CON-PATH                                           
+wlan0   wifi      niedostępne  nieznane          nieznane          /org/freedesktop/NetworkManager/Devices/3  con-vpn-1   UUID-con-vpn-1-REPLACED-REPLACED-REP  /org/freedesktop/NetworkManager/ActiveConnection/2 
+eth0    ethernet  niedostępne  nieznane          nieznane          /org/freedesktop/NetworkManager/Devices/1  --          --                                    --                                                 
+eth1    ethernet  niedostępne  nieznane          nieznane          /org/freedesktop/NetworkManager/Devices/2  --          --                                    --                                                 
+wlan1   wifi      niedostępne  nieznane          nieznane          /org/freedesktop/NetworkManager/Devices/4  --          --                                    --                                                 
+wlan1   wifi      niedostępne  nieznane          nieznane          /org/freedesktop/NetworkManager/Devices/5  --          --                                    --                                                 
 
 <<<
 size: 6361
-location: clients/tests/test-client.py:1045:test_004()/313
+location: clients/tests/test-client.py:1059:test_004()/313
 cmd: $NMCLI --mode tabular dev show
 lang: C
 returncode: 0
 stdout: 6216 bytes
 >>>
+DEVICE 
+wlan0  
+
+TYPE 
+wifi 
+
+HWADDR            
+13:E0:74:85:7C:D9 
+
+MTU 
+0   
+
+STATE            
+20 (unavailable) 
+
+CONNECTION 
+con-vpn-1  
+
+CON-PATH                                           
+/org/freedesktop/NetworkManager/ActiveConnection/2 
+
+GROUP  ADDRESS                                 GATEWAY         ROUTE  DNS  DOMAIN                                                                            WINS           
+IP4    192.168.228.18/32 | 192.168.209.179/25  192.168.41.120  --     --   sear4.foo2.bar | sear4.fo.x.y | sear4.foo1.bar | sear4.foo4.bar | sear4.fo.o.bar  192.168.120.79 
+
+GROUP  ADDRESS  GATEWAY  ROUTE                                                           DNS  DOMAIN                                                                                            
+IP6    --       --       dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086  --   sear6.foo2.bar | sear6.foo1.bar | sear6.fo.x.y | sear6.fo.o.bar | sear6.foo3.bar | sear6.foo4.bar 
+
 DEVICE 
 eth0   
 
@@ -19353,6 +19692,14 @@ IP4    192.168.97.124/29 | 192.168.76.154/18  --       dst = 192.168.33.233/22,
 GROUP  ADDRESS                        GATEWAY  ROUTE                                                                                                                                                                                                      DNS                          DOMAIN       
 IP6    2001:a::88ca:3654:96b:ab44/89  --       dst = 2001:a::cc8b:7c09:4673:bbb0/85, nh = ::, mt = 2821465568 | dst = 2001:a::a976:2488:f49f:b48/106, nh = 2001:a::62ae:c734:fc7b:e931, mt = 2248613879 | dst = 2001:a::afb7:4449:3787:8bb4/123, nh = ::  2001:a::2934:bd66:550d:ec19  sear6.fo.x.y 
 
+<<<
+size: 6388
+location: clients/tests/test-client.py:1059:test_004()/314
+cmd: $NMCLI --mode tabular dev show
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 6233 bytes
+>>>
 DEVICE 
 wlan0  
 
@@ -19366,7 +19713,7 @@ MTU
 0   
 
 STATE            
-20 (unavailable) 
+20 (niedostępne) 
 
 CONNECTION 
 con-vpn-1  
@@ -19380,14 +19727,6 @@ IP4    192.168.228.18/32 | 192.168.209.179/25  192.168.41.120  --     --   sear4
 GROUP  ADDRESS  GATEWAY  ROUTE                                                           DNS  DOMAIN                                                                                            
 IP6    --       --       dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086  --   sear6.foo2.bar | sear6.foo1.bar | sear6.fo.x.y | sear6.fo.o.bar | sear6.foo3.bar | sear6.foo4.bar 
 
-<<<
-size: 6388
-location: clients/tests/test-client.py:1045:test_004()/314
-cmd: $NMCLI --mode tabular dev show
-lang: pl_PL.UTF-8
-returncode: 0
-stdout: 6233 bytes
->>>
 DEVICE 
 eth0   
 
@@ -19502,43 +19841,45 @@ IP4    192.168.97.124/29 | 192.168.76.154/18  --       dst = 192.168.33.233/22,
 GROUP  ADDRESS                        GATEWAY  ROUTE                                                                                                                                                                                                      DNS                          DOMAIN       
 IP6    2001:a::88ca:3654:96b:ab44/89  --       dst = 2001:a::cc8b:7c09:4673:bbb0/85, nh = ::, mt = 2821465568 | dst = 2001:a::a976:2488:f49f:b48/106, nh = 2001:a::62ae:c734:fc7b:e931, mt = 2248613879 | dst = 2001:a::afb7:4449:3787:8bb4/123, nh = ::  2001:a::2934:bd66:550d:ec19  sear6.fo.x.y 
 
-DEVICE 
-wlan0  
-
-TYPE 
-wifi 
-
-HWADDR            
-13:E0:74:85:7C:D9 
-
-MTU 
-0   
+<<<
+size: 14861
+location: clients/tests/test-client.py:1062:test_004()/315
+cmd: $NMCLI --mode tabular -f all dev show
+lang: C
+returncode: 0
+stdout: 14708 bytes
+>>>
+NAME     DEVICE  TYPE  NM-TYPE       VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON               IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                         IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED 
+GENERAL  wlan0   wifi  NMDeviceWifi  --      --       virtual  --              --                13:E0:74:85:7C:D9  0    20 (unavailable)  0 (No reason given)  0 (unknown)       0 (unknown)       /sys/devices/virtual/wlan0  --        no           yes         yes          no                no                 --            con-vpn-1   UUID-con-vpn-1-REPLACED-REPLACED-REP  /org/freedesktop/NetworkManager/ActiveConnection/2  unknown 
 
-STATE            
-20 (niedostępne) 
+NAME          CARRIER-DETECT  SPEED    IS-SOFTWARE  SRIOV 
+CAPABILITIES  no              unknown  no           no    
 
-CONNECTION 
-con-vpn-1  
+NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ     5GHZ    
+WIFI-PROPERTIES  yes  yes  yes   yes   yes   yes  yes    unknown  unknown 
 
-CON-PATH                                           
-/org/freedesktop/NetworkManager/ActiveConnection/2 
+NAME   IN-USE  SSID        MODE   CHAN  RATE       SIGNAL  BARS  SECURITY  
+AP[1]          wlan0-ap-2  Infra  1     54 Mbit/s  92      ****  WPA1 WPA2 
+AP[2]          wlan0-ap-1  Infra  1     54 Mbit/s  81      ****  WPA1      
+AP[3]          wlan0-ap-3  Infra  1     54 Mbit/s  55      **    WPA3      
 
 GROUP  ADDRESS                                 GATEWAY         ROUTE  DNS  DOMAIN                                                                            WINS           
 IP4    192.168.228.18/32 | 192.168.209.179/25  192.168.41.120  --     --   sear4.foo2.bar | sear4.fo.x.y | sear4.foo1.bar | sear4.foo4.bar | sear4.fo.o.bar  192.168.120.79 
 
+GROUP  OPTION                                                                                    
+DHCP4  dhcp-4-opt-0 = val-0 | dhcp-4-opt-2 = val-2 | dhcp-4-opt-4 = val-4 | dhcp-4-opt-7 = val-7 
+
 GROUP  ADDRESS  GATEWAY  ROUTE                                                           DNS  DOMAIN                                                                                            
 IP6    --       --       dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086  --   sear6.foo2.bar | sear6.foo1.bar | sear6.fo.x.y | sear6.fo.o.bar | sear6.foo3.bar | sear6.foo4.bar 
 
-<<<
-size: 14501
-location: clients/tests/test-client.py:1048:test_004()/315
-cmd: $NMCLI --mode tabular -f all dev show
-lang: C
-returncode: 0
-stdout: 14348 bytes
->>>
-NAME     DEVICE  TYPE      NM-TYPE           VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON               UDI                        IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID  CON-PATH  METERED 
-GENERAL  eth0    ethernet  NMDeviceEthernet  --      --       virtual  --              --                AB:B7:BF:E2:48:E8  0    20 (unavailable)  0 (No reason given)  /sys/devices/virtual/eth0  --        no           yes         yes          no                no                 --            --          --        --        unknown 
+GROUP  OPTION                                                                                                           
+DHCP6  dhcp-6-opt-1 = val-1 | dhcp-6-opt-2 = val-2 | dhcp-6-opt-3 = val-3 | dhcp-6-opt-4 = val-4 | dhcp-6-opt-5 = val-5 
+
+NAME         AVAILABLE-CONNECTION-PATHS                               AVAILABLE-CONNECTIONS                          
+CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{2}  UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 
+
+NAME     DEVICE  TYPE      NM-TYPE           VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON               IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                        IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID  CON-PATH  METERED 
+GENERAL  eth0    ethernet  NMDeviceEthernet  --      --       virtual  --              --                AB:B7:BF:E2:48:E8  0    20 (unavailable)  0 (No reason given)  0 (unknown)       0 (unknown)       /sys/devices/virtual/eth0  --        no           yes         yes          no                no                 --            --          --        --        unknown 
 
 NAME          CARRIER-DETECT  SPEED     IS-SOFTWARE  SRIOV 
 CAPABILITIES  no              100 Mb/s  no           no    
@@ -19561,8 +19902,8 @@ DHCP6  dhcp-6-opt-0 = val-0 | dhcp-6-opt-1 = val-1 | dhcp-6-opt-2 = val-2 | dhcp
 NAME         AVAILABLE-CONNECTION-PATHS                               AVAILABLE-CONNECTIONS                        
 CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{1}  5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 
 
-NAME     DEVICE  TYPE      NM-TYPE           VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON               UDI                        IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID  CON-PATH  METERED 
-GENERAL  eth1    ethernet  NMDeviceEthernet  --      --       virtual  --              --                E7:78:B1:93:2B:22  0    20 (unavailable)  0 (No reason given)  /sys/devices/virtual/eth1  --        no           yes         yes          no                no                 --            --          --        --        unknown 
+NAME     DEVICE  TYPE      NM-TYPE           VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON               IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                        IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID  CON-PATH  METERED 
+GENERAL  eth1    ethernet  NMDeviceEthernet  --      --       virtual  --              --                E7:78:B1:93:2B:22  0    20 (unavailable)  0 (No reason given)  0 (unknown)       0 (unknown)       /sys/devices/virtual/eth1  --        no           yes         yes          no                no                 --            --          --        --        unknown 
 
 NAME          CARRIER-DETECT  SPEED     IS-SOFTWARE  SRIOV 
 CAPABILITIES  no              100 Mb/s  no           no    
@@ -19585,8 +19926,8 @@ DHCP6  dhcp-6-opt-2 = val-2 | dhcp-6-opt-5 = val-5 | dhcp-6-opt-6 = val-6 | dhcp
 NAME         AVAILABLE-CONNECTION-PATHS                               AVAILABLE-CONNECTIONS                        
 CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{1}  5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 
 
-NAME     DEVICE  TYPE  NM-TYPE       VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON               UDI                         IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID  CON-PATH  METERED 
-GENERAL  wlan1   wifi  NMDeviceWifi  --      --       virtual  --              --                21:E9:64:81:8C:A8  0    20 (unavailable)  0 (No reason given)  /sys/devices/virtual/wlan1  --        no           yes         yes          no                no                 --            --          --        --        unknown 
+NAME     DEVICE  TYPE  NM-TYPE       VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON               IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                         IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID  CON-PATH  METERED 
+GENERAL  wlan1   wifi  NMDeviceWifi  --      --       virtual  --              --                21:E9:64:81:8C:A8  0    20 (unavailable)  0 (No reason given)  0 (unknown)       0 (unknown)       /sys/devices/virtual/wlan1  --        no           yes         yes          no                no                 --            --          --        --        unknown 
 
 NAME          CARRIER-DETECT  SPEED    IS-SOFTWARE  SRIOV 
 CAPABILITIES  no              unknown  no           no    
@@ -19612,8 +19953,8 @@ DHCP6  dhcp-6-opt-0 = val-0 | dhcp-6-opt-1 = val-1 | dhcp-6-opt-2 = val-2 | dhcp
 NAME         AVAILABLE-CONNECTION-PATHS                               AVAILABLE-CONNECTIONS                          
 CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{2}  UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 
 
-NAME     DEVICE  TYPE  NM-TYPE       VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON               UDI                         IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID  CON-PATH  METERED 
-GENERAL  wlan1   wifi  NMDeviceWifi  --      --       virtual  --              --                71:52:AD:63:5C:7C  0    20 (unavailable)  0 (No reason given)  /sys/devices/virtual/wlan1  --        no           yes         yes          no                no                 --            --          --        --        unknown 
+NAME     DEVICE  TYPE  NM-TYPE       VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON               IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                         IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID  CON-PATH  METERED 
+GENERAL  wlan1   wifi  NMDeviceWifi  --      --       virtual  --              --                71:52:AD:63:5C:7C  0    20 (unavailable)  0 (No reason given)  0 (unknown)       0 (unknown)       /sys/devices/virtual/wlan1  --        no           yes         yes          no                no                 --            --          --        --        unknown 
 
 NAME          CARRIER-DETECT  SPEED    IS-SOFTWARE  SRIOV 
 CAPABILITIES  no              unknown  no           no    
@@ -19638,19 +19979,27 @@ DHCP6  dhcp-6-opt-2 = val-2 | dhcp-6-opt-6 = val-6 | dhcp-6-opt-7 = val-7 | dhcp
 NAME         AVAILABLE-CONNECTION-PATHS                               AVAILABLE-CONNECTIONS                          
 CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{2}  UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 
 
-NAME     DEVICE  TYPE  NM-TYPE       VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON               UDI                         IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED 
-GENERAL  wlan0   wifi  NMDeviceWifi  --      --       virtual  --              --                13:E0:74:85:7C:D9  0    20 (unavailable)  0 (No reason given)  /sys/devices/virtual/wlan0  --        no           yes         yes          no                no                 --            con-vpn-1   UUID-con-vpn-1-REPLACED-REPLACED-REP  /org/freedesktop/NetworkManager/ActiveConnection/2  unknown 
+<<<
+size: 15020
+location: clients/tests/test-client.py:1062:test_004()/316
+cmd: $NMCLI --mode tabular -f all dev show
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 14857 bytes
+>>>
+NAME     DEVICE  TYPE  NM-TYPE       VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON                    IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                         IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED  
+GENERAL  wlan0   wifi  NMDeviceWifi  --      --       virtual  --              --                13:E0:74:85:7C:D9  0    20 (niedostępne)  0 (Nie podano przyczyny)  0 (nieznane)      0 (nieznane)      /sys/devices/virtual/wlan0  --        nie          tak         tak          nie               nie                --            con-vpn-1   UUID-con-vpn-1-REPLACED-REPLACED-REP  /org/freedesktop/NetworkManager/ActiveConnection/2  nieznane 
 
-NAME          CARRIER-DETECT  SPEED    IS-SOFTWARE  SRIOV 
-CAPABILITIES  no              unknown  no           no    
+NAME          CARRIER-DETECT  SPEED     IS-SOFTWARE  SRIOV 
+CAPABILITIES  nie             nieznane  nie          nie   
 
-NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ     5GHZ    
-WIFI-PROPERTIES  yes  yes  yes   yes   yes   yes  yes    unknown  unknown 
+NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ      5GHZ     
+WIFI-PROPERTIES  tak  tak  tak   tak   tak   tak  tak    nieznane  nieznane 
 
-NAME   IN-USE  SSID        MODE   CHAN  RATE       SIGNAL  BARS  SECURITY  
-AP[1]          wlan0-ap-2  Infra  1     54 Mbit/s  92      ****  WPA1 WPA2 
-AP[2]          wlan0-ap-1  Infra  1     54 Mbit/s  81      ****  WPA1 WPA2 
-AP[3]          wlan0-ap-3  Infra  1     54 Mbit/s  55      **    WPA1 WPA2 
+NAME   IN-USE  SSID        MODE            CHAN  RATE     SIGNAL  BARS  SECURITY  
+AP[1]          wlan0-ap-2  Infrastruktura  1     54 Mb/s  92      ****  WPA1 WPA2 
+AP[2]          wlan0-ap-1  Infrastruktura  1     54 Mb/s  81      ****  WPA1      
+AP[3]          wlan0-ap-3  Infrastruktura  1     54 Mb/s  55      **    WPA3      
 
 GROUP  ADDRESS                                 GATEWAY         ROUTE  DNS  DOMAIN                                                                            WINS           
 IP4    192.168.228.18/32 | 192.168.209.179/25  192.168.41.120  --     --   sear4.foo2.bar | sear4.fo.x.y | sear4.foo1.bar | sear4.foo4.bar | sear4.fo.o.bar  192.168.120.79 
@@ -19667,16 +20016,8 @@ DHCP6  dhcp-6-opt-1 = val-1 | dhcp-6-opt-2 = val-2 | dhcp-6-opt-3 = val-3 | dhcp
 NAME         AVAILABLE-CONNECTION-PATHS                               AVAILABLE-CONNECTIONS                          
 CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{2}  UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 
 
-<<<
-size: 14660
-location: clients/tests/test-client.py:1048:test_004()/316
-cmd: $NMCLI --mode tabular -f all dev show
-lang: pl_PL.UTF-8
-returncode: 0
-stdout: 14497 bytes
->>>
-NAME     DEVICE  TYPE      NM-TYPE           VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON                    UDI                        IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID  CON-PATH  METERED  
-GENERAL  eth0    ethernet  NMDeviceEthernet  --      --       virtual  --              --                AB:B7:BF:E2:48:E8  0    20 (niedostępne)  0 (Nie podano przyczyny)  /sys/devices/virtual/eth0  --        nie          tak         tak          nie               nie                --            --          --        --        nieznane 
+NAME     DEVICE  TYPE      NM-TYPE           VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON                    IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                        IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID  CON-PATH  METERED  
+GENERAL  eth0    ethernet  NMDeviceEthernet  --      --       virtual  --              --                AB:B7:BF:E2:48:E8  0    20 (niedostępne)  0 (Nie podano przyczyny)  0 (nieznane)      0 (nieznane)      /sys/devices/virtual/eth0  --        nie          tak         tak          nie               nie                --            --          --        --        nieznane 
 
 NAME          CARRIER-DETECT  SPEED     IS-SOFTWARE  SRIOV 
 CAPABILITIES  nie             100 Mb/s  nie          nie   
@@ -19699,8 +20040,8 @@ DHCP6  dhcp-6-opt-0 = val-0 | dhcp-6-opt-1 = val-1 | dhcp-6-opt-2 = val-2 | dhcp
 NAME         AVAILABLE-CONNECTION-PATHS                               AVAILABLE-CONNECTIONS                        
 CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{1}  5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 
 
-NAME     DEVICE  TYPE      NM-TYPE           VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON                    UDI                        IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID  CON-PATH  METERED  
-GENERAL  eth1    ethernet  NMDeviceEthernet  --      --       virtual  --              --                E7:78:B1:93:2B:22  0    20 (niedostępne)  0 (Nie podano przyczyny)  /sys/devices/virtual/eth1  --        nie          tak         tak          nie               nie                --            --          --        --        nieznane 
+NAME     DEVICE  TYPE      NM-TYPE           VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON                    IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                        IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID  CON-PATH  METERED  
+GENERAL  eth1    ethernet  NMDeviceEthernet  --      --       virtual  --              --                E7:78:B1:93:2B:22  0    20 (niedostępne)  0 (Nie podano przyczyny)  0 (nieznane)      0 (nieznane)      /sys/devices/virtual/eth1  --        nie          tak         tak          nie               nie                --            --          --        --        nieznane 
 
 NAME          CARRIER-DETECT  SPEED     IS-SOFTWARE  SRIOV 
 CAPABILITIES  nie             100 Mb/s  nie          nie   
@@ -19723,8 +20064,8 @@ DHCP6  dhcp-6-opt-2 = val-2 | dhcp-6-opt-5 = val-5 | dhcp-6-opt-6 = val-6 | dhcp
 NAME         AVAILABLE-CONNECTION-PATHS                               AVAILABLE-CONNECTIONS                        
 CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{1}  5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 
 
-NAME     DEVICE  TYPE  NM-TYPE       VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON                    UDI                         IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID  CON-PATH  METERED  
-GENERAL  wlan1   wifi  NMDeviceWifi  --      --       virtual  --              --                21:E9:64:81:8C:A8  0    20 (niedostępne)  0 (Nie podano przyczyny)  /sys/devices/virtual/wlan1  --        nie          tak         tak          nie               nie                --            --          --        --        nieznane 
+NAME     DEVICE  TYPE  NM-TYPE       VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON                    IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                         IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID  CON-PATH  METERED  
+GENERAL  wlan1   wifi  NMDeviceWifi  --      --       virtual  --              --                21:E9:64:81:8C:A8  0    20 (niedostępne)  0 (Nie podano przyczyny)  0 (nieznane)      0 (nieznane)      /sys/devices/virtual/wlan1  --        nie          tak         tak          nie               nie                --            --          --        --        nieznane 
 
 NAME          CARRIER-DETECT  SPEED     IS-SOFTWARE  SRIOV 
 CAPABILITIES  nie             nieznane  nie          nie   
@@ -19750,8 +20091,8 @@ DHCP6  dhcp-6-opt-0 = val-0 | dhcp-6-opt-1 = val-1 | dhcp-6-opt-2 = val-2 | dhcp
 NAME         AVAILABLE-CONNECTION-PATHS                               AVAILABLE-CONNECTIONS                          
 CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{2}  UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 
 
-NAME     DEVICE  TYPE  NM-TYPE       VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON                    UDI                         IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID  CON-PATH  METERED  
-GENERAL  wlan1   wifi  NMDeviceWifi  --      --       virtual  --              --                71:52:AD:63:5C:7C  0    20 (niedostępne)  0 (Nie podano przyczyny)  /sys/devices/virtual/wlan1  --        nie          tak         tak          nie               nie                --            --          --        --        nieznane 
+NAME     DEVICE  TYPE  NM-TYPE       VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON                    IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                         IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID  CON-PATH  METERED  
+GENERAL  wlan1   wifi  NMDeviceWifi  --      --       virtual  --              --                71:52:AD:63:5C:7C  0    20 (niedostępne)  0 (Nie podano przyczyny)  0 (nieznane)      0 (nieznane)      /sys/devices/virtual/wlan1  --        nie          tak         tak          nie               nie                --            --          --        --        nieznane 
 
 NAME          CARRIER-DETECT  SPEED     IS-SOFTWARE  SRIOV 
 CAPABILITIES  nie             nieznane  nie          nie   
@@ -19776,38 +20117,9 @@ DHCP6  dhcp-6-opt-2 = val-2 | dhcp-6-opt-6 = val-6 | dhcp-6-opt-7 = val-7 | dhcp
 NAME         AVAILABLE-CONNECTION-PATHS                               AVAILABLE-CONNECTIONS                          
 CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{2}  UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 
 
-NAME     DEVICE  TYPE  NM-TYPE       VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON                    UDI                         IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED  
-GENERAL  wlan0   wifi  NMDeviceWifi  --      --       virtual  --              --                13:E0:74:85:7C:D9  0    20 (niedostępne)  0 (Nie podano przyczyny)  /sys/devices/virtual/wlan0  --        nie          tak         tak          nie               nie                --            con-vpn-1   UUID-con-vpn-1-REPLACED-REPLACED-REP  /org/freedesktop/NetworkManager/ActiveConnection/2  nieznane 
-
-NAME          CARRIER-DETECT  SPEED     IS-SOFTWARE  SRIOV 
-CAPABILITIES  nie             nieznane  nie          nie   
-
-NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ      5GHZ     
-WIFI-PROPERTIES  tak  tak  tak   tak   tak   tak  tak    nieznane  nieznane 
-
-NAME   IN-USE  SSID        MODE            CHAN  RATE     SIGNAL  BARS  SECURITY  
-AP[1]          wlan0-ap-2  Infrastruktura  1     54 Mb/s  92      ****  WPA1 WPA2 
-AP[2]          wlan0-ap-1  Infrastruktura  1     54 Mb/s  81      ****  WPA1 WPA2 
-AP[3]          wlan0-ap-3  Infrastruktura  1     54 Mb/s  55      **    WPA1 WPA2 
-
-GROUP  ADDRESS                                 GATEWAY         ROUTE  DNS  DOMAIN                                                                            WINS           
-IP4    192.168.228.18/32 | 192.168.209.179/25  192.168.41.120  --     --   sear4.foo2.bar | sear4.fo.x.y | sear4.foo1.bar | sear4.foo4.bar | sear4.fo.o.bar  192.168.120.79 
-
-GROUP  OPTION                                                                                    
-DHCP4  dhcp-4-opt-0 = val-0 | dhcp-4-opt-2 = val-2 | dhcp-4-opt-4 = val-4 | dhcp-4-opt-7 = val-7 
-
-GROUP  ADDRESS  GATEWAY  ROUTE                                                           DNS  DOMAIN                                                                                            
-IP6    --       --       dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086  --   sear6.foo2.bar | sear6.foo1.bar | sear6.fo.x.y | sear6.fo.o.bar | sear6.foo3.bar | sear6.foo4.bar 
-
-GROUP  OPTION                                                                                                           
-DHCP6  dhcp-6-opt-1 = val-1 | dhcp-6-opt-2 = val-2 | dhcp-6-opt-3 = val-3 | dhcp-6-opt-4 = val-4 | dhcp-6-opt-5 = val-5 
-
-NAME         AVAILABLE-CONNECTION-PATHS                               AVAILABLE-CONNECTIONS                          
-CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{2}  UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 
-
 <<<
 size: 1130
-location: clients/tests/test-client.py:1051:test_004()/317
+location: clients/tests/test-client.py:1065:test_004()/317
 cmd: $NMCLI --mode tabular dev show wlan0
 lang: C
 returncode: 0
@@ -19842,7 +20154,7 @@ IP6    --       --       dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 250
 
 <<<
 size: 1141
-location: clients/tests/test-client.py:1051:test_004()/318
+location: clients/tests/test-client.py:1065:test_004()/318
 cmd: $NMCLI --mode tabular dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
@@ -19876,15 +20188,15 @@ GROUP  ADDRESS  GATEWAY  ROUTE
 IP6    --       --       dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086  --   sear6.foo2.bar | sear6.foo1.bar | sear6.fo.x.y | sear6.fo.o.bar | sear6.foo3.bar | sear6.foo4.bar 
 
 <<<
-size: 2940
-location: clients/tests/test-client.py:1054:test_004()/319
+size: 3012
+location: clients/tests/test-client.py:1068:test_004()/319
 cmd: $NMCLI --mode tabular -f all dev show wlan0
 lang: C
 returncode: 0
-stdout: 2782 bytes
+stdout: 2854 bytes
 >>>
-NAME     DEVICE  TYPE  NM-TYPE       VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON               UDI                         IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED 
-GENERAL  wlan0   wifi  NMDeviceWifi  --      --       virtual  --              --                13:E0:74:85:7C:D9  0    20 (unavailable)  0 (No reason given)  /sys/devices/virtual/wlan0  --        no           yes         yes          no                no                 --            con-vpn-1   UUID-con-vpn-1-REPLACED-REPLACED-REP  /org/freedesktop/NetworkManager/ActiveConnection/2  unknown 
+NAME     DEVICE  TYPE  NM-TYPE       VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON               IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                         IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED 
+GENERAL  wlan0   wifi  NMDeviceWifi  --      --       virtual  --              --                13:E0:74:85:7C:D9  0    20 (unavailable)  0 (No reason given)  0 (unknown)       0 (unknown)       /sys/devices/virtual/wlan0  --        no           yes         yes          no                no                 --            con-vpn-1   UUID-con-vpn-1-REPLACED-REPLACED-REP  /org/freedesktop/NetworkManager/ActiveConnection/2  unknown 
 
 NAME          CARRIER-DETECT  SPEED    IS-SOFTWARE  SRIOV 
 CAPABILITIES  no              unknown  no           no    
@@ -19894,8 +20206,8 @@ WIFI-PROPERTIES  yes  yes  yes   yes   yes   yes  yes    unknown  unknown
 
 NAME   IN-USE  SSID        MODE   CHAN  RATE       SIGNAL  BARS  SECURITY  
 AP[1]          wlan0-ap-2  Infra  1     54 Mbit/s  92      ****  WPA1 WPA2 
-AP[2]          wlan0-ap-1  Infra  1     54 Mbit/s  81      ****  WPA1 WPA2 
-AP[3]          wlan0-ap-3  Infra  1     54 Mbit/s  55      **    WPA1 WPA2 
+AP[2]          wlan0-ap-1  Infra  1     54 Mbit/s  81      ****  WPA1      
+AP[3]          wlan0-ap-3  Infra  1     54 Mbit/s  55      **    WPA3      
 
 GROUP  ADDRESS                                 GATEWAY         ROUTE  DNS  DOMAIN                                                                            WINS           
 IP4    192.168.228.18/32 | 192.168.209.179/25  192.168.41.120  --     --   sear4.foo2.bar | sear4.fo.x.y | sear4.foo1.bar | sear4.foo4.bar | sear4.fo.o.bar  192.168.120.79 
@@ -19913,15 +20225,15 @@ NAME         AVAILABLE-CONNECTION-PATHS                               AVAILABLE-
 CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{2}  UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 
 
 <<<
-size: 3003
-location: clients/tests/test-client.py:1054:test_004()/320
+size: 3075
+location: clients/tests/test-client.py:1068:test_004()/320
 cmd: $NMCLI --mode tabular -f all dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2835 bytes
+stdout: 2907 bytes
 >>>
-NAME     DEVICE  TYPE  NM-TYPE       VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON                    UDI                         IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED  
-GENERAL  wlan0   wifi  NMDeviceWifi  --      --       virtual  --              --                13:E0:74:85:7C:D9  0    20 (niedostępne)  0 (Nie podano przyczyny)  /sys/devices/virtual/wlan0  --        nie          tak         tak          nie               nie                --            con-vpn-1   UUID-con-vpn-1-REPLACED-REPLACED-REP  /org/freedesktop/NetworkManager/ActiveConnection/2  nieznane 
+NAME     DEVICE  TYPE  NM-TYPE       VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON                    IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                         IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED  
+GENERAL  wlan0   wifi  NMDeviceWifi  --      --       virtual  --              --                13:E0:74:85:7C:D9  0    20 (niedostępne)  0 (Nie podano przyczyny)  0 (nieznane)      0 (nieznane)      /sys/devices/virtual/wlan0  --        nie          tak         tak          nie               nie                --            con-vpn-1   UUID-con-vpn-1-REPLACED-REPLACED-REP  /org/freedesktop/NetworkManager/ActiveConnection/2  nieznane 
 
 NAME          CARRIER-DETECT  SPEED     IS-SOFTWARE  SRIOV 
 CAPABILITIES  nie             nieznane  nie          nie   
@@ -19931,8 +20243,8 @@ WIFI-PROPERTIES  tak  tak  tak   tak   tak   tak  tak    nieznane  nieznane
 
 NAME   IN-USE  SSID        MODE            CHAN  RATE     SIGNAL  BARS  SECURITY  
 AP[1]          wlan0-ap-2  Infrastruktura  1     54 Mb/s  92      ****  WPA1 WPA2 
-AP[2]          wlan0-ap-1  Infrastruktura  1     54 Mb/s  81      ****  WPA1 WPA2 
-AP[3]          wlan0-ap-3  Infrastruktura  1     54 Mb/s  55      **    WPA1 WPA2 
+AP[2]          wlan0-ap-1  Infrastruktura  1     54 Mb/s  81      ****  WPA1      
+AP[3]          wlan0-ap-3  Infrastruktura  1     54 Mb/s  55      **    WPA3      
 
 GROUP  ADDRESS                                 GATEWAY         ROUTE  DNS  DOMAIN                                                                            WINS           
 IP4    192.168.228.18/32 | 192.168.209.179/25  192.168.41.120  --     --   sear4.foo2.bar | sear4.fo.x.y | sear4.foo1.bar | sear4.foo4.bar | sear4.fo.o.bar  192.168.120.79 
@@ -19950,15 +20262,15 @@ NAME         AVAILABLE-CONNECTION-PATHS                               AVAILABLE-
 CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{2}  UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 
 
 <<<
-size: 1178
-location: clients/tests/test-client.py:1057:test_004()/321
+size: 1251
+location: clients/tests/test-client.py:1071:test_004()/321
 cmd: $NMCLI --mode tabular -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: C
 returncode: 0
-stdout: 986 bytes
+stdout: 1058 bytes
 >>>
-NAME     DEVICE  TYPE  NM-TYPE       VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON               UDI                         IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED 
-GENERAL  wlan0   wifi  NMDeviceWifi  --      --       virtual  --              --                13:E0:74:85:7C:D9  0    20 (unavailable)  0 (No reason given)  /sys/devices/virtual/wlan0  --        no           yes         yes          no                no                 --            con-vpn-1   UUID-con-vpn-1-REPLACED-REPLACED-REP  /org/freedesktop/NetworkManager/ActiveConnection/2  unknown 
+NAME     DEVICE  TYPE  NM-TYPE       VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON               IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                         IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED 
+GENERAL  wlan0   wifi  NMDeviceWifi  --      --       virtual  --              --                13:E0:74:85:7C:D9  0    20 (unavailable)  0 (No reason given)  0 (unknown)       0 (unknown)       /sys/devices/virtual/wlan0  --        no           yes         yes          no                no                 --            con-vpn-1   UUID-con-vpn-1-REPLACED-REPLACED-REP  /org/freedesktop/NetworkManager/ActiveConnection/2  unknown 
 
 HWADDR            
 13:E0:74:85:7C:D9 
@@ -19967,15 +20279,15 @@ NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ     5GHZ
 WIFI-PROPERTIES  yes  yes  yes   yes   yes   yes  yes    unknown  unknown 
 
 <<<
-size: 1206
-location: clients/tests/test-client.py:1057:test_004()/322
+size: 1278
+location: clients/tests/test-client.py:1071:test_004()/322
 cmd: $NMCLI --mode tabular -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 1003 bytes
+stdout: 1075 bytes
 >>>
-NAME     DEVICE  TYPE  NM-TYPE       VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON                    UDI                         IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED  
-GENERAL  wlan0   wifi  NMDeviceWifi  --      --       virtual  --              --                13:E0:74:85:7C:D9  0    20 (niedostępne)  0 (Nie podano przyczyny)  /sys/devices/virtual/wlan0  --        nie          tak         tak          nie               nie                --            con-vpn-1   UUID-con-vpn-1-REPLACED-REPLACED-REP  /org/freedesktop/NetworkManager/ActiveConnection/2  nieznane 
+NAME     DEVICE  TYPE  NM-TYPE       VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON                    IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                         IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED  
+GENERAL  wlan0   wifi  NMDeviceWifi  --      --       virtual  --              --                13:E0:74:85:7C:D9  0    20 (niedostępne)  0 (Nie podano przyczyny)  0 (nieznane)      0 (nieznane)      /sys/devices/virtual/wlan0  --        nie          tak         tak          nie               nie                --            con-vpn-1   UUID-con-vpn-1-REPLACED-REPLACED-REP  /org/freedesktop/NetworkManager/ActiveConnection/2  nieznane 
 
 HWADDR            
 13:E0:74:85:7C:D9 
@@ -19984,15 +20296,15 @@ NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ      5GHZ
 WIFI-PROPERTIES  tak  tak  tak   tak   tak   tak  tak    nieznane  nieznane 
 
 <<<
-size: 1178
-location: clients/tests/test-client.py:1060:test_004()/323
+size: 1251
+location: clients/tests/test-client.py:1074:test_004()/323
 cmd: $NMCLI --mode tabular -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: C
 returncode: 0
-stdout: 986 bytes
+stdout: 1058 bytes
 >>>
-NAME     DEVICE  TYPE  NM-TYPE       VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON               UDI                         IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED 
-GENERAL  wlan0   wifi  NMDeviceWifi  --      --       virtual  --              --                13:E0:74:85:7C:D9  0    20 (unavailable)  0 (No reason given)  /sys/devices/virtual/wlan0  --        no           yes         yes          no                no                 --            con-vpn-1   UUID-con-vpn-1-REPLACED-REPLACED-REP  /org/freedesktop/NetworkManager/ActiveConnection/2  unknown 
+NAME     DEVICE  TYPE  NM-TYPE       VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON               IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                         IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED 
+GENERAL  wlan0   wifi  NMDeviceWifi  --      --       virtual  --              --                13:E0:74:85:7C:D9  0    20 (unavailable)  0 (No reason given)  0 (unknown)       0 (unknown)       /sys/devices/virtual/wlan0  --        no           yes         yes          no                no                 --            con-vpn-1   UUID-con-vpn-1-REPLACED-REPLACED-REP  /org/freedesktop/NetworkManager/ActiveConnection/2  unknown 
 
 HWADDR            
 13:E0:74:85:7C:D9 
@@ -20001,15 +20313,15 @@ NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ     5GHZ
 WIFI-PROPERTIES  yes  yes  yes   yes   yes   yes  yes    unknown  unknown 
 
 <<<
-size: 1206
-location: clients/tests/test-client.py:1060:test_004()/324
+size: 1278
+location: clients/tests/test-client.py:1074:test_004()/324
 cmd: $NMCLI --mode tabular -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 1003 bytes
+stdout: 1075 bytes
 >>>
-NAME     DEVICE  TYPE  NM-TYPE       VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON                    UDI                         IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED  
-GENERAL  wlan0   wifi  NMDeviceWifi  --      --       virtual  --              --                13:E0:74:85:7C:D9  0    20 (niedostępne)  0 (Nie podano przyczyny)  /sys/devices/virtual/wlan0  --        nie          tak         tak          nie               nie                --            con-vpn-1   UUID-con-vpn-1-REPLACED-REPLACED-REP  /org/freedesktop/NetworkManager/ActiveConnection/2  nieznane 
+NAME     DEVICE  TYPE  NM-TYPE       VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON                    IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                         IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED  
+GENERAL  wlan0   wifi  NMDeviceWifi  --      --       virtual  --              --                13:E0:74:85:7C:D9  0    20 (niedostępne)  0 (Nie podano przyczyny)  0 (nieznane)      0 (nieznane)      /sys/devices/virtual/wlan0  --        nie          tak         tak          nie               nie                --            con-vpn-1   UUID-con-vpn-1-REPLACED-REPLACED-REP  /org/freedesktop/NetworkManager/ActiveConnection/2  nieznane 
 
 HWADDR            
 13:E0:74:85:7C:D9 
@@ -20019,218 +20331,230 @@ WIFI-PROPERTIES  tak  tak  tak   tak   tak   tak  tak    nieznane  nieznane
 
 <<<
 size: 530
-location: clients/tests/test-client.py:1063:test_004()/325
+location: clients/tests/test-client.py:1077:test_004()/325
 cmd: $NMCLI --mode tabular -f DEVICE,TYPE,DBUS-PATH dev
 lang: C
 returncode: 0
 stdout: 366 bytes
 >>>
 DEVICE  TYPE      DBUS-PATH                                 
+wlan0   wifi      /org/freedesktop/NetworkManager/Devices/3 
 eth0    ethernet  /org/freedesktop/NetworkManager/Devices/1 
 eth1    ethernet  /org/freedesktop/NetworkManager/Devices/2 
 wlan1   wifi      /org/freedesktop/NetworkManager/Devices/4 
 wlan1   wifi      /org/freedesktop/NetworkManager/Devices/5 
-wlan0   wifi      /org/freedesktop/NetworkManager/Devices/3 
 
 <<<
 size: 540
-location: clients/tests/test-client.py:1063:test_004()/326
+location: clients/tests/test-client.py:1077:test_004()/326
 cmd: $NMCLI --mode tabular -f DEVICE,TYPE,DBUS-PATH dev
 lang: pl_PL.UTF-8
 returncode: 0
 stdout: 366 bytes
 >>>
 DEVICE  TYPE      DBUS-PATH                                 
+wlan0   wifi      /org/freedesktop/NetworkManager/Devices/3 
 eth0    ethernet  /org/freedesktop/NetworkManager/Devices/1 
 eth1    ethernet  /org/freedesktop/NetworkManager/Devices/2 
 wlan1   wifi      /org/freedesktop/NetworkManager/Devices/4 
 wlan1   wifi      /org/freedesktop/NetworkManager/Devices/5 
-wlan0   wifi      /org/freedesktop/NetworkManager/Devices/3 
 
 <<<
 size: 2000
-location: clients/tests/test-client.py:1066:test_004()/327
+location: clients/tests/test-client.py:1080:test_004()/327
 cmd: $NMCLI --mode tabular -f ALL device wifi list
 lang: C
 returncode: 0
 stdout: 1840 bytes
 >>>
+NAME   SSID        SSID-HEX              BSSID              MODE   CHAN  FREQ      RATE       SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
+AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infra  1     2412 MHz  54 Mbit/s  92      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/2 
+AP[2]  wlan0-ap-1  776C616E302D61702D31  61:95:77:AC:1E:4C  Infra  1     2412 MHz  54 Mbit/s  81      ****  WPA1       pair_tkip pair_ccmp group_tkip group_ccmp psk  (none)                                         wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/1 
+AP[3]  wlan0-ap-3  776C616E302D61702D33  9B:F6:B7:EC:97:76  Infra  1     2412 MHz  54 Mbit/s  55      **    WPA3       (none)                                         pair_tkip pair_ccmp group_tkip group_ccmp sae  wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/3 
+
 NAME   SSID        SSID-HEX              BSSID              MODE   CHAN  FREQ      RATE       SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
 AP[1]  wlan1-ap-4  776C616E312D61702D34  94:2B:E8:F6:D2:86  Infra  1     2412 MHz  54 Mbit/s  48      **    WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan1   no              /org/freedesktop/NetworkManager/AccessPoint/4 
 
 NAME  SSID  SSID-HEX  BSSID  MODE  CHAN  FREQ  RATE  SIGNAL  BARS  SECURITY  WPA-FLAGS  RSN-FLAGS  DEVICE  ACTIVE  IN-USE  DBUS-PATH 
 
-NAME   SSID        SSID-HEX              BSSID              MODE   CHAN  FREQ      RATE       SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
-AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infra  1     2412 MHz  54 Mbit/s  92      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/2 
-AP[2]  wlan0-ap-1  776C616E302D61702D31  61:95:77:AC:1E:4C  Infra  1     2412 MHz  54 Mbit/s  81      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/1 
-AP[3]  wlan0-ap-3  776C616E302D61702D33  9B:F6:B7:EC:97:76  Infra  1     2412 MHz  54 Mbit/s  55      **    WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/3 
-
 <<<
 size: 2068
-location: clients/tests/test-client.py:1066:test_004()/328
+location: clients/tests/test-client.py:1080:test_004()/328
 cmd: $NMCLI --mode tabular -f ALL device wifi list
 lang: pl_PL.UTF-8
 returncode: 0
 stdout: 1898 bytes
 >>>
+NAME   SSID        SSID-HEX              BSSID              MODE            CHAN  FREQ      RATE     SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
+AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infrastruktura  1     2412 MHz  54 Mb/s  92      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/2 
+AP[2]  wlan0-ap-1  776C616E302D61702D31  61:95:77:AC:1E:4C  Infrastruktura  1     2412 MHz  54 Mb/s  81      ****  WPA1       pair_tkip pair_ccmp group_tkip group_ccmp psk  (brak)                                         wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/1 
+AP[3]  wlan0-ap-3  776C616E302D61702D33  9B:F6:B7:EC:97:76  Infrastruktura  1     2412 MHz  54 Mb/s  55      **    WPA3       (brak)                                         pair_tkip pair_ccmp group_tkip group_ccmp sae  wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/3 
+
 NAME   SSID        SSID-HEX              BSSID              MODE            CHAN  FREQ      RATE     SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
 AP[1]  wlan1-ap-4  776C616E312D61702D34  94:2B:E8:F6:D2:86  Infrastruktura  1     2412 MHz  54 Mb/s  48      **    WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan1   nie             /org/freedesktop/NetworkManager/AccessPoint/4 
 
 NAME  SSID  SSID-HEX  BSSID  MODE  CHAN  FREQ  RATE  SIGNAL  BARS  SECURITY  WPA-FLAGS  RSN-FLAGS  DEVICE  ACTIVE  IN-USE  DBUS-PATH 
 
-NAME   SSID        SSID-HEX              BSSID              MODE            CHAN  FREQ      RATE     SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
-AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infrastruktura  1     2412 MHz  54 Mb/s  92      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/2 
-AP[2]  wlan0-ap-1  776C616E302D61702D31  61:95:77:AC:1E:4C  Infrastruktura  1     2412 MHz  54 Mb/s  81      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/1 
-AP[3]  wlan0-ap-3  776C616E302D61702D33  9B:F6:B7:EC:97:76  Infrastruktura  1     2412 MHz  54 Mb/s  55      **    WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/3 
-
 <<<
 size: 634
-location: clients/tests/test-client.py:1068:test_004()/329
+location: clients/tests/test-client.py:1082:test_004()/329
 cmd: $NMCLI --mode tabular -f COMMON device wifi list
 lang: C
 returncode: 0
 stdout: 472 bytes
 >>>
+IN-USE  SSID        MODE   CHAN  RATE       SIGNAL  BARS  SECURITY  
+        wlan0-ap-2  Infra  1     54 Mbit/s  92      ****  WPA1 WPA2 
+        wlan0-ap-1  Infra  1     54 Mbit/s  81      ****  WPA1      
+        wlan0-ap-3  Infra  1     54 Mbit/s  55      **    WPA3      
+
 IN-USE  SSID        MODE   CHAN  RATE       SIGNAL  BARS  SECURITY  
         wlan1-ap-4  Infra  1     54 Mbit/s  48      **    WPA1 WPA2 
 
 IN-USE  SSID  MODE  CHAN  RATE  SIGNAL  BARS  SECURITY 
 
-IN-USE  SSID        MODE   CHAN  RATE       SIGNAL  BARS  SECURITY  
-        wlan0-ap-2  Infra  1     54 Mbit/s  92      ****  WPA1 WPA2 
-        wlan0-ap-1  Infra  1     54 Mbit/s  81      ****  WPA1 WPA2 
-        wlan0-ap-3  Infra  1     54 Mbit/s  55      **    WPA1 WPA2 
-
 <<<
 size: 694
-location: clients/tests/test-client.py:1068:test_004()/330
+location: clients/tests/test-client.py:1082:test_004()/330
 cmd: $NMCLI --mode tabular -f COMMON device wifi list
 lang: pl_PL.UTF-8
 returncode: 0
 stdout: 522 bytes
 >>>
+IN-USE  SSID        MODE            CHAN  RATE     SIGNAL  BARS  SECURITY  
+        wlan0-ap-2  Infrastruktura  1     54 Mb/s  92      ****  WPA1 WPA2 
+        wlan0-ap-1  Infrastruktura  1     54 Mb/s  81      ****  WPA1      
+        wlan0-ap-3  Infrastruktura  1     54 Mb/s  55      **    WPA3      
+
 IN-USE  SSID        MODE            CHAN  RATE     SIGNAL  BARS  SECURITY  
         wlan1-ap-4  Infrastruktura  1     54 Mb/s  48      **    WPA1 WPA2 
 
 IN-USE  SSID  MODE  CHAN  RATE  SIGNAL  BARS  SECURITY 
 
-IN-USE  SSID        MODE            CHAN  RATE     SIGNAL  BARS  SECURITY  
-        wlan0-ap-2  Infrastruktura  1     54 Mb/s  92      ****  WPA1 WPA2 
-        wlan0-ap-1  Infrastruktura  1     54 Mb/s  81      ****  WPA1 WPA2 
-        wlan0-ap-3  Infrastruktura  1     54 Mb/s  55      **    WPA1 WPA2 
-
 <<<
 size: 2113
-location: clients/tests/test-client.py:1071:test_004()/331
+location: clients/tests/test-client.py:1085:test_004()/331
 cmd: $NMCLI --mode tabular -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list
 lang: C
 returncode: 0
 stdout: 1840 bytes
 >>>
+NAME   SSID        SSID-HEX              BSSID              MODE   CHAN  FREQ      RATE       SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
+AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infra  1     2412 MHz  54 Mbit/s  92      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/2 
+AP[2]  wlan0-ap-1  776C616E302D61702D31  61:95:77:AC:1E:4C  Infra  1     2412 MHz  54 Mbit/s  81      ****  WPA1       pair_tkip pair_ccmp group_tkip group_ccmp psk  (none)                                         wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/1 
+AP[3]  wlan0-ap-3  776C616E302D61702D33  9B:F6:B7:EC:97:76  Infra  1     2412 MHz  54 Mbit/s  55      **    WPA3       (none)                                         pair_tkip pair_ccmp group_tkip group_ccmp sae  wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/3 
+
 NAME   SSID        SSID-HEX              BSSID              MODE   CHAN  FREQ      RATE       SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
 AP[1]  wlan1-ap-4  776C616E312D61702D34  94:2B:E8:F6:D2:86  Infra  1     2412 MHz  54 Mbit/s  48      **    WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan1   no              /org/freedesktop/NetworkManager/AccessPoint/4 
 
 NAME  SSID  SSID-HEX  BSSID  MODE  CHAN  FREQ  RATE  SIGNAL  BARS  SECURITY  WPA-FLAGS  RSN-FLAGS  DEVICE  ACTIVE  IN-USE  DBUS-PATH 
 
-NAME   SSID        SSID-HEX              BSSID              MODE   CHAN  FREQ      RATE       SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
-AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infra  1     2412 MHz  54 Mbit/s  92      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/2 
-AP[2]  wlan0-ap-1  776C616E302D61702D31  61:95:77:AC:1E:4C  Infra  1     2412 MHz  54 Mbit/s  81      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/1 
-AP[3]  wlan0-ap-3  776C616E302D61702D33  9B:F6:B7:EC:97:76  Infra  1     2412 MHz  54 Mbit/s  55      **    WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/3 
-
 <<<
 size: 2181
-location: clients/tests/test-client.py:1071:test_004()/332
+location: clients/tests/test-client.py:1085:test_004()/332
 cmd: $NMCLI --mode tabular -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list
 lang: pl_PL.UTF-8
 returncode: 0
 stdout: 1898 bytes
 >>>
+NAME   SSID        SSID-HEX              BSSID              MODE            CHAN  FREQ      RATE     SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
+AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infrastruktura  1     2412 MHz  54 Mb/s  92      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/2 
+AP[2]  wlan0-ap-1  776C616E302D61702D31  61:95:77:AC:1E:4C  Infrastruktura  1     2412 MHz  54 Mb/s  81      ****  WPA1       pair_tkip pair_ccmp group_tkip group_ccmp psk  (brak)                                         wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/1 
+AP[3]  wlan0-ap-3  776C616E302D61702D33  9B:F6:B7:EC:97:76  Infrastruktura  1     2412 MHz  54 Mb/s  55      **    WPA3       (brak)                                         pair_tkip pair_ccmp group_tkip group_ccmp sae  wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/3 
+
 NAME   SSID        SSID-HEX              BSSID              MODE            CHAN  FREQ      RATE     SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
 AP[1]  wlan1-ap-4  776C616E312D61702D34  94:2B:E8:F6:D2:86  Infrastruktura  1     2412 MHz  54 Mb/s  48      **    WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan1   nie             /org/freedesktop/NetworkManager/AccessPoint/4 
 
 NAME  SSID  SSID-HEX  BSSID  MODE  CHAN  FREQ  RATE  SIGNAL  BARS  SECURITY  WPA-FLAGS  RSN-FLAGS  DEVICE  ACTIVE  IN-USE  DBUS-PATH 
 
-NAME   SSID        SSID-HEX              BSSID              MODE            CHAN  FREQ      RATE     SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
-AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infrastruktura  1     2412 MHz  54 Mb/s  92      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/2 
-AP[2]  wlan0-ap-1  776C616E302D61702D31  61:95:77:AC:1E:4C  Infrastruktura  1     2412 MHz  54 Mb/s  81      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/1 
-AP[3]  wlan0-ap-3  776C616E302D61702D33  9B:F6:B7:EC:97:76  Infrastruktura  1     2412 MHz  54 Mb/s  55      **    WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/3 
-
 <<<
-size: 751
-location: clients/tests/test-client.py:1073:test_004()/333
+size: 753
+location: clients/tests/test-client.py:1087:test_004()/333
 cmd: $NMCLI --mode tabular -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: C
 returncode: 0
-stdout: 568 bytes
+stdout: 570 bytes
 >>>
 NAME   SSID        SSID-HEX              BSSID              MODE   CHAN  FREQ      RATE       SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
 AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infra  1     2412 MHz  54 Mbit/s  92      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/2 
 
+
+
 <<<
-size: 779
-location: clients/tests/test-client.py:1073:test_004()/334
+size: 781
+location: clients/tests/test-client.py:1087:test_004()/334
 cmd: $NMCLI --mode tabular -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 586 bytes
+stdout: 588 bytes
 >>>
 NAME   SSID        SSID-HEX              BSSID              MODE            CHAN  FREQ      RATE     SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
 AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infrastruktura  1     2412 MHz  54 Mb/s  92      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/2 
 
+
+
 <<<
-size: 324
-location: clients/tests/test-client.py:1075:test_004()/335
+size: 326
+location: clients/tests/test-client.py:1089:test_004()/335
 cmd: $NMCLI --mode tabular -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: C
 returncode: 0
-stdout: 138 bytes
+stdout: 140 bytes
 >>>
 IN-USE  SSID        MODE   CHAN  RATE       SIGNAL  BARS  SECURITY  
         wlan0-ap-2  Infra  1     54 Mbit/s  92      ****  WPA1 WPA2 
 
+
+
 <<<
-size: 350
-location: clients/tests/test-client.py:1075:test_004()/336
+size: 352
+location: clients/tests/test-client.py:1089:test_004()/336
 cmd: $NMCLI --mode tabular -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 154 bytes
+stdout: 156 bytes
 >>>
 IN-USE  SSID        MODE            CHAN  RATE     SIGNAL  BARS  SECURITY  
         wlan0-ap-2  Infrastruktura  1     54 Mb/s  92      ****  WPA1 WPA2 
 
+
+
 <<<
-size: 864
-location: clients/tests/test-client.py:1078:test_004()/337
+size: 866
+location: clients/tests/test-client.py:1092:test_004()/337
 cmd: $NMCLI --mode tabular -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: C
 returncode: 0
-stdout: 568 bytes
+stdout: 570 bytes
 >>>
 NAME   SSID        SSID-HEX              BSSID              MODE   CHAN  FREQ      RATE       SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
 AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infra  1     2412 MHz  54 Mbit/s  92      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/2 
 
+
+
 <<<
-size: 892
-location: clients/tests/test-client.py:1078:test_004()/338
+size: 894
+location: clients/tests/test-client.py:1092:test_004()/338
 cmd: $NMCLI --mode tabular -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 586 bytes
+stdout: 588 bytes
 >>>
 NAME   SSID        SSID-HEX              BSSID              MODE            CHAN  FREQ      RATE     SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
 AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infrastruktura  1     2412 MHz  54 Mb/s  92      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/2 
 
+
+
 <<<
-size: 2943
-location: clients/tests/test-client.py:1080:test_004()/339
+size: 3015
+location: clients/tests/test-client.py:1094:test_004()/339
 cmd: $NMCLI --mode tabular -f ALL device show wlan0
 lang: C
 returncode: 0
-stdout: 2782 bytes
+stdout: 2854 bytes
 >>>
-NAME     DEVICE  TYPE  NM-TYPE       VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON               UDI                         IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED 
-GENERAL  wlan0   wifi  NMDeviceWifi  --      --       virtual  --              --                13:E0:74:85:7C:D9  0    20 (unavailable)  0 (No reason given)  /sys/devices/virtual/wlan0  --        no           yes         yes          no                no                 --            con-vpn-1   UUID-con-vpn-1-REPLACED-REPLACED-REP  /org/freedesktop/NetworkManager/ActiveConnection/2  unknown 
+NAME     DEVICE  TYPE  NM-TYPE       VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON               IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                         IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED 
+GENERAL  wlan0   wifi  NMDeviceWifi  --      --       virtual  --              --                13:E0:74:85:7C:D9  0    20 (unavailable)  0 (No reason given)  0 (unknown)       0 (unknown)       /sys/devices/virtual/wlan0  --        no           yes         yes          no                no                 --            con-vpn-1   UUID-con-vpn-1-REPLACED-REPLACED-REP  /org/freedesktop/NetworkManager/ActiveConnection/2  unknown 
 
 NAME          CARRIER-DETECT  SPEED    IS-SOFTWARE  SRIOV 
 CAPABILITIES  no              unknown  no           no    
@@ -20240,8 +20564,8 @@ WIFI-PROPERTIES  yes  yes  yes   yes   yes   yes  yes    unknown  unknown
 
 NAME   IN-USE  SSID        MODE   CHAN  RATE       SIGNAL  BARS  SECURITY  
 AP[1]          wlan0-ap-2  Infra  1     54 Mbit/s  92      ****  WPA1 WPA2 
-AP[2]          wlan0-ap-1  Infra  1     54 Mbit/s  81      ****  WPA1 WPA2 
-AP[3]          wlan0-ap-3  Infra  1     54 Mbit/s  55      **    WPA1 WPA2 
+AP[2]          wlan0-ap-1  Infra  1     54 Mbit/s  81      ****  WPA1      
+AP[3]          wlan0-ap-3  Infra  1     54 Mbit/s  55      **    WPA3      
 
 GROUP  ADDRESS                                 GATEWAY         ROUTE  DNS  DOMAIN                                                                            WINS           
 IP4    192.168.228.18/32 | 192.168.209.179/25  192.168.41.120  --     --   sear4.foo2.bar | sear4.fo.x.y | sear4.foo1.bar | sear4.foo4.bar | sear4.fo.o.bar  192.168.120.79 
@@ -20259,15 +20583,15 @@ NAME         AVAILABLE-CONNECTION-PATHS                               AVAILABLE-
 CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{2}  UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 
 
 <<<
-size: 3006
-location: clients/tests/test-client.py:1080:test_004()/340
+size: 3078
+location: clients/tests/test-client.py:1094:test_004()/340
 cmd: $NMCLI --mode tabular -f ALL device show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2835 bytes
+stdout: 2907 bytes
 >>>
-NAME     DEVICE  TYPE  NM-TYPE       VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON                    UDI                         IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED  
-GENERAL  wlan0   wifi  NMDeviceWifi  --      --       virtual  --              --                13:E0:74:85:7C:D9  0    20 (niedostępne)  0 (Nie podano przyczyny)  /sys/devices/virtual/wlan0  --        nie          tak         tak          nie               nie                --            con-vpn-1   UUID-con-vpn-1-REPLACED-REPLACED-REP  /org/freedesktop/NetworkManager/ActiveConnection/2  nieznane 
+NAME     DEVICE  TYPE  NM-TYPE       VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON                    IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                         IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED  
+GENERAL  wlan0   wifi  NMDeviceWifi  --      --       virtual  --              --                13:E0:74:85:7C:D9  0    20 (niedostępne)  0 (Nie podano przyczyny)  0 (nieznane)      0 (nieznane)      /sys/devices/virtual/wlan0  --        nie          tak         tak          nie               nie                --            con-vpn-1   UUID-con-vpn-1-REPLACED-REPLACED-REP  /org/freedesktop/NetworkManager/ActiveConnection/2  nieznane 
 
 NAME          CARRIER-DETECT  SPEED     IS-SOFTWARE  SRIOV 
 CAPABILITIES  nie             nieznane  nie          nie   
@@ -20277,8 +20601,8 @@ WIFI-PROPERTIES  tak  tak  tak   tak   tak   tak  tak    nieznane  nieznane
 
 NAME   IN-USE  SSID        MODE            CHAN  RATE     SIGNAL  BARS  SECURITY  
 AP[1]          wlan0-ap-2  Infrastruktura  1     54 Mb/s  92      ****  WPA1 WPA2 
-AP[2]          wlan0-ap-1  Infrastruktura  1     54 Mb/s  81      ****  WPA1 WPA2 
-AP[3]          wlan0-ap-3  Infrastruktura  1     54 Mb/s  55      **    WPA1 WPA2 
+AP[2]          wlan0-ap-1  Infrastruktura  1     54 Mb/s  81      ****  WPA1      
+AP[3]          wlan0-ap-3  Infrastruktura  1     54 Mb/s  55      **    WPA3      
 
 GROUP  ADDRESS                                 GATEWAY         ROUTE  DNS  DOMAIN                                                                            WINS           
 IP4    192.168.228.18/32 | 192.168.209.179/25  192.168.41.120  --     --   sear4.foo2.bar | sear4.fo.x.y | sear4.foo1.bar | sear4.foo4.bar | sear4.fo.o.bar  192.168.120.79 
@@ -20297,7 +20621,7 @@ CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{2}  UUID-con-x
 
 <<<
 size: 1143
-location: clients/tests/test-client.py:1082:test_004()/341
+location: clients/tests/test-client.py:1096:test_004()/341
 cmd: $NMCLI --mode tabular -f COMMON device show wlan0
 lang: C
 returncode: 0
@@ -20332,7 +20656,7 @@ IP6    --       --       dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 250
 
 <<<
 size: 1154
-location: clients/tests/test-client.py:1082:test_004()/342
+location: clients/tests/test-client.py:1096:test_004()/342
 cmd: $NMCLI --mode tabular -f COMMON device show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
@@ -20366,15 +20690,15 @@ GROUP  ADDRESS  GATEWAY  ROUTE
 IP6    --       --       dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086  --   sear6.foo2.bar | sear6.foo1.bar | sear6.fo.x.y | sear6.fo.o.bar | sear6.foo3.bar | sear6.foo4.bar 
 
 <<<
-size: 3081
-location: clients/tests/test-client.py:1084:test_004()/343
+size: 3153
+location: clients/tests/test-client.py:1098:test_004()/343
 cmd: $NMCLI --mode tabular -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0
 lang: C
 returncode: 0
-stdout: 2782 bytes
+stdout: 2854 bytes
 >>>
-NAME     DEVICE  TYPE  NM-TYPE       VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON               UDI                         IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED 
-GENERAL  wlan0   wifi  NMDeviceWifi  --      --       virtual  --              --                13:E0:74:85:7C:D9  0    20 (unavailable)  0 (No reason given)  /sys/devices/virtual/wlan0  --        no           yes         yes          no                no                 --            con-vpn-1   UUID-con-vpn-1-REPLACED-REPLACED-REP  /org/freedesktop/NetworkManager/ActiveConnection/2  unknown 
+NAME     DEVICE  TYPE  NM-TYPE       VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON               IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                         IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED 
+GENERAL  wlan0   wifi  NMDeviceWifi  --      --       virtual  --              --                13:E0:74:85:7C:D9  0    20 (unavailable)  0 (No reason given)  0 (unknown)       0 (unknown)       /sys/devices/virtual/wlan0  --        no           yes         yes          no                no                 --            con-vpn-1   UUID-con-vpn-1-REPLACED-REPLACED-REP  /org/freedesktop/NetworkManager/ActiveConnection/2  unknown 
 
 NAME          CARRIER-DETECT  SPEED    IS-SOFTWARE  SRIOV 
 CAPABILITIES  no              unknown  no           no    
@@ -20384,8 +20708,8 @@ WIFI-PROPERTIES  yes  yes  yes   yes   yes   yes  yes    unknown  unknown
 
 NAME   IN-USE  SSID        MODE   CHAN  RATE       SIGNAL  BARS  SECURITY  
 AP[1]          wlan0-ap-2  Infra  1     54 Mbit/s  92      ****  WPA1 WPA2 
-AP[2]          wlan0-ap-1  Infra  1     54 Mbit/s  81      ****  WPA1 WPA2 
-AP[3]          wlan0-ap-3  Infra  1     54 Mbit/s  55      **    WPA1 WPA2 
+AP[2]          wlan0-ap-1  Infra  1     54 Mbit/s  81      ****  WPA1      
+AP[3]          wlan0-ap-3  Infra  1     54 Mbit/s  55      **    WPA3      
 
 GROUP  ADDRESS                                 GATEWAY         ROUTE  DNS  DOMAIN                                                                            WINS           
 IP4    192.168.228.18/32 | 192.168.209.179/25  192.168.41.120  --     --   sear4.foo2.bar | sear4.fo.x.y | sear4.foo1.bar | sear4.foo4.bar | sear4.fo.o.bar  192.168.120.79 
@@ -20403,15 +20727,15 @@ NAME         AVAILABLE-CONNECTION-PATHS                               AVAILABLE-
 CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{2}  UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 
 
 <<<
-size: 3144
-location: clients/tests/test-client.py:1084:test_004()/344
+size: 3216
+location: clients/tests/test-client.py:1098:test_004()/344
 cmd: $NMCLI --mode tabular -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2835 bytes
+stdout: 2907 bytes
 >>>
-NAME     DEVICE  TYPE  NM-TYPE       VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON                    UDI                         IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED  
-GENERAL  wlan0   wifi  NMDeviceWifi  --      --       virtual  --              --                13:E0:74:85:7C:D9  0    20 (niedostępne)  0 (Nie podano przyczyny)  /sys/devices/virtual/wlan0  --        nie          tak         tak          nie               nie                --            con-vpn-1   UUID-con-vpn-1-REPLACED-REPLACED-REP  /org/freedesktop/NetworkManager/ActiveConnection/2  nieznane 
+NAME     DEVICE  TYPE  NM-TYPE       VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON                    IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                         IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED  
+GENERAL  wlan0   wifi  NMDeviceWifi  --      --       virtual  --              --                13:E0:74:85:7C:D9  0    20 (niedostępne)  0 (Nie podano przyczyny)  0 (nieznane)      0 (nieznane)      /sys/devices/virtual/wlan0  --        nie          tak         tak          nie               nie                --            con-vpn-1   UUID-con-vpn-1-REPLACED-REPLACED-REP  /org/freedesktop/NetworkManager/ActiveConnection/2  nieznane 
 
 NAME          CARRIER-DETECT  SPEED     IS-SOFTWARE  SRIOV 
 CAPABILITIES  nie             nieznane  nie          nie   
@@ -20421,8 +20745,8 @@ WIFI-PROPERTIES  tak  tak  tak   tak   tak   tak  tak    nieznane  nieznane
 
 NAME   IN-USE  SSID        MODE            CHAN  RATE     SIGNAL  BARS  SECURITY  
 AP[1]          wlan0-ap-2  Infrastruktura  1     54 Mb/s  92      ****  WPA1 WPA2 
-AP[2]          wlan0-ap-1  Infrastruktura  1     54 Mb/s  81      ****  WPA1 WPA2 
-AP[3]          wlan0-ap-3  Infrastruktura  1     54 Mb/s  55      **    WPA1 WPA2 
+AP[2]          wlan0-ap-1  Infrastruktura  1     54 Mb/s  81      ****  WPA1      
+AP[3]          wlan0-ap-3  Infrastruktura  1     54 Mb/s  55      **    WPA3      
 
 GROUP  ADDRESS                                 GATEWAY         ROUTE  DNS  DOMAIN                                                                            WINS           
 IP4    192.168.228.18/32 | 192.168.209.179/25  192.168.41.120  --     --   sear4.foo2.bar | sear4.fo.x.y | sear4.foo1.bar | sear4.foo4.bar | sear4.fo.o.bar  192.168.120.79 
@@ -20441,7 +20765,7 @@ CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{2}  UUID-con-x
 
 <<<
 size: 2990
-location: clients/tests/test-client.py:1022:test_004()/345
+location: clients/tests/test-client.py:1036:test_004()/345
 cmd: $NMCLI --mode tabular --color yes con s con-vpn-1
 lang: C
 returncode: 0
@@ -20469,12 +20793,12 @@ NAME  TYPE     USERNAME  GATEWAY  BANNER                            VPN-STATE
 VPN   openvpn  --        --       *** VPN connection con-vpn-1 ***  5 - VPN connected  key1 = val1 | key2 = val2 | key3 = val3 
 
 <<<
-size: 3011
-location: clients/tests/test-client.py:1022:test_004()/346
+size: 3013
+location: clients/tests/test-client.py:1036:test_004()/346
 cmd: $NMCLI --mode tabular --color yes con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2837 bytes
+stdout: 2839 bytes
 >>>
 name        id         uuid                                  stable-id  type  interface-name  autoconnect  autoconnect-priority  autoconnect-retries  multi-connect  auth-retries  timestamp  read-only  permissions  zone  master  slave-type  autoconnect-slaves  secondaries  gateway-ping-timeout  metered   lldp     mdns          llmnr        
 connection  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  --         vpn   --              tak          0                     -1 (default)         0 (default)    -1            0          nie        --           --    --      --          -1 (default)        --           0                     nieznane  default  -1 (default)  -1 (default) 
@@ -20495,11 +20819,11 @@ GROUP    NAME       UUID                                  DEVICES  STATE       D
 GENERAL  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  wlan0    aktywowano  nie      nie       --           tak  /org/freedesktop/NetworkManager/ActiveConnection/2  /org/freedesktop/NetworkManager/Settings/Connection/3  --    --          
 
 NAME  TYPE     USERNAME  GATEWAY  BANNER                            VPN-STATE            CFG                                     
-VPN   openvpn  --        --       *** VPN connection con-vpn-1 ***  5 - Połączono z VPN  key1 = val1 | key2 = val2 | key3 = val3 
+VPN   openvpn  --        --       *** VPN connection con-vpn-1 ***  5 — Połączono z VPN  key1 = val1 | key2 = val2 | key3 = val3 
 
 <<<
 size: 2990
-location: clients/tests/test-client.py:1024:test_004()/347
+location: clients/tests/test-client.py:1038:test_004()/347
 cmd: $NMCLI --mode tabular --color yes con s con-vpn-1
 lang: C
 returncode: 0
@@ -20527,12 +20851,12 @@ NAME  TYPE     USERNAME  GATEWAY  BANNER                            VPN-STATE
 VPN   openvpn  --        --       *** VPN connection con-vpn-1 ***  5 - VPN connected  key1 = val1 | key2 = val2 | key3 = val3 
 
 <<<
-size: 3011
-location: clients/tests/test-client.py:1024:test_004()/348
+size: 3013
+location: clients/tests/test-client.py:1038:test_004()/348
 cmd: $NMCLI --mode tabular --color yes con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2837 bytes
+stdout: 2839 bytes
 >>>
 name        id         uuid                                  stable-id  type  interface-name  autoconnect  autoconnect-priority  autoconnect-retries  multi-connect  auth-retries  timestamp  read-only  permissions  zone  master  slave-type  autoconnect-slaves  secondaries  gateway-ping-timeout  metered   lldp     mdns          llmnr        
 connection  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  --         vpn   --              tak          0                     -1 (default)         0 (default)    -1            0          nie        --           --    --      --          -1 (default)        --           0                     nieznane  default  -1 (default)  -1 (default) 
@@ -20553,11 +20877,11 @@ GROUP    NAME       UUID                                  DEVICES  STATE       D
 GENERAL  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  wlan0    aktywowano  nie      nie       --           tak  /org/freedesktop/NetworkManager/ActiveConnection/2  /org/freedesktop/NetworkManager/Settings/Connection/3  --    --          
 
 NAME  TYPE     USERNAME  GATEWAY  BANNER                            VPN-STATE            CFG                                     
-VPN   openvpn  --        --       *** VPN connection con-vpn-1 ***  5 - Połączono z VPN  key1 = val1 | key2 = val2 | key3 = val3 
+VPN   openvpn  --        --       *** VPN connection con-vpn-1 ***  5 — Połączono z VPN  key1 = val1 | key2 = val2 | key3 = val3 
 
 <<<
 size: 2258
-location: clients/tests/test-client.py:1027:test_004()/349
+location: clients/tests/test-client.py:1041:test_004()/349
 cmd: $NMCLI --mode tabular --color yes -f ALL con s con-vpn-1
 lang: C
 returncode: 0
@@ -20581,7 +20905,7 @@ proxy  none    no            --       --
 
 <<<
 size: 2270
-location: clients/tests/test-client.py:1027:test_004()/350
+location: clients/tests/test-client.py:1041:test_004()/350
 cmd: $NMCLI --mode tabular --color yes -f ALL con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
@@ -20605,7 +20929,7 @@ proxy  none    nie           --       --
 
 <<<
 size: 424
-location: clients/tests/test-client.py:1033:test_004()/351
+location: clients/tests/test-client.py:1047:test_004()/351
 cmd: $NMCLI --mode tabular --color yes -f VPN con s con-vpn-1
 lang: C
 returncode: 0
@@ -20616,7 +20940,7 @@ vpn   org.freedesktop.NetworkManager.openvpn  --         key1 = val1, key2 = val
 
 <<<
 size: 434
-location: clients/tests/test-client.py:1033:test_004()/352
+location: clients/tests/test-client.py:1047:test_004()/352
 cmd: $NMCLI --mode tabular --color yes -f VPN con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
@@ -20627,7 +20951,7 @@ vpn   org.freedesktop.NetworkManager.openvpn  --         key1 = val1, key2 = val
 
 <<<
 size: 656
-location: clients/tests/test-client.py:1036:test_004()/353
+location: clients/tests/test-client.py:1050:test_004()/353
 cmd: $NMCLI --mode tabular --color yes -f GENERAL con s con-vpn-1
 lang: C
 returncode: 0
@@ -20638,7 +20962,7 @@ GENERAL  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  wlan0    activated  no
 
 <<<
 size: 668
-location: clients/tests/test-client.py:1036:test_004()/354
+location: clients/tests/test-client.py:1050:test_004()/354
 cmd: $NMCLI --mode tabular --color yes -f GENERAL con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
@@ -20649,186 +20973,72 @@ GENERAL  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  wlan0    aktywowano  n
 
 <<<
 size: 571
-location: clients/tests/test-client.py:1039:test_004()/355
+location: clients/tests/test-client.py:1053:test_004()/355
 cmd: $NMCLI --mode tabular --color yes dev s
 lang: C
 returncode: 0
 stdout: 418 bytes
 >>>
 DEVICE  TYPE      STATE        CONNECTION 
+wlan0   wifi      unavailable  con-vpn-1  
 eth0    ethernet  unavailable  --         
 eth1    ethernet  unavailable  --         
 wlan1   wifi      unavailable  --         
 wlan1   wifi      unavailable  --         
-wlan0   wifi      unavailable  con-vpn-1  
 
 <<<
 size: 586
-location: clients/tests/test-client.py:1039:test_004()/356
+location: clients/tests/test-client.py:1053:test_004()/356
 cmd: $NMCLI --mode tabular --color yes dev s
 lang: pl_PL.UTF-8
 returncode: 0
 stdout: 423 bytes
 >>>
 DEVICE  TYPE      STATE        CONNECTION 
+wlan0   wifi      niedostępne  con-vpn-1  
 eth0    ethernet  niedostępne  --         
 eth1    ethernet  niedostępne  --         
 wlan1   wifi      niedostępne  --         
 wlan1   wifi      niedostępne  --         
-wlan0   wifi      niedostępne  con-vpn-1  
 
 <<<
-size: 1502
-location: clients/tests/test-client.py:1042:test_004()/357
+size: 1798
+location: clients/tests/test-client.py:1056:test_004()/357
 cmd: $NMCLI --mode tabular --color yes -f all dev status
 lang: C
 returncode: 0
-stdout: 1336 bytes
+stdout: 1632 bytes
 >>>
-DEVICE  TYPE      STATE        DBUS-PATH                                  CONNECTION  CON-UUID                              CON-PATH                                           
-eth0    ethernet  unavailable  /org/freedesktop/NetworkManager/Devices/1  --          --                                    --                                                 
-eth1    ethernet  unavailable  /org/freedesktop/NetworkManager/Devices/2  --          --                                    --                                                 
-wlan1   wifi      unavailable  /org/freedesktop/NetworkManager/Devices/4  --          --                                    --                                                 
-wlan1   wifi      unavailable  /org/freedesktop/NetworkManager/Devices/5  --          --                                    --                                                 
-wlan0   wifi      unavailable  /org/freedesktop/NetworkManager/Devices/3  con-vpn-1   UUID-con-vpn-1-REPLACED-REPLACED-REP  /org/freedesktop/NetworkManager/ActiveConnection/2 
+DEVICE  TYPE      STATE        IP4-CONNECTIVITY  IP6-CONNECTIVITY  DBUS-PATH                                  CONNECTION  CON-UUID                              CON-PATH                                           
+wlan0   wifi      unavailable  unknown           unknown           /org/freedesktop/NetworkManager/Devices/3  con-vpn-1   UUID-con-vpn-1-REPLACED-REPLACED-REP  /org/freedesktop/NetworkManager/ActiveConnection/2 
+eth0    ethernet  unavailable  unknown           unknown           /org/freedesktop/NetworkManager/Devices/1  --          --                                    --                                                 
+eth1    ethernet  unavailable  unknown           unknown           /org/freedesktop/NetworkManager/Devices/2  --          --                                    --                                                 
+wlan1   wifi      unavailable  unknown           unknown           /org/freedesktop/NetworkManager/Devices/4  --          --                                    --                                                 
+wlan1   wifi      unavailable  unknown           unknown           /org/freedesktop/NetworkManager/Devices/5  --          --                                    --                                                 
 
 <<<
-size: 1517
-location: clients/tests/test-client.py:1042:test_004()/358
+size: 1813
+location: clients/tests/test-client.py:1056:test_004()/358
 cmd: $NMCLI --mode tabular --color yes -f all dev status
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 1341 bytes
+stdout: 1637 bytes
 >>>
-DEVICE  TYPE      STATE        DBUS-PATH                                  CONNECTION  CON-UUID                              CON-PATH                                           
-eth0    ethernet  niedostępne  /org/freedesktop/NetworkManager/Devices/1  --          --                                    --                                                 
-eth1    ethernet  niedostępne  /org/freedesktop/NetworkManager/Devices/2  --          --                                    --                                                 
-wlan1   wifi      niedostępne  /org/freedesktop/NetworkManager/Devices/4  --          --                                    --                                                 
-wlan1   wifi      niedostępne  /org/freedesktop/NetworkManager/Devices/5  --          --                                    --                                                 
-wlan0   wifi      niedostępne  /org/freedesktop/NetworkManager/Devices/3  con-vpn-1   UUID-con-vpn-1-REPLACED-REPLACED-REP  /org/freedesktop/NetworkManager/ActiveConnection/2 
+DEVICE  TYPE      STATE        IP4-CONNECTIVITY  IP6-CONNECTIVITY  DBUS-PATH                                  CONNECTION  CON-UUID                              CON-PATH                                           
+wlan0   wifi      niedostępne  nieznane          nieznane          /org/freedesktop/NetworkManager/Devices/3  con-vpn-1   UUID-con-vpn-1-REPLACED-REPLACED-REP  /org/freedesktop/NetworkManager/ActiveConnection/2 
+eth0    ethernet  niedostępne  nieznane          nieznane          /org/freedesktop/NetworkManager/Devices/1  --          --                                    --                                                 
+eth1    ethernet  niedostępne  nieznane          nieznane          /org/freedesktop/NetworkManager/Devices/2  --          --                                    --                                                 
+wlan1   wifi      niedostępne  nieznane          nieznane          /org/freedesktop/NetworkManager/Devices/4  --          --                                    --                                                 
+wlan1   wifi      niedostępne  nieznane          nieznane          /org/freedesktop/NetworkManager/Devices/5  --          --                                    --                                                 
 
 <<<
 size: 6373
-location: clients/tests/test-client.py:1045:test_004()/359
+location: clients/tests/test-client.py:1059:test_004()/359
 cmd: $NMCLI --mode tabular --color yes dev show
 lang: C
 returncode: 0
 stdout: 6216 bytes
 >>>
-DEVICE 
-eth0   
-
-TYPE     
-ethernet 
-
-HWADDR            
-AB:B7:BF:E2:48:E8 
-
-MTU 
-0   
-
-STATE            
-20 (unavailable) 
-
-CONNECTION 
---         
-
-CON-PATH 
---       
-
-NAME              CARRIER  S390-SUBCHANNELS 
-WIRED-PROPERTIES  off      --               
-
-GROUP  ADDRESS                               GATEWAY  ROUTE  DNS                                               DOMAIN                           WINS                             
-IP4    192.168.49.34/22 | 192.168.135.86/19  --       --     192.168.45.230 | 192.168.180.201 | 192.168.253.2  sear4.foo2.bar | sear4.foo1.bar  192.168.163.23 | 192.168.151.246 
-
-GROUP  ADDRESS                        GATEWAY  ROUTE  DNS                                                                                    DOMAIN                          
-IP6    2001:a::ed81:3d7:c2e9:df82/99  --       --     2001:a::2703:f06:9619:d89f | 2001:a::3a75:3682:c683:8541 | 2001:a::584e:912:d5ee:c74f  sear6.foo4.bar | sear6.fo.o.bar 
-
-DEVICE 
-eth1   
-
-TYPE     
-ethernet 
-
-HWADDR            
-E7:78:B1:93:2B:22 
-
-MTU 
-0   
-
-STATE            
-20 (unavailable) 
-
-CONNECTION 
---         
-
-CON-PATH 
---       
-
-NAME              CARRIER  S390-SUBCHANNELS 
-WIRED-PROPERTIES  off      --               
-
-GROUP  ADDRESS             GATEWAY       ROUTE                                                                                                                                                                                         DNS                                               DOMAIN                                            WINS                                             
-IP4    192.168.127.210/25  192.168.88.4  dst = 192.168.222.35/19, nh = 192.168.170.142, mt = 3609264321 | dst = 192.168.135.81/32, nh = 192.168.32.11, mt = 1316413247 | dst = 192.168.24.65/26, nh = 192.168.23.163, mt = 3855574583  192.168.16.144 | 192.168.79.53 | 192.168.237.155  sear4.foo4.bar | sear4.foo3.bar | sear4.foo1.bar  192.168.211.91 | 192.168.58.182 | 192.168.114.97 
-
-GROUP  ADDRESS                                                          GATEWAY  ROUTE                                           DNS                                                                                     DOMAIN         
-IP6    2001:a::1c1:c178:169f:2b80/93 | 2001:a::1f79:e0fb:87b9:3cc6/123  --       dst = 2001:a::3166:7ed1:e4ae:7612/123, nh = ::  2001:a::edda:955:dcf4:23d4 | 2001:a::109f:aa0f:fb4a:9d5a | 2001:a::61cf:7c82:e9c0:c952  sear6.foo1.bar 
-
-DEVICE 
-wlan1  
-
-TYPE 
-wifi 
-
-HWADDR            
-21:E9:64:81:8C:A8 
-
-MTU 
-0   
-
-STATE            
-20 (unavailable) 
-
-CONNECTION 
---         
-
-CON-PATH 
---       
-
-GROUP  ADDRESS  GATEWAY         ROUTE                                                                                                                                                  DNS            DOMAIN                                                                                             WINS 
-IP4    --       192.168.57.160  dst = 192.168.36.106/21, nh = 192.168.199.128, mt = 979274165 | dst = 192.168.238.130/19, nh = 0.0.0.0 | dst = 192.168.224.39/32, nh = 192.168.148.69  192.168.61.83  sear4.foo4.bar | sear4.fo.x.y | sear4.foo2.bar | sear4.foo1.bar | sear4.fo.o.bar | sear4.foo3.bar  --   
-
-GROUP  ADDRESS                                                                                           GATEWAY                      ROUTE                                                                                                                                                    DNS                                                       DOMAIN                          
-IP6    2001:a::fa05:2ab4:9300:e8fe/116 | 2001:a::e9cf:bd3:caba:99b3/86 | 2001:a::2be6:44fa:2c95:5559/78  2001:a::4d70:d91a:770f:2319  dst = 2001:a::3cb2:719d:bb00:b22f/66, nh = 2001:a::81b1:58b9:7237:3511, mt = 2280277732 | dst = 2001:a::986f:983c:5eb:1c7d/99, nh = ::, mt = 1204008676  2001:a::85e7:3d7d:53e8:50ac | 2001:a::1c5:9cb5:e86d:25a5  sear6.foo4.bar | sear6.foo2.bar 
-
-DEVICE 
-wlan1  
-
-TYPE 
-wifi 
-
-HWADDR            
-71:52:AD:63:5C:7C 
-
-MTU 
-0   
-
-STATE            
-20 (unavailable) 
-
-CONNECTION 
---         
-
-CON-PATH 
---       
-
-GROUP  ADDRESS                                GATEWAY  ROUTE                                                           DNS              DOMAIN                                                                            WINS                          
-IP4    192.168.97.124/29 | 192.168.76.154/18  --       dst = 192.168.33.233/22, nh = 192.168.222.210, mt = 2810496551  192.168.107.109  sear4.fo.o.bar | sear4.fo.x.y | sear4.foo2.bar | sear4.foo3.bar | sear4.foo4.bar  192.168.60.60 | 192.168.63.92 
-
-GROUP  ADDRESS                        GATEWAY  ROUTE                                                                                                                                                                                                      DNS                          DOMAIN       
-IP6    2001:a::88ca:3654:96b:ab44/89  --       dst = 2001:a::cc8b:7c09:4673:bbb0/85, nh = ::, mt = 2821465568 | dst = 2001:a::a976:2488:f49f:b48/106, nh = 2001:a::62ae:c734:fc7b:e931, mt = 2248613879 | dst = 2001:a::afb7:4449:3787:8bb4/123, nh = ::  2001:a::2934:bd66:550d:ec19  sear6.fo.x.y 
-
 DEVICE 
 wlan0  
 
@@ -20856,14 +21066,6 @@ IP4    192.168.228.18/32 | 192.168.209.179/25  192.168.41.120  --     --   sear4
 GROUP  ADDRESS  GATEWAY  ROUTE                                                           DNS  DOMAIN                                                                                            
 IP6    --       --       dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086  --   sear6.foo2.bar | sear6.foo1.bar | sear6.fo.x.y | sear6.fo.o.bar | sear6.foo3.bar | sear6.foo4.bar 
 
-<<<
-size: 6400
-location: clients/tests/test-client.py:1045:test_004()/360
-cmd: $NMCLI --mode tabular --color yes dev show
-lang: pl_PL.UTF-8
-returncode: 0
-stdout: 6233 bytes
->>>
 DEVICE 
 eth0   
 
@@ -20877,7 +21079,7 @@ MTU
 0   
 
 STATE            
-20 (niedostępne) 
+20 (unavailable) 
 
 CONNECTION 
 --         
@@ -20885,8 +21087,8 @@ CONNECTION
 CON-PATH 
 --       
 
-NAME              CARRIER    S390-SUBCHANNELS 
-WIRED-PROPERTIES  wyłączone  --               
+NAME              CARRIER  S390-SUBCHANNELS 
+WIRED-PROPERTIES  off      --               
 
 GROUP  ADDRESS                               GATEWAY  ROUTE  DNS                                               DOMAIN                           WINS                             
 IP4    192.168.49.34/22 | 192.168.135.86/19  --       --     192.168.45.230 | 192.168.180.201 | 192.168.253.2  sear4.foo2.bar | sear4.foo1.bar  192.168.163.23 | 192.168.151.246 
@@ -20907,7 +21109,7 @@ MTU
 0   
 
 STATE            
-20 (niedostępne) 
+20 (unavailable) 
 
 CONNECTION 
 --         
@@ -20915,8 +21117,8 @@ CONNECTION
 CON-PATH 
 --       
 
-NAME              CARRIER    S390-SUBCHANNELS 
-WIRED-PROPERTIES  wyłączone  --               
+NAME              CARRIER  S390-SUBCHANNELS 
+WIRED-PROPERTIES  off      --               
 
 GROUP  ADDRESS             GATEWAY       ROUTE                                                                                                                                                                                         DNS                                               DOMAIN                                            WINS                                             
 IP4    192.168.127.210/25  192.168.88.4  dst = 192.168.222.35/19, nh = 192.168.170.142, mt = 3609264321 | dst = 192.168.135.81/32, nh = 192.168.32.11, mt = 1316413247 | dst = 192.168.24.65/26, nh = 192.168.23.163, mt = 3855574583  192.168.16.144 | 192.168.79.53 | 192.168.237.155  sear4.foo4.bar | sear4.foo3.bar | sear4.foo1.bar  192.168.211.91 | 192.168.58.182 | 192.168.114.97 
@@ -20937,7 +21139,7 @@ MTU
 0   
 
 STATE            
-20 (niedostępne) 
+20 (unavailable) 
 
 CONNECTION 
 --         
@@ -20964,7 +21166,7 @@ MTU
 0   
 
 STATE            
-20 (niedostępne) 
+20 (unavailable) 
 
 CONNECTION 
 --         
@@ -20978,6 +21180,14 @@ IP4    192.168.97.124/29 | 192.168.76.154/18  --       dst = 192.168.33.233/22,
 GROUP  ADDRESS                        GATEWAY  ROUTE                                                                                                                                                                                                      DNS                          DOMAIN       
 IP6    2001:a::88ca:3654:96b:ab44/89  --       dst = 2001:a::cc8b:7c09:4673:bbb0/85, nh = ::, mt = 2821465568 | dst = 2001:a::a976:2488:f49f:b48/106, nh = 2001:a::62ae:c734:fc7b:e931, mt = 2248613879 | dst = 2001:a::afb7:4449:3787:8bb4/123, nh = ::  2001:a::2934:bd66:550d:ec19  sear6.fo.x.y 
 
+<<<
+size: 6400
+location: clients/tests/test-client.py:1059:test_004()/360
+cmd: $NMCLI --mode tabular --color yes dev show
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 6233 bytes
+>>>
 DEVICE 
 wlan0  
 
@@ -21005,16 +21215,159 @@ IP4    192.168.228.18/32 | 192.168.209.179/25  192.168.41.120  --     --   sear4
 GROUP  ADDRESS  GATEWAY  ROUTE                                                           DNS  DOMAIN                                                                                            
 IP6    --       --       dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086  --   sear6.foo2.bar | sear6.foo1.bar | sear6.fo.x.y | sear6.fo.o.bar | sear6.foo3.bar | sear6.foo4.bar 
 
+DEVICE 
+eth0   
+
+TYPE     
+ethernet 
+
+HWADDR            
+AB:B7:BF:E2:48:E8 
+
+MTU 
+0   
+
+STATE            
+20 (niedostępne) 
+
+CONNECTION 
+--         
+
+CON-PATH 
+--       
+
+NAME              CARRIER    S390-SUBCHANNELS 
+WIRED-PROPERTIES  wyłączone  --               
+
+GROUP  ADDRESS                               GATEWAY  ROUTE  DNS                                               DOMAIN                           WINS                             
+IP4    192.168.49.34/22 | 192.168.135.86/19  --       --     192.168.45.230 | 192.168.180.201 | 192.168.253.2  sear4.foo2.bar | sear4.foo1.bar  192.168.163.23 | 192.168.151.246 
+
+GROUP  ADDRESS                        GATEWAY  ROUTE  DNS                                                                                    DOMAIN                          
+IP6    2001:a::ed81:3d7:c2e9:df82/99  --       --     2001:a::2703:f06:9619:d89f | 2001:a::3a75:3682:c683:8541 | 2001:a::584e:912:d5ee:c74f  sear6.foo4.bar | sear6.fo.o.bar 
+
+DEVICE 
+eth1   
+
+TYPE     
+ethernet 
+
+HWADDR            
+E7:78:B1:93:2B:22 
+
+MTU 
+0   
+
+STATE            
+20 (niedostępne) 
+
+CONNECTION 
+--         
+
+CON-PATH 
+--       
+
+NAME              CARRIER    S390-SUBCHANNELS 
+WIRED-PROPERTIES  wyłączone  --               
+
+GROUP  ADDRESS             GATEWAY       ROUTE                                                                                                                                                                                         DNS                                               DOMAIN                                            WINS                                             
+IP4    192.168.127.210/25  192.168.88.4  dst = 192.168.222.35/19, nh = 192.168.170.142, mt = 3609264321 | dst = 192.168.135.81/32, nh = 192.168.32.11, mt = 1316413247 | dst = 192.168.24.65/26, nh = 192.168.23.163, mt = 3855574583  192.168.16.144 | 192.168.79.53 | 192.168.237.155  sear4.foo4.bar | sear4.foo3.bar | sear4.foo1.bar  192.168.211.91 | 192.168.58.182 | 192.168.114.97 
+
+GROUP  ADDRESS                                                          GATEWAY  ROUTE                                           DNS                                                                                     DOMAIN         
+IP6    2001:a::1c1:c178:169f:2b80/93 | 2001:a::1f79:e0fb:87b9:3cc6/123  --       dst = 2001:a::3166:7ed1:e4ae:7612/123, nh = ::  2001:a::edda:955:dcf4:23d4 | 2001:a::109f:aa0f:fb4a:9d5a | 2001:a::61cf:7c82:e9c0:c952  sear6.foo1.bar 
+
+DEVICE 
+wlan1  
+
+TYPE 
+wifi 
+
+HWADDR            
+21:E9:64:81:8C:A8 
+
+MTU 
+0   
+
+STATE            
+20 (niedostępne) 
+
+CONNECTION 
+--         
+
+CON-PATH 
+--       
+
+GROUP  ADDRESS  GATEWAY         ROUTE                                                                                                                                                  DNS            DOMAIN                                                                                             WINS 
+IP4    --       192.168.57.160  dst = 192.168.36.106/21, nh = 192.168.199.128, mt = 979274165 | dst = 192.168.238.130/19, nh = 0.0.0.0 | dst = 192.168.224.39/32, nh = 192.168.148.69  192.168.61.83  sear4.foo4.bar | sear4.fo.x.y | sear4.foo2.bar | sear4.foo1.bar | sear4.fo.o.bar | sear4.foo3.bar  --   
+
+GROUP  ADDRESS                                                                                           GATEWAY                      ROUTE                                                                                                                                                    DNS                                                       DOMAIN                          
+IP6    2001:a::fa05:2ab4:9300:e8fe/116 | 2001:a::e9cf:bd3:caba:99b3/86 | 2001:a::2be6:44fa:2c95:5559/78  2001:a::4d70:d91a:770f:2319  dst = 2001:a::3cb2:719d:bb00:b22f/66, nh = 2001:a::81b1:58b9:7237:3511, mt = 2280277732 | dst = 2001:a::986f:983c:5eb:1c7d/99, nh = ::, mt = 1204008676  2001:a::85e7:3d7d:53e8:50ac | 2001:a::1c5:9cb5:e86d:25a5  sear6.foo4.bar | sear6.foo2.bar 
+
+DEVICE 
+wlan1  
+
+TYPE 
+wifi 
+
+HWADDR            
+71:52:AD:63:5C:7C 
+
+MTU 
+0   
+
+STATE            
+20 (niedostępne) 
+
+CONNECTION 
+--         
+
+CON-PATH 
+--       
+
+GROUP  ADDRESS                                GATEWAY  ROUTE                                                           DNS              DOMAIN                                                                            WINS                          
+IP4    192.168.97.124/29 | 192.168.76.154/18  --       dst = 192.168.33.233/22, nh = 192.168.222.210, mt = 2810496551  192.168.107.109  sear4.fo.o.bar | sear4.fo.x.y | sear4.foo2.bar | sear4.foo3.bar | sear4.foo4.bar  192.168.60.60 | 192.168.63.92 
+
+GROUP  ADDRESS                        GATEWAY  ROUTE                                                                                                                                                                                                      DNS                          DOMAIN       
+IP6    2001:a::88ca:3654:96b:ab44/89  --       dst = 2001:a::cc8b:7c09:4673:bbb0/85, nh = ::, mt = 2821465568 | dst = 2001:a::a976:2488:f49f:b48/106, nh = 2001:a::62ae:c734:fc7b:e931, mt = 2248613879 | dst = 2001:a::afb7:4449:3787:8bb4/123, nh = ::  2001:a::2934:bd66:550d:ec19  sear6.fo.x.y 
+
 <<<
-size: 14837
-location: clients/tests/test-client.py:1048:test_004()/361
+size: 15197
+location: clients/tests/test-client.py:1062:test_004()/361
 cmd: $NMCLI --mode tabular --color yes -f all dev show
 lang: C
 returncode: 0
-stdout: 14672 bytes
+stdout: 15032 bytes
 >>>
-NAME     DEVICE  TYPE      NM-TYPE           VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON               UDI                        IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID  CON-PATH  METERED 
-GENERAL  eth0    ethernet  NMDeviceEthernet  --      --       virtual  --              --                AB:B7:BF:E2:48:E8  0    20 (unavailable)  0 (No reason given)  /sys/devices/virtual/eth0  --        no           yes         yes          no                no                 --            --          --        --        unknown 
+NAME     DEVICE  TYPE  NM-TYPE       VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON               IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                         IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED 
+GENERAL  wlan0   wifi  NMDeviceWifi  --      --       virtual  --              --                13:E0:74:85:7C:D9  0    20 (unavailable)  0 (No reason given)  0 (unknown)       0 (unknown)       /sys/devices/virtual/wlan0  --        no           yes         yes          no                no                 --            con-vpn-1   UUID-con-vpn-1-REPLACED-REPLACED-REP  /org/freedesktop/NetworkManager/ActiveConnection/2  unknown 
+
+NAME          CARRIER-DETECT  SPEED    IS-SOFTWARE  SRIOV 
+CAPABILITIES  no              unknown  no           no    
+
+NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ     5GHZ    
+WIFI-PROPERTIES  yes  yes  yes   yes   yes   yes  yes    unknown  unknown 
+
+NAME   IN-USE  SSID        MODE   CHAN  RATE       SIGNAL  BARS  SECURITY  
+AP[1]          wlan0-ap-2  Infra  1     54 Mbit/s  92      ****  WPA1 WPA2 
+AP[2]          wlan0-ap-1  Infra  1     54 Mbit/s  81      ****  WPA1      
+AP[3]          wlan0-ap-3  Infra  1     54 Mbit/s  55      **    WPA3      
+
+GROUP  ADDRESS                                 GATEWAY         ROUTE  DNS  DOMAIN                                                                            WINS           
+IP4    192.168.228.18/32 | 192.168.209.179/25  192.168.41.120  --     --   sear4.foo2.bar | sear4.fo.x.y | sear4.foo1.bar | sear4.foo4.bar | sear4.fo.o.bar  192.168.120.79 
+
+GROUP  OPTION                                                                                    
+DHCP4  dhcp-4-opt-0 = val-0 | dhcp-4-opt-2 = val-2 | dhcp-4-opt-4 = val-4 | dhcp-4-opt-7 = val-7 
+
+GROUP  ADDRESS  GATEWAY  ROUTE                                                           DNS  DOMAIN                                                                                            
+IP6    --       --       dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086  --   sear6.foo2.bar | sear6.foo1.bar | sear6.fo.x.y | sear6.fo.o.bar | sear6.foo3.bar | sear6.foo4.bar 
+
+GROUP  OPTION                                                                                                           
+DHCP6  dhcp-6-opt-1 = val-1 | dhcp-6-opt-2 = val-2 | dhcp-6-opt-3 = val-3 | dhcp-6-opt-4 = val-4 | dhcp-6-opt-5 = val-5 
+
+NAME         AVAILABLE-CONNECTION-PATHS                               AVAILABLE-CONNECTIONS                          
+CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{2}  UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 
+
+NAME     DEVICE  TYPE      NM-TYPE           VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON               IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                        IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID  CON-PATH  METERED 
+GENERAL  eth0    ethernet  NMDeviceEthernet  --      --       virtual  --              --                AB:B7:BF:E2:48:E8  0    20 (unavailable)  0 (No reason given)  0 (unknown)       0 (unknown)       /sys/devices/virtual/eth0  --        no           yes         yes          no                no                 --            --          --        --        unknown 
 
 NAME          CARRIER-DETECT  SPEED     IS-SOFTWARE  SRIOV 
 CAPABILITIES  no              100 Mb/s  no           no    
@@ -21037,8 +21390,8 @@ DHCP6  dhcp-6-opt-0 = val-0 | dhcp-6-opt-1 = val-1 | dhcp-6-opt-2 = val-2 | dhcp
 NAME         AVAILABLE-CONNECTION-PATHS                               AVAILABLE-CONNECTIONS                        
 CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{1}  5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 
 
-NAME     DEVICE  TYPE      NM-TYPE           VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON               UDI                        IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID  CON-PATH  METERED 
-GENERAL  eth1    ethernet  NMDeviceEthernet  --      --       virtual  --              --                E7:78:B1:93:2B:22  0    20 (unavailable)  0 (No reason given)  /sys/devices/virtual/eth1  --        no           yes         yes          no                no                 --            --          --        --        unknown 
+NAME     DEVICE  TYPE      NM-TYPE           VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON               IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                        IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID  CON-PATH  METERED 
+GENERAL  eth1    ethernet  NMDeviceEthernet  --      --       virtual  --              --                E7:78:B1:93:2B:22  0    20 (unavailable)  0 (No reason given)  0 (unknown)       0 (unknown)       /sys/devices/virtual/eth1  --        no           yes         yes          no                no                 --            --          --        --        unknown 
 
 NAME          CARRIER-DETECT  SPEED     IS-SOFTWARE  SRIOV 
 CAPABILITIES  no              100 Mb/s  no           no    
@@ -21061,8 +21414,8 @@ DHCP6  dhcp-6-opt-2 = val-2 | dhcp-6-opt-5 = val-5 | dhcp-6-opt-6 = val-6 | dhcp
 NAME         AVAILABLE-CONNECTION-PATHS                               AVAILABLE-CONNECTIONS                        
 CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{1}  5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 
 
-NAME     DEVICE  TYPE  NM-TYPE       VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON               UDI                         IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID  CON-PATH  METERED 
-GENERAL  wlan1   wifi  NMDeviceWifi  --      --       virtual  --              --                21:E9:64:81:8C:A8  0    20 (unavailable)  0 (No reason given)  /sys/devices/virtual/wlan1  --        no           yes         yes          no                no                 --            --          --        --        unknown 
+NAME     DEVICE  TYPE  NM-TYPE       VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON               IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                         IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID  CON-PATH  METERED 
+GENERAL  wlan1   wifi  NMDeviceWifi  --      --       virtual  --              --                21:E9:64:81:8C:A8  0    20 (unavailable)  0 (No reason given)  0 (unknown)       0 (unknown)       /sys/devices/virtual/wlan1  --        no           yes         yes          no                no                 --            --          --        --        unknown 
 
 NAME          CARRIER-DETECT  SPEED    IS-SOFTWARE  SRIOV 
 CAPABILITIES  no              unknown  no           no    
@@ -21088,8 +21441,8 @@ DHCP6  dhcp-6-opt-0 = val-0 | dhcp-6-opt-1 = val-1 | dhcp-6-opt-2 = val-2 | dhcp
 NAME         AVAILABLE-CONNECTION-PATHS                               AVAILABLE-CONNECTIONS                          
 CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{2}  UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 
 
-NAME     DEVICE  TYPE  NM-TYPE       VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON               UDI                         IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID  CON-PATH  METERED 
-GENERAL  wlan1   wifi  NMDeviceWifi  --      --       virtual  --              --                71:52:AD:63:5C:7C  0    20 (unavailable)  0 (No reason given)  /sys/devices/virtual/wlan1  --        no           yes         yes          no                no                 --            --          --        --        unknown 
+NAME     DEVICE  TYPE  NM-TYPE       VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON               IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                         IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID  CON-PATH  METERED 
+GENERAL  wlan1   wifi  NMDeviceWifi  --      --       virtual  --              --                71:52:AD:63:5C:7C  0    20 (unavailable)  0 (No reason given)  0 (unknown)       0 (unknown)       /sys/devices/virtual/wlan1  --        no           yes         yes          no                no                 --            --          --        --        unknown 
 
 NAME          CARRIER-DETECT  SPEED    IS-SOFTWARE  SRIOV 
 CAPABILITIES  no              unknown  no           no    
@@ -21114,19 +21467,27 @@ DHCP6  dhcp-6-opt-2 = val-2 | dhcp-6-opt-6 = val-6 | dhcp-6-opt-7 = val-7 | dhcp
 NAME         AVAILABLE-CONNECTION-PATHS                               AVAILABLE-CONNECTIONS                          
 CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{2}  UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 
 
-NAME     DEVICE  TYPE  NM-TYPE       VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON               UDI                         IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED 
-GENERAL  wlan0   wifi  NMDeviceWifi  --      --       virtual  --              --                13:E0:74:85:7C:D9  0    20 (unavailable)  0 (No reason given)  /sys/devices/virtual/wlan0  --        no           yes         yes          no                no                 --            con-vpn-1   UUID-con-vpn-1-REPLACED-REPLACED-REP  /org/freedesktop/NetworkManager/ActiveConnection/2  unknown 
+<<<
+size: 15356
+location: clients/tests/test-client.py:1062:test_004()/362
+cmd: $NMCLI --mode tabular --color yes -f all dev show
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 15181 bytes
+>>>
+NAME     DEVICE  TYPE  NM-TYPE       VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON                    IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                         IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED  
+GENERAL  wlan0   wifi  NMDeviceWifi  --      --       virtual  --              --                13:E0:74:85:7C:D9  0    20 (niedostępne)  0 (Nie podano przyczyny)  0 (nieznane)      0 (nieznane)      /sys/devices/virtual/wlan0  --        nie          tak         tak          nie               nie                --            con-vpn-1   UUID-con-vpn-1-REPLACED-REPLACED-REP  /org/freedesktop/NetworkManager/ActiveConnection/2  nieznane 
 
-NAME          CARRIER-DETECT  SPEED    IS-SOFTWARE  SRIOV 
-CAPABILITIES  no              unknown  no           no    
+NAME          CARRIER-DETECT  SPEED     IS-SOFTWARE  SRIOV 
+CAPABILITIES  nie             nieznane  nie          nie   
 
-NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ     5GHZ    
-WIFI-PROPERTIES  yes  yes  yes   yes   yes   yes  yes    unknown  unknown 
+NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ      5GHZ     
+WIFI-PROPERTIES  tak  tak  tak   tak   tak   tak  tak    nieznane  nieznane 
 
-NAME   IN-USE  SSID        MODE   CHAN  RATE       SIGNAL  BARS  SECURITY  
-AP[1]          wlan0-ap-2  Infra  1     54 Mbit/s  92      ****  WPA1 WPA2 
-AP[2]          wlan0-ap-1  Infra  1     54 Mbit/s  81      ****  WPA1 WPA2 
-AP[3]          wlan0-ap-3  Infra  1     54 Mbit/s  55      **    WPA1 WPA2 
+NAME   IN-USE  SSID        MODE            CHAN  RATE     SIGNAL  BARS  SECURITY  
+AP[1]          wlan0-ap-2  Infrastruktura  1     54 Mb/s  92      ****  WPA1 WPA2 
+AP[2]          wlan0-ap-1  Infrastruktura  1     54 Mb/s  81      ****  WPA1      
+AP[3]          wlan0-ap-3  Infrastruktura  1     54 Mb/s  55      **    WPA3      
 
 GROUP  ADDRESS                                 GATEWAY         ROUTE  DNS  DOMAIN                                                                            WINS           
 IP4    192.168.228.18/32 | 192.168.209.179/25  192.168.41.120  --     --   sear4.foo2.bar | sear4.fo.x.y | sear4.foo1.bar | sear4.foo4.bar | sear4.fo.o.bar  192.168.120.79 
@@ -21143,16 +21504,8 @@ DHCP6  dhcp-6-opt-1 = val-1 | dhcp-6-opt-2 = val-2 | dhcp-6-opt-3 = val-3 | dhcp
 NAME         AVAILABLE-CONNECTION-PATHS                               AVAILABLE-CONNECTIONS                          
 CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{2}  UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 
 
-<<<
-size: 14996
-location: clients/tests/test-client.py:1048:test_004()/362
-cmd: $NMCLI --mode tabular --color yes -f all dev show
-lang: pl_PL.UTF-8
-returncode: 0
-stdout: 14821 bytes
->>>
-NAME     DEVICE  TYPE      NM-TYPE           VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON                    UDI                        IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID  CON-PATH  METERED  
-GENERAL  eth0    ethernet  NMDeviceEthernet  --      --       virtual  --              --                AB:B7:BF:E2:48:E8  0    20 (niedostępne)  0 (Nie podano przyczyny)  /sys/devices/virtual/eth0  --        nie          tak         tak          nie               nie                --            --          --        --        nieznane 
+NAME     DEVICE  TYPE      NM-TYPE           VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON                    IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                        IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID  CON-PATH  METERED  
+GENERAL  eth0    ethernet  NMDeviceEthernet  --      --       virtual  --              --                AB:B7:BF:E2:48:E8  0    20 (niedostępne)  0 (Nie podano przyczyny)  0 (nieznane)      0 (nieznane)      /sys/devices/virtual/eth0  --        nie          tak         tak          nie               nie                --            --          --        --        nieznane 
 
 NAME          CARRIER-DETECT  SPEED     IS-SOFTWARE  SRIOV 
 CAPABILITIES  nie             100 Mb/s  nie          nie   
@@ -21175,8 +21528,8 @@ DHCP6  dhcp-6-opt-0 = val-0 | dhcp-6-opt-1 = val-1 | dhcp-6-opt-2 = val-2 | dhcp
 NAME         AVAILABLE-CONNECTION-PATHS                               AVAILABLE-CONNECTIONS                        
 CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{1}  5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 
 
-NAME     DEVICE  TYPE      NM-TYPE           VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON                    UDI                        IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID  CON-PATH  METERED  
-GENERAL  eth1    ethernet  NMDeviceEthernet  --      --       virtual  --              --                E7:78:B1:93:2B:22  0    20 (niedostępne)  0 (Nie podano przyczyny)  /sys/devices/virtual/eth1  --        nie          tak         tak          nie               nie                --            --          --        --        nieznane 
+NAME     DEVICE  TYPE      NM-TYPE           VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON                    IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                        IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID  CON-PATH  METERED  
+GENERAL  eth1    ethernet  NMDeviceEthernet  --      --       virtual  --              --                E7:78:B1:93:2B:22  0    20 (niedostępne)  0 (Nie podano przyczyny)  0 (nieznane)      0 (nieznane)      /sys/devices/virtual/eth1  --        nie          tak         tak          nie               nie                --            --          --        --        nieznane 
 
 NAME          CARRIER-DETECT  SPEED     IS-SOFTWARE  SRIOV 
 CAPABILITIES  nie             100 Mb/s  nie          nie   
@@ -21199,8 +21552,8 @@ DHCP6  dhcp-6-opt-2 = val-2 | dhcp-6-opt-5 = val-5 | dhcp-6-opt-6 = val-6 | dhcp
 NAME         AVAILABLE-CONNECTION-PATHS                               AVAILABLE-CONNECTIONS                        
 CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{1}  5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 
 
-NAME     DEVICE  TYPE  NM-TYPE       VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON                    UDI                         IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID  CON-PATH  METERED  
-GENERAL  wlan1   wifi  NMDeviceWifi  --      --       virtual  --              --                21:E9:64:81:8C:A8  0    20 (niedostępne)  0 (Nie podano przyczyny)  /sys/devices/virtual/wlan1  --        nie          tak         tak          nie               nie                --            --          --        --        nieznane 
+NAME     DEVICE  TYPE  NM-TYPE       VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON                    IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                         IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID  CON-PATH  METERED  
+GENERAL  wlan1   wifi  NMDeviceWifi  --      --       virtual  --              --                21:E9:64:81:8C:A8  0    20 (niedostępne)  0 (Nie podano przyczyny)  0 (nieznane)      0 (nieznane)      /sys/devices/virtual/wlan1  --        nie          tak         tak          nie               nie                --            --          --        --        nieznane 
 
 NAME          CARRIER-DETECT  SPEED     IS-SOFTWARE  SRIOV 
 CAPABILITIES  nie             nieznane  nie          nie   
@@ -21226,8 +21579,8 @@ DHCP6  dhcp-6-opt-0 = val-0 | dhcp-6-opt-1 = val-1 | dhcp-6-opt-2 = val-2 | dhcp
 NAME         AVAILABLE-CONNECTION-PATHS                               AVAILABLE-CONNECTIONS                          
 CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{2}  UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 
 
-NAME     DEVICE  TYPE  NM-TYPE       VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON                    UDI                         IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID  CON-PATH  METERED  
-GENERAL  wlan1   wifi  NMDeviceWifi  --      --       virtual  --              --                71:52:AD:63:5C:7C  0    20 (niedostępne)  0 (Nie podano przyczyny)  /sys/devices/virtual/wlan1  --        nie          tak         tak          nie               nie                --            --          --        --        nieznane 
+NAME     DEVICE  TYPE  NM-TYPE       VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON                    IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                         IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID  CON-PATH  METERED  
+GENERAL  wlan1   wifi  NMDeviceWifi  --      --       virtual  --              --                71:52:AD:63:5C:7C  0    20 (niedostępne)  0 (Nie podano przyczyny)  0 (nieznane)      0 (nieznane)      /sys/devices/virtual/wlan1  --        nie          tak         tak          nie               nie                --            --          --        --        nieznane 
 
 NAME          CARRIER-DETECT  SPEED     IS-SOFTWARE  SRIOV 
 CAPABILITIES  nie             nieznane  nie          nie   
@@ -21252,38 +21605,9 @@ DHCP6  dhcp-6-opt-2 = val-2 | dhcp-6-opt-6 = val-6 | dhcp-6-opt-7 = val-7 | dhcp
 NAME         AVAILABLE-CONNECTION-PATHS                               AVAILABLE-CONNECTIONS                          
 CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{2}  UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 
 
-NAME     DEVICE  TYPE  NM-TYPE       VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON                    UDI                         IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED  
-GENERAL  wlan0   wifi  NMDeviceWifi  --      --       virtual  --              --                13:E0:74:85:7C:D9  0    20 (niedostępne)  0 (Nie podano przyczyny)  /sys/devices/virtual/wlan0  --        nie          tak         tak          nie               nie                --            con-vpn-1   UUID-con-vpn-1-REPLACED-REPLACED-REP  /org/freedesktop/NetworkManager/ActiveConnection/2  nieznane 
-
-NAME          CARRIER-DETECT  SPEED     IS-SOFTWARE  SRIOV 
-CAPABILITIES  nie             nieznane  nie          nie   
-
-NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ      5GHZ     
-WIFI-PROPERTIES  tak  tak  tak   tak   tak   tak  tak    nieznane  nieznane 
-
-NAME   IN-USE  SSID        MODE            CHAN  RATE     SIGNAL  BARS  SECURITY  
-AP[1]          wlan0-ap-2  Infrastruktura  1     54 Mb/s  92      ****  WPA1 WPA2 
-AP[2]          wlan0-ap-1  Infrastruktura  1     54 Mb/s  81      ****  WPA1 WPA2 
-AP[3]          wlan0-ap-3  Infrastruktura  1     54 Mb/s  55      **    WPA1 WPA2 
-
-GROUP  ADDRESS                                 GATEWAY         ROUTE  DNS  DOMAIN                                                                            WINS           
-IP4    192.168.228.18/32 | 192.168.209.179/25  192.168.41.120  --     --   sear4.foo2.bar | sear4.fo.x.y | sear4.foo1.bar | sear4.foo4.bar | sear4.fo.o.bar  192.168.120.79 
-
-GROUP  OPTION                                                                                    
-DHCP4  dhcp-4-opt-0 = val-0 | dhcp-4-opt-2 = val-2 | dhcp-4-opt-4 = val-4 | dhcp-4-opt-7 = val-7 
-
-GROUP  ADDRESS  GATEWAY  ROUTE                                                           DNS  DOMAIN                                                                                            
-IP6    --       --       dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086  --   sear6.foo2.bar | sear6.foo1.bar | sear6.fo.x.y | sear6.fo.o.bar | sear6.foo3.bar | sear6.foo4.bar 
-
-GROUP  OPTION                                                                                                           
-DHCP6  dhcp-6-opt-1 = val-1 | dhcp-6-opt-2 = val-2 | dhcp-6-opt-3 = val-3 | dhcp-6-opt-4 = val-4 | dhcp-6-opt-5 = val-5 
-
-NAME         AVAILABLE-CONNECTION-PATHS                               AVAILABLE-CONNECTIONS                          
-CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{2}  UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 
-
 <<<
 size: 1142
-location: clients/tests/test-client.py:1051:test_004()/363
+location: clients/tests/test-client.py:1065:test_004()/363
 cmd: $NMCLI --mode tabular --color yes dev show wlan0
 lang: C
 returncode: 0
@@ -21318,7 +21642,7 @@ IP6    --       --       dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 250
 
 <<<
 size: 1153
-location: clients/tests/test-client.py:1051:test_004()/364
+location: clients/tests/test-client.py:1065:test_004()/364
 cmd: $NMCLI --mode tabular --color yes dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
@@ -21352,15 +21676,15 @@ GROUP  ADDRESS  GATEWAY  ROUTE
 IP6    --       --       dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086  --   sear6.foo2.bar | sear6.foo1.bar | sear6.fo.x.y | sear6.fo.o.bar | sear6.foo3.bar | sear6.foo4.bar 
 
 <<<
-size: 3195
-location: clients/tests/test-client.py:1054:test_004()/365
+size: 3267
+location: clients/tests/test-client.py:1068:test_004()/365
 cmd: $NMCLI --mode tabular --color yes -f all dev show wlan0
 lang: C
 returncode: 0
-stdout: 3025 bytes
+stdout: 3097 bytes
 >>>
-NAME     DEVICE  TYPE  NM-TYPE       VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON               UDI                         IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED 
-GENERAL  wlan0   wifi  NMDeviceWifi  --      --       virtual  --              --                13:E0:74:85:7C:D9  0    20 (unavailable)  0 (No reason given)  /sys/devices/virtual/wlan0  --        no           yes         yes          no                no                 --            con-vpn-1   UUID-con-vpn-1-REPLACED-REPLACED-REP  /org/freedesktop/NetworkManager/ActiveConnection/2  unknown 
+NAME     DEVICE  TYPE  NM-TYPE       VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON               IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                         IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED 
+GENERAL  wlan0   wifi  NMDeviceWifi  --      --       virtual  --              --                13:E0:74:85:7C:D9  0    20 (unavailable)  0 (No reason given)  0 (unknown)       0 (unknown)       /sys/devices/virtual/wlan0  --        no           yes         yes          no                no                 --            con-vpn-1   UUID-con-vpn-1-REPLACED-REPLACED-REP  /org/freedesktop/NetworkManager/ActiveConnection/2  unknown 
 
 NAME          CARRIER-DETECT  SPEED    IS-SOFTWARE  SRIOV 
 CAPABILITIES  no              unknown  no           no    
@@ -21370,8 +21694,8 @@ WIFI-PROPERTIES  yes  yes  yes   yes   yes   yes  yes    unknown  unknown
 
 NAME   IN-USE  SSID        MODE   CHAN  RATE       SIGNAL  BARS  SECURITY  
 AP[1]          wlan0-ap-2  Infra  1     54 Mbit/s  92      ****  WPA1 WPA2 
-AP[2]          wlan0-ap-1  Infra  1     54 Mbit/s  81      ****  WPA1 WPA2 
-AP[3]          wlan0-ap-3  Infra  1     54 Mbit/s  55      **    WPA1 WPA2 
+AP[2]          wlan0-ap-1  Infra  1     54 Mbit/s  81      ****  WPA1      
+AP[3]          wlan0-ap-3  Infra  1     54 Mbit/s  55      **    WPA3      
 
 GROUP  ADDRESS                                 GATEWAY         ROUTE  DNS  DOMAIN                                                                            WINS           
 IP4    192.168.228.18/32 | 192.168.209.179/25  192.168.41.120  --     --   sear4.foo2.bar | sear4.fo.x.y | sear4.foo1.bar | sear4.foo4.bar | sear4.fo.o.bar  192.168.120.79 
@@ -21389,15 +21713,15 @@ NAME         AVAILABLE-CONNECTION-PATHS                               AVAILABLE-
 CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{2}  UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 
 
 <<<
-size: 3258
-location: clients/tests/test-client.py:1054:test_004()/366
+size: 3330
+location: clients/tests/test-client.py:1068:test_004()/366
 cmd: $NMCLI --mode tabular --color yes -f all dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 3078 bytes
+stdout: 3150 bytes
 >>>
-NAME     DEVICE  TYPE  NM-TYPE       VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON                    UDI                         IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED  
-GENERAL  wlan0   wifi  NMDeviceWifi  --      --       virtual  --              --                13:E0:74:85:7C:D9  0    20 (niedostępne)  0 (Nie podano przyczyny)  /sys/devices/virtual/wlan0  --        nie          tak         tak          nie               nie                --            con-vpn-1   UUID-con-vpn-1-REPLACED-REPLACED-REP  /org/freedesktop/NetworkManager/ActiveConnection/2  nieznane 
+NAME     DEVICE  TYPE  NM-TYPE       VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON                    IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                         IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED  
+GENERAL  wlan0   wifi  NMDeviceWifi  --      --       virtual  --              --                13:E0:74:85:7C:D9  0    20 (niedostępne)  0 (Nie podano przyczyny)  0 (nieznane)      0 (nieznane)      /sys/devices/virtual/wlan0  --        nie          tak         tak          nie               nie                --            con-vpn-1   UUID-con-vpn-1-REPLACED-REPLACED-REP  /org/freedesktop/NetworkManager/ActiveConnection/2  nieznane 
 
 NAME          CARRIER-DETECT  SPEED     IS-SOFTWARE  SRIOV 
 CAPABILITIES  nie             nieznane  nie          nie   
@@ -21407,8 +21731,8 @@ WIFI-PROPERTIES  tak  tak  tak   tak   tak   tak  tak    nieznane  nieznane
 
 NAME   IN-USE  SSID        MODE            CHAN  RATE     SIGNAL  BARS  SECURITY  
 AP[1]          wlan0-ap-2  Infrastruktura  1     54 Mb/s  92      ****  WPA1 WPA2 
-AP[2]          wlan0-ap-1  Infrastruktura  1     54 Mb/s  81      ****  WPA1 WPA2 
-AP[3]          wlan0-ap-3  Infrastruktura  1     54 Mb/s  55      **    WPA1 WPA2 
+AP[2]          wlan0-ap-1  Infrastruktura  1     54 Mb/s  81      ****  WPA1      
+AP[3]          wlan0-ap-3  Infrastruktura  1     54 Mb/s  55      **    WPA3      
 
 GROUP  ADDRESS                                 GATEWAY         ROUTE  DNS  DOMAIN                                                                            WINS           
 IP4    192.168.228.18/32 | 192.168.209.179/25  192.168.41.120  --     --   sear4.foo2.bar | sear4.fo.x.y | sear4.foo1.bar | sear4.foo4.bar | sear4.fo.o.bar  192.168.120.79 
@@ -21426,15 +21750,15 @@ NAME         AVAILABLE-CONNECTION-PATHS                               AVAILABLE-
 CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{2}  UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 
 
 <<<
-size: 1190
-location: clients/tests/test-client.py:1057:test_004()/367
+size: 1263
+location: clients/tests/test-client.py:1071:test_004()/367
 cmd: $NMCLI --mode tabular --color yes -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: C
 returncode: 0
-stdout: 986 bytes
+stdout: 1058 bytes
 >>>
-NAME     DEVICE  TYPE  NM-TYPE       VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON               UDI                         IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED 
-GENERAL  wlan0   wifi  NMDeviceWifi  --      --       virtual  --              --                13:E0:74:85:7C:D9  0    20 (unavailable)  0 (No reason given)  /sys/devices/virtual/wlan0  --        no           yes         yes          no                no                 --            con-vpn-1   UUID-con-vpn-1-REPLACED-REPLACED-REP  /org/freedesktop/NetworkManager/ActiveConnection/2  unknown 
+NAME     DEVICE  TYPE  NM-TYPE       VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON               IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                         IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED 
+GENERAL  wlan0   wifi  NMDeviceWifi  --      --       virtual  --              --                13:E0:74:85:7C:D9  0    20 (unavailable)  0 (No reason given)  0 (unknown)       0 (unknown)       /sys/devices/virtual/wlan0  --        no           yes         yes          no                no                 --            con-vpn-1   UUID-con-vpn-1-REPLACED-REPLACED-REP  /org/freedesktop/NetworkManager/ActiveConnection/2  unknown 
 
 HWADDR            
 13:E0:74:85:7C:D9 
@@ -21443,15 +21767,15 @@ NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ     5GHZ
 WIFI-PROPERTIES  yes  yes  yes   yes   yes   yes  yes    unknown  unknown 
 
 <<<
-size: 1218
-location: clients/tests/test-client.py:1057:test_004()/368
+size: 1290
+location: clients/tests/test-client.py:1071:test_004()/368
 cmd: $NMCLI --mode tabular --color yes -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 1003 bytes
+stdout: 1075 bytes
 >>>
-NAME     DEVICE  TYPE  NM-TYPE       VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON                    UDI                         IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED  
-GENERAL  wlan0   wifi  NMDeviceWifi  --      --       virtual  --              --                13:E0:74:85:7C:D9  0    20 (niedostępne)  0 (Nie podano przyczyny)  /sys/devices/virtual/wlan0  --        nie          tak         tak          nie               nie                --            con-vpn-1   UUID-con-vpn-1-REPLACED-REPLACED-REP  /org/freedesktop/NetworkManager/ActiveConnection/2  nieznane 
+NAME     DEVICE  TYPE  NM-TYPE       VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON                    IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                         IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED  
+GENERAL  wlan0   wifi  NMDeviceWifi  --      --       virtual  --              --                13:E0:74:85:7C:D9  0    20 (niedostępne)  0 (Nie podano przyczyny)  0 (nieznane)      0 (nieznane)      /sys/devices/virtual/wlan0  --        nie          tak         tak          nie               nie                --            con-vpn-1   UUID-con-vpn-1-REPLACED-REPLACED-REP  /org/freedesktop/NetworkManager/ActiveConnection/2  nieznane 
 
 HWADDR            
 13:E0:74:85:7C:D9 
@@ -21460,15 +21784,15 @@ NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ      5GHZ
 WIFI-PROPERTIES  tak  tak  tak   tak   tak   tak  tak    nieznane  nieznane 
 
 <<<
-size: 1190
-location: clients/tests/test-client.py:1060:test_004()/369
+size: 1263
+location: clients/tests/test-client.py:1074:test_004()/369
 cmd: $NMCLI --mode tabular --color yes -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: C
 returncode: 0
-stdout: 986 bytes
+stdout: 1058 bytes
 >>>
-NAME     DEVICE  TYPE  NM-TYPE       VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON               UDI                         IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED 
-GENERAL  wlan0   wifi  NMDeviceWifi  --      --       virtual  --              --                13:E0:74:85:7C:D9  0    20 (unavailable)  0 (No reason given)  /sys/devices/virtual/wlan0  --        no           yes         yes          no                no                 --            con-vpn-1   UUID-con-vpn-1-REPLACED-REPLACED-REP  /org/freedesktop/NetworkManager/ActiveConnection/2  unknown 
+NAME     DEVICE  TYPE  NM-TYPE       VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON               IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                         IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED 
+GENERAL  wlan0   wifi  NMDeviceWifi  --      --       virtual  --              --                13:E0:74:85:7C:D9  0    20 (unavailable)  0 (No reason given)  0 (unknown)       0 (unknown)       /sys/devices/virtual/wlan0  --        no           yes         yes          no                no                 --            con-vpn-1   UUID-con-vpn-1-REPLACED-REPLACED-REP  /org/freedesktop/NetworkManager/ActiveConnection/2  unknown 
 
 HWADDR            
 13:E0:74:85:7C:D9 
@@ -21477,15 +21801,15 @@ NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ     5GHZ
 WIFI-PROPERTIES  yes  yes  yes   yes   yes   yes  yes    unknown  unknown 
 
 <<<
-size: 1218
-location: clients/tests/test-client.py:1060:test_004()/370
+size: 1290
+location: clients/tests/test-client.py:1074:test_004()/370
 cmd: $NMCLI --mode tabular --color yes -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 1003 bytes
+stdout: 1075 bytes
 >>>
-NAME     DEVICE  TYPE  NM-TYPE       VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON                    UDI                         IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED  
-GENERAL  wlan0   wifi  NMDeviceWifi  --      --       virtual  --              --                13:E0:74:85:7C:D9  0    20 (niedostępne)  0 (Nie podano przyczyny)  /sys/devices/virtual/wlan0  --        nie          tak         tak          nie               nie                --            con-vpn-1   UUID-con-vpn-1-REPLACED-REPLACED-REP  /org/freedesktop/NetworkManager/ActiveConnection/2  nieznane 
+NAME     DEVICE  TYPE  NM-TYPE       VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON                    IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                         IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED  
+GENERAL  wlan0   wifi  NMDeviceWifi  --      --       virtual  --              --                13:E0:74:85:7C:D9  0    20 (niedostępne)  0 (Nie podano przyczyny)  0 (nieznane)      0 (nieznane)      /sys/devices/virtual/wlan0  --        nie          tak         tak          nie               nie                --            con-vpn-1   UUID-con-vpn-1-REPLACED-REPLACED-REP  /org/freedesktop/NetworkManager/ActiveConnection/2  nieznane 
 
 HWADDR            
 13:E0:74:85:7C:D9 
@@ -21495,218 +21819,230 @@ WIFI-PROPERTIES  tak  tak  tak   tak   tak   tak  tak    nieznane  nieznane
 
 <<<
 size: 662
-location: clients/tests/test-client.py:1063:test_004()/371
+location: clients/tests/test-client.py:1077:test_004()/371
 cmd: $NMCLI --mode tabular --color yes -f DEVICE,TYPE,DBUS-PATH dev
 lang: C
 returncode: 0
 stdout: 486 bytes
 >>>
 DEVICE  TYPE      DBUS-PATH                                 
+wlan0   wifi      /org/freedesktop/NetworkManager/Devices/3 
 eth0    ethernet  /org/freedesktop/NetworkManager/Devices/1 
 eth1    ethernet  /org/freedesktop/NetworkManager/Devices/2 
 wlan1   wifi      /org/freedesktop/NetworkManager/Devices/4 
 wlan1   wifi      /org/freedesktop/NetworkManager/Devices/5 
-wlan0   wifi      /org/freedesktop/NetworkManager/Devices/3 
 
 <<<
 size: 672
-location: clients/tests/test-client.py:1063:test_004()/372
+location: clients/tests/test-client.py:1077:test_004()/372
 cmd: $NMCLI --mode tabular --color yes -f DEVICE,TYPE,DBUS-PATH dev
 lang: pl_PL.UTF-8
 returncode: 0
 stdout: 486 bytes
 >>>
 DEVICE  TYPE      DBUS-PATH                                 
+wlan0   wifi      /org/freedesktop/NetworkManager/Devices/3 
 eth0    ethernet  /org/freedesktop/NetworkManager/Devices/1 
 eth1    ethernet  /org/freedesktop/NetworkManager/Devices/2 
 wlan1   wifi      /org/freedesktop/NetworkManager/Devices/4 
 wlan1   wifi      /org/freedesktop/NetworkManager/Devices/5 
-wlan0   wifi      /org/freedesktop/NetworkManager/Devices/3 
 
 <<<
 size: 2624
-location: clients/tests/test-client.py:1066:test_004()/373
+location: clients/tests/test-client.py:1080:test_004()/373
 cmd: $NMCLI --mode tabular --color yes -f ALL device wifi list
 lang: C
 returncode: 0
 stdout: 2452 bytes
 >>>
+NAME   SSID        SSID-HEX              BSSID              MODE   CHAN  FREQ      RATE       SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
+AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infra  1     2412 MHz  54 Mbit/s  92      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/2 
+AP[2]  wlan0-ap-1  776C616E302D61702D31  61:95:77:AC:1E:4C  Infra  1     2412 MHz  54 Mbit/s  81      ****  WPA1       pair_tkip pair_ccmp group_tkip group_ccmp psk  (none)                                         wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/1 
+AP[3]  wlan0-ap-3  776C616E302D61702D33  9B:F6:B7:EC:97:76  Infra  1     2412 MHz  54 Mbit/s  55      **    WPA3       (none)                                         pair_tkip pair_ccmp group_tkip group_ccmp sae  wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/3 
+
 NAME   SSID        SSID-HEX              BSSID              MODE   CHAN  FREQ      RATE       SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
 AP[1]  wlan1-ap-4  776C616E312D61702D34  94:2B:E8:F6:D2:86  Infra  1     2412 MHz  54 Mbit/s  48      **    WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan1   no              /org/freedesktop/NetworkManager/AccessPoint/4 
 
 NAME  SSID  SSID-HEX  BSSID  MODE  CHAN  FREQ  RATE  SIGNAL  BARS  SECURITY  WPA-FLAGS  RSN-FLAGS  DEVICE  ACTIVE  IN-USE  DBUS-PATH 
 
-NAME   SSID        SSID-HEX              BSSID              MODE   CHAN  FREQ      RATE       SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
-AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infra  1     2412 MHz  54 Mbit/s  92      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/2 
-AP[2]  wlan0-ap-1  776C616E302D61702D31  61:95:77:AC:1E:4C  Infra  1     2412 MHz  54 Mbit/s  81      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/1 
-AP[3]  wlan0-ap-3  776C616E302D61702D33  9B:F6:B7:EC:97:76  Infra  1     2412 MHz  54 Mbit/s  55      **    WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/3 
-
 <<<
 size: 2692
-location: clients/tests/test-client.py:1066:test_004()/374
+location: clients/tests/test-client.py:1080:test_004()/374
 cmd: $NMCLI --mode tabular --color yes -f ALL device wifi list
 lang: pl_PL.UTF-8
 returncode: 0
 stdout: 2510 bytes
 >>>
+NAME   SSID        SSID-HEX              BSSID              MODE            CHAN  FREQ      RATE     SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
+AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infrastruktura  1     2412 MHz  54 Mb/s  92      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/2 
+AP[2]  wlan0-ap-1  776C616E302D61702D31  61:95:77:AC:1E:4C  Infrastruktura  1     2412 MHz  54 Mb/s  81      ****  WPA1       pair_tkip pair_ccmp group_tkip group_ccmp psk  (brak)                                         wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/1 
+AP[3]  wlan0-ap-3  776C616E302D61702D33  9B:F6:B7:EC:97:76  Infrastruktura  1     2412 MHz  54 Mb/s  55      **    WPA3       (brak)                                         pair_tkip pair_ccmp group_tkip group_ccmp sae  wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/3 
+
 NAME   SSID        SSID-HEX              BSSID              MODE            CHAN  FREQ      RATE     SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
 AP[1]  wlan1-ap-4  776C616E312D61702D34  94:2B:E8:F6:D2:86  Infrastruktura  1     2412 MHz  54 Mb/s  48      **    WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan1   nie             /org/freedesktop/NetworkManager/AccessPoint/4 
 
 NAME  SSID  SSID-HEX  BSSID  MODE  CHAN  FREQ  RATE  SIGNAL  BARS  SECURITY  WPA-FLAGS  RSN-FLAGS  DEVICE  ACTIVE  IN-USE  DBUS-PATH 
 
-NAME   SSID        SSID-HEX              BSSID              MODE            CHAN  FREQ      RATE     SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
-AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infrastruktura  1     2412 MHz  54 Mb/s  92      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/2 
-AP[2]  wlan0-ap-1  776C616E302D61702D31  61:95:77:AC:1E:4C  Infrastruktura  1     2412 MHz  54 Mb/s  81      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/1 
-AP[3]  wlan0-ap-3  776C616E302D61702D33  9B:F6:B7:EC:97:76  Infrastruktura  1     2412 MHz  54 Mb/s  55      **    WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/3 
-
 <<<
 size: 934
-location: clients/tests/test-client.py:1068:test_004()/375
+location: clients/tests/test-client.py:1082:test_004()/375
 cmd: $NMCLI --mode tabular --color yes -f COMMON device wifi list
 lang: C
 returncode: 0
 stdout: 760 bytes
 >>>
+IN-USE  SSID        MODE   CHAN  RATE       SIGNAL  BARS  SECURITY  
+        wlan0-ap-2  Infra  1     54 Mbit/s  92      ****  WPA1 WPA2 
+        wlan0-ap-1  Infra  1     54 Mbit/s  81      ****  WPA1      
+        wlan0-ap-3  Infra  1     54 Mbit/s  55      **    WPA3      
+
 IN-USE  SSID        MODE   CHAN  RATE       SIGNAL  BARS  SECURITY  
         wlan1-ap-4  Infra  1     54 Mbit/s  48      **    WPA1 WPA2 
 
 IN-USE  SSID  MODE  CHAN  RATE  SIGNAL  BARS  SECURITY 
 
-IN-USE  SSID        MODE   CHAN  RATE       SIGNAL  BARS  SECURITY  
-        wlan0-ap-2  Infra  1     54 Mbit/s  92      ****  WPA1 WPA2 
-        wlan0-ap-1  Infra  1     54 Mbit/s  81      ****  WPA1 WPA2 
-        wlan0-ap-3  Infra  1     54 Mbit/s  55      **    WPA1 WPA2 
-
 <<<
 size: 994
-location: clients/tests/test-client.py:1068:test_004()/376
+location: clients/tests/test-client.py:1082:test_004()/376
 cmd: $NMCLI --mode tabular --color yes -f COMMON device wifi list
 lang: pl_PL.UTF-8
 returncode: 0
 stdout: 810 bytes
 >>>
+IN-USE  SSID        MODE            CHAN  RATE     SIGNAL  BARS  SECURITY  
+        wlan0-ap-2  Infrastruktura  1     54 Mb/s  92      ****  WPA1 WPA2 
+        wlan0-ap-1  Infrastruktura  1     54 Mb/s  81      ****  WPA1      
+        wlan0-ap-3  Infrastruktura  1     54 Mb/s  55      **    WPA3      
+
 IN-USE  SSID        MODE            CHAN  RATE     SIGNAL  BARS  SECURITY  
         wlan1-ap-4  Infrastruktura  1     54 Mb/s  48      **    WPA1 WPA2 
 
 IN-USE  SSID  MODE  CHAN  RATE  SIGNAL  BARS  SECURITY 
 
-IN-USE  SSID        MODE            CHAN  RATE     SIGNAL  BARS  SECURITY  
-        wlan0-ap-2  Infrastruktura  1     54 Mb/s  92      ****  WPA1 WPA2 
-        wlan0-ap-1  Infrastruktura  1     54 Mb/s  81      ****  WPA1 WPA2 
-        wlan0-ap-3  Infrastruktura  1     54 Mb/s  55      **    WPA1 WPA2 
-
 <<<
 size: 2737
-location: clients/tests/test-client.py:1071:test_004()/377
+location: clients/tests/test-client.py:1085:test_004()/377
 cmd: $NMCLI --mode tabular --color yes -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list
 lang: C
 returncode: 0
 stdout: 2452 bytes
 >>>
+NAME   SSID        SSID-HEX              BSSID              MODE   CHAN  FREQ      RATE       SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
+AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infra  1     2412 MHz  54 Mbit/s  92      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/2 
+AP[2]  wlan0-ap-1  776C616E302D61702D31  61:95:77:AC:1E:4C  Infra  1     2412 MHz  54 Mbit/s  81      ****  WPA1       pair_tkip pair_ccmp group_tkip group_ccmp psk  (none)                                         wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/1 
+AP[3]  wlan0-ap-3  776C616E302D61702D33  9B:F6:B7:EC:97:76  Infra  1     2412 MHz  54 Mbit/s  55      **    WPA3       (none)                                         pair_tkip pair_ccmp group_tkip group_ccmp sae  wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/3 
+
 NAME   SSID        SSID-HEX              BSSID              MODE   CHAN  FREQ      RATE       SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
 AP[1]  wlan1-ap-4  776C616E312D61702D34  94:2B:E8:F6:D2:86  Infra  1     2412 MHz  54 Mbit/s  48      **    WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan1   no              /org/freedesktop/NetworkManager/AccessPoint/4 
 
 NAME  SSID  SSID-HEX  BSSID  MODE  CHAN  FREQ  RATE  SIGNAL  BARS  SECURITY  WPA-FLAGS  RSN-FLAGS  DEVICE  ACTIVE  IN-USE  DBUS-PATH 
 
-NAME   SSID        SSID-HEX              BSSID              MODE   CHAN  FREQ      RATE       SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
-AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infra  1     2412 MHz  54 Mbit/s  92      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/2 
-AP[2]  wlan0-ap-1  776C616E302D61702D31  61:95:77:AC:1E:4C  Infra  1     2412 MHz  54 Mbit/s  81      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/1 
-AP[3]  wlan0-ap-3  776C616E302D61702D33  9B:F6:B7:EC:97:76  Infra  1     2412 MHz  54 Mbit/s  55      **    WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/3 
-
 <<<
 size: 2805
-location: clients/tests/test-client.py:1071:test_004()/378
+location: clients/tests/test-client.py:1085:test_004()/378
 cmd: $NMCLI --mode tabular --color yes -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list
 lang: pl_PL.UTF-8
 returncode: 0
 stdout: 2510 bytes
 >>>
+NAME   SSID        SSID-HEX              BSSID              MODE            CHAN  FREQ      RATE     SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
+AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infrastruktura  1     2412 MHz  54 Mb/s  92      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/2 
+AP[2]  wlan0-ap-1  776C616E302D61702D31  61:95:77:AC:1E:4C  Infrastruktura  1     2412 MHz  54 Mb/s  81      ****  WPA1       pair_tkip pair_ccmp group_tkip group_ccmp psk  (brak)                                         wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/1 
+AP[3]  wlan0-ap-3  776C616E302D61702D33  9B:F6:B7:EC:97:76  Infrastruktura  1     2412 MHz  54 Mb/s  55      **    WPA3       (brak)                                         pair_tkip pair_ccmp group_tkip group_ccmp sae  wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/3 
+
 NAME   SSID        SSID-HEX              BSSID              MODE            CHAN  FREQ      RATE     SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
 AP[1]  wlan1-ap-4  776C616E312D61702D34  94:2B:E8:F6:D2:86  Infrastruktura  1     2412 MHz  54 Mb/s  48      **    WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan1   nie             /org/freedesktop/NetworkManager/AccessPoint/4 
 
 NAME  SSID  SSID-HEX  BSSID  MODE  CHAN  FREQ  RATE  SIGNAL  BARS  SECURITY  WPA-FLAGS  RSN-FLAGS  DEVICE  ACTIVE  IN-USE  DBUS-PATH 
 
-NAME   SSID        SSID-HEX              BSSID              MODE            CHAN  FREQ      RATE     SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
-AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infrastruktura  1     2412 MHz  54 Mb/s  92      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/2 
-AP[2]  wlan0-ap-1  776C616E302D61702D31  61:95:77:AC:1E:4C  Infrastruktura  1     2412 MHz  54 Mb/s  81      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/1 
-AP[3]  wlan0-ap-3  776C616E302D61702D33  9B:F6:B7:EC:97:76  Infrastruktura  1     2412 MHz  54 Mb/s  55      **    WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/3 
-
 <<<
-size: 916
-location: clients/tests/test-client.py:1073:test_004()/379
+size: 918
+location: clients/tests/test-client.py:1087:test_004()/379
 cmd: $NMCLI --mode tabular --color yes -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: C
 returncode: 0
-stdout: 721 bytes
+stdout: 723 bytes
 >>>
 NAME   SSID        SSID-HEX              BSSID              MODE   CHAN  FREQ      RATE       SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
 AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infra  1     2412 MHz  54 Mbit/s  92      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/2 
 
+
+
 <<<
-size: 944
-location: clients/tests/test-client.py:1073:test_004()/380
+size: 946
+location: clients/tests/test-client.py:1087:test_004()/380
 cmd: $NMCLI --mode tabular --color yes -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 739 bytes
+stdout: 741 bytes
 >>>
 NAME   SSID        SSID-HEX              BSSID              MODE            CHAN  FREQ      RATE     SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
 AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infrastruktura  1     2412 MHz  54 Mb/s  92      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/2 
 
+
+
 <<<
-size: 408
-location: clients/tests/test-client.py:1075:test_004()/381
+size: 410
+location: clients/tests/test-client.py:1089:test_004()/381
 cmd: $NMCLI --mode tabular --color yes -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: C
 returncode: 0
-stdout: 210 bytes
+stdout: 212 bytes
 >>>
 IN-USE  SSID        MODE   CHAN  RATE       SIGNAL  BARS  SECURITY  
         wlan0-ap-2  Infra  1     54 Mbit/s  92      ****  WPA1 WPA2 
 
+
+
 <<<
-size: 434
-location: clients/tests/test-client.py:1075:test_004()/382
+size: 436
+location: clients/tests/test-client.py:1089:test_004()/382
 cmd: $NMCLI --mode tabular --color yes -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 226 bytes
+stdout: 228 bytes
 >>>
 IN-USE  SSID        MODE            CHAN  RATE     SIGNAL  BARS  SECURITY  
         wlan0-ap-2  Infrastruktura  1     54 Mb/s  92      ****  WPA1 WPA2 
 
+
+
 <<<
-size: 1029
-location: clients/tests/test-client.py:1078:test_004()/383
+size: 1031
+location: clients/tests/test-client.py:1092:test_004()/383
 cmd: $NMCLI --mode tabular --color yes -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: C
 returncode: 0
-stdout: 721 bytes
+stdout: 723 bytes
 >>>
 NAME   SSID        SSID-HEX              BSSID              MODE   CHAN  FREQ      RATE       SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
 AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infra  1     2412 MHz  54 Mbit/s  92      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/2 
 
+
+
 <<<
-size: 1057
-location: clients/tests/test-client.py:1078:test_004()/384
+size: 1059
+location: clients/tests/test-client.py:1092:test_004()/384
 cmd: $NMCLI --mode tabular --color yes -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 739 bytes
+stdout: 741 bytes
 >>>
 NAME   SSID        SSID-HEX              BSSID              MODE            CHAN  FREQ      RATE     SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
 AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infrastruktura  1     2412 MHz  54 Mb/s  92      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/2 
 
+
+
 <<<
-size: 3198
-location: clients/tests/test-client.py:1080:test_004()/385
+size: 3270
+location: clients/tests/test-client.py:1094:test_004()/385
 cmd: $NMCLI --mode tabular --color yes -f ALL device show wlan0
 lang: C
 returncode: 0
-stdout: 3025 bytes
+stdout: 3097 bytes
 >>>
-NAME     DEVICE  TYPE  NM-TYPE       VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON               UDI                         IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED 
-GENERAL  wlan0   wifi  NMDeviceWifi  --      --       virtual  --              --                13:E0:74:85:7C:D9  0    20 (unavailable)  0 (No reason given)  /sys/devices/virtual/wlan0  --        no           yes         yes          no                no                 --            con-vpn-1   UUID-con-vpn-1-REPLACED-REPLACED-REP  /org/freedesktop/NetworkManager/ActiveConnection/2  unknown 
+NAME     DEVICE  TYPE  NM-TYPE       VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON               IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                         IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED 
+GENERAL  wlan0   wifi  NMDeviceWifi  --      --       virtual  --              --                13:E0:74:85:7C:D9  0    20 (unavailable)  0 (No reason given)  0 (unknown)       0 (unknown)       /sys/devices/virtual/wlan0  --        no           yes         yes          no                no                 --            con-vpn-1   UUID-con-vpn-1-REPLACED-REPLACED-REP  /org/freedesktop/NetworkManager/ActiveConnection/2  unknown 
 
 NAME          CARRIER-DETECT  SPEED    IS-SOFTWARE  SRIOV 
 CAPABILITIES  no              unknown  no           no    
@@ -21716,8 +22052,8 @@ WIFI-PROPERTIES  yes  yes  yes   yes   yes   yes  yes    unknown  unknown
 
 NAME   IN-USE  SSID        MODE   CHAN  RATE       SIGNAL  BARS  SECURITY  
 AP[1]          wlan0-ap-2  Infra  1     54 Mbit/s  92      ****  WPA1 WPA2 
-AP[2]          wlan0-ap-1  Infra  1     54 Mbit/s  81      ****  WPA1 WPA2 
-AP[3]          wlan0-ap-3  Infra  1     54 Mbit/s  55      **    WPA1 WPA2 
+AP[2]          wlan0-ap-1  Infra  1     54 Mbit/s  81      ****  WPA1      
+AP[3]          wlan0-ap-3  Infra  1     54 Mbit/s  55      **    WPA3      
 
 GROUP  ADDRESS                                 GATEWAY         ROUTE  DNS  DOMAIN                                                                            WINS           
 IP4    192.168.228.18/32 | 192.168.209.179/25  192.168.41.120  --     --   sear4.foo2.bar | sear4.fo.x.y | sear4.foo1.bar | sear4.foo4.bar | sear4.fo.o.bar  192.168.120.79 
@@ -21735,15 +22071,15 @@ NAME         AVAILABLE-CONNECTION-PATHS                               AVAILABLE-
 CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{2}  UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 
 
 <<<
-size: 3261
-location: clients/tests/test-client.py:1080:test_004()/386
+size: 3333
+location: clients/tests/test-client.py:1094:test_004()/386
 cmd: $NMCLI --mode tabular --color yes -f ALL device show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 3078 bytes
+stdout: 3150 bytes
 >>>
-NAME     DEVICE  TYPE  NM-TYPE       VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON                    UDI                         IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED  
-GENERAL  wlan0   wifi  NMDeviceWifi  --      --       virtual  --              --                13:E0:74:85:7C:D9  0    20 (niedostępne)  0 (Nie podano przyczyny)  /sys/devices/virtual/wlan0  --        nie          tak         tak          nie               nie                --            con-vpn-1   UUID-con-vpn-1-REPLACED-REPLACED-REP  /org/freedesktop/NetworkManager/ActiveConnection/2  nieznane 
+NAME     DEVICE  TYPE  NM-TYPE       VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON                    IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                         IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED  
+GENERAL  wlan0   wifi  NMDeviceWifi  --      --       virtual  --              --                13:E0:74:85:7C:D9  0    20 (niedostępne)  0 (Nie podano przyczyny)  0 (nieznane)      0 (nieznane)      /sys/devices/virtual/wlan0  --        nie          tak         tak          nie               nie                --            con-vpn-1   UUID-con-vpn-1-REPLACED-REPLACED-REP  /org/freedesktop/NetworkManager/ActiveConnection/2  nieznane 
 
 NAME          CARRIER-DETECT  SPEED     IS-SOFTWARE  SRIOV 
 CAPABILITIES  nie             nieznane  nie          nie   
@@ -21753,8 +22089,8 @@ WIFI-PROPERTIES  tak  tak  tak   tak   tak   tak  tak    nieznane  nieznane
 
 NAME   IN-USE  SSID        MODE            CHAN  RATE     SIGNAL  BARS  SECURITY  
 AP[1]          wlan0-ap-2  Infrastruktura  1     54 Mb/s  92      ****  WPA1 WPA2 
-AP[2]          wlan0-ap-1  Infrastruktura  1     54 Mb/s  81      ****  WPA1 WPA2 
-AP[3]          wlan0-ap-3  Infrastruktura  1     54 Mb/s  55      **    WPA1 WPA2 
+AP[2]          wlan0-ap-1  Infrastruktura  1     54 Mb/s  81      ****  WPA1      
+AP[3]          wlan0-ap-3  Infrastruktura  1     54 Mb/s  55      **    WPA3      
 
 GROUP  ADDRESS                                 GATEWAY         ROUTE  DNS  DOMAIN                                                                            WINS           
 IP4    192.168.228.18/32 | 192.168.209.179/25  192.168.41.120  --     --   sear4.foo2.bar | sear4.fo.x.y | sear4.foo1.bar | sear4.foo4.bar | sear4.fo.o.bar  192.168.120.79 
@@ -21773,7 +22109,7 @@ CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{2}  UUID-con-x
 
 <<<
 size: 1155
-location: clients/tests/test-client.py:1082:test_004()/387
+location: clients/tests/test-client.py:1096:test_004()/387
 cmd: $NMCLI --mode tabular --color yes -f COMMON device show wlan0
 lang: C
 returncode: 0
@@ -21808,7 +22144,7 @@ IP6    --       --       dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 250
 
 <<<
 size: 1166
-location: clients/tests/test-client.py:1082:test_004()/388
+location: clients/tests/test-client.py:1096:test_004()/388
 cmd: $NMCLI --mode tabular --color yes -f COMMON device show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
@@ -21842,15 +22178,15 @@ GROUP  ADDRESS  GATEWAY  ROUTE
 IP6    --       --       dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086  --   sear6.foo2.bar | sear6.foo1.bar | sear6.fo.x.y | sear6.fo.o.bar | sear6.foo3.bar | sear6.foo4.bar 
 
 <<<
-size: 3336
-location: clients/tests/test-client.py:1084:test_004()/389
+size: 3408
+location: clients/tests/test-client.py:1098:test_004()/389
 cmd: $NMCLI --mode tabular --color yes -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0
 lang: C
 returncode: 0
-stdout: 3025 bytes
+stdout: 3097 bytes
 >>>
-NAME     DEVICE  TYPE  NM-TYPE       VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON               UDI                         IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED 
-GENERAL  wlan0   wifi  NMDeviceWifi  --      --       virtual  --              --                13:E0:74:85:7C:D9  0    20 (unavailable)  0 (No reason given)  /sys/devices/virtual/wlan0  --        no           yes         yes          no                no                 --            con-vpn-1   UUID-con-vpn-1-REPLACED-REPLACED-REP  /org/freedesktop/NetworkManager/ActiveConnection/2  unknown 
+NAME     DEVICE  TYPE  NM-TYPE       VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON               IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                         IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED 
+GENERAL  wlan0   wifi  NMDeviceWifi  --      --       virtual  --              --                13:E0:74:85:7C:D9  0    20 (unavailable)  0 (No reason given)  0 (unknown)       0 (unknown)       /sys/devices/virtual/wlan0  --        no           yes         yes          no                no                 --            con-vpn-1   UUID-con-vpn-1-REPLACED-REPLACED-REP  /org/freedesktop/NetworkManager/ActiveConnection/2  unknown 
 
 NAME          CARRIER-DETECT  SPEED    IS-SOFTWARE  SRIOV 
 CAPABILITIES  no              unknown  no           no    
@@ -21860,8 +22196,8 @@ WIFI-PROPERTIES  yes  yes  yes   yes   yes   yes  yes    unknown  unknown
 
 NAME   IN-USE  SSID        MODE   CHAN  RATE       SIGNAL  BARS  SECURITY  
 AP[1]          wlan0-ap-2  Infra  1     54 Mbit/s  92      ****  WPA1 WPA2 
-AP[2]          wlan0-ap-1  Infra  1     54 Mbit/s  81      ****  WPA1 WPA2 
-AP[3]          wlan0-ap-3  Infra  1     54 Mbit/s  55      **    WPA1 WPA2 
+AP[2]          wlan0-ap-1  Infra  1     54 Mbit/s  81      ****  WPA1      
+AP[3]          wlan0-ap-3  Infra  1     54 Mbit/s  55      **    WPA3      
 
 GROUP  ADDRESS                                 GATEWAY         ROUTE  DNS  DOMAIN                                                                            WINS           
 IP4    192.168.228.18/32 | 192.168.209.179/25  192.168.41.120  --     --   sear4.foo2.bar | sear4.fo.x.y | sear4.foo1.bar | sear4.foo4.bar | sear4.fo.o.bar  192.168.120.79 
@@ -21879,15 +22215,15 @@ NAME         AVAILABLE-CONNECTION-PATHS                               AVAILABLE-
 CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{2}  UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 
 
 <<<
-size: 3399
-location: clients/tests/test-client.py:1084:test_004()/390
+size: 3471
+location: clients/tests/test-client.py:1098:test_004()/390
 cmd: $NMCLI --mode tabular --color yes -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 3078 bytes
+stdout: 3150 bytes
 >>>
-NAME     DEVICE  TYPE  NM-TYPE       VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON                    UDI                         IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED  
-GENERAL  wlan0   wifi  NMDeviceWifi  --      --       virtual  --              --                13:E0:74:85:7C:D9  0    20 (niedostępne)  0 (Nie podano przyczyny)  /sys/devices/virtual/wlan0  --        nie          tak         tak          nie               nie                --            con-vpn-1   UUID-con-vpn-1-REPLACED-REPLACED-REP  /org/freedesktop/NetworkManager/ActiveConnection/2  nieznane 
+NAME     DEVICE  TYPE  NM-TYPE       VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON                    IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                         IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED  
+GENERAL  wlan0   wifi  NMDeviceWifi  --      --       virtual  --              --                13:E0:74:85:7C:D9  0    20 (niedostępne)  0 (Nie podano przyczyny)  0 (nieznane)      0 (nieznane)      /sys/devices/virtual/wlan0  --        nie          tak         tak          nie               nie                --            con-vpn-1   UUID-con-vpn-1-REPLACED-REPLACED-REP  /org/freedesktop/NetworkManager/ActiveConnection/2  nieznane 
 
 NAME          CARRIER-DETECT  SPEED     IS-SOFTWARE  SRIOV 
 CAPABILITIES  nie             nieznane  nie          nie   
@@ -21897,8 +22233,8 @@ WIFI-PROPERTIES  tak  tak  tak   tak   tak   tak  tak    nieznane  nieznane
 
 NAME   IN-USE  SSID        MODE            CHAN  RATE     SIGNAL  BARS  SECURITY  
 AP[1]          wlan0-ap-2  Infrastruktura  1     54 Mb/s  92      ****  WPA1 WPA2 
-AP[2]          wlan0-ap-1  Infrastruktura  1     54 Mb/s  81      ****  WPA1 WPA2 
-AP[3]          wlan0-ap-3  Infrastruktura  1     54 Mb/s  55      **    WPA1 WPA2 
+AP[2]          wlan0-ap-1  Infrastruktura  1     54 Mb/s  81      ****  WPA1      
+AP[3]          wlan0-ap-3  Infrastruktura  1     54 Mb/s  55      **    WPA3      
 
 GROUP  ADDRESS                                 GATEWAY         ROUTE  DNS  DOMAIN                                                                            WINS           
 IP4    192.168.228.18/32 | 192.168.209.179/25  192.168.41.120  --     --   sear4.foo2.bar | sear4.fo.x.y | sear4.foo1.bar | sear4.foo4.bar | sear4.fo.o.bar  192.168.120.79 
@@ -21917,7 +22253,7 @@ CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{2}  UUID-con-x
 
 <<<
 size: 4742
-location: clients/tests/test-client.py:1022:test_004()/391
+location: clients/tests/test-client.py:1036:test_004()/391
 cmd: $NMCLI --mode tabular --pretty con s con-vpn-1
 lang: C
 returncode: 0
@@ -21958,12 +22294,12 @@ NAME  TYPE     USERNAME  GATEWAY  BANNER                            VPN-STATE
 VPN   openvpn  --        --       *** VPN connection con-vpn-1 ***  5 - VPN connected  key1 = val1 | key2 = val2 | key3 = val3 
 
 <<<
-size: 4796
-location: clients/tests/test-client.py:1022:test_004()/392
+size: 4798
+location: clients/tests/test-client.py:1036:test_004()/392
 cmd: $NMCLI --mode tabular --pretty con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 4625 bytes
+stdout: 4627 bytes
 >>>
 ============================================
   Szczegóły profilu połączenia (con-vpn-1)
@@ -21997,11 +22333,11 @@ GENERAL  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  wlan0    aktywowano  n
 
 NAME  TYPE     USERNAME  GATEWAY  BANNER                            VPN-STATE            CFG                                     
 ----------------------------------------------------------------------------------------------------------------------------------
-VPN   openvpn  --        --       *** VPN connection con-vpn-1 ***  5 - Połączono z VPN  key1 = val1 | key2 = val2 | key3 = val3 
+VPN   openvpn  --        --       *** VPN connection con-vpn-1 ***  5 — Połączono z VPN  key1 = val1 | key2 = val2 | key3 = val3 
 
 <<<
 size: 4742
-location: clients/tests/test-client.py:1024:test_004()/393
+location: clients/tests/test-client.py:1038:test_004()/393
 cmd: $NMCLI --mode tabular --pretty con s con-vpn-1
 lang: C
 returncode: 0
@@ -22042,12 +22378,12 @@ NAME  TYPE     USERNAME  GATEWAY  BANNER                            VPN-STATE
 VPN   openvpn  --        --       *** VPN connection con-vpn-1 ***  5 - VPN connected  key1 = val1 | key2 = val2 | key3 = val3 
 
 <<<
-size: 4796
-location: clients/tests/test-client.py:1024:test_004()/394
+size: 4798
+location: clients/tests/test-client.py:1038:test_004()/394
 cmd: $NMCLI --mode tabular --pretty con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 4625 bytes
+stdout: 4627 bytes
 >>>
 ============================================
   Szczegóły profilu połączenia (con-vpn-1)
@@ -22081,11 +22417,11 @@ GENERAL  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  wlan0    aktywowano  n
 
 NAME  TYPE     USERNAME  GATEWAY  BANNER                            VPN-STATE            CFG                                     
 ----------------------------------------------------------------------------------------------------------------------------------
-VPN   openvpn  --        --       *** VPN connection con-vpn-1 ***  5 - Połączono z VPN  key1 = val1 | key2 = val2 | key3 = val3 
+VPN   openvpn  --        --       *** VPN connection con-vpn-1 ***  5 — Połączono z VPN  key1 = val1 | key2 = val2 | key3 = val3 
 
 <<<
 size: 3428
-location: clients/tests/test-client.py:1027:test_004()/395
+location: clients/tests/test-client.py:1041:test_004()/395
 cmd: $NMCLI --mode tabular --pretty -f ALL con s con-vpn-1
 lang: C
 returncode: 0
@@ -22117,7 +22453,7 @@ proxy  none    no            --       --
 
 <<<
 size: 3451
-location: clients/tests/test-client.py:1027:test_004()/396
+location: clients/tests/test-client.py:1041:test_004()/396
 cmd: $NMCLI --mode tabular --pretty -f ALL con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
@@ -22149,7 +22485,7 @@ proxy  none    nie           --       --
 
 <<<
 size: 676
-location: clients/tests/test-client.py:1033:test_004()/397
+location: clients/tests/test-client.py:1047:test_004()/397
 cmd: $NMCLI --mode tabular --pretty -f VPN con s con-vpn-1
 lang: C
 returncode: 0
@@ -22164,7 +22500,7 @@ vpn   org.freedesktop.NetworkManager.openvpn  --         key1 = val1, key2 = val
 
 <<<
 size: 696
-location: clients/tests/test-client.py:1033:test_004()/398
+location: clients/tests/test-client.py:1047:test_004()/398
 cmd: $NMCLI --mode tabular --pretty -f VPN con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
@@ -22179,7 +22515,7 @@ vpn   org.freedesktop.NetworkManager.openvpn  --         key1 = val1, key2 = val
 
 <<<
 size: 1106
-location: clients/tests/test-client.py:1036:test_004()/399
+location: clients/tests/test-client.py:1050:test_004()/399
 cmd: $NMCLI --mode tabular --pretty -f GENERAL con s con-vpn-1
 lang: C
 returncode: 0
@@ -22194,7 +22530,7 @@ GENERAL  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  wlan0    activated  no
 
 <<<
 size: 1138
-location: clients/tests/test-client.py:1036:test_004()/400
+location: clients/tests/test-client.py:1050:test_004()/400
 cmd: $NMCLI --mode tabular --pretty -f GENERAL con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
@@ -22209,7 +22545,7 @@ GENERAL  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  wlan0    aktywowano  n
 
 <<<
 size: 537
-location: clients/tests/test-client.py:1039:test_004()/401
+location: clients/tests/test-client.py:1053:test_004()/401
 cmd: $NMCLI --mode tabular --pretty dev s
 lang: C
 returncode: 0
@@ -22220,15 +22556,15 @@ stdout: 387 bytes
 =====================
 DEVICE  TYPE      STATE        CONNECTION 
 ----------------------------------------------------------------
+wlan0   wifi      unavailable  con-vpn-1  
 eth0    ethernet  unavailable  --         
 eth1    ethernet  unavailable  --         
 wlan1   wifi      unavailable  --         
 wlan1   wifi      unavailable  --         
-wlan0   wifi      unavailable  con-vpn-1  
 
 <<<
 size: 545
-location: clients/tests/test-client.py:1039:test_004()/402
+location: clients/tests/test-client.py:1053:test_004()/402
 cmd: $NMCLI --mode tabular --pretty dev s
 lang: pl_PL.UTF-8
 returncode: 0
@@ -22239,58 +22575,97 @@ stdout: 385 bytes
 ===================
 DEVICE  TYPE      STATE        CONNECTION 
 --------------------------------------------------------------
+wlan0   wifi      niedostępne  con-vpn-1  
 eth0    ethernet  niedostępne  --         
 eth1    ethernet  niedostępne  --         
 wlan1   wifi      niedostępne  --         
 wlan1   wifi      niedostępne  --         
-wlan0   wifi      niedostępne  con-vpn-1  
 
 <<<
-size: 1481
-location: clients/tests/test-client.py:1042:test_004()/403
+size: 1733
+location: clients/tests/test-client.py:1056:test_004()/403
 cmd: $NMCLI --mode tabular --pretty -f all dev status
 lang: C
 returncode: 0
-stdout: 1318 bytes
+stdout: 1570 bytes
 >>>
 =====================
   Status of devices
 =====================
-DEVICE  TYPE      STATE        DBUS-PATH                                  CONNECTION  CON-UUID                              CON-PATH                                           
------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-eth0    ethernet  unavailable  /org/freedesktop/NetworkManager/Devices/1  --          --                                    --                                                 
-eth1    ethernet  unavailable  /org/freedesktop/NetworkManager/Devices/2  --          --                                    --                                                 
-wlan1   wifi      unavailable  /org/freedesktop/NetworkManager/Devices/4  --          --                                    --                                                 
-wlan1   wifi      unavailable  /org/freedesktop/NetworkManager/Devices/5  --          --                                    --                                                 
-wlan0   wifi      unavailable  /org/freedesktop/NetworkManager/Devices/3  con-vpn-1   UUID-con-vpn-1-REPLACED-REPLACED-REP  /org/freedesktop/NetworkManager/ActiveConnection/2 
+DEVICE  TYPE      STATE        IP4-CONNECTIVITY  IP6-CONNECTIVITY  DBUS-PATH                                  CONNECTION  CON-UUID                              CON-PATH                                           
+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+wlan0   wifi      unavailable  unknown           unknown           /org/freedesktop/NetworkManager/Devices/3  con-vpn-1   UUID-con-vpn-1-REPLACED-REPLACED-REP  /org/freedesktop/NetworkManager/ActiveConnection/2 
+eth0    ethernet  unavailable  unknown           unknown           /org/freedesktop/NetworkManager/Devices/1  --          --                                    --                                                 
+eth1    ethernet  unavailable  unknown           unknown           /org/freedesktop/NetworkManager/Devices/2  --          --                                    --                                                 
+wlan1   wifi      unavailable  unknown           unknown           /org/freedesktop/NetworkManager/Devices/4  --          --                                    --                                                 
+wlan1   wifi      unavailable  unknown           unknown           /org/freedesktop/NetworkManager/Devices/5  --          --                                    --                                                 
 
 <<<
-size: 1489
-location: clients/tests/test-client.py:1042:test_004()/404
+size: 1741
+location: clients/tests/test-client.py:1056:test_004()/404
 cmd: $NMCLI --mode tabular --pretty -f all dev status
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 1316 bytes
+stdout: 1568 bytes
 >>>
 ===================
   Stan urządzenia
 ===================
-DEVICE  TYPE      STATE        DBUS-PATH                                  CONNECTION  CON-UUID                              CON-PATH                                           
----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-eth0    ethernet  niedostępne  /org/freedesktop/NetworkManager/Devices/1  --          --                                    --                                                 
-eth1    ethernet  niedostępne  /org/freedesktop/NetworkManager/Devices/2  --          --                                    --                                                 
-wlan1   wifi      niedostępne  /org/freedesktop/NetworkManager/Devices/4  --          --                                    --                                                 
-wlan1   wifi      niedostępne  /org/freedesktop/NetworkManager/Devices/5  --          --                                    --                                                 
-wlan0   wifi      niedostępne  /org/freedesktop/NetworkManager/Devices/3  con-vpn-1   UUID-con-vpn-1-REPLACED-REPLACED-REP  /org/freedesktop/NetworkManager/ActiveConnection/2 
+DEVICE  TYPE      STATE        IP4-CONNECTIVITY  IP6-CONNECTIVITY  DBUS-PATH                                  CONNECTION  CON-UUID                              CON-PATH                                           
+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+wlan0   wifi      niedostępne  nieznane          nieznane          /org/freedesktop/NetworkManager/Devices/3  con-vpn-1   UUID-con-vpn-1-REPLACED-REPLACED-REP  /org/freedesktop/NetworkManager/ActiveConnection/2 
+eth0    ethernet  niedostępne  nieznane          nieznane          /org/freedesktop/NetworkManager/Devices/1  --          --                                    --                                                 
+eth1    ethernet  niedostępne  nieznane          nieznane          /org/freedesktop/NetworkManager/Devices/2  --          --                                    --                                                 
+wlan1   wifi      niedostępne  nieznane          nieznane          /org/freedesktop/NetworkManager/Devices/4  --          --                                    --                                                 
+wlan1   wifi      niedostępne  nieznane          nieznane          /org/freedesktop/NetworkManager/Devices/5  --          --                                    --                                                 
 
 <<<
 size: 9891
-location: clients/tests/test-client.py:1045:test_004()/405
+location: clients/tests/test-client.py:1059:test_004()/405
 cmd: $NMCLI --mode tabular --pretty dev show
 lang: C
 returncode: 0
 stdout: 9737 bytes
 >>>
+==========================
+  Device details (wlan0)
+==========================
+DEVICE 
+--------
+wlan0  
+
+TYPE 
+------
+wifi 
+
+HWADDR            
+-------------------
+13:E0:74:85:7C:D9 
+
+MTU 
+-----
+0   
+
+STATE            
+------------------
+20 (unavailable) 
+
+CONNECTION 
+------------
+con-vpn-1  
+
+CON-PATH                                           
+----------------------------------------------------
+/org/freedesktop/NetworkManager/ActiveConnection/2 
+
+GROUP  ADDRESS                                 GATEWAY         ROUTE  DNS  DOMAIN                                                                            WINS           
+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+IP4    192.168.228.18/32 | 192.168.209.179/25  192.168.41.120  --     --   sear4.foo2.bar | sear4.fo.x.y | sear4.foo1.bar | sear4.foo4.bar | sear4.fo.o.bar  192.168.120.79 
+
+GROUP  ADDRESS  GATEWAY  ROUTE                                                           DNS  DOMAIN                                                                                            
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+IP6    --       --       dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086  --   sear6.foo2.bar | sear6.foo1.bar | sear6.fo.x.y | sear6.fo.o.bar | sear6.foo3.bar | sear6.foo4.bar 
+
 =========================
   Device details (eth0)
 =========================
@@ -22455,9 +22830,17 @@ GROUP  ADDRESS                        GATEWAY  ROUTE
 -----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 IP6    2001:a::88ca:3654:96b:ab44/89  --       dst = 2001:a::cc8b:7c09:4673:bbb0/85, nh = ::, mt = 2821465568 | dst = 2001:a::a976:2488:f49f:b48/106, nh = 2001:a::62ae:c734:fc7b:e931, mt = 2248613879 | dst = 2001:a::afb7:4449:3787:8bb4/123, nh = ::  2001:a::2934:bd66:550d:ec19  sear6.fo.x.y 
 
-==========================
-  Device details (wlan0)
-==========================
+<<<
+size: 10067
+location: clients/tests/test-client.py:1059:test_004()/406
+cmd: $NMCLI --mode tabular --pretty dev show
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 9903 bytes
+>>>
+===================================
+  Informacje o urządzeniu (wlan0)
+===================================
 DEVICE 
 --------
 wlan0  
@@ -22476,7 +22859,7 @@ MTU
 
 STATE            
 ------------------
-20 (unavailable) 
+20 (niedostępne) 
 
 CONNECTION 
 ------------
@@ -22494,14 +22877,6 @@ GROUP  ADDRESS  GATEWAY  ROUTE
 -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 IP6    --       --       dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086  --   sear6.foo2.bar | sear6.foo1.bar | sear6.fo.x.y | sear6.fo.o.bar | sear6.foo3.bar | sear6.foo4.bar 
 
-<<<
-size: 10067
-location: clients/tests/test-client.py:1045:test_004()/406
-cmd: $NMCLI --mode tabular --pretty dev show
-lang: pl_PL.UTF-8
-returncode: 0
-stdout: 9903 bytes
->>>
 ==================================
   Informacje o urządzeniu (eth0)
 ==================================
@@ -22666,59 +23041,61 @@ GROUP  ADDRESS                        GATEWAY  ROUTE
 -----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 IP6    2001:a::88ca:3654:96b:ab44/89  --       dst = 2001:a::cc8b:7c09:4673:bbb0/85, nh = ::, mt = 2821465568 | dst = 2001:a::a976:2488:f49f:b48/106, nh = 2001:a::62ae:c734:fc7b:e931, mt = 2248613879 | dst = 2001:a::afb7:4449:3787:8bb4/123, nh = ::  2001:a::2934:bd66:550d:ec19  sear6.fo.x.y 
 
-===================================
-  Informacje o urządzeniu (wlan0)
-===================================
-DEVICE 
---------
-wlan0  
-
-TYPE 
-------
-wifi 
-
-HWADDR            
--------------------
-13:E0:74:85:7C:D9 
-
-MTU 
------
-0   
+<<<
+size: 22590
+location: clients/tests/test-client.py:1062:test_004()/407
+cmd: $NMCLI --mode tabular --pretty -f all dev show
+lang: C
+returncode: 0
+stdout: 22428 bytes
+>>>
+==========================
+  Device details (wlan0)
+==========================
+NAME     DEVICE  TYPE  NM-TYPE       VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON               IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                         IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED 
+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+GENERAL  wlan0   wifi  NMDeviceWifi  --      --       virtual  --              --                13:E0:74:85:7C:D9  0    20 (unavailable)  0 (No reason given)  0 (unknown)       0 (unknown)       /sys/devices/virtual/wlan0  --        no           yes         yes          no                no                 --            con-vpn-1   UUID-con-vpn-1-REPLACED-REPLACED-REP  /org/freedesktop/NetworkManager/ActiveConnection/2  unknown 
 
-STATE            
-------------------
-20 (niedostępne) 
+NAME          CARRIER-DETECT  SPEED    IS-SOFTWARE  SRIOV 
+-----------------------------------------------------------
+CAPABILITIES  no              unknown  no           no    
 
-CONNECTION 
-------------
-con-vpn-1  
+NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ     5GHZ    
+---------------------------------------------------------------------------
+WIFI-PROPERTIES  yes  yes  yes   yes   yes   yes  yes    unknown  unknown 
 
-CON-PATH                                           
-----------------------------------------------------
-/org/freedesktop/NetworkManager/ActiveConnection/2 
+NAME   IN-USE  SSID        MODE   CHAN  RATE       SIGNAL  BARS  SECURITY  
+----------------------------------------------------------------------------
+AP[1]          wlan0-ap-2  Infra  1     54 Mbit/s  92      ****  WPA1 WPA2 
+AP[2]          wlan0-ap-1  Infra  1     54 Mbit/s  81      ****  WPA1      
+AP[3]          wlan0-ap-3  Infra  1     54 Mbit/s  55      **    WPA3      
 
 GROUP  ADDRESS                                 GATEWAY         ROUTE  DNS  DOMAIN                                                                            WINS           
 -----------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 IP4    192.168.228.18/32 | 192.168.209.179/25  192.168.41.120  --     --   sear4.foo2.bar | sear4.fo.x.y | sear4.foo1.bar | sear4.foo4.bar | sear4.fo.o.bar  192.168.120.79 
 
+GROUP  OPTION                                                                                    
+--------------------------------------------------------------------------------------------------
+DHCP4  dhcp-4-opt-0 = val-0 | dhcp-4-opt-2 = val-2 | dhcp-4-opt-4 = val-4 | dhcp-4-opt-7 = val-7 
+
 GROUP  ADDRESS  GATEWAY  ROUTE                                                           DNS  DOMAIN                                                                                            
 -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 IP6    --       --       dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086  --   sear6.foo2.bar | sear6.foo1.bar | sear6.fo.x.y | sear6.fo.o.bar | sear6.foo3.bar | sear6.foo4.bar 
 
-<<<
-size: 22050
-location: clients/tests/test-client.py:1048:test_004()/407
-cmd: $NMCLI --mode tabular --pretty -f all dev show
-lang: C
-returncode: 0
-stdout: 21888 bytes
->>>
+GROUP  OPTION                                                                                                           
+-------------------------------------------------------------------------------------------------------------------------
+DHCP6  dhcp-6-opt-1 = val-1 | dhcp-6-opt-2 = val-2 | dhcp-6-opt-3 = val-3 | dhcp-6-opt-4 = val-4 | dhcp-6-opt-5 = val-5 
+
+NAME         AVAILABLE-CONNECTION-PATHS                               AVAILABLE-CONNECTIONS                          
+----------------------------------------------------------------------------------------------------------------------
+CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{2}  UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 
+
 =========================
   Device details (eth0)
 =========================
-NAME     DEVICE  TYPE      NM-TYPE           VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON               UDI                        IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID  CON-PATH  METERED 
------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-GENERAL  eth0    ethernet  NMDeviceEthernet  --      --       virtual  --              --                AB:B7:BF:E2:48:E8  0    20 (unavailable)  0 (No reason given)  /sys/devices/virtual/eth0  --        no           yes         yes          no                no                 --            --          --        --        unknown 
+NAME     DEVICE  TYPE      NM-TYPE           VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON               IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                        IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID  CON-PATH  METERED 
+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+GENERAL  eth0    ethernet  NMDeviceEthernet  --      --       virtual  --              --                AB:B7:BF:E2:48:E8  0    20 (unavailable)  0 (No reason given)  0 (unknown)       0 (unknown)       /sys/devices/virtual/eth0  --        no           yes         yes          no                no                 --            --          --        --        unknown 
 
 NAME          CARRIER-DETECT  SPEED     IS-SOFTWARE  SRIOV 
 ------------------------------------------------------------
@@ -22751,9 +23128,9 @@ CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{1}  5fcfd6d7-1
 =========================
   Device details (eth1)
 =========================
-NAME     DEVICE  TYPE      NM-TYPE           VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON               UDI                        IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID  CON-PATH  METERED 
------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-GENERAL  eth1    ethernet  NMDeviceEthernet  --      --       virtual  --              --                E7:78:B1:93:2B:22  0    20 (unavailable)  0 (No reason given)  /sys/devices/virtual/eth1  --        no           yes         yes          no                no                 --            --          --        --        unknown 
+NAME     DEVICE  TYPE      NM-TYPE           VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON               IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                        IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID  CON-PATH  METERED 
+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+GENERAL  eth1    ethernet  NMDeviceEthernet  --      --       virtual  --              --                E7:78:B1:93:2B:22  0    20 (unavailable)  0 (No reason given)  0 (unknown)       0 (unknown)       /sys/devices/virtual/eth1  --        no           yes         yes          no                no                 --            --          --        --        unknown 
 
 NAME          CARRIER-DETECT  SPEED     IS-SOFTWARE  SRIOV 
 ------------------------------------------------------------
@@ -22786,9 +23163,9 @@ CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{1}  5fcfd6d7-1
 ==========================
   Device details (wlan1)
 ==========================
-NAME     DEVICE  TYPE  NM-TYPE       VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON               UDI                         IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID  CON-PATH  METERED 
-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-GENERAL  wlan1   wifi  NMDeviceWifi  --      --       virtual  --              --                21:E9:64:81:8C:A8  0    20 (unavailable)  0 (No reason given)  /sys/devices/virtual/wlan1  --        no           yes         yes          no                no                 --            --          --        --        unknown 
+NAME     DEVICE  TYPE  NM-TYPE       VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON               IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                         IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID  CON-PATH  METERED 
+----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+GENERAL  wlan1   wifi  NMDeviceWifi  --      --       virtual  --              --                21:E9:64:81:8C:A8  0    20 (unavailable)  0 (No reason given)  0 (unknown)       0 (unknown)       /sys/devices/virtual/wlan1  --        no           yes         yes          no                no                 --            --          --        --        unknown 
 
 NAME          CARRIER-DETECT  SPEED    IS-SOFTWARE  SRIOV 
 -----------------------------------------------------------
@@ -22825,9 +23202,9 @@ CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{2}  UUID-con-x
 ==========================
   Device details (wlan1)
 ==========================
-NAME     DEVICE  TYPE  NM-TYPE       VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON               UDI                         IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID  CON-PATH  METERED 
-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-GENERAL  wlan1   wifi  NMDeviceWifi  --      --       virtual  --              --                71:52:AD:63:5C:7C  0    20 (unavailable)  0 (No reason given)  /sys/devices/virtual/wlan1  --        no           yes         yes          no                no                 --            --          --        --        unknown 
+NAME     DEVICE  TYPE  NM-TYPE       VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON               IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                         IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID  CON-PATH  METERED 
+----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+GENERAL  wlan1   wifi  NMDeviceWifi  --      --       virtual  --              --                71:52:AD:63:5C:7C  0    20 (unavailable)  0 (No reason given)  0 (unknown)       0 (unknown)       /sys/devices/virtual/wlan1  --        no           yes         yes          no                no                 --            --          --        --        unknown 
 
 NAME          CARRIER-DETECT  SPEED    IS-SOFTWARE  SRIOV 
 -----------------------------------------------------------
@@ -22860,26 +23237,34 @@ NAME         AVAILABLE-CONNECTION-PATHS                               AVAILABLE-
 ----------------------------------------------------------------------------------------------------------------------
 CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{2}  UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 
 
-==========================
-  Device details (wlan0)
-==========================
-NAME     DEVICE  TYPE  NM-TYPE       VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON               UDI                         IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED 
---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-GENERAL  wlan0   wifi  NMDeviceWifi  --      --       virtual  --              --                13:E0:74:85:7C:D9  0    20 (unavailable)  0 (No reason given)  /sys/devices/virtual/wlan0  --        no           yes         yes          no                no                 --            con-vpn-1   UUID-con-vpn-1-REPLACED-REPLACED-REP  /org/freedesktop/NetworkManager/ActiveConnection/2  unknown 
+<<<
+size: 22951
+location: clients/tests/test-client.py:1062:test_004()/408
+cmd: $NMCLI --mode tabular --pretty -f all dev show
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 22779 bytes
+>>>
+===================================
+  Informacje o urządzeniu (wlan0)
+===================================
+NAME     DEVICE  TYPE  NM-TYPE       VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON                    IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                         IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED  
+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+GENERAL  wlan0   wifi  NMDeviceWifi  --      --       virtual  --              --                13:E0:74:85:7C:D9  0    20 (niedostępne)  0 (Nie podano przyczyny)  0 (nieznane)      0 (nieznane)      /sys/devices/virtual/wlan0  --        nie          tak         tak          nie               nie                --            con-vpn-1   UUID-con-vpn-1-REPLACED-REPLACED-REP  /org/freedesktop/NetworkManager/ActiveConnection/2  nieznane 
 
-NAME          CARRIER-DETECT  SPEED    IS-SOFTWARE  SRIOV 
------------------------------------------------------------
-CAPABILITIES  no              unknown  no           no    
+NAME          CARRIER-DETECT  SPEED     IS-SOFTWARE  SRIOV 
+------------------------------------------------------------
+CAPABILITIES  nie             nieznane  nie          nie   
 
-NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ     5GHZ    
----------------------------------------------------------------------------
-WIFI-PROPERTIES  yes  yes  yes   yes   yes   yes  yes    unknown  unknown 
+NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ      5GHZ     
+-----------------------------------------------------------------------------
+WIFI-PROPERTIES  tak  tak  tak   tak   tak   tak  tak    nieznane  nieznane 
 
-NAME   IN-USE  SSID        MODE   CHAN  RATE       SIGNAL  BARS  SECURITY  
-----------------------------------------------------------------------------
-AP[1]          wlan0-ap-2  Infra  1     54 Mbit/s  92      ****  WPA1 WPA2 
-AP[2]          wlan0-ap-1  Infra  1     54 Mbit/s  81      ****  WPA1 WPA2 
-AP[3]          wlan0-ap-3  Infra  1     54 Mbit/s  55      **    WPA1 WPA2 
+NAME   IN-USE  SSID        MODE            CHAN  RATE     SIGNAL  BARS  SECURITY  
+-----------------------------------------------------------------------------------
+AP[1]          wlan0-ap-2  Infrastruktura  1     54 Mb/s  92      ****  WPA1 WPA2 
+AP[2]          wlan0-ap-1  Infrastruktura  1     54 Mb/s  81      ****  WPA1      
+AP[3]          wlan0-ap-3  Infrastruktura  1     54 Mb/s  55      **    WPA3      
 
 GROUP  ADDRESS                                 GATEWAY         ROUTE  DNS  DOMAIN                                                                            WINS           
 -----------------------------------------------------------------------------------------------------------------------------------------------------------------------------
@@ -22901,20 +23286,12 @@ NAME         AVAILABLE-CONNECTION-PATHS                               AVAILABLE-
 ----------------------------------------------------------------------------------------------------------------------
 CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{2}  UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 
 
-<<<
-size: 22411
-location: clients/tests/test-client.py:1048:test_004()/408
-cmd: $NMCLI --mode tabular --pretty -f all dev show
-lang: pl_PL.UTF-8
-returncode: 0
-stdout: 22239 bytes
->>>
 ==================================
   Informacje o urządzeniu (eth0)
 ==================================
-NAME     DEVICE  TYPE      NM-TYPE           VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON                    UDI                        IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID  CON-PATH  METERED  
------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-GENERAL  eth0    ethernet  NMDeviceEthernet  --      --       virtual  --              --                AB:B7:BF:E2:48:E8  0    20 (niedostępne)  0 (Nie podano przyczyny)  /sys/devices/virtual/eth0  --        nie          tak         tak          nie               nie                --            --          --        --        nieznane 
+NAME     DEVICE  TYPE      NM-TYPE           VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON                    IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                        IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID  CON-PATH  METERED  
+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+GENERAL  eth0    ethernet  NMDeviceEthernet  --      --       virtual  --              --                AB:B7:BF:E2:48:E8  0    20 (niedostępne)  0 (Nie podano przyczyny)  0 (nieznane)      0 (nieznane)      /sys/devices/virtual/eth0  --        nie          tak         tak          nie               nie                --            --          --        --        nieznane 
 
 NAME          CARRIER-DETECT  SPEED     IS-SOFTWARE  SRIOV 
 ------------------------------------------------------------
@@ -22947,9 +23324,9 @@ CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{1}  5fcfd6d7-1
 ==================================
   Informacje o urządzeniu (eth1)
 ==================================
-NAME     DEVICE  TYPE      NM-TYPE           VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON                    UDI                        IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID  CON-PATH  METERED  
------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-GENERAL  eth1    ethernet  NMDeviceEthernet  --      --       virtual  --              --                E7:78:B1:93:2B:22  0    20 (niedostępne)  0 (Nie podano przyczyny)  /sys/devices/virtual/eth1  --        nie          tak         tak          nie               nie                --            --          --        --        nieznane 
+NAME     DEVICE  TYPE      NM-TYPE           VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON                    IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                        IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID  CON-PATH  METERED  
+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+GENERAL  eth1    ethernet  NMDeviceEthernet  --      --       virtual  --              --                E7:78:B1:93:2B:22  0    20 (niedostępne)  0 (Nie podano przyczyny)  0 (nieznane)      0 (nieznane)      /sys/devices/virtual/eth1  --        nie          tak         tak          nie               nie                --            --          --        --        nieznane 
 
 NAME          CARRIER-DETECT  SPEED     IS-SOFTWARE  SRIOV 
 ------------------------------------------------------------
@@ -22982,9 +23359,9 @@ CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{1}  5fcfd6d7-1
 ===================================
   Informacje o urządzeniu (wlan1)
 ===================================
-NAME     DEVICE  TYPE  NM-TYPE       VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON                    UDI                         IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID  CON-PATH  METERED  
-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-GENERAL  wlan1   wifi  NMDeviceWifi  --      --       virtual  --              --                21:E9:64:81:8C:A8  0    20 (niedostępne)  0 (Nie podano przyczyny)  /sys/devices/virtual/wlan1  --        nie          tak         tak          nie               nie                --            --          --        --        nieznane 
+NAME     DEVICE  TYPE  NM-TYPE       VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON                    IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                         IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID  CON-PATH  METERED  
+----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+GENERAL  wlan1   wifi  NMDeviceWifi  --      --       virtual  --              --                21:E9:64:81:8C:A8  0    20 (niedostępne)  0 (Nie podano przyczyny)  0 (nieznane)      0 (nieznane)      /sys/devices/virtual/wlan1  --        nie          tak         tak          nie               nie                --            --          --        --        nieznane 
 
 NAME          CARRIER-DETECT  SPEED     IS-SOFTWARE  SRIOV 
 ------------------------------------------------------------
@@ -23021,9 +23398,9 @@ CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{2}  UUID-con-x
 ===================================
   Informacje o urządzeniu (wlan1)
 ===================================
-NAME     DEVICE  TYPE  NM-TYPE       VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON                    UDI                         IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID  CON-PATH  METERED  
-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-GENERAL  wlan1   wifi  NMDeviceWifi  --      --       virtual  --              --                71:52:AD:63:5C:7C  0    20 (niedostępne)  0 (Nie podano przyczyny)  /sys/devices/virtual/wlan1  --        nie          tak         tak          nie               nie                --            --          --        --        nieznane 
+NAME     DEVICE  TYPE  NM-TYPE       VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON                    IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                         IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID  CON-PATH  METERED  
+----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+GENERAL  wlan1   wifi  NMDeviceWifi  --      --       virtual  --              --                71:52:AD:63:5C:7C  0    20 (niedostępne)  0 (Nie podano przyczyny)  0 (nieznane)      0 (nieznane)      /sys/devices/virtual/wlan1  --        nie          tak         tak          nie               nie                --            --          --        --        nieznane 
 
 NAME          CARRIER-DETECT  SPEED     IS-SOFTWARE  SRIOV 
 ------------------------------------------------------------
@@ -23056,50 +23433,9 @@ NAME         AVAILABLE-CONNECTION-PATHS                               AVAILABLE-
 ----------------------------------------------------------------------------------------------------------------------
 CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{2}  UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 
 
-===================================
-  Informacje o urządzeniu (wlan0)
-===================================
-NAME     DEVICE  TYPE  NM-TYPE       VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON                    UDI                         IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED  
---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-GENERAL  wlan0   wifi  NMDeviceWifi  --      --       virtual  --              --                13:E0:74:85:7C:D9  0    20 (niedostępne)  0 (Nie podano przyczyny)  /sys/devices/virtual/wlan0  --        nie          tak         tak          nie               nie                --            con-vpn-1   UUID-con-vpn-1-REPLACED-REPLACED-REP  /org/freedesktop/NetworkManager/ActiveConnection/2  nieznane 
-
-NAME          CARRIER-DETECT  SPEED     IS-SOFTWARE  SRIOV 
-------------------------------------------------------------
-CAPABILITIES  nie             nieznane  nie          nie   
-
-NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ      5GHZ     
------------------------------------------------------------------------------
-WIFI-PROPERTIES  tak  tak  tak   tak   tak   tak  tak    nieznane  nieznane 
-
-NAME   IN-USE  SSID        MODE            CHAN  RATE     SIGNAL  BARS  SECURITY  
------------------------------------------------------------------------------------
-AP[1]          wlan0-ap-2  Infrastruktura  1     54 Mb/s  92      ****  WPA1 WPA2 
-AP[2]          wlan0-ap-1  Infrastruktura  1     54 Mb/s  81      ****  WPA1 WPA2 
-AP[3]          wlan0-ap-3  Infrastruktura  1     54 Mb/s  55      **    WPA1 WPA2 
-
-GROUP  ADDRESS                                 GATEWAY         ROUTE  DNS  DOMAIN                                                                            WINS           
------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-IP4    192.168.228.18/32 | 192.168.209.179/25  192.168.41.120  --     --   sear4.foo2.bar | sear4.fo.x.y | sear4.foo1.bar | sear4.foo4.bar | sear4.fo.o.bar  192.168.120.79 
-
-GROUP  OPTION                                                                                    
---------------------------------------------------------------------------------------------------
-DHCP4  dhcp-4-opt-0 = val-0 | dhcp-4-opt-2 = val-2 | dhcp-4-opt-4 = val-4 | dhcp-4-opt-7 = val-7 
-
-GROUP  ADDRESS  GATEWAY  ROUTE                                                           DNS  DOMAIN                                                                                            
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-IP6    --       --       dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086  --   sear6.foo2.bar | sear6.foo1.bar | sear6.fo.x.y | sear6.fo.o.bar | sear6.foo3.bar | sear6.foo4.bar 
-
-GROUP  OPTION                                                                                                           
--------------------------------------------------------------------------------------------------------------------------
-DHCP6  dhcp-6-opt-1 = val-1 | dhcp-6-opt-2 = val-2 | dhcp-6-opt-3 = val-3 | dhcp-6-opt-4 = val-4 | dhcp-6-opt-5 = val-5 
-
-NAME         AVAILABLE-CONNECTION-PATHS                               AVAILABLE-CONNECTIONS                          
-----------------------------------------------------------------------------------------------------------------------
-CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{2}  UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 
-
 <<<
 size: 1714
-location: clients/tests/test-client.py:1051:test_004()/409
+location: clients/tests/test-client.py:1065:test_004()/409
 cmd: $NMCLI --mode tabular --pretty dev show wlan0
 lang: C
 returncode: 0
@@ -23146,7 +23482,7 @@ IP6    --       --       dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 250
 
 <<<
 size: 1754
-location: clients/tests/test-client.py:1051:test_004()/410
+location: clients/tests/test-client.py:1065:test_004()/410
 cmd: $NMCLI --mode tabular --pretty dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
@@ -23192,19 +23528,19 @@ GROUP  ADDRESS  GATEWAY  ROUTE
 IP6    --       --       dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086  --   sear6.foo2.bar | sear6.foo1.bar | sear6.fo.x.y | sear6.fo.o.bar | sear6.foo3.bar | sear6.foo4.bar 
 
 <<<
-size: 4348
-location: clients/tests/test-client.py:1054:test_004()/411
+size: 4456
+location: clients/tests/test-client.py:1068:test_004()/411
 cmd: $NMCLI --mode tabular --pretty -f all dev show wlan0
 lang: C
 returncode: 0
-stdout: 4181 bytes
+stdout: 4289 bytes
 >>>
 ==========================
   Device details (wlan0)
 ==========================
-NAME     DEVICE  TYPE  NM-TYPE       VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON               UDI                         IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED 
---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-GENERAL  wlan0   wifi  NMDeviceWifi  --      --       virtual  --              --                13:E0:74:85:7C:D9  0    20 (unavailable)  0 (No reason given)  /sys/devices/virtual/wlan0  --        no           yes         yes          no                no                 --            con-vpn-1   UUID-con-vpn-1-REPLACED-REPLACED-REP  /org/freedesktop/NetworkManager/ActiveConnection/2  unknown 
+NAME     DEVICE  TYPE  NM-TYPE       VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON               IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                         IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED 
+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+GENERAL  wlan0   wifi  NMDeviceWifi  --      --       virtual  --              --                13:E0:74:85:7C:D9  0    20 (unavailable)  0 (No reason given)  0 (unknown)       0 (unknown)       /sys/devices/virtual/wlan0  --        no           yes         yes          no                no                 --            con-vpn-1   UUID-con-vpn-1-REPLACED-REPLACED-REP  /org/freedesktop/NetworkManager/ActiveConnection/2  unknown 
 
 NAME          CARRIER-DETECT  SPEED    IS-SOFTWARE  SRIOV 
 -----------------------------------------------------------
@@ -23217,8 +23553,8 @@ WIFI-PROPERTIES  yes  yes  yes   yes   yes   yes  yes    unknown  unknown
 NAME   IN-USE  SSID        MODE   CHAN  RATE       SIGNAL  BARS  SECURITY  
 ----------------------------------------------------------------------------
 AP[1]          wlan0-ap-2  Infra  1     54 Mbit/s  92      ****  WPA1 WPA2 
-AP[2]          wlan0-ap-1  Infra  1     54 Mbit/s  81      ****  WPA1 WPA2 
-AP[3]          wlan0-ap-3  Infra  1     54 Mbit/s  55      **    WPA1 WPA2 
+AP[2]          wlan0-ap-1  Infra  1     54 Mbit/s  81      ****  WPA1      
+AP[3]          wlan0-ap-3  Infra  1     54 Mbit/s  55      **    WPA3      
 
 GROUP  ADDRESS                                 GATEWAY         ROUTE  DNS  DOMAIN                                                                            WINS           
 -----------------------------------------------------------------------------------------------------------------------------------------------------------------------------
@@ -23241,19 +23577,19 @@ NAME         AVAILABLE-CONNECTION-PATHS                               AVAILABLE-
 CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{2}  UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 
 
 <<<
-size: 4456
-location: clients/tests/test-client.py:1054:test_004()/412
+size: 4564
+location: clients/tests/test-client.py:1068:test_004()/412
 cmd: $NMCLI --mode tabular --pretty -f all dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 4279 bytes
+stdout: 4387 bytes
 >>>
 ===================================
   Informacje o urządzeniu (wlan0)
 ===================================
-NAME     DEVICE  TYPE  NM-TYPE       VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON                    UDI                         IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED  
---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-GENERAL  wlan0   wifi  NMDeviceWifi  --      --       virtual  --              --                13:E0:74:85:7C:D9  0    20 (niedostępne)  0 (Nie podano przyczyny)  /sys/devices/virtual/wlan0  --        nie          tak         tak          nie               nie                --            con-vpn-1   UUID-con-vpn-1-REPLACED-REPLACED-REP  /org/freedesktop/NetworkManager/ActiveConnection/2  nieznane 
+NAME     DEVICE  TYPE  NM-TYPE       VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON                    IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                         IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED  
+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+GENERAL  wlan0   wifi  NMDeviceWifi  --      --       virtual  --              --                13:E0:74:85:7C:D9  0    20 (niedostępne)  0 (Nie podano przyczyny)  0 (nieznane)      0 (nieznane)      /sys/devices/virtual/wlan0  --        nie          tak         tak          nie               nie                --            con-vpn-1   UUID-con-vpn-1-REPLACED-REPLACED-REP  /org/freedesktop/NetworkManager/ActiveConnection/2  nieznane 
 
 NAME          CARRIER-DETECT  SPEED     IS-SOFTWARE  SRIOV 
 ------------------------------------------------------------
@@ -23266,8 +23602,8 @@ WIFI-PROPERTIES  tak  tak  tak   tak   tak   tak  tak    nieznane  nieznane
 NAME   IN-USE  SSID        MODE            CHAN  RATE     SIGNAL  BARS  SECURITY  
 -----------------------------------------------------------------------------------
 AP[1]          wlan0-ap-2  Infrastruktura  1     54 Mb/s  92      ****  WPA1 WPA2 
-AP[2]          wlan0-ap-1  Infrastruktura  1     54 Mb/s  81      ****  WPA1 WPA2 
-AP[3]          wlan0-ap-3  Infrastruktura  1     54 Mb/s  55      **    WPA1 WPA2 
+AP[2]          wlan0-ap-1  Infrastruktura  1     54 Mb/s  81      ****  WPA1      
+AP[3]          wlan0-ap-3  Infrastruktura  1     54 Mb/s  55      **    WPA3      
 
 GROUP  ADDRESS                                 GATEWAY         ROUTE  DNS  DOMAIN                                                                            WINS           
 -----------------------------------------------------------------------------------------------------------------------------------------------------------------------------
@@ -23290,19 +23626,19 @@ NAME         AVAILABLE-CONNECTION-PATHS                               AVAILABLE-
 CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{2}  UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 
 
 <<<
-size: 1762
-location: clients/tests/test-client.py:1057:test_004()/413
+size: 1870
+location: clients/tests/test-client.py:1071:test_004()/413
 cmd: $NMCLI --mode tabular --pretty -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: C
 returncode: 0
-stdout: 1560 bytes
+stdout: 1668 bytes
 >>>
 ==========================
   Device details (wlan0)
 ==========================
-NAME     DEVICE  TYPE  NM-TYPE       VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON               UDI                         IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED 
---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-GENERAL  wlan0   wifi  NMDeviceWifi  --      --       virtual  --              --                13:E0:74:85:7C:D9  0    20 (unavailable)  0 (No reason given)  /sys/devices/virtual/wlan0  --        no           yes         yes          no                no                 --            con-vpn-1   UUID-con-vpn-1-REPLACED-REPLACED-REP  /org/freedesktop/NetworkManager/ActiveConnection/2  unknown 
+NAME     DEVICE  TYPE  NM-TYPE       VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON               IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                         IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED 
+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+GENERAL  wlan0   wifi  NMDeviceWifi  --      --       virtual  --              --                13:E0:74:85:7C:D9  0    20 (unavailable)  0 (No reason given)  0 (unknown)       0 (unknown)       /sys/devices/virtual/wlan0  --        no           yes         yes          no                no                 --            con-vpn-1   UUID-con-vpn-1-REPLACED-REPLACED-REP  /org/freedesktop/NetworkManager/ActiveConnection/2  unknown 
 
 HWADDR            
 -------------------
@@ -23313,19 +23649,19 @@ NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ     5GHZ
 WIFI-PROPERTIES  yes  yes  yes   yes   yes   yes  yes    unknown  unknown 
 
 <<<
-size: 1826
-location: clients/tests/test-client.py:1057:test_004()/414
+size: 1934
+location: clients/tests/test-client.py:1071:test_004()/414
 cmd: $NMCLI --mode tabular --pretty -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 1614 bytes
+stdout: 1722 bytes
 >>>
 ===================================
   Informacje o urządzeniu (wlan0)
 ===================================
-NAME     DEVICE  TYPE  NM-TYPE       VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON                    UDI                         IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED  
---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-GENERAL  wlan0   wifi  NMDeviceWifi  --      --       virtual  --              --                13:E0:74:85:7C:D9  0    20 (niedostępne)  0 (Nie podano przyczyny)  /sys/devices/virtual/wlan0  --        nie          tak         tak          nie               nie                --            con-vpn-1   UUID-con-vpn-1-REPLACED-REPLACED-REP  /org/freedesktop/NetworkManager/ActiveConnection/2  nieznane 
+NAME     DEVICE  TYPE  NM-TYPE       VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON                    IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                         IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED  
+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+GENERAL  wlan0   wifi  NMDeviceWifi  --      --       virtual  --              --                13:E0:74:85:7C:D9  0    20 (niedostępne)  0 (Nie podano przyczyny)  0 (nieznane)      0 (nieznane)      /sys/devices/virtual/wlan0  --        nie          tak         tak          nie               nie                --            con-vpn-1   UUID-con-vpn-1-REPLACED-REPLACED-REP  /org/freedesktop/NetworkManager/ActiveConnection/2  nieznane 
 
 HWADDR            
 -------------------
@@ -23336,19 +23672,19 @@ NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ      5GHZ
 WIFI-PROPERTIES  tak  tak  tak   tak   tak   tak  tak    nieznane  nieznane 
 
 <<<
-size: 1762
-location: clients/tests/test-client.py:1060:test_004()/415
+size: 1870
+location: clients/tests/test-client.py:1074:test_004()/415
 cmd: $NMCLI --mode tabular --pretty -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: C
 returncode: 0
-stdout: 1560 bytes
+stdout: 1668 bytes
 >>>
 ==========================
   Device details (wlan0)
 ==========================
-NAME     DEVICE  TYPE  NM-TYPE       VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON               UDI                         IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED 
---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-GENERAL  wlan0   wifi  NMDeviceWifi  --      --       virtual  --              --                13:E0:74:85:7C:D9  0    20 (unavailable)  0 (No reason given)  /sys/devices/virtual/wlan0  --        no           yes         yes          no                no                 --            con-vpn-1   UUID-con-vpn-1-REPLACED-REPLACED-REP  /org/freedesktop/NetworkManager/ActiveConnection/2  unknown 
+NAME     DEVICE  TYPE  NM-TYPE       VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON               IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                         IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED 
+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+GENERAL  wlan0   wifi  NMDeviceWifi  --      --       virtual  --              --                13:E0:74:85:7C:D9  0    20 (unavailable)  0 (No reason given)  0 (unknown)       0 (unknown)       /sys/devices/virtual/wlan0  --        no           yes         yes          no                no                 --            con-vpn-1   UUID-con-vpn-1-REPLACED-REPLACED-REP  /org/freedesktop/NetworkManager/ActiveConnection/2  unknown 
 
 HWADDR            
 -------------------
@@ -23359,19 +23695,19 @@ NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ     5GHZ
 WIFI-PROPERTIES  yes  yes  yes   yes   yes   yes  yes    unknown  unknown 
 
 <<<
-size: 1826
-location: clients/tests/test-client.py:1060:test_004()/416
+size: 1934
+location: clients/tests/test-client.py:1074:test_004()/416
 cmd: $NMCLI --mode tabular --pretty -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 1614 bytes
+stdout: 1722 bytes
 >>>
 ===================================
   Informacje o urządzeniu (wlan0)
 ===================================
-NAME     DEVICE  TYPE  NM-TYPE       VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON                    UDI                         IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED  
---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-GENERAL  wlan0   wifi  NMDeviceWifi  --      --       virtual  --              --                13:E0:74:85:7C:D9  0    20 (niedostępne)  0 (Nie podano przyczyny)  /sys/devices/virtual/wlan0  --        nie          tak         tak          nie               nie                --            con-vpn-1   UUID-con-vpn-1-REPLACED-REPLACED-REP  /org/freedesktop/NetworkManager/ActiveConnection/2  nieznane 
+NAME     DEVICE  TYPE  NM-TYPE       VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON                    IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                         IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED  
+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+GENERAL  wlan0   wifi  NMDeviceWifi  --      --       virtual  --              --                13:E0:74:85:7C:D9  0    20 (niedostępne)  0 (Nie podano przyczyny)  0 (nieznane)      0 (nieznane)      /sys/devices/virtual/wlan0  --        nie          tak         tak          nie               nie                --            con-vpn-1   UUID-con-vpn-1-REPLACED-REPLACED-REP  /org/freedesktop/NetworkManager/ActiveConnection/2  nieznane 
 
 HWADDR            
 -------------------
@@ -23383,7 +23719,7 @@ WIFI-PROPERTIES  tak  tak  tak   tak   tak   tak  tak    nieznane  nieznane
 
 <<<
 size: 686
-location: clients/tests/test-client.py:1063:test_004()/417
+location: clients/tests/test-client.py:1077:test_004()/417
 cmd: $NMCLI --mode tabular --pretty -f DEVICE,TYPE,DBUS-PATH dev
 lang: C
 returncode: 0
@@ -23394,15 +23730,15 @@ stdout: 513 bytes
 =====================
 DEVICE  TYPE      DBUS-PATH                                 
 ----------------------------------------------------------------------------------
+wlan0   wifi      /org/freedesktop/NetworkManager/Devices/3 
 eth0    ethernet  /org/freedesktop/NetworkManager/Devices/1 
 eth1    ethernet  /org/freedesktop/NetworkManager/Devices/2 
 wlan1   wifi      /org/freedesktop/NetworkManager/Devices/4 
 wlan1   wifi      /org/freedesktop/NetworkManager/Devices/5 
-wlan0   wifi      /org/freedesktop/NetworkManager/Devices/3 
 
 <<<
 size: 689
-location: clients/tests/test-client.py:1063:test_004()/418
+location: clients/tests/test-client.py:1077:test_004()/418
 cmd: $NMCLI --mode tabular --pretty -f DEVICE,TYPE,DBUS-PATH dev
 lang: pl_PL.UTF-8
 returncode: 0
@@ -23413,20 +23749,29 @@ stdout: 506 bytes
 ===================
 DEVICE  TYPE      DBUS-PATH                                 
 --------------------------------------------------------------------------------
+wlan0   wifi      /org/freedesktop/NetworkManager/Devices/3 
 eth0    ethernet  /org/freedesktop/NetworkManager/Devices/1 
 eth1    ethernet  /org/freedesktop/NetworkManager/Devices/2 
 wlan1   wifi      /org/freedesktop/NetworkManager/Devices/4 
 wlan1   wifi      /org/freedesktop/NetworkManager/Devices/5 
-wlan0   wifi      /org/freedesktop/NetworkManager/Devices/3 
 
 <<<
 size: 3041
-location: clients/tests/test-client.py:1066:test_004()/419
+location: clients/tests/test-client.py:1080:test_004()/419
 cmd: $NMCLI --mode tabular --pretty -f ALL device wifi list
 lang: C
 returncode: 0
 stdout: 2872 bytes
 >>>
+===========================
+  Wi-Fi scan list (wlan0)
+===========================
+NAME   SSID        SSID-HEX              BSSID              MODE   CHAN  FREQ      RATE       SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infra  1     2412 MHz  54 Mbit/s  92      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/2 
+AP[2]  wlan0-ap-1  776C616E302D61702D31  61:95:77:AC:1E:4C  Infra  1     2412 MHz  54 Mbit/s  81      ****  WPA1       pair_tkip pair_ccmp group_tkip group_ccmp psk  (none)                                         wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/1 
+AP[3]  wlan0-ap-3  776C616E302D61702D33  9B:F6:B7:EC:97:76  Infra  1     2412 MHz  54 Mbit/s  55      **    WPA3       (none)                                         pair_tkip pair_ccmp group_tkip group_ccmp sae  wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/3 
+
 ===========================
   Wi-Fi scan list (wlan1)
 ===========================
@@ -23440,23 +23785,23 @@ AP[1]  wlan1-ap-4  776C616E312D61702D34  94:2B:E8:F6:D2:86  Infra  1     2412 MH
 NAME  SSID  SSID-HEX  BSSID  MODE  CHAN  FREQ  RATE  SIGNAL  BARS  SECURITY  WPA-FLAGS  RSN-FLAGS  DEVICE  ACTIVE  IN-USE  DBUS-PATH 
 -----------------------------------------------------------------------------------------------------------------------------------------------------------------
 
-===========================
-  Wi-Fi scan list (wlan0)
-===========================
-NAME   SSID        SSID-HEX              BSSID              MODE   CHAN  FREQ      RATE       SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infra  1     2412 MHz  54 Mbit/s  92      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/2 
-AP[2]  wlan0-ap-1  776C616E302D61702D31  61:95:77:AC:1E:4C  Infra  1     2412 MHz  54 Mbit/s  81      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/1 
-AP[3]  wlan0-ap-3  776C616E302D61702D33  9B:F6:B7:EC:97:76  Infra  1     2412 MHz  54 Mbit/s  55      **    WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/3 
-
 <<<
 size: 3279
-location: clients/tests/test-client.py:1066:test_004()/420
+location: clients/tests/test-client.py:1080:test_004()/420
 cmd: $NMCLI --mode tabular --pretty -f ALL device wifi list
 lang: pl_PL.UTF-8
 returncode: 0
 stdout: 3100 bytes
 >>>
+========================================
+  Lista skanowania sieci Wi-Fi (wlan0)
+========================================
+NAME   SSID        SSID-HEX              BSSID              MODE            CHAN  FREQ      RATE     SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infrastruktura  1     2412 MHz  54 Mb/s  92      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/2 
+AP[2]  wlan0-ap-1  776C616E302D61702D31  61:95:77:AC:1E:4C  Infrastruktura  1     2412 MHz  54 Mb/s  81      ****  WPA1       pair_tkip pair_ccmp group_tkip group_ccmp psk  (brak)                                         wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/1 
+AP[3]  wlan0-ap-3  776C616E302D61702D33  9B:F6:B7:EC:97:76  Infrastruktura  1     2412 MHz  54 Mb/s  55      **    WPA3       (brak)                                         pair_tkip pair_ccmp group_tkip group_ccmp sae  wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/3 
+
 ========================================
   Lista skanowania sieci Wi-Fi (wlan1)
 ========================================
@@ -23470,23 +23815,23 @@ AP[1]  wlan1-ap-4  776C616E312D61702D34  94:2B:E8:F6:D2:86  Infrastruktura  1
 NAME  SSID  SSID-HEX  BSSID  MODE  CHAN  FREQ  RATE  SIGNAL  BARS  SECURITY  WPA-FLAGS  RSN-FLAGS  DEVICE  ACTIVE  IN-USE  DBUS-PATH 
 ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 
-========================================
-  Lista skanowania sieci Wi-Fi (wlan0)
-========================================
-NAME   SSID        SSID-HEX              BSSID              MODE            CHAN  FREQ      RATE     SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infrastruktura  1     2412 MHz  54 Mb/s  92      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/2 
-AP[2]  wlan0-ap-1  776C616E302D61702D31  61:95:77:AC:1E:4C  Infrastruktura  1     2412 MHz  54 Mb/s  81      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/1 
-AP[3]  wlan0-ap-3  776C616E302D61702D33  9B:F6:B7:EC:97:76  Infrastruktura  1     2412 MHz  54 Mb/s  55      **    WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/3 
-
 <<<
 size: 1167
-location: clients/tests/test-client.py:1068:test_004()/421
+location: clients/tests/test-client.py:1082:test_004()/421
 cmd: $NMCLI --mode tabular --pretty -f COMMON device wifi list
 lang: C
 returncode: 0
 stdout: 996 bytes
 >>>
+===========================
+  Wi-Fi scan list (wlan0)
+===========================
+IN-USE  SSID        MODE   CHAN  RATE       SIGNAL  BARS  SECURITY  
+------------------------------------------------------------------------------------------------
+        wlan0-ap-2  Infra  1     54 Mbit/s  92      ****  WPA1 WPA2 
+        wlan0-ap-1  Infra  1     54 Mbit/s  81      ****  WPA1      
+        wlan0-ap-3  Infra  1     54 Mbit/s  55      **    WPA3      
+
 ===========================
   Wi-Fi scan list (wlan1)
 ===========================
@@ -23500,23 +23845,23 @@ IN-USE  SSID        MODE   CHAN  RATE       SIGNAL  BARS  SECURITY
 IN-USE  SSID  MODE  CHAN  RATE  SIGNAL  BARS  SECURITY 
 -----------------------------------------------------------------------------------
 
-===========================
-  Wi-Fi scan list (wlan0)
-===========================
-IN-USE  SSID        MODE   CHAN  RATE       SIGNAL  BARS  SECURITY  
-------------------------------------------------------------------------------------------------
-        wlan0-ap-2  Infra  1     54 Mbit/s  92      ****  WPA1 WPA2 
-        wlan0-ap-1  Infra  1     54 Mbit/s  81      ****  WPA1 WPA2 
-        wlan0-ap-3  Infra  1     54 Mbit/s  55      **    WPA1 WPA2 
-
 <<<
 size: 1398
-location: clients/tests/test-client.py:1068:test_004()/422
+location: clients/tests/test-client.py:1082:test_004()/422
 cmd: $NMCLI --mode tabular --pretty -f COMMON device wifi list
 lang: pl_PL.UTF-8
 returncode: 0
 stdout: 1216 bytes
 >>>
+========================================
+  Lista skanowania sieci Wi-Fi (wlan0)
+========================================
+IN-USE  SSID        MODE            CHAN  RATE     SIGNAL  BARS  SECURITY  
+--------------------------------------------------------------------------------------------------------------------
+        wlan0-ap-2  Infrastruktura  1     54 Mb/s  92      ****  WPA1 WPA2 
+        wlan0-ap-1  Infrastruktura  1     54 Mb/s  81      ****  WPA1      
+        wlan0-ap-3  Infrastruktura  1     54 Mb/s  55      **    WPA3      
+
 ========================================
   Lista skanowania sieci Wi-Fi (wlan1)
 ========================================
@@ -23530,23 +23875,23 @@ IN-USE  SSID        MODE            CHAN  RATE     SIGNAL  BARS  SECURITY
 IN-USE  SSID  MODE  CHAN  RATE  SIGNAL  BARS  SECURITY 
 ------------------------------------------------------------------------------------------------
 
-========================================
-  Lista skanowania sieci Wi-Fi (wlan0)
-========================================
-IN-USE  SSID        MODE            CHAN  RATE     SIGNAL  BARS  SECURITY  
---------------------------------------------------------------------------------------------------------------------
-        wlan0-ap-2  Infrastruktura  1     54 Mb/s  92      ****  WPA1 WPA2 
-        wlan0-ap-1  Infrastruktura  1     54 Mb/s  81      ****  WPA1 WPA2 
-        wlan0-ap-3  Infrastruktura  1     54 Mb/s  55      **    WPA1 WPA2 
-
 <<<
 size: 3154
-location: clients/tests/test-client.py:1071:test_004()/423
+location: clients/tests/test-client.py:1085:test_004()/423
 cmd: $NMCLI --mode tabular --pretty -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list
 lang: C
 returncode: 0
 stdout: 2872 bytes
 >>>
+===========================
+  Wi-Fi scan list (wlan0)
+===========================
+NAME   SSID        SSID-HEX              BSSID              MODE   CHAN  FREQ      RATE       SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infra  1     2412 MHz  54 Mbit/s  92      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/2 
+AP[2]  wlan0-ap-1  776C616E302D61702D31  61:95:77:AC:1E:4C  Infra  1     2412 MHz  54 Mbit/s  81      ****  WPA1       pair_tkip pair_ccmp group_tkip group_ccmp psk  (none)                                         wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/1 
+AP[3]  wlan0-ap-3  776C616E302D61702D33  9B:F6:B7:EC:97:76  Infra  1     2412 MHz  54 Mbit/s  55      **    WPA3       (none)                                         pair_tkip pair_ccmp group_tkip group_ccmp sae  wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/3 
+
 ===========================
   Wi-Fi scan list (wlan1)
 ===========================
@@ -23560,23 +23905,23 @@ AP[1]  wlan1-ap-4  776C616E312D61702D34  94:2B:E8:F6:D2:86  Infra  1     2412 MH
 NAME  SSID  SSID-HEX  BSSID  MODE  CHAN  FREQ  RATE  SIGNAL  BARS  SECURITY  WPA-FLAGS  RSN-FLAGS  DEVICE  ACTIVE  IN-USE  DBUS-PATH 
 -----------------------------------------------------------------------------------------------------------------------------------------------------------------
 
-===========================
-  Wi-Fi scan list (wlan0)
-===========================
-NAME   SSID        SSID-HEX              BSSID              MODE   CHAN  FREQ      RATE       SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infra  1     2412 MHz  54 Mbit/s  92      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/2 
-AP[2]  wlan0-ap-1  776C616E302D61702D31  61:95:77:AC:1E:4C  Infra  1     2412 MHz  54 Mbit/s  81      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/1 
-AP[3]  wlan0-ap-3  776C616E302D61702D33  9B:F6:B7:EC:97:76  Infra  1     2412 MHz  54 Mbit/s  55      **    WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/3 
-
 <<<
 size: 3392
-location: clients/tests/test-client.py:1071:test_004()/424
+location: clients/tests/test-client.py:1085:test_004()/424
 cmd: $NMCLI --mode tabular --pretty -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list
 lang: pl_PL.UTF-8
 returncode: 0
 stdout: 3100 bytes
 >>>
+========================================
+  Lista skanowania sieci Wi-Fi (wlan0)
+========================================
+NAME   SSID        SSID-HEX              BSSID              MODE            CHAN  FREQ      RATE     SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infrastruktura  1     2412 MHz  54 Mb/s  92      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/2 
+AP[2]  wlan0-ap-1  776C616E302D61702D31  61:95:77:AC:1E:4C  Infrastruktura  1     2412 MHz  54 Mb/s  81      ****  WPA1       pair_tkip pair_ccmp group_tkip group_ccmp psk  (brak)                                         wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/1 
+AP[3]  wlan0-ap-3  776C616E302D61702D33  9B:F6:B7:EC:97:76  Infrastruktura  1     2412 MHz  54 Mb/s  55      **    WPA3       (brak)                                         pair_tkip pair_ccmp group_tkip group_ccmp sae  wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/3 
+
 ========================================
   Lista skanowania sieci Wi-Fi (wlan1)
 ========================================
@@ -23590,22 +23935,13 @@ AP[1]  wlan1-ap-4  776C616E312D61702D34  94:2B:E8:F6:D2:86  Infrastruktura  1
 NAME  SSID  SSID-HEX  BSSID  MODE  CHAN  FREQ  RATE  SIGNAL  BARS  SECURITY  WPA-FLAGS  RSN-FLAGS  DEVICE  ACTIVE  IN-USE  DBUS-PATH 
 ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 
-========================================
-  Lista skanowania sieci Wi-Fi (wlan0)
-========================================
-NAME   SSID        SSID-HEX              BSSID              MODE            CHAN  FREQ      RATE     SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infrastruktura  1     2412 MHz  54 Mb/s  92      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/2 
-AP[2]  wlan0-ap-1  776C616E302D61702D31  61:95:77:AC:1E:4C  Infrastruktura  1     2412 MHz  54 Mb/s  81      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/1 
-AP[3]  wlan0-ap-3  776C616E302D61702D33  9B:F6:B7:EC:97:76  Infrastruktura  1     2412 MHz  54 Mb/s  55      **    WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/3 
-
 <<<
-size: 1154
-location: clients/tests/test-client.py:1073:test_004()/425
+size: 1156
+location: clients/tests/test-client.py:1087:test_004()/425
 cmd: $NMCLI --mode tabular --pretty -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: C
 returncode: 0
-stdout: 962 bytes
+stdout: 964 bytes
 >>>
 ===========================
   Wi-Fi scan list (wlan0)
@@ -23614,13 +23950,15 @@ NAME   SSID        SSID-HEX              BSSID              MODE   CHAN  FREQ
 -----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infra  1     2412 MHz  54 Mbit/s  92      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/2 
 
+
+
 <<<
-size: 1242
-location: clients/tests/test-client.py:1073:test_004()/426
+size: 1244
+location: clients/tests/test-client.py:1087:test_004()/426
 cmd: $NMCLI --mode tabular --pretty -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 1039 bytes
+stdout: 1041 bytes
 >>>
 ========================================
   Lista skanowania sieci Wi-Fi (wlan0)
@@ -23629,13 +23967,15 @@ NAME   SSID        SSID-HEX              BSSID              MODE            CHAN
 -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infrastruktura  1     2412 MHz  54 Mb/s  92      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/2 
 
+
+
 <<<
-size: 512
-location: clients/tests/test-client.py:1075:test_004()/427
+size: 514
+location: clients/tests/test-client.py:1089:test_004()/427
 cmd: $NMCLI --mode tabular --pretty -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: C
 returncode: 0
-stdout: 317 bytes
+stdout: 319 bytes
 >>>
 ===========================
   Wi-Fi scan list (wlan0)
@@ -23644,13 +23984,15 @@ IN-USE  SSID        MODE   CHAN  RATE       SIGNAL  BARS  SECURITY
 ------------------------------------------------------------------------------------------------
         wlan0-ap-2  Infra  1     54 Mbit/s  92      ****  WPA1 WPA2 
 
+
+
 <<<
-size: 597
-location: clients/tests/test-client.py:1075:test_004()/428
+size: 599
+location: clients/tests/test-client.py:1089:test_004()/428
 cmd: $NMCLI --mode tabular --pretty -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 392 bytes
+stdout: 394 bytes
 >>>
 ========================================
   Lista skanowania sieci Wi-Fi (wlan0)
@@ -23659,13 +24001,15 @@ IN-USE  SSID        MODE            CHAN  RATE     SIGNAL  BARS  SECURITY
 --------------------------------------------------------------------------------------------------------------------
         wlan0-ap-2  Infrastruktura  1     54 Mb/s  92      ****  WPA1 WPA2 
 
+
+
 <<<
-size: 1267
-location: clients/tests/test-client.py:1078:test_004()/429
+size: 1269
+location: clients/tests/test-client.py:1092:test_004()/429
 cmd: $NMCLI --mode tabular --pretty -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: C
 returncode: 0
-stdout: 962 bytes
+stdout: 964 bytes
 >>>
 ===========================
   Wi-Fi scan list (wlan0)
@@ -23674,13 +24018,15 @@ NAME   SSID        SSID-HEX              BSSID              MODE   CHAN  FREQ
 -----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infra  1     2412 MHz  54 Mbit/s  92      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/2 
 
+
+
 <<<
-size: 1355
-location: clients/tests/test-client.py:1078:test_004()/430
+size: 1357
+location: clients/tests/test-client.py:1092:test_004()/430
 cmd: $NMCLI --mode tabular --pretty -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 1039 bytes
+stdout: 1041 bytes
 >>>
 ========================================
   Lista skanowania sieci Wi-Fi (wlan0)
@@ -23689,20 +24035,22 @@ NAME   SSID        SSID-HEX              BSSID              MODE            CHAN
 -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infrastruktura  1     2412 MHz  54 Mb/s  92      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/2 
 
+
+
 <<<
-size: 4351
-location: clients/tests/test-client.py:1080:test_004()/431
+size: 4459
+location: clients/tests/test-client.py:1094:test_004()/431
 cmd: $NMCLI --mode tabular --pretty -f ALL device show wlan0
 lang: C
 returncode: 0
-stdout: 4181 bytes
+stdout: 4289 bytes
 >>>
 ==========================
   Device details (wlan0)
 ==========================
-NAME     DEVICE  TYPE  NM-TYPE       VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON               UDI                         IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED 
---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-GENERAL  wlan0   wifi  NMDeviceWifi  --      --       virtual  --              --                13:E0:74:85:7C:D9  0    20 (unavailable)  0 (No reason given)  /sys/devices/virtual/wlan0  --        no           yes         yes          no                no                 --            con-vpn-1   UUID-con-vpn-1-REPLACED-REPLACED-REP  /org/freedesktop/NetworkManager/ActiveConnection/2  unknown 
+NAME     DEVICE  TYPE  NM-TYPE       VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON               IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                         IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED 
+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+GENERAL  wlan0   wifi  NMDeviceWifi  --      --       virtual  --              --                13:E0:74:85:7C:D9  0    20 (unavailable)  0 (No reason given)  0 (unknown)       0 (unknown)       /sys/devices/virtual/wlan0  --        no           yes         yes          no                no                 --            con-vpn-1   UUID-con-vpn-1-REPLACED-REPLACED-REP  /org/freedesktop/NetworkManager/ActiveConnection/2  unknown 
 
 NAME          CARRIER-DETECT  SPEED    IS-SOFTWARE  SRIOV 
 -----------------------------------------------------------
@@ -23715,8 +24063,8 @@ WIFI-PROPERTIES  yes  yes  yes   yes   yes   yes  yes    unknown  unknown
 NAME   IN-USE  SSID        MODE   CHAN  RATE       SIGNAL  BARS  SECURITY  
 ----------------------------------------------------------------------------
 AP[1]          wlan0-ap-2  Infra  1     54 Mbit/s  92      ****  WPA1 WPA2 
-AP[2]          wlan0-ap-1  Infra  1     54 Mbit/s  81      ****  WPA1 WPA2 
-AP[3]          wlan0-ap-3  Infra  1     54 Mbit/s  55      **    WPA1 WPA2 
+AP[2]          wlan0-ap-1  Infra  1     54 Mbit/s  81      ****  WPA1      
+AP[3]          wlan0-ap-3  Infra  1     54 Mbit/s  55      **    WPA3      
 
 GROUP  ADDRESS                                 GATEWAY         ROUTE  DNS  DOMAIN                                                                            WINS           
 -----------------------------------------------------------------------------------------------------------------------------------------------------------------------------
@@ -23739,19 +24087,19 @@ NAME         AVAILABLE-CONNECTION-PATHS                               AVAILABLE-
 CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{2}  UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 
 
 <<<
-size: 4459
-location: clients/tests/test-client.py:1080:test_004()/432
+size: 4567
+location: clients/tests/test-client.py:1094:test_004()/432
 cmd: $NMCLI --mode tabular --pretty -f ALL device show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 4279 bytes
+stdout: 4387 bytes
 >>>
 ===================================
   Informacje o urządzeniu (wlan0)
 ===================================
-NAME     DEVICE  TYPE  NM-TYPE       VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON                    UDI                         IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED  
---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-GENERAL  wlan0   wifi  NMDeviceWifi  --      --       virtual  --              --                13:E0:74:85:7C:D9  0    20 (niedostępne)  0 (Nie podano przyczyny)  /sys/devices/virtual/wlan0  --        nie          tak         tak          nie               nie                --            con-vpn-1   UUID-con-vpn-1-REPLACED-REPLACED-REP  /org/freedesktop/NetworkManager/ActiveConnection/2  nieznane 
+NAME     DEVICE  TYPE  NM-TYPE       VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON                    IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                         IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED  
+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+GENERAL  wlan0   wifi  NMDeviceWifi  --      --       virtual  --              --                13:E0:74:85:7C:D9  0    20 (niedostępne)  0 (Nie podano przyczyny)  0 (nieznane)      0 (nieznane)      /sys/devices/virtual/wlan0  --        nie          tak         tak          nie               nie                --            con-vpn-1   UUID-con-vpn-1-REPLACED-REPLACED-REP  /org/freedesktop/NetworkManager/ActiveConnection/2  nieznane 
 
 NAME          CARRIER-DETECT  SPEED     IS-SOFTWARE  SRIOV 
 ------------------------------------------------------------
@@ -23764,8 +24112,8 @@ WIFI-PROPERTIES  tak  tak  tak   tak   tak   tak  tak    nieznane  nieznane
 NAME   IN-USE  SSID        MODE            CHAN  RATE     SIGNAL  BARS  SECURITY  
 -----------------------------------------------------------------------------------
 AP[1]          wlan0-ap-2  Infrastruktura  1     54 Mb/s  92      ****  WPA1 WPA2 
-AP[2]          wlan0-ap-1  Infrastruktura  1     54 Mb/s  81      ****  WPA1 WPA2 
-AP[3]          wlan0-ap-3  Infrastruktura  1     54 Mb/s  55      **    WPA1 WPA2 
+AP[2]          wlan0-ap-1  Infrastruktura  1     54 Mb/s  81      ****  WPA1      
+AP[3]          wlan0-ap-3  Infrastruktura  1     54 Mb/s  55      **    WPA3      
 
 GROUP  ADDRESS                                 GATEWAY         ROUTE  DNS  DOMAIN                                                                            WINS           
 -----------------------------------------------------------------------------------------------------------------------------------------------------------------------------
@@ -23789,7 +24137,7 @@ CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{2}  UUID-con-x
 
 <<<
 size: 1727
-location: clients/tests/test-client.py:1082:test_004()/433
+location: clients/tests/test-client.py:1096:test_004()/433
 cmd: $NMCLI --mode tabular --pretty -f COMMON device show wlan0
 lang: C
 returncode: 0
@@ -23836,7 +24184,7 @@ IP6    --       --       dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 250
 
 <<<
 size: 1767
-location: clients/tests/test-client.py:1082:test_004()/434
+location: clients/tests/test-client.py:1096:test_004()/434
 cmd: $NMCLI --mode tabular --pretty -f COMMON device show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
@@ -23882,19 +24230,19 @@ GROUP  ADDRESS  GATEWAY  ROUTE
 IP6    --       --       dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086  --   sear6.foo2.bar | sear6.foo1.bar | sear6.fo.x.y | sear6.fo.o.bar | sear6.foo3.bar | sear6.foo4.bar 
 
 <<<
-size: 4489
-location: clients/tests/test-client.py:1084:test_004()/435
+size: 4597
+location: clients/tests/test-client.py:1098:test_004()/435
 cmd: $NMCLI --mode tabular --pretty -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0
 lang: C
 returncode: 0
-stdout: 4181 bytes
+stdout: 4289 bytes
 >>>
 ==========================
   Device details (wlan0)
 ==========================
-NAME     DEVICE  TYPE  NM-TYPE       VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON               UDI                         IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED 
---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-GENERAL  wlan0   wifi  NMDeviceWifi  --      --       virtual  --              --                13:E0:74:85:7C:D9  0    20 (unavailable)  0 (No reason given)  /sys/devices/virtual/wlan0  --        no           yes         yes          no                no                 --            con-vpn-1   UUID-con-vpn-1-REPLACED-REPLACED-REP  /org/freedesktop/NetworkManager/ActiveConnection/2  unknown 
+NAME     DEVICE  TYPE  NM-TYPE       VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON               IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                         IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED 
+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+GENERAL  wlan0   wifi  NMDeviceWifi  --      --       virtual  --              --                13:E0:74:85:7C:D9  0    20 (unavailable)  0 (No reason given)  0 (unknown)       0 (unknown)       /sys/devices/virtual/wlan0  --        no           yes         yes          no                no                 --            con-vpn-1   UUID-con-vpn-1-REPLACED-REPLACED-REP  /org/freedesktop/NetworkManager/ActiveConnection/2  unknown 
 
 NAME          CARRIER-DETECT  SPEED    IS-SOFTWARE  SRIOV 
 -----------------------------------------------------------
@@ -23907,8 +24255,8 @@ WIFI-PROPERTIES  yes  yes  yes   yes   yes   yes  yes    unknown  unknown
 NAME   IN-USE  SSID        MODE   CHAN  RATE       SIGNAL  BARS  SECURITY  
 ----------------------------------------------------------------------------
 AP[1]          wlan0-ap-2  Infra  1     54 Mbit/s  92      ****  WPA1 WPA2 
-AP[2]          wlan0-ap-1  Infra  1     54 Mbit/s  81      ****  WPA1 WPA2 
-AP[3]          wlan0-ap-3  Infra  1     54 Mbit/s  55      **    WPA1 WPA2 
+AP[2]          wlan0-ap-1  Infra  1     54 Mbit/s  81      ****  WPA1      
+AP[3]          wlan0-ap-3  Infra  1     54 Mbit/s  55      **    WPA3      
 
 GROUP  ADDRESS                                 GATEWAY         ROUTE  DNS  DOMAIN                                                                            WINS           
 -----------------------------------------------------------------------------------------------------------------------------------------------------------------------------
@@ -23931,19 +24279,19 @@ NAME         AVAILABLE-CONNECTION-PATHS                               AVAILABLE-
 CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{2}  UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 
 
 <<<
-size: 4597
-location: clients/tests/test-client.py:1084:test_004()/436
+size: 4705
+location: clients/tests/test-client.py:1098:test_004()/436
 cmd: $NMCLI --mode tabular --pretty -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 4279 bytes
+stdout: 4387 bytes
 >>>
 ===================================
   Informacje o urządzeniu (wlan0)
 ===================================
-NAME     DEVICE  TYPE  NM-TYPE       VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON                    UDI                         IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED  
---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-GENERAL  wlan0   wifi  NMDeviceWifi  --      --       virtual  --              --                13:E0:74:85:7C:D9  0    20 (niedostępne)  0 (Nie podano przyczyny)  /sys/devices/virtual/wlan0  --        nie          tak         tak          nie               nie                --            con-vpn-1   UUID-con-vpn-1-REPLACED-REPLACED-REP  /org/freedesktop/NetworkManager/ActiveConnection/2  nieznane 
+NAME     DEVICE  TYPE  NM-TYPE       VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON                    IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                         IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED  
+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+GENERAL  wlan0   wifi  NMDeviceWifi  --      --       virtual  --              --                13:E0:74:85:7C:D9  0    20 (niedostępne)  0 (Nie podano przyczyny)  0 (nieznane)      0 (nieznane)      /sys/devices/virtual/wlan0  --        nie          tak         tak          nie               nie                --            con-vpn-1   UUID-con-vpn-1-REPLACED-REPLACED-REP  /org/freedesktop/NetworkManager/ActiveConnection/2  nieznane 
 
 NAME          CARRIER-DETECT  SPEED     IS-SOFTWARE  SRIOV 
 ------------------------------------------------------------
@@ -23956,8 +24304,8 @@ WIFI-PROPERTIES  tak  tak  tak   tak   tak   tak  tak    nieznane  nieznane
 NAME   IN-USE  SSID        MODE            CHAN  RATE     SIGNAL  BARS  SECURITY  
 -----------------------------------------------------------------------------------
 AP[1]          wlan0-ap-2  Infrastruktura  1     54 Mb/s  92      ****  WPA1 WPA2 
-AP[2]          wlan0-ap-1  Infrastruktura  1     54 Mb/s  81      ****  WPA1 WPA2 
-AP[3]          wlan0-ap-3  Infrastruktura  1     54 Mb/s  55      **    WPA1 WPA2 
+AP[2]          wlan0-ap-1  Infrastruktura  1     54 Mb/s  81      ****  WPA1      
+AP[3]          wlan0-ap-3  Infrastruktura  1     54 Mb/s  55      **    WPA3      
 
 GROUP  ADDRESS                                 GATEWAY         ROUTE  DNS  DOMAIN                                                                            WINS           
 -----------------------------------------------------------------------------------------------------------------------------------------------------------------------------
@@ -23981,7 +24329,7 @@ CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{2}  UUID-con-x
 
 <<<
 size: 4754
-location: clients/tests/test-client.py:1022:test_004()/437
+location: clients/tests/test-client.py:1036:test_004()/437
 cmd: $NMCLI --mode tabular --pretty --color yes con s con-vpn-1
 lang: C
 returncode: 0
@@ -24022,12 +24370,12 @@ NAME  TYPE     USERNAME  GATEWAY  BANNER                            VPN-STATE
 VPN   openvpn  --        --       *** VPN connection con-vpn-1 ***  5 - VPN connected  key1 = val1 | key2 = val2 | key3 = val3 
 
 <<<
-size: 4808
-location: clients/tests/test-client.py:1022:test_004()/438
+size: 4810
+location: clients/tests/test-client.py:1036:test_004()/438
 cmd: $NMCLI --mode tabular --pretty --color yes con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 4625 bytes
+stdout: 4627 bytes
 >>>
 ============================================
   Szczegóły profilu połączenia (con-vpn-1)
@@ -24061,11 +24409,11 @@ GENERAL  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  wlan0    aktywowano  n
 
 NAME  TYPE     USERNAME  GATEWAY  BANNER                            VPN-STATE            CFG                                     
 ----------------------------------------------------------------------------------------------------------------------------------
-VPN   openvpn  --        --       *** VPN connection con-vpn-1 ***  5 - Połączono z VPN  key1 = val1 | key2 = val2 | key3 = val3 
+VPN   openvpn  --        --       *** VPN connection con-vpn-1 ***  5 — Połączono z VPN  key1 = val1 | key2 = val2 | key3 = val3 
 
 <<<
 size: 4754
-location: clients/tests/test-client.py:1024:test_004()/439
+location: clients/tests/test-client.py:1038:test_004()/439
 cmd: $NMCLI --mode tabular --pretty --color yes con s con-vpn-1
 lang: C
 returncode: 0
@@ -24106,12 +24454,12 @@ NAME  TYPE     USERNAME  GATEWAY  BANNER                            VPN-STATE
 VPN   openvpn  --        --       *** VPN connection con-vpn-1 ***  5 - VPN connected  key1 = val1 | key2 = val2 | key3 = val3 
 
 <<<
-size: 4808
-location: clients/tests/test-client.py:1024:test_004()/440
+size: 4810
+location: clients/tests/test-client.py:1038:test_004()/440
 cmd: $NMCLI --mode tabular --pretty --color yes con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 4625 bytes
+stdout: 4627 bytes
 >>>
 ============================================
   Szczegóły profilu połączenia (con-vpn-1)
@@ -24145,11 +24493,11 @@ GENERAL  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  wlan0    aktywowano  n
 
 NAME  TYPE     USERNAME  GATEWAY  BANNER                            VPN-STATE            CFG                                     
 ----------------------------------------------------------------------------------------------------------------------------------
-VPN   openvpn  --        --       *** VPN connection con-vpn-1 ***  5 - Połączono z VPN  key1 = val1 | key2 = val2 | key3 = val3 
+VPN   openvpn  --        --       *** VPN connection con-vpn-1 ***  5 — Połączono z VPN  key1 = val1 | key2 = val2 | key3 = val3 
 
 <<<
 size: 3440
-location: clients/tests/test-client.py:1027:test_004()/441
+location: clients/tests/test-client.py:1041:test_004()/441
 cmd: $NMCLI --mode tabular --pretty --color yes -f ALL con s con-vpn-1
 lang: C
 returncode: 0
@@ -24181,7 +24529,7 @@ proxy  none    no            --       --
 
 <<<
 size: 3463
-location: clients/tests/test-client.py:1027:test_004()/442
+location: clients/tests/test-client.py:1041:test_004()/442
 cmd: $NMCLI --mode tabular --pretty --color yes -f ALL con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
@@ -24213,7 +24561,7 @@ proxy  none    nie           --       --
 
 <<<
 size: 688
-location: clients/tests/test-client.py:1033:test_004()/443
+location: clients/tests/test-client.py:1047:test_004()/443
 cmd: $NMCLI --mode tabular --pretty --color yes -f VPN con s con-vpn-1
 lang: C
 returncode: 0
@@ -24228,7 +24576,7 @@ vpn   org.freedesktop.NetworkManager.openvpn  --         key1 = val1, key2 = val
 
 <<<
 size: 708
-location: clients/tests/test-client.py:1033:test_004()/444
+location: clients/tests/test-client.py:1047:test_004()/444
 cmd: $NMCLI --mode tabular --pretty --color yes -f VPN con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
@@ -24243,7 +24591,7 @@ vpn   org.freedesktop.NetworkManager.openvpn  --         key1 = val1, key2 = val
 
 <<<
 size: 1118
-location: clients/tests/test-client.py:1036:test_004()/445
+location: clients/tests/test-client.py:1050:test_004()/445
 cmd: $NMCLI --mode tabular --pretty --color yes -f GENERAL con s con-vpn-1
 lang: C
 returncode: 0
@@ -24258,7 +24606,7 @@ GENERAL  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  wlan0    activated  no
 
 <<<
 size: 1150
-location: clients/tests/test-client.py:1036:test_004()/446
+location: clients/tests/test-client.py:1050:test_004()/446
 cmd: $NMCLI --mode tabular --pretty --color yes -f GENERAL con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
@@ -24273,7 +24621,7 @@ GENERAL  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  wlan0    aktywowano  n
 
 <<<
 size: 709
-location: clients/tests/test-client.py:1039:test_004()/447
+location: clients/tests/test-client.py:1053:test_004()/447
 cmd: $NMCLI --mode tabular --pretty --color yes dev s
 lang: C
 returncode: 0
@@ -24284,15 +24632,15 @@ stdout: 547 bytes
 =====================
 DEVICE  TYPE      STATE        CONNECTION 
 ----------------------------------------------------------------
+wlan0   wifi      unavailable  con-vpn-1  
 eth0    ethernet  unavailable  --         
 eth1    ethernet  unavailable  --         
 wlan1   wifi      unavailable  --         
 wlan1   wifi      unavailable  --         
-wlan0   wifi      unavailable  con-vpn-1  
 
 <<<
 size: 717
-location: clients/tests/test-client.py:1039:test_004()/448
+location: clients/tests/test-client.py:1053:test_004()/448
 cmd: $NMCLI --mode tabular --pretty --color yes dev s
 lang: pl_PL.UTF-8
 returncode: 0
@@ -24303,58 +24651,97 @@ stdout: 545 bytes
 ===================
 DEVICE  TYPE      STATE        CONNECTION 
 --------------------------------------------------------------
+wlan0   wifi      niedostępne  con-vpn-1  
 eth0    ethernet  niedostępne  --         
 eth1    ethernet  niedostępne  --         
 wlan1   wifi      niedostępne  --         
 wlan1   wifi      niedostępne  --         
-wlan0   wifi      niedostępne  con-vpn-1  
 
 <<<
-size: 1773
-location: clients/tests/test-client.py:1042:test_004()/449
+size: 2105
+location: clients/tests/test-client.py:1056:test_004()/449
 cmd: $NMCLI --mode tabular --pretty --color yes -f all dev status
 lang: C
 returncode: 0
-stdout: 1598 bytes
+stdout: 1930 bytes
 >>>
 =====================
   Status of devices
 =====================
-DEVICE  TYPE      STATE        DBUS-PATH                                  CONNECTION  CON-UUID                              CON-PATH                                           
------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-eth0    ethernet  unavailable  /org/freedesktop/NetworkManager/Devices/1  --          --                                    --                                                 
-eth1    ethernet  unavailable  /org/freedesktop/NetworkManager/Devices/2  --          --                                    --                                                 
-wlan1   wifi      unavailable  /org/freedesktop/NetworkManager/Devices/4  --          --                                    --                                                 
-wlan1   wifi      unavailable  /org/freedesktop/NetworkManager/Devices/5  --          --                                    --                                                 
-wlan0   wifi      unavailable  /org/freedesktop/NetworkManager/Devices/3  con-vpn-1   UUID-con-vpn-1-REPLACED-REPLACED-REP  /org/freedesktop/NetworkManager/ActiveConnection/2 
+DEVICE  TYPE      STATE        IP4-CONNECTIVITY  IP6-CONNECTIVITY  DBUS-PATH                                  CONNECTION  CON-UUID                              CON-PATH                                           
+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+wlan0   wifi      unavailable  unknown           unknown           /org/freedesktop/NetworkManager/Devices/3  con-vpn-1   UUID-con-vpn-1-REPLACED-REPLACED-REP  /org/freedesktop/NetworkManager/ActiveConnection/2 
+eth0    ethernet  unavailable  unknown           unknown           /org/freedesktop/NetworkManager/Devices/1  --          --                                    --                                                 
+eth1    ethernet  unavailable  unknown           unknown           /org/freedesktop/NetworkManager/Devices/2  --          --                                    --                                                 
+wlan1   wifi      unavailable  unknown           unknown           /org/freedesktop/NetworkManager/Devices/4  --          --                                    --                                                 
+wlan1   wifi      unavailable  unknown           unknown           /org/freedesktop/NetworkManager/Devices/5  --          --                                    --                                                 
 
 <<<
-size: 1781
-location: clients/tests/test-client.py:1042:test_004()/450
+size: 2113
+location: clients/tests/test-client.py:1056:test_004()/450
 cmd: $NMCLI --mode tabular --pretty --color yes -f all dev status
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 1596 bytes
+stdout: 1928 bytes
 >>>
 ===================
   Stan urządzenia
 ===================
-DEVICE  TYPE      STATE        DBUS-PATH                                  CONNECTION  CON-UUID                              CON-PATH                                           
----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-eth0    ethernet  niedostępne  /org/freedesktop/NetworkManager/Devices/1  --          --                                    --                                                 
-eth1    ethernet  niedostępne  /org/freedesktop/NetworkManager/Devices/2  --          --                                    --                                                 
-wlan1   wifi      niedostępne  /org/freedesktop/NetworkManager/Devices/4  --          --                                    --                                                 
-wlan1   wifi      niedostępne  /org/freedesktop/NetworkManager/Devices/5  --          --                                    --                                                 
-wlan0   wifi      niedostępne  /org/freedesktop/NetworkManager/Devices/3  con-vpn-1   UUID-con-vpn-1-REPLACED-REPLACED-REP  /org/freedesktop/NetworkManager/ActiveConnection/2 
+DEVICE  TYPE      STATE        IP4-CONNECTIVITY  IP6-CONNECTIVITY  DBUS-PATH                                  CONNECTION  CON-UUID                              CON-PATH                                           
+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+wlan0   wifi      niedostępne  nieznane          nieznane          /org/freedesktop/NetworkManager/Devices/3  con-vpn-1   UUID-con-vpn-1-REPLACED-REPLACED-REP  /org/freedesktop/NetworkManager/ActiveConnection/2 
+eth0    ethernet  niedostępne  nieznane          nieznane          /org/freedesktop/NetworkManager/Devices/1  --          --                                    --                                                 
+eth1    ethernet  niedostępne  nieznane          nieznane          /org/freedesktop/NetworkManager/Devices/2  --          --                                    --                                                 
+wlan1   wifi      niedostępne  nieznane          nieznane          /org/freedesktop/NetworkManager/Devices/4  --          --                                    --                                                 
+wlan1   wifi      niedostępne  nieznane          nieznane          /org/freedesktop/NetworkManager/Devices/5  --          --                                    --                                                 
 
 <<<
 size: 9903
-location: clients/tests/test-client.py:1045:test_004()/451
+location: clients/tests/test-client.py:1059:test_004()/451
 cmd: $NMCLI --mode tabular --pretty --color yes dev show
 lang: C
 returncode: 0
 stdout: 9737 bytes
 >>>
+==========================
+  Device details (wlan0)
+==========================
+DEVICE 
+--------
+wlan0  
+
+TYPE 
+------
+wifi 
+
+HWADDR            
+-------------------
+13:E0:74:85:7C:D9 
+
+MTU 
+-----
+0   
+
+STATE            
+------------------
+20 (unavailable) 
+
+CONNECTION 
+------------
+con-vpn-1  
+
+CON-PATH                                           
+----------------------------------------------------
+/org/freedesktop/NetworkManager/ActiveConnection/2 
+
+GROUP  ADDRESS                                 GATEWAY         ROUTE  DNS  DOMAIN                                                                            WINS           
+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+IP4    192.168.228.18/32 | 192.168.209.179/25  192.168.41.120  --     --   sear4.foo2.bar | sear4.fo.x.y | sear4.foo1.bar | sear4.foo4.bar | sear4.fo.o.bar  192.168.120.79 
+
+GROUP  ADDRESS  GATEWAY  ROUTE                                                           DNS  DOMAIN                                                                                            
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+IP6    --       --       dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086  --   sear6.foo2.bar | sear6.foo1.bar | sear6.fo.x.y | sear6.fo.o.bar | sear6.foo3.bar | sear6.foo4.bar 
+
 =========================
   Device details (eth0)
 =========================
@@ -24519,9 +24906,17 @@ GROUP  ADDRESS                        GATEWAY  ROUTE
 -----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 IP6    2001:a::88ca:3654:96b:ab44/89  --       dst = 2001:a::cc8b:7c09:4673:bbb0/85, nh = ::, mt = 2821465568 | dst = 2001:a::a976:2488:f49f:b48/106, nh = 2001:a::62ae:c734:fc7b:e931, mt = 2248613879 | dst = 2001:a::afb7:4449:3787:8bb4/123, nh = ::  2001:a::2934:bd66:550d:ec19  sear6.fo.x.y 
 
-==========================
-  Device details (wlan0)
-==========================
+<<<
+size: 10079
+location: clients/tests/test-client.py:1059:test_004()/452
+cmd: $NMCLI --mode tabular --pretty --color yes dev show
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 9903 bytes
+>>>
+===================================
+  Informacje o urządzeniu (wlan0)
+===================================
 DEVICE 
 --------
 wlan0  
@@ -24540,7 +24935,7 @@ MTU
 
 STATE            
 ------------------
-20 (unavailable) 
+20 (niedostępne) 
 
 CONNECTION 
 ------------
@@ -24558,14 +24953,6 @@ GROUP  ADDRESS  GATEWAY  ROUTE
 -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 IP6    --       --       dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086  --   sear6.foo2.bar | sear6.foo1.bar | sear6.fo.x.y | sear6.fo.o.bar | sear6.foo3.bar | sear6.foo4.bar 
 
-<<<
-size: 10079
-location: clients/tests/test-client.py:1045:test_004()/452
-cmd: $NMCLI --mode tabular --pretty --color yes dev show
-lang: pl_PL.UTF-8
-returncode: 0
-stdout: 9903 bytes
->>>
 ==================================
   Informacje o urządzeniu (eth0)
 ==================================
@@ -24730,59 +25117,61 @@ GROUP  ADDRESS                        GATEWAY  ROUTE
 -----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 IP6    2001:a::88ca:3654:96b:ab44/89  --       dst = 2001:a::cc8b:7c09:4673:bbb0/85, nh = ::, mt = 2821465568 | dst = 2001:a::a976:2488:f49f:b48/106, nh = 2001:a::62ae:c734:fc7b:e931, mt = 2248613879 | dst = 2001:a::afb7:4449:3787:8bb4/123, nh = ::  2001:a::2934:bd66:550d:ec19  sear6.fo.x.y 
 
-===================================
-  Informacje o urządzeniu (wlan0)
-===================================
-DEVICE 
---------
-wlan0  
-
-TYPE 
-------
-wifi 
-
-HWADDR            
--------------------
-13:E0:74:85:7C:D9 
-
-MTU 
------
-0   
+<<<
+size: 22926
+location: clients/tests/test-client.py:1062:test_004()/453
+cmd: $NMCLI --mode tabular --pretty --color yes -f all dev show
+lang: C
+returncode: 0
+stdout: 22752 bytes
+>>>
+==========================
+  Device details (wlan0)
+==========================
+NAME     DEVICE  TYPE  NM-TYPE       VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON               IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                         IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED 
+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+GENERAL  wlan0   wifi  NMDeviceWifi  --      --       virtual  --              --                13:E0:74:85:7C:D9  0    20 (unavailable)  0 (No reason given)  0 (unknown)       0 (unknown)       /sys/devices/virtual/wlan0  --        no           yes         yes          no                no                 --            con-vpn-1   UUID-con-vpn-1-REPLACED-REPLACED-REP  /org/freedesktop/NetworkManager/ActiveConnection/2  unknown 
 
-STATE            
-------------------
-20 (niedostępne) 
+NAME          CARRIER-DETECT  SPEED    IS-SOFTWARE  SRIOV 
+-----------------------------------------------------------
+CAPABILITIES  no              unknown  no           no    
 
-CONNECTION 
-------------
-con-vpn-1  
+NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ     5GHZ    
+---------------------------------------------------------------------------
+WIFI-PROPERTIES  yes  yes  yes   yes   yes   yes  yes    unknown  unknown 
 
-CON-PATH                                           
-----------------------------------------------------
-/org/freedesktop/NetworkManager/ActiveConnection/2 
+NAME   IN-USE  SSID        MODE   CHAN  RATE       SIGNAL  BARS  SECURITY  
+----------------------------------------------------------------------------
+AP[1]          wlan0-ap-2  Infra  1     54 Mbit/s  92      ****  WPA1 WPA2 
+AP[2]          wlan0-ap-1  Infra  1     54 Mbit/s  81      ****  WPA1      
+AP[3]          wlan0-ap-3  Infra  1     54 Mbit/s  55      **    WPA3      
 
 GROUP  ADDRESS                                 GATEWAY         ROUTE  DNS  DOMAIN                                                                            WINS           
 -----------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 IP4    192.168.228.18/32 | 192.168.209.179/25  192.168.41.120  --     --   sear4.foo2.bar | sear4.fo.x.y | sear4.foo1.bar | sear4.foo4.bar | sear4.fo.o.bar  192.168.120.79 
 
+GROUP  OPTION                                                                                    
+--------------------------------------------------------------------------------------------------
+DHCP4  dhcp-4-opt-0 = val-0 | dhcp-4-opt-2 = val-2 | dhcp-4-opt-4 = val-4 | dhcp-4-opt-7 = val-7 
+
 GROUP  ADDRESS  GATEWAY  ROUTE                                                           DNS  DOMAIN                                                                                            
 -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 IP6    --       --       dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086  --   sear6.foo2.bar | sear6.foo1.bar | sear6.fo.x.y | sear6.fo.o.bar | sear6.foo3.bar | sear6.foo4.bar 
 
-<<<
-size: 22386
-location: clients/tests/test-client.py:1048:test_004()/453
-cmd: $NMCLI --mode tabular --pretty --color yes -f all dev show
-lang: C
-returncode: 0
-stdout: 22212 bytes
->>>
+GROUP  OPTION                                                                                                           
+-------------------------------------------------------------------------------------------------------------------------
+DHCP6  dhcp-6-opt-1 = val-1 | dhcp-6-opt-2 = val-2 | dhcp-6-opt-3 = val-3 | dhcp-6-opt-4 = val-4 | dhcp-6-opt-5 = val-5 
+
+NAME         AVAILABLE-CONNECTION-PATHS                               AVAILABLE-CONNECTIONS                          
+----------------------------------------------------------------------------------------------------------------------
+CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{2}  UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 
+
 =========================
   Device details (eth0)
 =========================
-NAME     DEVICE  TYPE      NM-TYPE           VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON               UDI                        IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID  CON-PATH  METERED 
------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-GENERAL  eth0    ethernet  NMDeviceEthernet  --      --       virtual  --              --                AB:B7:BF:E2:48:E8  0    20 (unavailable)  0 (No reason given)  /sys/devices/virtual/eth0  --        no           yes         yes          no                no                 --            --          --        --        unknown 
+NAME     DEVICE  TYPE      NM-TYPE           VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON               IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                        IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID  CON-PATH  METERED 
+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+GENERAL  eth0    ethernet  NMDeviceEthernet  --      --       virtual  --              --                AB:B7:BF:E2:48:E8  0    20 (unavailable)  0 (No reason given)  0 (unknown)       0 (unknown)       /sys/devices/virtual/eth0  --        no           yes         yes          no                no                 --            --          --        --        unknown 
 
 NAME          CARRIER-DETECT  SPEED     IS-SOFTWARE  SRIOV 
 ------------------------------------------------------------
@@ -24815,9 +25204,9 @@ CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{1}  5fcfd6d7-1
 =========================
   Device details (eth1)
 =========================
-NAME     DEVICE  TYPE      NM-TYPE           VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON               UDI                        IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID  CON-PATH  METERED 
------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-GENERAL  eth1    ethernet  NMDeviceEthernet  --      --       virtual  --              --                E7:78:B1:93:2B:22  0    20 (unavailable)  0 (No reason given)  /sys/devices/virtual/eth1  --        no           yes         yes          no                no                 --            --          --        --        unknown 
+NAME     DEVICE  TYPE      NM-TYPE           VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON               IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                        IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID  CON-PATH  METERED 
+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+GENERAL  eth1    ethernet  NMDeviceEthernet  --      --       virtual  --              --                E7:78:B1:93:2B:22  0    20 (unavailable)  0 (No reason given)  0 (unknown)       0 (unknown)       /sys/devices/virtual/eth1  --        no           yes         yes          no                no                 --            --          --        --        unknown 
 
 NAME          CARRIER-DETECT  SPEED     IS-SOFTWARE  SRIOV 
 ------------------------------------------------------------
@@ -24850,9 +25239,9 @@ CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{1}  5fcfd6d7-1
 ==========================
   Device details (wlan1)
 ==========================
-NAME     DEVICE  TYPE  NM-TYPE       VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON               UDI                         IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID  CON-PATH  METERED 
-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-GENERAL  wlan1   wifi  NMDeviceWifi  --      --       virtual  --              --                21:E9:64:81:8C:A8  0    20 (unavailable)  0 (No reason given)  /sys/devices/virtual/wlan1  --        no           yes         yes          no                no                 --            --          --        --        unknown 
+NAME     DEVICE  TYPE  NM-TYPE       VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON               IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                         IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID  CON-PATH  METERED 
+----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+GENERAL  wlan1   wifi  NMDeviceWifi  --      --       virtual  --              --                21:E9:64:81:8C:A8  0    20 (unavailable)  0 (No reason given)  0 (unknown)       0 (unknown)       /sys/devices/virtual/wlan1  --        no           yes         yes          no                no                 --            --          --        --        unknown 
 
 NAME          CARRIER-DETECT  SPEED    IS-SOFTWARE  SRIOV 
 -----------------------------------------------------------
@@ -24889,9 +25278,9 @@ CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{2}  UUID-con-x
 ==========================
   Device details (wlan1)
 ==========================
-NAME     DEVICE  TYPE  NM-TYPE       VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON               UDI                         IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID  CON-PATH  METERED 
-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-GENERAL  wlan1   wifi  NMDeviceWifi  --      --       virtual  --              --                71:52:AD:63:5C:7C  0    20 (unavailable)  0 (No reason given)  /sys/devices/virtual/wlan1  --        no           yes         yes          no                no                 --            --          --        --        unknown 
+NAME     DEVICE  TYPE  NM-TYPE       VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON               IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                         IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID  CON-PATH  METERED 
+----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+GENERAL  wlan1   wifi  NMDeviceWifi  --      --       virtual  --              --                71:52:AD:63:5C:7C  0    20 (unavailable)  0 (No reason given)  0 (unknown)       0 (unknown)       /sys/devices/virtual/wlan1  --        no           yes         yes          no                no                 --            --          --        --        unknown 
 
 NAME          CARRIER-DETECT  SPEED    IS-SOFTWARE  SRIOV 
 -----------------------------------------------------------
@@ -24924,208 +25313,20 @@ NAME         AVAILABLE-CONNECTION-PATHS                               AVAILABLE-
 ----------------------------------------------------------------------------------------------------------------------
 CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{2}  UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 
 
-==========================
-  Device details (wlan0)
-==========================
-NAME     DEVICE  TYPE  NM-TYPE       VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON               UDI                         IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED 
---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-GENERAL  wlan0   wifi  NMDeviceWifi  --      --       virtual  --              --                13:E0:74:85:7C:D9  0    20 (unavailable)  0 (No reason given)  /sys/devices/virtual/wlan0  --        no           yes         yes          no                no                 --            con-vpn-1   UUID-con-vpn-1-REPLACED-REPLACED-REP  /org/freedesktop/NetworkManager/ActiveConnection/2  unknown 
-
-NAME          CARRIER-DETECT  SPEED    IS-SOFTWARE  SRIOV 
------------------------------------------------------------
-CAPABILITIES  no              unknown  no           no    
-
-NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ     5GHZ    
----------------------------------------------------------------------------
-WIFI-PROPERTIES  yes  yes  yes   yes   yes   yes  yes    unknown  unknown 
-
-NAME   IN-USE  SSID        MODE   CHAN  RATE       SIGNAL  BARS  SECURITY  
-----------------------------------------------------------------------------
-AP[1]          wlan0-ap-2  Infra  1     54 Mbit/s  92      ****  WPA1 WPA2 
-AP[2]          wlan0-ap-1  Infra  1     54 Mbit/s  81      ****  WPA1 WPA2 
-AP[3]          wlan0-ap-3  Infra  1     54 Mbit/s  55      **    WPA1 WPA2 
-
-GROUP  ADDRESS                                 GATEWAY         ROUTE  DNS  DOMAIN                                                                            WINS           
------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-IP4    192.168.228.18/32 | 192.168.209.179/25  192.168.41.120  --     --   sear4.foo2.bar | sear4.fo.x.y | sear4.foo1.bar | sear4.foo4.bar | sear4.fo.o.bar  192.168.120.79 
-
-GROUP  OPTION                                                                                    
---------------------------------------------------------------------------------------------------
-DHCP4  dhcp-4-opt-0 = val-0 | dhcp-4-opt-2 = val-2 | dhcp-4-opt-4 = val-4 | dhcp-4-opt-7 = val-7 
-
-GROUP  ADDRESS  GATEWAY  ROUTE                                                           DNS  DOMAIN                                                                                            
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-IP6    --       --       dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086  --   sear6.foo2.bar | sear6.foo1.bar | sear6.fo.x.y | sear6.fo.o.bar | sear6.foo3.bar | sear6.foo4.bar 
-
-GROUP  OPTION                                                                                                           
--------------------------------------------------------------------------------------------------------------------------
-DHCP6  dhcp-6-opt-1 = val-1 | dhcp-6-opt-2 = val-2 | dhcp-6-opt-3 = val-3 | dhcp-6-opt-4 = val-4 | dhcp-6-opt-5 = val-5 
-
-NAME         AVAILABLE-CONNECTION-PATHS                               AVAILABLE-CONNECTIONS                          
-----------------------------------------------------------------------------------------------------------------------
-CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{2}  UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 
-
 <<<
-size: 22747
-location: clients/tests/test-client.py:1048:test_004()/454
+size: 23287
+location: clients/tests/test-client.py:1062:test_004()/454
 cmd: $NMCLI --mode tabular --pretty --color yes -f all dev show
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 22563 bytes
+stdout: 23103 bytes
 >>>
-==================================
-  Informacje o urządzeniu (eth0)
-==================================
-NAME     DEVICE  TYPE      NM-TYPE           VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON                    UDI                        IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID  CON-PATH  METERED  
------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-GENERAL  eth0    ethernet  NMDeviceEthernet  --      --       virtual  --              --                AB:B7:BF:E2:48:E8  0    20 (niedostępne)  0 (Nie podano przyczyny)  /sys/devices/virtual/eth0  --        nie          tak         tak          nie               nie                --            --          --        --        nieznane 
-
-NAME          CARRIER-DETECT  SPEED     IS-SOFTWARE  SRIOV 
-------------------------------------------------------------
-CAPABILITIES  nie             100 Mb/s  nie          nie   
-
-NAME              CARRIER    S390-SUBCHANNELS 
------------------------------------------------
-WIRED-PROPERTIES  wyłączone  --               
-
-GROUP  ADDRESS                               GATEWAY  ROUTE  DNS                                               DOMAIN                           WINS                             
-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-IP4    192.168.49.34/22 | 192.168.135.86/19  --       --     192.168.45.230 | 192.168.180.201 | 192.168.253.2  sear4.foo2.bar | sear4.foo1.bar  192.168.163.23 | 192.168.151.246 
-
-GROUP  OPTION                                      
-----------------------------------------------------
-DHCP4  dhcp-4-opt-8 = val-8 | dhcp-4-opt-9 = val-9 
-
-GROUP  ADDRESS                        GATEWAY  ROUTE  DNS                                                                                    DOMAIN                          
-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-IP6    2001:a::ed81:3d7:c2e9:df82/99  --       --     2001:a::2703:f06:9619:d89f | 2001:a::3a75:3682:c683:8541 | 2001:a::584e:912:d5ee:c74f  sear6.foo4.bar | sear6.fo.o.bar 
-
-GROUP  OPTION                                                                                                                                                                                                                              
---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-DHCP6  dhcp-6-opt-0 = val-0 | dhcp-6-opt-1 = val-1 | dhcp-6-opt-2 = val-2 | dhcp-6-opt-3 = val-3 | dhcp-6-opt-4 = val-4 | dhcp-6-opt-5 = val-5 | dhcp-6-opt-6 = val-6 | dhcp-6-opt-7 = val-7 | dhcp-6-opt-8 = val-8 | dhcp-6-opt-9 = val-9 
-
-NAME         AVAILABLE-CONNECTION-PATHS                               AVAILABLE-CONNECTIONS                        
---------------------------------------------------------------------------------------------------------------------
-CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{1}  5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 
-
-==================================
-  Informacje o urządzeniu (eth1)
-==================================
-NAME     DEVICE  TYPE      NM-TYPE           VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON                    UDI                        IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID  CON-PATH  METERED  
------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-GENERAL  eth1    ethernet  NMDeviceEthernet  --      --       virtual  --              --                E7:78:B1:93:2B:22  0    20 (niedostępne)  0 (Nie podano przyczyny)  /sys/devices/virtual/eth1  --        nie          tak         tak          nie               nie                --            --          --        --        nieznane 
-
-NAME          CARRIER-DETECT  SPEED     IS-SOFTWARE  SRIOV 
-------------------------------------------------------------
-CAPABILITIES  nie             100 Mb/s  nie          nie   
-
-NAME              CARRIER    S390-SUBCHANNELS 
------------------------------------------------
-WIRED-PROPERTIES  wyłączone  --               
-
-GROUP  ADDRESS             GATEWAY       ROUTE                                                                                                                                                                                         DNS                                               DOMAIN                                            WINS                                             
----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-IP4    192.168.127.210/25  192.168.88.4  dst = 192.168.222.35/19, nh = 192.168.170.142, mt = 3609264321 | dst = 192.168.135.81/32, nh = 192.168.32.11, mt = 1316413247 | dst = 192.168.24.65/26, nh = 192.168.23.163, mt = 3855574583  192.168.16.144 | 192.168.79.53 | 192.168.237.155  sear4.foo4.bar | sear4.foo3.bar | sear4.foo1.bar  192.168.211.91 | 192.168.58.182 | 192.168.114.97 
-
-GROUP  OPTION                                                                                                                                                                                                       
----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-DHCP4  dhcp-4-opt-0 = val-0 | dhcp-4-opt-1 = val-1 | dhcp-4-opt-2 = val-2 | dhcp-4-opt-3 = val-3 | dhcp-4-opt-4 = val-4 | dhcp-4-opt-5 = val-5 | dhcp-4-opt-7 = val-7 | dhcp-4-opt-8 = val-8 | dhcp-4-opt-9 = val-9 
-
-GROUP  ADDRESS                                                          GATEWAY  ROUTE                                           DNS                                                                                     DOMAIN         
------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-IP6    2001:a::1c1:c178:169f:2b80/93 | 2001:a::1f79:e0fb:87b9:3cc6/123  --       dst = 2001:a::3166:7ed1:e4ae:7612/123, nh = ::  2001:a::edda:955:dcf4:23d4 | 2001:a::109f:aa0f:fb4a:9d5a | 2001:a::61cf:7c82:e9c0:c952  sear6.foo1.bar 
-
-GROUP  OPTION                                                                                                           
--------------------------------------------------------------------------------------------------------------------------
-DHCP6  dhcp-6-opt-2 = val-2 | dhcp-6-opt-5 = val-5 | dhcp-6-opt-6 = val-6 | dhcp-6-opt-8 = val-8 | dhcp-6-opt-9 = val-9 
-
-NAME         AVAILABLE-CONNECTION-PATHS                               AVAILABLE-CONNECTIONS                        
---------------------------------------------------------------------------------------------------------------------
-CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{1}  5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 
-
-===================================
-  Informacje o urządzeniu (wlan1)
-===================================
-NAME     DEVICE  TYPE  NM-TYPE       VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON                    UDI                         IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID  CON-PATH  METERED  
-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-GENERAL  wlan1   wifi  NMDeviceWifi  --      --       virtual  --              --                21:E9:64:81:8C:A8  0    20 (niedostępne)  0 (Nie podano przyczyny)  /sys/devices/virtual/wlan1  --        nie          tak         tak          nie               nie                --            --          --        --        nieznane 
-
-NAME          CARRIER-DETECT  SPEED     IS-SOFTWARE  SRIOV 
-------------------------------------------------------------
-CAPABILITIES  nie             nieznane  nie          nie   
-
-NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ      5GHZ     
------------------------------------------------------------------------------
-WIFI-PROPERTIES  tak  tak  tak   tak   tak   tak  tak    nieznane  nieznane 
-
-NAME   IN-USE  SSID        MODE            CHAN  RATE     SIGNAL  BARS  SECURITY  
------------------------------------------------------------------------------------
-AP[1]          wlan1-ap-4  Infrastruktura  1     54 Mb/s  48      **    WPA1 WPA2 
-
-GROUP  ADDRESS  GATEWAY         ROUTE                                                                                                                                                  DNS            DOMAIN                                                                                             WINS 
----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-IP4    --       192.168.57.160  dst = 192.168.36.106/21, nh = 192.168.199.128, mt = 979274165 | dst = 192.168.238.130/19, nh = 0.0.0.0 | dst = 192.168.224.39/32, nh = 192.168.148.69  192.168.61.83  sear4.foo4.bar | sear4.fo.x.y | sear4.foo2.bar | sear4.foo1.bar | sear4.fo.o.bar | sear4.foo3.bar  --   
-
-GROUP  OPTION                                                                                                                                                                                
-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-DHCP4  dhcp-4-opt-0 = val-0 | dhcp-4-opt-1 = val-1 | dhcp-4-opt-2 = val-2 | dhcp-4-opt-4 = val-4 | dhcp-4-opt-6 = val-6 | dhcp-4-opt-7 = val-7 | dhcp-4-opt-8 = val-8 | dhcp-4-opt-9 = val-9 
-
-GROUP  ADDRESS                                                                                           GATEWAY                      ROUTE                                                                                                                                                    DNS                                                       DOMAIN                          
-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-IP6    2001:a::fa05:2ab4:9300:e8fe/116 | 2001:a::e9cf:bd3:caba:99b3/86 | 2001:a::2be6:44fa:2c95:5559/78  2001:a::4d70:d91a:770f:2319  dst = 2001:a::3cb2:719d:bb00:b22f/66, nh = 2001:a::81b1:58b9:7237:3511, mt = 2280277732 | dst = 2001:a::986f:983c:5eb:1c7d/99, nh = ::, mt = 1204008676  2001:a::85e7:3d7d:53e8:50ac | 2001:a::1c5:9cb5:e86d:25a5  sear6.foo4.bar | sear6.foo2.bar 
-
-GROUP  OPTION                                                                                                                                                                                                       
----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-DHCP6  dhcp-6-opt-0 = val-0 | dhcp-6-opt-1 = val-1 | dhcp-6-opt-2 = val-2 | dhcp-6-opt-3 = val-3 | dhcp-6-opt-4 = val-4 | dhcp-6-opt-5 = val-5 | dhcp-6-opt-6 = val-6 | dhcp-6-opt-7 = val-7 | dhcp-6-opt-9 = val-9 
-
-NAME         AVAILABLE-CONNECTION-PATHS                               AVAILABLE-CONNECTIONS                          
-----------------------------------------------------------------------------------------------------------------------
-CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{2}  UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 
-
-===================================
-  Informacje o urządzeniu (wlan1)
-===================================
-NAME     DEVICE  TYPE  NM-TYPE       VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON                    UDI                         IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID  CON-PATH  METERED  
-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-GENERAL  wlan1   wifi  NMDeviceWifi  --      --       virtual  --              --                71:52:AD:63:5C:7C  0    20 (niedostępne)  0 (Nie podano przyczyny)  /sys/devices/virtual/wlan1  --        nie          tak         tak          nie               nie                --            --          --        --        nieznane 
-
-NAME          CARRIER-DETECT  SPEED     IS-SOFTWARE  SRIOV 
-------------------------------------------------------------
-CAPABILITIES  nie             nieznane  nie          nie   
-
-NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ      5GHZ     
------------------------------------------------------------------------------
-WIFI-PROPERTIES  tak  tak  tak   tak   tak   tak  tak    nieznane  nieznane 
-
-NAME  IN-USE  SSID  MODE  CHAN  RATE  SIGNAL  BARS  SECURITY 
---------------------------------------------------------------
-
-GROUP  ADDRESS                                GATEWAY  ROUTE                                                           DNS              DOMAIN                                                                            WINS                          
----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-IP4    192.168.97.124/29 | 192.168.76.154/18  --       dst = 192.168.33.233/22, nh = 192.168.222.210, mt = 2810496551  192.168.107.109  sear4.fo.o.bar | sear4.fo.x.y | sear4.foo2.bar | sear4.foo3.bar | sear4.foo4.bar  192.168.60.60 | 192.168.63.92 
-
-GROUP  OPTION                                      
-----------------------------------------------------
-DHCP4  dhcp-4-opt-0 = val-0 | dhcp-4-opt-5 = val-5 
-
-GROUP  ADDRESS                        GATEWAY  ROUTE                                                                                                                                                                                                      DNS                          DOMAIN       
------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-IP6    2001:a::88ca:3654:96b:ab44/89  --       dst = 2001:a::cc8b:7c09:4673:bbb0/85, nh = ::, mt = 2821465568 | dst = 2001:a::a976:2488:f49f:b48/106, nh = 2001:a::62ae:c734:fc7b:e931, mt = 2248613879 | dst = 2001:a::afb7:4449:3787:8bb4/123, nh = ::  2001:a::2934:bd66:550d:ec19  sear6.fo.x.y 
-
-GROUP  OPTION                                                                                                           
--------------------------------------------------------------------------------------------------------------------------
-DHCP6  dhcp-6-opt-2 = val-2 | dhcp-6-opt-6 = val-6 | dhcp-6-opt-7 = val-7 | dhcp-6-opt-8 = val-8 | dhcp-6-opt-9 = val-9 
-
-NAME         AVAILABLE-CONNECTION-PATHS                               AVAILABLE-CONNECTIONS                          
-----------------------------------------------------------------------------------------------------------------------
-CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{2}  UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 
-
 ===================================
   Informacje o urządzeniu (wlan0)
 ===================================
-NAME     DEVICE  TYPE  NM-TYPE       VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON                    UDI                         IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED  
---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-GENERAL  wlan0   wifi  NMDeviceWifi  --      --       virtual  --              --                13:E0:74:85:7C:D9  0    20 (niedostępne)  0 (Nie podano przyczyny)  /sys/devices/virtual/wlan0  --        nie          tak         tak          nie               nie                --            con-vpn-1   UUID-con-vpn-1-REPLACED-REPLACED-REP  /org/freedesktop/NetworkManager/ActiveConnection/2  nieznane 
+NAME     DEVICE  TYPE  NM-TYPE       VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON                    IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                         IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED  
+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+GENERAL  wlan0   wifi  NMDeviceWifi  --      --       virtual  --              --                13:E0:74:85:7C:D9  0    20 (niedostępne)  0 (Nie podano przyczyny)  0 (nieznane)      0 (nieznane)      /sys/devices/virtual/wlan0  --        nie          tak         tak          nie               nie                --            con-vpn-1   UUID-con-vpn-1-REPLACED-REPLACED-REP  /org/freedesktop/NetworkManager/ActiveConnection/2  nieznane 
 
 NAME          CARRIER-DETECT  SPEED     IS-SOFTWARE  SRIOV 
 ------------------------------------------------------------
@@ -25138,8 +25339,8 @@ WIFI-PROPERTIES  tak  tak  tak   tak   tak   tak  tak    nieznane  nieznane
 NAME   IN-USE  SSID        MODE            CHAN  RATE     SIGNAL  BARS  SECURITY  
 -----------------------------------------------------------------------------------
 AP[1]          wlan0-ap-2  Infrastruktura  1     54 Mb/s  92      ****  WPA1 WPA2 
-AP[2]          wlan0-ap-1  Infrastruktura  1     54 Mb/s  81      ****  WPA1 WPA2 
-AP[3]          wlan0-ap-3  Infrastruktura  1     54 Mb/s  55      **    WPA1 WPA2 
+AP[2]          wlan0-ap-1  Infrastruktura  1     54 Mb/s  81      ****  WPA1      
+AP[3]          wlan0-ap-3  Infrastruktura  1     54 Mb/s  55      **    WPA3      
 
 GROUP  ADDRESS                                 GATEWAY         ROUTE  DNS  DOMAIN                                                                            WINS           
 -----------------------------------------------------------------------------------------------------------------------------------------------------------------------------
@@ -25161,9 +25362,156 @@ NAME         AVAILABLE-CONNECTION-PATHS                               AVAILABLE-
 ----------------------------------------------------------------------------------------------------------------------
 CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{2}  UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 
 
+==================================
+  Informacje o urządzeniu (eth0)
+==================================
+NAME     DEVICE  TYPE      NM-TYPE           VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON                    IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                        IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID  CON-PATH  METERED  
+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+GENERAL  eth0    ethernet  NMDeviceEthernet  --      --       virtual  --              --                AB:B7:BF:E2:48:E8  0    20 (niedostępne)  0 (Nie podano przyczyny)  0 (nieznane)      0 (nieznane)      /sys/devices/virtual/eth0  --        nie          tak         tak          nie               nie                --            --          --        --        nieznane 
+
+NAME          CARRIER-DETECT  SPEED     IS-SOFTWARE  SRIOV 
+------------------------------------------------------------
+CAPABILITIES  nie             100 Mb/s  nie          nie   
+
+NAME              CARRIER    S390-SUBCHANNELS 
+-----------------------------------------------
+WIRED-PROPERTIES  wyłączone  --               
+
+GROUP  ADDRESS                               GATEWAY  ROUTE  DNS                                               DOMAIN                           WINS                             
+----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+IP4    192.168.49.34/22 | 192.168.135.86/19  --       --     192.168.45.230 | 192.168.180.201 | 192.168.253.2  sear4.foo2.bar | sear4.foo1.bar  192.168.163.23 | 192.168.151.246 
+
+GROUP  OPTION                                      
+----------------------------------------------------
+DHCP4  dhcp-4-opt-8 = val-8 | dhcp-4-opt-9 = val-9 
+
+GROUP  ADDRESS                        GATEWAY  ROUTE  DNS                                                                                    DOMAIN                          
+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+IP6    2001:a::ed81:3d7:c2e9:df82/99  --       --     2001:a::2703:f06:9619:d89f | 2001:a::3a75:3682:c683:8541 | 2001:a::584e:912:d5ee:c74f  sear6.foo4.bar | sear6.fo.o.bar 
+
+GROUP  OPTION                                                                                                                                                                                                                              
+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+DHCP6  dhcp-6-opt-0 = val-0 | dhcp-6-opt-1 = val-1 | dhcp-6-opt-2 = val-2 | dhcp-6-opt-3 = val-3 | dhcp-6-opt-4 = val-4 | dhcp-6-opt-5 = val-5 | dhcp-6-opt-6 = val-6 | dhcp-6-opt-7 = val-7 | dhcp-6-opt-8 = val-8 | dhcp-6-opt-9 = val-9 
+
+NAME         AVAILABLE-CONNECTION-PATHS                               AVAILABLE-CONNECTIONS                        
+--------------------------------------------------------------------------------------------------------------------
+CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{1}  5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 
+
+==================================
+  Informacje o urządzeniu (eth1)
+==================================
+NAME     DEVICE  TYPE      NM-TYPE           VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON                    IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                        IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID  CON-PATH  METERED  
+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+GENERAL  eth1    ethernet  NMDeviceEthernet  --      --       virtual  --              --                E7:78:B1:93:2B:22  0    20 (niedostępne)  0 (Nie podano przyczyny)  0 (nieznane)      0 (nieznane)      /sys/devices/virtual/eth1  --        nie          tak         tak          nie               nie                --            --          --        --        nieznane 
+
+NAME          CARRIER-DETECT  SPEED     IS-SOFTWARE  SRIOV 
+------------------------------------------------------------
+CAPABILITIES  nie             100 Mb/s  nie          nie   
+
+NAME              CARRIER    S390-SUBCHANNELS 
+-----------------------------------------------
+WIRED-PROPERTIES  wyłączone  --               
+
+GROUP  ADDRESS             GATEWAY       ROUTE                                                                                                                                                                                         DNS                                               DOMAIN                                            WINS                                             
+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+IP4    192.168.127.210/25  192.168.88.4  dst = 192.168.222.35/19, nh = 192.168.170.142, mt = 3609264321 | dst = 192.168.135.81/32, nh = 192.168.32.11, mt = 1316413247 | dst = 192.168.24.65/26, nh = 192.168.23.163, mt = 3855574583  192.168.16.144 | 192.168.79.53 | 192.168.237.155  sear4.foo4.bar | sear4.foo3.bar | sear4.foo1.bar  192.168.211.91 | 192.168.58.182 | 192.168.114.97 
+
+GROUP  OPTION                                                                                                                                                                                                       
+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+DHCP4  dhcp-4-opt-0 = val-0 | dhcp-4-opt-1 = val-1 | dhcp-4-opt-2 = val-2 | dhcp-4-opt-3 = val-3 | dhcp-4-opt-4 = val-4 | dhcp-4-opt-5 = val-5 | dhcp-4-opt-7 = val-7 | dhcp-4-opt-8 = val-8 | dhcp-4-opt-9 = val-9 
+
+GROUP  ADDRESS                                                          GATEWAY  ROUTE                                           DNS                                                                                     DOMAIN         
+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+IP6    2001:a::1c1:c178:169f:2b80/93 | 2001:a::1f79:e0fb:87b9:3cc6/123  --       dst = 2001:a::3166:7ed1:e4ae:7612/123, nh = ::  2001:a::edda:955:dcf4:23d4 | 2001:a::109f:aa0f:fb4a:9d5a | 2001:a::61cf:7c82:e9c0:c952  sear6.foo1.bar 
+
+GROUP  OPTION                                                                                                           
+-------------------------------------------------------------------------------------------------------------------------
+DHCP6  dhcp-6-opt-2 = val-2 | dhcp-6-opt-5 = val-5 | dhcp-6-opt-6 = val-6 | dhcp-6-opt-8 = val-8 | dhcp-6-opt-9 = val-9 
+
+NAME         AVAILABLE-CONNECTION-PATHS                               AVAILABLE-CONNECTIONS                        
+--------------------------------------------------------------------------------------------------------------------
+CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{1}  5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 
+
+===================================
+  Informacje o urządzeniu (wlan1)
+===================================
+NAME     DEVICE  TYPE  NM-TYPE       VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON                    IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                         IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID  CON-PATH  METERED  
+----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+GENERAL  wlan1   wifi  NMDeviceWifi  --      --       virtual  --              --                21:E9:64:81:8C:A8  0    20 (niedostępne)  0 (Nie podano przyczyny)  0 (nieznane)      0 (nieznane)      /sys/devices/virtual/wlan1  --        nie          tak         tak          nie               nie                --            --          --        --        nieznane 
+
+NAME          CARRIER-DETECT  SPEED     IS-SOFTWARE  SRIOV 
+------------------------------------------------------------
+CAPABILITIES  nie             nieznane  nie          nie   
+
+NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ      5GHZ     
+-----------------------------------------------------------------------------
+WIFI-PROPERTIES  tak  tak  tak   tak   tak   tak  tak    nieznane  nieznane 
+
+NAME   IN-USE  SSID        MODE            CHAN  RATE     SIGNAL  BARS  SECURITY  
+-----------------------------------------------------------------------------------
+AP[1]          wlan1-ap-4  Infrastruktura  1     54 Mb/s  48      **    WPA1 WPA2 
+
+GROUP  ADDRESS  GATEWAY         ROUTE                                                                                                                                                  DNS            DOMAIN                                                                                             WINS 
+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+IP4    --       192.168.57.160  dst = 192.168.36.106/21, nh = 192.168.199.128, mt = 979274165 | dst = 192.168.238.130/19, nh = 0.0.0.0 | dst = 192.168.224.39/32, nh = 192.168.148.69  192.168.61.83  sear4.foo4.bar | sear4.fo.x.y | sear4.foo2.bar | sear4.foo1.bar | sear4.fo.o.bar | sear4.foo3.bar  --   
+
+GROUP  OPTION                                                                                                                                                                                
+----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+DHCP4  dhcp-4-opt-0 = val-0 | dhcp-4-opt-1 = val-1 | dhcp-4-opt-2 = val-2 | dhcp-4-opt-4 = val-4 | dhcp-4-opt-6 = val-6 | dhcp-4-opt-7 = val-7 | dhcp-4-opt-8 = val-8 | dhcp-4-opt-9 = val-9 
+
+GROUP  ADDRESS                                                                                           GATEWAY                      ROUTE                                                                                                                                                    DNS                                                       DOMAIN                          
+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+IP6    2001:a::fa05:2ab4:9300:e8fe/116 | 2001:a::e9cf:bd3:caba:99b3/86 | 2001:a::2be6:44fa:2c95:5559/78  2001:a::4d70:d91a:770f:2319  dst = 2001:a::3cb2:719d:bb00:b22f/66, nh = 2001:a::81b1:58b9:7237:3511, mt = 2280277732 | dst = 2001:a::986f:983c:5eb:1c7d/99, nh = ::, mt = 1204008676  2001:a::85e7:3d7d:53e8:50ac | 2001:a::1c5:9cb5:e86d:25a5  sear6.foo4.bar | sear6.foo2.bar 
+
+GROUP  OPTION                                                                                                                                                                                                       
+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+DHCP6  dhcp-6-opt-0 = val-0 | dhcp-6-opt-1 = val-1 | dhcp-6-opt-2 = val-2 | dhcp-6-opt-3 = val-3 | dhcp-6-opt-4 = val-4 | dhcp-6-opt-5 = val-5 | dhcp-6-opt-6 = val-6 | dhcp-6-opt-7 = val-7 | dhcp-6-opt-9 = val-9 
+
+NAME         AVAILABLE-CONNECTION-PATHS                               AVAILABLE-CONNECTIONS                          
+----------------------------------------------------------------------------------------------------------------------
+CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{2}  UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 
+
+===================================
+  Informacje o urządzeniu (wlan1)
+===================================
+NAME     DEVICE  TYPE  NM-TYPE       VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON                    IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                         IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID  CON-PATH  METERED  
+----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+GENERAL  wlan1   wifi  NMDeviceWifi  --      --       virtual  --              --                71:52:AD:63:5C:7C  0    20 (niedostępne)  0 (Nie podano przyczyny)  0 (nieznane)      0 (nieznane)      /sys/devices/virtual/wlan1  --        nie          tak         tak          nie               nie                --            --          --        --        nieznane 
+
+NAME          CARRIER-DETECT  SPEED     IS-SOFTWARE  SRIOV 
+------------------------------------------------------------
+CAPABILITIES  nie             nieznane  nie          nie   
+
+NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ      5GHZ     
+-----------------------------------------------------------------------------
+WIFI-PROPERTIES  tak  tak  tak   tak   tak   tak  tak    nieznane  nieznane 
+
+NAME  IN-USE  SSID  MODE  CHAN  RATE  SIGNAL  BARS  SECURITY 
+--------------------------------------------------------------
+
+GROUP  ADDRESS                                GATEWAY  ROUTE                                                           DNS              DOMAIN                                                                            WINS                          
+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+IP4    192.168.97.124/29 | 192.168.76.154/18  --       dst = 192.168.33.233/22, nh = 192.168.222.210, mt = 2810496551  192.168.107.109  sear4.fo.o.bar | sear4.fo.x.y | sear4.foo2.bar | sear4.foo3.bar | sear4.foo4.bar  192.168.60.60 | 192.168.63.92 
+
+GROUP  OPTION                                      
+----------------------------------------------------
+DHCP4  dhcp-4-opt-0 = val-0 | dhcp-4-opt-5 = val-5 
+
+GROUP  ADDRESS                        GATEWAY  ROUTE                                                                                                                                                                                                      DNS                          DOMAIN       
+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+IP6    2001:a::88ca:3654:96b:ab44/89  --       dst = 2001:a::cc8b:7c09:4673:bbb0/85, nh = ::, mt = 2821465568 | dst = 2001:a::a976:2488:f49f:b48/106, nh = 2001:a::62ae:c734:fc7b:e931, mt = 2248613879 | dst = 2001:a::afb7:4449:3787:8bb4/123, nh = ::  2001:a::2934:bd66:550d:ec19  sear6.fo.x.y 
+
+GROUP  OPTION                                                                                                           
+-------------------------------------------------------------------------------------------------------------------------
+DHCP6  dhcp-6-opt-2 = val-2 | dhcp-6-opt-6 = val-6 | dhcp-6-opt-7 = val-7 | dhcp-6-opt-8 = val-8 | dhcp-6-opt-9 = val-9 
+
+NAME         AVAILABLE-CONNECTION-PATHS                               AVAILABLE-CONNECTIONS                          
+----------------------------------------------------------------------------------------------------------------------
+CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{2}  UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 
+
 <<<
 size: 1726
-location: clients/tests/test-client.py:1051:test_004()/455
+location: clients/tests/test-client.py:1065:test_004()/455
 cmd: $NMCLI --mode tabular --pretty --color yes dev show wlan0
 lang: C
 returncode: 0
@@ -25210,7 +25558,7 @@ IP6    --       --       dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 250
 
 <<<
 size: 1766
-location: clients/tests/test-client.py:1051:test_004()/456
+location: clients/tests/test-client.py:1065:test_004()/456
 cmd: $NMCLI --mode tabular --pretty --color yes dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
@@ -25256,19 +25604,19 @@ GROUP  ADDRESS  GATEWAY  ROUTE
 IP6    --       --       dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086  --   sear6.foo2.bar | sear6.foo1.bar | sear6.fo.x.y | sear6.fo.o.bar | sear6.foo3.bar | sear6.foo4.bar 
 
 <<<
-size: 4603
-location: clients/tests/test-client.py:1054:test_004()/457
+size: 4711
+location: clients/tests/test-client.py:1068:test_004()/457
 cmd: $NMCLI --mode tabular --pretty --color yes -f all dev show wlan0
 lang: C
 returncode: 0
-stdout: 4424 bytes
+stdout: 4532 bytes
 >>>
 ==========================
   Device details (wlan0)
 ==========================
-NAME     DEVICE  TYPE  NM-TYPE       VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON               UDI                         IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED 
---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-GENERAL  wlan0   wifi  NMDeviceWifi  --      --       virtual  --              --                13:E0:74:85:7C:D9  0    20 (unavailable)  0 (No reason given)  /sys/devices/virtual/wlan0  --        no           yes         yes          no                no                 --            con-vpn-1   UUID-con-vpn-1-REPLACED-REPLACED-REP  /org/freedesktop/NetworkManager/ActiveConnection/2  unknown 
+NAME     DEVICE  TYPE  NM-TYPE       VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON               IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                         IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED 
+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+GENERAL  wlan0   wifi  NMDeviceWifi  --      --       virtual  --              --                13:E0:74:85:7C:D9  0    20 (unavailable)  0 (No reason given)  0 (unknown)       0 (unknown)       /sys/devices/virtual/wlan0  --        no           yes         yes          no                no                 --            con-vpn-1   UUID-con-vpn-1-REPLACED-REPLACED-REP  /org/freedesktop/NetworkManager/ActiveConnection/2  unknown 
 
 NAME          CARRIER-DETECT  SPEED    IS-SOFTWARE  SRIOV 
 -----------------------------------------------------------
@@ -25281,8 +25629,8 @@ WIFI-PROPERTIES  yes  yes  yes   yes   yes   yes  yes    unknown  unknown
 NAME   IN-USE  SSID        MODE   CHAN  RATE       SIGNAL  BARS  SECURITY  
 ----------------------------------------------------------------------------
 AP[1]          wlan0-ap-2  Infra  1     54 Mbit/s  92      ****  WPA1 WPA2 
-AP[2]          wlan0-ap-1  Infra  1     54 Mbit/s  81      ****  WPA1 WPA2 
-AP[3]          wlan0-ap-3  Infra  1     54 Mbit/s  55      **    WPA1 WPA2 
+AP[2]          wlan0-ap-1  Infra  1     54 Mbit/s  81      ****  WPA1      
+AP[3]          wlan0-ap-3  Infra  1     54 Mbit/s  55      **    WPA3      
 
 GROUP  ADDRESS                                 GATEWAY         ROUTE  DNS  DOMAIN                                                                            WINS           
 -----------------------------------------------------------------------------------------------------------------------------------------------------------------------------
@@ -25305,19 +25653,19 @@ NAME         AVAILABLE-CONNECTION-PATHS                               AVAILABLE-
 CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{2}  UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 
 
 <<<
-size: 4711
-location: clients/tests/test-client.py:1054:test_004()/458
+size: 4819
+location: clients/tests/test-client.py:1068:test_004()/458
 cmd: $NMCLI --mode tabular --pretty --color yes -f all dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 4522 bytes
+stdout: 4630 bytes
 >>>
 ===================================
   Informacje o urządzeniu (wlan0)
 ===================================
-NAME     DEVICE  TYPE  NM-TYPE       VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON                    UDI                         IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED  
---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-GENERAL  wlan0   wifi  NMDeviceWifi  --      --       virtual  --              --                13:E0:74:85:7C:D9  0    20 (niedostępne)  0 (Nie podano przyczyny)  /sys/devices/virtual/wlan0  --        nie          tak         tak          nie               nie                --            con-vpn-1   UUID-con-vpn-1-REPLACED-REPLACED-REP  /org/freedesktop/NetworkManager/ActiveConnection/2  nieznane 
+NAME     DEVICE  TYPE  NM-TYPE       VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON                    IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                         IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED  
+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+GENERAL  wlan0   wifi  NMDeviceWifi  --      --       virtual  --              --                13:E0:74:85:7C:D9  0    20 (niedostępne)  0 (Nie podano przyczyny)  0 (nieznane)      0 (nieznane)      /sys/devices/virtual/wlan0  --        nie          tak         tak          nie               nie                --            con-vpn-1   UUID-con-vpn-1-REPLACED-REPLACED-REP  /org/freedesktop/NetworkManager/ActiveConnection/2  nieznane 
 
 NAME          CARRIER-DETECT  SPEED     IS-SOFTWARE  SRIOV 
 ------------------------------------------------------------
@@ -25330,8 +25678,8 @@ WIFI-PROPERTIES  tak  tak  tak   tak   tak   tak  tak    nieznane  nieznane
 NAME   IN-USE  SSID        MODE            CHAN  RATE     SIGNAL  BARS  SECURITY  
 -----------------------------------------------------------------------------------
 AP[1]          wlan0-ap-2  Infrastruktura  1     54 Mb/s  92      ****  WPA1 WPA2 
-AP[2]          wlan0-ap-1  Infrastruktura  1     54 Mb/s  81      ****  WPA1 WPA2 
-AP[3]          wlan0-ap-3  Infrastruktura  1     54 Mb/s  55      **    WPA1 WPA2 
+AP[2]          wlan0-ap-1  Infrastruktura  1     54 Mb/s  81      ****  WPA1      
+AP[3]          wlan0-ap-3  Infrastruktura  1     54 Mb/s  55      **    WPA3      
 
 GROUP  ADDRESS                                 GATEWAY         ROUTE  DNS  DOMAIN                                                                            WINS           
 -----------------------------------------------------------------------------------------------------------------------------------------------------------------------------
@@ -25354,19 +25702,19 @@ NAME         AVAILABLE-CONNECTION-PATHS                               AVAILABLE-
 CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{2}  UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 
 
 <<<
-size: 1774
-location: clients/tests/test-client.py:1057:test_004()/459
+size: 1882
+location: clients/tests/test-client.py:1071:test_004()/459
 cmd: $NMCLI --mode tabular --pretty --color yes -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: C
 returncode: 0
-stdout: 1560 bytes
+stdout: 1668 bytes
 >>>
 ==========================
   Device details (wlan0)
 ==========================
-NAME     DEVICE  TYPE  NM-TYPE       VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON               UDI                         IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED 
---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-GENERAL  wlan0   wifi  NMDeviceWifi  --      --       virtual  --              --                13:E0:74:85:7C:D9  0    20 (unavailable)  0 (No reason given)  /sys/devices/virtual/wlan0  --        no           yes         yes          no                no                 --            con-vpn-1   UUID-con-vpn-1-REPLACED-REPLACED-REP  /org/freedesktop/NetworkManager/ActiveConnection/2  unknown 
+NAME     DEVICE  TYPE  NM-TYPE       VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON               IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                         IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED 
+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+GENERAL  wlan0   wifi  NMDeviceWifi  --      --       virtual  --              --                13:E0:74:85:7C:D9  0    20 (unavailable)  0 (No reason given)  0 (unknown)       0 (unknown)       /sys/devices/virtual/wlan0  --        no           yes         yes          no                no                 --            con-vpn-1   UUID-con-vpn-1-REPLACED-REPLACED-REP  /org/freedesktop/NetworkManager/ActiveConnection/2  unknown 
 
 HWADDR            
 -------------------
@@ -25377,19 +25725,19 @@ NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ     5GHZ
 WIFI-PROPERTIES  yes  yes  yes   yes   yes   yes  yes    unknown  unknown 
 
 <<<
-size: 1838
-location: clients/tests/test-client.py:1057:test_004()/460
+size: 1946
+location: clients/tests/test-client.py:1071:test_004()/460
 cmd: $NMCLI --mode tabular --pretty --color yes -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 1614 bytes
+stdout: 1722 bytes
 >>>
 ===================================
   Informacje o urządzeniu (wlan0)
 ===================================
-NAME     DEVICE  TYPE  NM-TYPE       VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON                    UDI                         IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED  
---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-GENERAL  wlan0   wifi  NMDeviceWifi  --      --       virtual  --              --                13:E0:74:85:7C:D9  0    20 (niedostępne)  0 (Nie podano przyczyny)  /sys/devices/virtual/wlan0  --        nie          tak         tak          nie               nie                --            con-vpn-1   UUID-con-vpn-1-REPLACED-REPLACED-REP  /org/freedesktop/NetworkManager/ActiveConnection/2  nieznane 
+NAME     DEVICE  TYPE  NM-TYPE       VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON                    IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                         IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED  
+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+GENERAL  wlan0   wifi  NMDeviceWifi  --      --       virtual  --              --                13:E0:74:85:7C:D9  0    20 (niedostępne)  0 (Nie podano przyczyny)  0 (nieznane)      0 (nieznane)      /sys/devices/virtual/wlan0  --        nie          tak         tak          nie               nie                --            con-vpn-1   UUID-con-vpn-1-REPLACED-REPLACED-REP  /org/freedesktop/NetworkManager/ActiveConnection/2  nieznane 
 
 HWADDR            
 -------------------
@@ -25400,19 +25748,19 @@ NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ      5GHZ
 WIFI-PROPERTIES  tak  tak  tak   tak   tak   tak  tak    nieznane  nieznane 
 
 <<<
-size: 1774
-location: clients/tests/test-client.py:1060:test_004()/461
+size: 1882
+location: clients/tests/test-client.py:1074:test_004()/461
 cmd: $NMCLI --mode tabular --pretty --color yes -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: C
 returncode: 0
-stdout: 1560 bytes
+stdout: 1668 bytes
 >>>
 ==========================
   Device details (wlan0)
 ==========================
-NAME     DEVICE  TYPE  NM-TYPE       VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON               UDI                         IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED 
---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-GENERAL  wlan0   wifi  NMDeviceWifi  --      --       virtual  --              --                13:E0:74:85:7C:D9  0    20 (unavailable)  0 (No reason given)  /sys/devices/virtual/wlan0  --        no           yes         yes          no                no                 --            con-vpn-1   UUID-con-vpn-1-REPLACED-REPLACED-REP  /org/freedesktop/NetworkManager/ActiveConnection/2  unknown 
+NAME     DEVICE  TYPE  NM-TYPE       VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON               IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                         IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED 
+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+GENERAL  wlan0   wifi  NMDeviceWifi  --      --       virtual  --              --                13:E0:74:85:7C:D9  0    20 (unavailable)  0 (No reason given)  0 (unknown)       0 (unknown)       /sys/devices/virtual/wlan0  --        no           yes         yes          no                no                 --            con-vpn-1   UUID-con-vpn-1-REPLACED-REPLACED-REP  /org/freedesktop/NetworkManager/ActiveConnection/2  unknown 
 
 HWADDR            
 -------------------
@@ -25423,19 +25771,19 @@ NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ     5GHZ
 WIFI-PROPERTIES  yes  yes  yes   yes   yes   yes  yes    unknown  unknown 
 
 <<<
-size: 1838
-location: clients/tests/test-client.py:1060:test_004()/462
+size: 1946
+location: clients/tests/test-client.py:1074:test_004()/462
 cmd: $NMCLI --mode tabular --pretty --color yes -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 1614 bytes
+stdout: 1722 bytes
 >>>
 ===================================
   Informacje o urządzeniu (wlan0)
 ===================================
-NAME     DEVICE  TYPE  NM-TYPE       VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON                    UDI                         IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED  
---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-GENERAL  wlan0   wifi  NMDeviceWifi  --      --       virtual  --              --                13:E0:74:85:7C:D9  0    20 (niedostępne)  0 (Nie podano przyczyny)  /sys/devices/virtual/wlan0  --        nie          tak         tak          nie               nie                --            con-vpn-1   UUID-con-vpn-1-REPLACED-REPLACED-REP  /org/freedesktop/NetworkManager/ActiveConnection/2  nieznane 
+NAME     DEVICE  TYPE  NM-TYPE       VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON                    IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                         IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED  
+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+GENERAL  wlan0   wifi  NMDeviceWifi  --      --       virtual  --              --                13:E0:74:85:7C:D9  0    20 (niedostępne)  0 (Nie podano przyczyny)  0 (nieznane)      0 (nieznane)      /sys/devices/virtual/wlan0  --        nie          tak         tak          nie               nie                --            con-vpn-1   UUID-con-vpn-1-REPLACED-REPLACED-REP  /org/freedesktop/NetworkManager/ActiveConnection/2  nieznane 
 
 HWADDR            
 -------------------
@@ -25447,7 +25795,7 @@ WIFI-PROPERTIES  tak  tak  tak   tak   tak   tak  tak    nieznane  nieznane
 
 <<<
 size: 818
-location: clients/tests/test-client.py:1063:test_004()/463
+location: clients/tests/test-client.py:1077:test_004()/463
 cmd: $NMCLI --mode tabular --pretty --color yes -f DEVICE,TYPE,DBUS-PATH dev
 lang: C
 returncode: 0
@@ -25458,15 +25806,15 @@ stdout: 633 bytes
 =====================
 DEVICE  TYPE      DBUS-PATH                                 
 ----------------------------------------------------------------------------------
+wlan0   wifi      /org/freedesktop/NetworkManager/Devices/3 
 eth0    ethernet  /org/freedesktop/NetworkManager/Devices/1 
 eth1    ethernet  /org/freedesktop/NetworkManager/Devices/2 
 wlan1   wifi      /org/freedesktop/NetworkManager/Devices/4 
 wlan1   wifi      /org/freedesktop/NetworkManager/Devices/5 
-wlan0   wifi      /org/freedesktop/NetworkManager/Devices/3 
 
 <<<
 size: 821
-location: clients/tests/test-client.py:1063:test_004()/464
+location: clients/tests/test-client.py:1077:test_004()/464
 cmd: $NMCLI --mode tabular --pretty --color yes -f DEVICE,TYPE,DBUS-PATH dev
 lang: pl_PL.UTF-8
 returncode: 0
@@ -25477,20 +25825,29 @@ stdout: 626 bytes
 ===================
 DEVICE  TYPE      DBUS-PATH                                 
 --------------------------------------------------------------------------------
+wlan0   wifi      /org/freedesktop/NetworkManager/Devices/3 
 eth0    ethernet  /org/freedesktop/NetworkManager/Devices/1 
 eth1    ethernet  /org/freedesktop/NetworkManager/Devices/2 
 wlan1   wifi      /org/freedesktop/NetworkManager/Devices/4 
 wlan1   wifi      /org/freedesktop/NetworkManager/Devices/5 
-wlan0   wifi      /org/freedesktop/NetworkManager/Devices/3 
 
 <<<
 size: 3665
-location: clients/tests/test-client.py:1066:test_004()/465
+location: clients/tests/test-client.py:1080:test_004()/465
 cmd: $NMCLI --mode tabular --pretty --color yes -f ALL device wifi list
 lang: C
 returncode: 0
 stdout: 3484 bytes
 >>>
+===========================
+  Wi-Fi scan list (wlan0)
+===========================
+NAME   SSID        SSID-HEX              BSSID              MODE   CHAN  FREQ      RATE       SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infra  1     2412 MHz  54 Mbit/s  92      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/2 
+AP[2]  wlan0-ap-1  776C616E302D61702D31  61:95:77:AC:1E:4C  Infra  1     2412 MHz  54 Mbit/s  81      ****  WPA1       pair_tkip pair_ccmp group_tkip group_ccmp psk  (none)                                         wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/1 
+AP[3]  wlan0-ap-3  776C616E302D61702D33  9B:F6:B7:EC:97:76  Infra  1     2412 MHz  54 Mbit/s  55      **    WPA3       (none)                                         pair_tkip pair_ccmp group_tkip group_ccmp sae  wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/3 
+
 ===========================
   Wi-Fi scan list (wlan1)
 ===========================
@@ -25504,23 +25861,23 @@ NAME   SSID        SSID-HEX              BSSID              MODE   CHAN  FREQ
 NAME  SSID  SSID-HEX  BSSID  MODE  CHAN  FREQ  RATE  SIGNAL  BARS  SECURITY  WPA-FLAGS  RSN-FLAGS  DEVICE  ACTIVE  IN-USE  DBUS-PATH 
 -----------------------------------------------------------------------------------------------------------------------------------------------------------------
 
-===========================
-  Wi-Fi scan list (wlan0)
-===========================
-NAME   SSID        SSID-HEX              BSSID              MODE   CHAN  FREQ      RATE       SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infra  1     2412 MHz  54 Mbit/s  92      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/2 
-AP[2]  wlan0-ap-1  776C616E302D61702D31  61:95:77:AC:1E:4C  Infra  1     2412 MHz  54 Mbit/s  81      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/1 
-AP[3]  wlan0-ap-3  776C616E302D61702D33  9B:F6:B7:EC:97:76  Infra  1     2412 MHz  54 Mbit/s  55      **    WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/3 
-
 <<<
 size: 3903
-location: clients/tests/test-client.py:1066:test_004()/466
+location: clients/tests/test-client.py:1080:test_004()/466
 cmd: $NMCLI --mode tabular --pretty --color yes -f ALL device wifi list
 lang: pl_PL.UTF-8
 returncode: 0
 stdout: 3712 bytes
 >>>
+========================================
+  Lista skanowania sieci Wi-Fi (wlan0)
+========================================
+NAME   SSID        SSID-HEX              BSSID              MODE            CHAN  FREQ      RATE     SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infrastruktura  1     2412 MHz  54 Mb/s  92      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/2 
+AP[2]  wlan0-ap-1  776C616E302D61702D31  61:95:77:AC:1E:4C  Infrastruktura  1     2412 MHz  54 Mb/s  81      ****  WPA1       pair_tkip pair_ccmp group_tkip group_ccmp psk  (brak)                                         wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/1 
+AP[3]  wlan0-ap-3  776C616E302D61702D33  9B:F6:B7:EC:97:76  Infrastruktura  1     2412 MHz  54 Mb/s  55      **    WPA3       (brak)                                         pair_tkip pair_ccmp group_tkip group_ccmp sae  wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/3 
+
 ========================================
   Lista skanowania sieci Wi-Fi (wlan1)
 ========================================
@@ -25534,23 +25891,23 @@ NAME   SSID        SSID-HEX              BSSID              MODE            CHAN
 NAME  SSID  SSID-HEX  BSSID  MODE  CHAN  FREQ  RATE  SIGNAL  BARS  SECURITY  WPA-FLAGS  RSN-FLAGS  DEVICE  ACTIVE  IN-USE  DBUS-PATH 
 ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 
-========================================
-  Lista skanowania sieci Wi-Fi (wlan0)
-========================================
-NAME   SSID        SSID-HEX              BSSID              MODE            CHAN  FREQ      RATE     SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infrastruktura  1     2412 MHz  54 Mb/s  92      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/2 
-AP[2]  wlan0-ap-1  776C616E302D61702D31  61:95:77:AC:1E:4C  Infrastruktura  1     2412 MHz  54 Mb/s  81      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/1 
-AP[3]  wlan0-ap-3  776C616E302D61702D33  9B:F6:B7:EC:97:76  Infrastruktura  1     2412 MHz  54 Mb/s  55      **    WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/3 
-
 <<<
 size: 1468
-location: clients/tests/test-client.py:1068:test_004()/467
+location: clients/tests/test-client.py:1082:test_004()/467
 cmd: $NMCLI --mode tabular --pretty --color yes -f COMMON device wifi list
 lang: C
 returncode: 0
 stdout: 1284 bytes
 >>>
+===========================
+  Wi-Fi scan list (wlan0)
+===========================
+IN-USE  SSID        MODE   CHAN  RATE       SIGNAL  BARS  SECURITY  
+------------------------------------------------------------------------------------------------
+        wlan0-ap-2  Infra  1     54 Mbit/s  92      ****  WPA1 WPA2 
+        wlan0-ap-1  Infra  1     54 Mbit/s  81      ****  WPA1      
+        wlan0-ap-3  Infra  1     54 Mbit/s  55      **    WPA3      
+
 ===========================
   Wi-Fi scan list (wlan1)
 ===========================
@@ -25564,23 +25921,23 @@ IN-USE  SSID        MODE   CHAN  RATE       SIGNAL  BARS  SECURITY
 IN-USE  SSID  MODE  CHAN  RATE  SIGNAL  BARS  SECURITY 
 -----------------------------------------------------------------------------------
 
-===========================
-  Wi-Fi scan list (wlan0)
-===========================
-IN-USE  SSID        MODE   CHAN  RATE       SIGNAL  BARS  SECURITY  
-------------------------------------------------------------------------------------------------
-        wlan0-ap-2  Infra  1     54 Mbit/s  92      ****  WPA1 WPA2 
-        wlan0-ap-1  Infra  1     54 Mbit/s  81      ****  WPA1 WPA2 
-        wlan0-ap-3  Infra  1     54 Mbit/s  55      **    WPA1 WPA2 
-
 <<<
 size: 1698
-location: clients/tests/test-client.py:1068:test_004()/468
+location: clients/tests/test-client.py:1082:test_004()/468
 cmd: $NMCLI --mode tabular --pretty --color yes -f COMMON device wifi list
 lang: pl_PL.UTF-8
 returncode: 0
 stdout: 1504 bytes
 >>>
+========================================
+  Lista skanowania sieci Wi-Fi (wlan0)
+========================================
+IN-USE  SSID        MODE            CHAN  RATE     SIGNAL  BARS  SECURITY  
+--------------------------------------------------------------------------------------------------------------------
+        wlan0-ap-2  Infrastruktura  1     54 Mb/s  92      ****  WPA1 WPA2 
+        wlan0-ap-1  Infrastruktura  1     54 Mb/s  81      ****  WPA1      
+        wlan0-ap-3  Infrastruktura  1     54 Mb/s  55      **    WPA3      
+
 ========================================
   Lista skanowania sieci Wi-Fi (wlan1)
 ========================================
@@ -25594,23 +25951,23 @@ IN-USE  SSID        MODE            CHAN  RATE     SIGNAL  BARS  SECURITY
 IN-USE  SSID  MODE  CHAN  RATE  SIGNAL  BARS  SECURITY 
 ------------------------------------------------------------------------------------------------
 
-========================================
-  Lista skanowania sieci Wi-Fi (wlan0)
-========================================
-IN-USE  SSID        MODE            CHAN  RATE     SIGNAL  BARS  SECURITY  
---------------------------------------------------------------------------------------------------------------------
-        wlan0-ap-2  Infrastruktura  1     54 Mb/s  92      ****  WPA1 WPA2 
-        wlan0-ap-1  Infrastruktura  1     54 Mb/s  81      ****  WPA1 WPA2 
-        wlan0-ap-3  Infrastruktura  1     54 Mb/s  55      **    WPA1 WPA2 
-
 <<<
 size: 3778
-location: clients/tests/test-client.py:1071:test_004()/469
+location: clients/tests/test-client.py:1085:test_004()/469
 cmd: $NMCLI --mode tabular --pretty --color yes -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list
 lang: C
 returncode: 0
 stdout: 3484 bytes
 >>>
+===========================
+  Wi-Fi scan list (wlan0)
+===========================
+NAME   SSID        SSID-HEX              BSSID              MODE   CHAN  FREQ      RATE       SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infra  1     2412 MHz  54 Mbit/s  92      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/2 
+AP[2]  wlan0-ap-1  776C616E302D61702D31  61:95:77:AC:1E:4C  Infra  1     2412 MHz  54 Mbit/s  81      ****  WPA1       pair_tkip pair_ccmp group_tkip group_ccmp psk  (none)                                         wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/1 
+AP[3]  wlan0-ap-3  776C616E302D61702D33  9B:F6:B7:EC:97:76  Infra  1     2412 MHz  54 Mbit/s  55      **    WPA3       (none)                                         pair_tkip pair_ccmp group_tkip group_ccmp sae  wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/3 
+
 ===========================
   Wi-Fi scan list (wlan1)
 ===========================
@@ -25624,23 +25981,23 @@ NAME   SSID        SSID-HEX              BSSID              MODE   CHAN  FREQ
 NAME  SSID  SSID-HEX  BSSID  MODE  CHAN  FREQ  RATE  SIGNAL  BARS  SECURITY  WPA-FLAGS  RSN-FLAGS  DEVICE  ACTIVE  IN-USE  DBUS-PATH 
 -----------------------------------------------------------------------------------------------------------------------------------------------------------------
 
-===========================
-  Wi-Fi scan list (wlan0)
-===========================
-NAME   SSID        SSID-HEX              BSSID              MODE   CHAN  FREQ      RATE       SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infra  1     2412 MHz  54 Mbit/s  92      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/2 
-AP[2]  wlan0-ap-1  776C616E302D61702D31  61:95:77:AC:1E:4C  Infra  1     2412 MHz  54 Mbit/s  81      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/1 
-AP[3]  wlan0-ap-3  776C616E302D61702D33  9B:F6:B7:EC:97:76  Infra  1     2412 MHz  54 Mbit/s  55      **    WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/3 
-
 <<<
 size: 4016
-location: clients/tests/test-client.py:1071:test_004()/470
+location: clients/tests/test-client.py:1085:test_004()/470
 cmd: $NMCLI --mode tabular --pretty --color yes -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list
 lang: pl_PL.UTF-8
 returncode: 0
 stdout: 3712 bytes
 >>>
+========================================
+  Lista skanowania sieci Wi-Fi (wlan0)
+========================================
+NAME   SSID        SSID-HEX              BSSID              MODE            CHAN  FREQ      RATE     SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infrastruktura  1     2412 MHz  54 Mb/s  92      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/2 
+AP[2]  wlan0-ap-1  776C616E302D61702D31  61:95:77:AC:1E:4C  Infrastruktura  1     2412 MHz  54 Mb/s  81      ****  WPA1       pair_tkip pair_ccmp group_tkip group_ccmp psk  (brak)                                         wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/1 
+AP[3]  wlan0-ap-3  776C616E302D61702D33  9B:F6:B7:EC:97:76  Infrastruktura  1     2412 MHz  54 Mb/s  55      **    WPA3       (brak)                                         pair_tkip pair_ccmp group_tkip group_ccmp sae  wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/3 
+
 ========================================
   Lista skanowania sieci Wi-Fi (wlan1)
 ========================================
@@ -25654,22 +26011,13 @@ NAME   SSID        SSID-HEX              BSSID              MODE            CHAN
 NAME  SSID  SSID-HEX  BSSID  MODE  CHAN  FREQ  RATE  SIGNAL  BARS  SECURITY  WPA-FLAGS  RSN-FLAGS  DEVICE  ACTIVE  IN-USE  DBUS-PATH 
 ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 
-========================================
-  Lista skanowania sieci Wi-Fi (wlan0)
-========================================
-NAME   SSID        SSID-HEX              BSSID              MODE            CHAN  FREQ      RATE     SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infrastruktura  1     2412 MHz  54 Mb/s  92      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/2 
-AP[2]  wlan0-ap-1  776C616E302D61702D31  61:95:77:AC:1E:4C  Infrastruktura  1     2412 MHz  54 Mb/s  81      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/1 
-AP[3]  wlan0-ap-3  776C616E302D61702D33  9B:F6:B7:EC:97:76  Infrastruktura  1     2412 MHz  54 Mb/s  55      **    WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/3 
-
 <<<
-size: 1320
-location: clients/tests/test-client.py:1073:test_004()/471
+size: 1322
+location: clients/tests/test-client.py:1087:test_004()/471
 cmd: $NMCLI --mode tabular --pretty --color yes -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: C
 returncode: 0
-stdout: 1115 bytes
+stdout: 1117 bytes
 >>>
 ===========================
   Wi-Fi scan list (wlan0)
@@ -25678,13 +26026,15 @@ NAME   SSID        SSID-HEX              BSSID              MODE   CHAN  FREQ
 -----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infra  1     2412 MHz  54 Mbit/s  92      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/2 
 
+
+
 <<<
-size: 1407
-location: clients/tests/test-client.py:1073:test_004()/472
+size: 1409
+location: clients/tests/test-client.py:1087:test_004()/472
 cmd: $NMCLI --mode tabular --pretty --color yes -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 1192 bytes
+stdout: 1194 bytes
 >>>
 ========================================
   Lista skanowania sieci Wi-Fi (wlan0)
@@ -25693,13 +26043,15 @@ NAME   SSID        SSID-HEX              BSSID              MODE            CHAN
 -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infrastruktura  1     2412 MHz  54 Mb/s  92      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/2 
 
+
+
 <<<
-size: 596
-location: clients/tests/test-client.py:1075:test_004()/473
+size: 598
+location: clients/tests/test-client.py:1089:test_004()/473
 cmd: $NMCLI --mode tabular --pretty --color yes -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: C
 returncode: 0
-stdout: 389 bytes
+stdout: 391 bytes
 >>>
 ===========================
   Wi-Fi scan list (wlan0)
@@ -25708,13 +26060,15 @@ IN-USE  SSID        MODE   CHAN  RATE       SIGNAL  BARS  SECURITY
 ------------------------------------------------------------------------------------------------
         wlan0-ap-2  Infra  1     54 Mbit/s  92      ****  WPA1 WPA2 
 
+
+
 <<<
-size: 681
-location: clients/tests/test-client.py:1075:test_004()/474
+size: 683
+location: clients/tests/test-client.py:1089:test_004()/474
 cmd: $NMCLI --mode tabular --pretty --color yes -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 464 bytes
+stdout: 466 bytes
 >>>
 ========================================
   Lista skanowania sieci Wi-Fi (wlan0)
@@ -25723,13 +26077,15 @@ IN-USE  SSID        MODE            CHAN  RATE     SIGNAL  BARS  SECURITY
 --------------------------------------------------------------------------------------------------------------------
         wlan0-ap-2  Infrastruktura  1     54 Mb/s  92      ****  WPA1 WPA2 
 
+
+
 <<<
-size: 1433
-location: clients/tests/test-client.py:1078:test_004()/475
+size: 1435
+location: clients/tests/test-client.py:1092:test_004()/475
 cmd: $NMCLI --mode tabular --pretty --color yes -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: C
 returncode: 0
-stdout: 1115 bytes
+stdout: 1117 bytes
 >>>
 ===========================
   Wi-Fi scan list (wlan0)
@@ -25738,13 +26094,15 @@ NAME   SSID        SSID-HEX              BSSID              MODE   CHAN  FREQ
 -----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infra  1     2412 MHz  54 Mbit/s  92      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/2 
 
+
+
 <<<
-size: 1520
-location: clients/tests/test-client.py:1078:test_004()/476
+size: 1522
+location: clients/tests/test-client.py:1092:test_004()/476
 cmd: $NMCLI --mode tabular --pretty --color yes -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 1192 bytes
+stdout: 1194 bytes
 >>>
 ========================================
   Lista skanowania sieci Wi-Fi (wlan0)
@@ -25753,20 +26111,22 @@ NAME   SSID        SSID-HEX              BSSID              MODE            CHAN
 -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infrastruktura  1     2412 MHz  54 Mb/s  92      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/2 
 
+
+
 <<<
-size: 4606
-location: clients/tests/test-client.py:1080:test_004()/477
+size: 4714
+location: clients/tests/test-client.py:1094:test_004()/477
 cmd: $NMCLI --mode tabular --pretty --color yes -f ALL device show wlan0
 lang: C
 returncode: 0
-stdout: 4424 bytes
+stdout: 4532 bytes
 >>>
 ==========================
   Device details (wlan0)
 ==========================
-NAME     DEVICE  TYPE  NM-TYPE       VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON               UDI                         IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED 
---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-GENERAL  wlan0   wifi  NMDeviceWifi  --      --       virtual  --              --                13:E0:74:85:7C:D9  0    20 (unavailable)  0 (No reason given)  /sys/devices/virtual/wlan0  --        no           yes         yes          no                no                 --            con-vpn-1   UUID-con-vpn-1-REPLACED-REPLACED-REP  /org/freedesktop/NetworkManager/ActiveConnection/2  unknown 
+NAME     DEVICE  TYPE  NM-TYPE       VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON               IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                         IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED 
+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+GENERAL  wlan0   wifi  NMDeviceWifi  --      --       virtual  --              --                13:E0:74:85:7C:D9  0    20 (unavailable)  0 (No reason given)  0 (unknown)       0 (unknown)       /sys/devices/virtual/wlan0  --        no           yes         yes          no                no                 --            con-vpn-1   UUID-con-vpn-1-REPLACED-REPLACED-REP  /org/freedesktop/NetworkManager/ActiveConnection/2  unknown 
 
 NAME          CARRIER-DETECT  SPEED    IS-SOFTWARE  SRIOV 
 -----------------------------------------------------------
@@ -25779,8 +26139,8 @@ WIFI-PROPERTIES  yes  yes  yes   yes   yes   yes  yes    unknown  unknown
 NAME   IN-USE  SSID        MODE   CHAN  RATE       SIGNAL  BARS  SECURITY  
 ----------------------------------------------------------------------------
 AP[1]          wlan0-ap-2  Infra  1     54 Mbit/s  92      ****  WPA1 WPA2 
-AP[2]          wlan0-ap-1  Infra  1     54 Mbit/s  81      ****  WPA1 WPA2 
-AP[3]          wlan0-ap-3  Infra  1     54 Mbit/s  55      **    WPA1 WPA2 
+AP[2]          wlan0-ap-1  Infra  1     54 Mbit/s  81      ****  WPA1      
+AP[3]          wlan0-ap-3  Infra  1     54 Mbit/s  55      **    WPA3      
 
 GROUP  ADDRESS                                 GATEWAY         ROUTE  DNS  DOMAIN                                                                            WINS           
 -----------------------------------------------------------------------------------------------------------------------------------------------------------------------------
@@ -25803,19 +26163,19 @@ NAME         AVAILABLE-CONNECTION-PATHS                               AVAILABLE-
 CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{2}  UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 
 
 <<<
-size: 4714
-location: clients/tests/test-client.py:1080:test_004()/478
+size: 4822
+location: clients/tests/test-client.py:1094:test_004()/478
 cmd: $NMCLI --mode tabular --pretty --color yes -f ALL device show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 4522 bytes
+stdout: 4630 bytes
 >>>
 ===================================
   Informacje o urządzeniu (wlan0)
 ===================================
-NAME     DEVICE  TYPE  NM-TYPE       VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON                    UDI                         IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED  
---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-GENERAL  wlan0   wifi  NMDeviceWifi  --      --       virtual  --              --                13:E0:74:85:7C:D9  0    20 (niedostępne)  0 (Nie podano przyczyny)  /sys/devices/virtual/wlan0  --        nie          tak         tak          nie               nie                --            con-vpn-1   UUID-con-vpn-1-REPLACED-REPLACED-REP  /org/freedesktop/NetworkManager/ActiveConnection/2  nieznane 
+NAME     DEVICE  TYPE  NM-TYPE       VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON                    IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                         IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED  
+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+GENERAL  wlan0   wifi  NMDeviceWifi  --      --       virtual  --              --                13:E0:74:85:7C:D9  0    20 (niedostępne)  0 (Nie podano przyczyny)  0 (nieznane)      0 (nieznane)      /sys/devices/virtual/wlan0  --        nie          tak         tak          nie               nie                --            con-vpn-1   UUID-con-vpn-1-REPLACED-REPLACED-REP  /org/freedesktop/NetworkManager/ActiveConnection/2  nieznane 
 
 NAME          CARRIER-DETECT  SPEED     IS-SOFTWARE  SRIOV 
 ------------------------------------------------------------
@@ -25828,8 +26188,8 @@ WIFI-PROPERTIES  tak  tak  tak   tak   tak   tak  tak    nieznane  nieznane
 NAME   IN-USE  SSID        MODE            CHAN  RATE     SIGNAL  BARS  SECURITY  
 -----------------------------------------------------------------------------------
 AP[1]          wlan0-ap-2  Infrastruktura  1     54 Mb/s  92      ****  WPA1 WPA2 
-AP[2]          wlan0-ap-1  Infrastruktura  1     54 Mb/s  81      ****  WPA1 WPA2 
-AP[3]          wlan0-ap-3  Infrastruktura  1     54 Mb/s  55      **    WPA1 WPA2 
+AP[2]          wlan0-ap-1  Infrastruktura  1     54 Mb/s  81      ****  WPA1      
+AP[3]          wlan0-ap-3  Infrastruktura  1     54 Mb/s  55      **    WPA3      
 
 GROUP  ADDRESS                                 GATEWAY         ROUTE  DNS  DOMAIN                                                                            WINS           
 -----------------------------------------------------------------------------------------------------------------------------------------------------------------------------
@@ -25853,7 +26213,7 @@ CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{2}  UUID-con-x
 
 <<<
 size: 1739
-location: clients/tests/test-client.py:1082:test_004()/479
+location: clients/tests/test-client.py:1096:test_004()/479
 cmd: $NMCLI --mode tabular --pretty --color yes -f COMMON device show wlan0
 lang: C
 returncode: 0
@@ -25900,7 +26260,7 @@ IP6    --       --       dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 250
 
 <<<
 size: 1779
-location: clients/tests/test-client.py:1082:test_004()/480
+location: clients/tests/test-client.py:1096:test_004()/480
 cmd: $NMCLI --mode tabular --pretty --color yes -f COMMON device show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
@@ -25946,19 +26306,19 @@ GROUP  ADDRESS  GATEWAY  ROUTE
 IP6    --       --       dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086  --   sear6.foo2.bar | sear6.foo1.bar | sear6.fo.x.y | sear6.fo.o.bar | sear6.foo3.bar | sear6.foo4.bar 
 
 <<<
-size: 4744
-location: clients/tests/test-client.py:1084:test_004()/481
+size: 4852
+location: clients/tests/test-client.py:1098:test_004()/481
 cmd: $NMCLI --mode tabular --pretty --color yes -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0
 lang: C
 returncode: 0
-stdout: 4424 bytes
+stdout: 4532 bytes
 >>>
 ==========================
   Device details (wlan0)
 ==========================
-NAME     DEVICE  TYPE  NM-TYPE       VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON               UDI                         IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED 
---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-GENERAL  wlan0   wifi  NMDeviceWifi  --      --       virtual  --              --                13:E0:74:85:7C:D9  0    20 (unavailable)  0 (No reason given)  /sys/devices/virtual/wlan0  --        no           yes         yes          no                no                 --            con-vpn-1   UUID-con-vpn-1-REPLACED-REPLACED-REP  /org/freedesktop/NetworkManager/ActiveConnection/2  unknown 
+NAME     DEVICE  TYPE  NM-TYPE       VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON               IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                         IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED 
+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+GENERAL  wlan0   wifi  NMDeviceWifi  --      --       virtual  --              --                13:E0:74:85:7C:D9  0    20 (unavailable)  0 (No reason given)  0 (unknown)       0 (unknown)       /sys/devices/virtual/wlan0  --        no           yes         yes          no                no                 --            con-vpn-1   UUID-con-vpn-1-REPLACED-REPLACED-REP  /org/freedesktop/NetworkManager/ActiveConnection/2  unknown 
 
 NAME          CARRIER-DETECT  SPEED    IS-SOFTWARE  SRIOV 
 -----------------------------------------------------------
@@ -25971,8 +26331,8 @@ WIFI-PROPERTIES  yes  yes  yes   yes   yes   yes  yes    unknown  unknown
 NAME   IN-USE  SSID        MODE   CHAN  RATE       SIGNAL  BARS  SECURITY  
 ----------------------------------------------------------------------------
 AP[1]          wlan0-ap-2  Infra  1     54 Mbit/s  92      ****  WPA1 WPA2 
-AP[2]          wlan0-ap-1  Infra  1     54 Mbit/s  81      ****  WPA1 WPA2 
-AP[3]          wlan0-ap-3  Infra  1     54 Mbit/s  55      **    WPA1 WPA2 
+AP[2]          wlan0-ap-1  Infra  1     54 Mbit/s  81      ****  WPA1      
+AP[3]          wlan0-ap-3  Infra  1     54 Mbit/s  55      **    WPA3      
 
 GROUP  ADDRESS                                 GATEWAY         ROUTE  DNS  DOMAIN                                                                            WINS           
 -----------------------------------------------------------------------------------------------------------------------------------------------------------------------------
@@ -25995,19 +26355,19 @@ NAME         AVAILABLE-CONNECTION-PATHS                               AVAILABLE-
 CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{2}  UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 
 
 <<<
-size: 4852
-location: clients/tests/test-client.py:1084:test_004()/482
+size: 4960
+location: clients/tests/test-client.py:1098:test_004()/482
 cmd: $NMCLI --mode tabular --pretty --color yes -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 4522 bytes
+stdout: 4630 bytes
 >>>
 ===================================
   Informacje o urządzeniu (wlan0)
 ===================================
-NAME     DEVICE  TYPE  NM-TYPE       VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON                    UDI                         IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED  
---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-GENERAL  wlan0   wifi  NMDeviceWifi  --      --       virtual  --              --                13:E0:74:85:7C:D9  0    20 (niedostępne)  0 (Nie podano przyczyny)  /sys/devices/virtual/wlan0  --        nie          tak         tak          nie               nie                --            con-vpn-1   UUID-con-vpn-1-REPLACED-REPLACED-REP  /org/freedesktop/NetworkManager/ActiveConnection/2  nieznane 
+NAME     DEVICE  TYPE  NM-TYPE       VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON                    IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                         IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED  
+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+GENERAL  wlan0   wifi  NMDeviceWifi  --      --       virtual  --              --                13:E0:74:85:7C:D9  0    20 (niedostępne)  0 (Nie podano przyczyny)  0 (nieznane)      0 (nieznane)      /sys/devices/virtual/wlan0  --        nie          tak         tak          nie               nie                --            con-vpn-1   UUID-con-vpn-1-REPLACED-REPLACED-REP  /org/freedesktop/NetworkManager/ActiveConnection/2  nieznane 
 
 NAME          CARRIER-DETECT  SPEED     IS-SOFTWARE  SRIOV 
 ------------------------------------------------------------
@@ -26020,8 +26380,8 @@ WIFI-PROPERTIES  tak  tak  tak   tak   tak   tak  tak    nieznane  nieznane
 NAME   IN-USE  SSID        MODE            CHAN  RATE     SIGNAL  BARS  SECURITY  
 -----------------------------------------------------------------------------------
 AP[1]          wlan0-ap-2  Infrastruktura  1     54 Mb/s  92      ****  WPA1 WPA2 
-AP[2]          wlan0-ap-1  Infrastruktura  1     54 Mb/s  81      ****  WPA1 WPA2 
-AP[3]          wlan0-ap-3  Infrastruktura  1     54 Mb/s  55      **    WPA1 WPA2 
+AP[2]          wlan0-ap-1  Infrastruktura  1     54 Mb/s  81      ****  WPA1      
+AP[3]          wlan0-ap-3  Infrastruktura  1     54 Mb/s  55      **    WPA3      
 
 GROUP  ADDRESS                                 GATEWAY         ROUTE  DNS  DOMAIN                                                                            WINS           
 -----------------------------------------------------------------------------------------------------------------------------------------------------------------------------
@@ -26045,7 +26405,7 @@ CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{2}  UUID-con-x
 
 <<<
 size: 791
-location: clients/tests/test-client.py:1022:test_004()/483
+location: clients/tests/test-client.py:1036:test_004()/483
 cmd: $NMCLI --mode tabular --terse con s con-vpn-1
 lang: C
 returncode: 0
@@ -26061,7 +26421,7 @@ VPN:openvpn:::*** VPN connection con-vpn-1 ***:5 - VPN connected:key1 = val1 | k
 
 <<<
 size: 801
-location: clients/tests/test-client.py:1022:test_004()/484
+location: clients/tests/test-client.py:1036:test_004()/484
 cmd: $NMCLI --mode tabular --terse con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
@@ -26077,7 +26437,7 @@ VPN:openvpn:::*** VPN connection con-vpn-1 ***:5 - VPN connected:key1 = val1 | k
 
 <<<
 size: 791
-location: clients/tests/test-client.py:1024:test_004()/485
+location: clients/tests/test-client.py:1038:test_004()/485
 cmd: $NMCLI --mode tabular --terse con s con-vpn-1
 lang: C
 returncode: 0
@@ -26093,7 +26453,7 @@ VPN:openvpn:::*** VPN connection con-vpn-1 ***:5 - VPN connected:key1 = val1 | k
 
 <<<
 size: 801
-location: clients/tests/test-client.py:1024:test_004()/486
+location: clients/tests/test-client.py:1038:test_004()/486
 cmd: $NMCLI --mode tabular --terse con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
@@ -26109,7 +26469,7 @@ VPN:openvpn:::*** VPN connection con-vpn-1 ***:5 - VPN connected:key1 = val1 | k
 
 <<<
 size: 504
-location: clients/tests/test-client.py:1027:test_004()/487
+location: clients/tests/test-client.py:1041:test_004()/487
 cmd: $NMCLI --mode tabular --terse -f ALL con s con-vpn-1
 lang: C
 returncode: 0
@@ -26123,7 +26483,7 @@ proxy:none:no::
 
 <<<
 size: 514
-location: clients/tests/test-client.py:1027:test_004()/488
+location: clients/tests/test-client.py:1041:test_004()/488
 cmd: $NMCLI --mode tabular --terse -f ALL con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
@@ -26137,7 +26497,7 @@ proxy:none:no::
 
 <<<
 size: 261
-location: clients/tests/test-client.py:1033:test_004()/489
+location: clients/tests/test-client.py:1047:test_004()/489
 cmd: $NMCLI --mode tabular --terse -f VPN con s con-vpn-1
 lang: C
 returncode: 0
@@ -26147,7 +26507,7 @@ vpn:org.freedesktop.NetworkManager.openvpn::key1 = val1, key2 = val2, key3 = val
 
 <<<
 size: 271
-location: clients/tests/test-client.py:1033:test_004()/490
+location: clients/tests/test-client.py:1047:test_004()/490
 cmd: $NMCLI --mode tabular --terse -f VPN con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
@@ -26157,7 +26517,7 @@ vpn:org.freedesktop.NetworkManager.openvpn::key1 = val1, key2 = val2, key3 = val
 
 <<<
 size: 359
-location: clients/tests/test-client.py:1036:test_004()/491
+location: clients/tests/test-client.py:1050:test_004()/491
 cmd: $NMCLI --mode tabular --terse -f GENERAL con s con-vpn-1
 lang: C
 returncode: 0
@@ -26167,7 +26527,7 @@ GENERAL:con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:wlan0:activated:no:no::ye
 
 <<<
 size: 369
-location: clients/tests/test-client.py:1036:test_004()/492
+location: clients/tests/test-client.py:1050:test_004()/492
 cmd: $NMCLI --mode tabular --terse -f GENERAL con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
@@ -26177,68 +26537,78 @@ GENERAL:con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:wlan0:activated:no:no::ye
 
 <<<
 size: 284
-location: clients/tests/test-client.py:1039:test_004()/493
+location: clients/tests/test-client.py:1053:test_004()/493
 cmd: $NMCLI --mode tabular --terse dev s
 lang: C
 returncode: 0
 stdout: 135 bytes
 >>>
+wlan0:wifi:unavailable:con-vpn-1
 eth0:ethernet:unavailable:
 eth1:ethernet:unavailable:
 wlan1:wifi:unavailable:
 wlan1:wifi:unavailable:
-wlan0:wifi:unavailable:con-vpn-1
 
 <<<
 size: 294
-location: clients/tests/test-client.py:1039:test_004()/494
+location: clients/tests/test-client.py:1053:test_004()/494
 cmd: $NMCLI --mode tabular --terse dev s
 lang: pl_PL.UTF-8
 returncode: 0
 stdout: 135 bytes
 >>>
+wlan0:wifi:unavailable:con-vpn-1
 eth0:ethernet:unavailable:
 eth1:ethernet:unavailable:
 wlan1:wifi:unavailable:
 wlan1:wifi:unavailable:
-wlan0:wifi:unavailable:con-vpn-1
 
 <<<
-size: 602
-location: clients/tests/test-client.py:1042:test_004()/495
+size: 682
+location: clients/tests/test-client.py:1056:test_004()/495
 cmd: $NMCLI --mode tabular --terse -f all dev status
 lang: C
 returncode: 0
-stdout: 441 bytes
+stdout: 521 bytes
 >>>
-eth0:ethernet:unavailable:/org/freedesktop/NetworkManager/Devices/1:::
-eth1:ethernet:unavailable:/org/freedesktop/NetworkManager/Devices/2:::
-wlan1:wifi:unavailable:/org/freedesktop/NetworkManager/Devices/4:::
-wlan1:wifi:unavailable:/org/freedesktop/NetworkManager/Devices/5:::
-wlan0:wifi:unavailable:/org/freedesktop/NetworkManager/Devices/3:con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:/org/freedesktop/NetworkManager/ActiveConnection/2
+wlan0:wifi:unavailable:unknown:unknown:/org/freedesktop/NetworkManager/Devices/3:con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:/org/freedesktop/NetworkManager/ActiveConnection/2
+eth0:ethernet:unavailable:unknown:unknown:/org/freedesktop/NetworkManager/Devices/1:::
+eth1:ethernet:unavailable:unknown:unknown:/org/freedesktop/NetworkManager/Devices/2:::
+wlan1:wifi:unavailable:unknown:unknown:/org/freedesktop/NetworkManager/Devices/4:::
+wlan1:wifi:unavailable:unknown:unknown:/org/freedesktop/NetworkManager/Devices/5:::
 
 <<<
-size: 612
-location: clients/tests/test-client.py:1042:test_004()/496
+size: 692
+location: clients/tests/test-client.py:1056:test_004()/496
 cmd: $NMCLI --mode tabular --terse -f all dev status
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 441 bytes
+stdout: 521 bytes
 >>>
-eth0:ethernet:unavailable:/org/freedesktop/NetworkManager/Devices/1:::
-eth1:ethernet:unavailable:/org/freedesktop/NetworkManager/Devices/2:::
-wlan1:wifi:unavailable:/org/freedesktop/NetworkManager/Devices/4:::
-wlan1:wifi:unavailable:/org/freedesktop/NetworkManager/Devices/5:::
-wlan0:wifi:unavailable:/org/freedesktop/NetworkManager/Devices/3:con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:/org/freedesktop/NetworkManager/ActiveConnection/2
+wlan0:wifi:unavailable:unknown:unknown:/org/freedesktop/NetworkManager/Devices/3:con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:/org/freedesktop/NetworkManager/ActiveConnection/2
+eth0:ethernet:unavailable:unknown:unknown:/org/freedesktop/NetworkManager/Devices/1:::
+eth1:ethernet:unavailable:unknown:unknown:/org/freedesktop/NetworkManager/Devices/2:::
+wlan1:wifi:unavailable:unknown:unknown:/org/freedesktop/NetworkManager/Devices/4:::
+wlan1:wifi:unavailable:unknown:unknown:/org/freedesktop/NetworkManager/Devices/5:::
 
 <<<
 size: 3096
-location: clients/tests/test-client.py:1045:test_004()/497
+location: clients/tests/test-client.py:1059:test_004()/497
 cmd: $NMCLI --mode tabular --terse dev show
 lang: C
 returncode: 0
 stdout: 2943 bytes
 >>>
+wlan0
+wifi
+13\:E0\:74\:85\:7C\:D9
+0
+20 (unavailable)
+con-vpn-1
+/org/freedesktop/NetworkManager/ActiveConnection/2
+IP4:192.168.228.18/32 | 192.168.209.179/25:192.168.41.120:::sear4.foo2.bar | sear4.fo.x.y | sear4.foo1.bar | sear4.foo4.bar | sear4.fo.o.bar:192.168.120.79
+IP6:::dst = 2001\:a\:\:dd5b\:aa7b\:b4a2\:e42/102, nh = \:\:, mt = 2504159086::sear6.foo2.bar | sear6.foo1.bar | sear6.fo.x.y | sear6.fo.o.bar | sear6.foo3.bar | sear6.foo4.bar
+
 eth0
 ethernet
 AB\:B7\:BF\:E2\:48\:E8
@@ -26281,6 +26651,14 @@ wifi
 IP4:192.168.97.124/29 | 192.168.76.154/18::dst = 192.168.33.233/22, nh = 192.168.222.210, mt = 2810496551:192.168.107.109:sear4.fo.o.bar | sear4.fo.x.y | sear4.foo2.bar | sear4.foo3.bar | sear4.foo4.bar:192.168.60.60 | 192.168.63.92
 IP6:2001\:a\:\:88ca\:3654\:96b\:ab44/89::dst = 2001\:a\:\:cc8b\:7c09\:4673\:bbb0/85, nh = \:\:, mt = 2821465568 | dst = 2001\:a\:\:a976\:2488\:f49f\:b48/106, nh = 2001\:a\:\:62ae\:c734\:fc7b\:e931, mt = 2248613879 | dst = 2001\:a\:\:afb7\:4449\:3787\:8bb4/123, nh = \:\::2001\:a\:\:2934\:bd66\:550d\:ec19:sear6.fo.x.y
 
+<<<
+size: 3106
+location: clients/tests/test-client.py:1059:test_004()/498
+cmd: $NMCLI --mode tabular --terse dev show
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 2943 bytes
+>>>
 wlan0
 wifi
 13\:E0\:74\:85\:7C\:D9
@@ -26291,14 +26669,6 @@ con-vpn-1
 IP4:192.168.228.18/32 | 192.168.209.179/25:192.168.41.120:::sear4.foo2.bar | sear4.fo.x.y | sear4.foo1.bar | sear4.foo4.bar | sear4.fo.o.bar:192.168.120.79
 IP6:::dst = 2001\:a\:\:dd5b\:aa7b\:b4a2\:e42/102, nh = \:\:, mt = 2504159086::sear6.foo2.bar | sear6.foo1.bar | sear6.fo.x.y | sear6.fo.o.bar | sear6.foo3.bar | sear6.foo4.bar
 
-<<<
-size: 3106
-location: clients/tests/test-client.py:1045:test_004()/498
-cmd: $NMCLI --mode tabular --terse dev show
-lang: pl_PL.UTF-8
-returncode: 0
-stdout: 2943 bytes
->>>
 eth0
 ethernet
 AB\:B7\:BF\:E2\:48\:E8
@@ -26341,25 +26711,27 @@ wifi
 IP4:192.168.97.124/29 | 192.168.76.154/18::dst = 192.168.33.233/22, nh = 192.168.222.210, mt = 2810496551:192.168.107.109:sear4.fo.o.bar | sear4.fo.x.y | sear4.foo2.bar | sear4.foo3.bar | sear4.foo4.bar:192.168.60.60 | 192.168.63.92
 IP6:2001\:a\:\:88ca\:3654\:96b\:ab44/89::dst = 2001\:a\:\:cc8b\:7c09\:4673\:bbb0/85, nh = \:\:, mt = 2821465568 | dst = 2001\:a\:\:a976\:2488\:f49f\:b48/106, nh = 2001\:a\:\:62ae\:c734\:fc7b\:e931, mt = 2248613879 | dst = 2001\:a\:\:afb7\:4449\:3787\:8bb4/123, nh = \:\::2001\:a\:\:2934\:bd66\:550d\:ec19:sear6.fo.x.y
 
-wlan0
-wifi
-13\:E0\:74\:85\:7C\:D9
-0
-20 (unavailable)
-con-vpn-1
-/org/freedesktop/NetworkManager/ActiveConnection/2
-IP4:192.168.228.18/32 | 192.168.209.179/25:192.168.41.120:::sear4.foo2.bar | sear4.fo.x.y | sear4.foo1.bar | sear4.foo4.bar | sear4.fo.o.bar:192.168.120.79
-IP6:::dst = 2001\:a\:\:dd5b\:aa7b\:b4a2\:e42/102, nh = \:\:, mt = 2504159086::sear6.foo2.bar | sear6.foo1.bar | sear6.fo.x.y | sear6.fo.o.bar | sear6.foo3.bar | sear6.foo4.bar
-
 <<<
-size: 6205
-location: clients/tests/test-client.py:1048:test_004()/499
+size: 6315
+location: clients/tests/test-client.py:1062:test_004()/499
 cmd: $NMCLI --mode tabular --terse -f all dev show
 lang: C
 returncode: 0
-stdout: 6045 bytes
+stdout: 6155 bytes
 >>>
-GENERAL:eth0:ethernet:NMDeviceEthernet:::virtual:::AB\:B7\:BF\:E2\:48\:E8:0:20 (unavailable):0 (No reason given):/sys/devices/virtual/eth0::no:yes:yes:no:no:::::unknown
+GENERAL:wlan0:wifi:NMDeviceWifi:::virtual:::13\:E0\:74\:85\:7C\:D9:0:20 (unavailable):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/wlan0::no:yes:yes:no:no::con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:/org/freedesktop/NetworkManager/ActiveConnection/2:unknown
+CAPABILITIES:no:unknown:no:no
+WIFI-PROPERTIES:yes:yes:yes:yes:yes:yes:yes:unknown:unknown
+AP[1]: :wlan0-ap-2:Infra:1:54 Mbit/s:92:****:WPA1 WPA2
+AP[2]: :wlan0-ap-1:Infra:1:54 Mbit/s:81:****:WPA1
+AP[3]: :wlan0-ap-3:Infra:1:54 Mbit/s:55:**  :WPA3
+IP4:192.168.228.18/32 | 192.168.209.179/25:192.168.41.120:::sear4.foo2.bar | sear4.fo.x.y | sear4.foo1.bar | sear4.foo4.bar | sear4.fo.o.bar:192.168.120.79
+DHCP4:dhcp-4-opt-0 = val-0 | dhcp-4-opt-2 = val-2 | dhcp-4-opt-4 = val-4 | dhcp-4-opt-7 = val-7
+IP6:::dst = 2001\:a\:\:dd5b\:aa7b\:b4a2\:e42/102, nh = \:\:, mt = 2504159086::sear6.foo2.bar | sear6.foo1.bar | sear6.fo.x.y | sear6.fo.o.bar | sear6.foo3.bar | sear6.foo4.bar
+DHCP6:dhcp-6-opt-1 = val-1 | dhcp-6-opt-2 = val-2 | dhcp-6-opt-3 = val-3 | dhcp-6-opt-4 = val-4 | dhcp-6-opt-5 = val-5
+CONNECTIONS:/org/freedesktop/NetworkManager/Settings/Connection/{2}:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
+
+GENERAL:eth0:ethernet:NMDeviceEthernet:::virtual:::AB\:B7\:BF\:E2\:48\:E8:0:20 (unavailable):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/eth0::no:yes:yes:no:no:::::unknown
 CAPABILITIES:no:100 Mb/s:no:no
 WIRED-PROPERTIES:off:
 IP4:192.168.49.34/22 | 192.168.135.86/19:::192.168.45.230 | 192.168.180.201 | 192.168.253.2:sear4.foo2.bar | sear4.foo1.bar:192.168.163.23 | 192.168.151.246
@@ -26368,7 +26740,7 @@ IP6:2001\:a\:\:ed81\:3d7\:c2e9\:df82/99:::2001\:a\:\:2703\:f06\:9619\:d89f | 200
 DHCP6:dhcp-6-opt-0 = val-0 | dhcp-6-opt-1 = val-1 | dhcp-6-opt-2 = val-2 | dhcp-6-opt-3 = val-3 | dhcp-6-opt-4 = val-4 | dhcp-6-opt-5 = val-5 | dhcp-6-opt-6 = val-6 | dhcp-6-opt-7 = val-7 | dhcp-6-opt-8 = val-8 | dhcp-6-opt-9 = val-9
 CONNECTIONS:/org/freedesktop/NetworkManager/Settings/Connection/{1}:5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1
 
-GENERAL:eth1:ethernet:NMDeviceEthernet:::virtual:::E7\:78\:B1\:93\:2B\:22:0:20 (unavailable):0 (No reason given):/sys/devices/virtual/eth1::no:yes:yes:no:no:::::unknown
+GENERAL:eth1:ethernet:NMDeviceEthernet:::virtual:::E7\:78\:B1\:93\:2B\:22:0:20 (unavailable):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/eth1::no:yes:yes:no:no:::::unknown
 CAPABILITIES:no:100 Mb/s:no:no
 WIRED-PROPERTIES:off:
 IP4:192.168.127.210/25:192.168.88.4:dst = 192.168.222.35/19, nh = 192.168.170.142, mt = 3609264321 | dst = 192.168.135.81/32, nh = 192.168.32.11, mt = 1316413247 | dst = 192.168.24.65/26, nh = 192.168.23.163, mt = 3855574583:192.168.16.144 | 192.168.79.53 | 192.168.237.155:sear4.foo4.bar | sear4.foo3.bar | sear4.foo1.bar:192.168.211.91 | 192.168.58.182 | 192.168.114.97
@@ -26377,7 +26749,7 @@ IP6:2001\:a\:\:1c1\:c178\:169f\:2b80/93 | 2001\:a\:\:1f79\:e0fb\:87b9\:3cc6/123:
 DHCP6:dhcp-6-opt-2 = val-2 | dhcp-6-opt-5 = val-5 | dhcp-6-opt-6 = val-6 | dhcp-6-opt-8 = val-8 | dhcp-6-opt-9 = val-9
 CONNECTIONS:/org/freedesktop/NetworkManager/Settings/Connection/{1}:5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1
 
-GENERAL:wlan1:wifi:NMDeviceWifi:::virtual:::21\:E9\:64\:81\:8C\:A8:0:20 (unavailable):0 (No reason given):/sys/devices/virtual/wlan1::no:yes:yes:no:no:::::unknown
+GENERAL:wlan1:wifi:NMDeviceWifi:::virtual:::21\:E9\:64\:81\:8C\:A8:0:20 (unavailable):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/wlan1::no:yes:yes:no:no:::::unknown
 CAPABILITIES:no:unknown:no:no
 WIFI-PROPERTIES:yes:yes:yes:yes:yes:yes:yes:unknown:unknown
 AP[1]: :wlan1-ap-4:Infra:1:54 Mbit/s:48:**  :WPA1 WPA2
@@ -26387,7 +26759,7 @@ IP6:2001\:a\:\:fa05\:2ab4\:9300\:e8fe/116 | 2001\:a\:\:e9cf\:bd3\:caba\:99b3/86
 DHCP6:dhcp-6-opt-0 = val-0 | dhcp-6-opt-1 = val-1 | dhcp-6-opt-2 = val-2 | dhcp-6-opt-3 = val-3 | dhcp-6-opt-4 = val-4 | dhcp-6-opt-5 = val-5 | dhcp-6-opt-6 = val-6 | dhcp-6-opt-7 = val-7 | dhcp-6-opt-9 = val-9
 CONNECTIONS:/org/freedesktop/NetworkManager/Settings/Connection/{2}:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 
-GENERAL:wlan1:wifi:NMDeviceWifi:::virtual:::71\:52\:AD\:63\:5C\:7C:0:20 (unavailable):0 (No reason given):/sys/devices/virtual/wlan1::no:yes:yes:no:no:::::unknown
+GENERAL:wlan1:wifi:NMDeviceWifi:::virtual:::71\:52\:AD\:63\:5C\:7C:0:20 (unavailable):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/wlan1::no:yes:yes:no:no:::::unknown
 CAPABILITIES:no:unknown:no:no
 WIFI-PROPERTIES:yes:yes:yes:yes:yes:yes:yes:unknown:unknown
 IP4:192.168.97.124/29 | 192.168.76.154/18::dst = 192.168.33.233/22, nh = 192.168.222.210, mt = 2810496551:192.168.107.109:sear4.fo.o.bar | sear4.fo.x.y | sear4.foo2.bar | sear4.foo3.bar | sear4.foo4.bar:192.168.60.60 | 192.168.63.92
@@ -26396,27 +26768,27 @@ IP6:2001\:a\:\:88ca\:3654\:96b\:ab44/89::dst = 2001\:a\:\:cc8b\:7c09\:4673\:bbb0
 DHCP6:dhcp-6-opt-2 = val-2 | dhcp-6-opt-6 = val-6 | dhcp-6-opt-7 = val-7 | dhcp-6-opt-8 = val-8 | dhcp-6-opt-9 = val-9
 CONNECTIONS:/org/freedesktop/NetworkManager/Settings/Connection/{2}:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 
-GENERAL:wlan0:wifi:NMDeviceWifi:::virtual:::13\:E0\:74\:85\:7C\:D9:0:20 (unavailable):0 (No reason given):/sys/devices/virtual/wlan0::no:yes:yes:no:no::con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:/org/freedesktop/NetworkManager/ActiveConnection/2:unknown
+<<<
+size: 6361
+location: clients/tests/test-client.py:1062:test_004()/500
+cmd: $NMCLI --mode tabular --terse -f all dev show
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 6191 bytes
+>>>
+GENERAL:wlan0:wifi:NMDeviceWifi:::virtual:::13\:E0\:74\:85\:7C\:D9:0:20 (unavailable):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/wlan0::no:yes:yes:no:no::con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:/org/freedesktop/NetworkManager/ActiveConnection/2:unknown
 CAPABILITIES:no:unknown:no:no
 WIFI-PROPERTIES:yes:yes:yes:yes:yes:yes:yes:unknown:unknown
-AP[1]: :wlan0-ap-2:Infra:1:54 Mbit/s:92:****:WPA1 WPA2
-AP[2]: :wlan0-ap-1:Infra:1:54 Mbit/s:81:****:WPA1 WPA2
-AP[3]: :wlan0-ap-3:Infra:1:54 Mbit/s:55:**  :WPA1 WPA2
+AP[1]: :wlan0-ap-2:Infrastruktura:1:54 Mb/s:92:****:WPA1 WPA2
+AP[2]: :wlan0-ap-1:Infrastruktura:1:54 Mb/s:81:****:WPA1
+AP[3]: :wlan0-ap-3:Infrastruktura:1:54 Mb/s:55:**  :WPA3
 IP4:192.168.228.18/32 | 192.168.209.179/25:192.168.41.120:::sear4.foo2.bar | sear4.fo.x.y | sear4.foo1.bar | sear4.foo4.bar | sear4.fo.o.bar:192.168.120.79
 DHCP4:dhcp-4-opt-0 = val-0 | dhcp-4-opt-2 = val-2 | dhcp-4-opt-4 = val-4 | dhcp-4-opt-7 = val-7
 IP6:::dst = 2001\:a\:\:dd5b\:aa7b\:b4a2\:e42/102, nh = \:\:, mt = 2504159086::sear6.foo2.bar | sear6.foo1.bar | sear6.fo.x.y | sear6.fo.o.bar | sear6.foo3.bar | sear6.foo4.bar
 DHCP6:dhcp-6-opt-1 = val-1 | dhcp-6-opt-2 = val-2 | dhcp-6-opt-3 = val-3 | dhcp-6-opt-4 = val-4 | dhcp-6-opt-5 = val-5
 CONNECTIONS:/org/freedesktop/NetworkManager/Settings/Connection/{2}:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 
-<<<
-size: 6251
-location: clients/tests/test-client.py:1048:test_004()/500
-cmd: $NMCLI --mode tabular --terse -f all dev show
-lang: pl_PL.UTF-8
-returncode: 0
-stdout: 6081 bytes
->>>
-GENERAL:eth0:ethernet:NMDeviceEthernet:::virtual:::AB\:B7\:BF\:E2\:48\:E8:0:20 (unavailable):0 (No reason given):/sys/devices/virtual/eth0::no:yes:yes:no:no:::::unknown
+GENERAL:eth0:ethernet:NMDeviceEthernet:::virtual:::AB\:B7\:BF\:E2\:48\:E8:0:20 (unavailable):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/eth0::no:yes:yes:no:no:::::unknown
 CAPABILITIES:no:100 Mb/s:no:no
 WIRED-PROPERTIES:off:
 IP4:192.168.49.34/22 | 192.168.135.86/19:::192.168.45.230 | 192.168.180.201 | 192.168.253.2:sear4.foo2.bar | sear4.foo1.bar:192.168.163.23 | 192.168.151.246
@@ -26425,7 +26797,7 @@ IP6:2001\:a\:\:ed81\:3d7\:c2e9\:df82/99:::2001\:a\:\:2703\:f06\:9619\:d89f | 200
 DHCP6:dhcp-6-opt-0 = val-0 | dhcp-6-opt-1 = val-1 | dhcp-6-opt-2 = val-2 | dhcp-6-opt-3 = val-3 | dhcp-6-opt-4 = val-4 | dhcp-6-opt-5 = val-5 | dhcp-6-opt-6 = val-6 | dhcp-6-opt-7 = val-7 | dhcp-6-opt-8 = val-8 | dhcp-6-opt-9 = val-9
 CONNECTIONS:/org/freedesktop/NetworkManager/Settings/Connection/{1}:5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1
 
-GENERAL:eth1:ethernet:NMDeviceEthernet:::virtual:::E7\:78\:B1\:93\:2B\:22:0:20 (unavailable):0 (No reason given):/sys/devices/virtual/eth1::no:yes:yes:no:no:::::unknown
+GENERAL:eth1:ethernet:NMDeviceEthernet:::virtual:::E7\:78\:B1\:93\:2B\:22:0:20 (unavailable):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/eth1::no:yes:yes:no:no:::::unknown
 CAPABILITIES:no:100 Mb/s:no:no
 WIRED-PROPERTIES:off:
 IP4:192.168.127.210/25:192.168.88.4:dst = 192.168.222.35/19, nh = 192.168.170.142, mt = 3609264321 | dst = 192.168.135.81/32, nh = 192.168.32.11, mt = 1316413247 | dst = 192.168.24.65/26, nh = 192.168.23.163, mt = 3855574583:192.168.16.144 | 192.168.79.53 | 192.168.237.155:sear4.foo4.bar | sear4.foo3.bar | sear4.foo1.bar:192.168.211.91 | 192.168.58.182 | 192.168.114.97
@@ -26434,7 +26806,7 @@ IP6:2001\:a\:\:1c1\:c178\:169f\:2b80/93 | 2001\:a\:\:1f79\:e0fb\:87b9\:3cc6/123:
 DHCP6:dhcp-6-opt-2 = val-2 | dhcp-6-opt-5 = val-5 | dhcp-6-opt-6 = val-6 | dhcp-6-opt-8 = val-8 | dhcp-6-opt-9 = val-9
 CONNECTIONS:/org/freedesktop/NetworkManager/Settings/Connection/{1}:5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1
 
-GENERAL:wlan1:wifi:NMDeviceWifi:::virtual:::21\:E9\:64\:81\:8C\:A8:0:20 (unavailable):0 (No reason given):/sys/devices/virtual/wlan1::no:yes:yes:no:no:::::unknown
+GENERAL:wlan1:wifi:NMDeviceWifi:::virtual:::21\:E9\:64\:81\:8C\:A8:0:20 (unavailable):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/wlan1::no:yes:yes:no:no:::::unknown
 CAPABILITIES:no:unknown:no:no
 WIFI-PROPERTIES:yes:yes:yes:yes:yes:yes:yes:unknown:unknown
 AP[1]: :wlan1-ap-4:Infrastruktura:1:54 Mb/s:48:**  :WPA1 WPA2
@@ -26444,7 +26816,7 @@ IP6:2001\:a\:\:fa05\:2ab4\:9300\:e8fe/116 | 2001\:a\:\:e9cf\:bd3\:caba\:99b3/86
 DHCP6:dhcp-6-opt-0 = val-0 | dhcp-6-opt-1 = val-1 | dhcp-6-opt-2 = val-2 | dhcp-6-opt-3 = val-3 | dhcp-6-opt-4 = val-4 | dhcp-6-opt-5 = val-5 | dhcp-6-opt-6 = val-6 | dhcp-6-opt-7 = val-7 | dhcp-6-opt-9 = val-9
 CONNECTIONS:/org/freedesktop/NetworkManager/Settings/Connection/{2}:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 
-GENERAL:wlan1:wifi:NMDeviceWifi:::virtual:::71\:52\:AD\:63\:5C\:7C:0:20 (unavailable):0 (No reason given):/sys/devices/virtual/wlan1::no:yes:yes:no:no:::::unknown
+GENERAL:wlan1:wifi:NMDeviceWifi:::virtual:::71\:52\:AD\:63\:5C\:7C:0:20 (unavailable):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/wlan1::no:yes:yes:no:no:::::unknown
 CAPABILITIES:no:unknown:no:no
 WIFI-PROPERTIES:yes:yes:yes:yes:yes:yes:yes:unknown:unknown
 IP4:192.168.97.124/29 | 192.168.76.154/18::dst = 192.168.33.233/22, nh = 192.168.222.210, mt = 2810496551:192.168.107.109:sear4.fo.o.bar | sear4.fo.x.y | sear4.foo2.bar | sear4.foo3.bar | sear4.foo4.bar:192.168.60.60 | 192.168.63.92
@@ -26453,21 +26825,9 @@ IP6:2001\:a\:\:88ca\:3654\:96b\:ab44/89::dst = 2001\:a\:\:cc8b\:7c09\:4673\:bbb0
 DHCP6:dhcp-6-opt-2 = val-2 | dhcp-6-opt-6 = val-6 | dhcp-6-opt-7 = val-7 | dhcp-6-opt-8 = val-8 | dhcp-6-opt-9 = val-9
 CONNECTIONS:/org/freedesktop/NetworkManager/Settings/Connection/{2}:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 
-GENERAL:wlan0:wifi:NMDeviceWifi:::virtual:::13\:E0\:74\:85\:7C\:D9:0:20 (unavailable):0 (No reason given):/sys/devices/virtual/wlan0::no:yes:yes:no:no::con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:/org/freedesktop/NetworkManager/ActiveConnection/2:unknown
-CAPABILITIES:no:unknown:no:no
-WIFI-PROPERTIES:yes:yes:yes:yes:yes:yes:yes:unknown:unknown
-AP[1]: :wlan0-ap-2:Infrastruktura:1:54 Mb/s:92:****:WPA1 WPA2
-AP[2]: :wlan0-ap-1:Infrastruktura:1:54 Mb/s:81:****:WPA1 WPA2
-AP[3]: :wlan0-ap-3:Infrastruktura:1:54 Mb/s:55:**  :WPA1 WPA2
-IP4:192.168.228.18/32 | 192.168.209.179/25:192.168.41.120:::sear4.foo2.bar | sear4.fo.x.y | sear4.foo1.bar | sear4.foo4.bar | sear4.fo.o.bar:192.168.120.79
-DHCP4:dhcp-4-opt-0 = val-0 | dhcp-4-opt-2 = val-2 | dhcp-4-opt-4 = val-4 | dhcp-4-opt-7 = val-7
-IP6:::dst = 2001\:a\:\:dd5b\:aa7b\:b4a2\:e42/102, nh = \:\:, mt = 2504159086::sear6.foo2.bar | sear6.foo1.bar | sear6.fo.x.y | sear6.fo.o.bar | sear6.foo3.bar | sear6.foo4.bar
-DHCP6:dhcp-6-opt-1 = val-1 | dhcp-6-opt-2 = val-2 | dhcp-6-opt-3 = val-3 | dhcp-6-opt-4 = val-4 | dhcp-6-opt-5 = val-5
-CONNECTIONS:/org/freedesktop/NetworkManager/Settings/Connection/{2}:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
-
 <<<
 size: 604
-location: clients/tests/test-client.py:1051:test_004()/501
+location: clients/tests/test-client.py:1065:test_004()/501
 cmd: $NMCLI --mode tabular --terse dev show wlan0
 lang: C
 returncode: 0
@@ -26485,7 +26845,7 @@ IP6:::dst = 2001\:a\:\:dd5b\:aa7b\:b4a2\:e42/102, nh = \:\:, mt = 2504159086::se
 
 <<<
 size: 614
-location: clients/tests/test-client.py:1051:test_004()/502
+location: clients/tests/test-client.py:1065:test_004()/502
 cmd: $NMCLI --mode tabular --terse dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
@@ -26502,19 +26862,19 @@ IP4:192.168.228.18/32 | 192.168.209.179/25:192.168.41.120:::sear4.foo2.bar | sea
 IP6:::dst = 2001\:a\:\:dd5b\:aa7b\:b4a2\:e42/102, nh = \:\:, mt = 2504159086::sear6.foo2.bar | sear6.foo1.bar | sear6.fo.x.y | sear6.fo.o.bar | sear6.foo3.bar | sear6.foo4.bar
 
 <<<
-size: 1341
-location: clients/tests/test-client.py:1054:test_004()/503
+size: 1355
+location: clients/tests/test-client.py:1068:test_004()/503
 cmd: $NMCLI --mode tabular --terse -f all dev show wlan0
 lang: C
 returncode: 0
-stdout: 1175 bytes
+stdout: 1189 bytes
 >>>
-GENERAL:wlan0:wifi:NMDeviceWifi:::virtual:::13\:E0\:74\:85\:7C\:D9:0:20 (unavailable):0 (No reason given):/sys/devices/virtual/wlan0::no:yes:yes:no:no::con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:/org/freedesktop/NetworkManager/ActiveConnection/2:unknown
+GENERAL:wlan0:wifi:NMDeviceWifi:::virtual:::13\:E0\:74\:85\:7C\:D9:0:20 (unavailable):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/wlan0::no:yes:yes:no:no::con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:/org/freedesktop/NetworkManager/ActiveConnection/2:unknown
 CAPABILITIES:no:unknown:no:no
 WIFI-PROPERTIES:yes:yes:yes:yes:yes:yes:yes:unknown:unknown
 AP[1]: :wlan0-ap-2:Infra:1:54 Mbit/s:92:****:WPA1 WPA2
-AP[2]: :wlan0-ap-1:Infra:1:54 Mbit/s:81:****:WPA1 WPA2
-AP[3]: :wlan0-ap-3:Infra:1:54 Mbit/s:55:**  :WPA1 WPA2
+AP[2]: :wlan0-ap-1:Infra:1:54 Mbit/s:81:****:WPA1
+AP[3]: :wlan0-ap-3:Infra:1:54 Mbit/s:55:**  :WPA3
 IP4:192.168.228.18/32 | 192.168.209.179/25:192.168.41.120:::sear4.foo2.bar | sear4.fo.x.y | sear4.foo1.bar | sear4.foo4.bar | sear4.fo.o.bar:192.168.120.79
 DHCP4:dhcp-4-opt-0 = val-0 | dhcp-4-opt-2 = val-2 | dhcp-4-opt-4 = val-4 | dhcp-4-opt-7 = val-7
 IP6:::dst = 2001\:a\:\:dd5b\:aa7b\:b4a2\:e42/102, nh = \:\:, mt = 2504159086::sear6.foo2.bar | sear6.foo1.bar | sear6.fo.x.y | sear6.fo.o.bar | sear6.foo3.bar | sear6.foo4.bar
@@ -26522,19 +26882,19 @@ DHCP6:dhcp-6-opt-1 = val-1 | dhcp-6-opt-2 = val-2 | dhcp-6-opt-3 = val-3 | dhcp-
 CONNECTIONS:/org/freedesktop/NetworkManager/Settings/Connection/{2}:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 
 <<<
-size: 1378
-location: clients/tests/test-client.py:1054:test_004()/504
+size: 1392
+location: clients/tests/test-client.py:1068:test_004()/504
 cmd: $NMCLI --mode tabular --terse -f all dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 1202 bytes
+stdout: 1216 bytes
 >>>
-GENERAL:wlan0:wifi:NMDeviceWifi:::virtual:::13\:E0\:74\:85\:7C\:D9:0:20 (unavailable):0 (No reason given):/sys/devices/virtual/wlan0::no:yes:yes:no:no::con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:/org/freedesktop/NetworkManager/ActiveConnection/2:unknown
+GENERAL:wlan0:wifi:NMDeviceWifi:::virtual:::13\:E0\:74\:85\:7C\:D9:0:20 (unavailable):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/wlan0::no:yes:yes:no:no::con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:/org/freedesktop/NetworkManager/ActiveConnection/2:unknown
 CAPABILITIES:no:unknown:no:no
 WIFI-PROPERTIES:yes:yes:yes:yes:yes:yes:yes:unknown:unknown
 AP[1]: :wlan0-ap-2:Infrastruktura:1:54 Mb/s:92:****:WPA1 WPA2
-AP[2]: :wlan0-ap-1:Infrastruktura:1:54 Mb/s:81:****:WPA1 WPA2
-AP[3]: :wlan0-ap-3:Infrastruktura:1:54 Mb/s:55:**  :WPA1 WPA2
+AP[2]: :wlan0-ap-1:Infrastruktura:1:54 Mb/s:81:****:WPA1
+AP[3]: :wlan0-ap-3:Infrastruktura:1:54 Mb/s:55:**  :WPA3
 IP4:192.168.228.18/32 | 192.168.209.179/25:192.168.41.120:::sear4.foo2.bar | sear4.fo.x.y | sear4.foo1.bar | sear4.foo4.bar | sear4.fo.o.bar:192.168.120.79
 DHCP4:dhcp-4-opt-0 = val-0 | dhcp-4-opt-2 = val-2 | dhcp-4-opt-4 = val-4 | dhcp-4-opt-7 = val-7
 IP6:::dst = 2001\:a\:\:dd5b\:aa7b\:b4a2\:e42/102, nh = \:\:, mt = 2504159086::sear6.foo2.bar | sear6.foo1.bar | sear6.fo.x.y | sear6.fo.o.bar | sear6.foo3.bar | sear6.foo4.bar
@@ -26542,245 +26902,257 @@ DHCP6:dhcp-6-opt-1 = val-1 | dhcp-6-opt-2 = val-2 | dhcp-6-opt-3 = val-3 | dhcp-
 CONNECTIONS:/org/freedesktop/NetworkManager/Settings/Connection/{2}:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 
 <<<
-size: 541
-location: clients/tests/test-client.py:1057:test_004()/505
+size: 565
+location: clients/tests/test-client.py:1071:test_004()/505
 cmd: $NMCLI --mode tabular --terse -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: C
 returncode: 0
-stdout: 341 bytes
+stdout: 365 bytes
 >>>
-GENERAL:wlan0:wifi:NMDeviceWifi:::virtual:::13\:E0\:74\:85\:7C\:D9:0:20 (unavailable):0 (No reason given):/sys/devices/virtual/wlan0::no:yes:yes:no:no::con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:/org/freedesktop/NetworkManager/ActiveConnection/2:unknown
+GENERAL:wlan0:wifi:NMDeviceWifi:::virtual:::13\:E0\:74\:85\:7C\:D9:0:20 (unavailable):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/wlan0::no:yes:yes:no:no::con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:/org/freedesktop/NetworkManager/ActiveConnection/2:unknown
 13\:E0\:74\:85\:7C\:D9
 WIFI-PROPERTIES:yes:yes:yes:yes:yes:yes:yes:unknown:unknown
 
 <<<
-size: 551
-location: clients/tests/test-client.py:1057:test_004()/506
+size: 575
+location: clients/tests/test-client.py:1071:test_004()/506
 cmd: $NMCLI --mode tabular --terse -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 341 bytes
+stdout: 365 bytes
 >>>
-GENERAL:wlan0:wifi:NMDeviceWifi:::virtual:::13\:E0\:74\:85\:7C\:D9:0:20 (unavailable):0 (No reason given):/sys/devices/virtual/wlan0::no:yes:yes:no:no::con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:/org/freedesktop/NetworkManager/ActiveConnection/2:unknown
+GENERAL:wlan0:wifi:NMDeviceWifi:::virtual:::13\:E0\:74\:85\:7C\:D9:0:20 (unavailable):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/wlan0::no:yes:yes:no:no::con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:/org/freedesktop/NetworkManager/ActiveConnection/2:unknown
 13\:E0\:74\:85\:7C\:D9
 WIFI-PROPERTIES:yes:yes:yes:yes:yes:yes:yes:unknown:unknown
 
 <<<
-size: 541
-location: clients/tests/test-client.py:1060:test_004()/507
+size: 565
+location: clients/tests/test-client.py:1074:test_004()/507
 cmd: $NMCLI --mode tabular --terse -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: C
 returncode: 0
-stdout: 341 bytes
+stdout: 365 bytes
 >>>
-GENERAL:wlan0:wifi:NMDeviceWifi:::virtual:::13\:E0\:74\:85\:7C\:D9:0:20 (unavailable):0 (No reason given):/sys/devices/virtual/wlan0::no:yes:yes:no:no::con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:/org/freedesktop/NetworkManager/ActiveConnection/2:unknown
+GENERAL:wlan0:wifi:NMDeviceWifi:::virtual:::13\:E0\:74\:85\:7C\:D9:0:20 (unavailable):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/wlan0::no:yes:yes:no:no::con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:/org/freedesktop/NetworkManager/ActiveConnection/2:unknown
 13\:E0\:74\:85\:7C\:D9
 WIFI-PROPERTIES:yes:yes:yes:yes:yes:yes:yes:unknown:unknown
 
 <<<
-size: 551
-location: clients/tests/test-client.py:1060:test_004()/508
+size: 575
+location: clients/tests/test-client.py:1074:test_004()/508
 cmd: $NMCLI --mode tabular --terse -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 341 bytes
+stdout: 365 bytes
 >>>
-GENERAL:wlan0:wifi:NMDeviceWifi:::virtual:::13\:E0\:74\:85\:7C\:D9:0:20 (unavailable):0 (No reason given):/sys/devices/virtual/wlan0::no:yes:yes:no:no::con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:/org/freedesktop/NetworkManager/ActiveConnection/2:unknown
+GENERAL:wlan0:wifi:NMDeviceWifi:::virtual:::13\:E0\:74\:85\:7C\:D9:0:20 (unavailable):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/wlan0::no:yes:yes:no:no::con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:/org/freedesktop/NetworkManager/ActiveConnection/2:unknown
 13\:E0\:74\:85\:7C\:D9
 WIFI-PROPERTIES:yes:yes:yes:yes:yes:yes:yes:unknown:unknown
 
 <<<
 size: 443
-location: clients/tests/test-client.py:1063:test_004()/509
+location: clients/tests/test-client.py:1077:test_004()/509
 cmd: $NMCLI --mode tabular --terse -f DEVICE,TYPE,DBUS-PATH dev
 lang: C
 returncode: 0
 stdout: 271 bytes
 >>>
+wlan0:wifi:/org/freedesktop/NetworkManager/Devices/3
 eth0:ethernet:/org/freedesktop/NetworkManager/Devices/1
 eth1:ethernet:/org/freedesktop/NetworkManager/Devices/2
 wlan1:wifi:/org/freedesktop/NetworkManager/Devices/4
 wlan1:wifi:/org/freedesktop/NetworkManager/Devices/5
-wlan0:wifi:/org/freedesktop/NetworkManager/Devices/3
 
 <<<
 size: 453
-location: clients/tests/test-client.py:1063:test_004()/510
+location: clients/tests/test-client.py:1077:test_004()/510
 cmd: $NMCLI --mode tabular --terse -f DEVICE,TYPE,DBUS-PATH dev
 lang: pl_PL.UTF-8
 returncode: 0
 stdout: 271 bytes
 >>>
+wlan0:wifi:/org/freedesktop/NetworkManager/Devices/3
 eth0:ethernet:/org/freedesktop/NetworkManager/Devices/1
 eth1:ethernet:/org/freedesktop/NetworkManager/Devices/2
 wlan1:wifi:/org/freedesktop/NetworkManager/Devices/4
 wlan1:wifi:/org/freedesktop/NetworkManager/Devices/5
-wlan0:wifi:/org/freedesktop/NetworkManager/Devices/3
 
 <<<
-size: 1190
-location: clients/tests/test-client.py:1066:test_004()/511
+size: 1101
+location: clients/tests/test-client.py:1080:test_004()/511
 cmd: $NMCLI --mode tabular --terse -f ALL device wifi list
 lang: C
 returncode: 0
-stdout: 1022 bytes
+stdout: 934 bytes
 >>>
+AP[1]:wlan0-ap-2:776C616E302D61702D32:C0\:E2\:BE\:E8\:EF\:B6:Infra:1:2412 MHz:54 Mbit/s:92:****:WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:no: :/org/freedesktop/NetworkManager/AccessPoint/2
+AP[2]:wlan0-ap-1:776C616E302D61702D31:61\:95\:77\:AC\:1E\:4C:Infra:1:2412 MHz:54 Mbit/s:81:****:WPA1:pair_tkip pair_ccmp group_tkip group_ccmp psk:(none):wlan0:no: :/org/freedesktop/NetworkManager/AccessPoint/1
+AP[3]:wlan0-ap-3:776C616E302D61702D33:9B\:F6\:B7\:EC\:97\:76:Infra:1:2412 MHz:54 Mbit/s:55:**  :WPA3:(none):pair_tkip pair_ccmp group_tkip group_ccmp sae:wlan0:no: :/org/freedesktop/NetworkManager/AccessPoint/3
+
 AP[1]:wlan1-ap-4:776C616E312D61702D34:94\:2B\:E8\:F6\:D2\:86:Infra:1:2412 MHz:54 Mbit/s:48:**  :WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan1:no: :/org/freedesktop/NetworkManager/AccessPoint/4
 
 
-AP[1]:wlan0-ap-2:776C616E302D61702D32:C0\:E2\:BE\:E8\:EF\:B6:Infra:1:2412 MHz:54 Mbit/s:92:****:WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:no: :/org/freedesktop/NetworkManager/AccessPoint/2
-AP[2]:wlan0-ap-1:776C616E302D61702D31:61\:95\:77\:AC\:1E\:4C:Infra:1:2412 MHz:54 Mbit/s:81:****:WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:no: :/org/freedesktop/NetworkManager/AccessPoint/1
-AP[3]:wlan0-ap-3:776C616E302D61702D33:9B\:F6\:B7\:EC\:97\:76:Infra:1:2412 MHz:54 Mbit/s:55:**  :WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:no: :/org/freedesktop/NetworkManager/AccessPoint/3
-
 <<<
-size: 1248
-location: clients/tests/test-client.py:1066:test_004()/512
+size: 1159
+location: clients/tests/test-client.py:1080:test_004()/512
 cmd: $NMCLI --mode tabular --terse -f ALL device wifi list
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 1070 bytes
+stdout: 982 bytes
 >>>
-AP[1]:wlan1-ap-4:776C616E312D61702D34:94\:2B\:E8\:F6\:D2\:86:Infrastruktura:1:2412 MHz:54 Mb/s:48:**  :WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan1:nie: :/org/freedesktop/NetworkManager/AccessPoint/4
+AP[1]:wlan0-ap-2:776C616E302D61702D32:C0\:E2\:BE\:E8\:EF\:B6:Infrastruktura:1:2412 MHz:54 Mb/s:92:****:WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:nie: :/org/freedesktop/NetworkManager/AccessPoint/2
+AP[2]:wlan0-ap-1:776C616E302D61702D31:61\:95\:77\:AC\:1E\:4C:Infrastruktura:1:2412 MHz:54 Mb/s:81:****:WPA1:pair_tkip pair_ccmp group_tkip group_ccmp psk:(brak):wlan0:nie: :/org/freedesktop/NetworkManager/AccessPoint/1
+AP[3]:wlan0-ap-3:776C616E302D61702D33:9B\:F6\:B7\:EC\:97\:76:Infrastruktura:1:2412 MHz:54 Mb/s:55:**  :WPA3:(brak):pair_tkip pair_ccmp group_tkip group_ccmp sae:wlan0:nie: :/org/freedesktop/NetworkManager/AccessPoint/3
 
+AP[1]:wlan1-ap-4:776C616E312D61702D34:94\:2B\:E8\:F6\:D2\:86:Infrastruktura:1:2412 MHz:54 Mb/s:48:**  :WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan1:nie: :/org/freedesktop/NetworkManager/AccessPoint/4
 
-AP[1]:wlan0-ap-2:776C616E302D61702D32:C0\:E2\:BE\:E8\:EF\:B6:Infrastruktura:1:2412 MHz:54 Mb/s:92:****:WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:nie: :/org/freedesktop/NetworkManager/AccessPoint/2
-AP[2]:wlan0-ap-1:776C616E302D61702D31:61\:95\:77\:AC\:1E\:4C:Infrastruktura:1:2412 MHz:54 Mb/s:81:****:WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:nie: :/org/freedesktop/NetworkManager/AccessPoint/1
-AP[3]:wlan0-ap-3:776C616E302D61702D33:9B\:F6\:B7\:EC\:97\:76:Infrastruktura:1:2412 MHz:54 Mb/s:55:**  :WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:nie: :/org/freedesktop/NetworkManager/AccessPoint/3
 
 <<<
-size: 368
-location: clients/tests/test-client.py:1068:test_004()/513
+size: 358
+location: clients/tests/test-client.py:1082:test_004()/513
 cmd: $NMCLI --mode tabular --terse -f COMMON device wifi list
 lang: C
 returncode: 0
-stdout: 198 bytes
+stdout: 188 bytes
 >>>
- :wlan1-ap-4:Infra:1:54 Mbit/s:48:**  :WPA1 WPA2
+ :wlan0-ap-2:Infra:1:54 Mbit/s:92:****:WPA1 WPA2
+ :wlan0-ap-1:Infra:1:54 Mbit/s:81:****:WPA1
+ :wlan0-ap-3:Infra:1:54 Mbit/s:55:**  :WPA3
 
+ :wlan1-ap-4:Infra:1:54 Mbit/s:48:**  :WPA1 WPA2
 
- :wlan0-ap-2:Infra:1:54 Mbit/s:92:****:WPA1 WPA2
- :wlan0-ap-1:Infra:1:54 Mbit/s:81:****:WPA1 WPA2
- :wlan0-ap-3:Infra:1:54 Mbit/s:55:**  :WPA1 WPA2
 
 <<<
-size: 414
-location: clients/tests/test-client.py:1068:test_004()/514
+size: 404
+location: clients/tests/test-client.py:1082:test_004()/514
 cmd: $NMCLI --mode tabular --terse -f COMMON device wifi list
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 234 bytes
+stdout: 224 bytes
 >>>
- :wlan1-ap-4:Infrastruktura:1:54 Mb/s:48:**  :WPA1 WPA2
+ :wlan0-ap-2:Infrastruktura:1:54 Mb/s:92:****:WPA1 WPA2
+ :wlan0-ap-1:Infrastruktura:1:54 Mb/s:81:****:WPA1
+ :wlan0-ap-3:Infrastruktura:1:54 Mb/s:55:**  :WPA3
 
+ :wlan1-ap-4:Infrastruktura:1:54 Mb/s:48:**  :WPA1 WPA2
 
- :wlan0-ap-2:Infrastruktura:1:54 Mb/s:92:****:WPA1 WPA2
- :wlan0-ap-1:Infrastruktura:1:54 Mb/s:81:****:WPA1 WPA2
- :wlan0-ap-3:Infrastruktura:1:54 Mb/s:55:**  :WPA1 WPA2
 
 <<<
-size: 1303
-location: clients/tests/test-client.py:1071:test_004()/515
+size: 1214
+location: clients/tests/test-client.py:1085:test_004()/515
 cmd: $NMCLI --mode tabular --terse -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list
 lang: C
 returncode: 0
-stdout: 1022 bytes
+stdout: 934 bytes
 >>>
-AP[1]:wlan1-ap-4:776C616E312D61702D34:94\:2B\:E8\:F6\:D2\:86:Infra:1:2412 MHz:54 Mbit/s:48:**  :WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan1:no: :/org/freedesktop/NetworkManager/AccessPoint/4
+AP[1]:wlan0-ap-2:776C616E302D61702D32:C0\:E2\:BE\:E8\:EF\:B6:Infra:1:2412 MHz:54 Mbit/s:92:****:WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:no: :/org/freedesktop/NetworkManager/AccessPoint/2
+AP[2]:wlan0-ap-1:776C616E302D61702D31:61\:95\:77\:AC\:1E\:4C:Infra:1:2412 MHz:54 Mbit/s:81:****:WPA1:pair_tkip pair_ccmp group_tkip group_ccmp psk:(none):wlan0:no: :/org/freedesktop/NetworkManager/AccessPoint/1
+AP[3]:wlan0-ap-3:776C616E302D61702D33:9B\:F6\:B7\:EC\:97\:76:Infra:1:2412 MHz:54 Mbit/s:55:**  :WPA3:(none):pair_tkip pair_ccmp group_tkip group_ccmp sae:wlan0:no: :/org/freedesktop/NetworkManager/AccessPoint/3
 
+AP[1]:wlan1-ap-4:776C616E312D61702D34:94\:2B\:E8\:F6\:D2\:86:Infra:1:2412 MHz:54 Mbit/s:48:**  :WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan1:no: :/org/freedesktop/NetworkManager/AccessPoint/4
 
-AP[1]:wlan0-ap-2:776C616E302D61702D32:C0\:E2\:BE\:E8\:EF\:B6:Infra:1:2412 MHz:54 Mbit/s:92:****:WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:no: :/org/freedesktop/NetworkManager/AccessPoint/2
-AP[2]:wlan0-ap-1:776C616E302D61702D31:61\:95\:77\:AC\:1E\:4C:Infra:1:2412 MHz:54 Mbit/s:81:****:WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:no: :/org/freedesktop/NetworkManager/AccessPoint/1
-AP[3]:wlan0-ap-3:776C616E302D61702D33:9B\:F6\:B7\:EC\:97\:76:Infra:1:2412 MHz:54 Mbit/s:55:**  :WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:no: :/org/freedesktop/NetworkManager/AccessPoint/3
 
 <<<
-size: 1361
-location: clients/tests/test-client.py:1071:test_004()/516
+size: 1272
+location: clients/tests/test-client.py:1085:test_004()/516
 cmd: $NMCLI --mode tabular --terse -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 1070 bytes
+stdout: 982 bytes
 >>>
-AP[1]:wlan1-ap-4:776C616E312D61702D34:94\:2B\:E8\:F6\:D2\:86:Infrastruktura:1:2412 MHz:54 Mb/s:48:**  :WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan1:nie: :/org/freedesktop/NetworkManager/AccessPoint/4
+AP[1]:wlan0-ap-2:776C616E302D61702D32:C0\:E2\:BE\:E8\:EF\:B6:Infrastruktura:1:2412 MHz:54 Mb/s:92:****:WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:nie: :/org/freedesktop/NetworkManager/AccessPoint/2
+AP[2]:wlan0-ap-1:776C616E302D61702D31:61\:95\:77\:AC\:1E\:4C:Infrastruktura:1:2412 MHz:54 Mb/s:81:****:WPA1:pair_tkip pair_ccmp group_tkip group_ccmp psk:(brak):wlan0:nie: :/org/freedesktop/NetworkManager/AccessPoint/1
+AP[3]:wlan0-ap-3:776C616E302D61702D33:9B\:F6\:B7\:EC\:97\:76:Infrastruktura:1:2412 MHz:54 Mb/s:55:**  :WPA3:(brak):pair_tkip pair_ccmp group_tkip group_ccmp sae:wlan0:nie: :/org/freedesktop/NetworkManager/AccessPoint/3
 
+AP[1]:wlan1-ap-4:776C616E312D61702D34:94\:2B\:E8\:F6\:D2\:86:Infrastruktura:1:2412 MHz:54 Mb/s:48:**  :WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan1:nie: :/org/freedesktop/NetworkManager/AccessPoint/4
 
-AP[1]:wlan0-ap-2:776C616E302D61702D32:C0\:E2\:BE\:E8\:EF\:B6:Infrastruktura:1:2412 MHz:54 Mb/s:92:****:WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:nie: :/org/freedesktop/NetworkManager/AccessPoint/2
-AP[2]:wlan0-ap-1:776C616E302D61702D31:61\:95\:77\:AC\:1E\:4C:Infrastruktura:1:2412 MHz:54 Mb/s:81:****:WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:nie: :/org/freedesktop/NetworkManager/AccessPoint/1
-AP[3]:wlan0-ap-3:776C616E302D61702D33:9B\:F6\:B7\:EC\:97\:76:Infrastruktura:1:2412 MHz:54 Mb/s:55:**  :WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:nie: :/org/freedesktop/NetworkManager/AccessPoint/3
 
 <<<
-size: 446
-location: clients/tests/test-client.py:1073:test_004()/517
+size: 448
+location: clients/tests/test-client.py:1087:test_004()/517
 cmd: $NMCLI --mode tabular --terse -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: C
 returncode: 0
-stdout: 255 bytes
+stdout: 257 bytes
 >>>
 AP[1]:wlan0-ap-2:776C616E302D61702D32:C0\:E2\:BE\:E8\:EF\:B6:Infra:1:2412 MHz:54 Mbit/s:92:****:WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:no: :/org/freedesktop/NetworkManager/AccessPoint/2
 
+
+
 <<<
-size: 468
-location: clients/tests/test-client.py:1073:test_004()/518
+size: 470
+location: clients/tests/test-client.py:1087:test_004()/518
 cmd: $NMCLI --mode tabular --terse -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 267 bytes
+stdout: 269 bytes
 >>>
 AP[1]:wlan0-ap-2:776C616E302D61702D32:C0\:E2\:BE\:E8\:EF\:B6:Infrastruktura:1:2412 MHz:54 Mb/s:92:****:WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:nie: :/org/freedesktop/NetworkManager/AccessPoint/2
 
+
+
 <<<
-size: 242
-location: clients/tests/test-client.py:1075:test_004()/519
+size: 244
+location: clients/tests/test-client.py:1089:test_004()/519
 cmd: $NMCLI --mode tabular --terse -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: C
 returncode: 0
-stdout: 49 bytes
+stdout: 51 bytes
 >>>
  :wlan0-ap-2:Infra:1:54 Mbit/s:92:****:WPA1 WPA2
 
+
+
 <<<
-size: 261
-location: clients/tests/test-client.py:1075:test_004()/520
+size: 263
+location: clients/tests/test-client.py:1089:test_004()/520
 cmd: $NMCLI --mode tabular --terse -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 58 bytes
+stdout: 60 bytes
 >>>
  :wlan0-ap-2:Infrastruktura:1:54 Mb/s:92:****:WPA1 WPA2
 
+
+
 <<<
-size: 559
-location: clients/tests/test-client.py:1078:test_004()/521
+size: 561
+location: clients/tests/test-client.py:1092:test_004()/521
 cmd: $NMCLI --mode tabular --terse -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: C
 returncode: 0
-stdout: 255 bytes
+stdout: 257 bytes
 >>>
 AP[1]:wlan0-ap-2:776C616E302D61702D32:C0\:E2\:BE\:E8\:EF\:B6:Infra:1:2412 MHz:54 Mbit/s:92:****:WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:no: :/org/freedesktop/NetworkManager/AccessPoint/2
 
+
+
 <<<
-size: 581
-location: clients/tests/test-client.py:1078:test_004()/522
+size: 583
+location: clients/tests/test-client.py:1092:test_004()/522
 cmd: $NMCLI --mode tabular --terse -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 267 bytes
+stdout: 269 bytes
 >>>
 AP[1]:wlan0-ap-2:776C616E302D61702D32:C0\:E2\:BE\:E8\:EF\:B6:Infrastruktura:1:2412 MHz:54 Mb/s:92:****:WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:nie: :/org/freedesktop/NetworkManager/AccessPoint/2
 
+
+
 <<<
-size: 1344
-location: clients/tests/test-client.py:1080:test_004()/523
+size: 1358
+location: clients/tests/test-client.py:1094:test_004()/523
 cmd: $NMCLI --mode tabular --terse -f ALL device show wlan0
 lang: C
 returncode: 0
-stdout: 1175 bytes
+stdout: 1189 bytes
 >>>
-GENERAL:wlan0:wifi:NMDeviceWifi:::virtual:::13\:E0\:74\:85\:7C\:D9:0:20 (unavailable):0 (No reason given):/sys/devices/virtual/wlan0::no:yes:yes:no:no::con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:/org/freedesktop/NetworkManager/ActiveConnection/2:unknown
+GENERAL:wlan0:wifi:NMDeviceWifi:::virtual:::13\:E0\:74\:85\:7C\:D9:0:20 (unavailable):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/wlan0::no:yes:yes:no:no::con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:/org/freedesktop/NetworkManager/ActiveConnection/2:unknown
 CAPABILITIES:no:unknown:no:no
 WIFI-PROPERTIES:yes:yes:yes:yes:yes:yes:yes:unknown:unknown
 AP[1]: :wlan0-ap-2:Infra:1:54 Mbit/s:92:****:WPA1 WPA2
-AP[2]: :wlan0-ap-1:Infra:1:54 Mbit/s:81:****:WPA1 WPA2
-AP[3]: :wlan0-ap-3:Infra:1:54 Mbit/s:55:**  :WPA1 WPA2
+AP[2]: :wlan0-ap-1:Infra:1:54 Mbit/s:81:****:WPA1
+AP[3]: :wlan0-ap-3:Infra:1:54 Mbit/s:55:**  :WPA3
 IP4:192.168.228.18/32 | 192.168.209.179/25:192.168.41.120:::sear4.foo2.bar | sear4.fo.x.y | sear4.foo1.bar | sear4.foo4.bar | sear4.fo.o.bar:192.168.120.79
 DHCP4:dhcp-4-opt-0 = val-0 | dhcp-4-opt-2 = val-2 | dhcp-4-opt-4 = val-4 | dhcp-4-opt-7 = val-7
 IP6:::dst = 2001\:a\:\:dd5b\:aa7b\:b4a2\:e42/102, nh = \:\:, mt = 2504159086::sear6.foo2.bar | sear6.foo1.bar | sear6.fo.x.y | sear6.fo.o.bar | sear6.foo3.bar | sear6.foo4.bar
@@ -26788,19 +27160,19 @@ DHCP6:dhcp-6-opt-1 = val-1 | dhcp-6-opt-2 = val-2 | dhcp-6-opt-3 = val-3 | dhcp-
 CONNECTIONS:/org/freedesktop/NetworkManager/Settings/Connection/{2}:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 
 <<<
-size: 1381
-location: clients/tests/test-client.py:1080:test_004()/524
+size: 1395
+location: clients/tests/test-client.py:1094:test_004()/524
 cmd: $NMCLI --mode tabular --terse -f ALL device show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 1202 bytes
+stdout: 1216 bytes
 >>>
-GENERAL:wlan0:wifi:NMDeviceWifi:::virtual:::13\:E0\:74\:85\:7C\:D9:0:20 (unavailable):0 (No reason given):/sys/devices/virtual/wlan0::no:yes:yes:no:no::con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:/org/freedesktop/NetworkManager/ActiveConnection/2:unknown
+GENERAL:wlan0:wifi:NMDeviceWifi:::virtual:::13\:E0\:74\:85\:7C\:D9:0:20 (unavailable):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/wlan0::no:yes:yes:no:no::con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:/org/freedesktop/NetworkManager/ActiveConnection/2:unknown
 CAPABILITIES:no:unknown:no:no
 WIFI-PROPERTIES:yes:yes:yes:yes:yes:yes:yes:unknown:unknown
 AP[1]: :wlan0-ap-2:Infrastruktura:1:54 Mb/s:92:****:WPA1 WPA2
-AP[2]: :wlan0-ap-1:Infrastruktura:1:54 Mb/s:81:****:WPA1 WPA2
-AP[3]: :wlan0-ap-3:Infrastruktura:1:54 Mb/s:55:**  :WPA1 WPA2
+AP[2]: :wlan0-ap-1:Infrastruktura:1:54 Mb/s:81:****:WPA1
+AP[3]: :wlan0-ap-3:Infrastruktura:1:54 Mb/s:55:**  :WPA3
 IP4:192.168.228.18/32 | 192.168.209.179/25:192.168.41.120:::sear4.foo2.bar | sear4.fo.x.y | sear4.foo1.bar | sear4.foo4.bar | sear4.fo.o.bar:192.168.120.79
 DHCP4:dhcp-4-opt-0 = val-0 | dhcp-4-opt-2 = val-2 | dhcp-4-opt-4 = val-4 | dhcp-4-opt-7 = val-7
 IP6:::dst = 2001\:a\:\:dd5b\:aa7b\:b4a2\:e42/102, nh = \:\:, mt = 2504159086::sear6.foo2.bar | sear6.foo1.bar | sear6.fo.x.y | sear6.fo.o.bar | sear6.foo3.bar | sear6.foo4.bar
@@ -26809,7 +27181,7 @@ CONNECTIONS:/org/freedesktop/NetworkManager/Settings/Connection/{2}:UUID-con-xx1
 
 <<<
 size: 617
-location: clients/tests/test-client.py:1082:test_004()/525
+location: clients/tests/test-client.py:1096:test_004()/525
 cmd: $NMCLI --mode tabular --terse -f COMMON device show wlan0
 lang: C
 returncode: 0
@@ -26827,7 +27199,7 @@ IP6:::dst = 2001\:a\:\:dd5b\:aa7b\:b4a2\:e42/102, nh = \:\:, mt = 2504159086::se
 
 <<<
 size: 627
-location: clients/tests/test-client.py:1082:test_004()/526
+location: clients/tests/test-client.py:1096:test_004()/526
 cmd: $NMCLI --mode tabular --terse -f COMMON device show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
@@ -26844,19 +27216,19 @@ IP4:192.168.228.18/32 | 192.168.209.179/25:192.168.41.120:::sear4.foo2.bar | sea
 IP6:::dst = 2001\:a\:\:dd5b\:aa7b\:b4a2\:e42/102, nh = \:\:, mt = 2504159086::sear6.foo2.bar | sear6.foo1.bar | sear6.fo.x.y | sear6.fo.o.bar | sear6.foo3.bar | sear6.foo4.bar
 
 <<<
-size: 1482
-location: clients/tests/test-client.py:1084:test_004()/527
+size: 1496
+location: clients/tests/test-client.py:1098:test_004()/527
 cmd: $NMCLI --mode tabular --terse -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0
 lang: C
 returncode: 0
-stdout: 1175 bytes
+stdout: 1189 bytes
 >>>
-GENERAL:wlan0:wifi:NMDeviceWifi:::virtual:::13\:E0\:74\:85\:7C\:D9:0:20 (unavailable):0 (No reason given):/sys/devices/virtual/wlan0::no:yes:yes:no:no::con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:/org/freedesktop/NetworkManager/ActiveConnection/2:unknown
+GENERAL:wlan0:wifi:NMDeviceWifi:::virtual:::13\:E0\:74\:85\:7C\:D9:0:20 (unavailable):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/wlan0::no:yes:yes:no:no::con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:/org/freedesktop/NetworkManager/ActiveConnection/2:unknown
 CAPABILITIES:no:unknown:no:no
 WIFI-PROPERTIES:yes:yes:yes:yes:yes:yes:yes:unknown:unknown
 AP[1]: :wlan0-ap-2:Infra:1:54 Mbit/s:92:****:WPA1 WPA2
-AP[2]: :wlan0-ap-1:Infra:1:54 Mbit/s:81:****:WPA1 WPA2
-AP[3]: :wlan0-ap-3:Infra:1:54 Mbit/s:55:**  :WPA1 WPA2
+AP[2]: :wlan0-ap-1:Infra:1:54 Mbit/s:81:****:WPA1
+AP[3]: :wlan0-ap-3:Infra:1:54 Mbit/s:55:**  :WPA3
 IP4:192.168.228.18/32 | 192.168.209.179/25:192.168.41.120:::sear4.foo2.bar | sear4.fo.x.y | sear4.foo1.bar | sear4.foo4.bar | sear4.fo.o.bar:192.168.120.79
 DHCP4:dhcp-4-opt-0 = val-0 | dhcp-4-opt-2 = val-2 | dhcp-4-opt-4 = val-4 | dhcp-4-opt-7 = val-7
 IP6:::dst = 2001\:a\:\:dd5b\:aa7b\:b4a2\:e42/102, nh = \:\:, mt = 2504159086::sear6.foo2.bar | sear6.foo1.bar | sear6.fo.x.y | sear6.fo.o.bar | sear6.foo3.bar | sear6.foo4.bar
@@ -26864,19 +27236,19 @@ DHCP6:dhcp-6-opt-1 = val-1 | dhcp-6-opt-2 = val-2 | dhcp-6-opt-3 = val-3 | dhcp-
 CONNECTIONS:/org/freedesktop/NetworkManager/Settings/Connection/{2}:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 
 <<<
-size: 1519
-location: clients/tests/test-client.py:1084:test_004()/528
+size: 1533
+location: clients/tests/test-client.py:1098:test_004()/528
 cmd: $NMCLI --mode tabular --terse -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 1202 bytes
+stdout: 1216 bytes
 >>>
-GENERAL:wlan0:wifi:NMDeviceWifi:::virtual:::13\:E0\:74\:85\:7C\:D9:0:20 (unavailable):0 (No reason given):/sys/devices/virtual/wlan0::no:yes:yes:no:no::con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:/org/freedesktop/NetworkManager/ActiveConnection/2:unknown
+GENERAL:wlan0:wifi:NMDeviceWifi:::virtual:::13\:E0\:74\:85\:7C\:D9:0:20 (unavailable):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/wlan0::no:yes:yes:no:no::con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:/org/freedesktop/NetworkManager/ActiveConnection/2:unknown
 CAPABILITIES:no:unknown:no:no
 WIFI-PROPERTIES:yes:yes:yes:yes:yes:yes:yes:unknown:unknown
 AP[1]: :wlan0-ap-2:Infrastruktura:1:54 Mb/s:92:****:WPA1 WPA2
-AP[2]: :wlan0-ap-1:Infrastruktura:1:54 Mb/s:81:****:WPA1 WPA2
-AP[3]: :wlan0-ap-3:Infrastruktura:1:54 Mb/s:55:**  :WPA1 WPA2
+AP[2]: :wlan0-ap-1:Infrastruktura:1:54 Mb/s:81:****:WPA1
+AP[3]: :wlan0-ap-3:Infrastruktura:1:54 Mb/s:55:**  :WPA3
 IP4:192.168.228.18/32 | 192.168.209.179/25:192.168.41.120:::sear4.foo2.bar | sear4.fo.x.y | sear4.foo1.bar | sear4.foo4.bar | sear4.fo.o.bar:192.168.120.79
 DHCP4:dhcp-4-opt-0 = val-0 | dhcp-4-opt-2 = val-2 | dhcp-4-opt-4 = val-4 | dhcp-4-opt-7 = val-7
 IP6:::dst = 2001\:a\:\:dd5b\:aa7b\:b4a2\:e42/102, nh = \:\:, mt = 2504159086::sear6.foo2.bar | sear6.foo1.bar | sear6.fo.x.y | sear6.fo.o.bar | sear6.foo3.bar | sear6.foo4.bar
@@ -26885,7 +27257,7 @@ CONNECTIONS:/org/freedesktop/NetworkManager/Settings/Connection/{2}:UUID-con-xx1
 
 <<<
 size: 803
-location: clients/tests/test-client.py:1022:test_004()/529
+location: clients/tests/test-client.py:1036:test_004()/529
 cmd: $NMCLI --mode tabular --terse --color yes con s con-vpn-1
 lang: C
 returncode: 0
@@ -26901,7 +27273,7 @@ VPN:openvpn:::*** VPN connection con-vpn-1 ***:5 - VPN connected:key1 = val1 | k
 
 <<<
 size: 813
-location: clients/tests/test-client.py:1022:test_004()/530
+location: clients/tests/test-client.py:1036:test_004()/530
 cmd: $NMCLI --mode tabular --terse --color yes con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
@@ -26917,7 +27289,7 @@ VPN:openvpn:::*** VPN connection con-vpn-1 ***:5 - VPN connected:key1 = val1 | k
 
 <<<
 size: 803
-location: clients/tests/test-client.py:1024:test_004()/531
+location: clients/tests/test-client.py:1038:test_004()/531
 cmd: $NMCLI --mode tabular --terse --color yes con s con-vpn-1
 lang: C
 returncode: 0
@@ -26933,7 +27305,7 @@ VPN:openvpn:::*** VPN connection con-vpn-1 ***:5 - VPN connected:key1 = val1 | k
 
 <<<
 size: 813
-location: clients/tests/test-client.py:1024:test_004()/532
+location: clients/tests/test-client.py:1038:test_004()/532
 cmd: $NMCLI --mode tabular --terse --color yes con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
@@ -26949,7 +27321,7 @@ VPN:openvpn:::*** VPN connection con-vpn-1 ***:5 - VPN connected:key1 = val1 | k
 
 <<<
 size: 516
-location: clients/tests/test-client.py:1027:test_004()/533
+location: clients/tests/test-client.py:1041:test_004()/533
 cmd: $NMCLI --mode tabular --terse --color yes -f ALL con s con-vpn-1
 lang: C
 returncode: 0
@@ -26963,7 +27335,7 @@ proxy:none:no::
 
 <<<
 size: 526
-location: clients/tests/test-client.py:1027:test_004()/534
+location: clients/tests/test-client.py:1041:test_004()/534
 cmd: $NMCLI --mode tabular --terse --color yes -f ALL con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
@@ -26977,7 +27349,7 @@ proxy:none:no::
 
 <<<
 size: 273
-location: clients/tests/test-client.py:1033:test_004()/535
+location: clients/tests/test-client.py:1047:test_004()/535
 cmd: $NMCLI --mode tabular --terse --color yes -f VPN con s con-vpn-1
 lang: C
 returncode: 0
@@ -26987,7 +27359,7 @@ vpn:org.freedesktop.NetworkManager.openvpn::key1 = val1, key2 = val2, key3 = val
 
 <<<
 size: 283
-location: clients/tests/test-client.py:1033:test_004()/536
+location: clients/tests/test-client.py:1047:test_004()/536
 cmd: $NMCLI --mode tabular --terse --color yes -f VPN con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
@@ -26997,7 +27369,7 @@ vpn:org.freedesktop.NetworkManager.openvpn::key1 = val1, key2 = val2, key3 = val
 
 <<<
 size: 371
-location: clients/tests/test-client.py:1036:test_004()/537
+location: clients/tests/test-client.py:1050:test_004()/537
 cmd: $NMCLI --mode tabular --terse --color yes -f GENERAL con s con-vpn-1
 lang: C
 returncode: 0
@@ -27007,7 +27379,7 @@ GENERAL:con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:wlan0:activated:no:no::ye
 
 <<<
 size: 381
-location: clients/tests/test-client.py:1036:test_004()/538
+location: clients/tests/test-client.py:1050:test_004()/538
 cmd: $NMCLI --mode tabular --terse --color yes -f GENERAL con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
@@ -27017,68 +27389,78 @@ GENERAL:con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:wlan0:activated:no:no::ye
 
 <<<
 size: 456
-location: clients/tests/test-client.py:1039:test_004()/539
+location: clients/tests/test-client.py:1053:test_004()/539
 cmd: $NMCLI --mode tabular --terse --color yes dev s
 lang: C
 returncode: 0
 stdout: 295 bytes
 >>>
+wlan0:wifi:unavailable:con-vpn-1
 eth0:ethernet:unavailable:
 eth1:ethernet:unavailable:
 wlan1:wifi:unavailable:
 wlan1:wifi:unavailable:
-wlan0:wifi:unavailable:con-vpn-1
 
 <<<
 size: 466
-location: clients/tests/test-client.py:1039:test_004()/540
+location: clients/tests/test-client.py:1053:test_004()/540
 cmd: $NMCLI --mode tabular --terse --color yes dev s
 lang: pl_PL.UTF-8
 returncode: 0
 stdout: 295 bytes
 >>>
+wlan0:wifi:unavailable:con-vpn-1
 eth0:ethernet:unavailable:
 eth1:ethernet:unavailable:
 wlan1:wifi:unavailable:
 wlan1:wifi:unavailable:
-wlan0:wifi:unavailable:con-vpn-1
 
 <<<
-size: 894
-location: clients/tests/test-client.py:1042:test_004()/541
+size: 1054
+location: clients/tests/test-client.py:1056:test_004()/541
 cmd: $NMCLI --mode tabular --terse --color yes -f all dev status
 lang: C
 returncode: 0
-stdout: 721 bytes
+stdout: 881 bytes
 >>>
-eth0:ethernet:unavailable:/org/freedesktop/NetworkManager/Devices/1:::
-eth1:ethernet:unavailable:/org/freedesktop/NetworkManager/Devices/2:::
-wlan1:wifi:unavailable:/org/freedesktop/NetworkManager/Devices/4:::
-wlan1:wifi:unavailable:/org/freedesktop/NetworkManager/Devices/5:::
-wlan0:wifi:unavailable:/org/freedesktop/NetworkManager/Devices/3:con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:/org/freedesktop/NetworkManager/ActiveConnection/2
+wlan0:wifi:unavailable:unknown:unknown:/org/freedesktop/NetworkManager/Devices/3:con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:/org/freedesktop/NetworkManager/ActiveConnection/2
+eth0:ethernet:unavailable:unknown:unknown:/org/freedesktop/NetworkManager/Devices/1:::
+eth1:ethernet:unavailable:unknown:unknown:/org/freedesktop/NetworkManager/Devices/2:::
+wlan1:wifi:unavailable:unknown:unknown:/org/freedesktop/NetworkManager/Devices/4:::
+wlan1:wifi:unavailable:unknown:unknown:/org/freedesktop/NetworkManager/Devices/5:::
 
 <<<
-size: 904
-location: clients/tests/test-client.py:1042:test_004()/542
+size: 1064
+location: clients/tests/test-client.py:1056:test_004()/542
 cmd: $NMCLI --mode tabular --terse --color yes -f all dev status
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 721 bytes
+stdout: 881 bytes
 >>>
-eth0:ethernet:unavailable:/org/freedesktop/NetworkManager/Devices/1:::
-eth1:ethernet:unavailable:/org/freedesktop/NetworkManager/Devices/2:::
-wlan1:wifi:unavailable:/org/freedesktop/NetworkManager/Devices/4:::
-wlan1:wifi:unavailable:/org/freedesktop/NetworkManager/Devices/5:::
-wlan0:wifi:unavailable:/org/freedesktop/NetworkManager/Devices/3:con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:/org/freedesktop/NetworkManager/ActiveConnection/2
+wlan0:wifi:unavailable:unknown:unknown:/org/freedesktop/NetworkManager/Devices/3:con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:/org/freedesktop/NetworkManager/ActiveConnection/2
+eth0:ethernet:unavailable:unknown:unknown:/org/freedesktop/NetworkManager/Devices/1:::
+eth1:ethernet:unavailable:unknown:unknown:/org/freedesktop/NetworkManager/Devices/2:::
+wlan1:wifi:unavailable:unknown:unknown:/org/freedesktop/NetworkManager/Devices/4:::
+wlan1:wifi:unavailable:unknown:unknown:/org/freedesktop/NetworkManager/Devices/5:::
 
 <<<
 size: 3108
-location: clients/tests/test-client.py:1045:test_004()/543
+location: clients/tests/test-client.py:1059:test_004()/543
 cmd: $NMCLI --mode tabular --terse --color yes dev show
 lang: C
 returncode: 0
 stdout: 2943 bytes
 >>>
+wlan0
+wifi
+13\:E0\:74\:85\:7C\:D9
+0
+20 (unavailable)
+con-vpn-1
+/org/freedesktop/NetworkManager/ActiveConnection/2
+IP4:192.168.228.18/32 | 192.168.209.179/25:192.168.41.120:::sear4.foo2.bar | sear4.fo.x.y | sear4.foo1.bar | sear4.foo4.bar | sear4.fo.o.bar:192.168.120.79
+IP6:::dst = 2001\:a\:\:dd5b\:aa7b\:b4a2\:e42/102, nh = \:\:, mt = 2504159086::sear6.foo2.bar | sear6.foo1.bar | sear6.fo.x.y | sear6.fo.o.bar | sear6.foo3.bar | sear6.foo4.bar
+
 eth0
 ethernet
 AB\:B7\:BF\:E2\:48\:E8
@@ -27121,6 +27503,14 @@ wifi
 IP4:192.168.97.124/29 | 192.168.76.154/18::dst = 192.168.33.233/22, nh = 192.168.222.210, mt = 2810496551:192.168.107.109:sear4.fo.o.bar | sear4.fo.x.y | sear4.foo2.bar | sear4.foo3.bar | sear4.foo4.bar:192.168.60.60 | 192.168.63.92
 IP6:2001\:a\:\:88ca\:3654\:96b\:ab44/89::dst = 2001\:a\:\:cc8b\:7c09\:4673\:bbb0/85, nh = \:\:, mt = 2821465568 | dst = 2001\:a\:\:a976\:2488\:f49f\:b48/106, nh = 2001\:a\:\:62ae\:c734\:fc7b\:e931, mt = 2248613879 | dst = 2001\:a\:\:afb7\:4449\:3787\:8bb4/123, nh = \:\::2001\:a\:\:2934\:bd66\:550d\:ec19:sear6.fo.x.y
 
+<<<
+size: 3118
+location: clients/tests/test-client.py:1059:test_004()/544
+cmd: $NMCLI --mode tabular --terse --color yes dev show
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 2943 bytes
+>>>
 wlan0
 wifi
 13\:E0\:74\:85\:7C\:D9
@@ -27131,14 +27521,6 @@ con-vpn-1
 IP4:192.168.228.18/32 | 192.168.209.179/25:192.168.41.120:::sear4.foo2.bar | sear4.fo.x.y | sear4.foo1.bar | sear4.foo4.bar | sear4.fo.o.bar:192.168.120.79
 IP6:::dst = 2001\:a\:\:dd5b\:aa7b\:b4a2\:e42/102, nh = \:\:, mt = 2504159086::sear6.foo2.bar | sear6.foo1.bar | sear6.fo.x.y | sear6.fo.o.bar | sear6.foo3.bar | sear6.foo4.bar
 
-<<<
-size: 3118
-location: clients/tests/test-client.py:1045:test_004()/544
-cmd: $NMCLI --mode tabular --terse --color yes dev show
-lang: pl_PL.UTF-8
-returncode: 0
-stdout: 2943 bytes
->>>
 eth0
 ethernet
 AB\:B7\:BF\:E2\:48\:E8
@@ -27181,25 +27563,27 @@ wifi
 IP4:192.168.97.124/29 | 192.168.76.154/18::dst = 192.168.33.233/22, nh = 192.168.222.210, mt = 2810496551:192.168.107.109:sear4.fo.o.bar | sear4.fo.x.y | sear4.foo2.bar | sear4.foo3.bar | sear4.foo4.bar:192.168.60.60 | 192.168.63.92
 IP6:2001\:a\:\:88ca\:3654\:96b\:ab44/89::dst = 2001\:a\:\:cc8b\:7c09\:4673\:bbb0/85, nh = \:\:, mt = 2821465568 | dst = 2001\:a\:\:a976\:2488\:f49f\:b48/106, nh = 2001\:a\:\:62ae\:c734\:fc7b\:e931, mt = 2248613879 | dst = 2001\:a\:\:afb7\:4449\:3787\:8bb4/123, nh = \:\::2001\:a\:\:2934\:bd66\:550d\:ec19:sear6.fo.x.y
 
-wlan0
-wifi
-13\:E0\:74\:85\:7C\:D9
-0
-20 (unavailable)
-con-vpn-1
-/org/freedesktop/NetworkManager/ActiveConnection/2
-IP4:192.168.228.18/32 | 192.168.209.179/25:192.168.41.120:::sear4.foo2.bar | sear4.fo.x.y | sear4.foo1.bar | sear4.foo4.bar | sear4.fo.o.bar:192.168.120.79
-IP6:::dst = 2001\:a\:\:dd5b\:aa7b\:b4a2\:e42/102, nh = \:\:, mt = 2504159086::sear6.foo2.bar | sear6.foo1.bar | sear6.fo.x.y | sear6.fo.o.bar | sear6.foo3.bar | sear6.foo4.bar
-
 <<<
-size: 6541
-location: clients/tests/test-client.py:1048:test_004()/545
+size: 6651
+location: clients/tests/test-client.py:1062:test_004()/545
 cmd: $NMCLI --mode tabular --terse --color yes -f all dev show
 lang: C
 returncode: 0
-stdout: 6369 bytes
+stdout: 6479 bytes
 >>>
-GENERAL:eth0:ethernet:NMDeviceEthernet:::virtual:::AB\:B7\:BF\:E2\:48\:E8:0:20 (unavailable):0 (No reason given):/sys/devices/virtual/eth0::no:yes:yes:no:no:::::unknown
+GENERAL:wlan0:wifi:NMDeviceWifi:::virtual:::13\:E0\:74\:85\:7C\:D9:0:20 (unavailable):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/wlan0::no:yes:yes:no:no::con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:/org/freedesktop/NetworkManager/ActiveConnection/2:unknown
+CAPABILITIES:no:unknown:no:no
+WIFI-PROPERTIES:yes:yes:yes:yes:yes:yes:yes:unknown:unknown
+AP[1]: :wlan0-ap-2:Infra:1:54 Mbit/s:92:****:WPA1 WPA2
+AP[2]: :wlan0-ap-1:Infra:1:54 Mbit/s:81:****:WPA1
+AP[3]: :wlan0-ap-3:Infra:1:54 Mbit/s:55:**  :WPA3
+IP4:192.168.228.18/32 | 192.168.209.179/25:192.168.41.120:::sear4.foo2.bar | sear4.fo.x.y | sear4.foo1.bar | sear4.foo4.bar | sear4.fo.o.bar:192.168.120.79
+DHCP4:dhcp-4-opt-0 = val-0 | dhcp-4-opt-2 = val-2 | dhcp-4-opt-4 = val-4 | dhcp-4-opt-7 = val-7
+IP6:::dst = 2001\:a\:\:dd5b\:aa7b\:b4a2\:e42/102, nh = \:\:, mt = 2504159086::sear6.foo2.bar | sear6.foo1.bar | sear6.fo.x.y | sear6.fo.o.bar | sear6.foo3.bar | sear6.foo4.bar
+DHCP6:dhcp-6-opt-1 = val-1 | dhcp-6-opt-2 = val-2 | dhcp-6-opt-3 = val-3 | dhcp-6-opt-4 = val-4 | dhcp-6-opt-5 = val-5
+CONNECTIONS:/org/freedesktop/NetworkManager/Settings/Connection/{2}:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
+
+GENERAL:eth0:ethernet:NMDeviceEthernet:::virtual:::AB\:B7\:BF\:E2\:48\:E8:0:20 (unavailable):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/eth0::no:yes:yes:no:no:::::unknown
 CAPABILITIES:no:100 Mb/s:no:no
 WIRED-PROPERTIES:off:
 IP4:192.168.49.34/22 | 192.168.135.86/19:::192.168.45.230 | 192.168.180.201 | 192.168.253.2:sear4.foo2.bar | sear4.foo1.bar:192.168.163.23 | 192.168.151.246
@@ -27208,7 +27592,7 @@ IP6:2001\:a\:\:ed81\:3d7\:c2e9\:df82/99:::2001\:a\:\:2703\:f06\:9619\:d89f | 200
 DHCP6:dhcp-6-opt-0 = val-0 | dhcp-6-opt-1 = val-1 | dhcp-6-opt-2 = val-2 | dhcp-6-opt-3 = val-3 | dhcp-6-opt-4 = val-4 | dhcp-6-opt-5 = val-5 | dhcp-6-opt-6 = val-6 | dhcp-6-opt-7 = val-7 | dhcp-6-opt-8 = val-8 | dhcp-6-opt-9 = val-9
 CONNECTIONS:/org/freedesktop/NetworkManager/Settings/Connection/{1}:5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1
 
-GENERAL:eth1:ethernet:NMDeviceEthernet:::virtual:::E7\:78\:B1\:93\:2B\:22:0:20 (unavailable):0 (No reason given):/sys/devices/virtual/eth1::no:yes:yes:no:no:::::unknown
+GENERAL:eth1:ethernet:NMDeviceEthernet:::virtual:::E7\:78\:B1\:93\:2B\:22:0:20 (unavailable):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/eth1::no:yes:yes:no:no:::::unknown
 CAPABILITIES:no:100 Mb/s:no:no
 WIRED-PROPERTIES:off:
 IP4:192.168.127.210/25:192.168.88.4:dst = 192.168.222.35/19, nh = 192.168.170.142, mt = 3609264321 | dst = 192.168.135.81/32, nh = 192.168.32.11, mt = 1316413247 | dst = 192.168.24.65/26, nh = 192.168.23.163, mt = 3855574583:192.168.16.144 | 192.168.79.53 | 192.168.237.155:sear4.foo4.bar | sear4.foo3.bar | sear4.foo1.bar:192.168.211.91 | 192.168.58.182 | 192.168.114.97
@@ -27217,7 +27601,7 @@ IP6:2001\:a\:\:1c1\:c178\:169f\:2b80/93 | 2001\:a\:\:1f79\:e0fb\:87b9\:3cc6/123:
 DHCP6:dhcp-6-opt-2 = val-2 | dhcp-6-opt-5 = val-5 | dhcp-6-opt-6 = val-6 | dhcp-6-opt-8 = val-8 | dhcp-6-opt-9 = val-9
 CONNECTIONS:/org/freedesktop/NetworkManager/Settings/Connection/{1}:5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1
 
-GENERAL:wlan1:wifi:NMDeviceWifi:::virtual:::21\:E9\:64\:81\:8C\:A8:0:20 (unavailable):0 (No reason given):/sys/devices/virtual/wlan1::no:yes:yes:no:no:::::unknown
+GENERAL:wlan1:wifi:NMDeviceWifi:::virtual:::21\:E9\:64\:81\:8C\:A8:0:20 (unavailable):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/wlan1::no:yes:yes:no:no:::::unknown
 CAPABILITIES:no:unknown:no:no
 WIFI-PROPERTIES:yes:yes:yes:yes:yes:yes:yes:unknown:unknown
 AP[1]: :wlan1-ap-4:Infra:1:54 Mbit/s:48:**  :WPA1 WPA2
@@ -27227,7 +27611,7 @@ IP6:2001\:a\:\:fa05\:2ab4\:9300\:e8fe/116 | 2001\:a\:\:e9cf\:bd3\:caba\:99b3/86
 DHCP6:dhcp-6-opt-0 = val-0 | dhcp-6-opt-1 = val-1 | dhcp-6-opt-2 = val-2 | dhcp-6-opt-3 = val-3 | dhcp-6-opt-4 = val-4 | dhcp-6-opt-5 = val-5 | dhcp-6-opt-6 = val-6 | dhcp-6-opt-7 = val-7 | dhcp-6-opt-9 = val-9
 CONNECTIONS:/org/freedesktop/NetworkManager/Settings/Connection/{2}:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 
-GENERAL:wlan1:wifi:NMDeviceWifi:::virtual:::71\:52\:AD\:63\:5C\:7C:0:20 (unavailable):0 (No reason given):/sys/devices/virtual/wlan1::no:yes:yes:no:no:::::unknown
+GENERAL:wlan1:wifi:NMDeviceWifi:::virtual:::71\:52\:AD\:63\:5C\:7C:0:20 (unavailable):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/wlan1::no:yes:yes:no:no:::::unknown
 CAPABILITIES:no:unknown:no:no
 WIFI-PROPERTIES:yes:yes:yes:yes:yes:yes:yes:unknown:unknown
 IP4:192.168.97.124/29 | 192.168.76.154/18::dst = 192.168.33.233/22, nh = 192.168.222.210, mt = 2810496551:192.168.107.109:sear4.fo.o.bar | sear4.fo.x.y | sear4.foo2.bar | sear4.foo3.bar | sear4.foo4.bar:192.168.60.60 | 192.168.63.92
@@ -27236,27 +27620,27 @@ IP6:2001\:a\:\:88ca\:3654\:96b\:ab44/89::dst = 2001\:a\:\:cc8b\:7c09\:4673\:bbb0
 DHCP6:dhcp-6-opt-2 = val-2 | dhcp-6-opt-6 = val-6 | dhcp-6-opt-7 = val-7 | dhcp-6-opt-8 = val-8 | dhcp-6-opt-9 = val-9
 CONNECTIONS:/org/freedesktop/NetworkManager/Settings/Connection/{2}:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 
-GENERAL:wlan0:wifi:NMDeviceWifi:::virtual:::13\:E0\:74\:85\:7C\:D9:0:20 (unavailable):0 (No reason given):/sys/devices/virtual/wlan0::no:yes:yes:no:no::con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:/org/freedesktop/NetworkManager/ActiveConnection/2:unknown
+<<<
+size: 6697
+location: clients/tests/test-client.py:1062:test_004()/546
+cmd: $NMCLI --mode tabular --terse --color yes -f all dev show
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 6515 bytes
+>>>
+GENERAL:wlan0:wifi:NMDeviceWifi:::virtual:::13\:E0\:74\:85\:7C\:D9:0:20 (unavailable):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/wlan0::no:yes:yes:no:no::con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:/org/freedesktop/NetworkManager/ActiveConnection/2:unknown
 CAPABILITIES:no:unknown:no:no
 WIFI-PROPERTIES:yes:yes:yes:yes:yes:yes:yes:unknown:unknown
-AP[1]: :wlan0-ap-2:Infra:1:54 Mbit/s:92:****:WPA1 WPA2
-AP[2]: :wlan0-ap-1:Infra:1:54 Mbit/s:81:****:WPA1 WPA2
-AP[3]: :wlan0-ap-3:Infra:1:54 Mbit/s:55:**  :WPA1 WPA2
+AP[1]: :wlan0-ap-2:Infrastruktura:1:54 Mb/s:92:****:WPA1 WPA2
+AP[2]: :wlan0-ap-1:Infrastruktura:1:54 Mb/s:81:****:WPA1
+AP[3]: :wlan0-ap-3:Infrastruktura:1:54 Mb/s:55:**  :WPA3
 IP4:192.168.228.18/32 | 192.168.209.179/25:192.168.41.120:::sear4.foo2.bar | sear4.fo.x.y | sear4.foo1.bar | sear4.foo4.bar | sear4.fo.o.bar:192.168.120.79
 DHCP4:dhcp-4-opt-0 = val-0 | dhcp-4-opt-2 = val-2 | dhcp-4-opt-4 = val-4 | dhcp-4-opt-7 = val-7
 IP6:::dst = 2001\:a\:\:dd5b\:aa7b\:b4a2\:e42/102, nh = \:\:, mt = 2504159086::sear6.foo2.bar | sear6.foo1.bar | sear6.fo.x.y | sear6.fo.o.bar | sear6.foo3.bar | sear6.foo4.bar
 DHCP6:dhcp-6-opt-1 = val-1 | dhcp-6-opt-2 = val-2 | dhcp-6-opt-3 = val-3 | dhcp-6-opt-4 = val-4 | dhcp-6-opt-5 = val-5
 CONNECTIONS:/org/freedesktop/NetworkManager/Settings/Connection/{2}:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 
-<<<
-size: 6587
-location: clients/tests/test-client.py:1048:test_004()/546
-cmd: $NMCLI --mode tabular --terse --color yes -f all dev show
-lang: pl_PL.UTF-8
-returncode: 0
-stdout: 6405 bytes
->>>
-GENERAL:eth0:ethernet:NMDeviceEthernet:::virtual:::AB\:B7\:BF\:E2\:48\:E8:0:20 (unavailable):0 (No reason given):/sys/devices/virtual/eth0::no:yes:yes:no:no:::::unknown
+GENERAL:eth0:ethernet:NMDeviceEthernet:::virtual:::AB\:B7\:BF\:E2\:48\:E8:0:20 (unavailable):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/eth0::no:yes:yes:no:no:::::unknown
 CAPABILITIES:no:100 Mb/s:no:no
 WIRED-PROPERTIES:off:
 IP4:192.168.49.34/22 | 192.168.135.86/19:::192.168.45.230 | 192.168.180.201 | 192.168.253.2:sear4.foo2.bar | sear4.foo1.bar:192.168.163.23 | 192.168.151.246
@@ -27265,7 +27649,7 @@ IP6:2001\:a\:\:ed81\:3d7\:c2e9\:df82/99:::2001\:a\:\:2703\:f06\:9619\:d89f | 200
 DHCP6:dhcp-6-opt-0 = val-0 | dhcp-6-opt-1 = val-1 | dhcp-6-opt-2 = val-2 | dhcp-6-opt-3 = val-3 | dhcp-6-opt-4 = val-4 | dhcp-6-opt-5 = val-5 | dhcp-6-opt-6 = val-6 | dhcp-6-opt-7 = val-7 | dhcp-6-opt-8 = val-8 | dhcp-6-opt-9 = val-9
 CONNECTIONS:/org/freedesktop/NetworkManager/Settings/Connection/{1}:5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1
 
-GENERAL:eth1:ethernet:NMDeviceEthernet:::virtual:::E7\:78\:B1\:93\:2B\:22:0:20 (unavailable):0 (No reason given):/sys/devices/virtual/eth1::no:yes:yes:no:no:::::unknown
+GENERAL:eth1:ethernet:NMDeviceEthernet:::virtual:::E7\:78\:B1\:93\:2B\:22:0:20 (unavailable):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/eth1::no:yes:yes:no:no:::::unknown
 CAPABILITIES:no:100 Mb/s:no:no
 WIRED-PROPERTIES:off:
 IP4:192.168.127.210/25:192.168.88.4:dst = 192.168.222.35/19, nh = 192.168.170.142, mt = 3609264321 | dst = 192.168.135.81/32, nh = 192.168.32.11, mt = 1316413247 | dst = 192.168.24.65/26, nh = 192.168.23.163, mt = 3855574583:192.168.16.144 | 192.168.79.53 | 192.168.237.155:sear4.foo4.bar | sear4.foo3.bar | sear4.foo1.bar:192.168.211.91 | 192.168.58.182 | 192.168.114.97
@@ -27274,7 +27658,7 @@ IP6:2001\:a\:\:1c1\:c178\:169f\:2b80/93 | 2001\:a\:\:1f79\:e0fb\:87b9\:3cc6/123:
 DHCP6:dhcp-6-opt-2 = val-2 | dhcp-6-opt-5 = val-5 | dhcp-6-opt-6 = val-6 | dhcp-6-opt-8 = val-8 | dhcp-6-opt-9 = val-9
 CONNECTIONS:/org/freedesktop/NetworkManager/Settings/Connection/{1}:5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1
 
-GENERAL:wlan1:wifi:NMDeviceWifi:::virtual:::21\:E9\:64\:81\:8C\:A8:0:20 (unavailable):0 (No reason given):/sys/devices/virtual/wlan1::no:yes:yes:no:no:::::unknown
+GENERAL:wlan1:wifi:NMDeviceWifi:::virtual:::21\:E9\:64\:81\:8C\:A8:0:20 (unavailable):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/wlan1::no:yes:yes:no:no:::::unknown
 CAPABILITIES:no:unknown:no:no
 WIFI-PROPERTIES:yes:yes:yes:yes:yes:yes:yes:unknown:unknown
 AP[1]: :wlan1-ap-4:Infrastruktura:1:54 Mb/s:48:**  :WPA1 WPA2
@@ -27284,7 +27668,7 @@ IP6:2001\:a\:\:fa05\:2ab4\:9300\:e8fe/116 | 2001\:a\:\:e9cf\:bd3\:caba\:99b3/86
 DHCP6:dhcp-6-opt-0 = val-0 | dhcp-6-opt-1 = val-1 | dhcp-6-opt-2 = val-2 | dhcp-6-opt-3 = val-3 | dhcp-6-opt-4 = val-4 | dhcp-6-opt-5 = val-5 | dhcp-6-opt-6 = val-6 | dhcp-6-opt-7 = val-7 | dhcp-6-opt-9 = val-9
 CONNECTIONS:/org/freedesktop/NetworkManager/Settings/Connection/{2}:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 
-GENERAL:wlan1:wifi:NMDeviceWifi:::virtual:::71\:52\:AD\:63\:5C\:7C:0:20 (unavailable):0 (No reason given):/sys/devices/virtual/wlan1::no:yes:yes:no:no:::::unknown
+GENERAL:wlan1:wifi:NMDeviceWifi:::virtual:::71\:52\:AD\:63\:5C\:7C:0:20 (unavailable):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/wlan1::no:yes:yes:no:no:::::unknown
 CAPABILITIES:no:unknown:no:no
 WIFI-PROPERTIES:yes:yes:yes:yes:yes:yes:yes:unknown:unknown
 IP4:192.168.97.124/29 | 192.168.76.154/18::dst = 192.168.33.233/22, nh = 192.168.222.210, mt = 2810496551:192.168.107.109:sear4.fo.o.bar | sear4.fo.x.y | sear4.foo2.bar | sear4.foo3.bar | sear4.foo4.bar:192.168.60.60 | 192.168.63.92
@@ -27293,21 +27677,9 @@ IP6:2001\:a\:\:88ca\:3654\:96b\:ab44/89::dst = 2001\:a\:\:cc8b\:7c09\:4673\:bbb0
 DHCP6:dhcp-6-opt-2 = val-2 | dhcp-6-opt-6 = val-6 | dhcp-6-opt-7 = val-7 | dhcp-6-opt-8 = val-8 | dhcp-6-opt-9 = val-9
 CONNECTIONS:/org/freedesktop/NetworkManager/Settings/Connection/{2}:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 
-GENERAL:wlan0:wifi:NMDeviceWifi:::virtual:::13\:E0\:74\:85\:7C\:D9:0:20 (unavailable):0 (No reason given):/sys/devices/virtual/wlan0::no:yes:yes:no:no::con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:/org/freedesktop/NetworkManager/ActiveConnection/2:unknown
-CAPABILITIES:no:unknown:no:no
-WIFI-PROPERTIES:yes:yes:yes:yes:yes:yes:yes:unknown:unknown
-AP[1]: :wlan0-ap-2:Infrastruktura:1:54 Mb/s:92:****:WPA1 WPA2
-AP[2]: :wlan0-ap-1:Infrastruktura:1:54 Mb/s:81:****:WPA1 WPA2
-AP[3]: :wlan0-ap-3:Infrastruktura:1:54 Mb/s:55:**  :WPA1 WPA2
-IP4:192.168.228.18/32 | 192.168.209.179/25:192.168.41.120:::sear4.foo2.bar | sear4.fo.x.y | sear4.foo1.bar | sear4.foo4.bar | sear4.fo.o.bar:192.168.120.79
-DHCP4:dhcp-4-opt-0 = val-0 | dhcp-4-opt-2 = val-2 | dhcp-4-opt-4 = val-4 | dhcp-4-opt-7 = val-7
-IP6:::dst = 2001\:a\:\:dd5b\:aa7b\:b4a2\:e42/102, nh = \:\:, mt = 2504159086::sear6.foo2.bar | sear6.foo1.bar | sear6.fo.x.y | sear6.fo.o.bar | sear6.foo3.bar | sear6.foo4.bar
-DHCP6:dhcp-6-opt-1 = val-1 | dhcp-6-opt-2 = val-2 | dhcp-6-opt-3 = val-3 | dhcp-6-opt-4 = val-4 | dhcp-6-opt-5 = val-5
-CONNECTIONS:/org/freedesktop/NetworkManager/Settings/Connection/{2}:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
-
 <<<
 size: 616
-location: clients/tests/test-client.py:1051:test_004()/547
+location: clients/tests/test-client.py:1065:test_004()/547
 cmd: $NMCLI --mode tabular --terse --color yes dev show wlan0
 lang: C
 returncode: 0
@@ -27325,7 +27697,7 @@ IP6:::dst = 2001\:a\:\:dd5b\:aa7b\:b4a2\:e42/102, nh = \:\:, mt = 2504159086::se
 
 <<<
 size: 626
-location: clients/tests/test-client.py:1051:test_004()/548
+location: clients/tests/test-client.py:1065:test_004()/548
 cmd: $NMCLI --mode tabular --terse --color yes dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
@@ -27342,19 +27714,19 @@ IP4:192.168.228.18/32 | 192.168.209.179/25:192.168.41.120:::sear4.foo2.bar | sea
 IP6:::dst = 2001\:a\:\:dd5b\:aa7b\:b4a2\:e42/102, nh = \:\:, mt = 2504159086::sear6.foo2.bar | sear6.foo1.bar | sear6.fo.x.y | sear6.fo.o.bar | sear6.foo3.bar | sear6.foo4.bar
 
 <<<
-size: 1596
-location: clients/tests/test-client.py:1054:test_004()/549
+size: 1610
+location: clients/tests/test-client.py:1068:test_004()/549
 cmd: $NMCLI --mode tabular --terse --color yes -f all dev show wlan0
 lang: C
 returncode: 0
-stdout: 1418 bytes
+stdout: 1432 bytes
 >>>
-GENERAL:wlan0:wifi:NMDeviceWifi:::virtual:::13\:E0\:74\:85\:7C\:D9:0:20 (unavailable):0 (No reason given):/sys/devices/virtual/wlan0::no:yes:yes:no:no::con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:/org/freedesktop/NetworkManager/ActiveConnection/2:unknown
+GENERAL:wlan0:wifi:NMDeviceWifi:::virtual:::13\:E0\:74\:85\:7C\:D9:0:20 (unavailable):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/wlan0::no:yes:yes:no:no::con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:/org/freedesktop/NetworkManager/ActiveConnection/2:unknown
 CAPABILITIES:no:unknown:no:no
 WIFI-PROPERTIES:yes:yes:yes:yes:yes:yes:yes:unknown:unknown
 AP[1]: :wlan0-ap-2:Infra:1:54 Mbit/s:92:****:WPA1 WPA2
-AP[2]: :wlan0-ap-1:Infra:1:54 Mbit/s:81:****:WPA1 WPA2
-AP[3]: :wlan0-ap-3:Infra:1:54 Mbit/s:55:**  :WPA1 WPA2
+AP[2]: :wlan0-ap-1:Infra:1:54 Mbit/s:81:****:WPA1
+AP[3]: :wlan0-ap-3:Infra:1:54 Mbit/s:55:**  :WPA3
 IP4:192.168.228.18/32 | 192.168.209.179/25:192.168.41.120:::sear4.foo2.bar | sear4.fo.x.y | sear4.foo1.bar | sear4.foo4.bar | sear4.fo.o.bar:192.168.120.79
 DHCP4:dhcp-4-opt-0 = val-0 | dhcp-4-opt-2 = val-2 | dhcp-4-opt-4 = val-4 | dhcp-4-opt-7 = val-7
 IP6:::dst = 2001\:a\:\:dd5b\:aa7b\:b4a2\:e42/102, nh = \:\:, mt = 2504159086::sear6.foo2.bar | sear6.foo1.bar | sear6.fo.x.y | sear6.fo.o.bar | sear6.foo3.bar | sear6.foo4.bar
@@ -27362,19 +27734,19 @@ DHCP6:dhcp-6-opt-1 = val-1 | dhcp-6-opt-2 = val-2 | dhcp-6-opt-3 = val-3 | dhcp-
 CONNECTIONS:/org/freedesktop/NetworkManager/Settings/Connection/{2}:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 
 <<<
-size: 1633
-location: clients/tests/test-client.py:1054:test_004()/550
+size: 1647
+location: clients/tests/test-client.py:1068:test_004()/550
 cmd: $NMCLI --mode tabular --terse --color yes -f all dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 1445 bytes
+stdout: 1459 bytes
 >>>
-GENERAL:wlan0:wifi:NMDeviceWifi:::virtual:::13\:E0\:74\:85\:7C\:D9:0:20 (unavailable):0 (No reason given):/sys/devices/virtual/wlan0::no:yes:yes:no:no::con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:/org/freedesktop/NetworkManager/ActiveConnection/2:unknown
+GENERAL:wlan0:wifi:NMDeviceWifi:::virtual:::13\:E0\:74\:85\:7C\:D9:0:20 (unavailable):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/wlan0::no:yes:yes:no:no::con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:/org/freedesktop/NetworkManager/ActiveConnection/2:unknown
 CAPABILITIES:no:unknown:no:no
 WIFI-PROPERTIES:yes:yes:yes:yes:yes:yes:yes:unknown:unknown
 AP[1]: :wlan0-ap-2:Infrastruktura:1:54 Mb/s:92:****:WPA1 WPA2
-AP[2]: :wlan0-ap-1:Infrastruktura:1:54 Mb/s:81:****:WPA1 WPA2
-AP[3]: :wlan0-ap-3:Infrastruktura:1:54 Mb/s:55:**  :WPA1 WPA2
+AP[2]: :wlan0-ap-1:Infrastruktura:1:54 Mb/s:81:****:WPA1
+AP[3]: :wlan0-ap-3:Infrastruktura:1:54 Mb/s:55:**  :WPA3
 IP4:192.168.228.18/32 | 192.168.209.179/25:192.168.41.120:::sear4.foo2.bar | sear4.fo.x.y | sear4.foo1.bar | sear4.foo4.bar | sear4.fo.o.bar:192.168.120.79
 DHCP4:dhcp-4-opt-0 = val-0 | dhcp-4-opt-2 = val-2 | dhcp-4-opt-4 = val-4 | dhcp-4-opt-7 = val-7
 IP6:::dst = 2001\:a\:\:dd5b\:aa7b\:b4a2\:e42/102, nh = \:\:, mt = 2504159086::sear6.foo2.bar | sear6.foo1.bar | sear6.fo.x.y | sear6.fo.o.bar | sear6.foo3.bar | sear6.foo4.bar
@@ -27382,245 +27754,257 @@ DHCP6:dhcp-6-opt-1 = val-1 | dhcp-6-opt-2 = val-2 | dhcp-6-opt-3 = val-3 | dhcp-
 CONNECTIONS:/org/freedesktop/NetworkManager/Settings/Connection/{2}:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 
 <<<
-size: 553
-location: clients/tests/test-client.py:1057:test_004()/551
+size: 577
+location: clients/tests/test-client.py:1071:test_004()/551
 cmd: $NMCLI --mode tabular --terse --color yes -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: C
 returncode: 0
-stdout: 341 bytes
+stdout: 365 bytes
 >>>
-GENERAL:wlan0:wifi:NMDeviceWifi:::virtual:::13\:E0\:74\:85\:7C\:D9:0:20 (unavailable):0 (No reason given):/sys/devices/virtual/wlan0::no:yes:yes:no:no::con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:/org/freedesktop/NetworkManager/ActiveConnection/2:unknown
+GENERAL:wlan0:wifi:NMDeviceWifi:::virtual:::13\:E0\:74\:85\:7C\:D9:0:20 (unavailable):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/wlan0::no:yes:yes:no:no::con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:/org/freedesktop/NetworkManager/ActiveConnection/2:unknown
 13\:E0\:74\:85\:7C\:D9
 WIFI-PROPERTIES:yes:yes:yes:yes:yes:yes:yes:unknown:unknown
 
 <<<
-size: 563
-location: clients/tests/test-client.py:1057:test_004()/552
+size: 587
+location: clients/tests/test-client.py:1071:test_004()/552
 cmd: $NMCLI --mode tabular --terse --color yes -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 341 bytes
+stdout: 365 bytes
 >>>
-GENERAL:wlan0:wifi:NMDeviceWifi:::virtual:::13\:E0\:74\:85\:7C\:D9:0:20 (unavailable):0 (No reason given):/sys/devices/virtual/wlan0::no:yes:yes:no:no::con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:/org/freedesktop/NetworkManager/ActiveConnection/2:unknown
+GENERAL:wlan0:wifi:NMDeviceWifi:::virtual:::13\:E0\:74\:85\:7C\:D9:0:20 (unavailable):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/wlan0::no:yes:yes:no:no::con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:/org/freedesktop/NetworkManager/ActiveConnection/2:unknown
 13\:E0\:74\:85\:7C\:D9
 WIFI-PROPERTIES:yes:yes:yes:yes:yes:yes:yes:unknown:unknown
 
 <<<
-size: 553
-location: clients/tests/test-client.py:1060:test_004()/553
+size: 577
+location: clients/tests/test-client.py:1074:test_004()/553
 cmd: $NMCLI --mode tabular --terse --color yes -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: C
 returncode: 0
-stdout: 341 bytes
+stdout: 365 bytes
 >>>
-GENERAL:wlan0:wifi:NMDeviceWifi:::virtual:::13\:E0\:74\:85\:7C\:D9:0:20 (unavailable):0 (No reason given):/sys/devices/virtual/wlan0::no:yes:yes:no:no::con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:/org/freedesktop/NetworkManager/ActiveConnection/2:unknown
+GENERAL:wlan0:wifi:NMDeviceWifi:::virtual:::13\:E0\:74\:85\:7C\:D9:0:20 (unavailable):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/wlan0::no:yes:yes:no:no::con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:/org/freedesktop/NetworkManager/ActiveConnection/2:unknown
 13\:E0\:74\:85\:7C\:D9
 WIFI-PROPERTIES:yes:yes:yes:yes:yes:yes:yes:unknown:unknown
 
 <<<
-size: 563
-location: clients/tests/test-client.py:1060:test_004()/554
+size: 587
+location: clients/tests/test-client.py:1074:test_004()/554
 cmd: $NMCLI --mode tabular --terse --color yes -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 341 bytes
+stdout: 365 bytes
 >>>
-GENERAL:wlan0:wifi:NMDeviceWifi:::virtual:::13\:E0\:74\:85\:7C\:D9:0:20 (unavailable):0 (No reason given):/sys/devices/virtual/wlan0::no:yes:yes:no:no::con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:/org/freedesktop/NetworkManager/ActiveConnection/2:unknown
+GENERAL:wlan0:wifi:NMDeviceWifi:::virtual:::13\:E0\:74\:85\:7C\:D9:0:20 (unavailable):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/wlan0::no:yes:yes:no:no::con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:/org/freedesktop/NetworkManager/ActiveConnection/2:unknown
 13\:E0\:74\:85\:7C\:D9
 WIFI-PROPERTIES:yes:yes:yes:yes:yes:yes:yes:unknown:unknown
 
 <<<
 size: 575
-location: clients/tests/test-client.py:1063:test_004()/555
+location: clients/tests/test-client.py:1077:test_004()/555
 cmd: $NMCLI --mode tabular --terse --color yes -f DEVICE,TYPE,DBUS-PATH dev
 lang: C
 returncode: 0
 stdout: 391 bytes
 >>>
+wlan0:wifi:/org/freedesktop/NetworkManager/Devices/3
 eth0:ethernet:/org/freedesktop/NetworkManager/Devices/1
 eth1:ethernet:/org/freedesktop/NetworkManager/Devices/2
 wlan1:wifi:/org/freedesktop/NetworkManager/Devices/4
 wlan1:wifi:/org/freedesktop/NetworkManager/Devices/5
-wlan0:wifi:/org/freedesktop/NetworkManager/Devices/3
 
 <<<
 size: 585
-location: clients/tests/test-client.py:1063:test_004()/556
+location: clients/tests/test-client.py:1077:test_004()/556
 cmd: $NMCLI --mode tabular --terse --color yes -f DEVICE,TYPE,DBUS-PATH dev
 lang: pl_PL.UTF-8
 returncode: 0
 stdout: 391 bytes
 >>>
+wlan0:wifi:/org/freedesktop/NetworkManager/Devices/3
 eth0:ethernet:/org/freedesktop/NetworkManager/Devices/1
 eth1:ethernet:/org/freedesktop/NetworkManager/Devices/2
 wlan1:wifi:/org/freedesktop/NetworkManager/Devices/4
 wlan1:wifi:/org/freedesktop/NetworkManager/Devices/5
-wlan0:wifi:/org/freedesktop/NetworkManager/Devices/3
 
 <<<
-size: 1814
-location: clients/tests/test-client.py:1066:test_004()/557
+size: 1726
+location: clients/tests/test-client.py:1080:test_004()/557
 cmd: $NMCLI --mode tabular --terse --color yes -f ALL device wifi list
 lang: C
 returncode: 0
-stdout: 1634 bytes
+stdout: 1546 bytes
 >>>
-AP[1]:wlan1-ap-4:776C616E312D61702D34:94\:2B\:E8\:F6\:D2\:86:Infra:1:2412 MHz:54 Mbit/s:48:**  :WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan1:no: :/org/freedesktop/NetworkManager/AccessPoint/4
+AP[1]:wlan0-ap-2:776C616E302D61702D32:C0\:E2\:BE\:E8\:EF\:B6:Infra:1:2412 MHz:54 Mbit/s:92:****:WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:no: :/org/freedesktop/NetworkManager/AccessPoint/2
+AP[2]:wlan0-ap-1:776C616E302D61702D31:61\:95\:77\:AC\:1E\:4C:Infra:1:2412 MHz:54 Mbit/s:81:****:WPA1:pair_tkip pair_ccmp group_tkip group_ccmp psk:(none):wlan0:no: :/org/freedesktop/NetworkManager/AccessPoint/1
+AP[3]:wlan0-ap-3:776C616E302D61702D33:9B\:F6\:B7\:EC\:97\:76:Infra:1:2412 MHz:54 Mbit/s:55:**  :WPA3:(none):pair_tkip pair_ccmp group_tkip group_ccmp sae:wlan0:no: :/org/freedesktop/NetworkManager/AccessPoint/3
 
+AP[1]:wlan1-ap-4:776C616E312D61702D34:94\:2B\:E8\:F6\:D2\:86:Infra:1:2412 MHz:54 Mbit/s:48:**  :WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan1:no: :/org/freedesktop/NetworkManager/AccessPoint/4
 
-AP[1]:wlan0-ap-2:776C616E302D61702D32:C0\:E2\:BE\:E8\:EF\:B6:Infra:1:2412 MHz:54 Mbit/s:92:****:WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:no: :/org/freedesktop/NetworkManager/AccessPoint/2
-AP[2]:wlan0-ap-1:776C616E302D61702D31:61\:95\:77\:AC\:1E\:4C:Infra:1:2412 MHz:54 Mbit/s:81:****:WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:no: :/org/freedesktop/NetworkManager/AccessPoint/1
-AP[3]:wlan0-ap-3:776C616E302D61702D33:9B\:F6\:B7\:EC\:97\:76:Infra:1:2412 MHz:54 Mbit/s:55:**  :WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:no: :/org/freedesktop/NetworkManager/AccessPoint/3
 
 <<<
-size: 1872
-location: clients/tests/test-client.py:1066:test_004()/558
+size: 1784
+location: clients/tests/test-client.py:1080:test_004()/558
 cmd: $NMCLI --mode tabular --terse --color yes -f ALL device wifi list
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 1682 bytes
+stdout: 1594 bytes
 >>>
-AP[1]:wlan1-ap-4:776C616E312D61702D34:94\:2B\:E8\:F6\:D2\:86:Infrastruktura:1:2412 MHz:54 Mb/s:48:**  :WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan1:nie: :/org/freedesktop/NetworkManager/AccessPoint/4
+AP[1]:wlan0-ap-2:776C616E302D61702D32:C0\:E2\:BE\:E8\:EF\:B6:Infrastruktura:1:2412 MHz:54 Mb/s:92:****:WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:nie: :/org/freedesktop/NetworkManager/AccessPoint/2
+AP[2]:wlan0-ap-1:776C616E302D61702D31:61\:95\:77\:AC\:1E\:4C:Infrastruktura:1:2412 MHz:54 Mb/s:81:****:WPA1:pair_tkip pair_ccmp group_tkip group_ccmp psk:(brak):wlan0:nie: :/org/freedesktop/NetworkManager/AccessPoint/1
+AP[3]:wlan0-ap-3:776C616E302D61702D33:9B\:F6\:B7\:EC\:97\:76:Infrastruktura:1:2412 MHz:54 Mb/s:55:**  :WPA3:(brak):pair_tkip pair_ccmp group_tkip group_ccmp sae:wlan0:nie: :/org/freedesktop/NetworkManager/AccessPoint/3
 
+AP[1]:wlan1-ap-4:776C616E312D61702D34:94\:2B\:E8\:F6\:D2\:86:Infrastruktura:1:2412 MHz:54 Mb/s:48:**  :WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan1:nie: :/org/freedesktop/NetworkManager/AccessPoint/4
 
-AP[1]:wlan0-ap-2:776C616E302D61702D32:C0\:E2\:BE\:E8\:EF\:B6:Infrastruktura:1:2412 MHz:54 Mb/s:92:****:WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:nie: :/org/freedesktop/NetworkManager/AccessPoint/2
-AP[2]:wlan0-ap-1:776C616E302D61702D31:61\:95\:77\:AC\:1E\:4C:Infrastruktura:1:2412 MHz:54 Mb/s:81:****:WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:nie: :/org/freedesktop/NetworkManager/AccessPoint/1
-AP[3]:wlan0-ap-3:776C616E302D61702D33:9B\:F6\:B7\:EC\:97\:76:Infrastruktura:1:2412 MHz:54 Mb/s:55:**  :WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:nie: :/org/freedesktop/NetworkManager/AccessPoint/3
 
 <<<
-size: 668
-location: clients/tests/test-client.py:1068:test_004()/559
+size: 658
+location: clients/tests/test-client.py:1082:test_004()/559
 cmd: $NMCLI --mode tabular --terse --color yes -f COMMON device wifi list
 lang: C
 returncode: 0
-stdout: 486 bytes
+stdout: 476 bytes
 >>>
- :wlan1-ap-4:Infra:1:54 Mbit/s:48:**  :WPA1 WPA2
+ :wlan0-ap-2:Infra:1:54 Mbit/s:92:****:WPA1 WPA2
+ :wlan0-ap-1:Infra:1:54 Mbit/s:81:****:WPA1
+ :wlan0-ap-3:Infra:1:54 Mbit/s:55:**  :WPA3
 
+ :wlan1-ap-4:Infra:1:54 Mbit/s:48:**  :WPA1 WPA2
 
- :wlan0-ap-2:Infra:1:54 Mbit/s:92:****:WPA1 WPA2
- :wlan0-ap-1:Infra:1:54 Mbit/s:81:****:WPA1 WPA2
- :wlan0-ap-3:Infra:1:54 Mbit/s:55:**  :WPA1 WPA2
 
 <<<
-size: 714
-location: clients/tests/test-client.py:1068:test_004()/560
+size: 704
+location: clients/tests/test-client.py:1082:test_004()/560
 cmd: $NMCLI --mode tabular --terse --color yes -f COMMON device wifi list
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 522 bytes
+stdout: 512 bytes
 >>>
- :wlan1-ap-4:Infrastruktura:1:54 Mb/s:48:**  :WPA1 WPA2
+ :wlan0-ap-2:Infrastruktura:1:54 Mb/s:92:****:WPA1 WPA2
+ :wlan0-ap-1:Infrastruktura:1:54 Mb/s:81:****:WPA1
+ :wlan0-ap-3:Infrastruktura:1:54 Mb/s:55:**  :WPA3
 
+ :wlan1-ap-4:Infrastruktura:1:54 Mb/s:48:**  :WPA1 WPA2
 
- :wlan0-ap-2:Infrastruktura:1:54 Mb/s:92:****:WPA1 WPA2
- :wlan0-ap-1:Infrastruktura:1:54 Mb/s:81:****:WPA1 WPA2
- :wlan0-ap-3:Infrastruktura:1:54 Mb/s:55:**  :WPA1 WPA2
 
 <<<
-size: 1927
-location: clients/tests/test-client.py:1071:test_004()/561
+size: 1839
+location: clients/tests/test-client.py:1085:test_004()/561
 cmd: $NMCLI --mode tabular --terse --color yes -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list
 lang: C
 returncode: 0
-stdout: 1634 bytes
+stdout: 1546 bytes
 >>>
-AP[1]:wlan1-ap-4:776C616E312D61702D34:94\:2B\:E8\:F6\:D2\:86:Infra:1:2412 MHz:54 Mbit/s:48:**  :WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan1:no: :/org/freedesktop/NetworkManager/AccessPoint/4
+AP[1]:wlan0-ap-2:776C616E302D61702D32:C0\:E2\:BE\:E8\:EF\:B6:Infra:1:2412 MHz:54 Mbit/s:92:****:WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:no: :/org/freedesktop/NetworkManager/AccessPoint/2
+AP[2]:wlan0-ap-1:776C616E302D61702D31:61\:95\:77\:AC\:1E\:4C:Infra:1:2412 MHz:54 Mbit/s:81:****:WPA1:pair_tkip pair_ccmp group_tkip group_ccmp psk:(none):wlan0:no: :/org/freedesktop/NetworkManager/AccessPoint/1
+AP[3]:wlan0-ap-3:776C616E302D61702D33:9B\:F6\:B7\:EC\:97\:76:Infra:1:2412 MHz:54 Mbit/s:55:**  :WPA3:(none):pair_tkip pair_ccmp group_tkip group_ccmp sae:wlan0:no: :/org/freedesktop/NetworkManager/AccessPoint/3
 
+AP[1]:wlan1-ap-4:776C616E312D61702D34:94\:2B\:E8\:F6\:D2\:86:Infra:1:2412 MHz:54 Mbit/s:48:**  :WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan1:no: :/org/freedesktop/NetworkManager/AccessPoint/4
 
-AP[1]:wlan0-ap-2:776C616E302D61702D32:C0\:E2\:BE\:E8\:EF\:B6:Infra:1:2412 MHz:54 Mbit/s:92:****:WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:no: :/org/freedesktop/NetworkManager/AccessPoint/2
-AP[2]:wlan0-ap-1:776C616E302D61702D31:61\:95\:77\:AC\:1E\:4C:Infra:1:2412 MHz:54 Mbit/s:81:****:WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:no: :/org/freedesktop/NetworkManager/AccessPoint/1
-AP[3]:wlan0-ap-3:776C616E302D61702D33:9B\:F6\:B7\:EC\:97\:76:Infra:1:2412 MHz:54 Mbit/s:55:**  :WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:no: :/org/freedesktop/NetworkManager/AccessPoint/3
 
 <<<
-size: 1985
-location: clients/tests/test-client.py:1071:test_004()/562
+size: 1897
+location: clients/tests/test-client.py:1085:test_004()/562
 cmd: $NMCLI --mode tabular --terse --color yes -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 1682 bytes
+stdout: 1594 bytes
 >>>
-AP[1]:wlan1-ap-4:776C616E312D61702D34:94\:2B\:E8\:F6\:D2\:86:Infrastruktura:1:2412 MHz:54 Mb/s:48:**  :WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan1:nie: :/org/freedesktop/NetworkManager/AccessPoint/4
+AP[1]:wlan0-ap-2:776C616E302D61702D32:C0\:E2\:BE\:E8\:EF\:B6:Infrastruktura:1:2412 MHz:54 Mb/s:92:****:WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:nie: :/org/freedesktop/NetworkManager/AccessPoint/2
+AP[2]:wlan0-ap-1:776C616E302D61702D31:61\:95\:77\:AC\:1E\:4C:Infrastruktura:1:2412 MHz:54 Mb/s:81:****:WPA1:pair_tkip pair_ccmp group_tkip group_ccmp psk:(brak):wlan0:nie: :/org/freedesktop/NetworkManager/AccessPoint/1
+AP[3]:wlan0-ap-3:776C616E302D61702D33:9B\:F6\:B7\:EC\:97\:76:Infrastruktura:1:2412 MHz:54 Mb/s:55:**  :WPA3:(brak):pair_tkip pair_ccmp group_tkip group_ccmp sae:wlan0:nie: :/org/freedesktop/NetworkManager/AccessPoint/3
 
+AP[1]:wlan1-ap-4:776C616E312D61702D34:94\:2B\:E8\:F6\:D2\:86:Infrastruktura:1:2412 MHz:54 Mb/s:48:**  :WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan1:nie: :/org/freedesktop/NetworkManager/AccessPoint/4
 
-AP[1]:wlan0-ap-2:776C616E302D61702D32:C0\:E2\:BE\:E8\:EF\:B6:Infrastruktura:1:2412 MHz:54 Mb/s:92:****:WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:nie: :/org/freedesktop/NetworkManager/AccessPoint/2
-AP[2]:wlan0-ap-1:776C616E302D61702D31:61\:95\:77\:AC\:1E\:4C:Infrastruktura:1:2412 MHz:54 Mb/s:81:****:WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:nie: :/org/freedesktop/NetworkManager/AccessPoint/1
-AP[3]:wlan0-ap-3:776C616E302D61702D33:9B\:F6\:B7\:EC\:97\:76:Infrastruktura:1:2412 MHz:54 Mb/s:55:**  :WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:nie: :/org/freedesktop/NetworkManager/AccessPoint/3
 
 <<<
-size: 611
-location: clients/tests/test-client.py:1073:test_004()/563
+size: 613
+location: clients/tests/test-client.py:1087:test_004()/563
 cmd: $NMCLI --mode tabular --terse --color yes -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: C
 returncode: 0
-stdout: 408 bytes
+stdout: 410 bytes
 >>>
 AP[1]:wlan0-ap-2:776C616E302D61702D32:C0\:E2\:BE\:E8\:EF\:B6:Infra:1:2412 MHz:54 Mbit/s:92:****:WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:no: :/org/freedesktop/NetworkManager/AccessPoint/2
 
+
+
 <<<
-size: 633
-location: clients/tests/test-client.py:1073:test_004()/564
+size: 635
+location: clients/tests/test-client.py:1087:test_004()/564
 cmd: $NMCLI --mode tabular --terse --color yes -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 420 bytes
+stdout: 422 bytes
 >>>
 AP[1]:wlan0-ap-2:776C616E302D61702D32:C0\:E2\:BE\:E8\:EF\:B6:Infrastruktura:1:2412 MHz:54 Mb/s:92:****:WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:nie: :/org/freedesktop/NetworkManager/AccessPoint/2
 
+
+
 <<<
-size: 327
-location: clients/tests/test-client.py:1075:test_004()/565
+size: 329
+location: clients/tests/test-client.py:1089:test_004()/565
 cmd: $NMCLI --mode tabular --terse --color yes -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: C
 returncode: 0
-stdout: 121 bytes
+stdout: 123 bytes
 >>>
  :wlan0-ap-2:Infra:1:54 Mbit/s:92:****:WPA1 WPA2
 
+
+
 <<<
-size: 346
-location: clients/tests/test-client.py:1075:test_004()/566
+size: 348
+location: clients/tests/test-client.py:1089:test_004()/566
 cmd: $NMCLI --mode tabular --terse --color yes -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 130 bytes
+stdout: 132 bytes
 >>>
  :wlan0-ap-2:Infrastruktura:1:54 Mb/s:92:****:WPA1 WPA2
 
+
+
 <<<
-size: 724
-location: clients/tests/test-client.py:1078:test_004()/567
+size: 726
+location: clients/tests/test-client.py:1092:test_004()/567
 cmd: $NMCLI --mode tabular --terse --color yes -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: C
 returncode: 0
-stdout: 408 bytes
+stdout: 410 bytes
 >>>
 AP[1]:wlan0-ap-2:776C616E302D61702D32:C0\:E2\:BE\:E8\:EF\:B6:Infra:1:2412 MHz:54 Mbit/s:92:****:WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:no: :/org/freedesktop/NetworkManager/AccessPoint/2
 
+
+
 <<<
-size: 746
-location: clients/tests/test-client.py:1078:test_004()/568
+size: 748
+location: clients/tests/test-client.py:1092:test_004()/568
 cmd: $NMCLI --mode tabular --terse --color yes -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 420 bytes
+stdout: 422 bytes
 >>>
 AP[1]:wlan0-ap-2:776C616E302D61702D32:C0\:E2\:BE\:E8\:EF\:B6:Infrastruktura:1:2412 MHz:54 Mb/s:92:****:WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:nie: :/org/freedesktop/NetworkManager/AccessPoint/2
 
+
+
 <<<
-size: 1599
-location: clients/tests/test-client.py:1080:test_004()/569
+size: 1613
+location: clients/tests/test-client.py:1094:test_004()/569
 cmd: $NMCLI --mode tabular --terse --color yes -f ALL device show wlan0
 lang: C
 returncode: 0
-stdout: 1418 bytes
+stdout: 1432 bytes
 >>>
-GENERAL:wlan0:wifi:NMDeviceWifi:::virtual:::13\:E0\:74\:85\:7C\:D9:0:20 (unavailable):0 (No reason given):/sys/devices/virtual/wlan0::no:yes:yes:no:no::con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:/org/freedesktop/NetworkManager/ActiveConnection/2:unknown
+GENERAL:wlan0:wifi:NMDeviceWifi:::virtual:::13\:E0\:74\:85\:7C\:D9:0:20 (unavailable):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/wlan0::no:yes:yes:no:no::con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:/org/freedesktop/NetworkManager/ActiveConnection/2:unknown
 CAPABILITIES:no:unknown:no:no
 WIFI-PROPERTIES:yes:yes:yes:yes:yes:yes:yes:unknown:unknown
 AP[1]: :wlan0-ap-2:Infra:1:54 Mbit/s:92:****:WPA1 WPA2
-AP[2]: :wlan0-ap-1:Infra:1:54 Mbit/s:81:****:WPA1 WPA2
-AP[3]: :wlan0-ap-3:Infra:1:54 Mbit/s:55:**  :WPA1 WPA2
+AP[2]: :wlan0-ap-1:Infra:1:54 Mbit/s:81:****:WPA1
+AP[3]: :wlan0-ap-3:Infra:1:54 Mbit/s:55:**  :WPA3
 IP4:192.168.228.18/32 | 192.168.209.179/25:192.168.41.120:::sear4.foo2.bar | sear4.fo.x.y | sear4.foo1.bar | sear4.foo4.bar | sear4.fo.o.bar:192.168.120.79
 DHCP4:dhcp-4-opt-0 = val-0 | dhcp-4-opt-2 = val-2 | dhcp-4-opt-4 = val-4 | dhcp-4-opt-7 = val-7
 IP6:::dst = 2001\:a\:\:dd5b\:aa7b\:b4a2\:e42/102, nh = \:\:, mt = 2504159086::sear6.foo2.bar | sear6.foo1.bar | sear6.fo.x.y | sear6.fo.o.bar | sear6.foo3.bar | sear6.foo4.bar
@@ -27628,19 +28012,19 @@ DHCP6:dhcp-6-opt-1 = val-1 | dhcp-6-opt-2 = val-2 | dhcp-6-opt-3 = val-3 | dhcp-
 CONNECTIONS:/org/freedesktop/NetworkManager/Settings/Connection/{2}:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 
 <<<
-size: 1636
-location: clients/tests/test-client.py:1080:test_004()/570
+size: 1650
+location: clients/tests/test-client.py:1094:test_004()/570
 cmd: $NMCLI --mode tabular --terse --color yes -f ALL device show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 1445 bytes
+stdout: 1459 bytes
 >>>
-GENERAL:wlan0:wifi:NMDeviceWifi:::virtual:::13\:E0\:74\:85\:7C\:D9:0:20 (unavailable):0 (No reason given):/sys/devices/virtual/wlan0::no:yes:yes:no:no::con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:/org/freedesktop/NetworkManager/ActiveConnection/2:unknown
+GENERAL:wlan0:wifi:NMDeviceWifi:::virtual:::13\:E0\:74\:85\:7C\:D9:0:20 (unavailable):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/wlan0::no:yes:yes:no:no::con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:/org/freedesktop/NetworkManager/ActiveConnection/2:unknown
 CAPABILITIES:no:unknown:no:no
 WIFI-PROPERTIES:yes:yes:yes:yes:yes:yes:yes:unknown:unknown
 AP[1]: :wlan0-ap-2:Infrastruktura:1:54 Mb/s:92:****:WPA1 WPA2
-AP[2]: :wlan0-ap-1:Infrastruktura:1:54 Mb/s:81:****:WPA1 WPA2
-AP[3]: :wlan0-ap-3:Infrastruktura:1:54 Mb/s:55:**  :WPA1 WPA2
+AP[2]: :wlan0-ap-1:Infrastruktura:1:54 Mb/s:81:****:WPA1
+AP[3]: :wlan0-ap-3:Infrastruktura:1:54 Mb/s:55:**  :WPA3
 IP4:192.168.228.18/32 | 192.168.209.179/25:192.168.41.120:::sear4.foo2.bar | sear4.fo.x.y | sear4.foo1.bar | sear4.foo4.bar | sear4.fo.o.bar:192.168.120.79
 DHCP4:dhcp-4-opt-0 = val-0 | dhcp-4-opt-2 = val-2 | dhcp-4-opt-4 = val-4 | dhcp-4-opt-7 = val-7
 IP6:::dst = 2001\:a\:\:dd5b\:aa7b\:b4a2\:e42/102, nh = \:\:, mt = 2504159086::sear6.foo2.bar | sear6.foo1.bar | sear6.fo.x.y | sear6.fo.o.bar | sear6.foo3.bar | sear6.foo4.bar
@@ -27649,7 +28033,7 @@ CONNECTIONS:/org/freedesktop/NetworkManager/Settings/Connection/{2}:UUID-con-xx1
 
 <<<
 size: 629
-location: clients/tests/test-client.py:1082:test_004()/571
+location: clients/tests/test-client.py:1096:test_004()/571
 cmd: $NMCLI --mode tabular --terse --color yes -f COMMON device show wlan0
 lang: C
 returncode: 0
@@ -27667,7 +28051,7 @@ IP6:::dst = 2001\:a\:\:dd5b\:aa7b\:b4a2\:e42/102, nh = \:\:, mt = 2504159086::se
 
 <<<
 size: 639
-location: clients/tests/test-client.py:1082:test_004()/572
+location: clients/tests/test-client.py:1096:test_004()/572
 cmd: $NMCLI --mode tabular --terse --color yes -f COMMON device show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
@@ -27684,19 +28068,19 @@ IP4:192.168.228.18/32 | 192.168.209.179/25:192.168.41.120:::sear4.foo2.bar | sea
 IP6:::dst = 2001\:a\:\:dd5b\:aa7b\:b4a2\:e42/102, nh = \:\:, mt = 2504159086::sear6.foo2.bar | sear6.foo1.bar | sear6.fo.x.y | sear6.fo.o.bar | sear6.foo3.bar | sear6.foo4.bar
 
 <<<
-size: 1737
-location: clients/tests/test-client.py:1084:test_004()/573
+size: 1751
+location: clients/tests/test-client.py:1098:test_004()/573
 cmd: $NMCLI --mode tabular --terse --color yes -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0
 lang: C
 returncode: 0
-stdout: 1418 bytes
+stdout: 1432 bytes
 >>>
-GENERAL:wlan0:wifi:NMDeviceWifi:::virtual:::13\:E0\:74\:85\:7C\:D9:0:20 (unavailable):0 (No reason given):/sys/devices/virtual/wlan0::no:yes:yes:no:no::con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:/org/freedesktop/NetworkManager/ActiveConnection/2:unknown
+GENERAL:wlan0:wifi:NMDeviceWifi:::virtual:::13\:E0\:74\:85\:7C\:D9:0:20 (unavailable):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/wlan0::no:yes:yes:no:no::con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:/org/freedesktop/NetworkManager/ActiveConnection/2:unknown
 CAPABILITIES:no:unknown:no:no
 WIFI-PROPERTIES:yes:yes:yes:yes:yes:yes:yes:unknown:unknown
 AP[1]: :wlan0-ap-2:Infra:1:54 Mbit/s:92:****:WPA1 WPA2
-AP[2]: :wlan0-ap-1:Infra:1:54 Mbit/s:81:****:WPA1 WPA2
-AP[3]: :wlan0-ap-3:Infra:1:54 Mbit/s:55:**  :WPA1 WPA2
+AP[2]: :wlan0-ap-1:Infra:1:54 Mbit/s:81:****:WPA1
+AP[3]: :wlan0-ap-3:Infra:1:54 Mbit/s:55:**  :WPA3
 IP4:192.168.228.18/32 | 192.168.209.179/25:192.168.41.120:::sear4.foo2.bar | sear4.fo.x.y | sear4.foo1.bar | sear4.foo4.bar | sear4.fo.o.bar:192.168.120.79
 DHCP4:dhcp-4-opt-0 = val-0 | dhcp-4-opt-2 = val-2 | dhcp-4-opt-4 = val-4 | dhcp-4-opt-7 = val-7
 IP6:::dst = 2001\:a\:\:dd5b\:aa7b\:b4a2\:e42/102, nh = \:\:, mt = 2504159086::sear6.foo2.bar | sear6.foo1.bar | sear6.fo.x.y | sear6.fo.o.bar | sear6.foo3.bar | sear6.foo4.bar
@@ -27704,19 +28088,19 @@ DHCP6:dhcp-6-opt-1 = val-1 | dhcp-6-opt-2 = val-2 | dhcp-6-opt-3 = val-3 | dhcp-
 CONNECTIONS:/org/freedesktop/NetworkManager/Settings/Connection/{2}:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 
 <<<
-size: 1774
-location: clients/tests/test-client.py:1084:test_004()/574
+size: 1788
+location: clients/tests/test-client.py:1098:test_004()/574
 cmd: $NMCLI --mode tabular --terse --color yes -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 1445 bytes
+stdout: 1459 bytes
 >>>
-GENERAL:wlan0:wifi:NMDeviceWifi:::virtual:::13\:E0\:74\:85\:7C\:D9:0:20 (unavailable):0 (No reason given):/sys/devices/virtual/wlan0::no:yes:yes:no:no::con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:/org/freedesktop/NetworkManager/ActiveConnection/2:unknown
+GENERAL:wlan0:wifi:NMDeviceWifi:::virtual:::13\:E0\:74\:85\:7C\:D9:0:20 (unavailable):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/wlan0::no:yes:yes:no:no::con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:/org/freedesktop/NetworkManager/ActiveConnection/2:unknown
 CAPABILITIES:no:unknown:no:no
 WIFI-PROPERTIES:yes:yes:yes:yes:yes:yes:yes:unknown:unknown
 AP[1]: :wlan0-ap-2:Infrastruktura:1:54 Mb/s:92:****:WPA1 WPA2
-AP[2]: :wlan0-ap-1:Infrastruktura:1:54 Mb/s:81:****:WPA1 WPA2
-AP[3]: :wlan0-ap-3:Infrastruktura:1:54 Mb/s:55:**  :WPA1 WPA2
+AP[2]: :wlan0-ap-1:Infrastruktura:1:54 Mb/s:81:****:WPA1
+AP[3]: :wlan0-ap-3:Infrastruktura:1:54 Mb/s:55:**  :WPA3
 IP4:192.168.228.18/32 | 192.168.209.179/25:192.168.41.120:::sear4.foo2.bar | sear4.fo.x.y | sear4.foo1.bar | sear4.foo4.bar | sear4.fo.o.bar:192.168.120.79
 DHCP4:dhcp-4-opt-0 = val-0 | dhcp-4-opt-2 = val-2 | dhcp-4-opt-4 = val-4 | dhcp-4-opt-7 = val-7
 IP6:::dst = 2001\:a\:\:dd5b\:aa7b\:b4a2\:e42/102, nh = \:\:, mt = 2504159086::sear6.foo2.bar | sear6.foo1.bar | sear6.fo.x.y | sear6.fo.o.bar | sear6.foo3.bar | sear6.foo4.bar
@@ -27725,7 +28109,7 @@ CONNECTIONS:/org/freedesktop/NetworkManager/Settings/Connection/{2}:UUID-con-xx1
 
 <<<
 size: 4621
-location: clients/tests/test-client.py:1022:test_004()/575
+location: clients/tests/test-client.py:1036:test_004()/575
 cmd: $NMCLI --mode multiline con s con-vpn-1
 lang: C
 returncode: 0
@@ -27826,12 +28210,12 @@ VPN.CFG[2]:                             key2 = val2
 VPN.CFG[3]:                             key3 = val3
 
 <<<
-size: 4649
-location: clients/tests/test-client.py:1022:test_004()/576
+size: 4651
+location: clients/tests/test-client.py:1036:test_004()/576
 cmd: $NMCLI --mode multiline con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 4485 bytes
+stdout: 4487 bytes
 >>>
 connection.id:                          con-vpn-1
 connection.uuid:                        UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -27922,14 +28306,14 @@ VPN.TYPE:                               openvpn
 VPN.USERNAME:                           --
 VPN.GATEWAY:                            --
 VPN.BANNER:                             *** VPN connection con-vpn-1 ***
-VPN.VPN-STATE:                          5 - Połączono z VPN
+VPN.VPN-STATE:                          5 — Połączono z VPN
 VPN.CFG[1]:                             key1 = val1
 VPN.CFG[2]:                             key2 = val2
 VPN.CFG[3]:                             key3 = val3
 
 <<<
 size: 4621
-location: clients/tests/test-client.py:1024:test_004()/577
+location: clients/tests/test-client.py:1038:test_004()/577
 cmd: $NMCLI --mode multiline con s con-vpn-1
 lang: C
 returncode: 0
@@ -28030,12 +28414,12 @@ VPN.CFG[2]:                             key2 = val2
 VPN.CFG[3]:                             key3 = val3
 
 <<<
-size: 4649
-location: clients/tests/test-client.py:1024:test_004()/578
+size: 4651
+location: clients/tests/test-client.py:1038:test_004()/578
 cmd: $NMCLI --mode multiline con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 4485 bytes
+stdout: 4487 bytes
 >>>
 connection.id:                          con-vpn-1
 connection.uuid:                        UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -28126,14 +28510,14 @@ VPN.TYPE:                               openvpn
 VPN.USERNAME:                           --
 VPN.GATEWAY:                            --
 VPN.BANNER:                             *** VPN connection con-vpn-1 ***
-VPN.VPN-STATE:                          5 - Połączono z VPN
+VPN.VPN-STATE:                          5 — Połączono z VPN
 VPN.CFG[1]:                             key1 = val1
 VPN.CFG[2]:                             key2 = val2
 VPN.CFG[3]:                             key3 = val3
 
 <<<
 size: 3540
-location: clients/tests/test-client.py:1027:test_004()/579
+location: clients/tests/test-client.py:1041:test_004()/579
 cmd: $NMCLI --mode multiline -f ALL con s con-vpn-1
 lang: C
 returncode: 0
@@ -28215,7 +28599,7 @@ proxy.pac-script:                       --
 
 <<<
 size: 3560
-location: clients/tests/test-client.py:1027:test_004()/580
+location: clients/tests/test-client.py:1041:test_004()/580
 cmd: $NMCLI --mode multiline -f ALL con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
@@ -28297,7 +28681,7 @@ proxy.pac-script:                       --
 
 <<<
 size: 494
-location: clients/tests/test-client.py:1033:test_004()/581
+location: clients/tests/test-client.py:1047:test_004()/581
 cmd: $NMCLI --mode multiline -f VPN con s con-vpn-1
 lang: C
 returncode: 0
@@ -28312,7 +28696,7 @@ vpn.timeout:                            0
 
 <<<
 size: 505
-location: clients/tests/test-client.py:1033:test_004()/582
+location: clients/tests/test-client.py:1047:test_004()/582
 cmd: $NMCLI --mode multiline -f VPN con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
@@ -28327,7 +28711,7 @@ vpn.timeout:                            0
 
 <<<
 size: 831
-location: clients/tests/test-client.py:1036:test_004()/583
+location: clients/tests/test-client.py:1050:test_004()/583
 cmd: $NMCLI --mode multiline -f GENERAL con s con-vpn-1
 lang: C
 returncode: 0
@@ -28348,7 +28732,7 @@ GENERAL.MASTER-PATH:                    --
 
 <<<
 size: 844
-location: clients/tests/test-client.py:1036:test_004()/584
+location: clients/tests/test-client.py:1050:test_004()/584
 cmd: $NMCLI --mode multiline -f GENERAL con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
@@ -28369,12 +28753,16 @@ GENERAL.MASTER-PATH:                    --
 
 <<<
 size: 1086
-location: clients/tests/test-client.py:1039:test_004()/585
+location: clients/tests/test-client.py:1053:test_004()/585
 cmd: $NMCLI --mode multiline dev s
 lang: C
 returncode: 0
 stdout: 943 bytes
 >>>
+DEVICE:                                 wlan0
+TYPE:                                   wifi
+STATE:                                  unavailable
+CONNECTION:                             con-vpn-1
 DEVICE:                                 eth0
 TYPE:                                   ethernet
 STATE:                                  unavailable
@@ -28391,19 +28779,19 @@ DEVICE:                                 wlan1
 TYPE:                                   wifi
 STATE:                                  unavailable
 CONNECTION:                             --
-DEVICE:                                 wlan0
-TYPE:                                   wifi
-STATE:                                  unavailable
-CONNECTION:                             con-vpn-1
 
 <<<
 size: 1101
-location: clients/tests/test-client.py:1039:test_004()/586
+location: clients/tests/test-client.py:1053:test_004()/586
 cmd: $NMCLI --mode multiline dev s
 lang: pl_PL.UTF-8
 returncode: 0
 stdout: 948 bytes
 >>>
+DEVICE:                                 wlan0
+TYPE:                                   wifi
+STATE:                                  niedostępne
+CONNECTION:                             con-vpn-1
 DEVICE:                                 eth0
 TYPE:                                   ethernet
 STATE:                                  niedostępne
@@ -28420,22 +28808,29 @@ DEVICE:                                 wlan1
 TYPE:                                   wifi
 STATE:                                  niedostępne
 CONNECTION:                             --
-DEVICE:                                 wlan0
-TYPE:                                   wifi
-STATE:                                  niedostępne
-CONNECTION:                             con-vpn-1
 
 <<<
-size: 2021
-location: clients/tests/test-client.py:1042:test_004()/587
+size: 2501
+location: clients/tests/test-client.py:1056:test_004()/587
 cmd: $NMCLI --mode multiline -f all dev status
 lang: C
 returncode: 0
-stdout: 1865 bytes
+stdout: 2345 bytes
 >>>
+DEVICE:                                 wlan0
+TYPE:                                   wifi
+STATE:                                  unavailable
+IP4-CONNECTIVITY:                       unknown
+IP6-CONNECTIVITY:                       unknown
+DBUS-PATH:                              /org/freedesktop/NetworkManager/Devices/3
+CONNECTION:                             con-vpn-1
+CON-UUID:                               UUID-con-vpn-1-REPLACED-REPLACED-REP
+CON-PATH:                               /org/freedesktop/NetworkManager/ActiveConnection/2
 DEVICE:                                 eth0
 TYPE:                                   ethernet
 STATE:                                  unavailable
+IP4-CONNECTIVITY:                       unknown
+IP6-CONNECTIVITY:                       unknown
 DBUS-PATH:                              /org/freedesktop/NetworkManager/Devices/1
 CONNECTION:                             --
 CON-UUID:                               --
@@ -28443,6 +28838,8 @@ CON-PATH:                               --
 DEVICE:                                 eth1
 TYPE:                                   ethernet
 STATE:                                  unavailable
+IP4-CONNECTIVITY:                       unknown
+IP6-CONNECTIVITY:                       unknown
 DBUS-PATH:                              /org/freedesktop/NetworkManager/Devices/2
 CONNECTION:                             --
 CON-UUID:                               --
@@ -28450,6 +28847,8 @@ CON-PATH:                               --
 DEVICE:                                 wlan1
 TYPE:                                   wifi
 STATE:                                  unavailable
+IP4-CONNECTIVITY:                       unknown
+IP6-CONNECTIVITY:                       unknown
 DBUS-PATH:                              /org/freedesktop/NetworkManager/Devices/4
 CONNECTION:                             --
 CON-UUID:                               --
@@ -28457,29 +28856,35 @@ CON-PATH:                               --
 DEVICE:                                 wlan1
 TYPE:                                   wifi
 STATE:                                  unavailable
+IP4-CONNECTIVITY:                       unknown
+IP6-CONNECTIVITY:                       unknown
 DBUS-PATH:                              /org/freedesktop/NetworkManager/Devices/5
 CONNECTION:                             --
 CON-UUID:                               --
 CON-PATH:                               --
-DEVICE:                                 wlan0
-TYPE:                                   wifi
-STATE:                                  unavailable
-DBUS-PATH:                              /org/freedesktop/NetworkManager/Devices/3
-CONNECTION:                             con-vpn-1
-CON-UUID:                               UUID-con-vpn-1-REPLACED-REPLACED-REP
-CON-PATH:                               /org/freedesktop/NetworkManager/ActiveConnection/2
 
 <<<
-size: 2036
-location: clients/tests/test-client.py:1042:test_004()/588
+size: 2526
+location: clients/tests/test-client.py:1056:test_004()/588
 cmd: $NMCLI --mode multiline -f all dev status
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 1870 bytes
+stdout: 2360 bytes
 >>>
+DEVICE:                                 wlan0
+TYPE:                                   wifi
+STATE:                                  niedostępne
+IP4-CONNECTIVITY:                       nieznane
+IP6-CONNECTIVITY:                       nieznane
+DBUS-PATH:                              /org/freedesktop/NetworkManager/Devices/3
+CONNECTION:                             con-vpn-1
+CON-UUID:                               UUID-con-vpn-1-REPLACED-REPLACED-REP
+CON-PATH:                               /org/freedesktop/NetworkManager/ActiveConnection/2
 DEVICE:                                 eth0
 TYPE:                                   ethernet
 STATE:                                  niedostępne
+IP4-CONNECTIVITY:                       nieznane
+IP6-CONNECTIVITY:                       nieznane
 DBUS-PATH:                              /org/freedesktop/NetworkManager/Devices/1
 CONNECTION:                             --
 CON-UUID:                               --
@@ -28487,6 +28892,8 @@ CON-PATH:                               --
 DEVICE:                                 eth1
 TYPE:                                   ethernet
 STATE:                                  niedostępne
+IP4-CONNECTIVITY:                       nieznane
+IP6-CONNECTIVITY:                       nieznane
 DBUS-PATH:                              /org/freedesktop/NetworkManager/Devices/2
 CONNECTION:                             --
 CON-UUID:                               --
@@ -28494,6 +28901,8 @@ CON-PATH:                               --
 DEVICE:                                 wlan1
 TYPE:                                   wifi
 STATE:                                  niedostępne
+IP4-CONNECTIVITY:                       nieznane
+IP6-CONNECTIVITY:                       nieznane
 DBUS-PATH:                              /org/freedesktop/NetworkManager/Devices/4
 CONNECTION:                             --
 CON-UUID:                               --
@@ -28501,26 +28910,46 @@ CON-PATH:                               --
 DEVICE:                                 wlan1
 TYPE:                                   wifi
 STATE:                                  niedostępne
+IP4-CONNECTIVITY:                       nieznane
+IP6-CONNECTIVITY:                       nieznane
 DBUS-PATH:                              /org/freedesktop/NetworkManager/Devices/5
 CONNECTION:                             --
 CON-UUID:                               --
 CON-PATH:                               --
-DEVICE:                                 wlan0
-TYPE:                                   wifi
-STATE:                                  niedostępne
-DBUS-PATH:                              /org/freedesktop/NetworkManager/Devices/3
-CONNECTION:                             con-vpn-1
-CON-UUID:                               UUID-con-vpn-1-REPLACED-REPLACED-REP
-CON-PATH:                               /org/freedesktop/NetworkManager/ActiveConnection/2
 
 <<<
 size: 8065
-location: clients/tests/test-client.py:1045:test_004()/589
+location: clients/tests/test-client.py:1059:test_004()/589
 cmd: $NMCLI --mode multiline dev show
 lang: C
 returncode: 0
 stdout: 7918 bytes
 >>>
+GENERAL.DEVICE:                         wlan0
+GENERAL.TYPE:                           wifi
+GENERAL.HWADDR:                         13:E0:74:85:7C:D9
+GENERAL.MTU:                            0
+GENERAL.STATE:                          20 (unavailable)
+GENERAL.CONNECTION:                     con-vpn-1
+GENERAL.CON-PATH:                       /org/freedesktop/NetworkManager/ActiveConnection/2
+IP4.ADDRESS[1]:                         192.168.228.18/32
+IP4.ADDRESS[2]:                         192.168.209.179/25
+IP4.GATEWAY:                            192.168.41.120
+IP4.DOMAIN[1]:                          sear4.foo2.bar
+IP4.DOMAIN[2]:                          sear4.fo.x.y
+IP4.DOMAIN[3]:                          sear4.foo1.bar
+IP4.DOMAIN[4]:                          sear4.foo4.bar
+IP4.DOMAIN[5]:                          sear4.fo.o.bar
+IP4.WINS[1]:                            192.168.120.79
+IP6.GATEWAY:                            --
+IP6.ROUTE[1]:                           dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086
+IP6.DOMAIN[1]:                          sear6.foo2.bar
+IP6.DOMAIN[2]:                          sear6.foo1.bar
+IP6.DOMAIN[3]:                          sear6.fo.x.y
+IP6.DOMAIN[4]:                          sear6.fo.o.bar
+IP6.DOMAIN[5]:                          sear6.foo3.bar
+IP6.DOMAIN[6]:                          sear6.foo4.bar
+
 GENERAL.DEVICE:                         eth0
 GENERAL.TYPE:                           ethernet
 GENERAL.HWADDR:                         AB:B7:BF:E2:48:E8
@@ -28634,11 +29063,19 @@ IP6.ROUTE[3]:                           dst = 2001:a::afb7:4449:3787:8bb4/123, n
 IP6.DNS[1]:                             2001:a::2934:bd66:550d:ec19
 IP6.DOMAIN[1]:                          sear6.fo.x.y
 
+<<<
+size: 8096
+location: clients/tests/test-client.py:1059:test_004()/590
+cmd: $NMCLI --mode multiline dev show
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 7939 bytes
+>>>
 GENERAL.DEVICE:                         wlan0
 GENERAL.TYPE:                           wifi
 GENERAL.HWADDR:                         13:E0:74:85:7C:D9
 GENERAL.MTU:                            0
-GENERAL.STATE:                          20 (unavailable)
+GENERAL.STATE:                          20 (niedostępne)
 GENERAL.CONNECTION:                     con-vpn-1
 GENERAL.CON-PATH:                       /org/freedesktop/NetworkManager/ActiveConnection/2
 IP4.ADDRESS[1]:                         192.168.228.18/32
@@ -28659,14 +29096,6 @@ IP6.DOMAIN[4]:                          sear6.fo.o.bar
 IP6.DOMAIN[5]:                          sear6.foo3.bar
 IP6.DOMAIN[6]:                          sear6.foo4.bar
 
-<<<
-size: 8096
-location: clients/tests/test-client.py:1045:test_004()/590
-cmd: $NMCLI --mode multiline dev show
-lang: pl_PL.UTF-8
-returncode: 0
-stdout: 7939 bytes
->>>
 GENERAL.DEVICE:                         eth0
 GENERAL.TYPE:                           ethernet
 GENERAL.HWADDR:                         AB:B7:BF:E2:48:E8
@@ -28780,13 +29209,77 @@ IP6.ROUTE[3]:                           dst = 2001:a::afb7:4449:3787:8bb4/123, n
 IP6.DNS[1]:                             2001:a::2934:bd66:550d:ec19
 IP6.DOMAIN[1]:                          sear6.fo.x.y
 
+<<<
+size: 20678
+location: clients/tests/test-client.py:1062:test_004()/591
+cmd: $NMCLI --mode multiline -f all dev show
+lang: C
+returncode: 0
+stdout: 20523 bytes
+>>>
 GENERAL.DEVICE:                         wlan0
 GENERAL.TYPE:                           wifi
+GENERAL.NM-TYPE:                        NMDeviceWifi
+GENERAL.VENDOR:                         --
+GENERAL.PRODUCT:                        --
+GENERAL.DRIVER:                         virtual
+GENERAL.DRIVER-VERSION:                 --
+GENERAL.FIRMWARE-VERSION:               --
 GENERAL.HWADDR:                         13:E0:74:85:7C:D9
 GENERAL.MTU:                            0
-GENERAL.STATE:                          20 (niedostępne)
+GENERAL.STATE:                          20 (unavailable)
+GENERAL.REASON:                         0 (No reason given)
+GENERAL.IP4-CONNECTIVITY:               0 (unknown)
+GENERAL.IP6-CONNECTIVITY:               0 (unknown)
+GENERAL.UDI:                            /sys/devices/virtual/wlan0
+GENERAL.IP-IFACE:                       --
+GENERAL.IS-SOFTWARE:                    no
+GENERAL.NM-MANAGED:                     yes
+GENERAL.AUTOCONNECT:                    yes
+GENERAL.FIRMWARE-MISSING:               no
+GENERAL.NM-PLUGIN-MISSING:              no
+GENERAL.PHYS-PORT-ID:                   --
 GENERAL.CONNECTION:                     con-vpn-1
+GENERAL.CON-UUID:                       UUID-con-vpn-1-REPLACED-REPLACED-REP
 GENERAL.CON-PATH:                       /org/freedesktop/NetworkManager/ActiveConnection/2
+GENERAL.METERED:                        unknown
+CAPABILITIES.CARRIER-DETECT:            no
+CAPABILITIES.SPEED:                     unknown
+CAPABILITIES.IS-SOFTWARE:               no
+CAPABILITIES.SRIOV:                     no
+WIFI-PROPERTIES.WEP:                    yes
+WIFI-PROPERTIES.WPA:                    yes
+WIFI-PROPERTIES.WPA2:                   yes
+WIFI-PROPERTIES.TKIP:                   yes
+WIFI-PROPERTIES.CCMP:                   yes
+WIFI-PROPERTIES.AP:                     yes
+WIFI-PROPERTIES.ADHOC:                  yes
+WIFI-PROPERTIES.2GHZ:                   unknown
+WIFI-PROPERTIES.5GHZ:                   unknown
+AP[1].IN-USE:                            
+AP[1].SSID:                             wlan0-ap-2
+AP[1].MODE:                             Infra
+AP[1].CHAN:                             1
+AP[1].RATE:                             54 Mbit/s
+AP[1].SIGNAL:                           92
+AP[1].BARS:                             ****
+AP[1].SECURITY:                         WPA1 WPA2
+AP[2].IN-USE:                            
+AP[2].SSID:                             wlan0-ap-1
+AP[2].MODE:                             Infra
+AP[2].CHAN:                             1
+AP[2].RATE:                             54 Mbit/s
+AP[2].SIGNAL:                           81
+AP[2].BARS:                             ****
+AP[2].SECURITY:                         WPA1
+AP[3].IN-USE:                            
+AP[3].SSID:                             wlan0-ap-3
+AP[3].MODE:                             Infra
+AP[3].CHAN:                             1
+AP[3].RATE:                             54 Mbit/s
+AP[3].SIGNAL:                           55
+AP[3].BARS:                             **  
+AP[3].SECURITY:                         WPA3
 IP4.ADDRESS[1]:                         192.168.228.18/32
 IP4.ADDRESS[2]:                         192.168.209.179/25
 IP4.GATEWAY:                            192.168.41.120
@@ -28796,6 +29289,10 @@ IP4.DOMAIN[3]:                          sear4.foo1.bar
 IP4.DOMAIN[4]:                          sear4.foo4.bar
 IP4.DOMAIN[5]:                          sear4.fo.o.bar
 IP4.WINS[1]:                            192.168.120.79
+DHCP4.OPTION[1]:                        dhcp-4-opt-0 = val-0
+DHCP4.OPTION[2]:                        dhcp-4-opt-2 = val-2
+DHCP4.OPTION[3]:                        dhcp-4-opt-4 = val-4
+DHCP4.OPTION[4]:                        dhcp-4-opt-7 = val-7
 IP6.GATEWAY:                            --
 IP6.ROUTE[1]:                           dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086
 IP6.DOMAIN[1]:                          sear6.foo2.bar
@@ -28804,15 +29301,14 @@ IP6.DOMAIN[3]:                          sear6.fo.x.y
 IP6.DOMAIN[4]:                          sear6.fo.o.bar
 IP6.DOMAIN[5]:                          sear6.foo3.bar
 IP6.DOMAIN[6]:                          sear6.foo4.bar
+DHCP6.OPTION[1]:                        dhcp-6-opt-1 = val-1
+DHCP6.OPTION[2]:                        dhcp-6-opt-2 = val-2
+DHCP6.OPTION[3]:                        dhcp-6-opt-3 = val-3
+DHCP6.OPTION[4]:                        dhcp-6-opt-4 = val-4
+DHCP6.OPTION[5]:                        dhcp-6-opt-5 = val-5
+CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings/Connection/{2}
+CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 
-<<<
-size: 20168
-location: clients/tests/test-client.py:1048:test_004()/591
-cmd: $NMCLI --mode multiline -f all dev show
-lang: C
-returncode: 0
-stdout: 20013 bytes
->>>
 GENERAL.DEVICE:                         eth0
 GENERAL.TYPE:                           ethernet
 GENERAL.NM-TYPE:                        NMDeviceEthernet
@@ -28825,6 +29321,8 @@ GENERAL.HWADDR:                         AB:B7:BF:E2:48:E8
 GENERAL.MTU:                            0
 GENERAL.STATE:                          20 (unavailable)
 GENERAL.REASON:                         0 (No reason given)
+GENERAL.IP4-CONNECTIVITY:               0 (unknown)
+GENERAL.IP6-CONNECTIVITY:               0 (unknown)
 GENERAL.UDI:                            /sys/devices/virtual/eth0
 GENERAL.IP-IFACE:                       --
 GENERAL.IS-SOFTWARE:                    no
@@ -28886,6 +29384,8 @@ GENERAL.HWADDR:                         E7:78:B1:93:2B:22
 GENERAL.MTU:                            0
 GENERAL.STATE:                          20 (unavailable)
 GENERAL.REASON:                         0 (No reason given)
+GENERAL.IP4-CONNECTIVITY:               0 (unknown)
+GENERAL.IP6-CONNECTIVITY:               0 (unknown)
 GENERAL.UDI:                            /sys/devices/virtual/eth1
 GENERAL.IP-IFACE:                       --
 GENERAL.IS-SOFTWARE:                    no
@@ -28954,6 +29454,8 @@ GENERAL.HWADDR:                         21:E9:64:81:8C:A8
 GENERAL.MTU:                            0
 GENERAL.STATE:                          20 (unavailable)
 GENERAL.REASON:                         0 (No reason given)
+GENERAL.IP4-CONNECTIVITY:               0 (unknown)
+GENERAL.IP6-CONNECTIVITY:               0 (unknown)
 GENERAL.UDI:                            /sys/devices/virtual/wlan1
 GENERAL.IP-IFACE:                       --
 GENERAL.IS-SOFTWARE:                    no
@@ -29040,6 +29542,8 @@ GENERAL.HWADDR:                         71:52:AD:63:5C:7C
 GENERAL.MTU:                            0
 GENERAL.STATE:                          20 (unavailable)
 GENERAL.REASON:                         0 (No reason given)
+GENERAL.IP4-CONNECTIVITY:               0 (unknown)
+GENERAL.IP6-CONNECTIVITY:               0 (unknown)
 GENERAL.UDI:                            /sys/devices/virtual/wlan1
 GENERAL.IP-IFACE:                       --
 GENERAL.IS-SOFTWARE:                    no
@@ -29094,6 +29598,14 @@ DHCP6.OPTION[5]:                        dhcp-6-opt-9 = val-9
 CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings/Connection/{2}
 CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 
+<<<
+size: 20828
+location: clients/tests/test-client.py:1062:test_004()/592
+cmd: $NMCLI --mode multiline -f all dev show
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 20663 bytes
+>>>
 GENERAL.DEVICE:                         wlan0
 GENERAL.TYPE:                           wifi
 GENERAL.NM-TYPE:                        NMDeviceWifi
@@ -29104,57 +29616,59 @@ GENERAL.DRIVER-VERSION:                 --
 GENERAL.FIRMWARE-VERSION:               --
 GENERAL.HWADDR:                         13:E0:74:85:7C:D9
 GENERAL.MTU:                            0
-GENERAL.STATE:                          20 (unavailable)
-GENERAL.REASON:                         0 (No reason given)
+GENERAL.STATE:                          20 (niedostępne)
+GENERAL.REASON:                         0 (Nie podano przyczyny)
+GENERAL.IP4-CONNECTIVITY:               0 (nieznane)
+GENERAL.IP6-CONNECTIVITY:               0 (nieznane)
 GENERAL.UDI:                            /sys/devices/virtual/wlan0
 GENERAL.IP-IFACE:                       --
-GENERAL.IS-SOFTWARE:                    no
-GENERAL.NM-MANAGED:                     yes
-GENERAL.AUTOCONNECT:                    yes
-GENERAL.FIRMWARE-MISSING:               no
-GENERAL.NM-PLUGIN-MISSING:              no
+GENERAL.IS-SOFTWARE:                    nie
+GENERAL.NM-MANAGED:                     tak
+GENERAL.AUTOCONNECT:                    tak
+GENERAL.FIRMWARE-MISSING:               nie
+GENERAL.NM-PLUGIN-MISSING:              nie
 GENERAL.PHYS-PORT-ID:                   --
 GENERAL.CONNECTION:                     con-vpn-1
 GENERAL.CON-UUID:                       UUID-con-vpn-1-REPLACED-REPLACED-REP
 GENERAL.CON-PATH:                       /org/freedesktop/NetworkManager/ActiveConnection/2
-GENERAL.METERED:                        unknown
-CAPABILITIES.CARRIER-DETECT:            no
-CAPABILITIES.SPEED:                     unknown
-CAPABILITIES.IS-SOFTWARE:               no
-CAPABILITIES.SRIOV:                     no
-WIFI-PROPERTIES.WEP:                    yes
-WIFI-PROPERTIES.WPA:                    yes
-WIFI-PROPERTIES.WPA2:                   yes
-WIFI-PROPERTIES.TKIP:                   yes
-WIFI-PROPERTIES.CCMP:                   yes
-WIFI-PROPERTIES.AP:                     yes
-WIFI-PROPERTIES.ADHOC:                  yes
-WIFI-PROPERTIES.2GHZ:                   unknown
-WIFI-PROPERTIES.5GHZ:                   unknown
+GENERAL.METERED:                        nieznane
+CAPABILITIES.CARRIER-DETECT:            nie
+CAPABILITIES.SPEED:                     nieznane
+CAPABILITIES.IS-SOFTWARE:               nie
+CAPABILITIES.SRIOV:                     nie
+WIFI-PROPERTIES.WEP:                    tak
+WIFI-PROPERTIES.WPA:                    tak
+WIFI-PROPERTIES.WPA2:                   tak
+WIFI-PROPERTIES.TKIP:                   tak
+WIFI-PROPERTIES.CCMP:                   tak
+WIFI-PROPERTIES.AP:                     tak
+WIFI-PROPERTIES.ADHOC:                  tak
+WIFI-PROPERTIES.2GHZ:                   nieznane
+WIFI-PROPERTIES.5GHZ:                   nieznane
 AP[1].IN-USE:                            
 AP[1].SSID:                             wlan0-ap-2
-AP[1].MODE:                             Infra
+AP[1].MODE:                             Infrastruktura
 AP[1].CHAN:                             1
-AP[1].RATE:                             54 Mbit/s
+AP[1].RATE:                             54 Mb/s
 AP[1].SIGNAL:                           92
 AP[1].BARS:                             ****
 AP[1].SECURITY:                         WPA1 WPA2
 AP[2].IN-USE:                            
 AP[2].SSID:                             wlan0-ap-1
-AP[2].MODE:                             Infra
+AP[2].MODE:                             Infrastruktura
 AP[2].CHAN:                             1
-AP[2].RATE:                             54 Mbit/s
+AP[2].RATE:                             54 Mb/s
 AP[2].SIGNAL:                           81
 AP[2].BARS:                             ****
-AP[2].SECURITY:                         WPA1 WPA2
+AP[2].SECURITY:                         WPA1
 AP[3].IN-USE:                            
 AP[3].SSID:                             wlan0-ap-3
-AP[3].MODE:                             Infra
+AP[3].MODE:                             Infrastruktura
 AP[3].CHAN:                             1
-AP[3].RATE:                             54 Mbit/s
+AP[3].RATE:                             54 Mb/s
 AP[3].SIGNAL:                           55
 AP[3].BARS:                             **  
-AP[3].SECURITY:                         WPA1 WPA2
+AP[3].SECURITY:                         WPA3
 IP4.ADDRESS[1]:                         192.168.228.18/32
 IP4.ADDRESS[2]:                         192.168.209.179/25
 IP4.GATEWAY:                            192.168.41.120
@@ -29184,14 +29698,6 @@ DHCP6.OPTION[5]:                        dhcp-6-opt-5 = val-5
 CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings/Connection/{2}
 CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 
-<<<
-size: 20308
-location: clients/tests/test-client.py:1048:test_004()/592
-cmd: $NMCLI --mode multiline -f all dev show
-lang: pl_PL.UTF-8
-returncode: 0
-stdout: 20143 bytes
->>>
 GENERAL.DEVICE:                         eth0
 GENERAL.TYPE:                           ethernet
 GENERAL.NM-TYPE:                        NMDeviceEthernet
@@ -29204,6 +29710,8 @@ GENERAL.HWADDR:                         AB:B7:BF:E2:48:E8
 GENERAL.MTU:                            0
 GENERAL.STATE:                          20 (niedostępne)
 GENERAL.REASON:                         0 (Nie podano przyczyny)
+GENERAL.IP4-CONNECTIVITY:               0 (nieznane)
+GENERAL.IP6-CONNECTIVITY:               0 (nieznane)
 GENERAL.UDI:                            /sys/devices/virtual/eth0
 GENERAL.IP-IFACE:                       --
 GENERAL.IS-SOFTWARE:                    nie
@@ -29265,6 +29773,8 @@ GENERAL.HWADDR:                         E7:78:B1:93:2B:22
 GENERAL.MTU:                            0
 GENERAL.STATE:                          20 (niedostępne)
 GENERAL.REASON:                         0 (Nie podano przyczyny)
+GENERAL.IP4-CONNECTIVITY:               0 (nieznane)
+GENERAL.IP6-CONNECTIVITY:               0 (nieznane)
 GENERAL.UDI:                            /sys/devices/virtual/eth1
 GENERAL.IP-IFACE:                       --
 GENERAL.IS-SOFTWARE:                    nie
@@ -29333,6 +29843,8 @@ GENERAL.HWADDR:                         21:E9:64:81:8C:A8
 GENERAL.MTU:                            0
 GENERAL.STATE:                          20 (niedostępne)
 GENERAL.REASON:                         0 (Nie podano przyczyny)
+GENERAL.IP4-CONNECTIVITY:               0 (nieznane)
+GENERAL.IP6-CONNECTIVITY:               0 (nieznane)
 GENERAL.UDI:                            /sys/devices/virtual/wlan1
 GENERAL.IP-IFACE:                       --
 GENERAL.IS-SOFTWARE:                    nie
@@ -29419,6 +29931,8 @@ GENERAL.HWADDR:                         71:52:AD:63:5C:7C
 GENERAL.MTU:                            0
 GENERAL.STATE:                          20 (niedostępne)
 GENERAL.REASON:                         0 (Nie podano przyczyny)
+GENERAL.IP4-CONNECTIVITY:               0 (nieznane)
+GENERAL.IP6-CONNECTIVITY:               0 (nieznane)
 GENERAL.UDI:                            /sys/devices/virtual/wlan1
 GENERAL.IP-IFACE:                       --
 GENERAL.IS-SOFTWARE:                    nie
@@ -29473,99 +29987,9 @@ DHCP6.OPTION[5]:                        dhcp-6-opt-9 = val-9
 CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings/Connection/{2}
 CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 
-GENERAL.DEVICE:                         wlan0
-GENERAL.TYPE:                           wifi
-GENERAL.NM-TYPE:                        NMDeviceWifi
-GENERAL.VENDOR:                         --
-GENERAL.PRODUCT:                        --
-GENERAL.DRIVER:                         virtual
-GENERAL.DRIVER-VERSION:                 --
-GENERAL.FIRMWARE-VERSION:               --
-GENERAL.HWADDR:                         13:E0:74:85:7C:D9
-GENERAL.MTU:                            0
-GENERAL.STATE:                          20 (niedostępne)
-GENERAL.REASON:                         0 (Nie podano przyczyny)
-GENERAL.UDI:                            /sys/devices/virtual/wlan0
-GENERAL.IP-IFACE:                       --
-GENERAL.IS-SOFTWARE:                    nie
-GENERAL.NM-MANAGED:                     tak
-GENERAL.AUTOCONNECT:                    tak
-GENERAL.FIRMWARE-MISSING:               nie
-GENERAL.NM-PLUGIN-MISSING:              nie
-GENERAL.PHYS-PORT-ID:                   --
-GENERAL.CONNECTION:                     con-vpn-1
-GENERAL.CON-UUID:                       UUID-con-vpn-1-REPLACED-REPLACED-REP
-GENERAL.CON-PATH:                       /org/freedesktop/NetworkManager/ActiveConnection/2
-GENERAL.METERED:                        nieznane
-CAPABILITIES.CARRIER-DETECT:            nie
-CAPABILITIES.SPEED:                     nieznane
-CAPABILITIES.IS-SOFTWARE:               nie
-CAPABILITIES.SRIOV:                     nie
-WIFI-PROPERTIES.WEP:                    tak
-WIFI-PROPERTIES.WPA:                    tak
-WIFI-PROPERTIES.WPA2:                   tak
-WIFI-PROPERTIES.TKIP:                   tak
-WIFI-PROPERTIES.CCMP:                   tak
-WIFI-PROPERTIES.AP:                     tak
-WIFI-PROPERTIES.ADHOC:                  tak
-WIFI-PROPERTIES.2GHZ:                   nieznane
-WIFI-PROPERTIES.5GHZ:                   nieznane
-AP[1].IN-USE:                            
-AP[1].SSID:                             wlan0-ap-2
-AP[1].MODE:                             Infrastruktura
-AP[1].CHAN:                             1
-AP[1].RATE:                             54 Mb/s
-AP[1].SIGNAL:                           92
-AP[1].BARS:                             ****
-AP[1].SECURITY:                         WPA1 WPA2
-AP[2].IN-USE:                            
-AP[2].SSID:                             wlan0-ap-1
-AP[2].MODE:                             Infrastruktura
-AP[2].CHAN:                             1
-AP[2].RATE:                             54 Mb/s
-AP[2].SIGNAL:                           81
-AP[2].BARS:                             ****
-AP[2].SECURITY:                         WPA1 WPA2
-AP[3].IN-USE:                            
-AP[3].SSID:                             wlan0-ap-3
-AP[3].MODE:                             Infrastruktura
-AP[3].CHAN:                             1
-AP[3].RATE:                             54 Mb/s
-AP[3].SIGNAL:                           55
-AP[3].BARS:                             **  
-AP[3].SECURITY:                         WPA1 WPA2
-IP4.ADDRESS[1]:                         192.168.228.18/32
-IP4.ADDRESS[2]:                         192.168.209.179/25
-IP4.GATEWAY:                            192.168.41.120
-IP4.DOMAIN[1]:                          sear4.foo2.bar
-IP4.DOMAIN[2]:                          sear4.fo.x.y
-IP4.DOMAIN[3]:                          sear4.foo1.bar
-IP4.DOMAIN[4]:                          sear4.foo4.bar
-IP4.DOMAIN[5]:                          sear4.fo.o.bar
-IP4.WINS[1]:                            192.168.120.79
-DHCP4.OPTION[1]:                        dhcp-4-opt-0 = val-0
-DHCP4.OPTION[2]:                        dhcp-4-opt-2 = val-2
-DHCP4.OPTION[3]:                        dhcp-4-opt-4 = val-4
-DHCP4.OPTION[4]:                        dhcp-4-opt-7 = val-7
-IP6.GATEWAY:                            --
-IP6.ROUTE[1]:                           dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086
-IP6.DOMAIN[1]:                          sear6.foo2.bar
-IP6.DOMAIN[2]:                          sear6.foo1.bar
-IP6.DOMAIN[3]:                          sear6.fo.x.y
-IP6.DOMAIN[4]:                          sear6.fo.o.bar
-IP6.DOMAIN[5]:                          sear6.foo3.bar
-IP6.DOMAIN[6]:                          sear6.foo4.bar
-DHCP6.OPTION[1]:                        dhcp-6-opt-1 = val-1
-DHCP6.OPTION[2]:                        dhcp-6-opt-2 = val-2
-DHCP6.OPTION[3]:                        dhcp-6-opt-3 = val-3
-DHCP6.OPTION[4]:                        dhcp-6-opt-4 = val-4
-DHCP6.OPTION[5]:                        dhcp-6-opt-5 = val-5
-CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings/Connection/{2}
-CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
-
 <<<
 size: 1516
-location: clients/tests/test-client.py:1051:test_004()/593
+location: clients/tests/test-client.py:1065:test_004()/593
 cmd: $NMCLI --mode multiline dev show wlan0
 lang: C
 returncode: 0
@@ -29598,7 +30022,7 @@ IP6.DOMAIN[6]:                          sear6.foo4.bar
 
 <<<
 size: 1527
-location: clients/tests/test-client.py:1051:test_004()/594
+location: clients/tests/test-client.py:1065:test_004()/594
 cmd: $NMCLI --mode multiline dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
@@ -29630,12 +30054,12 @@ IP6.DOMAIN[5]:                          sear6.foo3.bar
 IP6.DOMAIN[6]:                          sear6.foo4.bar
 
 <<<
-size: 4771
-location: clients/tests/test-client.py:1054:test_004()/595
+size: 4865
+location: clients/tests/test-client.py:1068:test_004()/595
 cmd: $NMCLI --mode multiline -f all dev show wlan0
 lang: C
 returncode: 0
-stdout: 4611 bytes
+stdout: 4705 bytes
 >>>
 GENERAL.DEVICE:                         wlan0
 GENERAL.TYPE:                           wifi
@@ -29649,6 +30073,8 @@ GENERAL.HWADDR:                         13:E0:74:85:7C:D9
 GENERAL.MTU:                            0
 GENERAL.STATE:                          20 (unavailable)
 GENERAL.REASON:                         0 (No reason given)
+GENERAL.IP4-CONNECTIVITY:               0 (unknown)
+GENERAL.IP6-CONNECTIVITY:               0 (unknown)
 GENERAL.UDI:                            /sys/devices/virtual/wlan0
 GENERAL.IP-IFACE:                       --
 GENERAL.IS-SOFTWARE:                    no
@@ -29689,7 +30115,7 @@ AP[2].CHAN:                             1
 AP[2].RATE:                             54 Mbit/s
 AP[2].SIGNAL:                           81
 AP[2].BARS:                             ****
-AP[2].SECURITY:                         WPA1 WPA2
+AP[2].SECURITY:                         WPA1
 AP[3].IN-USE:                            
 AP[3].SSID:                             wlan0-ap-3
 AP[3].MODE:                             Infra
@@ -29697,7 +30123,7 @@ AP[3].CHAN:                             1
 AP[3].RATE:                             54 Mbit/s
 AP[3].SIGNAL:                           55
 AP[3].BARS:                             **  
-AP[3].SECURITY:                         WPA1 WPA2
+AP[3].SECURITY:                         WPA3
 IP4.ADDRESS[1]:                         192.168.228.18/32
 IP4.ADDRESS[2]:                         192.168.209.179/25
 IP4.GATEWAY:                            192.168.41.120
@@ -29728,12 +30154,12 @@ CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings
 CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 
 <<<
-size: 4824
-location: clients/tests/test-client.py:1054:test_004()/596
+size: 4920
+location: clients/tests/test-client.py:1068:test_004()/596
 cmd: $NMCLI --mode multiline -f all dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 4654 bytes
+stdout: 4750 bytes
 >>>
 GENERAL.DEVICE:                         wlan0
 GENERAL.TYPE:                           wifi
@@ -29747,6 +30173,8 @@ GENERAL.HWADDR:                         13:E0:74:85:7C:D9
 GENERAL.MTU:                            0
 GENERAL.STATE:                          20 (niedostępne)
 GENERAL.REASON:                         0 (Nie podano przyczyny)
+GENERAL.IP4-CONNECTIVITY:               0 (nieznane)
+GENERAL.IP6-CONNECTIVITY:               0 (nieznane)
 GENERAL.UDI:                            /sys/devices/virtual/wlan0
 GENERAL.IP-IFACE:                       --
 GENERAL.IS-SOFTWARE:                    nie
@@ -29787,7 +30215,7 @@ AP[2].CHAN:                             1
 AP[2].RATE:                             54 Mb/s
 AP[2].SIGNAL:                           81
 AP[2].BARS:                             ****
-AP[2].SECURITY:                         WPA1 WPA2
+AP[2].SECURITY:                         WPA1
 AP[3].IN-USE:                            
 AP[3].SSID:                             wlan0-ap-3
 AP[3].MODE:                             Infrastruktura
@@ -29795,7 +30223,7 @@ AP[3].CHAN:                             1
 AP[3].RATE:                             54 Mb/s
 AP[3].SIGNAL:                           55
 AP[3].BARS:                             **  
-AP[3].SECURITY:                         WPA1 WPA2
+AP[3].SECURITY:                         WPA3
 IP4.ADDRESS[1]:                         192.168.228.18/32
 IP4.ADDRESS[2]:                         192.168.209.179/25
 IP4.GATEWAY:                            192.168.41.120
@@ -29826,12 +30254,12 @@ CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings
 CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 
 <<<
-size: 1874
-location: clients/tests/test-client.py:1057:test_004()/597
+size: 1978
+location: clients/tests/test-client.py:1071:test_004()/597
 cmd: $NMCLI --mode multiline -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: C
 returncode: 0
-stdout: 1679 bytes
+stdout: 1783 bytes
 >>>
 GENERAL.DEVICE:                         wlan0
 GENERAL.TYPE:                           wifi
@@ -29845,6 +30273,8 @@ GENERAL.HWADDR:                         13:E0:74:85:7C:D9
 GENERAL.MTU:                            0
 GENERAL.STATE:                          20 (unavailable)
 GENERAL.REASON:                         0 (No reason given)
+GENERAL.IP4-CONNECTIVITY:               0 (unknown)
+GENERAL.IP6-CONNECTIVITY:               0 (unknown)
 GENERAL.UDI:                            /sys/devices/virtual/wlan0
 GENERAL.IP-IFACE:                       --
 GENERAL.IS-SOFTWARE:                    no
@@ -29869,12 +30299,12 @@ WIFI-PROPERTIES.2GHZ:                   unknown
 WIFI-PROPERTIES.5GHZ:                   unknown
 
 <<<
-size: 1896
-location: clients/tests/test-client.py:1057:test_004()/598
+size: 2002
+location: clients/tests/test-client.py:1071:test_004()/598
 cmd: $NMCLI --mode multiline -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 1691 bytes
+stdout: 1797 bytes
 >>>
 GENERAL.DEVICE:                         wlan0
 GENERAL.TYPE:                           wifi
@@ -29888,6 +30318,8 @@ GENERAL.HWADDR:                         13:E0:74:85:7C:D9
 GENERAL.MTU:                            0
 GENERAL.STATE:                          20 (niedostępne)
 GENERAL.REASON:                         0 (Nie podano przyczyny)
+GENERAL.IP4-CONNECTIVITY:               0 (nieznane)
+GENERAL.IP6-CONNECTIVITY:               0 (nieznane)
 GENERAL.UDI:                            /sys/devices/virtual/wlan0
 GENERAL.IP-IFACE:                       --
 GENERAL.IS-SOFTWARE:                    nie
@@ -29912,12 +30344,12 @@ WIFI-PROPERTIES.2GHZ:                   nieznane
 WIFI-PROPERTIES.5GHZ:                   nieznane
 
 <<<
-size: 1874
-location: clients/tests/test-client.py:1060:test_004()/599
+size: 1978
+location: clients/tests/test-client.py:1074:test_004()/599
 cmd: $NMCLI --mode multiline -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: C
 returncode: 0
-stdout: 1679 bytes
+stdout: 1783 bytes
 >>>
 GENERAL.DEVICE:                         wlan0
 GENERAL.TYPE:                           wifi
@@ -29931,6 +30363,8 @@ GENERAL.HWADDR:                         13:E0:74:85:7C:D9
 GENERAL.MTU:                            0
 GENERAL.STATE:                          20 (unavailable)
 GENERAL.REASON:                         0 (No reason given)
+GENERAL.IP4-CONNECTIVITY:               0 (unknown)
+GENERAL.IP6-CONNECTIVITY:               0 (unknown)
 GENERAL.UDI:                            /sys/devices/virtual/wlan0
 GENERAL.IP-IFACE:                       --
 GENERAL.IS-SOFTWARE:                    no
@@ -29955,12 +30389,12 @@ WIFI-PROPERTIES.2GHZ:                   unknown
 WIFI-PROPERTIES.5GHZ:                   unknown
 
 <<<
-size: 1896
-location: clients/tests/test-client.py:1060:test_004()/600
+size: 2002
+location: clients/tests/test-client.py:1074:test_004()/600
 cmd: $NMCLI --mode multiline -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 1691 bytes
+stdout: 1797 bytes
 >>>
 GENERAL.DEVICE:                         wlan0
 GENERAL.TYPE:                           wifi
@@ -29974,6 +30408,8 @@ GENERAL.HWADDR:                         13:E0:74:85:7C:D9
 GENERAL.MTU:                            0
 GENERAL.STATE:                          20 (niedostępne)
 GENERAL.REASON:                         0 (Nie podano przyczyny)
+GENERAL.IP4-CONNECTIVITY:               0 (nieznane)
+GENERAL.IP6-CONNECTIVITY:               0 (nieznane)
 GENERAL.UDI:                            /sys/devices/virtual/wlan0
 GENERAL.IP-IFACE:                       --
 GENERAL.IS-SOFTWARE:                    nie
@@ -29999,12 +30435,15 @@ WIFI-PROPERTIES.5GHZ:                   nieznane
 
 <<<
 size: 1037
-location: clients/tests/test-client.py:1063:test_004()/601
+location: clients/tests/test-client.py:1077:test_004()/601
 cmd: $NMCLI --mode multiline -f DEVICE,TYPE,DBUS-PATH dev
 lang: C
 returncode: 0
 stdout: 871 bytes
 >>>
+DEVICE:                                 wlan0
+TYPE:                                   wifi
+DBUS-PATH:                              /org/freedesktop/NetworkManager/Devices/3
 DEVICE:                                 eth0
 TYPE:                                   ethernet
 DBUS-PATH:                              /org/freedesktop/NetworkManager/Devices/1
@@ -30017,18 +30456,18 @@ DBUS-PATH:                              /org/freedesktop/NetworkManager/Devices/
 DEVICE:                                 wlan1
 TYPE:                                   wifi
 DBUS-PATH:                              /org/freedesktop/NetworkManager/Devices/5
-DEVICE:                                 wlan0
-TYPE:                                   wifi
-DBUS-PATH:                              /org/freedesktop/NetworkManager/Devices/3
 
 <<<
 size: 1047
-location: clients/tests/test-client.py:1063:test_004()/602
+location: clients/tests/test-client.py:1077:test_004()/602
 cmd: $NMCLI --mode multiline -f DEVICE,TYPE,DBUS-PATH dev
 lang: pl_PL.UTF-8
 returncode: 0
 stdout: 871 bytes
 >>>
+DEVICE:                                 wlan0
+TYPE:                                   wifi
+DBUS-PATH:                              /org/freedesktop/NetworkManager/Devices/3
 DEVICE:                                 eth0
 TYPE:                                   ethernet
 DBUS-PATH:                              /org/freedesktop/NetworkManager/Devices/1
@@ -30041,37 +30480,15 @@ DBUS-PATH:                              /org/freedesktop/NetworkManager/Devices/
 DEVICE:                                 wlan1
 TYPE:                                   wifi
 DBUS-PATH:                              /org/freedesktop/NetworkManager/Devices/5
-DEVICE:                                 wlan0
-TYPE:                                   wifi
-DBUS-PATH:                              /org/freedesktop/NetworkManager/Devices/3
 
 <<<
-size: 3884
-location: clients/tests/test-client.py:1066:test_004()/603
+size: 3796
+location: clients/tests/test-client.py:1080:test_004()/603
 cmd: $NMCLI --mode multiline -f ALL device wifi list
 lang: C
 returncode: 0
-stdout: 3722 bytes
+stdout: 3634 bytes
 >>>
-NAME:                                   AP[1]
-SSID:                                   wlan1-ap-4
-SSID-HEX:                               776C616E312D61702D34
-BSSID:                                  94:2B:E8:F6:D2:86
-MODE:                                   Infra
-CHAN:                                   1
-FREQ:                                   2412 MHz
-RATE:                                   54 Mbit/s
-SIGNAL:                                 48
-BARS:                                   **  
-SECURITY:                               WPA1 WPA2
-WPA-FLAGS:                              pair_tkip pair_ccmp group_tkip group_ccmp psk
-RSN-FLAGS:                              pair_tkip pair_ccmp group_tkip group_ccmp psk
-DEVICE:                                 wlan1
-ACTIVE:                                 no
-IN-USE:                                  
-DBUS-PATH:                              /org/freedesktop/NetworkManager/AccessPoint/4
-
-
 NAME:                                   AP[1]
 SSID:                                   wlan0-ap-2
 SSID-HEX:                               776C616E302D61702D32
@@ -30099,9 +30516,9 @@ FREQ:                                   2412 MHz
 RATE:                                   54 Mbit/s
 SIGNAL:                                 81
 BARS:                                   ****
-SECURITY:                               WPA1 WPA2
+SECURITY:                               WPA1
 WPA-FLAGS:                              pair_tkip pair_ccmp group_tkip group_ccmp psk
-RSN-FLAGS:                              pair_tkip pair_ccmp group_tkip group_ccmp psk
+RSN-FLAGS:                              (none)
 DEVICE:                                 wlan0
 ACTIVE:                                 no
 IN-USE:                                  
@@ -30116,41 +30533,41 @@ FREQ:                                   2412 MHz
 RATE:                                   54 Mbit/s
 SIGNAL:                                 55
 BARS:                                   **  
-SECURITY:                               WPA1 WPA2
-WPA-FLAGS:                              pair_tkip pair_ccmp group_tkip group_ccmp psk
-RSN-FLAGS:                              pair_tkip pair_ccmp group_tkip group_ccmp psk
+SECURITY:                               WPA3
+WPA-FLAGS:                              (none)
+RSN-FLAGS:                              pair_tkip pair_ccmp group_tkip group_ccmp sae
 DEVICE:                                 wlan0
 ACTIVE:                                 no
 IN-USE:                                  
 DBUS-PATH:                              /org/freedesktop/NetworkManager/AccessPoint/3
 
-<<<
-size: 3942
-location: clients/tests/test-client.py:1066:test_004()/604
-cmd: $NMCLI --mode multiline -f ALL device wifi list
-lang: pl_PL.UTF-8
-returncode: 0
-stdout: 3770 bytes
->>>
 NAME:                                   AP[1]
 SSID:                                   wlan1-ap-4
 SSID-HEX:                               776C616E312D61702D34
 BSSID:                                  94:2B:E8:F6:D2:86
-MODE:                                   Infrastruktura
+MODE:                                   Infra
 CHAN:                                   1
-FREQ:                                   2412 MHz
-RATE:                                   54 Mb/s
+FREQ:                                   2412 MHz
+RATE:                                   54 Mbit/s
 SIGNAL:                                 48
 BARS:                                   **  
 SECURITY:                               WPA1 WPA2
 WPA-FLAGS:                              pair_tkip pair_ccmp group_tkip group_ccmp psk
 RSN-FLAGS:                              pair_tkip pair_ccmp group_tkip group_ccmp psk
 DEVICE:                                 wlan1
-ACTIVE:                                 nie
+ACTIVE:                                 no
 IN-USE:                                  
 DBUS-PATH:                              /org/freedesktop/NetworkManager/AccessPoint/4
 
 
+<<<
+size: 3854
+location: clients/tests/test-client.py:1080:test_004()/604
+cmd: $NMCLI --mode multiline -f ALL device wifi list
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 3682 bytes
+>>>
 NAME:                                   AP[1]
 SSID:                                   wlan0-ap-2
 SSID-HEX:                               776C616E302D61702D32
@@ -30178,9 +30595,9 @@ FREQ:                                   2412 MHz
 RATE:                                   54 Mb/s
 SIGNAL:                                 81
 BARS:                                   ****
-SECURITY:                               WPA1 WPA2
+SECURITY:                               WPA1
 WPA-FLAGS:                              pair_tkip pair_ccmp group_tkip group_ccmp psk
-RSN-FLAGS:                              pair_tkip pair_ccmp group_tkip group_ccmp psk
+RSN-FLAGS:                              (brak)
 DEVICE:                                 wlan0
 ACTIVE:                                 nie
 IN-USE:                                  
@@ -30195,32 +30612,41 @@ FREQ:                                   2412 MHz
 RATE:                                   54 Mb/s
 SIGNAL:                                 55
 BARS:                                   **  
-SECURITY:                               WPA1 WPA2
-WPA-FLAGS:                              pair_tkip pair_ccmp group_tkip group_ccmp psk
-RSN-FLAGS:                              pair_tkip pair_ccmp group_tkip group_ccmp psk
+SECURITY:                               WPA3
+WPA-FLAGS:                              (brak)
+RSN-FLAGS:                              pair_tkip pair_ccmp group_tkip group_ccmp sae
 DEVICE:                                 wlan0
 ACTIVE:                                 nie
 IN-USE:                                  
 DBUS-PATH:                              /org/freedesktop/NetworkManager/AccessPoint/3
 
-<<<
-size: 1643
-location: clients/tests/test-client.py:1068:test_004()/605
-cmd: $NMCLI --mode multiline -f COMMON device wifi list
-lang: C
-returncode: 0
-stdout: 1478 bytes
->>>
-IN-USE:                                  
+NAME:                                   AP[1]
 SSID:                                   wlan1-ap-4
-MODE:                                   Infra
+SSID-HEX:                               776C616E312D61702D34
+BSSID:                                  94:2B:E8:F6:D2:86
+MODE:                                   Infrastruktura
 CHAN:                                   1
-RATE:                                   54 Mbit/s
+FREQ:                                   2412 MHz
+RATE:                                   54 Mb/s
 SIGNAL:                                 48
 BARS:                                   **  
 SECURITY:                               WPA1 WPA2
+WPA-FLAGS:                              pair_tkip pair_ccmp group_tkip group_ccmp psk
+RSN-FLAGS:                              pair_tkip pair_ccmp group_tkip group_ccmp psk
+DEVICE:                                 wlan1
+ACTIVE:                                 nie
+IN-USE:                                  
+DBUS-PATH:                              /org/freedesktop/NetworkManager/AccessPoint/4
 
 
+<<<
+size: 1633
+location: clients/tests/test-client.py:1082:test_004()/605
+cmd: $NMCLI --mode multiline -f COMMON device wifi list
+lang: C
+returncode: 0
+stdout: 1468 bytes
+>>>
 IN-USE:                                  
 SSID:                                   wlan0-ap-2
 MODE:                                   Infra
@@ -30236,7 +30662,7 @@ CHAN:                                   1
 RATE:                                   54 Mbit/s
 SIGNAL:                                 81
 BARS:                                   ****
-SECURITY:                               WPA1 WPA2
+SECURITY:                               WPA1
 IN-USE:                                  
 SSID:                                   wlan0-ap-3
 MODE:                                   Infra
@@ -30244,26 +30670,26 @@ CHAN:                                   1
 RATE:                                   54 Mbit/s
 SIGNAL:                                 55
 BARS:                                   **  
-SECURITY:                               WPA1 WPA2
+SECURITY:                               WPA3
 
-<<<
-size: 1689
-location: clients/tests/test-client.py:1068:test_004()/606
-cmd: $NMCLI --mode multiline -f COMMON device wifi list
-lang: pl_PL.UTF-8
-returncode: 0
-stdout: 1514 bytes
->>>
 IN-USE:                                  
 SSID:                                   wlan1-ap-4
-MODE:                                   Infrastruktura
+MODE:                                   Infra
 CHAN:                                   1
-RATE:                                   54 Mb/s
+RATE:                                   54 Mbit/s
 SIGNAL:                                 48
 BARS:                                   **  
 SECURITY:                               WPA1 WPA2
 
 
+<<<
+size: 1679
+location: clients/tests/test-client.py:1082:test_004()/606
+cmd: $NMCLI --mode multiline -f COMMON device wifi list
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 1504 bytes
+>>>
 IN-USE:                                  
 SSID:                                   wlan0-ap-2
 MODE:                                   Infrastruktura
@@ -30279,7 +30705,7 @@ CHAN:                                   1
 RATE:                                   54 Mb/s
 SIGNAL:                                 81
 BARS:                                   ****
-SECURITY:                               WPA1 WPA2
+SECURITY:                               WPA1
 IN-USE:                                  
 SSID:                                   wlan0-ap-3
 MODE:                                   Infrastruktura
@@ -30287,35 +30713,26 @@ CHAN:                                   1
 RATE:                                   54 Mb/s
 SIGNAL:                                 55
 BARS:                                   **  
-SECURITY:                               WPA1 WPA2
+SECURITY:                               WPA3
 
-<<<
-size: 3997
-location: clients/tests/test-client.py:1071:test_004()/607
-cmd: $NMCLI --mode multiline -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list
-lang: C
-returncode: 0
-stdout: 3722 bytes
->>>
-NAME:                                   AP[1]
+IN-USE:                                  
 SSID:                                   wlan1-ap-4
-SSID-HEX:                               776C616E312D61702D34
-BSSID:                                  94:2B:E8:F6:D2:86
-MODE:                                   Infra
+MODE:                                   Infrastruktura
 CHAN:                                   1
-FREQ:                                   2412 MHz
-RATE:                                   54 Mbit/s
+RATE:                                   54 Mb/s
 SIGNAL:                                 48
 BARS:                                   **  
 SECURITY:                               WPA1 WPA2
-WPA-FLAGS:                              pair_tkip pair_ccmp group_tkip group_ccmp psk
-RSN-FLAGS:                              pair_tkip pair_ccmp group_tkip group_ccmp psk
-DEVICE:                                 wlan1
-ACTIVE:                                 no
-IN-USE:                                  
-DBUS-PATH:                              /org/freedesktop/NetworkManager/AccessPoint/4
 
 
+<<<
+size: 3909
+location: clients/tests/test-client.py:1085:test_004()/607
+cmd: $NMCLI --mode multiline -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list
+lang: C
+returncode: 0
+stdout: 3634 bytes
+>>>
 NAME:                                   AP[1]
 SSID:                                   wlan0-ap-2
 SSID-HEX:                               776C616E302D61702D32
@@ -30343,9 +30760,9 @@ FREQ:                                   2412 MHz
 RATE:                                   54 Mbit/s
 SIGNAL:                                 81
 BARS:                                   ****
-SECURITY:                               WPA1 WPA2
+SECURITY:                               WPA1
 WPA-FLAGS:                              pair_tkip pair_ccmp group_tkip group_ccmp psk
-RSN-FLAGS:                              pair_tkip pair_ccmp group_tkip group_ccmp psk
+RSN-FLAGS:                              (none)
 DEVICE:                                 wlan0
 ACTIVE:                                 no
 IN-USE:                                  
@@ -30360,41 +30777,41 @@ FREQ:                                   2412 MHz
 RATE:                                   54 Mbit/s
 SIGNAL:                                 55
 BARS:                                   **  
-SECURITY:                               WPA1 WPA2
-WPA-FLAGS:                              pair_tkip pair_ccmp group_tkip group_ccmp psk
-RSN-FLAGS:                              pair_tkip pair_ccmp group_tkip group_ccmp psk
+SECURITY:                               WPA3
+WPA-FLAGS:                              (none)
+RSN-FLAGS:                              pair_tkip pair_ccmp group_tkip group_ccmp sae
 DEVICE:                                 wlan0
 ACTIVE:                                 no
 IN-USE:                                  
 DBUS-PATH:                              /org/freedesktop/NetworkManager/AccessPoint/3
 
-<<<
-size: 4055
-location: clients/tests/test-client.py:1071:test_004()/608
-cmd: $NMCLI --mode multiline -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list
-lang: pl_PL.UTF-8
-returncode: 0
-stdout: 3770 bytes
->>>
 NAME:                                   AP[1]
 SSID:                                   wlan1-ap-4
 SSID-HEX:                               776C616E312D61702D34
 BSSID:                                  94:2B:E8:F6:D2:86
-MODE:                                   Infrastruktura
+MODE:                                   Infra
 CHAN:                                   1
-FREQ:                                   2412 MHz
-RATE:                                   54 Mb/s
+FREQ:                                   2412 MHz
+RATE:                                   54 Mbit/s
 SIGNAL:                                 48
 BARS:                                   **  
 SECURITY:                               WPA1 WPA2
 WPA-FLAGS:                              pair_tkip pair_ccmp group_tkip group_ccmp psk
 RSN-FLAGS:                              pair_tkip pair_ccmp group_tkip group_ccmp psk
 DEVICE:                                 wlan1
-ACTIVE:                                 nie
+ACTIVE:                                 no
 IN-USE:                                  
 DBUS-PATH:                              /org/freedesktop/NetworkManager/AccessPoint/4
 
 
+<<<
+size: 3967
+location: clients/tests/test-client.py:1085:test_004()/608
+cmd: $NMCLI --mode multiline -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 3682 bytes
+>>>
 NAME:                                   AP[1]
 SSID:                                   wlan0-ap-2
 SSID-HEX:                               776C616E302D61702D32
@@ -30422,9 +30839,9 @@ FREQ:                                   2412 MHz
 RATE:                                   54 Mb/s
 SIGNAL:                                 81
 BARS:                                   ****
-SECURITY:                               WPA1 WPA2
+SECURITY:                               WPA1
 WPA-FLAGS:                              pair_tkip pair_ccmp group_tkip group_ccmp psk
-RSN-FLAGS:                              pair_tkip pair_ccmp group_tkip group_ccmp psk
+RSN-FLAGS:                              (brak)
 DEVICE:                                 wlan0
 ACTIVE:                                 nie
 IN-USE:                                  
@@ -30439,21 +30856,40 @@ FREQ:                                   2412 MHz
 RATE:                                   54 Mb/s
 SIGNAL:                                 55
 BARS:                                   **  
+SECURITY:                               WPA3
+WPA-FLAGS:                              (brak)
+RSN-FLAGS:                              pair_tkip pair_ccmp group_tkip group_ccmp sae
+DEVICE:                                 wlan0
+ACTIVE:                                 nie
+IN-USE:                                  
+DBUS-PATH:                              /org/freedesktop/NetworkManager/AccessPoint/3
+
+NAME:                                   AP[1]
+SSID:                                   wlan1-ap-4
+SSID-HEX:                               776C616E312D61702D34
+BSSID:                                  94:2B:E8:F6:D2:86
+MODE:                                   Infrastruktura
+CHAN:                                   1
+FREQ:                                   2412 MHz
+RATE:                                   54 Mb/s
+SIGNAL:                                 48
+BARS:                                   **  
 SECURITY:                               WPA1 WPA2
 WPA-FLAGS:                              pair_tkip pair_ccmp group_tkip group_ccmp psk
 RSN-FLAGS:                              pair_tkip pair_ccmp group_tkip group_ccmp psk
-DEVICE:                                 wlan0
+DEVICE:                                 wlan1
 ACTIVE:                                 nie
 IN-USE:                                  
-DBUS-PATH:                              /org/freedesktop/NetworkManager/AccessPoint/3
+DBUS-PATH:                              /org/freedesktop/NetworkManager/AccessPoint/4
+
 
 <<<
-size: 1115
-location: clients/tests/test-client.py:1073:test_004()/609
+size: 1117
+location: clients/tests/test-client.py:1087:test_004()/609
 cmd: $NMCLI --mode multiline -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: C
 returncode: 0
-stdout: 930 bytes
+stdout: 932 bytes
 >>>
 NAME:                                   AP[1]
 SSID:                                   wlan0-ap-2
@@ -30473,13 +30909,15 @@ ACTIVE:                                 no
 IN-USE:                                  
 DBUS-PATH:                              /org/freedesktop/NetworkManager/AccessPoint/2
 
+
+
 <<<
-size: 1137
-location: clients/tests/test-client.py:1073:test_004()/610
+size: 1139
+location: clients/tests/test-client.py:1087:test_004()/610
 cmd: $NMCLI --mode multiline -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 942 bytes
+stdout: 944 bytes
 >>>
 NAME:                                   AP[1]
 SSID:                                   wlan0-ap-2
@@ -30499,13 +30937,15 @@ ACTIVE:                                 nie
 IN-USE:                                  
 DBUS-PATH:                              /org/freedesktop/NetworkManager/AccessPoint/2
 
+
+
 <<<
-size: 557
-location: clients/tests/test-client.py:1075:test_004()/611
+size: 559
+location: clients/tests/test-client.py:1089:test_004()/611
 cmd: $NMCLI --mode multiline -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: C
 returncode: 0
-stdout: 369 bytes
+stdout: 371 bytes
 >>>
 IN-USE:                                  
 SSID:                                   wlan0-ap-2
@@ -30516,13 +30956,15 @@ SIGNAL:                                 92
 BARS:                                   ****
 SECURITY:                               WPA1 WPA2
 
+
+
 <<<
-size: 576
-location: clients/tests/test-client.py:1075:test_004()/612
+size: 578
+location: clients/tests/test-client.py:1089:test_004()/612
 cmd: $NMCLI --mode multiline -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 378 bytes
+stdout: 380 bytes
 >>>
 IN-USE:                                  
 SSID:                                   wlan0-ap-2
@@ -30533,13 +30975,15 @@ SIGNAL:                                 92
 BARS:                                   ****
 SECURITY:                               WPA1 WPA2
 
+
+
 <<<
-size: 1228
-location: clients/tests/test-client.py:1078:test_004()/613
+size: 1230
+location: clients/tests/test-client.py:1092:test_004()/613
 cmd: $NMCLI --mode multiline -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: C
 returncode: 0
-stdout: 930 bytes
+stdout: 932 bytes
 >>>
 NAME:                                   AP[1]
 SSID:                                   wlan0-ap-2
@@ -30559,13 +31003,15 @@ ACTIVE:                                 no
 IN-USE:                                  
 DBUS-PATH:                              /org/freedesktop/NetworkManager/AccessPoint/2
 
+
+
 <<<
-size: 1250
-location: clients/tests/test-client.py:1078:test_004()/614
+size: 1252
+location: clients/tests/test-client.py:1092:test_004()/614
 cmd: $NMCLI --mode multiline -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 942 bytes
+stdout: 944 bytes
 >>>
 NAME:                                   AP[1]
 SSID:                                   wlan0-ap-2
@@ -30585,13 +31031,15 @@ ACTIVE:                                 nie
 IN-USE:                                  
 DBUS-PATH:                              /org/freedesktop/NetworkManager/AccessPoint/2
 
+
+
 <<<
-size: 4774
-location: clients/tests/test-client.py:1080:test_004()/615
+size: 4868
+location: clients/tests/test-client.py:1094:test_004()/615
 cmd: $NMCLI --mode multiline -f ALL device show wlan0
 lang: C
 returncode: 0
-stdout: 4611 bytes
+stdout: 4705 bytes
 >>>
 GENERAL.DEVICE:                         wlan0
 GENERAL.TYPE:                           wifi
@@ -30605,6 +31053,8 @@ GENERAL.HWADDR:                         13:E0:74:85:7C:D9
 GENERAL.MTU:                            0
 GENERAL.STATE:                          20 (unavailable)
 GENERAL.REASON:                         0 (No reason given)
+GENERAL.IP4-CONNECTIVITY:               0 (unknown)
+GENERAL.IP6-CONNECTIVITY:               0 (unknown)
 GENERAL.UDI:                            /sys/devices/virtual/wlan0
 GENERAL.IP-IFACE:                       --
 GENERAL.IS-SOFTWARE:                    no
@@ -30645,7 +31095,7 @@ AP[2].CHAN:                             1
 AP[2].RATE:                             54 Mbit/s
 AP[2].SIGNAL:                           81
 AP[2].BARS:                             ****
-AP[2].SECURITY:                         WPA1 WPA2
+AP[2].SECURITY:                         WPA1
 AP[3].IN-USE:                            
 AP[3].SSID:                             wlan0-ap-3
 AP[3].MODE:                             Infra
@@ -30653,7 +31103,7 @@ AP[3].CHAN:                             1
 AP[3].RATE:                             54 Mbit/s
 AP[3].SIGNAL:                           55
 AP[3].BARS:                             **  
-AP[3].SECURITY:                         WPA1 WPA2
+AP[3].SECURITY:                         WPA3
 IP4.ADDRESS[1]:                         192.168.228.18/32
 IP4.ADDRESS[2]:                         192.168.209.179/25
 IP4.GATEWAY:                            192.168.41.120
@@ -30684,12 +31134,12 @@ CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings
 CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 
 <<<
-size: 4827
-location: clients/tests/test-client.py:1080:test_004()/616
+size: 4923
+location: clients/tests/test-client.py:1094:test_004()/616
 cmd: $NMCLI --mode multiline -f ALL device show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 4654 bytes
+stdout: 4750 bytes
 >>>
 GENERAL.DEVICE:                         wlan0
 GENERAL.TYPE:                           wifi
@@ -30703,6 +31153,8 @@ GENERAL.HWADDR:                         13:E0:74:85:7C:D9
 GENERAL.MTU:                            0
 GENERAL.STATE:                          20 (niedostępne)
 GENERAL.REASON:                         0 (Nie podano przyczyny)
+GENERAL.IP4-CONNECTIVITY:               0 (nieznane)
+GENERAL.IP6-CONNECTIVITY:               0 (nieznane)
 GENERAL.UDI:                            /sys/devices/virtual/wlan0
 GENERAL.IP-IFACE:                       --
 GENERAL.IS-SOFTWARE:                    nie
@@ -30743,7 +31195,7 @@ AP[2].CHAN:                             1
 AP[2].RATE:                             54 Mb/s
 AP[2].SIGNAL:                           81
 AP[2].BARS:                             ****
-AP[2].SECURITY:                         WPA1 WPA2
+AP[2].SECURITY:                         WPA1
 AP[3].IN-USE:                            
 AP[3].SSID:                             wlan0-ap-3
 AP[3].MODE:                             Infrastruktura
@@ -30751,7 +31203,7 @@ AP[3].CHAN:                             1
 AP[3].RATE:                             54 Mb/s
 AP[3].SIGNAL:                           55
 AP[3].BARS:                             **  
-AP[3].SECURITY:                         WPA1 WPA2
+AP[3].SECURITY:                         WPA3
 IP4.ADDRESS[1]:                         192.168.228.18/32
 IP4.ADDRESS[2]:                         192.168.209.179/25
 IP4.GATEWAY:                            192.168.41.120
@@ -30783,7 +31235,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | c
 
 <<<
 size: 1529
-location: clients/tests/test-client.py:1082:test_004()/617
+location: clients/tests/test-client.py:1096:test_004()/617
 cmd: $NMCLI --mode multiline -f COMMON device show wlan0
 lang: C
 returncode: 0
@@ -30816,7 +31268,7 @@ IP6.DOMAIN[6]:                          sear6.foo4.bar
 
 <<<
 size: 1540
-location: clients/tests/test-client.py:1082:test_004()/618
+location: clients/tests/test-client.py:1096:test_004()/618
 cmd: $NMCLI --mode multiline -f COMMON device show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
@@ -30848,12 +31300,12 @@ IP6.DOMAIN[5]:                          sear6.foo3.bar
 IP6.DOMAIN[6]:                          sear6.foo4.bar
 
 <<<
-size: 4912
-location: clients/tests/test-client.py:1084:test_004()/619
+size: 5006
+location: clients/tests/test-client.py:1098:test_004()/619
 cmd: $NMCLI --mode multiline -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0
 lang: C
 returncode: 0
-stdout: 4611 bytes
+stdout: 4705 bytes
 >>>
 GENERAL.DEVICE:                         wlan0
 GENERAL.TYPE:                           wifi
@@ -30867,6 +31319,8 @@ GENERAL.HWADDR:                         13:E0:74:85:7C:D9
 GENERAL.MTU:                            0
 GENERAL.STATE:                          20 (unavailable)
 GENERAL.REASON:                         0 (No reason given)
+GENERAL.IP4-CONNECTIVITY:               0 (unknown)
+GENERAL.IP6-CONNECTIVITY:               0 (unknown)
 GENERAL.UDI:                            /sys/devices/virtual/wlan0
 GENERAL.IP-IFACE:                       --
 GENERAL.IS-SOFTWARE:                    no
@@ -30907,7 +31361,7 @@ AP[2].CHAN:                             1
 AP[2].RATE:                             54 Mbit/s
 AP[2].SIGNAL:                           81
 AP[2].BARS:                             ****
-AP[2].SECURITY:                         WPA1 WPA2
+AP[2].SECURITY:                         WPA1
 AP[3].IN-USE:                            
 AP[3].SSID:                             wlan0-ap-3
 AP[3].MODE:                             Infra
@@ -30915,7 +31369,7 @@ AP[3].CHAN:                             1
 AP[3].RATE:                             54 Mbit/s
 AP[3].SIGNAL:                           55
 AP[3].BARS:                             **  
-AP[3].SECURITY:                         WPA1 WPA2
+AP[3].SECURITY:                         WPA3
 IP4.ADDRESS[1]:                         192.168.228.18/32
 IP4.ADDRESS[2]:                         192.168.209.179/25
 IP4.GATEWAY:                            192.168.41.120
@@ -30946,12 +31400,12 @@ CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings
 CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 
 <<<
-size: 4965
-location: clients/tests/test-client.py:1084:test_004()/620
+size: 5061
+location: clients/tests/test-client.py:1098:test_004()/620
 cmd: $NMCLI --mode multiline -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 4654 bytes
+stdout: 4750 bytes
 >>>
 GENERAL.DEVICE:                         wlan0
 GENERAL.TYPE:                           wifi
@@ -30965,6 +31419,8 @@ GENERAL.HWADDR:                         13:E0:74:85:7C:D9
 GENERAL.MTU:                            0
 GENERAL.STATE:                          20 (niedostępne)
 GENERAL.REASON:                         0 (Nie podano przyczyny)
+GENERAL.IP4-CONNECTIVITY:               0 (nieznane)
+GENERAL.IP6-CONNECTIVITY:               0 (nieznane)
 GENERAL.UDI:                            /sys/devices/virtual/wlan0
 GENERAL.IP-IFACE:                       --
 GENERAL.IS-SOFTWARE:                    nie
@@ -31005,7 +31461,7 @@ AP[2].CHAN:                             1
 AP[2].RATE:                             54 Mb/s
 AP[2].SIGNAL:                           81
 AP[2].BARS:                             ****
-AP[2].SECURITY:                         WPA1 WPA2
+AP[2].SECURITY:                         WPA1
 AP[3].IN-USE:                            
 AP[3].SSID:                             wlan0-ap-3
 AP[3].MODE:                             Infrastruktura
@@ -31013,7 +31469,7 @@ AP[3].CHAN:                             1
 AP[3].RATE:                             54 Mb/s
 AP[3].SIGNAL:                           55
 AP[3].BARS:                             **  
-AP[3].SECURITY:                         WPA1 WPA2
+AP[3].SECURITY:                         WPA3
 IP4.ADDRESS[1]:                         192.168.228.18/32
 IP4.ADDRESS[2]:                         192.168.209.179/25
 IP4.GATEWAY:                            192.168.41.120
@@ -31045,7 +31501,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | c
 
 <<<
 size: 4633
-location: clients/tests/test-client.py:1022:test_004()/621
+location: clients/tests/test-client.py:1036:test_004()/621
 cmd: $NMCLI --mode multiline --color yes con s con-vpn-1
 lang: C
 returncode: 0
@@ -31146,12 +31602,12 @@ VPN.CFG[2]:                             key2 = val2
 VPN.CFG[3]:                             key3 = val3
 
 <<<
-size: 4661
-location: clients/tests/test-client.py:1022:test_004()/622
+size: 4663
+location: clients/tests/test-client.py:1036:test_004()/622
 cmd: $NMCLI --mode multiline --color yes con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 4485 bytes
+stdout: 4487 bytes
 >>>
 connection.id:                          con-vpn-1
 connection.uuid:                        UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -31242,14 +31698,14 @@ VPN.TYPE:                               openvpn
 VPN.USERNAME:                           --
 VPN.GATEWAY:                            --
 VPN.BANNER:                             *** VPN connection con-vpn-1 ***
-VPN.VPN-STATE:                          5 - Połączono z VPN
+VPN.VPN-STATE:                          5 — Połączono z VPN
 VPN.CFG[1]:                             key1 = val1
 VPN.CFG[2]:                             key2 = val2
 VPN.CFG[3]:                             key3 = val3
 
 <<<
 size: 4633
-location: clients/tests/test-client.py:1024:test_004()/623
+location: clients/tests/test-client.py:1038:test_004()/623
 cmd: $NMCLI --mode multiline --color yes con s con-vpn-1
 lang: C
 returncode: 0
@@ -31350,12 +31806,12 @@ VPN.CFG[2]:                             key2 = val2
 VPN.CFG[3]:                             key3 = val3
 
 <<<
-size: 4661
-location: clients/tests/test-client.py:1024:test_004()/624
+size: 4663
+location: clients/tests/test-client.py:1038:test_004()/624
 cmd: $NMCLI --mode multiline --color yes con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 4485 bytes
+stdout: 4487 bytes
 >>>
 connection.id:                          con-vpn-1
 connection.uuid:                        UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -31446,14 +31902,14 @@ VPN.TYPE:                               openvpn
 VPN.USERNAME:                           --
 VPN.GATEWAY:                            --
 VPN.BANNER:                             *** VPN connection con-vpn-1 ***
-VPN.VPN-STATE:                          5 - Połączono z VPN
+VPN.VPN-STATE:                          5 — Połączono z VPN
 VPN.CFG[1]:                             key1 = val1
 VPN.CFG[2]:                             key2 = val2
 VPN.CFG[3]:                             key3 = val3
 
 <<<
 size: 3552
-location: clients/tests/test-client.py:1027:test_004()/625
+location: clients/tests/test-client.py:1041:test_004()/625
 cmd: $NMCLI --mode multiline --color yes -f ALL con s con-vpn-1
 lang: C
 returncode: 0
@@ -31535,7 +31991,7 @@ proxy.pac-script:                       --
 
 <<<
 size: 3572
-location: clients/tests/test-client.py:1027:test_004()/626
+location: clients/tests/test-client.py:1041:test_004()/626
 cmd: $NMCLI --mode multiline --color yes -f ALL con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
@@ -31617,7 +32073,7 @@ proxy.pac-script:                       --
 
 <<<
 size: 506
-location: clients/tests/test-client.py:1033:test_004()/627
+location: clients/tests/test-client.py:1047:test_004()/627
 cmd: $NMCLI --mode multiline --color yes -f VPN con s con-vpn-1
 lang: C
 returncode: 0
@@ -31632,7 +32088,7 @@ vpn.timeout:                            0
 
 <<<
 size: 517
-location: clients/tests/test-client.py:1033:test_004()/628
+location: clients/tests/test-client.py:1047:test_004()/628
 cmd: $NMCLI --mode multiline --color yes -f VPN con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
@@ -31647,7 +32103,7 @@ vpn.timeout:                            0
 
 <<<
 size: 843
-location: clients/tests/test-client.py:1036:test_004()/629
+location: clients/tests/test-client.py:1050:test_004()/629
 cmd: $NMCLI --mode multiline --color yes -f GENERAL con s con-vpn-1
 lang: C
 returncode: 0
@@ -31668,7 +32124,7 @@ GENERAL.MASTER-PATH:                    --
 
 <<<
 size: 856
-location: clients/tests/test-client.py:1036:test_004()/630
+location: clients/tests/test-client.py:1050:test_004()/630
 cmd: $NMCLI --mode multiline --color yes -f GENERAL con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
@@ -31689,12 +32145,16 @@ GENERAL.MASTER-PATH:                    --
 
 <<<
 size: 1259
-location: clients/tests/test-client.py:1039:test_004()/631
+location: clients/tests/test-client.py:1053:test_004()/631
 cmd: $NMCLI --mode multiline --color yes dev s
 lang: C
 returncode: 0
 stdout: 1103 bytes
 >>>
+DEVICE:                                 wlan0
+TYPE:                                   wifi
+STATE:                                  unavailable
+CONNECTION:                             con-vpn-1
 DEVICE:                                 eth0
 TYPE:                                   ethernet
 STATE:                                  unavailable
@@ -31711,19 +32171,19 @@ DEVICE:                                 wlan1
 TYPE:                                   wifi
 STATE:                                  unavailable
 CONNECTION:                             --
-DEVICE:                                 wlan0
-TYPE:                                   wifi
-STATE:                                  unavailable
-CONNECTION:                             con-vpn-1
 
 <<<
 size: 1274
-location: clients/tests/test-client.py:1039:test_004()/632
+location: clients/tests/test-client.py:1053:test_004()/632
 cmd: $NMCLI --mode multiline --color yes dev s
 lang: pl_PL.UTF-8
 returncode: 0
 stdout: 1108 bytes
 >>>
+DEVICE:                                 wlan0
+TYPE:                                   wifi
+STATE:                                  niedostępne
+CONNECTION:                             con-vpn-1
 DEVICE:                                 eth0
 TYPE:                                   ethernet
 STATE:                                  niedostępne
@@ -31740,22 +32200,29 @@ DEVICE:                                 wlan1
 TYPE:                                   wifi
 STATE:                                  niedostępne
 CONNECTION:                             --
-DEVICE:                                 wlan0
-TYPE:                                   wifi
-STATE:                                  niedostępne
-CONNECTION:                             con-vpn-1
 
 <<<
-size: 2313
-location: clients/tests/test-client.py:1042:test_004()/633
+size: 2873
+location: clients/tests/test-client.py:1056:test_004()/633
 cmd: $NMCLI --mode multiline --color yes -f all dev status
 lang: C
 returncode: 0
-stdout: 2145 bytes
+stdout: 2705 bytes
 >>>
+DEVICE:                                 wlan0
+TYPE:                                   wifi
+STATE:                                  unavailable
+IP4-CONNECTIVITY:                       unknown
+IP6-CONNECTIVITY:                       unknown
+DBUS-PATH:                              /org/freedesktop/NetworkManager/Devices/3
+CONNECTION:                             con-vpn-1
+CON-UUID:                               UUID-con-vpn-1-REPLACED-REPLACED-REP
+CON-PATH:                               /org/freedesktop/NetworkManager/ActiveConnection/2
 DEVICE:                                 eth0
 TYPE:                                   ethernet
 STATE:                                  unavailable
+IP4-CONNECTIVITY:                       unknown
+IP6-CONNECTIVITY:                       unknown
 DBUS-PATH:                              /org/freedesktop/NetworkManager/Devices/1
 CONNECTION:                             --
 CON-UUID:                               --
@@ -31763,6 +32230,8 @@ CON-PATH:                               --
 DEVICE:                                 eth1
 TYPE:                                   ethernet
 STATE:                                  unavailable
+IP4-CONNECTIVITY:                       unknown
+IP6-CONNECTIVITY:                       unknown
 DBUS-PATH:                              /org/freedesktop/NetworkManager/Devices/2
 CONNECTION:                             --
 CON-UUID:                               --
@@ -31770,6 +32239,8 @@ CON-PATH:                               --
 DEVICE:                                 wlan1
 TYPE:                                   wifi
 STATE:                                  unavailable
+IP4-CONNECTIVITY:                       unknown
+IP6-CONNECTIVITY:                       unknown
 DBUS-PATH:                              /org/freedesktop/NetworkManager/Devices/4
 CONNECTION:                             --
 CON-UUID:                               --
@@ -31777,29 +32248,35 @@ CON-PATH:                               --
 DEVICE:                                 wlan1
 TYPE:                                   wifi
 STATE:                                  unavailable
+IP4-CONNECTIVITY:                       unknown
+IP6-CONNECTIVITY:                       unknown
 DBUS-PATH:                              /org/freedesktop/NetworkManager/Devices/5
 CONNECTION:                             --
 CON-UUID:                               --
 CON-PATH:                               --
-DEVICE:                                 wlan0
-TYPE:                                   wifi
-STATE:                                  unavailable
-DBUS-PATH:                              /org/freedesktop/NetworkManager/Devices/3
-CONNECTION:                             con-vpn-1
-CON-UUID:                               UUID-con-vpn-1-REPLACED-REPLACED-REP
-CON-PATH:                               /org/freedesktop/NetworkManager/ActiveConnection/2
 
 <<<
-size: 2328
-location: clients/tests/test-client.py:1042:test_004()/634
+size: 2898
+location: clients/tests/test-client.py:1056:test_004()/634
 cmd: $NMCLI --mode multiline --color yes -f all dev status
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2150 bytes
+stdout: 2720 bytes
 >>>
+DEVICE:                                 wlan0
+TYPE:                                   wifi
+STATE:                                  niedostępne
+IP4-CONNECTIVITY:                       nieznane
+IP6-CONNECTIVITY:                       nieznane
+DBUS-PATH:                              /org/freedesktop/NetworkManager/Devices/3
+CONNECTION:                             con-vpn-1
+CON-UUID:                               UUID-con-vpn-1-REPLACED-REPLACED-REP
+CON-PATH:                               /org/freedesktop/NetworkManager/ActiveConnection/2
 DEVICE:                                 eth0
 TYPE:                                   ethernet
 STATE:                                  niedostępne
+IP4-CONNECTIVITY:                       nieznane
+IP6-CONNECTIVITY:                       nieznane
 DBUS-PATH:                              /org/freedesktop/NetworkManager/Devices/1
 CONNECTION:                             --
 CON-UUID:                               --
@@ -31807,6 +32284,8 @@ CON-PATH:                               --
 DEVICE:                                 eth1
 TYPE:                                   ethernet
 STATE:                                  niedostępne
+IP4-CONNECTIVITY:                       nieznane
+IP6-CONNECTIVITY:                       nieznane
 DBUS-PATH:                              /org/freedesktop/NetworkManager/Devices/2
 CONNECTION:                             --
 CON-UUID:                               --
@@ -31814,6 +32293,8 @@ CON-PATH:                               --
 DEVICE:                                 wlan1
 TYPE:                                   wifi
 STATE:                                  niedostępne
+IP4-CONNECTIVITY:                       nieznane
+IP6-CONNECTIVITY:                       nieznane
 DBUS-PATH:                              /org/freedesktop/NetworkManager/Devices/4
 CONNECTION:                             --
 CON-UUID:                               --
@@ -31821,26 +32302,46 @@ CON-PATH:                               --
 DEVICE:                                 wlan1
 TYPE:                                   wifi
 STATE:                                  niedostępne
+IP4-CONNECTIVITY:                       nieznane
+IP6-CONNECTIVITY:                       nieznane
 DBUS-PATH:                              /org/freedesktop/NetworkManager/Devices/5
 CONNECTION:                             --
 CON-UUID:                               --
 CON-PATH:                               --
-DEVICE:                                 wlan0
-TYPE:                                   wifi
-STATE:                                  niedostępne
-DBUS-PATH:                              /org/freedesktop/NetworkManager/Devices/3
-CONNECTION:                             con-vpn-1
-CON-UUID:                               UUID-con-vpn-1-REPLACED-REPLACED-REP
-CON-PATH:                               /org/freedesktop/NetworkManager/ActiveConnection/2
 
 <<<
 size: 8077
-location: clients/tests/test-client.py:1045:test_004()/635
+location: clients/tests/test-client.py:1059:test_004()/635
 cmd: $NMCLI --mode multiline --color yes dev show
 lang: C
 returncode: 0
 stdout: 7918 bytes
 >>>
+GENERAL.DEVICE:                         wlan0
+GENERAL.TYPE:                           wifi
+GENERAL.HWADDR:                         13:E0:74:85:7C:D9
+GENERAL.MTU:                            0
+GENERAL.STATE:                          20 (unavailable)
+GENERAL.CONNECTION:                     con-vpn-1
+GENERAL.CON-PATH:                       /org/freedesktop/NetworkManager/ActiveConnection/2
+IP4.ADDRESS[1]:                         192.168.228.18/32
+IP4.ADDRESS[2]:                         192.168.209.179/25
+IP4.GATEWAY:                            192.168.41.120
+IP4.DOMAIN[1]:                          sear4.foo2.bar
+IP4.DOMAIN[2]:                          sear4.fo.x.y
+IP4.DOMAIN[3]:                          sear4.foo1.bar
+IP4.DOMAIN[4]:                          sear4.foo4.bar
+IP4.DOMAIN[5]:                          sear4.fo.o.bar
+IP4.WINS[1]:                            192.168.120.79
+IP6.GATEWAY:                            --
+IP6.ROUTE[1]:                           dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086
+IP6.DOMAIN[1]:                          sear6.foo2.bar
+IP6.DOMAIN[2]:                          sear6.foo1.bar
+IP6.DOMAIN[3]:                          sear6.fo.x.y
+IP6.DOMAIN[4]:                          sear6.fo.o.bar
+IP6.DOMAIN[5]:                          sear6.foo3.bar
+IP6.DOMAIN[6]:                          sear6.foo4.bar
+
 GENERAL.DEVICE:                         eth0
 GENERAL.TYPE:                           ethernet
 GENERAL.HWADDR:                         AB:B7:BF:E2:48:E8
@@ -31954,11 +32455,19 @@ IP6.ROUTE[3]:                           dst = 2001:a::afb7:4449:3787:8bb4/123, n
 IP6.DNS[1]:                             2001:a::2934:bd66:550d:ec19
 IP6.DOMAIN[1]:                          sear6.fo.x.y
 
+<<<
+size: 8108
+location: clients/tests/test-client.py:1059:test_004()/636
+cmd: $NMCLI --mode multiline --color yes dev show
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 7939 bytes
+>>>
 GENERAL.DEVICE:                         wlan0
 GENERAL.TYPE:                           wifi
 GENERAL.HWADDR:                         13:E0:74:85:7C:D9
 GENERAL.MTU:                            0
-GENERAL.STATE:                          20 (unavailable)
+GENERAL.STATE:                          20 (niedostępne)
 GENERAL.CONNECTION:                     con-vpn-1
 GENERAL.CON-PATH:                       /org/freedesktop/NetworkManager/ActiveConnection/2
 IP4.ADDRESS[1]:                         192.168.228.18/32
@@ -31979,14 +32488,6 @@ IP6.DOMAIN[4]:                          sear6.fo.o.bar
 IP6.DOMAIN[5]:                          sear6.foo3.bar
 IP6.DOMAIN[6]:                          sear6.foo4.bar
 
-<<<
-size: 8108
-location: clients/tests/test-client.py:1045:test_004()/636
-cmd: $NMCLI --mode multiline --color yes dev show
-lang: pl_PL.UTF-8
-returncode: 0
-stdout: 7939 bytes
->>>
 GENERAL.DEVICE:                         eth0
 GENERAL.TYPE:                           ethernet
 GENERAL.HWADDR:                         AB:B7:BF:E2:48:E8
@@ -32100,13 +32601,77 @@ IP6.ROUTE[3]:                           dst = 2001:a::afb7:4449:3787:8bb4/123, n
 IP6.DNS[1]:                             2001:a::2934:bd66:550d:ec19
 IP6.DOMAIN[1]:                          sear6.fo.x.y
 
+<<<
+size: 20978
+location: clients/tests/test-client.py:1062:test_004()/637
+cmd: $NMCLI --mode multiline --color yes -f all dev show
+lang: C
+returncode: 0
+stdout: 20811 bytes
+>>>
 GENERAL.DEVICE:                         wlan0
 GENERAL.TYPE:                           wifi
+GENERAL.NM-TYPE:                        NMDeviceWifi
+GENERAL.VENDOR:                         --
+GENERAL.PRODUCT:                        --
+GENERAL.DRIVER:                         virtual
+GENERAL.DRIVER-VERSION:                 --
+GENERAL.FIRMWARE-VERSION:               --
 GENERAL.HWADDR:                         13:E0:74:85:7C:D9
 GENERAL.MTU:                            0
-GENERAL.STATE:                          20 (niedostępne)
+GENERAL.STATE:                          20 (unavailable)
+GENERAL.REASON:                         0 (No reason given)
+GENERAL.IP4-CONNECTIVITY:               0 (unknown)
+GENERAL.IP6-CONNECTIVITY:               0 (unknown)
+GENERAL.UDI:                            /sys/devices/virtual/wlan0
+GENERAL.IP-IFACE:                       --
+GENERAL.IS-SOFTWARE:                    no
+GENERAL.NM-MANAGED:                     yes
+GENERAL.AUTOCONNECT:                    yes
+GENERAL.FIRMWARE-MISSING:               no
+GENERAL.NM-PLUGIN-MISSING:              no
+GENERAL.PHYS-PORT-ID:                   --
 GENERAL.CONNECTION:                     con-vpn-1
+GENERAL.CON-UUID:                       UUID-con-vpn-1-REPLACED-REPLACED-REP
 GENERAL.CON-PATH:                       /org/freedesktop/NetworkManager/ActiveConnection/2
+GENERAL.METERED:                        unknown
+CAPABILITIES.CARRIER-DETECT:            no
+CAPABILITIES.SPEED:                     unknown
+CAPABILITIES.IS-SOFTWARE:               no
+CAPABILITIES.SRIOV:                     no
+WIFI-PROPERTIES.WEP:                    yes
+WIFI-PROPERTIES.WPA:                    yes
+WIFI-PROPERTIES.WPA2:                   yes
+WIFI-PROPERTIES.TKIP:                   yes
+WIFI-PROPERTIES.CCMP:                   yes
+WIFI-PROPERTIES.AP:                     yes
+WIFI-PROPERTIES.ADHOC:                  yes
+WIFI-PROPERTIES.2GHZ:                   unknown
+WIFI-PROPERTIES.5GHZ:                   unknown
+AP[1].IN-USE:                            
+AP[1].SSID:                             wlan0-ap-2
+AP[1].MODE:                             Infra
+AP[1].CHAN:                             1
+AP[1].RATE:                             54 Mbit/s
+AP[1].SIGNAL:                           92
+AP[1].BARS:                             ****
+AP[1].SECURITY:                         WPA1 WPA2
+AP[2].IN-USE:                            
+AP[2].SSID:                             wlan0-ap-1
+AP[2].MODE:                             Infra
+AP[2].CHAN:                             1
+AP[2].RATE:                             54 Mbit/s
+AP[2].SIGNAL:                           81
+AP[2].BARS:                             ****
+AP[2].SECURITY:                         WPA1
+AP[3].IN-USE:                            
+AP[3].SSID:                             wlan0-ap-3
+AP[3].MODE:                             Infra
+AP[3].CHAN:                             1
+AP[3].RATE:                             54 Mbit/s
+AP[3].SIGNAL:                           55
+AP[3].BARS:                             **  
+AP[3].SECURITY:                         WPA3
 IP4.ADDRESS[1]:                         192.168.228.18/32
 IP4.ADDRESS[2]:                         192.168.209.179/25
 IP4.GATEWAY:                            192.168.41.120
@@ -32116,6 +32681,10 @@ IP4.DOMAIN[3]:                          sear4.foo1.bar
 IP4.DOMAIN[4]:                          sear4.foo4.bar
 IP4.DOMAIN[5]:                          sear4.fo.o.bar
 IP4.WINS[1]:                            192.168.120.79
+DHCP4.OPTION[1]:                        dhcp-4-opt-0 = val-0
+DHCP4.OPTION[2]:                        dhcp-4-opt-2 = val-2
+DHCP4.OPTION[3]:                        dhcp-4-opt-4 = val-4
+DHCP4.OPTION[4]:                        dhcp-4-opt-7 = val-7
 IP6.GATEWAY:                            --
 IP6.ROUTE[1]:                           dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086
 IP6.DOMAIN[1]:                          sear6.foo2.bar
@@ -32124,15 +32693,14 @@ IP6.DOMAIN[3]:                          sear6.fo.x.y
 IP6.DOMAIN[4]:                          sear6.fo.o.bar
 IP6.DOMAIN[5]:                          sear6.foo3.bar
 IP6.DOMAIN[6]:                          sear6.foo4.bar
+DHCP6.OPTION[1]:                        dhcp-6-opt-1 = val-1
+DHCP6.OPTION[2]:                        dhcp-6-opt-2 = val-2
+DHCP6.OPTION[3]:                        dhcp-6-opt-3 = val-3
+DHCP6.OPTION[4]:                        dhcp-6-opt-4 = val-4
+DHCP6.OPTION[5]:                        dhcp-6-opt-5 = val-5
+CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings/Connection/{2}
+CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 
-<<<
-size: 20468
-location: clients/tests/test-client.py:1048:test_004()/637
-cmd: $NMCLI --mode multiline --color yes -f all dev show
-lang: C
-returncode: 0
-stdout: 20301 bytes
->>>
 GENERAL.DEVICE:                         eth0
 GENERAL.TYPE:                           ethernet
 GENERAL.NM-TYPE:                        NMDeviceEthernet
@@ -32145,6 +32713,8 @@ GENERAL.HWADDR:                         AB:B7:BF:E2:48:E8
 GENERAL.MTU:                            0
 GENERAL.STATE:                          20 (unavailable)
 GENERAL.REASON:                         0 (No reason given)
+GENERAL.IP4-CONNECTIVITY:               0 (unknown)
+GENERAL.IP6-CONNECTIVITY:               0 (unknown)
 GENERAL.UDI:                            /sys/devices/virtual/eth0
 GENERAL.IP-IFACE:                       --
 GENERAL.IS-SOFTWARE:                    no
@@ -32206,6 +32776,8 @@ GENERAL.HWADDR:                         E7:78:B1:93:2B:22
 GENERAL.MTU:                            0
 GENERAL.STATE:                          20 (unavailable)
 GENERAL.REASON:                         0 (No reason given)
+GENERAL.IP4-CONNECTIVITY:               0 (unknown)
+GENERAL.IP6-CONNECTIVITY:               0 (unknown)
 GENERAL.UDI:                            /sys/devices/virtual/eth1
 GENERAL.IP-IFACE:                       --
 GENERAL.IS-SOFTWARE:                    no
@@ -32274,6 +32846,8 @@ GENERAL.HWADDR:                         21:E9:64:81:8C:A8
 GENERAL.MTU:                            0
 GENERAL.STATE:                          20 (unavailable)
 GENERAL.REASON:                         0 (No reason given)
+GENERAL.IP4-CONNECTIVITY:               0 (unknown)
+GENERAL.IP6-CONNECTIVITY:               0 (unknown)
 GENERAL.UDI:                            /sys/devices/virtual/wlan1
 GENERAL.IP-IFACE:                       --
 GENERAL.IS-SOFTWARE:                    no
@@ -32360,6 +32934,8 @@ GENERAL.HWADDR:                         71:52:AD:63:5C:7C
 GENERAL.MTU:                            0
 GENERAL.STATE:                          20 (unavailable)
 GENERAL.REASON:                         0 (No reason given)
+GENERAL.IP4-CONNECTIVITY:               0 (unknown)
+GENERAL.IP6-CONNECTIVITY:               0 (unknown)
 GENERAL.UDI:                            /sys/devices/virtual/wlan1
 GENERAL.IP-IFACE:                       --
 GENERAL.IS-SOFTWARE:                    no
@@ -32414,6 +32990,14 @@ DHCP6.OPTION[5]:                        dhcp-6-opt-9 = val-9
 CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings/Connection/{2}
 CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 
+<<<
+size: 21128
+location: clients/tests/test-client.py:1062:test_004()/638
+cmd: $NMCLI --mode multiline --color yes -f all dev show
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 20951 bytes
+>>>
 GENERAL.DEVICE:                         wlan0
 GENERAL.TYPE:                           wifi
 GENERAL.NM-TYPE:                        NMDeviceWifi
@@ -32424,57 +33008,59 @@ GENERAL.DRIVER-VERSION:                 --
 GENERAL.FIRMWARE-VERSION:               --
 GENERAL.HWADDR:                         13:E0:74:85:7C:D9
 GENERAL.MTU:                            0
-GENERAL.STATE:                          20 (unavailable)
-GENERAL.REASON:                         0 (No reason given)
+GENERAL.STATE:                          20 (niedostępne)
+GENERAL.REASON:                         0 (Nie podano przyczyny)
+GENERAL.IP4-CONNECTIVITY:               0 (nieznane)
+GENERAL.IP6-CONNECTIVITY:               0 (nieznane)
 GENERAL.UDI:                            /sys/devices/virtual/wlan0
 GENERAL.IP-IFACE:                       --
-GENERAL.IS-SOFTWARE:                    no
-GENERAL.NM-MANAGED:                     yes
-GENERAL.AUTOCONNECT:                    yes
-GENERAL.FIRMWARE-MISSING:               no
-GENERAL.NM-PLUGIN-MISSING:              no
+GENERAL.IS-SOFTWARE:                    nie
+GENERAL.NM-MANAGED:                     tak
+GENERAL.AUTOCONNECT:                    tak
+GENERAL.FIRMWARE-MISSING:               nie
+GENERAL.NM-PLUGIN-MISSING:              nie
 GENERAL.PHYS-PORT-ID:                   --
 GENERAL.CONNECTION:                     con-vpn-1
 GENERAL.CON-UUID:                       UUID-con-vpn-1-REPLACED-REPLACED-REP
 GENERAL.CON-PATH:                       /org/freedesktop/NetworkManager/ActiveConnection/2
-GENERAL.METERED:                        unknown
-CAPABILITIES.CARRIER-DETECT:            no
-CAPABILITIES.SPEED:                     unknown
-CAPABILITIES.IS-SOFTWARE:               no
-CAPABILITIES.SRIOV:                     no
-WIFI-PROPERTIES.WEP:                    yes
-WIFI-PROPERTIES.WPA:                    yes
-WIFI-PROPERTIES.WPA2:                   yes
-WIFI-PROPERTIES.TKIP:                   yes
-WIFI-PROPERTIES.CCMP:                   yes
-WIFI-PROPERTIES.AP:                     yes
-WIFI-PROPERTIES.ADHOC:                  yes
-WIFI-PROPERTIES.2GHZ:                   unknown
-WIFI-PROPERTIES.5GHZ:                   unknown
+GENERAL.METERED:                        nieznane
+CAPABILITIES.CARRIER-DETECT:            nie
+CAPABILITIES.SPEED:                     nieznane
+CAPABILITIES.IS-SOFTWARE:               nie
+CAPABILITIES.SRIOV:                     nie
+WIFI-PROPERTIES.WEP:                    tak
+WIFI-PROPERTIES.WPA:                    tak
+WIFI-PROPERTIES.WPA2:                   tak
+WIFI-PROPERTIES.TKIP:                   tak
+WIFI-PROPERTIES.CCMP:                   tak
+WIFI-PROPERTIES.AP:                     tak
+WIFI-PROPERTIES.ADHOC:                  tak
+WIFI-PROPERTIES.2GHZ:                   nieznane
+WIFI-PROPERTIES.5GHZ:                   nieznane
 AP[1].IN-USE:                            
 AP[1].SSID:                             wlan0-ap-2
-AP[1].MODE:                             Infra
+AP[1].MODE:                             Infrastruktura
 AP[1].CHAN:                             1
-AP[1].RATE:                             54 Mbit/s
+AP[1].RATE:                             54 Mb/s
 AP[1].SIGNAL:                           92
 AP[1].BARS:                             ****
 AP[1].SECURITY:                         WPA1 WPA2
 AP[2].IN-USE:                            
 AP[2].SSID:                             wlan0-ap-1
-AP[2].MODE:                             Infra
+AP[2].MODE:                             Infrastruktura
 AP[2].CHAN:                             1
-AP[2].RATE:                             54 Mbit/s
+AP[2].RATE:                             54 Mb/s
 AP[2].SIGNAL:                           81
 AP[2].BARS:                             ****
-AP[2].SECURITY:                         WPA1 WPA2
+AP[2].SECURITY:                         WPA1
 AP[3].IN-USE:                            
 AP[3].SSID:                             wlan0-ap-3
-AP[3].MODE:                             Infra
+AP[3].MODE:                             Infrastruktura
 AP[3].CHAN:                             1
-AP[3].RATE:                             54 Mbit/s
+AP[3].RATE:                             54 Mb/s
 AP[3].SIGNAL:                           55
 AP[3].BARS:                             **  
-AP[3].SECURITY:                         WPA1 WPA2
+AP[3].SECURITY:                         WPA3
 IP4.ADDRESS[1]:                         192.168.228.18/32
 IP4.ADDRESS[2]:                         192.168.209.179/25
 IP4.GATEWAY:                            192.168.41.120
@@ -32504,14 +33090,6 @@ DHCP6.OPTION[5]:                        dhcp-6-opt-5 = val-5
 CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings/Connection/{2}
 CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 
-<<<
-size: 20608
-location: clients/tests/test-client.py:1048:test_004()/638
-cmd: $NMCLI --mode multiline --color yes -f all dev show
-lang: pl_PL.UTF-8
-returncode: 0
-stdout: 20431 bytes
->>>
 GENERAL.DEVICE:                         eth0
 GENERAL.TYPE:                           ethernet
 GENERAL.NM-TYPE:                        NMDeviceEthernet
@@ -32524,6 +33102,8 @@ GENERAL.HWADDR:                         AB:B7:BF:E2:48:E8
 GENERAL.MTU:                            0
 GENERAL.STATE:                          20 (niedostępne)
 GENERAL.REASON:                         0 (Nie podano przyczyny)
+GENERAL.IP4-CONNECTIVITY:               0 (nieznane)
+GENERAL.IP6-CONNECTIVITY:               0 (nieznane)
 GENERAL.UDI:                            /sys/devices/virtual/eth0
 GENERAL.IP-IFACE:                       --
 GENERAL.IS-SOFTWARE:                    nie
@@ -32585,6 +33165,8 @@ GENERAL.HWADDR:                         E7:78:B1:93:2B:22
 GENERAL.MTU:                            0
 GENERAL.STATE:                          20 (niedostępne)
 GENERAL.REASON:                         0 (Nie podano przyczyny)
+GENERAL.IP4-CONNECTIVITY:               0 (nieznane)
+GENERAL.IP6-CONNECTIVITY:               0 (nieznane)
 GENERAL.UDI:                            /sys/devices/virtual/eth1
 GENERAL.IP-IFACE:                       --
 GENERAL.IS-SOFTWARE:                    nie
@@ -32653,6 +33235,8 @@ GENERAL.HWADDR:                         21:E9:64:81:8C:A8
 GENERAL.MTU:                            0
 GENERAL.STATE:                          20 (niedostępne)
 GENERAL.REASON:                         0 (Nie podano przyczyny)
+GENERAL.IP4-CONNECTIVITY:               0 (nieznane)
+GENERAL.IP6-CONNECTIVITY:               0 (nieznane)
 GENERAL.UDI:                            /sys/devices/virtual/wlan1
 GENERAL.IP-IFACE:                       --
 GENERAL.IS-SOFTWARE:                    nie
@@ -32739,6 +33323,8 @@ GENERAL.HWADDR:                         71:52:AD:63:5C:7C
 GENERAL.MTU:                            0
 GENERAL.STATE:                          20 (niedostępne)
 GENERAL.REASON:                         0 (Nie podano przyczyny)
+GENERAL.IP4-CONNECTIVITY:               0 (nieznane)
+GENERAL.IP6-CONNECTIVITY:               0 (nieznane)
 GENERAL.UDI:                            /sys/devices/virtual/wlan1
 GENERAL.IP-IFACE:                       --
 GENERAL.IS-SOFTWARE:                    nie
@@ -32793,99 +33379,9 @@ DHCP6.OPTION[5]:                        dhcp-6-opt-9 = val-9
 CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings/Connection/{2}
 CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 
-GENERAL.DEVICE:                         wlan0
-GENERAL.TYPE:                           wifi
-GENERAL.NM-TYPE:                        NMDeviceWifi
-GENERAL.VENDOR:                         --
-GENERAL.PRODUCT:                        --
-GENERAL.DRIVER:                         virtual
-GENERAL.DRIVER-VERSION:                 --
-GENERAL.FIRMWARE-VERSION:               --
-GENERAL.HWADDR:                         13:E0:74:85:7C:D9
-GENERAL.MTU:                            0
-GENERAL.STATE:                          20 (niedostępne)
-GENERAL.REASON:                         0 (Nie podano przyczyny)
-GENERAL.UDI:                            /sys/devices/virtual/wlan0
-GENERAL.IP-IFACE:                       --
-GENERAL.IS-SOFTWARE:                    nie
-GENERAL.NM-MANAGED:                     tak
-GENERAL.AUTOCONNECT:                    tak
-GENERAL.FIRMWARE-MISSING:               nie
-GENERAL.NM-PLUGIN-MISSING:              nie
-GENERAL.PHYS-PORT-ID:                   --
-GENERAL.CONNECTION:                     con-vpn-1
-GENERAL.CON-UUID:                       UUID-con-vpn-1-REPLACED-REPLACED-REP
-GENERAL.CON-PATH:                       /org/freedesktop/NetworkManager/ActiveConnection/2
-GENERAL.METERED:                        nieznane
-CAPABILITIES.CARRIER-DETECT:            nie
-CAPABILITIES.SPEED:                     nieznane
-CAPABILITIES.IS-SOFTWARE:               nie
-CAPABILITIES.SRIOV:                     nie
-WIFI-PROPERTIES.WEP:                    tak
-WIFI-PROPERTIES.WPA:                    tak
-WIFI-PROPERTIES.WPA2:                   tak
-WIFI-PROPERTIES.TKIP:                   tak
-WIFI-PROPERTIES.CCMP:                   tak
-WIFI-PROPERTIES.AP:                     tak
-WIFI-PROPERTIES.ADHOC:                  tak
-WIFI-PROPERTIES.2GHZ:                   nieznane
-WIFI-PROPERTIES.5GHZ:                   nieznane
-AP[1].IN-USE:                            
-AP[1].SSID:                             wlan0-ap-2
-AP[1].MODE:                             Infrastruktura
-AP[1].CHAN:                             1
-AP[1].RATE:                             54 Mb/s
-AP[1].SIGNAL:                           92
-AP[1].BARS:                             ****
-AP[1].SECURITY:                         WPA1 WPA2
-AP[2].IN-USE:                            
-AP[2].SSID:                             wlan0-ap-1
-AP[2].MODE:                             Infrastruktura
-AP[2].CHAN:                             1
-AP[2].RATE:                             54 Mb/s
-AP[2].SIGNAL:                           81
-AP[2].BARS:                             ****
-AP[2].SECURITY:                         WPA1 WPA2
-AP[3].IN-USE:                            
-AP[3].SSID:                             wlan0-ap-3
-AP[3].MODE:                             Infrastruktura
-AP[3].CHAN:                             1
-AP[3].RATE:                             54 Mb/s
-AP[3].SIGNAL:                           55
-AP[3].BARS:                             **  
-AP[3].SECURITY:                         WPA1 WPA2
-IP4.ADDRESS[1]:                         192.168.228.18/32
-IP4.ADDRESS[2]:                         192.168.209.179/25
-IP4.GATEWAY:                            192.168.41.120
-IP4.DOMAIN[1]:                          sear4.foo2.bar
-IP4.DOMAIN[2]:                          sear4.fo.x.y
-IP4.DOMAIN[3]:                          sear4.foo1.bar
-IP4.DOMAIN[4]:                          sear4.foo4.bar
-IP4.DOMAIN[5]:                          sear4.fo.o.bar
-IP4.WINS[1]:                            192.168.120.79
-DHCP4.OPTION[1]:                        dhcp-4-opt-0 = val-0
-DHCP4.OPTION[2]:                        dhcp-4-opt-2 = val-2
-DHCP4.OPTION[3]:                        dhcp-4-opt-4 = val-4
-DHCP4.OPTION[4]:                        dhcp-4-opt-7 = val-7
-IP6.GATEWAY:                            --
-IP6.ROUTE[1]:                           dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086
-IP6.DOMAIN[1]:                          sear6.foo2.bar
-IP6.DOMAIN[2]:                          sear6.foo1.bar
-IP6.DOMAIN[3]:                          sear6.fo.x.y
-IP6.DOMAIN[4]:                          sear6.fo.o.bar
-IP6.DOMAIN[5]:                          sear6.foo3.bar
-IP6.DOMAIN[6]:                          sear6.foo4.bar
-DHCP6.OPTION[1]:                        dhcp-6-opt-1 = val-1
-DHCP6.OPTION[2]:                        dhcp-6-opt-2 = val-2
-DHCP6.OPTION[3]:                        dhcp-6-opt-3 = val-3
-DHCP6.OPTION[4]:                        dhcp-6-opt-4 = val-4
-DHCP6.OPTION[5]:                        dhcp-6-opt-5 = val-5
-CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings/Connection/{2}
-CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
-
 <<<
 size: 1528
-location: clients/tests/test-client.py:1051:test_004()/639
+location: clients/tests/test-client.py:1065:test_004()/639
 cmd: $NMCLI --mode multiline --color yes dev show wlan0
 lang: C
 returncode: 0
@@ -32918,7 +33414,7 @@ IP6.DOMAIN[6]:                          sear6.foo4.bar
 
 <<<
 size: 1539
-location: clients/tests/test-client.py:1051:test_004()/640
+location: clients/tests/test-client.py:1065:test_004()/640
 cmd: $NMCLI --mode multiline --color yes dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
@@ -32950,12 +33446,12 @@ IP6.DOMAIN[5]:                          sear6.foo3.bar
 IP6.DOMAIN[6]:                          sear6.foo4.bar
 
 <<<
-size: 4999
-location: clients/tests/test-client.py:1054:test_004()/641
+size: 5093
+location: clients/tests/test-client.py:1068:test_004()/641
 cmd: $NMCLI --mode multiline --color yes -f all dev show wlan0
 lang: C
 returncode: 0
-stdout: 4827 bytes
+stdout: 4921 bytes
 >>>
 GENERAL.DEVICE:                         wlan0
 GENERAL.TYPE:                           wifi
@@ -32969,6 +33465,8 @@ GENERAL.HWADDR:                         13:E0:74:85:7C:D9
 GENERAL.MTU:                            0
 GENERAL.STATE:                          20 (unavailable)
 GENERAL.REASON:                         0 (No reason given)
+GENERAL.IP4-CONNECTIVITY:               0 (unknown)
+GENERAL.IP6-CONNECTIVITY:               0 (unknown)
 GENERAL.UDI:                            /sys/devices/virtual/wlan0
 GENERAL.IP-IFACE:                       --
 GENERAL.IS-SOFTWARE:                    no
@@ -33009,7 +33507,7 @@ AP[2].CHAN:                             1
 AP[2].RATE:                             54 Mbit/s
 AP[2].SIGNAL:                           81
 AP[2].BARS:                             ****
-AP[2].SECURITY:                         WPA1 WPA2
+AP[2].SECURITY:                         WPA1
 AP[3].IN-USE:                            
 AP[3].SSID:                             wlan0-ap-3
 AP[3].MODE:                             Infra
@@ -33017,7 +33515,7 @@ AP[3].CHAN:                             1
 AP[3].RATE:                             54 Mbit/s
 AP[3].SIGNAL:                           55
 AP[3].BARS:                             **  
-AP[3].SECURITY:                         WPA1 WPA2
+AP[3].SECURITY:                         WPA3
 IP4.ADDRESS[1]:                         192.168.228.18/32
 IP4.ADDRESS[2]:                         192.168.209.179/25
 IP4.GATEWAY:                            192.168.41.120
@@ -33048,12 +33546,12 @@ CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings
 CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 
 <<<
-size: 5052
-location: clients/tests/test-client.py:1054:test_004()/642
+size: 5148
+location: clients/tests/test-client.py:1068:test_004()/642
 cmd: $NMCLI --mode multiline --color yes -f all dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 4870 bytes
+stdout: 4966 bytes
 >>>
 GENERAL.DEVICE:                         wlan0
 GENERAL.TYPE:                           wifi
@@ -33067,6 +33565,8 @@ GENERAL.HWADDR:                         13:E0:74:85:7C:D9
 GENERAL.MTU:                            0
 GENERAL.STATE:                          20 (niedostępne)
 GENERAL.REASON:                         0 (Nie podano przyczyny)
+GENERAL.IP4-CONNECTIVITY:               0 (nieznane)
+GENERAL.IP6-CONNECTIVITY:               0 (nieznane)
 GENERAL.UDI:                            /sys/devices/virtual/wlan0
 GENERAL.IP-IFACE:                       --
 GENERAL.IS-SOFTWARE:                    nie
@@ -33107,7 +33607,7 @@ AP[2].CHAN:                             1
 AP[2].RATE:                             54 Mb/s
 AP[2].SIGNAL:                           81
 AP[2].BARS:                             ****
-AP[2].SECURITY:                         WPA1 WPA2
+AP[2].SECURITY:                         WPA1
 AP[3].IN-USE:                            
 AP[3].SSID:                             wlan0-ap-3
 AP[3].MODE:                             Infrastruktura
@@ -33115,7 +33615,7 @@ AP[3].CHAN:                             1
 AP[3].RATE:                             54 Mb/s
 AP[3].SIGNAL:                           55
 AP[3].BARS:                             **  
-AP[3].SECURITY:                         WPA1 WPA2
+AP[3].SECURITY:                         WPA3
 IP4.ADDRESS[1]:                         192.168.228.18/32
 IP4.ADDRESS[2]:                         192.168.209.179/25
 IP4.GATEWAY:                            192.168.41.120
@@ -33146,12 +33646,12 @@ CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings
 CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 
 <<<
-size: 1886
-location: clients/tests/test-client.py:1057:test_004()/643
+size: 1990
+location: clients/tests/test-client.py:1071:test_004()/643
 cmd: $NMCLI --mode multiline --color yes -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: C
 returncode: 0
-stdout: 1679 bytes
+stdout: 1783 bytes
 >>>
 GENERAL.DEVICE:                         wlan0
 GENERAL.TYPE:                           wifi
@@ -33165,6 +33665,8 @@ GENERAL.HWADDR:                         13:E0:74:85:7C:D9
 GENERAL.MTU:                            0
 GENERAL.STATE:                          20 (unavailable)
 GENERAL.REASON:                         0 (No reason given)
+GENERAL.IP4-CONNECTIVITY:               0 (unknown)
+GENERAL.IP6-CONNECTIVITY:               0 (unknown)
 GENERAL.UDI:                            /sys/devices/virtual/wlan0
 GENERAL.IP-IFACE:                       --
 GENERAL.IS-SOFTWARE:                    no
@@ -33189,12 +33691,12 @@ WIFI-PROPERTIES.2GHZ:                   unknown
 WIFI-PROPERTIES.5GHZ:                   unknown
 
 <<<
-size: 1908
-location: clients/tests/test-client.py:1057:test_004()/644
+size: 2014
+location: clients/tests/test-client.py:1071:test_004()/644
 cmd: $NMCLI --mode multiline --color yes -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 1691 bytes
+stdout: 1797 bytes
 >>>
 GENERAL.DEVICE:                         wlan0
 GENERAL.TYPE:                           wifi
@@ -33208,6 +33710,8 @@ GENERAL.HWADDR:                         13:E0:74:85:7C:D9
 GENERAL.MTU:                            0
 GENERAL.STATE:                          20 (niedostępne)
 GENERAL.REASON:                         0 (Nie podano przyczyny)
+GENERAL.IP4-CONNECTIVITY:               0 (nieznane)
+GENERAL.IP6-CONNECTIVITY:               0 (nieznane)
 GENERAL.UDI:                            /sys/devices/virtual/wlan0
 GENERAL.IP-IFACE:                       --
 GENERAL.IS-SOFTWARE:                    nie
@@ -33232,12 +33736,12 @@ WIFI-PROPERTIES.2GHZ:                   nieznane
 WIFI-PROPERTIES.5GHZ:                   nieznane
 
 <<<
-size: 1886
-location: clients/tests/test-client.py:1060:test_004()/645
+size: 1990
+location: clients/tests/test-client.py:1074:test_004()/645
 cmd: $NMCLI --mode multiline --color yes -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: C
 returncode: 0
-stdout: 1679 bytes
+stdout: 1783 bytes
 >>>
 GENERAL.DEVICE:                         wlan0
 GENERAL.TYPE:                           wifi
@@ -33251,6 +33755,8 @@ GENERAL.HWADDR:                         13:E0:74:85:7C:D9
 GENERAL.MTU:                            0
 GENERAL.STATE:                          20 (unavailable)
 GENERAL.REASON:                         0 (No reason given)
+GENERAL.IP4-CONNECTIVITY:               0 (unknown)
+GENERAL.IP6-CONNECTIVITY:               0 (unknown)
 GENERAL.UDI:                            /sys/devices/virtual/wlan0
 GENERAL.IP-IFACE:                       --
 GENERAL.IS-SOFTWARE:                    no
@@ -33275,12 +33781,12 @@ WIFI-PROPERTIES.2GHZ:                   unknown
 WIFI-PROPERTIES.5GHZ:                   unknown
 
 <<<
-size: 1908
-location: clients/tests/test-client.py:1060:test_004()/646
+size: 2014
+location: clients/tests/test-client.py:1074:test_004()/646
 cmd: $NMCLI --mode multiline --color yes -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 1691 bytes
+stdout: 1797 bytes
 >>>
 GENERAL.DEVICE:                         wlan0
 GENERAL.TYPE:                           wifi
@@ -33294,6 +33800,8 @@ GENERAL.HWADDR:                         13:E0:74:85:7C:D9
 GENERAL.MTU:                            0
 GENERAL.STATE:                          20 (niedostępne)
 GENERAL.REASON:                         0 (Nie podano przyczyny)
+GENERAL.IP4-CONNECTIVITY:               0 (nieznane)
+GENERAL.IP6-CONNECTIVITY:               0 (nieznane)
 GENERAL.UDI:                            /sys/devices/virtual/wlan0
 GENERAL.IP-IFACE:                       --
 GENERAL.IS-SOFTWARE:                    nie
@@ -33319,12 +33827,15 @@ WIFI-PROPERTIES.5GHZ:                   nieznane
 
 <<<
 size: 1169
-location: clients/tests/test-client.py:1063:test_004()/647
+location: clients/tests/test-client.py:1077:test_004()/647
 cmd: $NMCLI --mode multiline --color yes -f DEVICE,TYPE,DBUS-PATH dev
 lang: C
 returncode: 0
 stdout: 991 bytes
 >>>
+DEVICE:                                 wlan0
+TYPE:                                   wifi
+DBUS-PATH:                              /org/freedesktop/NetworkManager/Devices/3
 DEVICE:                                 eth0
 TYPE:                                   ethernet
 DBUS-PATH:                              /org/freedesktop/NetworkManager/Devices/1
@@ -33337,18 +33848,18 @@ DBUS-PATH:                              /org/freedesktop/NetworkManager/Devi
 DEVICE:                                 wlan1
 TYPE:                                   wifi
 DBUS-PATH:                              /org/freedesktop/NetworkManager/Devices/5
-DEVICE:                                 wlan0
-TYPE:                                   wifi
-DBUS-PATH:                              /org/freedesktop/NetworkManager/Devices/3
 
 <<<
 size: 1179
-location: clients/tests/test-client.py:1063:test_004()/648
+location: clients/tests/test-client.py:1077:test_004()/648
 cmd: $NMCLI --mode multiline --color yes -f DEVICE,TYPE,DBUS-PATH dev
 lang: pl_PL.UTF-8
 returncode: 0
 stdout: 991 bytes
 >>>
+DEVICE:                                 wlan0
+TYPE:                                   wifi
+DBUS-PATH:                              /org/freedesktop/NetworkManager/Devices/3
 DEVICE:                                 eth0
 TYPE:                                   ethernet
 DBUS-PATH:                              /org/freedesktop/NetworkManager/Devices/1
@@ -33361,37 +33872,15 @@ DBUS-PATH:                              /org/freedesktop/NetworkManager/Devi
 DEVICE:                                 wlan1
 TYPE:                                   wifi
 DBUS-PATH:                              /org/freedesktop/NetworkManager/Devices/5
-DEVICE:                                 wlan0
-TYPE:                                   wifi
-DBUS-PATH:                              /org/freedesktop/NetworkManager/Devices/3
 
 <<<
-size: 4508
-location: clients/tests/test-client.py:1066:test_004()/649
+size: 4420
+location: clients/tests/test-client.py:1080:test_004()/649
 cmd: $NMCLI --mode multiline --color yes -f ALL device wifi list
 lang: C
 returncode: 0
-stdout: 4334 bytes
+stdout: 4246 bytes
 >>>
-NAME:                                   AP[1]
-SSID:                                   wlan1-ap-4
-SSID-HEX:                               776C616E312D61702D34
-BSSID:                                  94:2B:E8:F6:D2:86
-MODE:                                   Infra
-CHAN:                                   1
-FREQ:                                   2412 MHz
-RATE:                                   54 Mbit/s
-SIGNAL:                                 48
-BARS:                                   **  
-SECURITY:                               WPA1 WPA2
-WPA-FLAGS:                              pair_tkip pair_ccmp group_tkip group_ccmp psk
-RSN-FLAGS:                              pair_tkip pair_ccmp group_tkip group_ccmp psk
-DEVICE:                                 wlan1
-ACTIVE:                                 no
-IN-USE:                                  
-DBUS-PATH:                              /org/freedesktop/NetworkManager/AccessPoint/4
-
-
 NAME:                                   AP[1]
 SSID:                                   wlan0-ap-2
 SSID-HEX:                               776C616E302D61702D32
@@ -33419,9 +33908,9 @@ FREQ:                                   2412 MHz
 RATE:                                   54 Mbit/s
 SIGNAL:                                 81
 BARS:                                   ****
-SECURITY:                               WPA1 WPA2
+SECURITY:                               WPA1
 WPA-FLAGS:                              pair_tkip pair_ccmp group_tkip group_ccmp psk
-RSN-FLAGS:                              pair_tkip pair_ccmp group_tkip group_ccmp psk
+RSN-FLAGS:                              (none)
 DEVICE:                                 wlan0
 ACTIVE:                                 no
 IN-USE:                                  
@@ -33436,41 +33925,41 @@ FREQ:                                   2412 MHz
 RATE:                                   54 Mbit/s
 SIGNAL:                                 55
 BARS:                                   **  
-SECURITY:                               WPA1 WPA2
-WPA-FLAGS:                              pair_tkip pair_ccmp group_tkip group_ccmp psk
-RSN-FLAGS:                              pair_tkip pair_ccmp group_tkip group_ccmp psk
+SECURITY:                               WPA3
+WPA-FLAGS:                              (none)
+RSN-FLAGS:                              pair_tkip pair_ccmp group_tkip group_ccmp sae
 DEVICE:                                 wlan0
 ACTIVE:                                 no
 IN-USE:                                  
 DBUS-PATH:                              /org/freedesktop/NetworkManager/AccessPoint/3
 
-<<<
-size: 4566
-location: clients/tests/test-client.py:1066:test_004()/650
-cmd: $NMCLI --mode multiline --color yes -f ALL device wifi list
-lang: pl_PL.UTF-8
-returncode: 0
-stdout: 4382 bytes
->>>
 NAME:                                   AP[1]
 SSID:                                   wlan1-ap-4
 SSID-HEX:                               776C616E312D61702D34
 BSSID:                                  94:2B:E8:F6:D2:86
-MODE:                                   Infrastruktura
+MODE:                                   Infra
 CHAN:                                   1
-FREQ:                                   2412 MHz
-RATE:                                   54 Mb/s
+FREQ:                                   2412 MHz
+RATE:                                   54 Mbit/s
 SIGNAL:                                 48
 BARS:                                   **  
 SECURITY:                               WPA1 WPA2
 WPA-FLAGS:                              pair_tkip pair_ccmp group_tkip group_ccmp psk
 RSN-FLAGS:                              pair_tkip pair_ccmp group_tkip group_ccmp psk
 DEVICE:                                 wlan1
-ACTIVE:                                 nie
+ACTIVE:                                 no
 IN-USE:                                  
 DBUS-PATH:                              /org/freedesktop/NetworkManager/AccessPoint/4
 
 
+<<<
+size: 4478
+location: clients/tests/test-client.py:1080:test_004()/650
+cmd: $NMCLI --mode multiline --color yes -f ALL device wifi list
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 4294 bytes
+>>>
 NAME:                                   AP[1]
 SSID:                                   wlan0-ap-2
 SSID-HEX:                               776C616E302D61702D32
@@ -33498,9 +33987,9 @@ FREQ:                                   2412 MHz
 RATE:                                   54 Mb/s
 SIGNAL:                                 81
 BARS:                                   ****
-SECURITY:                               WPA1 WPA2
+SECURITY:                               WPA1
 WPA-FLAGS:                              pair_tkip pair_ccmp group_tkip group_ccmp psk
-RSN-FLAGS:                              pair_tkip pair_ccmp group_tkip group_ccmp psk
+RSN-FLAGS:                              (brak)
 DEVICE:                                 wlan0
 ACTIVE:                                 nie
 IN-USE:                                  
@@ -33515,32 +34004,41 @@ FREQ:                                   2412 MHz
 RATE:                                   54 Mb/s
 SIGNAL:                                 55
 BARS:                                   **  
-SECURITY:                               WPA1 WPA2
-WPA-FLAGS:                              pair_tkip pair_ccmp group_tkip group_ccmp psk
-RSN-FLAGS:                              pair_tkip pair_ccmp group_tkip group_ccmp psk
+SECURITY:                               WPA3
+WPA-FLAGS:                              (brak)
+RSN-FLAGS:                              pair_tkip pair_ccmp group_tkip group_ccmp sae
 DEVICE:                                 wlan0
 ACTIVE:                                 nie
 IN-USE:                                  
 DBUS-PATH:                              /org/freedesktop/NetworkManager/AccessPoint/3
 
-<<<
-size: 1943
-location: clients/tests/test-client.py:1068:test_004()/651
-cmd: $NMCLI --mode multiline --color yes -f COMMON device wifi list
-lang: C
-returncode: 0
-stdout: 1766 bytes
->>>
-IN-USE:                                  
+NAME:                                   AP[1]
 SSID:                                   wlan1-ap-4
-MODE:                                   Infra
+SSID-HEX:                               776C616E312D61702D34
+BSSID:                                  94:2B:E8:F6:D2:86
+MODE:                                   Infrastruktura
 CHAN:                                   1
-RATE:                                   54 Mbit/s
+FREQ:                                   2412 MHz
+RATE:                                   54 Mb/s
 SIGNAL:                                 48
 BARS:                                   **  
 SECURITY:                               WPA1 WPA2
+WPA-FLAGS:                              pair_tkip pair_ccmp group_tkip group_ccmp psk
+RSN-FLAGS:                              pair_tkip pair_ccmp group_tkip group_ccmp psk
+DEVICE:                                 wlan1
+ACTIVE:                                 nie
+IN-USE:                                  
+DBUS-PATH:                              /org/freedesktop/NetworkManager/AccessPoint/4
 
 
+<<<
+size: 1933
+location: clients/tests/test-client.py:1082:test_004()/651
+cmd: $NMCLI --mode multiline --color yes -f COMMON device wifi list
+lang: C
+returncode: 0
+stdout: 1756 bytes
+>>>
 IN-USE:                                  
 SSID:                                   wlan0-ap-2
 MODE:                                   Infra
@@ -33556,7 +34054,7 @@ CHAN:                                   1
 RATE:                                   54 Mbit/s
 SIGNAL:                                 81
 BARS:                                   ****
-SECURITY:                               WPA1 WPA2
+SECURITY:                               WPA1
 IN-USE:                                  
 SSID:                                   wlan0-ap-3
 MODE:                                   Infra
@@ -33564,26 +34062,26 @@ CHAN:                                   1
 RATE:                                   54 Mbit/s
 SIGNAL:                                 55
 BARS:                                   **  
-SECURITY:                               WPA1 WPA2
+SECURITY:                               WPA3
 
-<<<
-size: 1989
-location: clients/tests/test-client.py:1068:test_004()/652
-cmd: $NMCLI --mode multiline --color yes -f COMMON device wifi list
-lang: pl_PL.UTF-8
-returncode: 0
-stdout: 1802 bytes
->>>
 IN-USE:                                  
 SSID:                                   wlan1-ap-4
-MODE:                                   Infrastruktura
+MODE:                                   Infra
 CHAN:                                   1
-RATE:                                   54 Mb/s
+RATE:                                   54 Mbit/s
 SIGNAL:                                 48
 BARS:                                   **  
 SECURITY:                               WPA1 WPA2
 
 
+<<<
+size: 1979
+location: clients/tests/test-client.py:1082:test_004()/652
+cmd: $NMCLI --mode multiline --color yes -f COMMON device wifi list
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 1792 bytes
+>>>
 IN-USE:                                  
 SSID:                                   wlan0-ap-2
 MODE:                                   Infrastruktura
@@ -33599,7 +34097,7 @@ CHAN:                                   1
 RATE:                                   54 Mb/s
 SIGNAL:                                 81
 BARS:                                   ****
-SECURITY:                               WPA1 WPA2
+SECURITY:                               WPA1
 IN-USE:                                  
 SSID:                                   wlan0-ap-3
 MODE:                                   Infrastruktura
@@ -33607,35 +34105,26 @@ CHAN:                                   1
 RATE:                                   54 Mb/s
 SIGNAL:                                 55
 BARS:                                   **  
-SECURITY:                               WPA1 WPA2
+SECURITY:                               WPA3
 
-<<<
-size: 4621
-location: clients/tests/test-client.py:1071:test_004()/653
-cmd: $NMCLI --mode multiline --color yes -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list
-lang: C
-returncode: 0
-stdout: 4334 bytes
->>>
-NAME:                                   AP[1]
+IN-USE:                                  
 SSID:                                   wlan1-ap-4
-SSID-HEX:                               776C616E312D61702D34
-BSSID:                                  94:2B:E8:F6:D2:86
-MODE:                                   Infra
+MODE:                                   Infrastruktura
 CHAN:                                   1
-FREQ:                                   2412 MHz
-RATE:                                   54 Mbit/s
+RATE:                                   54 Mb/s
 SIGNAL:                                 48
 BARS:                                   **  
 SECURITY:                               WPA1 WPA2
-WPA-FLAGS:                              pair_tkip pair_ccmp group_tkip group_ccmp psk
-RSN-FLAGS:                              pair_tkip pair_ccmp group_tkip group_ccmp psk
-DEVICE:                                 wlan1
-ACTIVE:                                 no
-IN-USE:                                  
-DBUS-PATH:                              /org/freedesktop/NetworkManager/AccessPoint/4
 
 
+<<<
+size: 4533
+location: clients/tests/test-client.py:1085:test_004()/653
+cmd: $NMCLI --mode multiline --color yes -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list
+lang: C
+returncode: 0
+stdout: 4246 bytes
+>>>
 NAME:                                   AP[1]
 SSID:                                   wlan0-ap-2
 SSID-HEX:                               776C616E302D61702D32
@@ -33663,9 +34152,9 @@ FREQ:                                   2412 MHz
 RATE:                                   54 Mbit/s
 SIGNAL:                                 81
 BARS:                                   ****
-SECURITY:                               WPA1 WPA2
+SECURITY:                               WPA1
 WPA-FLAGS:                              pair_tkip pair_ccmp group_tkip group_ccmp psk
-RSN-FLAGS:                              pair_tkip pair_ccmp group_tkip group_ccmp psk
+RSN-FLAGS:                              (none)
 DEVICE:                                 wlan0
 ACTIVE:                                 no
 IN-USE:                                  
@@ -33680,41 +34169,41 @@ FREQ:                                   2412 MHz
 RATE:                                   54 Mbit/s
 SIGNAL:                                 55
 BARS:                                   **  
-SECURITY:                               WPA1 WPA2
-WPA-FLAGS:                              pair_tkip pair_ccmp group_tkip group_ccmp psk
-RSN-FLAGS:                              pair_tkip pair_ccmp group_tkip group_ccmp psk
+SECURITY:                               WPA3
+WPA-FLAGS:                              (none)
+RSN-FLAGS:                              pair_tkip pair_ccmp group_tkip group_ccmp sae
 DEVICE:                                 wlan0
 ACTIVE:                                 no
 IN-USE:                                  
 DBUS-PATH:                              /org/freedesktop/NetworkManager/AccessPoint/3
 
-<<<
-size: 4679
-location: clients/tests/test-client.py:1071:test_004()/654
-cmd: $NMCLI --mode multiline --color yes -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list
-lang: pl_PL.UTF-8
-returncode: 0
-stdout: 4382 bytes
->>>
 NAME:                                   AP[1]
 SSID:                                   wlan1-ap-4
 SSID-HEX:                               776C616E312D61702D34
 BSSID:                                  94:2B:E8:F6:D2:86
-MODE:                                   Infrastruktura
+MODE:                                   Infra
 CHAN:                                   1
-FREQ:                                   2412 MHz
-RATE:                                   54 Mb/s
+FREQ:                                   2412 MHz
+RATE:                                   54 Mbit/s
 SIGNAL:                                 48
 BARS:                                   **  
 SECURITY:                               WPA1 WPA2
 WPA-FLAGS:                              pair_tkip pair_ccmp group_tkip group_ccmp psk
 RSN-FLAGS:                              pair_tkip pair_ccmp group_tkip group_ccmp psk
 DEVICE:                                 wlan1
-ACTIVE:                                 nie
+ACTIVE:                                 no
 IN-USE:                                  
 DBUS-PATH:                              /org/freedesktop/NetworkManager/AccessPoint/4
 
 
+<<<
+size: 4591
+location: clients/tests/test-client.py:1085:test_004()/654
+cmd: $NMCLI --mode multiline --color yes -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 4294 bytes
+>>>
 NAME:                                   AP[1]
 SSID:                                   wlan0-ap-2
 SSID-HEX:                               776C616E302D61702D32
@@ -33742,9 +34231,9 @@ FREQ:                                   2412 MHz
 RATE:                                   54 Mb/s
 SIGNAL:                                 81
 BARS:                                   ****
-SECURITY:                               WPA1 WPA2
+SECURITY:                               WPA1
 WPA-FLAGS:                              pair_tkip pair_ccmp group_tkip group_ccmp psk
-RSN-FLAGS:                              pair_tkip pair_ccmp group_tkip group_ccmp psk
+RSN-FLAGS:                              (brak)
 DEVICE:                                 wlan0
 ACTIVE:                                 nie
 IN-USE:                                  
@@ -33759,21 +34248,40 @@ FREQ:                                   2412 MHz
 RATE:                                   54 Mb/s
 SIGNAL:                                 55
 BARS:                                   **  
+SECURITY:                               WPA3
+WPA-FLAGS:                              (brak)
+RSN-FLAGS:                              pair_tkip pair_ccmp group_tkip group_ccmp sae
+DEVICE:                                 wlan0
+ACTIVE:                                 nie
+IN-USE:                                  
+DBUS-PATH:                              /org/freedesktop/NetworkManager/AccessPoint/3
+
+NAME:                                   AP[1]
+SSID:                                   wlan1-ap-4
+SSID-HEX:                               776C616E312D61702D34
+BSSID:                                  94:2B:E8:F6:D2:86
+MODE:                                   Infrastruktura
+CHAN:                                   1
+FREQ:                                   2412 MHz
+RATE:                                   54 Mb/s
+SIGNAL:                                 48
+BARS:                                   **  
 SECURITY:                               WPA1 WPA2
 WPA-FLAGS:                              pair_tkip pair_ccmp group_tkip group_ccmp psk
 RSN-FLAGS:                              pair_tkip pair_ccmp group_tkip group_ccmp psk
-DEVICE:                                 wlan0
+DEVICE:                                 wlan1
 ACTIVE:                                 nie
 IN-USE:                                  
-DBUS-PATH:                              /org/freedesktop/NetworkManager/AccessPoint/3
+DBUS-PATH:                              /org/freedesktop/NetworkManager/AccessPoint/4
+
 
 <<<
-size: 1281
-location: clients/tests/test-client.py:1073:test_004()/655
+size: 1283
+location: clients/tests/test-client.py:1087:test_004()/655
 cmd: $NMCLI --mode multiline --color yes -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: C
 returncode: 0
-stdout: 1083 bytes
+stdout: 1085 bytes
 >>>
 NAME:                                   AP[1]
 SSID:                                   wlan0-ap-2
@@ -33793,13 +34301,15 @@ ACTIVE:                                 no
 IN-USE:                                  
 DBUS-PATH:                              /org/freedesktop/NetworkManager/AccessPoint/2
 
+
+
 <<<
-size: 1303
-location: clients/tests/test-client.py:1073:test_004()/656
+size: 1305
+location: clients/tests/test-client.py:1087:test_004()/656
 cmd: $NMCLI --mode multiline --color yes -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 1095 bytes
+stdout: 1097 bytes
 >>>
 NAME:                                   AP[1]
 SSID:                                   wlan0-ap-2
@@ -33819,13 +34329,15 @@ ACTIVE:                                 nie
 IN-USE:                                  
 DBUS-PATH:                              /org/freedesktop/NetworkManager/AccessPoint/2
 
+
+
 <<<
-size: 641
-location: clients/tests/test-client.py:1075:test_004()/657
+size: 643
+location: clients/tests/test-client.py:1089:test_004()/657
 cmd: $NMCLI --mode multiline --color yes -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: C
 returncode: 0
-stdout: 441 bytes
+stdout: 443 bytes
 >>>
 IN-USE:                                  
 SSID:                                   wlan0-ap-2
@@ -33836,13 +34348,15 @@ SIGNAL:                                 92
 BARS:                                   ****
 SECURITY:                               WPA1 WPA2
 
+
+
 <<<
-size: 660
-location: clients/tests/test-client.py:1075:test_004()/658
+size: 662
+location: clients/tests/test-client.py:1089:test_004()/658
 cmd: $NMCLI --mode multiline --color yes -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 450 bytes
+stdout: 452 bytes
 >>>
 IN-USE:                                  
 SSID:                                   wlan0-ap-2
@@ -33853,13 +34367,15 @@ SIGNAL:                                 92
 BARS:                                   ****
 SECURITY:                               WPA1 WPA2
 
+
+
 <<<
-size: 1394
-location: clients/tests/test-client.py:1078:test_004()/659
+size: 1396
+location: clients/tests/test-client.py:1092:test_004()/659
 cmd: $NMCLI --mode multiline --color yes -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: C
 returncode: 0
-stdout: 1083 bytes
+stdout: 1085 bytes
 >>>
 NAME:                                   AP[1]
 SSID:                                   wlan0-ap-2
@@ -33879,13 +34395,15 @@ ACTIVE:                                 no
 IN-USE:                                  
 DBUS-PATH:                              /org/freedesktop/NetworkManager/AccessPoint/2
 
+
+
 <<<
-size: 1416
-location: clients/tests/test-client.py:1078:test_004()/660
+size: 1418
+location: clients/tests/test-client.py:1092:test_004()/660
 cmd: $NMCLI --mode multiline --color yes -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 1095 bytes
+stdout: 1097 bytes
 >>>
 NAME:                                   AP[1]
 SSID:                                   wlan0-ap-2
@@ -33905,13 +34423,15 @@ ACTIVE:                                 nie
 IN-USE:                                  
 DBUS-PATH:                              /org/freedesktop/NetworkManager/AccessPoint/2
 
+
+
 <<<
-size: 5002
-location: clients/tests/test-client.py:1080:test_004()/661
+size: 5096
+location: clients/tests/test-client.py:1094:test_004()/661
 cmd: $NMCLI --mode multiline --color yes -f ALL device show wlan0
 lang: C
 returncode: 0
-stdout: 4827 bytes
+stdout: 4921 bytes
 >>>
 GENERAL.DEVICE:                         wlan0
 GENERAL.TYPE:                           wifi
@@ -33925,6 +34445,8 @@ GENERAL.HWADDR:                         13:E0:74:85:7C:D9
 GENERAL.MTU:                            0
 GENERAL.STATE:                          20 (unavailable)
 GENERAL.REASON:                         0 (No reason given)
+GENERAL.IP4-CONNECTIVITY:               0 (unknown)
+GENERAL.IP6-CONNECTIVITY:               0 (unknown)
 GENERAL.UDI:                            /sys/devices/virtual/wlan0
 GENERAL.IP-IFACE:                       --
 GENERAL.IS-SOFTWARE:                    no
@@ -33965,7 +34487,7 @@ AP[2].CHAN:                             1
 AP[2].RATE:                             54 Mbit/s
 AP[2].SIGNAL:                           81
 AP[2].BARS:                             ****
-AP[2].SECURITY:                         WPA1 WPA2
+AP[2].SECURITY:                         WPA1
 AP[3].IN-USE:                            
 AP[3].SSID:                             wlan0-ap-3
 AP[3].MODE:                             Infra
@@ -33973,7 +34495,7 @@ AP[3].CHAN:                             1
 AP[3].RATE:                             54 Mbit/s
 AP[3].SIGNAL:                           55
 AP[3].BARS:                             **  
-AP[3].SECURITY:                         WPA1 WPA2
+AP[3].SECURITY:                         WPA3
 IP4.ADDRESS[1]:                         192.168.228.18/32
 IP4.ADDRESS[2]:                         192.168.209.179/25
 IP4.GATEWAY:                            192.168.41.120
@@ -34004,12 +34526,12 @@ CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings
 CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 
 <<<
-size: 5055
-location: clients/tests/test-client.py:1080:test_004()/662
+size: 5151
+location: clients/tests/test-client.py:1094:test_004()/662
 cmd: $NMCLI --mode multiline --color yes -f ALL device show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 4870 bytes
+stdout: 4966 bytes
 >>>
 GENERAL.DEVICE:                         wlan0
 GENERAL.TYPE:                           wifi
@@ -34023,6 +34545,8 @@ GENERAL.HWADDR:                         13:E0:74:85:7C:D9
 GENERAL.MTU:                            0
 GENERAL.STATE:                          20 (niedostępne)
 GENERAL.REASON:                         0 (Nie podano przyczyny)
+GENERAL.IP4-CONNECTIVITY:               0 (nieznane)
+GENERAL.IP6-CONNECTIVITY:               0 (nieznane)
 GENERAL.UDI:                            /sys/devices/virtual/wlan0
 GENERAL.IP-IFACE:                       --
 GENERAL.IS-SOFTWARE:                    nie
@@ -34063,7 +34587,7 @@ AP[2].CHAN:                             1
 AP[2].RATE:                             54 Mb/s
 AP[2].SIGNAL:                           81
 AP[2].BARS:                             ****
-AP[2].SECURITY:                         WPA1 WPA2
+AP[2].SECURITY:                         WPA1
 AP[3].IN-USE:                            
 AP[3].SSID:                             wlan0-ap-3
 AP[3].MODE:                             Infrastruktura
@@ -34071,7 +34595,7 @@ AP[3].CHAN:                             1
 AP[3].RATE:                             54 Mb/s
 AP[3].SIGNAL:                           55
 AP[3].BARS:                             **  
-AP[3].SECURITY:                         WPA1 WPA2
+AP[3].SECURITY:                         WPA3
 IP4.ADDRESS[1]:                         192.168.228.18/32
 IP4.ADDRESS[2]:                         192.168.209.179/25
 IP4.GATEWAY:                            192.168.41.120
@@ -34103,7 +34627,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | c
 
 <<<
 size: 1541
-location: clients/tests/test-client.py:1082:test_004()/663
+location: clients/tests/test-client.py:1096:test_004()/663
 cmd: $NMCLI --mode multiline --color yes -f COMMON device show wlan0
 lang: C
 returncode: 0
@@ -34136,7 +34660,7 @@ IP6.DOMAIN[6]:                          sear6.foo4.bar
 
 <<<
 size: 1552
-location: clients/tests/test-client.py:1082:test_004()/664
+location: clients/tests/test-client.py:1096:test_004()/664
 cmd: $NMCLI --mode multiline --color yes -f COMMON device show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
@@ -34168,12 +34692,12 @@ IP6.DOMAIN[5]:                          sear6.foo3.bar
 IP6.DOMAIN[6]:                          sear6.foo4.bar
 
 <<<
-size: 5140
-location: clients/tests/test-client.py:1084:test_004()/665
+size: 5234
+location: clients/tests/test-client.py:1098:test_004()/665
 cmd: $NMCLI --mode multiline --color yes -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0
 lang: C
 returncode: 0
-stdout: 4827 bytes
+stdout: 4921 bytes
 >>>
 GENERAL.DEVICE:                         wlan0
 GENERAL.TYPE:                           wifi
@@ -34187,6 +34711,8 @@ GENERAL.HWADDR:                         13:E0:74:85:7C:D9
 GENERAL.MTU:                            0
 GENERAL.STATE:                          20 (unavailable)
 GENERAL.REASON:                         0 (No reason given)
+GENERAL.IP4-CONNECTIVITY:               0 (unknown)
+GENERAL.IP6-CONNECTIVITY:               0 (unknown)
 GENERAL.UDI:                            /sys/devices/virtual/wlan0
 GENERAL.IP-IFACE:                       --
 GENERAL.IS-SOFTWARE:                    no
@@ -34227,7 +34753,7 @@ AP[2].CHAN:                             1
 AP[2].RATE:                             54 Mbit/s
 AP[2].SIGNAL:                           81
 AP[2].BARS:                             ****
-AP[2].SECURITY:                         WPA1 WPA2
+AP[2].SECURITY:                         WPA1
 AP[3].IN-USE:                            
 AP[3].SSID:                             wlan0-ap-3
 AP[3].MODE:                             Infra
@@ -34235,7 +34761,7 @@ AP[3].CHAN:                             1
 AP[3].RATE:                             54 Mbit/s
 AP[3].SIGNAL:                           55
 AP[3].BARS:                             **  
-AP[3].SECURITY:                         WPA1 WPA2
+AP[3].SECURITY:                         WPA3
 IP4.ADDRESS[1]:                         192.168.228.18/32
 IP4.ADDRESS[2]:                         192.168.209.179/25
 IP4.GATEWAY:                            192.168.41.120
@@ -34266,12 +34792,12 @@ CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings
 CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 
 <<<
-size: 5193
-location: clients/tests/test-client.py:1084:test_004()/666
+size: 5289
+location: clients/tests/test-client.py:1098:test_004()/666
 cmd: $NMCLI --mode multiline --color yes -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 4870 bytes
+stdout: 4966 bytes
 >>>
 GENERAL.DEVICE:                         wlan0
 GENERAL.TYPE:                           wifi
@@ -34285,6 +34811,8 @@ GENERAL.HWADDR:                         13:E0:74:85:7C:D9
 GENERAL.MTU:                            0
 GENERAL.STATE:                          20 (niedostępne)
 GENERAL.REASON:                         0 (Nie podano przyczyny)
+GENERAL.IP4-CONNECTIVITY:               0 (nieznane)
+GENERAL.IP6-CONNECTIVITY:               0 (nieznane)
 GENERAL.UDI:                            /sys/devices/virtual/wlan0
 GENERAL.IP-IFACE:                       --
 GENERAL.IS-SOFTWARE:                    nie
@@ -34325,7 +34853,7 @@ AP[2].CHAN:                             1
 AP[2].RATE:                             54 Mb/s
 AP[2].SIGNAL:                           81
 AP[2].BARS:                             ****
-AP[2].SECURITY:                         WPA1 WPA2
+AP[2].SECURITY:                         WPA1
 AP[3].IN-USE:                            
 AP[3].SSID:                             wlan0-ap-3
 AP[3].MODE:                             Infrastruktura
@@ -34333,7 +34861,7 @@ AP[3].CHAN:                             1
 AP[3].RATE:                             54 Mb/s
 AP[3].SIGNAL:                           55
 AP[3].BARS:                             **  
-AP[3].SECURITY:                         WPA1 WPA2
+AP[3].SECURITY:                         WPA3
 IP4.ADDRESS[1]:                         192.168.228.18/32
 IP4.ADDRESS[2]:                         192.168.209.179/25
 IP4.GATEWAY:                            192.168.41.120
@@ -34365,7 +34893,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | c
 
 <<<
 size: 5642
-location: clients/tests/test-client.py:1022:test_004()/667
+location: clients/tests/test-client.py:1036:test_004()/667
 cmd: $NMCLI --mode multiline --pretty con s con-vpn-1
 lang: C
 returncode: 0
@@ -34479,12 +35007,12 @@ VPN.CFG[3]:                             key3 = val3
 -------------------------------------------------------------------------------
 
 <<<
-size: 5682
-location: clients/tests/test-client.py:1022:test_004()/668
+size: 5684
+location: clients/tests/test-client.py:1036:test_004()/668
 cmd: $NMCLI --mode multiline --pretty con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 5509 bytes
+stdout: 5511 bytes
 >>>
 ===============================================================================
                    Szczegóły profilu połączenia (con-vpn-1)
@@ -34587,7 +35115,7 @@ VPN.TYPE:                               openvpn
 VPN.USERNAME:                           --
 VPN.GATEWAY:                            --
 VPN.BANNER:                             *** VPN connection con-vpn-1 ***
-VPN.VPN-STATE:                          5 - Połączono z VPN
+VPN.VPN-STATE:                          5 — Połączono z VPN
 VPN.CFG[1]:                             key1 = val1
 VPN.CFG[2]:                             key2 = val2
 VPN.CFG[3]:                             key3 = val3
@@ -34595,7 +35123,7 @@ VPN.CFG[3]:                             key3 = val3
 
 <<<
 size: 5642
-location: clients/tests/test-client.py:1024:test_004()/669
+location: clients/tests/test-client.py:1038:test_004()/669
 cmd: $NMCLI --mode multiline --pretty con s con-vpn-1
 lang: C
 returncode: 0
@@ -34709,12 +35237,12 @@ VPN.CFG[3]:                             key3 = val3
 -------------------------------------------------------------------------------
 
 <<<
-size: 5682
-location: clients/tests/test-client.py:1024:test_004()/670
+size: 5684
+location: clients/tests/test-client.py:1038:test_004()/670
 cmd: $NMCLI --mode multiline --pretty con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 5509 bytes
+stdout: 5511 bytes
 >>>
 ===============================================================================
                    Szczegóły profilu połączenia (con-vpn-1)
@@ -34817,7 +35345,7 @@ VPN.TYPE:                               openvpn
 VPN.USERNAME:                           --
 VPN.GATEWAY:                            --
 VPN.BANNER:                             *** VPN connection con-vpn-1 ***
-VPN.VPN-STATE:                          5 - Połączono z VPN
+VPN.VPN-STATE:                          5 — Połączono z VPN
 VPN.CFG[1]:                             key1 = val1
 VPN.CFG[2]:                             key2 = val2
 VPN.CFG[3]:                             key3 = val3
@@ -34825,7 +35353,7 @@ VPN.CFG[3]:                             key3 = val3
 
 <<<
 size: 4168
-location: clients/tests/test-client.py:1027:test_004()/671
+location: clients/tests/test-client.py:1041:test_004()/671
 cmd: $NMCLI --mode multiline --pretty -f ALL con s con-vpn-1
 lang: C
 returncode: 0
@@ -34915,7 +35443,7 @@ proxy.pac-script:                       --
 
 <<<
 size: 4193
-location: clients/tests/test-client.py:1027:test_004()/672
+location: clients/tests/test-client.py:1041:test_004()/672
 cmd: $NMCLI --mode multiline --pretty -f ALL con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
@@ -35005,7 +35533,7 @@ proxy.pac-script:                       --
 
 <<<
 size: 802
-location: clients/tests/test-client.py:1033:test_004()/673
+location: clients/tests/test-client.py:1047:test_004()/673
 cmd: $NMCLI --mode multiline --pretty -f VPN con s con-vpn-1
 lang: C
 returncode: 0
@@ -35024,7 +35552,7 @@ vpn.timeout:                            0
 
 <<<
 size: 818
-location: clients/tests/test-client.py:1033:test_004()/674
+location: clients/tests/test-client.py:1047:test_004()/674
 cmd: $NMCLI --mode multiline --pretty -f VPN con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
@@ -35043,7 +35571,7 @@ vpn.timeout:                            0
 
 <<<
 size: 1153
-location: clients/tests/test-client.py:1036:test_004()/675
+location: clients/tests/test-client.py:1050:test_004()/675
 cmd: $NMCLI --mode multiline --pretty -f GENERAL con s con-vpn-1
 lang: C
 returncode: 0
@@ -35068,7 +35596,7 @@ GENERAL.MASTER-PATH:                    --
 
 <<<
 size: 1173
-location: clients/tests/test-client.py:1036:test_004()/676
+location: clients/tests/test-client.py:1050:test_004()/676
 cmd: $NMCLI --mode multiline --pretty -f GENERAL con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
@@ -35093,7 +35621,7 @@ GENERAL.MASTER-PATH:                    --
 
 <<<
 size: 1705
-location: clients/tests/test-client.py:1039:test_004()/677
+location: clients/tests/test-client.py:1053:test_004()/677
 cmd: $NMCLI --mode multiline --pretty dev s
 lang: C
 returncode: 0
@@ -35102,6 +35630,11 @@ stdout: 1552 bytes
 ===============================================================================
                                Status of devices
 ===============================================================================
+DEVICE:                                 wlan0
+TYPE:                                   wifi
+STATE:                                  unavailable
+CONNECTION:                             con-vpn-1
+-------------------------------------------------------------------------------
 DEVICE:                                 eth0
 TYPE:                                   ethernet
 STATE:                                  unavailable
@@ -35122,15 +35655,10 @@ TYPE:                                   wifi
 STATE:                                  unavailable
 CONNECTION:                             --
 -------------------------------------------------------------------------------
-DEVICE:                                 wlan0
-TYPE:                                   wifi
-STATE:                                  unavailable
-CONNECTION:                             con-vpn-1
--------------------------------------------------------------------------------
 
 <<<
 size: 1720
-location: clients/tests/test-client.py:1039:test_004()/678
+location: clients/tests/test-client.py:1053:test_004()/678
 cmd: $NMCLI --mode multiline --pretty dev s
 lang: pl_PL.UTF-8
 returncode: 0
@@ -35139,6 +35667,11 @@ stdout: 1557 bytes
 ===============================================================================
                                 Stan urządzenia
 ===============================================================================
+DEVICE:                                 wlan0
+TYPE:                                   wifi
+STATE:                                  niedostępne
+CONNECTION:                             con-vpn-1
+-------------------------------------------------------------------------------
 DEVICE:                                 eth0
 TYPE:                                   ethernet
 STATE:                                  niedostępne
@@ -35159,26 +35692,33 @@ TYPE:                                   wifi
 STATE:                                  niedostępne
 CONNECTION:                             --
 -------------------------------------------------------------------------------
-DEVICE:                                 wlan0
-TYPE:                                   wifi
-STATE:                                  niedostępne
-CONNECTION:                             con-vpn-1
--------------------------------------------------------------------------------
 
 <<<
-size: 2639
-location: clients/tests/test-client.py:1042:test_004()/679
+size: 3119
+location: clients/tests/test-client.py:1056:test_004()/679
 cmd: $NMCLI --mode multiline --pretty -f all dev status
 lang: C
 returncode: 0
-stdout: 2474 bytes
+stdout: 2954 bytes
 >>>
 ===============================================================================
                                Status of devices
 ===============================================================================
+DEVICE:                                 wlan0
+TYPE:                                   wifi
+STATE:                                  unavailable
+IP4-CONNECTIVITY:                       unknown
+IP6-CONNECTIVITY:                       unknown
+DBUS-PATH:                              /org/freedesktop/NetworkManager/Devices/3
+CONNECTION:                             con-vpn-1
+CON-UUID:                               UUID-con-vpn-1-REPLACED-REPLACED-REP
+CON-PATH:                               /org/freedesktop/NetworkManager/ActiveConnection/2
+-------------------------------------------------------------------------------
 DEVICE:                                 eth0
 TYPE:                                   ethernet
 STATE:                                  unavailable
+IP4-CONNECTIVITY:                       unknown
+IP6-CONNECTIVITY:                       unknown
 DBUS-PATH:                              /org/freedesktop/NetworkManager/Devices/1
 CONNECTION:                             --
 CON-UUID:                               --
@@ -35187,6 +35727,8 @@ CON-PATH:                               --
 DEVICE:                                 eth1
 TYPE:                                   ethernet
 STATE:                                  unavailable
+IP4-CONNECTIVITY:                       unknown
+IP6-CONNECTIVITY:                       unknown
 DBUS-PATH:                              /org/freedesktop/NetworkManager/Devices/2
 CONNECTION:                             --
 CON-UUID:                               --
@@ -35195,6 +35737,8 @@ CON-PATH:                               --
 DEVICE:                                 wlan1
 TYPE:                                   wifi
 STATE:                                  unavailable
+IP4-CONNECTIVITY:                       unknown
+IP6-CONNECTIVITY:                       unknown
 DBUS-PATH:                              /org/freedesktop/NetworkManager/Devices/4
 CONNECTION:                             --
 CON-UUID:                               --
@@ -35203,34 +35747,40 @@ CON-PATH:                               --
 DEVICE:                                 wlan1
 TYPE:                                   wifi
 STATE:                                  unavailable
+IP4-CONNECTIVITY:                       unknown
+IP6-CONNECTIVITY:                       unknown
 DBUS-PATH:                              /org/freedesktop/NetworkManager/Devices/5
 CONNECTION:                             --
 CON-UUID:                               --
 CON-PATH:                               --
 -------------------------------------------------------------------------------
-DEVICE:                                 wlan0
-TYPE:                                   wifi
-STATE:                                  unavailable
-DBUS-PATH:                              /org/freedesktop/NetworkManager/Devices/3
-CONNECTION:                             con-vpn-1
-CON-UUID:                               UUID-con-vpn-1-REPLACED-REPLACED-REP
-CON-PATH:                               /org/freedesktop/NetworkManager/ActiveConnection/2
--------------------------------------------------------------------------------
 
 <<<
-size: 2654
-location: clients/tests/test-client.py:1042:test_004()/680
+size: 3144
+location: clients/tests/test-client.py:1056:test_004()/680
 cmd: $NMCLI --mode multiline --pretty -f all dev status
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2479 bytes
+stdout: 2969 bytes
 >>>
 ===============================================================================
                                 Stan urządzenia
 ===============================================================================
+DEVICE:                                 wlan0
+TYPE:                                   wifi
+STATE:                                  niedostępne
+IP4-CONNECTIVITY:                       nieznane
+IP6-CONNECTIVITY:                       nieznane
+DBUS-PATH:                              /org/freedesktop/NetworkManager/Devices/3
+CONNECTION:                             con-vpn-1
+CON-UUID:                               UUID-con-vpn-1-REPLACED-REPLACED-REP
+CON-PATH:                               /org/freedesktop/NetworkManager/ActiveConnection/2
+-------------------------------------------------------------------------------
 DEVICE:                                 eth0
 TYPE:                                   ethernet
 STATE:                                  niedostępne
+IP4-CONNECTIVITY:                       nieznane
+IP6-CONNECTIVITY:                       nieznane
 DBUS-PATH:                              /org/freedesktop/NetworkManager/Devices/1
 CONNECTION:                             --
 CON-UUID:                               --
@@ -35239,6 +35789,8 @@ CON-PATH:                               --
 DEVICE:                                 eth1
 TYPE:                                   ethernet
 STATE:                                  niedostępne
+IP4-CONNECTIVITY:                       nieznane
+IP6-CONNECTIVITY:                       nieznane
 DBUS-PATH:                              /org/freedesktop/NetworkManager/Devices/2
 CONNECTION:                             --
 CON-UUID:                               --
@@ -35247,6 +35799,8 @@ CON-PATH:                               --
 DEVICE:                                 wlan1
 TYPE:                                   wifi
 STATE:                                  niedostępne
+IP4-CONNECTIVITY:                       nieznane
+IP6-CONNECTIVITY:                       nieznane
 DBUS-PATH:                              /org/freedesktop/NetworkManager/Devices/4
 CONNECTION:                             --
 CON-UUID:                               --
@@ -35255,28 +35809,59 @@ CON-PATH:                               --
 DEVICE:                                 wlan1
 TYPE:                                   wifi
 STATE:                                  niedostępne
+IP4-CONNECTIVITY:                       nieznane
+IP6-CONNECTIVITY:                       nieznane
 DBUS-PATH:                              /org/freedesktop/NetworkManager/Devices/5
 CONNECTION:                             --
 CON-UUID:                               --
 CON-PATH:                               --
 -------------------------------------------------------------------------------
-DEVICE:                                 wlan0
-TYPE:                                   wifi
-STATE:                                  niedostępne
-DBUS-PATH:                              /org/freedesktop/NetworkManager/Devices/3
-CONNECTION:                             con-vpn-1
-CON-UUID:                               UUID-con-vpn-1-REPLACED-REPLACED-REP
-CON-PATH:                               /org/freedesktop/NetworkManager/ActiveConnection/2
--------------------------------------------------------------------------------
 
 <<<
 size: 12890
-location: clients/tests/test-client.py:1045:test_004()/681
+location: clients/tests/test-client.py:1059:test_004()/681
 cmd: $NMCLI --mode multiline --pretty dev show
 lang: C
 returncode: 0
 stdout: 12733 bytes
 >>>
+===============================================================================
+                            Device details (wlan0)
+===============================================================================
+GENERAL.DEVICE:                         wlan0
+-------------------------------------------------------------------------------
+GENERAL.TYPE:                           wifi
+-------------------------------------------------------------------------------
+GENERAL.HWADDR:                         13:E0:74:85:7C:D9
+-------------------------------------------------------------------------------
+GENERAL.MTU:                            0
+-------------------------------------------------------------------------------
+GENERAL.STATE:                          20 (unavailable)
+-------------------------------------------------------------------------------
+GENERAL.CONNECTION:                     con-vpn-1
+-------------------------------------------------------------------------------
+GENERAL.CON-PATH:                       /org/freedesktop/NetworkManager/ActiveConnection/2
+-------------------------------------------------------------------------------
+IP4.ADDRESS[1]:                         192.168.228.18/32
+IP4.ADDRESS[2]:                         192.168.209.179/25
+IP4.GATEWAY:                            192.168.41.120
+IP4.DOMAIN[1]:                          sear4.foo2.bar
+IP4.DOMAIN[2]:                          sear4.fo.x.y
+IP4.DOMAIN[3]:                          sear4.foo1.bar
+IP4.DOMAIN[4]:                          sear4.foo4.bar
+IP4.DOMAIN[5]:                          sear4.fo.o.bar
+IP4.WINS[1]:                            192.168.120.79
+-------------------------------------------------------------------------------
+IP6.GATEWAY:                            --
+IP6.ROUTE[1]:                           dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086
+IP6.DOMAIN[1]:                          sear6.foo2.bar
+IP6.DOMAIN[2]:                          sear6.foo1.bar
+IP6.DOMAIN[3]:                          sear6.fo.x.y
+IP6.DOMAIN[4]:                          sear6.fo.o.bar
+IP6.DOMAIN[5]:                          sear6.foo3.bar
+IP6.DOMAIN[6]:                          sear6.foo4.bar
+-------------------------------------------------------------------------------
+
 ===============================================================================
                              Device details (eth0)
 ===============================================================================
@@ -35440,8 +36025,16 @@ IP6.DNS[1]:                             2001:a::2934:bd66:550d:ec19
 IP6.DOMAIN[1]:                          sear6.fo.x.y
 -------------------------------------------------------------------------------
 
+<<<
+size: 12954
+location: clients/tests/test-client.py:1059:test_004()/682
+cmd: $NMCLI --mode multiline --pretty dev show
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 12787 bytes
+>>>
 ===============================================================================
-                            Device details (wlan0)
+                        Informacje o urządzeniu (wlan0)
 ===============================================================================
 GENERAL.DEVICE:                         wlan0
 -------------------------------------------------------------------------------
@@ -35451,7 +36044,7 @@ GENERAL.HWADDR:                         13:E0:74:85:7C:D9
 -------------------------------------------------------------------------------
 GENERAL.MTU:                            0
 -------------------------------------------------------------------------------
-GENERAL.STATE:                          20 (unavailable)
+GENERAL.STATE:                          20 (niedostępne)
 -------------------------------------------------------------------------------
 GENERAL.CONNECTION:                     con-vpn-1
 -------------------------------------------------------------------------------
@@ -35477,14 +36070,6 @@ IP6.DOMAIN[5]:                          sear6.foo3.bar
 IP6.DOMAIN[6]:                          sear6.foo4.bar
 -------------------------------------------------------------------------------
 
-<<<
-size: 12954
-location: clients/tests/test-client.py:1045:test_004()/682
-cmd: $NMCLI --mode multiline --pretty dev show
-lang: pl_PL.UTF-8
-returncode: 0
-stdout: 12787 bytes
->>>
 ===============================================================================
                         Informacje o urządzeniu (eth0)
 ===============================================================================
@@ -35648,22 +36233,85 @@ IP6.DNS[1]:                             2001:a::2934:bd66:550d:ec19
 IP6.DOMAIN[1]:                          sear6.fo.x.y
 -------------------------------------------------------------------------------
 
+<<<
+size: 25262
+location: clients/tests/test-client.py:1062:test_004()/683
+cmd: $NMCLI --mode multiline --pretty -f all dev show
+lang: C
+returncode: 0
+stdout: 25098 bytes
+>>>
 ===============================================================================
-                        Informacje o urządzeniu (wlan0)
+                            Device details (wlan0)
 ===============================================================================
 GENERAL.DEVICE:                         wlan0
--------------------------------------------------------------------------------
 GENERAL.TYPE:                           wifi
--------------------------------------------------------------------------------
+GENERAL.NM-TYPE:                        NMDeviceWifi
+GENERAL.VENDOR:                         --
+GENERAL.PRODUCT:                        --
+GENERAL.DRIVER:                         virtual
+GENERAL.DRIVER-VERSION:                 --
+GENERAL.FIRMWARE-VERSION:               --
 GENERAL.HWADDR:                         13:E0:74:85:7C:D9
--------------------------------------------------------------------------------
 GENERAL.MTU:                            0
+GENERAL.STATE:                          20 (unavailable)
+GENERAL.REASON:                         0 (No reason given)
+GENERAL.IP4-CONNECTIVITY:               0 (unknown)
+GENERAL.IP6-CONNECTIVITY:               0 (unknown)
+GENERAL.UDI:                            /sys/devices/virtual/wlan0
+GENERAL.IP-IFACE:                       --
+GENERAL.IS-SOFTWARE:                    no
+GENERAL.NM-MANAGED:                     yes
+GENERAL.AUTOCONNECT:                    yes
+GENERAL.FIRMWARE-MISSING:               no
+GENERAL.NM-PLUGIN-MISSING:              no
+GENERAL.PHYS-PORT-ID:                   --
+GENERAL.CONNECTION:                     con-vpn-1
+GENERAL.CON-UUID:                       UUID-con-vpn-1-REPLACED-REPLACED-REP
+GENERAL.CON-PATH:                       /org/freedesktop/NetworkManager/ActiveConnection/2
+GENERAL.METERED:                        unknown
 -------------------------------------------------------------------------------
-GENERAL.STATE:                          20 (niedostępne)
+CAPABILITIES.CARRIER-DETECT:            no
+CAPABILITIES.SPEED:                     unknown
+CAPABILITIES.IS-SOFTWARE:               no
+CAPABILITIES.SRIOV:                     no
 -------------------------------------------------------------------------------
-GENERAL.CONNECTION:                     con-vpn-1
+WIFI-PROPERTIES.WEP:                    yes
+WIFI-PROPERTIES.WPA:                    yes
+WIFI-PROPERTIES.WPA2:                   yes
+WIFI-PROPERTIES.TKIP:                   yes
+WIFI-PROPERTIES.CCMP:                   yes
+WIFI-PROPERTIES.AP:                     yes
+WIFI-PROPERTIES.ADHOC:                  yes
+WIFI-PROPERTIES.2GHZ:                   unknown
+WIFI-PROPERTIES.5GHZ:                   unknown
 -------------------------------------------------------------------------------
-GENERAL.CON-PATH:                       /org/freedesktop/NetworkManager/ActiveConnection/2
+AP[1].IN-USE:                            
+AP[1].SSID:                             wlan0-ap-2
+AP[1].MODE:                             Infra
+AP[1].CHAN:                             1
+AP[1].RATE:                             54 Mbit/s
+AP[1].SIGNAL:                           92
+AP[1].BARS:                             ****
+AP[1].SECURITY:                         WPA1 WPA2
+-------------------------------------------------------------------------------
+AP[2].IN-USE:                            
+AP[2].SSID:                             wlan0-ap-1
+AP[2].MODE:                             Infra
+AP[2].CHAN:                             1
+AP[2].RATE:                             54 Mbit/s
+AP[2].SIGNAL:                           81
+AP[2].BARS:                             ****
+AP[2].SECURITY:                         WPA1
+-------------------------------------------------------------------------------
+AP[3].IN-USE:                            
+AP[3].SSID:                             wlan0-ap-3
+AP[3].MODE:                             Infra
+AP[3].CHAN:                             1
+AP[3].RATE:                             54 Mbit/s
+AP[3].SIGNAL:                           55
+AP[3].BARS:                             **  
+AP[3].SECURITY:                         WPA3
 -------------------------------------------------------------------------------
 IP4.ADDRESS[1]:                         192.168.228.18/32
 IP4.ADDRESS[2]:                         192.168.209.179/25
@@ -35675,6 +36323,11 @@ IP4.DOMAIN[4]:                          sear4.foo4.bar
 IP4.DOMAIN[5]:                          sear4.fo.o.bar
 IP4.WINS[1]:                            192.168.120.79
 -------------------------------------------------------------------------------
+DHCP4.OPTION[1]:                        dhcp-4-opt-0 = val-0
+DHCP4.OPTION[2]:                        dhcp-4-opt-2 = val-2
+DHCP4.OPTION[3]:                        dhcp-4-opt-4 = val-4
+DHCP4.OPTION[4]:                        dhcp-4-opt-7 = val-7
+-------------------------------------------------------------------------------
 IP6.GATEWAY:                            --
 IP6.ROUTE[1]:                           dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086
 IP6.DOMAIN[1]:                          sear6.foo2.bar
@@ -35684,15 +36337,16 @@ IP6.DOMAIN[4]:                          sear6.fo.o.bar
 IP6.DOMAIN[5]:                          sear6.foo3.bar
 IP6.DOMAIN[6]:                          sear6.foo4.bar
 -------------------------------------------------------------------------------
+DHCP6.OPTION[1]:                        dhcp-6-opt-1 = val-1
+DHCP6.OPTION[2]:                        dhcp-6-opt-2 = val-2
+DHCP6.OPTION[3]:                        dhcp-6-opt-3 = val-3
+DHCP6.OPTION[4]:                        dhcp-6-opt-4 = val-4
+DHCP6.OPTION[5]:                        dhcp-6-opt-5 = val-5
+-------------------------------------------------------------------------------
+CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings/Connection/{2}
+CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
+-------------------------------------------------------------------------------
 
-<<<
-size: 24752
-location: clients/tests/test-client.py:1048:test_004()/683
-cmd: $NMCLI --mode multiline --pretty -f all dev show
-lang: C
-returncode: 0
-stdout: 24588 bytes
->>>
 ===============================================================================
                              Device details (eth0)
 ===============================================================================
@@ -35708,6 +36362,8 @@ GENERAL.HWADDR:                         AB:B7:BF:E2:48:E8
 GENERAL.MTU:                            0
 GENERAL.STATE:                          20 (unavailable)
 GENERAL.REASON:                         0 (No reason given)
+GENERAL.IP4-CONNECTIVITY:               0 (unknown)
+GENERAL.IP6-CONNECTIVITY:               0 (unknown)
 GENERAL.UDI:                            /sys/devices/virtual/eth0
 GENERAL.IP-IFACE:                       --
 GENERAL.IS-SOFTWARE:                    no
@@ -35780,6 +36436,8 @@ GENERAL.HWADDR:                         E7:78:B1:93:2B:22
 GENERAL.MTU:                            0
 GENERAL.STATE:                          20 (unavailable)
 GENERAL.REASON:                         0 (No reason given)
+GENERAL.IP4-CONNECTIVITY:               0 (unknown)
+GENERAL.IP6-CONNECTIVITY:               0 (unknown)
 GENERAL.UDI:                            /sys/devices/virtual/eth1
 GENERAL.IP-IFACE:                       --
 GENERAL.IS-SOFTWARE:                    no
@@ -35859,6 +36517,8 @@ GENERAL.HWADDR:                         21:E9:64:81:8C:A8
 GENERAL.MTU:                            0
 GENERAL.STATE:                          20 (unavailable)
 GENERAL.REASON:                         0 (No reason given)
+GENERAL.IP4-CONNECTIVITY:               0 (unknown)
+GENERAL.IP6-CONNECTIVITY:               0 (unknown)
 GENERAL.UDI:                            /sys/devices/virtual/wlan1
 GENERAL.IP-IFACE:                       --
 GENERAL.IS-SOFTWARE:                    no
@@ -35957,6 +36617,8 @@ GENERAL.HWADDR:                         71:52:AD:63:5C:7C
 GENERAL.MTU:                            0
 GENERAL.STATE:                          20 (unavailable)
 GENERAL.REASON:                         0 (No reason given)
+GENERAL.IP4-CONNECTIVITY:               0 (unknown)
+GENERAL.IP6-CONNECTIVITY:               0 (unknown)
 GENERAL.UDI:                            /sys/devices/virtual/wlan1
 GENERAL.IP-IFACE:                       --
 GENERAL.IS-SOFTWARE:                    no
@@ -36019,8 +36681,16 @@ CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings
 CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 -------------------------------------------------------------------------------
 
+<<<
+size: 25445
+location: clients/tests/test-client.py:1062:test_004()/684
+cmd: $NMCLI --mode multiline --pretty -f all dev show
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 25271 bytes
+>>>
 ===============================================================================
-                            Device details (wlan0)
+                        Informacje o urządzeniu (wlan0)
 ===============================================================================
 GENERAL.DEVICE:                         wlan0
 GENERAL.TYPE:                           wifi
@@ -36032,62 +36702,64 @@ GENERAL.DRIVER-VERSION:                 --
 GENERAL.FIRMWARE-VERSION:               --
 GENERAL.HWADDR:                         13:E0:74:85:7C:D9
 GENERAL.MTU:                            0
-GENERAL.STATE:                          20 (unavailable)
-GENERAL.REASON:                         0 (No reason given)
+GENERAL.STATE:                          20 (niedostępne)
+GENERAL.REASON:                         0 (Nie podano przyczyny)
+GENERAL.IP4-CONNECTIVITY:               0 (nieznane)
+GENERAL.IP6-CONNECTIVITY:               0 (nieznane)
 GENERAL.UDI:                            /sys/devices/virtual/wlan0
 GENERAL.IP-IFACE:                       --
-GENERAL.IS-SOFTWARE:                    no
-GENERAL.NM-MANAGED:                     yes
-GENERAL.AUTOCONNECT:                    yes
-GENERAL.FIRMWARE-MISSING:               no
-GENERAL.NM-PLUGIN-MISSING:              no
+GENERAL.IS-SOFTWARE:                    nie
+GENERAL.NM-MANAGED:                     tak
+GENERAL.AUTOCONNECT:                    tak
+GENERAL.FIRMWARE-MISSING:               nie
+GENERAL.NM-PLUGIN-MISSING:              nie
 GENERAL.PHYS-PORT-ID:                   --
 GENERAL.CONNECTION:                     con-vpn-1
 GENERAL.CON-UUID:                       UUID-con-vpn-1-REPLACED-REPLACED-REP
 GENERAL.CON-PATH:                       /org/freedesktop/NetworkManager/ActiveConnection/2
-GENERAL.METERED:                        unknown
+GENERAL.METERED:                        nieznane
 -------------------------------------------------------------------------------
-CAPABILITIES.CARRIER-DETECT:            no
-CAPABILITIES.SPEED:                     unknown
-CAPABILITIES.IS-SOFTWARE:               no
-CAPABILITIES.SRIOV:                     no
+CAPABILITIES.CARRIER-DETECT:            nie
+CAPABILITIES.SPEED:                     nieznane
+CAPABILITIES.IS-SOFTWARE:               nie
+CAPABILITIES.SRIOV:                     nie
 -------------------------------------------------------------------------------
-WIFI-PROPERTIES.WEP:                    yes
-WIFI-PROPERTIES.WPA:                    yes
-WIFI-PROPERTIES.WPA2:                   yes
-WIFI-PROPERTIES.TKIP:                   yes
-WIFI-PROPERTIES.CCMP:                   yes
-WIFI-PROPERTIES.AP:                     yes
-WIFI-PROPERTIES.ADHOC:                  yes
-WIFI-PROPERTIES.2GHZ:                   unknown
-WIFI-PROPERTIES.5GHZ:                   unknown
+WIFI-PROPERTIES.WEP:                    tak
+WIFI-PROPERTIES.WPA:                    tak
+WIFI-PROPERTIES.WPA2:                   tak
+WIFI-PROPERTIES.TKIP:                   tak
+WIFI-PROPERTIES.CCMP:                   tak
+WIFI-PROPERTIES.AP:                     tak
+WIFI-PROPERTIES.ADHOC:                  tak
+WIFI-PROPERTIES.2GHZ:                   nieznane
+WIFI-PROPERTIES.5GHZ:                   nieznane
 -------------------------------------------------------------------------------
 AP[1].IN-USE:                            
 AP[1].SSID:                             wlan0-ap-2
-AP[1].MODE:                             Infra
+AP[1].MODE:                             Infrastruktura
 AP[1].CHAN:                             1
-AP[1].RATE:                             54 Mbit/s
+AP[1].RATE:                             54 Mb/s
 AP[1].SIGNAL:                           92
 AP[1].BARS:                             ****
 AP[1].SECURITY:                         WPA1 WPA2
 -------------------------------------------------------------------------------
 AP[2].IN-USE:                            
 AP[2].SSID:                             wlan0-ap-1
-AP[2].MODE:                             Infra
+AP[2].MODE:                             Infrastruktura
 AP[2].CHAN:                             1
-AP[2].RATE:                             54 Mbit/s
+AP[2].RATE:                             54 Mb/s
 AP[2].SIGNAL:                           81
 AP[2].BARS:                             ****
-AP[2].SECURITY:                         WPA1 WPA2
+AP[2].SECURITY:                         WPA1
 -------------------------------------------------------------------------------
 AP[3].IN-USE:                            
 AP[3].SSID:                             wlan0-ap-3
-AP[3].MODE:                             Infra
+AP[3].MODE:                             Infrastruktura
 AP[3].CHAN:                             1
-AP[3].RATE:                             54 Mbit/s
+AP[3].RATE:                             54 Mb/s
 AP[3].SIGNAL:                           55
 AP[3].BARS:                             **  
-AP[3].SECURITY:                         WPA1 WPA2
+AP[3].SECURITY:                         WPA3
 -------------------------------------------------------------------------------
 IP4.ADDRESS[1]:                         192.168.228.18/32
 IP4.ADDRESS[2]:                         192.168.209.179/25
@@ -36123,14 +36795,6 @@ CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings
 CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 -------------------------------------------------------------------------------
 
-<<<
-size: 24925
-location: clients/tests/test-client.py:1048:test_004()/684
-cmd: $NMCLI --mode multiline --pretty -f all dev show
-lang: pl_PL.UTF-8
-returncode: 0
-stdout: 24751 bytes
->>>
 ===============================================================================
                         Informacje o urządzeniu (eth0)
 ===============================================================================
@@ -36146,6 +36810,8 @@ GENERAL.HWADDR:                         AB:B7:BF:E2:48:E8
 GENERAL.MTU:                            0
 GENERAL.STATE:                          20 (niedostępne)
 GENERAL.REASON:                         0 (Nie podano przyczyny)
+GENERAL.IP4-CONNECTIVITY:               0 (nieznane)
+GENERAL.IP6-CONNECTIVITY:               0 (nieznane)
 GENERAL.UDI:                            /sys/devices/virtual/eth0
 GENERAL.IP-IFACE:                       --
 GENERAL.IS-SOFTWARE:                    nie
@@ -36218,6 +36884,8 @@ GENERAL.HWADDR:                         E7:78:B1:93:2B:22
 GENERAL.MTU:                            0
 GENERAL.STATE:                          20 (niedostępne)
 GENERAL.REASON:                         0 (Nie podano przyczyny)
+GENERAL.IP4-CONNECTIVITY:               0 (nieznane)
+GENERAL.IP6-CONNECTIVITY:               0 (nieznane)
 GENERAL.UDI:                            /sys/devices/virtual/eth1
 GENERAL.IP-IFACE:                       --
 GENERAL.IS-SOFTWARE:                    nie
@@ -36297,6 +36965,8 @@ GENERAL.HWADDR:                         21:E9:64:81:8C:A8
 GENERAL.MTU:                            0
 GENERAL.STATE:                          20 (niedostępne)
 GENERAL.REASON:                         0 (Nie podano przyczyny)
+GENERAL.IP4-CONNECTIVITY:               0 (nieznane)
+GENERAL.IP6-CONNECTIVITY:               0 (nieznane)
 GENERAL.UDI:                            /sys/devices/virtual/wlan1
 GENERAL.IP-IFACE:                       --
 GENERAL.IS-SOFTWARE:                    nie
@@ -36395,6 +37065,8 @@ GENERAL.HWADDR:                         71:52:AD:63:5C:7C
 GENERAL.MTU:                            0
 GENERAL.STATE:                          20 (niedostępne)
 GENERAL.REASON:                         0 (Nie podano przyczyny)
+GENERAL.IP4-CONNECTIVITY:               0 (nieznane)
+GENERAL.IP6-CONNECTIVITY:               0 (nieznane)
 GENERAL.UDI:                            /sys/devices/virtual/wlan1
 GENERAL.IP-IFACE:                       --
 GENERAL.IS-SOFTWARE:                    nie
@@ -36457,113 +37129,9 @@ CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings
 CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 -------------------------------------------------------------------------------
 
-===============================================================================
-                        Informacje o urządzeniu (wlan0)
-===============================================================================
-GENERAL.DEVICE:                         wlan0
-GENERAL.TYPE:                           wifi
-GENERAL.NM-TYPE:                        NMDeviceWifi
-GENERAL.VENDOR:                         --
-GENERAL.PRODUCT:                        --
-GENERAL.DRIVER:                         virtual
-GENERAL.DRIVER-VERSION:                 --
-GENERAL.FIRMWARE-VERSION:               --
-GENERAL.HWADDR:                         13:E0:74:85:7C:D9
-GENERAL.MTU:                            0
-GENERAL.STATE:                          20 (niedostępne)
-GENERAL.REASON:                         0 (Nie podano przyczyny)
-GENERAL.UDI:                            /sys/devices/virtual/wlan0
-GENERAL.IP-IFACE:                       --
-GENERAL.IS-SOFTWARE:                    nie
-GENERAL.NM-MANAGED:                     tak
-GENERAL.AUTOCONNECT:                    tak
-GENERAL.FIRMWARE-MISSING:               nie
-GENERAL.NM-PLUGIN-MISSING:              nie
-GENERAL.PHYS-PORT-ID:                   --
-GENERAL.CONNECTION:                     con-vpn-1
-GENERAL.CON-UUID:                       UUID-con-vpn-1-REPLACED-REPLACED-REP
-GENERAL.CON-PATH:                       /org/freedesktop/NetworkManager/ActiveConnection/2
-GENERAL.METERED:                        nieznane
--------------------------------------------------------------------------------
-CAPABILITIES.CARRIER-DETECT:            nie
-CAPABILITIES.SPEED:                     nieznane
-CAPABILITIES.IS-SOFTWARE:               nie
-CAPABILITIES.SRIOV:                     nie
--------------------------------------------------------------------------------
-WIFI-PROPERTIES.WEP:                    tak
-WIFI-PROPERTIES.WPA:                    tak
-WIFI-PROPERTIES.WPA2:                   tak
-WIFI-PROPERTIES.TKIP:                   tak
-WIFI-PROPERTIES.CCMP:                   tak
-WIFI-PROPERTIES.AP:                     tak
-WIFI-PROPERTIES.ADHOC:                  tak
-WIFI-PROPERTIES.2GHZ:                   nieznane
-WIFI-PROPERTIES.5GHZ:                   nieznane
--------------------------------------------------------------------------------
-AP[1].IN-USE:                            
-AP[1].SSID:                             wlan0-ap-2
-AP[1].MODE:                             Infrastruktura
-AP[1].CHAN:                             1
-AP[1].RATE:                             54 Mb/s
-AP[1].SIGNAL:                           92
-AP[1].BARS:                             ****
-AP[1].SECURITY:                         WPA1 WPA2
--------------------------------------------------------------------------------
-AP[2].IN-USE:                            
-AP[2].SSID:                             wlan0-ap-1
-AP[2].MODE:                             Infrastruktura
-AP[2].CHAN:                             1
-AP[2].RATE:                             54 Mb/s
-AP[2].SIGNAL:                           81
-AP[2].BARS:                             ****
-AP[2].SECURITY:                         WPA1 WPA2
--------------------------------------------------------------------------------
-AP[3].IN-USE:                            
-AP[3].SSID:                             wlan0-ap-3
-AP[3].MODE:                             Infrastruktura
-AP[3].CHAN:                             1
-AP[3].RATE:                             54 Mb/s
-AP[3].SIGNAL:                           55
-AP[3].BARS:                             **  
-AP[3].SECURITY:                         WPA1 WPA2
--------------------------------------------------------------------------------
-IP4.ADDRESS[1]:                         192.168.228.18/32
-IP4.ADDRESS[2]:                         192.168.209.179/25
-IP4.GATEWAY:                            192.168.41.120
-IP4.DOMAIN[1]:                          sear4.foo2.bar
-IP4.DOMAIN[2]:                          sear4.fo.x.y
-IP4.DOMAIN[3]:                          sear4.foo1.bar
-IP4.DOMAIN[4]:                          sear4.foo4.bar
-IP4.DOMAIN[5]:                          sear4.fo.o.bar
-IP4.WINS[1]:                            192.168.120.79
--------------------------------------------------------------------------------
-DHCP4.OPTION[1]:                        dhcp-4-opt-0 = val-0
-DHCP4.OPTION[2]:                        dhcp-4-opt-2 = val-2
-DHCP4.OPTION[3]:                        dhcp-4-opt-4 = val-4
-DHCP4.OPTION[4]:                        dhcp-4-opt-7 = val-7
--------------------------------------------------------------------------------
-IP6.GATEWAY:                            --
-IP6.ROUTE[1]:                           dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086
-IP6.DOMAIN[1]:                          sear6.foo2.bar
-IP6.DOMAIN[2]:                          sear6.foo1.bar
-IP6.DOMAIN[3]:                          sear6.fo.x.y
-IP6.DOMAIN[4]:                          sear6.fo.o.bar
-IP6.DOMAIN[5]:                          sear6.foo3.bar
-IP6.DOMAIN[6]:                          sear6.foo4.bar
--------------------------------------------------------------------------------
-DHCP6.OPTION[1]:                        dhcp-6-opt-1 = val-1
-DHCP6.OPTION[2]:                        dhcp-6-opt-2 = val-2
-DHCP6.OPTION[3]:                        dhcp-6-opt-3 = val-3
-DHCP6.OPTION[4]:                        dhcp-6-opt-4 = val-4
-DHCP6.OPTION[5]:                        dhcp-6-opt-5 = val-5
--------------------------------------------------------------------------------
-CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings/Connection/{2}
-CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
--------------------------------------------------------------------------------
-
 <<<
 size: 2456
-location: clients/tests/test-client.py:1051:test_004()/685
+location: clients/tests/test-client.py:1065:test_004()/685
 cmd: $NMCLI --mode multiline --pretty dev show wlan0
 lang: C
 returncode: 0
@@ -36608,7 +37176,7 @@ IP6.DOMAIN[6]:                          sear6.foo4.bar
 
 <<<
 size: 2474
-location: clients/tests/test-client.py:1051:test_004()/686
+location: clients/tests/test-client.py:1065:test_004()/686
 cmd: $NMCLI --mode multiline --pretty dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
@@ -36652,12 +37220,12 @@ IP6.DOMAIN[6]:                          sear6.foo4.bar
 -------------------------------------------------------------------------------
 
 <<<
-size: 5871
-location: clients/tests/test-client.py:1054:test_004()/687
+size: 5965
+location: clients/tests/test-client.py:1068:test_004()/687
 cmd: $NMCLI --mode multiline --pretty -f all dev show wlan0
 lang: C
 returncode: 0
-stdout: 5702 bytes
+stdout: 5796 bytes
 >>>
 ===============================================================================
                             Device details (wlan0)
@@ -36674,6 +37242,8 @@ GENERAL.HWADDR:                         13:E0:74:85:7C:D9
 GENERAL.MTU:                            0
 GENERAL.STATE:                          20 (unavailable)
 GENERAL.REASON:                         0 (No reason given)
+GENERAL.IP4-CONNECTIVITY:               0 (unknown)
+GENERAL.IP6-CONNECTIVITY:               0 (unknown)
 GENERAL.UDI:                            /sys/devices/virtual/wlan0
 GENERAL.IP-IFACE:                       --
 GENERAL.IS-SOFTWARE:                    no
@@ -36718,7 +37288,7 @@ AP[2].CHAN:                             1
 AP[2].RATE:                             54 Mbit/s
 AP[2].SIGNAL:                           81
 AP[2].BARS:                             ****
-AP[2].SECURITY:                         WPA1 WPA2
+AP[2].SECURITY:                         WPA1
 -------------------------------------------------------------------------------
 AP[3].IN-USE:                            
 AP[3].SSID:                             wlan0-ap-3
@@ -36727,7 +37297,7 @@ AP[3].CHAN:                             1
 AP[3].RATE:                             54 Mbit/s
 AP[3].SIGNAL:                           55
 AP[3].BARS:                             **  
-AP[3].SECURITY:                         WPA1 WPA2
+AP[3].SECURITY:                         WPA3
 -------------------------------------------------------------------------------
 IP4.ADDRESS[1]:                         192.168.228.18/32
 IP4.ADDRESS[2]:                         192.168.209.179/25
@@ -36764,12 +37334,12 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | c
 -------------------------------------------------------------------------------
 
 <<<
-size: 5931
-location: clients/tests/test-client.py:1054:test_004()/688
+size: 6027
+location: clients/tests/test-client.py:1068:test_004()/688
 cmd: $NMCLI --mode multiline --pretty -f all dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 5752 bytes
+stdout: 5848 bytes
 >>>
 ===============================================================================
                         Informacje o urządzeniu (wlan0)
@@ -36786,6 +37356,8 @@ GENERAL.HWADDR:                         13:E0:74:85:7C:D9
 GENERAL.MTU:                            0
 GENERAL.STATE:                          20 (niedostępne)
 GENERAL.REASON:                         0 (Nie podano przyczyny)
+GENERAL.IP4-CONNECTIVITY:               0 (nieznane)
+GENERAL.IP6-CONNECTIVITY:               0 (nieznane)
 GENERAL.UDI:                            /sys/devices/virtual/wlan0
 GENERAL.IP-IFACE:                       --
 GENERAL.IS-SOFTWARE:                    nie
@@ -36830,7 +37402,7 @@ AP[2].CHAN:                             1
 AP[2].RATE:                             54 Mb/s
 AP[2].SIGNAL:                           81
 AP[2].BARS:                             ****
-AP[2].SECURITY:                         WPA1 WPA2
+AP[2].SECURITY:                         WPA1
 -------------------------------------------------------------------------------
 AP[3].IN-USE:                            
 AP[3].SSID:                             wlan0-ap-3
@@ -36839,7 +37411,7 @@ AP[3].CHAN:                             1
 AP[3].RATE:                             54 Mb/s
 AP[3].SIGNAL:                           55
 AP[3].BARS:                             **  
-AP[3].SECURITY:                         WPA1 WPA2
+AP[3].SECURITY:                         WPA3
 -------------------------------------------------------------------------------
 IP4.ADDRESS[1]:                         192.168.228.18/32
 IP4.ADDRESS[2]:                         192.168.209.179/25
@@ -36876,12 +37448,12 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | c
 -------------------------------------------------------------------------------
 
 <<<
-size: 2334
-location: clients/tests/test-client.py:1057:test_004()/689
+size: 2438
+location: clients/tests/test-client.py:1071:test_004()/689
 cmd: $NMCLI --mode multiline --pretty -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: C
 returncode: 0
-stdout: 2130 bytes
+stdout: 2234 bytes
 >>>
 ===============================================================================
                             Device details (wlan0)
@@ -36898,6 +37470,8 @@ GENERAL.HWADDR:                         13:E0:74:85:7C:D9
 GENERAL.MTU:                            0
 GENERAL.STATE:                          20 (unavailable)
 GENERAL.REASON:                         0 (No reason given)
+GENERAL.IP4-CONNECTIVITY:               0 (unknown)
+GENERAL.IP6-CONNECTIVITY:               0 (unknown)
 GENERAL.UDI:                            /sys/devices/virtual/wlan0
 GENERAL.IP-IFACE:                       --
 GENERAL.IS-SOFTWARE:                    no
@@ -36925,12 +37499,12 @@ WIFI-PROPERTIES.5GHZ:                   unknown
 -------------------------------------------------------------------------------
 
 <<<
-size: 2363
-location: clients/tests/test-client.py:1057:test_004()/690
+size: 2469
+location: clients/tests/test-client.py:1071:test_004()/690
 cmd: $NMCLI --mode multiline --pretty -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2149 bytes
+stdout: 2255 bytes
 >>>
 ===============================================================================
                         Informacje o urządzeniu (wlan0)
@@ -36947,6 +37521,8 @@ GENERAL.HWADDR:                         13:E0:74:85:7C:D9
 GENERAL.MTU:                            0
 GENERAL.STATE:                          20 (niedostępne)
 GENERAL.REASON:                         0 (Nie podano przyczyny)
+GENERAL.IP4-CONNECTIVITY:               0 (nieznane)
+GENERAL.IP6-CONNECTIVITY:               0 (nieznane)
 GENERAL.UDI:                            /sys/devices/virtual/wlan0
 GENERAL.IP-IFACE:                       --
 GENERAL.IS-SOFTWARE:                    nie
@@ -36974,12 +37550,12 @@ WIFI-PROPERTIES.5GHZ:                   nieznane
 -------------------------------------------------------------------------------
 
 <<<
-size: 2334
-location: clients/tests/test-client.py:1060:test_004()/691
+size: 2438
+location: clients/tests/test-client.py:1074:test_004()/691
 cmd: $NMCLI --mode multiline --pretty -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: C
 returncode: 0
-stdout: 2130 bytes
+stdout: 2234 bytes
 >>>
 ===============================================================================
                             Device details (wlan0)
@@ -36996,6 +37572,8 @@ GENERAL.HWADDR:                         13:E0:74:85:7C:D9
 GENERAL.MTU:                            0
 GENERAL.STATE:                          20 (unavailable)
 GENERAL.REASON:                         0 (No reason given)
+GENERAL.IP4-CONNECTIVITY:               0 (unknown)
+GENERAL.IP6-CONNECTIVITY:               0 (unknown)
 GENERAL.UDI:                            /sys/devices/virtual/wlan0
 GENERAL.IP-IFACE:                       --
 GENERAL.IS-SOFTWARE:                    no
@@ -37023,12 +37601,12 @@ WIFI-PROPERTIES.5GHZ:                   unknown
 -------------------------------------------------------------------------------
 
 <<<
-size: 2363
-location: clients/tests/test-client.py:1060:test_004()/692
+size: 2469
+location: clients/tests/test-client.py:1074:test_004()/692
 cmd: $NMCLI --mode multiline --pretty -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2149 bytes
+stdout: 2255 bytes
 >>>
 ===============================================================================
                         Informacje o urządzeniu (wlan0)
@@ -37045,6 +37623,8 @@ GENERAL.HWADDR:                         13:E0:74:85:7C:D9
 GENERAL.MTU:                            0
 GENERAL.STATE:                          20 (niedostępne)
 GENERAL.REASON:                         0 (Nie podano przyczyny)
+GENERAL.IP4-CONNECTIVITY:               0 (nieznane)
+GENERAL.IP6-CONNECTIVITY:               0 (nieznane)
 GENERAL.UDI:                            /sys/devices/virtual/wlan0
 GENERAL.IP-IFACE:                       --
 GENERAL.IS-SOFTWARE:                    nie
@@ -37073,7 +37653,7 @@ WIFI-PROPERTIES.5GHZ:                   nieznane
 
 <<<
 size: 1656
-location: clients/tests/test-client.py:1063:test_004()/693
+location: clients/tests/test-client.py:1077:test_004()/693
 cmd: $NMCLI --mode multiline --pretty -f DEVICE,TYPE,DBUS-PATH dev
 lang: C
 returncode: 0
@@ -37082,6 +37662,10 @@ stdout: 1480 bytes
 ===============================================================================
                                Status of devices
 ===============================================================================
+DEVICE:                                 wlan0
+TYPE:                                   wifi
+DBUS-PATH:                              /org/freedesktop/NetworkManager/Devices/3
+-------------------------------------------------------------------------------
 DEVICE:                                 eth0
 TYPE:                                   ethernet
 DBUS-PATH:                              /org/freedesktop/NetworkManager/Devices/1
@@ -37098,14 +37682,10 @@ DEVICE:                                 wlan1
 TYPE:                                   wifi
 DBUS-PATH:                              /org/freedesktop/NetworkManager/Devices/5
 -------------------------------------------------------------------------------
-DEVICE:                                 wlan0
-TYPE:                                   wifi
-DBUS-PATH:                              /org/freedesktop/NetworkManager/Devices/3
--------------------------------------------------------------------------------
 
 <<<
 size: 1666
-location: clients/tests/test-client.py:1063:test_004()/694
+location: clients/tests/test-client.py:1077:test_004()/694
 cmd: $NMCLI --mode multiline --pretty -f DEVICE,TYPE,DBUS-PATH dev
 lang: pl_PL.UTF-8
 returncode: 0
@@ -37114,6 +37694,10 @@ stdout: 1480 bytes
 ===============================================================================
                                 Stan urządzenia
 ===============================================================================
+DEVICE:                                 wlan0
+TYPE:                                   wifi
+DBUS-PATH:                              /org/freedesktop/NetworkManager/Devices/3
+-------------------------------------------------------------------------------
 DEVICE:                                 eth0
 TYPE:                                   ethernet
 DBUS-PATH:                              /org/freedesktop/NetworkManager/Devices/1
@@ -37130,45 +37714,15 @@ DEVICE:                                 wlan1
 TYPE:                                   wifi
 DBUS-PATH:                              /org/freedesktop/NetworkManager/Devices/5
 -------------------------------------------------------------------------------
-DEVICE:                                 wlan0
-TYPE:                                   wifi
-DBUS-PATH:                              /org/freedesktop/NetworkManager/Devices/3
--------------------------------------------------------------------------------
 
 <<<
-size: 4849
-location: clients/tests/test-client.py:1066:test_004()/695
+size: 4761
+location: clients/tests/test-client.py:1080:test_004()/695
 cmd: $NMCLI --mode multiline --pretty -f ALL device wifi list
 lang: C
 returncode: 0
-stdout: 4678 bytes
+stdout: 4590 bytes
 >>>
-===============================================================================
-                            Wi-Fi scan list (wlan1)
-===============================================================================
-NAME:                                   AP[1]
-SSID:                                   wlan1-ap-4
-SSID-HEX:                               776C616E312D61702D34
-BSSID:                                  94:2B:E8:F6:D2:86
-MODE:                                   Infra
-CHAN:                                   1
-FREQ:                                   2412 MHz
-RATE:                                   54 Mbit/s
-SIGNAL:                                 48
-BARS:                                   **  
-SECURITY:                               WPA1 WPA2
-WPA-FLAGS:                              pair_tkip pair_ccmp group_tkip group_ccmp psk
-RSN-FLAGS:                              pair_tkip pair_ccmp group_tkip group_ccmp psk
-DEVICE:                                 wlan1
-ACTIVE:                                 no
-IN-USE:                                  
-DBUS-PATH:                              /org/freedesktop/NetworkManager/AccessPoint/4
--------------------------------------------------------------------------------
-
-===============================================================================
-                            Wi-Fi scan list (wlan1)
-===============================================================================
-
 ===============================================================================
                             Wi-Fi scan list (wlan0)
 ===============================================================================
@@ -37200,9 +37754,9 @@ FREQ:                                   2412 MHz
 RATE:                                   54 Mbit/s
 SIGNAL:                                 81
 BARS:                                   ****
-SECURITY:                               WPA1 WPA2
+SECURITY:                               WPA1
 WPA-FLAGS:                              pair_tkip pair_ccmp group_tkip group_ccmp psk
-RSN-FLAGS:                              pair_tkip pair_ccmp group_tkip group_ccmp psk
+RSN-FLAGS:                              (none)
 DEVICE:                                 wlan0
 ACTIVE:                                 no
 IN-USE:                                  
@@ -37218,49 +37772,49 @@ FREQ:                                   2412 MHz
 RATE:                                   54 Mbit/s
 SIGNAL:                                 55
 BARS:                                   **  
-SECURITY:                               WPA1 WPA2
-WPA-FLAGS:                              pair_tkip pair_ccmp group_tkip group_ccmp psk
-RSN-FLAGS:                              pair_tkip pair_ccmp group_tkip group_ccmp psk
+SECURITY:                               WPA3
+WPA-FLAGS:                              (none)
+RSN-FLAGS:                              pair_tkip pair_ccmp group_tkip group_ccmp sae
 DEVICE:                                 wlan0
 ACTIVE:                                 no
 IN-USE:                                  
 DBUS-PATH:                              /org/freedesktop/NetworkManager/AccessPoint/3
 -------------------------------------------------------------------------------
 
-<<<
-size: 4925
-location: clients/tests/test-client.py:1066:test_004()/696
-cmd: $NMCLI --mode multiline --pretty -f ALL device wifi list
-lang: pl_PL.UTF-8
-returncode: 0
-stdout: 4744 bytes
->>>
 ===============================================================================
-                     Lista skanowania sieci Wi-Fi (wlan1)
+                            Wi-Fi scan list (wlan1)
 ===============================================================================
 NAME:                                   AP[1]
 SSID:                                   wlan1-ap-4
 SSID-HEX:                               776C616E312D61702D34
 BSSID:                                  94:2B:E8:F6:D2:86
-MODE:                                   Infrastruktura
+MODE:                                   Infra
 CHAN:                                   1
-FREQ:                                   2412 MHz
-RATE:                                   54 Mb/s
+FREQ:                                   2412 MHz
+RATE:                                   54 Mbit/s
 SIGNAL:                                 48
 BARS:                                   **  
 SECURITY:                               WPA1 WPA2
 WPA-FLAGS:                              pair_tkip pair_ccmp group_tkip group_ccmp psk
 RSN-FLAGS:                              pair_tkip pair_ccmp group_tkip group_ccmp psk
 DEVICE:                                 wlan1
-ACTIVE:                                 nie
+ACTIVE:                                 no
 IN-USE:                                  
 DBUS-PATH:                              /org/freedesktop/NetworkManager/AccessPoint/4
 -------------------------------------------------------------------------------
 
 ===============================================================================
-                     Lista skanowania sieci Wi-Fi (wlan1)
+                            Wi-Fi scan list (wlan1)
 ===============================================================================
 
+<<<
+size: 4837
+location: clients/tests/test-client.py:1080:test_004()/696
+cmd: $NMCLI --mode multiline --pretty -f ALL device wifi list
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 4656 bytes
+>>>
 ===============================================================================
                      Lista skanowania sieci Wi-Fi (wlan0)
 ===============================================================================
@@ -37292,9 +37846,9 @@ FREQ:                                   2412 MHz
 RATE:                                   54 Mb/s
 SIGNAL:                                 81
 BARS:                                   ****
-SECURITY:                               WPA1 WPA2
+SECURITY:                               WPA1
 WPA-FLAGS:                              pair_tkip pair_ccmp group_tkip group_ccmp psk
-RSN-FLAGS:                              pair_tkip pair_ccmp group_tkip group_ccmp psk
+RSN-FLAGS:                              (brak)
 DEVICE:                                 wlan0
 ACTIVE:                                 nie
 IN-USE:                                  
@@ -37310,40 +37864,49 @@ FREQ:                                   2412 MHz
 RATE:                                   54 Mb/s
 SIGNAL:                                 55
 BARS:                                   **  
-SECURITY:                               WPA1 WPA2
-WPA-FLAGS:                              pair_tkip pair_ccmp group_tkip group_ccmp psk
-RSN-FLAGS:                              pair_tkip pair_ccmp group_tkip group_ccmp psk
+SECURITY:                               WPA3
+WPA-FLAGS:                              (brak)
+RSN-FLAGS:                              pair_tkip pair_ccmp group_tkip group_ccmp sae
 DEVICE:                                 wlan0
 ACTIVE:                                 nie
 IN-USE:                                  
 DBUS-PATH:                              /org/freedesktop/NetworkManager/AccessPoint/3
 -------------------------------------------------------------------------------
 
-<<<
-size: 2608
-location: clients/tests/test-client.py:1068:test_004()/697
-cmd: $NMCLI --mode multiline --pretty -f COMMON device wifi list
-lang: C
-returncode: 0
-stdout: 2434 bytes
->>>
 ===============================================================================
-                            Wi-Fi scan list (wlan1)
+                     Lista skanowania sieci Wi-Fi (wlan1)
 ===============================================================================
-IN-USE:                                  
+NAME:                                   AP[1]
 SSID:                                   wlan1-ap-4
-MODE:                                   Infra
+SSID-HEX:                               776C616E312D61702D34
+BSSID:                                  94:2B:E8:F6:D2:86
+MODE:                                   Infrastruktura
 CHAN:                                   1
-RATE:                                   54 Mbit/s
+FREQ:                                   2412 MHz
+RATE:                                   54 Mb/s
 SIGNAL:                                 48
 BARS:                                   **  
 SECURITY:                               WPA1 WPA2
+WPA-FLAGS:                              pair_tkip pair_ccmp group_tkip group_ccmp psk
+RSN-FLAGS:                              pair_tkip pair_ccmp group_tkip group_ccmp psk
+DEVICE:                                 wlan1
+ACTIVE:                                 nie
+IN-USE:                                  
+DBUS-PATH:                              /org/freedesktop/NetworkManager/AccessPoint/4
 -------------------------------------------------------------------------------
 
 ===============================================================================
-                            Wi-Fi scan list (wlan1)
+                     Lista skanowania sieci Wi-Fi (wlan1)
 ===============================================================================
 
+<<<
+size: 2598
+location: clients/tests/test-client.py:1082:test_004()/697
+cmd: $NMCLI --mode multiline --pretty -f COMMON device wifi list
+lang: C
+returncode: 0
+stdout: 2424 bytes
+>>>
 ===============================================================================
                             Wi-Fi scan list (wlan0)
 ===============================================================================
@@ -37363,7 +37926,7 @@ CHAN:                                   1
 RATE:                                   54 Mbit/s
 SIGNAL:                                 81
 BARS:                                   ****
-SECURITY:                               WPA1 WPA2
+SECURITY:                               WPA1
 -------------------------------------------------------------------------------
 IN-USE:                                  
 SSID:                                   wlan0-ap-3
@@ -37372,34 +37935,34 @@ CHAN:                                   1
 RATE:                                   54 Mbit/s
 SIGNAL:                                 55
 BARS:                                   **  
-SECURITY:                               WPA1 WPA2
+SECURITY:                               WPA3
 -------------------------------------------------------------------------------
 
-<<<
-size: 2672
-location: clients/tests/test-client.py:1068:test_004()/698
-cmd: $NMCLI --mode multiline --pretty -f COMMON device wifi list
-lang: pl_PL.UTF-8
-returncode: 0
-stdout: 2488 bytes
->>>
 ===============================================================================
-                     Lista skanowania sieci Wi-Fi (wlan1)
+                            Wi-Fi scan list (wlan1)
 ===============================================================================
 IN-USE:                                  
 SSID:                                   wlan1-ap-4
-MODE:                                   Infrastruktura
+MODE:                                   Infra
 CHAN:                                   1
-RATE:                                   54 Mb/s
+RATE:                                   54 Mbit/s
 SIGNAL:                                 48
 BARS:                                   **  
 SECURITY:                               WPA1 WPA2
 -------------------------------------------------------------------------------
 
 ===============================================================================
-                     Lista skanowania sieci Wi-Fi (wlan1)
+                            Wi-Fi scan list (wlan1)
 ===============================================================================
 
+<<<
+size: 2662
+location: clients/tests/test-client.py:1082:test_004()/698
+cmd: $NMCLI --mode multiline --pretty -f COMMON device wifi list
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 2478 bytes
+>>>
 ===============================================================================
                      Lista skanowania sieci Wi-Fi (wlan0)
 ===============================================================================
@@ -37419,7 +37982,7 @@ CHAN:                                   1
 RATE:                                   54 Mb/s
 SIGNAL:                                 81
 BARS:                                   ****
-SECURITY:                               WPA1 WPA2
+SECURITY:                               WPA1
 -------------------------------------------------------------------------------
 IN-USE:                                  
 SSID:                                   wlan0-ap-3
@@ -37428,43 +37991,34 @@ CHAN:                                   1
 RATE:                                   54 Mb/s
 SIGNAL:                                 55
 BARS:                                   **  
-SECURITY:                               WPA1 WPA2
+SECURITY:                               WPA3
 -------------------------------------------------------------------------------
 
-<<<
-size: 4962
-location: clients/tests/test-client.py:1071:test_004()/699
-cmd: $NMCLI --mode multiline --pretty -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list
-lang: C
-returncode: 0
-stdout: 4678 bytes
->>>
 ===============================================================================
-                            Wi-Fi scan list (wlan1)
+                     Lista skanowania sieci Wi-Fi (wlan1)
 ===============================================================================
-NAME:                                   AP[1]
+IN-USE:                                  
 SSID:                                   wlan1-ap-4
-SSID-HEX:                               776C616E312D61702D34
-BSSID:                                  94:2B:E8:F6:D2:86
-MODE:                                   Infra
+MODE:                                   Infrastruktura
 CHAN:                                   1
-FREQ:                                   2412 MHz
-RATE:                                   54 Mbit/s
+RATE:                                   54 Mb/s
 SIGNAL:                                 48
 BARS:                                   **  
 SECURITY:                               WPA1 WPA2
-WPA-FLAGS:                              pair_tkip pair_ccmp group_tkip group_ccmp psk
-RSN-FLAGS:                              pair_tkip pair_ccmp group_tkip group_ccmp psk
-DEVICE:                                 wlan1
-ACTIVE:                                 no
-IN-USE:                                  
-DBUS-PATH:                              /org/freedesktop/NetworkManager/AccessPoint/4
 -------------------------------------------------------------------------------
 
 ===============================================================================
-                            Wi-Fi scan list (wlan1)
+                     Lista skanowania sieci Wi-Fi (wlan1)
 ===============================================================================
 
+<<<
+size: 4874
+location: clients/tests/test-client.py:1085:test_004()/699
+cmd: $NMCLI --mode multiline --pretty -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list
+lang: C
+returncode: 0
+stdout: 4590 bytes
+>>>
 ===============================================================================
                             Wi-Fi scan list (wlan0)
 ===============================================================================
@@ -37496,9 +38050,9 @@ FREQ:                                   2412 MHz
 RATE:                                   54 Mbit/s
 SIGNAL:                                 81
 BARS:                                   ****
-SECURITY:                               WPA1 WPA2
+SECURITY:                               WPA1
 WPA-FLAGS:                              pair_tkip pair_ccmp group_tkip group_ccmp psk
-RSN-FLAGS:                              pair_tkip pair_ccmp group_tkip group_ccmp psk
+RSN-FLAGS:                              (none)
 DEVICE:                                 wlan0
 ACTIVE:                                 no
 IN-USE:                                  
@@ -37514,49 +38068,49 @@ FREQ:                                   2412 MHz
 RATE:                                   54 Mbit/s
 SIGNAL:                                 55
 BARS:                                   **  
-SECURITY:                               WPA1 WPA2
-WPA-FLAGS:                              pair_tkip pair_ccmp group_tkip group_ccmp psk
-RSN-FLAGS:                              pair_tkip pair_ccmp group_tkip group_ccmp psk
+SECURITY:                               WPA3
+WPA-FLAGS:                              (none)
+RSN-FLAGS:                              pair_tkip pair_ccmp group_tkip group_ccmp sae
 DEVICE:                                 wlan0
 ACTIVE:                                 no
 IN-USE:                                  
 DBUS-PATH:                              /org/freedesktop/NetworkManager/AccessPoint/3
 -------------------------------------------------------------------------------
 
-<<<
-size: 5038
-location: clients/tests/test-client.py:1071:test_004()/700
-cmd: $NMCLI --mode multiline --pretty -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list
-lang: pl_PL.UTF-8
-returncode: 0
-stdout: 4744 bytes
->>>
 ===============================================================================
-                     Lista skanowania sieci Wi-Fi (wlan1)
+                            Wi-Fi scan list (wlan1)
 ===============================================================================
 NAME:                                   AP[1]
 SSID:                                   wlan1-ap-4
 SSID-HEX:                               776C616E312D61702D34
 BSSID:                                  94:2B:E8:F6:D2:86
-MODE:                                   Infrastruktura
+MODE:                                   Infra
 CHAN:                                   1
-FREQ:                                   2412 MHz
-RATE:                                   54 Mb/s
+FREQ:                                   2412 MHz
+RATE:                                   54 Mbit/s
 SIGNAL:                                 48
 BARS:                                   **  
 SECURITY:                               WPA1 WPA2
 WPA-FLAGS:                              pair_tkip pair_ccmp group_tkip group_ccmp psk
 RSN-FLAGS:                              pair_tkip pair_ccmp group_tkip group_ccmp psk
 DEVICE:                                 wlan1
-ACTIVE:                                 nie
+ACTIVE:                                 no
 IN-USE:                                  
 DBUS-PATH:                              /org/freedesktop/NetworkManager/AccessPoint/4
 -------------------------------------------------------------------------------
 
 ===============================================================================
-                     Lista skanowania sieci Wi-Fi (wlan1)
+                            Wi-Fi scan list (wlan1)
 ===============================================================================
 
+<<<
+size: 4950
+location: clients/tests/test-client.py:1085:test_004()/700
+cmd: $NMCLI --mode multiline --pretty -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 4656 bytes
+>>>
 ===============================================================================
                      Lista skanowania sieci Wi-Fi (wlan0)
 ===============================================================================
@@ -37588,9 +38142,9 @@ FREQ:                                   2412 MHz
 RATE:                                   54 Mb/s
 SIGNAL:                                 81
 BARS:                                   ****
-SECURITY:                               WPA1 WPA2
+SECURITY:                               WPA1
 WPA-FLAGS:                              pair_tkip pair_ccmp group_tkip group_ccmp psk
-RSN-FLAGS:                              pair_tkip pair_ccmp group_tkip group_ccmp psk
+RSN-FLAGS:                              (brak)
 DEVICE:                                 wlan0
 ACTIVE:                                 nie
 IN-USE:                                  
@@ -37606,22 +38160,48 @@ FREQ:                                   2412 MHz
 RATE:                                   54 Mb/s
 SIGNAL:                                 55
 BARS:                                   **  
+SECURITY:                               WPA3
+WPA-FLAGS:                              (brak)
+RSN-FLAGS:                              pair_tkip pair_ccmp group_tkip group_ccmp sae
+DEVICE:                                 wlan0
+ACTIVE:                                 nie
+IN-USE:                                  
+DBUS-PATH:                              /org/freedesktop/NetworkManager/AccessPoint/3
+-------------------------------------------------------------------------------
+
+===============================================================================
+                     Lista skanowania sieci Wi-Fi (wlan1)
+===============================================================================
+NAME:                                   AP[1]
+SSID:                                   wlan1-ap-4
+SSID-HEX:                               776C616E312D61702D34
+BSSID:                                  94:2B:E8:F6:D2:86
+MODE:                                   Infrastruktura
+CHAN:                                   1
+FREQ:                                   2412 MHz
+RATE:                                   54 Mb/s
+SIGNAL:                                 48
+BARS:                                   **  
 SECURITY:                               WPA1 WPA2
 WPA-FLAGS:                              pair_tkip pair_ccmp group_tkip group_ccmp psk
 RSN-FLAGS:                              pair_tkip pair_ccmp group_tkip group_ccmp psk
-DEVICE:                                 wlan0
+DEVICE:                                 wlan1
 ACTIVE:                                 nie
 IN-USE:                                  
-DBUS-PATH:                              /org/freedesktop/NetworkManager/AccessPoint/3
+DBUS-PATH:                              /org/freedesktop/NetworkManager/AccessPoint/4
 -------------------------------------------------------------------------------
 
+===============================================================================
+                     Lista skanowania sieci Wi-Fi (wlan1)
+===============================================================================
+
 <<<
-size: 1417
-location: clients/tests/test-client.py:1073:test_004()/701
+size: 1419
+location: clients/tests/test-client.py:1087:test_004()/701
 cmd: $NMCLI --mode multiline --pretty -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: C
 returncode: 0
-stdout: 1222 bytes
+stdout: 1224 bytes
 >>>
 ===============================================================================
                             Wi-Fi scan list (wlan0)
@@ -37645,13 +38225,15 @@ IN-USE:
 DBUS-PATH:                              /org/freedesktop/NetworkManager/AccessPoint/2
 -------------------------------------------------------------------------------
 
+
+
 <<<
-size: 1445
-location: clients/tests/test-client.py:1073:test_004()/702
+size: 1447
+location: clients/tests/test-client.py:1087:test_004()/702
 cmd: $NMCLI --mode multiline --pretty -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 1240 bytes
+stdout: 1242 bytes
 >>>
 ===============================================================================
                      Lista skanowania sieci Wi-Fi (wlan0)
@@ -37675,13 +38257,15 @@ IN-USE:
 DBUS-PATH:                              /org/freedesktop/NetworkManager/AccessPoint/2
 -------------------------------------------------------------------------------
 
+
+
 <<<
-size: 858
-location: clients/tests/test-client.py:1075:test_004()/703
+size: 860
+location: clients/tests/test-client.py:1089:test_004()/703
 cmd: $NMCLI --mode multiline --pretty -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: C
 returncode: 0
-stdout: 661 bytes
+stdout: 663 bytes
 >>>
 ===============================================================================
                             Wi-Fi scan list (wlan0)
@@ -37696,13 +38280,15 @@ BARS:                                   ****
 SECURITY:                               WPA1 WPA2
 -------------------------------------------------------------------------------
 
+
+
 <<<
-size: 883
-location: clients/tests/test-client.py:1075:test_004()/704
+size: 885
+location: clients/tests/test-client.py:1089:test_004()/704
 cmd: $NMCLI --mode multiline --pretty -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 676 bytes
+stdout: 678 bytes
 >>>
 ===============================================================================
                      Lista skanowania sieci Wi-Fi (wlan0)
@@ -37717,13 +38303,15 @@ BARS:                                   ****
 SECURITY:                               WPA1 WPA2
 -------------------------------------------------------------------------------
 
+
+
 <<<
-size: 1530
-location: clients/tests/test-client.py:1078:test_004()/705
+size: 1532
+location: clients/tests/test-client.py:1092:test_004()/705
 cmd: $NMCLI --mode multiline --pretty -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: C
 returncode: 0
-stdout: 1222 bytes
+stdout: 1224 bytes
 >>>
 ===============================================================================
                             Wi-Fi scan list (wlan0)
@@ -37747,13 +38335,15 @@ IN-USE:
 DBUS-PATH:                              /org/freedesktop/NetworkManager/AccessPoint/2
 -------------------------------------------------------------------------------
 
+
+
 <<<
-size: 1558
-location: clients/tests/test-client.py:1078:test_004()/706
+size: 1560
+location: clients/tests/test-client.py:1092:test_004()/706
 cmd: $NMCLI --mode multiline --pretty -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 1240 bytes
+stdout: 1242 bytes
 >>>
 ===============================================================================
                      Lista skanowania sieci Wi-Fi (wlan0)
@@ -37777,13 +38367,15 @@ IN-USE:
 DBUS-PATH:                              /org/freedesktop/NetworkManager/AccessPoint/2
 -------------------------------------------------------------------------------
 
+
+
 <<<
-size: 5874
-location: clients/tests/test-client.py:1080:test_004()/707
+size: 5968
+location: clients/tests/test-client.py:1094:test_004()/707
 cmd: $NMCLI --mode multiline --pretty -f ALL device show wlan0
 lang: C
 returncode: 0
-stdout: 5702 bytes
+stdout: 5796 bytes
 >>>
 ===============================================================================
                             Device details (wlan0)
@@ -37800,6 +38392,8 @@ GENERAL.HWADDR:                         13:E0:74:85:7C:D9
 GENERAL.MTU:                            0
 GENERAL.STATE:                          20 (unavailable)
 GENERAL.REASON:                         0 (No reason given)
+GENERAL.IP4-CONNECTIVITY:               0 (unknown)
+GENERAL.IP6-CONNECTIVITY:               0 (unknown)
 GENERAL.UDI:                            /sys/devices/virtual/wlan0
 GENERAL.IP-IFACE:                       --
 GENERAL.IS-SOFTWARE:                    no
@@ -37844,7 +38438,7 @@ AP[2].CHAN:                             1
 AP[2].RATE:                             54 Mbit/s
 AP[2].SIGNAL:                           81
 AP[2].BARS:                             ****
-AP[2].SECURITY:                         WPA1 WPA2
+AP[2].SECURITY:                         WPA1
 -------------------------------------------------------------------------------
 AP[3].IN-USE:                            
 AP[3].SSID:                             wlan0-ap-3
@@ -37853,7 +38447,7 @@ AP[3].CHAN:                             1
 AP[3].RATE:                             54 Mbit/s
 AP[3].SIGNAL:                           55
 AP[3].BARS:                             **  
-AP[3].SECURITY:                         WPA1 WPA2
+AP[3].SECURITY:                         WPA3
 -------------------------------------------------------------------------------
 IP4.ADDRESS[1]:                         192.168.228.18/32
 IP4.ADDRESS[2]:                         192.168.209.179/25
@@ -37890,12 +38484,12 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | c
 -------------------------------------------------------------------------------
 
 <<<
-size: 5934
-location: clients/tests/test-client.py:1080:test_004()/708
+size: 6030
+location: clients/tests/test-client.py:1094:test_004()/708
 cmd: $NMCLI --mode multiline --pretty -f ALL device show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 5752 bytes
+stdout: 5848 bytes
 >>>
 ===============================================================================
                         Informacje o urządzeniu (wlan0)
@@ -37912,6 +38506,8 @@ GENERAL.HWADDR:                         13:E0:74:85:7C:D9
 GENERAL.MTU:                            0
 GENERAL.STATE:                          20 (niedostępne)
 GENERAL.REASON:                         0 (Nie podano przyczyny)
+GENERAL.IP4-CONNECTIVITY:               0 (nieznane)
+GENERAL.IP6-CONNECTIVITY:               0 (nieznane)
 GENERAL.UDI:                            /sys/devices/virtual/wlan0
 GENERAL.IP-IFACE:                       --
 GENERAL.IS-SOFTWARE:                    nie
@@ -37956,7 +38552,7 @@ AP[2].CHAN:                             1
 AP[2].RATE:                             54 Mb/s
 AP[2].SIGNAL:                           81
 AP[2].BARS:                             ****
-AP[2].SECURITY:                         WPA1 WPA2
+AP[2].SECURITY:                         WPA1
 -------------------------------------------------------------------------------
 AP[3].IN-USE:                            
 AP[3].SSID:                             wlan0-ap-3
@@ -37965,7 +38561,7 @@ AP[3].CHAN:                             1
 AP[3].RATE:                             54 Mb/s
 AP[3].SIGNAL:                           55
 AP[3].BARS:                             **  
-AP[3].SECURITY:                         WPA1 WPA2
+AP[3].SECURITY:                         WPA3
 -------------------------------------------------------------------------------
 IP4.ADDRESS[1]:                         192.168.228.18/32
 IP4.ADDRESS[2]:                         192.168.209.179/25
@@ -38003,7 +38599,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | c
 
 <<<
 size: 2469
-location: clients/tests/test-client.py:1082:test_004()/709
+location: clients/tests/test-client.py:1096:test_004()/709
 cmd: $NMCLI --mode multiline --pretty -f COMMON device show wlan0
 lang: C
 returncode: 0
@@ -38048,7 +38644,7 @@ IP6.DOMAIN[6]:                          sear6.foo4.bar
 
 <<<
 size: 2487
-location: clients/tests/test-client.py:1082:test_004()/710
+location: clients/tests/test-client.py:1096:test_004()/710
 cmd: $NMCLI --mode multiline --pretty -f COMMON device show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
@@ -38092,12 +38688,12 @@ IP6.DOMAIN[6]:                          sear6.foo4.bar
 -------------------------------------------------------------------------------
 
 <<<
-size: 6012
-location: clients/tests/test-client.py:1084:test_004()/711
+size: 6106
+location: clients/tests/test-client.py:1098:test_004()/711
 cmd: $NMCLI --mode multiline --pretty -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0
 lang: C
 returncode: 0
-stdout: 5702 bytes
+stdout: 5796 bytes
 >>>
 ===============================================================================
                             Device details (wlan0)
@@ -38114,6 +38710,8 @@ GENERAL.HWADDR:                         13:E0:74:85:7C:D9
 GENERAL.MTU:                            0
 GENERAL.STATE:                          20 (unavailable)
 GENERAL.REASON:                         0 (No reason given)
+GENERAL.IP4-CONNECTIVITY:               0 (unknown)
+GENERAL.IP6-CONNECTIVITY:               0 (unknown)
 GENERAL.UDI:                            /sys/devices/virtual/wlan0
 GENERAL.IP-IFACE:                       --
 GENERAL.IS-SOFTWARE:                    no
@@ -38158,7 +38756,7 @@ AP[2].CHAN:                             1
 AP[2].RATE:                             54 Mbit/s
 AP[2].SIGNAL:                           81
 AP[2].BARS:                             ****
-AP[2].SECURITY:                         WPA1 WPA2
+AP[2].SECURITY:                         WPA1
 -------------------------------------------------------------------------------
 AP[3].IN-USE:                            
 AP[3].SSID:                             wlan0-ap-3
@@ -38167,7 +38765,7 @@ AP[3].CHAN:                             1
 AP[3].RATE:                             54 Mbit/s
 AP[3].SIGNAL:                           55
 AP[3].BARS:                             **  
-AP[3].SECURITY:                         WPA1 WPA2
+AP[3].SECURITY:                         WPA3
 -------------------------------------------------------------------------------
 IP4.ADDRESS[1]:                         192.168.228.18/32
 IP4.ADDRESS[2]:                         192.168.209.179/25
@@ -38204,12 +38802,12 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | c
 -------------------------------------------------------------------------------
 
 <<<
-size: 6072
-location: clients/tests/test-client.py:1084:test_004()/712
+size: 6168
+location: clients/tests/test-client.py:1098:test_004()/712
 cmd: $NMCLI --mode multiline --pretty -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 5752 bytes
+stdout: 5848 bytes
 >>>
 ===============================================================================
                         Informacje o urządzeniu (wlan0)
@@ -38226,6 +38824,8 @@ GENERAL.HWADDR:                         13:E0:74:85:7C:D9
 GENERAL.MTU:                            0
 GENERAL.STATE:                          20 (niedostępne)
 GENERAL.REASON:                         0 (Nie podano przyczyny)
+GENERAL.IP4-CONNECTIVITY:               0 (nieznane)
+GENERAL.IP6-CONNECTIVITY:               0 (nieznane)
 GENERAL.UDI:                            /sys/devices/virtual/wlan0
 GENERAL.IP-IFACE:                       --
 GENERAL.IS-SOFTWARE:                    nie
@@ -38270,7 +38870,7 @@ AP[2].CHAN:                             1
 AP[2].RATE:                             54 Mb/s
 AP[2].SIGNAL:                           81
 AP[2].BARS:                             ****
-AP[2].SECURITY:                         WPA1 WPA2
+AP[2].SECURITY:                         WPA1
 -------------------------------------------------------------------------------
 AP[3].IN-USE:                            
 AP[3].SSID:                             wlan0-ap-3
@@ -38279,7 +38879,7 @@ AP[3].CHAN:                             1
 AP[3].RATE:                             54 Mb/s
 AP[3].SIGNAL:                           55
 AP[3].BARS:                             **  
-AP[3].SECURITY:                         WPA1 WPA2
+AP[3].SECURITY:                         WPA3
 -------------------------------------------------------------------------------
 IP4.ADDRESS[1]:                         192.168.228.18/32
 IP4.ADDRESS[2]:                         192.168.209.179/25
@@ -38317,7 +38917,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | c
 
 <<<
 size: 5654
-location: clients/tests/test-client.py:1022:test_004()/713
+location: clients/tests/test-client.py:1036:test_004()/713
 cmd: $NMCLI --mode multiline --pretty --color yes con s con-vpn-1
 lang: C
 returncode: 0
@@ -38431,12 +39031,12 @@ VPN.CFG[3]:                             key3 = val3
 -------------------------------------------------------------------------------
 
 <<<
-size: 5694
-location: clients/tests/test-client.py:1022:test_004()/714
+size: 5696
+location: clients/tests/test-client.py:1036:test_004()/714
 cmd: $NMCLI --mode multiline --pretty --color yes con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 5509 bytes
+stdout: 5511 bytes
 >>>
 ===============================================================================
                    Szczegóły profilu połączenia (con-vpn-1)
@@ -38539,7 +39139,7 @@ VPN.TYPE:                               openvpn
 VPN.USERNAME:                           --
 VPN.GATEWAY:                            --
 VPN.BANNER:                             *** VPN connection con-vpn-1 ***
-VPN.VPN-STATE:                          5 - Połączono z VPN
+VPN.VPN-STATE:                          5 — Połączono z VPN
 VPN.CFG[1]:                             key1 = val1
 VPN.CFG[2]:                             key2 = val2
 VPN.CFG[3]:                             key3 = val3
@@ -38547,7 +39147,7 @@ VPN.CFG[3]:                             key3 = val3
 
 <<<
 size: 5654
-location: clients/tests/test-client.py:1024:test_004()/715
+location: clients/tests/test-client.py:1038:test_004()/715
 cmd: $NMCLI --mode multiline --pretty --color yes con s con-vpn-1
 lang: C
 returncode: 0
@@ -38661,12 +39261,12 @@ VPN.CFG[3]:                             key3 = val3
 -------------------------------------------------------------------------------
 
 <<<
-size: 5694
-location: clients/tests/test-client.py:1024:test_004()/716
+size: 5696
+location: clients/tests/test-client.py:1038:test_004()/716
 cmd: $NMCLI --mode multiline --pretty --color yes con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 5509 bytes
+stdout: 5511 bytes
 >>>
 ===============================================================================
                    Szczegóły profilu połączenia (con-vpn-1)
@@ -38769,7 +39369,7 @@ VPN.TYPE:                               openvpn
 VPN.USERNAME:                           --
 VPN.GATEWAY:                            --
 VPN.BANNER:                             *** VPN connection con-vpn-1 ***
-VPN.VPN-STATE:                          5 - Połączono z VPN
+VPN.VPN-STATE:                          5 — Połączono z VPN
 VPN.CFG[1]:                             key1 = val1
 VPN.CFG[2]:                             key2 = val2
 VPN.CFG[3]:                             key3 = val3
@@ -38777,7 +39377,7 @@ VPN.CFG[3]:                             key3 = val3
 
 <<<
 size: 4180
-location: clients/tests/test-client.py:1027:test_004()/717
+location: clients/tests/test-client.py:1041:test_004()/717
 cmd: $NMCLI --mode multiline --pretty --color yes -f ALL con s con-vpn-1
 lang: C
 returncode: 0
@@ -38867,7 +39467,7 @@ proxy.pac-script:                       --
 
 <<<
 size: 4205
-location: clients/tests/test-client.py:1027:test_004()/718
+location: clients/tests/test-client.py:1041:test_004()/718
 cmd: $NMCLI --mode multiline --pretty --color yes -f ALL con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
@@ -38957,7 +39557,7 @@ proxy.pac-script:                       --
 
 <<<
 size: 814
-location: clients/tests/test-client.py:1033:test_004()/719
+location: clients/tests/test-client.py:1047:test_004()/719
 cmd: $NMCLI --mode multiline --pretty --color yes -f VPN con s con-vpn-1
 lang: C
 returncode: 0
@@ -38976,7 +39576,7 @@ vpn.timeout:                            0
 
 <<<
 size: 830
-location: clients/tests/test-client.py:1033:test_004()/720
+location: clients/tests/test-client.py:1047:test_004()/720
 cmd: $NMCLI --mode multiline --pretty --color yes -f VPN con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
@@ -38995,7 +39595,7 @@ vpn.timeout:                            0
 
 <<<
 size: 1165
-location: clients/tests/test-client.py:1036:test_004()/721
+location: clients/tests/test-client.py:1050:test_004()/721
 cmd: $NMCLI --mode multiline --pretty --color yes -f GENERAL con s con-vpn-1
 lang: C
 returncode: 0
@@ -39020,7 +39620,7 @@ GENERAL.MASTER-PATH:                    --
 
 <<<
 size: 1185
-location: clients/tests/test-client.py:1036:test_004()/722
+location: clients/tests/test-client.py:1050:test_004()/722
 cmd: $NMCLI --mode multiline --pretty --color yes -f GENERAL con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
@@ -39045,7 +39645,7 @@ GENERAL.MASTER-PATH:                    --
 
 <<<
 size: 1877
-location: clients/tests/test-client.py:1039:test_004()/723
+location: clients/tests/test-client.py:1053:test_004()/723
 cmd: $NMCLI --mode multiline --pretty --color yes dev s
 lang: C
 returncode: 0
@@ -39054,6 +39654,11 @@ stdout: 1712 bytes
 ===============================================================================
                                Status of devices
 ===============================================================================
+DEVICE:                                 wlan0
+TYPE:                                   wifi
+STATE:                                  unavailable
+CONNECTION:                             con-vpn-1
+-------------------------------------------------------------------------------
 DEVICE:                                 eth0
 TYPE:                                   ethernet
 STATE:                                  unavailable
@@ -39074,15 +39679,10 @@ TYPE:                                   wifi
 STATE:                                  unavailable
 CONNECTION:                             --
 -------------------------------------------------------------------------------
-DEVICE:                                 wlan0
-TYPE:                                   wifi
-STATE:                                  unavailable
-CONNECTION:                             con-vpn-1
--------------------------------------------------------------------------------
 
 <<<
 size: 1892
-location: clients/tests/test-client.py:1039:test_004()/724
+location: clients/tests/test-client.py:1053:test_004()/724
 cmd: $NMCLI --mode multiline --pretty --color yes dev s
 lang: pl_PL.UTF-8
 returncode: 0
@@ -39091,6 +39691,11 @@ stdout: 1717 bytes
 ===============================================================================
                                 Stan urządzenia
 ===============================================================================
+DEVICE:                                 wlan0
+TYPE:                                   wifi
+STATE:                                  niedostępne
+CONNECTION:                             con-vpn-1
+-------------------------------------------------------------------------------
 DEVICE:                                 eth0
 TYPE:                                   ethernet
 STATE:                                  niedostępne
@@ -39111,26 +39716,33 @@ TYPE:                                   wifi
 STATE:                                  niedostępne
 CONNECTION:                             --
 -------------------------------------------------------------------------------
-DEVICE:                                 wlan0
-TYPE:                                   wifi
-STATE:                                  niedostępne
-CONNECTION:                             con-vpn-1
--------------------------------------------------------------------------------
 
 <<<
-size: 2931
-location: clients/tests/test-client.py:1042:test_004()/725
+size: 3491
+location: clients/tests/test-client.py:1056:test_004()/725
 cmd: $NMCLI --mode multiline --pretty --color yes -f all dev status
 lang: C
 returncode: 0
-stdout: 2754 bytes
+stdout: 3314 bytes
 >>>
 ===============================================================================
                                Status of devices
 ===============================================================================
+DEVICE:                                 wlan0
+TYPE:                                   wifi
+STATE:                                  unavailable
+IP4-CONNECTIVITY:                       unknown
+IP6-CONNECTIVITY:                       unknown
+DBUS-PATH:                              /org/freedesktop/NetworkManager/Devices/3
+CONNECTION:                             con-vpn-1
+CON-UUID:                               UUID-con-vpn-1-REPLACED-REPLACED-REP
+CON-PATH:                               /org/freedesktop/NetworkManager/ActiveConnection/2
+-------------------------------------------------------------------------------
 DEVICE:                                 eth0
 TYPE:                                   ethernet
 STATE:                                  unavailable
+IP4-CONNECTIVITY:                       unknown
+IP6-CONNECTIVITY:                       unknown
 DBUS-PATH:                              /org/freedesktop/NetworkManager/Devices/1
 CONNECTION:                             --
 CON-UUID:                               --
@@ -39139,6 +39751,8 @@ CON-PATH:                               --
 DEVICE:                                 eth1
 TYPE:                                   ethernet
 STATE:                                  unavailable
+IP4-CONNECTIVITY:                       unknown
+IP6-CONNECTIVITY:                       unknown
 DBUS-PATH:                              /org/freedesktop/NetworkManager/Devices/2
 CONNECTION:                             --
 CON-UUID:                               --
@@ -39147,6 +39761,8 @@ CON-PATH:                               --
 DEVICE:                                 wlan1
 TYPE:                                   wifi
 STATE:                                  unavailable
+IP4-CONNECTIVITY:                       unknown
+IP6-CONNECTIVITY:                       unknown
 DBUS-PATH:                              /org/freedesktop/NetworkManager/Devices/4
 CONNECTION:                             --
 CON-UUID:                               --
@@ -39155,34 +39771,40 @@ CON-PATH:                               --
 DEVICE:                                 wlan1
 TYPE:                                   wifi
 STATE:                                  unavailable
+IP4-CONNECTIVITY:                       unknown
+IP6-CONNECTIVITY:                       unknown
 DBUS-PATH:                              /org/freedesktop/NetworkManager/Devices/5
 CONNECTION:                             --
 CON-UUID:                               --
 CON-PATH:                               --
 -------------------------------------------------------------------------------
-DEVICE:                                 wlan0
-TYPE:                                   wifi
-STATE:                                  unavailable
-DBUS-PATH:                              /org/freedesktop/NetworkManager/Devices/3
-CONNECTION:                             con-vpn-1
-CON-UUID:                               UUID-con-vpn-1-REPLACED-REPLACED-REP
-CON-PATH:                               /org/freedesktop/NetworkManager/ActiveConnection/2
--------------------------------------------------------------------------------
 
 <<<
-size: 2946
-location: clients/tests/test-client.py:1042:test_004()/726
+size: 3516
+location: clients/tests/test-client.py:1056:test_004()/726
 cmd: $NMCLI --mode multiline --pretty --color yes -f all dev status
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2759 bytes
+stdout: 3329 bytes
 >>>
 ===============================================================================
                                 Stan urządzenia
 ===============================================================================
+DEVICE:                                 wlan0
+TYPE:                                   wifi
+STATE:                                  niedostępne
+IP4-CONNECTIVITY:                       nieznane
+IP6-CONNECTIVITY:                       nieznane
+DBUS-PATH:                              /org/freedesktop/NetworkManager/Devices/3
+CONNECTION:                             con-vpn-1
+CON-UUID:                               UUID-con-vpn-1-REPLACED-REPLACED-REP
+CON-PATH:                               /org/freedesktop/NetworkManager/ActiveConnection/2
+-------------------------------------------------------------------------------
 DEVICE:                                 eth0
 TYPE:                                   ethernet
 STATE:                                  niedostępne
+IP4-CONNECTIVITY:                       nieznane
+IP6-CONNECTIVITY:                       nieznane
 DBUS-PATH:                              /org/freedesktop/NetworkManager/Devices/1
 CONNECTION:                             --
 CON-UUID:                               --
@@ -39191,6 +39813,8 @@ CON-PATH:                               --
 DEVICE:                                 eth1
 TYPE:                                   ethernet
 STATE:                                  niedostępne
+IP4-CONNECTIVITY:                       nieznane
+IP6-CONNECTIVITY:                       nieznane
 DBUS-PATH:                              /org/freedesktop/NetworkManager/Devices/2
 CONNECTION:                             --
 CON-UUID:                               --
@@ -39199,6 +39823,8 @@ CON-PATH:                               --
 DEVICE:                                 wlan1
 TYPE:                                   wifi
 STATE:                                  niedostępne
+IP4-CONNECTIVITY:                       nieznane
+IP6-CONNECTIVITY:                       nieznane
 DBUS-PATH:                              /org/freedesktop/NetworkManager/Devices/4
 CONNECTION:                             --
 CON-UUID:                               --
@@ -39207,28 +39833,59 @@ CON-PATH:                               --
 DEVICE:                                 wlan1
 TYPE:                                   wifi
 STATE:                                  niedostępne
+IP4-CONNECTIVITY:                       nieznane
+IP6-CONNECTIVITY:                       nieznane
 DBUS-PATH:                              /org/freedesktop/NetworkManager/Devices/5
 CONNECTION:                             --
 CON-UUID:                               --
 CON-PATH:                               --
 -------------------------------------------------------------------------------
-DEVICE:                                 wlan0
-TYPE:                                   wifi
-STATE:                                  niedostępne
-DBUS-PATH:                              /org/freedesktop/NetworkManager/Devices/3
-CONNECTION:                             con-vpn-1
-CON-UUID:                               UUID-con-vpn-1-REPLACED-REPLACED-REP
-CON-PATH:                               /org/freedesktop/NetworkManager/ActiveConnection/2
--------------------------------------------------------------------------------
 
 <<<
 size: 12902
-location: clients/tests/test-client.py:1045:test_004()/727
+location: clients/tests/test-client.py:1059:test_004()/727
 cmd: $NMCLI --mode multiline --pretty --color yes dev show
 lang: C
 returncode: 0
 stdout: 12733 bytes
 >>>
+===============================================================================
+                            Device details (wlan0)
+===============================================================================
+GENERAL.DEVICE:                         wlan0
+-------------------------------------------------------------------------------
+GENERAL.TYPE:                           wifi
+-------------------------------------------------------------------------------
+GENERAL.HWADDR:                         13:E0:74:85:7C:D9
+-------------------------------------------------------------------------------
+GENERAL.MTU:                            0
+-------------------------------------------------------------------------------
+GENERAL.STATE:                          20 (unavailable)
+-------------------------------------------------------------------------------
+GENERAL.CONNECTION:                     con-vpn-1
+-------------------------------------------------------------------------------
+GENERAL.CON-PATH:                       /org/freedesktop/NetworkManager/ActiveConnection/2
+-------------------------------------------------------------------------------
+IP4.ADDRESS[1]:                         192.168.228.18/32
+IP4.ADDRESS[2]:                         192.168.209.179/25
+IP4.GATEWAY:                            192.168.41.120
+IP4.DOMAIN[1]:                          sear4.foo2.bar
+IP4.DOMAIN[2]:                          sear4.fo.x.y
+IP4.DOMAIN[3]:                          sear4.foo1.bar
+IP4.DOMAIN[4]:                          sear4.foo4.bar
+IP4.DOMAIN[5]:                          sear4.fo.o.bar
+IP4.WINS[1]:                            192.168.120.79
+-------------------------------------------------------------------------------
+IP6.GATEWAY:                            --
+IP6.ROUTE[1]:                           dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086
+IP6.DOMAIN[1]:                          sear6.foo2.bar
+IP6.DOMAIN[2]:                          sear6.foo1.bar
+IP6.DOMAIN[3]:                          sear6.fo.x.y
+IP6.DOMAIN[4]:                          sear6.fo.o.bar
+IP6.DOMAIN[5]:                          sear6.foo3.bar
+IP6.DOMAIN[6]:                          sear6.foo4.bar
+-------------------------------------------------------------------------------
+
 ===============================================================================
                              Device details (eth0)
 ===============================================================================
@@ -39392,8 +40049,16 @@ IP6.DNS[1]:                             2001:a::2934:bd66:550d:ec19
 IP6.DOMAIN[1]:                          sear6.fo.x.y
 -------------------------------------------------------------------------------
 
+<<<
+size: 12966
+location: clients/tests/test-client.py:1059:test_004()/728
+cmd: $NMCLI --mode multiline --pretty --color yes dev show
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 12787 bytes
+>>>
 ===============================================================================
-                            Device details (wlan0)
+                        Informacje o urządzeniu (wlan0)
 ===============================================================================
 GENERAL.DEVICE:                         wlan0
 -------------------------------------------------------------------------------
@@ -39403,7 +40068,7 @@ GENERAL.HWADDR:                         13:E0:74:85:7C:D9
 -------------------------------------------------------------------------------
 GENERAL.MTU:                            0
 -------------------------------------------------------------------------------
-GENERAL.STATE:                          20 (unavailable)
+GENERAL.STATE:                          20 (niedostępne)
 -------------------------------------------------------------------------------
 GENERAL.CONNECTION:                     con-vpn-1
 -------------------------------------------------------------------------------
@@ -39429,14 +40094,6 @@ IP6.DOMAIN[5]:                          sear6.foo3.bar
 IP6.DOMAIN[6]:                          sear6.foo4.bar
 -------------------------------------------------------------------------------
 
-<<<
-size: 12966
-location: clients/tests/test-client.py:1045:test_004()/728
-cmd: $NMCLI --mode multiline --pretty --color yes dev show
-lang: pl_PL.UTF-8
-returncode: 0
-stdout: 12787 bytes
->>>
 ===============================================================================
                         Informacje o urządzeniu (eth0)
 ===============================================================================
@@ -39600,22 +40257,85 @@ IP6.DNS[1]:                             2001:a::2934:bd66:550d:ec19
 IP6.DOMAIN[1]:                          sear6.fo.x.y
 -------------------------------------------------------------------------------
 
+<<<
+size: 25562
+location: clients/tests/test-client.py:1062:test_004()/729
+cmd: $NMCLI --mode multiline --pretty --color yes -f all dev show
+lang: C
+returncode: 0
+stdout: 25386 bytes
+>>>
 ===============================================================================
-                        Informacje o urządzeniu (wlan0)
+                            Device details (wlan0)
 ===============================================================================
 GENERAL.DEVICE:                         wlan0
--------------------------------------------------------------------------------
 GENERAL.TYPE:                           wifi
--------------------------------------------------------------------------------
+GENERAL.NM-TYPE:                        NMDeviceWifi
+GENERAL.VENDOR:                         --
+GENERAL.PRODUCT:                        --
+GENERAL.DRIVER:                         virtual
+GENERAL.DRIVER-VERSION:                 --
+GENERAL.FIRMWARE-VERSION:               --
 GENERAL.HWADDR:                         13:E0:74:85:7C:D9
--------------------------------------------------------------------------------
 GENERAL.MTU:                            0
+GENERAL.STATE:                          20 (unavailable)
+GENERAL.REASON:                         0 (No reason given)
+GENERAL.IP4-CONNECTIVITY:               0 (unknown)
+GENERAL.IP6-CONNECTIVITY:               0 (unknown)
+GENERAL.UDI:                            /sys/devices/virtual/wlan0
+GENERAL.IP-IFACE:                       --
+GENERAL.IS-SOFTWARE:                    no
+GENERAL.NM-MANAGED:                     yes
+GENERAL.AUTOCONNECT:                    yes
+GENERAL.FIRMWARE-MISSING:               no
+GENERAL.NM-PLUGIN-MISSING:              no
+GENERAL.PHYS-PORT-ID:                   --
+GENERAL.CONNECTION:                     con-vpn-1
+GENERAL.CON-UUID:                       UUID-con-vpn-1-REPLACED-REPLACED-REP
+GENERAL.CON-PATH:                       /org/freedesktop/NetworkManager/ActiveConnection/2
+GENERAL.METERED:                        unknown
 -------------------------------------------------------------------------------
-GENERAL.STATE:                          20 (niedostępne)
+CAPABILITIES.CARRIER-DETECT:            no
+CAPABILITIES.SPEED:                     unknown
+CAPABILITIES.IS-SOFTWARE:               no
+CAPABILITIES.SRIOV:                     no
 -------------------------------------------------------------------------------
-GENERAL.CONNECTION:                     con-vpn-1
+WIFI-PROPERTIES.WEP:                    yes
+WIFI-PROPERTIES.WPA:                    yes
+WIFI-PROPERTIES.WPA2:                   yes
+WIFI-PROPERTIES.TKIP:                   yes
+WIFI-PROPERTIES.CCMP:                   yes
+WIFI-PROPERTIES.AP:                     yes
+WIFI-PROPERTIES.ADHOC:                  yes
+WIFI-PROPERTIES.2GHZ:                   unknown
+WIFI-PROPERTIES.5GHZ:                   unknown
 -------------------------------------------------------------------------------
-GENERAL.CON-PATH:                       /org/freedesktop/NetworkManager/ActiveConnection/2
+AP[1].IN-USE:                            
+AP[1].SSID:                             wlan0-ap-2
+AP[1].MODE:                             Infra
+AP[1].CHAN:                             1
+AP[1].RATE:                             54 Mbit/s
+AP[1].SIGNAL:                           92
+AP[1].BARS:                             ****
+AP[1].SECURITY:                         WPA1 WPA2
+-------------------------------------------------------------------------------
+AP[2].IN-USE:                            
+AP[2].SSID:                             wlan0-ap-1
+AP[2].MODE:                             Infra
+AP[2].CHAN:                             1
+AP[2].RATE:                             54 Mbit/s
+AP[2].SIGNAL:                           81
+AP[2].BARS:                             ****
+AP[2].SECURITY:                         WPA1
+-------------------------------------------------------------------------------
+AP[3].IN-USE:                            
+AP[3].SSID:                             wlan0-ap-3
+AP[3].MODE:                             Infra
+AP[3].CHAN:                             1
+AP[3].RATE:                             54 Mbit/s
+AP[3].SIGNAL:                           55
+AP[3].BARS:                             **  
+AP[3].SECURITY:                         WPA3
 -------------------------------------------------------------------------------
 IP4.ADDRESS[1]:                         192.168.228.18/32
 IP4.ADDRESS[2]:                         192.168.209.179/25
@@ -39627,6 +40347,11 @@ IP4.DOMAIN[4]:                          sear4.foo4.bar
 IP4.DOMAIN[5]:                          sear4.fo.o.bar
 IP4.WINS[1]:                            192.168.120.79
 -------------------------------------------------------------------------------
+DHCP4.OPTION[1]:                        dhcp-4-opt-0 = val-0
+DHCP4.OPTION[2]:                        dhcp-4-opt-2 = val-2
+DHCP4.OPTION[3]:                        dhcp-4-opt-4 = val-4
+DHCP4.OPTION[4]:                        dhcp-4-opt-7 = val-7
+-------------------------------------------------------------------------------
 IP6.GATEWAY:                            --
 IP6.ROUTE[1]:                           dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086
 IP6.DOMAIN[1]:                          sear6.foo2.bar
@@ -39636,15 +40361,16 @@ IP6.DOMAIN[4]:                          sear6.fo.o.bar
 IP6.DOMAIN[5]:                          sear6.foo3.bar
 IP6.DOMAIN[6]:                          sear6.foo4.bar
 -------------------------------------------------------------------------------
+DHCP6.OPTION[1]:                        dhcp-6-opt-1 = val-1
+DHCP6.OPTION[2]:                        dhcp-6-opt-2 = val-2
+DHCP6.OPTION[3]:                        dhcp-6-opt-3 = val-3
+DHCP6.OPTION[4]:                        dhcp-6-opt-4 = val-4
+DHCP6.OPTION[5]:                        dhcp-6-opt-5 = val-5
+-------------------------------------------------------------------------------
+CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings/Connection/{2}
+CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
+-------------------------------------------------------------------------------
 
-<<<
-size: 25052
-location: clients/tests/test-client.py:1048:test_004()/729
-cmd: $NMCLI --mode multiline --pretty --color yes -f all dev show
-lang: C
-returncode: 0
-stdout: 24876 bytes
->>>
 ===============================================================================
                              Device details (eth0)
 ===============================================================================
@@ -39660,6 +40386,8 @@ GENERAL.HWADDR:                         AB:B7:BF:E2:48:E8
 GENERAL.MTU:                            0
 GENERAL.STATE:                          20 (unavailable)
 GENERAL.REASON:                         0 (No reason given)
+GENERAL.IP4-CONNECTIVITY:               0 (unknown)
+GENERAL.IP6-CONNECTIVITY:               0 (unknown)
 GENERAL.UDI:                            /sys/devices/virtual/eth0
 GENERAL.IP-IFACE:                       --
 GENERAL.IS-SOFTWARE:                    no
@@ -39732,6 +40460,8 @@ GENERAL.HWADDR:                         E7:78:B1:93:2B:22
 GENERAL.MTU:                            0
 GENERAL.STATE:                          20 (unavailable)
 GENERAL.REASON:                         0 (No reason given)
+GENERAL.IP4-CONNECTIVITY:               0 (unknown)
+GENERAL.IP6-CONNECTIVITY:               0 (unknown)
 GENERAL.UDI:                            /sys/devices/virtual/eth1
 GENERAL.IP-IFACE:                       --
 GENERAL.IS-SOFTWARE:                    no
@@ -39811,6 +40541,8 @@ GENERAL.HWADDR:                         21:E9:64:81:8C:A8
 GENERAL.MTU:                            0
 GENERAL.STATE:                          20 (unavailable)
 GENERAL.REASON:                         0 (No reason given)
+GENERAL.IP4-CONNECTIVITY:               0 (unknown)
+GENERAL.IP6-CONNECTIVITY:               0 (unknown)
 GENERAL.UDI:                            /sys/devices/virtual/wlan1
 GENERAL.IP-IFACE:                       --
 GENERAL.IS-SOFTWARE:                    no
@@ -39909,6 +40641,8 @@ GENERAL.HWADDR:                         71:52:AD:63:5C:7C
 GENERAL.MTU:                            0
 GENERAL.STATE:                          20 (unavailable)
 GENERAL.REASON:                         0 (No reason given)
+GENERAL.IP4-CONNECTIVITY:               0 (unknown)
+GENERAL.IP6-CONNECTIVITY:               0 (unknown)
 GENERAL.UDI:                            /sys/devices/virtual/wlan1
 GENERAL.IP-IFACE:                       --
 GENERAL.IS-SOFTWARE:                    no
@@ -39971,8 +40705,16 @@ CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings
 CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 -------------------------------------------------------------------------------
 
+<<<
+size: 25745
+location: clients/tests/test-client.py:1062:test_004()/730
+cmd: $NMCLI --mode multiline --pretty --color yes -f all dev show
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 25559 bytes
+>>>
 ===============================================================================
-                            Device details (wlan0)
+                        Informacje o urządzeniu (wlan0)
 ===============================================================================
 GENERAL.DEVICE:                         wlan0
 GENERAL.TYPE:                           wifi
@@ -39984,62 +40726,64 @@ GENERAL.DRIVER-VERSION:                 --
 GENERAL.FIRMWARE-VERSION:               --
 GENERAL.HWADDR:                         13:E0:74:85:7C:D9
 GENERAL.MTU:                            0
-GENERAL.STATE:                          20 (unavailable)
-GENERAL.REASON:                         0 (No reason given)
+GENERAL.STATE:                          20 (niedostępne)
+GENERAL.REASON:                         0 (Nie podano przyczyny)
+GENERAL.IP4-CONNECTIVITY:               0 (nieznane)
+GENERAL.IP6-CONNECTIVITY:               0 (nieznane)
 GENERAL.UDI:                            /sys/devices/virtual/wlan0
 GENERAL.IP-IFACE:                       --
-GENERAL.IS-SOFTWARE:                    no
-GENERAL.NM-MANAGED:                     yes
-GENERAL.AUTOCONNECT:                    yes
-GENERAL.FIRMWARE-MISSING:               no
-GENERAL.NM-PLUGIN-MISSING:              no
+GENERAL.IS-SOFTWARE:                    nie
+GENERAL.NM-MANAGED:                     tak
+GENERAL.AUTOCONNECT:                    tak
+GENERAL.FIRMWARE-MISSING:               nie
+GENERAL.NM-PLUGIN-MISSING:              nie
 GENERAL.PHYS-PORT-ID:                   --
 GENERAL.CONNECTION:                     con-vpn-1
 GENERAL.CON-UUID:                       UUID-con-vpn-1-REPLACED-REPLACED-REP
 GENERAL.CON-PATH:                       /org/freedesktop/NetworkManager/ActiveConnection/2
-GENERAL.METERED:                        unknown
+GENERAL.METERED:                        nieznane
 -------------------------------------------------------------------------------
-CAPABILITIES.CARRIER-DETECT:            no
-CAPABILITIES.SPEED:                     unknown
-CAPABILITIES.IS-SOFTWARE:               no
-CAPABILITIES.SRIOV:                     no
+CAPABILITIES.CARRIER-DETECT:            nie
+CAPABILITIES.SPEED:                     nieznane
+CAPABILITIES.IS-SOFTWARE:               nie
+CAPABILITIES.SRIOV:                     nie
 -------------------------------------------------------------------------------
-WIFI-PROPERTIES.WEP:                    yes
-WIFI-PROPERTIES.WPA:                    yes
-WIFI-PROPERTIES.WPA2:                   yes
-WIFI-PROPERTIES.TKIP:                   yes
-WIFI-PROPERTIES.CCMP:                   yes
-WIFI-PROPERTIES.AP:                     yes
-WIFI-PROPERTIES.ADHOC:                  yes
-WIFI-PROPERTIES.2GHZ:                   unknown
-WIFI-PROPERTIES.5GHZ:                   unknown
+WIFI-PROPERTIES.WEP:                    tak
+WIFI-PROPERTIES.WPA:                    tak
+WIFI-PROPERTIES.WPA2:                   tak
+WIFI-PROPERTIES.TKIP:                   tak
+WIFI-PROPERTIES.CCMP:                   tak
+WIFI-PROPERTIES.AP:                     tak
+WIFI-PROPERTIES.ADHOC:                  tak
+WIFI-PROPERTIES.2GHZ:                   nieznane
+WIFI-PROPERTIES.5GHZ:                   nieznane
 -------------------------------------------------------------------------------
 AP[1].IN-USE:                            
 AP[1].SSID:                             wlan0-ap-2
-AP[1].MODE:                             Infra
+AP[1].MODE:                             Infrastruktura
 AP[1].CHAN:                             1
-AP[1].RATE:                             54 Mbit/s
+AP[1].RATE:                             54 Mb/s
 AP[1].SIGNAL:                           92
 AP[1].BARS:                             ****
 AP[1].SECURITY:                         WPA1 WPA2
 -------------------------------------------------------------------------------
 AP[2].IN-USE:                            
 AP[2].SSID:                             wlan0-ap-1
-AP[2].MODE:                             Infra
+AP[2].MODE:                             Infrastruktura
 AP[2].CHAN:                             1
-AP[2].RATE:                             54 Mbit/s
+AP[2].RATE:                             54 Mb/s
 AP[2].SIGNAL:                           81
 AP[2].BARS:                             ****
-AP[2].SECURITY:                         WPA1 WPA2
+AP[2].SECURITY:                         WPA1
 -------------------------------------------------------------------------------
 AP[3].IN-USE:                            
 AP[3].SSID:                             wlan0-ap-3
-AP[3].MODE:                             Infra
+AP[3].MODE:                             Infrastruktura
 AP[3].CHAN:                             1
-AP[3].RATE:                             54 Mbit/s
+AP[3].RATE:                             54 Mb/s
 AP[3].SIGNAL:                           55
 AP[3].BARS:                             **  
-AP[3].SECURITY:                         WPA1 WPA2
+AP[3].SECURITY:                         WPA3
 -------------------------------------------------------------------------------
 IP4.ADDRESS[1]:                         192.168.228.18/32
 IP4.ADDRESS[2]:                         192.168.209.179/25
@@ -40075,14 +40819,6 @@ CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings
 CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 -------------------------------------------------------------------------------
 
-<<<
-size: 25225
-location: clients/tests/test-client.py:1048:test_004()/730
-cmd: $NMCLI --mode multiline --pretty --color yes -f all dev show
-lang: pl_PL.UTF-8
-returncode: 0
-stdout: 25039 bytes
->>>
 ===============================================================================
                         Informacje o urządzeniu (eth0)
 ===============================================================================
@@ -40098,6 +40834,8 @@ GENERAL.HWADDR:                         AB:B7:BF:E2:48:E8
 GENERAL.MTU:                            0
 GENERAL.STATE:                          20 (niedostępne)
 GENERAL.REASON:                         0 (Nie podano przyczyny)
+GENERAL.IP4-CONNECTIVITY:               0 (nieznane)
+GENERAL.IP6-CONNECTIVITY:               0 (nieznane)
 GENERAL.UDI:                            /sys/devices/virtual/eth0
 GENERAL.IP-IFACE:                       --
 GENERAL.IS-SOFTWARE:                    nie
@@ -40170,6 +40908,8 @@ GENERAL.HWADDR:                         E7:78:B1:93:2B:22
 GENERAL.MTU:                            0
 GENERAL.STATE:                          20 (niedostępne)
 GENERAL.REASON:                         0 (Nie podano przyczyny)
+GENERAL.IP4-CONNECTIVITY:               0 (nieznane)
+GENERAL.IP6-CONNECTIVITY:               0 (nieznane)
 GENERAL.UDI:                            /sys/devices/virtual/eth1
 GENERAL.IP-IFACE:                       --
 GENERAL.IS-SOFTWARE:                    nie
@@ -40249,6 +40989,8 @@ GENERAL.HWADDR:                         21:E9:64:81:8C:A8
 GENERAL.MTU:                            0
 GENERAL.STATE:                          20 (niedostępne)
 GENERAL.REASON:                         0 (Nie podano przyczyny)
+GENERAL.IP4-CONNECTIVITY:               0 (nieznane)
+GENERAL.IP6-CONNECTIVITY:               0 (nieznane)
 GENERAL.UDI:                            /sys/devices/virtual/wlan1
 GENERAL.IP-IFACE:                       --
 GENERAL.IS-SOFTWARE:                    nie
@@ -40277,142 +41019,65 @@ WIFI-PROPERTIES.ADHOC:                  tak
 WIFI-PROPERTIES.2GHZ:                   nieznane
 WIFI-PROPERTIES.5GHZ:                   nieznane
 -------------------------------------------------------------------------------
-AP[1].IN-USE:                            
-AP[1].SSID:                             wlan1-ap-4
-AP[1].MODE:                             Infrastruktura
-AP[1].CHAN:                             1
-AP[1].RATE:                             54 Mb/s
-AP[1].SIGNAL:                           48
-AP[1].BARS:                             **  
-AP[1].SECURITY:                         WPA1 WPA2
--------------------------------------------------------------------------------
-IP4.GATEWAY:                            192.168.57.160
-IP4.ROUTE[1]:                           dst = 192.168.36.106/21, nh = 192.168.199.128, mt = 979274165
-IP4.ROUTE[2]:                           dst = 192.168.238.130/19, nh = 0.0.0.0
-IP4.ROUTE[3]:                           dst = 192.168.224.39/32, nh = 192.168.148.69
-IP4.DNS[1]:                             192.168.61.83
-IP4.DOMAIN[1]:                          sear4.foo4.bar
-IP4.DOMAIN[2]:                          sear4.fo.x.y
-IP4.DOMAIN[3]:                          sear4.foo2.bar
-IP4.DOMAIN[4]:                          sear4.foo1.bar
-IP4.DOMAIN[5]:                          sear4.fo.o.bar
-IP4.DOMAIN[6]:                          sear4.foo3.bar
--------------------------------------------------------------------------------
-DHCP4.OPTION[1]:                        dhcp-4-opt-0 = val-0
-DHCP4.OPTION[2]:                        dhcp-4-opt-1 = val-1
-DHCP4.OPTION[3]:                        dhcp-4-opt-2 = val-2
-DHCP4.OPTION[4]:                        dhcp-4-opt-4 = val-4
-DHCP4.OPTION[5]:                        dhcp-4-opt-6 = val-6
-DHCP4.OPTION[6]:                        dhcp-4-opt-7 = val-7
-DHCP4.OPTION[7]:                        dhcp-4-opt-8 = val-8
-DHCP4.OPTION[8]:                        dhcp-4-opt-9 = val-9
--------------------------------------------------------------------------------
-IP6.ADDRESS[1]:                         2001:a::fa05:2ab4:9300:e8fe/116
-IP6.ADDRESS[2]:                         2001:a::e9cf:bd3:caba:99b3/86
-IP6.ADDRESS[3]:                         2001:a::2be6:44fa:2c95:5559/78
-IP6.GATEWAY:                            2001:a::4d70:d91a:770f:2319
-IP6.ROUTE[1]:                           dst = 2001:a::3cb2:719d:bb00:b22f/66, nh = 2001:a::81b1:58b9:7237:3511, mt = 2280277732
-IP6.ROUTE[2]:                           dst = 2001:a::986f:983c:5eb:1c7d/99, nh = ::, mt = 1204008676
-IP6.DNS[1]:                             2001:a::85e7:3d7d:53e8:50ac
-IP6.DNS[2]:                             2001:a::1c5:9cb5:e86d:25a5
-IP6.DOMAIN[1]:                          sear6.foo4.bar
-IP6.DOMAIN[2]:                          sear6.foo2.bar
--------------------------------------------------------------------------------
-DHCP6.OPTION[1]:                        dhcp-6-opt-0 = val-0
-DHCP6.OPTION[2]:                        dhcp-6-opt-1 = val-1
-DHCP6.OPTION[3]:                        dhcp-6-opt-2 = val-2
-DHCP6.OPTION[4]:                        dhcp-6-opt-3 = val-3
-DHCP6.OPTION[5]:                        dhcp-6-opt-4 = val-4
-DHCP6.OPTION[6]:                        dhcp-6-opt-5 = val-5
-DHCP6.OPTION[7]:                        dhcp-6-opt-6 = val-6
-DHCP6.OPTION[8]:                        dhcp-6-opt-7 = val-7
-DHCP6.OPTION[9]:                        dhcp-6-opt-9 = val-9
--------------------------------------------------------------------------------
-CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings/Connection/{2}
-CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
--------------------------------------------------------------------------------
-
-===============================================================================
-                        Informacje o urządzeniu (wlan1)
-===============================================================================
-GENERAL.DEVICE:                         wlan1
-GENERAL.TYPE:                           wifi
-GENERAL.NM-TYPE:                        NMDeviceWifi
-GENERAL.VENDOR:                         --
-GENERAL.PRODUCT:                        --
-GENERAL.DRIVER:                         virtual
-GENERAL.DRIVER-VERSION:                 --
-GENERAL.FIRMWARE-VERSION:               --
-GENERAL.HWADDR:                         71:52:AD:63:5C:7C
-GENERAL.MTU:                            0
-GENERAL.STATE:                          20 (niedostępne)
-GENERAL.REASON:                         0 (Nie podano przyczyny)
-GENERAL.UDI:                            /sys/devices/virtual/wlan1
-GENERAL.IP-IFACE:                       --
-GENERAL.IS-SOFTWARE:                    nie
-GENERAL.NM-MANAGED:                     tak
-GENERAL.AUTOCONNECT:                    tak
-GENERAL.FIRMWARE-MISSING:               nie
-GENERAL.NM-PLUGIN-MISSING:              nie
-GENERAL.PHYS-PORT-ID:                   --
-GENERAL.CONNECTION:                     --
-GENERAL.CON-UUID:                       --
-GENERAL.CON-PATH:                       --
-GENERAL.METERED:                        nieznane
--------------------------------------------------------------------------------
-CAPABILITIES.CARRIER-DETECT:            nie
-CAPABILITIES.SPEED:                     nieznane
-CAPABILITIES.IS-SOFTWARE:               nie
-CAPABILITIES.SRIOV:                     nie
--------------------------------------------------------------------------------
-WIFI-PROPERTIES.WEP:                    tak
-WIFI-PROPERTIES.WPA:                    tak
-WIFI-PROPERTIES.WPA2:                   tak
-WIFI-PROPERTIES.TKIP:                   tak
-WIFI-PROPERTIES.CCMP:                   tak
-WIFI-PROPERTIES.AP:                     tak
-WIFI-PROPERTIES.ADHOC:                  tak
-WIFI-PROPERTIES.2GHZ:                   nieznane
-WIFI-PROPERTIES.5GHZ:                   nieznane
--------------------------------------------------------------------------------
-IP4.ADDRESS[1]:                         192.168.97.124/29
-IP4.ADDRESS[2]:                         192.168.76.154/18
-IP4.GATEWAY:                            --
-IP4.ROUTE[1]:                           dst = 192.168.33.233/22, nh = 192.168.222.210, mt = 2810496551
-IP4.DNS[1]:                             192.168.107.109
-IP4.DOMAIN[1]:                          sear4.fo.o.bar
+AP[1].IN-USE:                            
+AP[1].SSID:                             wlan1-ap-4
+AP[1].MODE:                             Infrastruktura
+AP[1].CHAN:                             1
+AP[1].RATE:                             54 Mb/s
+AP[1].SIGNAL:                           48
+AP[1].BARS:                             **  
+AP[1].SECURITY:                         WPA1 WPA2
+-------------------------------------------------------------------------------
+IP4.GATEWAY:                            192.168.57.160
+IP4.ROUTE[1]:                           dst = 192.168.36.106/21, nh = 192.168.199.128, mt = 979274165
+IP4.ROUTE[2]:                           dst = 192.168.238.130/19, nh = 0.0.0.0
+IP4.ROUTE[3]:                           dst = 192.168.224.39/32, nh = 192.168.148.69
+IP4.DNS[1]:                             192.168.61.83
+IP4.DOMAIN[1]:                          sear4.foo4.bar
 IP4.DOMAIN[2]:                          sear4.fo.x.y
 IP4.DOMAIN[3]:                          sear4.foo2.bar
-IP4.DOMAIN[4]:                          sear4.foo3.bar
-IP4.DOMAIN[5]:                          sear4.foo4.bar
-IP4.WINS[1]:                            192.168.60.60
-IP4.WINS[2]:                            192.168.63.92
+IP4.DOMAIN[4]:                          sear4.foo1.bar
+IP4.DOMAIN[5]:                          sear4.fo.o.bar
+IP4.DOMAIN[6]:                          sear4.foo3.bar
 -------------------------------------------------------------------------------
 DHCP4.OPTION[1]:                        dhcp-4-opt-0 = val-0
-DHCP4.OPTION[2]:                        dhcp-4-opt-5 = val-5
+DHCP4.OPTION[2]:                        dhcp-4-opt-1 = val-1
+DHCP4.OPTION[3]:                        dhcp-4-opt-2 = val-2
+DHCP4.OPTION[4]:                        dhcp-4-opt-4 = val-4
+DHCP4.OPTION[5]:                        dhcp-4-opt-6 = val-6
+DHCP4.OPTION[6]:                        dhcp-4-opt-7 = val-7
+DHCP4.OPTION[7]:                        dhcp-4-opt-8 = val-8
+DHCP4.OPTION[8]:                        dhcp-4-opt-9 = val-9
 -------------------------------------------------------------------------------
-IP6.ADDRESS[1]:                         2001:a::88ca:3654:96b:ab44/89
-IP6.GATEWAY:                            --
-IP6.ROUTE[1]:                           dst = 2001:a::cc8b:7c09:4673:bbb0/85, nh = ::, mt = 2821465568
-IP6.ROUTE[2]:                           dst = 2001:a::a976:2488:f49f:b48/106, nh = 2001:a::62ae:c734:fc7b:e931, mt = 2248613879
-IP6.ROUTE[3]:                           dst = 2001:a::afb7:4449:3787:8bb4/123, nh = ::
-IP6.DNS[1]:                             2001:a::2934:bd66:550d:ec19
-IP6.DOMAIN[1]:                          sear6.fo.x.y
+IP6.ADDRESS[1]:                         2001:a::fa05:2ab4:9300:e8fe/116
+IP6.ADDRESS[2]:                         2001:a::e9cf:bd3:caba:99b3/86
+IP6.ADDRESS[3]:                         2001:a::2be6:44fa:2c95:5559/78
+IP6.GATEWAY:                            2001:a::4d70:d91a:770f:2319
+IP6.ROUTE[1]:                           dst = 2001:a::3cb2:719d:bb00:b22f/66, nh = 2001:a::81b1:58b9:7237:3511, mt = 2280277732
+IP6.ROUTE[2]:                           dst = 2001:a::986f:983c:5eb:1c7d/99, nh = ::, mt = 1204008676
+IP6.DNS[1]:                             2001:a::85e7:3d7d:53e8:50ac
+IP6.DNS[2]:                             2001:a::1c5:9cb5:e86d:25a5
+IP6.DOMAIN[1]:                          sear6.foo4.bar
+IP6.DOMAIN[2]:                          sear6.foo2.bar
 -------------------------------------------------------------------------------
-DHCP6.OPTION[1]:                        dhcp-6-opt-2 = val-2
-DHCP6.OPTION[2]:                        dhcp-6-opt-6 = val-6
-DHCP6.OPTION[3]:                        dhcp-6-opt-7 = val-7
-DHCP6.OPTION[4]:                        dhcp-6-opt-8 = val-8
-DHCP6.OPTION[5]:                        dhcp-6-opt-9 = val-9
+DHCP6.OPTION[1]:                        dhcp-6-opt-0 = val-0
+DHCP6.OPTION[2]:                        dhcp-6-opt-1 = val-1
+DHCP6.OPTION[3]:                        dhcp-6-opt-2 = val-2
+DHCP6.OPTION[4]:                        dhcp-6-opt-3 = val-3
+DHCP6.OPTION[5]:                        dhcp-6-opt-4 = val-4
+DHCP6.OPTION[6]:                        dhcp-6-opt-5 = val-5
+DHCP6.OPTION[7]:                        dhcp-6-opt-6 = val-6
+DHCP6.OPTION[8]:                        dhcp-6-opt-7 = val-7
+DHCP6.OPTION[9]:                        dhcp-6-opt-9 = val-9
 -------------------------------------------------------------------------------
 CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings/Connection/{2}
 CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 -------------------------------------------------------------------------------
 
 ===============================================================================
-                        Informacje o urządzeniu (wlan0)
+                        Informacje o urządzeniu (wlan1)
 ===============================================================================
-GENERAL.DEVICE:                         wlan0
+GENERAL.DEVICE:                         wlan1
 GENERAL.TYPE:                           wifi
 GENERAL.NM-TYPE:                        NMDeviceWifi
 GENERAL.VENDOR:                         --
@@ -40420,11 +41085,13 @@ GENERAL.PRODUCT:                        --
 GENERAL.DRIVER:                         virtual
 GENERAL.DRIVER-VERSION:                 --
 GENERAL.FIRMWARE-VERSION:               --
-GENERAL.HWADDR:                         13:E0:74:85:7C:D9
+GENERAL.HWADDR:                         71:52:AD:63:5C:7C
 GENERAL.MTU:                            0
 GENERAL.STATE:                          20 (niedostępne)
 GENERAL.REASON:                         0 (Nie podano przyczyny)
-GENERAL.UDI:                            /sys/devices/virtual/wlan0
+GENERAL.IP4-CONNECTIVITY:               0 (nieznane)
+GENERAL.IP6-CONNECTIVITY:               0 (nieznane)
+GENERAL.UDI:                            /sys/devices/virtual/wlan1
 GENERAL.IP-IFACE:                       --
 GENERAL.IS-SOFTWARE:                    nie
 GENERAL.NM-MANAGED:                     tak
@@ -40432,9 +41099,9 @@ GENERAL.AUTOCONNECT:                    tak
 GENERAL.FIRMWARE-MISSING:               nie
 GENERAL.NM-PLUGIN-MISSING:              nie
 GENERAL.PHYS-PORT-ID:                   --
-GENERAL.CONNECTION:                     con-vpn-1
-GENERAL.CON-UUID:                       UUID-con-vpn-1-REPLACED-REPLACED-REP
-GENERAL.CON-PATH:                       /org/freedesktop/NetworkManager/ActiveConnection/2
+GENERAL.CONNECTION:                     --
+GENERAL.CON-UUID:                       --
+GENERAL.CON-PATH:                       --
 GENERAL.METERED:                        nieznane
 -------------------------------------------------------------------------------
 CAPABILITIES.CARRIER-DETECT:            nie
@@ -40452,62 +41119,35 @@ WIFI-PROPERTIES.ADHOC:                  tak
 WIFI-PROPERTIES.2GHZ:                   nieznane
 WIFI-PROPERTIES.5GHZ:                   nieznane
 -------------------------------------------------------------------------------
-AP[1].IN-USE:                            
-AP[1].SSID:                             wlan0-ap-2
-AP[1].MODE:                             Infrastruktura
-AP[1].CHAN:                             1
-AP[1].RATE:                             54 Mb/s
-AP[1].SIGNAL:                           92
-AP[1].BARS:                             ****
-AP[1].SECURITY:                         WPA1 WPA2
--------------------------------------------------------------------------------
-AP[2].IN-USE:                            
-AP[2].SSID:                             wlan0-ap-1
-AP[2].MODE:                             Infrastruktura
-AP[2].CHAN:                             1
-AP[2].RATE:                             54 Mb/s
-AP[2].SIGNAL:                           81
-AP[2].BARS:                             ****
-AP[2].SECURITY:                         WPA1 WPA2
--------------------------------------------------------------------------------
-AP[3].IN-USE:                            
-AP[3].SSID:                             wlan0-ap-3
-AP[3].MODE:                             Infrastruktura
-AP[3].CHAN:                             1
-AP[3].RATE:                             54 Mb/s
-AP[3].SIGNAL:                           55
-AP[3].BARS:                             **  
-AP[3].SECURITY:                         WPA1 WPA2
--------------------------------------------------------------------------------
-IP4.ADDRESS[1]:                         192.168.228.18/32
-IP4.ADDRESS[2]:                         192.168.209.179/25
-IP4.GATEWAY:                            192.168.41.120
-IP4.DOMAIN[1]:                          sear4.foo2.bar
+IP4.ADDRESS[1]:                         192.168.97.124/29
+IP4.ADDRESS[2]:                         192.168.76.154/18
+IP4.GATEWAY:                            --
+IP4.ROUTE[1]:                           dst = 192.168.33.233/22, nh = 192.168.222.210, mt = 2810496551
+IP4.DNS[1]:                             192.168.107.109
+IP4.DOMAIN[1]:                          sear4.fo.o.bar
 IP4.DOMAIN[2]:                          sear4.fo.x.y
-IP4.DOMAIN[3]:                          sear4.foo1.bar
-IP4.DOMAIN[4]:                          sear4.foo4.bar
-IP4.DOMAIN[5]:                          sear4.fo.o.bar
-IP4.WINS[1]:                            192.168.120.79
+IP4.DOMAIN[3]:                          sear4.foo2.bar
+IP4.DOMAIN[4]:                          sear4.foo3.bar
+IP4.DOMAIN[5]:                          sear4.foo4.bar
+IP4.WINS[1]:                            192.168.60.60
+IP4.WINS[2]:                            192.168.63.92
 -------------------------------------------------------------------------------
 DHCP4.OPTION[1]:                        dhcp-4-opt-0 = val-0
-DHCP4.OPTION[2]:                        dhcp-4-opt-2 = val-2
-DHCP4.OPTION[3]:                        dhcp-4-opt-4 = val-4
-DHCP4.OPTION[4]:                        dhcp-4-opt-7 = val-7
+DHCP4.OPTION[2]:                        dhcp-4-opt-5 = val-5
 -------------------------------------------------------------------------------
+IP6.ADDRESS[1]:                         2001:a::88ca:3654:96b:ab44/89
 IP6.GATEWAY:                            --
-IP6.ROUTE[1]:                           dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086
-IP6.DOMAIN[1]:                          sear6.foo2.bar
-IP6.DOMAIN[2]:                          sear6.foo1.bar
-IP6.DOMAIN[3]:                          sear6.fo.x.y
-IP6.DOMAIN[4]:                          sear6.fo.o.bar
-IP6.DOMAIN[5]:                          sear6.foo3.bar
-IP6.DOMAIN[6]:                          sear6.foo4.bar
+IP6.ROUTE[1]:                           dst = 2001:a::cc8b:7c09:4673:bbb0/85, nh = ::, mt = 2821465568
+IP6.ROUTE[2]:                           dst = 2001:a::a976:2488:f49f:b48/106, nh = 2001:a::62ae:c734:fc7b:e931, mt = 2248613879
+IP6.ROUTE[3]:                           dst = 2001:a::afb7:4449:3787:8bb4/123, nh = ::
+IP6.DNS[1]:                             2001:a::2934:bd66:550d:ec19
+IP6.DOMAIN[1]:                          sear6.fo.x.y
 -------------------------------------------------------------------------------
-DHCP6.OPTION[1]:                        dhcp-6-opt-1 = val-1
-DHCP6.OPTION[2]:                        dhcp-6-opt-2 = val-2
-DHCP6.OPTION[3]:                        dhcp-6-opt-3 = val-3
-DHCP6.OPTION[4]:                        dhcp-6-opt-4 = val-4
-DHCP6.OPTION[5]:                        dhcp-6-opt-5 = val-5
+DHCP6.OPTION[1]:                        dhcp-6-opt-2 = val-2
+DHCP6.OPTION[2]:                        dhcp-6-opt-6 = val-6
+DHCP6.OPTION[3]:                        dhcp-6-opt-7 = val-7
+DHCP6.OPTION[4]:                        dhcp-6-opt-8 = val-8
+DHCP6.OPTION[5]:                        dhcp-6-opt-9 = val-9
 -------------------------------------------------------------------------------
 CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings/Connection/{2}
 CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
@@ -40515,7 +41155,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | c
 
 <<<
 size: 2468
-location: clients/tests/test-client.py:1051:test_004()/731
+location: clients/tests/test-client.py:1065:test_004()/731
 cmd: $NMCLI --mode multiline --pretty --color yes dev show wlan0
 lang: C
 returncode: 0
@@ -40560,7 +41200,7 @@ IP6.DOMAIN[6]:                          sear6.foo4.bar
 
 <<<
 size: 2486
-location: clients/tests/test-client.py:1051:test_004()/732
+location: clients/tests/test-client.py:1065:test_004()/732
 cmd: $NMCLI --mode multiline --pretty --color yes dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
@@ -40604,12 +41244,12 @@ IP6.DOMAIN[6]:                          sear6.foo4.bar
 -------------------------------------------------------------------------------
 
 <<<
-size: 6099
-location: clients/tests/test-client.py:1054:test_004()/733
+size: 6193
+location: clients/tests/test-client.py:1068:test_004()/733
 cmd: $NMCLI --mode multiline --pretty --color yes -f all dev show wlan0
 lang: C
 returncode: 0
-stdout: 5918 bytes
+stdout: 6012 bytes
 >>>
 ===============================================================================
                             Device details (wlan0)
@@ -40626,6 +41266,8 @@ GENERAL.HWADDR:                         13:E0:74:85:7C:D9
 GENERAL.MTU:                            0
 GENERAL.STATE:                          20 (unavailable)
 GENERAL.REASON:                         0 (No reason given)
+GENERAL.IP4-CONNECTIVITY:               0 (unknown)
+GENERAL.IP6-CONNECTIVITY:               0 (unknown)
 GENERAL.UDI:                            /sys/devices/virtual/wlan0
 GENERAL.IP-IFACE:                       --
 GENERAL.IS-SOFTWARE:                    no
@@ -40670,7 +41312,7 @@ AP[2].CHAN:                             1
 AP[2].RATE:                             54 Mbit/s
 AP[2].SIGNAL:                           81
 AP[2].BARS:                             ****
-AP[2].SECURITY:                         WPA1 WPA2
+AP[2].SECURITY:                         WPA1
 -------------------------------------------------------------------------------
 AP[3].IN-USE:                            
 AP[3].SSID:                             wlan0-ap-3
@@ -40679,7 +41321,7 @@ AP[3].CHAN:                             1
 AP[3].RATE:                             54 Mbit/s
 AP[3].SIGNAL:                           55
 AP[3].BARS:                             **  
-AP[3].SECURITY:                         WPA1 WPA2
+AP[3].SECURITY:                         WPA3
 -------------------------------------------------------------------------------
 IP4.ADDRESS[1]:                         192.168.228.18/32
 IP4.ADDRESS[2]:                         192.168.209.179/25
@@ -40716,12 +41358,12 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | c
 -------------------------------------------------------------------------------
 
 <<<
-size: 6159
-location: clients/tests/test-client.py:1054:test_004()/734
+size: 6255
+location: clients/tests/test-client.py:1068:test_004()/734
 cmd: $NMCLI --mode multiline --pretty --color yes -f all dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 5968 bytes
+stdout: 6064 bytes
 >>>
 ===============================================================================
                         Informacje o urządzeniu (wlan0)
@@ -40738,6 +41380,8 @@ GENERAL.HWADDR:                         13:E0:74:85:7C:D9
 GENERAL.MTU:                            0
 GENERAL.STATE:                          20 (niedostępne)
 GENERAL.REASON:                         0 (Nie podano przyczyny)
+GENERAL.IP4-CONNECTIVITY:               0 (nieznane)
+GENERAL.IP6-CONNECTIVITY:               0 (nieznane)
 GENERAL.UDI:                            /sys/devices/virtual/wlan0
 GENERAL.IP-IFACE:                       --
 GENERAL.IS-SOFTWARE:                    nie
@@ -40782,7 +41426,7 @@ AP[2].CHAN:                             1
 AP[2].RATE:                             54 Mb/s
 AP[2].SIGNAL:                           81
 AP[2].BARS:                             ****
-AP[2].SECURITY:                         WPA1 WPA2
+AP[2].SECURITY:                         WPA1
 -------------------------------------------------------------------------------
 AP[3].IN-USE:                            
 AP[3].SSID:                             wlan0-ap-3
@@ -40791,7 +41435,7 @@ AP[3].CHAN:                             1
 AP[3].RATE:                             54 Mb/s
 AP[3].SIGNAL:                           55
 AP[3].BARS:                             **  
-AP[3].SECURITY:                         WPA1 WPA2
+AP[3].SECURITY:                         WPA3
 -------------------------------------------------------------------------------
 IP4.ADDRESS[1]:                         192.168.228.18/32
 IP4.ADDRESS[2]:                         192.168.209.179/25
@@ -40828,12 +41472,12 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | c
 -------------------------------------------------------------------------------
 
 <<<
-size: 2346
-location: clients/tests/test-client.py:1057:test_004()/735
+size: 2450
+location: clients/tests/test-client.py:1071:test_004()/735
 cmd: $NMCLI --mode multiline --pretty --color yes -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: C
 returncode: 0
-stdout: 2130 bytes
+stdout: 2234 bytes
 >>>
 ===============================================================================
                             Device details (wlan0)
@@ -40850,6 +41494,8 @@ GENERAL.HWADDR:                         13:E0:74:85:7C:D9
 GENERAL.MTU:                            0
 GENERAL.STATE:                          20 (unavailable)
 GENERAL.REASON:                         0 (No reason given)
+GENERAL.IP4-CONNECTIVITY:               0 (unknown)
+GENERAL.IP6-CONNECTIVITY:               0 (unknown)
 GENERAL.UDI:                            /sys/devices/virtual/wlan0
 GENERAL.IP-IFACE:                       --
 GENERAL.IS-SOFTWARE:                    no
@@ -40877,12 +41523,12 @@ WIFI-PROPERTIES.5GHZ:                   unknown
 -------------------------------------------------------------------------------
 
 <<<
-size: 2375
-location: clients/tests/test-client.py:1057:test_004()/736
+size: 2481
+location: clients/tests/test-client.py:1071:test_004()/736
 cmd: $NMCLI --mode multiline --pretty --color yes -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2149 bytes
+stdout: 2255 bytes
 >>>
 ===============================================================================
                         Informacje o urządzeniu (wlan0)
@@ -40899,6 +41545,8 @@ GENERAL.HWADDR:                         13:E0:74:85:7C:D9
 GENERAL.MTU:                            0
 GENERAL.STATE:                          20 (niedostępne)
 GENERAL.REASON:                         0 (Nie podano przyczyny)
+GENERAL.IP4-CONNECTIVITY:               0 (nieznane)
+GENERAL.IP6-CONNECTIVITY:               0 (nieznane)
 GENERAL.UDI:                            /sys/devices/virtual/wlan0
 GENERAL.IP-IFACE:                       --
 GENERAL.IS-SOFTWARE:                    nie
@@ -40926,12 +41574,12 @@ WIFI-PROPERTIES.5GHZ:                   nieznane
 -------------------------------------------------------------------------------
 
 <<<
-size: 2346
-location: clients/tests/test-client.py:1060:test_004()/737
+size: 2450
+location: clients/tests/test-client.py:1074:test_004()/737
 cmd: $NMCLI --mode multiline --pretty --color yes -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: C
 returncode: 0
-stdout: 2130 bytes
+stdout: 2234 bytes
 >>>
 ===============================================================================
                             Device details (wlan0)
@@ -40948,6 +41596,8 @@ GENERAL.HWADDR:                         13:E0:74:85:7C:D9
 GENERAL.MTU:                            0
 GENERAL.STATE:                          20 (unavailable)
 GENERAL.REASON:                         0 (No reason given)
+GENERAL.IP4-CONNECTIVITY:               0 (unknown)
+GENERAL.IP6-CONNECTIVITY:               0 (unknown)
 GENERAL.UDI:                            /sys/devices/virtual/wlan0
 GENERAL.IP-IFACE:                       --
 GENERAL.IS-SOFTWARE:                    no
@@ -40975,12 +41625,12 @@ WIFI-PROPERTIES.5GHZ:                   unknown
 -------------------------------------------------------------------------------
 
 <<<
-size: 2375
-location: clients/tests/test-client.py:1060:test_004()/738
+size: 2481
+location: clients/tests/test-client.py:1074:test_004()/738
 cmd: $NMCLI --mode multiline --pretty --color yes -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2149 bytes
+stdout: 2255 bytes
 >>>
 ===============================================================================
                         Informacje o urządzeniu (wlan0)
@@ -40997,6 +41647,8 @@ GENERAL.HWADDR:                         13:E0:74:85:7C:D9
 GENERAL.MTU:                            0
 GENERAL.STATE:                          20 (niedostępne)
 GENERAL.REASON:                         0 (Nie podano przyczyny)
+GENERAL.IP4-CONNECTIVITY:               0 (nieznane)
+GENERAL.IP6-CONNECTIVITY:               0 (nieznane)
 GENERAL.UDI:                            /sys/devices/virtual/wlan0
 GENERAL.IP-IFACE:                       --
 GENERAL.IS-SOFTWARE:                    nie
@@ -41025,7 +41677,7 @@ WIFI-PROPERTIES.5GHZ:                   nieznane
 
 <<<
 size: 1788
-location: clients/tests/test-client.py:1063:test_004()/739
+location: clients/tests/test-client.py:1077:test_004()/739
 cmd: $NMCLI --mode multiline --pretty --color yes -f DEVICE,TYPE,DBUS-PATH dev
 lang: C
 returncode: 0
@@ -41034,6 +41686,10 @@ stdout: 1600 bytes
 ===============================================================================
                                Status of devices
 ===============================================================================
+DEVICE:                                 wlan0
+TYPE:                                   wifi
+DBUS-PATH:                              /org/freedesktop/NetworkManager/Devices/3
+-------------------------------------------------------------------------------
 DEVICE:                                 eth0
 TYPE:                                   ethernet
 DBUS-PATH:                              /org/freedesktop/NetworkManager/Devices/1
@@ -41050,14 +41706,10 @@ DEVICE:                                 wlan1
 TYPE:                                   wifi
 DBUS-PATH:                              /org/freedesktop/NetworkManager/Devices/5
 -------------------------------------------------------------------------------
-DEVICE:                                 wlan0
-TYPE:                                   wifi
-DBUS-PATH:                              /org/freedesktop/NetworkManager/Devices/3
--------------------------------------------------------------------------------
 
 <<<
 size: 1798
-location: clients/tests/test-client.py:1063:test_004()/740
+location: clients/tests/test-client.py:1077:test_004()/740
 cmd: $NMCLI --mode multiline --pretty --color yes -f DEVICE,TYPE,DBUS-PATH dev
 lang: pl_PL.UTF-8
 returncode: 0
@@ -41066,6 +41718,10 @@ stdout: 1600 bytes
 ===============================================================================
                                 Stan urządzenia
 ===============================================================================
+DEVICE:                                 wlan0
+TYPE:                                   wifi
+DBUS-PATH:                              /org/freedesktop/NetworkManager/Devices/3
+-------------------------------------------------------------------------------
 DEVICE:                                 eth0
 TYPE:                                   ethernet
 DBUS-PATH:                              /org/freedesktop/NetworkManager/Devices/1
@@ -41082,19 +41738,73 @@ DEVICE:                                 wlan1
 TYPE:                                   wifi
 DBUS-PATH:                              /org/freedesktop/NetworkManager/Devices/5
 -------------------------------------------------------------------------------
-DEVICE:                                 wlan0
-TYPE:                                   wifi
-DBUS-PATH:                              /org/freedesktop/NetworkManager/Devices/3
--------------------------------------------------------------------------------
 
 <<<
-size: 5473
-location: clients/tests/test-client.py:1066:test_004()/741
+size: 5385
+location: clients/tests/test-client.py:1080:test_004()/741
 cmd: $NMCLI --mode multiline --pretty --color yes -f ALL device wifi list
 lang: C
 returncode: 0
-stdout: 5290 bytes
+stdout: 5202 bytes
 >>>
+===============================================================================
+                            Wi-Fi scan list (wlan0)
+===============================================================================
+NAME:                                   AP[1]
+SSID:                                   wlan0-ap-2
+SSID-HEX:                               776C616E302D61702D32
+BSSID:                                  C0:E2:BE:E8:EF:B6
+MODE:                                   Infra
+CHAN:                                   1
+FREQ:                                   2412 MHz
+RATE:                                   54 Mbit/s
+SIGNAL:                                 92
+BARS:                                   ****
+SECURITY:                               WPA1 WPA2
+WPA-FLAGS:                              pair_tkip pair_ccmp group_tkip group_ccmp psk
+RSN-FLAGS:                              pair_tkip pair_ccmp group_tkip group_ccmp psk
+DEVICE:                                 wlan0
+ACTIVE:                                 no
+IN-USE:                                  
+DBUS-PATH:                              /org/freedesktop/NetworkManager/AccessPoint/2
+-------------------------------------------------------------------------------
+NAME:                                   AP[2]
+SSID:                                   wlan0-ap-1
+SSID-HEX:                               776C616E302D61702D31
+BSSID:                                  61:95:77:AC:1E:4C
+MODE:                                   Infra
+CHAN:                                   1
+FREQ:                                   2412 MHz
+RATE:                                   54 Mbit/s
+SIGNAL:                                 81
+BARS:                                   ****
+SECURITY:                               WPA1
+WPA-FLAGS:                              pair_tkip pair_ccmp group_tkip group_ccmp psk
+RSN-FLAGS:                              (none)
+DEVICE:                                 wlan0
+ACTIVE:                                 no
+IN-USE:                                  
+DBUS-PATH:                              /org/freedesktop/NetworkManager/AccessPoint/1
+-------------------------------------------------------------------------------
+NAME:                                   AP[3]
+SSID:                                   wlan0-ap-3
+SSID-HEX:                               776C616E302D61702D33
+BSSID:                                  9B:F6:B7:EC:97:76
+MODE:                                   Infra
+CHAN:                                   1
+FREQ:                                   2412 MHz
+RATE:                                   54 Mbit/s
+SIGNAL:                                 55
+BARS:                                   **  
+SECURITY:                               WPA3
+WPA-FLAGS:                              (none)
+RSN-FLAGS:                              pair_tkip pair_ccmp group_tkip group_ccmp sae
+DEVICE:                                 wlan0
+ACTIVE:                                 no
+IN-USE:                                  
+DBUS-PATH:                              /org/freedesktop/NetworkManager/AccessPoint/3
+-------------------------------------------------------------------------------
+
 ===============================================================================
                             Wi-Fi scan list (wlan1)
 ===============================================================================
@@ -41121,24 +41831,32 @@ DBUS-PATH:                              /org/freedesktop/NetworkManager/Acc
                             Wi-Fi scan list (wlan1)
 ===============================================================================
 
+<<<
+size: 5461
+location: clients/tests/test-client.py:1080:test_004()/742
+cmd: $NMCLI --mode multiline --pretty --color yes -f ALL device wifi list
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 5268 bytes
+>>>
 ===============================================================================
-                            Wi-Fi scan list (wlan0)
+                     Lista skanowania sieci Wi-Fi (wlan0)
 ===============================================================================
 NAME:                                   AP[1]
 SSID:                                   wlan0-ap-2
 SSID-HEX:                               776C616E302D61702D32
 BSSID:                                  C0:E2:BE:E8:EF:B6
-MODE:                                   Infra
+MODE:                                   Infrastruktura
 CHAN:                                   1
-FREQ:                                   2412 MHz
-RATE:                                   54 Mbit/s
+FREQ:                                   2412 MHz
+RATE:                                   54 Mb/s
 SIGNAL:                                 92
 BARS:                                   ****
 SECURITY:                               WPA1 WPA2
 WPA-FLAGS:                              pair_tkip pair_ccmp group_tkip group_ccmp psk
 RSN-FLAGS:                              pair_tkip pair_ccmp group_tkip group_ccmp psk
 DEVICE:                                 wlan0
-ACTIVE:                                 no
+ACTIVE:                                 nie
 IN-USE:                                  
 DBUS-PATH:                              /org/freedesktop/NetworkManager/AccessPoint/2
 -------------------------------------------------------------------------------
@@ -41146,17 +41864,17 @@ NAME:                                   AP[2]
 SSID:                                   wlan0-ap-1
 SSID-HEX:                               776C616E302D61702D31
 BSSID:                                  61:95:77:AC:1E:4C
-MODE:                                   Infra
+MODE:                                   Infrastruktura
 CHAN:                                   1
-FREQ:                                   2412 MHz
-RATE:                                   54 Mbit/s
+FREQ:                                   2412 MHz
+RATE:                                   54 Mb/s
 SIGNAL:                                 81
 BARS:                                   ****
-SECURITY:                               WPA1 WPA2
+SECURITY:                               WPA1
 WPA-FLAGS:                              pair_tkip pair_ccmp group_tkip group_ccmp psk
-RSN-FLAGS:                              pair_tkip pair_ccmp group_tkip group_ccmp psk
+RSN-FLAGS:                              (brak)
 DEVICE:                                 wlan0
-ACTIVE:                                 no
+ACTIVE:                                 nie
 IN-USE:                                  
 DBUS-PATH:                              /org/freedesktop/NetworkManager/AccessPoint/1
 -------------------------------------------------------------------------------
@@ -41164,29 +41882,21 @@ NAME:                                   AP[3]
 SSID:                                   wlan0-ap-3
 SSID-HEX:                               776C616E302D61702D33
 BSSID:                                  9B:F6:B7:EC:97:76
-MODE:                                   Infra
+MODE:                                   Infrastruktura
 CHAN:                                   1
-FREQ:                                   2412 MHz
-RATE:                                   54 Mbit/s
+FREQ:                                   2412 MHz
+RATE:                                   54 Mb/s
 SIGNAL:                                 55
 BARS:                                   **  
-SECURITY:                               WPA1 WPA2
-WPA-FLAGS:                              pair_tkip pair_ccmp group_tkip group_ccmp psk
-RSN-FLAGS:                              pair_tkip pair_ccmp group_tkip group_ccmp psk
+SECURITY:                               WPA3
+WPA-FLAGS:                              (brak)
+RSN-FLAGS:                              pair_tkip pair_ccmp group_tkip group_ccmp sae
 DEVICE:                                 wlan0
-ACTIVE:                                 no
+ACTIVE:                                 nie
 IN-USE:                                  
 DBUS-PATH:                              /org/freedesktop/NetworkManager/AccessPoint/3
 -------------------------------------------------------------------------------
 
-<<<
-size: 5549
-location: clients/tests/test-client.py:1066:test_004()/742
-cmd: $NMCLI --mode multiline --pretty --color yes -f ALL device wifi list
-lang: pl_PL.UTF-8
-returncode: 0
-stdout: 5356 bytes
->>>
 ===============================================================================
                      Lista skanowania sieci Wi-Fi (wlan1)
 ===============================================================================
@@ -41213,89 +41923,14 @@ DBUS-PATH:                              /org/freedesktop/NetworkManager/Acc
                      Lista skanowania sieci Wi-Fi (wlan1)
 ===============================================================================
 
-===============================================================================
-                     Lista skanowania sieci Wi-Fi (wlan0)
-===============================================================================
-NAME:                                   AP[1]
-SSID:                                   wlan0-ap-2
-SSID-HEX:                               776C616E302D61702D32
-BSSID:                                  C0:E2:BE:E8:EF:B6
-MODE:                                   Infrastruktura
-CHAN:                                   1
-FREQ:                                   2412 MHz
-RATE:                                   54 Mb/s
-SIGNAL:                                 92
-BARS:                                   ****
-SECURITY:                               WPA1 WPA2
-WPA-FLAGS:                              pair_tkip pair_ccmp group_tkip group_ccmp psk
-RSN-FLAGS:                              pair_tkip pair_ccmp group_tkip group_ccmp psk
-DEVICE:                                 wlan0
-ACTIVE:                                 nie
-IN-USE:                                  
-DBUS-PATH:                              /org/freedesktop/NetworkManager/AccessPoint/2
--------------------------------------------------------------------------------
-NAME:                                   AP[2]
-SSID:                                   wlan0-ap-1
-SSID-HEX:                               776C616E302D61702D31
-BSSID:                                  61:95:77:AC:1E:4C
-MODE:                                   Infrastruktura
-CHAN:                                   1
-FREQ:                                   2412 MHz
-RATE:                                   54 Mb/s
-SIGNAL:                                 81
-BARS:                                   ****
-SECURITY:                               WPA1 WPA2
-WPA-FLAGS:                              pair_tkip pair_ccmp group_tkip group_ccmp psk
-RSN-FLAGS:                              pair_tkip pair_ccmp group_tkip group_ccmp psk
-DEVICE:                                 wlan0
-ACTIVE:                                 nie
-IN-USE:                                  
-DBUS-PATH:                              /org/freedesktop/NetworkManager/AccessPoint/1
--------------------------------------------------------------------------------
-NAME:                                   AP[3]
-SSID:                                   wlan0-ap-3
-SSID-HEX:                               776C616E302D61702D33
-BSSID:                                  9B:F6:B7:EC:97:76
-MODE:                                   Infrastruktura
-CHAN:                                   1
-FREQ:                                   2412 MHz
-RATE:                                   54 Mb/s
-SIGNAL:                                 55
-BARS:                                   **  
-SECURITY:                               WPA1 WPA2
-WPA-FLAGS:                              pair_tkip pair_ccmp group_tkip group_ccmp psk
-RSN-FLAGS:                              pair_tkip pair_ccmp group_tkip group_ccmp psk
-DEVICE:                                 wlan0
-ACTIVE:                                 nie
-IN-USE:                                  
-DBUS-PATH:                              /org/freedesktop/NetworkManager/AccessPoint/3
--------------------------------------------------------------------------------
-
 <<<
-size: 2908
-location: clients/tests/test-client.py:1068:test_004()/743
+size: 2898
+location: clients/tests/test-client.py:1082:test_004()/743
 cmd: $NMCLI --mode multiline --pretty --color yes -f COMMON device wifi list
 lang: C
 returncode: 0
-stdout: 2722 bytes
+stdout: 2712 bytes
 >>>
-===============================================================================
-                            Wi-Fi scan list (wlan1)
-===============================================================================
-IN-USE:                                  
-SSID:                                   wlan1-ap-4
-MODE:                                   Infra
-CHAN:                                   1
-RATE:                                   54 Mbit/s
-SIGNAL:                                 48
-BARS:                                   **  
-SECURITY:                               WPA1 WPA2
--------------------------------------------------------------------------------
-
-===============================================================================
-                            Wi-Fi scan list (wlan1)
-===============================================================================
-
 ===============================================================================
                             Wi-Fi scan list (wlan0)
 ===============================================================================
@@ -41315,7 +41950,7 @@ CHAN:                                   1
 RATE:                                   54 Mbit/s
 SIGNAL:                                 81
 BARS:                                   ****
-SECURITY:                               WPA1 WPA2
+SECURITY:                               WPA1
 -------------------------------------------------------------------------------
 IN-USE:                                  
 SSID:                                   wlan0-ap-3
@@ -41324,34 +41959,34 @@ CHAN:                                   1
 RATE:                                   54 Mbit/s
 SIGNAL:                                 55
 BARS:                                   **  
-SECURITY:                               WPA1 WPA2
+SECURITY:                               WPA3
 -------------------------------------------------------------------------------
 
-<<<
-size: 2972
-location: clients/tests/test-client.py:1068:test_004()/744
-cmd: $NMCLI --mode multiline --pretty --color yes -f COMMON device wifi list
-lang: pl_PL.UTF-8
-returncode: 0
-stdout: 2776 bytes
->>>
 ===============================================================================
-                     Lista skanowania sieci Wi-Fi (wlan1)
+                            Wi-Fi scan list (wlan1)
 ===============================================================================
 IN-USE:                                  
 SSID:                                   wlan1-ap-4
-MODE:                                   Infrastruktura
+MODE:                                   Infra
 CHAN:                                   1
-RATE:                                   54 Mb/s
+RATE:                                   54 Mbit/s
 SIGNAL:                                 48
 BARS:                                   **  
 SECURITY:                               WPA1 WPA2
 -------------------------------------------------------------------------------
 
 ===============================================================================
-                     Lista skanowania sieci Wi-Fi (wlan1)
+                            Wi-Fi scan list (wlan1)
 ===============================================================================
 
+<<<
+size: 2962
+location: clients/tests/test-client.py:1082:test_004()/744
+cmd: $NMCLI --mode multiline --pretty --color yes -f COMMON device wifi list
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 2766 bytes
+>>>
 ===============================================================================
                      Lista skanowania sieci Wi-Fi (wlan0)
 ===============================================================================
@@ -41371,7 +42006,7 @@ CHAN:                                   1
 RATE:                                   54 Mb/s
 SIGNAL:                                 81
 BARS:                                   ****
-SECURITY:                               WPA1 WPA2
+SECURITY:                               WPA1
 -------------------------------------------------------------------------------
 IN-USE:                                  
 SSID:                                   wlan0-ap-3
@@ -41380,43 +42015,34 @@ CHAN:                                   1
 RATE:                                   54 Mb/s
 SIGNAL:                                 55
 BARS:                                   **  
-SECURITY:                               WPA1 WPA2
+SECURITY:                               WPA3
 -------------------------------------------------------------------------------
 
-<<<
-size: 5586
-location: clients/tests/test-client.py:1071:test_004()/745
-cmd: $NMCLI --mode multiline --pretty --color yes -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list
-lang: C
-returncode: 0
-stdout: 5290 bytes
->>>
 ===============================================================================
-                            Wi-Fi scan list (wlan1)
+                     Lista skanowania sieci Wi-Fi (wlan1)
 ===============================================================================
-NAME:                                   AP[1]
+IN-USE:                                  
 SSID:                                   wlan1-ap-4
-SSID-HEX:                               776C616E312D61702D34
-BSSID:                                  94:2B:E8:F6:D2:86
-MODE:                                   Infra
+MODE:                                   Infrastruktura
 CHAN:                                   1
-FREQ:                                   2412 MHz
-RATE:                                   54 Mbit/s
+RATE:                                   54 Mb/s
 SIGNAL:                                 48
 BARS:                                   **  
 SECURITY:                               WPA1 WPA2
-WPA-FLAGS:                              pair_tkip pair_ccmp group_tkip group_ccmp psk
-RSN-FLAGS:                              pair_tkip pair_ccmp group_tkip group_ccmp psk
-DEVICE:                                 wlan1
-ACTIVE:                                 no
-IN-USE:                                  
-DBUS-PATH:                              /org/freedesktop/NetworkManager/AccessPoint/4
 -------------------------------------------------------------------------------
 
 ===============================================================================
-                            Wi-Fi scan list (wlan1)
+                     Lista skanowania sieci Wi-Fi (wlan1)
 ===============================================================================
 
+<<<
+size: 5498
+location: clients/tests/test-client.py:1085:test_004()/745
+cmd: $NMCLI --mode multiline --pretty --color yes -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list
+lang: C
+returncode: 0
+stdout: 5202 bytes
+>>>
 ===============================================================================
                             Wi-Fi scan list (wlan0)
 ===============================================================================
@@ -41448,9 +42074,9 @@ FREQ:                                   2412 MHz
 RATE:                                   54 Mbit/s
 SIGNAL:                                 81
 BARS:                                   ****
-SECURITY:                               WPA1 WPA2
+SECURITY:                               WPA1
 WPA-FLAGS:                              pair_tkip pair_ccmp group_tkip group_ccmp psk
-RSN-FLAGS:                              pair_tkip pair_ccmp group_tkip group_ccmp psk
+RSN-FLAGS:                              (none)
 DEVICE:                                 wlan0
 ACTIVE:                                 no
 IN-USE:                                  
@@ -41466,49 +42092,49 @@ FREQ:                                   2412 MHz
 RATE:                                   54 Mbit/s
 SIGNAL:                                 55
 BARS:                                   **  
-SECURITY:                               WPA1 WPA2
-WPA-FLAGS:                              pair_tkip pair_ccmp group_tkip group_ccmp psk
-RSN-FLAGS:                              pair_tkip pair_ccmp group_tkip group_ccmp psk
+SECURITY:                               WPA3
+WPA-FLAGS:                              (none)
+RSN-FLAGS:                              pair_tkip pair_ccmp group_tkip group_ccmp sae
 DEVICE:                                 wlan0
 ACTIVE:                                 no
 IN-USE:                                  
 DBUS-PATH:                              /org/freedesktop/NetworkManager/AccessPoint/3
 -------------------------------------------------------------------------------
 
-<<<
-size: 5662
-location: clients/tests/test-client.py:1071:test_004()/746
-cmd: $NMCLI --mode multiline --pretty --color yes -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list
-lang: pl_PL.UTF-8
-returncode: 0
-stdout: 5356 bytes
->>>
 ===============================================================================
-                     Lista skanowania sieci Wi-Fi (wlan1)
+                            Wi-Fi scan list (wlan1)
 ===============================================================================
 NAME:                                   AP[1]
 SSID:                                   wlan1-ap-4
 SSID-HEX:                               776C616E312D61702D34
 BSSID:                                  94:2B:E8:F6:D2:86
-MODE:                                   Infrastruktura
+MODE:                                   Infra
 CHAN:                                   1
-FREQ:                                   2412 MHz
-RATE:                                   54 Mb/s
+FREQ:                                   2412 MHz
+RATE:                                   54 Mbit/s
 SIGNAL:                                 48
 BARS:                                   **  
 SECURITY:                               WPA1 WPA2
 WPA-FLAGS:                              pair_tkip pair_ccmp group_tkip group_ccmp psk
 RSN-FLAGS:                              pair_tkip pair_ccmp group_tkip group_ccmp psk
 DEVICE:                                 wlan1
-ACTIVE:                                 nie
+ACTIVE:                                 no
 IN-USE:                                  
 DBUS-PATH:                              /org/freedesktop/NetworkManager/AccessPoint/4
 -------------------------------------------------------------------------------
 
 ===============================================================================
-                     Lista skanowania sieci Wi-Fi (wlan1)
+                            Wi-Fi scan list (wlan1)
 ===============================================================================
 
+<<<
+size: 5574
+location: clients/tests/test-client.py:1085:test_004()/746
+cmd: $NMCLI --mode multiline --pretty --color yes -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 5268 bytes
+>>>
 ===============================================================================
                      Lista skanowania sieci Wi-Fi (wlan0)
 ===============================================================================
@@ -41540,9 +42166,9 @@ FREQ:                                   2412 MHz
 RATE:                                   54 Mb/s
 SIGNAL:                                 81
 BARS:                                   ****
-SECURITY:                               WPA1 WPA2
+SECURITY:                               WPA1
 WPA-FLAGS:                              pair_tkip pair_ccmp group_tkip group_ccmp psk
-RSN-FLAGS:                              pair_tkip pair_ccmp group_tkip group_ccmp psk
+RSN-FLAGS:                              (brak)
 DEVICE:                                 wlan0
 ACTIVE:                                 nie
 IN-USE:                                  
@@ -41558,22 +42184,48 @@ FREQ:                                   2412 MHz
 RATE:                                   54 Mb/s
 SIGNAL:                                 55
 BARS:                                   **  
+SECURITY:                               WPA3
+WPA-FLAGS:                              (brak)
+RSN-FLAGS:                              pair_tkip pair_ccmp group_tkip group_ccmp sae
+DEVICE:                                 wlan0
+ACTIVE:                                 nie
+IN-USE:                                  
+DBUS-PATH:                              /org/freedesktop/NetworkManager/AccessPoint/3
+-------------------------------------------------------------------------------
+
+===============================================================================
+                     Lista skanowania sieci Wi-Fi (wlan1)
+===============================================================================
+NAME:                                   AP[1]
+SSID:                                   wlan1-ap-4
+SSID-HEX:                               776C616E312D61702D34
+BSSID:                                  94:2B:E8:F6:D2:86
+MODE:                                   Infrastruktura
+CHAN:                                   1
+FREQ:                                   2412 MHz
+RATE:                                   54 Mb/s
+SIGNAL:                                 48
+BARS:                                   **  
 SECURITY:                               WPA1 WPA2
 WPA-FLAGS:                              pair_tkip pair_ccmp group_tkip group_ccmp psk
 RSN-FLAGS:                              pair_tkip pair_ccmp group_tkip group_ccmp psk
-DEVICE:                                 wlan0
+DEVICE:                                 wlan1
 ACTIVE:                                 nie
 IN-USE:                                  
-DBUS-PATH:                              /org/freedesktop/NetworkManager/AccessPoint/3
+DBUS-PATH:                              /org/freedesktop/NetworkManager/AccessPoint/4
 -------------------------------------------------------------------------------
 
+===============================================================================
+                     Lista skanowania sieci Wi-Fi (wlan1)
+===============================================================================
+
 <<<
-size: 1582
-location: clients/tests/test-client.py:1073:test_004()/747
+size: 1584
+location: clients/tests/test-client.py:1087:test_004()/747
 cmd: $NMCLI --mode multiline --pretty --color yes -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: C
 returncode: 0
-stdout: 1375 bytes
+stdout: 1377 bytes
 >>>
 ===============================================================================
                             Wi-Fi scan list (wlan0)
@@ -41597,13 +42249,15 @@ IN-USE:                                  
 DBUS-PATH:                              /org/freedesktop/NetworkManager/AccessPoint/2
 -------------------------------------------------------------------------------
 
+
+
 <<<
-size: 1610
-location: clients/tests/test-client.py:1073:test_004()/748
+size: 1612
+location: clients/tests/test-client.py:1087:test_004()/748
 cmd: $NMCLI --mode multiline --pretty --color yes -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 1393 bytes
+stdout: 1395 bytes
 >>>
 ===============================================================================
                      Lista skanowania sieci Wi-Fi (wlan0)
@@ -41627,13 +42281,15 @@ IN-USE:                                  
 DBUS-PATH:                              /org/freedesktop/NetworkManager/AccessPoint/2
 -------------------------------------------------------------------------------
 
+
+
 <<<
-size: 942
-location: clients/tests/test-client.py:1075:test_004()/749
+size: 944
+location: clients/tests/test-client.py:1089:test_004()/749
 cmd: $NMCLI --mode multiline --pretty --color yes -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: C
 returncode: 0
-stdout: 733 bytes
+stdout: 735 bytes
 >>>
 ===============================================================================
                             Wi-Fi scan list (wlan0)
@@ -41648,13 +42304,15 @@ BARS:                                   ****
 SECURITY:                               WPA1 WPA2
 -------------------------------------------------------------------------------
 
+
+
 <<<
-size: 967
-location: clients/tests/test-client.py:1075:test_004()/750
+size: 969
+location: clients/tests/test-client.py:1089:test_004()/750
 cmd: $NMCLI --mode multiline --pretty --color yes -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 748 bytes
+stdout: 750 bytes
 >>>
 ===============================================================================
                      Lista skanowania sieci Wi-Fi (wlan0)
@@ -41669,13 +42327,15 @@ BARS:                                   ****
 SECURITY:                               WPA1 WPA2
 -------------------------------------------------------------------------------
 
+
+
 <<<
-size: 1695
-location: clients/tests/test-client.py:1078:test_004()/751
+size: 1697
+location: clients/tests/test-client.py:1092:test_004()/751
 cmd: $NMCLI --mode multiline --pretty --color yes -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: C
 returncode: 0
-stdout: 1375 bytes
+stdout: 1377 bytes
 >>>
 ===============================================================================
                             Wi-Fi scan list (wlan0)
@@ -41699,13 +42359,15 @@ IN-USE:                                  
 DBUS-PATH:                              /org/freedesktop/NetworkManager/AccessPoint/2
 -------------------------------------------------------------------------------
 
+
+
 <<<
-size: 1723
-location: clients/tests/test-client.py:1078:test_004()/752
+size: 1725
+location: clients/tests/test-client.py:1092:test_004()/752
 cmd: $NMCLI --mode multiline --pretty --color yes -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 1393 bytes
+stdout: 1395 bytes
 >>>
 ===============================================================================
                      Lista skanowania sieci Wi-Fi (wlan0)
@@ -41729,13 +42391,15 @@ IN-USE:                                  
 DBUS-PATH:                              /org/freedesktop/NetworkManager/AccessPoint/2
 -------------------------------------------------------------------------------
 
+
+
 <<<
-size: 6102
-location: clients/tests/test-client.py:1080:test_004()/753
+size: 6196
+location: clients/tests/test-client.py:1094:test_004()/753
 cmd: $NMCLI --mode multiline --pretty --color yes -f ALL device show wlan0
 lang: C
 returncode: 0
-stdout: 5918 bytes
+stdout: 6012 bytes
 >>>
 ===============================================================================
                             Device details (wlan0)
@@ -41752,6 +42416,8 @@ GENERAL.HWADDR:                         13:E0:74:85:7C:D9
 GENERAL.MTU:                            0
 GENERAL.STATE:                          20 (unavailable)
 GENERAL.REASON:                         0 (No reason given)
+GENERAL.IP4-CONNECTIVITY:               0 (unknown)
+GENERAL.IP6-CONNECTIVITY:               0 (unknown)
 GENERAL.UDI:                            /sys/devices/virtual/wlan0
 GENERAL.IP-IFACE:                       --
 GENERAL.IS-SOFTWARE:                    no
@@ -41796,7 +42462,7 @@ AP[2].CHAN:                             1
 AP[2].RATE:                             54 Mbit/s
 AP[2].SIGNAL:                           81
 AP[2].BARS:                             ****
-AP[2].SECURITY:                         WPA1 WPA2
+AP[2].SECURITY:                         WPA1
 -------------------------------------------------------------------------------
 AP[3].IN-USE:                            
 AP[3].SSID:                             wlan0-ap-3
@@ -41805,7 +42471,7 @@ AP[3].CHAN:                             1
 AP[3].RATE:                             54 Mbit/s
 AP[3].SIGNAL:                           55
 AP[3].BARS:                             **  
-AP[3].SECURITY:                         WPA1 WPA2
+AP[3].SECURITY:                         WPA3
 -------------------------------------------------------------------------------
 IP4.ADDRESS[1]:                         192.168.228.18/32
 IP4.ADDRESS[2]:                         192.168.209.179/25
@@ -41842,12 +42508,12 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | c
 -------------------------------------------------------------------------------
 
 <<<
-size: 6162
-location: clients/tests/test-client.py:1080:test_004()/754
+size: 6258
+location: clients/tests/test-client.py:1094:test_004()/754
 cmd: $NMCLI --mode multiline --pretty --color yes -f ALL device show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 5968 bytes
+stdout: 6064 bytes
 >>>
 ===============================================================================
                         Informacje o urządzeniu (wlan0)
@@ -41864,6 +42530,8 @@ GENERAL.HWADDR:                         13:E0:74:85:7C:D9
 GENERAL.MTU:                            0
 GENERAL.STATE:                          20 (niedostępne)
 GENERAL.REASON:                         0 (Nie podano przyczyny)
+GENERAL.IP4-CONNECTIVITY:               0 (nieznane)
+GENERAL.IP6-CONNECTIVITY:               0 (nieznane)
 GENERAL.UDI:                            /sys/devices/virtual/wlan0
 GENERAL.IP-IFACE:                       --
 GENERAL.IS-SOFTWARE:                    nie
@@ -41908,7 +42576,7 @@ AP[2].CHAN:                             1
 AP[2].RATE:                             54 Mb/s
 AP[2].SIGNAL:                           81
 AP[2].BARS:                             ****
-AP[2].SECURITY:                         WPA1 WPA2
+AP[2].SECURITY:                         WPA1
 -------------------------------------------------------------------------------
 AP[3].IN-USE:                            
 AP[3].SSID:                             wlan0-ap-3
@@ -41917,7 +42585,7 @@ AP[3].CHAN:                             1
 AP[3].RATE:                             54 Mb/s
 AP[3].SIGNAL:                           55
 AP[3].BARS:                             **  
-AP[3].SECURITY:                         WPA1 WPA2
+AP[3].SECURITY:                         WPA3
 -------------------------------------------------------------------------------
 IP4.ADDRESS[1]:                         192.168.228.18/32
 IP4.ADDRESS[2]:                         192.168.209.179/25
@@ -41955,7 +42623,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | c
 
 <<<
 size: 2481
-location: clients/tests/test-client.py:1082:test_004()/755
+location: clients/tests/test-client.py:1096:test_004()/755
 cmd: $NMCLI --mode multiline --pretty --color yes -f COMMON device show wlan0
 lang: C
 returncode: 0
@@ -42000,7 +42668,7 @@ IP6.DOMAIN[6]:                          sear6.foo4.bar
 
 <<<
 size: 2499
-location: clients/tests/test-client.py:1082:test_004()/756
+location: clients/tests/test-client.py:1096:test_004()/756
 cmd: $NMCLI --mode multiline --pretty --color yes -f COMMON device show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
@@ -42044,12 +42712,12 @@ IP6.DOMAIN[6]:                          sear6.foo4.bar
 -------------------------------------------------------------------------------
 
 <<<
-size: 6240
-location: clients/tests/test-client.py:1084:test_004()/757
+size: 6334
+location: clients/tests/test-client.py:1098:test_004()/757
 cmd: $NMCLI --mode multiline --pretty --color yes -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0
 lang: C
 returncode: 0
-stdout: 5918 bytes
+stdout: 6012 bytes
 >>>
 ===============================================================================
                             Device details (wlan0)
@@ -42066,6 +42734,8 @@ GENERAL.HWADDR:                         13:E0:74:85:7C:D9
 GENERAL.MTU:                            0
 GENERAL.STATE:                          20 (unavailable)
 GENERAL.REASON:                         0 (No reason given)
+GENERAL.IP4-CONNECTIVITY:               0 (unknown)
+GENERAL.IP6-CONNECTIVITY:               0 (unknown)
 GENERAL.UDI:                            /sys/devices/virtual/wlan0
 GENERAL.IP-IFACE:                       --
 GENERAL.IS-SOFTWARE:                    no
@@ -42110,7 +42780,7 @@ AP[2].CHAN:                             1
 AP[2].RATE:                             54 Mbit/s
 AP[2].SIGNAL:                           81
 AP[2].BARS:                             ****
-AP[2].SECURITY:                         WPA1 WPA2
+AP[2].SECURITY:                         WPA1
 -------------------------------------------------------------------------------
 AP[3].IN-USE:                            
 AP[3].SSID:                             wlan0-ap-3
@@ -42119,7 +42789,7 @@ AP[3].CHAN:                             1
 AP[3].RATE:                             54 Mbit/s
 AP[3].SIGNAL:                           55
 AP[3].BARS:                             **  
-AP[3].SECURITY:                         WPA1 WPA2
+AP[3].SECURITY:                         WPA3
 -------------------------------------------------------------------------------
 IP4.ADDRESS[1]:                         192.168.228.18/32
 IP4.ADDRESS[2]:                         192.168.209.179/25
@@ -42156,12 +42826,12 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | c
 -------------------------------------------------------------------------------
 
 <<<
-size: 6300
-location: clients/tests/test-client.py:1084:test_004()/758
+size: 6396
+location: clients/tests/test-client.py:1098:test_004()/758
 cmd: $NMCLI --mode multiline --pretty --color yes -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 5968 bytes
+stdout: 6064 bytes
 >>>
 ===============================================================================
                         Informacje o urządzeniu (wlan0)
@@ -42178,6 +42848,8 @@ GENERAL.HWADDR:                         13:E0:74:85:7C:D9
 GENERAL.MTU:                            0
 GENERAL.STATE:                          20 (niedostępne)
 GENERAL.REASON:                         0 (Nie podano przyczyny)
+GENERAL.IP4-CONNECTIVITY:               0 (nieznane)
+GENERAL.IP6-CONNECTIVITY:               0 (nieznane)
 GENERAL.UDI:                            /sys/devices/virtual/wlan0
 GENERAL.IP-IFACE:                       --
 GENERAL.IS-SOFTWARE:                    nie
@@ -42222,7 +42894,7 @@ AP[2].CHAN:                             1
 AP[2].RATE:                             54 Mb/s
 AP[2].SIGNAL:                           81
 AP[2].BARS:                             ****
-AP[2].SECURITY:                         WPA1 WPA2
+AP[2].SECURITY:                         WPA1
 -------------------------------------------------------------------------------
 AP[3].IN-USE:                            
 AP[3].SSID:                             wlan0-ap-3
@@ -42231,7 +42903,7 @@ AP[3].CHAN:                             1
 AP[3].RATE:                             54 Mb/s
 AP[3].SIGNAL:                           55
 AP[3].BARS:                             **  
-AP[3].SECURITY:                         WPA1 WPA2
+AP[3].SECURITY:                         WPA3
 -------------------------------------------------------------------------------
 IP4.ADDRESS[1]:                         192.168.228.18/32
 IP4.ADDRESS[2]:                         192.168.209.179/25
@@ -42269,7 +42941,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | c
 
 <<<
 size: 2340
-location: clients/tests/test-client.py:1022:test_004()/759
+location: clients/tests/test-client.py:1036:test_004()/759
 cmd: $NMCLI --mode multiline --terse con s con-vpn-1
 lang: C
 returncode: 0
@@ -42371,7 +43043,7 @@ VPN.CFG[3]:key3 = val3
 
 <<<
 size: 2350
-location: clients/tests/test-client.py:1022:test_004()/760
+location: clients/tests/test-client.py:1036:test_004()/760
 cmd: $NMCLI --mode multiline --terse con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
@@ -42473,7 +43145,7 @@ VPN.CFG[3]:key3 = val3
 
 <<<
 size: 2340
-location: clients/tests/test-client.py:1024:test_004()/761
+location: clients/tests/test-client.py:1038:test_004()/761
 cmd: $NMCLI --mode multiline --terse con s con-vpn-1
 lang: C
 returncode: 0
@@ -42575,7 +43247,7 @@ VPN.CFG[3]:key3 = val3
 
 <<<
 size: 2350
-location: clients/tests/test-client.py:1024:test_004()/762
+location: clients/tests/test-client.py:1038:test_004()/762
 cmd: $NMCLI --mode multiline --terse con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
@@ -42677,7 +43349,7 @@ VPN.CFG[3]:key3 = val3
 
 <<<
 size: 1788
-location: clients/tests/test-client.py:1027:test_004()/763
+location: clients/tests/test-client.py:1041:test_004()/763
 cmd: $NMCLI --mode multiline --terse -f ALL con s con-vpn-1
 lang: C
 returncode: 0
@@ -42759,7 +43431,7 @@ proxy.pac-script:
 
 <<<
 size: 1798
-location: clients/tests/test-client.py:1027:test_004()/764
+location: clients/tests/test-client.py:1041:test_004()/764
 cmd: $NMCLI --mode multiline --terse -f ALL con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
@@ -42841,7 +43513,7 @@ proxy.pac-script:
 
 <<<
 size: 339
-location: clients/tests/test-client.py:1033:test_004()/765
+location: clients/tests/test-client.py:1047:test_004()/765
 cmd: $NMCLI --mode multiline --terse -f VPN con s con-vpn-1
 lang: C
 returncode: 0
@@ -42856,7 +43528,7 @@ vpn.timeout:0
 
 <<<
 size: 349
-location: clients/tests/test-client.py:1033:test_004()/766
+location: clients/tests/test-client.py:1047:test_004()/766
 cmd: $NMCLI --mode multiline --terse -f VPN con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
@@ -42871,7 +43543,7 @@ vpn.timeout:0
 
 <<<
 size: 542
-location: clients/tests/test-client.py:1036:test_004()/767
+location: clients/tests/test-client.py:1050:test_004()/767
 cmd: $NMCLI --mode multiline --terse -f GENERAL con s con-vpn-1
 lang: C
 returncode: 0
@@ -42892,7 +43564,7 @@ GENERAL.MASTER-PATH:
 
 <<<
 size: 552
-location: clients/tests/test-client.py:1036:test_004()/768
+location: clients/tests/test-client.py:1050:test_004()/768
 cmd: $NMCLI --mode multiline --terse -f GENERAL con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
@@ -42913,12 +43585,16 @@ GENERAL.MASTER-PATH:
 
 <<<
 size: 431
-location: clients/tests/test-client.py:1039:test_004()/769
+location: clients/tests/test-client.py:1053:test_004()/769
 cmd: $NMCLI --mode multiline --terse dev s
 lang: C
 returncode: 0
 stdout: 280 bytes
 >>>
+DEVICE:wlan0
+TYPE:wifi
+STATE:unavailable
+CONNECTION:con-vpn-1
 DEVICE:eth0
 TYPE:ethernet
 STATE:unavailable
@@ -42935,19 +43611,19 @@ DEVICE:wlan1
 TYPE:wifi
 STATE:unavailable
 CONNECTION:
-DEVICE:wlan0
-TYPE:wifi
-STATE:unavailable
-CONNECTION:con-vpn-1
 
 <<<
 size: 441
-location: clients/tests/test-client.py:1039:test_004()/770
+location: clients/tests/test-client.py:1053:test_004()/770
 cmd: $NMCLI --mode multiline --terse dev s
 lang: pl_PL.UTF-8
 returncode: 0
 stdout: 280 bytes
 >>>
+DEVICE:wlan0
+TYPE:wifi
+STATE:unavailable
+CONNECTION:con-vpn-1
 DEVICE:eth0
 TYPE:ethernet
 STATE:unavailable
@@ -42964,22 +43640,29 @@ DEVICE:wlan1
 TYPE:wifi
 STATE:unavailable
 CONNECTION:
-DEVICE:wlan0
-TYPE:wifi
-STATE:unavailable
-CONNECTION:con-vpn-1
 
 <<<
-size: 889
-location: clients/tests/test-client.py:1042:test_004()/771
+size: 1139
+location: clients/tests/test-client.py:1056:test_004()/771
 cmd: $NMCLI --mode multiline --terse -f all dev status
 lang: C
 returncode: 0
-stdout: 726 bytes
+stdout: 976 bytes
 >>>
+DEVICE:wlan0
+TYPE:wifi
+STATE:unavailable
+IP4-CONNECTIVITY:unknown
+IP6-CONNECTIVITY:unknown
+DBUS-PATH:/org/freedesktop/NetworkManager/Devices/3
+CONNECTION:con-vpn-1
+CON-UUID:UUID-con-vpn-1-REPLACED-REPLACED-REP
+CON-PATH:/org/freedesktop/NetworkManager/ActiveConnection/2
 DEVICE:eth0
 TYPE:ethernet
 STATE:unavailable
+IP4-CONNECTIVITY:unknown
+IP6-CONNECTIVITY:unknown
 DBUS-PATH:/org/freedesktop/NetworkManager/Devices/1
 CONNECTION:
 CON-UUID:
@@ -42987,6 +43670,8 @@ CON-PATH:
 DEVICE:eth1
 TYPE:ethernet
 STATE:unavailable
+IP4-CONNECTIVITY:unknown
+IP6-CONNECTIVITY:unknown
 DBUS-PATH:/org/freedesktop/NetworkManager/Devices/2
 CONNECTION:
 CON-UUID:
@@ -42994,6 +43679,8 @@ CON-PATH:
 DEVICE:wlan1
 TYPE:wifi
 STATE:unavailable
+IP4-CONNECTIVITY:unknown
+IP6-CONNECTIVITY:unknown
 DBUS-PATH:/org/freedesktop/NetworkManager/Devices/4
 CONNECTION:
 CON-UUID:
@@ -43001,29 +43688,35 @@ CON-PATH:
 DEVICE:wlan1
 TYPE:wifi
 STATE:unavailable
+IP4-CONNECTIVITY:unknown
+IP6-CONNECTIVITY:unknown
 DBUS-PATH:/org/freedesktop/NetworkManager/Devices/5
 CONNECTION:
 CON-UUID:
 CON-PATH:
+
+<<<
+size: 1149
+location: clients/tests/test-client.py:1056:test_004()/772
+cmd: $NMCLI --mode multiline --terse -f all dev status
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 976 bytes
+>>>
 DEVICE:wlan0
 TYPE:wifi
 STATE:unavailable
+IP4-CONNECTIVITY:unknown
+IP6-CONNECTIVITY:unknown
 DBUS-PATH:/org/freedesktop/NetworkManager/Devices/3
 CONNECTION:con-vpn-1
 CON-UUID:UUID-con-vpn-1-REPLACED-REPLACED-REP
 CON-PATH:/org/freedesktop/NetworkManager/ActiveConnection/2
-
-<<<
-size: 899
-location: clients/tests/test-client.py:1042:test_004()/772
-cmd: $NMCLI --mode multiline --terse -f all dev status
-lang: pl_PL.UTF-8
-returncode: 0
-stdout: 726 bytes
->>>
 DEVICE:eth0
 TYPE:ethernet
 STATE:unavailable
+IP4-CONNECTIVITY:unknown
+IP6-CONNECTIVITY:unknown
 DBUS-PATH:/org/freedesktop/NetworkManager/Devices/1
 CONNECTION:
 CON-UUID:
@@ -43031,6 +43724,8 @@ CON-PATH:
 DEVICE:eth1
 TYPE:ethernet
 STATE:unavailable
+IP4-CONNECTIVITY:unknown
+IP6-CONNECTIVITY:unknown
 DBUS-PATH:/org/freedesktop/NetworkManager/Devices/2
 CONNECTION:
 CON-UUID:
@@ -43038,6 +43733,8 @@ CON-PATH:
 DEVICE:wlan1
 TYPE:wifi
 STATE:unavailable
+IP4-CONNECTIVITY:unknown
+IP6-CONNECTIVITY:unknown
 DBUS-PATH:/org/freedesktop/NetworkManager/Devices/4
 CONNECTION:
 CON-UUID:
@@ -43045,26 +43742,46 @@ CON-PATH:
 DEVICE:wlan1
 TYPE:wifi
 STATE:unavailable
+IP4-CONNECTIVITY:unknown
+IP6-CONNECTIVITY:unknown
 DBUS-PATH:/org/freedesktop/NetworkManager/Devices/5
 CONNECTION:
 CON-UUID:
 CON-PATH:
-DEVICE:wlan0
-TYPE:wifi
-STATE:unavailable
-DBUS-PATH:/org/freedesktop/NetworkManager/Devices/3
-CONNECTION:con-vpn-1
-CON-UUID:UUID-con-vpn-1-REPLACED-REPLACED-REP
-CON-PATH:/org/freedesktop/NetworkManager/ActiveConnection/2
 
 <<<
 size: 4557
-location: clients/tests/test-client.py:1045:test_004()/773
+location: clients/tests/test-client.py:1059:test_004()/773
 cmd: $NMCLI --mode multiline --terse dev show
 lang: C
 returncode: 0
 stdout: 4402 bytes
 >>>
+GENERAL.DEVICE:wlan0
+GENERAL.TYPE:wifi
+GENERAL.HWADDR:13:E0:74:85:7C:D9
+GENERAL.MTU:0
+GENERAL.STATE:20 (unavailable)
+GENERAL.CONNECTION:con-vpn-1
+GENERAL.CON-PATH:/org/freedesktop/NetworkManager/ActiveConnection/2
+IP4.ADDRESS[1]:192.168.228.18/32
+IP4.ADDRESS[2]:192.168.209.179/25
+IP4.GATEWAY:192.168.41.120
+IP4.DOMAIN[1]:sear4.foo2.bar
+IP4.DOMAIN[2]:sear4.fo.x.y
+IP4.DOMAIN[3]:sear4.foo1.bar
+IP4.DOMAIN[4]:sear4.foo4.bar
+IP4.DOMAIN[5]:sear4.fo.o.bar
+IP4.WINS[1]:192.168.120.79
+IP6.GATEWAY:
+IP6.ROUTE[1]:dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086
+IP6.DOMAIN[1]:sear6.foo2.bar
+IP6.DOMAIN[2]:sear6.foo1.bar
+IP6.DOMAIN[3]:sear6.fo.x.y
+IP6.DOMAIN[4]:sear6.fo.o.bar
+IP6.DOMAIN[5]:sear6.foo3.bar
+IP6.DOMAIN[6]:sear6.foo4.bar
+
 GENERAL.DEVICE:eth0
 GENERAL.TYPE:ethernet
 GENERAL.HWADDR:AB:B7:BF:E2:48:E8
@@ -43178,6 +43895,14 @@ IP6.ROUTE[3]:dst = 2001:a::afb7:4449:3787:8bb4/123, nh = ::
 IP6.DNS[1]:2001:a::2934:bd66:550d:ec19
 IP6.DOMAIN[1]:sear6.fo.x.y
 
+<<<
+size: 4567
+location: clients/tests/test-client.py:1059:test_004()/774
+cmd: $NMCLI --mode multiline --terse dev show
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 4402 bytes
+>>>
 GENERAL.DEVICE:wlan0
 GENERAL.TYPE:wifi
 GENERAL.HWADDR:13:E0:74:85:7C:D9
@@ -43203,14 +43928,6 @@ IP6.DOMAIN[4]:sear6.fo.o.bar
 IP6.DOMAIN[5]:sear6.foo3.bar
 IP6.DOMAIN[6]:sear6.foo4.bar
 
-<<<
-size: 4567
-location: clients/tests/test-client.py:1045:test_004()/774
-cmd: $NMCLI --mode multiline --terse dev show
-lang: pl_PL.UTF-8
-returncode: 0
-stdout: 4402 bytes
->>>
 GENERAL.DEVICE:eth0
 GENERAL.TYPE:ethernet
 GENERAL.HWADDR:AB:B7:BF:E2:48:E8
@@ -43324,13 +44041,77 @@ IP6.ROUTE[3]:dst = 2001:a::afb7:4449:3787:8bb4/123, nh = ::
 IP6.DNS[1]:2001:a::2934:bd66:550d:ec19
 IP6.DOMAIN[1]:sear6.fo.x.y
 
+<<<
+size: 11944
+location: clients/tests/test-client.py:1062:test_004()/775
+cmd: $NMCLI --mode multiline --terse -f all dev show
+lang: C
+returncode: 0
+stdout: 11781 bytes
+>>>
 GENERAL.DEVICE:wlan0
 GENERAL.TYPE:wifi
+GENERAL.NM-TYPE:NMDeviceWifi
+GENERAL.VENDOR:
+GENERAL.PRODUCT:
+GENERAL.DRIVER:virtual
+GENERAL.DRIVER-VERSION:
+GENERAL.FIRMWARE-VERSION:
 GENERAL.HWADDR:13:E0:74:85:7C:D9
 GENERAL.MTU:0
 GENERAL.STATE:20 (unavailable)
+GENERAL.REASON:0 (No reason given)
+GENERAL.IP4-CONNECTIVITY:0 (unknown)
+GENERAL.IP6-CONNECTIVITY:0 (unknown)
+GENERAL.UDI:/sys/devices/virtual/wlan0
+GENERAL.IP-IFACE:
+GENERAL.IS-SOFTWARE:no
+GENERAL.NM-MANAGED:yes
+GENERAL.AUTOCONNECT:yes
+GENERAL.FIRMWARE-MISSING:no
+GENERAL.NM-PLUGIN-MISSING:no
+GENERAL.PHYS-PORT-ID:
 GENERAL.CONNECTION:con-vpn-1
+GENERAL.CON-UUID:UUID-con-vpn-1-REPLACED-REPLACED-REP
 GENERAL.CON-PATH:/org/freedesktop/NetworkManager/ActiveConnection/2
+GENERAL.METERED:unknown
+CAPABILITIES.CARRIER-DETECT:no
+CAPABILITIES.SPEED:unknown
+CAPABILITIES.IS-SOFTWARE:no
+CAPABILITIES.SRIOV:no
+WIFI-PROPERTIES.WEP:yes
+WIFI-PROPERTIES.WPA:yes
+WIFI-PROPERTIES.WPA2:yes
+WIFI-PROPERTIES.TKIP:yes
+WIFI-PROPERTIES.CCMP:yes
+WIFI-PROPERTIES.AP:yes
+WIFI-PROPERTIES.ADHOC:yes
+WIFI-PROPERTIES.2GHZ:unknown
+WIFI-PROPERTIES.5GHZ:unknown
+AP[1].IN-USE: 
+AP[1].SSID:wlan0-ap-2
+AP[1].MODE:Infra
+AP[1].CHAN:1
+AP[1].RATE:54 Mbit/s
+AP[1].SIGNAL:92
+AP[1].BARS:****
+AP[1].SECURITY:WPA1 WPA2
+AP[2].IN-USE: 
+AP[2].SSID:wlan0-ap-1
+AP[2].MODE:Infra
+AP[2].CHAN:1
+AP[2].RATE:54 Mbit/s
+AP[2].SIGNAL:81
+AP[2].BARS:****
+AP[2].SECURITY:WPA1
+AP[3].IN-USE: 
+AP[3].SSID:wlan0-ap-3
+AP[3].MODE:Infra
+AP[3].CHAN:1
+AP[3].RATE:54 Mbit/s
+AP[3].SIGNAL:55
+AP[3].BARS:**  
+AP[3].SECURITY:WPA3
 IP4.ADDRESS[1]:192.168.228.18/32
 IP4.ADDRESS[2]:192.168.209.179/25
 IP4.GATEWAY:192.168.41.120
@@ -43340,6 +44121,10 @@ IP4.DOMAIN[3]:sear4.foo1.bar
 IP4.DOMAIN[4]:sear4.foo4.bar
 IP4.DOMAIN[5]:sear4.fo.o.bar
 IP4.WINS[1]:192.168.120.79
+DHCP4.OPTION[1]:dhcp-4-opt-0 = val-0
+DHCP4.OPTION[2]:dhcp-4-opt-2 = val-2
+DHCP4.OPTION[3]:dhcp-4-opt-4 = val-4
+DHCP4.OPTION[4]:dhcp-4-opt-7 = val-7
 IP6.GATEWAY:
 IP6.ROUTE[1]:dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086
 IP6.DOMAIN[1]:sear6.foo2.bar
@@ -43348,15 +44133,14 @@ IP6.DOMAIN[3]:sear6.fo.x.y
 IP6.DOMAIN[4]:sear6.fo.o.bar
 IP6.DOMAIN[5]:sear6.foo3.bar
 IP6.DOMAIN[6]:sear6.foo4.bar
+DHCP6.OPTION[1]:dhcp-6-opt-1 = val-1
+DHCP6.OPTION[2]:dhcp-6-opt-2 = val-2
+DHCP6.OPTION[3]:dhcp-6-opt-3 = val-3
+DHCP6.OPTION[4]:dhcp-6-opt-4 = val-4
+DHCP6.OPTION[5]:dhcp-6-opt-5 = val-5
+CONNECTIONS.AVAILABLE-CONNECTION-PATHS:/org/freedesktop/NetworkManager/Settings/Connection/{2}
+CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 
-<<<
-size: 11584
-location: clients/tests/test-client.py:1048:test_004()/775
-cmd: $NMCLI --mode multiline --terse -f all dev show
-lang: C
-returncode: 0
-stdout: 11421 bytes
->>>
 GENERAL.DEVICE:eth0
 GENERAL.TYPE:ethernet
 GENERAL.NM-TYPE:NMDeviceEthernet
@@ -43369,6 +44153,8 @@ GENERAL.HWADDR:AB:B7:BF:E2:48:E8
 GENERAL.MTU:0
 GENERAL.STATE:20 (unavailable)
 GENERAL.REASON:0 (No reason given)
+GENERAL.IP4-CONNECTIVITY:0 (unknown)
+GENERAL.IP6-CONNECTIVITY:0 (unknown)
 GENERAL.UDI:/sys/devices/virtual/eth0
 GENERAL.IP-IFACE:
 GENERAL.IS-SOFTWARE:no
@@ -43430,6 +44216,8 @@ GENERAL.HWADDR:E7:78:B1:93:2B:22
 GENERAL.MTU:0
 GENERAL.STATE:20 (unavailable)
 GENERAL.REASON:0 (No reason given)
+GENERAL.IP4-CONNECTIVITY:0 (unknown)
+GENERAL.IP6-CONNECTIVITY:0 (unknown)
 GENERAL.UDI:/sys/devices/virtual/eth1
 GENERAL.IP-IFACE:
 GENERAL.IS-SOFTWARE:no
@@ -43498,6 +44286,8 @@ GENERAL.HWADDR:21:E9:64:81:8C:A8
 GENERAL.MTU:0
 GENERAL.STATE:20 (unavailable)
 GENERAL.REASON:0 (No reason given)
+GENERAL.IP4-CONNECTIVITY:0 (unknown)
+GENERAL.IP6-CONNECTIVITY:0 (unknown)
 GENERAL.UDI:/sys/devices/virtual/wlan1
 GENERAL.IP-IFACE:
 GENERAL.IS-SOFTWARE:no
@@ -43584,6 +44374,8 @@ GENERAL.HWADDR:71:52:AD:63:5C:7C
 GENERAL.MTU:0
 GENERAL.STATE:20 (unavailable)
 GENERAL.REASON:0 (No reason given)
+GENERAL.IP4-CONNECTIVITY:0 (unknown)
+GENERAL.IP6-CONNECTIVITY:0 (unknown)
 GENERAL.UDI:/sys/devices/virtual/wlan1
 GENERAL.IP-IFACE:
 GENERAL.IS-SOFTWARE:no
@@ -43638,6 +44430,14 @@ DHCP6.OPTION[5]:dhcp-6-opt-9 = val-9
 CONNECTIONS.AVAILABLE-CONNECTION-PATHS:/org/freedesktop/NetworkManager/Settings/Connection/{2}
 CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 
+<<<
+size: 11990
+location: clients/tests/test-client.py:1062:test_004()/776
+cmd: $NMCLI --mode multiline --terse -f all dev show
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 11817 bytes
+>>>
 GENERAL.DEVICE:wlan0
 GENERAL.TYPE:wifi
 GENERAL.NM-TYPE:NMDeviceWifi
@@ -43650,6 +44450,8 @@ GENERAL.HWADDR:13:E0:74:85:7C:D9
 GENERAL.MTU:0
 GENERAL.STATE:20 (unavailable)
 GENERAL.REASON:0 (No reason given)
+GENERAL.IP4-CONNECTIVITY:0 (unknown)
+GENERAL.IP6-CONNECTIVITY:0 (unknown)
 GENERAL.UDI:/sys/devices/virtual/wlan0
 GENERAL.IP-IFACE:
 GENERAL.IS-SOFTWARE:no
@@ -43677,28 +44479,28 @@ WIFI-PROPERTIES.2GHZ:unknown
 WIFI-PROPERTIES.5GHZ:unknown
 AP[1].IN-USE: 
 AP[1].SSID:wlan0-ap-2
-AP[1].MODE:Infra
+AP[1].MODE:Infrastruktura
 AP[1].CHAN:1
-AP[1].RATE:54 Mbit/s
+AP[1].RATE:54 Mb/s
 AP[1].SIGNAL:92
 AP[1].BARS:****
 AP[1].SECURITY:WPA1 WPA2
 AP[2].IN-USE: 
 AP[2].SSID:wlan0-ap-1
-AP[2].MODE:Infra
+AP[2].MODE:Infrastruktura
 AP[2].CHAN:1
-AP[2].RATE:54 Mbit/s
+AP[2].RATE:54 Mb/s
 AP[2].SIGNAL:81
 AP[2].BARS:****
-AP[2].SECURITY:WPA1 WPA2
+AP[2].SECURITY:WPA1
 AP[3].IN-USE: 
 AP[3].SSID:wlan0-ap-3
-AP[3].MODE:Infra
+AP[3].MODE:Infrastruktura
 AP[3].CHAN:1
-AP[3].RATE:54 Mbit/s
+AP[3].RATE:54 Mb/s
 AP[3].SIGNAL:55
 AP[3].BARS:**  
-AP[3].SECURITY:WPA1 WPA2
+AP[3].SECURITY:WPA3
 IP4.ADDRESS[1]:192.168.228.18/32
 IP4.ADDRESS[2]:192.168.209.179/25
 IP4.GATEWAY:192.168.41.120
@@ -43728,14 +44530,6 @@ DHCP6.OPTION[5]:dhcp-6-opt-5 = val-5
 CONNECTIONS.AVAILABLE-CONNECTION-PATHS:/org/freedesktop/NetworkManager/Settings/Connection/{2}
 CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 
-<<<
-size: 11630
-location: clients/tests/test-client.py:1048:test_004()/776
-cmd: $NMCLI --mode multiline --terse -f all dev show
-lang: pl_PL.UTF-8
-returncode: 0
-stdout: 11457 bytes
->>>
 GENERAL.DEVICE:eth0
 GENERAL.TYPE:ethernet
 GENERAL.NM-TYPE:NMDeviceEthernet
@@ -43748,6 +44542,8 @@ GENERAL.HWADDR:AB:B7:BF:E2:48:E8
 GENERAL.MTU:0
 GENERAL.STATE:20 (unavailable)
 GENERAL.REASON:0 (No reason given)
+GENERAL.IP4-CONNECTIVITY:0 (unknown)
+GENERAL.IP6-CONNECTIVITY:0 (unknown)
 GENERAL.UDI:/sys/devices/virtual/eth0
 GENERAL.IP-IFACE:
 GENERAL.IS-SOFTWARE:no
@@ -43809,6 +44605,8 @@ GENERAL.HWADDR:E7:78:B1:93:2B:22
 GENERAL.MTU:0
 GENERAL.STATE:20 (unavailable)
 GENERAL.REASON:0 (No reason given)
+GENERAL.IP4-CONNECTIVITY:0 (unknown)
+GENERAL.IP6-CONNECTIVITY:0 (unknown)
 GENERAL.UDI:/sys/devices/virtual/eth1
 GENERAL.IP-IFACE:
 GENERAL.IS-SOFTWARE:no
@@ -43877,6 +44675,8 @@ GENERAL.HWADDR:21:E9:64:81:8C:A8
 GENERAL.MTU:0
 GENERAL.STATE:20 (unavailable)
 GENERAL.REASON:0 (No reason given)
+GENERAL.IP4-CONNECTIVITY:0 (unknown)
+GENERAL.IP6-CONNECTIVITY:0 (unknown)
 GENERAL.UDI:/sys/devices/virtual/wlan1
 GENERAL.IP-IFACE:
 GENERAL.IS-SOFTWARE:no
@@ -43963,6 +44763,8 @@ GENERAL.HWADDR:71:52:AD:63:5C:7C
 GENERAL.MTU:0
 GENERAL.STATE:20 (unavailable)
 GENERAL.REASON:0 (No reason given)
+GENERAL.IP4-CONNECTIVITY:0 (unknown)
+GENERAL.IP6-CONNECTIVITY:0 (unknown)
 GENERAL.UDI:/sys/devices/virtual/wlan1
 GENERAL.IP-IFACE:
 GENERAL.IS-SOFTWARE:no
@@ -44017,99 +44819,9 @@ DHCP6.OPTION[5]:dhcp-6-opt-9 = val-9
 CONNECTIONS.AVAILABLE-CONNECTION-PATHS:/org/freedesktop/NetworkManager/Settings/Connection/{2}
 CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 
-GENERAL.DEVICE:wlan0
-GENERAL.TYPE:wifi
-GENERAL.NM-TYPE:NMDeviceWifi
-GENERAL.VENDOR:
-GENERAL.PRODUCT:
-GENERAL.DRIVER:virtual
-GENERAL.DRIVER-VERSION:
-GENERAL.FIRMWARE-VERSION:
-GENERAL.HWADDR:13:E0:74:85:7C:D9
-GENERAL.MTU:0
-GENERAL.STATE:20 (unavailable)
-GENERAL.REASON:0 (No reason given)
-GENERAL.UDI:/sys/devices/virtual/wlan0
-GENERAL.IP-IFACE:
-GENERAL.IS-SOFTWARE:no
-GENERAL.NM-MANAGED:yes
-GENERAL.AUTOCONNECT:yes
-GENERAL.FIRMWARE-MISSING:no
-GENERAL.NM-PLUGIN-MISSING:no
-GENERAL.PHYS-PORT-ID:
-GENERAL.CONNECTION:con-vpn-1
-GENERAL.CON-UUID:UUID-con-vpn-1-REPLACED-REPLACED-REP
-GENERAL.CON-PATH:/org/freedesktop/NetworkManager/ActiveConnection/2
-GENERAL.METERED:unknown
-CAPABILITIES.CARRIER-DETECT:no
-CAPABILITIES.SPEED:unknown
-CAPABILITIES.IS-SOFTWARE:no
-CAPABILITIES.SRIOV:no
-WIFI-PROPERTIES.WEP:yes
-WIFI-PROPERTIES.WPA:yes
-WIFI-PROPERTIES.WPA2:yes
-WIFI-PROPERTIES.TKIP:yes
-WIFI-PROPERTIES.CCMP:yes
-WIFI-PROPERTIES.AP:yes
-WIFI-PROPERTIES.ADHOC:yes
-WIFI-PROPERTIES.2GHZ:unknown
-WIFI-PROPERTIES.5GHZ:unknown
-AP[1].IN-USE: 
-AP[1].SSID:wlan0-ap-2
-AP[1].MODE:Infrastruktura
-AP[1].CHAN:1
-AP[1].RATE:54 Mb/s
-AP[1].SIGNAL:92
-AP[1].BARS:****
-AP[1].SECURITY:WPA1 WPA2
-AP[2].IN-USE: 
-AP[2].SSID:wlan0-ap-1
-AP[2].MODE:Infrastruktura
-AP[2].CHAN:1
-AP[2].RATE:54 Mb/s
-AP[2].SIGNAL:81
-AP[2].BARS:****
-AP[2].SECURITY:WPA1 WPA2
-AP[3].IN-USE: 
-AP[3].SSID:wlan0-ap-3
-AP[3].MODE:Infrastruktura
-AP[3].CHAN:1
-AP[3].RATE:54 Mb/s
-AP[3].SIGNAL:55
-AP[3].BARS:**  
-AP[3].SECURITY:WPA1 WPA2
-IP4.ADDRESS[1]:192.168.228.18/32
-IP4.ADDRESS[2]:192.168.209.179/25
-IP4.GATEWAY:192.168.41.120
-IP4.DOMAIN[1]:sear4.foo2.bar
-IP4.DOMAIN[2]:sear4.fo.x.y
-IP4.DOMAIN[3]:sear4.foo1.bar
-IP4.DOMAIN[4]:sear4.foo4.bar
-IP4.DOMAIN[5]:sear4.fo.o.bar
-IP4.WINS[1]:192.168.120.79
-DHCP4.OPTION[1]:dhcp-4-opt-0 = val-0
-DHCP4.OPTION[2]:dhcp-4-opt-2 = val-2
-DHCP4.OPTION[3]:dhcp-4-opt-4 = val-4
-DHCP4.OPTION[4]:dhcp-4-opt-7 = val-7
-IP6.GATEWAY:
-IP6.ROUTE[1]:dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086
-IP6.DOMAIN[1]:sear6.foo2.bar
-IP6.DOMAIN[2]:sear6.foo1.bar
-IP6.DOMAIN[3]:sear6.fo.x.y
-IP6.DOMAIN[4]:sear6.fo.o.bar
-IP6.DOMAIN[5]:sear6.foo3.bar
-IP6.DOMAIN[6]:sear6.foo4.bar
-DHCP6.OPTION[1]:dhcp-6-opt-1 = val-1
-DHCP6.OPTION[2]:dhcp-6-opt-2 = val-2
-DHCP6.OPTION[3]:dhcp-6-opt-3 = val-3
-DHCP6.OPTION[4]:dhcp-6-opt-4 = val-4
-DHCP6.OPTION[5]:dhcp-6-opt-5 = val-5
-CONNECTIONS.AVAILABLE-CONNECTION-PATHS:/org/freedesktop/NetworkManager/Settings/Connection/{2}
-CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
-
 <<<
 size: 899
-location: clients/tests/test-client.py:1051:test_004()/777
+location: clients/tests/test-client.py:1065:test_004()/777
 cmd: $NMCLI --mode multiline --terse dev show wlan0
 lang: C
 returncode: 0
@@ -44142,7 +44854,7 @@ IP6.DOMAIN[6]:sear6.foo4.bar
 
 <<<
 size: 909
-location: clients/tests/test-client.py:1051:test_004()/778
+location: clients/tests/test-client.py:1065:test_004()/778
 cmd: $NMCLI --mode multiline --terse dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
@@ -44174,12 +44886,12 @@ IP6.DOMAIN[5]:sear6.foo3.bar
 IP6.DOMAIN[6]:sear6.foo4.bar
 
 <<<
-size: 2646
-location: clients/tests/test-client.py:1054:test_004()/779
+size: 2710
+location: clients/tests/test-client.py:1068:test_004()/779
 cmd: $NMCLI --mode multiline --terse -f all dev show wlan0
 lang: C
 returncode: 0
-stdout: 2478 bytes
+stdout: 2542 bytes
 >>>
 GENERAL.DEVICE:wlan0
 GENERAL.TYPE:wifi
@@ -44193,6 +44905,8 @@ GENERAL.HWADDR:13:E0:74:85:7C:D9
 GENERAL.MTU:0
 GENERAL.STATE:20 (unavailable)
 GENERAL.REASON:0 (No reason given)
+GENERAL.IP4-CONNECTIVITY:0 (unknown)
+GENERAL.IP6-CONNECTIVITY:0 (unknown)
 GENERAL.UDI:/sys/devices/virtual/wlan0
 GENERAL.IP-IFACE:
 GENERAL.IS-SOFTWARE:no
@@ -44233,7 +44947,7 @@ AP[2].CHAN:1
 AP[2].RATE:54 Mbit/s
 AP[2].SIGNAL:81
 AP[2].BARS:****
-AP[2].SECURITY:WPA1 WPA2
+AP[2].SECURITY:WPA1
 AP[3].IN-USE: 
 AP[3].SSID:wlan0-ap-3
 AP[3].MODE:Infra
@@ -44241,7 +44955,7 @@ AP[3].CHAN:1
 AP[3].RATE:54 Mbit/s
 AP[3].SIGNAL:55
 AP[3].BARS:**  
-AP[3].SECURITY:WPA1 WPA2
+AP[3].SECURITY:WPA3
 IP4.ADDRESS[1]:192.168.228.18/32
 IP4.ADDRESS[2]:192.168.209.179/25
 IP4.GATEWAY:192.168.41.120
@@ -44272,12 +44986,12 @@ CONNECTIONS.AVAILABLE-CONNECTION-PATHS:/org/freedesktop/NetworkManager/Settings/
 CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 
 <<<
-size: 2683
-location: clients/tests/test-client.py:1054:test_004()/780
+size: 2747
+location: clients/tests/test-client.py:1068:test_004()/780
 cmd: $NMCLI --mode multiline --terse -f all dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2505 bytes
+stdout: 2569 bytes
 >>>
 GENERAL.DEVICE:wlan0
 GENERAL.TYPE:wifi
@@ -44291,6 +45005,8 @@ GENERAL.HWADDR:13:E0:74:85:7C:D9
 GENERAL.MTU:0
 GENERAL.STATE:20 (unavailable)
 GENERAL.REASON:0 (No reason given)
+GENERAL.IP4-CONNECTIVITY:0 (unknown)
+GENERAL.IP6-CONNECTIVITY:0 (unknown)
 GENERAL.UDI:/sys/devices/virtual/wlan0
 GENERAL.IP-IFACE:
 GENERAL.IS-SOFTWARE:no
@@ -44331,7 +45047,7 @@ AP[2].CHAN:1
 AP[2].RATE:54 Mb/s
 AP[2].SIGNAL:81
 AP[2].BARS:****
-AP[2].SECURITY:WPA1 WPA2
+AP[2].SECURITY:WPA1
 AP[3].IN-USE: 
 AP[3].SSID:wlan0-ap-3
 AP[3].MODE:Infrastruktura
@@ -44339,7 +45055,7 @@ AP[3].CHAN:1
 AP[3].RATE:54 Mb/s
 AP[3].SIGNAL:55
 AP[3].BARS:**  
-AP[3].SECURITY:WPA1 WPA2
+AP[3].SECURITY:WPA3
 IP4.ADDRESS[1]:192.168.228.18/32
 IP4.ADDRESS[2]:192.168.209.179/25
 IP4.GATEWAY:192.168.41.120
@@ -44370,12 +45086,12 @@ CONNECTIONS.AVAILABLE-CONNECTION-PATHS:/org/freedesktop/NetworkManager/Settings/
 CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 
 <<<
-size: 1133
-location: clients/tests/test-client.py:1057:test_004()/781
+size: 1208
+location: clients/tests/test-client.py:1071:test_004()/781
 cmd: $NMCLI --mode multiline --terse -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: C
 returncode: 0
-stdout: 931 bytes
+stdout: 1005 bytes
 >>>
 GENERAL.DEVICE:wlan0
 GENERAL.TYPE:wifi
@@ -44389,6 +45105,8 @@ GENERAL.HWADDR:13:E0:74:85:7C:D9
 GENERAL.MTU:0
 GENERAL.STATE:20 (unavailable)
 GENERAL.REASON:0 (No reason given)
+GENERAL.IP4-CONNECTIVITY:0 (unknown)
+GENERAL.IP6-CONNECTIVITY:0 (unknown)
 GENERAL.UDI:/sys/devices/virtual/wlan0
 GENERAL.IP-IFACE:
 GENERAL.IS-SOFTWARE:no
@@ -44413,12 +45131,12 @@ WIFI-PROPERTIES.2GHZ:unknown
 WIFI-PROPERTIES.5GHZ:unknown
 
 <<<
-size: 1143
-location: clients/tests/test-client.py:1057:test_004()/782
+size: 1218
+location: clients/tests/test-client.py:1071:test_004()/782
 cmd: $NMCLI --mode multiline --terse -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 931 bytes
+stdout: 1005 bytes
 >>>
 GENERAL.DEVICE:wlan0
 GENERAL.TYPE:wifi
@@ -44432,6 +45150,8 @@ GENERAL.HWADDR:13:E0:74:85:7C:D9
 GENERAL.MTU:0
 GENERAL.STATE:20 (unavailable)
 GENERAL.REASON:0 (No reason given)
+GENERAL.IP4-CONNECTIVITY:0 (unknown)
+GENERAL.IP6-CONNECTIVITY:0 (unknown)
 GENERAL.UDI:/sys/devices/virtual/wlan0
 GENERAL.IP-IFACE:
 GENERAL.IS-SOFTWARE:no
@@ -44456,12 +45176,12 @@ WIFI-PROPERTIES.2GHZ:unknown
 WIFI-PROPERTIES.5GHZ:unknown
 
 <<<
-size: 1133
-location: clients/tests/test-client.py:1060:test_004()/783
+size: 1208
+location: clients/tests/test-client.py:1074:test_004()/783
 cmd: $NMCLI --mode multiline --terse -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: C
 returncode: 0
-stdout: 931 bytes
+stdout: 1005 bytes
 >>>
 GENERAL.DEVICE:wlan0
 GENERAL.TYPE:wifi
@@ -44475,6 +45195,8 @@ GENERAL.HWADDR:13:E0:74:85:7C:D9
 GENERAL.MTU:0
 GENERAL.STATE:20 (unavailable)
 GENERAL.REASON:0 (No reason given)
+GENERAL.IP4-CONNECTIVITY:0 (unknown)
+GENERAL.IP6-CONNECTIVITY:0 (unknown)
 GENERAL.UDI:/sys/devices/virtual/wlan0
 GENERAL.IP-IFACE:
 GENERAL.IS-SOFTWARE:no
@@ -44499,12 +45221,12 @@ WIFI-PROPERTIES.2GHZ:unknown
 WIFI-PROPERTIES.5GHZ:unknown
 
 <<<
-size: 1143
-location: clients/tests/test-client.py:1060:test_004()/784
+size: 1218
+location: clients/tests/test-client.py:1074:test_004()/784
 cmd: $NMCLI --mode multiline --terse -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 931 bytes
+stdout: 1005 bytes
 >>>
 GENERAL.DEVICE:wlan0
 GENERAL.TYPE:wifi
@@ -44518,6 +45240,8 @@ GENERAL.HWADDR:13:E0:74:85:7C:D9
 GENERAL.MTU:0
 GENERAL.STATE:20 (unavailable)
 GENERAL.REASON:0 (No reason given)
+GENERAL.IP4-CONNECTIVITY:0 (unknown)
+GENERAL.IP6-CONNECTIVITY:0 (unknown)
 GENERAL.UDI:/sys/devices/virtual/wlan0
 GENERAL.IP-IFACE:
 GENERAL.IS-SOFTWARE:no
@@ -44543,12 +45267,15 @@ WIFI-PROPERTIES.5GHZ:unknown
 
 <<<
 size: 555
-location: clients/tests/test-client.py:1063:test_004()/785
+location: clients/tests/test-client.py:1077:test_004()/785
 cmd: $NMCLI --mode multiline --terse -f DEVICE,TYPE,DBUS-PATH dev
 lang: C
 returncode: 0
 stdout: 381 bytes
 >>>
+DEVICE:wlan0
+TYPE:wifi
+DBUS-PATH:/org/freedesktop/NetworkManager/Devices/3
 DEVICE:eth0
 TYPE:ethernet
 DBUS-PATH:/org/freedesktop/NetworkManager/Devices/1
@@ -44561,18 +45288,18 @@ DBUS-PATH:/org/freedesktop/NetworkManager/Devices/4
 DEVICE:wlan1
 TYPE:wifi
 DBUS-PATH:/org/freedesktop/NetworkManager/Devices/5
-DEVICE:wlan0
-TYPE:wifi
-DBUS-PATH:/org/freedesktop/NetworkManager/Devices/3
 
 <<<
 size: 565
-location: clients/tests/test-client.py:1063:test_004()/786
+location: clients/tests/test-client.py:1077:test_004()/786
 cmd: $NMCLI --mode multiline --terse -f DEVICE,TYPE,DBUS-PATH dev
 lang: pl_PL.UTF-8
 returncode: 0
 stdout: 381 bytes
 >>>
+DEVICE:wlan0
+TYPE:wifi
+DBUS-PATH:/org/freedesktop/NetworkManager/Devices/3
 DEVICE:eth0
 TYPE:ethernet
 DBUS-PATH:/org/freedesktop/NetworkManager/Devices/1
@@ -44585,37 +45312,15 @@ DBUS-PATH:/org/freedesktop/NetworkManager/Devices/4
 DEVICE:wlan1
 TYPE:wifi
 DBUS-PATH:/org/freedesktop/NetworkManager/Devices/5
-DEVICE:wlan0
-TYPE:wifi
-DBUS-PATH:/org/freedesktop/NetworkManager/Devices/3
 
 <<<
-size: 1640
-location: clients/tests/test-client.py:1066:test_004()/787
+size: 1552
+location: clients/tests/test-client.py:1080:test_004()/787
 cmd: $NMCLI --mode multiline --terse -f ALL device wifi list
 lang: C
 returncode: 0
-stdout: 1470 bytes
+stdout: 1382 bytes
 >>>
-NAME:AP[1]
-SSID:wlan1-ap-4
-SSID-HEX:776C616E312D61702D34
-BSSID:94:2B:E8:F6:D2:86
-MODE:Infra
-CHAN:1
-FREQ:2412 MHz
-RATE:54 Mbit/s
-SIGNAL:48
-BARS:**  
-SECURITY:WPA1 WPA2
-WPA-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp psk
-RSN-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp psk
-DEVICE:wlan1
-ACTIVE:no
-IN-USE: 
-DBUS-PATH:/org/freedesktop/NetworkManager/AccessPoint/4
-
-
 NAME:AP[1]
 SSID:wlan0-ap-2
 SSID-HEX:776C616E302D61702D32
@@ -44643,9 +45348,9 @@ FREQ:2412 MHz
 RATE:54 Mbit/s
 SIGNAL:81
 BARS:****
-SECURITY:WPA1 WPA2
+SECURITY:WPA1
 WPA-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp psk
-RSN-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp psk
+RSN-FLAGS:(none)
 DEVICE:wlan0
 ACTIVE:no
 IN-USE: 
@@ -44660,41 +45365,41 @@ FREQ:2412 MHz
 RATE:54 Mbit/s
 SIGNAL:55
 BARS:**  
-SECURITY:WPA1 WPA2
-WPA-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp psk
-RSN-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp psk
+SECURITY:WPA3
+WPA-FLAGS:(none)
+RSN-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp sae
 DEVICE:wlan0
 ACTIVE:no
 IN-USE: 
 DBUS-PATH:/org/freedesktop/NetworkManager/AccessPoint/3
 
-<<<
-size: 1698
-location: clients/tests/test-client.py:1066:test_004()/788
-cmd: $NMCLI --mode multiline --terse -f ALL device wifi list
-lang: pl_PL.UTF-8
-returncode: 0
-stdout: 1518 bytes
->>>
 NAME:AP[1]
 SSID:wlan1-ap-4
 SSID-HEX:776C616E312D61702D34
 BSSID:94:2B:E8:F6:D2:86
-MODE:Infrastruktura
+MODE:Infra
 CHAN:1
-FREQ:2412 MHz
-RATE:54 Mb/s
+FREQ:2412 MHz
+RATE:54 Mbit/s
 SIGNAL:48
 BARS:**  
 SECURITY:WPA1 WPA2
 WPA-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp psk
 RSN-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp psk
 DEVICE:wlan1
-ACTIVE:nie
+ACTIVE:no
 IN-USE: 
 DBUS-PATH:/org/freedesktop/NetworkManager/AccessPoint/4
 
 
+<<<
+size: 1610
+location: clients/tests/test-client.py:1080:test_004()/788
+cmd: $NMCLI --mode multiline --terse -f ALL device wifi list
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 1430 bytes
+>>>
 NAME:AP[1]
 SSID:wlan0-ap-2
 SSID-HEX:776C616E302D61702D32
@@ -44722,9 +45427,9 @@ FREQ:2412 MHz
 RATE:54 Mb/s
 SIGNAL:81
 BARS:****
-SECURITY:WPA1 WPA2
+SECURITY:WPA1
 WPA-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp psk
-RSN-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp psk
+RSN-FLAGS:(brak)
 DEVICE:wlan0
 ACTIVE:nie
 IN-USE: 
@@ -44739,32 +45444,41 @@ FREQ:2412 MHz
 RATE:54 Mb/s
 SIGNAL:55
 BARS:**  
-SECURITY:WPA1 WPA2
-WPA-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp psk
-RSN-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp psk
+SECURITY:WPA3
+WPA-FLAGS:(brak)
+RSN-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp sae
 DEVICE:wlan0
 ACTIVE:nie
 IN-USE: 
 DBUS-PATH:/org/freedesktop/NetworkManager/AccessPoint/3
 
-<<<
-size: 562
-location: clients/tests/test-client.py:1068:test_004()/789
-cmd: $NMCLI --mode multiline --terse -f COMMON device wifi list
-lang: C
-returncode: 0
-stdout: 390 bytes
->>>
-IN-USE: 
+NAME:AP[1]
 SSID:wlan1-ap-4
-MODE:Infra
+SSID-HEX:776C616E312D61702D34
+BSSID:94:2B:E8:F6:D2:86
+MODE:Infrastruktura
 CHAN:1
-RATE:54 Mbit/s
+FREQ:2412 MHz
+RATE:54 Mb/s
 SIGNAL:48
 BARS:**  
 SECURITY:WPA1 WPA2
+WPA-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp psk
+RSN-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp psk
+DEVICE:wlan1
+ACTIVE:nie
+IN-USE: 
+DBUS-PATH:/org/freedesktop/NetworkManager/AccessPoint/4
 
 
+<<<
+size: 552
+location: clients/tests/test-client.py:1082:test_004()/789
+cmd: $NMCLI --mode multiline --terse -f COMMON device wifi list
+lang: C
+returncode: 0
+stdout: 380 bytes
+>>>
 IN-USE: 
 SSID:wlan0-ap-2
 MODE:Infra
@@ -44780,7 +45494,7 @@ CHAN:1
 RATE:54 Mbit/s
 SIGNAL:81
 BARS:****
-SECURITY:WPA1 WPA2
+SECURITY:WPA1
 IN-USE: 
 SSID:wlan0-ap-3
 MODE:Infra
@@ -44788,26 +45502,26 @@ CHAN:1
 RATE:54 Mbit/s
 SIGNAL:55
 BARS:**  
-SECURITY:WPA1 WPA2
+SECURITY:WPA3
 
-<<<
-size: 608
-location: clients/tests/test-client.py:1068:test_004()/790
-cmd: $NMCLI --mode multiline --terse -f COMMON device wifi list
-lang: pl_PL.UTF-8
-returncode: 0
-stdout: 426 bytes
->>>
 IN-USE: 
 SSID:wlan1-ap-4
-MODE:Infrastruktura
+MODE:Infra
 CHAN:1
-RATE:54 Mb/s
+RATE:54 Mbit/s
 SIGNAL:48
 BARS:**  
 SECURITY:WPA1 WPA2
 
 
+<<<
+size: 598
+location: clients/tests/test-client.py:1082:test_004()/790
+cmd: $NMCLI --mode multiline --terse -f COMMON device wifi list
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 416 bytes
+>>>
 IN-USE: 
 SSID:wlan0-ap-2
 MODE:Infrastruktura
@@ -44823,7 +45537,7 @@ CHAN:1
 RATE:54 Mb/s
 SIGNAL:81
 BARS:****
-SECURITY:WPA1 WPA2
+SECURITY:WPA1
 IN-USE: 
 SSID:wlan0-ap-3
 MODE:Infrastruktura
@@ -44831,35 +45545,26 @@ CHAN:1
 RATE:54 Mb/s
 SIGNAL:55
 BARS:**  
-SECURITY:WPA1 WPA2
+SECURITY:WPA3
 
-<<<
-size: 1753
-location: clients/tests/test-client.py:1071:test_004()/791
-cmd: $NMCLI --mode multiline --terse -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list
-lang: C
-returncode: 0
-stdout: 1470 bytes
->>>
-NAME:AP[1]
+IN-USE: 
 SSID:wlan1-ap-4
-SSID-HEX:776C616E312D61702D34
-BSSID:94:2B:E8:F6:D2:86
-MODE:Infra
+MODE:Infrastruktura
 CHAN:1
-FREQ:2412 MHz
-RATE:54 Mbit/s
+RATE:54 Mb/s
 SIGNAL:48
 BARS:**  
 SECURITY:WPA1 WPA2
-WPA-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp psk
-RSN-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp psk
-DEVICE:wlan1
-ACTIVE:no
-IN-USE: 
-DBUS-PATH:/org/freedesktop/NetworkManager/AccessPoint/4
 
 
+<<<
+size: 1665
+location: clients/tests/test-client.py:1085:test_004()/791
+cmd: $NMCLI --mode multiline --terse -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list
+lang: C
+returncode: 0
+stdout: 1382 bytes
+>>>
 NAME:AP[1]
 SSID:wlan0-ap-2
 SSID-HEX:776C616E302D61702D32
@@ -44887,9 +45592,9 @@ FREQ:2412 MHz
 RATE:54 Mbit/s
 SIGNAL:81
 BARS:****
-SECURITY:WPA1 WPA2
+SECURITY:WPA1
 WPA-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp psk
-RSN-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp psk
+RSN-FLAGS:(none)
 DEVICE:wlan0
 ACTIVE:no
 IN-USE: 
@@ -44904,41 +45609,41 @@ FREQ:2412 MHz
 RATE:54 Mbit/s
 SIGNAL:55
 BARS:**  
-SECURITY:WPA1 WPA2
-WPA-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp psk
-RSN-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp psk
+SECURITY:WPA3
+WPA-FLAGS:(none)
+RSN-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp sae
 DEVICE:wlan0
 ACTIVE:no
 IN-USE: 
 DBUS-PATH:/org/freedesktop/NetworkManager/AccessPoint/3
 
-<<<
-size: 1811
-location: clients/tests/test-client.py:1071:test_004()/792
-cmd: $NMCLI --mode multiline --terse -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list
-lang: pl_PL.UTF-8
-returncode: 0
-stdout: 1518 bytes
->>>
 NAME:AP[1]
 SSID:wlan1-ap-4
 SSID-HEX:776C616E312D61702D34
 BSSID:94:2B:E8:F6:D2:86
-MODE:Infrastruktura
+MODE:Infra
 CHAN:1
-FREQ:2412 MHz
-RATE:54 Mb/s
+FREQ:2412 MHz
+RATE:54 Mbit/s
 SIGNAL:48
 BARS:**  
 SECURITY:WPA1 WPA2
 WPA-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp psk
 RSN-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp psk
 DEVICE:wlan1
-ACTIVE:nie
+ACTIVE:no
 IN-USE: 
 DBUS-PATH:/org/freedesktop/NetworkManager/AccessPoint/4
 
 
+<<<
+size: 1723
+location: clients/tests/test-client.py:1085:test_004()/792
+cmd: $NMCLI --mode multiline --terse -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 1430 bytes
+>>>
 NAME:AP[1]
 SSID:wlan0-ap-2
 SSID-HEX:776C616E302D61702D32
@@ -44966,9 +45671,9 @@ FREQ:2412 MHz
 RATE:54 Mb/s
 SIGNAL:81
 BARS:****
-SECURITY:WPA1 WPA2
+SECURITY:WPA1
 WPA-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp psk
-RSN-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp psk
+RSN-FLAGS:(brak)
 DEVICE:wlan0
 ACTIVE:nie
 IN-USE: 
@@ -44983,21 +45688,40 @@ FREQ:2412 MHz
 RATE:54 Mb/s
 SIGNAL:55
 BARS:**  
+SECURITY:WPA3
+WPA-FLAGS:(brak)
+RSN-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp sae
+DEVICE:wlan0
+ACTIVE:nie
+IN-USE: 
+DBUS-PATH:/org/freedesktop/NetworkManager/AccessPoint/3
+
+NAME:AP[1]
+SSID:wlan1-ap-4
+SSID-HEX:776C616E312D61702D34
+BSSID:94:2B:E8:F6:D2:86
+MODE:Infrastruktura
+CHAN:1
+FREQ:2412 MHz
+RATE:54 Mb/s
+SIGNAL:48
+BARS:**  
 SECURITY:WPA1 WPA2
 WPA-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp psk
 RSN-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp psk
-DEVICE:wlan0
+DEVICE:wlan1
 ACTIVE:nie
 IN-USE: 
-DBUS-PATH:/org/freedesktop/NetworkManager/AccessPoint/3
+DBUS-PATH:/org/freedesktop/NetworkManager/AccessPoint/4
+
 
 <<<
-size: 560
-location: clients/tests/test-client.py:1073:test_004()/793
+size: 562
+location: clients/tests/test-client.py:1087:test_004()/793
 cmd: $NMCLI --mode multiline --terse -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: C
 returncode: 0
-stdout: 367 bytes
+stdout: 369 bytes
 >>>
 NAME:AP[1]
 SSID:wlan0-ap-2
@@ -45017,13 +45741,15 @@ ACTIVE:no
 IN-USE: 
 DBUS-PATH:/org/freedesktop/NetworkManager/AccessPoint/2
 
+
+
 <<<
-size: 582
-location: clients/tests/test-client.py:1073:test_004()/794
+size: 584
+location: clients/tests/test-client.py:1087:test_004()/794
 cmd: $NMCLI --mode multiline --terse -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 379 bytes
+stdout: 381 bytes
 >>>
 NAME:AP[1]
 SSID:wlan0-ap-2
@@ -45043,13 +45769,15 @@ ACTIVE:nie
 IN-USE: 
 DBUS-PATH:/org/freedesktop/NetworkManager/AccessPoint/2
 
+
+
 <<<
-size: 292
-location: clients/tests/test-client.py:1075:test_004()/795
+size: 294
+location: clients/tests/test-client.py:1089:test_004()/795
 cmd: $NMCLI --mode multiline --terse -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: C
 returncode: 0
-stdout: 97 bytes
+stdout: 99 bytes
 >>>
 IN-USE: 
 SSID:wlan0-ap-2
@@ -45060,13 +45788,15 @@ SIGNAL:92
 BARS:****
 SECURITY:WPA1 WPA2
 
+
+
 <<<
-size: 312
-location: clients/tests/test-client.py:1075:test_004()/796
+size: 314
+location: clients/tests/test-client.py:1089:test_004()/796
 cmd: $NMCLI --mode multiline --terse -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 106 bytes
+stdout: 108 bytes
 >>>
 IN-USE: 
 SSID:wlan0-ap-2
@@ -45077,13 +45807,15 @@ SIGNAL:92
 BARS:****
 SECURITY:WPA1 WPA2
 
+
+
 <<<
-size: 673
-location: clients/tests/test-client.py:1078:test_004()/797
+size: 675
+location: clients/tests/test-client.py:1092:test_004()/797
 cmd: $NMCLI --mode multiline --terse -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: C
 returncode: 0
-stdout: 367 bytes
+stdout: 369 bytes
 >>>
 NAME:AP[1]
 SSID:wlan0-ap-2
@@ -45103,13 +45835,15 @@ ACTIVE:no
 IN-USE: 
 DBUS-PATH:/org/freedesktop/NetworkManager/AccessPoint/2
 
+
+
 <<<
-size: 695
-location: clients/tests/test-client.py:1078:test_004()/798
+size: 697
+location: clients/tests/test-client.py:1092:test_004()/798
 cmd: $NMCLI --mode multiline --terse -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 379 bytes
+stdout: 381 bytes
 >>>
 NAME:AP[1]
 SSID:wlan0-ap-2
@@ -45129,13 +45863,15 @@ ACTIVE:nie
 IN-USE: 
 DBUS-PATH:/org/freedesktop/NetworkManager/AccessPoint/2
 
+
+
 <<<
-size: 2649
-location: clients/tests/test-client.py:1080:test_004()/799
+size: 2713
+location: clients/tests/test-client.py:1094:test_004()/799
 cmd: $NMCLI --mode multiline --terse -f ALL device show wlan0
 lang: C
 returncode: 0
-stdout: 2478 bytes
+stdout: 2542 bytes
 >>>
 GENERAL.DEVICE:wlan0
 GENERAL.TYPE:wifi
@@ -45149,6 +45885,8 @@ GENERAL.HWADDR:13:E0:74:85:7C:D9
 GENERAL.MTU:0
 GENERAL.STATE:20 (unavailable)
 GENERAL.REASON:0 (No reason given)
+GENERAL.IP4-CONNECTIVITY:0 (unknown)
+GENERAL.IP6-CONNECTIVITY:0 (unknown)
 GENERAL.UDI:/sys/devices/virtual/wlan0
 GENERAL.IP-IFACE:
 GENERAL.IS-SOFTWARE:no
@@ -45189,7 +45927,7 @@ AP[2].CHAN:1
 AP[2].RATE:54 Mbit/s
 AP[2].SIGNAL:81
 AP[2].BARS:****
-AP[2].SECURITY:WPA1 WPA2
+AP[2].SECURITY:WPA1
 AP[3].IN-USE: 
 AP[3].SSID:wlan0-ap-3
 AP[3].MODE:Infra
@@ -45197,7 +45935,7 @@ AP[3].CHAN:1
 AP[3].RATE:54 Mbit/s
 AP[3].SIGNAL:55
 AP[3].BARS:**  
-AP[3].SECURITY:WPA1 WPA2
+AP[3].SECURITY:WPA3
 IP4.ADDRESS[1]:192.168.228.18/32
 IP4.ADDRESS[2]:192.168.209.179/25
 IP4.GATEWAY:192.168.41.120
@@ -45228,12 +45966,12 @@ CONNECTIONS.AVAILABLE-CONNECTION-PATHS:/org/freedesktop/NetworkManager/Settings/
 CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 
 <<<
-size: 2686
-location: clients/tests/test-client.py:1080:test_004()/800
+size: 2750
+location: clients/tests/test-client.py:1094:test_004()/800
 cmd: $NMCLI --mode multiline --terse -f ALL device show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2505 bytes
+stdout: 2569 bytes
 >>>
 GENERAL.DEVICE:wlan0
 GENERAL.TYPE:wifi
@@ -45247,6 +45985,8 @@ GENERAL.HWADDR:13:E0:74:85:7C:D9
 GENERAL.MTU:0
 GENERAL.STATE:20 (unavailable)
 GENERAL.REASON:0 (No reason given)
+GENERAL.IP4-CONNECTIVITY:0 (unknown)
+GENERAL.IP6-CONNECTIVITY:0 (unknown)
 GENERAL.UDI:/sys/devices/virtual/wlan0
 GENERAL.IP-IFACE:
 GENERAL.IS-SOFTWARE:no
@@ -45287,7 +46027,7 @@ AP[2].CHAN:1
 AP[2].RATE:54 Mb/s
 AP[2].SIGNAL:81
 AP[2].BARS:****
-AP[2].SECURITY:WPA1 WPA2
+AP[2].SECURITY:WPA1
 AP[3].IN-USE: 
 AP[3].SSID:wlan0-ap-3
 AP[3].MODE:Infrastruktura
@@ -45295,7 +46035,7 @@ AP[3].CHAN:1
 AP[3].RATE:54 Mb/s
 AP[3].SIGNAL:55
 AP[3].BARS:**  
-AP[3].SECURITY:WPA1 WPA2
+AP[3].SECURITY:WPA3
 IP4.ADDRESS[1]:192.168.228.18/32
 IP4.ADDRESS[2]:192.168.209.179/25
 IP4.GATEWAY:192.168.41.120
@@ -45327,7 +46067,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-
 
 <<<
 size: 912
-location: clients/tests/test-client.py:1082:test_004()/801
+location: clients/tests/test-client.py:1096:test_004()/801
 cmd: $NMCLI --mode multiline --terse -f COMMON device show wlan0
 lang: C
 returncode: 0
@@ -45360,7 +46100,7 @@ IP6.DOMAIN[6]:sear6.foo4.bar
 
 <<<
 size: 922
-location: clients/tests/test-client.py:1082:test_004()/802
+location: clients/tests/test-client.py:1096:test_004()/802
 cmd: $NMCLI --mode multiline --terse -f COMMON device show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
@@ -45392,12 +46132,12 @@ IP6.DOMAIN[5]:sear6.foo3.bar
 IP6.DOMAIN[6]:sear6.foo4.bar
 
 <<<
-size: 2787
-location: clients/tests/test-client.py:1084:test_004()/803
+size: 2851
+location: clients/tests/test-client.py:1098:test_004()/803
 cmd: $NMCLI --mode multiline --terse -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0
 lang: C
 returncode: 0
-stdout: 2478 bytes
+stdout: 2542 bytes
 >>>
 GENERAL.DEVICE:wlan0
 GENERAL.TYPE:wifi
@@ -45411,6 +46151,8 @@ GENERAL.HWADDR:13:E0:74:85:7C:D9
 GENERAL.MTU:0
 GENERAL.STATE:20 (unavailable)
 GENERAL.REASON:0 (No reason given)
+GENERAL.IP4-CONNECTIVITY:0 (unknown)
+GENERAL.IP6-CONNECTIVITY:0 (unknown)
 GENERAL.UDI:/sys/devices/virtual/wlan0
 GENERAL.IP-IFACE:
 GENERAL.IS-SOFTWARE:no
@@ -45451,7 +46193,7 @@ AP[2].CHAN:1
 AP[2].RATE:54 Mbit/s
 AP[2].SIGNAL:81
 AP[2].BARS:****
-AP[2].SECURITY:WPA1 WPA2
+AP[2].SECURITY:WPA1
 AP[3].IN-USE: 
 AP[3].SSID:wlan0-ap-3
 AP[3].MODE:Infra
@@ -45459,7 +46201,7 @@ AP[3].CHAN:1
 AP[3].RATE:54 Mbit/s
 AP[3].SIGNAL:55
 AP[3].BARS:**  
-AP[3].SECURITY:WPA1 WPA2
+AP[3].SECURITY:WPA3
 IP4.ADDRESS[1]:192.168.228.18/32
 IP4.ADDRESS[2]:192.168.209.179/25
 IP4.GATEWAY:192.168.41.120
@@ -45490,12 +46232,12 @@ CONNECTIONS.AVAILABLE-CONNECTION-PATHS:/org/freedesktop/NetworkManager/Settings/
 CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 
 <<<
-size: 2824
-location: clients/tests/test-client.py:1084:test_004()/804
+size: 2888
+location: clients/tests/test-client.py:1098:test_004()/804
 cmd: $NMCLI --mode multiline --terse -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2505 bytes
+stdout: 2569 bytes
 >>>
 GENERAL.DEVICE:wlan0
 GENERAL.TYPE:wifi
@@ -45509,6 +46251,8 @@ GENERAL.HWADDR:13:E0:74:85:7C:D9
 GENERAL.MTU:0
 GENERAL.STATE:20 (unavailable)
 GENERAL.REASON:0 (No reason given)
+GENERAL.IP4-CONNECTIVITY:0 (unknown)
+GENERAL.IP6-CONNECTIVITY:0 (unknown)
 GENERAL.UDI:/sys/devices/virtual/wlan0
 GENERAL.IP-IFACE:
 GENERAL.IS-SOFTWARE:no
@@ -45549,7 +46293,7 @@ AP[2].CHAN:1
 AP[2].RATE:54 Mb/s
 AP[2].SIGNAL:81
 AP[2].BARS:****
-AP[2].SECURITY:WPA1 WPA2
+AP[2].SECURITY:WPA1
 AP[3].IN-USE: 
 AP[3].SSID:wlan0-ap-3
 AP[3].MODE:Infrastruktura
@@ -45557,7 +46301,7 @@ AP[3].CHAN:1
 AP[3].RATE:54 Mb/s
 AP[3].SIGNAL:55
 AP[3].BARS:**  
-AP[3].SECURITY:WPA1 WPA2
+AP[3].SECURITY:WPA3
 IP4.ADDRESS[1]:192.168.228.18/32
 IP4.ADDRESS[2]:192.168.209.179/25
 IP4.GATEWAY:192.168.41.120
@@ -45589,7 +46333,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-
 
 <<<
 size: 2352
-location: clients/tests/test-client.py:1022:test_004()/805
+location: clients/tests/test-client.py:1036:test_004()/805
 cmd: $NMCLI --mode multiline --terse --color yes con s con-vpn-1
 lang: C
 returncode: 0
@@ -45691,7 +46435,7 @@ VPN.CFG[3]:key3 = val3
 
 <<<
 size: 2362
-location: clients/tests/test-client.py:1022:test_004()/806
+location: clients/tests/test-client.py:1036:test_004()/806
 cmd: $NMCLI --mode multiline --terse --color yes con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
@@ -45793,7 +46537,7 @@ VPN.CFG[3]:key3 = val3
 
 <<<
 size: 2352
-location: clients/tests/test-client.py:1024:test_004()/807
+location: clients/tests/test-client.py:1038:test_004()/807
 cmd: $NMCLI --mode multiline --terse --color yes con s con-vpn-1
 lang: C
 returncode: 0
@@ -45895,7 +46639,7 @@ VPN.CFG[3]:key3 = val3
 
 <<<
 size: 2362
-location: clients/tests/test-client.py:1024:test_004()/808
+location: clients/tests/test-client.py:1038:test_004()/808
 cmd: $NMCLI --mode multiline --terse --color yes con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
@@ -45997,7 +46741,7 @@ VPN.CFG[3]:key3 = val3
 
 <<<
 size: 1800
-location: clients/tests/test-client.py:1027:test_004()/809
+location: clients/tests/test-client.py:1041:test_004()/809
 cmd: $NMCLI --mode multiline --terse --color yes -f ALL con s con-vpn-1
 lang: C
 returncode: 0
@@ -46079,7 +46823,7 @@ proxy.pac-script:
 
 <<<
 size: 1810
-location: clients/tests/test-client.py:1027:test_004()/810
+location: clients/tests/test-client.py:1041:test_004()/810
 cmd: $NMCLI --mode multiline --terse --color yes -f ALL con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
@@ -46161,7 +46905,7 @@ proxy.pac-script:
 
 <<<
 size: 351
-location: clients/tests/test-client.py:1033:test_004()/811
+location: clients/tests/test-client.py:1047:test_004()/811
 cmd: $NMCLI --mode multiline --terse --color yes -f VPN con s con-vpn-1
 lang: C
 returncode: 0
@@ -46176,7 +46920,7 @@ vpn.timeout:0
 
 <<<
 size: 361
-location: clients/tests/test-client.py:1033:test_004()/812
+location: clients/tests/test-client.py:1047:test_004()/812
 cmd: $NMCLI --mode multiline --terse --color yes -f VPN con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
@@ -46191,7 +46935,7 @@ vpn.timeout:0
 
 <<<
 size: 554
-location: clients/tests/test-client.py:1036:test_004()/813
+location: clients/tests/test-client.py:1050:test_004()/813
 cmd: $NMCLI --mode multiline --terse --color yes -f GENERAL con s con-vpn-1
 lang: C
 returncode: 0
@@ -46212,7 +46956,7 @@ GENERAL.MASTER-PATH:
 
 <<<
 size: 564
-location: clients/tests/test-client.py:1036:test_004()/814
+location: clients/tests/test-client.py:1050:test_004()/814
 cmd: $NMCLI --mode multiline --terse --color yes -f GENERAL con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
@@ -46233,12 +46977,16 @@ GENERAL.MASTER-PATH:
 
 <<<
 size: 603
-location: clients/tests/test-client.py:1039:test_004()/815
+location: clients/tests/test-client.py:1053:test_004()/815
 cmd: $NMCLI --mode multiline --terse --color yes dev s
 lang: C
 returncode: 0
 stdout: 440 bytes
 >>>
+DEVICE:wlan0
+TYPE:wifi
+STATE:unavailable
+CONNECTION:con-vpn-1
 DEVICE:eth0
 TYPE:ethernet
 STATE:unavailable
@@ -46255,19 +47003,19 @@ DEVICE:wlan1
 TYPE:wifi
 STATE:unavailable
 CONNECTION:
-DEVICE:wlan0
-TYPE:wifi
-STATE:unavailable
-CONNECTION:con-vpn-1
 
 <<<
 size: 613
-location: clients/tests/test-client.py:1039:test_004()/816
+location: clients/tests/test-client.py:1053:test_004()/816
 cmd: $NMCLI --mode multiline --terse --color yes dev s
 lang: pl_PL.UTF-8
 returncode: 0
 stdout: 440 bytes
 >>>
+DEVICE:wlan0
+TYPE:wifi
+STATE:unavailable
+CONNECTION:con-vpn-1
 DEVICE:eth0
 TYPE:ethernet
 STATE:unavailable
@@ -46284,22 +47032,29 @@ DEVICE:wlan1
 TYPE:wifi
 STATE:unavailable
 CONNECTION:
-DEVICE:wlan0
-TYPE:wifi
-STATE:unavailable
-CONNECTION:con-vpn-1
 
 <<<
-size: 1182
-location: clients/tests/test-client.py:1042:test_004()/817
+size: 1512
+location: clients/tests/test-client.py:1056:test_004()/817
 cmd: $NMCLI --mode multiline --terse --color yes -f all dev status
 lang: C
 returncode: 0
-stdout: 1006 bytes
+stdout: 1336 bytes
 >>>
+DEVICE:wlan0
+TYPE:wifi
+STATE:unavailable
+IP4-CONNECTIVITY:unknown
+IP6-CONNECTIVITY:unknown
+DBUS-PATH:/org/freedesktop/NetworkManager/Devices/3
+CONNECTION:con-vpn-1
+CON-UUID:UUID-con-vpn-1-REPLACED-REPLACED-REP
+CON-PATH:/org/freedesktop/NetworkManager/ActiveConnection/2
 DEVICE:eth0
 TYPE:ethernet
 STATE:unavailable
+IP4-CONNECTIVITY:unknown
+IP6-CONNECTIVITY:unknown
 DBUS-PATH:/org/freedesktop/NetworkManager/Devices/1
 CONNECTION:
 CON-UUID:
@@ -46307,6 +47062,8 @@ CON-PATH:
 DEVICE:eth1
 TYPE:ethernet
 STATE:unavailable
+IP4-CONNECTIVITY:unknown
+IP6-CONNECTIVITY:unknown
 DBUS-PATH:/org/freedesktop/NetworkManager/Devices/2
 CONNECTION:
 CON-UUID:
@@ -46314,6 +47071,8 @@ CON-PATH:
 DEVICE:wlan1
 TYPE:wifi
 STATE:unavailable
+IP4-CONNECTIVITY:unknown
+IP6-CONNECTIVITY:unknown
 DBUS-PATH:/org/freedesktop/NetworkManager/Devices/4
 CONNECTION:
 CON-UUID:
@@ -46321,29 +47080,35 @@ CON-PATH:
 DEVICE:wlan1
 TYPE:wifi
 STATE:unavailable
+IP4-CONNECTIVITY:unknown
+IP6-CONNECTIVITY:unknown
 DBUS-PATH:/org/freedesktop/NetworkManager/Devices/5
 CONNECTION:
 CON-UUID:
 CON-PATH:
+
+<<<
+size: 1522
+location: clients/tests/test-client.py:1056:test_004()/818
+cmd: $NMCLI --mode multiline --terse --color yes -f all dev status
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 1336 bytes
+>>>
 DEVICE:wlan0
 TYPE:wifi
 STATE:unavailable
+IP4-CONNECTIVITY:unknown
+IP6-CONNECTIVITY:unknown
 DBUS-PATH:/org/freedesktop/NetworkManager/Devices/3
 CONNECTION:con-vpn-1
 CON-UUID:UUID-con-vpn-1-REPLACED-REPLACED-REP
 CON-PATH:/org/freedesktop/NetworkManager/ActiveConnection/2
-
-<<<
-size: 1192
-location: clients/tests/test-client.py:1042:test_004()/818
-cmd: $NMCLI --mode multiline --terse --color yes -f all dev status
-lang: pl_PL.UTF-8
-returncode: 0
-stdout: 1006 bytes
->>>
 DEVICE:eth0
 TYPE:ethernet
 STATE:unavailable
+IP4-CONNECTIVITY:unknown
+IP6-CONNECTIVITY:unknown
 DBUS-PATH:/org/freedesktop/NetworkManager/Devices/1
 CONNECTION:
 CON-UUID:
@@ -46351,6 +47116,8 @@ CON-PATH:
 DEVICE:eth1
 TYPE:ethernet
 STATE:unavailable
+IP4-CONNECTIVITY:unknown
+IP6-CONNECTIVITY:unknown
 DBUS-PATH:/org/freedesktop/NetworkManager/Devices/2
 CONNECTION:
 CON-UUID:
@@ -46358,6 +47125,8 @@ CON-PATH:
 DEVICE:wlan1
 TYPE:wifi
 STATE:unavailable
+IP4-CONNECTIVITY:unknown
+IP6-CONNECTIVITY:unknown
 DBUS-PATH:/org/freedesktop/NetworkManager/Devices/4
 CONNECTION:
 CON-UUID:
@@ -46365,26 +47134,46 @@ CON-PATH:
 DEVICE:wlan1
 TYPE:wifi
 STATE:unavailable
+IP4-CONNECTIVITY:unknown
+IP6-CONNECTIVITY:unknown
 DBUS-PATH:/org/freedesktop/NetworkManager/Devices/5
 CONNECTION:
 CON-UUID:
 CON-PATH:
-DEVICE:wlan0
-TYPE:wifi
-STATE:unavailable
-DBUS-PATH:/org/freedesktop/NetworkManager/Devices/3
-CONNECTION:con-vpn-1
-CON-UUID:UUID-con-vpn-1-REPLACED-REPLACED-REP
-CON-PATH:/org/freedesktop/NetworkManager/ActiveConnection/2
 
 <<<
 size: 4569
-location: clients/tests/test-client.py:1045:test_004()/819
+location: clients/tests/test-client.py:1059:test_004()/819
 cmd: $NMCLI --mode multiline --terse --color yes dev show
 lang: C
 returncode: 0
 stdout: 4402 bytes
 >>>
+GENERAL.DEVICE:wlan0
+GENERAL.TYPE:wifi
+GENERAL.HWADDR:13:E0:74:85:7C:D9
+GENERAL.MTU:0
+GENERAL.STATE:20 (unavailable)
+GENERAL.CONNECTION:con-vpn-1
+GENERAL.CON-PATH:/org/freedesktop/NetworkManager/ActiveConnection/2
+IP4.ADDRESS[1]:192.168.228.18/32
+IP4.ADDRESS[2]:192.168.209.179/25
+IP4.GATEWAY:192.168.41.120
+IP4.DOMAIN[1]:sear4.foo2.bar
+IP4.DOMAIN[2]:sear4.fo.x.y
+IP4.DOMAIN[3]:sear4.foo1.bar
+IP4.DOMAIN[4]:sear4.foo4.bar
+IP4.DOMAIN[5]:sear4.fo.o.bar
+IP4.WINS[1]:192.168.120.79
+IP6.GATEWAY:
+IP6.ROUTE[1]:dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086
+IP6.DOMAIN[1]:sear6.foo2.bar
+IP6.DOMAIN[2]:sear6.foo1.bar
+IP6.DOMAIN[3]:sear6.fo.x.y
+IP6.DOMAIN[4]:sear6.fo.o.bar
+IP6.DOMAIN[5]:sear6.foo3.bar
+IP6.DOMAIN[6]:sear6.foo4.bar
+
 GENERAL.DEVICE:eth0
 GENERAL.TYPE:ethernet
 GENERAL.HWADDR:AB:B7:BF:E2:48:E8
@@ -46498,6 +47287,14 @@ IP6.ROUTE[3]:dst = 2001:a::afb7:4449:3787:8bb4/123, nh = ::
 IP6.DNS[1]:2001:a::2934:bd66:550d:ec19
 IP6.DOMAIN[1]:sear6.fo.x.y
 
+<<<
+size: 4579
+location: clients/tests/test-client.py:1059:test_004()/820
+cmd: $NMCLI --mode multiline --terse --color yes dev show
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 4402 bytes
+>>>
 GENERAL.DEVICE:wlan0
 GENERAL.TYPE:wifi
 GENERAL.HWADDR:13:E0:74:85:7C:D9
@@ -46523,14 +47320,6 @@ IP6.DOMAIN[4]:sear6.fo.o.bar
 IP6.DOMAIN[5]:sear6.foo3.bar
 IP6.DOMAIN[6]:sear6.foo4.bar
 
-<<<
-size: 4579
-location: clients/tests/test-client.py:1045:test_004()/820
-cmd: $NMCLI --mode multiline --terse --color yes dev show
-lang: pl_PL.UTF-8
-returncode: 0
-stdout: 4402 bytes
->>>
 GENERAL.DEVICE:eth0
 GENERAL.TYPE:ethernet
 GENERAL.HWADDR:AB:B7:BF:E2:48:E8
@@ -46644,13 +47433,77 @@ IP6.ROUTE[3]:dst = 2001:a::afb7:4449:3787:8bb4/123, nh = ::
 IP6.DNS[1]:2001:a::2934:bd66:550d:ec19
 IP6.DOMAIN[1]:sear6.fo.x.y
 
+<<<
+size: 12244
+location: clients/tests/test-client.py:1062:test_004()/821
+cmd: $NMCLI --mode multiline --terse --color yes -f all dev show
+lang: C
+returncode: 0
+stdout: 12069 bytes
+>>>
 GENERAL.DEVICE:wlan0
 GENERAL.TYPE:wifi
+GENERAL.NM-TYPE:NMDeviceWifi
+GENERAL.VENDOR:
+GENERAL.PRODUCT:
+GENERAL.DRIVER:virtual
+GENERAL.DRIVER-VERSION:
+GENERAL.FIRMWARE-VERSION:
 GENERAL.HWADDR:13:E0:74:85:7C:D9
 GENERAL.MTU:0
 GENERAL.STATE:20 (unavailable)
+GENERAL.REASON:0 (No reason given)
+GENERAL.IP4-CONNECTIVITY:0 (unknown)
+GENERAL.IP6-CONNECTIVITY:0 (unknown)
+GENERAL.UDI:/sys/devices/virtual/wlan0
+GENERAL.IP-IFACE:
+GENERAL.IS-SOFTWARE:no
+GENERAL.NM-MANAGED:yes
+GENERAL.AUTOCONNECT:yes
+GENERAL.FIRMWARE-MISSING:no
+GENERAL.NM-PLUGIN-MISSING:no
+GENERAL.PHYS-PORT-ID:
 GENERAL.CONNECTION:con-vpn-1
+GENERAL.CON-UUID:UUID-con-vpn-1-REPLACED-REPLACED-REP
 GENERAL.CON-PATH:/org/freedesktop/NetworkManager/ActiveConnection/2
+GENERAL.METERED:unknown
+CAPABILITIES.CARRIER-DETECT:no
+CAPABILITIES.SPEED:unknown
+CAPABILITIES.IS-SOFTWARE:no
+CAPABILITIES.SRIOV:no
+WIFI-PROPERTIES.WEP:yes
+WIFI-PROPERTIES.WPA:yes
+WIFI-PROPERTIES.WPA2:yes
+WIFI-PROPERTIES.TKIP:yes
+WIFI-PROPERTIES.CCMP:yes
+WIFI-PROPERTIES.AP:yes
+WIFI-PROPERTIES.ADHOC:yes
+WIFI-PROPERTIES.2GHZ:unknown
+WIFI-PROPERTIES.5GHZ:unknown
+AP[1].IN-USE: 
+AP[1].SSID:wlan0-ap-2
+AP[1].MODE:Infra
+AP[1].CHAN:1
+AP[1].RATE:54 Mbit/s
+AP[1].SIGNAL:92
+AP[1].BARS:****
+AP[1].SECURITY:WPA1 WPA2
+AP[2].IN-USE: 
+AP[2].SSID:wlan0-ap-1
+AP[2].MODE:Infra
+AP[2].CHAN:1
+AP[2].RATE:54 Mbit/s
+AP[2].SIGNAL:81
+AP[2].BARS:****
+AP[2].SECURITY:WPA1
+AP[3].IN-USE: 
+AP[3].SSID:wlan0-ap-3
+AP[3].MODE:Infra
+AP[3].CHAN:1
+AP[3].RATE:54 Mbit/s
+AP[3].SIGNAL:55
+AP[3].BARS:**  
+AP[3].SECURITY:WPA3
 IP4.ADDRESS[1]:192.168.228.18/32
 IP4.ADDRESS[2]:192.168.209.179/25
 IP4.GATEWAY:192.168.41.120
@@ -46660,6 +47513,10 @@ IP4.DOMAIN[3]:sear4.foo1.bar
 IP4.DOMAIN[4]:sear4.foo4.bar
 IP4.DOMAIN[5]:sear4.fo.o.bar
 IP4.WINS[1]:192.168.120.79
+DHCP4.OPTION[1]:dhcp-4-opt-0 = val-0
+DHCP4.OPTION[2]:dhcp-4-opt-2 = val-2
+DHCP4.OPTION[3]:dhcp-4-opt-4 = val-4
+DHCP4.OPTION[4]:dhcp-4-opt-7 = val-7
 IP6.GATEWAY:
 IP6.ROUTE[1]:dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086
 IP6.DOMAIN[1]:sear6.foo2.bar
@@ -46668,15 +47525,14 @@ IP6.DOMAIN[3]:sear6.fo.x.y
 IP6.DOMAIN[4]:sear6.fo.o.bar
 IP6.DOMAIN[5]:sear6.foo3.bar
 IP6.DOMAIN[6]:sear6.foo4.bar
+DHCP6.OPTION[1]:dhcp-6-opt-1 = val-1
+DHCP6.OPTION[2]:dhcp-6-opt-2 = val-2
+DHCP6.OPTION[3]:dhcp-6-opt-3 = val-3
+DHCP6.OPTION[4]:dhcp-6-opt-4 = val-4
+DHCP6.OPTION[5]:dhcp-6-opt-5 = val-5
+CONNECTIONS.AVAILABLE-CONNECTION-PATHS:/org/freedesktop/NetworkManager/Settings/Connection/{2}
+CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 
-<<<
-size: 11884
-location: clients/tests/test-client.py:1048:test_004()/821
-cmd: $NMCLI --mode multiline --terse --color yes -f all dev show
-lang: C
-returncode: 0
-stdout: 11709 bytes
->>>
 GENERAL.DEVICE:eth0
 GENERAL.TYPE:ethernet
 GENERAL.NM-TYPE:NMDeviceEthernet
@@ -46689,6 +47545,8 @@ GENERAL.HWADDR:AB:B7:BF:E2:48:E8
 GENERAL.MTU:0
 GENERAL.STATE:20 (unavailable)
 GENERAL.REASON:0 (No reason given)
+GENERAL.IP4-CONNECTIVITY:0 (unknown)
+GENERAL.IP6-CONNECTIVITY:0 (unknown)
 GENERAL.UDI:/sys/devices/virtual/eth0
 GENERAL.IP-IFACE:
 GENERAL.IS-SOFTWARE:no
@@ -46750,6 +47608,8 @@ GENERAL.HWADDR:E7:78:B1:93:2B:22
 GENERAL.MTU:0
 GENERAL.STATE:20 (unavailable)
 GENERAL.REASON:0 (No reason given)
+GENERAL.IP4-CONNECTIVITY:0 (unknown)
+GENERAL.IP6-CONNECTIVITY:0 (unknown)
 GENERAL.UDI:/sys/devices/virtual/eth1
 GENERAL.IP-IFACE:
 GENERAL.IS-SOFTWARE:no
@@ -46818,6 +47678,8 @@ GENERAL.HWADDR:21:E9:64:81:8C:A8
 GENERAL.MTU:0
 GENERAL.STATE:20 (unavailable)
 GENERAL.REASON:0 (No reason given)
+GENERAL.IP4-CONNECTIVITY:0 (unknown)
+GENERAL.IP6-CONNECTIVITY:0 (unknown)
 GENERAL.UDI:/sys/devices/virtual/wlan1
 GENERAL.IP-IFACE:
 GENERAL.IS-SOFTWARE:no
@@ -46904,6 +47766,8 @@ GENERAL.HWADDR:71:52:AD:63:5C:7C
 GENERAL.MTU:0
 GENERAL.STATE:20 (unavailable)
 GENERAL.REASON:0 (No reason given)
+GENERAL.IP4-CONNECTIVITY:0 (unknown)
+GENERAL.IP6-CONNECTIVITY:0 (unknown)
 GENERAL.UDI:/sys/devices/virtual/wlan1
 GENERAL.IP-IFACE:
 GENERAL.IS-SOFTWARE:no
@@ -46958,6 +47822,14 @@ DHCP6.OPTION[5]:dhcp-6-opt-9 = val-9
 CONNECTIONS.AVAILABLE-CONNECTION-PATHS:/org/freedesktop/NetworkManager/Settings/Connection/{2}
 CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 
+<<<
+size: 12290
+location: clients/tests/test-client.py:1062:test_004()/822
+cmd: $NMCLI --mode multiline --terse --color yes -f all dev show
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 12105 bytes
+>>>
 GENERAL.DEVICE:wlan0
 GENERAL.TYPE:wifi
 GENERAL.NM-TYPE:NMDeviceWifi
@@ -46970,6 +47842,8 @@ GENERAL.HWADDR:13:E0:74:85:7C:D9
 GENERAL.MTU:0
 GENERAL.STATE:20 (unavailable)
 GENERAL.REASON:0 (No reason given)
+GENERAL.IP4-CONNECTIVITY:0 (unknown)
+GENERAL.IP6-CONNECTIVITY:0 (unknown)
 GENERAL.UDI:/sys/devices/virtual/wlan0
 GENERAL.IP-IFACE:
 GENERAL.IS-SOFTWARE:no
@@ -46997,28 +47871,28 @@ WIFI-PROPERTIES.2GHZ:unknown
 WIFI-PROPERTIES.5GHZ:unknown
 AP[1].IN-USE: 
 AP[1].SSID:wlan0-ap-2
-AP[1].MODE:Infra
+AP[1].MODE:Infrastruktura
 AP[1].CHAN:1
-AP[1].RATE:54 Mbit/s
+AP[1].RATE:54 Mb/s
 AP[1].SIGNAL:92
 AP[1].BARS:****
 AP[1].SECURITY:WPA1 WPA2
 AP[2].IN-USE: 
 AP[2].SSID:wlan0-ap-1
-AP[2].MODE:Infra
+AP[2].MODE:Infrastruktura
 AP[2].CHAN:1
-AP[2].RATE:54 Mbit/s
+AP[2].RATE:54 Mb/s
 AP[2].SIGNAL:81
 AP[2].BARS:****
-AP[2].SECURITY:WPA1 WPA2
+AP[2].SECURITY:WPA1
 AP[3].IN-USE: 
 AP[3].SSID:wlan0-ap-3
-AP[3].MODE:Infra
+AP[3].MODE:Infrastruktura
 AP[3].CHAN:1
-AP[3].RATE:54 Mbit/s
+AP[3].RATE:54 Mb/s
 AP[3].SIGNAL:55
 AP[3].BARS:**  
-AP[3].SECURITY:WPA1 WPA2
+AP[3].SECURITY:WPA3
 IP4.ADDRESS[1]:192.168.228.18/32
 IP4.ADDRESS[2]:192.168.209.179/25
 IP4.GATEWAY:192.168.41.120
@@ -47048,14 +47922,6 @@ DHCP6.OPTION[5]:dhcp-6-opt-5 = val-5
 CONNECTIONS.AVAILABLE-CONNECTION-PATHS:/org/freedesktop/NetworkManager/Settings/Connection/{2}
 CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 
-<<<
-size: 11930
-location: clients/tests/test-client.py:1048:test_004()/822
-cmd: $NMCLI --mode multiline --terse --color yes -f all dev show
-lang: pl_PL.UTF-8
-returncode: 0
-stdout: 11745 bytes
->>>
 GENERAL.DEVICE:eth0
 GENERAL.TYPE:ethernet
 GENERAL.NM-TYPE:NMDeviceEthernet
@@ -47068,6 +47934,8 @@ GENERAL.HWADDR:AB:B7:BF:E2:48:E8
 GENERAL.MTU:0
 GENERAL.STATE:20 (unavailable)
 GENERAL.REASON:0 (No reason given)
+GENERAL.IP4-CONNECTIVITY:0 (unknown)
+GENERAL.IP6-CONNECTIVITY:0 (unknown)
 GENERAL.UDI:/sys/devices/virtual/eth0
 GENERAL.IP-IFACE:
 GENERAL.IS-SOFTWARE:no
@@ -47129,6 +47997,8 @@ GENERAL.HWADDR:E7:78:B1:93:2B:22
 GENERAL.MTU:0
 GENERAL.STATE:20 (unavailable)
 GENERAL.REASON:0 (No reason given)
+GENERAL.IP4-CONNECTIVITY:0 (unknown)
+GENERAL.IP6-CONNECTIVITY:0 (unknown)
 GENERAL.UDI:/sys/devices/virtual/eth1
 GENERAL.IP-IFACE:
 GENERAL.IS-SOFTWARE:no
@@ -47197,6 +48067,8 @@ GENERAL.HWADDR:21:E9:64:81:8C:A8
 GENERAL.MTU:0
 GENERAL.STATE:20 (unavailable)
 GENERAL.REASON:0 (No reason given)
+GENERAL.IP4-CONNECTIVITY:0 (unknown)
+GENERAL.IP6-CONNECTIVITY:0 (unknown)
 GENERAL.UDI:/sys/devices/virtual/wlan1
 GENERAL.IP-IFACE:
 GENERAL.IS-SOFTWARE:no
@@ -47283,6 +48155,8 @@ GENERAL.HWADDR:71:52:AD:63:5C:7C
 GENERAL.MTU:0
 GENERAL.STATE:20 (unavailable)
 GENERAL.REASON:0 (No reason given)
+GENERAL.IP4-CONNECTIVITY:0 (unknown)
+GENERAL.IP6-CONNECTIVITY:0 (unknown)
 GENERAL.UDI:/sys/devices/virtual/wlan1
 GENERAL.IP-IFACE:
 GENERAL.IS-SOFTWARE:no
@@ -47337,99 +48211,9 @@ DHCP6.OPTION[5]:dhcp-6-opt-9 = val-9
 CONNECTIONS.AVAILABLE-CONNECTION-PATHS:/org/freedesktop/NetworkManager/Settings/Connection/{2}
 CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 
-GENERAL.DEVICE:wlan0
-GENERAL.TYPE:wifi
-GENERAL.NM-TYPE:NMDeviceWifi
-GENERAL.VENDOR:
-GENERAL.PRODUCT:
-GENERAL.DRIVER:virtual
-GENERAL.DRIVER-VERSION:
-GENERAL.FIRMWARE-VERSION:
-GENERAL.HWADDR:13:E0:74:85:7C:D9
-GENERAL.MTU:0
-GENERAL.STATE:20 (unavailable)
-GENERAL.REASON:0 (No reason given)
-GENERAL.UDI:/sys/devices/virtual/wlan0
-GENERAL.IP-IFACE:
-GENERAL.IS-SOFTWARE:no
-GENERAL.NM-MANAGED:yes
-GENERAL.AUTOCONNECT:yes
-GENERAL.FIRMWARE-MISSING:no
-GENERAL.NM-PLUGIN-MISSING:no
-GENERAL.PHYS-PORT-ID:
-GENERAL.CONNECTION:con-vpn-1
-GENERAL.CON-UUID:UUID-con-vpn-1-REPLACED-REPLACED-REP
-GENERAL.CON-PATH:/org/freedesktop/NetworkManager/ActiveConnection/2
-GENERAL.METERED:unknown
-CAPABILITIES.CARRIER-DETECT:no
-CAPABILITIES.SPEED:unknown
-CAPABILITIES.IS-SOFTWARE:no
-CAPABILITIES.SRIOV:no
-WIFI-PROPERTIES.WEP:yes
-WIFI-PROPERTIES.WPA:yes
-WIFI-PROPERTIES.WPA2:yes
-WIFI-PROPERTIES.TKIP:yes
-WIFI-PROPERTIES.CCMP:yes
-WIFI-PROPERTIES.AP:yes
-WIFI-PROPERTIES.ADHOC:yes
-WIFI-PROPERTIES.2GHZ:unknown
-WIFI-PROPERTIES.5GHZ:unknown
-AP[1].IN-USE: 
-AP[1].SSID:wlan0-ap-2
-AP[1].MODE:Infrastruktura
-AP[1].CHAN:1
-AP[1].RATE:54 Mb/s
-AP[1].SIGNAL:92
-AP[1].BARS:****
-AP[1].SECURITY:WPA1 WPA2
-AP[2].IN-USE: 
-AP[2].SSID:wlan0-ap-1
-AP[2].MODE:Infrastruktura
-AP[2].CHAN:1
-AP[2].RATE:54 Mb/s
-AP[2].SIGNAL:81
-AP[2].BARS:****
-AP[2].SECURITY:WPA1 WPA2
-AP[3].IN-USE: 
-AP[3].SSID:wlan0-ap-3
-AP[3].MODE:Infrastruktura
-AP[3].CHAN:1
-AP[3].RATE:54 Mb/s
-AP[3].SIGNAL:55
-AP[3].BARS:**  
-AP[3].SECURITY:WPA1 WPA2
-IP4.ADDRESS[1]:192.168.228.18/32
-IP4.ADDRESS[2]:192.168.209.179/25
-IP4.GATEWAY:192.168.41.120
-IP4.DOMAIN[1]:sear4.foo2.bar
-IP4.DOMAIN[2]:sear4.fo.x.y
-IP4.DOMAIN[3]:sear4.foo1.bar
-IP4.DOMAIN[4]:sear4.foo4.bar
-IP4.DOMAIN[5]:sear4.fo.o.bar
-IP4.WINS[1]:192.168.120.79
-DHCP4.OPTION[1]:dhcp-4-opt-0 = val-0
-DHCP4.OPTION[2]:dhcp-4-opt-2 = val-2
-DHCP4.OPTION[3]:dhcp-4-opt-4 = val-4
-DHCP4.OPTION[4]:dhcp-4-opt-7 = val-7
-IP6.GATEWAY:
-IP6.ROUTE[1]:dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086
-IP6.DOMAIN[1]:sear6.foo2.bar
-IP6.DOMAIN[2]:sear6.foo1.bar
-IP6.DOMAIN[3]:sear6.fo.x.y
-IP6.DOMAIN[4]:sear6.fo.o.bar
-IP6.DOMAIN[5]:sear6.foo3.bar
-IP6.DOMAIN[6]:sear6.foo4.bar
-DHCP6.OPTION[1]:dhcp-6-opt-1 = val-1
-DHCP6.OPTION[2]:dhcp-6-opt-2 = val-2
-DHCP6.OPTION[3]:dhcp-6-opt-3 = val-3
-DHCP6.OPTION[4]:dhcp-6-opt-4 = val-4
-DHCP6.OPTION[5]:dhcp-6-opt-5 = val-5
-CONNECTIONS.AVAILABLE-CONNECTION-PATHS:/org/freedesktop/NetworkManager/Settings/Connection/{2}
-CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
-
 <<<
 size: 911
-location: clients/tests/test-client.py:1051:test_004()/823
+location: clients/tests/test-client.py:1065:test_004()/823
 cmd: $NMCLI --mode multiline --terse --color yes dev show wlan0
 lang: C
 returncode: 0
@@ -47462,7 +48246,7 @@ IP6.DOMAIN[6]:sear6.foo4.bar
 
 <<<
 size: 921
-location: clients/tests/test-client.py:1051:test_004()/824
+location: clients/tests/test-client.py:1065:test_004()/824
 cmd: $NMCLI --mode multiline --terse --color yes dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
@@ -47494,12 +48278,12 @@ IP6.DOMAIN[5]:sear6.foo3.bar
 IP6.DOMAIN[6]:sear6.foo4.bar
 
 <<<
-size: 2874
-location: clients/tests/test-client.py:1054:test_004()/825
+size: 2938
+location: clients/tests/test-client.py:1068:test_004()/825
 cmd: $NMCLI --mode multiline --terse --color yes -f all dev show wlan0
 lang: C
 returncode: 0
-stdout: 2694 bytes
+stdout: 2758 bytes
 >>>
 GENERAL.DEVICE:wlan0
 GENERAL.TYPE:wifi
@@ -47513,6 +48297,8 @@ GENERAL.HWADDR:13:E0:74:85:7C:D9
 GENERAL.MTU:0
 GENERAL.STATE:20 (unavailable)
 GENERAL.REASON:0 (No reason given)
+GENERAL.IP4-CONNECTIVITY:0 (unknown)
+GENERAL.IP6-CONNECTIVITY:0 (unknown)
 GENERAL.UDI:/sys/devices/virtual/wlan0
 GENERAL.IP-IFACE:
 GENERAL.IS-SOFTWARE:no
@@ -47553,7 +48339,7 @@ AP[2].CHAN:1
 AP[2].RATE:54 Mbit/s
 AP[2].SIGNAL:81
 AP[2].BARS:****
-AP[2].SECURITY:WPA1 WPA2
+AP[2].SECURITY:WPA1
 AP[3].IN-USE: 
 AP[3].SSID:wlan0-ap-3
 AP[3].MODE:Infra
@@ -47561,7 +48347,7 @@ AP[3].CHAN:1
 AP[3].RATE:54 Mbit/s
 AP[3].SIGNAL:55
 AP[3].BARS:**  
-AP[3].SECURITY:WPA1 WPA2
+AP[3].SECURITY:WPA3
 IP4.ADDRESS[1]:192.168.228.18/32
 IP4.ADDRESS[2]:192.168.209.179/25
 IP4.GATEWAY:192.168.41.120
@@ -47592,12 +48378,12 @@ CONNECTIONS.AVAILABLE-CONNECTION-PATHS:/org/freedesktop/NetworkManager/Settings/
 CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 
 <<<
-size: 2911
-location: clients/tests/test-client.py:1054:test_004()/826
+size: 2975
+location: clients/tests/test-client.py:1068:test_004()/826
 cmd: $NMCLI --mode multiline --terse --color yes -f all dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2721 bytes
+stdout: 2785 bytes
 >>>
 GENERAL.DEVICE:wlan0
 GENERAL.TYPE:wifi
@@ -47611,6 +48397,8 @@ GENERAL.HWADDR:13:E0:74:85:7C:D9
 GENERAL.MTU:0
 GENERAL.STATE:20 (unavailable)
 GENERAL.REASON:0 (No reason given)
+GENERAL.IP4-CONNECTIVITY:0 (unknown)
+GENERAL.IP6-CONNECTIVITY:0 (unknown)
 GENERAL.UDI:/sys/devices/virtual/wlan0
 GENERAL.IP-IFACE:
 GENERAL.IS-SOFTWARE:no
@@ -47651,7 +48439,7 @@ AP[2].CHAN:1
 AP[2].RATE:54 Mb/s
 AP[2].SIGNAL:81
 AP[2].BARS:****
-AP[2].SECURITY:WPA1 WPA2
+AP[2].SECURITY:WPA1
 AP[3].IN-USE: 
 AP[3].SSID:wlan0-ap-3
 AP[3].MODE:Infrastruktura
@@ -47659,7 +48447,7 @@ AP[3].CHAN:1
 AP[3].RATE:54 Mb/s
 AP[3].SIGNAL:55
 AP[3].BARS:**  
-AP[3].SECURITY:WPA1 WPA2
+AP[3].SECURITY:WPA3
 IP4.ADDRESS[1]:192.168.228.18/32
 IP4.ADDRESS[2]:192.168.209.179/25
 IP4.GATEWAY:192.168.41.120
@@ -47690,12 +48478,12 @@ CONNECTIONS.AVAILABLE-CONNECTION-PATHS:/org/freedesktop/NetworkManager/Settings/
 CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 
 <<<
-size: 1145
-location: clients/tests/test-client.py:1057:test_004()/827
+size: 1220
+location: clients/tests/test-client.py:1071:test_004()/827
 cmd: $NMCLI --mode multiline --terse --color yes -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: C
 returncode: 0
-stdout: 931 bytes
+stdout: 1005 bytes
 >>>
 GENERAL.DEVICE:wlan0
 GENERAL.TYPE:wifi
@@ -47709,6 +48497,8 @@ GENERAL.HWADDR:13:E0:74:85:7C:D9
 GENERAL.MTU:0
 GENERAL.STATE:20 (unavailable)
 GENERAL.REASON:0 (No reason given)
+GENERAL.IP4-CONNECTIVITY:0 (unknown)
+GENERAL.IP6-CONNECTIVITY:0 (unknown)
 GENERAL.UDI:/sys/devices/virtual/wlan0
 GENERAL.IP-IFACE:
 GENERAL.IS-SOFTWARE:no
@@ -47733,12 +48523,12 @@ WIFI-PROPERTIES.2GHZ:unknown
 WIFI-PROPERTIES.5GHZ:unknown
 
 <<<
-size: 1155
-location: clients/tests/test-client.py:1057:test_004()/828
+size: 1230
+location: clients/tests/test-client.py:1071:test_004()/828
 cmd: $NMCLI --mode multiline --terse --color yes -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 931 bytes
+stdout: 1005 bytes
 >>>
 GENERAL.DEVICE:wlan0
 GENERAL.TYPE:wifi
@@ -47752,6 +48542,8 @@ GENERAL.HWADDR:13:E0:74:85:7C:D9
 GENERAL.MTU:0
 GENERAL.STATE:20 (unavailable)
 GENERAL.REASON:0 (No reason given)
+GENERAL.IP4-CONNECTIVITY:0 (unknown)
+GENERAL.IP6-CONNECTIVITY:0 (unknown)
 GENERAL.UDI:/sys/devices/virtual/wlan0
 GENERAL.IP-IFACE:
 GENERAL.IS-SOFTWARE:no
@@ -47776,12 +48568,12 @@ WIFI-PROPERTIES.2GHZ:unknown
 WIFI-PROPERTIES.5GHZ:unknown
 
 <<<
-size: 1145
-location: clients/tests/test-client.py:1060:test_004()/829
+size: 1220
+location: clients/tests/test-client.py:1074:test_004()/829
 cmd: $NMCLI --mode multiline --terse --color yes -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: C
 returncode: 0
-stdout: 931 bytes
+stdout: 1005 bytes
 >>>
 GENERAL.DEVICE:wlan0
 GENERAL.TYPE:wifi
@@ -47795,6 +48587,8 @@ GENERAL.HWADDR:13:E0:74:85:7C:D9
 GENERAL.MTU:0
 GENERAL.STATE:20 (unavailable)
 GENERAL.REASON:0 (No reason given)
+GENERAL.IP4-CONNECTIVITY:0 (unknown)
+GENERAL.IP6-CONNECTIVITY:0 (unknown)
 GENERAL.UDI:/sys/devices/virtual/wlan0
 GENERAL.IP-IFACE:
 GENERAL.IS-SOFTWARE:no
@@ -47819,12 +48613,12 @@ WIFI-PROPERTIES.2GHZ:unknown
 WIFI-PROPERTIES.5GHZ:unknown
 
 <<<
-size: 1155
-location: clients/tests/test-client.py:1060:test_004()/830
+size: 1230
+location: clients/tests/test-client.py:1074:test_004()/830
 cmd: $NMCLI --mode multiline --terse --color yes -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 931 bytes
+stdout: 1005 bytes
 >>>
 GENERAL.DEVICE:wlan0
 GENERAL.TYPE:wifi
@@ -47838,6 +48632,8 @@ GENERAL.HWADDR:13:E0:74:85:7C:D9
 GENERAL.MTU:0
 GENERAL.STATE:20 (unavailable)
 GENERAL.REASON:0 (No reason given)
+GENERAL.IP4-CONNECTIVITY:0 (unknown)
+GENERAL.IP6-CONNECTIVITY:0 (unknown)
 GENERAL.UDI:/sys/devices/virtual/wlan0
 GENERAL.IP-IFACE:
 GENERAL.IS-SOFTWARE:no
@@ -47863,12 +48659,15 @@ WIFI-PROPERTIES.5GHZ:unknown
 
 <<<
 size: 687
-location: clients/tests/test-client.py:1063:test_004()/831
+location: clients/tests/test-client.py:1077:test_004()/831
 cmd: $NMCLI --mode multiline --terse --color yes -f DEVICE,TYPE,DBUS-PATH dev
 lang: C
 returncode: 0
 stdout: 501 bytes
 >>>
+DEVICE:wlan0
+TYPE:wifi
+DBUS-PATH:/org/freedesktop/NetworkManager/Devices/3
 DEVICE:eth0
 TYPE:ethernet
 DBUS-PATH:/org/freedesktop/NetworkManager/Devices/1
@@ -47881,18 +48680,18 @@ DBUS-PATH:/org/freedesktop/NetworkManager/Devices/4
 DEVICE:wlan1
 TYPE:wifi
 DBUS-PATH:/org/freedesktop/NetworkManager/Devices/5
-DEVICE:wlan0
-TYPE:wifi
-DBUS-PATH:/org/freedesktop/NetworkManager/Devices/3
 
 <<<
 size: 697
-location: clients/tests/test-client.py:1063:test_004()/832
+location: clients/tests/test-client.py:1077:test_004()/832
 cmd: $NMCLI --mode multiline --terse --color yes -f DEVICE,TYPE,DBUS-PATH dev
 lang: pl_PL.UTF-8
 returncode: 0
 stdout: 501 bytes
 >>>
+DEVICE:wlan0
+TYPE:wifi
+DBUS-PATH:/org/freedesktop/NetworkManager/Devices/3
 DEVICE:eth0
 TYPE:ethernet
 DBUS-PATH:/org/freedesktop/NetworkManager/Devices/1
@@ -47905,37 +48704,15 @@ DBUS-PATH:/org/freedesktop/NetworkManager/Devices/4
 DEVICE:wlan1
 TYPE:wifi
 DBUS-PATH:/org/freedesktop/NetworkManager/Devices/5
-DEVICE:wlan0
-TYPE:wifi
-DBUS-PATH:/org/freedesktop/NetworkManager/Devices/3
 
 <<<
-size: 2264
-location: clients/tests/test-client.py:1066:test_004()/833
+size: 2176
+location: clients/tests/test-client.py:1080:test_004()/833
 cmd: $NMCLI --mode multiline --terse --color yes -f ALL device wifi list
 lang: C
 returncode: 0
-stdout: 2082 bytes
+stdout: 1994 bytes
 >>>
-NAME:AP[1]
-SSID:wlan1-ap-4
-SSID-HEX:776C616E312D61702D34
-BSSID:94:2B:E8:F6:D2:86
-MODE:Infra
-CHAN:1
-FREQ:2412 MHz
-RATE:54 Mbit/s
-SIGNAL:48
-BARS:**  
-SECURITY:WPA1 WPA2
-WPA-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp psk
-RSN-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp psk
-DEVICE:wlan1
-ACTIVE:no
-IN-USE: 
-DBUS-PATH:/org/freedesktop/NetworkManager/AccessPoint/4
-
-
 NAME:AP[1]
 SSID:wlan0-ap-2
 SSID-HEX:776C616E302D61702D32
@@ -47963,9 +48740,9 @@ FREQ:2412 MHz
 RATE:54 Mbit/s
 SIGNAL:81
 BARS:****
-SECURITY:WPA1 WPA2
+SECURITY:WPA1
 WPA-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp psk
-RSN-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp psk
+RSN-FLAGS:(none)
 DEVICE:wlan0
 ACTIVE:no
 IN-USE: 
@@ -47980,41 +48757,41 @@ FREQ:2412 MHz
 RATE:54 Mbit/s
 SIGNAL:55
 BARS:**  
-SECURITY:WPA1 WPA2
-WPA-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp psk
-RSN-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp psk
+SECURITY:WPA3
+WPA-FLAGS:(none)
+RSN-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp sae
 DEVICE:wlan0
 ACTIVE:no
 IN-USE: 
 DBUS-PATH:/org/freedesktop/NetworkManager/AccessPoint/3
 
-<<<
-size: 2322
-location: clients/tests/test-client.py:1066:test_004()/834
-cmd: $NMCLI --mode multiline --terse --color yes -f ALL device wifi list
-lang: pl_PL.UTF-8
-returncode: 0
-stdout: 2130 bytes
->>>
 NAME:AP[1]
 SSID:wlan1-ap-4
 SSID-HEX:776C616E312D61702D34
 BSSID:94:2B:E8:F6:D2:86
-MODE:Infrastruktura
+MODE:Infra
 CHAN:1
-FREQ:2412 MHz
-RATE:54 Mb/s
+FREQ:2412 MHz
+RATE:54 Mbit/s
 SIGNAL:48
 BARS:**  
 SECURITY:WPA1 WPA2
 WPA-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp psk
 RSN-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp psk
 DEVICE:wlan1
-ACTIVE:nie
+ACTIVE:no
 IN-USE: 
 DBUS-PATH:/org/freedesktop/NetworkManager/AccessPoint/4
 
 
+<<<
+size: 2234
+location: clients/tests/test-client.py:1080:test_004()/834
+cmd: $NMCLI --mode multiline --terse --color yes -f ALL device wifi list
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 2042 bytes
+>>>
 NAME:AP[1]
 SSID:wlan0-ap-2
 SSID-HEX:776C616E302D61702D32
@@ -48042,9 +48819,9 @@ FREQ:2412 MHz
 RATE:54 Mb/s
 SIGNAL:81
 BARS:****
-SECURITY:WPA1 WPA2
+SECURITY:WPA1
 WPA-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp psk
-RSN-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp psk
+RSN-FLAGS:(brak)
 DEVICE:wlan0
 ACTIVE:nie
 IN-USE: 
@@ -48059,32 +48836,41 @@ FREQ:2412 MHz
 RATE:54 Mb/s
 SIGNAL:55
 BARS:**  
-SECURITY:WPA1 WPA2
-WPA-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp psk
-RSN-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp psk
+SECURITY:WPA3
+WPA-FLAGS:(brak)
+RSN-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp sae
 DEVICE:wlan0
 ACTIVE:nie
 IN-USE: 
 DBUS-PATH:/org/freedesktop/NetworkManager/AccessPoint/3
 
-<<<
-size: 862
-location: clients/tests/test-client.py:1068:test_004()/835
-cmd: $NMCLI --mode multiline --terse --color yes -f COMMON device wifi list
-lang: C
-returncode: 0
-stdout: 678 bytes
->>>
-IN-USE: 
+NAME:AP[1]
 SSID:wlan1-ap-4
-MODE:Infra
+SSID-HEX:776C616E312D61702D34
+BSSID:94:2B:E8:F6:D2:86
+MODE:Infrastruktura
 CHAN:1
-RATE:54 Mbit/s
+FREQ:2412 MHz
+RATE:54 Mb/s
 SIGNAL:48
 BARS:**  
 SECURITY:WPA1 WPA2
+WPA-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp psk
+RSN-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp psk
+DEVICE:wlan1
+ACTIVE:nie
+IN-USE: 
+DBUS-PATH:/org/freedesktop/NetworkManager/AccessPoint/4
 
 
+<<<
+size: 852
+location: clients/tests/test-client.py:1082:test_004()/835
+cmd: $NMCLI --mode multiline --terse --color yes -f COMMON device wifi list
+lang: C
+returncode: 0
+stdout: 668 bytes
+>>>
 IN-USE: 
 SSID:wlan0-ap-2
 MODE:Infra
@@ -48100,7 +48886,7 @@ CHAN:1
 RATE:54 Mbit/s
 SIGNAL:81
 BARS:****
-SECURITY:WPA1 WPA2
+SECURITY:WPA1
 IN-USE: 
 SSID:wlan0-ap-3
 MODE:Infra
@@ -48108,26 +48894,26 @@ CHAN:1
 RATE:54 Mbit/s
 SIGNAL:55
 BARS:**  
-SECURITY:WPA1 WPA2
+SECURITY:WPA3
 
-<<<
-size: 908
-location: clients/tests/test-client.py:1068:test_004()/836
-cmd: $NMCLI --mode multiline --terse --color yes -f COMMON device wifi list
-lang: pl_PL.UTF-8
-returncode: 0
-stdout: 714 bytes
->>>
 IN-USE: 
 SSID:wlan1-ap-4
-MODE:Infrastruktura
+MODE:Infra
 CHAN:1
-RATE:54 Mb/s
+RATE:54 Mbit/s
 SIGNAL:48
 BARS:**  
 SECURITY:WPA1 WPA2
 
 
+<<<
+size: 898
+location: clients/tests/test-client.py:1082:test_004()/836
+cmd: $NMCLI --mode multiline --terse --color yes -f COMMON device wifi list
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 704 bytes
+>>>
 IN-USE: 
 SSID:wlan0-ap-2
 MODE:Infrastruktura
@@ -48143,7 +48929,7 @@ CHAN:1
 RATE:54 Mb/s
 SIGNAL:81
 BARS:****
-SECURITY:WPA1 WPA2
+SECURITY:WPA1
 IN-USE: 
 SSID:wlan0-ap-3
 MODE:Infrastruktura
@@ -48151,35 +48937,26 @@ CHAN:1
 RATE:54 Mb/s
 SIGNAL:55
 BARS:**  
-SECURITY:WPA1 WPA2
+SECURITY:WPA3
 
-<<<
-size: 2377
-location: clients/tests/test-client.py:1071:test_004()/837
-cmd: $NMCLI --mode multiline --terse --color yes -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list
-lang: C
-returncode: 0
-stdout: 2082 bytes
->>>
-NAME:AP[1]
+IN-USE: 
 SSID:wlan1-ap-4
-SSID-HEX:776C616E312D61702D34
-BSSID:94:2B:E8:F6:D2:86
-MODE:Infra
+MODE:Infrastruktura
 CHAN:1
-FREQ:2412 MHz
-RATE:54 Mbit/s
+RATE:54 Mb/s
 SIGNAL:48
 BARS:**  
 SECURITY:WPA1 WPA2
-WPA-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp psk
-RSN-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp psk
-DEVICE:wlan1
-ACTIVE:no
-IN-USE: 
-DBUS-PATH:/org/freedesktop/NetworkManager/AccessPoint/4
 
 
+<<<
+size: 2289
+location: clients/tests/test-client.py:1085:test_004()/837
+cmd: $NMCLI --mode multiline --terse --color yes -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list
+lang: C
+returncode: 0
+stdout: 1994 bytes
+>>>
 NAME:AP[1]
 SSID:wlan0-ap-2
 SSID-HEX:776C616E302D61702D32
@@ -48207,9 +48984,9 @@ FREQ:2412 MHz
 RATE:54 Mbit/s
 SIGNAL:81
 BARS:****
-SECURITY:WPA1 WPA2
+SECURITY:WPA1
 WPA-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp psk
-RSN-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp psk
+RSN-FLAGS:(none)
 DEVICE:wlan0
 ACTIVE:no
 IN-USE: 
@@ -48224,41 +49001,41 @@ FREQ:2412 MHz
 RATE:54 Mbit/s
 SIGNAL:55
 BARS:**  
-SECURITY:WPA1 WPA2
-WPA-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp psk
-RSN-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp psk
+SECURITY:WPA3
+WPA-FLAGS:(none)
+RSN-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp sae
 DEVICE:wlan0
 ACTIVE:no
 IN-USE: 
 DBUS-PATH:/org/freedesktop/NetworkManager/AccessPoint/3
 
-<<<
-size: 2435
-location: clients/tests/test-client.py:1071:test_004()/838
-cmd: $NMCLI --mode multiline --terse --color yes -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list
-lang: pl_PL.UTF-8
-returncode: 0
-stdout: 2130 bytes
->>>
 NAME:AP[1]
 SSID:wlan1-ap-4
 SSID-HEX:776C616E312D61702D34
 BSSID:94:2B:E8:F6:D2:86
-MODE:Infrastruktura
+MODE:Infra
 CHAN:1
-FREQ:2412 MHz
-RATE:54 Mb/s
+FREQ:2412 MHz
+RATE:54 Mbit/s
 SIGNAL:48
 BARS:**  
 SECURITY:WPA1 WPA2
 WPA-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp psk
 RSN-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp psk
 DEVICE:wlan1
-ACTIVE:nie
+ACTIVE:no
 IN-USE: 
 DBUS-PATH:/org/freedesktop/NetworkManager/AccessPoint/4
 
 
+<<<
+size: 2347
+location: clients/tests/test-client.py:1085:test_004()/838
+cmd: $NMCLI --mode multiline --terse --color yes -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 2042 bytes
+>>>
 NAME:AP[1]
 SSID:wlan0-ap-2
 SSID-HEX:776C616E302D61702D32
@@ -48286,9 +49063,9 @@ FREQ:2412 MHz
 RATE:54 Mb/s
 SIGNAL:81
 BARS:****
-SECURITY:WPA1 WPA2
+SECURITY:WPA1
 WPA-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp psk
-RSN-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp psk
+RSN-FLAGS:(brak)
 DEVICE:wlan0
 ACTIVE:nie
 IN-USE: 
@@ -48303,21 +49080,40 @@ FREQ:2412 MHz
 RATE:54 Mb/s
 SIGNAL:55
 BARS:**  
+SECURITY:WPA3
+WPA-FLAGS:(brak)
+RSN-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp sae
+DEVICE:wlan0
+ACTIVE:nie
+IN-USE: 
+DBUS-PATH:/org/freedesktop/NetworkManager/AccessPoint/3
+
+NAME:AP[1]
+SSID:wlan1-ap-4
+SSID-HEX:776C616E312D61702D34
+BSSID:94:2B:E8:F6:D2:86
+MODE:Infrastruktura
+CHAN:1
+FREQ:2412 MHz
+RATE:54 Mb/s
+SIGNAL:48
+BARS:**  
 SECURITY:WPA1 WPA2
 WPA-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp psk
 RSN-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp psk
-DEVICE:wlan0
+DEVICE:wlan1
 ACTIVE:nie
 IN-USE: 
-DBUS-PATH:/org/freedesktop/NetworkManager/AccessPoint/3
+DBUS-PATH:/org/freedesktop/NetworkManager/AccessPoint/4
+
 
 <<<
-size: 725
-location: clients/tests/test-client.py:1073:test_004()/839
+size: 727
+location: clients/tests/test-client.py:1087:test_004()/839
 cmd: $NMCLI --mode multiline --terse --color yes -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: C
 returncode: 0
-stdout: 520 bytes
+stdout: 522 bytes
 >>>
 NAME:AP[1]
 SSID:wlan0-ap-2
@@ -48337,13 +49133,15 @@ ACTIVE:no
 IN-USE: 
 DBUS-PATH:/org/freedesktop/NetworkManager/AccessPoint/2
 
+
+
 <<<
-size: 747
-location: clients/tests/test-client.py:1073:test_004()/840
+size: 749
+location: clients/tests/test-client.py:1087:test_004()/840
 cmd: $NMCLI --mode multiline --terse --color yes -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 532 bytes
+stdout: 534 bytes
 >>>
 NAME:AP[1]
 SSID:wlan0-ap-2
@@ -48363,13 +49161,15 @@ ACTIVE:nie
 IN-USE: 
 DBUS-PATH:/org/freedesktop/NetworkManager/AccessPoint/2
 
+
+
 <<<
-size: 377
-location: clients/tests/test-client.py:1075:test_004()/841
+size: 379
+location: clients/tests/test-client.py:1089:test_004()/841
 cmd: $NMCLI --mode multiline --terse --color yes -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: C
 returncode: 0
-stdout: 169 bytes
+stdout: 171 bytes
 >>>
 IN-USE: 
 SSID:wlan0-ap-2
@@ -48380,13 +49180,15 @@ SIGNAL:92
 BARS:****
 SECURITY:WPA1 WPA2
 
+
+
 <<<
-size: 396
-location: clients/tests/test-client.py:1075:test_004()/842
+size: 398
+location: clients/tests/test-client.py:1089:test_004()/842
 cmd: $NMCLI --mode multiline --terse --color yes -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 178 bytes
+stdout: 180 bytes
 >>>
 IN-USE: 
 SSID:wlan0-ap-2
@@ -48397,13 +49199,15 @@ SIGNAL:92
 BARS:****
 SECURITY:WPA1 WPA2
 
+
+
 <<<
-size: 838
-location: clients/tests/test-client.py:1078:test_004()/843
+size: 840
+location: clients/tests/test-client.py:1092:test_004()/843
 cmd: $NMCLI --mode multiline --terse --color yes -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: C
 returncode: 0
-stdout: 520 bytes
+stdout: 522 bytes
 >>>
 NAME:AP[1]
 SSID:wlan0-ap-2
@@ -48423,13 +49227,15 @@ ACTIVE:no
 IN-USE: 
 DBUS-PATH:/org/freedesktop/NetworkManager/AccessPoint/2
 
+
+
 <<<
-size: 860
-location: clients/tests/test-client.py:1078:test_004()/844
+size: 862
+location: clients/tests/test-client.py:1092:test_004()/844
 cmd: $NMCLI --mode multiline --terse --color yes -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 532 bytes
+stdout: 534 bytes
 >>>
 NAME:AP[1]
 SSID:wlan0-ap-2
@@ -48449,13 +49255,15 @@ ACTIVE:nie
 IN-USE: 
 DBUS-PATH:/org/freedesktop/NetworkManager/AccessPoint/2
 
+
+
 <<<
-size: 2877
-location: clients/tests/test-client.py:1080:test_004()/845
+size: 2941
+location: clients/tests/test-client.py:1094:test_004()/845
 cmd: $NMCLI --mode multiline --terse --color yes -f ALL device show wlan0
 lang: C
 returncode: 0
-stdout: 2694 bytes
+stdout: 2758 bytes
 >>>
 GENERAL.DEVICE:wlan0
 GENERAL.TYPE:wifi
@@ -48469,6 +49277,8 @@ GENERAL.HWADDR:13:E0:74:85:7C:D9
 GENERAL.MTU:0
 GENERAL.STATE:20 (unavailable)
 GENERAL.REASON:0 (No reason given)
+GENERAL.IP4-CONNECTIVITY:0 (unknown)
+GENERAL.IP6-CONNECTIVITY:0 (unknown)
 GENERAL.UDI:/sys/devices/virtual/wlan0
 GENERAL.IP-IFACE:
 GENERAL.IS-SOFTWARE:no
@@ -48509,7 +49319,7 @@ AP[2].CHAN:1
 AP[2].RATE:54 Mbit/s
 AP[2].SIGNAL:81
 AP[2].BARS:****
-AP[2].SECURITY:WPA1 WPA2
+AP[2].SECURITY:WPA1
 AP[3].IN-USE: 
 AP[3].SSID:wlan0-ap-3
 AP[3].MODE:Infra
@@ -48517,7 +49327,7 @@ AP[3].CHAN:1
 AP[3].RATE:54 Mbit/s
 AP[3].SIGNAL:55
 AP[3].BARS:**  
-AP[3].SECURITY:WPA1 WPA2
+AP[3].SECURITY:WPA3
 IP4.ADDRESS[1]:192.168.228.18/32
 IP4.ADDRESS[2]:192.168.209.179/25
 IP4.GATEWAY:192.168.41.120
@@ -48548,12 +49358,12 @@ CONNECTIONS.AVAILABLE-CONNECTION-PATHS:/org/freedesktop/NetworkManager/Settings/
 CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 
 <<<
-size: 2914
-location: clients/tests/test-client.py:1080:test_004()/846
+size: 2978
+location: clients/tests/test-client.py:1094:test_004()/846
 cmd: $NMCLI --mode multiline --terse --color yes -f ALL device show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2721 bytes
+stdout: 2785 bytes
 >>>
 GENERAL.DEVICE:wlan0
 GENERAL.TYPE:wifi
@@ -48567,6 +49377,8 @@ GENERAL.HWADDR:13:E0:74:85:7C:D9
 GENERAL.MTU:0
 GENERAL.STATE:20 (unavailable)
 GENERAL.REASON:0 (No reason given)
+GENERAL.IP4-CONNECTIVITY:0 (unknown)
+GENERAL.IP6-CONNECTIVITY:0 (unknown)
 GENERAL.UDI:/sys/devices/virtual/wlan0
 GENERAL.IP-IFACE:
 GENERAL.IS-SOFTWARE:no
@@ -48607,7 +49419,7 @@ AP[2].CHAN:1
 AP[2].RATE:54 Mb/s
 AP[2].SIGNAL:81
 AP[2].BARS:****
-AP[2].SECURITY:WPA1 WPA2
+AP[2].SECURITY:WPA1
 AP[3].IN-USE: 
 AP[3].SSID:wlan0-ap-3
 AP[3].MODE:Infrastruktura
@@ -48615,7 +49427,7 @@ AP[3].CHAN:1
 AP[3].RATE:54 Mb/s
 AP[3].SIGNAL:55
 AP[3].BARS:**  
-AP[3].SECURITY:WPA1 WPA2
+AP[3].SECURITY:WPA3
 IP4.ADDRESS[1]:192.168.228.18/32
 IP4.ADDRESS[2]:192.168.209.179/25
 IP4.GATEWAY:192.168.41.120
@@ -48647,7 +49459,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-
 
 <<<
 size: 924
-location: clients/tests/test-client.py:1082:test_004()/847
+location: clients/tests/test-client.py:1096:test_004()/847
 cmd: $NMCLI --mode multiline --terse --color yes -f COMMON device show wlan0
 lang: C
 returncode: 0
@@ -48680,7 +49492,7 @@ IP6.DOMAIN[6]:sear6.foo4.bar
 
 <<<
 size: 934
-location: clients/tests/test-client.py:1082:test_004()/848
+location: clients/tests/test-client.py:1096:test_004()/848
 cmd: $NMCLI --mode multiline --terse --color yes -f COMMON device show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
@@ -48712,12 +49524,12 @@ IP6.DOMAIN[5]:sear6.foo3.bar
 IP6.DOMAIN[6]:sear6.foo4.bar
 
 <<<
-size: 3015
-location: clients/tests/test-client.py:1084:test_004()/849
+size: 3079
+location: clients/tests/test-client.py:1098:test_004()/849
 cmd: $NMCLI --mode multiline --terse --color yes -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0
 lang: C
 returncode: 0
-stdout: 2694 bytes
+stdout: 2758 bytes
 >>>
 GENERAL.DEVICE:wlan0
 GENERAL.TYPE:wifi
@@ -48731,6 +49543,8 @@ GENERAL.HWADDR:13:E0:74:85:7C:D9
 GENERAL.MTU:0
 GENERAL.STATE:20 (unavailable)
 GENERAL.REASON:0 (No reason given)
+GENERAL.IP4-CONNECTIVITY:0 (unknown)
+GENERAL.IP6-CONNECTIVITY:0 (unknown)
 GENERAL.UDI:/sys/devices/virtual/wlan0
 GENERAL.IP-IFACE:
 GENERAL.IS-SOFTWARE:no
@@ -48771,7 +49585,7 @@ AP[2].CHAN:1
 AP[2].RATE:54 Mbit/s
 AP[2].SIGNAL:81
 AP[2].BARS:****
-AP[2].SECURITY:WPA1 WPA2
+AP[2].SECURITY:WPA1
 AP[3].IN-USE: 
 AP[3].SSID:wlan0-ap-3
 AP[3].MODE:Infra
@@ -48779,7 +49593,7 @@ AP[3].CHAN:1
 AP[3].RATE:54 Mbit/s
 AP[3].SIGNAL:55
 AP[3].BARS:**  
-AP[3].SECURITY:WPA1 WPA2
+AP[3].SECURITY:WPA3
 IP4.ADDRESS[1]:192.168.228.18/32
 IP4.ADDRESS[2]:192.168.209.179/25
 IP4.GATEWAY:192.168.41.120
@@ -48810,12 +49624,12 @@ CONNECTIONS.AVAILABLE-CONNECTION-PATHS:/org/freedesktop/NetworkManager/Settings/
 CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 
 <<<
-size: 3052
-location: clients/tests/test-client.py:1084:test_004()/850
+size: 3116
+location: clients/tests/test-client.py:1098:test_004()/850
 cmd: $NMCLI --mode multiline --terse --color yes -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2721 bytes
+stdout: 2785 bytes
 >>>
 GENERAL.DEVICE:wlan0
 GENERAL.TYPE:wifi
@@ -48829,6 +49643,8 @@ GENERAL.HWADDR:13:E0:74:85:7C:D9
 GENERAL.MTU:0
 GENERAL.STATE:20 (unavailable)
 GENERAL.REASON:0 (No reason given)
+GENERAL.IP4-CONNECTIVITY:0 (unknown)
+GENERAL.IP6-CONNECTIVITY:0 (unknown)
 GENERAL.UDI:/sys/devices/virtual/wlan0
 GENERAL.IP-IFACE:
 GENERAL.IS-SOFTWARE:no
@@ -48869,7 +49685,7 @@ AP[2].CHAN:1
 AP[2].RATE:54 Mb/s
 AP[2].SIGNAL:81
 AP[2].BARS:****
-AP[2].SECURITY:WPA1 WPA2
+AP[2].SECURITY:WPA1
 AP[3].IN-USE: 
 AP[3].SSID:wlan0-ap-3
 AP[3].MODE:Infrastruktura
@@ -48877,7 +49693,7 @@ AP[3].CHAN:1
 AP[3].RATE:54 Mb/s
 AP[3].SIGNAL:55
 AP[3].BARS:**  
-AP[3].SECURITY:WPA1 WPA2
+AP[3].SECURITY:WPA3
 IP4.ADDRESS[1]:192.168.228.18/32
 IP4.ADDRESS[2]:192.168.209.179/25
 IP4.GATEWAY:192.168.41.120
diff --git a/clients/tests/test-client.py b/clients/tests/test-client.py
index d92d499c..c7d5c958 100755
--- a/clients/tests/test-client.py
+++ b/clients/tests/test-client.py
@@ -7,7 +7,7 @@ from __future__ import print_function
 # This test starts NetworkManager stub service in a user D-Bus session,
 # and runs nmcli against it. The output is recorded and compared to a pre-generated
 # expected output (clients/tests/test-client.check-on-disk/*.expected) which
-# is also commited to git.
+# is also committed to git.
 #
 ###############################################################################
 #
@@ -27,7 +27,7 @@ from __future__ import print_function
 #    #  $ LANG=pl_PL.UTF-8 ./clients/cli/nmcli --version
 #    # also ensure that `locale -a` reports the Polish locale.
 #  $ rm -rf  clients/tests/test-client.check-on-disk/*.expected
-#    # (step seldomly required)
+#    # (step seldom required)
 #    # Sometimes, if you want to be sure that the test would generate
 #    # exactly the same .expected files, purge the previous version first.
 #    # This is only necessary, when you remove test from this file.
@@ -748,6 +748,7 @@ class TestNmcli(NmTestBase):
                 print("EXPECT OUTPUT:\n[[%s]]\n" % (results_expect[i]))
                 print("Let the test write the file by rerunning with NM_TEST_REGENERATE=1")
                 print("See howto in %s for details.\n" % (PathConfiguration.canonical_script_filename()))
+                sys.stdout.flush()
                 self.fail("Unexpected output of command, expected %s. Rerun test with NM_TEST_REGENERATE=1 to regenerate files" % (filename))
             if len(results_expect) != len(results):
                 if not regenerate:
@@ -758,6 +759,7 @@ class TestNmcli(NmTestBase):
                         print("EXPECT OUTPUT:\n[[%s]]\n" % (results_expect[len(results)]))
                     print("Let the test write the file by rerunning with NM_TEST_REGENERATE=1")
                     print("See howto in %s for details.\n" % (PathConfiguration.canonical_script_filename()))
+                    sys.stdout.flush()
                     self.fail("Unexpected output of command, expected %s. Rerun test with NM_TEST_REGENERATE=1 to regenerate files" % (filename))
 
         if regenerate:
@@ -805,11 +807,23 @@ class TestNmcli(NmTestBase):
                            iface = 'wlan1')
 
         self.srv.op_AddObj('WifiAp',
-                           device = 'wlan0')
+                           device = 'wlan0',
+                           rsnf = 0x0)
+
         self.srv.op_AddObj('WifiAp',
                            device = 'wlan0')
+
+        NM_AP_FLAGS = getattr(NM, '80211ApSecurityFlags')
+        rsnf = 0x0
+        rsnf = rsnf | NM_AP_FLAGS.PAIR_TKIP
+        rsnf = rsnf | NM_AP_FLAGS.PAIR_CCMP
+        rsnf = rsnf | NM_AP_FLAGS.GROUP_TKIP
+        rsnf = rsnf | NM_AP_FLAGS.GROUP_CCMP
+        rsnf = rsnf | NM_AP_FLAGS.KEY_MGMT_SAE
         self.srv.op_AddObj('WifiAp',
-                           device = 'wlan0')
+                           device = 'wlan0',
+                           wpaf = 0x0,
+                           rsnf = rsnf)
 
         self.srv.op_AddObj('WifiAp',
                            device = 'wlan1')
diff --git a/clients/tui/meson.build b/clients/tui/meson.build
index 5f7f0fbb..461b1f0a 100644
--- a/clients/tui/meson.build
+++ b/clients/tui/meson.build
@@ -2,7 +2,7 @@ name = 'nmtui'
 
 deps = [
   newt_dep,
-  nm_core_dep
+  nm_core_dep,
 ]
 
 cflags = clients_cflags + [
@@ -51,13 +51,13 @@ sources = files(
   'nmtui-edit.c',
   'nmtui-hostname.c',
   'nmt-utils.c',
-  'nmt-widget-list.c'
+  'nmt-widget-list.c',
 )
 
 deps += [
   libnm_dep,
   libnmc_base_dep,
-  libnmt_newt_dep
+  libnmt_newt_dep,
 ]
 
 executable(
@@ -67,5 +67,5 @@ executable(
   c_args: cflags,
   link_args: ldflags_linker_script_binary,
   link_depends: linker_script_binary,
-  install: true
+  install: true,
 )
diff --git a/clients/tui/newt/meson.build b/clients/tui/newt/meson.build
index aeec39da..5bb713d3 100644
--- a/clients/tui/newt/meson.build
+++ b/clients/tui/newt/meson.build
@@ -18,7 +18,7 @@ sources = files(
   'nmt-newt-textbox.c',
   'nmt-newt-toggle-button.c',
   'nmt-newt-utils.c',
-  'nmt-newt-widget.c'
+  'nmt-newt-widget.c',
 )
 
 libnmt_newt = static_library(
@@ -26,10 +26,10 @@ libnmt_newt = static_library(
   sources: sources + [libnm_enum[1]],
   include_directories: libnm_inc,
   dependencies: deps,
-  c_args: cflags
+  c_args: cflags,
 )
 
 libnmt_newt_dep = declare_dependency(
   include_directories: include_directories('.'),
-  link_with: libnmt_newt
+  link_with: libnmt_newt,
 )
diff --git a/clients/tui/newt/nmt-newt-button-box.c b/clients/tui/newt/nmt-newt-button-box.c
index 5341c76a..02d8f5cb 100644
--- a/clients/tui/newt/nmt-newt-button-box.c
+++ b/clients/tui/newt/nmt-newt-button-box.c
@@ -31,9 +31,8 @@
 
 #include "nm-default.h"
 
-#include 
-
 #include "nmt-newt-button-box.h"
+
 #include "nmt-newt-button.h"
 
 G_DEFINE_TYPE (NmtNewtButtonBox, nmt_newt_button_box, NMT_TYPE_NEWT_CONTAINER)
diff --git a/clients/tui/newt/nmt-newt-container.c b/clients/tui/newt/nmt-newt-container.c
index 927f187e..40259025 100644
--- a/clients/tui/newt/nmt-newt-container.c
+++ b/clients/tui/newt/nmt-newt-container.c
@@ -28,9 +28,8 @@
 
 #include "nm-default.h"
 
-#include 
-
 #include "nmt-newt-container.h"
+
 #include "nmt-newt-component.h"
 
 G_DEFINE_ABSTRACT_TYPE (NmtNewtContainer, nmt_newt_container, NMT_TYPE_NEWT_WIDGET)
diff --git a/clients/tui/newt/nmt-newt-entry-numeric.c b/clients/tui/newt/nmt-newt-entry-numeric.c
index a52fe868..92855fcb 100644
--- a/clients/tui/newt/nmt-newt-entry-numeric.c
+++ b/clients/tui/newt/nmt-newt-entry-numeric.c
@@ -127,8 +127,8 @@ newt_entry_numeric_validate (NmtNewtEntry *entry,
 	if (!*text)
 		return priv->optional ? TRUE : FALSE;
 
-	val = _nm_utils_ascii_str_to_int64 (text, 10, priv->min, priv->max, 0);
-	return val != 0 || errno == 0;
+	val = _nm_utils_ascii_str_to_int64 (text, 10, priv->min, priv->max, G_MAXINT64);
+	return val != G_MAXINT64 || errno == 0;
 }
 
 static void
diff --git a/clients/tui/newt/nmt-newt-entry.c b/clients/tui/newt/nmt-newt-entry.c
index 2715a738..90c2e467 100644
--- a/clients/tui/newt/nmt-newt-entry.c
+++ b/clients/tui/newt/nmt-newt-entry.c
@@ -28,8 +28,6 @@
 
 #include "nm-default.h"
 
-#include 
-
 #include "nmt-newt-entry.h"
 #include "nmt-newt-form.h"
 #include "nmt-newt-hacks.h"
diff --git a/clients/tui/newt/nmt-newt-form.c b/clients/tui/newt/nmt-newt-form.c
index ccf447ea..cd87a216 100644
--- a/clients/tui/newt/nmt-newt-form.c
+++ b/clients/tui/newt/nmt-newt-form.c
@@ -27,7 +27,6 @@
 #include "nm-default.h"
 
 #include 
-#include 
 #include 
 
 #include "nmt-newt-form.h"
diff --git a/clients/tui/newt/nmt-newt-grid.c b/clients/tui/newt/nmt-newt-grid.c
index 4333e0dc..e6c487f5 100644
--- a/clients/tui/newt/nmt-newt-grid.c
+++ b/clients/tui/newt/nmt-newt-grid.c
@@ -42,8 +42,6 @@
 
 #include "nm-default.h"
 
-#include 
-
 #include "nmt-newt-grid.h"
 
 G_DEFINE_TYPE (NmtNewtGrid, nmt_newt_grid, NMT_TYPE_NEWT_CONTAINER)
diff --git a/clients/tui/newt/nmt-newt-label.c b/clients/tui/newt/nmt-newt-label.c
index f9aed8a3..63bd28da 100644
--- a/clients/tui/newt/nmt-newt-label.c
+++ b/clients/tui/newt/nmt-newt-label.c
@@ -27,9 +27,8 @@
 
 #include "nm-default.h"
 
-#include 
-
 #include "nmt-newt-label.h"
+
 #include "nmt-newt-utils.h"
 
 G_DEFINE_TYPE (NmtNewtLabel, nmt_newt_label, NMT_TYPE_NEWT_COMPONENT)
diff --git a/clients/tui/newt/nmt-newt-listbox.c b/clients/tui/newt/nmt-newt-listbox.c
index 15a89b0b..4f8120f1 100644
--- a/clients/tui/newt/nmt-newt-listbox.c
+++ b/clients/tui/newt/nmt-newt-listbox.c
@@ -227,7 +227,7 @@ nmt_newt_listbox_get_active_key (NmtNewtListbox *listbox)
 /**
  * nmt_newt_listbox_set_height:
  * @listbox: an #NmtNewtListbox
- * @height: the new height, or -1 for no fixed heigh
+ * @height: the new height, or -1 for no fixed height
  *
  * Updates @listbox's height.
  */
diff --git a/clients/tui/newt/nmt-newt-section.c b/clients/tui/newt/nmt-newt-section.c
index 34073454..9b7e44e4 100644
--- a/clients/tui/newt/nmt-newt-section.c
+++ b/clients/tui/newt/nmt-newt-section.c
@@ -37,9 +37,8 @@
 
 #include "nm-default.h"
 
-#include 
-
 #include "nmt-newt-section.h"
+
 #include "nmt-newt-grid.h"
 #include "nmt-newt-label.h"
 #include "nmt-newt-utils.h"
diff --git a/clients/tui/newt/nmt-newt-stack.c b/clients/tui/newt/nmt-newt-stack.c
index 3abf00b1..da4beb8b 100644
--- a/clients/tui/newt/nmt-newt-stack.c
+++ b/clients/tui/newt/nmt-newt-stack.c
@@ -31,8 +31,6 @@
 
 #include "nm-default.h"
 
-#include 
-
 #include "nmt-newt-stack.h"
 
 G_DEFINE_TYPE (NmtNewtStack, nmt_newt_stack, NMT_TYPE_NEWT_CONTAINER)
diff --git a/clients/tui/newt/nmt-newt-textbox.c b/clients/tui/newt/nmt-newt-textbox.c
index 73794f5e..0850e60c 100644
--- a/clients/tui/newt/nmt-newt-textbox.c
+++ b/clients/tui/newt/nmt-newt-textbox.c
@@ -26,9 +26,8 @@
 
 #include "nm-default.h"
 
-#include 
-
 #include "nmt-newt-textbox.h"
+
 #include "nmt-newt-utils.h"
 
 G_DEFINE_TYPE (NmtNewtTextbox, nmt_newt_textbox, NMT_TYPE_NEWT_COMPONENT)
diff --git a/clients/tui/newt/nmt-newt-utils.c b/clients/tui/newt/nmt-newt-utils.c
index e8866500..475faf7e 100644
--- a/clients/tui/newt/nmt-newt-utils.c
+++ b/clients/tui/newt/nmt-newt-utils.c
@@ -23,7 +23,6 @@
 
 #include "nm-default.h"
 
-#include 
 #include 
 #include 
 #include 
diff --git a/clients/tui/nm-editor-bindings.c b/clients/tui/nm-editor-bindings.c
index 8df741f5..df6387c3 100644
--- a/clients/tui/nm-editor-bindings.c
+++ b/clients/tui/nm-editor-bindings.c
@@ -27,12 +27,11 @@
 
 #include "nm-default.h"
 
+#include "nm-editor-bindings.h"
+
 #include 
 #include 
 #include 
-#include 
-
-#include "nm-editor-bindings.h"
 
 static void
 value_transform_string_int (const GValue *src_value,
@@ -516,7 +515,7 @@ ip_route_transform_from_metric_string (GBinding     *binding,
  * @addr_family: the IP address family
  * @source: the source object
  * @source_property: the source property
- * @dest_target: the target object for the route's destionation
+ * @dest_target: the target object for the route's destination
  * @dest_target_property: the property on @dest_target
  * @next_hop_target: the target object for the route's next hop
  * @next_hop_target_property: the property on @next_hop_target
diff --git a/clients/tui/nmt-address-list.c b/clients/tui/nmt-address-list.c
index 53990d6a..ae1a6b2f 100644
--- a/clients/tui/nmt-address-list.c
+++ b/clients/tui/nmt-address-list.c
@@ -30,12 +30,12 @@
 
 #include "nm-default.h"
 
+#include "nmt-address-list.h"
+
 #include 
 #include 
 #include 
-#include 
 
-#include "nmt-address-list.h"
 #include "nmt-ip-entry.h"
 
 G_DEFINE_TYPE (NmtAddressList, nmt_address_list, NMT_TYPE_WIDGET_LIST)
diff --git a/clients/tui/nmt-device-entry.c b/clients/tui/nmt-device-entry.c
index a4d63e4f..43fbbc16 100644
--- a/clients/tui/nmt-device-entry.c
+++ b/clients/tui/nmt-device-entry.c
@@ -36,12 +36,12 @@
 
 #include "nm-default.h"
 
-#include 
+#include "nmt-device-entry.h"
+
 #include 
 #include 
 
 #include "nmtui.h"
-#include "nmt-device-entry.h"
 
 G_DEFINE_TYPE (NmtDeviceEntry, nmt_device_entry, NMT_TYPE_EDITOR_GRID)
 
diff --git a/clients/tui/nmt-editor-grid.c b/clients/tui/nmt-editor-grid.c
index bc8a7843..bb3e78b8 100644
--- a/clients/tui/nmt-editor-grid.c
+++ b/clients/tui/nmt-editor-grid.c
@@ -39,8 +39,6 @@
 
 #include "nm-default.h"
 
-#include 
-
 #include "nmt-editor-grid.h"
 
 G_DEFINE_TYPE (NmtEditorGrid, nmt_editor_grid, NMT_TYPE_NEWT_CONTAINER)
diff --git a/clients/tui/nmt-mac-entry.c b/clients/tui/nmt-mac-entry.c
index 23c2ab1c..70c8c307 100644
--- a/clients/tui/nmt-mac-entry.c
+++ b/clients/tui/nmt-mac-entry.c
@@ -30,8 +30,6 @@
 
 #include "nmt-mac-entry.h"
 
-#include 
-
 #include "nm-common-macros.h"
 
 G_DEFINE_TYPE (NmtMacEntry, nmt_mac_entry, NMT_TYPE_NEWT_ENTRY)
diff --git a/clients/tui/nmt-slave-list.c b/clients/tui/nmt-slave-list.c
index 893b7caf..a2c088b0 100644
--- a/clients/tui/nmt-slave-list.c
+++ b/clients/tui/nmt-slave-list.c
@@ -56,7 +56,7 @@ static gboolean nmt_slave_list_connection_filter (NmtEditConnectionList *list,
 /**
  * nmt_slave_list_new:
  * @master: the master #NMConnection whose slaves are being listed
- * @type_filter: (allow-none): a function to limit the availble slave types
+ * @type_filter: (allow-none): a function to limit the available slave types
  * @type_filter_data: (allow-none): data for @type_filter.
  *
  * Creates a new #NmtSlaveList.
diff --git a/clients/tui/nmt-utils.c b/clients/tui/nmt-utils.c
index 7cd71be2..96b97158 100644
--- a/clients/tui/nmt-utils.c
+++ b/clients/tui/nmt-utils.c
@@ -23,8 +23,6 @@
 
 #include "nm-default.h"
 
-#include 
-
 #include "nmt-utils.h"
 
 /**
diff --git a/clients/tui/nmt-widget-list.c b/clients/tui/nmt-widget-list.c
index 2fd5af02..ad35f3de 100644
--- a/clients/tui/nmt-widget-list.c
+++ b/clients/tui/nmt-widget-list.c
@@ -32,12 +32,12 @@
 
 #include "nm-default.h"
 
+#include "nmt-widget-list.h"
+
 #include 
 #include 
 #include 
-#include 
 
-#include "nmt-widget-list.h"
 #include "nmt-newt.h"
 
 G_DEFINE_TYPE (NmtWidgetList, nmt_widget_list, NMT_TYPE_NEWT_GRID)
diff --git a/clients/tui/nmtui-connect.c b/clients/tui/nmtui-connect.c
index 6f29e13e..e43c22e4 100644
--- a/clients/tui/nmtui-connect.c
+++ b/clients/tui/nmtui-connect.c
@@ -240,7 +240,7 @@ activate_connection (NMConnection *connection,
                      NMObject     *specific_object)
 {
 	NmtNewtForm *form;
-	gs_unref_object NMSecretAgentOld *agent = NULL;
+	gs_unref_object NMSecretAgentSimple *agent = NULL;
 	NmtNewtWidget *label;
 	NmtSyncOp op;
 	const char *specific_object_path;
@@ -257,7 +257,7 @@ activate_connection (NMConnection *connection,
 	agent = nm_secret_agent_simple_new ("nmtui");
 	if (agent) {
 		if (connection) {
-			nm_secret_agent_simple_enable (NM_SECRET_AGENT_SIMPLE (agent),
+			nm_secret_agent_simple_enable (agent,
 			                               nm_object_get_path (NM_OBJECT (connection)));
 		}
 		g_signal_connect (agent,
@@ -303,7 +303,7 @@ activate_connection (NMConnection *connection,
 	if (agent && !connection) {
 		connection = NM_CONNECTION (nm_active_connection_get_connection (ac));
 		if (connection) {
-			nm_secret_agent_simple_enable (NM_SECRET_AGENT_SIMPLE (agent),
+			nm_secret_agent_simple_enable (agent,
 			                               nm_object_get_path (NM_OBJECT (connection)));
 		}
 	}
@@ -341,7 +341,7 @@ activate_connection (NMConnection *connection,
 	g_object_unref (form);
 
 	if (agent)
-		nm_secret_agent_old_unregister (agent, NULL, NULL);
+		nm_secret_agent_old_unregister (NM_SECRET_AGENT_OLD (agent), NULL, NULL);
 }
 
 static void
diff --git a/clients/tui/nmtui.c b/clients/tui/nmtui.c
index 97c528e7..aacc07cb 100644
--- a/clients/tui/nmtui.c
+++ b/clients/tui/nmtui.c
@@ -26,14 +26,14 @@
 
 #include "nm-default.h"
 
+#include "nmtui.h"
+
 #include 
 #include 
-#include 
 
 #include "nmt-newt.h"
 #include "nm-editor-bindings.h"
 
-#include "nmtui.h"
 #include "nmtui-edit.h"
 #include "nmtui-connect.h"
 #include "nmtui-hostname.h"
diff --git a/config.h.in b/config.h.in
index ef7963da..cb7ded3f 100644
--- a/config.h.in
+++ b/config.h.in
@@ -45,6 +45,10 @@
    don't. */
 #undef HAVE_DECL_GETRANDOM
 
+/* Define to 1 if you have the declaration of `memfd_create', and to 0 if you
+   don't. */
+#undef HAVE_DECL_MEMFD_CREATE
+
 /* Define to 1 if you have the declaration of `reallocarray', and to 0 if you
    don't. */
 #undef HAVE_DECL_REALLOCARRAY
diff --git a/config.h.meson b/config.h.meson
index e79f9dcb..c8f98055 100644
--- a/config.h.meson
+++ b/config.h.meson
@@ -19,6 +19,10 @@
 /* Gettext package */
 #mesondefine GETTEXT_PACKAGE
 
+/* Define to 1 if you have the declaration of `memfd_create', and to 0 if you
+   don't. */
+#mesondefine HAVE_DECL_MEMFD_CREATE
+
 /* Define to 1 if you have the declaration of `reallocarray', and to 0 if
    you don't. */
 #mesondefine HAVE_DECL_REALLOCARRAY
diff --git a/configure b/configure
index cdb1ad85..b3e14a3b 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for NetworkManager 1.14.6.
+# Generated by GNU Autoconf 2.69 for NetworkManager 1.16.0.
 #
 # Report bugs to .
 #
@@ -591,8 +591,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='NetworkManager'
 PACKAGE_TARNAME='NetworkManager'
-PACKAGE_VERSION='1.14.6'
-PACKAGE_STRING='NetworkManager 1.14.6'
+PACKAGE_VERSION='1.16.0'
+PACKAGE_STRING='NetworkManager 1.16.0'
 PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=NetworkManager'
 PACKAGE_URL=''
 
@@ -637,6 +637,7 @@ ac_subst_vars='am__EXEEXT_FALSE
 am__EXEEXT_TRUE
 LTLIBOBJS
 LIBOBJS
+AM_CFLAGS
 HAVE_DOCS_FALSE
 HAVE_DOCS_TRUE
 BUILD_DOCS_FALSE
@@ -771,6 +772,8 @@ LIBAUDIT_LIBS
 LIBAUDIT_CFLAGS
 SELINUX_LIBS
 SELINUX_CFLAGS
+WITH_EBPF_FALSE
+WITH_EBPF_TRUE
 ELOGIND_INHIBIT_LIBS
 ELOGIND_INHIBIT_CFLAGS
 SYSTEMD_INHIBIT_LIBS
@@ -1069,6 +1072,7 @@ with_systemd_logind
 with_consolekit
 with_session_tracking
 with_suspend_resume
+with_ebpf
 with_selinux
 with_libaudit
 enable_teamdctl
@@ -1727,7 +1731,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures NetworkManager 1.14.6 to adapt to many kinds of systems.
+\`configure' configures NetworkManager 1.16.0 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1797,7 +1801,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of NetworkManager 1.14.6:";;
+     short | recursive ) echo "Configuration of NetworkManager 1.16.0:";;
    esac
   cat <<\_ACEOF
 
@@ -1840,7 +1844,7 @@ Optional Features:
   --enable-modify-system  Allow users to modify system connections
   --enable-ppp            enable PPP/PPPoE support
   --enable-bluez5-dun     enable Bluez5 DUN support
-  --enable-ovs            enable OpenVSwitch support
+  --enable-ovs            enable Open vSwitch support
   --enable-concheck       enable connectivity checking support
   --enable-more-warnings  Possible values: no/yes/error
   --enable-more-asserts   Enable more assertions for debugging (default:
@@ -1908,6 +1912,7 @@ Optional Packages:
   --with-suspend-resume=upower|systemd|elogind|consolekit
                           Build NetworkManager with specific suspend/resume
                           support
+  --with-ebpf=yes|no|auto Build with eBPF support (default: auto)
   --with-selinux=yes|no|auto
                           Build with SELinux (default: auto)
   --with-libaudit=yes|yes-disabled-by-default|no|auto
@@ -2136,7 +2141,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-NetworkManager configure 1.14.6
+NetworkManager configure 1.16.0
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2909,7 +2914,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by NetworkManager $as_me 1.14.6, which was
+It was created by NetworkManager $as_me 1.16.0, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -3779,7 +3784,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='NetworkManager'
- VERSION='1.14.6'
+ VERSION='1.16.0'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -17962,9 +17967,9 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 NM_MAJOR_VERSION=1
-NM_MINOR_VERSION=14
-NM_MICRO_VERSION=6
-NM_VERSION=1.14.6
+NM_MINOR_VERSION=16
+NM_MICRO_VERSION=0
+NM_VERSION=1.16.0
 
 
 
@@ -17972,7 +17977,7 @@ NM_VERSION=1.14.6
 
 
 
-NM_GIT_SHA=dc56a21ed6a21565d979887ba9ebc0334e791c47
+NM_GIT_SHA=15a6b41239e9abc44f128d2721f63c2ce09a40ec
 
 if test """" != "no-config-h" ; then
 
@@ -18124,6 +18129,21 @@ cat >>confdefs.h <<_ACEOF
 _ACEOF
 
 
+ac_fn_c_check_decl "$LINENO" "memfd_create" "ac_cv_have_decl_memfd_create" "
+#include 
+
+"
+if test "x$ac_cv_have_decl_memfd_create" = xyes; then :
+  ac_have_decl=1
+else
+  ac_have_decl=0
+fi
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_DECL_MEMFD_CREATE $ac_have_decl
+_ACEOF
+
+
 for ac_header in sys/auxv.h
 do :
   ac_fn_c_check_header_mongrel "$LINENO" "sys/auxv.h" "ac_cv_header_sys_auxv_h" "$ac_includes_default"
@@ -23654,6 +23674,39 @@ $as_echo "#define SUSPEND_RESUME_CONSOLEKIT 1" >>confdefs.h
 		;;
 esac
 
+# eBPF support
+
+# Check whether --with-ebpf was given.
+if test "${with_ebpf+set}" = set; then :
+  withval=$with_ebpf;
+else
+  with_ebpf=auto
+fi
+
+if test "$with_ebpf" = "yes" -o "$with_ebpf" = "auto"; then
+	ac_fn_c_check_header_mongrel "$LINENO" "linux/bpf.h" "ac_cv_header_linux_bpf_h" "$ac_includes_default"
+if test "x$ac_cv_header_linux_bpf_h" = xyes; then :
+  have_ebpf=yes
+else
+  have_ebpf=no
+fi
+
+
+else
+	have_ebpf=no
+fi
+if test "$with_ebpf" = "yes" -a "$have_ebpf" = "no"; then
+	as_fn_error $? "--with-ebpf=yes requires eBPF kernel header" "$LINENO" 5
+fi
+ if test "${have_ebpf}" = "yes"; then
+  WITH_EBPF_TRUE=
+  WITH_EBPF_FALSE='#'
+else
+  WITH_EBPF_TRUE='#'
+  WITH_EBPF_FALSE=
+fi
+
+
 # SELinux support
 
 # Check whether --with-selinux was given.
@@ -24294,7 +24347,7 @@ fi
 
 # we usually compile with polkit support. --enable-polkit=yes|no only sets the
 # default configuration for main.auth-polkit. User can always enable/disable polkit
-# autorization via config.
+# authorization via config.
 # Check whether --enable-polkit was given.
 if test "${enable_polkit+set}" = set; then :
   enableval=$enable_polkit; enable_polkit=${enableval}
@@ -25070,7 +25123,7 @@ $as_echo "#define WITH_DHCPCANON 0" >>confdefs.h
 
 fi
 
-# OpenVSwitch integration
+# Open vSwitch integration
 # Check whether --enable-ovs was given.
 if test "${enable_ovs+set}" = set; then :
   enableval=$enable_ovs;
@@ -26264,18 +26317,16 @@ if test "$GCC" = "yes" -a "$set_more_warnings" != "no"; then
 $as_echo "yes" >&6; }
 
 			CFLAGS_SAVED="$CFLAGS"
-	eval "CFLAGS='$CFLAGS -Qunused-arguments'"
+	CFLAGS="$CFLAGS -Qunused-arguments"
 	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 _ACEOF
 if ac_fn_c_try_compile "$LINENO"; then :
-
-else
-  eval "CFLAGS='$CFLAGS_SAVED'"
+  eval "AM_CFLAGS='$AM_CFLAGS -Qunused-arguments'"
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-	unset CFLAGS_SAVED
+	CFLAGS="$CFLAGS_SAVED"
 
 
 
@@ -26299,14 +26350,14 @@ if ac_fn_c_try_compile "$LINENO"; then :
 			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 			CFLAGS="$CFLAGS_SAVED"
-			eval "CFLAGS='$CFLAGS -Wunknown-warning-option'"
+			eval "AM_CFLAGS='$AM_CFLAGS -Wunknown-warning-option'"
 
 else
 
 			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 			CFLAGS="$CFLAGS_SAVED"
-			eval "CFLAGS='$CFLAGS -Wno-unknown-warning-option'"
+			eval "AM_CFLAGS='$AM_CFLAGS -Wno-unknown-warning-option'"
 
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
@@ -26423,14 +26474,14 @@ if ac_fn_c_try_compile "$LINENO"; then :
 			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 			CFLAGS="$CFLAGS_SAVED"
-			eval "CFLAGS='$CFLAGS -Wunknown-attributes'"
+			eval "AM_CFLAGS='$AM_CFLAGS -Wunknown-attributes'"
 
 else
 
 			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 			CFLAGS="$CFLAGS_SAVED"
-			eval "CFLAGS='$CFLAGS -Wno-unknown-attributes'"
+			eval "AM_CFLAGS='$AM_CFLAGS -Wno-unknown-attributes'"
 
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
@@ -26468,14 +26519,14 @@ if ac_fn_c_try_compile "$LINENO"; then :
 			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 			CFLAGS="$CFLAGS_SAVED"
-			eval "CFLAGS='$CFLAGS -Wtypedef-redefinition'"
+			eval "AM_CFLAGS='$AM_CFLAGS -Wtypedef-redefinition'"
 
 else
 
 			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 			CFLAGS="$CFLAGS_SAVED"
-			eval "CFLAGS='$CFLAGS -Wno-typedef-redefinition'"
+			eval "AM_CFLAGS='$AM_CFLAGS -Wno-typedef-redefinition'"
 
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
@@ -26515,14 +26566,14 @@ if ac_fn_c_try_compile "$LINENO"; then :
 			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 			CFLAGS="$CFLAGS_SAVED"
-			eval "CFLAGS='$CFLAGS -Warray-bounds'"
+			eval "AM_CFLAGS='$AM_CFLAGS -Warray-bounds'"
 
 else
 
 			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 			CFLAGS="$CFLAGS_SAVED"
-			eval "CFLAGS='$CFLAGS -Wno-array-bounds'"
+			eval "AM_CFLAGS='$AM_CFLAGS -Wno-array-bounds'"
 
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
@@ -26562,14 +26613,14 @@ if ac_fn_c_try_compile "$LINENO"; then :
 			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 			CFLAGS="$CFLAGS_SAVED"
-			eval "CFLAGS='$CFLAGS -Wparentheses-equality'"
+			eval "AM_CFLAGS='$AM_CFLAGS -Wparentheses-equality'"
 
 else
 
 			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 			CFLAGS="$CFLAGS_SAVED"
-			eval "CFLAGS='$CFLAGS -Wno-parentheses-equality'"
+			eval "AM_CFLAGS='$AM_CFLAGS -Wno-parentheses-equality'"
 
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
@@ -26609,60 +26660,14 @@ if ac_fn_c_try_compile "$LINENO"; then :
 			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 			CFLAGS="$CFLAGS_SAVED"
-			eval "CFLAGS='$CFLAGS -Wunused-value'"
+			eval "AM_CFLAGS='$AM_CFLAGS -Wunused-value'"
 
 else
 
 			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 			CFLAGS="$CFLAGS_SAVED"
-			eval "CFLAGS='$CFLAGS -Wno-unused-value'"
-
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-
-else
-
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: not supported" >&5
-$as_echo "not supported" >&6; }
-		CFLAGS="$CFLAGS_SAVED"
-
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-
-
-
-
-
-	CFLAGS_SAVED="$CFLAGS"
-	CFLAGS="$CFLAGS $GLIB_CFLAGS -Werror -Wmissing-braces"
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -Wmissing-braces works as expected" >&5
-$as_echo_n "checking whether -Wmissing-braces works as expected... " >&6; }
-
-	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-
-		cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-union { int a[1]; int b[2]; } c = { 0 }
-
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-
-			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-			CFLAGS="$CFLAGS_SAVED"
-			eval "CFLAGS='$CFLAGS -Wmissing-braces'"
-
-else
-
-			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-			CFLAGS="$CFLAGS_SAVED"
-			eval "CFLAGS='$CFLAGS -Wno-missing-braces'"
+			eval "AM_CFLAGS='$AM_CFLAGS -Wno-unused-value'"
 
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
@@ -26706,14 +26711,14 @@ if ac_fn_c_try_compile "$LINENO"; then :
 			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 			CFLAGS="$CFLAGS_SAVED"
-			eval "CFLAGS='$CFLAGS -Wcast-function-type'"
+			eval "AM_CFLAGS='$AM_CFLAGS -Wcast-function-type'"
 
 else
 
 			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 			CFLAGS="$CFLAGS_SAVED"
-			eval "CFLAGS='$CFLAGS -Wno-cast-function-type'"
+			eval "AM_CFLAGS='$AM_CFLAGS -Wno-cast-function-type'"
 
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
@@ -26729,7 +26734,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 
 
-	eval "CFLAGS='$CFLAGS_MORE_WARNINGS $CFLAGS'"
+	eval "AM_CFLAGS='$CFLAGS_MORE_WARNINGS $AM_CFLAGS'"
 else
 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
@@ -26820,7 +26825,7 @@ fi
 
   done
 
-CFLAGS="$CFLAGS $with_cflags"
+AM_CFLAGS="$AM_CFLAGS $with_cflags"
 
 # Check whether --enable-more-asserts was given.
 if test "${enable_more_asserts+set}" = set; then :
@@ -26877,35 +26882,35 @@ fi
 
 if (test "${enable_lto}" = "yes"); then
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports flag -flto in envvar CFLAGS" >&5
-$as_echo_n "checking if $CC supports flag -flto in envvar CFLAGS... " >&6; }
-if ${cc_cv_CFLAGS__flto+:} false; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports flag -flto -flto-partition=none in envvar CFLAGS" >&5
+$as_echo_n "checking if $CC supports flag -flto -flto-partition=none in envvar CFLAGS... " >&6; }
+if ${cc_cv_CFLAGS__flto__flto_partition_none+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   eval "cc_save_CFLAGS='${CFLAGS}'"
-           eval "CFLAGS='${cc_save_CFLAGS} -Werror `echo "-flto" | sed 's/^-Wno-/-W/'`'"
+           eval "CFLAGS='${cc_save_CFLAGS} -Werror `echo "-flto -flto-partition=none" | sed 's/^-Wno-/-W/'`'"
            cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 int main(void) { return 0; }
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
-  eval "cc_cv_CFLAGS__flto='yes'"
+  eval "cc_cv_CFLAGS__flto__flto_partition_none='yes'"
 else
-  eval "cc_cv_CFLAGS__flto='no'"
+  eval "cc_cv_CFLAGS__flto__flto_partition_none='no'"
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
            eval "CFLAGS='$cc_save_CFLAGS'"
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cc_cv_CFLAGS__flto" >&5
-$as_echo "$cc_cv_CFLAGS__flto" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cc_cv_CFLAGS__flto__flto_partition_none" >&5
+$as_echo "$cc_cv_CFLAGS__flto__flto_partition_none" >&6; }
 
-  if eval test x$cc_cv_CFLAGS__flto = xyes; then :
-  eval "lto_flags='${lto_flags} -flto'"
+  if eval test x$cc_cv_CFLAGS__flto__flto_partition_none = xyes; then :
+  eval "lto_flags='${lto_flags} -flto -flto-partition=none'"
 fi
 
 	if (test -n "${lto_flags}"); then
-		CFLAGS="-flto $CFLAGS"
+		CFLAGS="-flto -flto-partition=none $CFLAGS"
 	else
 		as_fn_error $? "Link Time Optimization -flto is not supported." "$LINENO" 5
 	fi
@@ -28217,6 +28222,7 @@ else
 fi
 
 
+
 ac_config_files="$ac_config_files Makefile shared/nm-version-macros.h libnm/libnm.pc libnm-util/libnm-util.pc libnm-glib/libnm-glib.pc libnm-glib/libnm-glib-vpn.pc po/Makefile.in data/org.freedesktop.NetworkManager.policy.in docs/api/Makefile docs/api/version.xml docs/libnm-glib/Makefile docs/libnm-glib/version.xml docs/libnm-util/Makefile docs/libnm-util/version.xml docs/libnm/Makefile docs/libnm/version.xml NetworkManager.pc"
 
 cat >confcache <<\_ACEOF
@@ -28424,6 +28430,10 @@ if test -z "${HAVE_SYSTEMD_200_TRUE}" && test -z "${HAVE_SYSTEMD_200_FALSE}"; th
   as_fn_error $? "conditional \"HAVE_SYSTEMD_200\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
+if test -z "${WITH_EBPF_TRUE}" && test -z "${WITH_EBPF_FALSE}"; then
+  as_fn_error $? "conditional \"WITH_EBPF\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
 if test -z "${WITH_JANSSON_TRUE}" && test -z "${WITH_JANSSON_FALSE}"; then
   as_fn_error $? "conditional \"WITH_JANSSON\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -28929,7 +28939,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by NetworkManager $as_me 1.14.6, which was
+This file was extended by NetworkManager $as_me 1.16.0, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -28995,7 +29005,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-NetworkManager config.status 1.14.6
+NetworkManager config.status 1.16.0
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
@@ -31189,4 +31199,5 @@ echo "  JSON validation for libnm: $enable_json_validation"
 echo "  crypto: $with_crypto (have-gnutls: $have_crypto_gnutls, have-nss: $have_crypto_nss)"
 echo "  sanitizers: $sanitizers"
 echo "  Mozilla Public Suffix List: $with_libpsl"
+echo "  eBPF: $have_ebpf"
 echo
diff --git a/configure.ac b/configure.ac
index 1f9dcb3c..967eac03 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7,8 +7,8 @@ dnl  - add corresponding NM_VERSION_x_y_z macros in
 dnl    "shared/nm-version-macros.h.in"
 dnl  - update number in meson.build
 m4_define([nm_major_version], [1])
-m4_define([nm_minor_version], [14])
-m4_define([nm_micro_version], [6])
+m4_define([nm_minor_version], [16])
+m4_define([nm_micro_version], [0])
 m4_define([nm_version],
           [nm_major_version.nm_minor_version.nm_micro_version])
 
@@ -81,6 +81,12 @@ AC_CHECK_DECLS([
 #include 
 ]])
 
+AC_CHECK_DECLS([
+	memfd_create],
+	[], [], [[
+#include 
+]])
+
 AC_CHECK_HEADERS(sys/auxv.h)
 
 AC_CHECK_DECLS([getrandom],
@@ -518,6 +524,20 @@ case $with_suspend_resume in
 		;;
 esac
 
+# eBPF support
+AC_ARG_WITH(ebpf,
+            AS_HELP_STRING([--with-ebpf=yes|no|auto], [Build with eBPF support (default: auto)]),
+            [], [with_ebpf=auto])
+if test "$with_ebpf" = "yes" -o "$with_ebpf" = "auto"; then
+	AC_CHECK_HEADER(linux/bpf.h, [have_ebpf=yes], [have_ebpf=no])
+else
+	have_ebpf=no
+fi
+if test "$with_ebpf" = "yes" -a "$have_ebpf" = "no"; then
+	AC_MSG_ERROR([--with-ebpf=yes requires eBPF kernel header])
+fi
+AM_CONDITIONAL(WITH_EBPF, test "${have_ebpf}" = "yes")
+
 # SELinux support
 AC_ARG_WITH(selinux,
             AS_HELP_STRING([--with-selinux=yes|no|auto], [Build with SELinux (default: auto)]),
@@ -623,7 +643,7 @@ AM_CONDITIONAL(WITH_JSON_VALIDATION, test "${enable_json_validation}" != "no")
 
 # we usually compile with polkit support. --enable-polkit=yes|no only sets the
 # default configuration for main.auth-polkit. User can always enable/disable polkit
-# autorization via config.
+# authorization via config.
 AC_ARG_ENABLE(polkit,
               AS_HELP_STRING([--enable-polkit=yes|no],
                              [set default value for auth-polkit configuration option. This value can be overwritten by NM configuration. 'disabled' is an alias for 'no']),
@@ -808,8 +828,8 @@ else
     AC_DEFINE(WITH_DHCPCANON, 0, [Define if you have dhcpcanon])
 fi
 
-# OpenVSwitch integration
-AC_ARG_ENABLE(ovs, AS_HELP_STRING([--enable-ovs], [enable OpenVSwitch support]))
+# Open vSwitch integration
+AC_ARG_ENABLE(ovs, AS_HELP_STRING([--enable-ovs], [enable Open vSwitch support]))
 if test "${enable_ovs}" != "no"; then
 	enable_ovs='yes'
 	if test "$have_jansson" = "no"; then
@@ -1043,7 +1063,7 @@ else
 	more_logging_default=no
 fi
 
-NM_COMPILER_WARNINGS(CFLAGS, ${more_warnings_default})
+NM_COMPILER_WARNINGS(AM_CFLAGS, ${more_warnings_default})
 
 NM_COMPILER_FLAG(LIBSYSTEMD_NM_CFLAGS, "-Wno-gnu-variable-sized-type-not-at-end")
 AC_SUBST(LIBSYSTEMD_NM_CFLAGS)
@@ -1051,7 +1071,7 @@ AC_SUBST(LIBSYSTEMD_NM_CFLAGS)
 CC_CHECK_FLAGS_APPEND([with_cflags], [CFLAGS], [\
 	-fno-strict-aliasing \
 ])
-CFLAGS="$CFLAGS $with_cflags"
+AM_CFLAGS="$AM_CFLAGS $with_cflags"
 
 AC_ARG_ENABLE(more-asserts,
               AS_HELP_STRING([--enable-more-asserts],
@@ -1248,6 +1268,7 @@ fi
 
 AM_CONDITIONAL(BUILD_DOCS, test "$build_docs" = "yes")
 AM_CONDITIONAL(HAVE_DOCS, test "$build_docs" = "yes" -o "$use_pregen_docs" = "yes")
+AC_SUBST(AM_CFLAGS)
 
 AC_CONFIG_FILES([
 Makefile
@@ -1352,4 +1373,5 @@ echo "  JSON validation for libnm: $enable_json_validation"
 echo "  crypto: $with_crypto (have-gnutls: $have_crypto_gnutls, have-nss: $have_crypto_nss)"
 echo "  sanitizers: $sanitizers"
 echo "  Mozilla Public Suffix List: $with_libpsl"
+echo "  eBPF: $have_ebpf"
 echo
diff --git a/data/85-nm-unmanaged.rules b/data/85-nm-unmanaged.rules
index edc4ddbe..20f4d29a 100644
--- a/data/85-nm-unmanaged.rules
+++ b/data/85-nm-unmanaged.rules
@@ -26,6 +26,9 @@ ATTR{address}=="00:1c:42:*", ENV{INTERFACE}=="vnic[0-9]*", ENV{NM_UNMANAGED}="1"
 # in another net namespace and managed by libvirt, Docker or the like.
 ENV{ID_NET_DRIVER}=="veth", ENV{NM_UNMANAGED}="1"
 
+# Docker bridge. Managed by docker daemon.
+ATTR{address}=="02:42:*", ENV{INTERFACE}=="docker[0-9]*", ENV{NM_UNMANAGED}="1"
+
 # USB gadget device. Unmanage by default, since whatever created it
 # might want to set it up itself (e.g. activate an ipv4.method=shared
 # connection).
diff --git a/data/NetworkManager.service.in b/data/NetworkManager.service.in
index 2692935e..ff90456f 100644
--- a/data/NetworkManager.service.in
+++ b/data/NetworkManager.service.in
@@ -24,7 +24,6 @@ ProtectHome=read-only
 
 [Install]
 WantedBy=multi-user.target
-Alias=dbus-org.freedesktop.NetworkManager.service
 Also=NetworkManager-dispatcher.service
 
 # We want to enable NetworkManager-wait-online.service whenever this service
diff --git a/data/meson.build b/data/meson.build
index 636db921..f496bf01 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -13,36 +13,35 @@ configure_file(
   output: server,
   install: true,
   install_dir: join_paths(nm_datadir, 'doc', nm_name, 'examples'),
-  configuration: data_conf
+  configuration: data_conf,
 )
 
 if install_systemd_unit_dir
   services = [
-    ['NetworkManager-dispatcher.service', systemd_system_unit_dir],
-    ['NetworkManager.service', systemd_system_unit_dir],
-    ['org.freedesktop.NetworkManager.service', dbus_sys_dir]
+    'NetworkManager-dispatcher.service',
+    'NetworkManager.service',
   ]
 
   if have_systemd_200
-    services += [['NetworkManager-wait-online.service', systemd_system_unit_dir]]
+    services += ['NetworkManager-wait-online.service']
   else
-    services += [['NetworkManager-wait-online-systemd-pre200.service', systemd_system_unit_dir]]
+    services += ['NetworkManager-wait-online-systemd-pre200.service']
   endif
 
   foreach service: services
     configure_file(
-      input: service[0] + '.in',
-      output: service[0],
+      input: service + '.in',
+      output: service,
       install: true,
-      install_dir: service[1],
-      configuration: data_conf
+      install_dir: systemd_system_unit_dir,
+      configuration: data_conf,
     )
   endforeach
 
   if enable_ovs
     install_data(
       'NetworkManager-ovs.conf',
-      install_dir: join_paths(systemd_system_unit_dir, 'NetworkManager.service.d')
+      install_dir: join_paths(systemd_system_unit_dir, 'NetworkManager.service.d'),
     )
   endif
 endif
@@ -51,12 +50,12 @@ if install_udev_dir
   data = files(
     '84-nm-drivers.rules',
     '85-nm-unmanaged.rules',
-    '90-nm-thunderbolt.rules'
+    '90-nm-thunderbolt.rules',
   )
 
   install_data(
     data,
-    install_dir: join_paths(udev_dir, 'rules.d')
+    install_dir: join_paths(udev_dir, 'rules.d'),
   )
 endif
 
@@ -66,7 +65,7 @@ if enable_polkit
   policy_in = configure_file(
     input: policy + '.in.in',
     output: policy + '.in',
-    configuration: data_conf
+    configuration: data_conf,
   )
 
   custom_target(
@@ -75,6 +74,6 @@ if enable_polkit
     output: policy,
     command: intltool_xml_cmd,
     install: true,
-    install_dir: polkit_dir
+    install_dir: polkit_dir,
   )
 endif
diff --git a/data/org.freedesktop.NetworkManager.policy.in.in b/data/org.freedesktop.NetworkManager.policy.in.in
index 880bbd57..8b6ea515 100644
--- a/data/org.freedesktop.NetworkManager.policy.in.in
+++ b/data/org.freedesktop.NetworkManager.policy.in.in
@@ -38,8 +38,8 @@
   
 
   
-    <_description>Enable or disable WiFi devices
-    <_message>System policy prevents enabling or disabling WiFi devices
+    <_description>Enable or disable Wi-Fi devices
+    <_message>System policy prevents enabling or disabling Wi-Fi devices
     
       no
       yes
@@ -74,9 +74,19 @@
     
   
 
+  
+    <_description>Allow control of Wi-Fi scans
+    <_message>System policy prevents Wi-Fi scans
+    
+      auth_admin
+      yes
+      yes
+    
+  
+
   
-    <_description>Connection sharing via a protected WiFi network
-    <_message>System policy prevents sharing connections via a protected WiFi network
+    <_description>Connection sharing via a protected Wi-Fi network
+    <_message>System policy prevents sharing connections via a protected Wi-Fi network
     
       no
       yes
@@ -84,8 +94,8 @@
   
 
   
-    <_description>Connection sharing via an open WiFi network
-    <_message>System policy prevents sharing connections via an open WiFi network
+    <_description>Connection sharing via an open Wi-Fi network
+    <_message>System policy prevents sharing connections via an open Wi-Fi network
     
       no
       yes
diff --git a/data/org.freedesktop.NetworkManager.service.in b/data/org.freedesktop.NetworkManager.service.in
deleted file mode 100644
index 5bd091b4..00000000
--- a/data/org.freedesktop.NetworkManager.service.in
+++ /dev/null
@@ -1,11 +0,0 @@
-# This D-Bus service activation file is only for systemd support since
-# an auto-activated NetworkManager would be quite surprising for those people
-# who have NM installed but turned off.  Thus the Exec path available to
-# D-Bus is /bin/false, but systemd knows the real Exec path due to the NM
-# systemd .service file.
-
-[D-BUS Service]
-Name=org.freedesktop.NetworkManager
-Exec=/bin/false
-User=root
-SystemdService=dbus-org.freedesktop.NetworkManager.service
diff --git a/dispatcher/meson.build b/dispatcher/meson.build
index 7c92fc55..05e570d8 100644
--- a/dispatcher/meson.build
+++ b/dispatcher/meson.build
@@ -15,19 +15,19 @@ configure_file(
   output: service,
   install: true,
   install_dir: dbus_sys_dir,
-  configuration: service_conf
+  configuration: service_conf,
 )
 
 install_data(
   'nm-dispatcher.conf',
-  install_dir: dbus_conf_dir
+  install_dir: dbus_conf_dir,
 )
 
 sources = files('nm-dispatcher-utils.c')
 
 deps = [
   libnm_dep,
-  nm_core_dep
+  nm_core_dep,
 ]
 
 cflags = [
@@ -39,7 +39,7 @@ libnm_dispatcher_core = static_library(
   name + '-core',
   sources: sources,
   dependencies: deps,
-  c_args: cflags
+  c_args: cflags,
 )
 
 sources = files('nm-dispatcher.c')
@@ -48,7 +48,7 @@ sources += gnome.gdbus_codegen(
   'nmdbus-dispatcher',
   name + '.xml',
   interface_prefix: 'org.freedesktop',
-  namespace: 'NMDBus'
+  namespace: 'NMDBus',
 )
 
 executable(
@@ -60,7 +60,7 @@ executable(
   link_args: ldflags_linker_script_binary,
   link_depends: linker_script_binary,
   install: true,
-  install_dir: nm_libexecdir
+  install_dir: nm_libexecdir,
 )
 
 if enable_tests
diff --git a/dispatcher/nm-dispatcher-utils.c b/dispatcher/nm-dispatcher-utils.c
index 4d04eeca..dee00612 100644
--- a/dispatcher/nm-dispatcher-utils.c
+++ b/dispatcher/nm-dispatcher-utils.c
@@ -20,7 +20,7 @@
 
 #include "nm-default.h"
 
-#include 
+#include "nm-dispatcher-utils.h"
 
 #include "nm-dbus-interface.h"
 #include "nm-connection.h"
@@ -31,8 +31,6 @@
 #include "nm-dispatcher-api.h"
 #include "nm-utils.h"
 
-#include "nm-dispatcher-utils.h"
-
 /*****************************************************************************/
 
 static gboolean
diff --git a/dispatcher/nm-dispatcher.c b/dispatcher/nm-dispatcher.c
index 946763f8..d395942a 100644
--- a/dispatcher/nm-dispatcher.c
+++ b/dispatcher/nm-dispatcher.c
@@ -24,12 +24,10 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 
@@ -461,7 +459,7 @@ again:
 	return FALSE;
 }
 
-static inline gboolean
+static gboolean
 check_permissions (struct stat *s, const char **out_error_msg)
 {
 	g_return_val_if_fail (s != NULL, FALSE);
diff --git a/dispatcher/tests/meson.build b/dispatcher/tests/meson.build
index b18c66e5..bf54fdff 100644
--- a/dispatcher/tests/meson.build
+++ b/dispatcher/tests/meson.build
@@ -2,7 +2,7 @@ test_unit = 'test-dispatcher-envp'
 
 incs = [
   dispatcher_inc,
-  libnm_inc
+  libnm_inc,
 ]
 
 exe = executable(
@@ -14,11 +14,11 @@ exe = executable(
       '-DNETWORKMANAGER_COMPILATION_TEST',
       '-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_CLIENT',
     ],
-  link_with: libnm_dispatcher_core
+  link_with: libnm_dispatcher_core,
 )
 
 test(
   'dispatcher/' + test_unit,
   test_script,
-  args: test_args + [exe.full_path()]
+  args: test_args + [exe.full_path()],
 )
diff --git a/dispatcher/tests/test-dispatcher-envp.c b/dispatcher/tests/test-dispatcher-envp.c
index 78bcd233..89ddadbb 100644
--- a/dispatcher/tests/test-dispatcher-envp.c
+++ b/dispatcher/tests/test-dispatcher-envp.c
@@ -22,7 +22,6 @@
 
 #include 
 #include 
-#include 
 
 #include "nm-dispatcher-utils.h"
 #include "nm-dispatcher-api.h"
diff --git a/docs/api/Makefile.am b/docs/api/Makefile.am
index 2baf4056..33ca2e35 100644
--- a/docs/api/Makefile.am
+++ b/docs/api/Makefile.am
@@ -42,42 +42,43 @@ MKHTML_OPTIONS=--path="$(abs_srcdir)"
 content_files = \
 	$(GENERATED_FILES) \
 	dbus-org.freedesktop.NetworkManager.AccessPoint.xml \
+	dbus-org.freedesktop.NetworkManager.AgentManager.xml \
 	dbus-org.freedesktop.NetworkManager.Connection.Active.xml \
-	dbus-org.freedesktop.NetworkManager.Device.Team.xml \
+	dbus-org.freedesktop.NetworkManager.DHCP4Config.xml \
 	dbus-org.freedesktop.NetworkManager.DHCP6Config.xml \
-	dbus-org.freedesktop.NetworkManager.Device.Wireless.xml \
-	dbus-org.freedesktop.NetworkManager.xml \
-	dbus-org.freedesktop.NetworkManager.VPN.Connection.xml \
-	dbus-org.freedesktop.NetworkManager.SecretAgent.xml \
-	dbus-org.freedesktop.NetworkManager.Device.xml \
-	dbus-org.freedesktop.NetworkManager.VPN.Plugin.xml \
+	dbus-org.freedesktop.NetworkManager.Device.Adsl.xml \
 	dbus-org.freedesktop.NetworkManager.Device.Bluetooth.xml \
-	dbus-org.freedesktop.NetworkManager.Device.Dummy.xml \
-	dbus-org.freedesktop.NetworkManager.Device.Vxlan.xml \
-	dbus-org.freedesktop.NetworkManager.Settings.Connection.xml \
 	dbus-org.freedesktop.NetworkManager.Device.Bond.xml \
-	dbus-org.freedesktop.NetworkManager.Device.Macvlan.xml \
-	dbus-org.freedesktop.NetworkManager.Device.Macsec.xml \
-	dbus-org.freedesktop.NetworkManager.PPP.xml \
-	dbus-org.freedesktop.NetworkManager.Device.Vlan.xml \
-	dbus-org.freedesktop.NetworkManager.Device.Adsl.xml \
-	dbus-org.freedesktop.NetworkManager.AgentManager.xml \
-	dbus-org.freedesktop.NetworkManager.Device.IPTunnel.xml \
-	dbus-org.freedesktop.NetworkManager.Device.Tun.xml \
 	dbus-org.freedesktop.NetworkManager.Device.Bridge.xml \
-	dbus-org.freedesktop.NetworkManager.Device.OlpcMesh.xml \
-	dbus-org.freedesktop.NetworkManager.DHCP4Config.xml \
+	dbus-org.freedesktop.NetworkManager.Device.Dummy.xml \
 	dbus-org.freedesktop.NetworkManager.Device.Generic.xml \
+	dbus-org.freedesktop.NetworkManager.Device.IPTunnel.xml \
 	dbus-org.freedesktop.NetworkManager.Device.Infiniband.xml \
+	dbus-org.freedesktop.NetworkManager.Device.Macsec.xml \
+	dbus-org.freedesktop.NetworkManager.Device.Macvlan.xml \
 	dbus-org.freedesktop.NetworkManager.Device.Modem.xml \
-	dbus-org.freedesktop.NetworkManager.IP6Config.xml \
+	dbus-org.freedesktop.NetworkManager.Device.OlpcMesh.xml \
+	dbus-org.freedesktop.NetworkManager.Device.Statistics.xml \
+	dbus-org.freedesktop.NetworkManager.Device.Team.xml \
+	dbus-org.freedesktop.NetworkManager.Device.Tun.xml \
 	dbus-org.freedesktop.NetworkManager.Device.Veth.xml \
-	dbus-org.freedesktop.NetworkManager.Settings.xml \
-	dbus-org.freedesktop.NetworkManager.Device.Wired.xml \
+	dbus-org.freedesktop.NetworkManager.Device.Vlan.xml \
+	dbus-org.freedesktop.NetworkManager.Device.Vxlan.xml \
+	dbus-org.freedesktop.NetworkManager.Device.WifiP2P.xml \
 	dbus-org.freedesktop.NetworkManager.Device.WireGuard.xml \
-	dbus-org.freedesktop.NetworkManager.IP4Config.xml \
-	dbus-org.freedesktop.NetworkManager.Device.Statistics.xml \
+	dbus-org.freedesktop.NetworkManager.Device.Wired.xml \
+	dbus-org.freedesktop.NetworkManager.Device.Wireless.xml \
+	dbus-org.freedesktop.NetworkManager.Device.xml \
 	dbus-org.freedesktop.NetworkManager.DnsManager.xml \
+	dbus-org.freedesktop.NetworkManager.IP4Config.xml \
+	dbus-org.freedesktop.NetworkManager.IP6Config.xml \
+	dbus-org.freedesktop.NetworkManager.PPP.xml \
+	dbus-org.freedesktop.NetworkManager.SecretAgent.xml \
+	dbus-org.freedesktop.NetworkManager.Settings.Connection.xml \
+	dbus-org.freedesktop.NetworkManager.Settings.xml \
+	dbus-org.freedesktop.NetworkManager.VPN.Connection.xml \
+	dbus-org.freedesktop.NetworkManager.VPN.Plugin.xml \
+	dbus-org.freedesktop.NetworkManager.xml \
 	$(top_builddir)/libnm-core/nm-dbus-types.xml \
 	$(top_builddir)/libnm-core/nm-vpn-dbus-types.xml \
 	$(top_builddir)/man/nmcli.xml \
diff --git a/docs/api/Makefile.in b/docs/api/Makefile.in
index b6a1e260..f545b7bc 100644
--- a/docs/api/Makefile.in
+++ b/docs/api/Makefile.in
@@ -163,6 +163,7 @@ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALL_LINGUAS = @ALL_LINGUAS@
 AMTAR = @AMTAR@
+AM_CFLAGS = @AM_CFLAGS@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AM_TESTS_FD_REDIRECT = @AM_TESTS_FD_REDIRECT@
 AR = @AR@
@@ -474,42 +475,43 @@ MKHTML_OPTIONS = --path="$(abs_srcdir)"
 # Files to be included in $(DOC_MAIN_SGML_FILE)
 content_files = $(GENERATED_FILES) \
 	dbus-org.freedesktop.NetworkManager.AccessPoint.xml \
+	dbus-org.freedesktop.NetworkManager.AgentManager.xml \
 	dbus-org.freedesktop.NetworkManager.Connection.Active.xml \
-	dbus-org.freedesktop.NetworkManager.Device.Team.xml \
+	dbus-org.freedesktop.NetworkManager.DHCP4Config.xml \
 	dbus-org.freedesktop.NetworkManager.DHCP6Config.xml \
-	dbus-org.freedesktop.NetworkManager.Device.Wireless.xml \
-	dbus-org.freedesktop.NetworkManager.xml \
-	dbus-org.freedesktop.NetworkManager.VPN.Connection.xml \
-	dbus-org.freedesktop.NetworkManager.SecretAgent.xml \
-	dbus-org.freedesktop.NetworkManager.Device.xml \
-	dbus-org.freedesktop.NetworkManager.VPN.Plugin.xml \
+	dbus-org.freedesktop.NetworkManager.Device.Adsl.xml \
 	dbus-org.freedesktop.NetworkManager.Device.Bluetooth.xml \
-	dbus-org.freedesktop.NetworkManager.Device.Dummy.xml \
-	dbus-org.freedesktop.NetworkManager.Device.Vxlan.xml \
-	dbus-org.freedesktop.NetworkManager.Settings.Connection.xml \
 	dbus-org.freedesktop.NetworkManager.Device.Bond.xml \
-	dbus-org.freedesktop.NetworkManager.Device.Macvlan.xml \
-	dbus-org.freedesktop.NetworkManager.Device.Macsec.xml \
-	dbus-org.freedesktop.NetworkManager.PPP.xml \
-	dbus-org.freedesktop.NetworkManager.Device.Vlan.xml \
-	dbus-org.freedesktop.NetworkManager.Device.Adsl.xml \
-	dbus-org.freedesktop.NetworkManager.AgentManager.xml \
-	dbus-org.freedesktop.NetworkManager.Device.IPTunnel.xml \
-	dbus-org.freedesktop.NetworkManager.Device.Tun.xml \
 	dbus-org.freedesktop.NetworkManager.Device.Bridge.xml \
-	dbus-org.freedesktop.NetworkManager.Device.OlpcMesh.xml \
-	dbus-org.freedesktop.NetworkManager.DHCP4Config.xml \
+	dbus-org.freedesktop.NetworkManager.Device.Dummy.xml \
 	dbus-org.freedesktop.NetworkManager.Device.Generic.xml \
+	dbus-org.freedesktop.NetworkManager.Device.IPTunnel.xml \
 	dbus-org.freedesktop.NetworkManager.Device.Infiniband.xml \
+	dbus-org.freedesktop.NetworkManager.Device.Macsec.xml \
+	dbus-org.freedesktop.NetworkManager.Device.Macvlan.xml \
 	dbus-org.freedesktop.NetworkManager.Device.Modem.xml \
-	dbus-org.freedesktop.NetworkManager.IP6Config.xml \
+	dbus-org.freedesktop.NetworkManager.Device.OlpcMesh.xml \
+	dbus-org.freedesktop.NetworkManager.Device.Statistics.xml \
+	dbus-org.freedesktop.NetworkManager.Device.Team.xml \
+	dbus-org.freedesktop.NetworkManager.Device.Tun.xml \
 	dbus-org.freedesktop.NetworkManager.Device.Veth.xml \
-	dbus-org.freedesktop.NetworkManager.Settings.xml \
-	dbus-org.freedesktop.NetworkManager.Device.Wired.xml \
+	dbus-org.freedesktop.NetworkManager.Device.Vlan.xml \
+	dbus-org.freedesktop.NetworkManager.Device.Vxlan.xml \
+	dbus-org.freedesktop.NetworkManager.Device.WifiP2P.xml \
 	dbus-org.freedesktop.NetworkManager.Device.WireGuard.xml \
-	dbus-org.freedesktop.NetworkManager.IP4Config.xml \
-	dbus-org.freedesktop.NetworkManager.Device.Statistics.xml \
+	dbus-org.freedesktop.NetworkManager.Device.Wired.xml \
+	dbus-org.freedesktop.NetworkManager.Device.Wireless.xml \
+	dbus-org.freedesktop.NetworkManager.Device.xml \
 	dbus-org.freedesktop.NetworkManager.DnsManager.xml \
+	dbus-org.freedesktop.NetworkManager.IP4Config.xml \
+	dbus-org.freedesktop.NetworkManager.IP6Config.xml \
+	dbus-org.freedesktop.NetworkManager.PPP.xml \
+	dbus-org.freedesktop.NetworkManager.SecretAgent.xml \
+	dbus-org.freedesktop.NetworkManager.Settings.Connection.xml \
+	dbus-org.freedesktop.NetworkManager.Settings.xml \
+	dbus-org.freedesktop.NetworkManager.VPN.Connection.xml \
+	dbus-org.freedesktop.NetworkManager.VPN.Plugin.xml \
+	dbus-org.freedesktop.NetworkManager.xml \
 	$(top_builddir)/libnm-core/nm-dbus-types.xml \
 	$(top_builddir)/libnm-core/nm-vpn-dbus-types.xml \
 	$(top_builddir)/man/nmcli.xml $(top_builddir)/man/nmtui.xml \
diff --git a/docs/api/dbus-org.freedesktop.NetworkManager.Device.WifiP2P.xml b/docs/api/dbus-org.freedesktop.NetworkManager.Device.WifiP2P.xml
new file mode 100644
index 00000000..d89bbe7b
--- /dev/null
+++ b/docs/api/dbus-org.freedesktop.NetworkManager.Device.WifiP2P.xml
@@ -0,0 +1,124 @@
+
+
+
+      org.freedesktop.NetworkManager.Device.WifiP2P
+  org.freedesktop.NetworkManager.Device.WifiP2P
+        org.freedesktop.NetworkManager.Device.WifiP2P    Wi-Fi P2P Device    
+    Methods
+    
+StartFind (IN  a{sv} options);
+StopFind  ();
+
+  
+  
+    Signals
+    
+PeerAdded   (o peer);
+PeerRemoved (o peer);
+
+  
+  
+    Properties
+    
+HwAddress  readable   s
+Peers      readable   ao
+
+  
+
+  Description
+        Since: 1.16
+
+
+
+  Method Details
+
+  The StartFind() method
+  org.freedesktop.NetworkManager.Device.WifiP2P.StartFind()
+
+StartFind (IN  a{sv} options);
+
+                  in the range of 1-600 seconds is supported. The default is
+                  30 seconds.
+        Start a find operation for Wi-Fi P2P peers.
+        Since: 1.16
+
+
+
+  IN a{sv} options:
+  Options of find. Currently 'timeout' option with value of "i"
+
+
+
+
+  The StopFind() method
+  org.freedesktop.NetworkManager.Device.WifiP2P.StopFind()
+
+StopFind ();
+
+        Stop an ongoing find operation again.
+        Since: 1.16
+
+
+
+
+  Signal Details
+
+  The "PeerAdded" signal
+  org.freedesktop.NetworkManager.Device.WifiP2P::PeerAdded
+
+PeerAdded (o peer);
+
+        Emitted when a new Wi-Fi P2P peer is found by the device.
+        Since: 1.16
+
+
+
+  o peer:
+  The object path of the newly found access point.
+
+
+
+
+  The "PeerRemoved" signal
+  org.freedesktop.NetworkManager.Device.WifiP2P::PeerRemoved
+
+PeerRemoved (o peer);
+
+        Emitted when a Wi-Fi P2P peer disappears from view of the device.
+        Since: 1.16
+
+
+
+  o peer:
+  The object path of the Wi-Fi P2P peer that has disappeared.
+
+
+
+
+
+  Property Details
+
+  The "HwAddress" property
+  org.freedesktop.NetworkManager.Device.WifiP2P:HwAddress
+
+HwAddress  readable   s
+
+        The active hardware address of the device.
+        Since: 1.16
+
+
+
+  The "Peers" property
+  org.freedesktop.NetworkManager.Device.WifiP2P:Peers
+
+Peers  readable   ao
+
+        List of object paths of peers visible to this Wi-Fi P2P device.
+        Since: 1.16
+
+
+
+
+
diff --git a/docs/api/dbus-org.freedesktop.NetworkManager.Device.Wireless.xml b/docs/api/dbus-org.freedesktop.NetworkManager.Device.Wireless.xml
index d478c7db..f6c363fd 100644
--- a/docs/api/dbus-org.freedesktop.NetworkManager.Device.Wireless.xml
+++ b/docs/api/dbus-org.freedesktop.NetworkManager.Device.Wireless.xml
@@ -80,7 +80,7 @@ GetAllAccessPoints (OUT ao access_points);
 
 RequestScan (IN  a{sv} options);
 
-        Request the device to scan
+        Request the device to scan. To know when the scan is finished, use the "PropertiesChanged" signal from "org.freedesktop.DBus.Properties" to listen to changes to the "LastScan" property.
 
 
 
diff --git a/docs/api/dbus-org.freedesktop.NetworkManager.Device.xml b/docs/api/dbus-org.freedesktop.NetworkManager.Device.xml
index fdd95b5a..3aa0c7d6 100644
--- a/docs/api/dbus-org.freedesktop.NetworkManager.Device.xml
+++ b/docs/api/dbus-org.freedesktop.NetworkManager.Device.xml
@@ -55,6 +55,8 @@
 Metered               readable   u
 LldpNeighbors         readable   aa{sv}
 Real                  readable   b
+Ip4Connectivity       readable   u
+Ip6Connectivity       readable   u
 
   
 
@@ -417,7 +419,7 @@ NmPluginMissing  readable   b
 
 DeviceType  readable   u
 
-        The general type of the network device; ie Ethernet, WiFi, etc.
+        The general type of the network device; ie Ethernet, Wi-Fi, etc.
         Returns: NMDeviceType
 
 
@@ -484,6 +486,28 @@ Real  readable   b
         their AvailableConnections was activated.
 
 
+
+  The "Ip4Connectivity" property
+  org.freedesktop.NetworkManager.Device:Ip4Connectivity
+
+Ip4Connectivity  readable   u
+
+        The result of the last IPv4 connectivity check.
+        Since: 1.16
+        Returns: NMConnectivityState
+
+
+
+  The "Ip6Connectivity" property
+  org.freedesktop.NetworkManager.Device:Ip6Connectivity
+
+Ip6Connectivity  readable   u
+
+        The result of the last IPv6 connectivity check.
+        Since: 1.16
+        Returns: NMConnectivityState
+
+
 
 
 
diff --git a/docs/api/dbus-org.freedesktop.NetworkManager.xml b/docs/api/dbus-org.freedesktop.NetworkManager.xml
index 4928f8fd..9c4f23b9 100644
--- a/docs/api/dbus-org.freedesktop.NetworkManager.xml
+++ b/docs/api/dbus-org.freedesktop.NetworkManager.xml
@@ -22,6 +22,13 @@
                                  IN  o         specific_object,
                                  OUT o         path,
                                  OUT o         active_connection);
+AddAndActivateConnection2       (IN  a{sa{sv}} connection,
+                                 IN  o         device,
+                                 IN  o         specific_object,
+                                 IN  a{sv}     options,
+                                 OUT o         path,
+                                 OUT o         active_connection,
+                                 OUT a{sv}     result);
 DeactivateConnection            (IN  o         active_connection);
 Sleep                           (IN  b         sleep);
 Enable                          (IN  b         enable);
@@ -194,7 +201,7 @@ ActivateConnection (IN  o connection,
 
 
   IN o specific_object:
-  The path of a connection-type-specific object this activation should use. This parameter is currently ignored for wired and mobile broadband connections, and the value of "/" should be used (ie, no specific object). For WiFi connections, pass the object path of a specific AP from the card's scan list, or "/" to pick an AP automatically. For VPN connections, pass the object path of an ActiveConnection object that should serve as the "base" connection (to which the VPN connections lifetime will be tied), or pass "/" and NM will automatically use the current default device.
+  The path of a connection-type-specific object this activation should use. This parameter is currently ignored for wired and mobile broadband connections, and the value of "/" should be used (ie, no specific object). For Wi-Fi connections, pass the object path of a specific AP from the card's scan list, or "/" to pick an AP automatically. For VPN connections, pass the object path of an ActiveConnection object that should serve as the "base" connection (to which the VPN connections lifetime will be tied), or pass "/" and NM will automatically use the current default device.
 
 
   OUT o active_connection:
@@ -216,6 +223,7 @@ AddAndActivateConnection (IN  a{sa{sv}} connection,
         (automatically filling in missing settings with the capabilities of the
         given device and specific object), then activate the new connection.
         Cannot be used for VPN connections at this time.
+        See also AddAndActivateConnection2.
 
 
 
@@ -228,7 +236,7 @@ AddAndActivateConnection (IN  a{sa{sv}} connection,
 
 
   IN o specific_object:
-  The path of a connection-type-specific object this activation should use. This parameter is currently ignored for wired and mobile broadband connections, and the value of "/" should be used (ie, no specific object). For WiFi connections, pass the object path of a specific AP from the card's scan list, which will be used to complete the details of the newly added connection.
+  The path of a connection-type-specific object this activation should use. This parameter is currently ignored for wired and mobile broadband connections, and the value of "/" should be used (ie, no specific object). For Wi-Fi connections, pass the object path of a specific AP from the card's scan list, which will be used to complete the details of the newly added connection.
 
 
   OUT o path:
@@ -240,6 +248,59 @@ AddAndActivateConnection (IN  a{sa{sv}} connection,
 
 
 
+
+  The AddAndActivateConnection2() method
+  org.freedesktop.NetworkManager.AddAndActivateConnection2()
+
+AddAndActivateConnection2 (IN  a{sa{sv}} connection,
+                           IN  o         device,
+                           IN  o         specific_object,
+                           IN  a{sv}     options,
+                           OUT o         path,
+                           OUT o         active_connection,
+                           OUT a{sv}     result);
+
+          output arguments are supported.
+        Adds a new connection using the given details (if any) as a template
+        (automatically filling in missing settings with the capabilities of the
+        given device and specific object), then activate the new connection.
+        Cannot be used for VPN connections at this time.
+        This method extends AddAndActivateConnection to allow passing further
+        parameters. At this time the following options are supported:
+         * persist: A string value of either "disk" (default), "memory" or "volatile". If "memory" is passed, the connection will not be saved to disk. If "volatile" is passed, the connection will not be saved to disk and will be destroyed when disconnected.
+         * bind-activation: Bind the activation lifetime. Set to "dbus-name" to automatically disconnect when the requesting process disappears from the bus. The default of "none" means the connection is kept activated normally.
+
+
+
+  IN a{sa{sv}} connection:
+  Connection settings and properties; if incomplete missing settings will be automatically completed using the given device and specific object.
+
+
+  IN o device:
+  The object path of device to be activated using the given connection.
+
+
+  IN o specific_object:
+  The path of a connection-type-specific object this activation should use. This parameter is currently ignored for wired and mobile broadband connections, and the value of "/" should be used (ie, no specific object). For Wi-Fi connections, pass the object path of a specific AP from the card's scan list, which will be used to complete the details of the newly added connection.
+
+
+  IN a{sv} options:
+  Further options for the method call.
+
+
+  OUT o path:
+  Object path of the new connection that was just added.
+
+
+  OUT o active_connection:
+  The path of the active connection object representing this active connection.
+
+
+  OUT a{sv} result:
+  a dictionary of additional output arguments for future extension. Currently not additional
+
+
+
 
   The DeactivateConnection() method
   org.freedesktop.NetworkManager.DeactivateConnection()
@@ -300,7 +361,7 @@ GetPermissions (OUT a{ss} permissions);
 
         Returns the permissions a caller has for various authenticated operations
         that NetworkManager provides, like Enable/Disable networking, changing
-        WiFi, WWAN, and WiMAX state, etc.
+        Wi-Fi, WWAN, and WiMAX state, etc.
 
 
 
diff --git a/docs/api/html/NetworkManager.conf.html b/docs/api/html/NetworkManager.conf.html
index 4fbf45e6..0069f1e4 100644
--- a/docs/api/html/NetworkManager.conf.html
+++ b/docs/api/html/NetworkManager.conf.html
@@ -146,7 +146,8 @@ plugins-=remove-me
 
 
 
monitor-connection-files

-
Whether the configured settings plugin(s)
+
+
Whether the configured settings plugin(s)
         should set up file monitors and immediately pick up changes
         made to connection files while NetworkManager is running. This
         is disabled by default; NetworkManager will only read
@@ -159,7 +160,19 @@ plugins-=remove-me
         In some situations, NetworkManager might first delete and add the
         connection anew, instead of updating the existing one. Also, NetworkManager
         might pick up incomplete settings while the user is still editing the files.
-        

+        

+

+        Note that neither this setting nor restarting the NetworkManager daemon
+        is the advised way to reload connection profiles from disk. Instead, after
+        modifying the files reload them with nmcli connection reload
+        or nmcli connection load "$FILENAME". Even better,
+        instead of modifying files directly, use NetworkManager tools like
+        nmcli, nmtui or the GUI.
+        

+

+        This setting is deprecated and will have no effect in the future.
+        

+
 
 
 
auth-polkit

@@ -200,7 +213,7 @@ plugins-=remove-me
 
When the default wired connection is deleted or saved
         to a new persistent connection by a plugin, the device is
         added to a list in the file
-        /run/NetworkManager/no-auto-default.state
+        /var/lib/NetworkManager/no-auto-default.state
         to prevent creating the default connection for that device
         again.

 
See the section called “Device List Format” for the syntax how to
@@ -254,7 +267,7 @@ no-auto-default=*
             environments where network setup is more or less static or it is
             desirable to save process time but still handle some dynamic
             configurations.  When this option is true,
-            network configuration for WiFi, WWAN, Bluetooth, ADSL, and PPPoE
+            network configuration for Wi-Fi, WWAN, Bluetooth, ADSL, and PPPoE
             interfaces cannot be preserved due to their use of external
             services, and these devices will be deconfigured when NetworkManager
             quits even though other interface's configuration may be preserved.
@@ -297,8 +310,8 @@ no-auto-default=*
 
 
dns

 
-
Set the DNS (resolv.conf) processing mode.
-        If the key is unspecified, default is used,
+
Set the DNS processing mode.

+
If the key is unspecified, default is used,
         unless /etc/resolv.conf is a symlink to
         /run/systemd/resolve/stub-resolv.conf,
         /run/systemd/resolve/resolv.conf,
@@ -322,15 +335,22 @@ no-auto-default=*
         after some time. This behavior can be modified passing the
         'all-servers' or 'strict-order' options to dnsmasq (see the
         manual page for more details).

+
systemd-resolved: NetworkManager will
+        push the DNS configuration to systemd-resolved

 
unbound: NetworkManager will talk
         to unbound and dnssec-triggerd, providing a "split DNS"
         configuration with DNSSEC support. /etc/resolv.conf
         will be managed by dnssec-trigger daemon.

-
systemd-resolved: NetworkManager will
-        push the DNS configuration to systemd-resolved

 
none: NetworkManager will not
         modify resolv.conf. This implies
         rc-manager unmanaged

+
Note that the plugins dnsmasq, systemd-resolved
+        and unbound are caching local nameservers.
+        Hence, when NetworkManager writes /var/run/NetworkManager/resolv.conf
+        and /etc/resolv.conf (according to rc-manager
+        setting below), the name server there will be localhost only.
+        NetworkManager also writes a file /var/run/NetworkManager/no-stub-resolv.conf
+        that contains the original name servers pushed to the DNS plugin.

 
 
 
@@ -370,6 +390,22 @@ no-auto-default=*
 
 
 
+
systemd-resolved

+
+
Send the connection DNS configuration to
+        systemd-resolved. Defaults to "true".
+        

+
Note that this setting is complementary to the
+        dns setting. You can keep this enabled while using
+        dns set to another DNS plugin alongside
+        systemd-resolved, or dns set to
+        systemd-resolved to configure the system resolver to use
+        systemd-resolved.

+
If systemd-resolved is enabled, the connectivity check resolves the
+        hostname per-device.

+
+
+
 
debug

 
 
Comma separated list of options to aid
@@ -595,6 +631,8 @@ ipv6.ip6-privacy=0
       (see nm-settings(5) for details).
       A default value is only consulted if the corresponding per-connection value
       explicitly allows for that.
+      
+      
       

 
@@ -677,6 +715,11 @@ ipv6.ip6-privacy=0
            the interface type is used.

+
+
+
+
@@ -697,6 +740,11 @@ ipv6.ip6-privacy=0
            the interface type is used.

+
+
+
+
+
+
+
+

 

 
 
ipv4.dns-priority
If unspecified or zero, use 50 for VPN profiles
+           and 100 for other profiles.

 
ipv4.route-metric

 
 

 
 
ipv6.dns-priority
If unspecified or zero, use 50 for VPN profiles
+           and 100 for other profiles.

 
ipv6.ip6-privacy

 
If ipv6.ip6-privacy is unset, use the content of
             "/proc/sys/net/ipv6/conf/default/use_tempaddr" as last fallback.
@@ -758,9 +806,15 @@ ipv6.ip6-privacy=0
 
wifi.wake-on-wlan

 
 
wireguard.mtu

 
 

 

+      
+      
     

 
 

@@ -997,6 +1051,20 @@ managed=1
     checking functionality.  This allows NetworkManager to detect
     whether or not the system can actually access the internet or
     whether it is behind a captive portal.

+
Connectivity checking serves two purposes. For one, it exposes
+    a connectivity state on D-Bus, which other applications may use. For example,
+    Gnome's portal helper uses this as signal to show a captive portal login
+    page.
+    The other use is that default-route of devices without global connectivity
+    get a penalty of +20000 to the route-metric. This has the purpose to give a
+    better default-route to devices that have global connectivity. For example,
+    when being connected to WWAN and to a Wi-Fi network which is behind a captive
+    portal, WWAN still gets preferred until login.

+
Note that your distribution might set /proc/sys/net/ipv4/conf/*/rp_filter to
+    strict filtering. That works badly with per-device connectivity checking,
+    which uses SO_BINDDEVICE to send requests on all devices. A strict rp_filter
+    setting will reject any response and the connectivity check on all but the
+    best route will fail.

 

       

 

@@ -1026,10 +1094,15 @@ managed=1
 
-
+          connectivity checking.  Note that this only compares
+          that the HTTP response starts with the specifid text,
+          it does not compare the exact string. This behavior
+          might change in the future, so avoid relying on it.
+          If missing, the response defaults to "NetworkManager is online".
+          If set to empty, the HTTP server is expected to answer with
+          status code 204 or send no data.

 

 
response
If set controls what body content
+
If set, controls what body content
           NetworkManager checks for when requesting the URI for
-          connectivity checking.  If missing, defaults to
-          "NetworkManager is online" 

 

 
 

@@ -1058,7 +1131,7 @@ managed=1
 
 
options

 

-             A list of of options to be passed to the hostname resolver.
+             A list of options to be passed to the hostname resolver.
            

 
 
diff --git a/docs/api/html/NetworkManager.devhelp2 b/docs/api/html/NetworkManager.devhelp2
index d4450730..840a72f4 100644
--- a/docs/api/html/NetworkManager.devhelp2
+++ b/docs/api/html/NetworkManager.devhelp2
@@ -55,8 +55,10 @@
         
         
         
+        
         
         
+        
         
         
         
@@ -83,14 +85,13 @@
         
         
         
+        
         
         
-        
         
-        
         
-        
         
+        
         
         
         
@@ -105,7 +106,9 @@
         
         
         
+        
         
+        
         
         
         
@@ -129,6 +132,9 @@
       
         
       
+      
+        
+      
       
         
       
@@ -159,6 +165,7 @@
     
     
     
+    
     
     
     
@@ -263,12 +270,18 @@
     
     
     
+    
+    
     
     
     
     
     
     
+    
+    
+    
+    
     
     
     
@@ -277,24 +290,11 @@
     
     
     
-    
-    
-    
-    
     
     
-    
-    
-    
-    
-    
-    
     
     
     
-    
-    
-    
     
     
     
@@ -308,6 +308,9 @@
     
     
     
+    
+    
+    
     
     
     
@@ -380,9 +383,21 @@
     
     
     
+    
+    
+    
+    
+    
+    
     
     
     
+    
+    
+    
+    
+    
+    
     
     
     
@@ -465,6 +480,15 @@
     
     
     
+    
+    
+    
+    
+    
+    
+    
+    
+    
     
     
     
@@ -521,259 +545,263 @@
     
     
     
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
     
     
     
diff --git a/docs/api/html/NetworkManager.html b/docs/api/html/NetworkManager.html
index fbb7dd99..c30db5e4 100644
--- a/docs/api/html/NetworkManager.html
+++ b/docs/api/html/NetworkManager.html
@@ -38,7 +38,7 @@
       The NetworkManager daemon attempts to make networking
       configuration and operation as painless and automatic as
       possible by managing the primary network connection and other
-      network interfaces, like Ethernet, WiFi, and Mobile Broadband
+      network interfaces, like Ethernet, Wi-Fi, and Mobile Broadband
       devices.  NetworkManager will connect any network device when a
       connection for that device becomes available, unless that
       behavior is disabled.  Information about networking is exported
@@ -436,20 +436,13 @@
 
 
 
NM_UNMANAGED

-
-

-          No default connection will be created and automatic activation
-          will not be attempted when this property of a device is set to a
-          true value ("1" or "true"). You will still be able to attach a
-          connection to the device manually or observe externally added
-          configuration such as addresses or routes.
-        

-

-          Create an udev rule that sets this property to prevent NetworkManager
-          from interfering with virtual Ethernet device interfaces that are
-          managed by virtualization tools.
-        

-
+

+          If set to "1" or "true", the device is
+          configured as unmanaged by NetworkManager. Note that the user still can
+          explicitly overrule this configuration via means like
+          nmcli device set "$DEVICE" managed yes or
+          "device*.managed=1" in NetworkManager.conf.
+        

 
 
 
diff --git a/docs/api/html/ch01.html b/docs/api/html/ch01.html
index 93f348c9..5c9cfa82 100644
--- a/docs/api/html/ch01.html
+++ b/docs/api/html/ch01.html
@@ -141,12 +141,18 @@
 vxlan — VXLAN Settings
 
 

+wifi-p2p — Wi-Fi P2P Settings
+

+

 wimax — WiMax Settings
 

 

 802-3-ethernet — Wired Ethernet Settings
 

 

+wireguard — WireGuard Ethernet Settings
+

+

 802-11-wireless — Wi-Fi Settings
 

 

diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.AccessPoint.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.AccessPoint.html
index d1232d30..66aba659 100644
--- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.AccessPoint.html
+++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.AccessPoint.html
@@ -7,7 +7,7 @@
 
 
 
-
+
 
 
 
@@ -22,7 +22,7 @@
 Home
 Up
 Prev
-Next
+Next
 
 

 

diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Checkpoint.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Checkpoint.html
index bc6f21f5..978a872f 100644
--- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Checkpoint.html
+++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Checkpoint.html
@@ -34,13 +34,13 @@
 
 

 

-
Signals

+
Signals

 
 PropertiesChanged (a{sv} properties);
 

 

 

-
Properties

+
Properties

 
 Devices          readable   ao
 Created          readable   x
diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Adsl.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Adsl.html
index 5570fcab..66c0a264 100644
--- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Adsl.html
+++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Adsl.html
@@ -7,7 +7,7 @@
 
 
 
-
+
 
 
 
@@ -22,7 +22,7 @@
 Home
 Up
 Prev
-Next
+Next
 
 

 

diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Bluetooth.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Bluetooth.html
index cdb44393..516e7b3e 100644
--- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Bluetooth.html
+++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Bluetooth.html
@@ -6,8 +6,8 @@
 
 
 
-
-
+
+
 
 
 
@@ -21,8 +21,8 @@
 
 Home
 Up
-Prev
-Next
+Prev
+Next
 
 

 

@@ -34,13 +34,13 @@
 
 

 

-
Signals

+
Signals

 
 PropertiesChanged (a{sv} properties);
 

 

 

-
Properties

+
Properties

 
 HwAddress       readable   s
 Name            readable   s
diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Bond.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Bond.html
index 5a7cebd0..9c693807 100644
--- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Bond.html
+++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Bond.html
@@ -6,7 +6,7 @@
 
 
 
-
+
 
 
 
@@ -21,7 +21,7 @@
 
 Home
 Up
-Prev
+Prev
 Next
 
 

@@ -34,13 +34,13 @@
 
 

 

-
Signals

+
Signals

 
 PropertiesChanged (a{sv} properties);
 

 

 

-
Properties

+
Properties

 
 HwAddress  readable   s
 Carrier    readable   b
diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Bridge.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Bridge.html
index 256362e0..cd140205 100644
--- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Bridge.html
+++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Bridge.html
@@ -7,7 +7,7 @@
 
 
 
-
+
 
 
 
@@ -22,7 +22,7 @@
 Home
 Up
 Prev
-Next
+Next
 
 

 

@@ -34,13 +34,13 @@
 
 

 

-
Signals

+
Signals

 
 PropertiesChanged (a{sv} properties);
 

 

 

-
Properties

+
Properties

 
 HwAddress  readable   s
 Carrier    readable   b
diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Dummy.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Dummy.html
index cf8c4383..ca726205 100644
--- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Dummy.html
+++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Dummy.html
@@ -6,8 +6,8 @@
 
 
 
-
-
+
+
 
 
 
@@ -21,8 +21,8 @@
 
 Home
 Up
-Prev
-Next
+Prev
+Next
 
 

 

diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Generic.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Generic.html
index 3a339492..e3eaed00 100644
--- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Generic.html
+++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Generic.html
@@ -6,8 +6,8 @@
 
 
 
-
-
+
+
 
 
 
@@ -21,8 +21,8 @@
 
 Home
 Up
-Prev
-Next
+Prev
+Next
 
 

 

@@ -34,13 +34,13 @@
 
 

 

-
Signals

+
Signals

 
 PropertiesChanged (a{sv} properties);
 

 

 

-
Properties

+
Properties

 
 HwAddress        readable   s
 TypeDescription  readable   s
diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.IPTunnel.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.IPTunnel.html
index 241a1634..7a2a7250 100644
--- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.IPTunnel.html
+++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.IPTunnel.html
@@ -6,8 +6,8 @@
 
 
 
-
-
+
+
 
 
 
@@ -21,8 +21,8 @@
 
 Home
 Up
-Prev
-Next
+Prev
+Next
 
 

 

@@ -34,13 +34,13 @@
 
 

 

-
Signals

+
Signals

 
 PropertiesChanged (a{sv} properties);
 

 

 

-
Properties

+
Properties

 
 Mode                readable   u
 Parent              readable   o
diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Infiniband.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Infiniband.html
index b9128792..c7608f8c 100644
--- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Infiniband.html
+++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Infiniband.html
@@ -6,8 +6,8 @@
 
 
 
-
-
+
+
 
 
 
@@ -21,8 +21,8 @@
 
 Home
 Up
-Prev
-Next
+Prev
+Next
 
 

 

diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Lowpan.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Lowpan.html
index b95bc1ab..5f74058b 100644
--- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Lowpan.html
+++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Lowpan.html
@@ -6,7 +6,7 @@
 
 
 
-
+
 
 
 
@@ -20,7 +20,7 @@
 
 Home
 Up
-Prev
+Prev
 Next
 
 

@@ -33,7 +33,7 @@
 
 

 

-
Properties

+
Properties

 
 HwAddress  readable   s
 Parent     readable   o
diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Macsec.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Macsec.html
index 4fb5a435..88e553dc 100644
--- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Macsec.html
+++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Macsec.html
@@ -34,13 +34,13 @@
 
 

 

-
Signals

+
Signals

 
 PropertiesChanged (a{sv} properties);
 

 

 

-
Properties

+
Properties

 
 Parent         readable   o
 Sci            readable   t
diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Macvlan.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Macvlan.html
index 23d67da2..5b480d71 100644
--- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Macvlan.html
+++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Macvlan.html
@@ -34,13 +34,13 @@
 
 

 

-
Signals

+
Signals

 
 PropertiesChanged (a{sv} properties);
 

 

 

-
Properties

+
Properties

 
 Parent     readable   o
 Mode       readable   s
diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Modem.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Modem.html
index 57ffe215..fc1273e1 100644
--- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Modem.html
+++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Modem.html
@@ -34,13 +34,13 @@
 
 

 

-
Signals

+
Signals

 
 PropertiesChanged (a{sv} properties);
 

 

 

-
Properties

+
Properties

 
 ModemCapabilities    readable   u
 CurrentCapabilities  readable   u
diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.OlpcMesh.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.OlpcMesh.html
index ade3b84e..ff2ce26c 100644
--- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.OlpcMesh.html
+++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.OlpcMesh.html
@@ -34,13 +34,13 @@
 
 

 

-
Signals

+
Signals

 
 PropertiesChanged (a{sv} properties);
 

 

 

-
Properties

+
Properties

 
 HwAddress      readable   s
 Companion      readable   o
diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.OvsBridge.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.OvsBridge.html
index 49e9e402..23835833 100644
--- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.OvsBridge.html
+++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.OvsBridge.html
@@ -34,13 +34,13 @@
 
 

 

-
Signals

+
Signals

 
 PropertiesChanged (a{sv} properties);
 

 

 

-
Properties

+
Properties

 
 Slaves  readable   ao
 

diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.OvsInterface.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.OvsInterface.html
index 177d6de9..2cc1a1eb 100644
--- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.OvsInterface.html
+++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.OvsInterface.html
@@ -33,7 +33,7 @@
 
 

 

-
Signals

+
Signals

 
 PropertiesChanged (a{sv} properties);
 

diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.OvsPort.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.OvsPort.html
index d5909eb7..0b000dbd 100644
--- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.OvsPort.html
+++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.OvsPort.html
@@ -34,13 +34,13 @@
 
 

 

-
Signals

+
Signals

 
 PropertiesChanged (a{sv} properties);
 

 

 

-
Properties

+
Properties

 
 Slaves  readable   ao
 

diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Ppp.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Ppp.html
index 389bb106..ebc789fd 100644
--- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Ppp.html
+++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Ppp.html
@@ -33,7 +33,7 @@
 
 

 

-
Signals

+
Signals

 
 PropertiesChanged (a{sv} properties);
 

diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Team.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Team.html
index d82c27ca..08eea63c 100644
--- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Team.html
+++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Team.html
@@ -34,13 +34,13 @@
 
 

 

-
Signals

+
Signals

 
 PropertiesChanged (a{sv} properties);
 

 

 

-
Properties

+
Properties

 
 HwAddress  readable   s
 Carrier    readable   b
diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Tun.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Tun.html
index 926df18e..f6d8b6cc 100644
--- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Tun.html
+++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Tun.html
@@ -34,13 +34,13 @@
 
 

 

-
Signals

+
Signals

 
 PropertiesChanged (a{sv} properties);
 

 

 

-
Properties

+
Properties

 
 Owner       readable   x
 Group       readable   x
diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Veth.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Veth.html
index 6bd6f3cf..ecd18854 100644
--- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Veth.html
+++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Veth.html
@@ -34,13 +34,13 @@
 
 

 

-
Signals

+
Signals

 
 PropertiesChanged (a{sv} properties);
 

 

 

-
Properties

+
Properties

 
 Peer  readable   o
 

diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Vlan.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Vlan.html
index 6182c837..3b8dd322 100644
--- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Vlan.html
+++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Vlan.html
@@ -34,13 +34,13 @@
 
 

 

-
Signals

+
Signals

 
 PropertiesChanged (a{sv} properties);
 

 

 

-
Properties

+
Properties

 
 HwAddress  readable   s
 Carrier    readable   b
diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Vxlan.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Vxlan.html
index 2131bd9f..0e58845f 100644
--- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Vxlan.html
+++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Vxlan.html
@@ -7,7 +7,7 @@
 
 
 
-
+
 
 
 
@@ -22,7 +22,7 @@
 Home
 Up
 Prev
-Next
+Next
 
 

 

@@ -34,13 +34,13 @@
 
 

 

-
Signals

+
Signals

 
 PropertiesChanged (a{sv} properties);
 

 

 

-
Properties

+
Properties

 
 Parent      readable   o
 HwAddress   readable   s
diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.WifiP2P.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.WifiP2P.html
new file mode 100644
index 00000000..7b01d3ae
--- /dev/null
+++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.WifiP2P.html
@@ -0,0 +1,171 @@
+
+
+
+
+org.freedesktop.NetworkManager.Device.WifiP2P: NetworkManager Reference Manual
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

+

+

+
+
+

+
org.freedesktop.NetworkManager.Device.WifiP2P

+
org.freedesktop.NetworkManager.Device.WifiP2P — Wi-Fi P2P Device

+

+

+
Methods

+
+StartFind (IN  a{sv} options);
+StopFind  ();
+

+

+

+
Signals

+
+PeerAdded   (o peer);
+PeerRemoved (o peer);
+

+

+

+
Properties

+
+HwAddress  readable   s
+Peers      readable   ao
+

+

+

+
Description

+
      Since: 1.16
+

+

+

+
Method Details

+

+
The StartFind() method

+
+StartFind (IN  a{sv} options);
+

+
                  in the range of 1-600 seconds is supported. The default is
+                  30 seconds.
+

+
        Start a find operation for Wi-Fi P2P peers.
+

+
        Since: 1.16
+

+

++++
+
+
+
+
+




IN a{sv} options:
Options of find. Currently 'timeout' option with value of "i"

+

+

+

+
The StopFind() method

+
+StopFind ();
+

+
        Stop an ongoing find operation again.
+

+
        Since: 1.16
+

+

+

+

+
Signal Details

+

+
The "PeerAdded" signal

+
+PeerAdded (o peer);
+

+
        Emitted when a new Wi-Fi P2P peer is found by the device.
+

+
        Since: 1.16
+

+

++++
+
+
+
+
+




o peer:
The object path of the newly found access point.

+

+

+

+
The "PeerRemoved" signal

+
+PeerRemoved (o peer);
+

+
        Emitted when a Wi-Fi P2P peer disappears from view of the device.
+

+
        Since: 1.16
+

+

++++
+
+
+
+
+




o peer:
The object path of the Wi-Fi P2P peer that has disappeared.

+

+

+

+
Property Details

+

+
The "HwAddress" property

+
+HwAddress  readable   s
+

+
        The active hardware address of the device.
+

+
        Since: 1.16
+

+

+

+

+
The "Peers" property

+
+Peers  readable   ao
+

+
        List of object paths of peers visible to this Wi-Fi P2P device.
+

+
        Since: 1.16
+

+

+

+

+

+
Generated by GTK-Doc V1.29

+
+
\ No newline at end of file
diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.WireGuard.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.WireGuard.html
index eae61221..a1022622 100644
--- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.WireGuard.html
+++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.WireGuard.html
@@ -6,8 +6,8 @@
 
 
 
-
-
+
+
 
 
 
@@ -20,8 +20,8 @@
 
 Home
 Up
-Prev
-Next
+Prev
+Next
 
 

 

diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Wired.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Wired.html
index 585359ba..3f7e0256 100644
--- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Wired.html
+++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Wired.html
@@ -6,8 +6,8 @@
 
 
 
-
-
+
+
 
 
 
@@ -21,8 +21,8 @@
 
 Home
 Up
-Prev
-Next
+Prev
+Next
 
 

 

@@ -34,13 +34,13 @@
 
 

 

-
Signals

+
Signals

 
 PropertiesChanged (a{sv} properties);
 

 

 

-
Properties

+
Properties

 
 HwAddress        readable   s
 PermHwAddress    readable   s
diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Wireless.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Wireless.html
index 1531b2df..c4a4cce7 100644
--- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Wireless.html
+++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Wireless.html
@@ -6,7 +6,7 @@
 
 
 
-
+
 
 
 
@@ -21,7 +21,7 @@
 
 Home
 Up
-Prev
+Prev
 Next
 
 

@@ -42,7 +42,7 @@
 

 

 

-
Signals

+
Signals

 
 PropertiesChanged  (a{sv} properties);
 AccessPointAdded   (o     access_point);
@@ -50,7 +50,7 @@
 

 

 

-
Properties

+
Properties

 
 HwAddress             readable   s
 PermHwAddress         readable   s
@@ -115,7 +115,7 @@ GetAllAccessPoints (OUT ao access_points);
 
 RequestScan (IN  a{sv} options);
 

-
        Request the device to scan
+
        Request the device to scan. To know when the scan is finished, use the "PropertiesChanged" signal from "org.freedesktop.DBus.Properties" to listen to changes to the "LastScan" property.
 

 
diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Wpan.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Wpan.html
index 906cea86..b546b63a 100644
--- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Wpan.html
+++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Wpan.html
@@ -33,7 +33,7 @@
 

 


 

 

-
Properties

+
Properties

 
 HwAddress  readable   s
 

diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.html
index f4d02ea3..14c79f0b 100644
--- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.html
+++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.html
@@ -83,6 +83,8 @@
 Metered               readable   u
 LldpNeighbors         readable   aa{sv}
 Real                  readable   b
+Ip4Connectivity       readable   u
+Ip6Connectivity       readable   u
 

 

 

@@ -464,7 +466,7 @@ NmPluginMissing  readable   b
 
 DeviceType  readable   u
 

-
        The general type of the network device; ie Ethernet, WiFi, etc.
+
        The general type of the network device; ie Ethernet, Wi-Fi, etc.
 

 
        Returns: NMDeviceType
 

@@ -533,6 +535,32 @@ Real  readable   b
         their AvailableConnections was activated.
 

 

+

+

+
The "Ip4Connectivity" property

+
+Ip4Connectivity  readable   u
+

+
        The result of the last IPv4 connectivity check.
+

+
        Since: 1.16
+

+
        Returns: NMConnectivityState
+

+

+

+

+
The "Ip6Connectivity" property

+
+Ip6Connectivity  readable   u
+

+
        The result of the last IPv6 connectivity check.
+

+
        Since: 1.16
+

+
        Returns: NMConnectivityState
+

+

 

 

 

diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.WifiP2PPeer.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.WifiP2PPeer.html
new file mode 100644
index 00000000..e6ca64ed
--- /dev/null
+++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.WifiP2PPeer.html
@@ -0,0 +1,163 @@
+
+
+
+
+org.freedesktop.NetworkManager.WifiP2PPeer: NetworkManager Reference Manual
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

+

+

+
+
+

+
org.freedesktop.NetworkManager.WifiP2PPeer

+
org.freedesktop.NetworkManager.WifiP2PPeer — Wi-Fi P2P Peer

+

+

+
Properties

+
+Flags         readable   u
+Manufacturer  readable   s
+Model         readable   s
+ModelNumber   readable   s
+Serial        readable   s
+WfdIEs        readable   ay
+HwAddress     readable   s
+Strength      readable   y
+LastSeen      readable   i
+

+

+

+
Description

+
      Since: 1.16
+

+

+

+
Property Details

+

+
The "Flags" property

+
+Flags  readable   u
+

+
        Flags describing the capabilities of the access point.
+

+
        Returns: NM80211ApFlags
+

+
        Since: 1.16
+

+

+

+

+
The "Manufacturer" property

+
+Manufacturer  readable   s
+

+
        The manufacturer of the Wi-Fi P2P peer.
+

+
        Since: 1.16
+

+

+

+

+
The "Model" property

+
+Model  readable   s
+

+
        The model of the Wi-Fi P2P peer.
+

+
        Since: 1.16
+

+

+

+

+
The "ModelNumber" property

+
+ModelNumber  readable   s
+

+
        The model number of the Wi-Fi P2P peer.
+

+
        Since: 1.16
+

+

+

+

+
The "Serial" property

+
+Serial  readable   s
+

+
        The serial number of the Wi-Fi P2P peer.
+

+
        Since: 1.16
+

+

+

+

+
The "WfdIEs" property

+
+WfdIEs  readable   ay
+

+
        The Wi-Fi Display Information Elements of the Wi-Fi P2P peer.
+

+
        Since: 1.16
+

+

+

+

+
The "HwAddress" property

+
+HwAddress  readable   s
+

+
        The hardware address (BSSID) of the access point.
+

+
        Since: 1.16
+

+

+

+

+
The "Strength" property

+
+Strength  readable   y
+

+
        The current signal quality of the access point, in percent.
+

+
        Since: 1.16
+

+

+

+

+
The "LastSeen" property

+
+LastSeen  readable   i
+

+
        The timestamp (in CLOCK_BOOTTIME seconds) for the last time the access
+        point was found in scan results. A value of -1 means the access point has
+        never been found in scan results.
+

+
        Since: 1.16
+

+

+

+

+

+
Generated by GTK-Doc V1.29

+
+
\ No newline at end of file
diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.html
index 64ea7e6b..c28fafe6 100644
--- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.html
+++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.html
@@ -50,6 +50,13 @@
                                  IN  o         specific_object,
                                  OUT o         path,
                                  OUT o         active_connection);
+AddAndActivateConnection2       (IN  a{sa{sv}} connection,
+                                 IN  o         device,
+                                 IN  o         specific_object,
+                                 IN  a{sv}     options,
+                                 OUT o         path,
+                                 OUT o         active_connection,
+                                 OUT a{sv}     result);
 DeactivateConnection            (IN  o         active_connection);
 Sleep                           (IN  b         sleep);
 Enable                          (IN  b         enable);
@@ -245,7 +252,7 @@ ActivateConnection (IN  o connection,
 
 
 
IN o specific_object:

-
The path of a connection-type-specific object this activation should use. This parameter is currently ignored for wired and mobile broadband connections, and the value of "/" should be used (ie, no specific object). For WiFi connections, pass the object path of a specific AP from the card's scan list, or "/" to pick an AP automatically. For VPN connections, pass the object path of an ActiveConnection object that should serve as the "base" connection (to which the VPN connections lifetime will be tied), or pass "/" and NM will automatically use the current default device.

+
The path of a connection-type-specific object this activation should use. This parameter is currently ignored for wired and mobile broadband connections, and the value of "/" should be used (ie, no specific object). For Wi-Fi connections, pass the object path of a specific AP from the card's scan list, or "/" to pick an AP automatically. For VPN connections, pass the object path of an ActiveConnection object that should serve as the "base" connection (to which the VPN connections lifetime will be tied), or pass "/" and NM will automatically use the current default device.

 
 
 
OUT o active_connection:

@@ -269,6 +276,62 @@ AddAndActivateConnection (IN  a{sa{sv}} connection,
         given device and specific object), then activate the new connection.
         Cannot be used for VPN connections at this time.
 

+
        See also AddAndActivateConnection2.
+

+

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




IN a{sa{sv}} connection:
Connection settings and properties; if incomplete missing settings will be automatically completed using the given device and specific object.
IN o device:
The object path of device to be activated using the given connection.
IN o specific_object:
The path of a connection-type-specific object this activation should use. This parameter is currently ignored for wired and mobile broadband connections, and the value of "/" should be used (ie, no specific object). For Wi-Fi connections, pass the object path of a specific AP from the card's scan list, which will be used to complete the details of the newly added connection.
OUT o path:
Object path of the new connection that was just added.
OUT o active_connection:
The path of the active connection object representing this active connection.

+

+

+

+
The AddAndActivateConnection2() method

+
+AddAndActivateConnection2 (IN  a{sa{sv}} connection,
+                           IN  o         device,
+                           IN  o         specific_object,
+                           IN  a{sv}     options,
+                           OUT o         path,
+                           OUT o         active_connection,
+                           OUT a{sv}     result);
+

+
          output arguments are supported.
+

+
        Adds a new connection using the given details (if any) as a template
+        (automatically filling in missing settings with the capabilities of the
+        given device and specific object), then activate the new connection.
+        Cannot be used for VPN connections at this time.
+

+
        This method extends AddAndActivateConnection to allow passing further
+        parameters. At this time the following options are supported:
+

+
         * persist: A string value of either "disk" (default), "memory" or "volatile". If "memory" is passed, the connection will not be saved to disk. If "volatile" is passed, the connection will not be saved to disk and will be destroyed when disconnected.
+         * bind-activation: Bind the activation lifetime. Set to "dbus-name" to automatically disconnect when the requesting process disappears from the bus. The default of "none" means the connection is kept activated normally.
+

 
@@ -285,7 +348,11 @@ AddAndActivateConnection (IN  a{sa{sv}} connection,
 
-
+
+
+
+
+
@@ -295,6 +362,10 @@ AddAndActivateConnection (IN  a{sa{sv}} connection,
 
+
+
+
+

 
 

 

 
IN o specific_object:
The path of a connection-type-specific object this activation should use. This parameter is currently ignored for wired and mobile broadband connections, and the value of "/" should be used (ie, no specific object). For WiFi connections, pass the object path of a specific AP from the card's scan list, which will be used to complete the details of the newly added connection.
The path of a connection-type-specific object this activation should use. This parameter is currently ignored for wired and mobile broadband connections, and the value of "/" should be used (ie, no specific object). For Wi-Fi connections, pass the object path of a specific AP from the card's scan list, which will be used to complete the details of the newly added connection.
IN a{sv} options:
Further options for the method call.

 

 

 
OUT o path:
OUT o active_connection:

 
The path of the active connection object representing this active connection.

 
OUT a{sv} result:
a dictionary of additional output arguments for future extension. Currently not additional

 
 

 

@@ -370,7 +441,7 @@ GetPermissions (OUT a{ss} permissions);
 

 
        Returns the permissions a caller has for various authenticated operations
         that NetworkManager provides, like Enable/Disable networking, changing
-        WiFi, WWAN, and WiMAX state, etc.
+        Wi-Fi, WWAN, and WiMAX state, etc.
 

 
diff --git a/docs/api/html/index.html b/docs/api/html/index.html
index c572f5e3..93b49167 100644
--- a/docs/api/html/index.html
+++ b/docs/api/html/index.html
@@ -16,7 +16,7 @@
 

 

 


 

-      for NetworkManager 1.14.6
+      for NetworkManager 1.16.0
 
       The latest version of this documentation can be found on-line at
       https://developer.gnome.org/NetworkManager/stable/.
@@ -101,7 +101,7 @@
 nm-initrd-generator — early boot NetworkManager configuration generator
 

 

-nm-openvswitch — overview of NetworkManager OpenVSwitch support
+nm-openvswitch — overview of NetworkManager Open vSwitch support
 

 
 
II. Network Configuration Setting Specification

@@ -226,12 +226,18 @@
 vxlan — VXLAN Settings
 
 

+wifi-p2p — Wi-Fi P2P Settings
+

+

 wimax — WiMax Settings
 

 

 802-3-ethernet — Wired Ethernet Settings
 

 

+wireguard — WireGuard Ethernet Settings
+

+

 802-11-wireless — Wi-Fi Settings
 

 

@@ -277,28 +283,25 @@
 org.freedesktop.NetworkManager.Device.Adsl — ADSL Device
 

 

-org.freedesktop.NetworkManager.Device.Bond — Bonding Device
+org.freedesktop.NetworkManager.Device.Bluetooth — Bluetooth Device
 

 

-org.freedesktop.NetworkManager.Device.Bridge — Bridging Device
+org.freedesktop.NetworkManager.Device.Bond — Bonding Device
 

 

-org.freedesktop.NetworkManager.Device.Bluetooth — Bluetooth Device
+org.freedesktop.NetworkManager.Device.Bridge — Bridging Device
 

 

 org.freedesktop.NetworkManager.Device.Dummy — Dummy Device
 

 

-org.freedesktop.NetworkManager.Device.Wired — Wired Ethernet Device
-

-

 org.freedesktop.NetworkManager.Device.Generic — Unrecognized Device
 

 

-org.freedesktop.NetworkManager.Device.Infiniband — Infiniband Device
+org.freedesktop.NetworkManager.Device.IPTunnel — IP Tunneling Device
 

 

-org.freedesktop.NetworkManager.Device.IPTunnel — IP Tunneling Device
+org.freedesktop.NetworkManager.Device.Infiniband — Infiniband Device
 

 

 org.freedesktop.NetworkManager.Device.Lowpan — 6LoWPAN Device
@@ -343,9 +346,15 @@
 org.freedesktop.NetworkManager.Device.Vxlan — VXLAN Device
 

 

+org.freedesktop.NetworkManager.Device.WifiP2P — Wi-Fi P2P Device
+

+

 org.freedesktop.NetworkManager.Device.WireGuard — WireGuard Device
 

 

+org.freedesktop.NetworkManager.Device.Wired — Wired Ethernet Device
+

+

 org.freedesktop.NetworkManager.Device.Wireless — Wi-Fi Device
 

 

@@ -384,6 +393,10 @@
 

 org.freedesktop.NetworkManager.AccessPoint — Wi-Fi Access Point
 

+
The /org.freedesktop.NetworkManager.WifiP2PPeer/* objects

+

+org.freedesktop.NetworkManager.WifiP2PPeer — Wi-Fi P2P Peer
+

 
The /org/freedesktop/NetworkManager/Checkpoint/* objects

 

 org.freedesktop.NetworkManager.Checkpoint — Configuration and State Snapshot
diff --git a/docs/api/html/ix01.html b/docs/api/html/ix01.html
index a17c94e0..418d2038 100644
--- a/docs/api/html/ix01.html
+++ b/docs/api/html/ix01.html
@@ -26,1519 +26,1573 @@
 

 
Symbols

 

-
org.freedesktop.NetworkManager.AccessPoint, org.freedesktop.NetworkManager.AccessPoint
+
org.freedesktop.NetworkManager.AccessPoint, org.freedesktop.NetworkManager.AccessPoint
 

-
org.freedesktop.NetworkManager.AccessPoint::PropertiesChanged, The "PropertiesChanged" signal
+
org.freedesktop.NetworkManager.AccessPoint::PropertiesChanged, The "PropertiesChanged" signal
 

-
org.freedesktop.NetworkManager.AccessPoint:Flags, The "Flags" property
+
org.freedesktop.NetworkManager.AccessPoint:Flags, The "Flags" property
 

-
org.freedesktop.NetworkManager.AccessPoint:Frequency, The "Frequency" property
+
org.freedesktop.NetworkManager.AccessPoint:Frequency, The "Frequency" property
 

-
org.freedesktop.NetworkManager.AccessPoint:HwAddress, The "HwAddress" property
+
org.freedesktop.NetworkManager.AccessPoint:HwAddress, The "HwAddress" property
 

-
org.freedesktop.NetworkManager.AccessPoint:LastSeen, The "LastSeen" property
+
org.freedesktop.NetworkManager.AccessPoint:LastSeen, The "LastSeen" property
 

-
org.freedesktop.NetworkManager.AccessPoint:MaxBitrate, The "MaxBitrate" property
+
org.freedesktop.NetworkManager.AccessPoint:MaxBitrate, The "MaxBitrate" property
 

-
org.freedesktop.NetworkManager.AccessPoint:Mode, The "Mode" property
+
org.freedesktop.NetworkManager.AccessPoint:Mode, The "Mode" property
 

-
org.freedesktop.NetworkManager.AccessPoint:RsnFlags, The "RsnFlags" property
+
org.freedesktop.NetworkManager.AccessPoint:RsnFlags, The "RsnFlags" property
 

-
org.freedesktop.NetworkManager.AccessPoint:Ssid, The "Ssid" property
+
org.freedesktop.NetworkManager.AccessPoint:Ssid, The "Ssid" property
 

-
org.freedesktop.NetworkManager.AccessPoint:Strength, The "Strength" property
+
org.freedesktop.NetworkManager.AccessPoint:Strength, The "Strength" property
 

-
org.freedesktop.NetworkManager.AccessPoint:WpaFlags, The "WpaFlags" property
+
org.freedesktop.NetworkManager.AccessPoint:WpaFlags, The "WpaFlags" property
 

-
org.freedesktop.NetworkManager.AgentManager, org.freedesktop.NetworkManager.AgentManager
+
org.freedesktop.NetworkManager.AgentManager, org.freedesktop.NetworkManager.AgentManager
 

-
org.freedesktop.NetworkManager.AgentManager.Register(), The Register() method
+
org.freedesktop.NetworkManager.AgentManager.Register(), The Register() method
 

-
org.freedesktop.NetworkManager.AgentManager.RegisterWithCapabilities(), The RegisterWithCapabilities() method
+
org.freedesktop.NetworkManager.AgentManager.RegisterWithCapabilities(), The RegisterWithCapabilities() method
 

-
org.freedesktop.NetworkManager.AgentManager.Unregister(), The Unregister() method
+
org.freedesktop.NetworkManager.AgentManager.Unregister(), The Unregister() method
 

-
org.freedesktop.NetworkManager.Device, org.freedesktop.NetworkManager.Device
+
org.freedesktop.NetworkManager.Device, org.freedesktop.NetworkManager.Device
 

-
org.freedesktop.NetworkManager.Device.Adsl, org.freedesktop.NetworkManager.Device.Adsl
+
org.freedesktop.NetworkManager.Device.Adsl, org.freedesktop.NetworkManager.Device.Adsl
 

-
org.freedesktop.NetworkManager.Device.Adsl::PropertiesChanged, The "PropertiesChanged" signal
+
org.freedesktop.NetworkManager.Device.Adsl::PropertiesChanged, The "PropertiesChanged" signal
 

-
org.freedesktop.NetworkManager.Device.Adsl:Carrier, The "Carrier" property
+
org.freedesktop.NetworkManager.Device.Adsl:Carrier, The "Carrier" property
 

-
org.freedesktop.NetworkManager.Device.Bluetooth, org.freedesktop.NetworkManager.Device.Bluetooth
+
org.freedesktop.NetworkManager.Device.Bluetooth, org.freedesktop.NetworkManager.Device.Bluetooth
 

-
org.freedesktop.NetworkManager.Device.Bluetooth::PropertiesChanged, The "PropertiesChanged" signal
+
org.freedesktop.NetworkManager.Device.Bluetooth::PropertiesChanged, The "PropertiesChanged" signal
 

-
org.freedesktop.NetworkManager.Device.Bluetooth:BtCapabilities, The "BtCapabilities" property
+
org.freedesktop.NetworkManager.Device.Bluetooth:BtCapabilities, The "BtCapabilities" property
 

-
org.freedesktop.NetworkManager.Device.Bluetooth:HwAddress, The "HwAddress" property
+
org.freedesktop.NetworkManager.Device.Bluetooth:HwAddress, The "HwAddress" property
 

-
org.freedesktop.NetworkManager.Device.Bluetooth:Name, The "Name" property
+
org.freedesktop.NetworkManager.Device.Bluetooth:Name, The "Name" property
 

-
org.freedesktop.NetworkManager.Device.Bond, org.freedesktop.NetworkManager.Device.Bond
+
org.freedesktop.NetworkManager.Device.Bond, org.freedesktop.NetworkManager.Device.Bond
 

-
org.freedesktop.NetworkManager.Device.Bond::PropertiesChanged, The "PropertiesChanged" signal
+
org.freedesktop.NetworkManager.Device.Bond::PropertiesChanged, The "PropertiesChanged" signal
 

-
org.freedesktop.NetworkManager.Device.Bond:Carrier, The "Carrier" property
+
org.freedesktop.NetworkManager.Device.Bond:Carrier, The "Carrier" property
 

-
org.freedesktop.NetworkManager.Device.Bond:HwAddress, The "HwAddress" property
+
org.freedesktop.NetworkManager.Device.Bond:HwAddress, The "HwAddress" property
 

-
org.freedesktop.NetworkManager.Device.Bond:Slaves, The "Slaves" property
+
org.freedesktop.NetworkManager.Device.Bond:Slaves, The "Slaves" property
 

-
org.freedesktop.NetworkManager.Device.Bridge, org.freedesktop.NetworkManager.Device.Bridge
+
org.freedesktop.NetworkManager.Device.Bridge, org.freedesktop.NetworkManager.Device.Bridge
 

-
org.freedesktop.NetworkManager.Device.Bridge::PropertiesChanged, The "PropertiesChanged" signal
+
org.freedesktop.NetworkManager.Device.Bridge::PropertiesChanged, The "PropertiesChanged" signal
 

-
org.freedesktop.NetworkManager.Device.Bridge:Carrier, The "Carrier" property
+
org.freedesktop.NetworkManager.Device.Bridge:Carrier, The "Carrier" property
 

-
org.freedesktop.NetworkManager.Device.Bridge:HwAddress, The "HwAddress" property
+
org.freedesktop.NetworkManager.Device.Bridge:HwAddress, The "HwAddress" property
 

-
org.freedesktop.NetworkManager.Device.Bridge:Slaves, The "Slaves" property
+
org.freedesktop.NetworkManager.Device.Bridge:Slaves, The "Slaves" property
 

-
org.freedesktop.NetworkManager.Device.Delete(), The Delete() method
+
org.freedesktop.NetworkManager.Device.Delete(), The Delete() method
 

-
org.freedesktop.NetworkManager.Device.Disconnect(), The Disconnect() method
+
org.freedesktop.NetworkManager.Device.Disconnect(), The Disconnect() method
 

-
org.freedesktop.NetworkManager.Device.Dummy, org.freedesktop.NetworkManager.Device.Dummy
+
org.freedesktop.NetworkManager.Device.Dummy, org.freedesktop.NetworkManager.Device.Dummy
 

-
org.freedesktop.NetworkManager.Device.Dummy::PropertiesChanged, The "PropertiesChanged" signal
+
org.freedesktop.NetworkManager.Device.Dummy::PropertiesChanged, The "PropertiesChanged" signal
 

-
org.freedesktop.NetworkManager.Device.Dummy:HwAddress, The "HwAddress" property
+
org.freedesktop.NetworkManager.Device.Dummy:HwAddress, The "HwAddress" property
 

-
org.freedesktop.NetworkManager.Device.Generic, org.freedesktop.NetworkManager.Device.Generic
+
org.freedesktop.NetworkManager.Device.Generic, org.freedesktop.NetworkManager.Device.Generic
 

-
org.freedesktop.NetworkManager.Device.Generic::PropertiesChanged, The "PropertiesChanged" signal
+
org.freedesktop.NetworkManager.Device.Generic::PropertiesChanged, The "PropertiesChanged" signal
 

-
org.freedesktop.NetworkManager.Device.Generic:HwAddress, The "HwAddress" property
+
org.freedesktop.NetworkManager.Device.Generic:HwAddress, The "HwAddress" property
 

-
org.freedesktop.NetworkManager.Device.Generic:TypeDescription, The "TypeDescription" property
+
org.freedesktop.NetworkManager.Device.Generic:TypeDescription, The "TypeDescription" property
 

-
org.freedesktop.NetworkManager.Device.GetAppliedConnection(), The GetAppliedConnection() method
+
org.freedesktop.NetworkManager.Device.GetAppliedConnection(), The GetAppliedConnection() method
 

-
org.freedesktop.NetworkManager.Device.Infiniband, org.freedesktop.NetworkManager.Device.Infiniband
+
org.freedesktop.NetworkManager.Device.Infiniband, org.freedesktop.NetworkManager.Device.Infiniband
 

-
org.freedesktop.NetworkManager.Device.Infiniband::PropertiesChanged, The "PropertiesChanged" signal
+
org.freedesktop.NetworkManager.Device.Infiniband::PropertiesChanged, The "PropertiesChanged" signal
 

-
org.freedesktop.NetworkManager.Device.Infiniband:Carrier, The "Carrier" property
+
org.freedesktop.NetworkManager.Device.Infiniband:Carrier, The "Carrier" property
 

-
org.freedesktop.NetworkManager.Device.Infiniband:HwAddress, The "HwAddress" property
+
org.freedesktop.NetworkManager.Device.Infiniband:HwAddress, The "HwAddress" property
 

-
org.freedesktop.NetworkManager.Device.IPTunnel, org.freedesktop.NetworkManager.Device.IPTunnel
+
org.freedesktop.NetworkManager.Device.IPTunnel, org.freedesktop.NetworkManager.Device.IPTunnel
 

-
org.freedesktop.NetworkManager.Device.IPTunnel::PropertiesChanged, The "PropertiesChanged" signal
+
org.freedesktop.NetworkManager.Device.IPTunnel::PropertiesChanged, The "PropertiesChanged" signal
 

-
org.freedesktop.NetworkManager.Device.IPTunnel:EncapsulationLimit, The "EncapsulationLimit" property
+
org.freedesktop.NetworkManager.Device.IPTunnel:EncapsulationLimit, The "EncapsulationLimit" property
 

-
org.freedesktop.NetworkManager.Device.IPTunnel:Flags, The "Flags" property
+
org.freedesktop.NetworkManager.Device.IPTunnel:Flags, The "Flags" property
 

-
org.freedesktop.NetworkManager.Device.IPTunnel:FlowLabel, The "FlowLabel" property
+
org.freedesktop.NetworkManager.Device.IPTunnel:FlowLabel, The "FlowLabel" property
 

-
org.freedesktop.NetworkManager.Device.IPTunnel:InputKey, The "InputKey" property
+
org.freedesktop.NetworkManager.Device.IPTunnel:InputKey, The "InputKey" property
 

-
org.freedesktop.NetworkManager.Device.IPTunnel:Local, The "Local" property
+
org.freedesktop.NetworkManager.Device.IPTunnel:Local, The "Local" property
 

-
org.freedesktop.NetworkManager.Device.IPTunnel:Mode, The "Mode" property
+
org.freedesktop.NetworkManager.Device.IPTunnel:Mode, The "Mode" property
 

-
org.freedesktop.NetworkManager.Device.IPTunnel:OutputKey, The "OutputKey" property
+
org.freedesktop.NetworkManager.Device.IPTunnel:OutputKey, The "OutputKey" property
 

-
org.freedesktop.NetworkManager.Device.IPTunnel:Parent, The "Parent" property
+
org.freedesktop.NetworkManager.Device.IPTunnel:Parent, The "Parent" property
 

-
org.freedesktop.NetworkManager.Device.IPTunnel:PathMtuDiscovery, The "PathMtuDiscovery" property
+
org.freedesktop.NetworkManager.Device.IPTunnel:PathMtuDiscovery, The "PathMtuDiscovery" property
 

-
org.freedesktop.NetworkManager.Device.IPTunnel:Remote, The "Remote" property
+
org.freedesktop.NetworkManager.Device.IPTunnel:Remote, The "Remote" property
 

-
org.freedesktop.NetworkManager.Device.IPTunnel:Tos, The "Tos" property
+
org.freedesktop.NetworkManager.Device.IPTunnel:Tos, The "Tos" property
 

-
org.freedesktop.NetworkManager.Device.IPTunnel:Ttl, The "Ttl" property
+
org.freedesktop.NetworkManager.Device.IPTunnel:Ttl, The "Ttl" property
 

-
org.freedesktop.NetworkManager.Device.Lowpan, org.freedesktop.NetworkManager.Device.Lowpan
+
org.freedesktop.NetworkManager.Device.Lowpan, org.freedesktop.NetworkManager.Device.Lowpan
 

-
org.freedesktop.NetworkManager.Device.Lowpan:HwAddress, The "HwAddress" property
+
org.freedesktop.NetworkManager.Device.Lowpan:HwAddress, The "HwAddress" property
 

-
org.freedesktop.NetworkManager.Device.Lowpan:Parent, The "Parent" property
+
org.freedesktop.NetworkManager.Device.Lowpan:Parent, The "Parent" property
 

-
org.freedesktop.NetworkManager.Device.Macsec, org.freedesktop.NetworkManager.Device.Macsec
+
org.freedesktop.NetworkManager.Device.Macsec, org.freedesktop.NetworkManager.Device.Macsec
 

-
org.freedesktop.NetworkManager.Device.Macsec::PropertiesChanged, The "PropertiesChanged" signal
+
org.freedesktop.NetworkManager.Device.Macsec::PropertiesChanged, The "PropertiesChanged" signal
 

-
org.freedesktop.NetworkManager.Device.Macsec:CipherSuite, The "CipherSuite" property
+
org.freedesktop.NetworkManager.Device.Macsec:CipherSuite, The "CipherSuite" property
 

-
org.freedesktop.NetworkManager.Device.Macsec:EncodingSa, The "EncodingSa" property
+
org.freedesktop.NetworkManager.Device.Macsec:EncodingSa, The "EncodingSa" property
 

-
org.freedesktop.NetworkManager.Device.Macsec:Encrypt, The "Encrypt" property
+
org.freedesktop.NetworkManager.Device.Macsec:Encrypt, The "Encrypt" property
 

-
org.freedesktop.NetworkManager.Device.Macsec:Es, The "Es" property
+
org.freedesktop.NetworkManager.Device.Macsec:Es, The "Es" property
 

-
org.freedesktop.NetworkManager.Device.Macsec:IcvLength, The "IcvLength" property
+
org.freedesktop.NetworkManager.Device.Macsec:IcvLength, The "IcvLength" property
 

-
org.freedesktop.NetworkManager.Device.Macsec:IncludeSci, The "IncludeSci" property
+
org.freedesktop.NetworkManager.Device.Macsec:IncludeSci, The "IncludeSci" property
 

-
org.freedesktop.NetworkManager.Device.Macsec:Parent, The "Parent" property
+
org.freedesktop.NetworkManager.Device.Macsec:Parent, The "Parent" property
 

-
org.freedesktop.NetworkManager.Device.Macsec:Protect, The "Protect" property
+
org.freedesktop.NetworkManager.Device.Macsec:Protect, The "Protect" property
 

-
org.freedesktop.NetworkManager.Device.Macsec:ReplayProtect, The "ReplayProtect" property
+
org.freedesktop.NetworkManager.Device.Macsec:ReplayProtect, The "ReplayProtect" property
 

-
org.freedesktop.NetworkManager.Device.Macsec:Scb, The "Scb" property
+
org.freedesktop.NetworkManager.Device.Macsec:Scb, The "Scb" property
 

-
org.freedesktop.NetworkManager.Device.Macsec:Sci, The "Sci" property
+
org.freedesktop.NetworkManager.Device.Macsec:Sci, The "Sci" property
 

-
org.freedesktop.NetworkManager.Device.Macsec:Validation, The "Validation" property
+
org.freedesktop.NetworkManager.Device.Macsec:Validation, The "Validation" property
 

-
org.freedesktop.NetworkManager.Device.Macsec:Window, The "Window" property
+
org.freedesktop.NetworkManager.Device.Macsec:Window, The "Window" property
 

-
org.freedesktop.NetworkManager.Device.Macvlan, org.freedesktop.NetworkManager.Device.Macvlan
+
org.freedesktop.NetworkManager.Device.Macvlan, org.freedesktop.NetworkManager.Device.Macvlan
 

-
org.freedesktop.NetworkManager.Device.Macvlan::PropertiesChanged, The "PropertiesChanged" signal
+
org.freedesktop.NetworkManager.Device.Macvlan::PropertiesChanged, The "PropertiesChanged" signal
 

-
org.freedesktop.NetworkManager.Device.Macvlan:Mode, The "Mode" property
+
org.freedesktop.NetworkManager.Device.Macvlan:Mode, The "Mode" property
 

-
org.freedesktop.NetworkManager.Device.Macvlan:NoPromisc, The "NoPromisc" property
+
org.freedesktop.NetworkManager.Device.Macvlan:NoPromisc, The "NoPromisc" property
 

-
org.freedesktop.NetworkManager.Device.Macvlan:Parent, The "Parent" property
+
org.freedesktop.NetworkManager.Device.Macvlan:Parent, The "Parent" property
 

-
org.freedesktop.NetworkManager.Device.Macvlan:Tap, The "Tap" property
+
org.freedesktop.NetworkManager.Device.Macvlan:Tap, The "Tap" property
 

-
org.freedesktop.NetworkManager.Device.Modem, org.freedesktop.NetworkManager.Device.Modem
+
org.freedesktop.NetworkManager.Device.Modem, org.freedesktop.NetworkManager.Device.Modem
 

-
org.freedesktop.NetworkManager.Device.Modem::PropertiesChanged, The "PropertiesChanged" signal
+
org.freedesktop.NetworkManager.Device.Modem::PropertiesChanged, The "PropertiesChanged" signal
 

-
org.freedesktop.NetworkManager.Device.Modem:CurrentCapabilities, The "CurrentCapabilities" property
+
org.freedesktop.NetworkManager.Device.Modem:CurrentCapabilities, The "CurrentCapabilities" property
 

-
org.freedesktop.NetworkManager.Device.Modem:ModemCapabilities, The "ModemCapabilities" property
+
org.freedesktop.NetworkManager.Device.Modem:ModemCapabilities, The "ModemCapabilities" property
 

-
org.freedesktop.NetworkManager.Device.OlpcMesh, org.freedesktop.NetworkManager.Device.OlpcMesh
+
org.freedesktop.NetworkManager.Device.OlpcMesh, org.freedesktop.NetworkManager.Device.OlpcMesh
 

-
org.freedesktop.NetworkManager.Device.OlpcMesh::PropertiesChanged, The "PropertiesChanged" signal
+
org.freedesktop.NetworkManager.Device.OlpcMesh::PropertiesChanged, The "PropertiesChanged" signal
 

-
org.freedesktop.NetworkManager.Device.OlpcMesh:ActiveChannel, The "ActiveChannel" property
+
org.freedesktop.NetworkManager.Device.OlpcMesh:ActiveChannel, The "ActiveChannel" property
 

-
org.freedesktop.NetworkManager.Device.OlpcMesh:Companion, The "Companion" property
+
org.freedesktop.NetworkManager.Device.OlpcMesh:Companion, The "Companion" property
 

-
org.freedesktop.NetworkManager.Device.OlpcMesh:HwAddress, The "HwAddress" property
+
org.freedesktop.NetworkManager.Device.OlpcMesh:HwAddress, The "HwAddress" property
 

-
org.freedesktop.NetworkManager.Device.OvsBridge, org.freedesktop.NetworkManager.Device.OvsBridge
+
org.freedesktop.NetworkManager.Device.OvsBridge, org.freedesktop.NetworkManager.Device.OvsBridge
 

-
org.freedesktop.NetworkManager.Device.OvsBridge::PropertiesChanged, The "PropertiesChanged" signal
+
org.freedesktop.NetworkManager.Device.OvsBridge::PropertiesChanged, The "PropertiesChanged" signal
 

-
org.freedesktop.NetworkManager.Device.OvsBridge:Slaves, The "Slaves" property
+
org.freedesktop.NetworkManager.Device.OvsBridge:Slaves, The "Slaves" property
 

-
org.freedesktop.NetworkManager.Device.OvsInterface, org.freedesktop.NetworkManager.Device.OvsInterface
+
org.freedesktop.NetworkManager.Device.OvsInterface, org.freedesktop.NetworkManager.Device.OvsInterface
 

-
org.freedesktop.NetworkManager.Device.OvsInterface::PropertiesChanged, The "PropertiesChanged" signal
+
org.freedesktop.NetworkManager.Device.OvsInterface::PropertiesChanged, The "PropertiesChanged" signal
 

-
org.freedesktop.NetworkManager.Device.OvsPort, org.freedesktop.NetworkManager.Device.OvsPort
+
org.freedesktop.NetworkManager.Device.OvsPort, org.freedesktop.NetworkManager.Device.OvsPort
 

-
org.freedesktop.NetworkManager.Device.OvsPort::PropertiesChanged, The "PropertiesChanged" signal
+
org.freedesktop.NetworkManager.Device.OvsPort::PropertiesChanged, The "PropertiesChanged" signal
 

-
org.freedesktop.NetworkManager.Device.OvsPort:Slaves, The "Slaves" property
+
org.freedesktop.NetworkManager.Device.OvsPort:Slaves, The "Slaves" property
 

-
org.freedesktop.NetworkManager.Device.Ppp, org.freedesktop.NetworkManager.Device.Ppp
+
org.freedesktop.NetworkManager.Device.Ppp, org.freedesktop.NetworkManager.Device.Ppp
 

-
org.freedesktop.NetworkManager.Device.Ppp::PropertiesChanged, The "PropertiesChanged" signal
+
org.freedesktop.NetworkManager.Device.Ppp::PropertiesChanged, The "PropertiesChanged" signal
 

-
org.freedesktop.NetworkManager.Device.Reapply(), The Reapply() method
+
org.freedesktop.NetworkManager.Device.Reapply(), The Reapply() method
 

-
org.freedesktop.NetworkManager.Device.Statistics, org.freedesktop.NetworkManager.Device.Statistics
+
org.freedesktop.NetworkManager.Device.Statistics, org.freedesktop.NetworkManager.Device.Statistics
 

-
org.freedesktop.NetworkManager.Device.Statistics::PropertiesChanged, The "PropertiesChanged" signal
+
org.freedesktop.NetworkManager.Device.Statistics::PropertiesChanged, The "PropertiesChanged" signal
 

-
org.freedesktop.NetworkManager.Device.Statistics:RefreshRateMs, The "RefreshRateMs" property
+
org.freedesktop.NetworkManager.Device.Statistics:RefreshRateMs, The "RefreshRateMs" property
 

-
org.freedesktop.NetworkManager.Device.Statistics:RxBytes, The "RxBytes" property
+
org.freedesktop.NetworkManager.Device.Statistics:RxBytes, The "RxBytes" property
 

-
org.freedesktop.NetworkManager.Device.Statistics:TxBytes, The "TxBytes" property
+
org.freedesktop.NetworkManager.Device.Statistics:TxBytes, The "TxBytes" property
 

-
org.freedesktop.NetworkManager.Device.Team, org.freedesktop.NetworkManager.Device.Team
+
org.freedesktop.NetworkManager.Device.Team, org.freedesktop.NetworkManager.Device.Team
 

-
org.freedesktop.NetworkManager.Device.Team::PropertiesChanged, The "PropertiesChanged" signal
+
org.freedesktop.NetworkManager.Device.Team::PropertiesChanged, The "PropertiesChanged" signal
 

-
org.freedesktop.NetworkManager.Device.Team:Carrier, The "Carrier" property
+
org.freedesktop.NetworkManager.Device.Team:Carrier, The "Carrier" property
 

-
org.freedesktop.NetworkManager.Device.Team:Config, The "Config" property
+
org.freedesktop.NetworkManager.Device.Team:Config, The "Config" property
 

-
org.freedesktop.NetworkManager.Device.Team:HwAddress, The "HwAddress" property
+
org.freedesktop.NetworkManager.Device.Team:HwAddress, The "HwAddress" property
 

-
org.freedesktop.NetworkManager.Device.Team:Slaves, The "Slaves" property
+
org.freedesktop.NetworkManager.Device.Team:Slaves, The "Slaves" property
 

-
org.freedesktop.NetworkManager.Device.Tun, org.freedesktop.NetworkManager.Device.Tun
+
org.freedesktop.NetworkManager.Device.Tun, org.freedesktop.NetworkManager.Device.Tun
 

-
org.freedesktop.NetworkManager.Device.Tun::PropertiesChanged, The "PropertiesChanged" signal
+
org.freedesktop.NetworkManager.Device.Tun::PropertiesChanged, The "PropertiesChanged" signal
 

-
org.freedesktop.NetworkManager.Device.Tun:Group, The "Group" property
+
org.freedesktop.NetworkManager.Device.Tun:Group, The "Group" property
 

-
org.freedesktop.NetworkManager.Device.Tun:HwAddress, The "HwAddress" property
+
org.freedesktop.NetworkManager.Device.Tun:HwAddress, The "HwAddress" property
 

-
org.freedesktop.NetworkManager.Device.Tun:Mode, The "Mode" property
+
org.freedesktop.NetworkManager.Device.Tun:Mode, The "Mode" property
 

-
org.freedesktop.NetworkManager.Device.Tun:MultiQueue, The "MultiQueue" property
+
org.freedesktop.NetworkManager.Device.Tun:MultiQueue, The "MultiQueue" property
 

-
org.freedesktop.NetworkManager.Device.Tun:NoPi, The "NoPi" property
+
org.freedesktop.NetworkManager.Device.Tun:NoPi, The "NoPi" property
 

-
org.freedesktop.NetworkManager.Device.Tun:Owner, The "Owner" property
+
org.freedesktop.NetworkManager.Device.Tun:Owner, The "Owner" property
 

-
org.freedesktop.NetworkManager.Device.Tun:VnetHdr, The "VnetHdr" property
+
org.freedesktop.NetworkManager.Device.Tun:VnetHdr, The "VnetHdr" property
 

-
org.freedesktop.NetworkManager.Device.Veth, org.freedesktop.NetworkManager.Device.Veth
+
org.freedesktop.NetworkManager.Device.Veth, org.freedesktop.NetworkManager.Device.Veth
 

-
org.freedesktop.NetworkManager.Device.Veth::PropertiesChanged, The "PropertiesChanged" signal
+
org.freedesktop.NetworkManager.Device.Veth::PropertiesChanged, The "PropertiesChanged" signal
 

-
org.freedesktop.NetworkManager.Device.Veth:Peer, The "Peer" property
+
org.freedesktop.NetworkManager.Device.Veth:Peer, The "Peer" property
 

-
org.freedesktop.NetworkManager.Device.Vlan, org.freedesktop.NetworkManager.Device.Vlan
+
org.freedesktop.NetworkManager.Device.Vlan, org.freedesktop.NetworkManager.Device.Vlan
 

-
org.freedesktop.NetworkManager.Device.Vlan::PropertiesChanged, The "PropertiesChanged" signal
+
org.freedesktop.NetworkManager.Device.Vlan::PropertiesChanged, The "PropertiesChanged" signal
 

-
org.freedesktop.NetworkManager.Device.Vlan:Carrier, The "Carrier" property
+
org.freedesktop.NetworkManager.Device.Vlan:Carrier, The "Carrier" property
 

-
org.freedesktop.NetworkManager.Device.Vlan:HwAddress, The "HwAddress" property
+
org.freedesktop.NetworkManager.Device.Vlan:HwAddress, The "HwAddress" property
 

-
org.freedesktop.NetworkManager.Device.Vlan:Parent, The "Parent" property
+
org.freedesktop.NetworkManager.Device.Vlan:Parent, The "Parent" property
 

-
org.freedesktop.NetworkManager.Device.Vlan:VlanId, The "VlanId" property
+
org.freedesktop.NetworkManager.Device.Vlan:VlanId, The "VlanId" property
 

-
org.freedesktop.NetworkManager.Device.Vxlan, org.freedesktop.NetworkManager.Device.Vxlan
+
org.freedesktop.NetworkManager.Device.Vxlan, org.freedesktop.NetworkManager.Device.Vxlan
 

-
org.freedesktop.NetworkManager.Device.Vxlan::PropertiesChanged, The "PropertiesChanged" signal
+
org.freedesktop.NetworkManager.Device.Vxlan::PropertiesChanged, The "PropertiesChanged" signal
 

-
org.freedesktop.NetworkManager.Device.Vxlan:Ageing, The "Ageing" property
+
org.freedesktop.NetworkManager.Device.Vxlan:Ageing, The "Ageing" property
 

-
org.freedesktop.NetworkManager.Device.Vxlan:DstPort, The "DstPort" property
+
org.freedesktop.NetworkManager.Device.Vxlan:DstPort, The "DstPort" property
 

-
org.freedesktop.NetworkManager.Device.Vxlan:Group, The "Group" property
+
org.freedesktop.NetworkManager.Device.Vxlan:Group, The "Group" property
 

-
org.freedesktop.NetworkManager.Device.Vxlan:HwAddress, The "HwAddress" property
+
org.freedesktop.NetworkManager.Device.Vxlan:HwAddress, The "HwAddress" property
 

-
org.freedesktop.NetworkManager.Device.Vxlan:Id, The "Id" property
+
org.freedesktop.NetworkManager.Device.Vxlan:Id, The "Id" property
 

-
org.freedesktop.NetworkManager.Device.Vxlan:L2miss, The "L2miss" property
+
org.freedesktop.NetworkManager.Device.Vxlan:L2miss, The "L2miss" property
 

-
org.freedesktop.NetworkManager.Device.Vxlan:L3miss, The "L3miss" property
+
org.freedesktop.NetworkManager.Device.Vxlan:L3miss, The "L3miss" property
 

-
org.freedesktop.NetworkManager.Device.Vxlan:Learning, The "Learning" property
+
org.freedesktop.NetworkManager.Device.Vxlan:Learning, The "Learning" property
 

-
org.freedesktop.NetworkManager.Device.Vxlan:Limit, The "Limit" property
+
org.freedesktop.NetworkManager.Device.Vxlan:Limit, The "Limit" property
 

-
org.freedesktop.NetworkManager.Device.Vxlan:Local, The "Local" property
+
org.freedesktop.NetworkManager.Device.Vxlan:Local, The "Local" property
 

-
org.freedesktop.NetworkManager.Device.Vxlan:Parent, The "Parent" property
+
org.freedesktop.NetworkManager.Device.Vxlan:Parent, The "Parent" property
 

-
org.freedesktop.NetworkManager.Device.Vxlan:Proxy, The "Proxy" property
+
org.freedesktop.NetworkManager.Device.Vxlan:Proxy, The "Proxy" property
 

-
org.freedesktop.NetworkManager.Device.Vxlan:Rsc, The "Rsc" property
+
org.freedesktop.NetworkManager.Device.Vxlan:Rsc, The "Rsc" property
 

-
org.freedesktop.NetworkManager.Device.Vxlan:SrcPortMax, The "SrcPortMax" property
+
org.freedesktop.NetworkManager.Device.Vxlan:SrcPortMax, The "SrcPortMax" property
 

-
org.freedesktop.NetworkManager.Device.Vxlan:SrcPortMin, The "SrcPortMin" property
+
org.freedesktop.NetworkManager.Device.Vxlan:SrcPortMin, The "SrcPortMin" property
 

-
org.freedesktop.NetworkManager.Device.Vxlan:Tos, The "Tos" property
+
org.freedesktop.NetworkManager.Device.Vxlan:Tos, The "Tos" property
 

-
org.freedesktop.NetworkManager.Device.Vxlan:Ttl, The "Ttl" property
+
org.freedesktop.NetworkManager.Device.Vxlan:Ttl, The "Ttl" property
 

-
org.freedesktop.NetworkManager.Device.WireGuard, org.freedesktop.NetworkManager.Device.WireGuard
+
org.freedesktop.NetworkManager.Device.WireGuard, org.freedesktop.NetworkManager.Device.WireGuard
 

-
org.freedesktop.NetworkManager.Device.WireGuard:FwMark, The "FwMark" property
+
org.freedesktop.NetworkManager.Device.WireGuard:FwMark, The "FwMark" property
 

-
org.freedesktop.NetworkManager.Device.WireGuard:ListenPort, The "ListenPort" property
+
org.freedesktop.NetworkManager.Device.WireGuard:ListenPort, The "ListenPort" property
 

-
org.freedesktop.NetworkManager.Device.WireGuard:PublicKey, The "PublicKey" property
+
org.freedesktop.NetworkManager.Device.WireGuard:PublicKey, The "PublicKey" property
 

-
org.freedesktop.NetworkManager.Device.Wpan, org.freedesktop.NetworkManager.Device.Wpan
+
org.freedesktop.NetworkManager.Device.Wpan, org.freedesktop.NetworkManager.Device.Wpan
 

-
org.freedesktop.NetworkManager.Device.Wpan:HwAddress, The "HwAddress" property
+
org.freedesktop.NetworkManager.Device.Wpan:HwAddress, The "HwAddress" property
 

-
org.freedesktop.NetworkManager.Device::StateChanged, The "StateChanged" signal
+
org.freedesktop.NetworkManager.Device::StateChanged, The "StateChanged" signal
 

-
org.freedesktop.NetworkManager.Device:ActiveConnection, The "ActiveConnection" property
+
org.freedesktop.NetworkManager.Device:ActiveConnection, The "ActiveConnection" property
 

-
org.freedesktop.NetworkManager.Device:Autoconnect, The "Autoconnect" property
+
org.freedesktop.NetworkManager.Device:Autoconnect, The "Autoconnect" property
 

-
org.freedesktop.NetworkManager.Device:AvailableConnections, The "AvailableConnections" property
+
org.freedesktop.NetworkManager.Device:AvailableConnections, The "AvailableConnections" property
 

-
org.freedesktop.NetworkManager.Device:Capabilities, The "Capabilities" property
+
org.freedesktop.NetworkManager.Device:Capabilities, The "Capabilities" property
 

-
org.freedesktop.NetworkManager.Device:DeviceType, The "DeviceType" property
+
org.freedesktop.NetworkManager.Device:DeviceType, The "DeviceType" property
 

-
org.freedesktop.NetworkManager.Device:Dhcp4Config, The "Dhcp4Config" property
+
org.freedesktop.NetworkManager.Device:Dhcp4Config, The "Dhcp4Config" property
 

-
org.freedesktop.NetworkManager.Device:Dhcp6Config, The "Dhcp6Config" property
+
org.freedesktop.NetworkManager.Device:Dhcp6Config, The "Dhcp6Config" property
 

-
org.freedesktop.NetworkManager.Device:Driver, The "Driver" property
+
org.freedesktop.NetworkManager.Device:Driver, The "Driver" property
 

-
org.freedesktop.NetworkManager.Device:DriverVersion, The "DriverVersion" property
+
org.freedesktop.NetworkManager.Device:DriverVersion, The "DriverVersion" property
 

-
org.freedesktop.NetworkManager.Device:FirmwareMissing, The "FirmwareMissing" property
+
org.freedesktop.NetworkManager.Device:FirmwareMissing, The "FirmwareMissing" property
 

-
org.freedesktop.NetworkManager.Device:FirmwareVersion, The "FirmwareVersion" property
+
org.freedesktop.NetworkManager.Device:FirmwareVersion, The "FirmwareVersion" property
 

-
org.freedesktop.NetworkManager.Device:Interface, The "Interface" property
+
org.freedesktop.NetworkManager.Device:Interface, The "Interface" property
 

-
org.freedesktop.NetworkManager.Device:Ip4Address, The "Ip4Address" property
+
org.freedesktop.NetworkManager.Device:Ip4Address, The "Ip4Address" property
 

-
org.freedesktop.NetworkManager.Device:Ip4Config, The "Ip4Config" property
+
org.freedesktop.NetworkManager.Device:Ip4Config, The "Ip4Config" property
 

-
org.freedesktop.NetworkManager.Device:Ip6Config, The "Ip6Config" property
+
org.freedesktop.NetworkManager.Device:Ip4Connectivity, The "Ip4Connectivity" property
 

-
org.freedesktop.NetworkManager.Device:IpInterface, The "IpInterface" property
+
org.freedesktop.NetworkManager.Device:Ip6Config, The "Ip6Config" property
 

-
org.freedesktop.NetworkManager.Device:LldpNeighbors, The "LldpNeighbors" property
+
org.freedesktop.NetworkManager.Device:Ip6Connectivity, The "Ip6Connectivity" property
 

-
org.freedesktop.NetworkManager.Device:Managed, The "Managed" property
+
org.freedesktop.NetworkManager.Device:IpInterface, The "IpInterface" property
 

-
org.freedesktop.NetworkManager.Device:Metered, The "Metered" property
+
org.freedesktop.NetworkManager.Device:LldpNeighbors, The "LldpNeighbors" property
 

-
org.freedesktop.NetworkManager.Device:Mtu, The "Mtu" property
+
org.freedesktop.NetworkManager.Device:Managed, The "Managed" property
 

-
org.freedesktop.NetworkManager.Device:NmPluginMissing, The "NmPluginMissing" property
+
org.freedesktop.NetworkManager.Device:Metered, The "Metered" property
 

-
org.freedesktop.NetworkManager.Device:PhysicalPortId, The "PhysicalPortId" property
+
org.freedesktop.NetworkManager.Device:Mtu, The "Mtu" property
 

-
org.freedesktop.NetworkManager.Device:Real, The "Real" property
+
org.freedesktop.NetworkManager.Device:NmPluginMissing, The "NmPluginMissing" property
 

-
org.freedesktop.NetworkManager.Device:State, The "State" property
+
org.freedesktop.NetworkManager.Device:PhysicalPortId, The "PhysicalPortId" property
 

-
org.freedesktop.NetworkManager.Device:StateReason, The "StateReason" property
+
org.freedesktop.NetworkManager.Device:Real, The "Real" property
 

-
org.freedesktop.NetworkManager.Device:Udi, The "Udi" property
+
org.freedesktop.NetworkManager.Device:State, The "State" property
 

-
org.freedesktop.NetworkManager.DnsManager, org.freedesktop.NetworkManager.DnsManager
+
org.freedesktop.NetworkManager.Device:StateReason, The "StateReason" property
 

-
org.freedesktop.NetworkManager.DnsManager:Configuration, The "Configuration" property
+
org.freedesktop.NetworkManager.Device:Udi, The "Udi" property
 

-
org.freedesktop.NetworkManager.DnsManager:Mode, The "Mode" property
+
org.freedesktop.NetworkManager.DnsManager, org.freedesktop.NetworkManager.DnsManager
 

-
org.freedesktop.NetworkManager.DnsManager:RcManager, The "RcManager" property
+
org.freedesktop.NetworkManager.DnsManager:Configuration, The "Configuration" property
 

-
org.freedesktop.NetworkManager.IP4Config, org.freedesktop.NetworkManager.IP4Config
+
org.freedesktop.NetworkManager.DnsManager:Mode, The "Mode" property
 

-
org.freedesktop.NetworkManager.IP4Config::PropertiesChanged, The "PropertiesChanged" signal
+
org.freedesktop.NetworkManager.DnsManager:RcManager, The "RcManager" property
 

-
org.freedesktop.NetworkManager.IP4Config:AddressData, The "AddressData" property
+
org.freedesktop.NetworkManager.IP4Config, org.freedesktop.NetworkManager.IP4Config
 

-
org.freedesktop.NetworkManager.IP4Config:Addresses, The "Addresses" property
+
org.freedesktop.NetworkManager.IP4Config::PropertiesChanged, The "PropertiesChanged" signal
 

-
org.freedesktop.NetworkManager.IP4Config:DnsOptions, The "DnsOptions" property
+
org.freedesktop.NetworkManager.IP4Config:AddressData, The "AddressData" property
 

-
org.freedesktop.NetworkManager.IP4Config:DnsPriority, The "DnsPriority" property
+
org.freedesktop.NetworkManager.IP4Config:Addresses, The "Addresses" property
 

-
org.freedesktop.NetworkManager.IP4Config:Domains, The "Domains" property
+
org.freedesktop.NetworkManager.IP4Config:DnsOptions, The "DnsOptions" property
 

-
org.freedesktop.NetworkManager.IP4Config:Gateway, The "Gateway" property
+
org.freedesktop.NetworkManager.IP4Config:DnsPriority, The "DnsPriority" property
 

-
org.freedesktop.NetworkManager.IP4Config:NameserverData, The "NameserverData" property
+
org.freedesktop.NetworkManager.IP4Config:Domains, The "Domains" property
 

-
org.freedesktop.NetworkManager.IP4Config:Nameservers, The "Nameservers" property
+
org.freedesktop.NetworkManager.IP4Config:Gateway, The "Gateway" property
 

-
org.freedesktop.NetworkManager.IP4Config:RouteData, The "RouteData" property
+
org.freedesktop.NetworkManager.IP4Config:NameserverData, The "NameserverData" property
 

-
org.freedesktop.NetworkManager.IP4Config:Routes, The "Routes" property
+
org.freedesktop.NetworkManager.IP4Config:Nameservers, The "Nameservers" property
 

-
org.freedesktop.NetworkManager.IP4Config:Searches, The "Searches" property
+
org.freedesktop.NetworkManager.IP4Config:RouteData, The "RouteData" property
 

-
org.freedesktop.NetworkManager.IP4Config:WinsServerData, The "WinsServerData" property
+
org.freedesktop.NetworkManager.IP4Config:Routes, The "Routes" property
 

-
org.freedesktop.NetworkManager.IP4Config:WinsServers, The "WinsServers" property
+
org.freedesktop.NetworkManager.IP4Config:Searches, The "Searches" property
 

-
org.freedesktop.NetworkManager.IP6Config, org.freedesktop.NetworkManager.IP6Config
+
org.freedesktop.NetworkManager.IP4Config:WinsServerData, The "WinsServerData" property
 

-
org.freedesktop.NetworkManager.IP6Config::PropertiesChanged, The "PropertiesChanged" signal
+
org.freedesktop.NetworkManager.IP4Config:WinsServers, The "WinsServers" property
 

-
org.freedesktop.NetworkManager.IP6Config:AddressData, The "AddressData" property
+
org.freedesktop.NetworkManager.IP6Config, org.freedesktop.NetworkManager.IP6Config
 

-
org.freedesktop.NetworkManager.IP6Config:Addresses, The "Addresses" property
+
org.freedesktop.NetworkManager.IP6Config::PropertiesChanged, The "PropertiesChanged" signal
 

-
org.freedesktop.NetworkManager.IP6Config:DnsOptions, The "DnsOptions" property
+
org.freedesktop.NetworkManager.IP6Config:AddressData, The "AddressData" property
 

-
org.freedesktop.NetworkManager.IP6Config:DnsPriority, The "DnsPriority" property
+
org.freedesktop.NetworkManager.IP6Config:Addresses, The "Addresses" property
 

-
org.freedesktop.NetworkManager.IP6Config:Domains, The "Domains" property
+
org.freedesktop.NetworkManager.IP6Config:DnsOptions, The "DnsOptions" property
 

-
org.freedesktop.NetworkManager.IP6Config:Gateway, The "Gateway" property
+
org.freedesktop.NetworkManager.IP6Config:DnsPriority, The "DnsPriority" property
 

-
org.freedesktop.NetworkManager.IP6Config:Nameservers, The "Nameservers" property
+
org.freedesktop.NetworkManager.IP6Config:Domains, The "Domains" property
 

-
org.freedesktop.NetworkManager.IP6Config:RouteData, The "RouteData" property
+
org.freedesktop.NetworkManager.IP6Config:Gateway, The "Gateway" property
 

-
org.freedesktop.NetworkManager.IP6Config:Routes, The "Routes" property
+
org.freedesktop.NetworkManager.IP6Config:Nameservers, The "Nameservers" property
 

-
org.freedesktop.NetworkManager.IP6Config:Searches, The "Searches" property
+
org.freedesktop.NetworkManager.IP6Config:RouteData, The "RouteData" property
 

-
org.freedesktop.NetworkManager.SecretAgent, org.freedesktop.NetworkManager.SecretAgent
+
org.freedesktop.NetworkManager.IP6Config:Routes, The "Routes" property
 

-
org.freedesktop.NetworkManager.SecretAgent.CancelGetSecrets(), The CancelGetSecrets() method
+
org.freedesktop.NetworkManager.IP6Config:Searches, The "Searches" property
 

-
org.freedesktop.NetworkManager.SecretAgent.DeleteSecrets(), The DeleteSecrets() method
+
org.freedesktop.NetworkManager.SecretAgent, org.freedesktop.NetworkManager.SecretAgent
 

-
org.freedesktop.NetworkManager.SecretAgent.GetSecrets(), The GetSecrets() method
+
org.freedesktop.NetworkManager.SecretAgent.CancelGetSecrets(), The CancelGetSecrets() method
 

-
org.freedesktop.NetworkManager.SecretAgent.SaveSecrets(), The SaveSecrets() method
+
org.freedesktop.NetworkManager.SecretAgent.DeleteSecrets(), The DeleteSecrets() method
 

-
org.freedesktop.NetworkManager.Settings, org.freedesktop.NetworkManager.Settings
+
org.freedesktop.NetworkManager.SecretAgent.GetSecrets(), The GetSecrets() method
 

-
org.freedesktop.NetworkManager.Settings.AddConnection(), The AddConnection() method
+
org.freedesktop.NetworkManager.SecretAgent.SaveSecrets(), The SaveSecrets() method
 

-
org.freedesktop.NetworkManager.Settings.AddConnectionUnsaved(), The AddConnectionUnsaved() method
+
org.freedesktop.NetworkManager.Settings, org.freedesktop.NetworkManager.Settings
 

-
org.freedesktop.NetworkManager.Settings.Connection, org.freedesktop.NetworkManager.Settings.Connection
+
org.freedesktop.NetworkManager.Settings.AddConnection(), The AddConnection() method
 

-
org.freedesktop.NetworkManager.Settings.Connection.ClearSecrets(), The ClearSecrets() method
+
org.freedesktop.NetworkManager.Settings.AddConnectionUnsaved(), The AddConnectionUnsaved() method
 

-
org.freedesktop.NetworkManager.Settings.Connection.Delete(), The Delete() method
+
org.freedesktop.NetworkManager.Settings.Connection, org.freedesktop.NetworkManager.Settings.Connection
 

-
org.freedesktop.NetworkManager.Settings.Connection.GetSecrets(), The GetSecrets() method
+
org.freedesktop.NetworkManager.Settings.Connection.ClearSecrets(), The ClearSecrets() method
 

-
org.freedesktop.NetworkManager.Settings.Connection.GetSettings(), The GetSettings() method
+
org.freedesktop.NetworkManager.Settings.Connection.Delete(), The Delete() method
 

-
org.freedesktop.NetworkManager.Settings.Connection.Save(), The Save() method
+
org.freedesktop.NetworkManager.Settings.Connection.GetSecrets(), The GetSecrets() method
 

-
org.freedesktop.NetworkManager.Settings.Connection.Update(), The Update() method
+
org.freedesktop.NetworkManager.Settings.Connection.GetSettings(), The GetSettings() method
 

-
org.freedesktop.NetworkManager.Settings.Connection.Update2(), The Update2() method
+
org.freedesktop.NetworkManager.Settings.Connection.Save(), The Save() method
 

-
org.freedesktop.NetworkManager.Settings.Connection.UpdateUnsaved(), The UpdateUnsaved() method
+
org.freedesktop.NetworkManager.Settings.Connection.Update(), The Update() method
 

-
org.freedesktop.NetworkManager.Settings.Connection::PropertiesChanged, The "PropertiesChanged" signal
+
org.freedesktop.NetworkManager.Settings.Connection.Update2(), The Update2() method
 

-
org.freedesktop.NetworkManager.Settings.Connection::Removed, The "Removed" signal
+
org.freedesktop.NetworkManager.Settings.Connection.UpdateUnsaved(), The UpdateUnsaved() method
 

-
org.freedesktop.NetworkManager.Settings.Connection::Updated, The "Updated" signal
+
org.freedesktop.NetworkManager.Settings.Connection::PropertiesChanged, The "PropertiesChanged" signal
 

-
org.freedesktop.NetworkManager.Settings.Connection:Filename, The "Filename" property
+
org.freedesktop.NetworkManager.Settings.Connection::Removed, The "Removed" signal
 

-
org.freedesktop.NetworkManager.Settings.Connection:Flags, The "Flags" property
+
org.freedesktop.NetworkManager.Settings.Connection::Updated, The "Updated" signal
 

-
org.freedesktop.NetworkManager.Settings.Connection:Unsaved, The "Unsaved" property
+
org.freedesktop.NetworkManager.Settings.Connection:Filename, The "Filename" property
 

-
org.freedesktop.NetworkManager.Settings.GetConnectionByUuid(), The GetConnectionByUuid() method
+
org.freedesktop.NetworkManager.Settings.Connection:Flags, The "Flags" property
 

-
org.freedesktop.NetworkManager.Settings.ListConnections(), The ListConnections() method
+
org.freedesktop.NetworkManager.Settings.Connection:Unsaved, The "Unsaved" property
 

-
org.freedesktop.NetworkManager.Settings.LoadConnections(), The LoadConnections() method
+
org.freedesktop.NetworkManager.Settings.GetConnectionByUuid(), The GetConnectionByUuid() method
 

-
org.freedesktop.NetworkManager.Settings.ReloadConnections(), The ReloadConnections() method
+
org.freedesktop.NetworkManager.Settings.ListConnections(), The ListConnections() method
 

-
org.freedesktop.NetworkManager.Settings.SaveHostname(), The SaveHostname() method
+
org.freedesktop.NetworkManager.Settings.LoadConnections(), The LoadConnections() method
 

-
org.freedesktop.NetworkManager.Settings::ConnectionRemoved, The "ConnectionRemoved" signal
+
org.freedesktop.NetworkManager.Settings.ReloadConnections(), The ReloadConnections() method
 

-
org.freedesktop.NetworkManager.Settings::NewConnection, The "NewConnection" signal
+
org.freedesktop.NetworkManager.Settings.SaveHostname(), The SaveHostname() method
 

-
org.freedesktop.NetworkManager.Settings::PropertiesChanged, The "PropertiesChanged" signal
+
org.freedesktop.NetworkManager.Settings::ConnectionRemoved, The "ConnectionRemoved" signal
 

-
org.freedesktop.NetworkManager.Settings:CanModify, The "CanModify" property
+
org.freedesktop.NetworkManager.Settings::NewConnection, The "NewConnection" signal
 

-
org.freedesktop.NetworkManager.Settings:Connections, The "Connections" property
+
org.freedesktop.NetworkManager.Settings::PropertiesChanged, The "PropertiesChanged" signal
 

-
org.freedesktop.NetworkManager.Settings:Hostname, The "Hostname" property
+
org.freedesktop.NetworkManager.Settings:CanModify, The "CanModify" property
+

+
org.freedesktop.NetworkManager.Settings:Connections, The "Connections" property
+

+
org.freedesktop.NetworkManager.Settings:Hostname, The "Hostname" property
 

 

 

 

 
A

 

-
org.freedesktop.NetworkManager.Connection.Active, org.freedesktop.NetworkManager.Connection.Active
+
org.freedesktop.NetworkManager.Connection.Active, org.freedesktop.NetworkManager.Connection.Active
 

-
org.freedesktop.NetworkManager.Connection.Active::PropertiesChanged, The "PropertiesChanged" signal
+
org.freedesktop.NetworkManager.Connection.Active::PropertiesChanged, The "PropertiesChanged" signal
 

-
org.freedesktop.NetworkManager.Connection.Active::StateChanged, The "StateChanged" signal
+
org.freedesktop.NetworkManager.Connection.Active::StateChanged, The "StateChanged" signal
 

-
org.freedesktop.NetworkManager.Connection.Active:Connection, The "Connection" property
+
org.freedesktop.NetworkManager.Connection.Active:Connection, The "Connection" property
 

-
org.freedesktop.NetworkManager.Connection.Active:Default, The "Default" property
+
org.freedesktop.NetworkManager.Connection.Active:Default, The "Default" property
 

-
org.freedesktop.NetworkManager.Connection.Active:Default6, The "Default6" property
+
org.freedesktop.NetworkManager.Connection.Active:Default6, The "Default6" property
 

-
org.freedesktop.NetworkManager.Connection.Active:Devices, The "Devices" property
+
org.freedesktop.NetworkManager.Connection.Active:Devices, The "Devices" property
 

-
org.freedesktop.NetworkManager.Connection.Active:Dhcp4Config, The "Dhcp4Config" property
+
org.freedesktop.NetworkManager.Connection.Active:Dhcp4Config, The "Dhcp4Config" property
 

-
org.freedesktop.NetworkManager.Connection.Active:Dhcp6Config, The "Dhcp6Config" property
+
org.freedesktop.NetworkManager.Connection.Active:Dhcp6Config, The "Dhcp6Config" property
 

-
org.freedesktop.NetworkManager.Connection.Active:Id, The "Id" property
+
org.freedesktop.NetworkManager.Connection.Active:Id, The "Id" property
 

-
org.freedesktop.NetworkManager.Connection.Active:Ip4Config, The "Ip4Config" property
+
org.freedesktop.NetworkManager.Connection.Active:Ip4Config, The "Ip4Config" property
 

-
org.freedesktop.NetworkManager.Connection.Active:Ip6Config, The "Ip6Config" property
+
org.freedesktop.NetworkManager.Connection.Active:Ip6Config, The "Ip6Config" property
 

-
org.freedesktop.NetworkManager.Connection.Active:Master, The "Master" property
+
org.freedesktop.NetworkManager.Connection.Active:Master, The "Master" property
 

-
org.freedesktop.NetworkManager.Connection.Active:SpecificObject, The "SpecificObject" property
+
org.freedesktop.NetworkManager.Connection.Active:SpecificObject, The "SpecificObject" property
 

-
org.freedesktop.NetworkManager.Connection.Active:State, The "State" property
+
org.freedesktop.NetworkManager.Connection.Active:State, The "State" property
 

-
org.freedesktop.NetworkManager.Connection.Active:StateFlags, The "StateFlags" property
+
org.freedesktop.NetworkManager.Connection.Active:StateFlags, The "StateFlags" property
 

-
org.freedesktop.NetworkManager.Connection.Active:Type, The "Type" property
+
org.freedesktop.NetworkManager.Connection.Active:Type, The "Type" property
 

-
org.freedesktop.NetworkManager.Connection.Active:Uuid, The "Uuid" property
+
org.freedesktop.NetworkManager.Connection.Active:Uuid, The "Uuid" property
 

-
org.freedesktop.NetworkManager.Connection.Active:Vpn, The "Vpn" property
+
org.freedesktop.NetworkManager.Connection.Active:Vpn, The "Vpn" property
 

-
addr-gen-mode, ipv6
+
addr-gen-mode, ipv6
 

-
address-data, ipv4, ipv6
+
address-data, ipv4, ipv6
 

-
addresses, ipv4, ipv6
+
addresses, ipv4, ipv6
 

-
ageing, vxlan
+
ageing, vxlan
 

-
ageing-time, bridge
+
ageing-time, bridge
 

-
altsubject-matches, 802-1x
+
altsubject-matches, 802-1x
 

-
anonymous-identity, 802-1x
+
anonymous-identity, 802-1x
 

-
apn, gsm
+
apn, gsm
 

-
app-fcoe-flags, dcb
+
app-fcoe-flags, dcb
 

-
app-fcoe-mode, dcb
+
app-fcoe-mode, dcb
 

-
app-fcoe-priority, dcb
+
app-fcoe-priority, dcb
 

-
app-fip-flags, dcb
+
app-fip-flags, dcb
 

-
app-fip-priority, dcb
+
app-fip-priority, dcb
 

-
app-iscsi-flags, dcb
+
app-iscsi-flags, dcb
 

-
app-iscsi-priority, dcb
+
app-iscsi-priority, dcb
 

-
assigned-mac-address, 802-3-ethernet, 802-11-wireless
+
assigned-mac-address, 802-3-ethernet, 802-11-wireless
 

-
auth-alg, 802-11-wireless-security
+
auth-alg, 802-11-wireless-security
 

-
auth-retries, connection
+
auth-retries, connection
 

-
auth-timeout, 802-1x
+
auth-timeout, 802-1x
 

-
auto-negotiate, 802-3-ethernet
+
auto-negotiate, 802-3-ethernet
 

-
autoconnect, connection
+
autoconnect, connection
 

-
autoconnect-priority, connection
+
autoconnect-priority, connection
 

-
autoconnect-retries, connection
+
autoconnect-retries, connection
 

-
autoconnect-slaves, connection
+
autoconnect-slaves, connection
 

-
autoprobe-drivers, sriov
+
autoprobe-drivers, sriov
 

 

 

 

 
B

 

-
band, 802-11-wireless
+
band, 802-11-wireless
 

-
baud, ppp, serial
+
baud, ppp, serial
 

-
bdaddr, bluetooth
+
bdaddr, bluetooth
 

-
bits, serial
+
bits, serial
 

-
bond-downdelay, ovs-port
+
bond-downdelay, ovs-port
 

-
bond-mode, ovs-port
+
bond-mode, ovs-port
 

-
bond-updelay, ovs-port
+
bond-updelay, ovs-port
 

-
browser-only, proxy
+
browser-only, proxy
 

-
bssid, 802-11-wireless
+
bssid, 802-11-wireless
 

 

 

 

 
C

 

-
ca-cert, 802-1x
+
ca-cert, 802-1x
 

-
ca-cert-password, 802-1x
+
ca-cert-password, 802-1x
 

-
ca-cert-password-flags, 802-1x
+
ca-cert-password-flags, 802-1x
 

-
ca-path, 802-1x
+
ca-path, 802-1x
 

-
channel, 802-11-olpc-mesh, 802-11-wireless
+
channel, 802-11-olpc-mesh, 802-11-wireless, wpan
 

-
org.freedesktop.NetworkManager.Checkpoint, org.freedesktop.NetworkManager.Checkpoint
+
org.freedesktop.NetworkManager.Checkpoint, org.freedesktop.NetworkManager.Checkpoint
 

-
org.freedesktop.NetworkManager.Checkpoint::PropertiesChanged, The "PropertiesChanged" signal
+
org.freedesktop.NetworkManager.Checkpoint::PropertiesChanged, The "PropertiesChanged" signal
 

-
org.freedesktop.NetworkManager.Checkpoint:Created, The "Created" property
+
org.freedesktop.NetworkManager.Checkpoint:Created, The "Created" property
 

-
org.freedesktop.NetworkManager.Checkpoint:Devices, The "Devices" property
+
org.freedesktop.NetworkManager.Checkpoint:Devices, The "Devices" property
 

-
org.freedesktop.NetworkManager.Checkpoint:RollbackTimeout, The "RollbackTimeout" property
+
org.freedesktop.NetworkManager.Checkpoint:RollbackTimeout, The "RollbackTimeout" property
 

-
client-cert, 802-1x
+
client-cert, 802-1x
 

-
client-cert-password, 802-1x
+
client-cert-password, 802-1x
 

-
client-cert-password-flags, 802-1x
+
client-cert-password-flags, 802-1x
 

-
cloned-mac-address, 802-3-ethernet, 802-11-wireless
+
cloned-mac-address, 802-3-ethernet, 802-11-wireless
 

-
config, team, team-port
+
config, team, team-port
 

-
crtscts, ppp
+
crtscts, ppp
 

 

 

 

 
D

 

-
dad-timeout, ipv4, ipv6
+
dad-timeout, ipv4, ipv6
+

+
data, user, vpn
+

+
destination-port, vxlan
+

+
device-id, gsm
+

+
org.freedesktop.NetworkManager.Device.Wired, org.freedesktop.NetworkManager.Device.Wired
+

+
org.freedesktop.NetworkManager.Device.Wired::PropertiesChanged, The "PropertiesChanged" signal
 

-
data, user, vpn
+
org.freedesktop.NetworkManager.Device.Wired:Carrier, The "Carrier" property
 

-
destination-port, vxlan
+
org.freedesktop.NetworkManager.Device.Wired:HwAddress, The "HwAddress" property
 

-
device-id, gsm
+
org.freedesktop.NetworkManager.Device.Wired:PermHwAddress, The "PermHwAddress" property
 

-
org.freedesktop.NetworkManager.Device.Wired, org.freedesktop.NetworkManager.Device.Wired
+
org.freedesktop.NetworkManager.Device.Wired:S390Subchannels, The "S390Subchannels" property
 

-
org.freedesktop.NetworkManager.Device.Wired::PropertiesChanged, The "PropertiesChanged" signal
+
org.freedesktop.NetworkManager.Device.Wired:Speed, The "Speed" property
 

-
org.freedesktop.NetworkManager.Device.Wired:Carrier, The "Carrier" property
+
org.freedesktop.NetworkManager.Device.Wireless, org.freedesktop.NetworkManager.Device.Wireless
 

-
org.freedesktop.NetworkManager.Device.Wired:HwAddress, The "HwAddress" property
+
org.freedesktop.NetworkManager.Device.Wireless.GetAccessPoints(), The GetAccessPoints() method
 

-
org.freedesktop.NetworkManager.Device.Wired:PermHwAddress, The "PermHwAddress" property
+
org.freedesktop.NetworkManager.Device.Wireless.GetAllAccessPoints(), The GetAllAccessPoints() method
 

-
org.freedesktop.NetworkManager.Device.Wired:S390Subchannels, The "S390Subchannels" property
+
org.freedesktop.NetworkManager.Device.Wireless.RequestScan(), The RequestScan() method
 

-
org.freedesktop.NetworkManager.Device.Wired:Speed, The "Speed" property
+
org.freedesktop.NetworkManager.Device.Wireless::AccessPointAdded, The "AccessPointAdded" signal
 

-
org.freedesktop.NetworkManager.Device.Wireless, org.freedesktop.NetworkManager.Device.Wireless
+
org.freedesktop.NetworkManager.Device.Wireless::AccessPointRemoved, The "AccessPointRemoved" signal
 

-
org.freedesktop.NetworkManager.Device.Wireless.GetAccessPoints(), The GetAccessPoints() method
+
org.freedesktop.NetworkManager.Device.Wireless::PropertiesChanged, The "PropertiesChanged" signal
 

-
org.freedesktop.NetworkManager.Device.Wireless.GetAllAccessPoints(), The GetAllAccessPoints() method
+
org.freedesktop.NetworkManager.Device.Wireless:AccessPoints, The "AccessPoints" property
 

-
org.freedesktop.NetworkManager.Device.Wireless.RequestScan(), The RequestScan() method
+
org.freedesktop.NetworkManager.Device.Wireless:ActiveAccessPoint, The "ActiveAccessPoint" property
 

-
org.freedesktop.NetworkManager.Device.Wireless::AccessPointAdded, The "AccessPointAdded" signal
+
org.freedesktop.NetworkManager.Device.Wireless:Bitrate, The "Bitrate" property
 

-
org.freedesktop.NetworkManager.Device.Wireless::AccessPointRemoved, The "AccessPointRemoved" signal
+
org.freedesktop.NetworkManager.Device.Wireless:HwAddress, The "HwAddress" property
 

-
org.freedesktop.NetworkManager.Device.Wireless::PropertiesChanged, The "PropertiesChanged" signal
+
org.freedesktop.NetworkManager.Device.Wireless:LastScan, The "LastScan" property
 

-
org.freedesktop.NetworkManager.Device.Wireless:AccessPoints, The "AccessPoints" property
+
org.freedesktop.NetworkManager.Device.Wireless:Mode, The "Mode" property
 

-
org.freedesktop.NetworkManager.Device.Wireless:ActiveAccessPoint, The "ActiveAccessPoint" property
+
org.freedesktop.NetworkManager.Device.Wireless:PermHwAddress, The "PermHwAddress" property
 

-
org.freedesktop.NetworkManager.Device.Wireless:Bitrate, The "Bitrate" property
+
org.freedesktop.NetworkManager.Device.Wireless:WirelessCapabilities, The "WirelessCapabilities" property
 

-
org.freedesktop.NetworkManager.Device.Wireless:HwAddress, The "HwAddress" property
+
org.freedesktop.NetworkManager.Device.WifiP2P, org.freedesktop.NetworkManager.Device.WifiP2P
 

-
org.freedesktop.NetworkManager.Device.Wireless:LastScan, The "LastScan" property
+
org.freedesktop.NetworkManager.Device.WifiP2P.StartFind(), The StartFind() method
 

-
org.freedesktop.NetworkManager.Device.Wireless:Mode, The "Mode" property
+
org.freedesktop.NetworkManager.Device.WifiP2P.StopFind(), The StopFind() method
 

-
org.freedesktop.NetworkManager.Device.Wireless:PermHwAddress, The "PermHwAddress" property
+
org.freedesktop.NetworkManager.Device.WifiP2P::PeerAdded, The "PeerAdded" signal
 

-
org.freedesktop.NetworkManager.Device.Wireless:WirelessCapabilities, The "WirelessCapabilities" property
+
org.freedesktop.NetworkManager.Device.WifiP2P::PeerRemoved, The "PeerRemoved" signal
 

-
dhcp-anycast-address, 802-11-olpc-mesh
+
org.freedesktop.NetworkManager.Device.WifiP2P:HwAddress, The "HwAddress" property
 

-
dhcp-client-id, ipv4
+
org.freedesktop.NetworkManager.Device.WifiP2P:Peers, The "Peers" property
 

-
dhcp-duid, ipv6
+
dhcp-anycast-address, 802-11-olpc-mesh
 

-
dhcp-fqdn, ipv4
+
dhcp-client-id, ipv4
 

-
dhcp-hostname, ipv4, ipv6
+
dhcp-duid, ipv6
 

-
dhcp-send-hostname, ipv4, ipv6
+
dhcp-fqdn, ipv4
 

-
dhcp-timeout, ipv4, ipv6
+
dhcp-hostname, ipv4, ipv6
 

-
org.freedesktop.NetworkManager.DHCP4Config, org.freedesktop.NetworkManager.DHCP4Config
+
dhcp-send-hostname, ipv4, ipv6
 

-
org.freedesktop.NetworkManager.DHCP4Config::PropertiesChanged, The "PropertiesChanged" signal
+
dhcp-timeout, ipv4, ipv6
 

-
org.freedesktop.NetworkManager.DHCP4Config:Options, The "Options" property
+
org.freedesktop.NetworkManager.DHCP4Config, org.freedesktop.NetworkManager.DHCP4Config
 

-
org.freedesktop.NetworkManager.DHCP6Config, org.freedesktop.NetworkManager.DHCP6Config
+
org.freedesktop.NetworkManager.DHCP4Config::PropertiesChanged, The "PropertiesChanged" signal
 

-
org.freedesktop.NetworkManager.DHCP6Config::PropertiesChanged, The "PropertiesChanged" signal
+
org.freedesktop.NetworkManager.DHCP4Config:Options, The "Options" property
 

-
org.freedesktop.NetworkManager.DHCP6Config:Options, The "Options" property
+
org.freedesktop.NetworkManager.DHCP6Config, org.freedesktop.NetworkManager.DHCP6Config
 

-
dns, ipv4, ipv6
+
org.freedesktop.NetworkManager.DHCP6Config::PropertiesChanged, The "PropertiesChanged" signal
 

-
dns-options, ipv4, ipv6
+
org.freedesktop.NetworkManager.DHCP6Config:Options, The "Options" property
 

-
dns-priority, ipv4, ipv6
+
dns, ipv4, ipv6
 

-
dns-search, ipv4, ipv6
+
dns-options, ipv4, ipv6
 

-
domain-suffix-match, 802-1x
+
dns-priority, ipv4, ipv6
 

-
duplex, 802-3-ethernet
+
dns-search, ipv4, ipv6
+

+
domain-suffix-match, 802-1x
+

+
duplex, 802-3-ethernet
 

 

 

 

 
E

 

-
eap, 802-1x
+
eap, 802-1x
 

-
egress-priority-map, vlan
+
egress-priority-map, vlan
 

-
encapsulation, adsl
+
encapsulation, adsl
 

-
encapsulation-limit, ip-tunnel
+
encapsulation-limit, ip-tunnel
 

-
encrypt, macsec
+
encrypt, macsec
 

 

 

 

 
F

 

-
fail-mode, ovs-bridge
+
fail-mode, ovs-bridge
 

-
fils, 802-11-wireless-security
+
fils, 802-11-wireless-security
 

-
flags, ip-tunnel, vlan
+
flags, ip-tunnel, vlan
 

-
flow-label, ip-tunnel
+
flow-label, ip-tunnel
 

-
forward-delay, bridge
+
forward-delay, bridge
+

+
fwmark, wireguard
 

 

 

 

 
G

 

-
gateway, ipv4, ipv6
+
gateway, ipv4, ipv6
 

-
gateway-ping-timeout, connection
+
gateway-ping-timeout, connection
 

-
generate-mac-address-mask, 802-3-ethernet, 802-11-wireless
+
generate-mac-address-mask, 802-3-ethernet, 802-11-wireless
 

-
group, tun, 802-11-wireless-security
+
group, tun, 802-11-wireless-security
 

-
group-forward-mask, bridge
+
group-forward-mask, bridge
 

 

 

 

 
H

 

-
hairpin-mode, bridge-port
+
hairpin-mode, bridge-port
 

-
hello-time, bridge
+
hello-time, bridge
 

-
hidden, 802-11-wireless
+
hidden, 802-11-wireless
 

-
home-only, gsm
+
home-only, gsm
 

 

 

 

 
I

 

-
id, connection, vlan, vxlan
+
id, connection, vlan, vxlan
 

-
identity, 802-1x
+
identity, 802-1x
 

-
ignore-auto-dns, ipv4, ipv6
+
ignore-auto-dns, ipv4, ipv6
 

-
ignore-auto-routes, ipv4, ipv6
+
ignore-auto-routes, ipv4, ipv6
 

-
ingress-priority-map, vlan
+
ingress-priority-map, vlan
 

-
input-key, ip-tunnel
+
input-key, ip-tunnel
 

-
interface-name, connection, bond, bridge, match, team, vlan
+
interface-name, connection, bond, bridge, match, team, vlan
 

-
ip6-privacy, ipv6
+
ip6-privacy, ipv6
 

 

 

 

 
K

-
key-mgmt, 802-11-wireless-security
+
key-mgmt, 802-11-wireless-security
 

 

 

 
L

 

-
l2-miss, vxlan
+
l2-miss, vxlan
+

+
l3-miss, vxlan
 

-
l3-miss, vxlan
+
lacp, ovs-port
 

-
lacp, ovs-port
+
lacp-key, team-port
 

-
lacp-key, team-port
+
lacp-prio, team-port
 

-
lacp-prio, team-port
+
lcp-echo-failure, ppp
 

-
lcp-echo-failure, ppp
+
lcp-echo-interval, ppp
 

-
lcp-echo-interval, ppp
+
leap-password, 802-11-wireless-security
 

-
leap-password, 802-11-wireless-security
+
leap-password-flags, 802-11-wireless-security
 

-
leap-password-flags, 802-11-wireless-security
+
leap-username, 802-11-wireless-security
 

-
leap-username, 802-11-wireless-security
+
learning, vxlan
 

-
learning, vxlan
+
limit, vxlan
 

-
limit, vxlan
+
link-watchers, team, team-port
 

-
link-watchers, team, team-port
+
listen-port, wireguard
 

-
lldp, connection
+
lldp, connection
 

-
llmnr, connection
+
llmnr, connection
 

-
local, ip-tunnel, vxlan
+
local, ip-tunnel, vxlan
 

 

 

 

 
M

 

-
mac-address, bridge, infiniband, wimax, 802-3-ethernet, 802-11-wireless, wpan
+
mac-address, bridge, infiniband, wimax, 802-3-ethernet, 802-11-wireless, wpan
 

-
mac-address-blacklist, 802-3-ethernet, 802-11-wireless
+
mac-address-blacklist, 802-3-ethernet, 802-11-wireless
 

-
mac-address-randomization, 802-11-wireless
+
mac-address-randomization, 802-11-wireless
 

-
org.freedesktop.NetworkManager, org.freedesktop.NetworkManager
+
org.freedesktop.NetworkManager, org.freedesktop.NetworkManager
 

-
org.freedesktop.NetworkManager.ActivateConnection(), The ActivateConnection() method
+
org.freedesktop.NetworkManager.ActivateConnection(), The ActivateConnection() method
 

-
org.freedesktop.NetworkManager.AddAndActivateConnection(), The AddAndActivateConnection() method
+
org.freedesktop.NetworkManager.AddAndActivateConnection(), The AddAndActivateConnection() method
 

-
org.freedesktop.NetworkManager.CheckConnectivity(), The CheckConnectivity() method
+
org.freedesktop.NetworkManager.AddAndActivateConnection2(), The AddAndActivateConnection2() method
 

-
org.freedesktop.NetworkManager.CheckpointAdjustRollbackTimeout(), The CheckpointAdjustRollbackTimeout() method
+
org.freedesktop.NetworkManager.CheckConnectivity(), The CheckConnectivity() method
 

-
org.freedesktop.NetworkManager.CheckpointCreate(), The CheckpointCreate() method
+
org.freedesktop.NetworkManager.CheckpointAdjustRollbackTimeout(), The CheckpointAdjustRollbackTimeout() method
 

-
org.freedesktop.NetworkManager.CheckpointDestroy(), The CheckpointDestroy() method
+
org.freedesktop.NetworkManager.CheckpointCreate(), The CheckpointCreate() method
 

-
org.freedesktop.NetworkManager.CheckpointRollback(), The CheckpointRollback() method
+
org.freedesktop.NetworkManager.CheckpointDestroy(), The CheckpointDestroy() method
 

-
org.freedesktop.NetworkManager.DeactivateConnection(), The DeactivateConnection() method
+
org.freedesktop.NetworkManager.CheckpointRollback(), The CheckpointRollback() method
 

-
org.freedesktop.NetworkManager.Enable(), The Enable() method
+
org.freedesktop.NetworkManager.DeactivateConnection(), The DeactivateConnection() method
 

-
org.freedesktop.NetworkManager.GetAllDevices(), The GetAllDevices() method
+
org.freedesktop.NetworkManager.Enable(), The Enable() method
 

-
org.freedesktop.NetworkManager.GetDeviceByIpIface(), The GetDeviceByIpIface() method
+
org.freedesktop.NetworkManager.GetAllDevices(), The GetAllDevices() method
 

-
org.freedesktop.NetworkManager.GetDevices(), The GetDevices() method
+
org.freedesktop.NetworkManager.GetDeviceByIpIface(), The GetDeviceByIpIface() method
 

-
org.freedesktop.NetworkManager.GetLogging(), The GetLogging() method
+
org.freedesktop.NetworkManager.GetDevices(), The GetDevices() method
 

-
org.freedesktop.NetworkManager.GetPermissions(), The GetPermissions() method
+
org.freedesktop.NetworkManager.GetLogging(), The GetLogging() method
 

-
org.freedesktop.NetworkManager.Reload(), The Reload() method
+
org.freedesktop.NetworkManager.GetPermissions(), The GetPermissions() method
 

-
org.freedesktop.NetworkManager.SetLogging(), The SetLogging() method
+
org.freedesktop.NetworkManager.Reload(), The Reload() method
 

-
org.freedesktop.NetworkManager.Sleep(), The Sleep() method
+
org.freedesktop.NetworkManager.SetLogging(), The SetLogging() method
 

-
org.freedesktop.NetworkManager.state(), The state() method
+
org.freedesktop.NetworkManager.Sleep(), The Sleep() method
 

-
org.freedesktop.NetworkManager::CheckPermissions, The "CheckPermissions" signal
+
org.freedesktop.NetworkManager.state(), The state() method
 

-
org.freedesktop.NetworkManager::DeviceAdded, The "DeviceAdded" signal
+
org.freedesktop.NetworkManager::CheckPermissions, The "CheckPermissions" signal
 

-
org.freedesktop.NetworkManager::DeviceRemoved, The "DeviceRemoved" signal
+
org.freedesktop.NetworkManager::DeviceAdded, The "DeviceAdded" signal
 

-
org.freedesktop.NetworkManager::PropertiesChanged, The "PropertiesChanged" signal
+
org.freedesktop.NetworkManager::DeviceRemoved, The "DeviceRemoved" signal
 

-
org.freedesktop.NetworkManager::StateChanged, The "StateChanged" signal
+
org.freedesktop.NetworkManager::PropertiesChanged, The "PropertiesChanged" signal
 

-
org.freedesktop.NetworkManager:ActivatingConnection, The "ActivatingConnection" property
+
org.freedesktop.NetworkManager::StateChanged, The "StateChanged" signal
 

-
org.freedesktop.NetworkManager:ActiveConnections, The "ActiveConnections" property
+
org.freedesktop.NetworkManager:ActivatingConnection, The "ActivatingConnection" property
 

-
org.freedesktop.NetworkManager:AllDevices, The "AllDevices" property
+
org.freedesktop.NetworkManager:ActiveConnections, The "ActiveConnections" property
 

-
org.freedesktop.NetworkManager:Capabilities, The "Capabilities" property
+
org.freedesktop.NetworkManager:AllDevices, The "AllDevices" property
 

-
org.freedesktop.NetworkManager:Checkpoints, The "Checkpoints" property
+
org.freedesktop.NetworkManager:Capabilities, The "Capabilities" property
 

-
org.freedesktop.NetworkManager:Connectivity, The "Connectivity" property
+
org.freedesktop.NetworkManager:Checkpoints, The "Checkpoints" property
 

-
org.freedesktop.NetworkManager:ConnectivityCheckAvailable, The "ConnectivityCheckAvailable" property
+
org.freedesktop.NetworkManager:Connectivity, The "Connectivity" property
 

-
org.freedesktop.NetworkManager:ConnectivityCheckEnabled, The "ConnectivityCheckEnabled" property
+
org.freedesktop.NetworkManager:ConnectivityCheckAvailable, The "ConnectivityCheckAvailable" property
 

-
org.freedesktop.NetworkManager:Devices, The "Devices" property
+
org.freedesktop.NetworkManager:ConnectivityCheckEnabled, The "ConnectivityCheckEnabled" property
 

-
org.freedesktop.NetworkManager:GlobalDnsConfiguration, The "GlobalDnsConfiguration" property
+
org.freedesktop.NetworkManager:Devices, The "Devices" property
 

-
org.freedesktop.NetworkManager:Metered, The "Metered" property
+
org.freedesktop.NetworkManager:GlobalDnsConfiguration, The "GlobalDnsConfiguration" property
 

-
org.freedesktop.NetworkManager:NetworkingEnabled, The "NetworkingEnabled" property
+
org.freedesktop.NetworkManager:Metered, The "Metered" property
 

-
org.freedesktop.NetworkManager:PrimaryConnection, The "PrimaryConnection" property
+
org.freedesktop.NetworkManager:NetworkingEnabled, The "NetworkingEnabled" property
 

-
org.freedesktop.NetworkManager:PrimaryConnectionType, The "PrimaryConnectionType" property
+
org.freedesktop.NetworkManager:PrimaryConnection, The "PrimaryConnection" property
 

-
org.freedesktop.NetworkManager:Startup, The "Startup" property
+
org.freedesktop.NetworkManager:PrimaryConnectionType, The "PrimaryConnectionType" property
 

-
org.freedesktop.NetworkManager:State, The "State" property
+
org.freedesktop.NetworkManager:Startup, The "Startup" property
 

-
org.freedesktop.NetworkManager:Version, The "Version" property
+
org.freedesktop.NetworkManager:State, The "State" property
 

-
org.freedesktop.NetworkManager:WimaxEnabled, The "WimaxEnabled" property
+
org.freedesktop.NetworkManager:Version, The "Version" property
 

-
org.freedesktop.NetworkManager:WimaxHardwareEnabled, The "WimaxHardwareEnabled" property
+
org.freedesktop.NetworkManager:WimaxEnabled, The "WimaxEnabled" property
 

-
org.freedesktop.NetworkManager:WirelessEnabled, The "WirelessEnabled" property
+
org.freedesktop.NetworkManager:WimaxHardwareEnabled, The "WimaxHardwareEnabled" property
 

-
org.freedesktop.NetworkManager:WirelessHardwareEnabled, The "WirelessHardwareEnabled" property
+
org.freedesktop.NetworkManager:WirelessEnabled, The "WirelessEnabled" property
 

-
org.freedesktop.NetworkManager:WwanEnabled, The "WwanEnabled" property
+
org.freedesktop.NetworkManager:WirelessHardwareEnabled, The "WirelessHardwareEnabled" property
 

-
org.freedesktop.NetworkManager:WwanHardwareEnabled, The "WwanHardwareEnabled" property
+
org.freedesktop.NetworkManager:WwanEnabled, The "WwanEnabled" property
 

-
master, connection
+
org.freedesktop.NetworkManager:WwanHardwareEnabled, The "WwanHardwareEnabled" property
 

-
max-age, bridge
+
master, connection
 

-
may-fail, ipv4, ipv6
+
max-age, bridge
 

-
mcast-rejoin-count, team
+
may-fail, ipv4, ipv6
 

-
mcast-rejoin-interval, team
+
mcast-rejoin-count, team
 

-
mcast-snooping-enable, ovs-bridge
+
mcast-rejoin-interval, team
 

-
mdns, connection
+
mcast-snooping-enable, ovs-bridge
 

-
metered, connection
+
mdns, connection
 

-
method, ipv4, ipv6, proxy
+
metered, connection
 

-
mka-cak, macsec
+
method, ipv4, ipv6, proxy
 

-
mka-cak-flags, macsec
+
mka-cak, macsec
 

-
mka-ckn, macsec
+
mka-cak-flags, macsec
 

-
mode, ip-tunnel, macsec, macvlan, tun, 802-11-wireless
+
mka-ckn, macsec
 

-
mppe-stateful, ppp
+
mode, ip-tunnel, macsec, macvlan, tun, 802-11-wireless
 

-
mru, ppp
+
mppe-stateful, ppp
 

-
mtu, cdma, gsm, infiniband, ip-tunnel, ppp, 802-3-ethernet, 802-11-wireless
+
mru, ppp
 

-
multi-connect, connection
+
mtu, cdma, gsm, infiniband, ip-tunnel, ppp, 802-3-ethernet, wireguard, 802-11-wireless
 

-
multi-queue, tun
+
multi-connect, connection
 

-
multicast-snooping, bridge
+
multi-queue, tun
+

+
multicast-snooping, bridge
 

 

 

 

 
N

 

-
network-id, gsm
+
network-id, gsm
 

-
network-name, wimax
+
network-name, wimax
 

-
never-default, ipv4, ipv6
+
never-default, ipv4, ipv6
 

-
NM80211ApFlags, enum NM80211ApFlags
+
NM80211ApFlags, enum NM80211ApFlags
 

-
NM80211ApSecurityFlags, enum NM80211ApSecurityFlags
+
NM80211ApSecurityFlags, enum NM80211ApSecurityFlags
 

-
NM80211Mode, enum NM80211Mode
+
NM80211Mode, enum NM80211Mode
 

-
NMActivationStateFlags, enum NMActivationStateFlags
+
NMActivationStateFlags, enum NMActivationStateFlags
 

-
NMActiveConnectionState, enum NMActiveConnectionState
+
NMActiveConnectionState, enum NMActiveConnectionState
 

-
NMActiveConnectionStateReason, enum NMActiveConnectionStateReason
+
NMActiveConnectionStateReason, enum NMActiveConnectionStateReason
 

-
NMBluetoothCapabilities, enum NMBluetoothCapabilities
+
NMBluetoothCapabilities, enum NMBluetoothCapabilities
 

-
NMCapability, enum NMCapability
+
NMCapability, enum NMCapability
 

-
NMCheckpointCreateFlags, enum NMCheckpointCreateFlags
+
NMCheckpointCreateFlags, enum NMCheckpointCreateFlags
 

-
NMConnectionMultiConnect, enum NMConnectionMultiConnect
+
NMConnectionMultiConnect, enum NMConnectionMultiConnect
 

-
NMConnectivityState, enum NMConnectivityState
+
NMConnectivityState, enum NMConnectivityState
 

-
NMDeviceCapabilities, enum NMDeviceCapabilities
+
NMDeviceCapabilities, enum NMDeviceCapabilities
 

-
NMDeviceModemCapabilities, enum NMDeviceModemCapabilities
+
NMDeviceModemCapabilities, enum NMDeviceModemCapabilities
 

-
NMDeviceState, enum NMDeviceState
+
NMDeviceState, enum NMDeviceState
 

-
NMDeviceStateReason, enum NMDeviceStateReason
+
NMDeviceStateReason, enum NMDeviceStateReason
 

-
NMDeviceType, enum NMDeviceType
+
NMDeviceType, enum NMDeviceType
 

-
NMDeviceWifiCapabilities, enum NMDeviceWifiCapabilities
+
NMDeviceWifiCapabilities, enum NMDeviceWifiCapabilities
 

-
NMIPTunnelMode, enum NMIPTunnelMode
+
NMIPTunnelMode, enum NMIPTunnelMode
 

-
NMMetered, enum NMMetered
+
NMMetered, enum NMMetered
 

-
NMRollbackResult, enum NMRollbackResult
+
NMRollbackResult, enum NMRollbackResult
 

-
NMSecretAgentCapabilities, enum NMSecretAgentCapabilities
+
NMSecretAgentCapabilities, enum NMSecretAgentCapabilities
 

-
NMSecretAgentGetSecretsFlags, enum NMSecretAgentGetSecretsFlags
+
NMSecretAgentGetSecretsFlags, enum NMSecretAgentGetSecretsFlags
 

-
NMSettingsConnectionFlags, enum NMSettingsConnectionFlags
+
NMSettingsConnectionFlags, enum NMSettingsConnectionFlags
 

-
NMSettingsUpdate2Flags, enum NMSettingsUpdate2Flags
+
NMSettingsUpdate2Flags, enum NMSettingsUpdate2Flags
 

-
NMState, enum NMState
+
NMState, enum NMState
 

-
NMTernary, enum NMTernary
+
NMTernary, enum NMTernary
 

-
NMVpnConnectionState, enum NMVpnConnectionState
+
NMVpnConnectionState, enum NMVpnConnectionState
 

-
NMVpnConnectionStateReason, enum NMVpnConnectionStateReason
+
NMVpnConnectionStateReason, enum NMVpnConnectionStateReason
 

-
NMVpnPluginFailure, enum NMVpnPluginFailure
+
NMVpnPluginFailure, enum NMVpnPluginFailure
 

-
NMVpnServiceState, enum NMVpnServiceState
+
NMVpnServiceState, enum NMVpnServiceState
 

-
NMWimaxNspNetworkType, enum NMWimaxNspNetworkType
+
NMWimaxNspNetworkType, enum NMWimaxNspNetworkType
 

-
no-vj-comp, ppp
+
no-vj-comp, ppp
 

-
noauth, ppp
+
noauth, ppp
 

-
nobsdcomp, ppp
+
nobsdcomp, ppp
 

-
nodeflate, ppp
+
nodeflate, ppp
 

-
notify-peers-count, team
+
notify-peers-count, team
 

-
notify-peers-interval, team
+
notify-peers-interval, team
 

-
number, cdma, gsm
+
number, cdma, gsm
 

 

 

 

 
O

 

-
options, bond
+
options, bond
 

-
output-key, ip-tunnel
+
output-key, ip-tunnel
 

-
owner, tun
+
owner, tun
 

 

 

 

 
P

 

-
p-key, infiniband
+
p-key, infiniband
+

+
pac-file, 802-1x
+

+
pac-script, proxy
 

-
pac-file, 802-1x
+
pac-url, proxy
 

-
pac-script, proxy
+
page, wpan
 

-
pac-url, proxy
+
pairwise, 802-11-wireless-security
 

-
pairwise, 802-11-wireless-security
+
pan-id, wpan
 

-
pan-id, wpan
+
parent, 6lowpan, infiniband, ip-tunnel, macsec, macvlan, pppoe, vlan, vxlan
 

-
parent, 6lowpan, infiniband, ip-tunnel, macsec, macvlan, pppoe, vlan, vxlan
+
parity, serial
 

-
parity, serial
+
password, 802-1x, adsl, cdma, gsm, pppoe
 

-
password, 802-1x, adsl, cdma, gsm, pppoe
+
password-flags, 802-1x, adsl, cdma, gsm, pppoe
 

-
password-flags, 802-1x, adsl, cdma, gsm, pppoe
+
password-raw, 802-1x
 

-
password-raw, 802-1x
+
password-raw-flags, 802-1x
 

-
password-raw-flags, 802-1x
+
path-cost, bridge-port
 

-
path-cost, bridge-port
+
path-mtu-discovery, ip-tunnel
 

-
path-mtu-discovery, ip-tunnel
+
peer, ovs-patch, wifi-p2p
 

-
peer, ovs-patch
+
peer-routes, wireguard
 

-
permissions, connection
+
peers, wireguard
 

-
persistent, vpn
+
permissions, connection
 

-
phase1-auth-flags, 802-1x
+
persistent, vpn
 

-
phase1-fast-provisioning, 802-1x
+
phase1-auth-flags, 802-1x
 

-
phase1-peaplabel, 802-1x
+
phase1-fast-provisioning, 802-1x
 

-
phase1-peapver, 802-1x
+
phase1-peaplabel, 802-1x
 

-
phase2-altsubject-matches, 802-1x
+
phase1-peapver, 802-1x
 

-
phase2-auth, 802-1x
+
phase2-altsubject-matches, 802-1x
 

-
phase2-autheap, 802-1x
+
phase2-auth, 802-1x
 

-
phase2-ca-cert, 802-1x
+
phase2-autheap, 802-1x
 

-
phase2-ca-cert-password, 802-1x
+
phase2-ca-cert, 802-1x
 

-
phase2-ca-cert-password-flags, 802-1x
+
phase2-ca-cert-password, 802-1x
 

-
phase2-ca-path, 802-1x
+
phase2-ca-cert-password-flags, 802-1x
 

-
phase2-client-cert, 802-1x
+
phase2-ca-path, 802-1x
 

-
phase2-client-cert-password, 802-1x
+
phase2-client-cert, 802-1x
 

-
phase2-client-cert-password-flags, 802-1x
+
phase2-client-cert-password, 802-1x
 

-
phase2-domain-suffix-match, 802-1x
+
phase2-client-cert-password-flags, 802-1x
 

-
phase2-private-key, 802-1x
+
phase2-domain-suffix-match, 802-1x
 

-
phase2-private-key-password, 802-1x
+
phase2-private-key, 802-1x
 

-
phase2-private-key-password-flags, 802-1x
+
phase2-private-key-password, 802-1x
 

-
phase2-subject-match, 802-1x
+
phase2-private-key-password-flags, 802-1x
 

-
pi, tun
+
phase2-subject-match, 802-1x
 

-
pin, 802-1x, gsm
+
pi, tun
 

-
pin-flags, 802-1x, gsm
+
pin, 802-1x, gsm
 

-
pmf, 802-11-wireless-security
+
pin-flags, 802-1x, gsm
 

-
port, macsec, 802-3-ethernet
+
pmf, 802-11-wireless-security
 

-
powersave, 802-11-wireless
+
port, macsec, 802-3-ethernet
 

-
org.freedesktop.NetworkManager.PPP, org.freedesktop.NetworkManager.PPP
+
powersave, 802-11-wireless
 

-
org.freedesktop.NetworkManager.PPP.NeedSecrets(), The NeedSecrets() method
+
org.freedesktop.NetworkManager.PPP, org.freedesktop.NetworkManager.PPP
 

-
org.freedesktop.NetworkManager.PPP.SetIfindex(), The SetIfindex() method
+
org.freedesktop.NetworkManager.PPP.NeedSecrets(), The NeedSecrets() method
 

-
org.freedesktop.NetworkManager.PPP.SetIp4Config(), The SetIp4Config() method
+
org.freedesktop.NetworkManager.PPP.SetIfindex(), The SetIfindex() method
 

-
org.freedesktop.NetworkManager.PPP.SetIp6Config(), The SetIp6Config() method
+
org.freedesktop.NetworkManager.PPP.SetIp4Config(), The SetIp4Config() method
 

-
org.freedesktop.NetworkManager.PPP.SetState(), The SetState() method
+
org.freedesktop.NetworkManager.PPP.SetIp6Config(), The SetIp6Config() method
 

-
prio, team-port
+
org.freedesktop.NetworkManager.PPP.SetState(), The SetState() method
 

-
priority, bridge, bridge-port
+
prio, team-port
 

-
priority-bandwidth, dcb
+
priority, bridge, bridge-port
 

-
priority-flow-control, dcb
+
priority-bandwidth, dcb
 

-
priority-flow-control-flags, dcb
+
priority-flow-control, dcb
 

-
priority-group-bandwidth, dcb
+
priority-flow-control-flags, dcb
 

-
priority-group-flags, dcb
+
priority-group-bandwidth, dcb
 

-
priority-group-id, dcb
+
priority-group-flags, dcb
 

-
priority-strict-bandwidth, dcb
+
priority-group-id, dcb
 

-
priority-traffic-class, dcb
+
priority-strict-bandwidth, dcb
 

-
private-key, 802-1x
+
priority-traffic-class, dcb
 

-
private-key-password, 802-1x
+
private-key, 802-1x, wireguard
 

-
private-key-password-flags, 802-1x
+
private-key-flags, wireguard
 

-
promiscuous, macvlan
+
private-key-password, 802-1x
 

-
proto, 802-11-wireless-security
+
private-key-password-flags, 802-1x
 

-
protocol, adsl
+
promiscuous, macvlan
 

-
proxy, vxlan
+
proto, 802-11-wireless-security
 

-
psk, 802-11-wireless-security
+
protocol, adsl
 

-
psk-flags, 802-11-wireless-security
+
proxy, vxlan
+

+
psk, 802-11-wireless-security
+

+
psk-flags, 802-11-wireless-security
 

 

 

 

 
Q

 

-
qdiscs, tc
+
qdiscs, tc
 

-
queue-id, team-port
+
queue-id, team-port
 

 

 

 

 
R

 

-
rate, 802-11-wireless
+
rate, 802-11-wireless
 

-
read-only, connection
+
read-only, connection
 

-
refuse-chap, ppp
+
refuse-chap, ppp
 

-
refuse-eap, ppp
+
refuse-eap, ppp
 

-
refuse-mschap, ppp
+
refuse-mschap, ppp
 

-
refuse-mschapv2, ppp
+
refuse-mschapv2, ppp
 

-
refuse-pap, ppp
+
refuse-pap, ppp
 

-
remote, ip-tunnel, vxlan
+
remote, ip-tunnel, vxlan
 

-
require-mppe, ppp
+
require-mppe, ppp
 

-
require-mppe-128, ppp
+
require-mppe-128, ppp
 

-
route-data, ipv4, ipv6
+
route-data, ipv4, ipv6
 

-
route-metric, ipv4, ipv6
+
route-metric, ipv4, ipv6
 

-
route-table, ipv4, ipv6
+
route-table, ipv4, ipv6
 

-
routes, ipv4, ipv6
+
routes, ipv4, ipv6
 

-
rsc, vxlan
+
rsc, vxlan
 

-
rstp-enable, ovs-bridge
+
rstp-enable, ovs-bridge
 

-
runner, team
+
runner, team
 

-
runner-active, team
+
runner-active, team
 

-
runner-agg-select-policy, team
+
runner-agg-select-policy, team
 

-
runner-fast-rate, team
+
runner-fast-rate, team
 

-
runner-hwaddr-policy, team
+
runner-hwaddr-policy, team
 

-
runner-min-ports, team
+
runner-min-ports, team
 

-
runner-sys-prio, team
+
runner-sys-prio, team
 

-
runner-tx-balancer, team
+
runner-tx-balancer, team
 

-
runner-tx-balancer-interval, team
+
runner-tx-balancer-interval, team
 

-
runner-tx-hash, team
+
runner-tx-hash, team
 

 

 

 

 
S

 

-
s390-nettype, 802-3-ethernet
+
s390-nettype, 802-3-ethernet
 

-
s390-options, 802-3-ethernet
+
s390-options, 802-3-ethernet
 

-
s390-subchannels, 802-3-ethernet
+
s390-subchannels, 802-3-ethernet
 

-
secondaries, connection
+
secondaries, connection
 

-
secrets, vpn
+
secrets, vpn
 

-
security, 802-11-wireless
+
security, 802-11-wireless
 

-
seen-bssids, 802-11-wireless
+
seen-bssids, 802-11-wireless
 

-
send-delay, serial
+
send-delay, serial
 

-
send-sci, macsec
+
send-sci, macsec
 

-
service, pppoe
+
service, pppoe
 

-
service-type, vpn
+
service-type, vpn
 

-
short-address, wpan
+
short-address, wpan
 

-
sim-id, gsm
+
sim-id, gsm
 

-
sim-operator-id, gsm
+
sim-operator-id, gsm
 

-
slave-type, connection
+
slave-type, connection
 

-
source-port-max, vxlan
+
source-port-max, vxlan
 

-
source-port-min, vxlan
+
source-port-min, vxlan
 

-
speed, 802-3-ethernet
+
speed, 802-3-ethernet
 

-
ssid, 802-11-olpc-mesh, 802-11-wireless
+
ssid, 802-11-olpc-mesh, 802-11-wireless
 

-
stable-id, connection
+
stable-id, connection
 

-
sticky, team-port
+
sticky, team-port
 

-
stopbits, serial
+
stopbits, serial
 

-
stp, bridge
+
stp, bridge
 

-
stp-enable, ovs-bridge
+
stp-enable, ovs-bridge
 

-
subject-match, 802-1x
+
subject-match, 802-1x
 

-
system-ca-certs, 802-1x
+
system-ca-certs, 802-1x
 

 

 

 

 
T

 

-
tag, ovs-port
+
tag, ovs-port
 

-
tap, macvlan
+
tap, macvlan
 

-
tfilters, tc
+
tfilters, tc
 

-
timeout, vpn
+
timeout, vpn
 

-
timestamp, connection
+
timestamp, connection
 

-
token, ipv6
+
token, ipv6
 

-
tos, ip-tunnel, vxlan
+
tos, ip-tunnel, vxlan
 

-
total-vfs, sriov
+
total-vfs, sriov
 

-
transport-mode, infiniband
+
transport-mode, infiniband
 

-
ttl, ip-tunnel, vxlan
+
ttl, ip-tunnel, vxlan
 

-
tx-power, 802-11-wireless
+
tx-power, 802-11-wireless
 

-
type, connection, bluetooth, ovs-interface
+
type, connection, bluetooth, ovs-interface
 

 

 

 

 
U

 

-
user-name, vpn
+
user-name, vpn
 

-
username, adsl, cdma, gsm, pppoe
+
username, adsl, cdma, gsm, pppoe
 

-
uuid, connection
+
uuid, connection
 

 

 

 

 
V

 

-
validation, macsec
+
validation, macsec
 

-
vci, adsl
+
vci, adsl
 

-
vfs, sriov
+
vfs, sriov
 

-
vlan-mode, ovs-port
+
vlan-mode, ovs-port
 

-
vnet-hdr, tun
+
vnet-hdr, tun
 

-
vpi, adsl
+
vpi, adsl
 

-
org.freedesktop.NetworkManager.VPN.Connection, org.freedesktop.NetworkManager.VPN.Connection
+
org.freedesktop.NetworkManager.VPN.Connection, org.freedesktop.NetworkManager.VPN.Connection
 

-
org.freedesktop.NetworkManager.VPN.Connection::PropertiesChanged, The "PropertiesChanged" signal
+
org.freedesktop.NetworkManager.VPN.Connection::PropertiesChanged, The "PropertiesChanged" signal
 

-
org.freedesktop.NetworkManager.VPN.Connection::VpnStateChanged, The "VpnStateChanged" signal
+
org.freedesktop.NetworkManager.VPN.Connection::VpnStateChanged, The "VpnStateChanged" signal
 

-
org.freedesktop.NetworkManager.VPN.Connection:Banner, The "Banner" property
+
org.freedesktop.NetworkManager.VPN.Connection:Banner, The "Banner" property
 

-
org.freedesktop.NetworkManager.VPN.Connection:VpnState, The "VpnState" property
+
org.freedesktop.NetworkManager.VPN.Connection:VpnState, The "VpnState" property
 

-
org.freedesktop.NetworkManager.VPN.Plugin, org.freedesktop.NetworkManager.VPN.Plugin
+
org.freedesktop.NetworkManager.VPN.Plugin, org.freedesktop.NetworkManager.VPN.Plugin
 

-
org.freedesktop.NetworkManager.VPN.Plugin.Connect(), The Connect() method
+
org.freedesktop.NetworkManager.VPN.Plugin.Connect(), The Connect() method
 

-
org.freedesktop.NetworkManager.VPN.Plugin.ConnectInteractive(), The ConnectInteractive() method
+
org.freedesktop.NetworkManager.VPN.Plugin.ConnectInteractive(), The ConnectInteractive() method
 

-
org.freedesktop.NetworkManager.VPN.Plugin.Disconnect(), The Disconnect() method
+
org.freedesktop.NetworkManager.VPN.Plugin.Disconnect(), The Disconnect() method
 

-
org.freedesktop.NetworkManager.VPN.Plugin.NeedSecrets(), The NeedSecrets() method
+
org.freedesktop.NetworkManager.VPN.Plugin.NeedSecrets(), The NeedSecrets() method
 

-
org.freedesktop.NetworkManager.VPN.Plugin.NewSecrets(), The NewSecrets() method
+
org.freedesktop.NetworkManager.VPN.Plugin.NewSecrets(), The NewSecrets() method
 

-
org.freedesktop.NetworkManager.VPN.Plugin.SetConfig(), The SetConfig() method
+
org.freedesktop.NetworkManager.VPN.Plugin.SetConfig(), The SetConfig() method
 

-
org.freedesktop.NetworkManager.VPN.Plugin.SetFailure(), The SetFailure() method
+
org.freedesktop.NetworkManager.VPN.Plugin.SetFailure(), The SetFailure() method
 

-
org.freedesktop.NetworkManager.VPN.Plugin.SetIp4Config(), The SetIp4Config() method
+
org.freedesktop.NetworkManager.VPN.Plugin.SetIp4Config(), The SetIp4Config() method
 

-
org.freedesktop.NetworkManager.VPN.Plugin.SetIp6Config(), The SetIp6Config() method
+
org.freedesktop.NetworkManager.VPN.Plugin.SetIp6Config(), The SetIp6Config() method
 

-
org.freedesktop.NetworkManager.VPN.Plugin::Config, The "Config" signal
+
org.freedesktop.NetworkManager.VPN.Plugin::Config, The "Config" signal
 

-
org.freedesktop.NetworkManager.VPN.Plugin::Failure, The "Failure" signal
+
org.freedesktop.NetworkManager.VPN.Plugin::Failure, The "Failure" signal
 

-
org.freedesktop.NetworkManager.VPN.Plugin::Ip4Config, The "Ip4Config" signal
+
org.freedesktop.NetworkManager.VPN.Plugin::Ip4Config, The "Ip4Config" signal
 

-
org.freedesktop.NetworkManager.VPN.Plugin::Ip6Config, The "Ip6Config" signal
+
org.freedesktop.NetworkManager.VPN.Plugin::Ip6Config, The "Ip6Config" signal
 

-
org.freedesktop.NetworkManager.VPN.Plugin::LoginBanner, The "LoginBanner" signal
+
org.freedesktop.NetworkManager.VPN.Plugin::LoginBanner, The "LoginBanner" signal
 

-
org.freedesktop.NetworkManager.VPN.Plugin::SecretsRequired, The "SecretsRequired" signal
+
org.freedesktop.NetworkManager.VPN.Plugin::SecretsRequired, The "SecretsRequired" signal
 

-
org.freedesktop.NetworkManager.VPN.Plugin::StateChanged, The "StateChanged" signal
+
org.freedesktop.NetworkManager.VPN.Plugin::StateChanged, The "StateChanged" signal
 

-
org.freedesktop.NetworkManager.VPN.Plugin:State, The "State" property
+
org.freedesktop.NetworkManager.VPN.Plugin:State, The "State" property
 

 

 

 

 
W

 

-
wake-on-lan, 802-3-ethernet
+
wake-on-lan, 802-3-ethernet
+

+
wake-on-lan-password, 802-3-ethernet
+

+
wake-on-wlan, 802-11-wireless
+

+
wep-key-flags, 802-11-wireless-security
+

+
wep-key-type, 802-11-wireless-security
+

+
wep-key0, 802-11-wireless-security
+

+
wep-key1, 802-11-wireless-security
+

+
wep-key2, 802-11-wireless-security
+

+
wep-key3, 802-11-wireless-security
+

+
wep-tx-keyidx, 802-11-wireless-security
+

+
wfd-ies, wifi-p2p
+

+
org.freedesktop.NetworkManager.WifiP2PPeer, org.freedesktop.NetworkManager.WifiP2PPeer
 

-
wake-on-lan-password, 802-3-ethernet
+
org.freedesktop.NetworkManager.WifiP2PPeer:Flags, The "Flags" property
 

-
wake-on-wlan, 802-11-wireless
+
org.freedesktop.NetworkManager.WifiP2PPeer:HwAddress, The "HwAddress" property
 

-
wep-key-flags, 802-11-wireless-security
+
org.freedesktop.NetworkManager.WifiP2PPeer:LastSeen, The "LastSeen" property
 

-
wep-key-type, 802-11-wireless-security
+
org.freedesktop.NetworkManager.WifiP2PPeer:Manufacturer, The "Manufacturer" property
 

-
wep-key0, 802-11-wireless-security
+
org.freedesktop.NetworkManager.WifiP2PPeer:Model, The "Model" property
 

-
wep-key1, 802-11-wireless-security
+
org.freedesktop.NetworkManager.WifiP2PPeer:ModelNumber, The "ModelNumber" property
 

-
wep-key2, 802-11-wireless-security
+
org.freedesktop.NetworkManager.WifiP2PPeer:Serial, The "Serial" property
 

-
wep-key3, 802-11-wireless-security
+
org.freedesktop.NetworkManager.WifiP2PPeer:Strength, The "Strength" property
 

-
wep-tx-keyidx, 802-11-wireless-security
+
org.freedesktop.NetworkManager.WifiP2PPeer:WfdIEs, The "WfdIEs" property
 

-
wps-method, 802-11-wireless-security
+
wps-method, wifi-p2p, 802-11-wireless-security
 

 

 

 

 
Z

-
zone, connection
+
zone, connection
 

 

 
diff --git a/docs/api/html/manpages.html b/docs/api/html/manpages.html
index 5282cd2a..4f34155c 100644
--- a/docs/api/html/manpages.html
+++ b/docs/api/html/manpages.html
@@ -56,7 +56,7 @@
 nm-initrd-generator — early boot NetworkManager configuration generator
 

 

-nm-openvswitch — overview of NetworkManager OpenVSwitch support
+nm-openvswitch — overview of NetworkManager Open vSwitch support
 

 

 
diff --git a/docs/api/html/nm-dbus-types.html b/docs/api/html/nm-dbus-types.html
index 8f687d6b..56e69b2c 100644
--- a/docs/api/html/nm-dbus-types.html
+++ b/docs/api/html/nm-dbus-types.html
@@ -34,7 +34,7 @@
 
The range 0x7000 - 0x7FFF of capabilities is guaranteed not to be used by upstream NetworkManager. It could thus be used for downstream extensions.

 

 

-
Values

+
Values

 
@@ -66,7 +66,7 @@
 
NMState values indicate the current overall networking state.

-
Values

+
Values

 

 
 

 
 
@@ -204,7 +204,7 @@
 
enum NMConnectivityState

-
Values

+
Values

 

 
 

 
 
@@ -253,7 +253,7 @@
 

@@ -298,7 +298,7 @@
 
NMDeviceType values indicate the type of hardware represented by a device object.

-
Values

+
Values

 

 
 

 
 

-
The Internet connection is hijacked by a captive portal gateway. The graphical shell may open a sandboxed web browser window (because the captive portals typically attempt a man-in-the-middle attacks agains the https connections) for the purpose of authenticating to a gateway and retrigger the connectivity check with CheckConnectivity() when the browser window is dismissed.

+
The Internet connection is hijacked by a captive portal gateway. The graphical shell may open a sandboxed web browser window (because the captive portals typically attempt a man-in-the-middle attacks against the https connections) for the purpose of authenticating to a gateway and retrigger the connectivity check with CheckConnectivity() when the browser window is dismissed.

 

 		
  
 
 
@@ -362,7 +362,7 @@
 

@@ -757,6 +757,21 @@
 
+
+
+
+
+
+

 
 

 
 

-
an 802.11 WiFi device

+
an 802.11 Wi-Fi device

 

 		
  
  
 

+
NM_DEVICE_TYPE_WIFI_P2P

+

+		
+
= 30

+

+		
+
an 802.11 Wi-Fi P2P device (Since: 1.16)

+

+		 

 
 

 

@@ -767,7 +782,7 @@
 
General device capability flags.

 

 

-
Values

+
Values

 
@@ -861,7 +876,7 @@
 
802.11 specific device encryption and authentication capabilities.

-
Values

+
Values

 

 
 

 
 
@@ -1060,7 +1075,7 @@
 
802.11 access point flags.

-
Values

+
Values

 

 
 

 
 
@@ -1154,7 +1169,7 @@
 
802.11 access point security and authentication flags.  These flags describe the current security requirements of an access point as determined from the access point's beacon.

-
Values

+
Values

 

 
 

 
 
@@ -1328,6 +1343,21 @@
 
+
+
+
+
+
+

 
 

 
 
 

+
NM_802_11_AP_SEC_KEY_MGMT_SAE

+

+		
+
= 0x00000400

+

+		
+
WPA/RSN Simultaneous Authentication of Equals is supported

+

+		 

 
 

 

@@ -1338,7 +1368,7 @@
 
Indicates the 802.11 mode an access point or device is currently in.

 

 

-
Values

+
Values

 
@@ -1417,7 +1447,7 @@
 
NMBluetoothCapabilities values indicate the usable capabilities of a Bluetooth device.

-
Values

+
Values

 

 
 

 
 
@@ -1481,7 +1511,7 @@
 
NMDeviceModemCapabilities values indicate the generic radio access technology families a modem device supports.  For more information on the specific access technologies the device supports use the ModemManager D-Bus API.

-
Values

+
Values

 

 
 

 
 
@@ -1575,7 +1605,7 @@
 
WiMAX network type.

-
Values

+
Values

 

 
 

 
 
@@ -1653,7 +1683,7 @@
 
enum NMDeviceState

-
Values

+
Values

 

 
 

 
 
@@ -1747,7 +1777,7 @@
 

@@ -1867,7 +1897,7 @@
 
Device state change reason codes

-
Values

+
Values

 

 
 

 
 

-
the device is connecting to the requested network. This may include operations like associating with the WiFi AP, dialing the modem, connecting to the remote Bluetooth device, etc.

+
the device is connecting to the requested network. This may include operations like associating with the Wi-Fi AP, dialing the modem, connecting to the remote Bluetooth device, etc.

 

 		
  
 
 
@@ -2681,7 +2711,7 @@
 

@@ -2881,6 +2911,21 @@
 
+
+
+
+
+
+

 
 

 
 

-
The WiFi network could not be found

+
The Wi-Fi network could not be found

 

 		
  
  
 

+
NM_DEVICE_STATE_REASON_PEER_NOT_FOUND

+

+		
+
= 67

+

+		
+
The Wi-Fi P2P peer could not be found

+

+		 

 
 

 

@@ -2891,7 +2936,7 @@
 
Since: 1.2

 

 

-
Values

+
Values

 
@@ -2985,7 +3030,7 @@
 
Since: 1.14

-
Values

+
Values

 

 
 

 
 
@@ -3064,7 +3109,7 @@
 
NMActiveConnectionState values indicate the state of a connection to a specific network while it is starting, connected, or disconnecting from that network.

-
Values

+
Values

 

 
 

 
 
@@ -3159,7 +3204,7 @@
 
Since: 1.8

-
Values

+
Values

 

 
 

 
 
@@ -3403,7 +3448,7 @@
 
NMSecretAgentGetSecretsFlags values modify the behavior of a GetSecrets request.

-
Values

+
Values

 

 
 

 
 
@@ -3527,7 +3572,7 @@
 
NMSecretAgentCapabilities indicate various capabilities of the agent.

-
Values

+
Values

 

 
 

 
 
@@ -3577,7 +3622,7 @@
 
Since: 1.2

-
Values

+
Values

 

 
 

 
 
@@ -3777,7 +3822,7 @@
 
Since: 1.4 (gi flags generated since 1.12)

-
Values

+
Values

 

 
 

 
 
@@ -3872,7 +3917,7 @@
 
Since: 1.4

-
Values

+
Values

 

 
 

 
 
@@ -3952,7 +3997,7 @@
 
Since: 1.12

-
Values

+
Values

 

 
 

 
 
@@ -4032,7 +4077,7 @@
 
Since: 1.10

-
Values

+
Values

 

 
 

 
 
@@ -4062,7 +4107,7 @@
 

+
+
+
+
+
+

 
 

 
 

-
= (1LL

+
= 0x1

 

 		
 
@@ -4077,7 +4122,7 @@
 

 		
 
-
= (1LL

+
= 0x2

 

 		
 
@@ -4092,7 +4137,7 @@
 

 		
 
-
= (1LL

+
= 0x4

 

 		
 
@@ -4107,7 +4152,7 @@
 

 		
 
-
= (1LL

+
= 0x8

 

 		
 
@@ -4122,7 +4167,7 @@
 

 		
 
-
= (1LL

+
= 0x10

 

 		
 
@@ -4137,7 +4182,7 @@
 

 		
 
-
= (1LL

+
= 0x20

 

 		
 
@@ -4146,6 +4191,21 @@
 
  
 

+
NM_ACTIVATION_STATE_FLAG_LIFETIME_BOUND_TO_PROFILE_VISIBILITY

+

+		
+
= 0x40

+

+		
+
the lifetime of the activation is bound to the visilibity of the connection profile, which in turn depends on "connection.permissions" and whether a session for the user exists. Since: 1.16

+

+		 

 
 

 

@@ -4156,7 +4216,7 @@
 
Since: 1.12

 

 

-
Values

+
Values

 
@@ -4186,7 +4246,7 @@
 

@@ -4281,7 +4341,7 @@
 
Since: 1.14

-
Values

+
Values

 

 
 

 
 

-
= (1LL

+
= 0x1

 

 		
 
@@ -4201,7 +4261,7 @@
 

 		
 
-
= (1LL

+
= 0x2

 

 		
 
@@ -4216,7 +4276,7 @@
 

 		
 
-
= (1LL

+
= 0x4

 

 		
 
@@ -4231,7 +4291,7 @@
 

 		
 
-
= (1LL

+
= 0x8

 

 		
 
@@ -4246,7 +4306,7 @@
 

 		
 
-
= (1LL

+
= 0x10

 

 		
 
@@ -4261,11 +4321,11 @@
 

 		
 
-
= (1LL

+
= 0x20

 

 		
 
-
usually, when the connection has autoconnect enabled and is modified, it becomes elegible to autoconnect right away. Setting this flag, disables autoconnect until the connection is manually activated.

+
usually, when the connection has autoconnect enabled and is modified, it becomes eligible to autoconnect right away. Setting this flag, disables autoconnect until the connection is manually activated.

 

 		
  
 
 
diff --git a/docs/api/html/nm-online.html b/docs/api/html/nm-online.html
index 036fbb5d..bc91ee24 100644
--- a/docs/api/html/nm-online.html
+++ b/docs/api/html/nm-online.html
@@ -55,16 +55,8 @@
 
-
-
-
-
-
-
+
+
@@ -80,6 +72,18 @@
           nm-online -s will just return immediately, regardless of the
           current network state.)

+
+
+
+
+
+
+
+

 
 

 
 

-            -t  |   --timeout  
-            seconds 
-        
Time to wait for a connection, in seconds. If the option is not provided,
-          the default timeout is 30 seconds.
  -x  |   --exit  
Exit immediately if NetworkManager is not running or connecting.
  -h  |   --help  
Print help information.

 

 

 
  -q  |   --quiet  

 

+            -t  |   --timeout  
+            seconds 
+        
Time to wait for a connection, in seconds. If the option is not provided,
+          the default timeout is 30 seconds.
  -x  |   --exit  
Exit immediately if NetworkManager is not running or connecting.

 
 

 

diff --git a/docs/api/html/nm-openvswitch.html b/docs/api/html/nm-openvswitch.html
index bfe89e2f..abd868ad 100644
--- a/docs/api/html/nm-openvswitch.html
+++ b/docs/api/html/nm-openvswitch.html
@@ -24,17 +24,17 @@
 

 
 
nm-openvswitch

-
nm-openvswitch — overview of NetworkManager OpenVSwitch support

+
nm-openvswitch — overview of NetworkManager Open vSwitch support

 		
 
 

 

 
Overview

-
NetworkManager includes basic OpenVSwitch support, good enough
-    to be capable of setting up simple OpenVSwitch configurations. It is not
-    extensive and does not expose all functionality of OpenVSwitch provides.
+
NetworkManager includes basic Open vSwitch support, good enough
+    to be capable of setting up simple Open vSwitch configurations. It is not
+    extensive and does not expose all functionality of Open vSwitch provides.
     For large or complicated deployments users are advised to use native tools
-    shipped with OpenVSwitch. This document seeks to provide overview of
+    shipped with Open vSwitch. This document seeks to provide overview of
     functionality currently provided by NetworkManager, its capabilities and
     limitations.

 
First and foremost: NetworkManager applies the configuration by
@@ -96,7 +96,7 @@
 

 
Examples

 

-
Example 15. Creating a Bridge with a single internal Interface

+
Example 16. Creating a Bridge with a single internal Interface

 

 
$ nmcli conn add type ovs-bridge conn.interface bridge0
 Connection 'ovs-bridge-bridge0' (d10fc64d-1d48-4394-a1b8-e1aea72f27d5) successfully added.
@@ -113,7 +113,7 @@ Connection 'ovs-interface-iface0' (3640d2a1-a2fd-4718-92f1-cffadb5b6cdc) success
 

 

 

-
Example 16. Adding a Linux interface to a Bridge

+
Example 17. Adding a Linux interface to a Bridge

 

 
$ nmcli conn add type ovs-port conn.interface port1 master bridge0
 Connection 'ovs-port-port1' (67d041eb-8e7b-4458-afee-a1d07c9c4552) successfully added.
@@ -124,7 +124,7 @@ Connection 'ovs-slave-eth0' (d459c45c-cf78-4c1c-b4b7-505e71379624) successfully
 

 

 

-
Example 17. Creating a VLAN

+
Example 18. Creating a VLAN

 

 
$ nmcli conn add type ovs-port conn.interface port2 master bridge0 ovs-port.tag 120
 Connection 'ovs-port-port2' (3994c093-4ef7-4549-a4fd-627b831c3cb8) successfully added.
@@ -135,7 +135,7 @@ Connection 'ovs-slave-eth1' (099be06e-71ad-484d-8d5a-fcadc5f207f5) successfully
 

 

 

-
Example 18. Creating a Bond

+
Example 19. Creating a Bond

 

 
$ nmcli conn add type ovs-port conn.interface bond0 master bridge0
 Connection 'ovs-port-bond0' (d154ebf9-e999-4e1b-a084-a3de53d25d8a) successfully added.
@@ -155,8 +155,8 @@ Connection 'ovs-slave-eth3' (8dedeecb-ed12-482b-b77a-24a4fb835136) successfully
 

 
Bugs

 
    
-
  • Not all OpenVSwitch capabilities are supported.
    • 
-
  • OpenVSwitch devices don't expose many useful properties on D-Bus.
    • 
+
  • Not all Open vSwitch capabilities are supported.
    • 
+
  • Open vSwitch devices don't expose many useful properties on D-Bus.
    • 
 

 
Probably many more.

 

diff --git a/docs/api/html/nm-settings-ifcfg-rh.html b/docs/api/html/nm-settings-ifcfg-rh.html
index 3e56950b..e184de29 100644
--- a/docs/api/html/nm-settings-ifcfg-rh.html
+++ b/docs/api/html/nm-settings-ifcfg-rh.html
@@ -252,7 +252,7 @@ DEVICETYPE=TeamPort
           are NetworkManager specific extensions not understood by traditional initscripts.
         

 

-
Table 37. 6lowpan setting

+
Table 38. 6lowpan setting

 
@@ -270,7 +270,7 @@ DEVICETYPE=TeamPort
 

 
 


 

 

-
Table 38. 802-1x setting

+
Table 39. 802-1x setting

 
@@ -566,7 +566,7 @@ Example: IEEE_8021X_PRIVATE_KEY=/home/joe/mykey.p12

 
 

 

 

 

-
Table 39. bond setting

+
Table 40. bond setting

 
@@ -591,7 +591,7 @@ Example: BONDING_OPTS="miimon=100 mode=broadcast"

 
 

 

 

 

-
Table 40. bridge-port setting

+
Table 41. bridge-port setting

 
@@ -632,7 +632,7 @@ Allowed values: 1 - 65535

 
 

 

 

 

-
Table 41. bridge setting

+
Table 42. bridge setting

 
@@ -712,7 +712,7 @@ Allowed values: 0 or 1

 
 

 

 

 

-
Table 42. connection setting

+
Table 43. connection setting

 
@@ -909,7 +909,7 @@ Allowed values: yes,no,resolve

 
 

 

 

 

-
Table 43. dcb setting

+
Table 44. dcb setting

 
@@ -1032,7 +1032,7 @@ Example: DCB_PG_STRICT=01101110
-
@@ -1044,7 +1044,7 @@ Example: DCB_PG_UP2TC=01623701
           used explicitly to enable DCB so that the rest of the DCB_* variables can apply.
         

-
Table 44. ethtool setting

+
Table 45. ethtool setting

 

 
 

 
priority-traffic-class
 DCB_PG_UP2TC
  Priority values. String of eight trafic class values (0 - 7).
+Priority values. String of eight traffic class values (0 - 7).
 
 Example: DCB_PG_UP2TC=01623701
 

 
@@ -1062,7 +1062,7 @@ Example: DCB_PG_UP2TC=01623701

 
 

 

 

 

-
Table 45. infiniband setting

+
Table 46. infiniband setting

 
@@ -1117,7 +1117,7 @@ Example: PHYSDEV=ib0

 
 

 

 

 

-
Table 46. ipv4 setting

+
Table 47. ipv4 setting

 
@@ -1285,7 +1285,7 @@ Example: DHCP_FQDN=foo.bar.com

 
 

 

 

 

-
Table 47. ipv6 setting

+
Table 48. ipv6 setting

 
@@ -1448,7 +1448,7 @@ Example: DHCPV6_DUID=LL; DHCPV6_DUID=0301deadbeef0001; DHCPV6_DU
 

 
 


 

 

-
Table 48. match setting

+
Table 49. match setting

 
@@ -1466,7 +1466,7 @@ Example: DHCPV6_DUID=LL; DHCPV6_DUID=0301deadbeef0001; DHCPV6_DU
 

 
 


 

 

-
Table 49. ovs-bridge setting

+
Table 50. ovs-bridge setting

 
@@ -1484,7 +1484,7 @@ Example: DHCPV6_DUID=LL; DHCPV6_DUID=0301deadbeef0001; DHCPV6_DU
 

 
 


 

 

-
Table 50. ovs-interface setting

+
Table 51. ovs-interface setting

 
@@ -1502,7 +1502,7 @@ Example: DHCPV6_DUID=LL; DHCPV6_DUID=0301deadbeef0001; DHCPV6_DU
 

 
 


 

 

-
Table 51. ovs-patch setting

+
Table 52. ovs-patch setting

 
@@ -1520,7 +1520,7 @@ Example: DHCPV6_DUID=LL; DHCPV6_DUID=0301deadbeef0001; DHCPV6_DU
 

 
 


 

 

-
Table 52. ovs-port setting

+
Table 53. ovs-port setting

 
@@ -1538,7 +1538,7 @@ Example: DHCPV6_DUID=LL; DHCPV6_DUID=0301deadbeef0001; DHCPV6_DU
 

 
 


 

 

-
Table 53. proxy setting

+
Table 54. proxy setting

 
@@ -1591,7 +1591,7 @@ Example: PAC_SCRIPT=/home/joe/proxy.pac

 
 

 

 

 

-
Table 54. sriov setting

+
Table 55. sriov setting

 
@@ -1636,7 +1636,7 @@ Example: SRIOV_AUTOPROBE_DRIVERS=0,1

 
 

 

 

 

-
Table 55. tc setting

+
Table 56. tc setting

 
@@ -1671,7 +1671,7 @@ Example: FILTER1="parent ffff: matchall action simple sdata Inpu
 

 
 


 

 

-
Table 56. team-port setting

+
Table 57. team-port setting

 
@@ -1694,7 +1694,7 @@ Example: FILTER1="parent ffff: matchall action simple sdata Inpu
 

 
 


 

 

-
Table 57. team setting

+
Table 58. team setting

 
@@ -1717,7 +1717,7 @@ Example: FILTER1="parent ffff: matchall action simple sdata Inpu
 

 
 


 

 

-
Table 58. user setting

+
Table 59. user setting

 
@@ -1742,7 +1742,7 @@ Example: NM_USER_FOO__BAR=something

 
 

 

 

 

-
Table 59. vlan setting

+
Table 60. vlan setting

 
@@ -1805,7 +1805,25 @@ Example: PHYSDEV=eth0, VLAN_ID=12; or DEVICE=eth0.12

 
 

 

 

 

-
Table 60. 802-3-ethernet setting

+
Table 61. wifi-p2p setting

+

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






PropertyIfcfg-rh VariableDefaultDescription

+

+

+
Table 62. 802-3-ethernet setting

 
@@ -1906,7 +1924,25 @@ Allowed values: "qeth", "lcs" or "ctc"

 
 

 

 

 

-
Table 61. 802-11-wireless-security setting

+
Table 63. wireguard setting

+

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






PropertyIfcfg-rh VariableDefaultDescription

+

+

+
Table 64. 802-11-wireless-security setting

 
@@ -2088,7 +2124,7 @@ Allowed values: default, disable, optional, required

 
 

 

 

 

-
Table 62. 802-11-wireless setting

+
Table 65. 802-11-wireless setting

 
@@ -2236,7 +2272,7 @@ Allowed values: default, never, always

 
 

 

 

 

-
Table 63. wpan setting

+
Table 66. wpan setting

 
diff --git a/docs/api/html/nm-settings-keyfile.html b/docs/api/html/nm-settings-keyfile.html
index d883a4fb..80d2ec32 100644
--- a/docs/api/html/nm-settings-keyfile.html
+++ b/docs/api/html/nm-settings-keyfile.html
@@ -400,7 +400,30 @@ Example: password=Popocatepetl

 
 

 

 

 

-
Table 34. 802-3-ethernet setting (section)

+
Table 34. wifi-p2p setting (section)

+

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






PropertyKeyfile VariableFormatDescription
peerpeerusual hex-digits-and-colons notationMAC address in traditional hex-digits-and-colons notation (e.g. 00:22:68:12:79:A2), or semicolon separated list of 6 bytes (obsolete) (e.g. 0;34;104;18;121;162).

+

+

+
Table 35. 802-3-ethernet setting (section)

 
@@ -439,7 +462,7 @@ Example: mac-address-blacklist= 00:22:68:12:79:A6;00:22:68:12:79
 

 
 


 

 

-
Table 35. 802-11-wireless setting (section)

+
Table 36. 802-11-wireless setting (section)

 
@@ -486,7 +509,7 @@ Example: mac-address-blacklist= 00:22:68:12:79:A6;00:22:68:12:79
 

 
 


 

 

-
Table 36. wpan setting (section)

+
Table 37. wpan setting (section)

 
diff --git a/docs/api/html/nm-settings.html b/docs/api/html/nm-settings.html
index 9293e903..57ffab77 100644
--- a/docs/api/html/nm-settings.html
+++ b/docs/api/html/nm-settings.html
@@ -241,7 +241,7 @@
 stable-id
-
+
-
+
-
+
-
+
-
+
-
+
-
+

 
 

 
string
  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 as DHCP client identifier with ipv4.dhcp-client-id=stable and to derive the DHCP DUID with ipv6.dhcp-duid=stable-[llt,ll,uuid]. 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 '$' 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 the 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.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 as DHCP client identifier with ipv4.dhcp-client-id=stable and to derive the DHCP DUID with ipv6.dhcp-duid=stable-[llt,ll,uuid]. 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 '$' 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.
 

 

 
@@ -1202,7 +1202,7 @@
 number
 string
  Number to dial when establishing a PPP data session with the GSM-based mobile broadband network.  Many modems do not require PPP for connections to the mobile network and thus this property should be left blank, which allows NetworkManager to select the appropriate settings automatically.Legacy setting that used to help establishing PPP data sessions for GSM-based modems. Deprecated: 1
 

 

 
@@ -1405,7 +1405,7 @@
 dns-priority
 int32
 0DNS servers priority. The relative priority for DNS servers specified by this setting.  A lower value is better (higher priority).  Zero selects the default value, which is 50 for VPNs and 100 for other connections. Note that the priority is to order DNS settings for multiple active connections.  It does not disambiguate multiple DNS servers within the same connection profile. When using dns=default, servers with higher priority will be on top of resolv.conf.  To prioritize a given server over another one within the same connection, just specify them in the desired order.  When multiple devices have configurations with the same priority, the one with an active default route will be preferred.  Negative values have the special effect of excluding other configurations with a greater priority value; so in presence of at least a negative priority, only DNS servers from connections with the lowest priority value will be used. When using a DNS resolver that supports split-DNS as dns=dnsmasq or dns=systemd-resolved, each connection is used to query domains in its search list.  Queries for domains not present in any search list are routed through connections having the '~.' special wildcard domain, which is added automatically to connections with the default route (or can be added manually).  When multiple connections specify the same domain, the one with the highest priority (lowest numerical value) wins.  If a connection specifies a domain which is subdomain of another domain with a negative DNS priority value, the subdomain is ignored.DNS servers priority. The relative priority for DNS servers specified by this setting.  A lower value is better (higher priority). Zero selects a globally configured default value. If the latter is missing or zero too, it defaults to 50 for VPNs and 100 for other connections. Note that the priority is to order DNS settings for multiple active connections.  It does not disambiguate multiple DNS servers within the same connection profile. When using dns=default, servers with higher priority will be on top of resolv.conf.  To prioritize a given server over another one within the same connection, just specify them in the desired order.  When multiple devices have configurations with the same priority, the one with an active default route will be preferred.  Negative values have the special effect of excluding other configurations with a greater priority value; so in presence of at least a negative priority, only DNS servers from connections with the lowest priority value will be used. When using a DNS resolver that supports split-DNS as dns=dnsmasq or dns=systemd-resolved, each connection is used to query domains in its search list.  Queries for domains not present in any search list are routed through connections having the '~.' special wildcard domain, which is added automatically to connections with the default route (or can be added manually).  When multiple connections specify the same domain, the one with the highest priority (lowest numerical value) wins.  If a connection specifies a domain which is subdomain of another domain with a negative DNS priority value, the subdomain is ignored.
 

 

 
@@ -1580,7 +1580,7 @@
 dns-priority
 int32
 0DNS servers priority. The relative priority for DNS servers specified by this setting.  A lower value is better (higher priority).  Zero selects the default value, which is 50 for VPNs and 100 for other connections. Note that the priority is to order DNS settings for multiple active connections.  It does not disambiguate multiple DNS servers within the same connection profile. When using dns=default, servers with higher priority will be on top of resolv.conf.  To prioritize a given server over another one within the same connection, just specify them in the desired order.  When multiple devices have configurations with the same priority, the one with an active default route will be preferred.  Negative values have the special effect of excluding other configurations with a greater priority value; so in presence of at least a negative priority, only DNS servers from connections with the lowest priority value will be used. When using a DNS resolver that supports split-DNS as dns=dnsmasq or dns=systemd-resolved, each connection is used to query domains in its search list.  Queries for domains not present in any search list are routed through connections having the '~.' special wildcard domain, which is added automatically to connections with the default route (or can be added manually).  When multiple connections specify the same domain, the one with the highest priority (lowest numerical value) wins.  If a connection specifies a domain which is subdomain of another domain with a negative DNS priority value, the subdomain is ignored.DNS servers priority. The relative priority for DNS servers specified by this setting.  A lower value is better (higher priority). Zero selects a globally configured default value. If the latter is missing or zero too, it defaults to 50 for VPNs and 100 for other connections. Note that the priority is to order DNS settings for multiple active connections.  It does not disambiguate multiple DNS servers within the same connection profile. When using dns=default, servers with higher priority will be on top of resolv.conf.  To prioritize a given server over another one within the same connection, just specify them in the desired order.  When multiple devices have configurations with the same priority, the one with an active default route will be preferred.  Negative values have the special effect of excluding other configurations with a greater priority value; so in presence of at least a negative priority, only DNS servers from connections with the lowest priority value will be used. When using a DNS resolver that supports split-DNS as dns=dnsmasq or dns=systemd-resolved, each connection is used to query domains in its search list.  Queries for domains not present in any search list are routed through connections having the '~.' special wildcard domain, which is added automatically to connections with the default route (or can be added manually).  When multiple connections specify the same domain, the one with the highest priority (lowest numerical value) wins.  If a connection specifies a domain which is subdomain of another domain with a negative DNS priority value, the subdomain is ignored.
 

 

 
@@ -2575,7 +2575,7 @@
 link-watchers
 array of vardict
 []Link watchers configuration for the connection: each link watcher is defined by a dictionary, whose keys depend upon the selected link watcher. Available link watchers are 'ethtool', 'nsna_ping' and 'arp_ping' and it is specified in the dictionary with the key 'name'. Available keys are:   ethtool: 'delay-up', 'delay-down', 'init-wait'; nsna_ping: 'init-wait', 'interval', 'missed-max', 'target-host'; arp_ping: all the ones in nsna_ping and 'source-host', 'validate-active', 'validate-incative', 'send-always'. See teamd.conf man for more details.Link watchers configuration for the connection: each link watcher is defined by a dictionary, whose keys depend upon the selected link watcher. Available link watchers are 'ethtool', 'nsna_ping' and 'arp_ping' and it is specified in the dictionary with the key 'name'. Available keys are:   ethtool: 'delay-up', 'delay-down', 'init-wait'; nsna_ping: 'init-wait', 'interval', 'missed-max', 'target-host'; arp_ping: all the ones in nsna_ping and 'source-host', 'validate-active', 'validate-inactive', 'send-always'. See teamd.conf man for more details.
 

 

 
@@ -2722,7 +2722,7 @@
 link-watchers
 array of vardict
 []Link watchers configuration for the connection: each link watcher is defined by a dictionary, whose keys depend upon the selected link watcher. Available link watchers are 'ethtool', 'nsna_ping' and 'arp_ping' and it is specified in the dictionary with the key 'name'. Available keys are:   ethtool: 'delay-up', 'delay-down', 'init-wait'; nsna_ping: 'init-wait', 'interval', 'missed-max', 'target-host'; arp_ping: all the ones in nsna_ping and 'source-host', 'validate-active', 'validate-incative', 'send-always'. See teamd.conf man for more details.Link watchers configuration for the connection: each link watcher is defined by a dictionary, whose keys depend upon the selected link watcher. Available link watchers are 'ethtool', 'nsna_ping' and 'arp_ping' and it is specified in the dictionary with the key 'name'. Available keys are:   ethtool: 'delay-up', 'delay-down', 'init-wait'; nsna_ping: 'init-wait', 'interval', 'missed-max', 'target-host'; arp_ping: all the ones in nsna_ping and 'source-host', 'validate-active', 'validate-inactive', 'send-always'. See teamd.conf man for more details.
 

 

 
@@ -3098,7 +3098,49 @@
 
 

 

-
wimax setting

+
wifi-p2p setting

+
Wi-Fi P2P Settings.

+

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






Key NameValue TypeDefault ValueValue Description

+peerstring The P2P device that should be connected to. Currently this is the only way to create or join a group.

+wfd-iesbyte array The Wi-Fi Display (WFD) Information Elements (IEs) to set. Wi-Fi Display requires a protocol specific information element to be set in certain Wi-Fi frames. These can be specified here for the purpose of establishing a connection. This setting is only useful when implementing a Wi-Fi Display client.

+wps-methoduint320Flags indicating which mode of WPS is to be used. There's little point in changing the default setting as NetworkManager will automatically determine the best method to use.

+

+

+

+
wimax setting

 
WiMax Settings.

 
@@ -3133,7 +3175,7 @@
 

-
802-3-ethernet setting

+
802-3-ethernet setting

 
Wired Ethernet Settings.

 

 

 
 
@@ -3154,7 +3196,7 @@
 assigned-mac-address
-
+

 

 
string
  The new field for the cloned MAC address. It can be either a hardware address in ASCII representation, or one of the special values "preserve", "permanent", "random" or "stable". This field replaces the deprecated "cloned-mac-address" on D-Bus, which can only contain explict hardware addresses. Note that this property only exists in D-Bus API. libnm and nmcli continue to call this property "cloned-mac-address".The new field for the cloned MAC address. It can be either a hardware address in ASCII representation, or one of the special values "preserve", "permanent", "random" or "stable". This field replaces the deprecated "cloned-mac-address" on D-Bus, which can only contain explicit hardware addresses. Note that this property only exists in D-Bus API. libnm and nmcli continue to call this property "cloned-mac-address".
 

 

 
@@ -3259,7 +3301,77 @@
 
 

 

-
802-11-wireless setting

+
wireguard setting

+
WireGuard Ethernet Settings.

+

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






Key NameValue TypeDefault ValueValue Description

+fwmarkuint320The use of fwmark is optional and is by default off. Setting it to 0 disables it. Otherwise it is a 32-bit fwmark for outgoing packets.

+listen-portuint320The listen-port. If listen-port is not specified, the port will be chosen randomly when the interface comes up.

+mtuuint320If non-zero, only transmit packets of the specified size or smaller, breaking larger packets up into multiple fragments. If zero a default MTU is used. Note that contrary to wg-quick's MTU setting, this does not take into account the current routes at the time of activation.

+peer-routesbooleanTRUEWhether to automatically add routes for the AllowedIPs ranges of the peers. If TRUE (the default), NetworkManager will automatically add routes in the routing tables according to ipv4.route-table and ipv6.route-table. If FALSE, no such routes are added automatically. In this case, the user may want to configure static routes in ipv4.routes and ipv6.routes, respectively.

+peersarray of 'a{sv}' Array of dictionaries for the WireGuard peers.

+private-keystring The 256 bit private-key in base64 encoding.

+private-key-flagsNMSettingSecretFlags (uint32) Flags indicating how to handle the "private-key" property. (see the section called “Secret flag types:” for flag values)

+

+

+

+
802-11-wireless setting

 
Wi-Fi Settings.

 
@@ -3280,7 +3392,7 @@
 assigned-mac-address
-
+

 

 
string
  The new field for the cloned MAC address. It can be either a hardware address in ASCII representation, or one of the special values "preserve", "permanent", "random" or "stable". This field replaces the deprecated "cloned-mac-address" on D-Bus, which can only contain explict hardware addresses. Note that this property only exists in D-Bus API. libnm and nmcli continue to call this property "cloned-mac-address".The new field for the cloned MAC address. It can be either a hardware address in ASCII representation, or one of the special values "preserve", "permanent", "random" or "stable". This field replaces the deprecated "cloned-mac-address" on D-Bus, which can only contain explicit hardware addresses. Note that this property only exists in D-Bus API. libnm and nmcli continue to call this property "cloned-mac-address".
 

 

 
@@ -3413,7 +3525,7 @@
 
 

 

-
802-11-wireless-security setting

+
802-11-wireless-security setting

 
Wi-Fi Security Settings.

 
@@ -3455,7 +3567,7 @@
 key-mgmt
-
+
-
+
-
-
+
diff --git a/docs/api/html/ref-dbus-checkpoint.html b/docs/api/html/ref-dbus-checkpoint.html
index fd25cc3a..981d8892 100644
--- a/docs/api/html/ref-dbus-checkpoint.html
+++ b/docs/api/html/ref-dbus-checkpoint.html
@@ -6,7 +6,7 @@
 
-
+
@@ -16,7 +16,7 @@
 
-
+

 

 
string
  Key management used for the connection.  One of "none" (WEP), "ieee8021x" (Dynamic WEP), "wpa-none" (Ad-Hoc WPA-PSK), "wpa-psk" (infrastructure WPA-PSK), or "wpa-eap" (WPA-Enterprise).  This property must be set for any Wi-Fi connection that uses security.Key management used for the connection.  One of "none" (WEP), "ieee8021x" (Dynamic WEP), "wpa-none" (Ad-Hoc WPA-PSK), "wpa-psk" (infrastructure WPA-PSK), "sae" (SAE) or "wpa-eap" (WPA-Enterprise). This property must be set for any Wi-Fi connection that uses security.
 

 

 
@@ -3504,7 +3616,7 @@
 psk
 string
  Pre-Shared-Key for WPA networks.  If the key is 64-characters long, it must contain only hexadecimal characters and is interpreted as a hexadecimal WPA key.  Otherwise, the key must be between 8 and 63 ASCII characters (as specified in the 802.11i standard) and is interpreted as a WPA passphrase, and is hashed to derive the actual WPA-PSK used when connecting to the Wi-Fi network.Pre-Shared-Key for WPA networks. For WPA-PSK, it's either an ASCII passphrase of 8 to 63 characters that is (as specified in the 802.11i standard) hashed to derive the actual key, or the key in form of 64 hexadecimal character. The WPA3-Personal networks use a passphrase of any length for SAE authentication.
 

 

 
@@ -3574,7 +3686,7 @@
 
 

 

-
wpan setting

+
wpan setting

 
IEEE 802.15.4 (WPAN) MAC Settings.

 
@@ -3592,6 +3704,13 @@
 
+
+
+
+
+
+
@@ -3599,6 +3718,13 @@
 
+
+
+
+
+
+
diff --git a/docs/api/html/nmcli-examples.html b/docs/api/html/nmcli-examples.html
index 0a84e48c..e9d8154c 100644
--- a/docs/api/html/nmcli-examples.html
+++ b/docs/api/html/nmcli-examples.html
@@ -173,7 +173,22 @@ B,DISPATCH

-
Example 6. Adding a bonding master and two slave connection profiles

+
Example 6. Activating a VPN connection profile requiring interactive password input

+

+
$ nmcli --ask con up my-vpn-con

+

+        This command activates a VPN connection profile enabling nmcli to interact with the user
+        ('--ask'): this will allow nmcli to prompt for the VPN password on the command line when
+        the password-flags are set to '0x02' ('always ask', see
+        nm-settings(5)
+        ).
+        This is particularly useful for OTP based VPNs, as the user needs to be prompted for the
+        password each time the connection is activated.
+      

+

+

+

+
Example 7. Adding a bonding master and two slave connection profiles

 

 
$ nmcli con add type bond ifname mybond0 mode active-backup
 $ nmcli con add type ethernet ifname eth1 master mybond0
@@ -189,7 +204,7 @@ B,DISPATCH

 

 


-
Example 7. Adding a team master and two slave connection profiles

+
Example 8. Adding a team master and two slave connection profiles

 

 
$ nmcli con add type team con-name Team1 ifname Team1 config team1-master-json.conf
 $ nmcli con add type ethernet con-name Team1-slave1 ifname em1 master Team1
@@ -217,7 +232,7 @@ B,DISPATCH

 

 


-
Example 8. Adding a bridge and two slave profiles

+
Example 9. Adding a bridge and two slave profiles

 

 
$ nmcli con add type bridge con-name TowerBridge ifname TowerBridge
 $ nmcli con add type ethernet con-name br-slave-1 ifname ens3 master TowerBridge
@@ -236,7 +251,7 @@ B,DISPATCH

 

 


-
Example 9. Adding an ethernet connection profile with manual IP configuration

+
Example 10. Adding an ethernet connection profile with manual IP configuration

 

 
$ nmcli con add con-name my-con-em1 ifname em1 type ethernet \
   ip4 192.168.100.100/24 gw4 192.168.100.1 ip4 1.2.3.4 ip6 abbe::cafe
@@ -259,7 +274,7 @@ B,DISPATCH

 

 


-
Example 10. Convenient field values retrieval for scripting

+
Example 11. Convenient field values retrieval for scripting

 

 
$ nmcli -g ip4.address connection show my-con-eth0
 192.168.1.12/24

@@ -279,7 +294,7 @@ IP4:192.168.1.12/24:192.168.1.1::192.168.1.1::
 

 


-
Example 11. Adding an Ethernet connection and configuring SR-IOV VFs

+
Example 12. Adding an Ethernet connection and configuring SR-IOV VFs

 

 
$ nmcli con add type ethernet con-name EthernetPF ifname em1
 $ nmcli con modify EthernetPF sriov.total-vfs 3 sriov.autoprobe-drivers false
@@ -299,7 +314,7 @@ IP4:192.168.1.12/24:192.168.1.1::192.168.1.1::

 

 


-
Example 12. Escaping colon characters in tabular mode

+
Example 13. Escaping colon characters in tabular mode

 

 
$ nmcli -t -f general -e yes -m tab dev show eth0
 GENERAL:eth0:ethernet:Intel Corporation:82567LM Gigabit Network Connection:
@@ -314,7 +329,7 @@ nager/ActiveConnection/9

 

 


-
Example 13. nmcli usage in a NetworkManager dispatcher script to make Ethernet and Wi-Fi mutually exclusive

+
Example 14. nmcli usage in a NetworkManager dispatcher script to make Ethernet and Wi-Fi mutually exclusive

 

 
 #!/bin/bash
@@ -352,7 +367,7 @@ fi
 

 
Example sessions of interactive connection editor

 

-
Example 14. Adding an ethernet connection profile in interactive editor (a)

+
Example 15. Adding an ethernet connection profile in interactive editor (a)

 

 
$ nmcli connection edit type ethernet
 
diff --git a/docs/api/html/nmcli.html b/docs/api/html/nmcli.html
index 4014c714..bcef8464 100644
--- a/docs/api/html/nmcli.html
+++ b/docs/api/html/nmcli.html
@@ -39,7 +39,9 @@
     replacement for nm-applet or other graphical clients.
     nmcli is used to create, display, edit, delete, activate,
     and deactivate network connections, as well as control and display network
-    device status.

+    device status. See
+    nmcli-examples(7)
+    for ready to run nmcli examples.

 
Typical uses include:

 
    
 
  • Scripts: Utilize NetworkManager via nmcli instead of
@@ -63,47 +65,11 @@
 
 

-
-
-
-
-
-
-
-
-
-
+
+
@@ -119,6 +85,25 @@
 
+
+
+
+
+
+
+
+
-
+
+
+
+
+
-
-
+
+
@@ -164,6 +176,15 @@
           also influences echoing passwords typed by user as an input.

+
+
+
+
+
+
+
+
@@ -177,25 +198,6 @@
           success. The default value depends on the executed command.

-
-
-
-
-
-
-
-
-
-
-
-

 

 

 
+channelint32-1IEEE 802.15.4 channel. A positive integer or -1, meaning "do not set, use whatever the device is already set to".

 mac-address
 string
  

 

 
+pageint32-1IEEE 802.15.4 channel page. A positive integer or -1, meaning "do not set, use whatever the device is already set to".

 pan-id
 uint32
 65535
 
 
 
 
 
 
 
 
 
 

 
  -t  |   --terse  
Output is terse. This mode is designed and suitable for computer (script)
-          processing.
  -p  |   --pretty  
Output is pretty. This causes nmcli to produce easily
-          readable outputs for humans, i.e. values are aligned, headers are printed,
-          etc.
  -m  |   --mode  { tabular  |   multiline } 

-
Switch between tabular and multiline output:

-

----
-
-
-
-
-
-
-
-
-
-
-




 tabular 
Output is a table where each line describes a single entry.
-                Columns define particular properties of the entry.
 multiline 
Each entry comprises multiple lines, each property on its
-                own line. The values are prefixed with the property name.

-
If omitted, default is tabular for most commands.
-          For the commands producing more structured information, that cannot be
-          displayed on a single line, default is multiline.
-          Currently, they are:

-
    
-
  • nmcli connection show ID
    • 
-
  • nmcli device show
    • 
-

-
  -a  |   --ask  
When using this option nmcli will stop and ask for any
+          missing required arguments, so do not use this option for non-interactive
+          purposes like scripts. This option controls, for example, whether you will be
+          prompted for a password if it is required for connecting to a network.

 

 

 
  -c  |   --colors  { yes  |   no  |   auto } 

 

 
  --complete-args  

+
Instead of conducting the desired action, nmcli
+          will list possible completions for the last argument. This is useful to implement
+          argument completion in shell.

+
The exit status will indicate success
+          or return a code 65 to indicate the last argument is a file name.

+
NetworkManager ships with command completion support for GNU Bash.

+
  -e  |   --escape  { yes  |   no } 

+
Whether to escape : and \ characters in terse tabular mode. The
+          escape character is \.

+
If omitted, default is yes.

+

 
  -f  |   --fields  { field1,field2...  |   all  |   common } 

 
 
This option is used to specify what fields (column names) should be
@@ -143,19 +128,46 @@
 

 

 
  -e  |   --escape  { yes  |   no } 
  -h  |   --help  
Print help information.
  -m  |   --mode  { tabular  |   multiline } 

 
-
Whether to escape : and \ characters in terse tabular mode. The
-          escape character is \.

-
If omitted, default is yes.

+
Switch between tabular and multiline output:

+

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




 tabular 
Output is a table where each line describes a single entry.
+                Columns define particular properties of the entry.
 multiline 
Each entry comprises multiple lines, each property on its
+                own line. The values are prefixed with the property name.

+
If omitted, default is tabular for most commands.
+          For the commands producing more structured information, that cannot be
+          displayed on a single line, default is multiline.
+          Currently, they are:

+
    
+
  • nmcli connection show ID
    • 
+
  • nmcli device show
    • 
+

 		
 

 
  -a  |   --ask  
When using this option nmcli will stop and ask for any
-          missing required arguments, so do not use this option for non-interactive
-          purposes like scripts. This option controls, for example, whether you will be
-          prompted for a password if it is required for connecting to a network.
  -p  |   --pretty  
Output is pretty. This causes nmcli to produce easily
+          readable outputs for humans, i.e. values are aligned, headers are printed,
+          etc.

 

 

 
  -s  |   --show-secrets  

 

 
  -t  |   --terse  
Output is terse. This mode is designed and suitable for computer (script)
+          processing.
  -v  |   --version  
Show nmcli version.

 
  -w  |   --wait  
             seconds 
         

 
 
  --complete-args  

-
Instead of conducting the desired action, nmcli
-          will list possible completions for the last argument. This is useful to implement
-          argument completion in shell.

-
The exit status will indicate success
-          or return a code 65 to indicate the last argument is a file name.

-
NetworkManager ships with command completion support for GNU Bash.

-
  -v  |   --version  
Show nmcli version.
  -h  |   --help  
Print help information.

 
 

 

@@ -572,9 +574,10 @@
 
Be aware that this command deactivates the specified active connection,
           but the device on which the connection was active, is still ready to connect
           and will perform auto-activation by looking for a suitable connection that has
-          the 'autoconnect' flag set. This includes the just deactivated connection. So
-          if the connection is set to auto-connect, it will be automatically started on
-          the disconnected device again.

+          the 'autoconnect' flag set. Note that the deactivating connection profile is
+          internally blocked from autoconnecting again. Hence it will not autoconnect
+          until reboot or until the user performs an action that unblocks autoconnect,
+          like modifying the profile or explicitly activating it.

 
In most cases you may want to use device disconnect
           command instead.

 
The connection is identified by its name, UUID or D-Bus path. If
@@ -1024,14 +1027,13 @@
         

 
 
Connect to a Wi-Fi network specified by SSID or BSSID. The command
-          creates a new connection and then activates it on a device. This is a
-          command-line counterpart of clicking an SSID in a GUI client. The command
-          always creates a new connection and thus it is mainly useful for connecting to
-          new Wi-Fi networks. If a connection for the network already exists, it is
-          better to bring up (activate) the existing connection as follows:
+          finds a matching connection or creates one and then activates it on a device.
+          This is a command-line counterpart of clicking an SSID in a GUI client. If
+          a connection for the network already exists, it is possible to bring up
+          (activate) the existing profile as follows:
           nmcli con up id name. Note that
-          only open, WEP and WPA-PSK networks are supported at the moment. It is also
-          supposed that IP configuration is obtained via DHCP.

+          only open, WEP and WPA-PSK networks are supported if no previous connection
+          exists. It is also assumed that IP configuration is obtained via DHCP.

 
If --wait option is not specified, the default timeout will be 90
           seconds.

 
Available options are:

@@ -2386,8 +2388,8 @@ It's equivalent to the +bond.options 'option=value'
 
shows details for "My default em1" connection profile.

 

 
nmcli --show-secrets connection show "My Home WiFi"
shows details for "My Home WiFi" connection profile with all passwords.
+
nmcli --show-secrets connection show "My Home Wi-Fi"
shows details for "My Home Wi-Fi" connection profile with all passwords.
           Without --show-secrets option, secrets would not be
           displayed.

 

 
 
 
 
 

 Home
 UpPrevPrev
 Next
 

 

diff --git a/docs/api/html/ref-dbus-devices.html b/docs/api/html/ref-dbus-devices.html
index ee7f14ad..c58b8782 100644
--- a/docs/api/html/ref-dbus-devices.html
+++ b/docs/api/html/ref-dbus-devices.html
@@ -33,28 +33,25 @@
 org.freedesktop.NetworkManager.Device.Adsl — ADSL Device
 
 

-org.freedesktop.NetworkManager.Device.Bond — Bonding Device
+org.freedesktop.NetworkManager.Device.Bluetooth — Bluetooth Device
 

 

-org.freedesktop.NetworkManager.Device.Bridge — Bridging Device
+org.freedesktop.NetworkManager.Device.Bond — Bonding Device
 

 

-org.freedesktop.NetworkManager.Device.Bluetooth — Bluetooth Device
+org.freedesktop.NetworkManager.Device.Bridge — Bridging Device
 

 

 org.freedesktop.NetworkManager.Device.Dummy — Dummy Device
 

 

-org.freedesktop.NetworkManager.Device.Wired — Wired Ethernet Device
-

-

 org.freedesktop.NetworkManager.Device.Generic — Unrecognized Device
 

 

-org.freedesktop.NetworkManager.Device.Infiniband — Infiniband Device
+org.freedesktop.NetworkManager.Device.IPTunnel — IP Tunneling Device
 

 

-org.freedesktop.NetworkManager.Device.IPTunnel — IP Tunneling Device
+org.freedesktop.NetworkManager.Device.Infiniband — Infiniband Device
 

 

 org.freedesktop.NetworkManager.Device.Lowpan — 6LoWPAN Device
@@ -99,9 +96,15 @@
 org.freedesktop.NetworkManager.Device.Vxlan — VXLAN Device
 

 

+org.freedesktop.NetworkManager.Device.WifiP2P — Wi-Fi P2P Device
+

+

 org.freedesktop.NetworkManager.Device.WireGuard — WireGuard Device
 

 

+org.freedesktop.NetworkManager.Device.Wired — Wired Ethernet Device
+

+

 org.freedesktop.NetworkManager.Device.Wireless — Wi-Fi Device
 

 

diff --git a/docs/api/html/ref-dbus-wifi-p2p-peers.html b/docs/api/html/ref-dbus-wifi-p2p-peers.html
new file mode 100644
index 00000000..bf0c48fe
--- /dev/null
+++ b/docs/api/html/ref-dbus-wifi-p2p-peers.html
@@ -0,0 +1,32 @@
+
+
+
+
+The /org.freedesktop.NetworkManager.WifiP2PPeer/* objects: NetworkManager Reference Manual
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

+

+The /org.freedesktop.NetworkManager.WifiP2PPeer/* objects

+

+org.freedesktop.NetworkManager.WifiP2PPeer — Wi-Fi P2P Peer
+

+

+

+
Generated by GTK-Doc V1.29

+
+
\ No newline at end of file
diff --git a/docs/api/html/ref-settings.html b/docs/api/html/ref-settings.html
index c777b6b4..022eeb31 100644
--- a/docs/api/html/ref-settings.html
+++ b/docs/api/html/ref-settings.html
@@ -145,12 +145,18 @@
 vxlan — VXLAN Settings
 

 

+wifi-p2p — Wi-Fi P2P Settings
+

+

 wimax — WiMax Settings
 

 

 802-3-ethernet — Wired Ethernet Settings
 

 

+wireguard — WireGuard Ethernet Settings
+

+

 802-11-wireless — Wi-Fi Settings
 

 

diff --git a/docs/api/html/settings-6lowpan.html b/docs/api/html/settings-6lowpan.html
index ad65fe2e..6b94ca8e 100644
--- a/docs/api/html/settings-6lowpan.html
+++ b/docs/api/html/settings-6lowpan.html
@@ -38,7 +38,7 @@
             Properties
         
 

-
Table 65. 

+
Table 68. 

 
diff --git a/docs/api/html/settings-802-11-olpc-mesh.html b/docs/api/html/settings-802-11-olpc-mesh.html
index 847ac54e..012bee43 100644
--- a/docs/api/html/settings-802-11-olpc-mesh.html
+++ b/docs/api/html/settings-802-11-olpc-mesh.html
@@ -38,7 +38,7 @@
             Properties
         

-
Table 85. 

+
Table 88. 

 

 
 

 
diff --git a/docs/api/html/settings-802-11-wireless-security.html b/docs/api/html/settings-802-11-wireless-security.html
index 3859ff6b..aed0210e 100644
--- a/docs/api/html/settings-802-11-wireless-security.html
+++ b/docs/api/html/settings-802-11-wireless-security.html
@@ -34,11 +34,11 @@
 

 
 


 

 

-

+

             Properties
         

 

-
Table 106. 

+
Table 111. 

 
@@ -75,7 +75,7 @@
 
-
+
@@ -117,7 +117,7 @@
 
-
+
diff --git a/docs/api/html/settings-802-11-wireless.html b/docs/api/html/settings-802-11-wireless.html
index ee09bc6e..80e7e340 100644
--- a/docs/api/html/settings-802-11-wireless.html
+++ b/docs/api/html/settings-802-11-wireless.html
@@ -6,7 +6,7 @@
 
-
+
@@ -21,7 +21,7 @@
 
-
+

 
 

key-mgmt

 
string

 
Key management used for the connection.  One of "none" (WEP), "ieee8021x" (Dynamic WEP), "wpa-none" (Ad-Hoc WPA-PSK), "wpa-psk" (infrastructure WPA-PSK), or "wpa-eap" (WPA-Enterprise).  This property must be set for any Wi-Fi connection that uses security.Key management used for the connection.  One of "none" (WEP), "ieee8021x" (Dynamic WEP), "wpa-none" (Ad-Hoc WPA-PSK), "wpa-psk" (infrastructure WPA-PSK), "sae" (SAE) or "wpa-eap" (WPA-Enterprise). This property must be set for any Wi-Fi connection that uses security.
 

 

 
leap-password
psk

 
string

 
Pre-Shared-Key for WPA networks.  If the key is 64-characters long, it must contain only hexadecimal characters and is interpreted as a hexadecimal WPA key.  Otherwise, the key must be between 8 and 63 ASCII characters (as specified in the 802.11i standard) and is interpreted as a WPA passphrase, and is hashed to derive the actual WPA-PSK used when connecting to the Wi-Fi network.Pre-Shared-Key for WPA networks. For WPA-PSK, it's either an ASCII passphrase of 8 to 63 characters that is (as specified in the 802.11i standard) hashed to derive the actual key, or the key in form of 64 hexadecimal character. The WPA3-Personal networks use a passphrase of any length for SAE authentication.
 

 

 
psk-flags

 
 
 
 
 
 Home
 UpPrevPrev
 Next
 

 

@@ -34,11 +34,11 @@
 

 

 

-

+

             Properties
         

 

-
Table 105. 

+
Table 110. 

 
@@ -57,7 +57,7 @@
 
-
+
diff --git a/docs/api/html/settings-802-1x.html b/docs/api/html/settings-802-1x.html
index 08c348b3..63b845ec 100644
--- a/docs/api/html/settings-802-1x.html
+++ b/docs/api/html/settings-802-1x.html
@@ -38,7 +38,7 @@
             Properties
         

-
Table 66. 

+
Table 69. 

 

 
 

assigned-mac-address

 
string

 
The new field for the cloned MAC address. It can be either a hardware address in ASCII representation, or one of the special values "preserve", "permanent", "random" or "stable". This field replaces the deprecated "cloned-mac-address" on D-Bus, which can only contain explict hardware addresses. Note that this property only exists in D-Bus API. libnm and nmcli continue to call this property "cloned-mac-address".The new field for the cloned MAC address. It can be either a hardware address in ASCII representation, or one of the special values "preserve", "permanent", "random" or "stable". This field replaces the deprecated "cloned-mac-address" on D-Bus, which can only contain explicit hardware addresses. Note that this property only exists in D-Bus API. libnm and nmcli continue to call this property "cloned-mac-address".
 

 

 
band

 
diff --git a/docs/api/html/settings-802-3-ethernet.html b/docs/api/html/settings-802-3-ethernet.html
index a954bbf0..425bd124 100644
--- a/docs/api/html/settings-802-3-ethernet.html
+++ b/docs/api/html/settings-802-3-ethernet.html
@@ -7,7 +7,7 @@
 
-
+
@@ -22,7 +22,7 @@
 
-
+

 
 

 
 
 
 
 
Home
 Up
 PrevNextNext
 

 

 

@@ -34,11 +34,11 @@
 

 

 

-

+

             Properties
         

 

-
Table 104. 

+
Table 108. 

 
@@ -57,7 +57,7 @@
 
-
+
diff --git a/docs/api/html/settings-adsl.html b/docs/api/html/settings-adsl.html
index f3bc2f1c..e019f1fc 100644
--- a/docs/api/html/settings-adsl.html
+++ b/docs/api/html/settings-adsl.html
@@ -38,7 +38,7 @@
             Properties
         

-
Table 67. 

+
Table 70. 

 

 
 

assigned-mac-address

 
string

 
The new field for the cloned MAC address. It can be either a hardware address in ASCII representation, or one of the special values "preserve", "permanent", "random" or "stable". This field replaces the deprecated "cloned-mac-address" on D-Bus, which can only contain explict hardware addresses. Note that this property only exists in D-Bus API. libnm and nmcli continue to call this property "cloned-mac-address".The new field for the cloned MAC address. It can be either a hardware address in ASCII representation, or one of the special values "preserve", "permanent", "random" or "stable". This field replaces the deprecated "cloned-mac-address" on D-Bus, which can only contain explicit hardware addresses. Note that this property only exists in D-Bus API. libnm and nmcli continue to call this property "cloned-mac-address".
 

 

 
auto-negotiate

 
diff --git a/docs/api/html/settings-bluetooth.html b/docs/api/html/settings-bluetooth.html
index 2cabe4db..a7bfd081 100644
--- a/docs/api/html/settings-bluetooth.html
+++ b/docs/api/html/settings-bluetooth.html
@@ -38,7 +38,7 @@
             Properties
         

-
Table 68. 

+
Table 71. 

 

 
 

 
diff --git a/docs/api/html/settings-bond.html b/docs/api/html/settings-bond.html
index 425a8db5..5695ed42 100644
--- a/docs/api/html/settings-bond.html
+++ b/docs/api/html/settings-bond.html
@@ -38,7 +38,7 @@
             Properties
         

-
Table 69. 

+
Table 72. 

 

 
 

 
diff --git a/docs/api/html/settings-bridge-port.html b/docs/api/html/settings-bridge-port.html
index 598a99eb..9de7bc09 100644
--- a/docs/api/html/settings-bridge-port.html
+++ b/docs/api/html/settings-bridge-port.html
@@ -38,7 +38,7 @@
             Properties
         

-
Table 71. 

+
Table 74. 

 

 
 

 
diff --git a/docs/api/html/settings-bridge.html b/docs/api/html/settings-bridge.html
index 830fe274..d5657511 100644
--- a/docs/api/html/settings-bridge.html
+++ b/docs/api/html/settings-bridge.html
@@ -38,7 +38,7 @@
             Properties
         

-
Table 70. 

+
Table 73. 

 

 
 

 
diff --git a/docs/api/html/settings-cdma.html b/docs/api/html/settings-cdma.html
index 1ba7b975..a9dffd77 100644
--- a/docs/api/html/settings-cdma.html
+++ b/docs/api/html/settings-cdma.html
@@ -38,7 +38,7 @@
             Properties
         

-
Table 72. 

+
Table 75. 

 

 
 

 
diff --git a/docs/api/html/settings-connection.html b/docs/api/html/settings-connection.html
index 0da3cf89..fb44cf7e 100644
--- a/docs/api/html/settings-connection.html
+++ b/docs/api/html/settings-connection.html
@@ -38,7 +38,7 @@
             Properties
         

-
Table 64. 

+
Table 67. 

 

 
 

 
@@ -165,7 +165,7 @@
 
-
+
diff --git a/docs/api/html/settings-dcb.html b/docs/api/html/settings-dcb.html
index f41141f6..0f102334 100644
--- a/docs/api/html/settings-dcb.html
+++ b/docs/api/html/settings-dcb.html
@@ -38,7 +38,7 @@
             Properties
         

-
Table 73. 

+
Table 76. 

 

 
 

stable-id

 
string

 
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 as DHCP client identifier with ipv4.dhcp-client-id=stable and to derive the DHCP DUID with ipv6.dhcp-duid=stable-[llt,ll,uuid]. 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 '$' 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 the 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.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 as DHCP client identifier with ipv4.dhcp-client-id=stable and to derive the DHCP DUID with ipv6.dhcp-duid=stable-[llt,ll,uuid]. 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 '$' 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.
 

 

 
timestamp

 
diff --git a/docs/api/html/settings-dummy.html b/docs/api/html/settings-dummy.html
index 5e0951b3..7db75778 100644
--- a/docs/api/html/settings-dummy.html
+++ b/docs/api/html/settings-dummy.html
@@ -38,7 +38,7 @@
             Properties
         

-
Table 74. 

+
Table 77. 

 

 
 

 
diff --git a/docs/api/html/settings-ethtool.html b/docs/api/html/settings-ethtool.html
index c76c1b50..b3982665 100644
--- a/docs/api/html/settings-ethtool.html
+++ b/docs/api/html/settings-ethtool.html
@@ -38,7 +38,7 @@
             Properties
         

-
Table 75. 

+
Table 78. 

 

 
 

 
diff --git a/docs/api/html/settings-generic.html b/docs/api/html/settings-generic.html
index 5c8dc6a5..4d91d6cc 100644
--- a/docs/api/html/settings-generic.html
+++ b/docs/api/html/settings-generic.html
@@ -38,7 +38,7 @@
             Properties
         

-
Table 76. 

+
Table 79. 

 

 
 

 
diff --git a/docs/api/html/settings-gsm.html b/docs/api/html/settings-gsm.html
index 75ea0ef2..46be0d96 100644
--- a/docs/api/html/settings-gsm.html
+++ b/docs/api/html/settings-gsm.html
@@ -38,7 +38,7 @@
             Properties
         

-
Table 77. 

+
Table 80. 

 

 
 

 
@@ -87,7 +87,7 @@
 
-
+
diff --git a/docs/api/html/settings-infiniband.html b/docs/api/html/settings-infiniband.html
index 831da8af..3bce1836 100644
--- a/docs/api/html/settings-infiniband.html
+++ b/docs/api/html/settings-infiniband.html
@@ -38,7 +38,7 @@
             Properties
         

-
Table 78. 

+
Table 81. 

 

 
 

number

 
string

 
Number to dial when establishing a PPP data session with the GSM-based mobile broadband network.  Many modems do not require PPP for connections to the mobile network and thus this property should be left blank, which allows NetworkManager to select the appropriate settings automatically.Legacy setting that used to help establishing PPP data sessions for GSM-based modems. Deprecated: 1
 

 

 
password

 
diff --git a/docs/api/html/settings-ip-tunnel.html b/docs/api/html/settings-ip-tunnel.html
index ee47fde9..20f93bd9 100644
--- a/docs/api/html/settings-ip-tunnel.html
+++ b/docs/api/html/settings-ip-tunnel.html
@@ -38,7 +38,7 @@
             Properties
         

-
Table 81. 

+
Table 84. 

 

 
 

 
diff --git a/docs/api/html/settings-ipv4.html b/docs/api/html/settings-ipv4.html
index ae58a2d6..5f98dd5e 100644
--- a/docs/api/html/settings-ipv4.html
+++ b/docs/api/html/settings-ipv4.html
@@ -38,7 +38,7 @@
             Properties
         

-
Table 79. 

+
Table 82. 

 

 
 

 
@@ -117,7 +117,7 @@
 
-
+
diff --git a/docs/api/html/settings-ipv6.html b/docs/api/html/settings-ipv6.html
index 776b5022..76758030 100644
--- a/docs/api/html/settings-ipv6.html
+++ b/docs/api/html/settings-ipv6.html
@@ -38,7 +38,7 @@
             Properties
         

-
Table 80. 

+
Table 83. 

 

 
 

dns-priority

 
int32

 
0
DNS servers priority. The relative priority for DNS servers specified by this setting.  A lower value is better (higher priority).  Zero selects the default value, which is 50 for VPNs and 100 for other connections. Note that the priority is to order DNS settings for multiple active connections.  It does not disambiguate multiple DNS servers within the same connection profile. When using dns=default, servers with higher priority will be on top of resolv.conf.  To prioritize a given server over another one within the same connection, just specify them in the desired order.  When multiple devices have configurations with the same priority, the one with an active default route will be preferred.  Negative values have the special effect of excluding other configurations with a greater priority value; so in presence of at least a negative priority, only DNS servers from connections with the lowest priority value will be used. When using a DNS resolver that supports split-DNS as dns=dnsmasq or dns=systemd-resolved, each connection is used to query domains in its search list.  Queries for domains not present in any search list are routed through connections having the '~.' special wildcard domain, which is added automatically to connections with the default route (or can be added manually).  When multiple connections specify the same domain, the one with the highest priority (lowest numerical value) wins.  If a connection specifies a domain which is subdomain of another domain with a negative DNS priority value, the subdomain is ignored.DNS servers priority. The relative priority for DNS servers specified by this setting.  A lower value is better (higher priority). Zero selects a globally configured default value. If the latter is missing or zero too, it defaults to 50 for VPNs and 100 for other connections. Note that the priority is to order DNS settings for multiple active connections.  It does not disambiguate multiple DNS servers within the same connection profile. When using dns=default, servers with higher priority will be on top of resolv.conf.  To prioritize a given server over another one within the same connection, just specify them in the desired order.  When multiple devices have configurations with the same priority, the one with an active default route will be preferred.  Negative values have the special effect of excluding other configurations with a greater priority value; so in presence of at least a negative priority, only DNS servers from connections with the lowest priority value will be used. When using a DNS resolver that supports split-DNS as dns=dnsmasq or dns=systemd-resolved, each connection is used to query domains in its search list.  Queries for domains not present in any search list are routed through connections having the '~.' special wildcard domain, which is added automatically to connections with the default route (or can be added manually).  When multiple connections specify the same domain, the one with the highest priority (lowest numerical value) wins.  If a connection specifies a domain which is subdomain of another domain with a negative DNS priority value, the subdomain is ignored.
 

 

 
dns-search

 
@@ -117,7 +117,7 @@
 
-
+
diff --git a/docs/api/html/settings-macsec.html b/docs/api/html/settings-macsec.html
index f3e2c564..6ffb812f 100644
--- a/docs/api/html/settings-macsec.html
+++ b/docs/api/html/settings-macsec.html
@@ -38,7 +38,7 @@
             Properties
         

-
Table 82. 

+
Table 85. 

 

 
 

dns-priority

 
int32

 
0
DNS servers priority. The relative priority for DNS servers specified by this setting.  A lower value is better (higher priority).  Zero selects the default value, which is 50 for VPNs and 100 for other connections. Note that the priority is to order DNS settings for multiple active connections.  It does not disambiguate multiple DNS servers within the same connection profile. When using dns=default, servers with higher priority will be on top of resolv.conf.  To prioritize a given server over another one within the same connection, just specify them in the desired order.  When multiple devices have configurations with the same priority, the one with an active default route will be preferred.  Negative values have the special effect of excluding other configurations with a greater priority value; so in presence of at least a negative priority, only DNS servers from connections with the lowest priority value will be used. When using a DNS resolver that supports split-DNS as dns=dnsmasq or dns=systemd-resolved, each connection is used to query domains in its search list.  Queries for domains not present in any search list are routed through connections having the '~.' special wildcard domain, which is added automatically to connections with the default route (or can be added manually).  When multiple connections specify the same domain, the one with the highest priority (lowest numerical value) wins.  If a connection specifies a domain which is subdomain of another domain with a negative DNS priority value, the subdomain is ignored.DNS servers priority. The relative priority for DNS servers specified by this setting.  A lower value is better (higher priority). Zero selects a globally configured default value. If the latter is missing or zero too, it defaults to 50 for VPNs and 100 for other connections. Note that the priority is to order DNS settings for multiple active connections.  It does not disambiguate multiple DNS servers within the same connection profile. When using dns=default, servers with higher priority will be on top of resolv.conf.  To prioritize a given server over another one within the same connection, just specify them in the desired order.  When multiple devices have configurations with the same priority, the one with an active default route will be preferred.  Negative values have the special effect of excluding other configurations with a greater priority value; so in presence of at least a negative priority, only DNS servers from connections with the lowest priority value will be used. When using a DNS resolver that supports split-DNS as dns=dnsmasq or dns=systemd-resolved, each connection is used to query domains in its search list.  Queries for domains not present in any search list are routed through connections having the '~.' special wildcard domain, which is added automatically to connections with the default route (or can be added manually).  When multiple connections specify the same domain, the one with the highest priority (lowest numerical value) wins.  If a connection specifies a domain which is subdomain of another domain with a negative DNS priority value, the subdomain is ignored.
 

 

 
dns-search

 
diff --git a/docs/api/html/settings-macvlan.html b/docs/api/html/settings-macvlan.html
index ff792011..acd81695 100644
--- a/docs/api/html/settings-macvlan.html
+++ b/docs/api/html/settings-macvlan.html
@@ -38,7 +38,7 @@
             Properties
         

-
Table 83. 

+
Table 86. 

 

 
 

 
diff --git a/docs/api/html/settings-match.html b/docs/api/html/settings-match.html
index 994ece60..a7e6b153 100644
--- a/docs/api/html/settings-match.html
+++ b/docs/api/html/settings-match.html
@@ -38,7 +38,7 @@
             Properties
         

-
Table 84. 

+
Table 87. 

 

 
 

 
diff --git a/docs/api/html/settings-ovs-bridge.html b/docs/api/html/settings-ovs-bridge.html
index c46a2f17..2424e29f 100644
--- a/docs/api/html/settings-ovs-bridge.html
+++ b/docs/api/html/settings-ovs-bridge.html
@@ -38,7 +38,7 @@
             Properties
         

-
Table 86. 

+
Table 89. 

 

 
 

 
diff --git a/docs/api/html/settings-ovs-interface.html b/docs/api/html/settings-ovs-interface.html
index 7eb583e0..d373f6d8 100644
--- a/docs/api/html/settings-ovs-interface.html
+++ b/docs/api/html/settings-ovs-interface.html
@@ -38,7 +38,7 @@
             Properties
         

-
Table 87. 

+
Table 90. 

 

 
 

 
diff --git a/docs/api/html/settings-ovs-patch.html b/docs/api/html/settings-ovs-patch.html
index e3f41bd3..e3750cba 100644
--- a/docs/api/html/settings-ovs-patch.html
+++ b/docs/api/html/settings-ovs-patch.html
@@ -38,7 +38,7 @@
             Properties
         

-
Table 88. 

+
Table 91. 

 

 
 

 
diff --git a/docs/api/html/settings-ovs-port.html b/docs/api/html/settings-ovs-port.html
index 73889a89..f4acdf36 100644
--- a/docs/api/html/settings-ovs-port.html
+++ b/docs/api/html/settings-ovs-port.html
@@ -38,7 +38,7 @@
             Properties
         

-
Table 89. 

+
Table 92. 

 

 
 

 
diff --git a/docs/api/html/settings-ppp.html b/docs/api/html/settings-ppp.html
index 1d0ac104..fc303a85 100644
--- a/docs/api/html/settings-ppp.html
+++ b/docs/api/html/settings-ppp.html
@@ -38,7 +38,7 @@
             Properties
         

-
Table 90. 

+
Table 93. 

 

 
 

 
diff --git a/docs/api/html/settings-pppoe.html b/docs/api/html/settings-pppoe.html
index 41264737..8b1ce2ac 100644
--- a/docs/api/html/settings-pppoe.html
+++ b/docs/api/html/settings-pppoe.html
@@ -38,7 +38,7 @@
             Properties
         

-
Table 91. 

+
Table 94. 

 

 
 

 
diff --git a/docs/api/html/settings-proxy.html b/docs/api/html/settings-proxy.html
index 4b87ede1..0b4da901 100644
--- a/docs/api/html/settings-proxy.html
+++ b/docs/api/html/settings-proxy.html
@@ -38,7 +38,7 @@
             Properties
         

-
Table 92. 

+
Table 95. 

 

 
 

 
diff --git a/docs/api/html/settings-serial.html b/docs/api/html/settings-serial.html
index e503f732..a634b3c7 100644
--- a/docs/api/html/settings-serial.html
+++ b/docs/api/html/settings-serial.html
@@ -38,7 +38,7 @@
             Properties
         

-
Table 93. 

+
Table 96. 

 

 
 

 
diff --git a/docs/api/html/settings-sriov.html b/docs/api/html/settings-sriov.html
index b5ecc029..8c422e7e 100644
--- a/docs/api/html/settings-sriov.html
+++ b/docs/api/html/settings-sriov.html
@@ -38,7 +38,7 @@
             Properties
         

-
Table 94. 

+
Table 97. 

 

 
 

 
diff --git a/docs/api/html/settings-tc.html b/docs/api/html/settings-tc.html
index 6de65275..0668fef4 100644
--- a/docs/api/html/settings-tc.html
+++ b/docs/api/html/settings-tc.html
@@ -38,7 +38,7 @@
             Properties
         

-
Table 95. 

+
Table 98. 

 

 
 

 
diff --git a/docs/api/html/settings-team-port.html b/docs/api/html/settings-team-port.html
index c0698945..c972a583 100644
--- a/docs/api/html/settings-team-port.html
+++ b/docs/api/html/settings-team-port.html
@@ -38,7 +38,7 @@
             Properties
         

-
Table 97. 

+
Table 100. 

 

 
 

 
@@ -75,7 +75,7 @@
 
-
+
diff --git a/docs/api/html/settings-team.html b/docs/api/html/settings-team.html
index 4711e700..b3a38e24 100644
--- a/docs/api/html/settings-team.html
+++ b/docs/api/html/settings-team.html
@@ -38,7 +38,7 @@
             Properties
         

-
Table 96. 

+
Table 99. 

 

 
 

link-watchers

 
array of vardict

 
[]
Link watchers configuration for the connection: each link watcher is defined by a dictionary, whose keys depend upon the selected link watcher. Available link watchers are 'ethtool', 'nsna_ping' and 'arp_ping' and it is specified in the dictionary with the key 'name'. Available keys are:   ethtool: 'delay-up', 'delay-down', 'init-wait'; nsna_ping: 'init-wait', 'interval', 'missed-max', 'target-host'; arp_ping: all the ones in nsna_ping and 'source-host', 'validate-active', 'validate-incative', 'send-always'. See teamd.conf man for more details.Link watchers configuration for the connection: each link watcher is defined by a dictionary, whose keys depend upon the selected link watcher. Available link watchers are 'ethtool', 'nsna_ping' and 'arp_ping' and it is specified in the dictionary with the key 'name'. Available keys are:   ethtool: 'delay-up', 'delay-down', 'init-wait'; nsna_ping: 'init-wait', 'interval', 'missed-max', 'target-host'; arp_ping: all the ones in nsna_ping and 'source-host', 'validate-active', 'validate-inactive', 'send-always'. See teamd.conf man for more details.
 

 

 
prio

 
@@ -69,7 +69,7 @@
 
-
+
diff --git a/docs/api/html/settings-tun.html b/docs/api/html/settings-tun.html
index 14f1c2ea..86d12d8b 100644
--- a/docs/api/html/settings-tun.html
+++ b/docs/api/html/settings-tun.html
@@ -38,7 +38,7 @@
             Properties
         

-
Table 98. 

+
Table 101. 

 

 
 

link-watchers

 
array of vardict

 
[]
Link watchers configuration for the connection: each link watcher is defined by a dictionary, whose keys depend upon the selected link watcher. Available link watchers are 'ethtool', 'nsna_ping' and 'arp_ping' and it is specified in the dictionary with the key 'name'. Available keys are:   ethtool: 'delay-up', 'delay-down', 'init-wait'; nsna_ping: 'init-wait', 'interval', 'missed-max', 'target-host'; arp_ping: all the ones in nsna_ping and 'source-host', 'validate-active', 'validate-incative', 'send-always'. See teamd.conf man for more details.Link watchers configuration for the connection: each link watcher is defined by a dictionary, whose keys depend upon the selected link watcher. Available link watchers are 'ethtool', 'nsna_ping' and 'arp_ping' and it is specified in the dictionary with the key 'name'. Available keys are:   ethtool: 'delay-up', 'delay-down', 'init-wait'; nsna_ping: 'init-wait', 'interval', 'missed-max', 'target-host'; arp_ping: all the ones in nsna_ping and 'source-host', 'validate-active', 'validate-inactive', 'send-always'. See teamd.conf man for more details.
 

 

 
mcast-rejoin-count

 
diff --git a/docs/api/html/settings-user.html b/docs/api/html/settings-user.html
index 0e409100..6a511b08 100644
--- a/docs/api/html/settings-user.html
+++ b/docs/api/html/settings-user.html
@@ -38,7 +38,7 @@
             Properties
         

-
Table 99. 

+
Table 102. 

 

 
 

 
diff --git a/docs/api/html/settings-vlan.html b/docs/api/html/settings-vlan.html
index f975022c..61c4b630 100644
--- a/docs/api/html/settings-vlan.html
+++ b/docs/api/html/settings-vlan.html
@@ -38,7 +38,7 @@
             Properties
         

-
Table 100. 

+
Table 103. 

 

 
 

 
diff --git a/docs/api/html/settings-vpn.html b/docs/api/html/settings-vpn.html
index 1a964dd6..f94e1c15 100644
--- a/docs/api/html/settings-vpn.html
+++ b/docs/api/html/settings-vpn.html
@@ -38,7 +38,7 @@
             Properties
         

-
Table 101. 

+
Table 104. 

 

 
 

 
diff --git a/docs/api/html/settings-vxlan.html b/docs/api/html/settings-vxlan.html
index 14f48141..2891c893 100644
--- a/docs/api/html/settings-vxlan.html
+++ b/docs/api/html/settings-vxlan.html
@@ -7,7 +7,7 @@
 
-
+
@@ -22,7 +22,7 @@
 
-
+

 
 

 
 
 
 
 
Home
 Up
 PrevNextNext
 

 

 

@@ -38,7 +38,7 @@
             Properties
         
 

-
Table 102. 

+
Table 105. 

 
diff --git a/docs/api/html/settings-wifi-p2p.html b/docs/api/html/settings-wifi-p2p.html
new file mode 100644
index 00000000..ad66d6b6
--- /dev/null
+++ b/docs/api/html/settings-wifi-p2p.html
@@ -0,0 +1,83 @@
+
+
+
+
+wifi-p2p: NetworkManager Reference Manual
+
+
+
+
+
+
+
+
+
+

 
 


+
+
+
+
+
+
+

+

+

+
+
+

+
wifi-p2p

+
wifi-p2p — Wi-Fi P2P Settings

+

+

+

+            Properties
+        

+

+
Table 106. 

+

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






Key NameValue TypeDefault ValueValue Description
peer
string
The P2P device that should be connected to. Currently this is the only way to create or join a group.
wfd-ies
byte array
The Wi-Fi Display (WFD) Information Elements (IEs) to set. Wi-Fi Display requires a protocol specific information element to be set in certain Wi-Fi frames. These can be specified here for the purpose of establishing a connection. This setting is only useful when implementing a Wi-Fi Display client.
wps-method
uint32
0
Flags indicating which mode of WPS is to be used. There's little point in changing the default setting as NetworkManager will automatically determine the best method to use.

+

+


+

+

+

+
Generated by GTK-Doc V1.29

+
+
\ No newline at end of file
diff --git a/docs/api/html/settings-wimax.html b/docs/api/html/settings-wimax.html
index b00506af..bcbab4e4 100644
--- a/docs/api/html/settings-wimax.html
+++ b/docs/api/html/settings-wimax.html
@@ -6,7 +6,7 @@
 
 
 
-
+
 
 
 
@@ -21,7 +21,7 @@
 

 Home
 UpPrevPrev
 Next
 

 

@@ -34,11 +34,11 @@
 
 

 

-

+

             Properties
         

 

-
Table 103. 

+
Table 107. 

 
diff --git a/docs/api/html/settings-wireguard.html b/docs/api/html/settings-wireguard.html
new file mode 100644
index 00000000..99261f39
--- /dev/null
+++ b/docs/api/html/settings-wireguard.html
@@ -0,0 +1,107 @@
+
+
+
+
+wireguard: NetworkManager Reference Manual
+
+
+
+
+
+
+
+
+
+

 
 


+
+
+
+
+
+
+

+

+

+
+
+

+
wireguard

+
wireguard — WireGuard Ethernet Settings

+

+

+

+            Properties
+        

+

+
Table 109. 

+

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






Key NameValue TypeDefault ValueValue Description
fwmark
uint32
0
The use of fwmark is optional and is by default off. Setting it to 0 disables it. Otherwise it is a 32-bit fwmark for outgoing packets.
listen-port
uint32
0
The listen-port. If listen-port is not specified, the port will be chosen randomly when the interface comes up.
mtu
uint32
0
If non-zero, only transmit packets of the specified size or smaller, breaking larger packets up into multiple fragments. If zero a default MTU is used. Note that contrary to wg-quick's MTU setting, this does not take into account the current routes at the time of activation.
peer-routes
boolean
TRUE
Whether to automatically add routes for the AllowedIPs ranges of the peers. If TRUE (the default), NetworkManager will automatically add routes in the routing tables according to ipv4.route-table and ipv6.route-table. If FALSE, no such routes are added automatically. In this case, the user may want to configure static routes in ipv4.routes and ipv6.routes, respectively.
peers
array of 'a{sv}'
Array of dictionaries for the WireGuard peers.
private-key
string
The 256 bit private-key in base64 encoding.
private-key-flags
NMSettingSecretFlags (uint32)
Flags indicating how to handle the "private-key" property.

+

+


+

+

+

+
Generated by GTK-Doc V1.29

+
+
\ No newline at end of file
diff --git a/docs/api/html/settings-wpan.html b/docs/api/html/settings-wpan.html
index 62f851ae..41339fd1 100644
--- a/docs/api/html/settings-wpan.html
+++ b/docs/api/html/settings-wpan.html
@@ -34,11 +34,11 @@
 
 

 

-

+

             Properties
         

 

-
Table 107. 

+
Table 112. 

 
@@ -54,12 +54,24 @@
 
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/docs/api/html/spec.html b/docs/api/html/spec.html
index aa6c22b5..1adadeb3 100644
--- a/docs/api/html/spec.html
+++ b/docs/api/html/spec.html
@@ -57,28 +57,25 @@
 org.freedesktop.NetworkManager.Device.Adsl — ADSL Device

-org.freedesktop.NetworkManager.Device.Bond — Bonding Device
+org.freedesktop.NetworkManager.Device.Bluetooth — Bluetooth Device
 

-org.freedesktop.NetworkManager.Device.Bridge — Bridging Device
+org.freedesktop.NetworkManager.Device.Bond — Bonding Device
 

-org.freedesktop.NetworkManager.Device.Bluetooth — Bluetooth Device
+org.freedesktop.NetworkManager.Device.Bridge — Bridging Device
 

 org.freedesktop.NetworkManager.Device.Dummy — Dummy Device
 

-org.freedesktop.NetworkManager.Device.Wired — Wired Ethernet Device
-

-

 org.freedesktop.NetworkManager.Device.Generic — Unrecognized Device
 

-org.freedesktop.NetworkManager.Device.Infiniband — Infiniband Device
+org.freedesktop.NetworkManager.Device.IPTunnel — IP Tunneling Device
 

-org.freedesktop.NetworkManager.Device.IPTunnel — IP Tunneling Device
+org.freedesktop.NetworkManager.Device.Infiniband — Infiniband Device
 

 org.freedesktop.NetworkManager.Device.Lowpan — 6LoWPAN Device
@@ -123,9 +120,15 @@
 org.freedesktop.NetworkManager.Device.Vxlan — VXLAN Device
 

+org.freedesktop.NetworkManager.Device.WifiP2P — Wi-Fi P2P Device
+

+

 org.freedesktop.NetworkManager.Device.WireGuard — WireGuard Device
 

+org.freedesktop.NetworkManager.Device.Wired — Wired Ethernet Device
+

+

 org.freedesktop.NetworkManager.Device.Wireless — Wi-Fi Device
 

@@ -164,6 +167,10 @@
 

 org.freedesktop.NetworkManager.AccessPoint — Wi-Fi Access Point
 

+
The /org.freedesktop.NetworkManager.WifiP2PPeer/* objects

+

+org.freedesktop.NetworkManager.WifiP2PPeer — Wi-Fi P2P Peer
+
The /org/freedesktop/NetworkManager/Checkpoint/* objects

 org.freedesktop.NetworkManager.Checkpoint — Configuration and State Snapshot
diff --git a/docs/api/meson.build b/docs/api/meson.build
index 31b9776c..609e4ce8 100644
--- a/docs/api/meson.build
+++ b/docs/api/meson.build
@@ -10,14 +10,14 @@ if enable_introspection
     output: output,
     command: [xsltproc, '--output', '@OUTPUT@', join_paths(meson.current_source_dir(), settings + '.xsl'), '@INPUT@'],
     # FIXME: there is no target depending on this, so it will not be built
-    build_by_default: true
+    build_by_default: true,
   )
 endif
 
 configure_file(
   input: version_xml + '.in',
   output: version_xml,
-  configuration: version_conf
+  configuration: version_conf,
 )
 
 content_files += join_paths(meson.source_root(), 'COPYING')
@@ -44,5 +44,5 @@ gnome.gtkdoc(
   main_xml: 'network-manager-docs.xml',
   src_dir: meson.current_source_dir(),
   content_files: content_files,
-  install: true
+  install: true,
 )
diff --git a/docs/api/network-manager-docs.xml b/docs/api/network-manager-docs.xml
index 06ac3741..8cf97585 100644
--- a/docs/api/network-manager-docs.xml
+++ b/docs/api/network-manager-docs.xml
@@ -182,14 +182,13 @@
       
       
       
+      
       
       
-      
       
-      
       
-      
       
+      
       
       
       
@@ -204,7 +203,9 @@
       
       
       
+      
       
+      
       
       
       
@@ -247,6 +248,12 @@
       
     
 
+    
+      The <literal>/org.freedesktop.NetworkManager.WifiP2PPeer/*</literal> objects
+      
+      
+    
+
     
       The <literal>/org/freedesktop/NetworkManager/Checkpoint/*</literal> objects
       
diff --git a/docs/api/settings-spec.xml b/docs/api/settings-spec.xml
index d31d299e..2a73f041 100644
--- a/docs/api/settings-spec.xml
+++ b/docs/api/settings-spec.xml
@@ -22,7 +22,7 @@
     read-onlyread-onlybooleanFALSEFALSE 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.
     secondariessecondariesarray of string[]List of connection UUIDs that should be activated when the base connection itself is activated. Currently only VPN connections are supported.
     slave-typeslave-typestringSetting name of the device type of this slave's master connection (eg, "bond"), or NULL if this connection is not a slave.
-    stable-idstable-idstringThis 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 as DHCP client identifier with ipv4.dhcp-client-id=stable and to derive the DHCP DUID with ipv6.dhcp-duid=stable-[llt,ll,uuid]. 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 '$' 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 the 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.
+    stable-idstable-idstringThis 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 as DHCP client identifier with ipv4.dhcp-client-id=stable and to derive the DHCP DUID with ipv6.dhcp-duid=stable-[llt,ll,uuid]. 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 '$' 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.
     timestamptimestampuint640The 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).
     typetypestringBase type of the connection. For hardware-dependent connections, should contain the setting name of the hardware-type specific setting (ie, "802-3-ethernet" or "802-11-wireless" or "bluetooth", etc), and for non-hardware dependent connections like VPN or otherwise, should contain the setting name of that setting type (ie, "vpn" or "bridge", etc).
     uuiduuidstringA universally unique identifier for the connection, for example generated with libuuid.  It should be assigned when the connection is created, and never changed as long as the connection still applies to the same network.  For example, it should not be changed when the "id" property or NMSettingIP4Config changes, but might need to be re-created when the Wi-Fi SSID, mobile broadband network provider, or "type" property changes. The UUID must be in the format "2815492f-7e56-435e-b2e9-246bd7cdc664" (ie, contains only hexadecimal characters and "-").
@@ -173,7 +173,7 @@
     home-onlyhome-onlybooleanFALSEWhen TRUE, only connections to the home network will be allowed. Connections to roaming networks will not be made.
     mtumtuuint320If non-zero, only transmit packets of the specified size or smaller, breaking larger packets up into multiple frames.
     network-idnetwork-idstringThe Network ID (GSM LAI format, ie MCC-MNC) to force specific network registration.  If the Network ID is specified, NetworkManager will attempt to force the device to register only on the specified network. This can be used to ensure that the device does not roam when direct roaming control of the device is not otherwise possible.
-    numbernumberstringNumber to dial when establishing a PPP data session with the GSM-based mobile broadband network.  Many modems do not require PPP for connections to the mobile network and thus this property should be left blank, which allows NetworkManager to select the appropriate settings automatically.
+    numbernumberstringLegacy setting that used to help establishing PPP data sessions for GSM-based modems. Deprecated: 1
     passwordpasswordstringThe password used to authenticate with the network, if required.  Many providers do not require a password, or accept any password.  But if a password is required, it is specified here.
     password-flagspassword-flagsNMSettingSecretFlags (uint32)Flags indicating how to handle the "password" property.
     pinpinstringIf the SIM is locked with a PIN it must be unlocked before any other operations are requested.  Specify the PIN here to allow operation of the device.
@@ -204,7 +204,7 @@
     dhcp-timeoutdhcp-timeoutint320A timeout for a DHCP transaction in seconds.
     dnsdnsarray of uint32[]Array of IP addresses of DNS servers (as network-byte-order integers)
     dns-optionsdns-optionsarray of string[]Array of DNS options as described in man 5 resolv.conf. NULL means that the options are unset and left at the default. In this case NetworkManager will use default options. This is distinct from an empty list of properties.
-    dns-prioritydns-priorityint320DNS servers priority. The relative priority for DNS servers specified by this setting.  A lower value is better (higher priority).  Zero selects the default value, which is 50 for VPNs and 100 for other connections. Note that the priority is to order DNS settings for multiple active connections.  It does not disambiguate multiple DNS servers within the same connection profile. When using dns=default, servers with higher priority will be on top of resolv.conf.  To prioritize a given server over another one within the same connection, just specify them in the desired order.  When multiple devices have configurations with the same priority, the one with an active default route will be preferred.  Negative values have the special effect of excluding other configurations with a greater priority value; so in presence of at least a negative priority, only DNS servers from connections with the lowest priority value will be used. When using a DNS resolver that supports split-DNS as dns=dnsmasq or dns=systemd-resolved, each connection is used to query domains in its search list.  Queries for domains not present in any search list are routed through connections having the '~.' special wildcard domain, which is added automatically to connections with the default route (or can be added manually).  When multiple connections specify the same domain, the one with the highest priority (lowest numerical value) wins.  If a connection specifies a domain which is subdomain of another domain with a negative DNS priority value, the subdomain is ignored.
+    dns-prioritydns-priorityint320DNS servers priority. The relative priority for DNS servers specified by this setting.  A lower value is better (higher priority). Zero selects a globally configured default value. If the latter is missing or zero too, it defaults to 50 for VPNs and 100 for other connections. Note that the priority is to order DNS settings for multiple active connections.  It does not disambiguate multiple DNS servers within the same connection profile. When using dns=default, servers with higher priority will be on top of resolv.conf.  To prioritize a given server over another one within the same connection, just specify them in the desired order.  When multiple devices have configurations with the same priority, the one with an active default route will be preferred.  Negative values have the special effect of excluding other configurations with a greater priority value; so in presence of at least a negative priority, only DNS servers from connections with the lowest priority value will be used. When using a DNS resolver that supports split-DNS as dns=dnsmasq or dns=systemd-resolved, each connection is used to query domains in its search list.  Queries for domains not present in any search list are routed through connections having the '~.' special wildcard domain, which is added automatically to connections with the default route (or can be added manually).  When multiple connections specify the same domain, the one with the highest priority (lowest numerical value) wins.  If a connection specifies a domain which is subdomain of another domain with a negative DNS priority value, the subdomain is ignored.
     dns-searchdns-searcharray of string[]Array of DNS search domains. Domains starting with a tilde ('~') are considered 'routing' domains and are used only to decide the interface over which a query must be forwarded; they are not used to complete unqualified host names.
     gatewaygatewaystringThe gateway associated with this configuration. This is only meaningful if "addresses" is also set.
     ignore-auto-dnsignore-auto-dnsbooleanFALSEWhen "method" is set to "auto" and this property to TRUE, automatically configured nameservers and search domains are ignored and only nameservers and search domains specified in the "dns" and "dns-search" properties, if any, are used.
@@ -230,7 +230,7 @@
     dhcp-timeoutdhcp-timeoutint320A timeout for a DHCP transaction in seconds.
     dnsdnsarray of byte array[]Array of IP addresses of DNS servers (in network byte order)
     dns-optionsdns-optionsarray of string[]Array of DNS options as described in man 5 resolv.conf. NULL means that the options are unset and left at the default. In this case NetworkManager will use default options. This is distinct from an empty list of properties.
-    dns-prioritydns-priorityint320DNS servers priority. The relative priority for DNS servers specified by this setting.  A lower value is better (higher priority).  Zero selects the default value, which is 50 for VPNs and 100 for other connections. Note that the priority is to order DNS settings for multiple active connections.  It does not disambiguate multiple DNS servers within the same connection profile. When using dns=default, servers with higher priority will be on top of resolv.conf.  To prioritize a given server over another one within the same connection, just specify them in the desired order.  When multiple devices have configurations with the same priority, the one with an active default route will be preferred.  Negative values have the special effect of excluding other configurations with a greater priority value; so in presence of at least a negative priority, only DNS servers from connections with the lowest priority value will be used. When using a DNS resolver that supports split-DNS as dns=dnsmasq or dns=systemd-resolved, each connection is used to query domains in its search list.  Queries for domains not present in any search list are routed through connections having the '~.' special wildcard domain, which is added automatically to connections with the default route (or can be added manually).  When multiple connections specify the same domain, the one with the highest priority (lowest numerical value) wins.  If a connection specifies a domain which is subdomain of another domain with a negative DNS priority value, the subdomain is ignored.
+    dns-prioritydns-priorityint320DNS servers priority. The relative priority for DNS servers specified by this setting.  A lower value is better (higher priority). Zero selects a globally configured default value. If the latter is missing or zero too, it defaults to 50 for VPNs and 100 for other connections. Note that the priority is to order DNS settings for multiple active connections.  It does not disambiguate multiple DNS servers within the same connection profile. When using dns=default, servers with higher priority will be on top of resolv.conf.  To prioritize a given server over another one within the same connection, just specify them in the desired order.  When multiple devices have configurations with the same priority, the one with an active default route will be preferred.  Negative values have the special effect of excluding other configurations with a greater priority value; so in presence of at least a negative priority, only DNS servers from connections with the lowest priority value will be used. When using a DNS resolver that supports split-DNS as dns=dnsmasq or dns=systemd-resolved, each connection is used to query domains in its search list.  Queries for domains not present in any search list are routed through connections having the '~.' special wildcard domain, which is added automatically to connections with the default route (or can be added manually).  When multiple connections specify the same domain, the one with the highest priority (lowest numerical value) wins.  If a connection specifies a domain which is subdomain of another domain with a negative DNS priority value, the subdomain is ignored.
     dns-searchdns-searcharray of string[]Array of DNS search domains. Domains starting with a tilde ('~') are considered 'routing' domains and are used only to decide the interface over which a query must be forwarded; they are not used to complete unqualified host names.
     gatewaygatewaystringThe gateway associated with this configuration. This is only meaningful if "addresses" is also set.
     ignore-auto-dnsignore-auto-dnsbooleanFALSEWhen "method" is set to "auto" and this property to TRUE, automatically configured nameservers and search domains are ignored and only nameservers and search domains specified in the "dns" and "dns-search" properties, if any, are used.
@@ -389,7 +389,7 @@
         

 
 

 
 
channel
int32
-1
IEEE 802.15.4 channel. A positive integer or -1, meaning "do not set, use whatever the device is already set to".

 
mac-address

 
string

 

 If specified, this connection will only apply to the IEEE 802.15.4 (WPAN) MAC layer device whose permanent MAC address matches.
 

 
page
int32
-1
IEEE 802.15.4 channel page. A positive integer or -1, meaning "do not set, use whatever the device is already set to".

 
pan-id

 
uint32

 
65535

 
 
 
 
 
 
 
 
 
 
 
 
 
 
Key NameValue TypeDefault ValueValue DescriptionconfigconfigstringThe JSON configuration for the team network interface.  The property should contain raw JSON configuration data suitable for teamd, because the value is passed directly to teamd. If not specified, the default configuration is used.  See man teamd.conf for the format details.interface-nameinterface-namestringDeprecated in favor of connection.interface-name, but can be used for backward-compatibility with older daemons, to set the team's interface name.
-    link-watcherslink-watchersarray of vardict[]Link watchers configuration for the connection: each link watcher is defined by a dictionary, whose keys depend upon the selected link watcher. Available link watchers are 'ethtool', 'nsna_ping' and 'arp_ping' and it is specified in the dictionary with the key 'name'. Available keys are:   ethtool: 'delay-up', 'delay-down', 'init-wait'; nsna_ping: 'init-wait', 'interval', 'missed-max', 'target-host'; arp_ping: all the ones in nsna_ping and 'source-host', 'validate-active', 'validate-incative', 'send-always'. See teamd.conf man for more details.
+    link-watcherslink-watchersarray of vardict[]Link watchers configuration for the connection: each link watcher is defined by a dictionary, whose keys depend upon the selected link watcher. Available link watchers are 'ethtool', 'nsna_ping' and 'arp_ping' and it is specified in the dictionary with the key 'name'. Available keys are:   ethtool: 'delay-up', 'delay-down', 'init-wait'; nsna_ping: 'init-wait', 'interval', 'missed-max', 'target-host'; arp_ping: all the ones in nsna_ping and 'source-host', 'validate-active', 'validate-inactive', 'send-always'. See teamd.conf man for more details.mcast-rejoin-countmcast-rejoin-countint320Corresponds to the teamd mcast_rejoin.count.mcast-rejoin-intervalmcast-rejoin-intervalint320Corresponds to the teamd mcast_rejoin.interval.notify-peers-countnotify-peers-countint320Corresponds to the teamd notify_peers.count.
@@ -411,7 +411,7 @@
     configconfigstringThe JSON configuration for the team port. The property should contain raw JSON configuration data suitable for teamd, because the value is passed directly to teamd. If not specified, the default configuration is used. See man teamd.conf for the format details.lacp-keylacp-keyint320Corresponds to the teamd ports.PORTIFNAME.lacp_key.lacp-priolacp-prioint32255Corresponds to the teamd ports.PORTIFNAME.lacp_prio.
-    link-watcherslink-watchersarray of vardict[]Link watchers configuration for the connection: each link watcher is defined by a dictionary, whose keys depend upon the selected link watcher. Available link watchers are 'ethtool', 'nsna_ping' and 'arp_ping' and it is specified in the dictionary with the key 'name'. Available keys are:   ethtool: 'delay-up', 'delay-down', 'init-wait'; nsna_ping: 'init-wait', 'interval', 'missed-max', 'target-host'; arp_ping: all the ones in nsna_ping and 'source-host', 'validate-active', 'validate-incative', 'send-always'. See teamd.conf man for more details.
+    link-watcherslink-watchersarray of vardict[]Link watchers configuration for the connection: each link watcher is defined by a dictionary, whose keys depend upon the selected link watcher. Available link watchers are 'ethtool', 'nsna_ping' and 'arp_ping' and it is specified in the dictionary with the key 'name'. Available keys are:   ethtool: 'delay-up', 'delay-down', 'init-wait'; nsna_ping: 'init-wait', 'interval', 'missed-max', 'target-host'; arp_ping: all the ones in nsna_ping and 'source-host', 'validate-active', 'validate-inactive', 'send-always'. See teamd.conf man for more details.prioprioint320Corresponds to the teamd ports.PORTIFNAME.prio.queue-idqueue-idint32-1Corresponds to the teamd ports.PORTIFNAME.queue_id. When set to -1 means the parameter is skipped from the json config.stickystickybooleanFALSECorresponds to the teamd ports.PORTIFNAME.sticky.
@@ -471,6 +471,13 @@
     tostosuint320Specifies the TOS value to use in outgoing packets.ttlttluint320Specifies the time-to-live value to use in outgoing packets.

     
     
     
     
     
     
     
     
     
     
     
   

+  wifi-p2pWi-Fi P2P Settings
+            Properties
+        Key NameValue TypeDefault ValueValue Description
+    peerpeerstringThe P2P device that should be connected to. Currently this is the only way to create or join a group.
+    wfd-ieswfd-iesbyte arrayThe Wi-Fi Display (WFD) Information Elements (IEs) to set. Wi-Fi Display requires a protocol specific information element to be set in certain Wi-Fi frames. These can be specified here for the purpose of establishing a connection. This setting is only useful when implementing a Wi-Fi Display client.
+    wps-methodwps-methoduint320Flags indicating which mode of WPS is to be used. There's little point in changing the default setting as NetworkManager will automatically determine the best method to use.
+  

   wimaxWiMax Settings
             Properties
         Key NameValue TypeDefault ValueValue Description
@@ -480,7 +487,7 @@
   802-3-ethernetWired Ethernet Settings
             Properties
         
Key NameValue TypeDefault ValueValue Description
-    assigned-mac-addressassigned-mac-addressstringThe new field for the cloned MAC address. It can be either a hardware address in ASCII representation, or one of the special values "preserve", "permanent", "random" or "stable". This field replaces the deprecated "cloned-mac-address" on D-Bus, which can only contain explict hardware addresses. Note that this property only exists in D-Bus API. libnm and nmcli continue to call this property "cloned-mac-address".
+    assigned-mac-addressassigned-mac-addressstringThe new field for the cloned MAC address. It can be either a hardware address in ASCII representation, or one of the special values "preserve", "permanent", "random" or "stable". This field replaces the deprecated "cloned-mac-address" on D-Bus, which can only contain explicit hardware addresses. Note that this property only exists in D-Bus API. libnm and nmcli continue to call this property "cloned-mac-address".auto-negotiateauto-negotiatebooleanFALSEWhen TRUE, enforce auto-negotiation of speed and duplex mode. If "speed" and "duplex" properties are both specified, only that single mode will be advertised and accepted during the link auto-negotiation process: this works only for BASE-T 802.3 specifications and is useful for enforcing gigabits modes, as in these cases link negotiation is mandatory. When FALSE, "speed" and "duplex" properties should be both set or link configuration will be skipped.cloned-mac-addresscloned-mac-addressbyte arrayThis D-Bus field is deprecated in favor of "assigned-mac-address" which is more flexible and allows specifying special variants like "random". For libnm and nmcli, this field is called "cloned-mac-address".duplexduplexstringWhen a value is set, either "half" or "full", configures the device to use the specified duplex mode. If "auto-negotiate" is "yes" the specified duplex mode will be the only one advertised during link negotiation: this works only for BASE-T 802.3 specifications and is useful for enforcing gigabits modes, as in these cases link negotiation is mandatory. If the value is unset (the default), the link configuration will be either skipped (if "auto-negotiate" is "no", the default) or will be auto-negotiated (if "auto-negotiate" is "yes") and the local device will advertise all the supported duplex modes. Must be set together with the "speed" property if specified. Before specifying a duplex mode be sure your device supports it.
@@ -496,10 +503,21 @@
     wake-on-lanwake-on-lanuint321The NMSettingWiredWakeOnLan options to enable. Not all devices support all options. May be any combination of NM_SETTING_WIRED_WAKE_ON_LAN_PHY (0x2), NM_SETTING_WIRED_WAKE_ON_LAN_UNICAST (0x4), NM_SETTING_WIRED_WAKE_ON_LAN_MULTICAST (0x8), NM_SETTING_WIRED_WAKE_ON_LAN_BROADCAST (0x10), NM_SETTING_WIRED_WAKE_ON_LAN_ARP (0x20), NM_SETTING_WIRED_WAKE_ON_LAN_MAGIC (0x40) or the special values NM_SETTING_WIRED_WAKE_ON_LAN_DEFAULT (0x1) (to use global settings) and NM_SETTING_WIRED_WAKE_ON_LAN_IGNORE (0x8000) (to disable management of Wake-on-LAN in NetworkManager).wake-on-lan-passwordwake-on-lan-passwordstringIf specified, the password used with magic-packet-based Wake-on-LAN, represented as an Ethernet MAC address.  If NULL, no password will be required.

     
     
     
     
   

+  wireguardWireGuard Ethernet Settings
+            Properties
+        Key NameValue TypeDefault ValueValue Description
+    fwmarkfwmarkuint320The use of fwmark is optional and is by default off. Setting it to 0 disables it. Otherwise it is a 32-bit fwmark for outgoing packets.
+    listen-portlisten-portuint320The listen-port. If listen-port is not specified, the port will be chosen randomly when the interface comes up.
+    mtumtuuint320If non-zero, only transmit packets of the specified size or smaller, breaking larger packets up into multiple fragments. If zero a default MTU is used. Note that contrary to wg-quick's MTU setting, this does not take into account the current routes at the time of activation.
+    peer-routespeer-routesbooleanTRUEWhether to automatically add routes for the AllowedIPs ranges of the peers. If TRUE (the default), NetworkManager will automatically add routes in the routing tables according to ipv4.route-table and ipv6.route-table. If FALSE, no such routes are added automatically. In this case, the user may want to configure static routes in ipv4.routes and ipv6.routes, respectively.
+    peerspeersarray of 'a{sv}'Array of dictionaries for the WireGuard peers.
+    private-keyprivate-keystringThe 256 bit private-key in base64 encoding.
+    private-key-flagsprivate-key-flagsNMSettingSecretFlags (uint32)Flags indicating how to handle the "private-key" property.
+  

   802-11-wirelessWi-Fi Settings
             Properties
         Key NameValue TypeDefault ValueValue Description
-    assigned-mac-addressassigned-mac-addressstringThe new field for the cloned MAC address. It can be either a hardware address in ASCII representation, or one of the special values "preserve", "permanent", "random" or "stable". This field replaces the deprecated "cloned-mac-address" on D-Bus, which can only contain explict hardware addresses. Note that this property only exists in D-Bus API. libnm and nmcli continue to call this property "cloned-mac-address".
+    assigned-mac-addressassigned-mac-addressstringThe new field for the cloned MAC address. It can be either a hardware address in ASCII representation, or one of the special values "preserve", "permanent", "random" or "stable". This field replaces the deprecated "cloned-mac-address" on D-Bus, which can only contain explicit hardware addresses. Note that this property only exists in D-Bus API. libnm and nmcli continue to call this property "cloned-mac-address".bandbandstring802.11 frequency band of the network.  One of "a" for 5GHz 802.11a or "bg" for 2.4GHz 802.11.  This will lock associations to the Wi-Fi network to the specific band, i.e. if "a" is specified, the device will not associate with the same network in the 2.4GHz band even if the network's settings are compatible.  This setting depends on specific driver capability and may not work with all drivers.bssidbssidbyte arrayIf 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.channelchanneluint320Wireless 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 "band" property to be set.
@@ -525,14 +543,14 @@
     auth-algauth-algstringWhen 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.filsfilsint320Indicates 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.groupgrouparray of string[]A list of group/broadcast encryption algorithms which prevents connections to Wi-Fi networks that do not utilize one of the algorithms in the list.  For maximum compatibility leave this property empty.  Each list element may be one of "wep40", "wep104", "tkip", or "ccmp".
-    key-mgmtkey-mgmtstringKey management used for the connection.  One of "none" (WEP), "ieee8021x" (Dynamic WEP), "wpa-none" (Ad-Hoc WPA-PSK), "wpa-psk" (infrastructure WPA-PSK), or "wpa-eap" (WPA-Enterprise).  This property must be set for any Wi-Fi connection that uses security.
+    key-mgmtkey-mgmtstringKey management used for the connection.  One of "none" (WEP), "ieee8021x" (Dynamic WEP), "wpa-none" (Ad-Hoc WPA-PSK), "wpa-psk" (infrastructure WPA-PSK), "sae" (SAE) or "wpa-eap" (WPA-Enterprise). This property must be set for any Wi-Fi connection that uses security.leap-passwordleap-passwordstringThe login password for legacy LEAP connections (ie, key-mgmt = "ieee8021x" and auth-alg = "leap").leap-password-flagsleap-password-flagsNMSettingSecretFlags (uint32)Flags indicating how to handle the "leap-password" property.leap-usernameleap-usernamestringThe login username for legacy LEAP connections (ie, key-mgmt = "ieee8021x" and auth-alg = "leap").pairwisepairwisearray of string[]A list of pairwise encryption algorithms which prevents connections to Wi-Fi networks that do not utilize one of the algorithms in the list. For maximum compatibility leave this property empty.  Each list element may be one of "tkip" or "ccmp".pmfpmfint320Indicates whether Protected Management Frames (802.11w) must be enabled for the connection.  One of NM_SETTING_WIRELESS_SECURITY_PMF_DEFAULT (0) (use global default value), NM_SETTING_WIRELESS_SECURITY_PMF_DISABLE (1) (disable PMF), NM_SETTING_WIRELESS_SECURITY_PMF_OPTIONAL (2) (enable PMF if the supplicant and the access point support it) or NM_SETTING_WIRELESS_SECURITY_PMF_REQUIRED (3) (enable PMF and fail if not supported).  When set to NM_SETTING_WIRELESS_SECURITY_PMF_DEFAULT (0) and no global default is set, PMF will be optionally enabled.protoprotoarray of string[]List of strings specifying the allowed WPA protocol versions to use. Each element may be one "wpa" (allow WPA) or "rsn" (allow WPA2/RSN).  If not specified, both WPA and RSN connections are allowed.
-    pskpskstringPre-Shared-Key for WPA networks.  If the key is 64-characters long, it must contain only hexadecimal characters and is interpreted as a hexadecimal WPA key.  Otherwise, the key must be between 8 and 63 ASCII characters (as specified in the 802.11i standard) and is interpreted as a WPA passphrase, and is hashed to derive the actual WPA-PSK used when connecting to the Wi-Fi network.
+    pskpskstringPre-Shared-Key for WPA networks. For WPA-PSK, it's either an ASCII passphrase of 8 to 63 characters that is (as specified in the 802.11i standard) hashed to derive the actual key, or the key in form of 64 hexadecimal character. The WPA3-Personal networks use a passphrase of any length for SAE authentication.psk-flagspsk-flagsNMSettingSecretFlags (uint32)Flags indicating how to handle the "psk" property.wep-key-flagswep-key-flagsNMSettingSecretFlags (uint32)Flags indicating how to handle the "wep-key0", "wep-key1", "wep-key2", and "wep-key3" properties.wep-key-typewep-key-typeNMWepKeyType (uint32)Controls the interpretation of WEP keys.  Allowed values are NM_WEP_KEY_TYPE_KEY (1), in which case the key is either a 10- or 26-character hexadecimal string, or a 5- or 13-character ASCII password; or NM_WEP_KEY_TYPE_PASSPHRASE (2), in which case the passphrase is provided as a string and will be hashed using the de-facto MD5 method to derive the actual WEP key.
@@ -546,7 +564,9 @@
   wpanIEEE 802.15.4 (WPAN) MAC Settings
             Properties
         

     
     
     
     
     
     
     
     
     
     
     
     
     
     
Key NameValue TypeDefault ValueValue Description
+    channelchannelint32-1IEEE 802.15.4 channel. A positive integer or -1, meaning "do not set, use whatever the device is already set to".mac-addressmac-addressstringIf specified, this connection will only apply to the IEEE 802.15.4 (WPAN) MAC layer device whose permanent MAC address matches.
+    pagepageint32-1IEEE 802.15.4 channel page. A positive integer or -1, meaning "do not set, use whatever the device is already set to".pan-idpan-iduint3265535IEEE 802.15.4 Personal Area Network (PAN) identifier.short-addressshort-addressuint3265535Short IEEE 802.15.4 address to be used within a restricted environment.

     
     
     
   

diff --git a/docs/api/version.xml b/docs/api/version.xml
index c6ba3bc1..15b989e3 100644
--- a/docs/api/version.xml
+++ b/docs/api/version.xml
@@ -1 +1 @@
-1.14.6
+1.16.0
diff --git a/docs/libnm-glib/Makefile.in b/docs/libnm-glib/Makefile.in
index b0121290..5416d811 100644
--- a/docs/libnm-glib/Makefile.in
+++ b/docs/libnm-glib/Makefile.in
@@ -160,6 +160,7 @@ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALL_LINGUAS = @ALL_LINGUAS@
 AMTAR = @AMTAR@
+AM_CFLAGS = @AM_CFLAGS@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AM_TESTS_FD_REDIRECT = @AM_TESTS_FD_REDIRECT@
 AR = @AR@
diff --git a/docs/libnm-glib/html/NMObject.html b/docs/libnm-glib/html/NMObject.html
index 3d9be2b9..7feea85e 100644
--- a/docs/libnm-glib/html/NMObject.html
+++ b/docs/libnm-glib/html/NMObject.html
@@ -294,7 +294,7 @@ user_function (gpointer  error,
                gpointer  failed_path,
                gpointer  user_data)

-
Indicates that an error occured while creating an NMObject object
+
Indicates that an error occurred while creating an NMObject object
 during property handling of master_object
 .

 
Note: Be aware that the signal is private for libnm-glib's internal
@@ -315,7 +315,7 @@ during property handling of master_object
 
 
error

-
the error that occured while creating object

+
the error that occurred while creating object

  
 
 
diff --git a/docs/libnm-glib/html/NMSecretAgent.html b/docs/libnm-glib/html/NMSecretAgent.html
index 0c2bc341..b8acf986 100644
--- a/docs/libnm-glib/html/NMSecretAgent.html
+++ b/docs/libnm-glib/html/NMSecretAgent.html
@@ -823,7 +823,7 @@ request was successful.

 
 
 
error

-
the error, if any, that occured while registering

+
the error, if any, that occurred while registering

  
 
 
diff --git a/docs/libnm-glib/html/index.html b/docs/libnm-glib/html/index.html
index 2d5f53a4..aa85345e 100644
--- a/docs/libnm-glib/html/index.html
+++ b/docs/libnm-glib/html/index.html
@@ -15,7 +15,7 @@
 

 

 

-      for libnm-glib 1.14.6
+      for libnm-glib 1.16.0
 
       The latest version of this documentation can be found on-line at
       https://developer.gnome.org/libnm-glib/stable/.
diff --git a/docs/libnm-glib/meson.build b/docs/libnm-glib/meson.build
index b760ce00..622669ee 100644
--- a/docs/libnm-glib/meson.build
+++ b/docs/libnm-glib/meson.build
@@ -9,13 +9,13 @@ private_headers = [
   'nm-remote-connection-private.h',
   'nm-types-private.h',
   'nm-secret-agent-glue.h',
-  'nm-vpn-plugin-glue.h'
+  'nm-vpn-plugin-glue.h',
 ]
 
 configure_file(
   input: version_xml + '.in',
   output: version_xml,
-  configuration: version_conf
+  configuration: version_conf,
 )
 
 gnome.gtkdoc(
@@ -24,7 +24,7 @@ gnome.gtkdoc(
   src_dir: join_paths(meson.source_root(), 'libnm-glib'),
   dependencies: [
     libnm_glib_dep,
-    libnm_glib_vpn_dep
+    libnm_glib_vpn_dep,
    ],
   scan_args: [
     '--rebuild-types',
@@ -35,5 +35,5 @@ gnome.gtkdoc(
   fixxref_args: '--html-dir=' + join_paths(nm_prefix, gnome.gtkdoc_html_dir(doc_module)),
   gobject_typesfile: doc_module + '.types',
   html_assets: doc_module + '.png',
-  install: true
+  install: true,
 )
diff --git a/docs/libnm-glib/version.xml b/docs/libnm-glib/version.xml
index c6ba3bc1..15b989e3 100644
--- a/docs/libnm-glib/version.xml
+++ b/docs/libnm-glib/version.xml
@@ -1 +1 @@
-1.14.6
+1.16.0
diff --git a/docs/libnm-util/Makefile.in b/docs/libnm-util/Makefile.in
index 8638fc0c..075de38a 100644
--- a/docs/libnm-util/Makefile.in
+++ b/docs/libnm-util/Makefile.in
@@ -160,6 +160,7 @@ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALL_LINGUAS = @ALL_LINGUAS@
 AMTAR = @AMTAR@
+AM_CFLAGS = @AM_CFLAGS@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AM_TESTS_FD_REDIRECT = @AM_TESTS_FD_REDIRECT@
 AR = @AR@
diff --git a/docs/libnm-util/html/NMSetting.html b/docs/libnm-util/html/NMSetting.html
index 04965325..1d8f1402 100644
--- a/docs/libnm-util/html/NMSetting.html
+++ b/docs/libnm-util/html/NMSetting.html
@@ -1173,7 +1173,7 @@ should be requested from the user each time it is needed

 
 
in situations where it cannot be
 automatically determined that the secret is required (some VPNs and PPP
-providers dont require all secrets) this flag indicates that the specific
+providers don't require all secrets) this flag indicates that the specific
 secret is not required

 
  
diff --git a/docs/libnm-util/html/NMSettingConnection.html b/docs/libnm-util/html/NMSettingConnection.html
index 544189d9..12635583 100644
--- a/docs/libnm-util/html/NMSettingConnection.html
+++ b/docs/libnm-util/html/NMSettingConnection.html
@@ -695,7 +695,7 @@ of this setting.

 
 
 
out_pitem

-
on return, the permission item (formatted accoring to ptype
+
on return, the permission item (formatted according to ptype
 , see
 “permissions” for more detail

  
@@ -1071,7 +1071,7 @@ nm_setting_connection_get_secondary (gboolean
 nm_setting_connection_add_secondary (NMSettingConnection *setting,
                                      const char *sec_uuid);
-
Adds a new secondary connetion UUID to the setting.

+
Adds a new secondary connection UUID to the setting.

 

 
Parameters

 

diff --git a/docs/libnm-util/html/NMSettingWirelessSecurity.html b/docs/libnm-util/html/NMSettingWirelessSecurity.html
index 83a4be08..76b0781b 100644
--- a/docs/libnm-util/html/NMSettingWirelessSecurity.html
+++ b/docs/libnm-util/html/NMSettingWirelessSecurity.html
@@ -938,7 +938,7 @@ algorithm list.

 
Returns

-
 TRUE if the encryption algorith was found and removed; FALSE if it was not.

+
 TRUE if the encryption algorithm was found and removed; FALSE if it was not.

 
Since: 0.9.10

@@ -1560,9 +1560,9 @@ encryption protocol

 
enum NMWepKeyType

 
The NMWepKeyType values specify how any WEP keys present in the setting
-are intepreted.  There are no standards governing how to hash the various WEP
+are interpreted.  There are no standards governing how to hash the various WEP
 key/passphrase formats into the actual WEP key.  Unfortunately some WEP keys
-can be interpreted in multiple ways, requring the setting to specify how to
+can be interpreted in multiple ways, requiring the setting to specify how to
 interpret the any WEP keys.  For example, the key "732f2d712e4a394a375d366931"
 is both a valid Hexadecimal WEP key and a WEP passphrase.  Further, many
 ASCII keys are also valid WEP passphrases, but since passphrases and ASCII
diff --git a/docs/libnm-util/html/index.html b/docs/libnm-util/html/index.html
index 77d7c18e..90af150c 100644
--- a/docs/libnm-util/html/index.html
+++ b/docs/libnm-util/html/index.html
@@ -15,7 +15,7 @@
 

 

 
 
 
 
 

 

-      for libnm-util 1.14.6
+      for libnm-util 1.16.0
 
       The latest version of this documentation can be found on-line at
       https://developer.gnome.org/libnm-util/stable/.
diff --git a/docs/libnm-util/html/libnm-util-NetworkManager.html b/docs/libnm-util/html/libnm-util-NetworkManager.html
index aa7bd3a2..c5ab858e 100644
--- a/docs/libnm-util/html/libnm-util-NetworkManager.html
+++ b/docs/libnm-util/html/libnm-util-NetworkManager.html
@@ -671,7 +671,7 @@ an 
 
NM_DEVICE_TYPE_WIFI

 
-
an 802.11 WiFi device

+
an 802.11 Wi-Fi device

 
  
 
@@ -1294,7 +1294,7 @@ GPRS, EDGE, UMTS, HSDPA, HSUPA, or HSPA+ packet switched data capability

 
NM_DEVICE_STATE_CONFIG

 
 
the device is connecting to the requested network.
-  This may include operations like associating with the WiFi AP, dialing
+  This may include operations like associating with the Wi-Fi AP, dialing
   the modem, connecting to the remote Bluetooth device, etc.

 
  
@@ -1751,7 +1751,7 @@ GPRS, EDGE, UMTS, HSDPA, HSUPA, or HSPA+ packet switched data capability

 
 
NM_DEVICE_STATE_REASON_SSID_NOT_FOUND

 
-
The WiFi network could not be found

+
The Wi-Fi network could not be found

 
  
 
diff --git a/docs/libnm-util/html/libnm-util-nm-utils.html b/docs/libnm-util/html/libnm-util-nm-utils.html
index 106d1c8f..c1b0ce0c 100644
--- a/docs/libnm-util/html/libnm-util-nm-utils.html
+++ b/docs/libnm-util/html/libnm-util-nm-utils.html
@@ -789,7 +789,7 @@ use 
type

-
the security type to check AP flags and device capabilties against,
+
the security type to check AP flags and device capabilities against,
 e.g. NMU_SEC_STATIC_WEP

  
 
@@ -819,13 +819,13 @@ arguments are valid

 
 
 
ap_wpa

-
bitfield of AP capabilties derived from the AP's WPA beacon,
+
bitfield of AP capabilities derived from the AP's WPA beacon,
 e.g. (NM_802_11_AP_SEC_PAIR_TKIP | NM_802_11_AP_SEC_KEY_MGMT_PSK)

  
 
 
 
ap_rsn

-
bitfield of AP capabilties derived from the AP's RSN/WPA2 beacon,
+
bitfield of AP capabilities derived from the AP's RSN/WPA2 beacon,
 e.g. (NM_802_11_AP_SEC_PAIR_CCMP | NM_802_11_AP_SEC_PAIR_TKIP)

  
 
@@ -834,7 +834,7 @@ e.g. (
 
Returns

-
 TRUE if the device capabilities and AP capabilties intersect and are
+
 TRUE if the device capabilities and AP capabilities intersect and are
 compatible with the desired type
 , FALSE if they are not

 

@@ -859,7 +859,7 @@ desired security type are valid for AP/Hotspot connections.

 
 
 
type

-
the security type to check device capabilties against,
+
the security type to check device capabilities against,
 e.g. NMU_SEC_STATIC_WEP

  
 
@@ -1597,9 +1597,9 @@ and predicate
 
 
 
user_data

-
(allow-none): user data for predicate
+
user data for predicate
 function. 

-[closure]
+[closure][allow-none]
 
 
 
error

diff --git a/docs/libnm-util/meson.build b/docs/libnm-util/meson.build
index 7b06baf3..1492103d 100644
--- a/docs/libnm-util/meson.build
+++ b/docs/libnm-util/meson.build
@@ -6,13 +6,13 @@ private_headers = [
   'nm-setting-private.h',
   'nm-param-spec-specialized.h',
   'nm-test-utils.h',
-  'nm-version.h'
+  'nm-version.h',
 ]
 
 configure_file(
   input: version_xml + '.in',
   output: version_xml,
-  configuration: version_conf
+  configuration: version_conf,
 )
 
 gnome.gtkdoc(
@@ -23,10 +23,10 @@ gnome.gtkdoc(
   scan_args: [
     '--rebuild-types',
     '--rebuild-sections',
-    '--ignore-headers=' + ' '.join(private_headers)
+    '--ignore-headers=' + ' '.join(private_headers),
   ],
   scanobjs_args: '--type-init-func="g_type_init();"',
   fixxref_args: '--html-dir=' + join_paths(nm_prefix, gnome.gtkdoc_html_dir(doc_module)),
   gobject_typesfile: doc_module + '.types',
-  install: true
+  install: true,
 )
diff --git a/docs/libnm-util/version.xml b/docs/libnm-util/version.xml
index c6ba3bc1..15b989e3 100644
--- a/docs/libnm-util/version.xml
+++ b/docs/libnm-util/version.xml
@@ -1 +1 @@
-1.14.6
+1.16.0
diff --git a/docs/libnm/Makefile.in b/docs/libnm/Makefile.in
index eda49457..a3c2f6eb 100644
--- a/docs/libnm/Makefile.in
+++ b/docs/libnm/Makefile.in
@@ -161,6 +161,7 @@ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALL_LINGUAS = @ALL_LINGUAS@
 AMTAR = @AMTAR@
+AM_CFLAGS = @AM_CFLAGS@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AM_TESTS_FD_REDIRECT = @AM_TESTS_FD_REDIRECT@
 AR = @AR@
diff --git a/docs/libnm/html/NMAccessPoint.html b/docs/libnm/html/NMAccessPoint.html
index 22f76319..653501ad 100644
--- a/docs/libnm/html/NMAccessPoint.html
+++ b/docs/libnm/html/NMAccessPoint.html
@@ -7,7 +7,7 @@
 
 
 
-
+
 
 
 
@@ -23,7 +23,7 @@
 Home
 Up
 Prev
-Next
+Next
 
 

 

diff --git a/docs/libnm/html/NMActiveConnection.html b/docs/libnm/html/NMActiveConnection.html
index f13fe153..5689ae2f 100644
--- a/docs/libnm/html/NMActiveConnection.html
+++ b/docs/libnm/html/NMActiveConnection.html
@@ -1103,10 +1103,42 @@ nm_active_connection_get_vpn (
 
The “state-changed” signal

 
void
-user_function (NMActiveConnection *nmactiveconnection,
-               guint               arg1,
-               guint               arg2,
+user_function (NMActiveConnection *active_connection,
+               guint               state,
+               guint               reason,
                gpointer            user_data)

+

+
Parameters

+

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





active_connection
the source NMActiveConnection
 
state
the new state number (NMActiveConnectionState)
 
reason
the state change reason (NMActiveConnectionStateReason)
 
user_data
user data set when the signal handler was connected.
 

+

 
Flags: Run First

 

 

diff --git a/docs/libnm/html/NMCheckpoint.html b/docs/libnm/html/NMCheckpoint.html
index 7d0ba4d3..dc70ac0c 100644
--- a/docs/libnm/html/NMCheckpoint.html
+++ b/docs/libnm/html/NMCheckpoint.html
@@ -154,7 +154,7 @@ comparing to this value.

 
nm_checkpoint_get_rollback_timeout ()

 
guint32
 nm_checkpoint_get_rollback_timeout (NMCheckpoint *checkpoint);

-
Gets the the timeout in seconds for automatic rollback.

+
Gets the timeout in seconds for automatic rollback.

 

 
Parameters

 

diff --git a/docs/libnm/html/NMClient.html b/docs/libnm/html/NMClient.html
index 7ccbd977..e6387588 100644
--- a/docs/libnm/html/NMClient.html
+++ b/docs/libnm/html/NMClient.html
@@ -430,6 +430,22 @@
 
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+specific secret should be cleared or not. If NULL, all secrets are cleared. 

+
@@ -1500,8 +1500,8 @@ nm_connection_get_settings (
out_length

-
-
+
+

 

 
+void
+
+nm_client_add_and_activate_connection2 ()
+

+NMActiveConnection *
+
+nm_client_add_and_activate_connection2_finish ()
+

 gboolean
 
 
@@ -2770,6 +2786,161 @@ will be set. 

 
 

 

+
nm_client_add_and_activate_connection2 ()

+
void
+nm_client_add_and_activate_connection2
+                               (NMClient *client,
+                                NMConnection *partial,
+                                NMDevice *device,
+                                const char *specific_object,
+                                GVariant *options,
+                                GCancellable *cancellable,
+                                GAsyncReadyCallback callback,
+                                gpointer user_data);

+
Adds a new connection using the given details (if any) as a template,
+automatically filling in missing settings with the capabilities of the given
+device and specific object.  The new connection is then asynchronously
+activated as with nm_client_activate_connection_async(). Cannot be used for
+VPN connections at this time.

+
Note that the callback is invoked when NetworkManager has started activating
+the new connection, not when it finishes. You can used the returned
+NMActiveConnection object (in particular, “state”) to
+track the activation to its completion.

+
This is identitcal to nm_client_add_and_activate_connection_async() but takes
+a further options
+ parameter. Currently the following options are supported
+by the daemon:

+
    
+
  • "persist": A string describing how the connection should be stored.
+          The default is "disk", but it can be modified to "memory" (until
+          the daemon quits) or "volatile" (will be deleted on disconnect).
    • 
+
  • "bind-activation": Bind the connection lifetime to something. The default is "none",
+       meaning an explicit disconnect is needed. The value "dbus-client"
+       means the connection will automatically be deactivated when the calling
+       DBus client disappears from the system bus.
    • 
+

+

+
Parameters

+

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





client
a NMClient
 
partial
an NMConnection to add; the connection may be
+partially filled (or even NULL) and will be completed by NetworkManager
+using the given device
+and specific_object
+before being added. 
[allow-none]
device
the NMDevice
 
specific_object
the object path of a connection-type-specific
+object this activation should use. This parameter is currently ignored for
+wired and mobile broadband connections, and the value of NULL should be used
+(ie, no specific object).  For Wi-Fi or WiMAX connections, pass the object
+path of a NMAccessPoint or NMWimaxNsp owned by device
+, which you can
+get using nm_object_get_path(), and which will be used to complete the
+details of the newly added connection. 
[allow-none]
options
a GVariant containing a dictionary with options, or NULL
 
cancellable
a GCancellable, or NULL
 
callback
callback to be called when the activation has started
 
user_data
caller-specific data passed to callback
+
 

+

+
Since: 1.16

+

+

+

+
nm_client_add_and_activate_connection2_finish ()

+
NMActiveConnection *
+nm_client_add_and_activate_connection2_finish
+                               (NMClient *client,
+                                GAsyncResult *result,
+                                GVariant **out_result,
+                                GError **error);

+
Gets the result of a call to nm_client_add_and_activate_connection2().

+
You can call nm_active_connection_get_connection() on the returned
+NMActiveConnection to find the path of the created NMConnection.

+

+
Parameters

+

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





client
an NMClient
 
result
the result passed to the GAsyncReadyCallback
 
error
location for a GError, or NULL
 
out_result
the output result
+of type "a{sv}" returned by D-Bus' AddAndActivate2 call. Currently no
+output is implemented yet. 
[allow-none][transfer full]

+

+

+
Returns

+
the new NMActiveConnection on success, NULL on
+failure, in which case error
+will be set. 

+
[transfer full]

+

+

+

+

 
nm_client_deactivate_connection ()

 
gboolean
 nm_client_deactivate_connection (NMClient *client,
@@ -4339,6 +4510,13 @@ clients can obtain to perform certain tasks on behalf of the current user.

 
 
 

 
NM_CLIENT_PERMISSION_WIFI_SCAN

+
controls whether wifi scans can be performed

+		 

 
NM_CLIENT_PERMISSION_LAST

 
 
a reserved boundary value

@@ -4541,14 +4719,9 @@ permission to read the details of.)

 

 
The “dns-configuration” property

 
  “dns-configuration”        GPtrArray *

-
The current DNS configuration represented as an array of
-dictionaries.  Each dictionary has the "nameservers",
-"priority" keys and, optionally, "interface" and "vpn".
-"nameservers" is the list of DNS servers, "priority" their
-relative priority, "interface" the interface on which these
-servers are contacted, "vpn" a boolean telling whether the
-configuration was obtained from a VPN connection.

-
[type GPtrArray(GVariant)]

+
The current DNS configuration, represented as an array
+of NMDnsEntry objects.

+
[type GPtrArray(NMDnsEntry)]

 
Flags: Read

 
Since: 1.6

 

diff --git a/docs/libnm/html/NMConnection.html b/docs/libnm/html/NMConnection.html
index 00d006d0..5421cf34 100644
--- a/docs/libnm/html/NMConnection.html
+++ b/docs/libnm/html/NMConnection.html
@@ -1239,8 +1239,8 @@ nm_connection_clear_secrets_with_flags
 

 
func

 
function to be called to determine whether a
-specific secret should be cleared or not. 
[scope call][scope call][allow-none]
 

 

 
user_data
(out): the length of the returned array. 
[allow-none]
the length of the returned array. 
[allow-none][out]
 

 
 

@@ -2781,7 +2781,7 @@ nm_connection_get_setting_vxlan (
 
 
GTypeInterface parent;

-
the parent interace struct

+
the parent interface struct

  
 
 
diff --git a/docs/libnm/html/NMDevice.html b/docs/libnm/html/NMDevice.html
index be147615..6f9f1ae6 100644
--- a/docs/libnm/html/NMDevice.html
+++ b/docs/libnm/html/NMDevice.html
@@ -197,6 +197,14 @@
 
 
 
+NMConnectivityState
+
+
+nm_device_get_connectivity ()
+
+
+
+
 NMDeviceState
 
 
@@ -578,12 +586,22 @@
 Read
 
 
+NMConnectivityState
+ip4-connectivity
+Read
+
+
 
 NMIPConfig *
 ip6-config
 Read
 
 
+NMConnectivityState
+ip6-connectivity
+Read
+
+
 
 GPtrArray *
 lldp-neighbors
@@ -783,6 +801,14 @@
 NM_DEVICE_LLDP_NEIGHBORS
 
 
+#define
+NM_DEVICE_IP4_CONNECTIVITY
+
+
+#define
+NM_DEVICE_IP6_CONNECTIVITY
+
+
  
 NMDevice
 
@@ -819,6 +845,7 @@
             ├── NMDeviceVlan
             ├── NMDeviceVxlan
             ├── NMDeviceWifi
+            ├── NMDeviceWifiP2P
             ├── NMDeviceWimax
             ├── NMDeviceWireGuard
             ╰── NMDeviceWpan
@@ -1396,6 +1423,43 @@ not activated or not using DHCPv6. 

 

 

 

+
nm_device_get_connectivity ()

+
NMConnectivityState
+nm_device_get_connectivity (NMDevice *device,
+                            int addr_family);

+
The connectivity state of the device for given address family.
+Supported address families are AF_INET for IPv4, AF_INET6
+for IPv6 or AF_UNSPEC for any.

+

+
Parameters

+

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





device
a NMDevice
 
addr_family
network address family
 

+

+

+
Returns

+
 the current connectivity state

+

+
Since: 1.16

+

+

+

 
nm_device_get_state ()

 
NMDeviceState
 nm_device_get_state (NMDevice *device);

@@ -2004,9 +2068,9 @@ nm_device_get_applied_connection (
 
 
version_id

-
(allow-none): returns the current version id of
+
returns the current version id of
 the applied connection. 

-[out]
+[out][allow-none]
 
 
 
cancellable

@@ -2113,9 +2177,9 @@ nm_device_get_applied_connection_finish
 
 
 
version_id

-
(allow-none): the current version id of the applied
+
the current version id of the applied
 connection. 

-[out]
+[out][allow-none]
 
 
 
error

@@ -2313,7 +2377,7 @@ nm_device_delete_async (GCancellable *cancellable,
                         GAsyncReadyCallback callback,
                         gpointer user_data);
-
Asynchronously begins deleteing the software device. Hardware devices can't
+
Asynchronously begins deleting the software device. Hardware devices can't
 be deleted.

 

 
Parameters

@@ -2943,6 +3007,18 @@ nm_lldp_neighbor_get_attr_type (
 

 

+
NM_DEVICE_IP4_CONNECTIVITY

+
#define NM_DEVICE_IP4_CONNECTIVITY "ip4-connectivity"
+

+

+

+

+
NM_DEVICE_IP6_CONNECTIVITY

+
#define NM_DEVICE_IP6_CONNECTIVITY "ip6-connectivity"
+

+

+

+

 
NMDevice

 
typedef struct _NMDevice NMDevice;

 

@@ -3059,6 +3135,15 @@ operations like addressing and routing.

 

 

 

+
The “ip4-connectivity” property

+
  “ip4-connectivity”         NMConnectivityState

+
The IPv4 connectivity state of the device.

+
Flags: Read

+
Default value: NM_CONNECTIVITY_UNKNOWN

+
Since: 1.16

+

+

+

 
The “ip6-config” property

 
  “ip6-config”               NMIPConfig *

 
The IPv6 NMIPConfig of the device.

@@ -3066,6 +3151,15 @@ operations like addressing and routing.

 

 

 

+
The “ip6-connectivity” property

+
  “ip6-connectivity”         NMConnectivityState

+
The IPv6 connectivity state of the device.

+
Flags: Read

+
Default value: NM_CONNECTIVITY_UNKNOWN

+
Since: 1.16

+

+

+

 
The “lldp-neighbors” property

 
  “lldp-neighbors”           GPtrArray *

 
The LLDP neighbors.

diff --git a/docs/libnm/html/NMDeviceVxlan.html b/docs/libnm/html/NMDeviceVxlan.html
index 8b36a0e8..d672aa33 100644
--- a/docs/libnm/html/NMDeviceVxlan.html
+++ b/docs/libnm/html/NMDeviceVxlan.html
@@ -7,7 +7,7 @@
 
 
 
-
+
 
 
 
@@ -23,7 +23,7 @@
 Home
 Up
 Prev
-Next
+Next
 
 

 

@@ -867,7 +867,7 @@ nm_device_vxlan_get_l3miss (
 
Returns

-
 wether netlink IP ADDR miss notifications are generated

+
 whether netlink IP ADDR miss notifications are generated

 

 
Since: 1.2

 

diff --git a/docs/libnm/html/NMDeviceWifi.html b/docs/libnm/html/NMDeviceWifi.html
index 863bd4ad..352768d3 100644
--- a/docs/libnm/html/NMDeviceWifi.html
+++ b/docs/libnm/html/NMDeviceWifi.html
@@ -6,7 +6,7 @@
 
 
 
-
+
 
 
 
@@ -23,7 +23,7 @@
 
 Home
 Up
-Prev
+Prev
 Next
 
 

@@ -615,7 +615,7 @@ This is the same as nm_device_wifi_request_scanoptions
 
 for the scanning. The argument is the dictionary passed to RequestScan()
-D-Bus call. Valid otions inside the dictionary are:
+D-Bus call. Valid options inside the dictionary are:
 'ssids' => array of SSIDs (saay)

 

 
Parameters

@@ -723,7 +723,7 @@ This is the same as nm_device_wifi_request_scan_asyn
  except it accepts options
 
 for the scanning. The argument is the dictionary passed to RequestScan()
-D-Bus call. Valid otions inside the dictionary are:
+D-Bus call. Valid options inside the dictionary are:
 'ssids' => array of SSIDs (saay)

 

 
Parameters

diff --git a/docs/libnm/html/NMDeviceWifiP2P.html b/docs/libnm/html/NMDeviceWifiP2P.html
new file mode 100644
index 00000000..29d675a9
--- /dev/null
+++ b/docs/libnm/html/NMDeviceWifiP2P.html
@@ -0,0 +1,427 @@
+
+
+
+
+NMDeviceWifiP2P: libnm Reference Manual
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

+

+

+
+
+

+
NMDeviceWifiP2P

+
NMDeviceWifiP2P

+

+

+
Functions

+

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




const char *
+
+nm_device_wifi_p2p_get_hw_address ()
+

+NMWifiP2PPeer *
+
+nm_device_wifi_p2p_get_peer_by_path ()
+
const GPtrArray *
+
+nm_device_wifi_p2p_get_peers ()
+

+void
+
+nm_device_wifi_p2p_start_find ()
+

+gboolean
+
+nm_device_wifi_p2p_start_find_finish ()
+

+void
+
+nm_device_wifi_p2p_stop_find ()
+

+gboolean
+
+nm_device_wifi_p2p_stop_find_finish ()
+

+

+

+
Types and Values

+

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




#defineNM_DEVICE_WIFI_P2P_HW_ADDRESS
#defineNM_DEVICE_WIFI_P2P_PEERS
#defineNM_DEVICE_WIFI_P2P_WFDIES

+

+

+
Description

+

+

+
Functions

+

+
nm_device_wifi_p2p_get_hw_address ()

+
const char *
+nm_device_wifi_p2p_get_hw_address (NMDeviceWifiP2P *device);

+
Gets the actual hardware (MAC) address of the NMDeviceWifiP2P

+

+
Parameters

+

+++++
+
+
+
+
+
+





device
a NMDeviceWifiP2P
 

+

+

+
Returns

+
 the actual hardware address. This is the internal string used by the
+device, and must not be modified.

+

+
Since: 1.16

+

+

+

+
nm_device_wifi_p2p_get_peer_by_path ()

+
NMWifiP2PPeer *
+nm_device_wifi_p2p_get_peer_by_path (NMDeviceWifiP2P *device,
+                                     const char *path);

+
Gets a NMWifiP2PPeer by path.

+

+
Parameters

+

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





device
a NMDeviceWifiP2P
 
path
the object path of the peer
 

+

+

+
Returns

+
the peer or NULL if none is found. 

+
[transfer none]

+

+
Since: 1.16

+

+

+

+
nm_device_wifi_p2p_get_peers ()

+
const GPtrArray *
+nm_device_wifi_p2p_get_peers (NMDeviceWifiP2P *device);

+
Gets all the found peers of the NMDeviceWifiP2P.

+

+
Parameters

+

+++++
+
+
+
+
+
+





device
a NMDeviceWifiP2P
 

+

+

+
Returns

+
a GPtrArray containing all the
+found NMWifiP2PPeers.
+The returned array is owned by the client and should not be modified. 

+
[element-type NMWifiP2PPeer]

+

+
Since: 1.16

+

+

+

+
nm_device_wifi_p2p_start_find ()

+
void
+nm_device_wifi_p2p_start_find (NMDeviceWifiP2P *device,
+                               GVariant *options,
+                               GCancellable *cancellable,
+                               GAsyncReadyCallback callback,
+                               gpointer user_data);

+
Request NM to search for Wi-Fi P2P peers on device
+. Note that the call
+returns immediately after requesting the find, and it may take some time
+after that for peers to be found.

+
The find operation will run for 30s by default. You can stop it earlier
+using nm_device_p2p_wifi_stop_find().

+

+
Parameters

+

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





device
a NMDeviceWifiP2P
 
options
optional options passed to StartFind. 
[allow-none]
cancellable
a GCancellable, or NULL
 
callback
a GAsyncReadyCallback, or NULL
 
user_data
user_data for callback
+
 

+

+
Since: 1.16

+

+

+

+
nm_device_wifi_p2p_start_find_finish ()

+
gboolean
+nm_device_wifi_p2p_start_find_finish (NMDeviceWifiP2P *device,
+                                      GAsyncResult *result,
+                                      GError **error);

+
Finish an operation started by nm_device_wifi_p2p_start_find().

+

+
Parameters

+

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





device
a NMDeviceWifiP2P
 
result
the GAsyncResult
 
error
GError return address
 

+

+

+
Returns

+
 TRUE if the call was successful

+

+
Since: 1.16

+

+

+

+
nm_device_wifi_p2p_stop_find ()

+
void
+nm_device_wifi_p2p_stop_find (NMDeviceWifiP2P *device,
+                              GCancellable *cancellable,
+                              GAsyncReadyCallback callback,
+                              gpointer user_data);

+
Request NM to stop any ongoing find operation for Wi-Fi P2P peers on device
+.

+

+
Parameters

+

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





device
a NMDeviceWifiP2P
 
cancellable
a GCancellable, or NULL
 
callback
a GAsyncReadyCallback, or NULL
 
user_data
user_data for callback
+
 

+

+
Since: 1.16

+

+

+

+
nm_device_wifi_p2p_stop_find_finish ()

+
gboolean
+nm_device_wifi_p2p_stop_find_finish (NMDeviceWifiP2P *device,
+                                     GAsyncResult *result,
+                                     GError **error);

+
Finish an operation started by nm_device_wifi_p2p_stop_find().

+

+
Parameters

+

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





device
a NMDeviceWifiP2P
 
result
the GAsyncResult
 
error
GError return address
 

+

+

+
Returns

+
 TRUE if the call was successful

+

+
Since: 1.16

+

+

+

+
Types and Values

+

+
NM_DEVICE_WIFI_P2P_HW_ADDRESS

+
#define NM_DEVICE_WIFI_P2P_HW_ADDRESS          "hw-address"
+

+

+

+

+
NM_DEVICE_WIFI_P2P_PEERS

+
#define NM_DEVICE_WIFI_P2P_PEERS               "peers"
+

+

+

+

+
NM_DEVICE_WIFI_P2P_WFDIES

+
#define NM_DEVICE_WIFI_P2P_WFDIES              "wfdies"
+

+

+

+

+

+
Generated by GTK-Doc V1.29

+
+
\ No newline at end of file
diff --git a/docs/libnm/html/NMObject.html b/docs/libnm/html/NMObject.html
index dacf1197..02e9e9da 100644
--- a/docs/libnm/html/NMObject.html
+++ b/docs/libnm/html/NMObject.html
@@ -124,6 +124,7 @@
         ├── NMDhcpConfig
         ├── NMIPConfig
         ├── NMRemoteConnection
+        ├── NMWifiP2PPeer
         ╰── NMWimaxNsp
 
 

diff --git a/docs/libnm/html/NMSetting.html b/docs/libnm/html/NMSetting.html
index 2340e37b..aaafa2c1 100644
--- a/docs/libnm/html/NMSetting.html
+++ b/docs/libnm/html/NMSetting.html
@@ -59,6 +59,14 @@
 
 
 
+gboolean
+
+
+(*_NMConnectionForEachSecretFunc) ()
+
+
+
+
 GType
 
 
@@ -265,8 +273,10 @@
         ├── NMSettingVlan
         ├── NMSettingVpn
         ├── NMSettingVxlan
+        ├── NMSettingWifiP2P
         ├── NMSettingWimax
         ├── NMSettingWired
+        ├── NMSettingWireGuard
         ├── NMSettingWireless
         ├── NMSettingWirelessSecurity
         ╰── NMSettingWpan
@@ -377,6 +387,13 @@ of properties and allowed values.

 

 

 

+
_NMConnectionForEachSecretFunc ()

+
gboolean
+(*_NMConnectionForEachSecretFunc) (NMSettingSecretFlags flags,
+                                   gpointer user_data);

+

+

+

 
nm_setting_lookup_type ()

 
GType
 nm_setting_lookup_type (const char *name);

@@ -932,7 +949,7 @@ should be requested from the user each time it is needed

 
 
in situations where it cannot be
 automatically determined that the secret is required (some VPNs and PPP
-providers dont require all secrets) this flag indicates that the specific
+providers don't require all secrets) this flag indicates that the specific
 secret is not required

 
  
diff --git a/docs/libnm/html/NMSetting8021x.html b/docs/libnm/html/NMSetting8021x.html
index 21ac1234..d950232c 100644
--- a/docs/libnm/html/NMSetting8021x.html
+++ b/docs/libnm/html/NMSetting8021x.html
@@ -1182,10 +1182,9 @@
 

 
Object Hierarchy

 
    GEnum
+    ├── NMSetting8021xAuthFlags
     ├── NMSetting8021xCKFormat
     ╰── NMSetting8021xCKScheme
-    GFlags
-    ╰── NMSetting8021xAuthFlags
     GObject
     ╰── NMSetting
         ╰── NMSetting8021x
@@ -1255,8 +1254,8 @@ the blob must be not UNKNOWN (or NULL).

 
 
 
error

-
(out): validation reason. 

-[allow-none]
+
validation reason. 

+[allow-none][out]
 
 
 

@@ -4210,11 +4209,6 @@ should be used.

  
 
 
-
_NM_SETTING_802_1X_AUTH_FLAGS_LAST

- 
- 
-
-
 
NM_SETTING_802_1X_AUTH_FLAGS_ALL

 
 
All supported flags

diff --git a/docs/libnm/html/NMSettingConnection.html b/docs/libnm/html/NMSettingConnection.html
index 3eba2674..6d1aa6b3 100644
--- a/docs/libnm/html/NMSettingConnection.html
+++ b/docs/libnm/html/NMSettingConnection.html
@@ -972,7 +972,7 @@ of this setting.

 
 
 
out_pitem

-
on return, the permission item (formatted accoring to ptype
+
on return, the permission item (formatted according to ptype
 , see
 “permissions” for more detail

  
@@ -1374,7 +1374,7 @@ nm_setting_connection_get_secondary (gboolean
 nm_setting_connection_add_secondary (NMSettingConnection *setting,
                                      const char *sec_uuid);
-
Adds a new secondary connetion UUID to the setting.

+
Adds a new secondary connection UUID to the setting.

 

 
Parameters

 

@@ -2217,7 +2217,7 @@ name is included, so that different interfaces yield different addresses.

 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 the the interface name of the
+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
diff --git a/docs/libnm/html/NMSettingGsm.html b/docs/libnm/html/NMSettingGsm.html
index c7ce6adf..9cf1103c 100644
--- a/docs/libnm/html/NMSettingGsm.html
+++ b/docs/libnm/html/NMSettingGsm.html
@@ -53,13 +53,6 @@
 
-
-
-
-
@@ -129,6 +122,13 @@
 
+
+
+
+
@@ -247,10 +247,6 @@
 
-
-
-
-
@@ -298,6 +294,10 @@
 
+
+
+
+
@@ -331,31 +331,6 @@ nm_setting_gsm_new (void
 

 

-
nm_setting_gsm_get_number ()

-
const char *
-nm_setting_gsm_get_number (NMSettingGsm *setting);

-

-
Parameters

-
const char *
 
 
-nm_setting_gsm_get_number ()
-
const char *
-
 nm_setting_gsm_get_username ()
 
 

 
 
const char *
+
+nm_setting_gsm_get_number ()
+

 
 NMSettingSecretFlags
 

 

 #defineNM_SETTING_GSM_NUMBER
#define
 NM_SETTING_GSM_USERNAME
 

 
NM_SETTING_GSM_MTU
 

 
#defineNM_SETTING_GSM_NUMBER

  
 NMSettingGsm
 

-----
-
-
-
-
-
-





setting
the NMSettingGsm
 

-

-

-
Returns

-
 the “number” property of the setting

-

-

-

-

 
nm_setting_gsm_get_username ()

 
const char *
 nm_setting_gsm_get_username (NMSettingGsm *setting);

@@ -610,6 +585,35 @@ nm_setting_gsm_get_mtu (
+
nm_setting_gsm_get_number ()

+
const char *
+nm_setting_gsm_get_number (NMSettingGsm *setting);

+

+
nm_setting_gsm_get_number has been deprecated since version 1.16 and should not be used in newly-written code.

+
user-provided values for this setting are no longer used.

+

+

+
Parameters

+

+++++
+
+
+
+
+
+





setting
the NMSettingGsm
 

+

+

+
Returns

+
 the “number” property of the setting

+

+

+

+

 
nm_setting_gsm_get_pin_flags ()

 
NMSettingSecretFlags
 nm_setting_gsm_get_pin_flags (NMSettingGsm *setting);

@@ -668,12 +672,6 @@ nm_setting_gsm_get_password_flags (
 

 

-
NM_SETTING_GSM_NUMBER

-
#define NM_SETTING_GSM_NUMBER          "number"
-

-

-

-

 
NM_SETTING_GSM_USERNAME

 
#define NM_SETTING_GSM_USERNAME        "username"
 

@@ -746,6 +744,12 @@ nm_setting_gsm_get_password_flags (
 

 

+
NM_SETTING_GSM_NUMBER

+
#define NM_SETTING_GSM_NUMBER          "number"
+

+

+

+

 
NMSettingGsm

 
typedef struct _NMSettingGsm NMSettingGsm;

 
GSM-based Mobile Broadband Settings

@@ -812,10 +816,12 @@ roaming control of the device is not otherwise possible.

 

 
The “number” property

 
  “number”                   gchar *

-
Number to dial when establishing a PPP data session with the GSM-based
-mobile broadband network.  Many modems do not require PPP for connections
-to the mobile network and thus this property should be left blank, which
-allows NetworkManager to select the appropriate settings automatically.

+
Legacy setting that used to help establishing PPP data sessions for
+GSM-based modems.

+

+
NMSettingGsm:number has been deprecated since version 1.16 and should not be used in newly-written code.

+
user-provided values for this setting are no longer used.

+

 
Flags: Read / Write

 
Default value: NULL

 

diff --git a/docs/libnm/html/NMSettingIPConfig.html b/docs/libnm/html/NMSettingIPConfig.html
index 23fbdcbe..873cdb84 100644
--- a/docs/libnm/html/NMSettingIPConfig.html
+++ b/docs/libnm/html/NMSettingIPConfig.html
@@ -4220,8 +4220,9 @@ distinct from an empty list of properties.

 
  “dns-priority”             gint

 
DNS servers priority.

 
The relative priority for DNS servers specified by this setting.  A lower
-value is better (higher priority).  Zero selects the default value, which
-is 50 for VPNs and 100 for other connections.

+value is better (higher priority). Zero selects a globally configured
+default value. If the latter is missing or zero too, it defaults to
+50 for VPNs and 100 for other connections.

 
Note that the priority is to order DNS settings for multiple active
 connections.  It does not disambiguate multiple DNS servers within the
 same connection profile.

diff --git a/docs/libnm/html/NMSettingOvsPort.html b/docs/libnm/html/NMSettingOvsPort.html
index 1c5e81dc..5d326bb3 100644
--- a/docs/libnm/html/NMSettingOvsPort.html
+++ b/docs/libnm/html/NMSettingOvsPort.html
@@ -7,7 +7,7 @@
 
 
 
-
+
 
 
 
@@ -20,7 +20,7 @@
 Home
 Up
 Prev
-Next
+Next
 
 

 

diff --git a/docs/libnm/html/NMSettingPpp.html b/docs/libnm/html/NMSettingPpp.html
index be86468b..c73d0bd7 100644
--- a/docs/libnm/html/NMSettingPpp.html
+++ b/docs/libnm/html/NMSettingPpp.html
@@ -6,8 +6,8 @@
 
 
 
-
-
+
+
 
 
 
@@ -21,8 +21,8 @@
 
 Home
 Up
-Prev
-Next
+Prev
+Next
 
 

 

diff --git a/docs/libnm/html/NMSettingPppoe.html b/docs/libnm/html/NMSettingPppoe.html
index 61858a6d..34f95831 100644
--- a/docs/libnm/html/NMSettingPppoe.html
+++ b/docs/libnm/html/NMSettingPppoe.html
@@ -6,8 +6,8 @@
 
 
 
-
-
+
+
 
 
 
@@ -21,8 +21,8 @@
 
 Home
 Up
-Prev
-Next
+Prev
+Next
 
 

 

diff --git a/docs/libnm/html/NMSettingProxy.html b/docs/libnm/html/NMSettingProxy.html
index 2870c41e..c1d4dc0d 100644
--- a/docs/libnm/html/NMSettingProxy.html
+++ b/docs/libnm/html/NMSettingProxy.html
@@ -6,7 +6,7 @@
 
 
 
-
+
 
 
 
@@ -21,7 +21,7 @@
 
 Home
 Up
-Prev
+Prev
 Next
 
 

diff --git a/docs/libnm/html/NMSettingTeam.html b/docs/libnm/html/NMSettingTeam.html
index 1d4beb4a..02a1f409 100644
--- a/docs/libnm/html/NMSettingTeam.html
+++ b/docs/libnm/html/NMSettingTeam.html
@@ -67,6 +67,14 @@
 
 
 
+NMTeamLinkWatcher *
+
+
+nm_team_link_watcher_new_arp_ping2 ()
+
+
+
+
 void
 
 
@@ -168,6 +176,14 @@
 
 
 
+int
+
+
+nm_team_link_watcher_get_vlanid ()
+
+
+
+
 NMSetting *
 
 
@@ -837,6 +853,80 @@ address in the arp request

 

 

 

+
nm_team_link_watcher_new_arp_ping2 ()

+
NMTeamLinkWatcher *
+nm_team_link_watcher_new_arp_ping2 (int init_wait,
+                                    int interval,
+                                    int missed_max,
+                                    int vlanid,
+                                    const char *target_host,
+                                    const char *source_host,
+                                    NMTeamLinkWatcherArpPingFlags flags,
+                                    GError **error);

+
Creates a new arp_ping NMTeamLinkWatcher object

+

+
Parameters

+

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





init_wait
init_wait value
 
interval
interval value
 
missed_max
missed_max value
 
vlanid
vlanid value
 
target_host
the host name or the ip address that will be used as destination
+address in the arp request
 
source_host
the host name or the ip address that will be used as source
+address in the arp request
 
flags
the watcher NMTeamLinkWatcherArpPingFlags
 
error
location to store the error on failure. 
[out][allow-none]

+

+

+
Returns

+
the new NMTeamLinkWatcher object, or NULL on error. 

+
[transfer full]

+

+
Since: 1.16

+

+

+

 
nm_team_link_watcher_ref ()

 
void
 nm_team_link_watcher_ref (NMTeamLinkWatcher *watcher);

@@ -978,7 +1068,7 @@ nm_team_link_watcher_get_name (int
 nm_team_link_watcher_get_delay_up (NMTeamLinkWatcher *watcher);
 
Gets the delay_up interval (in milliseconds) that elapses between the link
-coming up and the runner beeing notified about it.

+coming up and the runner being notified about it.

 

 
Parameters

 

@@ -1002,7 +1092,7 @@ coming up and the runner beeing notified about it.
int
 nm_team_link_watcher_get_delay_down (NMTeamLinkWatcher *watcher);
Gets the delay_down interval (in milliseconds) that elapses between the link
-going down and the runner beeing notified about it.

+going down and the runner being notified about it.

 
Parameters

 

 
 
 

@@ -1163,6 +1253,29 @@ nm_team_link_watcher_get_flags (
 

 

+
nm_team_link_watcher_get_vlanid ()

+
int
+nm_team_link_watcher_get_vlanid (NMTeamLinkWatcher *watcher);

+
Gets the VLAN tag ID to be used to outgoing link probes

+

+
Parameters

+

+++++
+
+
+
+
+
+





watcher
the NMTeamLinkWatcher
 

+

+
Since: 1.16

+

+

+

 
nm_setting_team_new ()

 
NMSetting *
 nm_setting_team_new (void);

@@ -2225,7 +2338,7 @@ watcher. Available link watchers are 'ethtool', 'nsna_ping' and
 Available keys are:   ethtool: 'delay-up', 'delay-down', 'init-wait';
 nsna_ping: 'init-wait', 'interval', 'missed-max', 'target-host';
 arp_ping: all the ones in nsna_ping and 'source-host', 'validate-active',
-'validate-incative', 'send-always'. See teamd.conf man for more details.

+'validate-inactive', 'send-always'. See teamd.conf man for more details.

 
[type GPtrArray(NMTeamLinkWatcher)]

 
Flags: Read / Write

 
Since: 1.12

diff --git a/docs/libnm/html/NMSettingTeamPort.html b/docs/libnm/html/NMSettingTeamPort.html
index e1cc4098..403a0373 100644
--- a/docs/libnm/html/NMSettingTeamPort.html
+++ b/docs/libnm/html/NMSettingTeamPort.html
@@ -732,7 +732,7 @@ watcher. Available link watchers are 'ethtool', 'nsna_ping' and
 Available keys are:   ethtool: 'delay-up', 'delay-down', 'init-wait';
 nsna_ping: 'init-wait', 'interval', 'missed-max', 'target-host';
 arp_ping: all the ones in nsna_ping and 'source-host', 'validate-active',
-'validate-incative', 'send-always'. See teamd.conf man for more details.

+'validate-inactive', 'send-always'. See teamd.conf man for more details.

 
[type GPtrArray(NMTeamLinkWatcher)]

 
Flags: Read / Write

 
Since: 1.12

diff --git a/docs/libnm/html/NMSettingVpn.html b/docs/libnm/html/NMSettingVpn.html
index 52119bb7..f5b6b1c3 100644
--- a/docs/libnm/html/NMSettingVpn.html
+++ b/docs/libnm/html/NMSettingVpn.html
@@ -617,8 +617,8 @@ nm_setting_vpn_get_data_keys (
out_length

-
(out): the length of the returned array. 

-[allow-none]
+
the length of the returned array. 

+[allow-none][out]
 
 
 

@@ -834,8 +834,8 @@ nm_setting_vpn_get_secret_keys (
 
 
out_length

-
(out): the length of the returned array. 

-[allow-none]
+
the length of the returned array. 

+[allow-none][out]
 
 
 

diff --git a/docs/libnm/html/NMSettingVxlan.html b/docs/libnm/html/NMSettingVxlan.html
index 4634af0a..f0606610 100644
--- a/docs/libnm/html/NMSettingVxlan.html
+++ b/docs/libnm/html/NMSettingVxlan.html
@@ -7,7 +7,7 @@
 
 
 
-
+
 
 
 
@@ -22,7 +22,7 @@
 Home
 Up
 Prev
-Next
+Next
 
 

 

diff --git a/docs/libnm/html/NMSettingWifiP2P.html b/docs/libnm/html/NMSettingWifiP2P.html
new file mode 100644
index 00000000..b7cf9125
--- /dev/null
+++ b/docs/libnm/html/NMSettingWifiP2P.html
@@ -0,0 +1,233 @@
+
+
+
+
+NMSettingWifiP2P: libnm Reference Manual
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

+

+

+
+
+

+
NMSettingWifiP2P

+
NMSettingWifiP2P — Describes connection properties for 802.11 Wi-Fi P2P networks

+

+

+
Functions

+

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





+NMSetting *
+
+nm_setting_wifi_p2p_new ()
+
const char *
+
+nm_setting_wifi_p2p_get_peer ()
+

+NMSettingWirelessSecurityWpsMethod
+
+nm_setting_wifi_p2p_get_wps_method ()
+

+GBytes *
+
+nm_setting_wifi_p2p_get_wfd_ies ()
+

+

+

+
Types and Values

+

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




#defineNM_SETTING_WIFI_P2P_SETTING_NAME
#defineNM_SETTING_WIFI_P2P_PEER
#defineNM_SETTING_WIFI_P2P_WPS_METHOD
#defineNM_SETTING_WIFI_P2P_WFD_IES

+

+

+
Description

+
The NMSettingWifiP2P object is a NMSetting subclass that describes properties
+necessary for connection to 802.11 Wi-Fi P2P networks (aka Wi-Fi Direct).

+

+

+
Functions

+

+
nm_setting_wifi_p2p_new ()

+
NMSetting *
+nm_setting_wifi_p2p_new (void);

+
Creates a new NMSettingWifiP2P object with default values.

+

+
Returns

+
the new empty NMSettingWifiP2P object. 

+
[transfer full]

+

+
Since: 1.16

+

+

+

+
nm_setting_wifi_p2p_get_peer ()

+
const char *
+nm_setting_wifi_p2p_get_peer (NMSettingWifiP2P *setting);

+

+
Parameters

+

+++++
+
+
+
+
+
+





setting
the NMSettingWifiP2P
 

+

+

+
Returns

+
 the “peer” property of the setting

+

+
Since: 1.16

+

+

+

+
nm_setting_wifi_p2p_get_wps_method ()

+
NMSettingWirelessSecurityWpsMethod
+nm_setting_wifi_p2p_get_wps_method (NMSettingWifiP2P *setting);

+

+
Parameters

+

+++++
+
+
+
+
+
+





setting
the NMSettingWifiP2P
 

+

+

+
Returns

+
 the “wps-method” property of the setting

+

+
Since: 1.16

+

+

+

+
nm_setting_wifi_p2p_get_wfd_ies ()

+
GBytes *
+nm_setting_wifi_p2p_get_wfd_ies (NMSettingWifiP2P *setting);

+

+
Parameters

+

+++++
+
+
+
+
+
+





setting
the NMSettingWiFiP2P
 

+

+

+
Returns

+
the “wfd-ies” property of the setting. 

+
[transfer none]

+

+
Since: 1.16

+

+

+

+
Types and Values

+

+
NM_SETTING_WIFI_P2P_SETTING_NAME

+
#define NM_SETTING_WIFI_P2P_SETTING_NAME "wifi-p2p"
+

+

+

+

+
NM_SETTING_WIFI_P2P_PEER

+
#define NM_SETTING_WIFI_P2P_PEER        "peer"
+

+
The mac address of the peer to connect to.

+

+

+

+
NM_SETTING_WIFI_P2P_WPS_METHOD

+
#define NM_SETTING_WIFI_P2P_WPS_METHOD  "wps-method"
+

+

+

+

+
NM_SETTING_WIFI_P2P_WFD_IES

+
#define NM_SETTING_WIFI_P2P_WFD_IES     "wfd-ies"
+

+

+

+

+

+
Generated by GTK-Doc V1.29

+
+
\ No newline at end of file
diff --git a/docs/libnm/html/NMSettingWimax.html b/docs/libnm/html/NMSettingWimax.html
index 519d0a9c..d52a4119 100644
--- a/docs/libnm/html/NMSettingWimax.html
+++ b/docs/libnm/html/NMSettingWimax.html
@@ -6,7 +6,7 @@
 
 
 
-
+
 
 
 
@@ -21,7 +21,7 @@
 
 Home
 Up
-Prev
+Prev
 Next
 
 

diff --git a/docs/libnm/html/NMSettingWireGuard.html b/docs/libnm/html/NMSettingWireGuard.html
new file mode 100644
index 00000000..3efa9ed5
--- /dev/null
+++ b/docs/libnm/html/NMSettingWireGuard.html
@@ -0,0 +1,1743 @@
+
+
+
+
+NMSettingWireGuard: libnm Reference Manual
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

+

+

+
+
+

+
NMSettingWireGuard

+
NMSettingWireGuard — Describes connection properties for wireguard related options

+

+

+
Functions

+

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





+NMWireGuardPeer *
+
+nm_wireguard_peer_new ()
+

+NMWireGuardPeer *
+
+nm_wireguard_peer_new_clone ()
+

+NMWireGuardPeer *
+
+nm_wireguard_peer_ref ()
+

+void
+
+nm_wireguard_peer_unref ()
+

+void
+
+nm_wireguard_peer_seal ()
+

+gboolean
+
+nm_wireguard_peer_is_sealed ()
+
const char *
+
+nm_wireguard_peer_get_public_key ()
+

+gboolean
+
+nm_wireguard_peer_set_public_key ()
+
const char *
+
+nm_wireguard_peer_get_preshared_key ()
+

+gboolean
+
+nm_wireguard_peer_set_preshared_key ()
+

+NMSettingSecretFlags
+
+nm_wireguard_peer_get_preshared_key_flags ()
+

+void
+
+nm_wireguard_peer_set_preshared_key_flags ()
+

+guint16
+
+nm_wireguard_peer_get_persistent_keepalive ()
+

+void
+
+nm_wireguard_peer_set_persistent_keepalive ()
+
const char *
+
+nm_wireguard_peer_get_endpoint ()
+

+gboolean
+
+nm_wireguard_peer_set_endpoint ()
+

+guint
+
+nm_wireguard_peer_get_allowed_ips_len ()
+
const char *
+
+nm_wireguard_peer_get_allowed_ip ()
+

+void
+
+nm_wireguard_peer_clear_allowed_ips ()
+

+gboolean
+
+nm_wireguard_peer_append_allowed_ip ()
+

+gboolean
+
+nm_wireguard_peer_remove_allowed_ip ()
+

+gboolean
+
+nm_wireguard_peer_is_valid ()
+

+int
+
+nm_wireguard_peer_cmp ()
+

+NMSetting *
+
+nm_setting_wireguard_new ()
+
const char *
+
+nm_setting_wireguard_get_private_key ()
+

+NMSettingSecretFlags
+
+nm_setting_wireguard_get_private_key_flags ()
+

+guint16
+
+nm_setting_wireguard_get_listen_port ()
+

+guint32
+
+nm_setting_wireguard_get_fwmark ()
+

+guint
+
+nm_setting_wireguard_get_peers_len ()
+

+NMWireGuardPeer *
+
+nm_setting_wireguard_get_peer ()
+

+NMWireGuardPeer *
+
+nm_setting_wireguard_get_peer_by_public_key ()
+

+void
+
+nm_setting_wireguard_set_peer ()
+

+void
+
+nm_setting_wireguard_append_peer ()
+

+gboolean
+
+nm_setting_wireguard_remove_peer ()
+

+guint
+
+nm_setting_wireguard_clear_peers ()
+

+gboolean
+
+nm_setting_wireguard_get_peer_routes ()
+

+guint32
+
+nm_setting_wireguard_get_mtu ()
+

+

+

+
Types and Values

+

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




#defineNM_WIREGUARD_PUBLIC_KEY_LEN
#defineNM_WIREGUARD_SYMMETRIC_KEY_LEN
#defineNM_SETTING_WIREGUARD_SETTING_NAME
#defineNM_SETTING_WIREGUARD_FWMARK
#defineNM_SETTING_WIREGUARD_LISTEN_PORT
#defineNM_SETTING_WIREGUARD_PRIVATE_KEY
#defineNM_SETTING_WIREGUARD_PRIVATE_KEY_FLAGS
#defineNM_SETTING_WIREGUARD_PEERS
#defineNM_SETTING_WIREGUARD_MTU
#defineNM_SETTING_WIREGUARD_PEER_ROUTES
#defineNM_WIREGUARD_PEER_ATTR_ALLOWED_IPS
#defineNM_WIREGUARD_PEER_ATTR_ENDPOINT
#defineNM_WIREGUARD_PEER_ATTR_PERSISTENT_KEEPALIVE
#defineNM_WIREGUARD_PEER_ATTR_PRESHARED_KEY
#defineNM_WIREGUARD_PEER_ATTR_PRESHARED_KEY_FLAGS
#defineNM_WIREGUARD_PEER_ATTR_PUBLIC_KEY

+

+

+
Object Hierarchy

+
    GBoxed
+    ╰── NMWireGuardPeer
+

+

+

+
Description

+
The NMSettingWireGuard object is a NMSetting subclass that contains settings
+for configuring WireGuard.

+

+

+
Functions

+

+
nm_wireguard_peer_new ()

+
NMWireGuardPeer *
+nm_wireguard_peer_new (void);

+

+
Returns

+
a new, default, unsealed NMWireGuardPeer instance. 

+
[transfer full]

+

+
Since: 1.16

+

+

+

+
nm_wireguard_peer_new_clone ()

+
NMWireGuardPeer *
+nm_wireguard_peer_new_clone (const NMWireGuardPeer *self,
+                             gboolean with_secrets);

+

+
Parameters

+

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





self
the NMWireGuardPeer instance to copy.
 
with_secrets
if TRUE, the preshared-key secrets are copied
+as well. Otherwise, they will be removed.
 

+

+

+
Returns

+
a clone of self
+. This instance
+is always unsealed. 

+
[transfer full]

+

+
Since: 1.16

+

+

+

+
nm_wireguard_peer_ref ()

+
NMWireGuardPeer *
+nm_wireguard_peer_ref (NMWireGuardPeer *self);

+
This is not thread-safe.

+

+
Parameters

+

+++++
+
+
+
+
+
+





self
the NMWireGuardPeer instance. 
[allow-none]

+

+

+
Returns

+
 returns the input argument self
+after incrementing
+the reference count.

+

+
Since: 1.16

+

+

+

+
nm_wireguard_peer_unref ()

+
void
+nm_wireguard_peer_unref (NMWireGuardPeer *self);

+
Drop a reference to self
+. If the last reference is dropped,
+the instance is freed and all accociate data released.

+
This is not thread-safe.

+

+
Parameters

+

+++++
+
+
+
+
+
+





self
the NMWireGuardPeer instance. 
[allow-none]

+

+
Since: 1.16

+

+

+

+
nm_wireguard_peer_seal ()

+
void
+nm_wireguard_peer_seal (NMWireGuardPeer *self);

+
Seal the NMWireGuardPeer instance. Afterwards, it is a bug
+to call all functions that modify the instance (except ref/unref).
+A sealed instance cannot be unsealed again, but you can create
+an unsealed copy with nm_wireguard_peer_new_clone().

+

+
Parameters

+

+++++
+
+
+
+
+
+





self
the NMWireGuardPeer instance
 

+

+
Since: 1.16

+

+

+

+
nm_wireguard_peer_is_sealed ()

+
gboolean
+nm_wireguard_peer_is_sealed (const NMWireGuardPeer *self);

+

+
Parameters

+

+++++
+
+
+
+
+
+





self
the NMWireGuardPeer instance
 

+

+

+
Returns

+
 whether self
+is sealed or not.

+

+
Since: 1.16

+

+

+

+
nm_wireguard_peer_get_public_key ()

+
const char *
+nm_wireguard_peer_get_public_key (const NMWireGuardPeer *self);

+

+
Parameters

+

+++++
+
+
+
+
+
+





self
the NMWireGuardPeer instance
 

+

+

+
Returns

+
the public key or NULL if unset. 

+
[transfer none]

+

+
Since: 1.16

+

+

+

+
nm_wireguard_peer_set_public_key ()

+
gboolean
+nm_wireguard_peer_set_public_key (NMWireGuardPeer *self,
+                                  const char *public_key,
+                                  gboolean accept_invalid);

+
Reset the public key. Note that if the public key is valid, it
+will be normalized (which may or may not modify the set value).

+
It is a bug trying to modify a sealed NMWireGuardPeer instance.

+

+
Parameters

+

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





self
the unsealed NMWireGuardPeer instance
 
public_key
the new public
+key or NULL to clear the public key. 
[allow-none][transfer none]
accept_invalid
if TRUE and public_key
+is not NULL and
+invalid, then do not modify the instance.
 

+

+

+
Returns

+
 TRUE if the key was valid or NULL. Returns
+FALSE for invalid keys. Depending on accept_invalid
+will an invalid key be set or not.

+

+
Since: 1.16

+

+

+

+
nm_wireguard_peer_get_preshared_key ()

+
const char *
+nm_wireguard_peer_get_preshared_key (const NMWireGuardPeer *self);

+

+
Parameters

+

+++++
+
+
+
+
+
+





self
the NMWireGuardPeer instance
 

+

+

+
Returns

+
the preshared key or NULL if unset. 

+
[transfer none]

+

+
Since: 1.16

+

+

+

+
nm_wireguard_peer_set_preshared_key ()

+
gboolean
+nm_wireguard_peer_set_preshared_key (NMWireGuardPeer *self,
+                                     const char *preshared_key,
+                                     gboolean accept_invalid);

+
Reset the preshared key. Note that if the preshared key is valid, it
+will be normalized (which may or may not modify the set value).

+
Note that the preshared-key is a secret and consequently has corresponding
+preshared-key-flags property. This is so that secrets can be optional
+and requested on demand from a secret-agent. Also, an invalid  preshared-key
+may optionally cause nm_wireguard_peer_is_valid() to fail or it may
+be accepted.

+
It is a bug trying to modify a sealed NMWireGuardPeer instance.

+

+
Parameters

+

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





self
the unsealed NMWireGuardPeer instance
 
preshared_key
the new preshared
+key or NULL to clear the preshared key. 
[allow-none][transfer none]
accept_invalid
whether to allow setting the key to an invalid
+value. If FALSE, self
+is unchanged if the key is invalid
+and if FALSE is returned.
 

+

+

+
Returns

+
 TRUE if the preshared-key is valid, otherwise FALSE.
+NULL is considered a valid value.
+If the key is invalid, it depends on accept_invalid
+whether the
+previous value was reset.

+

+
Since: 1.16

+

+

+

+
nm_wireguard_peer_get_preshared_key_flags ()

+
NMSettingSecretFlags
+nm_wireguard_peer_get_preshared_key_flags
+                               (const NMWireGuardPeer *self);

+

+
Parameters

+

+++++
+
+
+
+
+
+





self
the NMWireGuardPeer instance
 

+

+

+
Returns

+
 get the secret flags for the preshared-key.

+

+
Since: 1.16

+

+

+

+
nm_wireguard_peer_set_preshared_key_flags ()

+
void
+nm_wireguard_peer_set_preshared_key_flags
+                               (NMWireGuardPeer *self,
+                                NMSettingSecretFlags preshared_key_flags);

+
It is a bug trying to modify a sealed NMWireGuardPeer instance.

+

+
Parameters

+

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





self
the unsealed NMWireGuardPeer instance
 
preshared_key_flags
the secret flags to set.
 

+

+
Since: 1.16

+

+

+

+
nm_wireguard_peer_get_persistent_keepalive ()

+
guint16
+nm_wireguard_peer_get_persistent_keepalive
+                               (const NMWireGuardPeer *self);

+

+
Parameters

+

+++++
+
+
+
+
+
+





self
the NMWireGuardPeer instance
 

+

+

+
Returns

+
 get the persistent-keepalive setting in seconds. Set to zero to disable
+keep-alive.

+

+
Since: 1.16

+

+

+

+
nm_wireguard_peer_set_persistent_keepalive ()

+
void
+nm_wireguard_peer_set_persistent_keepalive
+                               (NMWireGuardPeer *self,
+                                guint16 persistent_keepalive);

+
It is a bug trying to modify a sealed NMWireGuardPeer instance.

+

+
Parameters

+

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





self
the unsealed NMWireGuardPeer instance
 
persistent_keepalive
the keep-alive value to set.
 

+

+
Since: 1.16

+

+

+

+
nm_wireguard_peer_get_endpoint ()

+
const char *
+nm_wireguard_peer_get_endpoint (const NMWireGuardPeer *self);

+

+
Parameters

+

+++++
+
+
+
+
+
+





self
the NMWireGuardPeer instance
 

+

+

+
Returns

+
the endpoint or NULL if none was set. 

+
[transfer none]

+

+
Since: 1.16

+

+

+

+
nm_wireguard_peer_set_endpoint ()

+
gboolean
+nm_wireguard_peer_set_endpoint (NMWireGuardPeer *self,
+                                const char *endpoint,
+                                gboolean allow_invalid);

+
Sets or clears the endpoint of self
+.

+
It is a bug trying to modify a sealed NMWireGuardPeer instance.

+

+
Parameters

+

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





self
the unsealed NMWireGuardPeer instance
 
endpoint
the socket address endpoint to set or NULL.
 
allow_invalid
if TRUE, also invalid values are set.
+If FALSE, the function does nothing for invalid endpoint
+arguments.
 

+

+

+
Returns

+
 TRUE if the endpoint is NULL or valid. For an
+invalid endpoint
+argument, FALSE is returned. Depending
+on allow_invalid
+, the instance will be modified.

+

+
Since: 1.16

+

+

+

+
nm_wireguard_peer_get_allowed_ips_len ()

+
guint
+nm_wireguard_peer_get_allowed_ips_len (const NMWireGuardPeer *self);

+

+
Parameters

+

+++++
+
+
+
+
+
+





self
the NMWireGuardPeer instance
 

+

+

+
Returns

+
 the number of allowed-ips entries.

+

+
Since: 1.16

+

+

+

+
nm_wireguard_peer_get_allowed_ip ()

+
const char *
+nm_wireguard_peer_get_allowed_ip (const NMWireGuardPeer *self,
+                                  guint idx,
+                                  gboolean *out_is_valid);

+

+
Parameters

+

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





self
the NMWireGuardPeer instance
 
idx
the index from zero to (allowed-ips-len - 1) to
+retrieve.
 
out_is_valid
TRUE if the returned value is a valid allowed-ip
+setting. 
[allow-none]

+

+

+
Returns

+
the allowed-ip setting at index idx
+.
+If idx
+is out of range, NULL will be returned. 

+
[transfer none]

+

+
Since: 1.16

+

+

+

+
nm_wireguard_peer_clear_allowed_ips ()

+
void
+nm_wireguard_peer_clear_allowed_ips (NMWireGuardPeer *self);

+
Removes all allowed-ip entries.

+
It is a bug trying to modify a sealed NMWireGuardPeer instance.

+

+
Parameters

+

+++++
+
+
+
+
+
+





self
the unsealed NMWireGuardPeer instance
 

+

+
Since: 1.16

+

+

+

+
nm_wireguard_peer_append_allowed_ip ()

+
gboolean
+nm_wireguard_peer_append_allowed_ip (NMWireGuardPeer *self,
+                                     const char *allowed_ip,
+                                     gboolean accept_invalid);

+
Appends allowed_ip
+ setting to the list. This does not check
+for duplicates and always appends allowed_ip
+ to the end of the
+list. If allowed_ip
+ is valid, it will be normalized and a modified
+for might be appended. If allowed_ip
+ is invalid, it will still be
+appended, but later verification will fail.

+
It is a bug trying to modify a sealed NMWireGuardPeer instance.

+

+
Parameters

+

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





self
the unsealed NMWireGuardPeer instance
 
allowed_ip
the allowed-ip entry to set.
 
accept_invalid
if TRUE, also invalid allowed_ip
+value
+will be appended. Otherwise, the function does nothing
+in face of invalid values and returns FALSE.
 

+

+

+
Returns

+
 TRUE if the value is a valid allowed-ips value, FALSE otherwise.
+Depending on accept_invalid
+, also invalid values are added.

+

+
Since: 1.16

+

+

+

+
nm_wireguard_peer_remove_allowed_ip ()

+
gboolean
+nm_wireguard_peer_remove_allowed_ip (NMWireGuardPeer *self,
+                                     guint idx);

+
Removes the allowed-ip at the given idx
+. This shifts all
+following entries one index down.

+
It is a bug trying to modify a sealed NMWireGuardPeer instance.

+

+
Parameters

+

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





self
the unsealed NMWireGuardPeer instance
 
idx
the index from zero to (allowed-ips-len - 1) to
+retrieve. If the index is out of range, FALSE is returned
+and nothing is done.
 

+

+

+
Returns

+
 TRUE if idx
+was valid and the allowed-ip was removed.
+FALSE otherwise, and the peer will not be changed.

+

+
Since: 1.16

+

+

+

+
nm_wireguard_peer_is_valid ()

+
gboolean
+nm_wireguard_peer_is_valid (const NMWireGuardPeer *self,
+                            gboolean check_non_secrets,
+                            gboolean check_secrets,
+                            GError **error);

+

+
Parameters

+

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





self
the NMWireGuardPeer instance
 
check_secrets
if TRUE, non-secret properties are validated.
+Otherwise they are ignored for this purpose.
 
check_non_secrets
if TRUE, secret properties are validated.
+Otherwise they are ignored for this purpose.
 
error
the GError location for returning the failure reason.
 

+

+

+
Returns

+
  TRUE if the peer is valid or fails with an error
+reason.

+

+
Since: 1.16

+

+

+

+
nm_wireguard_peer_cmp ()

+
int
+nm_wireguard_peer_cmp (const NMWireGuardPeer *a,
+                       const NMWireGuardPeer *b,
+                       NMSettingCompareFlags compare_flags);

+

+
Parameters

+

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





a
the NMWireGuardPeer to compare. 
[allow-none]
b
the other NMWireGuardPeer to compare. 
[allow-none]
compare_flags
NMSettingCompareFlags to affect the comparison.
 

+

+

+
Returns

+
 zero of the two instances are equivalent or
+a non-zero integer otherwise. This defines a total ordering
+over the peers. Whether a peer is sealed or not, does not
+affect the comparison.

+

+
Since: 1.16

+

+

+

+
nm_setting_wireguard_new ()

+
NMSetting *
+nm_setting_wireguard_new (void);

+
Creates a new NMSettingWireGuard object with default values.

+

+
Returns

+
the new empty NMSettingWireGuard object. 

+
[transfer full]

+

+
Since: 1.16

+

+

+

+
nm_setting_wireguard_get_private_key ()

+
const char *
+nm_setting_wireguard_get_private_key (NMSettingWireGuard *self);

+

+
Parameters

+

+++++
+
+
+
+
+
+





self
the NMSettingWireGuard instance
 

+

+

+
Returns

+
the set private-key or NULL. 

+
[transfer none]

+

+
Since: 1.16

+

+

+

+
nm_setting_wireguard_get_private_key_flags ()

+
NMSettingSecretFlags
+nm_setting_wireguard_get_private_key_flags
+                               (NMSettingWireGuard *self);

+

+
Parameters

+

+++++
+
+
+
+
+
+





self
the NMSettingWireGuard instance
 

+

+

+
Returns

+
 the secret-flags for “private-key”.

+

+
Since: 1.16

+

+

+

+
nm_setting_wireguard_get_listen_port ()

+
guint16
+nm_setting_wireguard_get_listen_port (NMSettingWireGuard *self);

+

+
Parameters

+

+++++
+
+
+
+
+
+





self
the NMSettingWireGuard instance
 

+

+

+
Returns

+
 the set UDP listen port.

+

+
Since: 1.16

+

+

+

+
nm_setting_wireguard_get_fwmark ()

+
guint32
+nm_setting_wireguard_get_fwmark (NMSettingWireGuard *self);

+

+
Parameters

+

+++++
+
+
+
+
+
+





self
the NMSettingWireGuard instance
 

+

+

+
Returns

+
 the set firewall mark.

+

+
Since: 1.16

+

+

+

+
nm_setting_wireguard_get_peers_len ()

+
guint
+nm_setting_wireguard_get_peers_len (NMSettingWireGuard *self);

+

+
Parameters

+

+++++
+
+
+
+
+
+





self
the NMSettingWireGuard instance
 

+

+

+
Returns

+
 the number of registered peers.

+

+
Since: 1.16

+

+

+

+
nm_setting_wireguard_get_peer ()

+
NMWireGuardPeer *
+nm_setting_wireguard_get_peer (NMSettingWireGuard *self,
+                               guint idx);

+

+
Parameters

+

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





self
the NMSettingWireGuard instance
 
idx
the index to lookup.
 

+

+

+
Returns

+
the NMWireGuardPeer entry at
+index idx
+. If the index is out of range, NULL is returned. 

+
[transfer none]

+

+
Since: 1.16

+

+

+

+
nm_setting_wireguard_get_peer_by_public_key ()

+
NMWireGuardPeer *
+nm_setting_wireguard_get_peer_by_public_key
+                               (NMSettingWireGuard *self,
+                                const char *public_key,
+                                guint *out_idx);

+

+
Parameters

+

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





self
the NMSettingWireGuard instance
 
public_key
the public key for looking up the
+peer.
 
out_idx
optional output argument
+for the index of the found peer. If no index is found,
+this is set to the nm_setting_wireguard_get_peers_len(). 
[out][allow-none]

+

+

+
Returns

+
the NMWireGuardPeer instance with a
+matching public key. If no such peer exists, NULL is returned. 

+
[transfer none]

+

+
Since: 1.16

+

+

+

+
nm_setting_wireguard_set_peer ()

+
void
+nm_setting_wireguard_set_peer (NMSettingWireGuard *self,
+                               NMWireGuardPeer *peer,
+                               guint idx);

+
If idx
+ is one past the last peer, the behavior is the same
+as nm_setting_wireguard_append_peer().
+Otherwise, the peer will be at idx
+ and replace the peer
+instance at that index. Note that if a peer with the same
+public-key exists on another index, then that peer will also
+be replaced. In that case, the number of peers will shrink
+by one (because the one at idx
+ got replace and then one
+with the same public-key got removed). This also means,
+that the resulting index afterwards may be one less than
+idx
+ (if another peer with a lower index was dropped).

+

+
Parameters

+

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





self
the NMSettingWireGuard instance
 
peer
the NMWireGuardPeer instance to set.
+This seals peer
+and keeps a reference on the
+instance.
 
idx
the index, in the range of 0 to the number of
+peers (including). That means, if idx
+is one past
+the end of the number of peers, this is the same as
+nm_setting_wireguard_append_peer(). Otherwise, the
+peer at this index is replaced.
 

+

+
Since: 1.16

+

+

+

+
nm_setting_wireguard_append_peer ()

+
void
+nm_setting_wireguard_append_peer (NMSettingWireGuard *self,
+                                  NMWireGuardPeer *peer);

+
If a peer with the same public-key already exists, that
+one is replaced by peer
+. The new peer
+ is always appended
+(or moved to) the end, so in case a peer is replaced, the
+indexes are shifted and the number of peers stays unchanged.

+

+
Parameters

+

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





self
the NMSettingWireGuard instance
 
peer
the NMWireGuardPeer instance to append.
+This seals peer
+and keeps a reference on the
+instance.
 

+

+
Since: 1.16

+

+

+

+
nm_setting_wireguard_remove_peer ()

+
gboolean
+nm_setting_wireguard_remove_peer (NMSettingWireGuard *self,
+                                  guint idx);

+

+
Parameters

+

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





self
the NMSettingWireGuard instance
 
idx
the index to remove.
 

+

+

+
Returns

+
 TRUE if idx
+was in range and a peer
+was removed. Otherwise, self
+is unchanged.

+

+
Since: 1.16

+

+

+

+
nm_setting_wireguard_clear_peers ()

+
guint
+nm_setting_wireguard_clear_peers (NMSettingWireGuard *self);

+

+

+

+
nm_setting_wireguard_get_peer_routes ()

+
gboolean
+nm_setting_wireguard_get_peer_routes (NMSettingWireGuard *self);

+

+
Parameters

+

+++++
+
+
+
+
+
+





self
the NMSettingWireGuard instance
 

+

+

+
Returns

+
 whether automatically add peer routes.

+

+
Since: 1.16

+

+

+

+
nm_setting_wireguard_get_mtu ()

+
guint32
+nm_setting_wireguard_get_mtu (NMSettingWireGuard *self);

+

+
Parameters

+

+++++
+
+
+
+
+
+





self
the NMSettingWireGuard instance
 

+

+

+
Returns

+
 the MTU of the setting.

+

+
Since: 1.16

+

+

+

+
Types and Values

+

+
NM_WIREGUARD_PUBLIC_KEY_LEN

+
#define NM_WIREGUARD_PUBLIC_KEY_LEN     32
+

+

+

+

+
NM_WIREGUARD_SYMMETRIC_KEY_LEN

+
#define NM_WIREGUARD_SYMMETRIC_KEY_LEN  32
+

+

+

+

+
NM_SETTING_WIREGUARD_SETTING_NAME

+
#define NM_SETTING_WIREGUARD_SETTING_NAME "wireguard"
+

+

+

+

+
NM_SETTING_WIREGUARD_FWMARK

+
#define NM_SETTING_WIREGUARD_FWMARK            "fwmark"
+

+

+

+

+
NM_SETTING_WIREGUARD_LISTEN_PORT

+
#define NM_SETTING_WIREGUARD_LISTEN_PORT       "listen-port"
+

+

+

+

+
NM_SETTING_WIREGUARD_PRIVATE_KEY

+
#define NM_SETTING_WIREGUARD_PRIVATE_KEY       "private-key"
+

+

+

+

+
NM_SETTING_WIREGUARD_PRIVATE_KEY_FLAGS

+
#define NM_SETTING_WIREGUARD_PRIVATE_KEY_FLAGS "private-key-flags"
+

+

+

+

+
NM_SETTING_WIREGUARD_PEERS

+
#define NM_SETTING_WIREGUARD_PEERS             "peers"
+

+

+

+

+
NM_SETTING_WIREGUARD_MTU

+
#define NM_SETTING_WIREGUARD_MTU               "mtu"
+

+

+

+

+
NM_SETTING_WIREGUARD_PEER_ROUTES

+
#define NM_SETTING_WIREGUARD_PEER_ROUTES       "peer-routes"
+

+

+

+

+
NM_WIREGUARD_PEER_ATTR_ALLOWED_IPS

+
#define NM_WIREGUARD_PEER_ATTR_ALLOWED_IPS          "allowed-ips"
+

+

+

+

+
NM_WIREGUARD_PEER_ATTR_ENDPOINT

+
#define NM_WIREGUARD_PEER_ATTR_ENDPOINT             "endpoint"
+

+

+

+

+
NM_WIREGUARD_PEER_ATTR_PERSISTENT_KEEPALIVE

+
#define NM_WIREGUARD_PEER_ATTR_PERSISTENT_KEEPALIVE "persistent-keepalive"
+

+

+

+

+
NM_WIREGUARD_PEER_ATTR_PRESHARED_KEY

+
#define NM_WIREGUARD_PEER_ATTR_PRESHARED_KEY        "preshared-key"
+

+

+

+

+
NM_WIREGUARD_PEER_ATTR_PRESHARED_KEY_FLAGS

+
#define NM_WIREGUARD_PEER_ATTR_PRESHARED_KEY_FLAGS  "preshared-key-flags"
+

+

+

+

+
NM_WIREGUARD_PEER_ATTR_PUBLIC_KEY

+
#define NM_WIREGUARD_PEER_ATTR_PUBLIC_KEY           "public-key"
+

+

+

+

+

+
Generated by GTK-Doc V1.29

+
+
\ No newline at end of file
diff --git a/docs/libnm/html/NMSettingWired.html b/docs/libnm/html/NMSettingWired.html
index 8850803b..fe475926 100644
--- a/docs/libnm/html/NMSettingWired.html
+++ b/docs/libnm/html/NMSettingWired.html
@@ -7,7 +7,7 @@
 
 
 
-
+
 
 
 
@@ -22,7 +22,7 @@
 Home
 Up
 Prev
-Next
+Next
 
 

 

@@ -1273,11 +1273,6 @@ are supported by all devices.

  
 
 
-
_NM_SETTING_WIRED_WAKE_ON_LAN_LAST_OPT

- 
- 
-
-
 
NM_SETTING_WIRED_WAKE_ON_LAN_ALL

 
 
Wake on all events. This does not
diff --git a/docs/libnm/html/NMSettingWireless.html b/docs/libnm/html/NMSettingWireless.html
index 64488bdc..2f4a8f36 100644
--- a/docs/libnm/html/NMSettingWireless.html
+++ b/docs/libnm/html/NMSettingWireless.html
@@ -1324,7 +1324,7 @@ are supported by all devices.

 
 
NM_SETTING_WIRELESS_WAKE_ON_WLAN_4WAY_HANDSHAKE

 
-
Wake on 4way hanshake

+
Wake on 4way handshake

 
  
 
@@ -1341,16 +1341,6 @@ are supported by all devices.

  
 
 
-
_NM_SETTING_WIRELESS_WAKE_ON_WLAN_NUM

- 
- 
-
-
-
NM_SETTING_WIRELESS_WAKE_ON_WLAN_LAST

- 
- 
-
-
 
NM_SETTING_WIRELESS_WAKE_ON_WLAN_ALL

 
 
Wake on all events. This does not
diff --git a/docs/libnm/html/NMSettingWirelessSecurity.html b/docs/libnm/html/NMSettingWirelessSecurity.html
index 515dabd0..90c77e7c 100644
--- a/docs/libnm/html/NMSettingWirelessSecurity.html
+++ b/docs/libnm/html/NMSettingWirelessSecurity.html
@@ -6,7 +6,7 @@
 
 
 
-
+
 
 
 
@@ -21,7 +21,7 @@
 
 Home
 Up
-Prev
+Prev
 Next
 
 

@@ -549,8 +549,9 @@ use WEP, LEAP, WPA or WPA2/RSN security

 
    GEnum
     ├── NMSettingWirelessSecurityFils
     ├── NMSettingWirelessSecurityPmf
-    ├── NMSettingWirelessSecurityWpsMethod
     ╰── NMWepKeyType
+    GFlags
+    ╰── NMSettingWirelessSecurityWpsMethod
     GObject
     ╰── NMSetting
         ╰── NMSettingWirelessSecurity
@@ -970,7 +971,7 @@ algorithm list.

 

 

 
Returns

-
 TRUE if the encryption algorith was found and removed; FALSE if it was not.

+
 TRUE if the encryption algorithm was found and removed; FALSE if it was not.

 

 

 

@@ -1552,9 +1553,9 @@ nm_setting_wireless_security_get_fils (
 
enum NMWepKeyType

 
The NMWepKeyType values specify how any WEP keys present in the setting
-are intepreted.  There are no standards governing how to hash the various WEP
+are interpreted.  There are no standards governing how to hash the various WEP
 key/passphrase formats into the actual WEP key.  Unfortunately some WEP keys
-can be interpreted in multiple ways, requring the setting to specify how to
+can be interpreted in multiple ways, requiring the setting to specify how to
 interpret the any WEP keys.  For example, the key "732f2d712e4a394a375d366931"
 is both a valid Hexadecimal WEP key and a WEP passphrase.  Further, many
 ASCII keys are also valid WEP passphrases, but since passphrases and ASCII
@@ -1666,6 +1667,8 @@ the actual WEP key using the MD5 hash algorithm.

 

 
enum NMSettingWirelessSecurityWpsMethod

 
Configure the use of WPS by a connection while it activates.

+
Note: prior to 1.16, this was a GEnum type instead of a GFlags type
+although, with the same numeric values.

 

 
Members

 

@@ -1947,8 +1950,8 @@ list element may be one of "wep40", "wep104", "tkip", or "ccmp".
  “key-mgmt”                 gchar *
Key management used for the connection.  One of "none" (WEP), "ieee8021x"
 (Dynamic WEP), "wpa-none" (Ad-Hoc WPA-PSK), "wpa-psk" (infrastructure
-WPA-PSK), or "wpa-eap" (WPA-Enterprise).  This property must be set for
-any Wi-Fi connection that uses security.

+WPA-PSK), "sae" (SAE) or "wpa-eap" (WPA-Enterprise).
+This property must be set for any Wi-Fi connection that uses security.
Flags: Read / Write
Default value: NULL

@@ -2017,12 +2020,11 @@ not specified, both WPA and RSN connections are allowed.

 
The “psk” property

 
  “psk”                      gchar *

-
Pre-Shared-Key for WPA networks.  If the key is 64-characters long, it
-must contain only hexadecimal characters and is interpreted as a
-hexadecimal WPA key.  Otherwise, the key must be between 8 and 63 ASCII
-characters (as specified in the 802.11i standard) and is interpreted as a
-WPA passphrase, and is hashed to derive the actual WPA-PSK used when
-connecting to the Wi-Fi network.

+
Pre-Shared-Key for WPA networks. For WPA-PSK, it's either an ASCII
+passphrase of 8 to 63 characters that is (as specified in the 802.11i
+standard) hashed to derive the actual key, or the key in form of 64
+hexadecimal character. The WPA3-Personal networks use a passphrase
+of any length for SAE authentication.

 
Flags: Read / Write

 
Default value: NULL

 

diff --git a/docs/libnm/html/NMSettingWpan.html b/docs/libnm/html/NMSettingWpan.html
index 1ceb07c3..777bc6f6 100644
--- a/docs/libnm/html/NMSettingWpan.html
+++ b/docs/libnm/html/NMSettingWpan.html
@@ -70,6 +70,22 @@
 nm_setting_wpan_get_short_address ()
+
+
+
+
+
+
+
+

 
 
 
 
 
 
 
 

+gint16
+
+nm_setting_wpan_get_page ()
+

+gint16
+
+nm_setting_wpan_get_channel ()
+

 
 

 

@@ -97,6 +113,22 @@
 #define
 NM_SETTING_WPAN_SHORT_ADDRESS
 
+
+#define
+NM_SETTING_WPAN_PAGE
+
+
+#define
+NM_SETTING_WPAN_CHANNEL
+
+
+#define
+NM_SETTING_WPAN_PAGE_DEFAULT
+
+
+#define
+NM_SETTING_WPAN_CHANNEL_DEFAULT
+
 
 

 

@@ -197,6 +229,58 @@ nm_setting_wpan_get_short_address (
 
Since: 1.14

 

+

+

+
nm_setting_wpan_get_page ()

+
gint16
+nm_setting_wpan_get_page (NMSettingWpan *setting);

+

+
Parameters

+

+++++
+
+
+
+
+
+





setting
the NMSettingWpan
 

+

+

+
Returns

+
 the “page” property of the setting

+

+
Since: 1.16

+

+

+

+
nm_setting_wpan_get_channel ()

+
gint16
+nm_setting_wpan_get_channel (NMSettingWpan *setting);

+

+
Parameters

+

+++++
+
+
+
+
+
+





setting
the NMSettingWpan
 

+

+

+
Returns

+
 the “channel” property of the setting

+

+
Since: 1.16

+

 

 

 
Types and Values

@@ -223,6 +307,30 @@ nm_setting_wpan_get_short_address (#define NM_SETTING_WPAN_SHORT_ADDRESS      "short-address"
 
 

+

+

+
NM_SETTING_WPAN_PAGE

+
#define NM_SETTING_WPAN_PAGE               "page"
+

+

+

+

+
NM_SETTING_WPAN_CHANNEL

+
#define NM_SETTING_WPAN_CHANNEL            "channel"
+

+

+

+

+
NM_SETTING_WPAN_PAGE_DEFAULT

+
#define NM_SETTING_WPAN_PAGE_DEFAULT    -1
+

+

+

+

+
NM_SETTING_WPAN_CHANNEL_DEFAULT

+
#define NM_SETTING_WPAN_CHANNEL_DEFAULT -1
+

+

 

 

 

diff --git a/docs/libnm/html/NMVpnEditorPlugin.html b/docs/libnm/html/NMVpnEditorPlugin.html
index f1168013..4085af30 100644
--- a/docs/libnm/html/NMVpnEditorPlugin.html
+++ b/docs/libnm/html/NMVpnEditorPlugin.html
@@ -424,9 +424,9 @@ nm_vpn_editor_plugin_load_from_file (const NMUtilsCheckFilePredicate check_file,
                                      gpointer user_data,
                                      GError **error);
-
Load the shared libary plugin_name
+
Load the shared library plugin_name
  and create a new
-NMVpnEditorPlugin instace via the NMVpnEditorPluginFactory
+NMVpnEditorPlugin instance via the NMVpnEditorPluginFactory
 function.

 
If plugin_name
  is not an absolute path name, it assumes the file
@@ -499,9 +499,9 @@ loading the shared library. 

 nm_vpn_editor_plugin_load (const char *plugin_name,
                            const char *check_service,
                            GError **error);
-
Load the shared libary plugin_name
+
Load the shared library plugin_name
  and create a new
-NMVpnEditorPlugin instace via the NMVpnEditorPluginFactory
+NMVpnEditorPlugin instance via the NMVpnEditorPluginFactory
 function.

 
This is similar to nm_vpn_editor_plugin_load_from_file(), but
 it does no validation of the plugin name, instead passes it directly
diff --git a/docs/libnm/html/NMWifiP2PPeer.html b/docs/libnm/html/NMWifiP2PPeer.html
new file mode 100644
index 00000000..fae8f62d
--- /dev/null
+++ b/docs/libnm/html/NMWifiP2PPeer.html
@@ -0,0 +1,618 @@
+
+
+
+
+NMWifiP2PPeer: libnm Reference Manual
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

+

+

+
+
+

+
NMWifiP2PPeer

+
NMWifiP2PPeer

+

+

+
Functions

+

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





+NM80211ApFlags
+
+nm_wifi_p2p_peer_get_flags ()
+
const char *
+
+nm_wifi_p2p_peer_get_name ()
+
const char *
+
+nm_wifi_p2p_peer_get_manufacturer ()
+
const char *
+
+nm_wifi_p2p_peer_get_model ()
+
const char *
+
+nm_wifi_p2p_peer_get_model_number ()
+
const char *
+
+nm_wifi_p2p_peer_get_serial ()
+

+GBytes *
+
+nm_wifi_p2p_peer_get_wfd_ies ()
+
const char *
+
+nm_wifi_p2p_peer_get_hw_address ()
+

+guint8
+
+nm_wifi_p2p_peer_get_strength ()
+

+int
+
+nm_wifi_p2p_peer_get_last_seen ()
+

+GPtrArray *
+
+nm_wifi_p2p_peer_filter_connections ()
+

+gboolean
+
+nm_wifi_p2p_peer_connection_valid ()
+

+

+

+
Types and Values

+

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




#defineNM_WIFI_P2P_PEER_FLAGS
#defineNM_WIFI_P2P_PEER_NAME
#defineNM_WIFI_P2P_PEER_MANUFACTURER
#defineNM_WIFI_P2P_PEER_MODEL
#defineNM_WIFI_P2P_PEER_MODEL_NUMBER
#defineNM_WIFI_P2P_PEER_SERIAL
#defineNM_WIFI_P2P_PEER_WFD_IES
#defineNM_WIFI_P2P_PEER_HW_ADDRESS
#defineNM_WIFI_P2P_PEER_STRENGTH
#defineNM_WIFI_P2P_PEER_LAST_SEEN

+

+

+
Description

+

+

+
Functions

+

+
nm_wifi_p2p_peer_get_flags ()

+
NM80211ApFlags
+nm_wifi_p2p_peer_get_flags (NMWifiP2PPeer *peer);

+
Gets the flags of the P2P peer.

+

+
Parameters

+

+++++
+
+
+
+
+
+





peer
a NMWifiP2PPeer
 

+

+

+
Returns

+
 the flags

+

+
Since: 1.16

+

+

+

+
nm_wifi_p2p_peer_get_name ()

+
const char *
+nm_wifi_p2p_peer_get_name (NMWifiP2PPeer *peer);

+
Gets the name of the P2P peer.

+

+
Parameters

+

+++++
+
+
+
+
+
+





peer
a NMWifiP2PPeer
 

+

+

+
Returns

+
 the name

+

+
Since: 1.16

+

+

+

+
nm_wifi_p2p_peer_get_manufacturer ()

+
const char *
+nm_wifi_p2p_peer_get_manufacturer (NMWifiP2PPeer *peer);

+
Gets the manufacturer of the P2P peer.

+

+
Parameters

+

+++++
+
+
+
+
+
+





peer
a NMWifiP2PPeer
 

+

+

+
Returns

+
 the manufacturer

+

+
Since: 1.16

+

+

+

+
nm_wifi_p2p_peer_get_model ()

+
const char *
+nm_wifi_p2p_peer_get_model (NMWifiP2PPeer *peer);

+
Gets the model of the P2P peer.

+

+
Parameters

+

+++++
+
+
+
+
+
+





peer
a NMWifiP2PPeer
 

+

+

+
Returns

+
 the model

+

+
Since: 1.16

+

+

+

+
nm_wifi_p2p_peer_get_model_number ()

+
const char *
+nm_wifi_p2p_peer_get_model_number (NMWifiP2PPeer *peer);

+
Gets the model number of the P2P peer.

+

+
Parameters

+

+++++
+
+
+
+
+
+





peer
a NMWifiP2PPeer
 

+

+

+
Returns

+
 the model number

+

+
Since: 1.16

+

+

+

+
nm_wifi_p2p_peer_get_serial ()

+
const char *
+nm_wifi_p2p_peer_get_serial (NMWifiP2PPeer *peer);

+
Gets the serial number of the P2P peer.

+

+
Parameters

+

+++++
+
+
+
+
+
+





peer
a NMWifiP2PPeer
 

+

+

+
Returns

+
 the serial number

+

+
Since: 1.16

+

+

+

+
nm_wifi_p2p_peer_get_wfd_ies ()

+
GBytes *
+nm_wifi_p2p_peer_get_wfd_ies (NMWifiP2PPeer *peer);

+
Gets the WFD information elements of the P2P peer.

+

+
Parameters

+

+++++
+
+
+
+
+
+





peer
a NMWifiP2PPeer
 

+

+

+
Returns

+
the GBytes containing the WFD IEs, or NULL. 

+
[transfer none]

+

+
Since: 1.16

+

+

+

+
nm_wifi_p2p_peer_get_hw_address ()

+
const char *
+nm_wifi_p2p_peer_get_hw_address (NMWifiP2PPeer *peer);

+
Gets the hardware address of the P2P peer.

+

+
Parameters

+

+++++
+
+
+
+
+
+





peer
a NMWifiP2PPeer
 

+

+

+
Returns

+
 the hardware address

+

+
Since: 1.16

+

+

+

+
nm_wifi_p2p_peer_get_strength ()

+
guint8
+nm_wifi_p2p_peer_get_strength (NMWifiP2PPeer *peer);

+
Gets the current signal strength of the P2P peer as a percentage.

+

+
Parameters

+

+++++
+
+
+
+
+
+





peer
a NMWifiP2PPeer
 

+

+

+
Returns

+
 the signal strength (0 to 100)

+

+
Since: 1.16

+

+

+

+
nm_wifi_p2p_peer_get_last_seen ()

+
int
+nm_wifi_p2p_peer_get_last_seen (NMWifiP2PPeer *peer);

+
Returns the timestamp (in CLOCK_BOOTTIME seconds) for the last time the
+P2P peer was seen.  A value of -1 means the P2P peer has never been seen.

+

+
Parameters

+

+++++
+
+
+
+
+
+





peer
a NMWifiP2PPeer
 

+

+

+
Returns

+
 the last seen time in seconds

+

+
Since: 1.16

+

+

+

+
nm_wifi_p2p_peer_filter_connections ()

+
GPtrArray *
+nm_wifi_p2p_peer_filter_connections (NMWifiP2PPeer *peer,
+                                     const GPtrArray *connections);

+
Filters a given array of connections for a given NMWifiP2PPeer object and
+returns connections which may be activated with the P2P peer.  Any
+returned connections will match the peers
+'s HW address and in the future
+possibly other attributes.

+
To obtain the list of connections that are compatible with this P2P peer,
+use nm_client_get_connections() and then filter the returned list for a given
+NMDevice using nm_device_filter_connections() and finally filter that list
+with this function.

+

+
Parameters

+

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





peer
an NMWifiP2PPeer to filter connections for
 
connections
an array of NMConnections to
+filter. 
[element-type NMConnection]

+

+

+
Returns

+
an array of
+NMConnections that could be activated with the given peer
+. The array should
+be freed with g_ptr_array_unref() when it is no longer required. 

+
[transfer container][element-type NMConnection]

+

+
Since: 1.16

+

+

+

+
nm_wifi_p2p_peer_connection_valid ()

+
gboolean
+nm_wifi_p2p_peer_connection_valid (NMWifiP2PPeer *peer,
+                                   NMConnection *connection);

+
Validates a given connection against a given Wi-Fi P2P peer to ensure that
+the connection may be activated with that peer. The connection must match the
+peer
+'s address and in the future possibly other attributes.

+

+
Parameters

+

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





peer
an NMWifiP2PPeer to validate connection
+against
 
connection
an NMConnection to validate against peer
+
 

+

+

+
Returns

+
 TRUE if the connection may be activated with this Wi-Fi P2P Peer,
+FALSE if it cannot be.

+

+
Since: 1.16

+

+

+

+
Types and Values

+

+
NM_WIFI_P2P_PEER_FLAGS

+
#define NM_WIFI_P2P_PEER_FLAGS                "flags"
+

+

+

+

+
NM_WIFI_P2P_PEER_NAME

+
#define NM_WIFI_P2P_PEER_NAME                 "name"
+

+

+

+

+
NM_WIFI_P2P_PEER_MANUFACTURER

+
#define NM_WIFI_P2P_PEER_MANUFACTURER         "manufacturer"
+

+

+

+

+
NM_WIFI_P2P_PEER_MODEL

+
#define NM_WIFI_P2P_PEER_MODEL                "model"
+

+

+

+

+
NM_WIFI_P2P_PEER_MODEL_NUMBER

+
#define NM_WIFI_P2P_PEER_MODEL_NUMBER         "model-number"
+

+

+

+

+
NM_WIFI_P2P_PEER_SERIAL

+
#define NM_WIFI_P2P_PEER_SERIAL               "serial"
+

+

+

+

+
NM_WIFI_P2P_PEER_WFD_IES

+
#define NM_WIFI_P2P_PEER_WFD_IES              "wfd-ies"
+

+

+

+

+
NM_WIFI_P2P_PEER_HW_ADDRESS

+
#define NM_WIFI_P2P_PEER_HW_ADDRESS           "hw-address"
+

+

+

+

+
NM_WIFI_P2P_PEER_STRENGTH

+
#define NM_WIFI_P2P_PEER_STRENGTH             "strength"
+

+

+

+

+
NM_WIFI_P2P_PEER_LAST_SEEN

+
#define NM_WIFI_P2P_PEER_LAST_SEEN            "last-seen"
+

+

+

+

+

+
Generated by GTK-Doc V1.29

+
+
\ No newline at end of file
diff --git a/docs/libnm/html/NMWimaxNsp.html b/docs/libnm/html/NMWimaxNsp.html
index eb249419..d361a0ec 100644
--- a/docs/libnm/html/NMWimaxNsp.html
+++ b/docs/libnm/html/NMWimaxNsp.html
@@ -6,7 +6,7 @@
 
 
 
-
+
 
 
 
@@ -22,7 +22,7 @@
 
 Home
 Up
-Prev
+Prev
 Next
 
 

diff --git a/docs/libnm/html/api-index-full.html b/docs/libnm/html/api-index-full.html
index 9d850e33..f8b8487c 100644
--- a/docs/libnm/html/api-index-full.html
+++ b/docs/libnm/html/api-index-full.html
@@ -13,39 +13,11 @@
 
 
 
-
+                  S
@@ -54,158 +26,158 @@
 

 

 API Index

-
8

+
J

 

-NM80211ApFlags, enum in nm-dbus-interface
+json_array, macro in nm-json
 

 

 

-NM80211ApSecurityFlags, enum in nm-dbus-interface
+json_array_append_new, macro in nm-json
 

 

 

-NM80211Mode, enum in nm-dbus-interface
+json_array_get, macro in nm-json
 

 

-
A

 

-NMAccessPoint, struct in NMDeviceOvs
+json_array_size, macro in nm-json
 

 

 

-NMAccessPoint:bssid, object property in NMDeviceOvs
+json_delete, macro in nm-json
 

 

 

-NMAccessPoint:flags, object property in NMDeviceOvs
+json_dumps, macro in nm-json
 

 

 

-NMAccessPoint:frequency, object property in NMDeviceOvs
+json_false, macro in nm-json
 

 

 

-NMAccessPoint:hw-address, object property in NMDeviceOvs
+json_integer, macro in nm-json
 

 

 

-NMAccessPoint:last-seen, object property in NMDeviceOvs
+json_integer_value, macro in nm-json
 

 

 

-NMAccessPoint:max-bitrate, object property in NMDeviceOvs
+json_loads, macro in nm-json
 

 

 

-NMAccessPoint:mode, object property in NMDeviceOvs
+json_object, macro in nm-json
 

 

 

-NMAccessPoint:rsn-flags, object property in NMDeviceOvs
+json_object_del, macro in nm-json
 

 

 

-NMAccessPoint:ssid, object property in NMDeviceOvs
+json_object_get, macro in nm-json
 

 

 

-NMAccessPoint:strength, object property in NMDeviceOvs
+json_object_iter, macro in nm-json
 

 

 

-NMAccessPoint:wpa-flags, object property in NMDeviceOvs
+json_object_iter_key, macro in nm-json
 

 

 

-NM_ACCESS_POINT_BSSID, macro in NMAccessPoint
+json_object_iter_next, macro in nm-json
 

 

 

-nm_access_point_connection_valid, function in NMAccessPoint
+json_object_iter_value, macro in nm-json
 

 

 

-nm_access_point_filter_connections, function in NMAccessPoint
+json_object_key_to_iter, macro in nm-json
 

 

 

-NM_ACCESS_POINT_FLAGS, macro in NMAccessPoint
+json_object_set_new, macro in nm-json
 

 

 

-NM_ACCESS_POINT_FREQUENCY, macro in NMAccessPoint
+json_object_size, macro in nm-json
 

 

 

-nm_access_point_get_bssid, function in NMAccessPoint
+json_string, macro in nm-json
 

 

 

-nm_access_point_get_flags, function in NMAccessPoint
+json_string_value, macro in nm-json
 

 

 

-nm_access_point_get_frequency, function in NMAccessPoint
+json_true, macro in nm-json
 

 

+
N

 

-nm_access_point_get_last_seen, function in NMAccessPoint
+NM80211ApFlags, enum in nm-dbus-interface
 

 

 

-nm_access_point_get_max_bitrate, function in NMAccessPoint
+NM80211ApSecurityFlags, enum in nm-dbus-interface
 

 

 

-nm_access_point_get_mode, function in NMAccessPoint
+NM80211Mode, enum in nm-dbus-interface
 

 

 

-nm_access_point_get_rsn_flags, function in NMAccessPoint
+NMAccessPoint, struct in NMDeviceOvs
 

 

 

-nm_access_point_get_ssid, function in NMAccessPoint
+NMAccessPoint:bssid, object property in NMDeviceOvs
 

 

 

-nm_access_point_get_strength, function in NMAccessPoint
+NMAccessPoint:flags, object property in NMDeviceOvs
 

 

 

-nm_access_point_get_wpa_flags, function in NMAccessPoint
+NMAccessPoint:frequency, object property in NMDeviceOvs
 

 

 

-NM_ACCESS_POINT_HW_ADDRESS, macro in NMAccessPoint
+NMAccessPoint:hw-address, object property in NMDeviceOvs
 

 

 

-NM_ACCESS_POINT_LAST_SEEN, macro in NMAccessPoint
+NMAccessPoint:last-seen, object property in NMDeviceOvs
 

 

 

-NM_ACCESS_POINT_MAX_BITRATE, macro in NMAccessPoint
+NMAccessPoint:max-bitrate, object property in NMDeviceOvs
 

 

 

-NM_ACCESS_POINT_MODE, macro in NMAccessPoint
+NMAccessPoint:mode, object property in NMDeviceOvs
 

 

 

-NM_ACCESS_POINT_RSN_FLAGS, macro in NMAccessPoint
+NMAccessPoint:rsn-flags, object property in NMDeviceOvs
 

 

 

-NM_ACCESS_POINT_SSID, macro in NMAccessPoint
+NMAccessPoint:ssid, object property in NMDeviceOvs
 

 

 

-NM_ACCESS_POINT_STRENGTH, macro in NMAccessPoint
+NMAccessPoint:strength, object property in NMDeviceOvs
 

 

 

-NM_ACCESS_POINT_WPA_FLAGS, macro in NMAccessPoint
+NMAccessPoint:wpa-flags, object property in NMDeviceOvs
 

 

 

@@ -293,6274 +265,6627 @@
 

 

 

-NM_ACTIVE_CONNECTION_CONNECTION, macro in NMActiveConnection
+NMAgentManagerError, enum in nm-errors
 

 

 

-NM_ACTIVE_CONNECTION_DEFAULT, macro in NMActiveConnection
+NMBluetoothCapabilities, enum in nm-dbus-interface
 

 

 

-NM_ACTIVE_CONNECTION_DEFAULT6, macro in NMActiveConnection
+NMCapability, enum in nm-dbus-interface
 

 

 

-NM_ACTIVE_CONNECTION_DEVICES, macro in NMActiveConnection
+NMCheckpoint, struct in NMDeviceOvs
 

 

 

-NM_ACTIVE_CONNECTION_DHCP4_CONFIG, macro in NMActiveConnection
+NMCheckpoint:created, object property in NMDeviceOvs
 

 

 

-NM_ACTIVE_CONNECTION_DHCP6_CONFIG, macro in NMActiveConnection
+NMCheckpoint:devices, object property in NMDeviceOvs
 

 

 

-nm_active_connection_get_connection, function in NMActiveConnection
+NMCheckpoint:rollback-timeout, object property in NMDeviceOvs
 

 

 

-nm_active_connection_get_connection_type, function in NMActiveConnection
+NMCheckpointCreateFlags, enum in nm-dbus-interface
 

 

 

-nm_active_connection_get_default, function in NMActiveConnection
+NMClient, struct in NMDeviceOvs
 

 

 

-nm_active_connection_get_default6, function in NMActiveConnection
+NMClient::active-connection-added, object signal in NMDeviceOvs
 

 

 

-nm_active_connection_get_devices, function in NMActiveConnection
+NMClient::active-connection-removed, object signal in NMDeviceOvs
 

 

 

-nm_active_connection_get_dhcp4_config, function in NMActiveConnection
+NMClient::any-device-added, object signal in NMDeviceOvs
 

 

 

-nm_active_connection_get_dhcp6_config, function in NMActiveConnection
+NMClient::any-device-removed, object signal in NMDeviceOvs
 

 

 

-nm_active_connection_get_id, function in NMActiveConnection
+NMClient::connection-added, object signal in NMDeviceOvs
 

 

 

-nm_active_connection_get_ip4_config, function in NMActiveConnection
+NMClient::connection-removed, object signal in NMDeviceOvs
 

 

 

-nm_active_connection_get_ip6_config, function in NMActiveConnection
+NMClient::device-added, object signal in NMDeviceOvs
 

 

 

-nm_active_connection_get_master, function in NMActiveConnection
+NMClient::device-removed, object signal in NMDeviceOvs
 

 

 

-nm_active_connection_get_specific_object_path, function in NMActiveConnection
+NMClient::permission-changed, object signal in NMDeviceOvs
 

 

 

-nm_active_connection_get_state, function in NMActiveConnection
+NMClient:activating-connection, object property in NMDeviceOvs
 

 

 

-nm_active_connection_get_state_flags, function in NMActiveConnection
+NMClient:active-connections, object property in NMDeviceOvs
 

 

 

-nm_active_connection_get_state_reason, function in NMActiveConnection
+NMClient:all-devices, object property in NMDeviceOvs
 

 

 

-nm_active_connection_get_uuid, function in NMActiveConnection
+NMClient:can-modify, object property in NMDeviceOvs
 

 

 

-nm_active_connection_get_vpn, function in NMActiveConnection
+NMClient:checkpoints, object property in NMDeviceOvs
 

 

 

-NM_ACTIVE_CONNECTION_ID, macro in NMActiveConnection
+NMClient:connections, object property in NMDeviceOvs
 

 

 

-NM_ACTIVE_CONNECTION_IP4_CONFIG, macro in NMActiveConnection
+NMClient:connectivity, object property in NMDeviceOvs
 

 

 

-NM_ACTIVE_CONNECTION_IP6_CONFIG, macro in NMActiveConnection
+NMClient:connectivity-check-available, object property in NMDeviceOvs
 

 

 

-NM_ACTIVE_CONNECTION_MASTER, macro in NMActiveConnection
+NMClient:connectivity-check-enabled, object property in NMDeviceOvs
 

 

 

-NM_ACTIVE_CONNECTION_SPECIFIC_OBJECT_PATH, macro in NMActiveConnection
+NMClient:devices, object property in NMDeviceOvs
 

 

 

-NM_ACTIVE_CONNECTION_STATE, macro in NMActiveConnection
+NMClient:dns-configuration, object property in NMDeviceOvs
 

 

 

-NM_ACTIVE_CONNECTION_STATE_FLAGS, macro in NMActiveConnection
+NMClient:dns-mode, object property in NMDeviceOvs
 

 

 

-NM_ACTIVE_CONNECTION_TYPE, macro in NMActiveConnection
+NMClient:dns-rc-manager, object property in NMDeviceOvs
 

 

 

-NM_ACTIVE_CONNECTION_UUID, macro in NMActiveConnection
+NMClient:hostname, object property in NMDeviceOvs
 

 

 

-NM_ACTIVE_CONNECTION_VPN, macro in NMActiveConnection
+NMClient:metered, object property in NMDeviceOvs
 

 

 

-NMAgentManagerError, enum in nm-errors
+NMClient:networking-enabled, object property in NMDeviceOvs
 

 

 

-NM_AGENT_MANAGER_ERROR, macro in nm-errors
+NMClient:nm-running, object property in NMDeviceOvs
 

 

 

-nm_agent_manager_error_quark, function in nm-errors
+NMClient:primary-connection, object property in NMDeviceOvs
 

 

 

-NM_AVAILABLE_IN_0_9_10, macro in nm-version
+NMClient:startup, object property in NMDeviceOvs
 

 

 

-NM_AVAILABLE_IN_1_0, macro in nm-version
+NMClient:state, object property in NMDeviceOvs
 

 

 

-NM_AVAILABLE_IN_1_10, macro in nm-version
+NMClient:version, object property in NMDeviceOvs
 

 

 

-NM_AVAILABLE_IN_1_12, macro in nm-version
+NMClient:wimax-enabled, object property in NMDeviceOvs
 

 

 

-NM_AVAILABLE_IN_1_14, macro in nm-version
+NMClient:wimax-hardware-enabled, object property in NMDeviceOvs
 

 

 

-NM_AVAILABLE_IN_1_2, macro in nm-version
+NMClient:wireless-enabled, object property in NMDeviceOvs
 

 

 

-NM_AVAILABLE_IN_1_4, macro in nm-version
+NMClient:wireless-hardware-enabled, object property in NMDeviceOvs
 

 

 

-NM_AVAILABLE_IN_1_6, macro in nm-version
+NMClient:wwan-enabled, object property in NMDeviceOvs
 

 

 

-NM_AVAILABLE_IN_1_8, macro in nm-version
+NMClient:wwan-hardware-enabled, object property in NMDeviceOvs
 

 

-
B

 

-NMBluetoothCapabilities, enum in nm-dbus-interface
+NMClientError, enum in NMClient
 

 

-
C

 

-NMCapability, enum in nm-dbus-interface
+NMClientPermission, enum in NMClient
 

 

 

-NMCheckpoint, struct in NMDeviceOvs
+NMClientPermissionResult, enum in NMClient
 

 

 

-NMCheckpoint:created, object property in NMDeviceOvs
+NMConnection, struct in NMSettingOvs
 

 

 

-NMCheckpoint:devices, object property in NMDeviceOvs
+NMConnection::changed, object signal in NMSettingOvs
 

 

 

-NMCheckpoint:rollback-timeout, object property in NMDeviceOvs
+NMConnection::secrets-cleared, object signal in NMSettingOvs
 

 

 

-NMCheckpointCreateFlags, enum in nm-dbus-interface
+NMConnection::secrets-updated, object signal in NMSettingOvs
 

 

 

-NM_CHECKPOINT_CREATED, macro in NMCheckpoint
+NMConnectionError, enum in nm-errors
 

 

 

-NM_CHECKPOINT_DEVICES, macro in NMCheckpoint
+_NMConnectionForEachSecretFunc, user_function in NMSetting
 

 

 

-nm_checkpoint_get_created, function in NMCheckpoint
+NMConnectionInterface, struct in NMConnection
 

 

 

-nm_checkpoint_get_devices, function in NMCheckpoint
+NMConnectionMultiConnect, enum in nm-dbus-interface
 

 

 

-nm_checkpoint_get_rollback_timeout, function in NMCheckpoint
+NMConnectionSerializationFlags, enum in NMConnection
 

 

 

-NM_CHECKPOINT_ROLLBACK_TIMEOUT, macro in NMCheckpoint
+NMConnectivityState, enum in nm-dbus-interface
 

 

 

-NMClient, struct in NMDeviceOvs
+NMCryptoError, enum in nm-errors
 

 

 

-NMClient::active-connection-added, object signal in NMDeviceOvs
+NMDevice, struct in NMDeviceOvs
 

 

 

-NMClient::active-connection-removed, object signal in NMDeviceOvs
+NMDevice6Lowpan, struct in NMDeviceOvs
 

 

 

-NMClient::any-device-added, object signal in NMDeviceOvs
+NMDevice6Lowpan:hw-address, object property in NMDeviceOvs
 

 

 

-NMClient::any-device-removed, object signal in NMDeviceOvs
+NMDevice6Lowpan:parent, object property in NMDeviceOvs
 

 

 

-NMClient::connection-added, object signal in NMDeviceOvs
+NMDevice::state-changed, object signal in NMDeviceOvs
 

 

 

-NMClient::connection-removed, object signal in NMDeviceOvs
+NMDevice:active-connection, object property in NMDeviceOvs
 

 

 

-NMClient::device-added, object signal in NMDeviceOvs
+NMDevice:autoconnect, object property in NMDeviceOvs
 

 

 

-NMClient::device-removed, object signal in NMDeviceOvs
+NMDevice:available-connections, object property in NMDeviceOvs
 

 

 

-NMClient::permission-changed, object signal in NMDeviceOvs
+NMDevice:capabilities, object property in NMDeviceOvs
 

 

 

-NMClient:activating-connection, object property in NMDeviceOvs
+NMDevice:device-type, object property in NMDeviceOvs
 

 

 

-NMClient:active-connections, object property in NMDeviceOvs
+NMDevice:dhcp4-config, object property in NMDeviceOvs
 

 

 

-NMClient:all-devices, object property in NMDeviceOvs
+NMDevice:dhcp6-config, object property in NMDeviceOvs
 

 

 

-NMClient:can-modify, object property in NMDeviceOvs
+NMDevice:driver, object property in NMDeviceOvs
 

 

 

-NMClient:checkpoints, object property in NMDeviceOvs
+NMDevice:driver-version, object property in NMDeviceOvs
 

 

 

-NMClient:connections, object property in NMDeviceOvs
+NMDevice:firmware-missing, object property in NMDeviceOvs
 

 

 

-NMClient:connectivity, object property in NMDeviceOvs
+NMDevice:firmware-version, object property in NMDeviceOvs
 

 

 

-NMClient:connectivity-check-available, object property in NMDeviceOvs
+NMDevice:interface, object property in NMDeviceOvs
 

 

 

-NMClient:connectivity-check-enabled, object property in NMDeviceOvs
+NMDevice:ip-interface, object property in NMDeviceOvs
 

 

 

-NMClient:devices, object property in NMDeviceOvs
+NMDevice:ip4-config, object property in NMDeviceOvs
 

 

 

-NMClient:dns-configuration, object property in NMDeviceOvs
+NMDevice:ip4-connectivity, object property in NMDeviceOvs
 

 

 

-NMClient:dns-mode, object property in NMDeviceOvs
+NMDevice:ip6-config, object property in NMDeviceOvs
 

 

 

-NMClient:dns-rc-manager, object property in NMDeviceOvs
+NMDevice:ip6-connectivity, object property in NMDeviceOvs
 

 

 

-NMClient:hostname, object property in NMDeviceOvs
+NMDevice:lldp-neighbors, object property in NMDeviceOvs
 

 

 

-NMClient:metered, object property in NMDeviceOvs
+NMDevice:managed, object property in NMDeviceOvs
 

 

 

-NMClient:networking-enabled, object property in NMDeviceOvs
+NMDevice:metered, object property in NMDeviceOvs
 

 

 

-NMClient:nm-running, object property in NMDeviceOvs
+NMDevice:mtu, object property in NMDeviceOvs
+

+

+

+NMDevice:nm-plugin-missing, object property in NMDeviceOvs
+

+

+

+NMDevice:physical-port-id, object property in NMDeviceOvs
+

+

+

+NMDevice:product, object property in NMDeviceOvs
+

+

+

+NMDevice:real, object property in NMDeviceOvs
+

+

+

+NMDevice:state, object property in NMDeviceOvs
+

+

+

+NMDevice:state-reason, object property in NMDeviceOvs
+

+

+

+NMDevice:udi, object property in NMDeviceOvs
+

+

+

+NMDevice:vendor, object property in NMDeviceOvs
+

+

+

+NMDeviceAdsl, struct in NMDeviceOvs
+

+

+

+NMDeviceAdsl:carrier, object property in NMDeviceOvs
+

+

+

+NMDeviceBond, struct in NMDeviceOvs
+

+

+

+NMDeviceBond:carrier, object property in NMDeviceOvs
+

+

+

+NMDeviceBond:hw-address, object property in NMDeviceOvs
+

+

+

+NMDeviceBond:slaves, object property in NMDeviceOvs
+

+

+

+NMDeviceBridge, struct in NMDeviceOvs
+

+

+

+NMDeviceBridge:carrier, object property in NMDeviceOvs
+

+

+

+NMDeviceBridge:hw-address, object property in NMDeviceOvs
+

+

+

+NMDeviceBridge:slaves, object property in NMDeviceOvs
+

+

+

+NMDeviceBt, struct in NMDeviceOvs
+

+

+

+NMDeviceBt:bt-capabilities, object property in NMDeviceOvs
+

+

+

+NMDeviceBt:hw-address, object property in NMDeviceOvs
+

+

+

+NMDeviceBt:name, object property in NMDeviceOvs
+

+

+

+NMDeviceCapabilities, enum in nm-dbus-interface
+

+

+

+NMDeviceDummy, struct in NMDeviceOvs
+

+

+

+NMDeviceDummy:hw-address, object property in NMDeviceOvs
+

+

+

+NMDeviceError, enum in nm-errors
+

+

+

+NMDeviceEthernet, struct in NMDeviceOvs
+

+

+

+NMDeviceEthernet:carrier, object property in NMDeviceOvs
+

+

+

+NMDeviceEthernet:hw-address, object property in NMDeviceOvs
+

+

+

+NMDeviceEthernet:perm-hw-address, object property in NMDeviceOvs
+

+

+

+NMDeviceEthernet:s390-subchannels, object property in NMDeviceOvs
+

+

+

+NMDeviceEthernet:speed, object property in NMDeviceOvs
+

+

+

+NMDeviceGeneric, struct in NMDeviceOvs
+

+

+

+NMDeviceGeneric:hw-address, object property in NMDeviceOvs
+

+

+

+NMDeviceGeneric:type-description, object property in NMDeviceOvs
+

+

+

+NMDeviceInfiniband, struct in NMDeviceOvs
+

+

+

+NMDeviceInfiniband:carrier, object property in NMDeviceOvs
+

+

+

+NMDeviceInfiniband:hw-address, object property in NMDeviceOvs
+

+

+

+NMDeviceIPTunnel, struct in NMDeviceOvs
+

+

+

+NMDeviceIPTunnel:encapsulation-limit, object property in NMDeviceOvs
+

+

+

+NMDeviceIPTunnel:flags, object property in NMDeviceOvs
+

+

+

+NMDeviceIPTunnel:flow-label, object property in NMDeviceOvs
+

+

+

+NMDeviceIPTunnel:input-key, object property in NMDeviceOvs
+

+

+

+NMDeviceIPTunnel:local, object property in NMDeviceOvs
+

+

+

+NMDeviceIPTunnel:mode, object property in NMDeviceOvs
+

+

+

+NMDeviceIPTunnel:output-key, object property in NMDeviceOvs
+

+

+

+NMDeviceIPTunnel:parent, object property in NMDeviceOvs
+

+

+

+NMDeviceIPTunnel:path-mtu-discovery, object property in NMDeviceOvs
+

+

+

+NMDeviceIPTunnel:remote, object property in NMDeviceOvs
+

+

+

+NMDeviceIPTunnel:tos, object property in NMDeviceOvs
+

+

+

+NMDeviceIPTunnel:ttl, object property in NMDeviceOvs
+

+

+

+NMDeviceMacsec, struct in NMDeviceOvs
+

+

+

+NMDeviceMacsec:cipher-suite, object property in NMDeviceOvs
+

+

+

+NMDeviceMacsec:encoding-sa, object property in NMDeviceOvs
+

+

+

+NMDeviceMacsec:encrypt, object property in NMDeviceOvs
+

+

+

+NMDeviceMacsec:es, object property in NMDeviceOvs
+

+

+

+NMDeviceMacsec:hw-address, object property in NMDeviceOvs
+

+

+

+NMDeviceMacsec:icv-length, object property in NMDeviceOvs
+

+

+

+NMDeviceMacsec:include-sci, object property in NMDeviceOvs
+

+

+

+NMDeviceMacsec:parent, object property in NMDeviceOvs
+

+

+

+NMDeviceMacsec:protect, object property in NMDeviceOvs
+

+

+

+NMDeviceMacsec:replay-protect, object property in NMDeviceOvs
+

+

+

+NMDeviceMacsec:scb, object property in NMDeviceOvs
+

+

+

+NMDeviceMacsec:sci, object property in NMDeviceOvs
+

+

+

+NMDeviceMacsec:validation, object property in NMDeviceOvs
+

+

+

+NMDeviceMacsec:window, object property in NMDeviceOvs
+

+

+

+NMDeviceMacvlan, struct in NMDeviceOvs
+

+

+

+NMDeviceMacvlan:hw-address, object property in NMDeviceOvs
+

+

+

+NMDeviceMacvlan:mode, object property in NMDeviceOvs
+

+

+

+NMDeviceMacvlan:no-promisc, object property in NMDeviceOvs
+

+

+

+NMDeviceMacvlan:parent, object property in NMDeviceOvs
+

+

+

+NMDeviceMacvlan:tap, object property in NMDeviceOvs
+

+

+

+NMDeviceModem, struct in NMDeviceOvs
+

+

+

+NMDeviceModem:current-capabilities, object property in NMDeviceOvs
+

+

+

+NMDeviceModem:modem-capabilities, object property in NMDeviceOvs
+

+

+

+NMDeviceModemCapabilities, enum in nm-dbus-interface
+

+

+

+NMDeviceOlpcMesh, struct in NMDeviceOvs
+

+

+

+NMDeviceOlpcMesh:active-channel, object property in NMDeviceOvs
+

+

+

+NMDeviceOlpcMesh:companion, object property in NMDeviceOvs
+

+

+

+NMDeviceOlpcMesh:hw-address, object property in NMDeviceOvs
+

+

+

+NMDeviceOvsBridge, struct in NMDeviceOvs
+

+

+

+NMDeviceOvsInterface, struct in NMDeviceOvs
+

+

+

+NMDeviceOvsPort, struct in NMDeviceOvs
+

+

+

+NMDevicePpp, struct in NMDeviceOvs
+

+

+

+NMDeviceState, enum in nm-dbus-interface
+

+

+

+NMDeviceStateReason, enum in nm-dbus-interface
 

 

 

-NMClient:primary-connection, object property in NMDeviceOvs
+NMDeviceTeam, struct in NMDeviceOvs
 

 

 

-NMClient:startup, object property in NMDeviceOvs
+NMDeviceTeam:carrier, object property in NMDeviceOvs
 

 

 

-NMClient:state, object property in NMDeviceOvs
+NMDeviceTeam:config, object property in NMDeviceOvs
 

 

 

-NMClient:version, object property in NMDeviceOvs
+NMDeviceTeam:hw-address, object property in NMDeviceOvs
 

 

 

-NMClient:wimax-enabled, object property in NMDeviceOvs
+NMDeviceTeam:slaves, object property in NMDeviceOvs
 

 

 

-NMClient:wimax-hardware-enabled, object property in NMDeviceOvs
+NMDeviceTun, struct in NMDeviceOvs
 

 

 

-NMClient:wireless-enabled, object property in NMDeviceOvs
+NMDeviceTun:group, object property in NMDeviceOvs
 

 

 

-NMClient:wireless-hardware-enabled, object property in NMDeviceOvs
+NMDeviceTun:hw-address, object property in NMDeviceOvs
 

 

 

-NMClient:wwan-enabled, object property in NMDeviceOvs
+NMDeviceTun:mode, object property in NMDeviceOvs
 

 

 

-NMClient:wwan-hardware-enabled, object property in NMDeviceOvs
+NMDeviceTun:multi-queue, object property in NMDeviceOvs
 

 

 

-NMClientError, enum in NMClient
+NMDeviceTun:no-pi, object property in NMDeviceOvs
 

 

 

-NMClientPermission, enum in NMClient
+NMDeviceTun:owner, object property in NMDeviceOvs
 

 

 

-NMClientPermissionResult, enum in NMClient
+NMDeviceTun:vnet-hdr, object property in NMDeviceOvs
 

 

 

-nm_client_activate_connection_async, function in NMClient
+NMDeviceType, enum in nm-dbus-interface
 

 

 

-nm_client_activate_connection_finish, function in NMClient
+NMDeviceVlan, struct in NMDeviceOvs
 

 

 

-NM_CLIENT_ACTIVATING_CONNECTION, macro in NMClient
+NMDeviceVlan:carrier, object property in NMDeviceOvs
 

 

 

-NM_CLIENT_ACTIVE_CONNECTIONS, macro in NMClient
+NMDeviceVlan:hw-address, object property in NMDeviceOvs
 

 

 

-NM_CLIENT_ACTIVE_CONNECTION_ADDED, macro in NMClient
+NMDeviceVlan:parent, object property in NMDeviceOvs
 

 

 

-NM_CLIENT_ACTIVE_CONNECTION_REMOVED, macro in NMClient
+NMDeviceVlan:vlan-id, object property in NMDeviceOvs
 

 

 

-nm_client_add_and_activate_connection_async, function in NMClient
+NMDeviceVxlan, struct in NMDeviceOvs
 

 

 

-nm_client_add_and_activate_connection_finish, function in NMClient
+NMDeviceVxlan:ageing, object property in NMDeviceOvs
 

 

 

-nm_client_add_connection_async, function in NMClient
+NMDeviceVxlan:carrier, object property in NMDeviceOvs
 

 

 

-nm_client_add_connection_finish, function in NMClient
+NMDeviceVxlan:dst-port, object property in NMDeviceOvs
 

 

 

-NM_CLIENT_ALL_DEVICES, macro in NMClient
+NMDeviceVxlan:group, object property in NMDeviceOvs
 

 

 

-NM_CLIENT_ANY_DEVICE_ADDED, macro in NMClient
+NMDeviceVxlan:hw-address, object property in NMDeviceOvs
 

 

 

-NM_CLIENT_ANY_DEVICE_REMOVED, macro in NMClient
+NMDeviceVxlan:id, object property in NMDeviceOvs
 

 

 

-NM_CLIENT_CAN_MODIFY, macro in NMClient
+NMDeviceVxlan:l2miss, object property in NMDeviceOvs
 

 

 

-nm_client_checkpoint_adjust_rollback_timeout, function in NMClient
+NMDeviceVxlan:l3miss, object property in NMDeviceOvs
 

 

 

-nm_client_checkpoint_adjust_rollback_timeout_finish, function in NMClient
+NMDeviceVxlan:learning, object property in NMDeviceOvs
 

 

 

-nm_client_checkpoint_create, function in NMClient
+NMDeviceVxlan:limit, object property in NMDeviceOvs
 

 

 

-nm_client_checkpoint_create_finish, function in NMClient
+NMDeviceVxlan:local, object property in NMDeviceOvs
 

 

 

-nm_client_checkpoint_destroy, function in NMClient
+NMDeviceVxlan:parent, object property in NMDeviceOvs
 

 

 

-nm_client_checkpoint_destroy_finish, function in NMClient
+NMDeviceVxlan:proxy, object property in NMDeviceOvs
 

 

 

-nm_client_checkpoint_rollback, function in NMClient
+NMDeviceVxlan:rsc, object property in NMDeviceOvs
 

 

 

-nm_client_checkpoint_rollback_finish, function in NMClient
+NMDeviceVxlan:src-port-max, object property in NMDeviceOvs
 

 

 

-nm_client_check_connectivity, function in NMClient
+NMDeviceVxlan:src-port-min, object property in NMDeviceOvs
 

 

 

-nm_client_check_connectivity_async, function in NMClient
+NMDeviceVxlan:tos, object property in NMDeviceOvs
 

 

 

-nm_client_check_connectivity_finish, function in NMClient
+NMDeviceVxlan:ttl, object property in NMDeviceOvs
 

 

 

-NM_CLIENT_CONNECTIONS, macro in NMClient
+NMDeviceWifi, struct in NMDeviceOvs
 

 

 

-NM_CLIENT_CONNECTION_ADDED, macro in NMClient
+NMDeviceWifi::access-point-added, object signal in NMDeviceOvs
 

 

 

-NM_CLIENT_CONNECTION_REMOVED, macro in NMClient
+NMDeviceWifi::access-point-removed, object signal in NMDeviceOvs
 

 

 

-NM_CLIENT_CONNECTIVITY, macro in NMClient
+NMDeviceWifi:access-points, object property in NMDeviceOvs
 

 

 

-NM_CLIENT_CONNECTIVITY_CHECK_AVAILABLE, macro in NMClient
+NMDeviceWifi:active-access-point, object property in NMDeviceOvs
 

 

 

-NM_CLIENT_CONNECTIVITY_CHECK_ENABLED, macro in NMClient
+NMDeviceWifi:bitrate, object property in NMDeviceOvs
 

 

 

-nm_client_connectivity_check_get_available, function in NMClient
+NMDeviceWifi:hw-address, object property in NMDeviceOvs
 

 

 

-nm_client_connectivity_check_get_enabled, function in NMClient
+NMDeviceWifi:last-scan, object property in NMDeviceOvs
 

 

 

-nm_client_connectivity_check_set_enabled, function in NMClient
+NMDeviceWifi:mode, object property in NMDeviceOvs
 

 

 

-nm_client_deactivate_connection, function in NMClient
+NMDeviceWifi:perm-hw-address, object property in NMDeviceOvs
 

 

 

-nm_client_deactivate_connection_async, function in NMClient
+NMDeviceWifi:wireless-capabilities, object property in NMDeviceOvs
 

 

 

-nm_client_deactivate_connection_finish, function in NMClient
+NMDeviceWifiCapabilities, enum in nm-dbus-interface
 

 

 

-NM_CLIENT_DEVICES, macro in NMClient
+NMDeviceWifiP2P, struct in NMDeviceOvs
 

 

 

-NM_CLIENT_DEVICE_ADDED, macro in NMClient
+NMDeviceWifiP2P::peer-added, object signal in NMDeviceOvs
 

 

 

-NM_CLIENT_DEVICE_REMOVED, macro in NMClient
+NMDeviceWifiP2P::peer-removed, object signal in NMDeviceOvs
 

 

 

-NM_CLIENT_DNS_CONFIGURATION, macro in NMClient
+NMDeviceWifiP2P:hw-address, object property in NMDeviceOvs
 

 

 

-NM_CLIENT_DNS_MODE, macro in NMClient
+NMDeviceWifiP2P:peers, object property in NMDeviceOvs
 

 

 

-NM_CLIENT_DNS_RC_MANAGER, macro in NMClient
+NMDeviceWimax, struct in NMDeviceOvs
 

 

 

-NM_CLIENT_ERROR, macro in NMClient
+NMDeviceWimax::nsp-added, object signal in NMDeviceOvs
 

 

 

-nm_client_error_quark, function in NMClient
+NMDeviceWimax::nsp-removed, object signal in NMDeviceOvs
 

 

 

-nm_client_get_activating_connection, function in NMClient
+NMDeviceWimax:active-nsp, object property in NMDeviceOvs
 

 

 

-nm_client_get_active_connections, function in NMClient
+NMDeviceWimax:bsid, object property in NMDeviceOvs
 

 

 

-nm_client_get_all_devices, function in NMClient
+NMDeviceWimax:center-frequency, object property in NMDeviceOvs
 

 

 

-nm_client_get_checkpoints, function in NMClient
+NMDeviceWimax:cinr, object property in NMDeviceOvs
 

 

 

-nm_client_get_connections, function in NMClient
+NMDeviceWimax:hw-address, object property in NMDeviceOvs
 

 

 

-nm_client_get_connection_by_id, function in NMClient
+NMDeviceWimax:nsps, object property in NMDeviceOvs
 

 

 

-nm_client_get_connection_by_path, function in NMClient
+NMDeviceWimax:rssi, object property in NMDeviceOvs
 

 

 

-nm_client_get_connection_by_uuid, function in NMClient
+NMDeviceWimax:tx-power, object property in NMDeviceOvs
 

 

 

-nm_client_get_connectivity, function in NMClient
+NMDeviceWireGuard, struct in NMDeviceOvs
 

 

 

-nm_client_get_devices, function in NMClient
+NMDeviceWireGuard:fwmark, object property in NMDeviceOvs
 

 

 

-nm_client_get_device_by_iface, function in NMClient
+NMDeviceWireGuard:listen-port, object property in NMDeviceOvs
 

 

 

-nm_client_get_device_by_path, function in NMClient
+NMDeviceWireGuard:public-key, object property in NMDeviceOvs
 

 

 

-nm_client_get_dns_configuration, function in NMClient
+NMDeviceWpan, struct in NMDeviceOvs
 

 

 

-nm_client_get_dns_mode, function in NMClient
+NMDeviceWpan:hw-address, object property in NMDeviceOvs
 

 

 

-nm_client_get_dns_rc_manager, function in NMClient
+NMDhcpConfig, struct in NMDeviceOvs
 

 

 

-nm_client_get_logging, function in NMClient
+NMDhcpConfig:family, object property in NMDeviceOvs
 

 

 

-nm_client_get_nm_running, function in NMClient
+NMDhcpConfig:options, object property in NMDeviceOvs
 

 

 

-nm_client_get_permission_result, function in NMClient
+NMIPConfig, struct in NMDeviceOvs
 

 

 

-nm_client_get_primary_connection, function in NMClient
+NMIPConfig:addresses, object property in NMDeviceOvs
 

 

 

-nm_client_get_startup, function in NMClient
+NMIPConfig:domains, object property in NMDeviceOvs
 

 

 

-nm_client_get_state, function in NMClient
+NMIPConfig:family, object property in NMDeviceOvs
 

 

 

-nm_client_get_version, function in NMClient
+NMIPConfig:gateway, object property in NMDeviceOvs
 

 

 

-NM_CLIENT_HOSTNAME, macro in NMClient
+NMIPConfig:nameservers, object property in NMDeviceOvs
 

 

 

-nm_client_load_connections, function in NMClient
+NMIPConfig:routes, object property in NMDeviceOvs
 

 

 

-nm_client_load_connections_async, function in NMClient
+NMIPConfig:searches, object property in NMDeviceOvs
 

 

 

-nm_client_load_connections_finish, function in NMClient
+NMIPConfig:wins-servers, object property in NMDeviceOvs
 

 

 

-NM_CLIENT_METERED, macro in NMClient
+NMIPTunnelFlags, enum in NMSettingIPTunnel
 

 

 

-NM_CLIENT_NETWORKING_ENABLED, macro in NMClient
+NMIPTunnelMode, enum in nm-dbus-interface
 

 

 

-nm_client_networking_get_enabled, function in NMClient
+NMManagerError, enum in nm-errors
 

 

 

-nm_client_networking_set_enabled, function in NMClient
+NMMetered, enum in nm-dbus-interface
 

 

 

-nm_client_new, function in NMClient
+NMObject, struct in NMDeviceOvs
 

 

 

-nm_client_new_async, function in NMClient
+NMObject:dbus-connection, object property in NMDeviceOvs
 

 

 

-nm_client_new_finish, function in NMClient
+NMObject:dbus-object, object property in NMDeviceOvs
 

 

 

-NM_CLIENT_NM_RUNNING, macro in NMClient
+NMObject:dbus-object-manager, object property in NMDeviceOvs
 

 

 

-NM_CLIENT_PERMISSION_CHANGED, macro in NMClient
+NMObject:path, object property in NMDeviceOvs
 

 

 

-NM_CLIENT_PRIMARY_CONNECTION, macro in NMClient
+NMRemoteConnection, struct in NMDeviceOvs
 

 

 

-nm_client_reload_connections, function in NMClient
+NMRemoteConnection:filename, object property in NMDeviceOvs
 

 

 

-nm_client_reload_connections_async, function in NMClient
+NMRemoteConnection:flags, object property in NMDeviceOvs
 

 

 

-nm_client_reload_connections_finish, function in NMClient
+NMRemoteConnection:unsaved, object property in NMDeviceOvs
 

 

 

-nm_client_save_hostname, function in NMClient
+NMRemoteConnection:visible, object property in NMDeviceOvs
 

 

 

-nm_client_save_hostname_async, function in NMClient
+NMRollbackResult, enum in nm-dbus-interface
 

 

 

-nm_client_save_hostname_finish, function in NMClient
+NMSecretAgentCapabilities, enum in nm-dbus-interface
 

 

 

-nm_client_set_logging, function in NMClient
+NMSecretAgentError, enum in nm-errors
 

 

 

-NM_CLIENT_STARTUP, macro in NMClient
+NMSecretAgentGetSecretsFlags, enum in nm-dbus-interface
 

 

 

-NM_CLIENT_STATE, macro in NMClient
+NMSecretAgentOld, struct in NMSecretAgentOld
 

 

 

-NM_CLIENT_VERSION, macro in NMClient
+NMSecretAgentOld:auto-register, object property in NMSecretAgentOld
 

 

 

-NM_CLIENT_WIMAX_ENABLED, macro in NMClient
+NMSecretAgentOld:capabilities, object property in NMSecretAgentOld
 

 

 

-nm_client_wimax_get_enabled, function in NMClient
+NMSecretAgentOld:identifier, object property in NMSecretAgentOld
 

 

 

-NM_CLIENT_WIMAX_HARDWARE_ENABLED, macro in NMClient
+NMSecretAgentOld:registered, object property in NMSecretAgentOld
 

 

 

-nm_client_wimax_hardware_get_enabled, function in NMClient
+NMSecretAgentOldDeleteSecretsFunc, user_function in NMSecretAgentOld
 

 

 

-nm_client_wimax_set_enabled, function in NMClient
+NMSecretAgentOldGetSecretsFunc, user_function in NMSecretAgentOld
 

 

 

-NM_CLIENT_WIRELESS_ENABLED, macro in NMClient
+NMSecretAgentOldSaveSecretsFunc, user_function in NMSecretAgentOld
 

 

 

-nm_client_wireless_get_enabled, function in NMClient
+NMSetting, struct in NMSetting
 

 

 

-NM_CLIENT_WIRELESS_HARDWARE_ENABLED, macro in NMClient
+NMSetting6Lowpan, struct in NMSettingOvs
 

 

 

-nm_client_wireless_hardware_get_enabled, function in NMClient
+NMSetting6Lowpan:parent, object property in NMSettingOvs
 

 

 

-nm_client_wireless_set_enabled, function in NMClient
+NMSetting8021x, struct in NMSetting8021x
 

 

 

-NM_CLIENT_WWAN_ENABLED, macro in NMClient
+NMSetting8021x:altsubject-matches, object property in NMSetting8021x
 

 

 

-nm_client_wwan_get_enabled, function in NMClient
+NMSetting8021x:anonymous-identity, object property in NMSetting8021x
 

 

 

-NM_CLIENT_WWAN_HARDWARE_ENABLED, macro in NMClient
+NMSetting8021x:auth-timeout, object property in NMSetting8021x
 

 

 

-nm_client_wwan_hardware_get_enabled, function in NMClient
+NMSetting8021x:ca-cert, object property in NMSetting8021x
 

 

 

-nm_client_wwan_set_enabled, function in NMClient
+NMSetting8021x:ca-cert-password, object property in NMSetting8021x
 

 

 

-NMConnection, struct in NMSettingOvs
+NMSetting8021x:ca-cert-password-flags, object property in NMSetting8021x
 

 

 

-NMConnection::changed, object signal in NMSettingOvs
+NMSetting8021x:ca-path, object property in NMSetting8021x
+

+

+

+NMSetting8021x:client-cert, object property in NMSetting8021x
+

+

+

+NMSetting8021x:client-cert-password, object property in NMSetting8021x
+

+

+

+NMSetting8021x:client-cert-password-flags, object property in NMSetting8021x
+

+

+

+NMSetting8021x:domain-suffix-match, object property in NMSetting8021x
+

+

+

+NMSetting8021x:eap, object property in NMSetting8021x
 

 

 

-NMConnection::secrets-cleared, object signal in NMSettingOvs
+NMSetting8021x:identity, object property in NMSetting8021x
 

 

 

-NMConnection::secrets-updated, object signal in NMSettingOvs
+NMSetting8021x:pac-file, object property in NMSetting8021x
 

 

 

-NMConnectionError, enum in nm-errors
+NMSetting8021x:password, object property in NMSetting8021x
 

 

 

-NMConnectionInterface, struct in NMConnection
+NMSetting8021x:password-flags, object property in NMSetting8021x
 

 

 

-NMConnectionMultiConnect, enum in nm-dbus-interface
+NMSetting8021x:password-raw, object property in NMSetting8021x
 

 

 

-NMConnectionSerializationFlags, enum in NMConnection
+NMSetting8021x:password-raw-flags, object property in NMSetting8021x
 

 

 

-nm_connection_add_setting, function in NMConnection
+NMSetting8021x:phase1-auth-flags, object property in NMSetting8021x
 

 

 

-NM_CONNECTION_CHANGED, macro in NMConnection
+NMSetting8021x:phase1-fast-provisioning, object property in NMSetting8021x
 

 

 

-nm_connection_clear_secrets, function in NMConnection
+NMSetting8021x:phase1-peaplabel, object property in NMSetting8021x
 

 

 

-nm_connection_clear_secrets_with_flags, function in NMConnection
+NMSetting8021x:phase1-peapver, object property in NMSetting8021x
 

 

 

-nm_connection_clear_settings, function in NMConnection
+NMSetting8021x:phase2-altsubject-matches, object property in NMSetting8021x
 

 

 

-nm_connection_compare, function in NMConnection
+NMSetting8021x:phase2-auth, object property in NMSetting8021x
 

 

 

-nm_connection_diff, function in NMConnection
+NMSetting8021x:phase2-autheap, object property in NMSetting8021x
 

 

 

-nm_connection_dump, function in NMConnection
+NMSetting8021x:phase2-ca-cert, object property in NMSetting8021x
 

 

 

-NM_CONNECTION_ERROR, macro in nm-errors
+NMSetting8021x:phase2-ca-cert-password, object property in NMSetting8021x
 

 

 

-nm_connection_error_quark, function in nm-errors
+NMSetting8021x:phase2-ca-cert-password-flags, object property in NMSetting8021x
 

 

 

-nm_connection_for_each_setting_value, function in NMConnection
+NMSetting8021x:phase2-ca-path, object property in NMSetting8021x
 

 

 

-nm_connection_get_connection_type, function in NMConnection
+NMSetting8021x:phase2-client-cert, object property in NMSetting8021x
 

 

 

-nm_connection_get_id, function in NMConnection
+NMSetting8021x:phase2-client-cert-password, object property in NMSetting8021x
 

 

 

-nm_connection_get_interface_name, function in NMConnection
+NMSetting8021x:phase2-client-cert-password-flags, object property in NMSetting8021x
 

 

 

-nm_connection_get_path, function in NMConnection
+NMSetting8021x:phase2-domain-suffix-match, object property in NMSetting8021x
 

 

 

-nm_connection_get_setting, function in NMConnection
+NMSetting8021x:phase2-private-key, object property in NMSetting8021x
 

 

 

-nm_connection_get_settings, function in NMConnection
+NMSetting8021x:phase2-private-key-password, object property in NMSetting8021x
 

 

 

-nm_connection_get_setting_802_1x, function in NMConnection
+NMSetting8021x:phase2-private-key-password-flags, object property in NMSetting8021x
 

 

 

-nm_connection_get_setting_adsl, function in NMConnection
+NMSetting8021x:phase2-subject-match, object property in NMSetting8021x
 

 

 

-nm_connection_get_setting_bluetooth, function in NMConnection
+NMSetting8021x:pin, object property in NMSetting8021x
 

 

 

-nm_connection_get_setting_bond, function in NMConnection
+NMSetting8021x:pin-flags, object property in NMSetting8021x
 

 

 

-nm_connection_get_setting_bridge, function in NMConnection
+NMSetting8021x:private-key, object property in NMSetting8021x
 

 

 

-nm_connection_get_setting_bridge_port, function in NMConnection
+NMSetting8021x:private-key-password, object property in NMSetting8021x
 

 

 

-nm_connection_get_setting_by_name, function in NMConnection
+NMSetting8021x:private-key-password-flags, object property in NMSetting8021x
 

 

 

-nm_connection_get_setting_cdma, function in NMConnection
+NMSetting8021x:subject-match, object property in NMSetting8021x
 

 

 

-nm_connection_get_setting_connection, function in NMConnection
+NMSetting8021x:system-ca-certs, object property in NMSetting8021x
 

 

 

-nm_connection_get_setting_dcb, function in NMConnection
+NMSetting8021xAuthFlags, enum in NMSetting8021x
 

 

 

-nm_connection_get_setting_dummy, function in NMConnection
+NMSetting8021xCKFormat, enum in NMSetting8021x
 

 

 

-nm_connection_get_setting_generic, function in NMConnection
+NMSetting8021xCKScheme, enum in NMSetting8021x
 

 

 

-nm_connection_get_setting_gsm, function in NMConnection
+NMSetting:name, object property in NMSetting
 

 

 

-nm_connection_get_setting_infiniband, function in NMConnection
+NMSettingAdsl, struct in NMSettingAdsl
 

 

 

-nm_connection_get_setting_ip4_config, function in NMConnection
+NMSettingAdsl:encapsulation, object property in NMSettingAdsl
 

 

 

-nm_connection_get_setting_ip6_config, function in NMConnection
+NMSettingAdsl:password, object property in NMSettingAdsl
 

 

 

-nm_connection_get_setting_ip_tunnel, function in NMConnection
+NMSettingAdsl:password-flags, object property in NMSettingAdsl
 

 

 

-nm_connection_get_setting_macsec, function in NMConnection
+NMSettingAdsl:protocol, object property in NMSettingAdsl
 

 

 

-nm_connection_get_setting_macvlan, function in NMConnection
+NMSettingAdsl:username, object property in NMSettingAdsl
 

 

 

-nm_connection_get_setting_olpc_mesh, function in NMConnection
+NMSettingAdsl:vci, object property in NMSettingAdsl
 

 

 

-nm_connection_get_setting_ovs_bridge, function in NMConnection
+NMSettingAdsl:vpi, object property in NMSettingAdsl
 

 

 

-nm_connection_get_setting_ovs_interface, function in NMConnection
+NMSettingBluetooth, struct in NMSettingBluetooth
 

 

 

-nm_connection_get_setting_ovs_patch, function in NMConnection
+NMSettingBluetooth:bdaddr, object property in NMSettingBluetooth
 

 

 

-nm_connection_get_setting_ovs_port, function in NMConnection
+NMSettingBluetooth:type, object property in NMSettingBluetooth
 

 

 

-nm_connection_get_setting_ppp, function in NMConnection
+NMSettingBond, struct in NMSettingBond
 

 

 

-nm_connection_get_setting_pppoe, function in NMConnection
+NMSettingBond:options, object property in NMSettingBond
 

 

 

-nm_connection_get_setting_proxy, function in NMConnection
+NMSettingBridge, struct in NMSettingBridge
 

 

 

-nm_connection_get_setting_serial, function in NMConnection
+NMSettingBridge:ageing-time, object property in NMSettingBridge
 

 

 

-nm_connection_get_setting_tc_config, function in NMConnection
+NMSettingBridge:forward-delay, object property in NMSettingBridge
 

 

 

-nm_connection_get_setting_team, function in NMConnection
+NMSettingBridge:group-forward-mask, object property in NMSettingBridge
 

 

 

-nm_connection_get_setting_team_port, function in NMConnection
+NMSettingBridge:hello-time, object property in NMSettingBridge
 

 

 

-nm_connection_get_setting_tun, function in NMConnection
+NMSettingBridge:mac-address, object property in NMSettingBridge
 

 

 

-nm_connection_get_setting_vlan, function in NMConnection
+NMSettingBridge:max-age, object property in NMSettingBridge
 

 

 

-nm_connection_get_setting_vpn, function in NMConnection
+NMSettingBridge:multicast-snooping, object property in NMSettingBridge
 

 

 

-nm_connection_get_setting_vxlan, function in NMConnection
+NMSettingBridge:priority, object property in NMSettingBridge
 

 

 

-nm_connection_get_setting_wimax, function in NMConnection
+NMSettingBridge:stp, object property in NMSettingBridge
 

 

 

-nm_connection_get_setting_wired, function in NMConnection
+NMSettingBridgePort, struct in NMSettingBridgePort
 

 

 

-nm_connection_get_setting_wireless, function in NMConnection
+NMSettingBridgePort:hairpin-mode, object property in NMSettingBridgePort
 

 

 

-nm_connection_get_setting_wireless_security, function in NMConnection
+NMSettingBridgePort:path-cost, object property in NMSettingBridgePort
 

 

 

-nm_connection_get_uuid, function in NMConnection
+NMSettingBridgePort:priority, object property in NMSettingBridgePort
 

 

 

-nm_connection_get_virtual_device_description, function in NMConnection
+NMSettingCdma, struct in NMSettingCdma
 

 

 

-nm_connection_is_type, function in NMConnection
+NMSettingCdma:mtu, object property in NMSettingCdma
 

 

 

-nm_connection_is_virtual, function in NMConnection
+NMSettingCdma:number, object property in NMSettingCdma
 

 

 

-nm_connection_need_secrets, function in NMConnection
+NMSettingCdma:password, object property in NMSettingCdma
 

 

 

-nm_connection_normalize, function in NMConnection
+NMSettingCdma:password-flags, object property in NMSettingCdma
 

 

 

-NM_CONNECTION_NORMALIZE_PARAM_IP6_CONFIG_METHOD, macro in NMConnection
+NMSettingCdma:username, object property in NMSettingCdma
 

 

 

-nm_connection_remove_setting, function in NMConnection
+NMSettingClearSecretsWithFlagsFn, user_function in NMSetting
 

 

 

-nm_connection_replace_settings, function in NMConnection
+NMSettingCompareFlags, enum in NMSetting
 

 

 

-nm_connection_replace_settings_from_connection, function in NMConnection
+NMSettingConnection, struct in NMSettingConnection
 

 

 

-NM_CONNECTION_SECRETS_CLEARED, macro in NMConnection
+NMSettingConnection:auth-retries, object property in NMSettingConnection
 

 

 

-NM_CONNECTION_SECRETS_UPDATED, macro in NMConnection
+NMSettingConnection:autoconnect, object property in NMSettingConnection
 

 

 

-nm_connection_set_path, function in NMConnection
+NMSettingConnection:autoconnect-priority, object property in NMSettingConnection
 

 

 

-nm_connection_to_dbus, function in NMConnection
+NMSettingConnection:autoconnect-retries, object property in NMSettingConnection
 

 

 

-nm_connection_update_secrets, function in NMConnection
+NMSettingConnection:autoconnect-slaves, object property in NMSettingConnection
 

 

 

-nm_connection_verify, function in NMConnection
+NMSettingConnection:gateway-ping-timeout, object property in NMSettingConnection
 

 

 

-nm_connection_verify_secrets, function in NMConnection
+NMSettingConnection:id, object property in NMSettingConnection
 

 

 

-NMConnectivityState, enum in nm-dbus-interface
+NMSettingConnection:interface-name, object property in NMSettingConnection
 

 

 

-NMCryptoError, enum in nm-errors
+NMSettingConnection:lldp, object property in NMSettingConnection
 

 

 

-NM_CRYPTO_ERROR, macro in nm-errors
+NMSettingConnection:llmnr, object property in NMSettingConnection
 

 

 

-nm_crypto_error_quark, function in nm-errors
+NMSettingConnection:master, object property in NMSettingConnection
 

 

-
D

 

-NM_DBUS_INTERFACE, macro in nm-dbus-interface
+NMSettingConnection:mdns, object property in NMSettingConnection
 

 

 

-NM_DBUS_INTERFACE_ACCESS_POINT, macro in nm-dbus-interface
+NMSettingConnection:metered, object property in NMSettingConnection
 

 

 

-NM_DBUS_INTERFACE_ACTIVE_CONNECTION, macro in nm-dbus-interface
+NMSettingConnection:multi-connect, object property in NMSettingConnection
 

 

 

-NM_DBUS_INTERFACE_AGENT_MANAGER, macro in nm-dbus-interface
+NMSettingConnection:permissions, object property in NMSettingConnection
 

 

 

-NM_DBUS_INTERFACE_CHECKPOINT, macro in nm-dbus-interface
+NMSettingConnection:read-only, object property in NMSettingConnection
 

 

 

-NM_DBUS_INTERFACE_DEVICE, macro in nm-dbus-interface
+NMSettingConnection:secondaries, object property in NMSettingConnection
 

 

 

-NM_DBUS_INTERFACE_DEVICE_6LOWPAN, macro in nm-dbus-interface
+NMSettingConnection:slave-type, object property in NMSettingConnection
 

 

 

-NM_DBUS_INTERFACE_DEVICE_ADSL, macro in nm-dbus-interface
+NMSettingConnection:stable-id, object property in NMSettingConnection
 

 

 

-NM_DBUS_INTERFACE_DEVICE_BLUETOOTH, macro in nm-dbus-interface
+NMSettingConnection:timestamp, object property in NMSettingConnection
 

 

 

-NM_DBUS_INTERFACE_DEVICE_BOND, macro in nm-dbus-interface
+NMSettingConnection:type, object property in NMSettingConnection
 

 

 

-NM_DBUS_INTERFACE_DEVICE_BRIDGE, macro in nm-dbus-interface
+NMSettingConnection:uuid, object property in NMSettingConnection
 

 

 

-NM_DBUS_INTERFACE_DEVICE_DUMMY, macro in nm-dbus-interface
+NMSettingConnection:zone, object property in NMSettingConnection
 

 

 

-NM_DBUS_INTERFACE_DEVICE_GENERIC, macro in nm-dbus-interface
+NMSettingConnectionAutoconnectSlaves, enum in NMSettingConnection
 

 

 

-NM_DBUS_INTERFACE_DEVICE_GRE, macro in nm-dbus-interface
+NMSettingConnectionLldp, enum in NMSettingConnection
 

 

 

-NM_DBUS_INTERFACE_DEVICE_INFINIBAND, macro in nm-dbus-interface
+NMSettingConnectionLlmnr, enum in NMSettingConnection
 

 

 

-NM_DBUS_INTERFACE_DEVICE_IP_TUNNEL, macro in nm-dbus-interface
+NMSettingConnectionMdns, enum in NMSettingConnection
 

 

 

-NM_DBUS_INTERFACE_DEVICE_MACSEC, macro in nm-dbus-interface
+NMSettingDcb, struct in NMSettingDcb
 

 

 

-NM_DBUS_INTERFACE_DEVICE_MACVLAN, macro in nm-dbus-interface
+NMSettingDcb:app-fcoe-flags, object property in NMSettingDcb
 

 

 

-NM_DBUS_INTERFACE_DEVICE_MODEM, macro in nm-dbus-interface
+NMSettingDcb:app-fcoe-mode, object property in NMSettingDcb
 

 

 

-NM_DBUS_INTERFACE_DEVICE_OLPC_MESH, macro in nm-dbus-interface
+NMSettingDcb:app-fcoe-priority, object property in NMSettingDcb
 

 

 

-NM_DBUS_INTERFACE_DEVICE_OVS_BRIDGE, macro in nm-dbus-interface
+NMSettingDcb:app-fip-flags, object property in NMSettingDcb
 

 

 

-NM_DBUS_INTERFACE_DEVICE_OVS_INTERFACE, macro in nm-dbus-interface
+NMSettingDcb:app-fip-priority, object property in NMSettingDcb
 

 

 

-NM_DBUS_INTERFACE_DEVICE_OVS_PORT, macro in nm-dbus-interface
+NMSettingDcb:app-iscsi-flags, object property in NMSettingDcb
 

 

 

-NM_DBUS_INTERFACE_DEVICE_PPP, macro in nm-dbus-interface
+NMSettingDcb:app-iscsi-priority, object property in NMSettingDcb
 

 

 

-NM_DBUS_INTERFACE_DEVICE_STATISTICS, macro in nm-dbus-interface
+NMSettingDcb:priority-bandwidth, object property in NMSettingDcb
 

 

 

-NM_DBUS_INTERFACE_DEVICE_TEAM, macro in nm-dbus-interface
+NMSettingDcb:priority-flow-control, object property in NMSettingDcb
 

 

 

-NM_DBUS_INTERFACE_DEVICE_TUN, macro in nm-dbus-interface
+NMSettingDcb:priority-flow-control-flags, object property in NMSettingDcb
 

 

 

-NM_DBUS_INTERFACE_DEVICE_VETH, macro in nm-dbus-interface
+NMSettingDcb:priority-group-bandwidth, object property in NMSettingDcb
 

 

 

-NM_DBUS_INTERFACE_DEVICE_VLAN, macro in nm-dbus-interface
+NMSettingDcb:priority-group-flags, object property in NMSettingDcb
 

 

 

-NM_DBUS_INTERFACE_DEVICE_VXLAN, macro in nm-dbus-interface
+NMSettingDcb:priority-group-id, object property in NMSettingDcb
 

 

 

-NM_DBUS_INTERFACE_DEVICE_WIMAX, macro in nm-dbus-interface
+NMSettingDcb:priority-strict-bandwidth, object property in NMSettingDcb
 

 

 

-NM_DBUS_INTERFACE_DEVICE_WIRED, macro in nm-dbus-interface
+NMSettingDcb:priority-traffic-class, object property in NMSettingDcb
 

 

 

-NM_DBUS_INTERFACE_DEVICE_WIREGUARD, macro in nm-dbus-interface
+NMSettingDcbFlags, enum in NMSettingDcb
 

 

 

-NM_DBUS_INTERFACE_DEVICE_WIRELESS, macro in nm-dbus-interface
+NMSettingDiffResult, enum in NMSetting
 

 

 

-NM_DBUS_INTERFACE_DEVICE_WPAN, macro in nm-dbus-interface
+NMSettingDummy, struct in NMSettingDummy
 

 

 

-NM_DBUS_INTERFACE_DHCP4_CONFIG, macro in nm-dbus-interface
+NMSettingEthtool, struct in NMSettingOvs
 

 

 

-NM_DBUS_INTERFACE_DHCP6_CONFIG, macro in nm-dbus-interface
+NMSettingGeneric, struct in NMSettingGeneric
 

 

 

-NM_DBUS_INTERFACE_DNS_MANAGER, macro in nm-dbus-interface
+NMSettingGsm, struct in NMSettingGsm
 

 

 

-NM_DBUS_INTERFACE_IP4_CONFIG, macro in nm-dbus-interface
+NMSettingGsm:apn, object property in NMSettingGsm
 

 

 

-NM_DBUS_INTERFACE_IP6_CONFIG, macro in nm-dbus-interface
+NMSettingGsm:device-id, object property in NMSettingGsm
 

 

 

-NM_DBUS_INTERFACE_SECRET_AGENT, macro in nm-dbus-interface
+NMSettingGsm:home-only, object property in NMSettingGsm
 

 

 

-NM_DBUS_INTERFACE_SETTINGS, macro in nm-dbus-interface
+NMSettingGsm:mtu, object property in NMSettingGsm
 

 

 

-NM_DBUS_INTERFACE_SETTINGS_CONNECTION, macro in nm-dbus-interface
+NMSettingGsm:network-id, object property in NMSettingGsm
 

 

 

-NM_DBUS_INTERFACE_SETTINGS_CONNECTION_SECRETS, macro in nm-dbus-interface
+NMSettingGsm:number, object property in NMSettingGsm
 

 

 

-NM_DBUS_INTERFACE_VPN, macro in nm-vpn-dbus-interface
+NMSettingGsm:password, object property in NMSettingGsm
 

 

 

-NM_DBUS_INTERFACE_VPN_CONNECTION, macro in nm-vpn-dbus-interface
+NMSettingGsm:password-flags, object property in NMSettingGsm
 

 

 

-NM_DBUS_INTERFACE_WIMAX_NSP, macro in nm-dbus-interface
+NMSettingGsm:pin, object property in NMSettingGsm
 

 

 

-NM_DBUS_INVALID_VPN_CONNECTION, macro in nm-vpn-dbus-interface
+NMSettingGsm:pin-flags, object property in NMSettingGsm
 

 

 

-NM_DBUS_NO_ACTIVE_VPN_CONNECTION, macro in nm-vpn-dbus-interface
+NMSettingGsm:sim-id, object property in NMSettingGsm
 

 

 

-NM_DBUS_NO_VPN_CONNECTIONS, macro in nm-vpn-dbus-interface
+NMSettingGsm:sim-operator-id, object property in NMSettingGsm
 

 

 

-NM_DBUS_PATH, macro in nm-dbus-interface
+NMSettingGsm:username, object property in NMSettingGsm
 

 

 

-NM_DBUS_PATH_ACCESS_POINT, macro in nm-dbus-interface
+NMSettingInfiniband, struct in NMSettingInfiniband
 

 

 

-NM_DBUS_PATH_AGENT_MANAGER, macro in nm-dbus-interface
+NMSettingInfiniband:mac-address, object property in NMSettingInfiniband
 

 

 

-NM_DBUS_PATH_DNS_MANAGER, macro in nm-dbus-interface
+NMSettingInfiniband:mtu, object property in NMSettingInfiniband
 

 

 

-NM_DBUS_PATH_SECRET_AGENT, macro in nm-dbus-interface
+NMSettingInfiniband:p-key, object property in NMSettingInfiniband
 

 

 

-NM_DBUS_PATH_SETTINGS, macro in nm-dbus-interface
+NMSettingInfiniband:parent, object property in NMSettingInfiniband
 

 

 

-NM_DBUS_PATH_SETTINGS_CONNECTION, macro in nm-dbus-interface
+NMSettingInfiniband:transport-mode, object property in NMSettingInfiniband
 

 

 

-NM_DBUS_PATH_VPN, macro in nm-vpn-dbus-interface
+NMSettingIP4Config, struct in NMSettingIP4Config
 

 

 

-NM_DBUS_PATH_VPN_CONNECTION, macro in nm-vpn-dbus-interface
+NMSettingIP4Config:dhcp-client-id, object property in NMSettingIP4Config
 

 

 

-NM_DBUS_PATH_WIMAX_NSP, macro in nm-dbus-interface
+NMSettingIP4Config:dhcp-fqdn, object property in NMSettingIP4Config
 

 

 

-NM_DBUS_SERVICE, macro in nm-dbus-interface
+NMSettingIP6Config, struct in NMSettingIP6Config
 

 

 

-NM_DBUS_VPN_ALREADY_STARTED, macro in nm-vpn-dbus-interface
+NMSettingIP6Config:addr-gen-mode, object property in NMSettingIP6Config
 

 

 

-NM_DBUS_VPN_ALREADY_STOPPED, macro in nm-vpn-dbus-interface
+NMSettingIP6Config:dhcp-duid, object property in NMSettingIP6Config
 

 

 

-NM_DBUS_VPN_BAD_ARGUMENTS, macro in nm-vpn-dbus-interface
+NMSettingIP6Config:ip6-privacy, object property in NMSettingIP6Config
 

 

 

-NM_DBUS_VPN_ERROR_PREFIX, macro in nm-vpn-dbus-interface
+NMSettingIP6Config:token, object property in NMSettingIP6Config
 

 

 

-NM_DBUS_VPN_INTERACTIVE_NOT_SUPPORTED, macro in nm-vpn-dbus-interface
+NMSettingIP6ConfigAddrGenMode, enum in NMSettingIP6Config
 

 

 

-NM_DBUS_VPN_SIGNAL_CONNECT_FAILED, macro in nm-vpn-dbus-interface
+NMSettingIP6ConfigPrivacy, enum in NMSettingIP6Config
 

 

 

-NM_DBUS_VPN_SIGNAL_IP4_CONFIG, macro in nm-vpn-dbus-interface
+NMSettingIPConfig, struct in NMSettingIPConfig
 

 

 

-NM_DBUS_VPN_SIGNAL_IP_CONFIG_BAD, macro in nm-vpn-dbus-interface
+NMSettingIPConfig:addresses, object property in NMSettingIPConfig
 

 

 

-NM_DBUS_VPN_SIGNAL_LAUNCH_FAILED, macro in nm-vpn-dbus-interface
+NMSettingIPConfig:dad-timeout, object property in NMSettingIPConfig
 

 

 

-NM_DBUS_VPN_SIGNAL_LOGIN_BANNER, macro in nm-vpn-dbus-interface
+NMSettingIPConfig:dhcp-hostname, object property in NMSettingIPConfig
 

 

 

-NM_DBUS_VPN_SIGNAL_LOGIN_FAILED, macro in nm-vpn-dbus-interface
+NMSettingIPConfig:dhcp-send-hostname, object property in NMSettingIPConfig
 

 

 

-NM_DBUS_VPN_SIGNAL_STATE_CHANGE, macro in nm-vpn-dbus-interface
+NMSettingIPConfig:dhcp-timeout, object property in NMSettingIPConfig
 

 

 

-NM_DBUS_VPN_SIGNAL_VPN_CONFIG_BAD, macro in nm-vpn-dbus-interface
+NMSettingIPConfig:dns, object property in NMSettingIPConfig
 

 

 

-NM_DBUS_VPN_STARTING_IN_PROGRESS, macro in nm-vpn-dbus-interface
+NMSettingIPConfig:dns-options, object property in NMSettingIPConfig
 

 

 

-NM_DBUS_VPN_STOPPING_IN_PROGRESS, macro in nm-vpn-dbus-interface
+NMSettingIPConfig:dns-priority, object property in NMSettingIPConfig
 

 

 

-NM_DBUS_VPN_WRONG_STATE, macro in nm-vpn-dbus-interface
+NMSettingIPConfig:dns-search, object property in NMSettingIPConfig
 

 

 

-NM_DEPRECATED_IN_0_9_10, macro in nm-version
+NMSettingIPConfig:gateway, object property in NMSettingIPConfig
 

 

 

-NM_DEPRECATED_IN_0_9_10_FOR, macro in nm-version
+NMSettingIPConfig:ignore-auto-dns, object property in NMSettingIPConfig
 

 

 

-NM_DEPRECATED_IN_1_0, macro in nm-version
+NMSettingIPConfig:ignore-auto-routes, object property in NMSettingIPConfig
 

 

 

-NM_DEPRECATED_IN_1_0_FOR, macro in nm-version
+NMSettingIPConfig:may-fail, object property in NMSettingIPConfig
 

 

 

-NM_DEPRECATED_IN_1_10, macro in nm-version
+NMSettingIPConfig:method, object property in NMSettingIPConfig
 

 

 

-NM_DEPRECATED_IN_1_10_FOR, macro in nm-version
+NMSettingIPConfig:never-default, object property in NMSettingIPConfig
 

 

 

-NM_DEPRECATED_IN_1_12, macro in nm-version
+NMSettingIPConfig:route-metric, object property in NMSettingIPConfig
 

 

 

-NM_DEPRECATED_IN_1_12_FOR, macro in nm-version
+NMSettingIPConfig:route-table, object property in NMSettingIPConfig
 

 

 

-NM_DEPRECATED_IN_1_14, macro in nm-version
+NMSettingIPConfig:routes, object property in NMSettingIPConfig
 

 

 

-NM_DEPRECATED_IN_1_14_FOR, macro in nm-version
+NMSettingIPTunnel, struct in NMSettingIPTunnel
 

 

 

-NM_DEPRECATED_IN_1_2, macro in nm-version
+NMSettingIPTunnel:encapsulation-limit, object property in NMSettingIPTunnel
 

 

 

-NM_DEPRECATED_IN_1_2_FOR, macro in nm-version
+NMSettingIPTunnel:flags, object property in NMSettingIPTunnel
 

 

 

-NM_DEPRECATED_IN_1_4, macro in nm-version
+NMSettingIPTunnel:flow-label, object property in NMSettingIPTunnel
 

 

 

-NM_DEPRECATED_IN_1_4_FOR, macro in nm-version
+NMSettingIPTunnel:input-key, object property in NMSettingIPTunnel
 

 

 

-NM_DEPRECATED_IN_1_6, macro in nm-version
+NMSettingIPTunnel:local, object property in NMSettingIPTunnel
 

 

 

-NM_DEPRECATED_IN_1_6_FOR, macro in nm-version
+NMSettingIPTunnel:mode, object property in NMSettingIPTunnel
 

 

 

-NM_DEPRECATED_IN_1_8, macro in nm-version
+NMSettingIPTunnel:mtu, object property in NMSettingIPTunnel
 

 

 

-NM_DEPRECATED_IN_1_8_FOR, macro in nm-vpn-dbus-interface
+NMSettingIPTunnel:output-key, object property in NMSettingIPTunnel
 

 

 

-NMDevice, struct in NMDeviceOvs
+NMSettingIPTunnel:parent, object property in NMSettingIPTunnel
 

 

 

-NMDevice6Lowpan, struct in NMDeviceOvs
+NMSettingIPTunnel:path-mtu-discovery, object property in NMSettingIPTunnel
 

 

 

-NMDevice6Lowpan:hw-address, object property in NMDeviceOvs
+NMSettingIPTunnel:remote, object property in NMSettingIPTunnel
 

 

 

-NMDevice6Lowpan:parent, object property in NMDeviceOvs
+NMSettingIPTunnel:tos, object property in NMSettingIPTunnel
 

 

 

-NMDevice::state-changed, object signal in NMDeviceOvs
+NMSettingIPTunnel:ttl, object property in NMSettingIPTunnel
 

 

 

-NMDevice:active-connection, object property in NMDeviceOvs
+NMSettingMacRandomization, enum in NMSetting
 

 

 

-NMDevice:autoconnect, object property in NMDeviceOvs
+NMSettingMacsec, struct in NMSettingMacsec
 

 

 

-NMDevice:available-connections, object property in NMDeviceOvs
+NMSettingMacsec:encrypt, object property in NMSettingMacsec
 

 

 

-NMDevice:capabilities, object property in NMDeviceOvs
+NMSettingMacsec:mka-cak, object property in NMSettingMacsec
 

 

 

-NMDevice:device-type, object property in NMDeviceOvs
+NMSettingMacsec:mka-cak-flags, object property in NMSettingMacsec
 

 

 

-NMDevice:dhcp4-config, object property in NMDeviceOvs
+NMSettingMacsec:mka-ckn, object property in NMSettingMacsec
 

 

 

-NMDevice:dhcp6-config, object property in NMDeviceOvs
+NMSettingMacsec:mode, object property in NMSettingMacsec
 

 

 

-NMDevice:driver, object property in NMDeviceOvs
+NMSettingMacsec:parent, object property in NMSettingMacsec
 

 

 

-NMDevice:driver-version, object property in NMDeviceOvs
+NMSettingMacsec:port, object property in NMSettingMacsec
 

 

 

-NMDevice:firmware-missing, object property in NMDeviceOvs
+NMSettingMacsec:send-sci, object property in NMSettingMacsec
 

 

 

-NMDevice:firmware-version, object property in NMDeviceOvs
+NMSettingMacsec:validation, object property in NMSettingMacsec
 

 

 

-NMDevice:interface, object property in NMDeviceOvs
+NMSettingMacsecMode, enum in NMSettingMacsec
 

 

 

-NMDevice:ip-interface, object property in NMDeviceOvs
+NMSettingMacsecValidation, enum in NMSettingMacsec
 

 

 

-NMDevice:ip4-config, object property in NMDeviceOvs
+NMSettingMacvlan, struct in NMSettingMacvlan
 

 

 

-NMDevice:ip6-config, object property in NMDeviceOvs
+NMSettingMacvlan:mode, object property in NMSettingMacvlan
 

 

 

-NMDevice:lldp-neighbors, object property in NMDeviceOvs
+NMSettingMacvlan:parent, object property in NMSettingMacvlan
 

 

 

-NMDevice:managed, object property in NMDeviceOvs
+NMSettingMacvlan:promiscuous, object property in NMSettingMacvlan
 

 

 

-NMDevice:metered, object property in NMDeviceOvs
+NMSettingMacvlan:tap, object property in NMSettingMacvlan
 

 

 

-NMDevice:mtu, object property in NMDeviceOvs
+NMSettingMacvlanMode, enum in NMSettingMacvlan
 

 

 

-NMDevice:nm-plugin-missing, object property in NMDeviceOvs
+NMSettingMatch, struct in NMSettingOvs
 

 

 

-NMDevice:physical-port-id, object property in NMDeviceOvs
+NMSettingMatch:interface-name, object property in NMSettingOvs
 

 

 

-NMDevice:product, object property in NMDeviceOvs
+NMSettingOlpcMesh, struct in NMSettingOlpcMesh
 

 

 

-NMDevice:real, object property in NMDeviceOvs
+NMSettingOlpcMesh:channel, object property in NMSettingOlpcMesh
 

 

 

-NMDevice:state, object property in NMDeviceOvs
+NMSettingOlpcMesh:dhcp-anycast-address, object property in NMSettingOlpcMesh
 

 

 

-NMDevice:state-reason, object property in NMDeviceOvs
+NMSettingOlpcMesh:ssid, object property in NMSettingOlpcMesh
 

 

 

-NMDevice:udi, object property in NMDeviceOvs
+NMSettingOvsBridge, struct in NMSettingOvs
 

 

 

-NMDevice:vendor, object property in NMDeviceOvs
+NMSettingOvsBridge:fail-mode, object property in NMSettingOvs
 

 

 

-NMDeviceAdsl, struct in NMDeviceOvs
+NMSettingOvsBridge:mcast-snooping-enable, object property in NMSettingOvs
 

 

 

-NMDeviceAdsl:carrier, object property in NMDeviceOvs
+NMSettingOvsBridge:rstp-enable, object property in NMSettingOvs
 

 

 

-NMDeviceBond, struct in NMDeviceOvs
+NMSettingOvsBridge:stp-enable, object property in NMSettingOvs
 

 

 

-NMDeviceBond:carrier, object property in NMDeviceOvs
+NMSettingOvsInterface, struct in NMSettingOvs
 

 

 

-NMDeviceBond:hw-address, object property in NMDeviceOvs
+NMSettingOvsInterface:type, object property in NMSettingOvs
 

 

 

-NMDeviceBond:slaves, object property in NMDeviceOvs
+NMSettingOvsPatch, struct in NMSettingOvs
 

 

 

-NMDeviceBridge, struct in NMDeviceOvs
+NMSettingOvsPatch:peer, object property in NMSettingOvs
 

 

 

-NMDeviceBridge:carrier, object property in NMDeviceOvs
+NMSettingOvsPort, struct in NMSettingOvs
 

 

 

-NMDeviceBridge:hw-address, object property in NMDeviceOvs
+NMSettingOvsPort:bond-downdelay, object property in NMSettingOvs
 

 

 

-NMDeviceBridge:slaves, object property in NMDeviceOvs
+NMSettingOvsPort:bond-mode, object property in NMSettingOvs
 

 

 

-NMDeviceBt, struct in NMDeviceOvs
+NMSettingOvsPort:bond-updelay, object property in NMSettingOvs
 

 

 

-NMDeviceBt:bt-capabilities, object property in NMDeviceOvs
+NMSettingOvsPort:lacp, object property in NMSettingOvs
 

 

 

-NMDeviceBt:hw-address, object property in NMDeviceOvs
+NMSettingOvsPort:tag, object property in NMSettingOvs
 

 

 

-NMDeviceBt:name, object property in NMDeviceOvs
+NMSettingOvsPort:vlan-mode, object property in NMSettingOvs
 

 

 

-NMDeviceCapabilities, enum in nm-dbus-interface
+NMSettingPpp, struct in NMSettingPpp
 

 

 

-NMDeviceDummy, struct in NMDeviceOvs
+NMSettingPpp:baud, object property in NMSettingPpp
 

 

 

-NMDeviceDummy:hw-address, object property in NMDeviceOvs
+NMSettingPpp:crtscts, object property in NMSettingPpp
 

 

 

-NMDeviceError, enum in nm-errors
+NMSettingPpp:lcp-echo-failure, object property in NMSettingPpp
 

 

 

-NMDeviceEthernet, struct in NMDeviceOvs
+NMSettingPpp:lcp-echo-interval, object property in NMSettingPpp
 

 

 

-NMDeviceEthernet:carrier, object property in NMDeviceOvs
+NMSettingPpp:mppe-stateful, object property in NMSettingPpp
 

 

 

-NMDeviceEthernet:hw-address, object property in NMDeviceOvs
+NMSettingPpp:mru, object property in NMSettingPpp
 

 

 

-NMDeviceEthernet:perm-hw-address, object property in NMDeviceOvs
+NMSettingPpp:mtu, object property in NMSettingPpp
 

 

 

-NMDeviceEthernet:s390-subchannels, object property in NMDeviceOvs
+NMSettingPpp:no-vj-comp, object property in NMSettingPpp
 

 

 

-NMDeviceEthernet:speed, object property in NMDeviceOvs
+NMSettingPpp:noauth, object property in NMSettingPpp
 

 

 

-NMDeviceGeneric, struct in NMDeviceOvs
+NMSettingPpp:nobsdcomp, object property in NMSettingPpp
 

 

 

-NMDeviceGeneric:hw-address, object property in NMDeviceOvs
+NMSettingPpp:nodeflate, object property in NMSettingPpp
 

 

 

-NMDeviceGeneric:type-description, object property in NMDeviceOvs
+NMSettingPpp:refuse-chap, object property in NMSettingPpp
 

 

 

-NMDeviceInfiniband, struct in NMDeviceOvs
+NMSettingPpp:refuse-eap, object property in NMSettingPpp
 

 

 

-NMDeviceInfiniband:carrier, object property in NMDeviceOvs
+NMSettingPpp:refuse-mschap, object property in NMSettingPpp
 

 

 

-NMDeviceInfiniband:hw-address, object property in NMDeviceOvs
+NMSettingPpp:refuse-mschapv2, object property in NMSettingPpp
 

 

 

-NMDeviceIPTunnel, struct in NMDeviceOvs
+NMSettingPpp:refuse-pap, object property in NMSettingPpp
 

 

 

-NMDeviceIPTunnel:encapsulation-limit, object property in NMDeviceOvs
+NMSettingPpp:require-mppe, object property in NMSettingPpp
 

 

 

-NMDeviceIPTunnel:flags, object property in NMDeviceOvs
+NMSettingPpp:require-mppe-128, object property in NMSettingPpp
 

 

 

-NMDeviceIPTunnel:flow-label, object property in NMDeviceOvs
+NMSettingPppoe, struct in NMSettingPppoe
 

 

 

-NMDeviceIPTunnel:input-key, object property in NMDeviceOvs
+NMSettingPppoe:parent, object property in NMSettingPppoe
 

 

 

-NMDeviceIPTunnel:local, object property in NMDeviceOvs
+NMSettingPppoe:password, object property in NMSettingPppoe
 

 

 

-NMDeviceIPTunnel:mode, object property in NMDeviceOvs
+NMSettingPppoe:password-flags, object property in NMSettingPppoe
 

 

 

-NMDeviceIPTunnel:output-key, object property in NMDeviceOvs
+NMSettingPppoe:service, object property in NMSettingPppoe
 

 

 

-NMDeviceIPTunnel:parent, object property in NMDeviceOvs
+NMSettingPppoe:username, object property in NMSettingPppoe
 

 

 

-NMDeviceIPTunnel:path-mtu-discovery, object property in NMDeviceOvs
+NMSettingProxy, struct in NMSettingProxy
 

 

 

-NMDeviceIPTunnel:remote, object property in NMDeviceOvs
+NMSettingProxy:browser-only, object property in NMSettingProxy
 

 

 

-NMDeviceIPTunnel:tos, object property in NMDeviceOvs
+NMSettingProxy:method, object property in NMSettingProxy
 

 

 

-NMDeviceIPTunnel:ttl, object property in NMDeviceOvs
+NMSettingProxy:pac-script, object property in NMSettingProxy
 

 

 

-NMDeviceMacsec, struct in NMDeviceOvs
+NMSettingProxy:pac-url, object property in NMSettingProxy
 

 

 

-NMDeviceMacsec:cipher-suite, object property in NMDeviceOvs
+NMSettingProxyMethod, enum in NMSettingProxy
 

 

 

-NMDeviceMacsec:encoding-sa, object property in NMDeviceOvs
+NMSettingsConnectionFlags, enum in nm-dbus-interface
 

 

 

-NMDeviceMacsec:encrypt, object property in NMDeviceOvs
+NMSettingSecretFlags, enum in NMSetting
 

 

 

-NMDeviceMacsec:es, object property in NMDeviceOvs
+NMSettingSerial, struct in NMSettingSerial
 

 

 

-NMDeviceMacsec:hw-address, object property in NMDeviceOvs
+NMSettingSerial:baud, object property in NMSettingSerial
 

 

 

-NMDeviceMacsec:icv-length, object property in NMDeviceOvs
+NMSettingSerial:bits, object property in NMSettingSerial
 

 

 

-NMDeviceMacsec:include-sci, object property in NMDeviceOvs
+NMSettingSerial:parity, object property in NMSettingSerial
 

 

 

-NMDeviceMacsec:parent, object property in NMDeviceOvs
+NMSettingSerial:send-delay, object property in NMSettingSerial
 

 

 

-NMDeviceMacsec:protect, object property in NMDeviceOvs
+NMSettingSerial:stopbits, object property in NMSettingSerial
 

 

 

-NMDeviceMacsec:replay-protect, object property in NMDeviceOvs
+NMSettingSerialParity, enum in NMSettingSerial
 

 

 

-NMDeviceMacsec:scb, object property in NMDeviceOvs
+NMSettingsError, enum in nm-errors
 

 

 

-NMDeviceMacsec:sci, object property in NMDeviceOvs
+NMSettingSriov, struct in NMSettingOvs
 

 

 

-NMDeviceMacsec:validation, object property in NMDeviceOvs
+NMSettingSriov:autoprobe-drivers, object property in NMSettingOvs
 

 

 

-NMDeviceMacsec:window, object property in NMDeviceOvs
+NMSettingSriov:total-vfs, object property in NMSettingOvs
 

 

 

-NMDeviceMacvlan, struct in NMDeviceOvs
+NMSettingSriov:vfs, object property in NMSettingOvs
 

 

 

-NMDeviceMacvlan:hw-address, object property in NMDeviceOvs
+NMSettingsUpdate2Flags, enum in nm-dbus-interface
 

 

 

-NMDeviceMacvlan:mode, object property in NMDeviceOvs
+NMSettingTCConfig, struct in NMSettingOvs
 

 

 

-NMDeviceMacvlan:no-promisc, object property in NMDeviceOvs
+NMSettingTCConfig:qdiscs, object property in NMSettingOvs
 

 

 

-NMDeviceMacvlan:parent, object property in NMDeviceOvs
+NMSettingTCConfig:tfilters, object property in NMSettingOvs
 

 

 

-NMDeviceMacvlan:tap, object property in NMDeviceOvs
+NMSettingTeam, struct in NMSettingTeam
 

 

 

-NMDeviceModem, struct in NMDeviceOvs
+NMSettingTeam:config, object property in NMSettingTeam
 

 

 

-NMDeviceModem:current-capabilities, object property in NMDeviceOvs
+NMSettingTeam:link-watchers, object property in NMSettingTeam
 

 

 

-NMDeviceModem:modem-capabilities, object property in NMDeviceOvs
+NMSettingTeam:mcast-rejoin-count, object property in NMSettingTeam
 

 

 

-NMDeviceModemCapabilities, enum in nm-dbus-interface
+NMSettingTeam:mcast-rejoin-interval, object property in NMSettingTeam
 

 

 

-NMDeviceOlpcMesh, struct in NMDeviceOvs
+NMSettingTeam:notify-peers-count, object property in NMSettingTeam
 

 

 

-NMDeviceOlpcMesh:active-channel, object property in NMDeviceOvs
+NMSettingTeam:notify-peers-interval, object property in NMSettingTeam
 

 

 

-NMDeviceOlpcMesh:companion, object property in NMDeviceOvs
+NMSettingTeam:runner, object property in NMSettingTeam
 

 

 

-NMDeviceOlpcMesh:hw-address, object property in NMDeviceOvs
+NMSettingTeam:runner-active, object property in NMSettingTeam
 

 

 

-NMDeviceOvsBridge, struct in NMDeviceOvs
+NMSettingTeam:runner-agg-select-policy, object property in NMSettingTeam
 

 

 

-NMDeviceOvsInterface, struct in NMDeviceOvs
+NMSettingTeam:runner-fast-rate, object property in NMSettingTeam
 

 

 

-NMDeviceOvsPort, struct in NMDeviceOvs
+NMSettingTeam:runner-hwaddr-policy, object property in NMSettingTeam
 

 

 

-NMDevicePpp, struct in NMDeviceOvs
+NMSettingTeam:runner-min-ports, object property in NMSettingTeam
 

 

 

-NMDeviceState, enum in nm-dbus-interface
+NMSettingTeam:runner-sys-prio, object property in NMSettingTeam
 

 

 

-NMDeviceStateReason, enum in nm-dbus-interface
+NMSettingTeam:runner-tx-balancer, object property in NMSettingTeam
 

 

 

-NMDeviceTeam, struct in NMDeviceOvs
+NMSettingTeam:runner-tx-balancer-interval, object property in NMSettingTeam
 

 

 

-NMDeviceTeam:carrier, object property in NMDeviceOvs
+NMSettingTeam:runner-tx-hash, object property in NMSettingTeam
 

 

 

-NMDeviceTeam:config, object property in NMDeviceOvs
+NMSettingTeamPort, struct in NMSettingTeamPort
 

 

 

-NMDeviceTeam:hw-address, object property in NMDeviceOvs
+NMSettingTeamPort:config, object property in NMSettingTeamPort
 

 

 

-NMDeviceTeam:slaves, object property in NMDeviceOvs
+NMSettingTeamPort:lacp-key, object property in NMSettingTeamPort
 

 

 

-NMDeviceTun, struct in NMDeviceOvs
+NMSettingTeamPort:lacp-prio, object property in NMSettingTeamPort
 

 

 

-NMDeviceTun:group, object property in NMDeviceOvs
+NMSettingTeamPort:link-watchers, object property in NMSettingTeamPort
 

 

 

-NMDeviceTun:hw-address, object property in NMDeviceOvs
+NMSettingTeamPort:prio, object property in NMSettingTeamPort
 

 

 

-NMDeviceTun:mode, object property in NMDeviceOvs
+NMSettingTeamPort:queue-id, object property in NMSettingTeamPort
 

 

 

-NMDeviceTun:multi-queue, object property in NMDeviceOvs
+NMSettingTeamPort:sticky, object property in NMSettingTeamPort
 

 

 

-NMDeviceTun:no-pi, object property in NMDeviceOvs
+NMSettingTun, struct in NMSettingTun
 

 

 

-NMDeviceTun:owner, object property in NMDeviceOvs
+NMSettingTun:group, object property in NMSettingTun
 

 

 

-NMDeviceTun:vnet-hdr, object property in NMDeviceOvs
+NMSettingTun:mode, object property in NMSettingTun
 

 

 

-NMDeviceType, enum in nm-dbus-interface
+NMSettingTun:multi-queue, object property in NMSettingTun
 

 

 

-NMDeviceVlan, struct in NMDeviceOvs
+NMSettingTun:owner, object property in NMSettingTun
 

 

 

-NMDeviceVlan:carrier, object property in NMDeviceOvs
+NMSettingTun:pi, object property in NMSettingTun
 

 

 

-NMDeviceVlan:hw-address, object property in NMDeviceOvs
+NMSettingTun:vnet-hdr, object property in NMSettingTun
 

 

 

-NMDeviceVlan:parent, object property in NMDeviceOvs
+NMSettingTunMode, enum in NMSettingTun
 

 

 

-NMDeviceVlan:vlan-id, object property in NMDeviceOvs
+NMSettingUser, struct in NMSettingOvs
 

 

 

-NMDeviceVxlan, struct in NMDeviceOvs
+NMSettingUser:data, object property in NMSettingOvs
 

 

 

-NMDeviceVxlan:ageing, object property in NMDeviceOvs
+NMSettingValueIterFn, user_function in NMSetting
 

 

 

-NMDeviceVxlan:carrier, object property in NMDeviceOvs
+NMSettingVlan, struct in NMSettingVlan
 

 

 

-NMDeviceVxlan:dst-port, object property in NMDeviceOvs
+NMSettingVlan:egress-priority-map, object property in NMSettingVlan
 

 

 

-NMDeviceVxlan:group, object property in NMDeviceOvs
+NMSettingVlan:flags, object property in NMSettingVlan
 

 

 

-NMDeviceVxlan:hw-address, object property in NMDeviceOvs
+NMSettingVlan:id, object property in NMSettingVlan
 

 

 

-NMDeviceVxlan:id, object property in NMDeviceOvs
+NMSettingVlan:ingress-priority-map, object property in NMSettingVlan
 

 

 

-NMDeviceVxlan:l2miss, object property in NMDeviceOvs
+NMSettingVlan:parent, object property in NMSettingVlan
 

 

 

-NMDeviceVxlan:l3miss, object property in NMDeviceOvs
+NMSettingVpn, struct in NMSettingVpn
 

 

 

-NMDeviceVxlan:learning, object property in NMDeviceOvs
+NMSettingVpn:data, object property in NMSettingVpn
 

 

 

-NMDeviceVxlan:limit, object property in NMDeviceOvs
+NMSettingVpn:persistent, object property in NMSettingVpn
 

 

 

-NMDeviceVxlan:local, object property in NMDeviceOvs
+NMSettingVpn:secrets, object property in NMSettingVpn
 

 

 

-NMDeviceVxlan:parent, object property in NMDeviceOvs
+NMSettingVpn:service-type, object property in NMSettingVpn
 

 

 

-NMDeviceVxlan:proxy, object property in NMDeviceOvs
+NMSettingVpn:timeout, object property in NMSettingVpn
 

 

 

-NMDeviceVxlan:rsc, object property in NMDeviceOvs
+NMSettingVpn:user-name, object property in NMSettingVpn
 

 

 

-NMDeviceVxlan:src-port-max, object property in NMDeviceOvs
+NMSettingVxlan, struct in NMSettingVxlan
 

 

 

-NMDeviceVxlan:src-port-min, object property in NMDeviceOvs
+NMSettingVxlan:ageing, object property in NMSettingVxlan
 

 

 

-NMDeviceVxlan:tos, object property in NMDeviceOvs
+NMSettingVxlan:destination-port, object property in NMSettingVxlan
 

 

 

-NMDeviceVxlan:ttl, object property in NMDeviceOvs
+NMSettingVxlan:id, object property in NMSettingVxlan
 

 

 

-NMDeviceWifi, struct in NMDeviceOvs
+NMSettingVxlan:l2-miss, object property in NMSettingVxlan
 

 

 

-NMDeviceWifi::access-point-added, object signal in NMDeviceOvs
+NMSettingVxlan:l3-miss, object property in NMSettingVxlan
 

 

 

-NMDeviceWifi::access-point-removed, object signal in NMDeviceOvs
+NMSettingVxlan:learning, object property in NMSettingVxlan
 

 

 

-NMDeviceWifi:access-points, object property in NMDeviceOvs
+NMSettingVxlan:limit, object property in NMSettingVxlan
 

 

 

-NMDeviceWifi:active-access-point, object property in NMDeviceOvs
+NMSettingVxlan:local, object property in NMSettingVxlan
 

 

 

-NMDeviceWifi:bitrate, object property in NMDeviceOvs
+NMSettingVxlan:parent, object property in NMSettingVxlan
 

 

 

-NMDeviceWifi:hw-address, object property in NMDeviceOvs
+NMSettingVxlan:proxy, object property in NMSettingVxlan
 

 

 

-NMDeviceWifi:last-scan, object property in NMDeviceOvs
+NMSettingVxlan:remote, object property in NMSettingVxlan
 

 

 

-NMDeviceWifi:mode, object property in NMDeviceOvs
+NMSettingVxlan:rsc, object property in NMSettingVxlan
 

 

 

-NMDeviceWifi:perm-hw-address, object property in NMDeviceOvs
+NMSettingVxlan:source-port-max, object property in NMSettingVxlan
 

 

 

-NMDeviceWifi:wireless-capabilities, object property in NMDeviceOvs
+NMSettingVxlan:source-port-min, object property in NMSettingVxlan
 

 

 

-NMDeviceWifiCapabilities, enum in nm-dbus-interface
+NMSettingVxlan:tos, object property in NMSettingVxlan
 

 

 

-NMDeviceWimax, struct in NMDeviceOvs
+NMSettingVxlan:ttl, object property in NMSettingVxlan
 

 

 

-NMDeviceWimax::nsp-added, object signal in NMDeviceOvs
+NMSettingWifiP2P, struct in NMSettingOvs
 

 

 

-NMDeviceWimax::nsp-removed, object signal in NMDeviceOvs
+NMSettingWifiP2P:peer, object property in NMSettingOvs
 

 

 

-NMDeviceWimax:active-nsp, object property in NMDeviceOvs
+NMSettingWifiP2P:wfd-ies, object property in NMSettingOvs
 

 

 

-NMDeviceWimax:bsid, object property in NMDeviceOvs
+NMSettingWifiP2P:wps-method, object property in NMSettingOvs
 

 

 

-NMDeviceWimax:center-frequency, object property in NMDeviceOvs
+NMSettingWimax, struct in NMSettingWimax
 

 

 

-NMDeviceWimax:cinr, object property in NMDeviceOvs
+NMSettingWimax:mac-address, object property in NMSettingWimax
 

 

 

-NMDeviceWimax:hw-address, object property in NMDeviceOvs
+NMSettingWimax:network-name, object property in NMSettingWimax
 

 

 

-NMDeviceWimax:nsps, object property in NMDeviceOvs
+NMSettingWired, struct in NMSettingWired
 

 

 

-NMDeviceWimax:rssi, object property in NMDeviceOvs
+NMSettingWired:auto-negotiate, object property in NMSettingWired
 

 

 

-NMDeviceWimax:tx-power, object property in NMDeviceOvs
+NMSettingWired:cloned-mac-address, object property in NMSettingWired
 

 

 

-NMDeviceWireGuard, struct in NMDeviceOvs
+NMSettingWired:duplex, object property in NMSettingWired
 

 

 

-NMDeviceWireGuard:fwmark, object property in NMDeviceOvs
+NMSettingWired:generate-mac-address-mask, object property in NMSettingWired
 

 

 

-NMDeviceWireGuard:listen-port, object property in NMDeviceOvs
+NMSettingWired:mac-address, object property in NMSettingWired
 

 

 

-NMDeviceWireGuard:public-key, object property in NMDeviceOvs
+NMSettingWired:mac-address-blacklist, object property in NMSettingWired
 

 

 

-NMDeviceWpan, struct in NMDeviceOvs
+NMSettingWired:mtu, object property in NMSettingWired
 

 

 

-NMDeviceWpan:hw-address, object property in NMDeviceOvs
+NMSettingWired:port, object property in NMSettingWired
 

 

 

-nm_device_6lowpan_get_hw_address, function in nm-device-6lowpan
+NMSettingWired:s390-nettype, object property in NMSettingWired
 

 

 

-nm_device_6lowpan_get_parent, function in nm-device-6lowpan
+NMSettingWired:s390-options, object property in NMSettingWired
 

 

 

-NM_DEVICE_6LOWPAN_HW_ADDRESS, macro in nm-device-6lowpan
+NMSettingWired:s390-subchannels, object property in NMSettingWired
 

 

 

-NM_DEVICE_6LOWPAN_PARENT, macro in nm-device-6lowpan
+NMSettingWired:speed, object property in NMSettingWired
 

 

 

-NM_DEVICE_ACTIVE_CONNECTION, macro in NMDevice
+NMSettingWired:wake-on-lan, object property in NMSettingWired
 

 

 

-NM_DEVICE_ADSL_CARRIER, macro in NMDeviceAdsl
+NMSettingWired:wake-on-lan-password, object property in NMSettingWired
 

 

 

-nm_device_adsl_get_carrier, function in NMDeviceAdsl
+NMSettingWiredWakeOnLan, enum in NMSettingWired
 

 

 

-NM_DEVICE_AUTOCONNECT, macro in NMDevice
+NMSettingWireGuard, struct in NMSettingOvs
 

 

 

-NM_DEVICE_AVAILABLE_CONNECTIONS, macro in NMDevice
+NMSettingWireGuard:fwmark, object property in NMSettingOvs
 

 

 

-NM_DEVICE_BOND_CARRIER, macro in NMDeviceBond
+NMSettingWireGuard:listen-port, object property in NMSettingOvs
 

 

 

-nm_device_bond_get_carrier, function in NMDeviceBond
+NMSettingWireGuard:mtu, object property in NMSettingOvs
 

 

 

-nm_device_bond_get_hw_address, function in NMDeviceBond
+NMSettingWireGuard:peer-routes, object property in NMSettingOvs
 

 

 

-nm_device_bond_get_slaves, function in NMDeviceBond
+NMSettingWireGuard:private-key, object property in NMSettingOvs
 

 

 

-NM_DEVICE_BOND_HW_ADDRESS, macro in NMDeviceBond
+NMSettingWireGuard:private-key-flags, object property in NMSettingOvs
 

 

 

-NM_DEVICE_BOND_SLAVES, macro in NMDeviceBond
+NMSettingWireless, struct in NMSettingWireless
 

 

 

-NM_DEVICE_BRIDGE_CARRIER, macro in NMDeviceBridge
+NMSettingWireless:band, object property in NMSettingWireless
 

 

 

-nm_device_bridge_get_carrier, function in NMDeviceBridge
+NMSettingWireless:bssid, object property in NMSettingWireless
 

 

 

-nm_device_bridge_get_hw_address, function in NMDeviceBridge
+NMSettingWireless:channel, object property in NMSettingWireless
 

 

 

-nm_device_bridge_get_slaves, function in NMDeviceBridge
+NMSettingWireless:cloned-mac-address, object property in NMSettingWireless
 

 

 

-NM_DEVICE_BRIDGE_HW_ADDRESS, macro in NMDeviceBridge
+NMSettingWireless:generate-mac-address-mask, object property in NMSettingWireless
 

 

 

-NM_DEVICE_BRIDGE_SLAVES, macro in NMDeviceBridge
+NMSettingWireless:hidden, object property in NMSettingWireless
 

 

 

-NM_DEVICE_BT_CAPABILITIES, macro in NMDeviceBt
+NMSettingWireless:mac-address, object property in NMSettingWireless
 

 

 

-nm_device_bt_get_capabilities, function in NMDeviceBt
+NMSettingWireless:mac-address-blacklist, object property in NMSettingWireless
 

 

 

-nm_device_bt_get_hw_address, function in NMDeviceBt
+NMSettingWireless:mac-address-randomization, object property in NMSettingWireless
 

 

 

-nm_device_bt_get_name, function in NMDeviceBt
+NMSettingWireless:mode, object property in NMSettingWireless
 

 

 

-NM_DEVICE_BT_HW_ADDRESS, macro in NMDeviceBt
+NMSettingWireless:mtu, object property in NMSettingWireless
 

 

 

-NM_DEVICE_BT_NAME, macro in NMDeviceBt
+NMSettingWireless:powersave, object property in NMSettingWireless
 

 

 

-NM_DEVICE_CAPABILITIES, macro in NMDevice
+NMSettingWireless:rate, object property in NMSettingWireless
 

 

 

-nm_device_connection_compatible, function in NMDevice
+NMSettingWireless:seen-bssids, object property in NMSettingWireless
 

 

 

-nm_device_connection_valid, function in NMDevice
+NMSettingWireless:ssid, object property in NMSettingWireless
 

 

 

-nm_device_delete, function in NMDevice
+NMSettingWireless:tx-power, object property in NMSettingWireless
 

 

 

-nm_device_delete_async, function in NMDevice
+NMSettingWireless:wake-on-wlan, object property in NMSettingWireless
 

 

 

-nm_device_delete_finish, function in NMDevice
+NMSettingWirelessPowersave, enum in NMSettingWireless
 

 

 

-NM_DEVICE_DEVICE_TYPE, macro in NMDevice
+NMSettingWirelessSecurity, struct in NMSettingWirelessSecurity
 

 

 

-NM_DEVICE_DHCP4_CONFIG, macro in NMDevice
+NMSettingWirelessSecurity:auth-alg, object property in NMSettingWirelessSecurity
 

 

 

-NM_DEVICE_DHCP6_CONFIG, macro in NMDevice
+NMSettingWirelessSecurity:fils, object property in NMSettingWirelessSecurity
 

 

 

-nm_device_disambiguate_names, function in NMDevice
+NMSettingWirelessSecurity:group, object property in NMSettingWirelessSecurity
 

 

 

-nm_device_disconnect, function in NMDevice
+NMSettingWirelessSecurity:key-mgmt, object property in NMSettingWirelessSecurity
 

 

 

-nm_device_disconnect_async, function in NMDevice
+NMSettingWirelessSecurity:leap-password, object property in NMSettingWirelessSecurity
 

 

 

-nm_device_disconnect_finish, function in NMDevice
+NMSettingWirelessSecurity:leap-password-flags, object property in NMSettingWirelessSecurity
 

 

 

-NM_DEVICE_DRIVER, macro in NMDevice
+NMSettingWirelessSecurity:leap-username, object property in NMSettingWirelessSecurity
 

 

 

-NM_DEVICE_DRIVER_VERSION, macro in NMDevice
+NMSettingWirelessSecurity:pairwise, object property in NMSettingWirelessSecurity
 

 

 

-nm_device_dummy_get_hw_address, function in NMDeviceDummy
+NMSettingWirelessSecurity:pmf, object property in NMSettingWirelessSecurity
 

 

 

-NM_DEVICE_DUMMY_HW_ADDRESS, macro in NMDeviceDummy
+NMSettingWirelessSecurity:proto, object property in NMSettingWirelessSecurity
 

 

 

-NM_DEVICE_ERROR, macro in nm-errors
+NMSettingWirelessSecurity:psk, object property in NMSettingWirelessSecurity
 

 

 

-nm_device_error_quark, function in nm-errors
+NMSettingWirelessSecurity:psk-flags, object property in NMSettingWirelessSecurity
 

 

 

-NM_DEVICE_ETHERNET_CARRIER, macro in NMDeviceEthernet
+NMSettingWirelessSecurity:wep-key-flags, object property in NMSettingWirelessSecurity
 

 

 

-nm_device_ethernet_get_carrier, function in NMDeviceEthernet
+NMSettingWirelessSecurity:wep-key-type, object property in NMSettingWirelessSecurity
 

 

 

-nm_device_ethernet_get_hw_address, function in NMDeviceEthernet
+NMSettingWirelessSecurity:wep-key0, object property in NMSettingWirelessSecurity
 

 

 

-nm_device_ethernet_get_permanent_hw_address, function in NMDeviceEthernet
+NMSettingWirelessSecurity:wep-key1, object property in NMSettingWirelessSecurity
 

 

 

-nm_device_ethernet_get_s390_subchannels, function in NMDeviceEthernet
+NMSettingWirelessSecurity:wep-key2, object property in NMSettingWirelessSecurity
 

 

 

-nm_device_ethernet_get_speed, function in NMDeviceEthernet
+NMSettingWirelessSecurity:wep-key3, object property in NMSettingWirelessSecurity
 

 

 

-NM_DEVICE_ETHERNET_HW_ADDRESS, macro in NMDeviceEthernet
+NMSettingWirelessSecurity:wep-tx-keyidx, object property in NMSettingWirelessSecurity
 

 

 

-NM_DEVICE_ETHERNET_PERMANENT_HW_ADDRESS, macro in NMDeviceEthernet
+NMSettingWirelessSecurity:wps-method, object property in NMSettingWirelessSecurity
 

 

 

-NM_DEVICE_ETHERNET_S390_SUBCHANNELS, macro in NMDeviceEthernet
+NMSettingWirelessSecurityFils, enum in NMSettingWirelessSecurity
 

 

 

-NM_DEVICE_ETHERNET_SPEED, macro in NMDeviceEthernet
+NMSettingWirelessSecurityPmf, enum in NMSettingWirelessSecurity
 

 

 

-nm_device_filter_connections, function in NMDevice
+NMSettingWirelessSecurityWpsMethod, enum in NMSettingWirelessSecurity
 

 

 

-NM_DEVICE_FIRMWARE_MISSING, macro in NMDevice
+NMSettingWirelessWakeOnWLan, enum in NMSettingWireless
 

 

 

-NM_DEVICE_FIRMWARE_VERSION, macro in NMDevice
+NMSettingWpan, struct in NMSettingOvs
 

 

 

-nm_device_generic_get_hw_address, function in NMDeviceGeneric
+NMSettingWpan:channel, object property in NMSettingOvs
 

 

 

-NM_DEVICE_GENERIC_HW_ADDRESS, macro in NMDeviceGeneric
+NMSettingWpan:mac-address, object property in NMSettingOvs
 

 

 

-NM_DEVICE_GENERIC_TYPE_DESCRIPTION, macro in NMDeviceGeneric
+NMSettingWpan:page, object property in NMSettingOvs
 

 

 

-nm_device_get_active_connection, function in NMDevice
+NMSettingWpan:pan-id, object property in NMSettingOvs
 

 

 

-nm_device_get_applied_connection, function in NMDevice
+NMSettingWpan:short-address, object property in NMSettingOvs
 

 

 

-nm_device_get_applied_connection_async, function in NMDevice
+NMSimpleConnection, struct in NMSimpleConnection
 

 

 

-nm_device_get_applied_connection_finish, function in NMDevice
+NMSriovVFVlanProtocol, enum in NMSettingSriov
 

 

 

-nm_device_get_autoconnect, function in NMDevice
+NMState, enum in nm-dbus-interface
 

 

 

-nm_device_get_available_connections, function in NMDevice
+NMTeamLinkWatcherArpPingFlags, enum in NMSettingTeam
 

 

 

-nm_device_get_capabilities, function in NMDevice
+NMTernary, enum in nm-dbus-interface
 

 

 

-nm_device_get_description, function in NMDevice
+NMUtilsCheckFilePredicate, user_function in nm-utils
 

 

 

-nm_device_get_device_type, function in NMDevice
+NMUtilsFileSearchInPathsPredicate, user_function in nm-utils
 

 

 

-nm_device_get_dhcp4_config, function in NMDevice
+NMUtilsSecurityType, enum in nm-utils
 

 

 

-nm_device_get_dhcp6_config, function in NMDevice
+NMVariantAttributeSpec, struct in nm-utils
 

 

 

-nm_device_get_driver, function in NMDevice
+NMVlanFlags, enum in NMSettingVlan
 

 

 

-nm_device_get_driver_version, function in NMDevice
+NMVlanPriorityMap, enum in NMSettingVlan
 

 

 

-nm_device_get_firmware_missing, function in NMDevice
+NMVpnConnection, struct in NMVpnConnection
 

 

 

-nm_device_get_firmware_version, function in NMDevice
+NMVpnConnection::vpn-state-changed, object signal in NMVpnConnection
 

 

 

-nm_device_get_hw_address, function in NMDevice
+NMVpnConnection:banner, object property in NMVpnConnection
 

 

 

-nm_device_get_iface, function in NMDevice
+NMVpnConnection:vpn-state, object property in NMVpnConnection
 

 

 

-nm_device_get_ip4_config, function in NMDevice
+NMVpnConnectionState, enum in nm-vpn-dbus-interface
 

 

 

-nm_device_get_ip6_config, function in NMDevice
+NMVpnConnectionStateReason, enum in nm-vpn-dbus-interface
 

 

 

-nm_device_get_ip_iface, function in NMDevice
+NMVpnEditor, struct in NMVpnEditorPlugin
 

 

 

-nm_device_get_lldp_neighbors, function in NMDevice
+NMVpnEditor::changed, object signal in NMVpnEditorPlugin
 

 

 

-nm_device_get_managed, function in NMDevice
+NMVpnEditorInterface, struct in NMVpnEditor
 

 

 

-nm_device_get_metered, function in NMDevice
+NMVpnEditorPlugin:description, object property in NMVpnEditorPlugin
 

 

 

-nm_device_get_mtu, function in NMDevice
+NMVpnEditorPlugin:name, object property in NMVpnEditorPlugin
 

 

 

-nm_device_get_nm_plugin_missing, function in NMDevice
+NMVpnEditorPlugin:service, object property in NMVpnEditorPlugin
 

 

 

-nm_device_get_physical_port_id, function in NMDevice
+NMVpnEditorPluginCapability, enum in NMVpnEditorPlugin
 

 

 

-nm_device_get_product, function in NMDevice
+NMVpnEditorPluginFactory, user_function in NMVpnEditorPlugin
 

 

 

-nm_device_get_setting_type, function in NMDevice
+NMVpnEditorPluginInterface, struct in NMVpnEditorPlugin
 

 

 

-nm_device_get_state, function in NMDevice
+NMVpnEditorPluginVT, struct in NMVpnEditorPlugin
 

 

 

-nm_device_get_state_reason, function in NMDevice
+NMVpnIterFunc, user_function in NMSettingVpn
 

 

 

-nm_device_get_type_description, function in NMDevice
+NMVpnPluginError, enum in nm-errors
 

 

 

-nm_device_get_udi, function in NMDevice
+NMVpnPluginFailure, enum in nm-vpn-dbus-interface
 

 

 

-nm_device_get_vendor, function in NMDevice
+NMVpnPluginInfo, struct in nm-vpn-plugin-info
 

 

 

-NM_DEVICE_INFINIBAND_CARRIER, macro in NMDeviceInfiniband
+NMVpnServiceState, enum in nm-vpn-dbus-interface
 

 

 

-nm_device_infiniband_get_carrier, function in NMDeviceInfiniband
+NMWepKeyType, enum in NMSettingWirelessSecurity
 

 

 

-nm_device_infiniband_get_hw_address, function in NMDeviceInfiniband
+NMWifiP2PPeer, struct in NMDeviceOvs
 

 

 

-NM_DEVICE_INFINIBAND_HW_ADDRESS, macro in NMDeviceInfiniband
+NMWifiP2PPeer:flags, object property in NMDeviceOvs
 

 

 

-NM_DEVICE_INTERFACE, macro in NMDevice
+NMWifiP2PPeer:hw-address, object property in NMDeviceOvs
 

 

 

-NM_DEVICE_IP4_CONFIG, macro in NMDevice
+NMWifiP2PPeer:last-seen, object property in NMDeviceOvs
 

 

 

-NM_DEVICE_IP6_CONFIG, macro in NMDevice
+NMWifiP2PPeer:manufacturer, object property in NMDeviceOvs
 

 

 

-NM_DEVICE_IP_INTERFACE, macro in NMDevice
+NMWifiP2PPeer:model, object property in NMDeviceOvs
 

 

 

-NM_DEVICE_IP_TUNNEL_ENCAPSULATION_LIMIT, macro in NMDeviceIPTunnel
+NMWifiP2PPeer:model-number, object property in NMDeviceOvs
 

 

 

-NM_DEVICE_IP_TUNNEL_FLAGS, macro in NMDeviceIPTunnel
+NMWifiP2PPeer:name, object property in NMDeviceOvs
 

 

 

-NM_DEVICE_IP_TUNNEL_FLOW_LABEL, macro in NMDeviceIPTunnel
+NMWifiP2PPeer:serial, object property in NMDeviceOvs
 

 

 

-nm_device_ip_tunnel_get_encapsulation_limit, function in NMDeviceIPTunnel
+NMWifiP2PPeer:strength, object property in NMDeviceOvs
 

 

 

-nm_device_ip_tunnel_get_flags, function in NMDeviceIPTunnel
+NMWifiP2PPeer:wfd-ies, object property in NMDeviceOvs
 

 

 

-nm_device_ip_tunnel_get_flow_label, function in NMDeviceIPTunnel
+NMWimaxNsp, struct in NMWimaxNsp
 

 

 

-nm_device_ip_tunnel_get_input_key, function in NMDeviceIPTunnel
+NMWimaxNsp:name, object property in NMWimaxNsp
 

 

 

-nm_device_ip_tunnel_get_local, function in NMDeviceIPTunnel
+NMWimaxNsp:network-type, object property in NMWimaxNsp
 

 

 

-nm_device_ip_tunnel_get_mode, function in NMDeviceIPTunnel
+NMWimaxNsp:signal-quality, object property in NMWimaxNsp
 

 

 

-nm_device_ip_tunnel_get_output_key, function in NMDeviceIPTunnel
+NMWimaxNspNetworkType, enum in nm-dbus-interface
 

 

 

-nm_device_ip_tunnel_get_parent, function in NMDeviceIPTunnel
+NM_ACCESS_POINT_BSSID, macro in NMAccessPoint
 

 

 

-nm_device_ip_tunnel_get_path_mtu_discovery, function in NMDeviceIPTunnel
+nm_access_point_connection_valid, function in NMAccessPoint
 

 

 

-nm_device_ip_tunnel_get_remote, function in NMDeviceIPTunnel
+nm_access_point_filter_connections, function in NMAccessPoint
 

 

 

-nm_device_ip_tunnel_get_tos, function in NMDeviceIPTunnel
+NM_ACCESS_POINT_FLAGS, macro in NMAccessPoint
 

 

 

-nm_device_ip_tunnel_get_ttl, function in NMDeviceIPTunnel
+NM_ACCESS_POINT_FREQUENCY, macro in NMAccessPoint
 

 

 

-NM_DEVICE_IP_TUNNEL_INPUT_KEY, macro in NMDeviceIPTunnel
+nm_access_point_get_bssid, function in NMAccessPoint
 

 

 

-NM_DEVICE_IP_TUNNEL_LOCAL, macro in NMDeviceIPTunnel
+nm_access_point_get_flags, function in NMAccessPoint
 

 

 

-NM_DEVICE_IP_TUNNEL_MODE, macro in NMDeviceIPTunnel
+nm_access_point_get_frequency, function in NMAccessPoint
 

 

 

-NM_DEVICE_IP_TUNNEL_OUTPUT_KEY, macro in NMDeviceIPTunnel
+nm_access_point_get_last_seen, function in NMAccessPoint
 

 

 

-NM_DEVICE_IP_TUNNEL_PARENT, macro in NMDeviceIPTunnel
+nm_access_point_get_max_bitrate, function in NMAccessPoint
 

 

 

-NM_DEVICE_IP_TUNNEL_PATH_MTU_DISCOVERY, macro in NMDeviceIPTunnel
+nm_access_point_get_mode, function in NMAccessPoint
 

 

 

-NM_DEVICE_IP_TUNNEL_REMOTE, macro in NMDeviceIPTunnel
+nm_access_point_get_rsn_flags, function in NMAccessPoint
 

 

 

-NM_DEVICE_IP_TUNNEL_TOS, macro in NMDeviceIPTunnel
+nm_access_point_get_ssid, function in NMAccessPoint
 

 

 

-NM_DEVICE_IP_TUNNEL_TTL, macro in NMDeviceIPTunnel
+nm_access_point_get_strength, function in NMAccessPoint
 

 

 

-nm_device_is_real, function in NMDevice
+nm_access_point_get_wpa_flags, function in NMAccessPoint
 

 

 

-nm_device_is_software, function in NMDevice
+NM_ACCESS_POINT_HW_ADDRESS, macro in NMAccessPoint
 

 

 

-NM_DEVICE_LLDP_NEIGHBORS, macro in NMDevice
+NM_ACCESS_POINT_LAST_SEEN, macro in NMAccessPoint
 

 

 

-NM_DEVICE_MACSEC_CIPHER_SUITE, macro in NMDeviceMacsec
+NM_ACCESS_POINT_MAX_BITRATE, macro in NMAccessPoint
 

 

 

-NM_DEVICE_MACSEC_ENCODING_SA, macro in NMDeviceMacsec
+NM_ACCESS_POINT_MODE, macro in NMAccessPoint
 

 

 

-NM_DEVICE_MACSEC_ENCRYPT, macro in NMDeviceMacsec
+NM_ACCESS_POINT_RSN_FLAGS, macro in NMAccessPoint
 

 

 

-NM_DEVICE_MACSEC_ES, macro in NMDeviceMacsec
+NM_ACCESS_POINT_SSID, macro in NMAccessPoint
 

 

 

-nm_device_macsec_get_cipher_suite, function in NMDeviceMacsec
+NM_ACCESS_POINT_STRENGTH, macro in NMAccessPoint
 

 

 

-nm_device_macsec_get_encoding_sa, function in NMDeviceMacsec
+NM_ACCESS_POINT_WPA_FLAGS, macro in NMAccessPoint
 

 

 

-nm_device_macsec_get_encrypt, function in NMDeviceMacsec
+NM_ACTIVE_CONNECTION_CONNECTION, macro in NMActiveConnection
 

 

 

-nm_device_macsec_get_es, function in NMDeviceMacsec
+NM_ACTIVE_CONNECTION_DEFAULT, macro in NMActiveConnection
 

 

 

-nm_device_macsec_get_hw_address, function in NMDeviceMacsec
+NM_ACTIVE_CONNECTION_DEFAULT6, macro in NMActiveConnection
 

 

 

-nm_device_macsec_get_icv_length, function in NMDeviceMacsec
+NM_ACTIVE_CONNECTION_DEVICES, macro in NMActiveConnection
 

 

 

-nm_device_macsec_get_include_sci, function in NMDeviceMacsec
+NM_ACTIVE_CONNECTION_DHCP4_CONFIG, macro in NMActiveConnection
 

 

 

-nm_device_macsec_get_parent, function in NMDeviceMacsec
+NM_ACTIVE_CONNECTION_DHCP6_CONFIG, macro in NMActiveConnection
 

 

 

-nm_device_macsec_get_protect, function in NMDeviceMacsec
+nm_active_connection_get_connection, function in NMActiveConnection
 

 

 

-nm_device_macsec_get_replay_protect, function in NMDeviceMacsec
+nm_active_connection_get_connection_type, function in NMActiveConnection
 

 

 

-nm_device_macsec_get_scb, function in NMDeviceMacsec
+nm_active_connection_get_default, function in NMActiveConnection
 

 

 

-nm_device_macsec_get_sci, function in NMDeviceMacsec
+nm_active_connection_get_default6, function in NMActiveConnection
 

 

 

-nm_device_macsec_get_validation, function in NMDeviceMacsec
+nm_active_connection_get_devices, function in NMActiveConnection
 

 

 

-nm_device_macsec_get_window, function in NMDeviceMacsec
+nm_active_connection_get_dhcp4_config, function in NMActiveConnection
 

 

 

-NM_DEVICE_MACSEC_HW_ADDRESS, macro in NMDeviceMacsec
+nm_active_connection_get_dhcp6_config, function in NMActiveConnection
 

 

 

-NM_DEVICE_MACSEC_ICV_LENGTH, macro in NMDeviceMacsec
+nm_active_connection_get_id, function in NMActiveConnection
 

 

 

-NM_DEVICE_MACSEC_INCLUDE_SCI, macro in NMDeviceMacsec
+nm_active_connection_get_ip4_config, function in NMActiveConnection
 

 

 

-NM_DEVICE_MACSEC_PARENT, macro in NMDeviceMacsec
+nm_active_connection_get_ip6_config, function in NMActiveConnection
 

 

 

-NM_DEVICE_MACSEC_PROTECT, macro in NMDeviceMacsec
+nm_active_connection_get_master, function in NMActiveConnection
 

 

 

-NM_DEVICE_MACSEC_REPLAY_PROTECT, macro in NMDeviceMacsec
+nm_active_connection_get_specific_object_path, function in NMActiveConnection
 

 

 

-NM_DEVICE_MACSEC_SCB, macro in NMDeviceMacsec
+nm_active_connection_get_state, function in NMActiveConnection
 

 

 

-NM_DEVICE_MACSEC_SCI, macro in NMDeviceMacsec
+nm_active_connection_get_state_flags, function in NMActiveConnection
 

 

 

-NM_DEVICE_MACSEC_VALIDATION, macro in NMDeviceMacsec
+nm_active_connection_get_state_reason, function in NMActiveConnection
 

 

 

-NM_DEVICE_MACSEC_WINDOW, macro in NMDeviceMacsec
+nm_active_connection_get_uuid, function in NMActiveConnection
 

 

 

-nm_device_macvlan_get_hw_address, function in NMDeviceMacvlan
+nm_active_connection_get_vpn, function in NMActiveConnection
 

 

 

-nm_device_macvlan_get_mode, function in NMDeviceMacvlan
+NM_ACTIVE_CONNECTION_ID, macro in NMActiveConnection
 

 

 

-nm_device_macvlan_get_no_promisc, function in NMDeviceMacvlan
+NM_ACTIVE_CONNECTION_IP4_CONFIG, macro in NMActiveConnection
 

 

 

-nm_device_macvlan_get_parent, function in NMDeviceMacvlan
+NM_ACTIVE_CONNECTION_IP6_CONFIG, macro in NMActiveConnection
 

 

 

-nm_device_macvlan_get_tap, function in NMDeviceMacvlan
+NM_ACTIVE_CONNECTION_MASTER, macro in NMActiveConnection
 

 

 

-NM_DEVICE_MACVLAN_HW_ADDRESS, macro in NMDeviceMacvlan
+NM_ACTIVE_CONNECTION_SPECIFIC_OBJECT_PATH, macro in NMActiveConnection
 

 

 

-NM_DEVICE_MACVLAN_MODE, macro in NMDeviceMacvlan
+NM_ACTIVE_CONNECTION_STATE, macro in NMActiveConnection
 

 

 

-NM_DEVICE_MACVLAN_NO_PROMISC, macro in NMDeviceMacvlan
+NM_ACTIVE_CONNECTION_STATE_FLAGS, macro in NMActiveConnection
 

 

 

-NM_DEVICE_MACVLAN_PARENT, macro in NMDeviceMacvlan
+NM_ACTIVE_CONNECTION_TYPE, macro in NMActiveConnection
 

 

 

-NM_DEVICE_MACVLAN_TAP, macro in NMDeviceMacvlan
+NM_ACTIVE_CONNECTION_UUID, macro in NMActiveConnection
 

 

 

-NM_DEVICE_MANAGED, macro in NMDevice
+NM_ACTIVE_CONNECTION_VPN, macro in NMActiveConnection
 

 

 

-NM_DEVICE_METERED, macro in NMDevice
+NM_AGENT_MANAGER_ERROR, macro in nm-errors
 

 

 

-NM_DEVICE_MODEM_CURRENT_CAPABILITIES, macro in NMDeviceModem
+nm_agent_manager_error_quark, function in nm-errors
 

 

 

-nm_device_modem_get_current_capabilities, function in NMDeviceModem
+NM_AVAILABLE_IN_0_9_10, macro in nm-version
 

 

 

-nm_device_modem_get_modem_capabilities, function in NMDeviceModem
+NM_AVAILABLE_IN_1_0, macro in nm-version
 

 

 

-NM_DEVICE_MODEM_MODEM_CAPABILITIES, macro in NMDeviceModem
+NM_AVAILABLE_IN_1_10, macro in nm-version
 

 

 

-NM_DEVICE_MTU, macro in NMDevice
+NM_AVAILABLE_IN_1_12, macro in nm-version
 

 

 

-NM_DEVICE_NM_PLUGIN_MISSING, macro in NMDevice
+NM_AVAILABLE_IN_1_14, macro in nm-version
 

 

 

-NM_DEVICE_OLPC_MESH_ACTIVE_CHANNEL, macro in NMDeviceOlpcMesh
+NM_AVAILABLE_IN_1_16, macro in nm-version
 

 

 

-NM_DEVICE_OLPC_MESH_COMPANION, macro in NMDeviceOlpcMesh
+NM_AVAILABLE_IN_1_2, macro in nm-version
 

 

 

-nm_device_olpc_mesh_get_active_channel, function in NMDeviceOlpcMesh
+NM_AVAILABLE_IN_1_4, macro in nm-version
 

 

 

-nm_device_olpc_mesh_get_companion, function in NMDeviceOlpcMesh
+NM_AVAILABLE_IN_1_6, macro in nm-version
 

 

 

-nm_device_olpc_mesh_get_hw_address, function in NMDeviceOlpcMesh
+NM_AVAILABLE_IN_1_8, macro in nm-version
 

 

 

-NM_DEVICE_OLPC_MESH_HW_ADDRESS, macro in NMDeviceOlpcMesh
+NM_CHECKPOINT_CREATED, macro in NMCheckpoint
 

 

 

-nm_device_ovs_bridge_get_slaves, function in NMDeviceOvsBridge
+NM_CHECKPOINT_DEVICES, macro in NMCheckpoint
 

 

 

-NM_DEVICE_OVS_BRIDGE_SLAVES, macro in NMDeviceOvsBridge
+nm_checkpoint_get_created, function in NMCheckpoint
 

 

 

-nm_device_ovs_port_get_slaves, function in NMDeviceOvsPort
+nm_checkpoint_get_devices, function in NMCheckpoint
 

 

 

-NM_DEVICE_OVS_PORT_SLAVES, macro in NMDeviceOvsPort
+nm_checkpoint_get_rollback_timeout, function in NMCheckpoint
 

 

 

-NM_DEVICE_PHYSICAL_PORT_ID, macro in NMDevice
+NM_CHECKPOINT_ROLLBACK_TIMEOUT, macro in NMCheckpoint
 

 

 

-NM_DEVICE_PRODUCT, macro in NMDevice
+nm_client_activate_connection_async, function in NMClient
 

 

 

-NM_DEVICE_REAL, macro in NMDevice
+nm_client_activate_connection_finish, function in NMClient
 

 

 

-nm_device_reapply, function in NMDevice
+NM_CLIENT_ACTIVATING_CONNECTION, macro in NMClient
 

 

 

-nm_device_reapply_async, function in NMDevice
+NM_CLIENT_ACTIVE_CONNECTIONS, macro in NMClient
 

 

 

-nm_device_reapply_finish, function in NMDevice
+NM_CLIENT_ACTIVE_CONNECTION_ADDED, macro in NMClient
 

 

 

-nm_device_set_autoconnect, function in NMDevice
+NM_CLIENT_ACTIVE_CONNECTION_REMOVED, macro in NMClient
 

 

 

-nm_device_set_managed, function in NMDevice
+nm_client_add_and_activate_connection2, function in NMClient
 

 

 

-NM_DEVICE_STATE, macro in NMDevice
+nm_client_add_and_activate_connection2_finish, function in NMClient
 

 

 

-NM_DEVICE_STATE_REASON, macro in NMDevice
+nm_client_add_and_activate_connection_async, function in NMClient
 

 

 

-NM_DEVICE_TEAM_CARRIER, macro in NMDeviceTeam
+nm_client_add_and_activate_connection_finish, function in NMClient
 

 

 

-NM_DEVICE_TEAM_CONFIG, macro in NMDeviceTeam
+nm_client_add_connection_async, function in NMClient
 

 

 

-nm_device_team_get_carrier, function in NMDeviceTeam
+nm_client_add_connection_finish, function in NMClient
 

 

 

-nm_device_team_get_config, function in NMDeviceTeam
+NM_CLIENT_ALL_DEVICES, macro in NMClient
 

 

 

-nm_device_team_get_hw_address, function in NMDeviceTeam
+NM_CLIENT_ANY_DEVICE_ADDED, macro in NMClient
 

 

 

-nm_device_team_get_slaves, function in NMDeviceTeam
+NM_CLIENT_ANY_DEVICE_REMOVED, macro in NMClient
 

 

 

-NM_DEVICE_TEAM_HW_ADDRESS, macro in NMDeviceTeam
+NM_CLIENT_CAN_MODIFY, macro in NMClient
 

 

 

-NM_DEVICE_TEAM_SLAVES, macro in NMDeviceTeam
+nm_client_checkpoint_adjust_rollback_timeout, function in NMClient
 

 

 

-nm_device_tun_get_group, function in NMDeviceTun
+nm_client_checkpoint_adjust_rollback_timeout_finish, function in NMClient
 

 

 

-nm_device_tun_get_hw_address, function in NMDeviceTun
+nm_client_checkpoint_create, function in NMClient
 

 

 

-nm_device_tun_get_mode, function in NMDeviceTun
+nm_client_checkpoint_create_finish, function in NMClient
 

 

 

-nm_device_tun_get_multi_queue, function in NMDeviceTun
+nm_client_checkpoint_destroy, function in NMClient
 

 

 

-nm_device_tun_get_no_pi, function in NMDeviceTun
+nm_client_checkpoint_destroy_finish, function in NMClient
 

 

 

-nm_device_tun_get_owner, function in NMDeviceTun
+nm_client_checkpoint_rollback, function in NMClient
 

 

 

-nm_device_tun_get_vnet_hdr, function in NMDeviceTun
+nm_client_checkpoint_rollback_finish, function in NMClient
 

 

 

-NM_DEVICE_TUN_GROUP, macro in NMDeviceTun
+nm_client_check_connectivity, function in NMClient
 

 

 

-NM_DEVICE_TUN_HW_ADDRESS, macro in NMDeviceTun
+nm_client_check_connectivity_async, function in NMClient
 

 

 

-NM_DEVICE_TUN_MODE, macro in NMDeviceTun
+nm_client_check_connectivity_finish, function in NMClient
 

 

 

-NM_DEVICE_TUN_MULTI_QUEUE, macro in NMDeviceTun
+NM_CLIENT_CONNECTIONS, macro in NMClient
 

 

 

-NM_DEVICE_TUN_NO_PI, macro in NMDeviceTun
+NM_CLIENT_CONNECTION_ADDED, macro in NMClient
 

 

 

-NM_DEVICE_TUN_OWNER, macro in NMDeviceTun
+NM_CLIENT_CONNECTION_REMOVED, macro in NMClient
 

 

 

-NM_DEVICE_TUN_VNET_HDR, macro in NMDeviceTun
+NM_CLIENT_CONNECTIVITY, macro in NMClient
 

 

 

-NM_DEVICE_UDI, macro in NMDevice
+NM_CLIENT_CONNECTIVITY_CHECK_AVAILABLE, macro in NMClient
 

 

 

-NM_DEVICE_VENDOR, macro in NMDevice
+NM_CLIENT_CONNECTIVITY_CHECK_ENABLED, macro in NMClient
 

 

 

-NM_DEVICE_VLAN_CARRIER, macro in NMDeviceVlan
+nm_client_connectivity_check_get_available, function in NMClient
 

 

 

-nm_device_vlan_get_carrier, function in NMDeviceVlan
+nm_client_connectivity_check_get_enabled, function in NMClient
 

 

 

-nm_device_vlan_get_hw_address, function in NMDeviceVlan
+nm_client_connectivity_check_set_enabled, function in NMClient
 

 

 

-nm_device_vlan_get_parent, function in NMDeviceVlan
+nm_client_deactivate_connection, function in NMClient
 

 

 

-nm_device_vlan_get_vlan_id, function in NMDeviceVlan
+nm_client_deactivate_connection_async, function in NMClient
 

 

 

-NM_DEVICE_VLAN_HW_ADDRESS, macro in NMDeviceVlan
+nm_client_deactivate_connection_finish, function in NMClient
 

 

 

-NM_DEVICE_VLAN_PARENT, macro in NMDeviceVlan
+NM_CLIENT_DEVICES, macro in NMClient
 

 

 

-NM_DEVICE_VLAN_VLAN_ID, macro in NMDeviceVlan
+NM_CLIENT_DEVICE_ADDED, macro in NMClient
 

 

 

-NM_DEVICE_VXLAN_AGEING, macro in NMDeviceVxlan
+NM_CLIENT_DEVICE_REMOVED, macro in NMClient
 

 

 

-NM_DEVICE_VXLAN_CARRIER, macro in NMDeviceVxlan
+NM_CLIENT_DNS_CONFIGURATION, macro in NMClient
 

 

 

-NM_DEVICE_VXLAN_DST_PORT, macro in NMDeviceVxlan
+NM_CLIENT_DNS_MODE, macro in NMClient
 

 

 

-nm_device_vxlan_get_ageing, function in NMDeviceVxlan
+NM_CLIENT_DNS_RC_MANAGER, macro in NMClient
 

 

 

-nm_device_vxlan_get_carrier, function in NMDeviceVxlan
+NM_CLIENT_ERROR, macro in NMClient
 

 

 

-nm_device_vxlan_get_dst_port, function in NMDeviceVxlan
+nm_client_error_quark, function in NMClient
 

 

 

-nm_device_vxlan_get_group, function in NMDeviceVxlan
+nm_client_get_activating_connection, function in NMClient
 

 

 

-nm_device_vxlan_get_hw_address, function in NMDeviceVxlan
+nm_client_get_active_connections, function in NMClient
 

 

 

-nm_device_vxlan_get_id, function in NMDeviceVxlan
+nm_client_get_all_devices, function in NMClient
 

 

 

-nm_device_vxlan_get_l2miss, function in NMDeviceVxlan
+nm_client_get_checkpoints, function in NMClient
 

 

 

-nm_device_vxlan_get_l3miss, function in NMDeviceVxlan
+nm_client_get_connections, function in NMClient
 

 

 

-nm_device_vxlan_get_learning, function in NMDeviceVxlan
+nm_client_get_connection_by_id, function in NMClient
 

 

 

-nm_device_vxlan_get_limit, function in NMDeviceVxlan
+nm_client_get_connection_by_path, function in NMClient
 

 

 

-nm_device_vxlan_get_local, function in NMDeviceVxlan
+nm_client_get_connection_by_uuid, function in NMClient
 

 

 

-nm_device_vxlan_get_parent, function in NMDeviceVxlan
+nm_client_get_connectivity, function in NMClient
 

 

 

-nm_device_vxlan_get_proxy, function in NMDeviceVxlan
+nm_client_get_devices, function in NMClient
 

 

 

-nm_device_vxlan_get_rsc, function in NMDeviceVxlan
+nm_client_get_device_by_iface, function in NMClient
 

 

 

-nm_device_vxlan_get_src_port_max, function in NMDeviceVxlan
+nm_client_get_device_by_path, function in NMClient
 

 

 

-nm_device_vxlan_get_src_port_min, function in NMDeviceVxlan
+nm_client_get_dns_configuration, function in NMClient
 

 

 

-nm_device_vxlan_get_tos, function in NMDeviceVxlan
+nm_client_get_dns_mode, function in NMClient
 

 

 

-nm_device_vxlan_get_ttl, function in NMDeviceVxlan
+nm_client_get_dns_rc_manager, function in NMClient
 

 

 

-NM_DEVICE_VXLAN_GROUP, macro in NMDeviceVxlan
+nm_client_get_logging, function in NMClient
 

 

 

-NM_DEVICE_VXLAN_HW_ADDRESS, macro in NMDeviceVxlan
+nm_client_get_nm_running, function in NMClient
 

 

 

-NM_DEVICE_VXLAN_ID, macro in NMDeviceVxlan
+nm_client_get_permission_result, function in NMClient
 

 

 

-NM_DEVICE_VXLAN_L2MISS, macro in NMDeviceVxlan
+nm_client_get_primary_connection, function in NMClient
 

 

 

-NM_DEVICE_VXLAN_L3MISS, macro in NMDeviceVxlan
+nm_client_get_startup, function in NMClient
 

 

 

-NM_DEVICE_VXLAN_LEARNING, macro in NMDeviceVxlan
+nm_client_get_state, function in NMClient
 

 

 

-NM_DEVICE_VXLAN_LIMIT, macro in NMDeviceVxlan
+nm_client_get_version, function in NMClient
 

 

 

-NM_DEVICE_VXLAN_LOCAL, macro in NMDeviceVxlan
+NM_CLIENT_HOSTNAME, macro in NMClient
 

 

 

-NM_DEVICE_VXLAN_PARENT, macro in NMDeviceVxlan
+nm_client_load_connections, function in NMClient
 

 

 

-NM_DEVICE_VXLAN_PROXY, macro in NMDeviceVxlan
+nm_client_load_connections_async, function in NMClient
 

 

 

-NM_DEVICE_VXLAN_RSC, macro in NMDeviceVxlan
+nm_client_load_connections_finish, function in NMClient
 

 

 

-NM_DEVICE_VXLAN_SRC_PORT_MAX, macro in NMDeviceVxlan
+NM_CLIENT_METERED, macro in NMClient
 

 

 

-NM_DEVICE_VXLAN_SRC_PORT_MIN, macro in NMDeviceVxlan
+NM_CLIENT_NETWORKING_ENABLED, macro in NMClient
 

 

 

-NM_DEVICE_VXLAN_TOS, macro in NMDeviceVxlan
+nm_client_networking_get_enabled, function in NMClient
 

 

 

-NM_DEVICE_VXLAN_TTL, macro in NMDeviceVxlan
+nm_client_networking_set_enabled, function in NMClient
 

 

 

-NM_DEVICE_WIFI_ACCESS_POINTS, macro in NMDeviceWifi
+nm_client_new, function in NMClient
 

 

 

-NM_DEVICE_WIFI_ACTIVE_ACCESS_POINT, macro in NMDeviceWifi
+nm_client_new_async, function in NMClient
 

 

 

-NM_DEVICE_WIFI_BITRATE, macro in NMDeviceWifi
+nm_client_new_finish, function in NMClient
 

 

 

-NM_DEVICE_WIFI_CAPABILITIES, macro in NMDeviceWifi
+NM_CLIENT_NM_RUNNING, macro in NMClient
 

 

 

-nm_device_wifi_get_access_points, function in NMDeviceWifi
+NM_CLIENT_PERMISSION_CHANGED, macro in NMClient
 

 

 

-nm_device_wifi_get_access_point_by_path, function in NMDeviceWifi
+NM_CLIENT_PRIMARY_CONNECTION, macro in NMClient
 

 

 

-nm_device_wifi_get_active_access_point, function in NMDeviceWifi
+nm_client_reload_connections, function in NMClient
 

 

 

-nm_device_wifi_get_bitrate, function in NMDeviceWifi
+nm_client_reload_connections_async, function in NMClient
 

 

 

-nm_device_wifi_get_capabilities, function in NMDeviceWifi
+nm_client_reload_connections_finish, function in NMClient
 

 

 

-nm_device_wifi_get_hw_address, function in NMDeviceWifi
+nm_client_save_hostname, function in NMClient
 

 

 

-nm_device_wifi_get_last_scan, function in NMDeviceWifi
+nm_client_save_hostname_async, function in NMClient
 

 

 

-nm_device_wifi_get_mode, function in NMDeviceWifi
+nm_client_save_hostname_finish, function in NMClient
 

 

 

-nm_device_wifi_get_permanent_hw_address, function in NMDeviceWifi
+nm_client_set_logging, function in NMClient
 

 

 

-NM_DEVICE_WIFI_HW_ADDRESS, macro in NMDeviceWifi
+NM_CLIENT_STARTUP, macro in NMClient
 

 

 

-NM_DEVICE_WIFI_LAST_SCAN, macro in NMDeviceWifi
+NM_CLIENT_STATE, macro in NMClient
 

 

 

-NM_DEVICE_WIFI_MODE, macro in NMDeviceWifi
+NM_CLIENT_VERSION, macro in NMClient
 

 

 

-NM_DEVICE_WIFI_PERMANENT_HW_ADDRESS, macro in NMDeviceWifi
+NM_CLIENT_WIMAX_ENABLED, macro in NMClient
 

 

 

-nm_device_wifi_request_scan, function in NMDeviceWifi
+nm_client_wimax_get_enabled, function in NMClient
 

 

 

-nm_device_wifi_request_scan_async, function in NMDeviceWifi
+NM_CLIENT_WIMAX_HARDWARE_ENABLED, macro in NMClient
 

 

 

-nm_device_wifi_request_scan_finish, function in NMDeviceWifi
+nm_client_wimax_hardware_get_enabled, function in NMClient
 

 

 

-nm_device_wifi_request_scan_options, function in NMDeviceWifi
+nm_client_wimax_set_enabled, function in NMClient
 

 

 

-nm_device_wifi_request_scan_options_async, function in NMDeviceWifi
+NM_CLIENT_WIRELESS_ENABLED, macro in NMClient
 

 

 

-NM_DEVICE_WIMAX_ACTIVE_NSP, macro in NMDeviceWimax
+nm_client_wireless_get_enabled, function in NMClient
 

 

 

-NM_DEVICE_WIMAX_BSID, macro in NMDeviceWimax
+NM_CLIENT_WIRELESS_HARDWARE_ENABLED, macro in NMClient
 

 

 

-NM_DEVICE_WIMAX_CENTER_FREQUENCY, macro in NMDeviceWimax
+nm_client_wireless_hardware_get_enabled, function in NMClient
 

 

 

-NM_DEVICE_WIMAX_CINR, macro in NMDeviceWimax
+nm_client_wireless_set_enabled, function in NMClient
 

 

 

-nm_device_wimax_get_active_nsp, function in NMDeviceWimax
+NM_CLIENT_WWAN_ENABLED, macro in NMClient
 

 

 

-nm_device_wimax_get_bsid, function in NMDeviceWimax
+nm_client_wwan_get_enabled, function in NMClient
 

 

 

-nm_device_wimax_get_center_frequency, function in NMDeviceWimax
+NM_CLIENT_WWAN_HARDWARE_ENABLED, macro in NMClient
 

 

 

-nm_device_wimax_get_cinr, function in NMDeviceWimax
+nm_client_wwan_hardware_get_enabled, function in NMClient
 

 

 

-nm_device_wimax_get_hw_address, function in NMDeviceWimax
+nm_client_wwan_set_enabled, function in NMClient
 

 

 

-nm_device_wimax_get_nsps, function in NMDeviceWimax
+nm_connection_add_setting, function in NMConnection
 

 

 

-nm_device_wimax_get_nsp_by_path, function in NMDeviceWimax
+NM_CONNECTION_CHANGED, macro in NMConnection
 

 

 

-nm_device_wimax_get_rssi, function in NMDeviceWimax
+nm_connection_clear_secrets, function in NMConnection
 

 

 

-nm_device_wimax_get_tx_power, function in NMDeviceWimax
+nm_connection_clear_secrets_with_flags, function in NMConnection
 

 

 

-NM_DEVICE_WIMAX_HW_ADDRESS, macro in NMDeviceWimax
+nm_connection_clear_settings, function in NMConnection
 

 

 

-NM_DEVICE_WIMAX_NSPS, macro in NMDeviceWimax
+nm_connection_compare, function in NMConnection
 

 

 

-NM_DEVICE_WIMAX_RSSI, macro in NMDeviceWimax
+nm_connection_diff, function in NMConnection
 

 

 

-NM_DEVICE_WIMAX_TX_POWER, macro in NMDeviceWimax
+nm_connection_dump, function in NMConnection
 

 

 

-NM_DEVICE_WIREGUARD_FWMARK, macro in NMDeviceWireGuard
+NM_CONNECTION_ERROR, macro in nm-errors
 

 

 

-nm_device_wireguard_get_fwmark, function in NMDeviceWireGuard
+nm_connection_error_quark, function in nm-errors
 

 

 

-nm_device_wireguard_get_listen_port, function in NMDeviceWireGuard
+nm_connection_for_each_setting_value, function in NMConnection
 

 

 

-nm_device_wireguard_get_public_key, function in NMDeviceWireGuard
+nm_connection_get_connection_type, function in NMConnection
 

 

 

-NM_DEVICE_WIREGUARD_LISTEN_PORT, macro in NMDeviceWireGuard
+nm_connection_get_id, function in NMConnection
 

 

 

-NM_DEVICE_WIREGUARD_PUBLIC_KEY, macro in NMDeviceWireGuard
+nm_connection_get_interface_name, function in NMConnection
 

 

 

-nm_device_wpan_get_hw_address, function in nm-device-wpan
+nm_connection_get_path, function in NMConnection
 

 

 

-NM_DEVICE_WPAN_HW_ADDRESS, macro in nm-device-wpan
+nm_connection_get_setting, function in NMConnection
 

 

 

-NMDhcpConfig, struct in NMDeviceOvs
+nm_connection_get_settings, function in NMConnection
 

 

 

-NMDhcpConfig:family, object property in NMDeviceOvs
+nm_connection_get_setting_802_1x, function in NMConnection
 

 

 

-NMDhcpConfig:options, object property in NMDeviceOvs
+nm_connection_get_setting_adsl, function in NMConnection
 

 

 

-NM_DHCP_CONFIG_FAMILY, macro in NMDhcpConfig
+nm_connection_get_setting_bluetooth, function in NMConnection
 

 

 

-nm_dhcp_config_get_family, function in NMDhcpConfig
+nm_connection_get_setting_bond, function in NMConnection
 

 

 

-nm_dhcp_config_get_one_option, function in NMDhcpConfig
+nm_connection_get_setting_bridge, function in NMConnection
 

 

 

-nm_dhcp_config_get_options, function in NMDhcpConfig
+nm_connection_get_setting_bridge_port, function in NMConnection
 

 

 

-NM_DHCP_CONFIG_OPTIONS, macro in NMDhcpConfig
+nm_connection_get_setting_by_name, function in NMConnection
 

 

 

-nm_dns_entry_get_domains, function in NMClient
+nm_connection_get_setting_cdma, function in NMConnection
 

 

 

-nm_dns_entry_get_interface, function in NMClient
+nm_connection_get_setting_connection, function in NMConnection
 

 

 

-nm_dns_entry_get_nameservers, function in NMClient
+nm_connection_get_setting_dcb, function in NMConnection
 

 

 

-nm_dns_entry_get_priority, function in NMClient
+nm_connection_get_setting_dummy, function in NMConnection
 

 

 

-nm_dns_entry_get_vpn, function in NMClient
+nm_connection_get_setting_generic, function in NMConnection
 

 

 

-nm_dns_entry_unref, function in NMClient
+nm_connection_get_setting_gsm, function in NMConnection
 

 

-
E

 

-NM_ETHTOOL_OPTNAME_FEATURE_ESP_HW_OFFLOAD, macro in NMSettingEthtool
+nm_connection_get_setting_infiniband, function in NMConnection
 

 

 

-NM_ETHTOOL_OPTNAME_FEATURE_ESP_TX_CSUM_HW_OFFLOAD, macro in NMSettingEthtool
+nm_connection_get_setting_ip4_config, function in NMConnection
 

 

 

-NM_ETHTOOL_OPTNAME_FEATURE_FCOE_MTU, macro in NMSettingEthtool
+nm_connection_get_setting_ip6_config, function in NMConnection
 

 

 

-NM_ETHTOOL_OPTNAME_FEATURE_GRO, macro in NMSettingEthtool
+nm_connection_get_setting_ip_tunnel, function in NMConnection
 

 

 

-NM_ETHTOOL_OPTNAME_FEATURE_GSO, macro in NMSettingEthtool
+nm_connection_get_setting_macsec, function in NMConnection
 

 

 

-NM_ETHTOOL_OPTNAME_FEATURE_HIGHDMA, macro in NMSettingEthtool
+nm_connection_get_setting_macvlan, function in NMConnection
 

 

 

-NM_ETHTOOL_OPTNAME_FEATURE_HW_TC_OFFLOAD, macro in NMSettingEthtool
+nm_connection_get_setting_olpc_mesh, function in NMConnection
 

 

 

-NM_ETHTOOL_OPTNAME_FEATURE_L2_FWD_OFFLOAD, macro in NMSettingEthtool
+nm_connection_get_setting_ovs_bridge, function in NMConnection
 

 

 

-NM_ETHTOOL_OPTNAME_FEATURE_LOOPBACK, macro in NMSettingEthtool
+nm_connection_get_setting_ovs_interface, function in NMConnection
 

 

 

-NM_ETHTOOL_OPTNAME_FEATURE_LRO, macro in NMSettingEthtool
+nm_connection_get_setting_ovs_patch, function in NMConnection
 

 

 

-NM_ETHTOOL_OPTNAME_FEATURE_NTUPLE, macro in NMSettingEthtool
+nm_connection_get_setting_ovs_port, function in NMConnection
 

 

 

-NM_ETHTOOL_OPTNAME_FEATURE_RX, macro in NMSettingEthtool
+nm_connection_get_setting_ppp, function in NMConnection
 

 

 

-NM_ETHTOOL_OPTNAME_FEATURE_RXHASH, macro in NMSettingEthtool
+nm_connection_get_setting_pppoe, function in NMConnection
 

 

 

-NM_ETHTOOL_OPTNAME_FEATURE_RXVLAN, macro in NMSettingEthtool
+nm_connection_get_setting_proxy, function in NMConnection
 

 

 

-NM_ETHTOOL_OPTNAME_FEATURE_RX_ALL, macro in NMSettingEthtool
+nm_connection_get_setting_serial, function in NMConnection
 

 

 

-NM_ETHTOOL_OPTNAME_FEATURE_RX_FCS, macro in NMSettingEthtool
+nm_connection_get_setting_tc_config, function in NMConnection
 

 

 

-NM_ETHTOOL_OPTNAME_FEATURE_RX_GRO_HW, macro in NMSettingEthtool
+nm_connection_get_setting_team, function in NMConnection
 

 

 

-NM_ETHTOOL_OPTNAME_FEATURE_RX_UDP_TUNNEL_PORT_OFFLOAD, macro in NMSettingEthtool
+nm_connection_get_setting_team_port, function in NMConnection
 

 

 

-NM_ETHTOOL_OPTNAME_FEATURE_RX_VLAN_FILTER, macro in NMSettingEthtool
+nm_connection_get_setting_tun, function in NMConnection
 

 

 

-NM_ETHTOOL_OPTNAME_FEATURE_RX_VLAN_STAG_FILTER, macro in NMSettingEthtool
+nm_connection_get_setting_vlan, function in NMConnection
 

 

 

-NM_ETHTOOL_OPTNAME_FEATURE_RX_VLAN_STAG_HW_PARSE, macro in NMSettingEthtool
+nm_connection_get_setting_vpn, function in NMConnection
 

 

 

-NM_ETHTOOL_OPTNAME_FEATURE_SG, macro in NMSettingEthtool
+nm_connection_get_setting_vxlan, function in NMConnection
 

 

 

-NM_ETHTOOL_OPTNAME_FEATURE_TLS_HW_RECORD, macro in NMSettingEthtool
+nm_connection_get_setting_wimax, function in NMConnection
 

 

 

-NM_ETHTOOL_OPTNAME_FEATURE_TLS_HW_TX_OFFLOAD, macro in NMSettingEthtool
+nm_connection_get_setting_wired, function in NMConnection
 

 

 

-NM_ETHTOOL_OPTNAME_FEATURE_TSO, macro in NMSettingEthtool
+nm_connection_get_setting_wireless, function in NMConnection
 

 

 

-NM_ETHTOOL_OPTNAME_FEATURE_TX, macro in NMSettingEthtool
+nm_connection_get_setting_wireless_security, function in NMConnection
 

 

 

-NM_ETHTOOL_OPTNAME_FEATURE_TXVLAN, macro in NMSettingEthtool
+nm_connection_get_uuid, function in NMConnection
 

 

 

-NM_ETHTOOL_OPTNAME_FEATURE_TX_CHECKSUM_FCOE_CRC, macro in NMSettingEthtool
+nm_connection_get_virtual_device_description, function in NMConnection
 

 

 

-NM_ETHTOOL_OPTNAME_FEATURE_TX_CHECKSUM_IPV4, macro in NMSettingEthtool
+nm_connection_is_type, function in NMConnection
 

 

 

-NM_ETHTOOL_OPTNAME_FEATURE_TX_CHECKSUM_IPV6, macro in NMSettingEthtool
+nm_connection_is_virtual, function in NMConnection
 

 

 

-NM_ETHTOOL_OPTNAME_FEATURE_TX_CHECKSUM_IP_GENERIC, macro in NMSettingEthtool
+nm_connection_need_secrets, function in NMConnection
 

 

 

-NM_ETHTOOL_OPTNAME_FEATURE_TX_CHECKSUM_SCTP, macro in NMSettingEthtool
+nm_connection_normalize, function in NMConnection
 

 

 

-NM_ETHTOOL_OPTNAME_FEATURE_TX_ESP_SEGMENTATION, macro in NMSettingEthtool
+NM_CONNECTION_NORMALIZE_PARAM_IP6_CONFIG_METHOD, macro in NMConnection
 

 

 

-NM_ETHTOOL_OPTNAME_FEATURE_TX_FCOE_SEGMENTATION, macro in NMSettingEthtool
+nm_connection_remove_setting, function in NMConnection
 

 

 

-NM_ETHTOOL_OPTNAME_FEATURE_TX_GRE_CSUM_SEGMENTATION, macro in NMSettingEthtool
+nm_connection_replace_settings, function in NMConnection
 

 

 

-NM_ETHTOOL_OPTNAME_FEATURE_TX_GRE_SEGMENTATION, macro in NMSettingEthtool
+nm_connection_replace_settings_from_connection, function in NMConnection
 

 

 

-NM_ETHTOOL_OPTNAME_FEATURE_TX_GSO_PARTIAL, macro in NMSettingEthtool
+NM_CONNECTION_SECRETS_CLEARED, macro in NMConnection
 

 

 

-NM_ETHTOOL_OPTNAME_FEATURE_TX_GSO_ROBUST, macro in NMSettingEthtool
+NM_CONNECTION_SECRETS_UPDATED, macro in NMConnection
 

 

 

-NM_ETHTOOL_OPTNAME_FEATURE_TX_IPXIP4_SEGMENTATION, macro in NMSettingEthtool
+nm_connection_set_path, function in NMConnection
 

 

 

-NM_ETHTOOL_OPTNAME_FEATURE_TX_IPXIP6_SEGMENTATION, macro in NMSettingEthtool
+nm_connection_to_dbus, function in NMConnection
 

 

 

-NM_ETHTOOL_OPTNAME_FEATURE_TX_NOCACHE_COPY, macro in NMSettingEthtool
+nm_connection_update_secrets, function in NMConnection
 

 

 

-NM_ETHTOOL_OPTNAME_FEATURE_TX_SCATTER_GATHER, macro in NMSettingEthtool
+nm_connection_verify, function in NMConnection
 

 

 

-NM_ETHTOOL_OPTNAME_FEATURE_TX_SCATTER_GATHER_FRAGLIST, macro in NMSettingEthtool
+nm_connection_verify_secrets, function in NMConnection
 

 

 

-NM_ETHTOOL_OPTNAME_FEATURE_TX_SCTP_SEGMENTATION, macro in NMSettingEthtool
+NM_CRYPTO_ERROR, macro in nm-errors
 

 

 

-NM_ETHTOOL_OPTNAME_FEATURE_TX_TCP6_SEGMENTATION, macro in NMSettingEthtool
+nm_crypto_error_quark, function in nm-errors
 

 

 

-NM_ETHTOOL_OPTNAME_FEATURE_TX_TCP_ECN_SEGMENTATION, macro in NMSettingEthtool
+NM_DBUS_INTERFACE, macro in nm-dbus-interface
 

 

 

-NM_ETHTOOL_OPTNAME_FEATURE_TX_TCP_MANGLEID_SEGMENTATION, macro in NMSettingEthtool
+NM_DBUS_INTERFACE_ACCESS_POINT, macro in nm-dbus-interface
 

 

 

-NM_ETHTOOL_OPTNAME_FEATURE_TX_TCP_SEGMENTATION, macro in NMSettingEthtool
+NM_DBUS_INTERFACE_ACTIVE_CONNECTION, macro in nm-dbus-interface
 

 

 

-NM_ETHTOOL_OPTNAME_FEATURE_TX_UDP_SEGMENTATION, macro in NMSettingEthtool
+NM_DBUS_INTERFACE_AGENT_MANAGER, macro in nm-dbus-interface
 

 

 

-NM_ETHTOOL_OPTNAME_FEATURE_TX_UDP_TNL_CSUM_SEGMENTATION, macro in NMSettingEthtool
+NM_DBUS_INTERFACE_CHECKPOINT, macro in nm-dbus-interface
 

 

 

-NM_ETHTOOL_OPTNAME_FEATURE_TX_UDP_TNL_SEGMENTATION, macro in NMSettingEthtool
+NM_DBUS_INTERFACE_DEVICE, macro in nm-dbus-interface
 

 

 

-NM_ETHTOOL_OPTNAME_FEATURE_TX_VLAN_STAG_HW_INSERT, macro in NMSettingEthtool
+NM_DBUS_INTERFACE_DEVICE_6LOWPAN, macro in nm-dbus-interface
 

 

 

-nm_ethtool_optname_is_feature, function in NMSettingEthtool
+NM_DBUS_INTERFACE_DEVICE_ADSL, macro in nm-dbus-interface
 

 

-
I

 

-NMIPConfig, struct in NMDeviceOvs
+NM_DBUS_INTERFACE_DEVICE_BLUETOOTH, macro in nm-dbus-interface
 

 

 

-NMIPConfig:addresses, object property in NMDeviceOvs
+NM_DBUS_INTERFACE_DEVICE_BOND, macro in nm-dbus-interface
 

 

 

-NMIPConfig:domains, object property in NMDeviceOvs
+NM_DBUS_INTERFACE_DEVICE_BRIDGE, macro in nm-dbus-interface
 

 

 

-NMIPConfig:family, object property in NMDeviceOvs
+NM_DBUS_INTERFACE_DEVICE_DUMMY, macro in nm-dbus-interface
 

 

 

-NMIPConfig:gateway, object property in NMDeviceOvs
+NM_DBUS_INTERFACE_DEVICE_GENERIC, macro in nm-dbus-interface
 

 

 

-NMIPConfig:nameservers, object property in NMDeviceOvs
+NM_DBUS_INTERFACE_DEVICE_GRE, macro in nm-dbus-interface
 

 

 

-NMIPConfig:routes, object property in NMDeviceOvs
+NM_DBUS_INTERFACE_DEVICE_INFINIBAND, macro in nm-dbus-interface
 

 

 

-NMIPConfig:searches, object property in NMDeviceOvs
+NM_DBUS_INTERFACE_DEVICE_IP_TUNNEL, macro in nm-dbus-interface
 

 

 

-NMIPConfig:wins-servers, object property in NMDeviceOvs
+NM_DBUS_INTERFACE_DEVICE_MACSEC, macro in nm-dbus-interface
 

 

 

-NMIPTunnelFlags, enum in NMSettingIPTunnel
+NM_DBUS_INTERFACE_DEVICE_MACVLAN, macro in nm-dbus-interface
 

 

 

-NMIPTunnelMode, enum in nm-dbus-interface
+NM_DBUS_INTERFACE_DEVICE_MODEM, macro in nm-dbus-interface
 

 

 

-NM_IP_ADDRESS_ATTRIBUTE_LABEL, macro in NMSettingIPConfig
+NM_DBUS_INTERFACE_DEVICE_OLPC_MESH, macro in nm-dbus-interface
 

 

 

-nm_ip_address_dup, function in NMSettingIPConfig
+NM_DBUS_INTERFACE_DEVICE_OVS_BRIDGE, macro in nm-dbus-interface
 

 

 

-nm_ip_address_equal, function in NMSettingIPConfig
+NM_DBUS_INTERFACE_DEVICE_OVS_INTERFACE, macro in nm-dbus-interface
 

 

 

-nm_ip_address_get_address, function in NMSettingIPConfig
+NM_DBUS_INTERFACE_DEVICE_OVS_PORT, macro in nm-dbus-interface
 

 

 

-nm_ip_address_get_address_binary, function in NMSettingIPConfig
+NM_DBUS_INTERFACE_DEVICE_PPP, macro in nm-dbus-interface
 

 

 

-nm_ip_address_get_attribute, function in NMSettingIPConfig
+NM_DBUS_INTERFACE_DEVICE_STATISTICS, macro in nm-dbus-interface
 

 

 

-nm_ip_address_get_attribute_names, function in NMSettingIPConfig
+NM_DBUS_INTERFACE_DEVICE_TEAM, macro in nm-dbus-interface
 

 

 

-nm_ip_address_get_family, function in NMSettingIPConfig
+NM_DBUS_INTERFACE_DEVICE_TUN, macro in nm-dbus-interface
 

 

 

-nm_ip_address_get_prefix, function in NMSettingIPConfig
+NM_DBUS_INTERFACE_DEVICE_VETH, macro in nm-dbus-interface
 

 

 

-nm_ip_address_new, function in NMSettingIPConfig
+NM_DBUS_INTERFACE_DEVICE_VLAN, macro in nm-dbus-interface
 

 

 

-nm_ip_address_new_binary, function in NMSettingIPConfig
+NM_DBUS_INTERFACE_DEVICE_VXLAN, macro in nm-dbus-interface
 

 

 

-nm_ip_address_ref, function in NMSettingIPConfig
+NM_DBUS_INTERFACE_DEVICE_WIFI_P2P, macro in nm-dbus-interface
 

 

 

-nm_ip_address_set_address, function in NMSettingIPConfig
+NM_DBUS_INTERFACE_DEVICE_WIMAX, macro in nm-dbus-interface
 

 

 

-nm_ip_address_set_address_binary, function in NMSettingIPConfig
+NM_DBUS_INTERFACE_DEVICE_WIRED, macro in nm-dbus-interface
 

 

 

-nm_ip_address_set_attribute, function in NMSettingIPConfig
+NM_DBUS_INTERFACE_DEVICE_WIREGUARD, macro in nm-dbus-interface
 

 

 

-nm_ip_address_set_prefix, function in NMSettingIPConfig
+NM_DBUS_INTERFACE_DEVICE_WIRELESS, macro in nm-dbus-interface
 

 

 

-nm_ip_address_unref, function in NMSettingIPConfig
+NM_DBUS_INTERFACE_DEVICE_WPAN, macro in nm-dbus-interface
 

 

 

-NM_IP_CONFIG_ADDRESSES, macro in NMIPConfig
+NM_DBUS_INTERFACE_DHCP4_CONFIG, macro in nm-dbus-interface
 

 

 

-NM_IP_CONFIG_DOMAINS, macro in NMIPConfig
+NM_DBUS_INTERFACE_DHCP6_CONFIG, macro in nm-dbus-interface
 

 

 

-NM_IP_CONFIG_FAMILY, macro in NMIPConfig
+NM_DBUS_INTERFACE_DNS_MANAGER, macro in nm-dbus-interface
 

 

 

-NM_IP_CONFIG_GATEWAY, macro in NMIPConfig
+NM_DBUS_INTERFACE_IP4_CONFIG, macro in nm-dbus-interface
 

 

 

-nm_ip_config_get_addresses, function in NMIPConfig
+NM_DBUS_INTERFACE_IP6_CONFIG, macro in nm-dbus-interface
 

 

 

-nm_ip_config_get_domains, function in NMIPConfig
+NM_DBUS_INTERFACE_SECRET_AGENT, macro in nm-dbus-interface
 

 

 

-nm_ip_config_get_family, function in NMIPConfig
+NM_DBUS_INTERFACE_SETTINGS, macro in nm-dbus-interface
 

 

 

-nm_ip_config_get_gateway, function in NMIPConfig
+NM_DBUS_INTERFACE_SETTINGS_CONNECTION, macro in nm-dbus-interface
 

 

 

-nm_ip_config_get_nameservers, function in NMIPConfig
+NM_DBUS_INTERFACE_SETTINGS_CONNECTION_SECRETS, macro in nm-dbus-interface
 

 

 

-nm_ip_config_get_routes, function in NMIPConfig
+NM_DBUS_INTERFACE_VPN, macro in nm-vpn-dbus-interface
 

 

 

-nm_ip_config_get_searches, function in NMIPConfig
+NM_DBUS_INTERFACE_VPN_CONNECTION, macro in nm-vpn-dbus-interface
 

 

 

-nm_ip_config_get_wins_servers, function in NMIPConfig
+NM_DBUS_INTERFACE_WIFI_P2P_PEER, macro in nm-dbus-interface
 

 

 

-NM_IP_CONFIG_NAMESERVERS, macro in NMIPConfig
+NM_DBUS_INTERFACE_WIMAX_NSP, macro in nm-dbus-interface
 

 

 

-NM_IP_CONFIG_ROUTES, macro in NMIPConfig
+NM_DBUS_INVALID_VPN_CONNECTION, macro in nm-vpn-dbus-interface
 

 

 

-NM_IP_CONFIG_SEARCHES, macro in NMIPConfig
+NM_DBUS_NO_ACTIVE_VPN_CONNECTION, macro in nm-vpn-dbus-interface
 

 

 

-NM_IP_CONFIG_WINS_SERVERS, macro in NMIPConfig
+NM_DBUS_NO_VPN_CONNECTIONS, macro in nm-vpn-dbus-interface
 

 

 

-NM_IP_ROUTE_ATTRIBUTE_CWND, macro in NMSettingIPConfig
+NM_DBUS_PATH, macro in nm-dbus-interface
 

 

 

-NM_IP_ROUTE_ATTRIBUTE_FROM, macro in NMSettingIPConfig
+NM_DBUS_PATH_ACCESS_POINT, macro in nm-dbus-interface
 

 

 

-NM_IP_ROUTE_ATTRIBUTE_INITCWND, macro in NMSettingIPConfig
+NM_DBUS_PATH_AGENT_MANAGER, macro in nm-dbus-interface
 

 

 

-NM_IP_ROUTE_ATTRIBUTE_INITRWND, macro in NMSettingIPConfig
+NM_DBUS_PATH_DNS_MANAGER, macro in nm-dbus-interface
 

 

 

-NM_IP_ROUTE_ATTRIBUTE_LOCK_CWND, macro in NMSettingIPConfig
+NM_DBUS_PATH_SECRET_AGENT, macro in nm-dbus-interface
 

 

 

-NM_IP_ROUTE_ATTRIBUTE_LOCK_INITCWND, macro in NMSettingIPConfig
+NM_DBUS_PATH_SETTINGS, macro in nm-dbus-interface
 

 

 

-NM_IP_ROUTE_ATTRIBUTE_LOCK_INITRWND, macro in NMSettingIPConfig
+NM_DBUS_PATH_SETTINGS_CONNECTION, macro in nm-dbus-interface
 

 

 

-NM_IP_ROUTE_ATTRIBUTE_LOCK_MTU, macro in NMSettingIPConfig
+NM_DBUS_PATH_VPN, macro in nm-vpn-dbus-interface
 

 

 

-NM_IP_ROUTE_ATTRIBUTE_LOCK_WINDOW, macro in NMSettingIPConfig
+NM_DBUS_PATH_VPN_CONNECTION, macro in nm-vpn-dbus-interface
 

 

 

-NM_IP_ROUTE_ATTRIBUTE_MTU, macro in NMSettingIPConfig
+NM_DBUS_PATH_WIFI_P2P_PEER, macro in nm-dbus-interface
 

 

 

-NM_IP_ROUTE_ATTRIBUTE_ONLINK, macro in NMSettingIPConfig
+NM_DBUS_PATH_WIMAX_NSP, macro in nm-dbus-interface
 

 

 

-NM_IP_ROUTE_ATTRIBUTE_SRC, macro in NMSettingIPConfig
+NM_DBUS_SERVICE, macro in nm-dbus-interface
 

 

 

-NM_IP_ROUTE_ATTRIBUTE_TABLE, macro in NMSettingIPConfig
+NM_DBUS_VPN_ALREADY_STARTED, macro in nm-vpn-dbus-interface
 

 

 

-NM_IP_ROUTE_ATTRIBUTE_TOS, macro in NMSettingIPConfig
+NM_DBUS_VPN_ALREADY_STOPPED, macro in nm-vpn-dbus-interface
 

 

 

-nm_ip_route_attribute_validate, function in NMSettingIPConfig
+NM_DBUS_VPN_BAD_ARGUMENTS, macro in nm-vpn-dbus-interface
 

 

 

-NM_IP_ROUTE_ATTRIBUTE_WINDOW, macro in NMSettingIPConfig
+NM_DBUS_VPN_ERROR_PREFIX, macro in nm-vpn-dbus-interface
 

 

 

-nm_ip_route_dup, function in NMSettingIPConfig
+NM_DBUS_VPN_INTERACTIVE_NOT_SUPPORTED, macro in nm-vpn-dbus-interface
 

 

 

-nm_ip_route_equal, function in NMSettingIPConfig
+NM_DBUS_VPN_SIGNAL_CONNECT_FAILED, macro in nm-vpn-dbus-interface
 

 

 

-nm_ip_route_equal_full, function in NMSettingIPConfig
+NM_DBUS_VPN_SIGNAL_IP4_CONFIG, macro in nm-vpn-dbus-interface
 

 

 

-nm_ip_route_get_attribute, function in NMSettingIPConfig
+NM_DBUS_VPN_SIGNAL_IP_CONFIG_BAD, macro in nm-vpn-dbus-interface
 

 

 

-nm_ip_route_get_attribute_names, function in NMSettingIPConfig
+NM_DBUS_VPN_SIGNAL_LAUNCH_FAILED, macro in nm-vpn-dbus-interface
 

 

 

-nm_ip_route_get_dest, function in NMSettingIPConfig
+NM_DBUS_VPN_SIGNAL_LOGIN_BANNER, macro in nm-vpn-dbus-interface
 

 

 

-nm_ip_route_get_dest_binary, function in NMSettingIPConfig
+NM_DBUS_VPN_SIGNAL_LOGIN_FAILED, macro in nm-vpn-dbus-interface
 

 

 

-nm_ip_route_get_family, function in NMSettingIPConfig
+NM_DBUS_VPN_SIGNAL_STATE_CHANGE, macro in nm-vpn-dbus-interface
 

 

 

-nm_ip_route_get_metric, function in NMSettingIPConfig
+NM_DBUS_VPN_SIGNAL_VPN_CONFIG_BAD, macro in nm-vpn-dbus-interface
 

 

 

-nm_ip_route_get_next_hop, function in NMSettingIPConfig
+NM_DBUS_VPN_STARTING_IN_PROGRESS, macro in nm-vpn-dbus-interface
 

 

 

-nm_ip_route_get_next_hop_binary, function in NMSettingIPConfig
+NM_DBUS_VPN_STOPPING_IN_PROGRESS, macro in nm-vpn-dbus-interface
 

 

 

-nm_ip_route_get_prefix, function in NMSettingIPConfig
+NM_DBUS_VPN_WRONG_STATE, macro in nm-vpn-dbus-interface
 

 

 

-nm_ip_route_get_variant_attribute_spec, function in NMSettingIPConfig
+NM_DEPRECATED_IN_0_9_10, macro in nm-version
 

 

 

-nm_ip_route_new, function in NMSettingIPConfig
+NM_DEPRECATED_IN_0_9_10_FOR, macro in nm-version
 

 

 

-nm_ip_route_new_binary, function in NMSettingIPConfig
+NM_DEPRECATED_IN_1_0, macro in nm-version
 

 

 

-nm_ip_route_ref, function in NMSettingIPConfig
+NM_DEPRECATED_IN_1_0_FOR, macro in nm-version
 

 

 

-nm_ip_route_set_attribute, function in NMSettingIPConfig
+NM_DEPRECATED_IN_1_10, macro in nm-version
 

 

 

-nm_ip_route_set_dest, function in NMSettingIPConfig
+NM_DEPRECATED_IN_1_10_FOR, macro in nm-version
 

 

 

-nm_ip_route_set_dest_binary, function in NMSettingIPConfig
+NM_DEPRECATED_IN_1_12, macro in nm-version
 

 

 

-nm_ip_route_set_metric, function in NMSettingIPConfig
+NM_DEPRECATED_IN_1_12_FOR, macro in nm-version
 

 

 

-nm_ip_route_set_next_hop, function in NMSettingIPConfig
+NM_DEPRECATED_IN_1_14, macro in nm-version
 

 

 

-nm_ip_route_set_next_hop_binary, function in NMSettingIPConfig
+NM_DEPRECATED_IN_1_14_FOR, macro in nm-version
 

 

 

-nm_ip_route_set_prefix, function in NMSettingIPConfig
+NM_DEPRECATED_IN_1_16, macro in nm-version
 

 

 

-nm_ip_route_unref, function in NMSettingIPConfig
+NM_DEPRECATED_IN_1_16_FOR, macro in nm-version
 

 

-
J

 

-nm_jansson_load, function in nm-json
+NM_DEPRECATED_IN_1_2, macro in nm-version
 

 

 

-json_array, macro in nm-json
+NM_DEPRECATED_IN_1_2_FOR, macro in nm-version
 

 

 

-json_array_append_new, macro in nm-json
+NM_DEPRECATED_IN_1_4, macro in nm-version
 

 

 

-json_array_get, macro in nm-json
+NM_DEPRECATED_IN_1_4_FOR, macro in nm-version
 

 

 

-json_array_size, macro in nm-json
+NM_DEPRECATED_IN_1_6, macro in nm-version
 

 

 

-json_delete, macro in nm-json
+NM_DEPRECATED_IN_1_6_FOR, macro in nm-version
 

 

 

-json_dumps, macro in nm-json
+NM_DEPRECATED_IN_1_8, macro in nm-version
 

 

 

-json_false, macro in nm-json
+NM_DEPRECATED_IN_1_8_FOR, macro in nm-vpn-dbus-interface
 

 

 

-json_integer, macro in nm-json
+nm_device_6lowpan_get_hw_address, function in nm-device-6lowpan
 

 

 

-json_integer_value, macro in nm-json
+nm_device_6lowpan_get_parent, function in nm-device-6lowpan
 

 

 

-json_loads, macro in nm-json
+NM_DEVICE_6LOWPAN_HW_ADDRESS, macro in nm-device-6lowpan
 

 

 

-json_object, macro in nm-json
+NM_DEVICE_6LOWPAN_PARENT, macro in nm-device-6lowpan
 

 

 

-json_object_del, macro in nm-json
+NM_DEVICE_ACTIVE_CONNECTION, macro in NMDevice
 

 

 

-json_object_get, macro in nm-json
+NM_DEVICE_ADSL_CARRIER, macro in NMDeviceAdsl
 

 

 

-json_object_iter, macro in nm-json
+nm_device_adsl_get_carrier, function in NMDeviceAdsl
 

 

 

-json_object_iter_key, macro in nm-json
+NM_DEVICE_AUTOCONNECT, macro in NMDevice
 

 

 

-json_object_iter_next, macro in nm-json
+NM_DEVICE_AVAILABLE_CONNECTIONS, macro in NMDevice
 

 

 

-json_object_iter_value, macro in nm-json
+NM_DEVICE_BOND_CARRIER, macro in NMDeviceBond
 

 

 

-json_object_key_to_iter, macro in nm-json
+nm_device_bond_get_carrier, function in NMDeviceBond
 

 

 

-json_object_set_new, macro in nm-json
+nm_device_bond_get_hw_address, function in NMDeviceBond
 

 

 

-json_object_size, macro in nm-json
+nm_device_bond_get_slaves, function in NMDeviceBond
 

 

 

-json_string, macro in nm-json
+NM_DEVICE_BOND_HW_ADDRESS, macro in NMDeviceBond
 

 

 

-json_string_value, macro in nm-json
+NM_DEVICE_BOND_SLAVES, macro in NMDeviceBond
 

 

 

-json_true, macro in nm-json
+NM_DEVICE_BRIDGE_CARRIER, macro in NMDeviceBridge
 

 

-
L

 

-NM_LLDP_ATTR_CHASSIS_ID, macro in nm-dbus-interface
+nm_device_bridge_get_carrier, function in NMDeviceBridge
 

 

 

-NM_LLDP_ATTR_CHASSIS_ID_TYPE, macro in nm-dbus-interface
+nm_device_bridge_get_hw_address, function in NMDeviceBridge
 

 

 

-NM_LLDP_ATTR_DESTINATION, macro in nm-dbus-interface
+nm_device_bridge_get_slaves, function in NMDeviceBridge
 

 

 

-NM_LLDP_ATTR_IEEE_802_1_PPVID, macro in nm-dbus-interface
+NM_DEVICE_BRIDGE_HW_ADDRESS, macro in NMDeviceBridge
 

 

 

-NM_LLDP_ATTR_IEEE_802_1_PPVID_FLAGS, macro in nm-dbus-interface
+NM_DEVICE_BRIDGE_SLAVES, macro in NMDeviceBridge
 

 

 

-NM_LLDP_ATTR_IEEE_802_1_PVID, macro in nm-dbus-interface
+NM_DEVICE_BT_CAPABILITIES, macro in NMDeviceBt
 

 

 

-NM_LLDP_ATTR_IEEE_802_1_VID, macro in nm-dbus-interface
+nm_device_bt_get_capabilities, function in NMDeviceBt
 

 

 

-NM_LLDP_ATTR_IEEE_802_1_VLAN_NAME, macro in nm-dbus-interface
+nm_device_bt_get_hw_address, function in NMDeviceBt
 

 

 

-NM_LLDP_ATTR_PORT_DESCRIPTION, macro in nm-dbus-interface
+nm_device_bt_get_name, function in NMDeviceBt
 

 

 

-NM_LLDP_ATTR_PORT_ID, macro in nm-dbus-interface
+NM_DEVICE_BT_HW_ADDRESS, macro in NMDeviceBt
 

 

 

-NM_LLDP_ATTR_PORT_ID_TYPE, macro in nm-dbus-interface
+NM_DEVICE_BT_NAME, macro in NMDeviceBt
 

 

 

-NM_LLDP_ATTR_SYSTEM_CAPABILITIES, macro in nm-dbus-interface
+NM_DEVICE_CAPABILITIES, macro in NMDevice
 

 

 

-NM_LLDP_ATTR_SYSTEM_DESCRIPTION, macro in nm-dbus-interface
+nm_device_connection_compatible, function in NMDevice
 

 

 

-NM_LLDP_ATTR_SYSTEM_NAME, macro in nm-dbus-interface
+nm_device_connection_valid, function in NMDevice
 

 

 

-NM_LLDP_DEST_NEAREST_BRIDGE, macro in nm-dbus-interface
+nm_device_delete, function in NMDevice
 

 

 

-NM_LLDP_DEST_NEAREST_CUSTOMER_BRIDGE, macro in nm-dbus-interface
+nm_device_delete_async, function in NMDevice
 

 

 

-NM_LLDP_DEST_NEAREST_NON_TPMR_BRIDGE, macro in nm-dbus-interface
+nm_device_delete_finish, function in NMDevice
 

 

 

-nm_lldp_neighbor_get_attr_names, function in NMDevice
+NM_DEVICE_DEVICE_TYPE, macro in NMDevice
 

 

 

-nm_lldp_neighbor_get_attr_string_value, function in NMDevice
+NM_DEVICE_DHCP4_CONFIG, macro in NMDevice
 

 

 

-nm_lldp_neighbor_get_attr_type, function in NMDevice
+NM_DEVICE_DHCP6_CONFIG, macro in NMDevice
 

 

 

-nm_lldp_neighbor_get_attr_uint_value, function in NMDevice
+nm_device_disambiguate_names, function in NMDevice
 

 

 

-nm_lldp_neighbor_new, function in NMDevice
+nm_device_disconnect, function in NMDevice
 

 

 

-nm_lldp_neighbor_ref, function in NMDevice
+nm_device_disconnect_async, function in NMDevice
 

 

 

-nm_lldp_neighbor_unref, function in NMDevice
+nm_device_disconnect_finish, function in NMDevice
 

 

-
M

 

-NMManagerError, enum in nm-errors
+NM_DEVICE_DRIVER, macro in NMDevice
 

 

 

-NM_MANAGER_ERROR, macro in nm-errors
+NM_DEVICE_DRIVER_VERSION, macro in NMDevice
 

 

 

-nm_manager_error_quark, function in nm-errors
+nm_device_dummy_get_hw_address, function in NMDeviceDummy
 

 

 

-NMMetered, enum in nm-dbus-interface
+NM_DEVICE_DUMMY_HW_ADDRESS, macro in NMDeviceDummy
 

 

-
O

 

-NMObject, struct in NMDeviceOvs
+NM_DEVICE_ERROR, macro in nm-errors
 

 

 

-NMObject:dbus-connection, object property in NMDeviceOvs
+nm_device_error_quark, function in nm-errors
 

 

 

-NMObject:dbus-object, object property in NMDeviceOvs
+NM_DEVICE_ETHERNET_CARRIER, macro in NMDeviceEthernet
 

 

 

-NMObject:dbus-object-manager, object property in NMDeviceOvs
+nm_device_ethernet_get_carrier, function in NMDeviceEthernet
 

 

 

-NMObject:path, object property in NMDeviceOvs
+nm_device_ethernet_get_hw_address, function in NMDeviceEthernet
 

 

 

-NM_OBJECT_DBUS_CONNECTION, macro in NMObject
+nm_device_ethernet_get_permanent_hw_address, function in NMDeviceEthernet
 

 

 

-NM_OBJECT_DBUS_OBJECT_MANAGER, macro in NMObject
+nm_device_ethernet_get_s390_subchannels, function in NMDeviceEthernet
 

 

 

-nm_object_get_path, function in NMObject
+nm_device_ethernet_get_speed, function in NMDeviceEthernet
 

 

 

-NM_OBJECT_PATH, macro in NMObject
+NM_DEVICE_ETHERNET_HW_ADDRESS, macro in NMDeviceEthernet
 

 

-
R

 

-NMRemoteConnection, struct in NMDeviceOvs
+NM_DEVICE_ETHERNET_PERMANENT_HW_ADDRESS, macro in NMDeviceEthernet
 

 

 

-NMRemoteConnection:filename, object property in NMDeviceOvs
+NM_DEVICE_ETHERNET_S390_SUBCHANNELS, macro in NMDeviceEthernet
 

 

 

-NMRemoteConnection:flags, object property in NMDeviceOvs
+NM_DEVICE_ETHERNET_SPEED, macro in NMDeviceEthernet
 

 

 

-NMRemoteConnection:unsaved, object property in NMDeviceOvs
+nm_device_filter_connections, function in NMDevice
 

 

 

-NMRemoteConnection:visible, object property in NMDeviceOvs
+NM_DEVICE_FIRMWARE_MISSING, macro in NMDevice
 

 

 

-nm_remote_connection_commit_changes, function in NMRemoteConnection
+NM_DEVICE_FIRMWARE_VERSION, macro in NMDevice
 

 

 

-nm_remote_connection_commit_changes_async, function in NMRemoteConnection
+nm_device_generic_get_hw_address, function in NMDeviceGeneric
 

 

 

-nm_remote_connection_commit_changes_finish, function in NMRemoteConnection
+NM_DEVICE_GENERIC_HW_ADDRESS, macro in NMDeviceGeneric
 

 

 

-NM_REMOTE_CONNECTION_DBUS_CONNECTION, macro in NMRemoteConnection
+NM_DEVICE_GENERIC_TYPE_DESCRIPTION, macro in NMDeviceGeneric
 

 

 

-nm_remote_connection_delete, function in NMRemoteConnection
+nm_device_get_active_connection, function in NMDevice
 

 

 

-nm_remote_connection_delete_async, function in NMRemoteConnection
+nm_device_get_applied_connection, function in NMDevice
 

 

 

-nm_remote_connection_delete_finish, function in NMRemoteConnection
+nm_device_get_applied_connection_async, function in NMDevice
 

 

 

-NM_REMOTE_CONNECTION_FILENAME, macro in NMRemoteConnection
+nm_device_get_applied_connection_finish, function in NMDevice
 

 

 

-NM_REMOTE_CONNECTION_FLAGS, macro in NMRemoteConnection
+nm_device_get_autoconnect, function in NMDevice
 

 

 

-nm_remote_connection_get_filename, function in NMRemoteConnection
+nm_device_get_available_connections, function in NMDevice
 

 

 

-nm_remote_connection_get_flags, function in NMRemoteConnection
+nm_device_get_capabilities, function in NMDevice
 

 

 

-nm_remote_connection_get_secrets, function in NMRemoteConnection
+nm_device_get_connectivity, function in NMDevice
 

 

 

-nm_remote_connection_get_secrets_async, function in NMRemoteConnection
+nm_device_get_description, function in NMDevice
 

 

 

-nm_remote_connection_get_secrets_finish, function in NMRemoteConnection
+nm_device_get_device_type, function in NMDevice
 

 

 

-nm_remote_connection_get_unsaved, function in NMRemoteConnection
+nm_device_get_dhcp4_config, function in NMDevice
 

 

 

-nm_remote_connection_get_visible, function in NMRemoteConnection
+nm_device_get_dhcp6_config, function in NMDevice
 

 

 

-NM_REMOTE_CONNECTION_PATH, macro in NMRemoteConnection
+nm_device_get_driver, function in NMDevice
 

 

 

-nm_remote_connection_save, function in NMRemoteConnection
+nm_device_get_driver_version, function in NMDevice
 

 

 

-nm_remote_connection_save_async, function in NMRemoteConnection
+nm_device_get_firmware_missing, function in NMDevice
 

 

 

-nm_remote_connection_save_finish, function in NMRemoteConnection
+nm_device_get_firmware_version, function in NMDevice
 

 

 

-NM_REMOTE_CONNECTION_UNSAVED, macro in NMRemoteConnection
+nm_device_get_hw_address, function in NMDevice
 

 

 

-nm_remote_connection_update2, function in NMRemoteConnection
+nm_device_get_iface, function in NMDevice
 

 

 

-nm_remote_connection_update2_finish, function in NMRemoteConnection
+nm_device_get_ip4_config, function in NMDevice
 

 

 

-NM_REMOTE_CONNECTION_VISIBLE, macro in NMRemoteConnection
+nm_device_get_ip6_config, function in NMDevice
 

 

 

-NMRollbackResult, enum in nm-dbus-interface
+nm_device_get_ip_iface, function in NMDevice
 

 

-
S

 

-NMSecretAgentCapabilities, enum in nm-dbus-interface
+nm_device_get_lldp_neighbors, function in NMDevice
 

 

 

-NMSecretAgentError, enum in nm-errors
+nm_device_get_managed, function in NMDevice
 

 

 

-NMSecretAgentGetSecretsFlags, enum in nm-dbus-interface
+nm_device_get_metered, function in NMDevice
 

 

 

-NMSecretAgentOld, struct in NMSecretAgentOld
+nm_device_get_mtu, function in NMDevice
 

 

 

-NMSecretAgentOld:auto-register, object property in NMSecretAgentOld
+nm_device_get_nm_plugin_missing, function in NMDevice
 

 

 

-NMSecretAgentOld:capabilities, object property in NMSecretAgentOld
+nm_device_get_physical_port_id, function in NMDevice
 

 

 

-NMSecretAgentOld:identifier, object property in NMSecretAgentOld
+nm_device_get_product, function in NMDevice
 

 

 

-NMSecretAgentOld:registered, object property in NMSecretAgentOld
+nm_device_get_setting_type, function in NMDevice
 

 

 

-NMSecretAgentOldDeleteSecretsFunc, user_function in NMSecretAgentOld
+nm_device_get_state, function in NMDevice
 

 

 

-NMSecretAgentOldGetSecretsFunc, user_function in NMSecretAgentOld
+nm_device_get_state_reason, function in NMDevice
 

 

 

-NMSecretAgentOldSaveSecretsFunc, user_function in NMSecretAgentOld
+nm_device_get_type_description, function in NMDevice
 

 

 

-NM_SECRET_AGENT_ERROR, macro in nm-errors
+nm_device_get_udi, function in NMDevice
 

 

 

-nm_secret_agent_error_quark, function in nm-errors
+nm_device_get_vendor, function in NMDevice
 

 

 

-NM_SECRET_AGENT_OLD_AUTO_REGISTER, macro in NMSecretAgentOld
+NM_DEVICE_INFINIBAND_CARRIER, macro in NMDeviceInfiniband
 

 

 

-NM_SECRET_AGENT_OLD_CAPABILITIES, macro in NMSecretAgentOld
+nm_device_infiniband_get_carrier, function in NMDeviceInfiniband
 

 

 

-nm_secret_agent_old_delete_secrets, function in NMSecretAgentOld
+nm_device_infiniband_get_hw_address, function in NMDeviceInfiniband
 

 

 

-nm_secret_agent_old_get_registered, function in NMSecretAgentOld
+NM_DEVICE_INFINIBAND_HW_ADDRESS, macro in NMDeviceInfiniband
 

 

 

-nm_secret_agent_old_get_secrets, function in NMSecretAgentOld
+NM_DEVICE_INTERFACE, macro in NMDevice
 

 

 

-NM_SECRET_AGENT_OLD_IDENTIFIER, macro in NMSecretAgentOld
+NM_DEVICE_IP4_CONFIG, macro in NMDevice
 

 

 

-nm_secret_agent_old_register, function in NMSecretAgentOld
+NM_DEVICE_IP4_CONNECTIVITY, macro in NMDevice
 

 

 

-NM_SECRET_AGENT_OLD_REGISTERED, macro in NMSecretAgentOld
+NM_DEVICE_IP6_CONFIG, macro in NMDevice
 

 

 

-nm_secret_agent_old_register_async, function in NMSecretAgentOld
+NM_DEVICE_IP6_CONNECTIVITY, macro in NMDevice
 

 

 

-nm_secret_agent_old_register_finish, function in NMSecretAgentOld
+NM_DEVICE_IP_INTERFACE, macro in NMDevice
 

 

 

-nm_secret_agent_old_save_secrets, function in NMSecretAgentOld
+NM_DEVICE_IP_TUNNEL_ENCAPSULATION_LIMIT, macro in NMDeviceIPTunnel
 

 

 

-nm_secret_agent_old_unregister, function in NMSecretAgentOld
+NM_DEVICE_IP_TUNNEL_FLAGS, macro in NMDeviceIPTunnel
 

 

 

-nm_secret_agent_old_unregister_async, function in NMSecretAgentOld
+NM_DEVICE_IP_TUNNEL_FLOW_LABEL, macro in NMDeviceIPTunnel
 

 

 

-nm_secret_agent_old_unregister_finish, function in NMSecretAgentOld
+nm_device_ip_tunnel_get_encapsulation_limit, function in NMDeviceIPTunnel
 

 

 

-NMSetting, struct in NMSetting
+nm_device_ip_tunnel_get_flags, function in NMDeviceIPTunnel
 

 

 

-NMSetting6Lowpan, struct in NMSettingOvs
+nm_device_ip_tunnel_get_flow_label, function in NMDeviceIPTunnel
 

 

 

-NMSetting6Lowpan:parent, object property in NMSettingOvs
+nm_device_ip_tunnel_get_input_key, function in NMDeviceIPTunnel
 

 

 

-NMSetting8021x, struct in NMSetting8021x
+nm_device_ip_tunnel_get_local, function in NMDeviceIPTunnel
 

 

 

-NMSetting8021x:altsubject-matches, object property in NMSetting8021x
+nm_device_ip_tunnel_get_mode, function in NMDeviceIPTunnel
 

 

 

-NMSetting8021x:anonymous-identity, object property in NMSetting8021x
+nm_device_ip_tunnel_get_output_key, function in NMDeviceIPTunnel
 

 

 

-NMSetting8021x:auth-timeout, object property in NMSetting8021x
+nm_device_ip_tunnel_get_parent, function in NMDeviceIPTunnel
 

 

 

-NMSetting8021x:ca-cert, object property in NMSetting8021x
+nm_device_ip_tunnel_get_path_mtu_discovery, function in NMDeviceIPTunnel
 

 

 

-NMSetting8021x:ca-cert-password, object property in NMSetting8021x
+nm_device_ip_tunnel_get_remote, function in NMDeviceIPTunnel
 

 

 

-NMSetting8021x:ca-cert-password-flags, object property in NMSetting8021x
+nm_device_ip_tunnel_get_tos, function in NMDeviceIPTunnel
 

 

 

-NMSetting8021x:ca-path, object property in NMSetting8021x
+nm_device_ip_tunnel_get_ttl, function in NMDeviceIPTunnel
 

 

 

-NMSetting8021x:client-cert, object property in NMSetting8021x
+NM_DEVICE_IP_TUNNEL_INPUT_KEY, macro in NMDeviceIPTunnel
 

 

 

-NMSetting8021x:client-cert-password, object property in NMSetting8021x
+NM_DEVICE_IP_TUNNEL_LOCAL, macro in NMDeviceIPTunnel
 

 

 

-NMSetting8021x:client-cert-password-flags, object property in NMSetting8021x
+NM_DEVICE_IP_TUNNEL_MODE, macro in NMDeviceIPTunnel
 

 

 

-NMSetting8021x:domain-suffix-match, object property in NMSetting8021x
+NM_DEVICE_IP_TUNNEL_OUTPUT_KEY, macro in NMDeviceIPTunnel
 

 

 

-NMSetting8021x:eap, object property in NMSetting8021x
+NM_DEVICE_IP_TUNNEL_PARENT, macro in NMDeviceIPTunnel
 

 

 

-NMSetting8021x:identity, object property in NMSetting8021x
+NM_DEVICE_IP_TUNNEL_PATH_MTU_DISCOVERY, macro in NMDeviceIPTunnel
 

 

 

-NMSetting8021x:pac-file, object property in NMSetting8021x
+NM_DEVICE_IP_TUNNEL_REMOTE, macro in NMDeviceIPTunnel
 

 

 

-NMSetting8021x:password, object property in NMSetting8021x
+NM_DEVICE_IP_TUNNEL_TOS, macro in NMDeviceIPTunnel
 

 

 

-NMSetting8021x:password-flags, object property in NMSetting8021x
+NM_DEVICE_IP_TUNNEL_TTL, macro in NMDeviceIPTunnel
 

 

 

-NMSetting8021x:password-raw, object property in NMSetting8021x
+nm_device_is_real, function in NMDevice
 

 

 

-NMSetting8021x:password-raw-flags, object property in NMSetting8021x
+nm_device_is_software, function in NMDevice
 

 

 

-NMSetting8021x:phase1-auth-flags, object property in NMSetting8021x
+NM_DEVICE_LLDP_NEIGHBORS, macro in NMDevice
 

 

 

-NMSetting8021x:phase1-fast-provisioning, object property in NMSetting8021x
+NM_DEVICE_MACSEC_CIPHER_SUITE, macro in NMDeviceMacsec
 

 

 

-NMSetting8021x:phase1-peaplabel, object property in NMSetting8021x
+NM_DEVICE_MACSEC_ENCODING_SA, macro in NMDeviceMacsec
 

 

 

-NMSetting8021x:phase1-peapver, object property in NMSetting8021x
+NM_DEVICE_MACSEC_ENCRYPT, macro in NMDeviceMacsec
 

 

 

-NMSetting8021x:phase2-altsubject-matches, object property in NMSetting8021x
+NM_DEVICE_MACSEC_ES, macro in NMDeviceMacsec
 

 

 

-NMSetting8021x:phase2-auth, object property in NMSetting8021x
+nm_device_macsec_get_cipher_suite, function in NMDeviceMacsec
 

 

 

-NMSetting8021x:phase2-autheap, object property in NMSetting8021x
+nm_device_macsec_get_encoding_sa, function in NMDeviceMacsec
 

 

 

-NMSetting8021x:phase2-ca-cert, object property in NMSetting8021x
+nm_device_macsec_get_encrypt, function in NMDeviceMacsec
 

 

 

-NMSetting8021x:phase2-ca-cert-password, object property in NMSetting8021x
+nm_device_macsec_get_es, function in NMDeviceMacsec
 

 

 

-NMSetting8021x:phase2-ca-cert-password-flags, object property in NMSetting8021x
+nm_device_macsec_get_hw_address, function in NMDeviceMacsec
 

 

 

-NMSetting8021x:phase2-ca-path, object property in NMSetting8021x
+nm_device_macsec_get_icv_length, function in NMDeviceMacsec
 

 

 

-NMSetting8021x:phase2-client-cert, object property in NMSetting8021x
+nm_device_macsec_get_include_sci, function in NMDeviceMacsec
 

 

 

-NMSetting8021x:phase2-client-cert-password, object property in NMSetting8021x
+nm_device_macsec_get_parent, function in NMDeviceMacsec
 

 

 

-NMSetting8021x:phase2-client-cert-password-flags, object property in NMSetting8021x
+nm_device_macsec_get_protect, function in NMDeviceMacsec
 

 

 

-NMSetting8021x:phase2-domain-suffix-match, object property in NMSetting8021x
+nm_device_macsec_get_replay_protect, function in NMDeviceMacsec
 

 

 

-NMSetting8021x:phase2-private-key, object property in NMSetting8021x
+nm_device_macsec_get_scb, function in NMDeviceMacsec
 

 

 

-NMSetting8021x:phase2-private-key-password, object property in NMSetting8021x
+nm_device_macsec_get_sci, function in NMDeviceMacsec
 

 

 

-NMSetting8021x:phase2-private-key-password-flags, object property in NMSetting8021x
+nm_device_macsec_get_validation, function in NMDeviceMacsec
 

 

 

-NMSetting8021x:phase2-subject-match, object property in NMSetting8021x
+nm_device_macsec_get_window, function in NMDeviceMacsec
 

 

 

-NMSetting8021x:pin, object property in NMSetting8021x
+NM_DEVICE_MACSEC_HW_ADDRESS, macro in NMDeviceMacsec
 

 

 

-NMSetting8021x:pin-flags, object property in NMSetting8021x
+NM_DEVICE_MACSEC_ICV_LENGTH, macro in NMDeviceMacsec
 

 

 

-NMSetting8021x:private-key, object property in NMSetting8021x
+NM_DEVICE_MACSEC_INCLUDE_SCI, macro in NMDeviceMacsec
 

 

 

-NMSetting8021x:private-key-password, object property in NMSetting8021x
+NM_DEVICE_MACSEC_PARENT, macro in NMDeviceMacsec
 

 

 

-NMSetting8021x:private-key-password-flags, object property in NMSetting8021x
+NM_DEVICE_MACSEC_PROTECT, macro in NMDeviceMacsec
 

 

 

-NMSetting8021x:subject-match, object property in NMSetting8021x
+NM_DEVICE_MACSEC_REPLAY_PROTECT, macro in NMDeviceMacsec
 

 

 

-NMSetting8021x:system-ca-certs, object property in NMSetting8021x
+NM_DEVICE_MACSEC_SCB, macro in NMDeviceMacsec
 

 

 

-NMSetting8021xAuthFlags, enum in NMSetting8021x
+NM_DEVICE_MACSEC_SCI, macro in NMDeviceMacsec
 

 

 

-NMSetting8021xCKFormat, enum in NMSetting8021x
+NM_DEVICE_MACSEC_VALIDATION, macro in NMDeviceMacsec
 

 

 

-NMSetting8021xCKScheme, enum in NMSetting8021x
+NM_DEVICE_MACSEC_WINDOW, macro in NMDeviceMacsec
 

 

 

-NMSetting:name, object property in NMSetting
+nm_device_macvlan_get_hw_address, function in NMDeviceMacvlan
 

 

 

-NMSettingAdsl, struct in NMSettingAdsl
+nm_device_macvlan_get_mode, function in NMDeviceMacvlan
 

 

 

-NMSettingAdsl:encapsulation, object property in NMSettingAdsl
+nm_device_macvlan_get_no_promisc, function in NMDeviceMacvlan
 

 

 

-NMSettingAdsl:password, object property in NMSettingAdsl
+nm_device_macvlan_get_parent, function in NMDeviceMacvlan
 

 

 

-NMSettingAdsl:password-flags, object property in NMSettingAdsl
+nm_device_macvlan_get_tap, function in NMDeviceMacvlan
 

 

 

-NMSettingAdsl:protocol, object property in NMSettingAdsl
+NM_DEVICE_MACVLAN_HW_ADDRESS, macro in NMDeviceMacvlan
 

 

 

-NMSettingAdsl:username, object property in NMSettingAdsl
+NM_DEVICE_MACVLAN_MODE, macro in NMDeviceMacvlan
 

 

 

-NMSettingAdsl:vci, object property in NMSettingAdsl
+NM_DEVICE_MACVLAN_NO_PROMISC, macro in NMDeviceMacvlan
 

 

 

-NMSettingAdsl:vpi, object property in NMSettingAdsl
+NM_DEVICE_MACVLAN_PARENT, macro in NMDeviceMacvlan
 

 

 

-NMSettingBluetooth, struct in NMSettingBluetooth
+NM_DEVICE_MACVLAN_TAP, macro in NMDeviceMacvlan
 

 

 

-NMSettingBluetooth:bdaddr, object property in NMSettingBluetooth
+NM_DEVICE_MANAGED, macro in NMDevice
 

 

 

-NMSettingBluetooth:type, object property in NMSettingBluetooth
+NM_DEVICE_METERED, macro in NMDevice
 

 

 

-NMSettingBond, struct in NMSettingBond
+NM_DEVICE_MODEM_CURRENT_CAPABILITIES, macro in NMDeviceModem
 

 

 

-NMSettingBond:options, object property in NMSettingBond
+nm_device_modem_get_current_capabilities, function in NMDeviceModem
 

 

 

-NMSettingBridge, struct in NMSettingBridge
+nm_device_modem_get_modem_capabilities, function in NMDeviceModem
 

 

 

-NMSettingBridge:ageing-time, object property in NMSettingBridge
+NM_DEVICE_MODEM_MODEM_CAPABILITIES, macro in NMDeviceModem
 

 

 

-NMSettingBridge:forward-delay, object property in NMSettingBridge
+NM_DEVICE_MTU, macro in NMDevice
 

 

 

-NMSettingBridge:group-forward-mask, object property in NMSettingBridge
+NM_DEVICE_NM_PLUGIN_MISSING, macro in NMDevice
 

 

 

-NMSettingBridge:hello-time, object property in NMSettingBridge
+NM_DEVICE_OLPC_MESH_ACTIVE_CHANNEL, macro in NMDeviceOlpcMesh
 

 

 

-NMSettingBridge:mac-address, object property in NMSettingBridge
+NM_DEVICE_OLPC_MESH_COMPANION, macro in NMDeviceOlpcMesh
 

 

 

-NMSettingBridge:max-age, object property in NMSettingBridge
+nm_device_olpc_mesh_get_active_channel, function in NMDeviceOlpcMesh
 

 

 

-NMSettingBridge:multicast-snooping, object property in NMSettingBridge
+nm_device_olpc_mesh_get_companion, function in NMDeviceOlpcMesh
 

 

 

-NMSettingBridge:priority, object property in NMSettingBridge
+nm_device_olpc_mesh_get_hw_address, function in NMDeviceOlpcMesh
 

 

 

-NMSettingBridge:stp, object property in NMSettingBridge
+NM_DEVICE_OLPC_MESH_HW_ADDRESS, macro in NMDeviceOlpcMesh
 

 

 

-NMSettingBridgePort, struct in NMSettingBridgePort
+nm_device_ovs_bridge_get_slaves, function in NMDeviceOvsBridge
 

 

 

-NMSettingBridgePort:hairpin-mode, object property in NMSettingBridgePort
+NM_DEVICE_OVS_BRIDGE_SLAVES, macro in NMDeviceOvsBridge
 

 

 

-NMSettingBridgePort:path-cost, object property in NMSettingBridgePort
+nm_device_ovs_port_get_slaves, function in NMDeviceOvsPort
 

 

 

-NMSettingBridgePort:priority, object property in NMSettingBridgePort
+NM_DEVICE_OVS_PORT_SLAVES, macro in NMDeviceOvsPort
 

 

 

-NMSettingCdma, struct in NMSettingCdma
+NM_DEVICE_PHYSICAL_PORT_ID, macro in NMDevice
 

 

 

-NMSettingCdma:mtu, object property in NMSettingCdma
+NM_DEVICE_PRODUCT, macro in NMDevice
 

 

 

-NMSettingCdma:number, object property in NMSettingCdma
+NM_DEVICE_REAL, macro in NMDevice
 

 

 

-NMSettingCdma:password, object property in NMSettingCdma
+nm_device_reapply, function in NMDevice
 

 

 

-NMSettingCdma:password-flags, object property in NMSettingCdma
+nm_device_reapply_async, function in NMDevice
 

 

 

-NMSettingCdma:username, object property in NMSettingCdma
+nm_device_reapply_finish, function in NMDevice
 

 

 

-NMSettingClearSecretsWithFlagsFn, user_function in NMSetting
+nm_device_set_autoconnect, function in NMDevice
 

 

 

-NMSettingCompareFlags, enum in NMSetting
+nm_device_set_managed, function in NMDevice
 

 

 

-NMSettingConnection, struct in NMSettingConnection
+NM_DEVICE_STATE, macro in NMDevice
 

 

 

-NMSettingConnection:auth-retries, object property in NMSettingConnection
+NM_DEVICE_STATE_REASON, macro in NMDevice
 

 

 

-NMSettingConnection:autoconnect, object property in NMSettingConnection
+NM_DEVICE_TEAM_CARRIER, macro in NMDeviceTeam
 

 

 

-NMSettingConnection:autoconnect-priority, object property in NMSettingConnection
+NM_DEVICE_TEAM_CONFIG, macro in NMDeviceTeam
 

 

 

-NMSettingConnection:autoconnect-retries, object property in NMSettingConnection
+nm_device_team_get_carrier, function in NMDeviceTeam
 

 

 

-NMSettingConnection:autoconnect-slaves, object property in NMSettingConnection
+nm_device_team_get_config, function in NMDeviceTeam
 

 

 

-NMSettingConnection:gateway-ping-timeout, object property in NMSettingConnection
+nm_device_team_get_hw_address, function in NMDeviceTeam
 

 

 

-NMSettingConnection:id, object property in NMSettingConnection
+nm_device_team_get_slaves, function in NMDeviceTeam
 

 

 

-NMSettingConnection:interface-name, object property in NMSettingConnection
+NM_DEVICE_TEAM_HW_ADDRESS, macro in NMDeviceTeam
 

 

 

-NMSettingConnection:lldp, object property in NMSettingConnection
+NM_DEVICE_TEAM_SLAVES, macro in NMDeviceTeam
 

 

 

-NMSettingConnection:llmnr, object property in NMSettingConnection
+nm_device_tun_get_group, function in NMDeviceTun
 

 

 

-NMSettingConnection:master, object property in NMSettingConnection
+nm_device_tun_get_hw_address, function in NMDeviceTun
 

 

 

-NMSettingConnection:mdns, object property in NMSettingConnection
+nm_device_tun_get_mode, function in NMDeviceTun
 

 

 

-NMSettingConnection:metered, object property in NMSettingConnection
+nm_device_tun_get_multi_queue, function in NMDeviceTun
 

 

 

-NMSettingConnection:multi-connect, object property in NMSettingConnection
+nm_device_tun_get_no_pi, function in NMDeviceTun
 

 

 

-NMSettingConnection:permissions, object property in NMSettingConnection
+nm_device_tun_get_owner, function in NMDeviceTun
 

 

 

-NMSettingConnection:read-only, object property in NMSettingConnection
+nm_device_tun_get_vnet_hdr, function in NMDeviceTun
 

 

 

-NMSettingConnection:secondaries, object property in NMSettingConnection
+NM_DEVICE_TUN_GROUP, macro in NMDeviceTun
 

 

 

-NMSettingConnection:slave-type, object property in NMSettingConnection
+NM_DEVICE_TUN_HW_ADDRESS, macro in NMDeviceTun
 

 

 

-NMSettingConnection:stable-id, object property in NMSettingConnection
+NM_DEVICE_TUN_MODE, macro in NMDeviceTun
 

 

 

-NMSettingConnection:timestamp, object property in NMSettingConnection
+NM_DEVICE_TUN_MULTI_QUEUE, macro in NMDeviceTun
 

 

 

-NMSettingConnection:type, object property in NMSettingConnection
+NM_DEVICE_TUN_NO_PI, macro in NMDeviceTun
 

 

 

-NMSettingConnection:uuid, object property in NMSettingConnection
+NM_DEVICE_TUN_OWNER, macro in NMDeviceTun
 

 

 

-NMSettingConnection:zone, object property in NMSettingConnection
+NM_DEVICE_TUN_VNET_HDR, macro in NMDeviceTun
 

 

 

-NMSettingConnectionAutoconnectSlaves, enum in NMSettingConnection
+NM_DEVICE_UDI, macro in NMDevice
 

 

 

-NMSettingConnectionLldp, enum in NMSettingConnection
+NM_DEVICE_VENDOR, macro in NMDevice
 

 

 

-NMSettingConnectionLlmnr, enum in NMSettingConnection
+NM_DEVICE_VLAN_CARRIER, macro in NMDeviceVlan
 

 

 

-NMSettingConnectionMdns, enum in NMSettingConnection
+nm_device_vlan_get_carrier, function in NMDeviceVlan
 

 

 

-NMSettingDcb, struct in NMSettingDcb
+nm_device_vlan_get_hw_address, function in NMDeviceVlan
 

 

 

-NMSettingDcb:app-fcoe-flags, object property in NMSettingDcb
+nm_device_vlan_get_parent, function in NMDeviceVlan
 

 

 

-NMSettingDcb:app-fcoe-mode, object property in NMSettingDcb
+nm_device_vlan_get_vlan_id, function in NMDeviceVlan
 

 

 

-NMSettingDcb:app-fcoe-priority, object property in NMSettingDcb
+NM_DEVICE_VLAN_HW_ADDRESS, macro in NMDeviceVlan
 

 

 

-NMSettingDcb:app-fip-flags, object property in NMSettingDcb
+NM_DEVICE_VLAN_PARENT, macro in NMDeviceVlan
 

 

 

-NMSettingDcb:app-fip-priority, object property in NMSettingDcb
+NM_DEVICE_VLAN_VLAN_ID, macro in NMDeviceVlan
 

 

 

-NMSettingDcb:app-iscsi-flags, object property in NMSettingDcb
+NM_DEVICE_VXLAN_AGEING, macro in NMDeviceVxlan
 

 

 

-NMSettingDcb:app-iscsi-priority, object property in NMSettingDcb
+NM_DEVICE_VXLAN_CARRIER, macro in NMDeviceVxlan
 

 

 

-NMSettingDcb:priority-bandwidth, object property in NMSettingDcb
+NM_DEVICE_VXLAN_DST_PORT, macro in NMDeviceVxlan
 

 

 

-NMSettingDcb:priority-flow-control, object property in NMSettingDcb
+nm_device_vxlan_get_ageing, function in NMDeviceVxlan
 

 

 

-NMSettingDcb:priority-flow-control-flags, object property in NMSettingDcb
+nm_device_vxlan_get_carrier, function in NMDeviceVxlan
 

 

 

-NMSettingDcb:priority-group-bandwidth, object property in NMSettingDcb
+nm_device_vxlan_get_dst_port, function in NMDeviceVxlan
 

 

 

-NMSettingDcb:priority-group-flags, object property in NMSettingDcb
+nm_device_vxlan_get_group, function in NMDeviceVxlan
 

 

 

-NMSettingDcb:priority-group-id, object property in NMSettingDcb
+nm_device_vxlan_get_hw_address, function in NMDeviceVxlan
 

 

 

-NMSettingDcb:priority-strict-bandwidth, object property in NMSettingDcb
+nm_device_vxlan_get_id, function in NMDeviceVxlan
 

 

 

-NMSettingDcb:priority-traffic-class, object property in NMSettingDcb
+nm_device_vxlan_get_l2miss, function in NMDeviceVxlan
 

 

 

-NMSettingDcbFlags, enum in NMSettingDcb
+nm_device_vxlan_get_l3miss, function in NMDeviceVxlan
 

 

 

-NMSettingDiffResult, enum in NMSetting
+nm_device_vxlan_get_learning, function in NMDeviceVxlan
 

 

 

-NMSettingDummy, struct in NMSettingDummy
+nm_device_vxlan_get_limit, function in NMDeviceVxlan
 

 

 

-NMSettingEthtool, struct in NMSettingOvs
+nm_device_vxlan_get_local, function in NMDeviceVxlan
 

 

 

-NMSettingGeneric, struct in NMSettingGeneric
+nm_device_vxlan_get_parent, function in NMDeviceVxlan
 

 

 

-NMSettingGsm, struct in NMSettingGsm
+nm_device_vxlan_get_proxy, function in NMDeviceVxlan
 

 

 

-NMSettingGsm:apn, object property in NMSettingGsm
+nm_device_vxlan_get_rsc, function in NMDeviceVxlan
 

 

 

-NMSettingGsm:device-id, object property in NMSettingGsm
+nm_device_vxlan_get_src_port_max, function in NMDeviceVxlan
 

 

 

-NMSettingGsm:home-only, object property in NMSettingGsm
+nm_device_vxlan_get_src_port_min, function in NMDeviceVxlan
 

 

 

-NMSettingGsm:mtu, object property in NMSettingGsm
+nm_device_vxlan_get_tos, function in NMDeviceVxlan
 

 

 

-NMSettingGsm:network-id, object property in NMSettingGsm
+nm_device_vxlan_get_ttl, function in NMDeviceVxlan
 

 

 

-NMSettingGsm:number, object property in NMSettingGsm
+NM_DEVICE_VXLAN_GROUP, macro in NMDeviceVxlan
 

 

 

-NMSettingGsm:password, object property in NMSettingGsm
+NM_DEVICE_VXLAN_HW_ADDRESS, macro in NMDeviceVxlan
 

 

 

-NMSettingGsm:password-flags, object property in NMSettingGsm
+NM_DEVICE_VXLAN_ID, macro in NMDeviceVxlan
 

 

 

-NMSettingGsm:pin, object property in NMSettingGsm
+NM_DEVICE_VXLAN_L2MISS, macro in NMDeviceVxlan
 

 

 

-NMSettingGsm:pin-flags, object property in NMSettingGsm
+NM_DEVICE_VXLAN_L3MISS, macro in NMDeviceVxlan
 

 

 

-NMSettingGsm:sim-id, object property in NMSettingGsm
+NM_DEVICE_VXLAN_LEARNING, macro in NMDeviceVxlan
 

 

 

-NMSettingGsm:sim-operator-id, object property in NMSettingGsm
+NM_DEVICE_VXLAN_LIMIT, macro in NMDeviceVxlan
 

 

 

-NMSettingGsm:username, object property in NMSettingGsm
+NM_DEVICE_VXLAN_LOCAL, macro in NMDeviceVxlan
 

 

 

-NMSettingInfiniband, struct in NMSettingInfiniband
+NM_DEVICE_VXLAN_PARENT, macro in NMDeviceVxlan
 

 

 

-NMSettingInfiniband:mac-address, object property in NMSettingInfiniband
+NM_DEVICE_VXLAN_PROXY, macro in NMDeviceVxlan
 

 

 

-NMSettingInfiniband:mtu, object property in NMSettingInfiniband
+NM_DEVICE_VXLAN_RSC, macro in NMDeviceVxlan
 

 

 

-NMSettingInfiniband:p-key, object property in NMSettingInfiniband
+NM_DEVICE_VXLAN_SRC_PORT_MAX, macro in NMDeviceVxlan
 

 

 

-NMSettingInfiniband:parent, object property in NMSettingInfiniband
+NM_DEVICE_VXLAN_SRC_PORT_MIN, macro in NMDeviceVxlan
 

 

 

-NMSettingInfiniband:transport-mode, object property in NMSettingInfiniband
+NM_DEVICE_VXLAN_TOS, macro in NMDeviceVxlan
 

 

 

-NMSettingIP4Config, struct in NMSettingIP4Config
+NM_DEVICE_VXLAN_TTL, macro in NMDeviceVxlan
 

 

 

-NMSettingIP4Config:dhcp-client-id, object property in NMSettingIP4Config
+NM_DEVICE_WIFI_ACCESS_POINTS, macro in NMDeviceWifi
 

 

 

-NMSettingIP4Config:dhcp-fqdn, object property in NMSettingIP4Config
+NM_DEVICE_WIFI_ACTIVE_ACCESS_POINT, macro in NMDeviceWifi
 

 

 

-NMSettingIP6Config, struct in NMSettingIP6Config
+NM_DEVICE_WIFI_BITRATE, macro in NMDeviceWifi
 

 

 

-NMSettingIP6Config:addr-gen-mode, object property in NMSettingIP6Config
+NM_DEVICE_WIFI_CAPABILITIES, macro in NMDeviceWifi
 

 

 

-NMSettingIP6Config:dhcp-duid, object property in NMSettingIP6Config
+nm_device_wifi_get_access_points, function in NMDeviceWifi
 

 

 

-NMSettingIP6Config:ip6-privacy, object property in NMSettingIP6Config
+nm_device_wifi_get_access_point_by_path, function in NMDeviceWifi
 

 

 

-NMSettingIP6Config:token, object property in NMSettingIP6Config
+nm_device_wifi_get_active_access_point, function in NMDeviceWifi
 

 

 

-NMSettingIP6ConfigAddrGenMode, enum in NMSettingIP6Config
+nm_device_wifi_get_bitrate, function in NMDeviceWifi
 

 

 

-NMSettingIP6ConfigPrivacy, enum in NMSettingIP6Config
+nm_device_wifi_get_capabilities, function in NMDeviceWifi
 

 

 

-NMSettingIPConfig, struct in NMSettingIPConfig
+nm_device_wifi_get_hw_address, function in NMDeviceWifi
 

 

 

-NMSettingIPConfig:addresses, object property in NMSettingIPConfig
+nm_device_wifi_get_last_scan, function in NMDeviceWifi
 

 

 

-NMSettingIPConfig:dad-timeout, object property in NMSettingIPConfig
+nm_device_wifi_get_mode, function in NMDeviceWifi
 

 

 

-NMSettingIPConfig:dhcp-hostname, object property in NMSettingIPConfig
+nm_device_wifi_get_permanent_hw_address, function in NMDeviceWifi
 

 

 

-NMSettingIPConfig:dhcp-send-hostname, object property in NMSettingIPConfig
+NM_DEVICE_WIFI_HW_ADDRESS, macro in NMDeviceWifi
 

 

 

-NMSettingIPConfig:dhcp-timeout, object property in NMSettingIPConfig
+NM_DEVICE_WIFI_LAST_SCAN, macro in NMDeviceWifi
 

 

 

-NMSettingIPConfig:dns, object property in NMSettingIPConfig
+NM_DEVICE_WIFI_MODE, macro in NMDeviceWifi
 

 

 

-NMSettingIPConfig:dns-options, object property in NMSettingIPConfig
+nm_device_wifi_p2p_get_hw_address, function in NMDeviceWifiP2P
 

 

 

-NMSettingIPConfig:dns-priority, object property in NMSettingIPConfig
+nm_device_wifi_p2p_get_peers, function in NMDeviceWifiP2P
 

 

 

-NMSettingIPConfig:dns-search, object property in NMSettingIPConfig
+nm_device_wifi_p2p_get_peer_by_path, function in NMDeviceWifiP2P
 

 

 

-NMSettingIPConfig:gateway, object property in NMSettingIPConfig
+NM_DEVICE_WIFI_P2P_HW_ADDRESS, macro in NMDeviceWifiP2P
 

 

 

-NMSettingIPConfig:ignore-auto-dns, object property in NMSettingIPConfig
+NM_DEVICE_WIFI_P2P_PEERS, macro in NMDeviceWifiP2P
 

 

 

-NMSettingIPConfig:ignore-auto-routes, object property in NMSettingIPConfig
+nm_device_wifi_p2p_start_find, function in NMDeviceWifiP2P
 

 

 

-NMSettingIPConfig:may-fail, object property in NMSettingIPConfig
+nm_device_wifi_p2p_start_find_finish, function in NMDeviceWifiP2P
 

 

 

-NMSettingIPConfig:method, object property in NMSettingIPConfig
+nm_device_wifi_p2p_stop_find, function in NMDeviceWifiP2P
 

 

 

-NMSettingIPConfig:never-default, object property in NMSettingIPConfig
+nm_device_wifi_p2p_stop_find_finish, function in NMDeviceWifiP2P
 

 

 

-NMSettingIPConfig:route-metric, object property in NMSettingIPConfig
+NM_DEVICE_WIFI_P2P_WFDIES, macro in NMDeviceWifiP2P
 

 

 

-NMSettingIPConfig:route-table, object property in NMSettingIPConfig
+NM_DEVICE_WIFI_PERMANENT_HW_ADDRESS, macro in NMDeviceWifi
 

 

 

-NMSettingIPConfig:routes, object property in NMSettingIPConfig
+nm_device_wifi_request_scan, function in NMDeviceWifi
 

 

 

-NMSettingIPTunnel, struct in NMSettingIPTunnel
+nm_device_wifi_request_scan_async, function in NMDeviceWifi
 

 

 

-NMSettingIPTunnel:encapsulation-limit, object property in NMSettingIPTunnel
+nm_device_wifi_request_scan_finish, function in NMDeviceWifi
 

 

 

-NMSettingIPTunnel:flags, object property in NMSettingIPTunnel
+nm_device_wifi_request_scan_options, function in NMDeviceWifi
 

 

 

-NMSettingIPTunnel:flow-label, object property in NMSettingIPTunnel
+nm_device_wifi_request_scan_options_async, function in NMDeviceWifi
 

 

 

-NMSettingIPTunnel:input-key, object property in NMSettingIPTunnel
+NM_DEVICE_WIMAX_ACTIVE_NSP, macro in NMDeviceWimax
 

 

 

-NMSettingIPTunnel:local, object property in NMSettingIPTunnel
+NM_DEVICE_WIMAX_BSID, macro in NMDeviceWimax
 

 

 

-NMSettingIPTunnel:mode, object property in NMSettingIPTunnel
+NM_DEVICE_WIMAX_CENTER_FREQUENCY, macro in NMDeviceWimax
 

 

 

-NMSettingIPTunnel:mtu, object property in NMSettingIPTunnel
+NM_DEVICE_WIMAX_CINR, macro in NMDeviceWimax
 

 

 

-NMSettingIPTunnel:output-key, object property in NMSettingIPTunnel
+nm_device_wimax_get_active_nsp, function in NMDeviceWimax
 

 

 

-NMSettingIPTunnel:parent, object property in NMSettingIPTunnel
+nm_device_wimax_get_bsid, function in NMDeviceWimax
 

 

 

-NMSettingIPTunnel:path-mtu-discovery, object property in NMSettingIPTunnel
+nm_device_wimax_get_center_frequency, function in NMDeviceWimax
 

 

 

-NMSettingIPTunnel:remote, object property in NMSettingIPTunnel
+nm_device_wimax_get_cinr, function in NMDeviceWimax
 

 

 

-NMSettingIPTunnel:tos, object property in NMSettingIPTunnel
+nm_device_wimax_get_hw_address, function in NMDeviceWimax
 

 

 

-NMSettingIPTunnel:ttl, object property in NMSettingIPTunnel
+nm_device_wimax_get_nsps, function in NMDeviceWimax
 

 

 

-NMSettingMacRandomization, enum in NMSetting
+nm_device_wimax_get_nsp_by_path, function in NMDeviceWimax
 

 

 

-NMSettingMacsec, struct in NMSettingMacsec
+nm_device_wimax_get_rssi, function in NMDeviceWimax
 

 

 

-NMSettingMacsec:encrypt, object property in NMSettingMacsec
+nm_device_wimax_get_tx_power, function in NMDeviceWimax
 

 

 

-NMSettingMacsec:mka-cak, object property in NMSettingMacsec
+NM_DEVICE_WIMAX_HW_ADDRESS, macro in NMDeviceWimax
 

 

 

-NMSettingMacsec:mka-cak-flags, object property in NMSettingMacsec
+NM_DEVICE_WIMAX_NSPS, macro in NMDeviceWimax
 

 

 

-NMSettingMacsec:mka-ckn, object property in NMSettingMacsec
+NM_DEVICE_WIMAX_RSSI, macro in NMDeviceWimax
 

 

 

-NMSettingMacsec:mode, object property in NMSettingMacsec
+NM_DEVICE_WIMAX_TX_POWER, macro in NMDeviceWimax
 

 

 

-NMSettingMacsec:parent, object property in NMSettingMacsec
+NM_DEVICE_WIREGUARD_FWMARK, macro in NMDeviceWireGuard
 

 

 

-NMSettingMacsec:port, object property in NMSettingMacsec
+nm_device_wireguard_get_fwmark, function in NMDeviceWireGuard
 

 

 

-NMSettingMacsec:send-sci, object property in NMSettingMacsec
+nm_device_wireguard_get_listen_port, function in NMDeviceWireGuard
 

 

 

-NMSettingMacsec:validation, object property in NMSettingMacsec
+nm_device_wireguard_get_public_key, function in NMDeviceWireGuard
 

 

 

-NMSettingMacsecMode, enum in NMSettingMacsec
+NM_DEVICE_WIREGUARD_LISTEN_PORT, macro in NMDeviceWireGuard
 

 

 

-NMSettingMacsecValidation, enum in NMSettingMacsec
+NM_DEVICE_WIREGUARD_PUBLIC_KEY, macro in NMDeviceWireGuard
 

 

 

-NMSettingMacvlan, struct in NMSettingMacvlan
+nm_device_wpan_get_hw_address, function in nm-device-wpan
 

 

 

-NMSettingMacvlan:mode, object property in NMSettingMacvlan
+NM_DEVICE_WPAN_HW_ADDRESS, macro in nm-device-wpan
 

 

 

-NMSettingMacvlan:parent, object property in NMSettingMacvlan
+NM_DHCP_CONFIG_FAMILY, macro in NMDhcpConfig
 

 

 

-NMSettingMacvlan:promiscuous, object property in NMSettingMacvlan
+nm_dhcp_config_get_family, function in NMDhcpConfig
 

 

 

-NMSettingMacvlan:tap, object property in NMSettingMacvlan
+nm_dhcp_config_get_one_option, function in NMDhcpConfig
 

 

 

-NMSettingMacvlanMode, enum in NMSettingMacvlan
+nm_dhcp_config_get_options, function in NMDhcpConfig
 

 

 

-NMSettingMatch, struct in NMSettingOvs
+NM_DHCP_CONFIG_OPTIONS, macro in NMDhcpConfig
 

 

 

-NMSettingMatch:interface-name, object property in NMSettingOvs
+nm_dns_entry_get_domains, function in NMClient
 

 

 

-NMSettingOlpcMesh, struct in NMSettingOlpcMesh
+nm_dns_entry_get_interface, function in NMClient
 

 

 

-NMSettingOlpcMesh:channel, object property in NMSettingOlpcMesh
+nm_dns_entry_get_nameservers, function in NMClient
 

 

 

-NMSettingOlpcMesh:dhcp-anycast-address, object property in NMSettingOlpcMesh
+nm_dns_entry_get_priority, function in NMClient
 

 

 

-NMSettingOlpcMesh:ssid, object property in NMSettingOlpcMesh
+nm_dns_entry_get_vpn, function in NMClient
 

 

 

-NMSettingOvsBridge, struct in NMSettingOvs
+nm_dns_entry_unref, function in NMClient
 

 

 

-NMSettingOvsBridge:fail-mode, object property in NMSettingOvs
+NM_ETHTOOL_OPTNAME_FEATURE_ESP_HW_OFFLOAD, macro in NMSettingEthtool
 

 

 

-NMSettingOvsBridge:mcast-snooping-enable, object property in NMSettingOvs
+NM_ETHTOOL_OPTNAME_FEATURE_ESP_TX_CSUM_HW_OFFLOAD, macro in NMSettingEthtool
 

 

 

-NMSettingOvsBridge:rstp-enable, object property in NMSettingOvs
+NM_ETHTOOL_OPTNAME_FEATURE_FCOE_MTU, macro in NMSettingEthtool
 

 

 

-NMSettingOvsBridge:stp-enable, object property in NMSettingOvs
+NM_ETHTOOL_OPTNAME_FEATURE_GRO, macro in NMSettingEthtool
 

 

 

-NMSettingOvsInterface, struct in NMSettingOvs
+NM_ETHTOOL_OPTNAME_FEATURE_GSO, macro in NMSettingEthtool
 

 

 

-NMSettingOvsInterface:type, object property in NMSettingOvs
+NM_ETHTOOL_OPTNAME_FEATURE_HIGHDMA, macro in NMSettingEthtool
 

 

 

-NMSettingOvsPatch, struct in NMSettingOvs
+NM_ETHTOOL_OPTNAME_FEATURE_HW_TC_OFFLOAD, macro in NMSettingEthtool
 

 

 

-NMSettingOvsPatch:peer, object property in NMSettingOvs
+NM_ETHTOOL_OPTNAME_FEATURE_L2_FWD_OFFLOAD, macro in NMSettingEthtool
 

 

 

-NMSettingOvsPort, struct in NMSettingOvs
+NM_ETHTOOL_OPTNAME_FEATURE_LOOPBACK, macro in NMSettingEthtool
 

 

 

-NMSettingOvsPort:bond-downdelay, object property in NMSettingOvs
+NM_ETHTOOL_OPTNAME_FEATURE_LRO, macro in NMSettingEthtool
 

 

 

-NMSettingOvsPort:bond-mode, object property in NMSettingOvs
+NM_ETHTOOL_OPTNAME_FEATURE_NTUPLE, macro in NMSettingEthtool
 

 

 

-NMSettingOvsPort:bond-updelay, object property in NMSettingOvs
+NM_ETHTOOL_OPTNAME_FEATURE_RX, macro in NMSettingEthtool
 

 

 

-NMSettingOvsPort:lacp, object property in NMSettingOvs
+NM_ETHTOOL_OPTNAME_FEATURE_RXHASH, macro in NMSettingEthtool
 

 

 

-NMSettingOvsPort:tag, object property in NMSettingOvs
+NM_ETHTOOL_OPTNAME_FEATURE_RXVLAN, macro in NMSettingEthtool
 

 

 

-NMSettingOvsPort:vlan-mode, object property in NMSettingOvs
+NM_ETHTOOL_OPTNAME_FEATURE_RX_ALL, macro in NMSettingEthtool
 

 

 

-NMSettingPpp, struct in NMSettingPpp
+NM_ETHTOOL_OPTNAME_FEATURE_RX_FCS, macro in NMSettingEthtool
 

 

 

-NMSettingPpp:baud, object property in NMSettingPpp
+NM_ETHTOOL_OPTNAME_FEATURE_RX_GRO_HW, macro in NMSettingEthtool
 

 

 

-NMSettingPpp:crtscts, object property in NMSettingPpp
+NM_ETHTOOL_OPTNAME_FEATURE_RX_UDP_TUNNEL_PORT_OFFLOAD, macro in NMSettingEthtool
 

 

 

-NMSettingPpp:lcp-echo-failure, object property in NMSettingPpp
+NM_ETHTOOL_OPTNAME_FEATURE_RX_VLAN_FILTER, macro in NMSettingEthtool
 

 

 

-NMSettingPpp:lcp-echo-interval, object property in NMSettingPpp
+NM_ETHTOOL_OPTNAME_FEATURE_RX_VLAN_STAG_FILTER, macro in NMSettingEthtool
 

 

 

-NMSettingPpp:mppe-stateful, object property in NMSettingPpp
+NM_ETHTOOL_OPTNAME_FEATURE_RX_VLAN_STAG_HW_PARSE, macro in NMSettingEthtool
 

 

 

-NMSettingPpp:mru, object property in NMSettingPpp
+NM_ETHTOOL_OPTNAME_FEATURE_SG, macro in NMSettingEthtool
 

 

 

-NMSettingPpp:mtu, object property in NMSettingPpp
+NM_ETHTOOL_OPTNAME_FEATURE_TLS_HW_RECORD, macro in NMSettingEthtool
 

 

 

-NMSettingPpp:no-vj-comp, object property in NMSettingPpp
+NM_ETHTOOL_OPTNAME_FEATURE_TLS_HW_TX_OFFLOAD, macro in NMSettingEthtool
 

 

 

-NMSettingPpp:noauth, object property in NMSettingPpp
+NM_ETHTOOL_OPTNAME_FEATURE_TSO, macro in NMSettingEthtool
 

 

 

-NMSettingPpp:nobsdcomp, object property in NMSettingPpp
+NM_ETHTOOL_OPTNAME_FEATURE_TX, macro in NMSettingEthtool
 

 

 

-NMSettingPpp:nodeflate, object property in NMSettingPpp
+NM_ETHTOOL_OPTNAME_FEATURE_TXVLAN, macro in NMSettingEthtool
 

 

 

-NMSettingPpp:refuse-chap, object property in NMSettingPpp
+NM_ETHTOOL_OPTNAME_FEATURE_TX_CHECKSUM_FCOE_CRC, macro in NMSettingEthtool
 

 

 

-NMSettingPpp:refuse-eap, object property in NMSettingPpp
+NM_ETHTOOL_OPTNAME_FEATURE_TX_CHECKSUM_IPV4, macro in NMSettingEthtool
 

 

 

-NMSettingPpp:refuse-mschap, object property in NMSettingPpp
+NM_ETHTOOL_OPTNAME_FEATURE_TX_CHECKSUM_IPV6, macro in NMSettingEthtool
 

 

 

-NMSettingPpp:refuse-mschapv2, object property in NMSettingPpp
+NM_ETHTOOL_OPTNAME_FEATURE_TX_CHECKSUM_IP_GENERIC, macro in NMSettingEthtool
 

 

 

-NMSettingPpp:refuse-pap, object property in NMSettingPpp
+NM_ETHTOOL_OPTNAME_FEATURE_TX_CHECKSUM_SCTP, macro in NMSettingEthtool
 

 

 

-NMSettingPpp:require-mppe, object property in NMSettingPpp
+NM_ETHTOOL_OPTNAME_FEATURE_TX_ESP_SEGMENTATION, macro in NMSettingEthtool
 

 

 

-NMSettingPpp:require-mppe-128, object property in NMSettingPpp
+NM_ETHTOOL_OPTNAME_FEATURE_TX_FCOE_SEGMENTATION, macro in NMSettingEthtool
 

 

 

-NMSettingPppoe, struct in NMSettingPppoe
+NM_ETHTOOL_OPTNAME_FEATURE_TX_GRE_CSUM_SEGMENTATION, macro in NMSettingEthtool
 

 

 

-NMSettingPppoe:parent, object property in NMSettingPppoe
+NM_ETHTOOL_OPTNAME_FEATURE_TX_GRE_SEGMENTATION, macro in NMSettingEthtool
 

 

 

-NMSettingPppoe:password, object property in NMSettingPppoe
+NM_ETHTOOL_OPTNAME_FEATURE_TX_GSO_PARTIAL, macro in NMSettingEthtool
 

 

 

-NMSettingPppoe:password-flags, object property in NMSettingPppoe
+NM_ETHTOOL_OPTNAME_FEATURE_TX_GSO_ROBUST, macro in NMSettingEthtool
 

 

 

-NMSettingPppoe:service, object property in NMSettingPppoe
+NM_ETHTOOL_OPTNAME_FEATURE_TX_IPXIP4_SEGMENTATION, macro in NMSettingEthtool
 

 

 

-NMSettingPppoe:username, object property in NMSettingPppoe
+NM_ETHTOOL_OPTNAME_FEATURE_TX_IPXIP6_SEGMENTATION, macro in NMSettingEthtool
 

 

 

-NMSettingProxy, struct in NMSettingProxy
+NM_ETHTOOL_OPTNAME_FEATURE_TX_NOCACHE_COPY, macro in NMSettingEthtool
 

 

 

-NMSettingProxy:browser-only, object property in NMSettingProxy
+NM_ETHTOOL_OPTNAME_FEATURE_TX_SCATTER_GATHER, macro in NMSettingEthtool
 

 

 

-NMSettingProxy:method, object property in NMSettingProxy
+NM_ETHTOOL_OPTNAME_FEATURE_TX_SCATTER_GATHER_FRAGLIST, macro in NMSettingEthtool
 

 

 

-NMSettingProxy:pac-script, object property in NMSettingProxy
+NM_ETHTOOL_OPTNAME_FEATURE_TX_SCTP_SEGMENTATION, macro in NMSettingEthtool
 

 

 

-NMSettingProxy:pac-url, object property in NMSettingProxy
+NM_ETHTOOL_OPTNAME_FEATURE_TX_TCP6_SEGMENTATION, macro in NMSettingEthtool
 

 

 

-NMSettingProxyMethod, enum in NMSettingProxy
+NM_ETHTOOL_OPTNAME_FEATURE_TX_TCP_ECN_SEGMENTATION, macro in NMSettingEthtool
 

 

 

-NMSettingsConnectionFlags, enum in nm-dbus-interface
+NM_ETHTOOL_OPTNAME_FEATURE_TX_TCP_MANGLEID_SEGMENTATION, macro in NMSettingEthtool
 

 

 

-NMSettingSecretFlags, enum in NMSetting
+NM_ETHTOOL_OPTNAME_FEATURE_TX_TCP_SEGMENTATION, macro in NMSettingEthtool
 

 

 

-NMSettingSerial, struct in NMSettingSerial
+NM_ETHTOOL_OPTNAME_FEATURE_TX_UDP_SEGMENTATION, macro in NMSettingEthtool
 

 

 

-NMSettingSerial:baud, object property in NMSettingSerial
+NM_ETHTOOL_OPTNAME_FEATURE_TX_UDP_TNL_CSUM_SEGMENTATION, macro in NMSettingEthtool
 

 

 

-NMSettingSerial:bits, object property in NMSettingSerial
+NM_ETHTOOL_OPTNAME_FEATURE_TX_UDP_TNL_SEGMENTATION, macro in NMSettingEthtool
 

 

 

-NMSettingSerial:parity, object property in NMSettingSerial
+NM_ETHTOOL_OPTNAME_FEATURE_TX_VLAN_STAG_HW_INSERT, macro in NMSettingEthtool
 

 

 

-NMSettingSerial:send-delay, object property in NMSettingSerial
+nm_ethtool_optname_is_feature, function in NMSettingEthtool
 

 

 

-NMSettingSerial:stopbits, object property in NMSettingSerial
+NM_IP_ADDRESS_ATTRIBUTE_LABEL, macro in NMSettingIPConfig
 

 

 

-NMSettingSerialParity, enum in NMSettingSerial
+nm_ip_address_dup, function in NMSettingIPConfig
 

 

 

-NMSettingsError, enum in nm-errors
+nm_ip_address_equal, function in NMSettingIPConfig
 

 

 

-NMSettingSriov, struct in NMSettingOvs
+nm_ip_address_get_address, function in NMSettingIPConfig
 

 

 

-NMSettingSriov:autoprobe-drivers, object property in NMSettingOvs
+nm_ip_address_get_address_binary, function in NMSettingIPConfig
 

 

 

-NMSettingSriov:total-vfs, object property in NMSettingOvs
+nm_ip_address_get_attribute, function in NMSettingIPConfig
 

 

 

-NMSettingSriov:vfs, object property in NMSettingOvs
+nm_ip_address_get_attribute_names, function in NMSettingIPConfig
 

 

 

-NMSettingsUpdate2Flags, enum in nm-dbus-interface
+nm_ip_address_get_family, function in NMSettingIPConfig
 

 

 

-NM_SETTINGS_ERROR, macro in nm-errors
+nm_ip_address_get_prefix, function in NMSettingIPConfig
 

 

 

-nm_settings_error_quark, function in nm-errors
+nm_ip_address_new, function in NMSettingIPConfig
 

 

 

-NMSettingTCConfig, struct in NMSettingOvs
+nm_ip_address_new_binary, function in NMSettingIPConfig
 

 

 

-NMSettingTCConfig:qdiscs, object property in NMSettingOvs
+nm_ip_address_ref, function in NMSettingIPConfig
 

 

 

-NMSettingTCConfig:tfilters, object property in NMSettingOvs
+nm_ip_address_set_address, function in NMSettingIPConfig
 

 

 

-NMSettingTeam, struct in NMSettingTeam
+nm_ip_address_set_address_binary, function in NMSettingIPConfig
 

 

 

-NMSettingTeam:config, object property in NMSettingTeam
+nm_ip_address_set_attribute, function in NMSettingIPConfig
 

 

 

-NMSettingTeam:link-watchers, object property in NMSettingTeam
+nm_ip_address_set_prefix, function in NMSettingIPConfig
 

 

 

-NMSettingTeam:mcast-rejoin-count, object property in NMSettingTeam
+nm_ip_address_unref, function in NMSettingIPConfig
 

 

 

-NMSettingTeam:mcast-rejoin-interval, object property in NMSettingTeam
+NM_IP_CONFIG_ADDRESSES, macro in NMIPConfig
 

 

 

-NMSettingTeam:notify-peers-count, object property in NMSettingTeam
+NM_IP_CONFIG_DOMAINS, macro in NMIPConfig
 

 

 

-NMSettingTeam:notify-peers-interval, object property in NMSettingTeam
+NM_IP_CONFIG_FAMILY, macro in NMIPConfig
 

 

 

-NMSettingTeam:runner, object property in NMSettingTeam
+NM_IP_CONFIG_GATEWAY, macro in NMIPConfig
 

 

 

-NMSettingTeam:runner-active, object property in NMSettingTeam
+nm_ip_config_get_addresses, function in NMIPConfig
 

 

 

-NMSettingTeam:runner-agg-select-policy, object property in NMSettingTeam
+nm_ip_config_get_domains, function in NMIPConfig
 

 

 

-NMSettingTeam:runner-fast-rate, object property in NMSettingTeam
+nm_ip_config_get_family, function in NMIPConfig
 

 

 

-NMSettingTeam:runner-hwaddr-policy, object property in NMSettingTeam
+nm_ip_config_get_gateway, function in NMIPConfig
 

 

 

-NMSettingTeam:runner-min-ports, object property in NMSettingTeam
+nm_ip_config_get_nameservers, function in NMIPConfig
 

 

 

-NMSettingTeam:runner-sys-prio, object property in NMSettingTeam
+nm_ip_config_get_routes, function in NMIPConfig
 

 

 

-NMSettingTeam:runner-tx-balancer, object property in NMSettingTeam
+nm_ip_config_get_searches, function in NMIPConfig
 

 

 

-NMSettingTeam:runner-tx-balancer-interval, object property in NMSettingTeam
+nm_ip_config_get_wins_servers, function in NMIPConfig
 

 

 

-NMSettingTeam:runner-tx-hash, object property in NMSettingTeam
+NM_IP_CONFIG_NAMESERVERS, macro in NMIPConfig
 

 

 

-NMSettingTeamPort, struct in NMSettingTeamPort
+NM_IP_CONFIG_ROUTES, macro in NMIPConfig
 

 

 

-NMSettingTeamPort:config, object property in NMSettingTeamPort
+NM_IP_CONFIG_SEARCHES, macro in NMIPConfig
 

 

 

-NMSettingTeamPort:lacp-key, object property in NMSettingTeamPort
+NM_IP_CONFIG_WINS_SERVERS, macro in NMIPConfig
 

 

 

-NMSettingTeamPort:lacp-prio, object property in NMSettingTeamPort
+NM_IP_ROUTE_ATTRIBUTE_CWND, macro in NMSettingIPConfig
 

 

 

-NMSettingTeamPort:link-watchers, object property in NMSettingTeamPort
+NM_IP_ROUTE_ATTRIBUTE_FROM, macro in NMSettingIPConfig
 

 

 

-NMSettingTeamPort:prio, object property in NMSettingTeamPort
+NM_IP_ROUTE_ATTRIBUTE_INITCWND, macro in NMSettingIPConfig
 

 

 

-NMSettingTeamPort:queue-id, object property in NMSettingTeamPort
+NM_IP_ROUTE_ATTRIBUTE_INITRWND, macro in NMSettingIPConfig
 

 

 

-NMSettingTeamPort:sticky, object property in NMSettingTeamPort
+NM_IP_ROUTE_ATTRIBUTE_LOCK_CWND, macro in NMSettingIPConfig
 

 

 

-NMSettingTun, struct in NMSettingTun
+NM_IP_ROUTE_ATTRIBUTE_LOCK_INITCWND, macro in NMSettingIPConfig
 

 

 

-NMSettingTun:group, object property in NMSettingTun
+NM_IP_ROUTE_ATTRIBUTE_LOCK_INITRWND, macro in NMSettingIPConfig
 

 

 

-NMSettingTun:mode, object property in NMSettingTun
+NM_IP_ROUTE_ATTRIBUTE_LOCK_MTU, macro in NMSettingIPConfig
 

 

 

-NMSettingTun:multi-queue, object property in NMSettingTun
+NM_IP_ROUTE_ATTRIBUTE_LOCK_WINDOW, macro in NMSettingIPConfig
 

 

 

-NMSettingTun:owner, object property in NMSettingTun
+NM_IP_ROUTE_ATTRIBUTE_MTU, macro in NMSettingIPConfig
 

 

 

-NMSettingTun:pi, object property in NMSettingTun
+NM_IP_ROUTE_ATTRIBUTE_ONLINK, macro in NMSettingIPConfig
 

 

 

-NMSettingTun:vnet-hdr, object property in NMSettingTun
+NM_IP_ROUTE_ATTRIBUTE_SRC, macro in NMSettingIPConfig
 

 

 

-NMSettingTunMode, enum in NMSettingTun
+NM_IP_ROUTE_ATTRIBUTE_TABLE, macro in NMSettingIPConfig
 

 

 

-NMSettingUser, struct in NMSettingOvs
+NM_IP_ROUTE_ATTRIBUTE_TOS, macro in NMSettingIPConfig
 

 

 

-NMSettingUser:data, object property in NMSettingOvs
+nm_ip_route_attribute_validate, function in NMSettingIPConfig
 

 

 

-NMSettingValueIterFn, user_function in NMSetting
+NM_IP_ROUTE_ATTRIBUTE_WINDOW, macro in NMSettingIPConfig
 

 

 

-NMSettingVlan, struct in NMSettingVlan
+nm_ip_route_dup, function in NMSettingIPConfig
 

 

 

-NMSettingVlan:egress-priority-map, object property in NMSettingVlan
+nm_ip_route_equal, function in NMSettingIPConfig
 

 

 

-NMSettingVlan:flags, object property in NMSettingVlan
+nm_ip_route_equal_full, function in NMSettingIPConfig
 

 

 

-NMSettingVlan:id, object property in NMSettingVlan
+nm_ip_route_get_attribute, function in NMSettingIPConfig
 

 

 

-NMSettingVlan:ingress-priority-map, object property in NMSettingVlan
+nm_ip_route_get_attribute_names, function in NMSettingIPConfig
 

 

 

-NMSettingVlan:parent, object property in NMSettingVlan
+nm_ip_route_get_dest, function in NMSettingIPConfig
 

 

 

-NMSettingVpn, struct in NMSettingVpn
+nm_ip_route_get_dest_binary, function in NMSettingIPConfig
 

 

 

-NMSettingVpn:data, object property in NMSettingVpn
+nm_ip_route_get_family, function in NMSettingIPConfig
 

 

 

-NMSettingVpn:persistent, object property in NMSettingVpn
+nm_ip_route_get_metric, function in NMSettingIPConfig
 

 

 

-NMSettingVpn:secrets, object property in NMSettingVpn
+nm_ip_route_get_next_hop, function in NMSettingIPConfig
 

 

 

-NMSettingVpn:service-type, object property in NMSettingVpn
+nm_ip_route_get_next_hop_binary, function in NMSettingIPConfig
 

 

 

-NMSettingVpn:timeout, object property in NMSettingVpn
+nm_ip_route_get_prefix, function in NMSettingIPConfig
 

 

 

-NMSettingVpn:user-name, object property in NMSettingVpn
+nm_ip_route_get_variant_attribute_spec, function in NMSettingIPConfig
 

 

 

-NMSettingVxlan, struct in NMSettingVxlan
+nm_ip_route_new, function in NMSettingIPConfig
 

 

 

-NMSettingVxlan:ageing, object property in NMSettingVxlan
+nm_ip_route_new_binary, function in NMSettingIPConfig
 

 

 

-NMSettingVxlan:destination-port, object property in NMSettingVxlan
+nm_ip_route_ref, function in NMSettingIPConfig
 

 

 

-NMSettingVxlan:id, object property in NMSettingVxlan
+nm_ip_route_set_attribute, function in NMSettingIPConfig
 

 

 

-NMSettingVxlan:l2-miss, object property in NMSettingVxlan
+nm_ip_route_set_dest, function in NMSettingIPConfig
 

 

 

-NMSettingVxlan:l3-miss, object property in NMSettingVxlan
+nm_ip_route_set_dest_binary, function in NMSettingIPConfig
 

 

 

-NMSettingVxlan:learning, object property in NMSettingVxlan
+nm_ip_route_set_metric, function in NMSettingIPConfig
 

 

 

-NMSettingVxlan:limit, object property in NMSettingVxlan
+nm_ip_route_set_next_hop, function in NMSettingIPConfig
 

 

 

-NMSettingVxlan:local, object property in NMSettingVxlan
+nm_ip_route_set_next_hop_binary, function in NMSettingIPConfig
 

 

 

-NMSettingVxlan:parent, object property in NMSettingVxlan
+nm_ip_route_set_prefix, function in NMSettingIPConfig
 

 

 

-NMSettingVxlan:proxy, object property in NMSettingVxlan
+nm_ip_route_unref, function in NMSettingIPConfig
 

 

 

-NMSettingVxlan:remote, object property in NMSettingVxlan
+nm_jansson_load, function in nm-json
 

 

 

-NMSettingVxlan:rsc, object property in NMSettingVxlan
+NM_LLDP_ATTR_CHASSIS_ID, macro in nm-dbus-interface
 

 

 

-NMSettingVxlan:source-port-max, object property in NMSettingVxlan
+NM_LLDP_ATTR_CHASSIS_ID_TYPE, macro in nm-dbus-interface
 

 

 

-NMSettingVxlan:source-port-min, object property in NMSettingVxlan
+NM_LLDP_ATTR_DESTINATION, macro in nm-dbus-interface
 

 

 

-NMSettingVxlan:tos, object property in NMSettingVxlan
+NM_LLDP_ATTR_IEEE_802_1_PPVID, macro in nm-dbus-interface
 

 

 

-NMSettingVxlan:ttl, object property in NMSettingVxlan
+NM_LLDP_ATTR_IEEE_802_1_PPVID_FLAGS, macro in nm-dbus-interface
 

 

 

-NMSettingWimax, struct in NMSettingWimax
+NM_LLDP_ATTR_IEEE_802_1_PVID, macro in nm-dbus-interface
 

 

 

-NMSettingWimax:mac-address, object property in NMSettingWimax
+NM_LLDP_ATTR_IEEE_802_1_VID, macro in nm-dbus-interface
 

 

 

-NMSettingWimax:network-name, object property in NMSettingWimax
+NM_LLDP_ATTR_IEEE_802_1_VLAN_NAME, macro in nm-dbus-interface
 

 

 

-NMSettingWired, struct in NMSettingWired
+NM_LLDP_ATTR_PORT_DESCRIPTION, macro in nm-dbus-interface
 

 

 

-NMSettingWired:auto-negotiate, object property in NMSettingWired
+NM_LLDP_ATTR_PORT_ID, macro in nm-dbus-interface
 

 

 

-NMSettingWired:cloned-mac-address, object property in NMSettingWired
+NM_LLDP_ATTR_PORT_ID_TYPE, macro in nm-dbus-interface
 

 

 

-NMSettingWired:duplex, object property in NMSettingWired
+NM_LLDP_ATTR_SYSTEM_CAPABILITIES, macro in nm-dbus-interface
 

 

 

-NMSettingWired:generate-mac-address-mask, object property in NMSettingWired
+NM_LLDP_ATTR_SYSTEM_DESCRIPTION, macro in nm-dbus-interface
 

 

 

-NMSettingWired:mac-address, object property in NMSettingWired
+NM_LLDP_ATTR_SYSTEM_NAME, macro in nm-dbus-interface
 

 

 

-NMSettingWired:mac-address-blacklist, object property in NMSettingWired
+NM_LLDP_DEST_NEAREST_BRIDGE, macro in nm-dbus-interface
 

 

 

-NMSettingWired:mtu, object property in NMSettingWired
+NM_LLDP_DEST_NEAREST_CUSTOMER_BRIDGE, macro in nm-dbus-interface
 

 

 

-NMSettingWired:port, object property in NMSettingWired
+NM_LLDP_DEST_NEAREST_NON_TPMR_BRIDGE, macro in nm-dbus-interface
 

 

 

-NMSettingWired:s390-nettype, object property in NMSettingWired
+nm_lldp_neighbor_get_attr_names, function in NMDevice
 

 

 

-NMSettingWired:s390-options, object property in NMSettingWired
+nm_lldp_neighbor_get_attr_string_value, function in NMDevice
 

 

 

-NMSettingWired:s390-subchannels, object property in NMSettingWired
+nm_lldp_neighbor_get_attr_type, function in NMDevice
 

 

 

-NMSettingWired:speed, object property in NMSettingWired
+nm_lldp_neighbor_get_attr_uint_value, function in NMDevice
 

 

 

-NMSettingWired:wake-on-lan, object property in NMSettingWired
+nm_lldp_neighbor_new, function in NMDevice
 

 

 

-NMSettingWired:wake-on-lan-password, object property in NMSettingWired
+nm_lldp_neighbor_ref, function in NMDevice
 

 

 

-NMSettingWiredWakeOnLan, enum in NMSettingWired
+nm_lldp_neighbor_unref, function in NMDevice
 

 

 

-NMSettingWireless, struct in NMSettingWireless
+NM_MANAGER_ERROR, macro in nm-errors
 

 

 

-NMSettingWireless:band, object property in NMSettingWireless
+nm_manager_error_quark, function in nm-errors
 

 

 

-NMSettingWireless:bssid, object property in NMSettingWireless
+NM_OBJECT_DBUS_CONNECTION, macro in NMObject
 

 

 

-NMSettingWireless:channel, object property in NMSettingWireless
+NM_OBJECT_DBUS_OBJECT_MANAGER, macro in NMObject
 

 

 

-NMSettingWireless:cloned-mac-address, object property in NMSettingWireless
+nm_object_get_path, function in NMObject
 

 

 

-NMSettingWireless:generate-mac-address-mask, object property in NMSettingWireless
+NM_OBJECT_PATH, macro in NMObject
 

 

 

-NMSettingWireless:hidden, object property in NMSettingWireless
+nm_remote_connection_commit_changes, function in NMRemoteConnection
 

 

 

-NMSettingWireless:mac-address, object property in NMSettingWireless
+nm_remote_connection_commit_changes_async, function in NMRemoteConnection
 

 

 

-NMSettingWireless:mac-address-blacklist, object property in NMSettingWireless
+nm_remote_connection_commit_changes_finish, function in NMRemoteConnection
 

 

 

-NMSettingWireless:mac-address-randomization, object property in NMSettingWireless
+NM_REMOTE_CONNECTION_DBUS_CONNECTION, macro in NMRemoteConnection
 

 

 

-NMSettingWireless:mode, object property in NMSettingWireless
+nm_remote_connection_delete, function in NMRemoteConnection
 

 

 

-NMSettingWireless:mtu, object property in NMSettingWireless
+nm_remote_connection_delete_async, function in NMRemoteConnection
 

 

 

-NMSettingWireless:powersave, object property in NMSettingWireless
+nm_remote_connection_delete_finish, function in NMRemoteConnection
 

 

 

-NMSettingWireless:rate, object property in NMSettingWireless
+NM_REMOTE_CONNECTION_FILENAME, macro in NMRemoteConnection
 

 

 

-NMSettingWireless:seen-bssids, object property in NMSettingWireless
+NM_REMOTE_CONNECTION_FLAGS, macro in NMRemoteConnection
 

 

 

-NMSettingWireless:ssid, object property in NMSettingWireless
+nm_remote_connection_get_filename, function in NMRemoteConnection
 

 

 

-NMSettingWireless:tx-power, object property in NMSettingWireless
+nm_remote_connection_get_flags, function in NMRemoteConnection
 

 

 

-NMSettingWireless:wake-on-wlan, object property in NMSettingWireless
+nm_remote_connection_get_secrets, function in NMRemoteConnection
 

 

 

-NMSettingWirelessPowersave, enum in NMSettingWireless
+nm_remote_connection_get_secrets_async, function in NMRemoteConnection
 

 

 

-NMSettingWirelessSecurity, struct in NMSettingWirelessSecurity
+nm_remote_connection_get_secrets_finish, function in NMRemoteConnection
 

 

 

-NMSettingWirelessSecurity:auth-alg, object property in NMSettingWirelessSecurity
+nm_remote_connection_get_unsaved, function in NMRemoteConnection
 

 

 

-NMSettingWirelessSecurity:fils, object property in NMSettingWirelessSecurity
+nm_remote_connection_get_visible, function in NMRemoteConnection
 

 

 

-NMSettingWirelessSecurity:group, object property in NMSettingWirelessSecurity
+NM_REMOTE_CONNECTION_PATH, macro in NMRemoteConnection
 

 

 

-NMSettingWirelessSecurity:key-mgmt, object property in NMSettingWirelessSecurity
+nm_remote_connection_save, function in NMRemoteConnection
 

 

 

-NMSettingWirelessSecurity:leap-password, object property in NMSettingWirelessSecurity
+nm_remote_connection_save_async, function in NMRemoteConnection
 

 

 

-NMSettingWirelessSecurity:leap-password-flags, object property in NMSettingWirelessSecurity
+nm_remote_connection_save_finish, function in NMRemoteConnection
 

 

 

-NMSettingWirelessSecurity:leap-username, object property in NMSettingWirelessSecurity
+NM_REMOTE_CONNECTION_UNSAVED, macro in NMRemoteConnection
 

 

 

-NMSettingWirelessSecurity:pairwise, object property in NMSettingWirelessSecurity
+nm_remote_connection_update2, function in NMRemoteConnection
 

 

 

-NMSettingWirelessSecurity:pmf, object property in NMSettingWirelessSecurity
+nm_remote_connection_update2_finish, function in NMRemoteConnection
 

 

 

-NMSettingWirelessSecurity:proto, object property in NMSettingWirelessSecurity
+NM_REMOTE_CONNECTION_VISIBLE, macro in NMRemoteConnection
 

 

 

-NMSettingWirelessSecurity:psk, object property in NMSettingWirelessSecurity
+NM_SECRET_AGENT_ERROR, macro in nm-errors
 

 

 

-NMSettingWirelessSecurity:psk-flags, object property in NMSettingWirelessSecurity
+nm_secret_agent_error_quark, function in nm-errors
 

 

 

-NMSettingWirelessSecurity:wep-key-flags, object property in NMSettingWirelessSecurity
+NM_SECRET_AGENT_OLD_AUTO_REGISTER, macro in NMSecretAgentOld
 

 

 

-NMSettingWirelessSecurity:wep-key-type, object property in NMSettingWirelessSecurity
+NM_SECRET_AGENT_OLD_CAPABILITIES, macro in NMSecretAgentOld
 

 

 

-NMSettingWirelessSecurity:wep-key0, object property in NMSettingWirelessSecurity
+nm_secret_agent_old_delete_secrets, function in NMSecretAgentOld
 

 

 

-NMSettingWirelessSecurity:wep-key1, object property in NMSettingWirelessSecurity
+nm_secret_agent_old_get_registered, function in NMSecretAgentOld
 

 

 

-NMSettingWirelessSecurity:wep-key2, object property in NMSettingWirelessSecurity
+nm_secret_agent_old_get_secrets, function in NMSecretAgentOld
 

 

 

-NMSettingWirelessSecurity:wep-key3, object property in NMSettingWirelessSecurity
+NM_SECRET_AGENT_OLD_IDENTIFIER, macro in NMSecretAgentOld
 

 

 

-NMSettingWirelessSecurity:wep-tx-keyidx, object property in NMSettingWirelessSecurity
+nm_secret_agent_old_register, function in NMSecretAgentOld
 

 

 

-NMSettingWirelessSecurity:wps-method, object property in NMSettingWirelessSecurity
+NM_SECRET_AGENT_OLD_REGISTERED, macro in NMSecretAgentOld
 

 

 

-NMSettingWirelessSecurityFils, enum in NMSettingWirelessSecurity
+nm_secret_agent_old_register_async, function in NMSecretAgentOld
 

 

 

-NMSettingWirelessSecurityPmf, enum in NMSettingWirelessSecurity
+nm_secret_agent_old_register_finish, function in NMSecretAgentOld
 

 

 

-NMSettingWirelessSecurityWpsMethod, enum in NMSettingWirelessSecurity
+nm_secret_agent_old_save_secrets, function in NMSecretAgentOld
 

 

 

-NMSettingWirelessWakeOnWLan, enum in NMSettingWireless
+nm_secret_agent_old_unregister, function in NMSecretAgentOld
 

 

 

-NMSettingWpan, struct in NMSettingOvs
+nm_secret_agent_old_unregister_async, function in NMSecretAgentOld
 

 

 

-NMSettingWpan:mac-address, object property in NMSettingOvs
+nm_secret_agent_old_unregister_finish, function in NMSecretAgentOld
 

 

 

-NMSettingWpan:pan-id, object property in NMSettingOvs
+NM_SETTINGS_ERROR, macro in nm-errors
 

 

 

-NMSettingWpan:short-address, object property in NMSettingOvs
+nm_settings_error_quark, function in nm-errors
 

 

 

@@ -10224,6 +10549,38 @@ NMSettingWpan:short-address, object property in NMSettingOvs
 

 

 

+nm_setting_wifi_p2p_get_peer, function in NMSettingWifiP2P
+

+

+

+nm_setting_wifi_p2p_get_wfd_ies, function in NMSettingWifiP2P
+

+

+

+nm_setting_wifi_p2p_get_wps_method, function in NMSettingWifiP2P
+

+

+

+nm_setting_wifi_p2p_new, function in NMSettingWifiP2P
+

+

+

+NM_SETTING_WIFI_P2P_PEER, macro in NMSettingWifiP2P
+

+

+

+NM_SETTING_WIFI_P2P_SETTING_NAME, macro in NMSettingWifiP2P
+

+

+

+NM_SETTING_WIFI_P2P_WFD_IES, macro in NMSettingWifiP2P
+

+

+

+NM_SETTING_WIFI_P2P_WPS_METHOD, macro in NMSettingWifiP2P
+

+

+

 nm_setting_wimax_get_mac_address, function in NMSettingWimax
 

 

@@ -10412,6 +10769,94 @@ NMSettingWpan:short-address, object property in NMSettingOvs
 
 

 

+nm_setting_wireguard_append_peer, function in NMSettingWireGuard
+

+

+

+nm_setting_wireguard_clear_peers, function in NMSettingWireGuard
+

+

+

+NM_SETTING_WIREGUARD_FWMARK, macro in NMSettingWireGuard
+

+

+

+nm_setting_wireguard_get_fwmark, function in NMSettingWireGuard
+

+

+

+nm_setting_wireguard_get_listen_port, function in NMSettingWireGuard
+

+

+

+nm_setting_wireguard_get_mtu, function in NMSettingWireGuard
+

+

+

+nm_setting_wireguard_get_peer, function in NMSettingWireGuard
+

+

+

+nm_setting_wireguard_get_peers_len, function in NMSettingWireGuard
+

+

+

+nm_setting_wireguard_get_peer_by_public_key, function in NMSettingWireGuard
+

+

+

+nm_setting_wireguard_get_peer_routes, function in NMSettingWireGuard
+

+

+

+nm_setting_wireguard_get_private_key, function in NMSettingWireGuard
+

+

+

+nm_setting_wireguard_get_private_key_flags, function in NMSettingWireGuard
+

+

+

+NM_SETTING_WIREGUARD_LISTEN_PORT, macro in NMSettingWireGuard
+

+

+

+NM_SETTING_WIREGUARD_MTU, macro in NMSettingWireGuard
+

+

+

+nm_setting_wireguard_new, function in NMSettingWireGuard
+

+

+

+NM_SETTING_WIREGUARD_PEERS, macro in NMSettingWireGuard
+

+

+

+NM_SETTING_WIREGUARD_PEER_ROUTES, macro in NMSettingWireGuard
+

+

+

+NM_SETTING_WIREGUARD_PRIVATE_KEY, macro in NMSettingWireGuard
+

+

+

+NM_SETTING_WIREGUARD_PRIVATE_KEY_FLAGS, macro in NMSettingWireGuard
+

+

+

+nm_setting_wireguard_remove_peer, function in NMSettingWireGuard
+

+

+

+NM_SETTING_WIREGUARD_SETTING_NAME, macro in NMSettingWireGuard
+

+

+

+nm_setting_wireguard_set_peer, function in NMSettingWireGuard
+

+

+

 nm_setting_wireless_add_mac_blacklist_item, function in NMSettingWireless
 

 

@@ -10824,10 +11269,26 @@ NMSettingWpan:short-address, object property in NMSettingOvs
 
 

 

+NM_SETTING_WPAN_CHANNEL, macro in NMSettingWpan
+

+

+

+NM_SETTING_WPAN_CHANNEL_DEFAULT, macro in NMSettingWpan
+

+

+

+nm_setting_wpan_get_channel, function in NMSettingWpan
+

+

+

 nm_setting_wpan_get_mac_address, function in NMSettingWpan
 

 

 

+nm_setting_wpan_get_page, function in NMSettingWpan
+

+

+

 nm_setting_wpan_get_pan_id, function in NMSettingWpan
 

 

@@ -10844,35 +11305,35 @@ NMSettingWpan:short-address, object property in NMSettingOvs
 
 

 

-NM_SETTING_WPAN_PAN_ID, macro in NMSettingWpan
+NM_SETTING_WPAN_PAGE, macro in NMSettingWpan
 

 

 

-NM_SETTING_WPAN_SETTING_NAME, macro in NMSettingWpan
+NM_SETTING_WPAN_PAGE_DEFAULT, macro in NMSettingWpan
 

 

 

-NM_SETTING_WPAN_SHORT_ADDRESS, macro in NMSettingWpan
+NM_SETTING_WPAN_PAN_ID, macro in NMSettingWpan
 

 

 

-NMSimpleConnection, struct in NMSimpleConnection
+NM_SETTING_WPAN_SETTING_NAME, macro in NMSettingWpan
 

 

 

-nm_simple_connection_new, function in NMSimpleConnection
+NM_SETTING_WPAN_SHORT_ADDRESS, macro in NMSettingWpan
 

 

 

-nm_simple_connection_new_clone, function in NMSimpleConnection
+nm_simple_connection_new, function in NMSimpleConnection
 

 

 

-nm_simple_connection_new_from_dbus, function in NMSimpleConnection
+nm_simple_connection_new_clone, function in NMSimpleConnection
 

 

 

-NMSriovVFVlanProtocol, enum in NMSettingSriov
+nm_simple_connection_new_from_dbus, function in NMSimpleConnection
 

 

 

@@ -10964,15 +11425,6 @@ NMSettingWpan:short-address, object property in NMSettingOvs
 

 

 

-stat, struct in nm-utils
-

-

-

-NMState, enum in nm-dbus-interface
-

-

-
T

-

 nm_tc_action_dup, function in NMSettingTCConfig
 

 

@@ -11089,10 +11541,6 @@ NMSettingWpan:short-address, object property in NMSettingOvs
 
 

 

-NMTeamLinkWatcherArpPingFlags, enum in NMSettingTeam
-

-

-

 NM_TEAM_LINK_WATCHER_ARP_PING, macro in NMSettingTeam
 

 

@@ -11145,48 +11593,43 @@ NMSettingWpan:short-address, object property in NMSettingOvs
 
 

 

-nm_team_link_watcher_new_arp_ping, function in NMSettingTeam
-

-

-

-nm_team_link_watcher_new_ethtool, function in NMSettingTeam
+nm_team_link_watcher_get_vlanid, function in NMSettingTeam
 

 

 

-nm_team_link_watcher_new_nsna_ping, function in NMSettingTeam
+nm_team_link_watcher_new_arp_ping, function in NMSettingTeam
 

 

 

-NM_TEAM_LINK_WATCHER_NSNA_PING, macro in NMSettingTeam
+nm_team_link_watcher_new_arp_ping2, function in NMSettingTeam
 

 

 

-nm_team_link_watcher_ref, function in NMSettingTeam
+nm_team_link_watcher_new_ethtool, function in NMSettingTeam
 

 

 

-nm_team_link_watcher_unref, function in NMSettingTeam
+nm_team_link_watcher_new_nsna_ping, function in NMSettingTeam
 

 

 

-NMTernary, enum in nm-dbus-interface
+NM_TEAM_LINK_WATCHER_NSNA_PING, macro in NMSettingTeam
 

 

-
U

 

-NMUtilsCheckFilePredicate, user_function in nm-utils
+nm_team_link_watcher_ref, function in NMSettingTeam
 

 

 

-NMUtilsFileSearchInPathsPredicate, user_function in nm-utils
+nm_team_link_watcher_unref, function in NMSettingTeam
 

 

 

-NMUtilsSecurityType, enum in nm-utils
+nm_utils_ap_mode_security_valid, function in nm-utils
 

 

 

-nm_utils_ap_mode_security_valid, function in nm-utils
+nm_utils_base64secret_decode, function in nm-utils
 

 

 

@@ -11493,11 +11936,6 @@ nm_utils_fixup_vendor_string, function in nm-libnm-utils
 nm_utils_wpa_psk_valid, function in nm-utils
 

 

-
V

-

-NMVariantAttributeSpec, struct in nm-utils
-

-

 

 NM_VARIANT_TYPE_SETTING, macro in NMConnection
 

@@ -11511,102 +11949,10 @@ nm_utils_fixup_vendor_string, function in nm-libnm-utils
 
 

 

-NMVlanFlags, enum in NMSettingVlan
-

-

-

-NMVlanPriorityMap, enum in NMSettingVlan
-

-

-

 NM_VLAN_FLAGS_ALL, macro in NMSettingVlan
 

 

 

-NMVpnConnection, struct in NMVpnConnection
-

-

-

-NMVpnConnection::vpn-state-changed, object signal in NMVpnConnection
-

-

-

-NMVpnConnection:banner, object property in NMVpnConnection
-

-

-

-NMVpnConnection:vpn-state, object property in NMVpnConnection
-

-

-

-NMVpnConnectionState, enum in nm-vpn-dbus-interface
-

-

-

-NMVpnConnectionStateReason, enum in nm-vpn-dbus-interface
-

-

-

-NMVpnEditor, struct in NMVpnEditorPlugin
-

-

-

-NMVpnEditor::changed, object signal in NMVpnEditorPlugin
-

-

-

-NMVpnEditorInterface, struct in NMVpnEditor
-

-

-

-NMVpnEditorPlugin:description, object property in NMVpnEditorPlugin
-

-

-

-NMVpnEditorPlugin:name, object property in NMVpnEditorPlugin
-

-

-

-NMVpnEditorPlugin:service, object property in NMVpnEditorPlugin
-

-

-

-NMVpnEditorPluginCapability, enum in NMVpnEditorPlugin
-

-

-

-NMVpnEditorPluginFactory, user_function in NMVpnEditorPlugin
-

-

-

-NMVpnEditorPluginInterface, struct in NMVpnEditorPlugin
-

-

-

-NMVpnEditorPluginVT, struct in NMVpnEditorPlugin
-

-

-

-NMVpnIterFunc, user_function in NMSettingVpn
-

-

-

-NMVpnPluginError, enum in nm-errors
-

-

-

-NMVpnPluginFailure, enum in nm-vpn-dbus-interface
-

-

-

-NMVpnPluginInfo, struct in nm-vpn-plugin-info
-

-

-

-NMVpnServiceState, enum in nm-vpn-dbus-interface
-

-

-

 NM_VPN_CONNECTION_BANNER, macro in NMVpnConnection
 

 

@@ -11890,29 +12236,92 @@ NM_VPN_PLUGIN_IP6_CONFIG_PRESERVE_ROUTES, macro in nm-vpn-dbus-interface
 NM_VPN_SERVICE_PLUGIN_STATE, macro in nm-vpn-service-plugin
 
 

-
W

 

-NMWepKeyType, enum in NMSettingWirelessSecurity
+nm_wifi_p2p_peer_connection_valid, function in NMWifiP2PPeer
 

 

 

-NMWimaxNsp, struct in NMWimaxNsp
+nm_wifi_p2p_peer_filter_connections, function in NMWifiP2PPeer
 

 

 

-NMWimaxNsp:name, object property in NMWimaxNsp
+NM_WIFI_P2P_PEER_FLAGS, macro in NMWifiP2PPeer
 

 

 

-NMWimaxNsp:network-type, object property in NMWimaxNsp
+nm_wifi_p2p_peer_get_flags, function in NMWifiP2PPeer
 

 

 

-NMWimaxNsp:signal-quality, object property in NMWimaxNsp
+nm_wifi_p2p_peer_get_hw_address, function in NMWifiP2PPeer
 

 

 

-NMWimaxNspNetworkType, enum in nm-dbus-interface
+nm_wifi_p2p_peer_get_last_seen, function in NMWifiP2PPeer
+

+

+

+nm_wifi_p2p_peer_get_manufacturer, function in NMWifiP2PPeer
+

+

+

+nm_wifi_p2p_peer_get_model, function in NMWifiP2PPeer
+

+

+

+nm_wifi_p2p_peer_get_model_number, function in NMWifiP2PPeer
+

+

+

+nm_wifi_p2p_peer_get_name, function in NMWifiP2PPeer
+

+

+

+nm_wifi_p2p_peer_get_serial, function in NMWifiP2PPeer
+

+

+

+nm_wifi_p2p_peer_get_strength, function in NMWifiP2PPeer
+

+

+

+nm_wifi_p2p_peer_get_wfd_ies, function in NMWifiP2PPeer
+

+

+

+NM_WIFI_P2P_PEER_HW_ADDRESS, macro in NMWifiP2PPeer
+

+

+

+NM_WIFI_P2P_PEER_LAST_SEEN, macro in NMWifiP2PPeer
+

+

+

+NM_WIFI_P2P_PEER_MANUFACTURER, macro in NMWifiP2PPeer
+

+

+

+NM_WIFI_P2P_PEER_MODEL, macro in NMWifiP2PPeer
+

+

+

+NM_WIFI_P2P_PEER_MODEL_NUMBER, macro in NMWifiP2PPeer
+

+

+

+NM_WIFI_P2P_PEER_NAME, macro in NMWifiP2PPeer
+

+

+

+NM_WIFI_P2P_PEER_SERIAL, macro in NMWifiP2PPeer
+

+

+

+NM_WIFI_P2P_PEER_STRENGTH, macro in NMWifiP2PPeer
+

+

+

+NM_WIFI_P2P_PEER_WFD_IES, macro in NMWifiP2PPeer
 

 

 

@@ -11947,6 +12356,135 @@ NM_VPN_PLUGIN_IP6_CONFIG_PRESERVE_ROUTES, macro in nm-vpn-dbus-interface
 NM_WIMAX_NSP_SIGNAL_QUALITY, macro in NMWimaxNsp
 

 

+

+nm_wireguard_peer_append_allowed_ip, function in NMSettingWireGuard
+

+

+

+NM_WIREGUARD_PEER_ATTR_ALLOWED_IPS, macro in NMSettingWireGuard
+

+

+

+NM_WIREGUARD_PEER_ATTR_ENDPOINT, macro in NMSettingWireGuard
+

+

+

+NM_WIREGUARD_PEER_ATTR_PERSISTENT_KEEPALIVE, macro in NMSettingWireGuard
+

+

+

+NM_WIREGUARD_PEER_ATTR_PRESHARED_KEY, macro in NMSettingWireGuard
+

+

+

+NM_WIREGUARD_PEER_ATTR_PRESHARED_KEY_FLAGS, macro in NMSettingWireGuard
+

+

+

+NM_WIREGUARD_PEER_ATTR_PUBLIC_KEY, macro in NMSettingWireGuard
+

+

+

+nm_wireguard_peer_clear_allowed_ips, function in NMSettingWireGuard
+

+

+

+nm_wireguard_peer_cmp, function in NMSettingWireGuard
+

+

+

+nm_wireguard_peer_get_allowed_ip, function in NMSettingWireGuard
+

+

+

+nm_wireguard_peer_get_allowed_ips_len, function in NMSettingWireGuard
+

+

+

+nm_wireguard_peer_get_endpoint, function in NMSettingWireGuard
+

+

+

+nm_wireguard_peer_get_persistent_keepalive, function in NMSettingWireGuard
+

+

+

+nm_wireguard_peer_get_preshared_key, function in NMSettingWireGuard
+

+

+

+nm_wireguard_peer_get_preshared_key_flags, function in NMSettingWireGuard
+

+

+

+nm_wireguard_peer_get_public_key, function in NMSettingWireGuard
+

+

+

+nm_wireguard_peer_is_sealed, function in NMSettingWireGuard
+

+

+

+nm_wireguard_peer_is_valid, function in NMSettingWireGuard
+

+

+

+nm_wireguard_peer_new, function in NMSettingWireGuard
+

+

+

+nm_wireguard_peer_new_clone, function in NMSettingWireGuard
+

+

+

+nm_wireguard_peer_ref, function in NMSettingWireGuard
+

+

+

+nm_wireguard_peer_remove_allowed_ip, function in NMSettingWireGuard
+

+

+

+nm_wireguard_peer_seal, function in NMSettingWireGuard
+

+

+

+nm_wireguard_peer_set_endpoint, function in NMSettingWireGuard
+

+

+

+nm_wireguard_peer_set_persistent_keepalive, function in NMSettingWireGuard
+

+

+

+nm_wireguard_peer_set_preshared_key, function in NMSettingWireGuard
+

+

+

+nm_wireguard_peer_set_preshared_key_flags, function in NMSettingWireGuard
+

+

+

+nm_wireguard_peer_set_public_key, function in NMSettingWireGuard
+

+

+

+nm_wireguard_peer_unref, function in NMSettingWireGuard
+

+

+

+NM_WIREGUARD_PUBLIC_KEY_LEN, macro in NMSettingWireGuard
+

+

+

+NM_WIREGUARD_SYMMETRIC_KEY_LEN, macro in NMSettingWireGuard
+

+

+
S

+

+stat, struct in nm-utils
+

+

 

 
Generated by GTK-Doc V1.29

diff --git a/docs/libnm/html/ch03.html b/docs/libnm/html/ch03.html
index 4e2b599e..2d9538ce 100644
--- a/docs/libnm/html/ch03.html
+++ b/docs/libnm/html/ch03.html
@@ -118,13 +118,13 @@
 NMSettingOvsPort — Describes connection properties for Open vSwitch ports.

-NMSettingPppoe — Describes PPPoE connection properties
-

-

 NMSettingPpp — Describes connection properties for devices/networks
 that require PPP to deliver IP capability
 

+NMSettingPppoe — Describes PPPoE connection properties
+

+

 NMSettingProxy — Describes proxy URL, script and other related properties
 

@@ -159,12 +159,18 @@ serial communications
 NMSettingVxlan — Describes connection properties for VXLAN interfaces
 

+NMSettingWifiP2P — Describes connection properties for 802.11 Wi-Fi P2P networks
+

+

 NMSettingWimax — Describes 802.16e Mobile WiMAX connection properties
 

 NMSettingWired — Describes connection properties for Ethernet-based networks
 

+NMSettingWireGuard — Describes connection properties for wireguard related options
+

+

 NMSettingWirelessSecurity — Describes connection properties for Wi-Fi networks that
 use WEP, LEAP, WPA or WPA2/RSN security
 

diff --git a/docs/libnm/html/ch04.html b/docs/libnm/html/ch04.html
index 5553f2c6..e872e6fd 100644
--- a/docs/libnm/html/ch04.html
+++ b/docs/libnm/html/ch04.html
@@ -93,6 +93,9 @@
 NMDeviceVxlan

+NMDeviceWifiP2P
+

+

 NMDeviceWifi
 

@@ -114,6 +117,9 @@
 NMAccessPoint
 

+NMWifiP2PPeer
+

+

 NMWimaxNsp
 

diff --git a/docs/libnm/html/index.html b/docs/libnm/html/index.html
index 9d83dca8..0523598b 100644
--- a/docs/libnm/html/index.html
+++ b/docs/libnm/html/index.html
@@ -15,7 +15,7 @@
 

 

 

-      for libnm 1.14.6
+      for libnm 1.16.0
 
       The latest version of this documentation can be found on-line at
       https://developer.gnome.org/libnm/stable/.
@@ -167,13 +167,13 @@
 NMSettingOvsPort — Describes connection properties for Open vSwitch ports.
 
 

-NMSettingPppoe — Describes PPPoE connection properties
-

-

 NMSettingPpp — Describes connection properties for devices/networks
 that require PPP to deliver IP capability
 

 

+NMSettingPppoe — Describes PPPoE connection properties
+

+

 NMSettingProxy — Describes proxy URL, script and other related properties
 

 

@@ -208,12 +208,18 @@ serial communications
 NMSettingVxlan — Describes connection properties for VXLAN interfaces
 

 

+NMSettingWifiP2P — Describes connection properties for 802.11 Wi-Fi P2P networks
+

+

 NMSettingWimax — Describes 802.16e Mobile WiMAX connection properties
 

 

 NMSettingWired — Describes connection properties for Ethernet-based networks
 

 

+NMSettingWireGuard — Describes connection properties for wireguard related options
+

+

 NMSettingWirelessSecurity — Describes connection properties for Wi-Fi networks that
 use WEP, LEAP, WPA or WPA2/RSN security
 

@@ -296,6 +302,9 @@ use WEP, LEAP, WPA or WPA2/RSN security
 NMDeviceVxlan
 
 

+NMDeviceWifiP2P
+

+

 NMDeviceWifi
 

 

@@ -317,6 +326,9 @@ use WEP, LEAP, WPA or WPA2/RSN security
 NMAccessPoint
 

 

+NMWifiP2PPeer
+

+

 NMWimaxNsp
 

 

diff --git a/docs/libnm/html/libnm-nm-dbus-interface.html b/docs/libnm/html/libnm-nm-dbus-interface.html
index b845c764..73ae64b8 100644
--- a/docs/libnm/html/libnm-nm-dbus-interface.html
+++ b/docs/libnm/html/libnm-nm-dbus-interface.html
@@ -54,27 +54,31 @@
 
 
 #define
-NM_DBUS_PATH
+NM_DBUS_INTERFACE
 
 
 #define
-NM_DBUS_INTERFACE
+NM_DBUS_INTERFACE_ACCESS_POINT
 
 
 #define
-NM_DBUS_INTERFACE_DEVICE
+NM_DBUS_INTERFACE_ACTIVE_CONNECTION
 
 
 #define
-NM_DBUS_INTERFACE_DEVICE_WIRED
+NM_DBUS_INTERFACE_CHECKPOINT
 
 
 #define
-NM_DBUS_INTERFACE_DEVICE_ADSL
+NM_DBUS_INTERFACE_DEVICE
 
 
 #define
-NM_DBUS_INTERFACE_DEVICE_WIRELESS
+NM_DBUS_INTERFACE_DEVICE_6LOWPAN
+
+
+#define
+NM_DBUS_INTERFACE_DEVICE_ADSL
 
 
 #define
@@ -82,79 +86,79 @@
 
 
 #define
-NM_DBUS_INTERFACE_DEVICE_OLPC_MESH
+NM_DBUS_INTERFACE_DEVICE_BOND
 
 
 #define
-NM_DBUS_INTERFACE_DEVICE_OVS_INTERFACE
+NM_DBUS_INTERFACE_DEVICE_BRIDGE
 
 
 #define
-NM_DBUS_INTERFACE_DEVICE_OVS_PORT
+NM_DBUS_INTERFACE_DEVICE_DUMMY
 
 
 #define
-NM_DBUS_INTERFACE_DEVICE_OVS_BRIDGE
+NM_DBUS_INTERFACE_DEVICE_GENERIC
 
 
 #define
-NM_DBUS_PATH_ACCESS_POINT
+NM_DBUS_INTERFACE_DEVICE_GRE
 
 
 #define
-NM_DBUS_INTERFACE_ACCESS_POINT
+NM_DBUS_INTERFACE_DEVICE_INFINIBAND
 
 
 #define
-NM_DBUS_INTERFACE_DEVICE_MODEM
+NM_DBUS_INTERFACE_DEVICE_IP_TUNNEL
 
 
 #define
-NM_DBUS_INTERFACE_DEVICE_WIMAX
+NM_DBUS_INTERFACE_DEVICE_MACSEC
 
 
 #define
-NM_DBUS_INTERFACE_WIMAX_NSP
+NM_DBUS_INTERFACE_DEVICE_MACVLAN
 
 
 #define
-NM_DBUS_PATH_WIMAX_NSP
+NM_DBUS_INTERFACE_DEVICE_MODEM
 
 
 #define
-NM_DBUS_INTERFACE_ACTIVE_CONNECTION
+NM_DBUS_INTERFACE_DEVICE_OLPC_MESH
 
 
 #define
-NM_DBUS_INTERFACE_IP4_CONFIG
+NM_DBUS_INTERFACE_DEVICE_OVS_BRIDGE
 
 
 #define
-NM_DBUS_INTERFACE_DHCP4_CONFIG
+NM_DBUS_INTERFACE_DEVICE_OVS_INTERFACE
 
 
 #define
-NM_DBUS_INTERFACE_IP6_CONFIG
+NM_DBUS_INTERFACE_DEVICE_OVS_PORT
 
 
 #define
-NM_DBUS_INTERFACE_DHCP6_CONFIG
+NM_DBUS_INTERFACE_DEVICE_PPP
 
 
 #define
-NM_DBUS_INTERFACE_DEVICE_INFINIBAND
+NM_DBUS_INTERFACE_DEVICE_STATISTICS
 
 
 #define
-NM_DBUS_INTERFACE_DEVICE_BOND
+NM_DBUS_INTERFACE_DEVICE_TEAM
 
 
 #define
-NM_DBUS_INTERFACE_DEVICE_DUMMY
+NM_DBUS_INTERFACE_DEVICE_TUN
 
 
 #define
-NM_DBUS_INTERFACE_DEVICE_TEAM
+NM_DBUS_INTERFACE_DEVICE_VETH
 
 
 #define
@@ -162,63 +166,71 @@
 
 
 #define
-NM_DBUS_INTERFACE_DEVICE_BRIDGE
+NM_DBUS_INTERFACE_DEVICE_VXLAN
 
 
 #define
-NM_DBUS_INTERFACE_DEVICE_GENERIC
+NM_DBUS_INTERFACE_DEVICE_WIFI_P2P
 
 
 #define
-NM_DBUS_INTERFACE_DEVICE_VETH
+NM_DBUS_INTERFACE_DEVICE_WIMAX
 
 
 #define
-NM_DBUS_INTERFACE_DEVICE_TUN
+NM_DBUS_INTERFACE_DEVICE_WIRED
 
 
 #define
-NM_DBUS_INTERFACE_DEVICE_MACSEC
+NM_DBUS_INTERFACE_DEVICE_WIREGUARD
 
 
 #define
-NM_DBUS_INTERFACE_DEVICE_MACVLAN
+NM_DBUS_INTERFACE_DEVICE_WIRELESS
 
 
 #define
-NM_DBUS_INTERFACE_DEVICE_PPP
+NM_DBUS_INTERFACE_DEVICE_WPAN
 
 
 #define
-NM_DBUS_INTERFACE_DEVICE_VXLAN
+NM_DBUS_INTERFACE_DHCP4_CONFIG
 
 
 #define
-NM_DBUS_INTERFACE_DEVICE_WIREGUARD
+NM_DBUS_INTERFACE_DHCP6_CONFIG
 
 
 #define
-NM_DBUS_INTERFACE_DEVICE_GRE
+NM_DBUS_INTERFACE_IP4_CONFIG
 
 
 #define
-NM_DBUS_INTERFACE_DEVICE_IP_TUNNEL
+NM_DBUS_INTERFACE_IP6_CONFIG
 
 
 #define
-NM_DBUS_INTERFACE_DEVICE_WPAN
+NM_DBUS_INTERFACE_WIFI_P2P_PEER
 
 
 #define
-NM_DBUS_INTERFACE_DEVICE_6LOWPAN
+NM_DBUS_INTERFACE_WIMAX_NSP
 
 
 #define
-NM_DBUS_INTERFACE_DEVICE_STATISTICS
+NM_DBUS_PATH
 
 
 #define
-NM_DBUS_INTERFACE_CHECKPOINT
+NM_DBUS_PATH_ACCESS_POINT
+
+
+#define
+NM_DBUS_PATH_WIFI_P2P_PEER
+
+
+#define
+NM_DBUS_PATH_WIMAX_NSP
 
 
 #define
@@ -501,38 +513,44 @@
 
 

 

-
NM_DBUS_PATH

-
#define NM_DBUS_PATH                           "/org/freedesktop/NetworkManager"
+
NM_DBUS_INTERFACE

+
#define NM_DBUS_INTERFACE                      "org.freedesktop.NetworkManager"
 

 

 

 

-
NM_DBUS_INTERFACE

-
#define NM_DBUS_INTERFACE                      "org.freedesktop.NetworkManager"
+
NM_DBUS_INTERFACE_ACCESS_POINT

+
#define NM_DBUS_INTERFACE_ACCESS_POINT         NM_DBUS_INTERFACE ".AccessPoint"
 

 

 

 

-
NM_DBUS_INTERFACE_DEVICE

-
#define NM_DBUS_INTERFACE_DEVICE               NM_DBUS_INTERFACE ".Device"
+
NM_DBUS_INTERFACE_ACTIVE_CONNECTION

+
#define NM_DBUS_INTERFACE_ACTIVE_CONNECTION    NM_DBUS_INTERFACE ".Connection.Active"
 

 

 

 

-
NM_DBUS_INTERFACE_DEVICE_WIRED

-
#define NM_DBUS_INTERFACE_DEVICE_WIRED         NM_DBUS_INTERFACE_DEVICE ".Wired"
+
NM_DBUS_INTERFACE_CHECKPOINT

+
#define NM_DBUS_INTERFACE_CHECKPOINT           NM_DBUS_INTERFACE ".Checkpoint"
 

 

 

 

-
NM_DBUS_INTERFACE_DEVICE_ADSL

-
#define NM_DBUS_INTERFACE_DEVICE_ADSL          NM_DBUS_INTERFACE_DEVICE ".Adsl"
+
NM_DBUS_INTERFACE_DEVICE

+
#define NM_DBUS_INTERFACE_DEVICE               NM_DBUS_INTERFACE ".Device"
 

 

 

 

-
NM_DBUS_INTERFACE_DEVICE_WIRELESS

-
#define NM_DBUS_INTERFACE_DEVICE_WIRELESS      NM_DBUS_INTERFACE_DEVICE ".Wireless"
+
NM_DBUS_INTERFACE_DEVICE_6LOWPAN

+
#define NM_DBUS_INTERFACE_DEVICE_6LOWPAN       NM_DBUS_INTERFACE_DEVICE ".Lowpan"
+

+

+

+

+
NM_DBUS_INTERFACE_DEVICE_ADSL

+
#define NM_DBUS_INTERFACE_DEVICE_ADSL          NM_DBUS_INTERFACE_DEVICE ".Adsl"
 

 

 

@@ -543,116 +561,116 @@
 
 

 

-
NM_DBUS_INTERFACE_DEVICE_OLPC_MESH

-
#define NM_DBUS_INTERFACE_DEVICE_OLPC_MESH     NM_DBUS_INTERFACE_DEVICE ".OlpcMesh"
+
NM_DBUS_INTERFACE_DEVICE_BOND

+
#define NM_DBUS_INTERFACE_DEVICE_BOND          NM_DBUS_INTERFACE_DEVICE ".Bond"
 

 

 

 

-
NM_DBUS_INTERFACE_DEVICE_OVS_INTERFACE

-
#define NM_DBUS_INTERFACE_DEVICE_OVS_INTERFACE NM_DBUS_INTERFACE_DEVICE ".OvsInterface"
+
NM_DBUS_INTERFACE_DEVICE_BRIDGE

+
#define NM_DBUS_INTERFACE_DEVICE_BRIDGE        NM_DBUS_INTERFACE_DEVICE ".Bridge"
 

 

 

 

-
NM_DBUS_INTERFACE_DEVICE_OVS_PORT

-
#define NM_DBUS_INTERFACE_DEVICE_OVS_PORT      NM_DBUS_INTERFACE_DEVICE ".OvsPort"
+
NM_DBUS_INTERFACE_DEVICE_DUMMY

+
#define NM_DBUS_INTERFACE_DEVICE_DUMMY         NM_DBUS_INTERFACE_DEVICE ".Dummy"
 

 

 

 

-
NM_DBUS_INTERFACE_DEVICE_OVS_BRIDGE

-
#define NM_DBUS_INTERFACE_DEVICE_OVS_BRIDGE    NM_DBUS_INTERFACE_DEVICE ".OvsBridge"
+
NM_DBUS_INTERFACE_DEVICE_GENERIC

+
#define NM_DBUS_INTERFACE_DEVICE_GENERIC       NM_DBUS_INTERFACE_DEVICE ".Generic"
 

 

 

 

-
NM_DBUS_PATH_ACCESS_POINT

-
#define NM_DBUS_PATH_ACCESS_POINT              NM_DBUS_PATH "/AccessPoint"
+
NM_DBUS_INTERFACE_DEVICE_GRE

+
#define NM_DBUS_INTERFACE_DEVICE_GRE           NM_DBUS_INTERFACE_DEVICE ".Gre"
 

 

 

 

-
NM_DBUS_INTERFACE_ACCESS_POINT

-
#define NM_DBUS_INTERFACE_ACCESS_POINT         NM_DBUS_INTERFACE ".AccessPoint"
+
NM_DBUS_INTERFACE_DEVICE_INFINIBAND

+
#define NM_DBUS_INTERFACE_DEVICE_INFINIBAND    NM_DBUS_INTERFACE_DEVICE ".Infiniband"
 

 

 

 

-
NM_DBUS_INTERFACE_DEVICE_MODEM

-
#define NM_DBUS_INTERFACE_DEVICE_MODEM         NM_DBUS_INTERFACE_DEVICE ".Modem"
+
NM_DBUS_INTERFACE_DEVICE_IP_TUNNEL

+
#define NM_DBUS_INTERFACE_DEVICE_IP_TUNNEL     NM_DBUS_INTERFACE_DEVICE ".IPTunnel"
 

 

 

 

-
NM_DBUS_INTERFACE_DEVICE_WIMAX

-
#define NM_DBUS_INTERFACE_DEVICE_WIMAX         NM_DBUS_INTERFACE_DEVICE ".WiMax"
+
NM_DBUS_INTERFACE_DEVICE_MACSEC

+
#define NM_DBUS_INTERFACE_DEVICE_MACSEC        NM_DBUS_INTERFACE_DEVICE ".Macsec"
 

 

 

 

-
NM_DBUS_INTERFACE_WIMAX_NSP

-
#define NM_DBUS_INTERFACE_WIMAX_NSP            NM_DBUS_INTERFACE ".WiMax.Nsp"
+
NM_DBUS_INTERFACE_DEVICE_MACVLAN

+
#define NM_DBUS_INTERFACE_DEVICE_MACVLAN       NM_DBUS_INTERFACE_DEVICE ".Macvlan"
 

 

 

 

-
NM_DBUS_PATH_WIMAX_NSP

-
#define NM_DBUS_PATH_WIMAX_NSP                 NM_DBUS_PATH "/Nsp"
+
NM_DBUS_INTERFACE_DEVICE_MODEM

+
#define NM_DBUS_INTERFACE_DEVICE_MODEM         NM_DBUS_INTERFACE_DEVICE ".Modem"
 

 

 

 

-
NM_DBUS_INTERFACE_ACTIVE_CONNECTION

-
#define NM_DBUS_INTERFACE_ACTIVE_CONNECTION    NM_DBUS_INTERFACE ".Connection.Active"
+
NM_DBUS_INTERFACE_DEVICE_OLPC_MESH

+
#define NM_DBUS_INTERFACE_DEVICE_OLPC_MESH     NM_DBUS_INTERFACE_DEVICE ".OlpcMesh"
 

 

 

 

-
NM_DBUS_INTERFACE_IP4_CONFIG

-
#define NM_DBUS_INTERFACE_IP4_CONFIG           NM_DBUS_INTERFACE ".IP4Config"
+
NM_DBUS_INTERFACE_DEVICE_OVS_BRIDGE

+
#define NM_DBUS_INTERFACE_DEVICE_OVS_BRIDGE    NM_DBUS_INTERFACE_DEVICE ".OvsBridge"
 

 

 

 

-
NM_DBUS_INTERFACE_DHCP4_CONFIG

-
#define NM_DBUS_INTERFACE_DHCP4_CONFIG         NM_DBUS_INTERFACE ".DHCP4Config"
+
NM_DBUS_INTERFACE_DEVICE_OVS_INTERFACE

+
#define NM_DBUS_INTERFACE_DEVICE_OVS_INTERFACE NM_DBUS_INTERFACE_DEVICE ".OvsInterface"
 

 

 

 

-
NM_DBUS_INTERFACE_IP6_CONFIG

-
#define NM_DBUS_INTERFACE_IP6_CONFIG           NM_DBUS_INTERFACE ".IP6Config"
+
NM_DBUS_INTERFACE_DEVICE_OVS_PORT

+
#define NM_DBUS_INTERFACE_DEVICE_OVS_PORT      NM_DBUS_INTERFACE_DEVICE ".OvsPort"
 

 

 

 

-
NM_DBUS_INTERFACE_DHCP6_CONFIG

-
#define NM_DBUS_INTERFACE_DHCP6_CONFIG         NM_DBUS_INTERFACE ".DHCP6Config"
+
NM_DBUS_INTERFACE_DEVICE_PPP

+
#define NM_DBUS_INTERFACE_DEVICE_PPP           NM_DBUS_INTERFACE_DEVICE ".Ppp"
 

 

 

 

-
NM_DBUS_INTERFACE_DEVICE_INFINIBAND

-
#define NM_DBUS_INTERFACE_DEVICE_INFINIBAND    NM_DBUS_INTERFACE_DEVICE ".Infiniband"
+
NM_DBUS_INTERFACE_DEVICE_STATISTICS

+
#define NM_DBUS_INTERFACE_DEVICE_STATISTICS    NM_DBUS_INTERFACE_DEVICE ".Statistics"
 

 

 

 

-
NM_DBUS_INTERFACE_DEVICE_BOND

-
#define NM_DBUS_INTERFACE_DEVICE_BOND          NM_DBUS_INTERFACE_DEVICE ".Bond"
+
NM_DBUS_INTERFACE_DEVICE_TEAM

+
#define NM_DBUS_INTERFACE_DEVICE_TEAM          NM_DBUS_INTERFACE_DEVICE ".Team"
 

 

 

 

-
NM_DBUS_INTERFACE_DEVICE_DUMMY

-
#define NM_DBUS_INTERFACE_DEVICE_DUMMY         NM_DBUS_INTERFACE_DEVICE ".Dummy"
+
NM_DBUS_INTERFACE_DEVICE_TUN

+
#define NM_DBUS_INTERFACE_DEVICE_TUN           NM_DBUS_INTERFACE_DEVICE ".Tun"
 

 

 

 

-
NM_DBUS_INTERFACE_DEVICE_TEAM

-
#define NM_DBUS_INTERFACE_DEVICE_TEAM          NM_DBUS_INTERFACE_DEVICE ".Team"
+
NM_DBUS_INTERFACE_DEVICE_VETH

+
#define NM_DBUS_INTERFACE_DEVICE_VETH          NM_DBUS_INTERFACE_DEVICE ".Veth"
 

 

 

@@ -663,92 +681,104 @@
 
 

 

-
NM_DBUS_INTERFACE_DEVICE_BRIDGE

-
#define NM_DBUS_INTERFACE_DEVICE_BRIDGE        NM_DBUS_INTERFACE_DEVICE ".Bridge"
+
NM_DBUS_INTERFACE_DEVICE_VXLAN

+
#define NM_DBUS_INTERFACE_DEVICE_VXLAN         NM_DBUS_INTERFACE_DEVICE ".Vxlan"
 

 

 

 

-
NM_DBUS_INTERFACE_DEVICE_GENERIC

-
#define NM_DBUS_INTERFACE_DEVICE_GENERIC       NM_DBUS_INTERFACE_DEVICE ".Generic"
+
NM_DBUS_INTERFACE_DEVICE_WIFI_P2P

+
#define NM_DBUS_INTERFACE_DEVICE_WIFI_P2P      NM_DBUS_INTERFACE_DEVICE ".WifiP2P"
 

 

 

 

-
NM_DBUS_INTERFACE_DEVICE_VETH

-
#define NM_DBUS_INTERFACE_DEVICE_VETH          NM_DBUS_INTERFACE_DEVICE ".Veth"
+
NM_DBUS_INTERFACE_DEVICE_WIMAX

+
#define NM_DBUS_INTERFACE_DEVICE_WIMAX         NM_DBUS_INTERFACE_DEVICE ".WiMax"
 

 

 

 

-
NM_DBUS_INTERFACE_DEVICE_TUN

-
#define NM_DBUS_INTERFACE_DEVICE_TUN           NM_DBUS_INTERFACE_DEVICE ".Tun"
+
NM_DBUS_INTERFACE_DEVICE_WIRED

+
#define NM_DBUS_INTERFACE_DEVICE_WIRED         NM_DBUS_INTERFACE_DEVICE ".Wired"
 

 

 

 

-
NM_DBUS_INTERFACE_DEVICE_MACSEC

-
#define NM_DBUS_INTERFACE_DEVICE_MACSEC        NM_DBUS_INTERFACE_DEVICE ".Macsec"
+
NM_DBUS_INTERFACE_DEVICE_WIREGUARD

+
#define NM_DBUS_INTERFACE_DEVICE_WIREGUARD     NM_DBUS_INTERFACE_DEVICE ".WireGuard"
 

 

 

 

-
NM_DBUS_INTERFACE_DEVICE_MACVLAN

-
#define NM_DBUS_INTERFACE_DEVICE_MACVLAN       NM_DBUS_INTERFACE_DEVICE ".Macvlan"
+
NM_DBUS_INTERFACE_DEVICE_WIRELESS

+
#define NM_DBUS_INTERFACE_DEVICE_WIRELESS      NM_DBUS_INTERFACE_DEVICE ".Wireless"
 

 

 

 

-
NM_DBUS_INTERFACE_DEVICE_PPP

-
#define NM_DBUS_INTERFACE_DEVICE_PPP           NM_DBUS_INTERFACE_DEVICE ".Ppp"
+
NM_DBUS_INTERFACE_DEVICE_WPAN

+
#define NM_DBUS_INTERFACE_DEVICE_WPAN          NM_DBUS_INTERFACE_DEVICE ".Wpan"
 

 

 

 

-
NM_DBUS_INTERFACE_DEVICE_VXLAN

-
#define NM_DBUS_INTERFACE_DEVICE_VXLAN         NM_DBUS_INTERFACE_DEVICE ".Vxlan"
+
NM_DBUS_INTERFACE_DHCP4_CONFIG

+
#define NM_DBUS_INTERFACE_DHCP4_CONFIG         NM_DBUS_INTERFACE ".DHCP4Config"
 

 

 

 

-
NM_DBUS_INTERFACE_DEVICE_WIREGUARD

-
#define NM_DBUS_INTERFACE_DEVICE_WIREGUARD     NM_DBUS_INTERFACE_DEVICE ".WireGuard"
+
NM_DBUS_INTERFACE_DHCP6_CONFIG

+
#define NM_DBUS_INTERFACE_DHCP6_CONFIG         NM_DBUS_INTERFACE ".DHCP6Config"
 

 

 

 

-
NM_DBUS_INTERFACE_DEVICE_GRE

-
#define NM_DBUS_INTERFACE_DEVICE_GRE           NM_DBUS_INTERFACE_DEVICE ".Gre"
+
NM_DBUS_INTERFACE_IP4_CONFIG

+
#define NM_DBUS_INTERFACE_IP4_CONFIG           NM_DBUS_INTERFACE ".IP4Config"
 

 

 

 

-
NM_DBUS_INTERFACE_DEVICE_IP_TUNNEL

-
#define NM_DBUS_INTERFACE_DEVICE_IP_TUNNEL     NM_DBUS_INTERFACE_DEVICE ".IPTunnel"
+
NM_DBUS_INTERFACE_IP6_CONFIG

+
#define NM_DBUS_INTERFACE_IP6_CONFIG           NM_DBUS_INTERFACE ".IP6Config"
 

 

 

 

-
NM_DBUS_INTERFACE_DEVICE_WPAN

-
#define NM_DBUS_INTERFACE_DEVICE_WPAN          NM_DBUS_INTERFACE_DEVICE ".Wpan"
+
NM_DBUS_INTERFACE_WIFI_P2P_PEER

+
#define NM_DBUS_INTERFACE_WIFI_P2P_PEER        NM_DBUS_INTERFACE ".WifiP2PPeer"
 

 

 

 

-
NM_DBUS_INTERFACE_DEVICE_6LOWPAN

-
#define NM_DBUS_INTERFACE_DEVICE_6LOWPAN       NM_DBUS_INTERFACE_DEVICE ".Lowpan"
+
NM_DBUS_INTERFACE_WIMAX_NSP

+
#define NM_DBUS_INTERFACE_WIMAX_NSP            NM_DBUS_INTERFACE ".WiMax.Nsp"
 

 

 

 

-
NM_DBUS_INTERFACE_DEVICE_STATISTICS

-
#define NM_DBUS_INTERFACE_DEVICE_STATISTICS    NM_DBUS_INTERFACE_DEVICE ".Statistics"
+
NM_DBUS_PATH

+
#define NM_DBUS_PATH                           "/org/freedesktop/NetworkManager"
 

 

 

 

-
NM_DBUS_INTERFACE_CHECKPOINT

-
#define NM_DBUS_INTERFACE_CHECKPOINT           NM_DBUS_INTERFACE ".Checkpoint"
+
NM_DBUS_PATH_ACCESS_POINT

+
#define NM_DBUS_PATH_ACCESS_POINT              NM_DBUS_PATH "/AccessPoint"
+

+

+

+

+
NM_DBUS_PATH_WIFI_P2P_PEER

+
#define NM_DBUS_PATH_WIFI_P2P_PEER             NM_DBUS_PATH "/WifiP2PPeer"
+

+

+

+

+
NM_DBUS_PATH_WIMAX_NSP

+
#define NM_DBUS_PATH_WIMAX_NSP                 NM_DBUS_PATH "/Nsp"
 

 

 

@@ -973,7 +1003,7 @@ extensions.

 
The Internet connection is hijacked by a captive
   portal gateway. The graphical shell may open a sandboxed web browser window
   (because the captive portals typically attempt a man-in-the-middle attacks
-  agains the https connections) for the purpose of authenticating to a gateway
+  against the https connections) for the purpose of authenticating to a gateway
   and retrigger the connectivity check with CheckConnectivity() when the
   browser window is dismissed.

 
@@ -1031,7 +1061,7 @@ device object.

 
 
NM_DEVICE_TYPE_WIFI

 
-
an 802.11 WiFi device

+
an 802.11 Wi-Fi device

 
  
 
@@ -1225,6 +1255,13 @@ GSM/UMTS, or LTE network access protocols

 
  
 
+
+
NM_DEVICE_TYPE_WIFI_P2P

+
+
an 802.11 Wi-Fi P2P device (Since: 1.16)

+
+ 
+
 
 
 
@@ -1534,6 +1571,14 @@ is supported

 
  
 
+
+
NM_802_11_AP_SEC_KEY_MGMT_SAE

+
+
WPA/RSN Simultaneous Authentication of Equals is
+supported

+
+ 
+
 
 
 
@@ -1790,7 +1835,7 @@ GPRS, EDGE, UMTS, HSDPA, HSUPA, or HSPA+ packet switched data capability

 
NM_DEVICE_STATE_CONFIG

 
 
the device is connecting to the requested network.
-  This may include operations like associating with the WiFi AP, dialing
+  This may include operations like associating with the Wi-Fi AP, dialing
   the modem, connecting to the remote Bluetooth device, etc.

 
  
@@ -2247,7 +2292,7 @@ GPRS, EDGE, UMTS, HSDPA, HSUPA, or HSPA+ packet switched data capability

 
 
NM_DEVICE_STATE_REASON_SSID_NOT_FOUND

 
-
The WiFi network could not be found

+
The Wi-Fi network could not be found

 
  
 
@@ -2342,6 +2387,13 @@ GPRS, EDGE, UMTS, HSDPA, HSUPA, or HSPA+ packet switched data capability

 
  
 
+
+
NM_DEVICE_STATE_REASON_PEER_NOT_FOUND

+
+
The Wi-Fi P2P peer could not be found

+
+ 
+
 
 
 
@@ -3201,6 +3253,16 @@ VPN plugin authentication dialogs.

 
  
 
+
+
NM_ACTIVATION_STATE_FLAG_LIFETIME_BOUND_TO_PROFILE_VISIBILITY

+
+
the lifetime
+  of the activation is bound to the visilibity of the connection profile,
+  which in turn depends on "connection.permissions" and whether a session
+  for the user exists. Since: 1.16

+
+ 
+
 
 
 
@@ -3285,7 +3347,7 @@ VPN plugin authentication dialogs.

 
NM_SETTINGS_UPDATE2_FLAG_BLOCK_AUTOCONNECT

 
 
usually, when the connection
-  has autoconnect enabled and is modified, it becomes elegible to autoconnect
+  has autoconnect enabled and is modified, it becomes eligible to autoconnect
   right away. Setting this flag, disables autoconnect until the connection
   is manually activated.

 
diff --git a/docs/libnm/html/libnm-nm-errors.html b/docs/libnm/html/libnm-nm-errors.html
index 9e2f2d03..cd91f295 100644
--- a/docs/libnm/html/libnm-nm-errors.html
+++ b/docs/libnm/html/libnm-nm-errors.html
@@ -582,6 +582,13 @@ returned from D-Bus operations (where they correspond to errors in the
 
  
 
+
+
NM_DEVICE_ERROR_INVALID_ARGUMENT

+
+
invalid argument. Since: 1.16

+
+ 
+
 
 
 
diff --git a/docs/libnm/html/libnm-nm-utils.html b/docs/libnm/html/libnm-nm-utils.html
index 70a83944..3528aac9 100644
--- a/docs/libnm/html/libnm-nm-utils.html
+++ b/docs/libnm/html/libnm-nm-utils.html
@@ -631,6 +631,14 @@
 nm_utils_get_timestamp_msec ()
 
 
+
+
+gboolean
+
+
+nm_utils_base64secret_decode ()
+
+
 
 
 
@@ -895,7 +903,7 @@ use 
 
 
type

-
the security type to check AP flags and device capabilties against,
+
the security type to check AP flags and device capabilities against,
 e.g. NMU_SEC_STATIC_WEP

  
 
@@ -925,13 +933,13 @@ arguments are valid

 
 
 
ap_wpa

-
bitfield of AP capabilties derived from the AP's WPA beacon,
+
bitfield of AP capabilities derived from the AP's WPA beacon,
 e.g. (NM_802_11_AP_SEC_PAIR_TKIP | NM_802_11_AP_SEC_KEY_MGMT_PSK)

  
 
 
 
ap_rsn

-
bitfield of AP capabilties derived from the AP's RSN/WPA2 beacon,
+
bitfield of AP capabilities derived from the AP's RSN/WPA2 beacon,
 e.g. (NM_802_11_AP_SEC_PAIR_CCMP | NM_802_11_AP_SEC_PAIR_TKIP)

  
 
@@ -940,7 +948,7 @@ e.g. (
 
Returns

-
 TRUE if the device capabilities and AP capabilties intersect and are
+
 TRUE if the device capabilities and AP capabilities intersect and are
 compatible with the desired type
 , FALSE if they are not

 
@@ -965,7 +973,7 @@ desired security type are valid for AP/Hotspot connections.

 
 
 
type

-
the security type to check device capabilties against,
+
the security type to check device capabilities against,
 e.g. NMU_SEC_STATIC_WEP

  
 
@@ -1888,9 +1896,9 @@ and predicate
 
 
 
user_data

-
(allow-none): user data for predicate
+
user data for predicate
 function. 

-[closure]
+[closure][allow-none]
 
 
 
error

@@ -3356,6 +3364,51 @@ nm_utils_sriov_vf_from_str (const gint64
 nm_utils_get_timestamp_msec (void);
 
+

+

+
nm_utils_base64secret_decode ()

+
gboolean
+nm_utils_base64secret_decode (const char *base64_key,
+                              gsize required_key_len,
+                              guint8 *out_key);

+

+
Parameters

+

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





base64_key
the (possibly invalid) base64 encode key.
 
required_key_len
the expected (binary) length of the key after
+decoding. If the length does not match, the validation fails.
 
out_key
(out): an optional output buffer for the binary
+key. If given, it will be filled with exactly required_key_len
+bytes. 
[allow-none]

+

+

+
Returns

+
 TRUE if the input key is a valid base64 encoded key
+with required_key_len
+bytes.

+

+
Since: 1.16

+

 
 

 
Types and Values

diff --git a/docs/libnm/html/libnm-nm-version.html b/docs/libnm/html/libnm-nm-version.html
index bfeff4b5..596c4ea0 100644
--- a/docs/libnm/html/libnm-nm-version.html
+++ b/docs/libnm/html/libnm-nm-version.html
@@ -93,6 +93,12 @@
 NM_DEPRECATED_IN_1_14_FOR()
 
 
+
+#define
+
+NM_DEPRECATED_IN_1_16_FOR()
+
+
 
 

 
@@ -184,6 +190,14 @@
 #define
 NM_AVAILABLE_IN_1_14
 
+
+#define
+NM_DEPRECATED_IN_1_16
+
+
+#define
+NM_AVAILABLE_IN_1_16
+
 
 
 
@@ -244,6 +258,12 @@
 
# define NM_DEPRECATED_IN_1_14_FOR(f)    G_DEPRECATED_FOR(f)
 

 
+

+

+
NM_DEPRECATED_IN_1_16_FOR()

+
# define NM_DEPRECATED_IN_1_16_FOR(f)    G_DEPRECATED_FOR(f)
+

+

 
 

 
Types and Values

@@ -364,6 +384,18 @@
 
# define NM_AVAILABLE_IN_1_14            G_UNAVAILABLE(1,14)
 

 

+

+

+
NM_DEPRECATED_IN_1_16

+
# define NM_DEPRECATED_IN_1_16           G_DEPRECATED
+

+

+

+

+
NM_AVAILABLE_IN_1_16

+
# define NM_AVAILABLE_IN_1_16            G_UNAVAILABLE(1,16)
+

+

 
 
 

diff --git a/docs/libnm/html/libnm.devhelp2 b/docs/libnm/html/libnm.devhelp2
index e056858b..847ecd84 100644
--- a/docs/libnm/html/libnm.devhelp2
+++ b/docs/libnm/html/libnm.devhelp2
@@ -44,8 +44,8 @@
       
       
       
-      
       
+      
       
       
       
@@ -57,8 +57,10 @@
       
       
       
+      
       
       
+      
       
       
       
@@ -87,6 +89,7 @@
       
       
       
+      
       
       
       
@@ -94,6 +97,7 @@
       
       
       
+      
       
       
       
@@ -164,6 +168,8 @@
     
     
     
+    
+    
     
     
     
@@ -325,48 +331,51 @@
     
     
     
-    
     
+    
+    
+    
     
-    
+    
     
-    
     
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
     
-    
-    
-    
     
+    
     
-    
-    
+    
+    
+    
     
     
+    
+    
+    
+    
+    
     
+    
+    
+    
+    
+    
     
+    
+    
+    
     
-    
-    
+    
     
-    
-    
-    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
     
     
     
@@ -531,6 +540,7 @@
     
     
     
+    
     
     
     
@@ -1091,7 +1101,6 @@
     
     
     
-    
     
     
     
@@ -1102,10 +1111,10 @@
     
     
     
+    
     
     
     
-    
     
     
     
@@ -1118,6 +1127,7 @@
     
     
     
+    
     
     
     
@@ -1490,24 +1500,6 @@
     
     
     
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
     
     
     
@@ -1565,6 +1557,24 @@
     
     
     
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
     
     
     
@@ -1715,6 +1725,7 @@
     
     
     
+    
     
     
     
@@ -1728,6 +1739,7 @@
     
     
     
+    
     
     
     
@@ -1953,6 +1965,14 @@
     
     
     
+    
+    
+    
+    
+    
+    
+    
+    
     
     
     
@@ -2019,6 +2039,59 @@
     
     
     
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
     
     
     
@@ -2171,10 +2244,16 @@
     
     
     
+    
+    
     
     
     
     
+    
+    
+    
+    
     
     
     
@@ -2195,6 +2274,7 @@
     
     
     
+    
     
     
     
@@ -2259,6 +2339,8 @@
     
     
     
+    
+    
     
     
     
@@ -2274,7 +2356,9 @@
     
     
     
+    
     
+    
     
     
     
@@ -2579,6 +2663,16 @@
     
     
     
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
     
     
     
@@ -2742,6 +2836,28 @@
     
     
     
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
     
     
     
@@ -2868,6 +2984,7 @@
     
     
     
+    
     
     
     
@@ -2882,6 +2999,7 @@
     
     
     
+    
     
     
     
@@ -2902,6 +3020,8 @@
     
     
     
+    
+    
     
     
     
@@ -2958,6 +3078,7 @@
     
     
     
+    
     
     
     
@@ -2996,6 +3117,7 @@
     
     
     
+    
     
     
     
@@ -3078,6 +3200,7 @@
     
     
     
+    
     
     
     
@@ -3111,6 +3234,7 @@
     
     
     
+    
     
     
     
@@ -3207,6 +3331,7 @@
     
     
     
+    
     
     
     
@@ -3278,6 +3403,7 @@
     
     
     
+    
     
     
     
@@ -3338,7 +3464,6 @@
     
     
     
-    
     
     
     
@@ -3397,7 +3522,6 @@
     
     
     
-    
     
     
     
@@ -3432,8 +3556,6 @@
     
     
     
-    
-    
     
     
     
diff --git a/docs/libnm/html/object-tree.html b/docs/libnm/html/object-tree.html
index d5d0d0c7..d9093705 100644
--- a/docs/libnm/html/object-tree.html
+++ b/docs/libnm/html/object-tree.html
@@ -53,12 +53,14 @@
     │   │   ├── NMDeviceVlan
     │   │   ├── NMDeviceVxlan
     │   │   ├── NMDeviceWifi
+    │   │   ├── NMDeviceWifiP2P
     │   │   ├── NMDeviceWimax
     │   │   ├── NMDeviceWireGuard
     │   │   ╰── NMDeviceWpan
     │   ├── NMDhcpConfig
     │   ├── NMIPConfig
     │   ├── NMRemoteConnection
+    │   ├── NMWifiP2PPeer
     │   ╰── NMWimaxNsp
     ├── NMClient
     ├── NMSecretAgentOld
@@ -103,8 +105,10 @@
     │   ├── NMSettingVlan
     │   ├── NMSettingVpn
     │   ├── NMSettingVxlan
+    │   ├── NMSettingWifiP2P
     │   ├── NMSettingWimax
     │   ├── NMSettingWired
+    │   ├── NMSettingWireGuard
     │   ├── NMSettingWireless
     │   ├── NMSettingWirelessSecurity
     │   ╰── NMSettingWpan
@@ -126,10 +130,10 @@
     ├── NMIPTunnelFlags
     ├── NMSecretAgentCapabilities
     ├── NMSecretAgentGetSecretsFlags
-    ├── NMSetting8021xAuthFlags
     ├── NMSettingDcbFlags
     ├── NMSettingSecretFlags
     ├── NMSettingWiredWakeOnLan
+    ├── NMSettingWirelessSecurityWpsMethod
     ├── NMSettingWirelessWakeOnWLan
     ├── NMSettingsConnectionFlags
     ├── NMSettingsUpdate2Flags
@@ -159,6 +163,7 @@
     ├── NMDeviceType
     ├── NMIPTunnelMode
     ├── NMMetered
+    ├── NMSetting8021xAuthFlags
     ├── NMSetting8021xCKFormat
     ├── NMSetting8021xCKScheme
     ├── NMSettingCompareFlags
@@ -179,7 +184,6 @@
     ├── NMSettingWirelessPowersave
     ├── NMSettingWirelessSecurityFils
     ├── NMSettingWirelessSecurityPmf
-    ├── NMSettingWirelessSecurityWpsMethod
     ├── NMSriovVFVlanProtocol
     ├── NMState
     ├── NMTernary
@@ -200,7 +204,8 @@
     ├── NMTCAction
     ├── NMTCQdisc
     ├── NMTCTfilter
-    ╰── NMTeamLinkWatcher
+    ├── NMTeamLinkWatcher
+    ╰── NMWireGuardPeer
 
 

 

diff --git a/docs/libnm/html/ref-overview.html b/docs/libnm/html/ref-overview.html
index 5bb7c4e5..0486f3a9 100644
--- a/docs/libnm/html/ref-overview.html
+++ b/docs/libnm/html/ref-overview.html
@@ -47,7 +47,7 @@
         mapping D-Bus signals and properties to GObject signals and properties,
         and providing helpful accessor and utility functions.  However, unlike
         the old libnm-util/libnm-glib API, the mapping to the D-Bus API is not
-        exact, and various inconveniences and historical anomolies of the D-Bus
+        exact, and various inconveniences and historical anomalies of the D-Bus
         API are papered over.
       

 

diff --git a/docs/libnm/html/usage.html b/docs/libnm/html/usage.html
index 452b8d12..9b8caf5d 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.14.6
+  NetworkManager version: 1.16.0
 
   $ 

 

diff --git a/docs/libnm/libnm-docs.xml b/docs/libnm/libnm-docs.xml
index 8ff9676f..74866ace 100644
--- a/docs/libnm/libnm-docs.xml
+++ b/docs/libnm/libnm-docs.xml
@@ -69,7 +69,7 @@
         mapping D-Bus signals and properties to GObject signals and properties,
         and providing helpful accessor and utility functions.  However, unlike
         the old libnm-util/libnm-glib API, the mapping to the D-Bus API is not
-        exact, and various inconveniences and historical anomolies of the D-Bus
+        exact, and various inconveniences and historical anomalies of the D-Bus
         API are papered over.
       
       
@@ -218,8 +218,8 @@ print ("NetworkManager version " + client.get_version())]]>
     
     
-    
     
+    
     
     
     
@@ -231,8 +231,10 @@ print ("NetworkManager version " + client.get_version())]]>
     
     
+    
     
     
+    
     
     
     
@@ -265,6 +267,7 @@ print ("NetworkManager version " + client.get_version())]]>
     
     
+    
     
     
     
@@ -273,6 +276,7 @@ print ("NetworkManager version " + client.get_version())]]>
     
     
+    
     
     
     
diff --git a/docs/libnm/libnm-sections.txt b/docs/libnm/libnm-sections.txt
index 02d31ad7..93814a85 100644
--- a/docs/libnm/libnm-sections.txt
+++ b/docs/libnm/libnm-sections.txt
@@ -203,6 +203,8 @@ nm_client_activate_connection_async
 nm_client_activate_connection_finish
 nm_client_add_and_activate_connection_async
 nm_client_add_and_activate_connection_finish
+nm_client_add_and_activate_connection2
+nm_client_add_and_activate_connection2_finish
 nm_client_deactivate_connection
 nm_client_deactivate_connection_async
 nm_client_deactivate_connection_finish
@@ -518,7 +520,9 @@ NMSettingUser
 NMSettingVlan
 NMSettingVpn
 NMSettingVxlan
+NMSettingWifiP2P
 NMSettingWimax
+NMSettingWireGuard
 NMSettingWired
 NMSettingWireless
 NMSettingWirelessSecurity
@@ -531,48 +535,51 @@ NMSimpleConnection
 NM_AVAILABLE_IN_1_2
 NM_AVAILABLE_IN_1_8
 NM_DBUS_SERVICE
-NM_DBUS_PATH
 NM_DBUS_INTERFACE
+NM_DBUS_INTERFACE_ACCESS_POINT
+NM_DBUS_INTERFACE_ACTIVE_CONNECTION
+NM_DBUS_INTERFACE_CHECKPOINT
 NM_DBUS_INTERFACE_DEVICE
-NM_DBUS_INTERFACE_DEVICE_WIRED
+NM_DBUS_INTERFACE_DEVICE_6LOWPAN
 NM_DBUS_INTERFACE_DEVICE_ADSL
-NM_DBUS_INTERFACE_DEVICE_WIRELESS
 NM_DBUS_INTERFACE_DEVICE_BLUETOOTH
-NM_DBUS_INTERFACE_DEVICE_OLPC_MESH
-NM_DBUS_INTERFACE_DEVICE_OVS_INTERFACE
-NM_DBUS_INTERFACE_DEVICE_OVS_PORT
-NM_DBUS_INTERFACE_DEVICE_OVS_BRIDGE
-NM_DBUS_PATH_ACCESS_POINT
-NM_DBUS_INTERFACE_ACCESS_POINT
-NM_DBUS_INTERFACE_DEVICE_MODEM
-NM_DBUS_INTERFACE_DEVICE_WIMAX
-NM_DBUS_INTERFACE_WIMAX_NSP
-NM_DBUS_PATH_WIMAX_NSP
-NM_DBUS_INTERFACE_ACTIVE_CONNECTION
-NM_DBUS_INTERFACE_IP4_CONFIG
-NM_DBUS_INTERFACE_DHCP4_CONFIG
-NM_DBUS_INTERFACE_IP6_CONFIG
-NM_DBUS_INTERFACE_DHCP6_CONFIG
-NM_DBUS_INTERFACE_DEVICE_INFINIBAND
 NM_DBUS_INTERFACE_DEVICE_BOND
-NM_DBUS_INTERFACE_DEVICE_DUMMY
-NM_DBUS_INTERFACE_DEVICE_TEAM
-NM_DBUS_INTERFACE_DEVICE_VLAN
 NM_DBUS_INTERFACE_DEVICE_BRIDGE
+NM_DBUS_INTERFACE_DEVICE_DUMMY
 NM_DBUS_INTERFACE_DEVICE_GENERIC
-NM_DBUS_INTERFACE_DEVICE_VETH
-NM_DBUS_INTERFACE_DEVICE_TUN
+NM_DBUS_INTERFACE_DEVICE_GRE
+NM_DBUS_INTERFACE_DEVICE_INFINIBAND
+NM_DBUS_INTERFACE_DEVICE_IP_TUNNEL
 NM_DBUS_INTERFACE_DEVICE_MACSEC
 NM_DBUS_INTERFACE_DEVICE_MACVLAN
+NM_DBUS_INTERFACE_DEVICE_MODEM
+NM_DBUS_INTERFACE_DEVICE_OLPC_MESH
+NM_DBUS_INTERFACE_DEVICE_OVS_BRIDGE
+NM_DBUS_INTERFACE_DEVICE_OVS_INTERFACE
+NM_DBUS_INTERFACE_DEVICE_OVS_PORT
 NM_DBUS_INTERFACE_DEVICE_PPP
+NM_DBUS_INTERFACE_DEVICE_STATISTICS
+NM_DBUS_INTERFACE_DEVICE_TEAM
+NM_DBUS_INTERFACE_DEVICE_TUN
+NM_DBUS_INTERFACE_DEVICE_VETH
+NM_DBUS_INTERFACE_DEVICE_VLAN
 NM_DBUS_INTERFACE_DEVICE_VXLAN
+NM_DBUS_INTERFACE_DEVICE_WIFI_P2P
+NM_DBUS_INTERFACE_DEVICE_WIMAX
+NM_DBUS_INTERFACE_DEVICE_WIRED
 NM_DBUS_INTERFACE_DEVICE_WIREGUARD
-NM_DBUS_INTERFACE_DEVICE_GRE
-NM_DBUS_INTERFACE_DEVICE_IP_TUNNEL
+NM_DBUS_INTERFACE_DEVICE_WIRELESS
 NM_DBUS_INTERFACE_DEVICE_WPAN
-NM_DBUS_INTERFACE_DEVICE_6LOWPAN
-NM_DBUS_INTERFACE_DEVICE_STATISTICS
-NM_DBUS_INTERFACE_CHECKPOINT
+NM_DBUS_INTERFACE_DHCP4_CONFIG
+NM_DBUS_INTERFACE_DHCP6_CONFIG
+NM_DBUS_INTERFACE_IP4_CONFIG
+NM_DBUS_INTERFACE_IP6_CONFIG
+NM_DBUS_INTERFACE_WIFI_P2P_PEER
+NM_DBUS_INTERFACE_WIMAX_NSP
+NM_DBUS_PATH
+NM_DBUS_PATH_ACCESS_POINT
+NM_DBUS_PATH_WIFI_P2P_PEER
+NM_DBUS_PATH_WIMAX_NSP
 NM_DBUS_INTERFACE_SETTINGS
 NM_DBUS_PATH_SETTINGS
 NM_DBUS_INTERFACE_SETTINGS_CONNECTION
@@ -660,6 +667,8 @@ NM_DEVICE_PHYSICAL_PORT_ID
 NM_DEVICE_MTU
 NM_DEVICE_METERED
 NM_DEVICE_LLDP_NEIGHBORS
+NM_DEVICE_IP4_CONNECTIVITY
+NM_DEVICE_IP6_CONNECTIVITY
 NMDevice
 nm_device_get_iface
 nm_device_get_ip_iface
@@ -681,6 +690,7 @@ nm_device_get_ip4_config
 nm_device_get_dhcp4_config
 nm_device_get_ip6_config
 nm_device_get_dhcp6_config
+nm_device_get_connectivity
 nm_device_get_state
 nm_device_get_state_reason
 nm_device_get_active_connection
@@ -1252,6 +1262,29 @@ NM_TYPE_DEVICE_WIFI
 nm_device_wifi_get_type
 
 
+

+nm-device-wifi-p2p
+NMDeviceWifiP2P
+NM_DEVICE_WIFI_P2P_HW_ADDRESS
+NM_DEVICE_WIFI_P2P_PEERS
+NM_DEVICE_WIFI_P2P_WFDIES
+nm_device_wifi_p2p_get_hw_address
+nm_device_wifi_p2p_get_peer_by_path
+nm_device_wifi_p2p_get_peers
+nm_device_wifi_p2p_start_find
+nm_device_wifi_p2p_start_find_finish
+nm_device_wifi_p2p_stop_find
+nm_device_wifi_p2p_stop_find_finish
+
+NMDeviceWifiP2PClass
+NM_DEVICE_WIFI_P2P
+NM_DEVICE_WIFI_P2P_CLASS
+NM_DEVICE_WIFI_P2P_GET_CLASS
+NM_IS_DEVICE_WIFI_P2P
+NM_TYPE_DEVICE_WIFI_P2P
+nm_device_wifi_p2p_get_type
+

+
 

 nm-device-wimax
 NMDeviceWimax
@@ -1536,6 +1569,7 @@ NMSettingMacRandomization
 NMSetting
 NMSettingClearSecretsWithFlagsFn
 NMSettingValueIterFn
+_NMConnectionForEachSecretFunc
 nm_setting_lookup_type
 nm_setting_duplicate
 nm_setting_get_name
@@ -2160,7 +2194,6 @@ nm_setting_generic_get_type
 nm-setting-gsm
 NMSettingGsm
 NM_SETTING_GSM_SETTING_NAME
-NM_SETTING_GSM_NUMBER
 NM_SETTING_GSM_USERNAME
 NM_SETTING_GSM_PASSWORD
 NM_SETTING_GSM_PASSWORD_FLAGS
@@ -2173,9 +2206,9 @@ NM_SETTING_GSM_DEVICE_ID
 NM_SETTING_GSM_SIM_ID
 NM_SETTING_GSM_SIM_OPERATOR_ID
 NM_SETTING_GSM_MTU
+NM_SETTING_GSM_NUMBER
 NMSettingGsm
 nm_setting_gsm_new
-nm_setting_gsm_get_number
 nm_setting_gsm_get_username
 nm_setting_gsm_get_password
 nm_setting_gsm_get_apn
@@ -2186,6 +2219,7 @@ nm_setting_gsm_get_device_id
 nm_setting_gsm_get_sim_id
 nm_setting_gsm_get_sim_operator_id
 nm_setting_gsm_get_mtu
+nm_setting_gsm_get_number
 nm_setting_gsm_get_pin_flags
 nm_setting_gsm_get_password_flags
 
@@ -2926,6 +2960,7 @@ NM_TEAM_LINK_WATCHER_NSNA_PING
 nm_team_link_watcher_new_ethtool
 nm_team_link_watcher_new_nsna_ping
 nm_team_link_watcher_new_arp_ping
+nm_team_link_watcher_new_arp_ping2
 nm_team_link_watcher_ref
 nm_team_link_watcher_unref
 nm_team_link_watcher_equal
@@ -2939,6 +2974,7 @@ nm_team_link_watcher_get_missed_max
 nm_team_link_watcher_get_target_host
 nm_team_link_watcher_get_source_host
 nm_team_link_watcher_get_flags
+nm_team_link_watcher_get_vlanid
 NM_SETTING_TEAM_SETTING_NAME
 NM_SETTING_TEAM_CONFIG
 NM_SETTING_TEAM_NOTIFY_PEERS_COUNT
@@ -3225,6 +3261,27 @@ NM_TYPE_SETTING_VXLAN
 nm_setting_vxlan_get_type
 

 
+

+nm-setting-wifi-p2p
+NMSettingWifiP2P
+NM_SETTING_WIFI_P2P_SETTING_NAME
+NM_SETTING_WIFI_P2P_PEER
+NM_SETTING_WIFI_P2P_WPS_METHOD
+NM_SETTING_WIFI_P2P_WFD_IES
+nm_setting_wifi_p2p_new
+nm_setting_wifi_p2p_get_peer
+nm_setting_wifi_p2p_get_wps_method
+nm_setting_wifi_p2p_get_wfd_ies
+
+NMSettingWifiP2PClass
+NM_IS_SETTING_WIFI_P2P
+NM_SETTING_WIFI_P2P
+NM_SETTING_WIFI_P2P_CLASS
+NM_SETTING_WIFI_P2P_GET_CLASS
+NM_TYPE_SETTING_WIFI_P2P
+nm_setting_wifi_p2p_get_type
+

+
 

 nm-setting-wimax
 NMSettingWimax
@@ -3301,6 +3358,74 @@ NM_TYPE_SETTING_WIRED
 nm_setting_wired_get_type
 

 
+

+nm-setting-wireguard
+NMSettingWireGuard
+NM_WIREGUARD_PUBLIC_KEY_LEN
+NM_WIREGUARD_SYMMETRIC_KEY_LEN
+nm_wireguard_peer_new
+nm_wireguard_peer_new_clone
+nm_wireguard_peer_ref
+nm_wireguard_peer_unref
+nm_wireguard_peer_seal
+nm_wireguard_peer_is_sealed
+nm_wireguard_peer_get_public_key
+nm_wireguard_peer_set_public_key
+nm_wireguard_peer_get_preshared_key
+nm_wireguard_peer_set_preshared_key
+nm_wireguard_peer_get_preshared_key_flags
+nm_wireguard_peer_set_preshared_key_flags
+nm_wireguard_peer_get_persistent_keepalive
+nm_wireguard_peer_set_persistent_keepalive
+nm_wireguard_peer_get_endpoint
+nm_wireguard_peer_set_endpoint
+nm_wireguard_peer_get_allowed_ips_len
+nm_wireguard_peer_get_allowed_ip
+nm_wireguard_peer_clear_allowed_ips
+nm_wireguard_peer_append_allowed_ip
+nm_wireguard_peer_remove_allowed_ip
+nm_wireguard_peer_is_valid
+nm_wireguard_peer_cmp
+NM_SETTING_WIREGUARD_SETTING_NAME
+NM_SETTING_WIREGUARD_FWMARK
+NM_SETTING_WIREGUARD_LISTEN_PORT
+NM_SETTING_WIREGUARD_PRIVATE_KEY
+NM_SETTING_WIREGUARD_PRIVATE_KEY_FLAGS
+NM_SETTING_WIREGUARD_PEERS
+NM_SETTING_WIREGUARD_MTU
+NM_SETTING_WIREGUARD_PEER_ROUTES
+NM_WIREGUARD_PEER_ATTR_ALLOWED_IPS
+NM_WIREGUARD_PEER_ATTR_ENDPOINT
+NM_WIREGUARD_PEER_ATTR_PERSISTENT_KEEPALIVE
+NM_WIREGUARD_PEER_ATTR_PRESHARED_KEY
+NM_WIREGUARD_PEER_ATTR_PRESHARED_KEY_FLAGS
+NM_WIREGUARD_PEER_ATTR_PUBLIC_KEY
+nm_setting_wireguard_new
+nm_setting_wireguard_get_private_key
+nm_setting_wireguard_get_private_key_flags
+nm_setting_wireguard_get_listen_port
+nm_setting_wireguard_get_fwmark
+nm_setting_wireguard_get_peers_len
+nm_setting_wireguard_get_peer
+nm_setting_wireguard_get_peer_by_public_key
+nm_setting_wireguard_set_peer
+nm_setting_wireguard_append_peer
+nm_setting_wireguard_remove_peer
+nm_setting_wireguard_clear_peers
+nm_setting_wireguard_get_peer_routes
+nm_setting_wireguard_get_mtu
+
+NMSettingWireGuardClass
+NMWireGuardPeer
+NM_IS_SETTING_WIREGUARD
+NM_SETTING_WIREGUARD
+NM_SETTING_WIREGUARD_CLASS
+NM_SETTING_WIREGUARD_GET_CLASS
+NM_TYPE_SETTING_WIREGUARD
+nm_setting_wireguard_get_type
+nm_wireguard_peer_get_type
+

+
 

 nm-setting-wireless
 NMSettingWireless
@@ -3445,10 +3570,16 @@ NM_SETTING_WPAN_SETTING_NAME
 NM_SETTING_WPAN_MAC_ADDRESS
 NM_SETTING_WPAN_PAN_ID
 NM_SETTING_WPAN_SHORT_ADDRESS
+NM_SETTING_WPAN_PAGE
+NM_SETTING_WPAN_CHANNEL
+NM_SETTING_WPAN_PAGE_DEFAULT
+NM_SETTING_WPAN_CHANNEL_DEFAULT
 nm_setting_wpan_new
 nm_setting_wpan_get_mac_address
 nm_setting_wpan_get_pan_id
 nm_setting_wpan_get_short_address
+nm_setting_wpan_get_page
+nm_setting_wpan_get_channel
 
 NMSettingWpanClass
 NM_IS_SETTING_WPAN
@@ -3507,6 +3638,7 @@ NMDeviceTun
 NMDeviceVlan
 NMDeviceVxlan
 NMDeviceWifi
+NMDeviceWifiP2P
 NMDeviceWimax
 NMDeviceWireGuard
 NMDeviceWpan
@@ -3515,6 +3647,7 @@ NMIPConfig
 NMObject
 NMRemoteConnection
 NMVpnConnection
+NMWifiP2PPeer
 NMWimaxNsp
 

 
@@ -3598,6 +3731,7 @@ nm_utils_tc_tfilter_to_str
 nm_utils_sriov_vf_to_str
 nm_utils_sriov_vf_from_str
 nm_utils_get_timestamp_msec
+nm_utils_base64secret_decode
 NMVariantAttributeSpec
 stat
 
@@ -3633,6 +3767,9 @@ NM_AVAILABLE_IN_1_12
 NM_DEPRECATED_IN_1_14
 NM_DEPRECATED_IN_1_14_FOR
 NM_AVAILABLE_IN_1_14
+NM_DEPRECATED_IN_1_16
+NM_DEPRECATED_IN_1_16_FOR
+NM_AVAILABLE_IN_1_16
 
 
 

@@ -3811,6 +3948,41 @@ NM_VPN_SERVICE_PLUGIN_CLASS
 NM_VPN_SERVICE_PLUGIN_GET_CLASS
 

 
+

+nm-wifi-p2p-peer
+NMWifiP2PPeer
+NM_WIFI_P2P_PEER_FLAGS
+NM_WIFI_P2P_PEER_NAME
+NM_WIFI_P2P_PEER_MANUFACTURER
+NM_WIFI_P2P_PEER_MODEL
+NM_WIFI_P2P_PEER_MODEL_NUMBER
+NM_WIFI_P2P_PEER_SERIAL
+NM_WIFI_P2P_PEER_WFD_IES
+NM_WIFI_P2P_PEER_HW_ADDRESS
+NM_WIFI_P2P_PEER_STRENGTH
+NM_WIFI_P2P_PEER_LAST_SEEN
+nm_wifi_p2p_peer_get_flags
+nm_wifi_p2p_peer_get_name
+nm_wifi_p2p_peer_get_manufacturer
+nm_wifi_p2p_peer_get_model
+nm_wifi_p2p_peer_get_model_number
+nm_wifi_p2p_peer_get_serial
+nm_wifi_p2p_peer_get_wfd_ies
+nm_wifi_p2p_peer_get_hw_address
+nm_wifi_p2p_peer_get_strength
+nm_wifi_p2p_peer_get_last_seen
+nm_wifi_p2p_peer_filter_connections
+nm_wifi_p2p_peer_connection_valid
+
+NMWifiP2PPeerClass
+NM_IS_WIFI_P2P_PEER
+NM_TYPE_WIFI_P2P_PEER
+NM_WIFI_P2P_PEER
+NM_WIFI_P2P_PEER_CLASS
+NM_WIFI_P2P_PEER_GET_CLASS
+nm_wifi_p2p_peer_get_type
+

+
 

 nm-wimax-nsp
 NMWimaxNsp
diff --git a/docs/libnm/libnm.types b/docs/libnm/libnm.types
index d6dfdd21..ebddb57b 100644
--- a/docs/libnm/libnm.types
+++ b/docs/libnm/libnm.types
@@ -52,6 +52,7 @@ nm_device_vlan_get_type
 nm_device_vxlan_get_type
 nm_device_wifi_capabilities_get_type
 nm_device_wifi_get_type
+nm_device_wifi_p2p_get_type
 nm_device_wimax_get_type
 nm_device_wireguard_get_type
 nm_device_wpan_get_type
@@ -132,9 +133,11 @@ nm_setting_user_get_type
 nm_setting_vlan_get_type
 nm_setting_vpn_get_type
 nm_setting_vxlan_get_type
+nm_setting_wifi_p2p_get_type
 nm_setting_wimax_get_type
 nm_setting_wired_get_type
 nm_setting_wired_wake_on_lan_get_type
+nm_setting_wireguard_get_type
 nm_setting_wireless_get_type
 nm_setting_wireless_powersave_get_type
 nm_setting_wireless_security_fils_get_type
@@ -169,5 +172,7 @@ nm_vpn_plugin_error_get_type
 nm_vpn_plugin_failure_get_type
 nm_vpn_service_state_get_type
 nm_wep_key_type_get_type
+nm_wifi_p2p_peer_get_type
 nm_wimax_nsp_get_type
 nm_wimax_nsp_network_type_get_type
+nm_wireguard_peer_get_type
diff --git a/docs/libnm/meson.build b/docs/libnm/meson.build
index 77f7ed0f..c031a317 100644
--- a/docs/libnm/meson.build
+++ b/docs/libnm/meson.build
@@ -23,13 +23,13 @@ private_headers = [
   'nm-core-tests-enum-types.h',
   'nm-keyfile-internal.h',
   'nm-keyfile-utils.h',
-  'test-general-enums.h'
+  'test-general-enums.h',
 ]
 
 configure_file(
   input: version_xml + '.in',
   output: version_xml,
-  configuration: version_conf
+  configuration: version_conf,
 )
 
 gnome.gtkdoc(
@@ -37,17 +37,17 @@ gnome.gtkdoc(
   main_xml: doc_module + '-docs.xml',
   src_dir: [
     libnm_core_inc,
-    libnm_inc
+    libnm_inc,
   ],
   dependencies: libnm_dep,
   scan_args: [
     '--rebuild-types',
     '--rebuild-sections',
-    '--ignore-headers=' + ' '.join(private_headers)
+    '--ignore-headers=' + ' '.join(private_headers),
   ],
   scanobjs_args: '--type-init-func="g_type_init();"',
   fixxref_args: '--html-dir=' + join_paths(nm_prefix, gnome.gtkdoc_html_dir(doc_module)),
   gobject_typesfile: doc_module + '.types',
   html_assets: doc_module + '.png',
-  install: true
+  install: true,
 )
diff --git a/docs/libnm/version.xml b/docs/libnm/version.xml
index c6ba3bc1..15b989e3 100644
--- a/docs/libnm/version.xml
+++ b/docs/libnm/version.xml
@@ -1 +1 @@
-1.14.6
+1.16.0
diff --git a/docs/meson.build b/docs/meson.build
index 92e6d6e9..5c053165 100644
--- a/docs/meson.build
+++ b/docs/meson.build
@@ -14,5 +14,5 @@ endif
 test(
   'check-docs',
   find_program(join_paths(meson.source_root(), 'tools', 'check-docs.sh')),
-  args: [meson.source_root(), meson.build_root()]
+  args: [meson.source_root(), meson.build_root()],
 )
diff --git a/examples/C/glib/meson.build b/examples/C/glib/meson.build
index edc4dbb1..1c817163 100644
--- a/examples/C/glib/meson.build
+++ b/examples/C/glib/meson.build
@@ -6,7 +6,7 @@ examples = [
   ['list-connections-gdbus', [], [], []],
   ['list-connections-libnm', [], [], [libnm_dep]],
   ['monitor-nm-running-gdbus', [], [], []],
-  ['monitor-nm-state-gdbus', [], [], []]
+  ['monitor-nm-state-gdbus', [], [], []],
 ]
 
 foreach example: examples
diff --git a/examples/C/qt/meson.build b/examples/C/qt/meson.build
index 5349faa7..c3487af4 100644
--- a/examples/C/qt/meson.build
+++ b/examples/C/qt/meson.build
@@ -1,12 +1,12 @@
 examples = [
   ['add-connection-wired', []],
   ['list-connections', []],
-  ['change-ipv4-addresses', []]
+  ['change-ipv4-addresses', []],
 ]
 
 incs = [
   top_inc,
-  libnm_core_inc
+  libnm_core_inc,
 ]
 
 qt_core_dep = dependency('QtCore', version: '>= 4')
@@ -15,7 +15,7 @@ deps = [
   dbus_dep,
   qt_core_dep,
   dependency('QtDBus'),
-  dependency('QtNetwork')
+  dependency('QtNetwork'),
 ]
 
 moc = find_program('moc-qt4', required: false)
@@ -30,7 +30,7 @@ example_moc = custom_target(
   output,
   input: example + '.cpp',
   output: output,
-  command: [moc, '-i', '@INPUT@', '-o', '@OUTPUT@']
+  command: [moc, '-i', '@INPUT@', '-o', '@OUTPUT@'],
 )
 
 examples += [[example, [example_moc]]]
@@ -41,6 +41,6 @@ foreach example: examples
     example[0] + '.cpp',
     include_directories: incs,
     dependencies: deps,
-    link_depends: example[1]
+    link_depends: example[1],
   )
 endforeach
diff --git a/examples/dispatcher/70-wifi-wired-exclusive.sh b/examples/dispatcher/70-wifi-wired-exclusive.sh
index 676695f4..fac18b59 100755
--- a/examples/dispatcher/70-wifi-wired-exclusive.sh
+++ b/examples/dispatcher/70-wifi-wired-exclusive.sh
@@ -1,8 +1,8 @@
 #!/bin/bash
-# This dispatcher script makes WiFi mutually exclusive with
+# This dispatcher script makes Wi-Fi mutually exclusive with
 # wired networking.  When a wired interface is connected,
-# WiFi will be set to airplane mode (rfkilled).  When the wired
-# interface is disconnected, WiFi will be turned back on.
+# Wi-Fi will be set to airplane mode (rfkilled).  When the wired
+# interface is disconnected, Wi-Fi will be turned back on.
 #
 # Copyright 2012 Johannes Buchner 
 # Copyright 2012 - 2014 Red Hat, Inc.
diff --git a/examples/lua/lgi/add-connection.lua b/examples/lua/lgi/add-connection.lua
index 3daf5f32..69bc8cb2 100755
--- a/examples/lua/lgi/add-connection.lua
+++ b/examples/lua/lgi/add-connection.lua
@@ -62,7 +62,7 @@ end
 function added_cb(client, result, data)
   local con,err,code = client:add_connection_finish(result)
   if con then
-    print("The connection profile has been succesfully added to NetworkManager:")
+    print("The connection profile has been successfully added to NetworkManager:")
     print(con:get_id(), con:get_uuid())
   else
     print(string.format("Error: (%d) %s", code, err))
diff --git a/examples/lua/lgi/deactivate-all.lua b/examples/lua/lgi/deactivate-all.lua
index fb8e0ed5..2e8d8935 100755
--- a/examples/lua/lgi/deactivate-all.lua
+++ b/examples/lua/lgi/deactivate-all.lua
@@ -29,7 +29,7 @@
 local lgi = require 'lgi'
 local NM = lgi.NM
 
--- suported connection types
+-- supported connection types
 connection_types = {
   NM.SETTING_VPN_SETTING_NAME,
   NM.SETTING_WIRELESS_SETTING_NAME,
diff --git a/examples/nm-conf.d/30-anon.conf b/examples/nm-conf.d/30-anon.conf
index 3e879fc2..c523063b 100644
--- a/examples/nm-conf.d/30-anon.conf
+++ b/examples/nm-conf.d/30-anon.conf
@@ -38,7 +38,7 @@
 #
 #   $ nmcli connection modify "$CON_NAME" connection.stable-id '${CONNECTION}/${BOOT}'
 #
-# ... or keep it stable accross reboots, but still distinct per profile:
+# ... or keep it stable across reboots, but still distinct per profile:
 #
 #   $ nmcli connection modify "$CON_NAME" connection.stable-id '${CONNECTION}'
 #
diff --git a/examples/python/dbus/create-bond.py b/examples/python/dbus/create-bond.py
index 4600b9c2..4347b2a0 100755
--- a/examples/python/dbus/create-bond.py
+++ b/examples/python/dbus/create-bond.py
@@ -101,7 +101,7 @@ loop = GObject.MainLoop()
 def properties_changed(props):
     if 'State' in props:
         if props['State'] == 2:
-            print("Succesfully connected")
+            print("Successfully connected")
             loop.quit()
         if props['State'] == 3 or props['State'] == 4:
             print("Bond activation failed")
diff --git a/examples/python/dbus/show-bssids.py b/examples/python/dbus/show-bssids.py
index 9776864f..b364ed03 100755
--- a/examples/python/dbus/show-bssids.py
+++ b/examples/python/dbus/show-bssids.py
@@ -18,7 +18,7 @@
 #
 
 
-# This example prints out all the AP BSSIDs that all WiFi devices on the
+# This example prints out all the AP BSSIDs that all Wi-Fi devices on the
 # machine can see.  Useful for location-based services like Skyhook that
 # can geolocate you based on the APs you can see.
 
diff --git a/examples/python/dbus/vpn.py b/examples/python/dbus/vpn.py
index a21b82ff..0c4b2bb6 100755
--- a/examples/python/dbus/vpn.py
+++ b/examples/python/dbus/vpn.py
@@ -137,7 +137,7 @@ if not connection_path:
 
 device_path = get_wifi_device_path()
 if not device_path:
-    print("no wifi device found")
+    print("no Wi-Fi device found")
     sys.exit(1)
 
 # Is it already activated?
diff --git a/examples/python/gi/add_connection.py b/examples/python/gi/add_connection.py
index f5b5e63c..25a59235 100755
--- a/examples/python/gi/add_connection.py
+++ b/examples/python/gi/add_connection.py
@@ -69,7 +69,7 @@ def create_profile(name):
 def added_cb(client, result, data):
     try:
         client.add_connection_finish(result)
-        print("The connection profile has been succesfully added to NetworkManager.")
+        print("The connection profile has been successfully added to NetworkManager.")
     except Exception as e:
         sys.stderr.write("Error: %s\n" % e)
     main_loop.quit()
diff --git a/examples/python/gi/deactivate-all.py b/examples/python/gi/deactivate-all.py
index a4588522..13d14bc9 100755
--- a/examples/python/gi/deactivate-all.py
+++ b/examples/python/gi/deactivate-all.py
@@ -35,7 +35,7 @@ import gi
 gi.require_version('NM', '1.0')
 from gi.repository import NM
 
-# suported connection types
+# supported connection types
 connection_types = {
   NM.SETTING_VPN_SETTING_NAME,
   NM.SETTING_WIRELESS_SETTING_NAME,
diff --git a/examples/python/gi/nm-wg-set b/examples/python/gi/nm-wg-set
new file mode 100755
index 00000000..81ee5667
--- /dev/null
+++ b/examples/python/gi/nm-wg-set
@@ -0,0 +1,453 @@
+#!/usr/bin/env python
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Copyright 2018 - 2019 Red Hat, Inc.
+
+# nm-wg-set: modify an existing WireGuard connection profile.
+#
+#   $ nm-wg-set [id|uuid|interface] ID [wg-args...]
+#
+# The arguments to set the parameters are like the set parameters from `man 8 wg`.
+# For example:
+#
+#   $ nm-wg-set wg0 peer wN8G5HpphoXOGkiXTgBPyr9BhrRm2z9JEI6BiH6fB0g= preshared-key <(wg genpsk)
+#
+# extra, script specific arguments:
+#   - private-key-flags
+#   - preshared-key-flags
+#
+# Note that the arguments have some simliarities to `wg set` command. But this
+# script only modify the connection profile in NetworkManager. They don't (re)activate
+# the profile and thus the changes only result in the configuration of the kernel interface
+# after activating the profile. Use `nmcli connection up` for that.
+#
+# The example script does not support creating or deleting the WireGuard profile itself. It also
+# does not support modifying other settings of the connection profile, like the IP address configuration.
+# For that also use nmcli. For example:
+#
+#       PROFILE=wg0
+#
+#       # create the WireGuard profile with nmcli
+#       PRIVKEY_FILE=/tmp/wg.key
+#       (umask 077; rm -f "$PRIVKEY_FILE"; wg genkey > "$PRIVKEY_FILE")
+#       IFNAME=wg0
+#       PUBKEY=$(wg pubkey < "$PRIVKEY_FILE")
+#       IP4ADDR=192.168.99.5/24
+#       IP4GW=192.168.99.1
+#       nmcli connection delete id "$PROFILE"
+#       nmcli connection add \
+#           type wireguard \
+#           con-name "$PROFILE" \
+#           ifname "$IFNAME" \
+#           connection.stable-id "$PROFILE-$PUBKEY" \
+#           ipv4.method manual \
+#           ipv4.addresses "$IP4ADDR" \
+#           ipv4.gateway "$IP4GW" \
+#           ipv4.never-default yes \
+#           ipv6.method link-local \
+#           wireguard.listen-port 0 \
+#           wireguard.fwmark 0 \
+#           wireguard.private-key '' \
+#           wireguard.private-key-flags 0
+#       nmcli connection up \
+#           id "$PROFILE" \
+#           passwd-file <(echo "wireguard.private-key:$(cat "$PRIVKEY_FILE")")
+#
+#       # modify the WireGuard profile with the script
+#       nm-wg-set id "$PROFILE" $WG_ARGS
+
+import sys
+import re
+import os
+
+import gi
+gi.require_version('NM', '1.0')
+from gi.repository import NM
+
+class MyError(Exception):
+    pass
+
+def pr(v):
+    import pprint
+    pprint.pprint(v, indent=4, depth=5, width=60)
+
+###############################################################################
+
+def connection_is_wireguard(conn):
+    s_con = conn.get_setting(NM.SettingConnection)
+    return     s_con \
+           and s_con.get_connection_type() == NM.SETTING_WIREGUARD_SETTING_NAME \
+           and conn.get_setting(NM.SettingWireGuard)
+
+def connection_to_str(conn):
+    if connection_is_wireguard(conn):
+        iface = conn.get_setting(NM.SettingConnection).get_interface_name()
+        if iface:
+            extra = ', interface: "%s"' % (iface)
+        else:
+            extra = ''
+    else:
+        extra = ', type: %s' % (conn.get_setting(NM.SettingConnection).get_connection_type())
+
+    return '"%s" (%s%s)' % (conn.get_id(), conn.get_uuid(), extra)
+
+def connections_wg(connections):
+    l = list([c for c in connections if connection_is_wireguard(c)])
+    l.sort(key = connection_to_str)
+    return l
+
+def connections_find(connections, con_spec, con_id):
+    connections = list(sorted(connections, key=connection_to_str))
+    l = []
+    if con_spec in [None, 'id']:
+        for c in connections:
+            if con_id == c.get_id():
+                if c not in l:
+                    l.append(c)
+    if con_spec in [None, 'interface']:
+        for c in connections:
+            s_con = c.get_setting(NM.SettingConnection)
+            if     s_con \
+               and con_id == s_con.get_interface_name():
+                if c not in l:
+                    l.append(c)
+    if con_spec in [None, 'uuid']:
+        for c in connections:
+            if con_id == c.get_uuid():
+                if c not in l:
+                    l.append(c)
+    l.sort(key = connection_to_str)
+    return l
+
+
+def print_hint(nm_client):
+    print('Maybe you want to create a profile first with')
+    print('  nmcli connection add type wireguard ifname wg0 $MORE_ARGS')
+    connections = connections_wg(nm_client.get_connections())
+    if connections:
+        print('Or edit one of the following WireGuard profiles:')
+        for c in connections:
+            print ('  - %s' % (connection_to_str(c)))
+
+###############################################################################
+
+def argv_get_one(argv, idx, type_ctor=None, topic=None):
+
+    if topic is not None:
+        try:
+            v = argv_get_one(argv, idx, type_ctor, None)
+        except MyError as e:
+            if isinstance(topic, (int, long)):
+                topic = argv[topic]
+            raise MyError('error for "%s": %s' % (topic, e.message))
+        return v
+
+    v = None
+    try:
+        v = argv[idx]
+    except:
+        raise MyError('missing argument')
+    if type_ctor is not None:
+        try:
+            v = type_ctor(v)
+        except Exception as e:
+            raise MyError('invalid argument "%s" (%s)' % (v, e.message))
+    return v
+
+###############################################################################
+
+def arg_parse_secret_flags(arg):
+    try:
+        f = arg.strip()
+        n = {
+            'none':         NM.SettingSecretFlags.NONE,
+            'not-saved':    NM.SettingSecretFlags.NOT_SAVED,
+            'not-required': NM.SettingSecretFlags.NOT_REQUIRED,
+            'agent-owned':  NM.SettingSecretFlags.AGENT_OWNED,
+        }.get(f)
+        if n is not None:
+            return n
+        return NM.SettingSecretFlags(int(f))
+    except Exception as e:
+        raise MyError('invalid secret flags "%s"' % (arg))
+
+def _arg_parse_int(arg, vmin, vmax, key, base = 0):
+    try:
+        v = int(arg, base)
+        if v >= vmin and vmax <= 0xFFFFFFFF:
+            return v
+    except:
+        raise MyError('invalid %s "%s"' % (key, arg))
+    raise MyError("%s out of range" % (key))
+
+def arg_parse_listen_port(arg):
+    return _arg_parse_int(arg, 0, 0xFFFF, "listen-port")
+
+def arg_parse_fwmark(arg):
+    return _arg_parse_int(arg, 0, 0xFFFFFFFF, "fwmark", base = 0)
+
+def arg_parse_persistent_keep_alive(arg):
+    return _arg_parse_int(arg, 0, 0xFFFFFFFF, "persistent-keepalive")
+
+def arg_parse_allowed_ips(arg):
+    l = [s.strip() for s in arg.strip().split(',')]
+    l = [s for s in l if s != '']
+    l = list(l)
+    # use a peer to parse and validate the allowed-ips.
+    peer = NM.WireGuardPeer()
+    for aip in l:
+        if not peer.append_allowed_ip(aip, False):
+            raise MyError('invalid allowed-ip "%s"' % (aip))
+    return l
+
+###############################################################################
+
+def secret_flags_to_string(flags):
+    nick = {
+            NM.SettingSecretFlags.NONE:         'none',
+            NM.SettingSecretFlags.NOT_SAVED:    'not-saved',
+            NM.SettingSecretFlags.NOT_REQUIRED: 'not-required',
+            NM.SettingSecretFlags.AGENT_OWNED:  'agent-owned',
+        }.get(flags)
+    num = str(int(flags))
+    if nick is None:
+        return num
+    return '%s (%s)' % (num, nick)
+
+def secret_to_string(secret):
+    if os.environ.get('WG_HIDE_KEYS', '') != 'never':
+        return '(hidden)'
+    if not secret:
+        return ''
+    return secret
+
+###############################################################################
+
+def wg_read_private_key(privkey_file):
+    import base64
+    try:
+        with open(privkey_file, "r") as f:
+            data = f.read()
+        bdata = base64.decodestring(data)
+        if len(bdata) != 32:
+            raise Exception("not 32 bytes base64 encoded")
+        return base64.encodestring(bdata).strip()
+    except Exception as e:
+        raise MyError('failed to read private key "%s": %s' % (privkey_file, e.message))
+
+def wg_peer_is_valid(peer, msg = None):
+    try:
+        peer.is_valid(True, True)
+    except gi.repository.GLib.Error as e:
+        if msg is None:
+            raise MyError('%s' % (e.message))
+        else:
+            raise MyError('%s' % (msg))
+
+###############################################################################
+
+def do_get(nm_client, connection):
+    s_con = conn.get_setting(NM.SettingConnection)
+    s_wg = conn.get_setting(NM.SettingWireGuard)
+
+    # Fetching secrets is not implemented. For now show them all as
+    # .
+
+    print('interface:                    %s' % (s_con.get_interface_name()))
+    print('uuid:                         %s' % (conn.get_uuid()))
+    print('id:                           %s' % (conn.get_id()))
+    print('private-key:                  %s' % (secret_to_string(s_wg.get_private_key())))
+    print('private-key-flags:            %s' % (secret_flags_to_string(s_wg.get_private_key_flags())))
+    print('listen-port:                  %s' % (s_wg.get_listen_port()))
+    print('fwmark:                       0x%x' % (s_wg.get_fwmark()))
+    for i in range(s_wg.get_peers_len()):
+        peer = s_wg.get_peer(i)
+        print('peer[%d].public-key:           %s' % (i, peer.get_public_key()))
+        print('peer[%d].preshared-key:        %s' % (i, secret_to_string(peer.get_preshared_key())))
+        print('peer[%d].preshared-key-flags:  %s' % (i, secret_flags_to_string(peer.get_preshared_key_flags())))
+        print('peer[%d].endpoint:             %s' % (i, peer.get_endpoint() if peer.get_endpoint() else ''))
+        print('peer[%d].persistent-keepalive: %s' % (i, peer.get_persistent_keepalive()))
+        print('peer[%d].allowed-ips:          %s' % (i, ','.join([peer.get_allowed_ip(j) for j in range(peer.get_allowed_ips_len())])))
+
+def do_set(nm_client, conn, argv):
+    s_wg = conn.get_setting(NM.SettingWireGuard)
+    peer = None
+    peer_remove = False
+    peer_idx = None
+    peer_secret_flags = None
+
+    try:
+        idx = 0
+        while True:
+            if     peer \
+               and (   idx >= len(argv) \
+                    or argv[idx] == 'peer'):
+                if peer_remove:
+                    pp_peer, pp_idx = s_wg.get_peer_by_public_key(peer.get_public_key())
+                    if pp_peer:
+                        s_wg.remove_peer(pp_idx)
+                else:
+                    if peer_secret_flags is not None:
+                        peer.set_preshared_key_flags(peer_secret_flags)
+                    wg_peer_is_valid(peer)
+                    if peer_idx is None:
+                        s_wg.append_peer(peer)
+                    else:
+                        s_wg.set_peer(peer, peer_idx)
+                peer = None
+                peer_remove = False
+                peer_idx = None
+                peer_secret_flags = None
+
+            if idx >= len(argv):
+                break;
+
+            if not peer and argv[idx] == 'private-key':
+                key = argv_get_one(argv, idx + 1, None, idx)
+                if key == '':
+                    s_wg.set_property(NM.SETTING_WIREGUARD_PRIVATE_KEY, None)
+                else:
+                    s_wg.set_property(NM.SETTING_WIREGUARD_PRIVATE_KEY, wg_read_private_key(key))
+                idx += 2
+                continue
+            if not peer and argv[idx] == 'private-key-flags':
+                s_wg.set_property(NM.SETTING_WIREGUARD_PRIVATE_KEY_FLAGS, argv_get_one(argv, idx + 1, arg_parse_secret_flags, idx))
+                idx += 2
+                continue
+            if not peer and argv[idx] == 'listen-port':
+                s_wg.set_property(NM.SETTING_WIREGUARD_LISTEN_PORT, argv_get_one(argv, idx + 1, arg_parse_listen_port, idx))
+                idx += 2
+                continue
+            if not peer and argv[idx] == 'fwmark':
+                s_wg.set_property(NM.SETTING_WIREGUARD_FWMARK, argv_get_one(argv, idx + 1, arg_parse_fwmark, idx))
+                idx += 2
+                continue
+            if argv[idx] == 'peer':
+                public_key = argv_get_one(argv, idx + 1, None, idx)
+                peer, peer_idx = s_wg.get_peer_by_public_key(public_key)
+                if peer:
+                    peer = peer.new_clone(True)
+                else:
+                    peer_idx = None
+                    peer = NM.WireGuardPeer()
+                    peer.set_public_key(public_key, True)
+                    wg_peer_is_valid(peer, 'public key "%s" is invalid' % (public_key))
+                peer_remove = False
+                idx += 2
+                continue
+            if peer and argv[idx] == 'remove':
+                peer_remove = True
+                idx += 1
+                continue
+            if peer and argv[idx] == 'preshared-key':
+                psk = argv_get_one(argv, idx + 1, None, idx)
+                if psk == '':
+                    peer.set_preshared_key(None, True)
+                    if peer_secret_flags is not None:
+                        peer_secret_flags = NM.SettingSecretFlags.NOT_REQUIRED
+                else:
+                    peer.set_preshared_key(wg_read_private_key(psk), True)
+                    if peer_secret_flags is not None:
+                        peer_secret_flags = NM.SettingSecretFlags.NONE
+                idx += 2
+                continue
+            if peer and argv[idx] == 'preshared-key-flags':
+                peer_secret_flags = argv_get_one(argv, idx + 1, arg_parse_secret_flags, idx)
+                idx += 2
+                continue
+            if peer and argv[idx] == 'endpoint':
+                peer.set_endpoint(argv_get_one(argv, idx + 1, None, idx), True)
+                idx += 2
+                continue
+            if peer and argv[idx] == 'persistent-keepalive':
+                peer.set_persistent_keepalive(argv_get_one(argv, idx + 1, arg_parse_persistent_keep_alive, idx))
+                idx += 2
+                continue
+            if peer and argv[idx] == 'allowed-ips':
+                allowed_ips = list(argv_get_one(argv, idx + 1, arg_parse_allowed_ips, idx))
+                peer.clear_allowed_ips()
+                for aip in allowed_ips:
+                    peer.append_allowed_ip(aip, False)
+                del allowed_ips
+                idx += 2
+                continue
+
+            raise MyError('invalid argument "%s"' % (argv[idx]))
+    except MyError as e:
+        print('Error: %s' % (e.message))
+        sys.exit(1)
+
+    try:
+        conn.commit_changes(True, None)
+    except Exception as e:
+        print('failure to commit connection: %s' % (e))
+        sys.exit(1)
+
+    print('Success')
+    sys.exit(0)
+
+###############################################################################
+
+if __name__ == '__main__':
+
+    nm_client = NM.Client.new(None)
+
+    argv = sys.argv
+    del argv[0]
+
+    con_spec = None
+    if len(argv) >= 1:
+        if argv[0] in [ 'id', 'uuid', 'interface' ]:
+            con_spec = argv[0]
+            del argv[0]
+
+    if len(argv) < 1:
+        print('Requires an existing NetworkManager connection profile as first argument')
+        print('Select it based on the connection ID, UUID, or interface-name (optionally qualify the selection with [id|uuid|interface])')
+        print_hint(nm_client)
+        sys.exit(1)
+    con_id = argv[0]
+    del argv[0]
+
+    connections = connections_find(nm_client.get_connections(), con_spec, con_id)
+    if len(connections) == 0:
+        print('No matching connection %s\"%s\" found.' % ((con_spec+' ' if con_spec else ''), con_id))
+        print_hint(nm_client)
+        sys.exit(1)
+    if len(connections) > 1:
+        print("Connection %s\"%s\" is not unique (%s)" % ((con_spec+' ' if con_spec else ''), con_id, ', '.join(['['+connection_to_str(c)+']' for c in connections])))
+        if not con_spec:
+            print('Maybe qualify the name with [id|uuid|interface]?')
+        sys.exit(1)
+
+    conn = connections[0]
+    if not connection_is_wireguard(conn):
+        print('Connection %s is not a WireGuard profile' % (connection_to_str(conn)))
+        print('See available profiles with `nmcli connection show`')
+        sys.exit(1)
+
+    try:
+        secrets = conn.get_secrets(NM.SETTING_WIREGUARD_SETTING_NAME)
+        if secrets:
+            conn.update_secrets(NM.SETTING_WIREGUARD_SETTING_NAME, secrets)
+    except:
+        pass
+
+    if not argv:
+        do_get(nm_client, conn)
+    else:
+        do_set(nm_client, conn, argv)
+
diff --git a/examples/shell/nm-logging.sh b/examples/shell/nm-logging.sh
index 0988e55e..98821650 100755
--- a/examples/shell/nm-logging.sh
+++ b/examples/shell/nm-logging.sh
@@ -31,7 +31,7 @@
 # Examples:
 #   nm-logging.sh debug   -  switches the debugging level on
 #   nm-logging.sh info    -  turns debugging off (back to normal)
-#   nm-logging.sh "" "WIFI"     -  changes domain to print only WiFi related messages
+#   nm-logging.sh "" "WIFI"     -  changes domain to print only Wi-Fi related messages
 #   nm-logging.sh err "HW,IP4"  -  will print only error messages related to hardware or IPv4
 #
 
diff --git a/introspection/meson.build b/introspection/meson.build
index 35d8c87c..e442ac85 100644
--- a/introspection/meson.build
+++ b/introspection/meson.build
@@ -3,26 +3,30 @@ ifaces_secret_agent_xml = files('org.freedesktop.NetworkManager.SecretAgent.xml'
 ifaces_vpn_plugin_xml = files('org.freedesktop.NetworkManager.VPN.Plugin.xml')
 
 ifaces = [
+  'org.freedesktop.NetworkManager',
   'org.freedesktop.NetworkManager.AccessPoint',
   'org.freedesktop.NetworkManager.AgentManager',
   'org.freedesktop.NetworkManager.Checkpoint',
   'org.freedesktop.NetworkManager.Connection.Active',
+  'org.freedesktop.NetworkManager.DHCP4Config',
+  'org.freedesktop.NetworkManager.DHCP6Config',
+  'org.freedesktop.NetworkManager.Device',
   'org.freedesktop.NetworkManager.Device.Adsl',
   'org.freedesktop.NetworkManager.Device.Bluetooth',
   'org.freedesktop.NetworkManager.Device.Bond',
   'org.freedesktop.NetworkManager.Device.Bridge',
   'org.freedesktop.NetworkManager.Device.Dummy',
   'org.freedesktop.NetworkManager.Device.Generic',
-  'org.freedesktop.NetworkManager.Device.Infiniband',
   'org.freedesktop.NetworkManager.Device.IPTunnel',
+  'org.freedesktop.NetworkManager.Device.Infiniband',
   'org.freedesktop.NetworkManager.Device.Lowpan',
   'org.freedesktop.NetworkManager.Device.Macsec',
   'org.freedesktop.NetworkManager.Device.Macvlan',
   'org.freedesktop.NetworkManager.Device.Modem',
   'org.freedesktop.NetworkManager.Device.OlpcMesh',
+  'org.freedesktop.NetworkManager.Device.OvsBridge',
   'org.freedesktop.NetworkManager.Device.OvsInterface',
   'org.freedesktop.NetworkManager.Device.OvsPort',
-  'org.freedesktop.NetworkManager.Device.OvsBridge',
   'org.freedesktop.NetworkManager.Device.Ppp',
   'org.freedesktop.NetworkManager.Device.Statistics',
   'org.freedesktop.NetworkManager.Device.Team',
@@ -31,24 +35,22 @@ ifaces = [
   'org.freedesktop.NetworkManager.Device.Vlan',
   'org.freedesktop.NetworkManager.Device.Vxlan',
   'org.freedesktop.NetworkManager.Device.WiMax',
-  'org.freedesktop.NetworkManager.Device.Wpan',
+  'org.freedesktop.NetworkManager.Device.WifiP2P',
   'org.freedesktop.NetworkManager.Device.WireGuard',
   'org.freedesktop.NetworkManager.Device.Wired',
   'org.freedesktop.NetworkManager.Device.Wireless',
-  'org.freedesktop.NetworkManager.Device',
-  'org.freedesktop.NetworkManager.DHCP4Config',
-  'org.freedesktop.NetworkManager.DHCP6Config',
+  'org.freedesktop.NetworkManager.Device.Wpan',
   'org.freedesktop.NetworkManager.DnsManager',
   'org.freedesktop.NetworkManager.IP4Config',
   'org.freedesktop.NetworkManager.IP6Config',
-  'org.freedesktop.NetworkManager',
   'org.freedesktop.NetworkManager.PPP',
   'org.freedesktop.NetworkManager.SecretAgent',
-  'org.freedesktop.NetworkManager.Settings.Connection',
   'org.freedesktop.NetworkManager.Settings',
+  'org.freedesktop.NetworkManager.Settings.Connection',
   'org.freedesktop.NetworkManager.VPN.Connection',
   'org.freedesktop.NetworkManager.VPN.Plugin',
-  'org.freedesktop.NetworkManager.WiMax.Nsp'
+  'org.freedesktop.NetworkManager.WiMax.Nsp',
+  'org.freedesktop.NetworkManager.WifiP2PPeer',
 ]
 
 ifaces_xmls = []
@@ -66,7 +68,7 @@ foreach iface: ifaces
     iface_xml,
     interface_prefix: 'org.freedesktop.NetworkManager',
     namespace: 'NMDBus',
-    docbook: 'dbus'
+    docbook: 'dbus',
   )
 
   sources += res
@@ -82,14 +84,14 @@ endforeach
 
 install_data(
   ifaces_xmls,
-  install_dir: dbus_ifaces_dir
+  install_dir: dbus_ifaces_dir,
 )
 
 libnmdbus = static_library(
   'nmdbus',
   sources: sources,
   include_directories: top_inc,
-  dependencies: glib_dep
+  dependencies: glib_dep,
 )
 
 libnmdbus_dep = declare_dependency(
@@ -97,5 +99,5 @@ libnmdbus_dep = declare_dependency(
   #        libNetworkManagerBase and libNetworkManager
   #sources: sources,
   include_directories: include_directories('.'),
-  link_with: libnmdbus
+  link_with: libnmdbus,
 )
diff --git a/introspection/org.freedesktop.NetworkManager.Device.WifiP2P.xml b/introspection/org.freedesktop.NetworkManager.Device.WifiP2P.xml
new file mode 100644
index 00000000..40e6fdbb
--- /dev/null
+++ b/introspection/org.freedesktop.NetworkManager.Device.WifiP2P.xml
@@ -0,0 +1,79 @@
+
+
+  
+  
+    
+
+    
+    
+
+    
+    
+
+    
+    
+      
+    
+
+    
+    
+    
+
+    
+    
+      
+    
+
+    
+    
+      
+    
+
+  
+
diff --git a/introspection/org.freedesktop.NetworkManager.Device.Wireless.xml b/introspection/org.freedesktop.NetworkManager.Device.Wireless.xml
index 13038545..af544088 100644
--- a/introspection/org.freedesktop.NetworkManager.Device.Wireless.xml
+++ b/introspection/org.freedesktop.NetworkManager.Device.Wireless.xml
@@ -36,7 +36,7 @@
         RequestScan:
         @options: Options of scan. Currently 'ssids' option with value of "aay" type is supported.
 
-        Request the device to scan
+        Request the device to scan. To know when the scan is finished, use the "PropertiesChanged" signal from "org.freedesktop.DBus.Properties" to listen to changes to the "LastScan" property.
     -->
     
       
diff --git a/introspection/org.freedesktop.NetworkManager.Device.xml b/introspection/org.freedesktop.NetworkManager.Device.xml
index be0a612c..65c2a2c0 100644
--- a/introspection/org.freedesktop.NetworkManager.Device.xml
+++ b/introspection/org.freedesktop.NetworkManager.Device.xml
@@ -198,7 +198,7 @@
     
@@ -256,6 +256,28 @@
     -->
     
 
+    
+    
+
+    
+    
+
     
+  
+    
+
+    
+    
+
+    
+    
+
+    
+    
+
+    
+    
+
+    
+    
+
+    
+    
+
+    
+    
+
+    
+    
+
+    
+    
+  
+
diff --git a/introspection/org.freedesktop.NetworkManager.xml b/introspection/org.freedesktop.NetworkManager.xml
index 6c6ec282..efd866db 100644
--- a/introspection/org.freedesktop.NetworkManager.xml
+++ b/introspection/org.freedesktop.NetworkManager.xml
@@ -76,7 +76,7 @@
         ActivateConnection:
         @connection: The connection to activate. If "/" is given, a valid device path must be given, and NetworkManager picks the best connection to activate for the given device. VPN connections must always pass a valid connection path.
         @device: The object path of device to be activated for physical connections. This parameter is ignored for VPN connections, because the specific_object (if provided) specifies the device to use.
-        @specific_object: The path of a connection-type-specific object this activation should use. This parameter is currently ignored for wired and mobile broadband connections, and the value of "/" should be used (ie, no specific object). For WiFi connections, pass the object path of a specific AP from the card's scan list, or "/" to pick an AP automatically. For VPN connections, pass the object path of an ActiveConnection object that should serve as the "base" connection (to which the VPN connections lifetime will be tied), or pass "/" and NM will automatically use the current default device.
+        @specific_object: The path of a connection-type-specific object this activation should use. This parameter is currently ignored for wired and mobile broadband connections, and the value of "/" should be used (ie, no specific object). For Wi-Fi connections, pass the object path of a specific AP from the card's scan list, or "/" to pick an AP automatically. For VPN connections, pass the object path of an ActiveConnection object that should serve as the "base" connection (to which the VPN connections lifetime will be tied), or pass "/" and NM will automatically use the current default device.
         @active_connection: The path of the active connection object representing this active connection.
 
         Activate a connection using the supplied device.
@@ -92,7 +92,7 @@
         AddAndActivateConnection:
         @connection: Connection settings and properties; if incomplete missing settings will be automatically completed using the given device and specific object.
         @device: The object path of device to be activated using the given connection.
-        @specific_object: The path of a connection-type-specific object this activation should use. This parameter is currently ignored for wired and mobile broadband connections, and the value of "/" should be used (ie, no specific object). For WiFi connections, pass the object path of a specific AP from the card's scan list, which will be used to complete the details of the newly added connection.
+        @specific_object: The path of a connection-type-specific object this activation should use. This parameter is currently ignored for wired and mobile broadband connections, and the value of "/" should be used (ie, no specific object). For Wi-Fi connections, pass the object path of a specific AP from the card's scan list, which will be used to complete the details of the newly added connection.
         @path: Object path of the new connection that was just added.
         @active_connection: The path of the active connection object representing this active connection.
 
@@ -100,6 +100,8 @@
         (automatically filling in missing settings with the capabilities of the
         given device and specific object), then activate the new connection.
         Cannot be used for VPN connections at this time.
+
+        See also AddAndActivateConnection2.
     -->
     
       
@@ -109,6 +111,38 @@
       
     
 
+    
+    
+      
+      
+      
+      
+      
+      
+      
+    
+
     
     
       
diff --git a/libnm-core/meson.build b/libnm-core/meson.build
index ac13a1be..d10dd1c5 100644
--- a/libnm-core/meson.build
+++ b/libnm-core/meson.build
@@ -45,8 +45,10 @@ libnm_core_headers = files(
   'nm-setting-vlan.h',
   'nm-setting-vpn.h',
   'nm-setting-vxlan.h',
+  'nm-setting-wifi-p2p.h',
   'nm-setting-wimax.h',
   'nm-setting-wired.h',
+  'nm-setting-wireguard.h',
   'nm-setting-wireless-security.h',
   'nm-setting-wireless.h',
   'nm-setting-wpan.h',
@@ -56,7 +58,7 @@ libnm_core_headers = files(
   'nm-version.h',
   'nm-vpn-dbus-interface.h',
   'nm-vpn-editor-plugin.h',
-  'nm-vpn-plugin-info.h'
+  'nm-vpn-plugin-info.h',
 )
 
 libnm_core_settings_sources = files(
@@ -100,11 +102,13 @@ libnm_core_settings_sources = files(
   'nm-setting-vlan.c',
   'nm-setting-vpn.c',
   'nm-setting-vxlan.c',
+  'nm-setting-wifi-p2p.c',
   'nm-setting-wimax.c',
   'nm-setting-wired.c',
+  'nm-setting-wireguard.c',
   'nm-setting-wireless-security.c',
   'nm-setting-wireless.c',
-  'nm-setting-wpan.c'
+  'nm-setting-wpan.c',
 )
 
 libnm_core_sources = libnm_core_settings_sources + files(
@@ -119,7 +123,7 @@ libnm_core_sources = libnm_core_settings_sources + files(
   'nm-simple-connection.c',
   'nm-utils.c',
   'nm-vpn-editor-plugin.c',
-  'nm-vpn-plugin-info.c'
+  'nm-vpn-plugin-info.c',
 )
 
 enum_headers = libnm_core_headers + [version_header]
@@ -132,15 +136,17 @@ libnm_core_enum = gnome.mkenums(
   c_template: enum_types + '.c.template',
   h_template: enum_types + '.h.template',
   install_header: true,
-  install_dir: libnm_pkgincludedir
+  install_dir: libnm_pkgincludedir,
 )
 
 deps = [
   dl_dep,
   libudev_dep,
-  shared_dep,
   uuid_dep,
+  glib_dep,
   shared_c_siphash_dep,
+  shared_nm_utils_base_dep,
+  shared_nm_utils_udev_dep,
 ]
 
 cflags = [
@@ -158,7 +164,7 @@ if (crypto_gnutls_dep.found())
     'nm-crypto-gnutls',
     sources: [ 'nm-crypto-gnutls.c' ],
     dependencies: deps + [ crypto_gnutls_dep ],
-    c_args: cflags
+    c_args: cflags,
   )
 endif
 
@@ -167,7 +173,7 @@ if (crypto_nss_dep.found())
     'nm-crypto-nss',
     sources: [ 'nm-crypto-nss.c' ],
     dependencies: deps + [ crypto_nss_dep ],
-    c_args: cflags
+    c_args: cflags,
   )
 endif
 
@@ -183,7 +189,6 @@ libnm_core_sources_all =  libnm_core_sources
 libnm_core_sources_all += libnm_core_enum
 libnm_core_sources_all += shared_nm_meta_setting_c
 libnm_core_sources_all += shared_nm_ethtool_utils_c
-libnm_core_sources_all += shared_files_libnm_core
 libnm_core_sources_all += [version_header]
 
 libnm_core = static_library(
@@ -191,15 +196,16 @@ libnm_core = static_library(
   sources: libnm_core_sources_all,
   dependencies: deps,
   link_with: libnm_crypto,
-  c_args: cflags
+  c_args: cflags,
 )
 
 nm_core_dep = declare_dependency(
   sources: libnm_core_enum[1],
   include_directories: libnm_core_inc,
   dependencies: [
-    shared_dep,
+    shared_nm_utils_base_dep,
     shared_c_siphash_dep,
+    libnm_systemd_shared_dep,
   ],
 )
 
@@ -207,7 +213,7 @@ enums_to_docbook = join_paths(meson.source_root(), 'tools', 'enums-to-docbook.pl
 
 docbooks = [
   ['nm-dbus-types', 'nm-dbus-interface.h', 'NetworkManager D-Bus API Types'],
-  ['nm-vpn-dbus-types', 'nm-vpn-dbus-interface.h', 'VPN Plugin D-Bus API Types']
+  ['nm-vpn-dbus-types', 'nm-vpn-dbus-interface.h', 'VPN Plugin D-Bus API Types'],
 ]
 
 foreach docbook: docbooks
@@ -221,7 +227,7 @@ foreach docbook: docbooks
     command: [perl, enums_to_docbook, docbook[0], docbook[2], '@INPUT@'],
     # FIXME: gtkdoc does not depend directly on this.
     #        https://github.com/mesonbuild/meson/pull/2806
-    build_by_default: true
+    build_by_default: true,
   )
 
   content_files += xml.full_path()
diff --git a/libnm-core/nm-connection.c b/libnm-core/nm-connection.c
index 5f406cc6..ea7730bf 100644
--- a/libnm-core/nm-connection.c
+++ b/libnm-core/nm-connection.c
@@ -22,10 +22,10 @@
 
 #include "nm-default.h"
 
-#include 
+#include "nm-connection.h"
+
 #include 
 
-#include "nm-connection.h"
 #include "nm-connection-private.h"
 #include "nm-utils.h"
 #include "nm-setting-private.h"
@@ -50,6 +50,17 @@
  *
  */
 
+/*****************************************************************************/
+
+enum {
+	SECRETS_UPDATED,
+	SECRETS_CLEARED,
+	CHANGED,
+	LAST_SIGNAL
+};
+
+static guint signals[LAST_SIGNAL] = { 0 };
+
 typedef struct {
 	NMConnection *self;
 
@@ -59,19 +70,26 @@ typedef struct {
 	char *path;
 } NMConnectionPrivate;
 
+G_DEFINE_INTERFACE (NMConnection, nm_connection, G_TYPE_OBJECT)
+
 static NMConnectionPrivate *nm_connection_get_private (NMConnection *connection);
 #define NM_CONNECTION_GET_PRIVATE(o) (nm_connection_get_private ((NMConnection *)o))
 
-G_DEFINE_INTERFACE (NMConnection, nm_connection, G_TYPE_OBJECT)
+/*****************************************************************************/
 
-enum {
-	SECRETS_UPDATED,
-	SECRETS_CLEARED,
-	CHANGED,
-	LAST_SIGNAL
-};
+static gpointer
+_gtype_to_hash_key (GType gtype)
+{
+#if NM_MORE_ASSERTS
+	_nm_unused const gsize *const test_gtype_typedef = >ype;
 
-static guint signals[LAST_SIGNAL] = { 0 };
+	nm_assert ((GType) (GPOINTER_TO_SIZE (GSIZE_TO_POINTER (gtype))) == gtype);
+	G_STATIC_ASSERT_EXPR (sizeof (gpointer) >= sizeof (gsize));
+	G_STATIC_ASSERT_EXPR (sizeof (gsize) == sizeof (GType));
+#endif
+
+	return GSIZE_TO_POINTER (gtype);
+}
 
 /*****************************************************************************/
 
@@ -83,10 +101,16 @@ setting_changed_cb (NMSetting *setting,
 	g_signal_emit (self, signals[CHANGED], 0);
 }
 
+static void
+_setting_release (NMConnection *connection, NMSetting *setting)
+{
+	g_signal_handlers_disconnect_by_func (setting, setting_changed_cb, connection);
+}
+
 static gboolean
-_setting_release (gpointer key, gpointer value, gpointer user_data)
+_setting_release_hfr (gpointer key, gpointer value, gpointer user_data)
 {
-	g_signal_handlers_disconnect_by_func (user_data, setting_changed_cb, value);
+	_setting_release (user_data, value);
 	return TRUE;
 }
 
@@ -94,19 +118,20 @@ static void
 _nm_connection_add_setting (NMConnection *connection, NMSetting *setting)
 {
 	NMConnectionPrivate *priv;
-	const char *name;
+	GType setting_type;
 	NMSetting *s_old;
 
 	nm_assert (NM_IS_CONNECTION (connection));
 	nm_assert (NM_IS_SETTING (setting));
 
 	priv = NM_CONNECTION_GET_PRIVATE (connection);
-	name = G_OBJECT_TYPE_NAME (setting);
+	setting_type = G_OBJECT_TYPE (setting);
+
+	if ((s_old = g_hash_table_lookup (priv->settings, _gtype_to_hash_key (setting_type))))
+		_setting_release (connection, s_old);
+
+	g_hash_table_insert (priv->settings, _gtype_to_hash_key (setting_type), setting);
 
-	if ((s_old = g_hash_table_lookup (priv->settings, (gpointer) name)))
-		g_signal_handlers_disconnect_by_func (s_old, setting_changed_cb, connection);
-	g_hash_table_insert (priv->settings, (gpointer) name, setting);
-	/* Listen for property changes so we can emit the 'changed' signal */
 	g_signal_connect (setting, "notify", (GCallback) setting_changed_cb, connection);
 }
 
@@ -135,17 +160,15 @@ _nm_connection_remove_setting (NMConnection *connection, GType setting_type)
 {
 	NMConnectionPrivate *priv;
 	NMSetting *setting;
-	const char *setting_name;
 
 	g_return_val_if_fail (NM_IS_CONNECTION (connection), FALSE);
 	g_return_val_if_fail (g_type_is_a (setting_type, NM_TYPE_SETTING), FALSE);
 
 	priv = NM_CONNECTION_GET_PRIVATE (connection);
-	setting_name = g_type_name (setting_type);
-	setting = g_hash_table_lookup (priv->settings, setting_name);
+	setting = g_hash_table_lookup (priv->settings, _gtype_to_hash_key (setting_type));
 	if (setting) {
 		g_signal_handlers_disconnect_by_func (setting, setting_changed_cb, connection);
-		g_hash_table_remove (priv->settings, setting_name);
+		g_hash_table_remove (priv->settings, _gtype_to_hash_key (setting_type));
 		g_signal_emit (connection, signals[CHANGED], 0);
 		return TRUE;
 	}
@@ -169,11 +192,15 @@ nm_connection_remove_setting (NMConnection *connection, GType setting_type)
 static gpointer
 _connection_get_setting (NMConnection *connection, GType setting_type)
 {
+	NMSetting *setting;
+
 	nm_assert (NM_IS_CONNECTION (connection));
 	nm_assert (g_type_is_a (setting_type, NM_TYPE_SETTING));
 
-	return g_hash_table_lookup (NM_CONNECTION_GET_PRIVATE (connection)->settings,
-	                            g_type_name (setting_type));
+	setting = g_hash_table_lookup (NM_CONNECTION_GET_PRIVATE (connection)->settings,
+	                               _gtype_to_hash_key (setting_type));
+	nm_assert (!setting || G_TYPE_CHECK_INSTANCE_TYPE (setting, setting_type));
+	return setting;
 }
 
 static gpointer
@@ -203,6 +230,18 @@ nm_connection_get_setting (NMConnection *connection, GType setting_type)
 	return _connection_get_setting_check (connection, setting_type);
 }
 
+NMSettingIPConfig *
+nm_connection_get_setting_ip_config (NMConnection *connection,
+                                     int addr_family)
+{
+	nm_assert_addr_family (addr_family);
+
+	return NM_SETTING_IP_CONFIG (_connection_get_setting (connection,
+	                                                        (addr_family == AF_INET)
+	                                                      ? NM_TYPE_SETTING_IP4_CONFIG
+	                                                      : NM_TYPE_SETTING_IP6_CONFIG));
+}
+
 /**
  * nm_connection_get_setting_by_name:
  * @connection: a #NMConnection
@@ -388,7 +427,7 @@ _nm_connection_replace_settings (NMConnection *connection,
 	}
 
 	if (g_hash_table_size (priv->settings) > 0) {
-		g_hash_table_foreach_remove (priv->settings, _setting_release, connection);
+		g_hash_table_foreach_remove (priv->settings, _setting_release_hfr, connection);
 		changed = TRUE;
 	} else
 		changed = (settings != NULL);
@@ -473,7 +512,7 @@ nm_connection_replace_settings_from_connection (NMConnection *connection,
 	new_priv = NM_CONNECTION_GET_PRIVATE (new_connection);
 
 	if ((changed = g_hash_table_size (priv->settings) > 0))
-		g_hash_table_foreach_remove (priv->settings, _setting_release, connection);
+		g_hash_table_foreach_remove (priv->settings, _setting_release_hfr, connection);
 
 	if (g_hash_table_size (new_priv->settings)) {
 		g_hash_table_iter_init (&iter, new_priv->settings);
@@ -502,7 +541,7 @@ nm_connection_clear_settings (NMConnection *connection)
 	priv = NM_CONNECTION_GET_PRIVATE (connection);
 
 	if (g_hash_table_size (priv->settings) > 0) {
-		g_hash_table_foreach_remove (priv->settings, _setting_release, connection);
+		g_hash_table_foreach_remove (priv->settings, _setting_release_hfr, connection);
 		g_signal_emit (connection, signals[CHANGED], 0);
 	}
 }
@@ -646,8 +685,10 @@ _nm_connection_find_base_type_setting (NMConnection *connection)
 {
 	NMConnectionPrivate *priv = NM_CONNECTION_GET_PRIVATE (connection);
 	GHashTableIter iter;
-	NMSetting *setting = NULL, *s_iter;
-	NMSettingPriority setting_prio, s_iter_prio;
+	NMSetting *setting = NULL;
+	NMSetting *s_iter;
+	NMSettingPriority setting_prio = NM_SETTING_PRIORITY_USER;
+	NMSettingPriority s_iter_prio;
 
 	g_hash_table_iter_init (&iter, priv->settings);
 	while (g_hash_table_iter_next (&iter, NULL, (gpointer *) &s_iter)) {
@@ -876,25 +917,24 @@ _supports_addr_family (NMConnection *self, int family)
 static gboolean
 _normalize_ip_config (NMConnection *self, GHashTable *parameters)
 {
-	const char *default_ip4_method = NM_SETTING_IP4_CONFIG_METHOD_AUTO;
-	const char *default_ip6_method = NULL;
 	NMSettingIPConfig *s_ip4, *s_ip6;
 	NMSettingProxy *s_proxy;
 	NMSetting *setting;
 	gboolean changed = FALSE;
 	guint num, i;
 
-	if (parameters)
-		default_ip6_method = g_hash_table_lookup (parameters, NM_CONNECTION_NORMALIZE_PARAM_IP6_CONFIG_METHOD);
-	if (!default_ip6_method)
-		default_ip6_method = NM_SETTING_IP6_CONFIG_METHOD_AUTO;
-
 	s_ip4 = nm_connection_get_setting_ip4_config (self);
 	s_ip6 = nm_connection_get_setting_ip6_config (self);
 	s_proxy = nm_connection_get_setting_proxy (self);
 
 	if (_supports_addr_family (self, AF_INET)) {
+
 		if (!s_ip4) {
+			const char *default_ip4_method = NM_SETTING_IP4_CONFIG_METHOD_AUTO;
+
+			if (nm_connection_is_type (self, NM_SETTING_WIREGUARD_SETTING_NAME))
+				default_ip4_method = NM_SETTING_IP4_CONFIG_METHOD_DISABLED;
+
 			 /* But if no IP4 setting was specified, assume the caller was just
 			  * being lazy and use the default method.
 			  */
@@ -937,6 +977,17 @@ _normalize_ip_config (NMConnection *self, GHashTable *parameters)
 
 	if (_supports_addr_family (self, AF_INET6)) {
 		if (!s_ip6) {
+			const char *default_ip6_method = NULL;
+
+			if (parameters)
+				default_ip6_method = g_hash_table_lookup (parameters, NM_CONNECTION_NORMALIZE_PARAM_IP6_CONFIG_METHOD);
+			if (!default_ip6_method) {
+				if (nm_connection_is_type (self, NM_SETTING_WIREGUARD_SETTING_NAME))
+					default_ip6_method = NM_SETTING_IP6_CONFIG_METHOD_IGNORE;
+				else
+					default_ip6_method = NM_SETTING_IP6_CONFIG_METHOD_AUTO;
+			}
+
 			/* If no IP6 setting was specified, then assume that means IP6 config is
 			 * allowed to fail.
 			 */
@@ -1811,26 +1862,14 @@ nm_connection_need_secrets (NMConnection *connection,
 void
 nm_connection_clear_secrets (NMConnection *connection)
 {
-	GHashTableIter iter;
-	NMSetting *setting;
-
-	g_return_if_fail (NM_IS_CONNECTION (connection));
-
-	g_hash_table_iter_init (&iter, NM_CONNECTION_GET_PRIVATE (connection)->settings);
-	while (g_hash_table_iter_next (&iter, NULL, (gpointer) &setting)) {
-		g_signal_handlers_block_by_func (setting, (GCallback) setting_changed_cb, connection);
-		_nm_setting_clear_secrets (setting);
-		g_signal_handlers_unblock_by_func (setting, (GCallback) setting_changed_cb, connection);
-	}
-
-	g_signal_emit (connection, signals[SECRETS_CLEARED], 0);
+	return nm_connection_clear_secrets_with_flags (connection, NULL, NULL);
 }
 
 /**
  * nm_connection_clear_secrets_with_flags:
  * @connection: the #NMConnection
- * @func: (scope call): function to be called to determine whether a
- *     specific secret should be cleared or not
+ * @func: (scope call) (allow-none): function to be called to determine whether a
+ *     specific secret should be cleared or not. If %NULL, all secrets are cleared.
  * @user_data: caller-supplied data passed to @func
  *
  * Clears and frees secrets determined by @func.
@@ -1848,13 +1887,115 @@ nm_connection_clear_secrets_with_flags (NMConnection *connection,
 	g_hash_table_iter_init (&iter, NM_CONNECTION_GET_PRIVATE (connection)->settings);
 	while (g_hash_table_iter_next (&iter, NULL, (gpointer) &setting)) {
 		g_signal_handlers_block_by_func (setting, (GCallback) setting_changed_cb, connection);
-		_nm_setting_clear_secrets_with_flags (setting, func, user_data);
+		_nm_setting_clear_secrets (setting, func, user_data);
 		g_signal_handlers_unblock_by_func (setting, (GCallback) setting_changed_cb, connection);
 	}
 
 	g_signal_emit (connection, signals[SECRETS_CLEARED], 0);
 }
 
+/*****************************************************************************/
+
+/* Returns always a non-NULL, floating variant that must
+ * be unrefed by the caller. */
+GVariant *
+_nm_connection_for_each_secret (NMConnection *self,
+                                GVariant *secrets,
+                                gboolean remove_non_secrets,
+                                _NMConnectionForEachSecretFunc callback,
+                                gpointer callback_data)
+{
+	GVariantBuilder secrets_builder;
+	GVariantBuilder setting_builder;
+	GVariantIter secrets_iter;
+	GVariantIter *setting_iter;
+	const char *setting_name;
+
+	/* This function, given a dict of dicts representing new secrets of
+	 * an NMConnection, walks through each toplevel dict (which represents a
+	 * NMSetting), and for each setting, walks through that setting dict's
+	 * properties.  For each property that's a secret, it will check that
+	 * secret's flags in the backing NMConnection object, and call a supplied
+	 * callback.
+	 *
+	 * The one complexity is that the VPN setting's 'secrets' property is
+	 * *also* a dict (since the key/value pairs are arbitrary and known
+	 * only to the VPN plugin itself).  That means we have three levels of
+	 * dicts that we potentially have to traverse here.  The differences
+	 * are handled by the virtual for_each_secret() function.
+	 */
+
+	g_return_val_if_fail (callback, NULL);
+
+	g_variant_iter_init (&secrets_iter, secrets);
+	g_variant_builder_init (&secrets_builder, NM_VARIANT_TYPE_CONNECTION);
+	while (g_variant_iter_next (&secrets_iter, "{&sa{sv}}", &setting_name, &setting_iter)) {
+		_nm_unused nm_auto_free_variant_iter GVariantIter *setting_iter_free = setting_iter;
+		NMSetting *setting;
+		const char *secret_name;
+		GVariant *val;
+
+		setting = nm_connection_get_setting_by_name (self, setting_name);
+		if (!setting)
+			continue;
+
+		g_variant_builder_init (&setting_builder, NM_VARIANT_TYPE_SETTING);
+		while (g_variant_iter_next (setting_iter, "{&sv}", &secret_name, &val)) {
+			_nm_unused gs_unref_variant GVariant *val_free = val;
+
+			NM_SETTING_GET_CLASS (setting)->for_each_secret (setting,
+			                                                 secret_name,
+			                                                 val,
+			                                                 remove_non_secrets,
+			                                                 callback,
+			                                                 callback_data,
+			                                                 &setting_builder);
+		}
+
+		g_variant_builder_add (&secrets_builder, "{sa{sv}}", setting_name, &setting_builder);
+	}
+
+	return g_variant_builder_end (&secrets_builder);
+}
+
+/*****************************************************************************/
+
+typedef struct {
+	NMConnectionFindSecretFunc find_func;
+	gpointer find_func_data;
+	gboolean found;
+} FindSecretData;
+
+static gboolean
+find_secret_for_each_func (NMSettingSecretFlags flags,
+                           gpointer user_data)
+{
+	FindSecretData *data = user_data;
+
+	if (!data->found)
+		data->found = data->find_func (flags, data->find_func_data);
+	return FALSE;
+}
+
+gboolean
+_nm_connection_find_secret (NMConnection *self,
+                            GVariant *secrets,
+                            NMConnectionFindSecretFunc callback,
+                            gpointer callback_data)
+{
+	gs_unref_variant GVariant *dummy = NULL;
+	FindSecretData data = {
+		.find_func      = callback,
+		.find_func_data = callback_data,
+		.found          = FALSE,
+	};
+
+	dummy = _nm_connection_for_each_secret (self, secrets, FALSE, find_secret_for_each_func, &data);
+	return data.found;
+}
+
+/*****************************************************************************/
+
 /**
  * nm_connection_to_dbus:
  * @connection: the #NMConnection
@@ -1874,7 +2015,7 @@ nm_connection_to_dbus (NMConnection *connection,
 	NMConnectionPrivate *priv;
 	GVariantBuilder builder;
 	GHashTableIter iter;
-	gpointer key, data;
+	gpointer data;
 	GVariant *setting_dict, *ret;
 
 	g_return_val_if_fail (NM_IS_CONNECTION (connection), NULL);
@@ -1884,7 +2025,7 @@ nm_connection_to_dbus (NMConnection *connection,
 
 	/* Add each setting's hash to the main hash */
 	g_hash_table_iter_init (&iter, priv->settings);
-	while (g_hash_table_iter_next (&iter, &key, &data)) {
+	while (g_hash_table_iter_next (&iter, NULL, &data)) {
 		NMSetting *setting = NM_SETTING (data);
 
 		setting_dict = _nm_setting_to_dbus (setting, connection, flags);
@@ -1939,7 +2080,7 @@ _for_each_sort (NMSetting **p_a, NMSetting **p_b, void *unused)
 /**
  * nm_connection_get_settings:
  * @connection: the #NMConnection instance
- * @out_length: (allow-none): (out): the length of the returned array
+ * @out_length: (allow-none) (out): the length of the returned array
  *
  * Retrieves the settings in @connection.
  *
@@ -2015,6 +2156,73 @@ nm_connection_for_each_setting_value (NMConnection *connection,
 		nm_setting_enumerate_values (settings[i], func, user_data);
 }
 
+/**
+ * _nm_connection_aggregate:
+ * @connecition: the #NMConnection for which values are to be aggregated.
+ * @type: one of the supported aggrate types.
+ * @arg: the input/output argument that depends on @type.
+ *
+ * For example, with %NM_CONNECTION_AGGREGATE_ANY_SECRETS and
+ * %NM_CONNECTION_AGGREGATE_ANY_SYSTEM_SECRET_FLAGS @arg is a boolean
+ * output argument. It is either %NULL or a pointer to an gboolean
+ * out-argument. The function will always set @arg if given.
+ * Also, the return value of the function is likewise the result
+ * that is set to @arg.
+ *
+ * Returns: a boolean result with the meaning depending on the aggregation
+ *   type @type.
+ */
+gboolean
+_nm_connection_aggregate (NMConnection *connection,
+                          NMConnectionAggregateType type,
+                          gpointer arg)
+{
+	NMConnectionPrivate *priv;
+	GHashTableIter iter;
+	NMSetting *setting;
+	gboolean arg_boolean;
+	gboolean completed_early;
+	gpointer my_arg;
+
+	g_return_val_if_fail (NM_IS_CONNECTION (connection), FALSE);
+
+	switch (type) {
+	case NM_CONNECTION_AGGREGATE_ANY_SECRETS:
+		arg_boolean = FALSE;
+		my_arg = &arg_boolean;
+		goto good;
+	case NM_CONNECTION_AGGREGATE_ANY_SYSTEM_SECRET_FLAGS:
+		arg_boolean = FALSE;
+		my_arg = &arg_boolean;
+		goto good;
+	}
+	g_return_val_if_reached (FALSE);
+
+good:
+	priv = NM_CONNECTION_GET_PRIVATE (connection);
+
+	completed_early = FALSE;
+	g_hash_table_iter_init (&iter, priv->settings);
+	while (g_hash_table_iter_next (&iter, NULL, (gpointer) &setting)) {
+		if (_nm_setting_aggregate (setting, type, my_arg)) {
+			completed_early = TRUE;
+			break;
+		}
+		nm_assert (   my_arg != &arg_boolean
+		           || !arg_boolean);
+	}
+
+	if (my_arg == &arg_boolean) {
+		nm_assert (completed_early == arg_boolean);
+		if (arg)
+			*((gboolean *) arg) = arg_boolean;
+		return arg_boolean;
+	}
+
+	nm_assert_not_reached ();
+	return FALSE;
+}
+
 /**
  * nm_connection_dump:
  * @connection: the #NMConnection
@@ -2029,14 +2237,13 @@ nm_connection_dump (NMConnection *connection)
 {
 	GHashTableIter iter;
 	NMSetting *setting;
-	const char *setting_name;
 	char *str;
 
 	if (!connection)
 		return;
 
 	g_hash_table_iter_init (&iter, NM_CONNECTION_GET_PRIVATE (connection)->settings);
-	while (g_hash_table_iter_next (&iter, (gpointer) &setting_name, (gpointer) &setting)) {
+	while (g_hash_table_iter_next (&iter, NULL, (gpointer) &setting)) {
 		str = nm_setting_to_string (setting);
 		g_print ("%s\n", str);
 		g_free (str);
@@ -2221,23 +2428,24 @@ nm_connection_is_virtual (NMConnection *connection)
 	if (!type)
 		return FALSE;
 
-	if (   !strcmp (type, NM_SETTING_6LOWPAN_SETTING_NAME)
-	    || !strcmp (type, NM_SETTING_BOND_SETTING_NAME)
-	    || !strcmp (type, NM_SETTING_DUMMY_SETTING_NAME)
-	    || !strcmp (type, NM_SETTING_TEAM_SETTING_NAME)
-	    || !strcmp (type, NM_SETTING_BRIDGE_SETTING_NAME)
-	    || !strcmp (type, NM_SETTING_VLAN_SETTING_NAME)
-	    || !strcmp (type, NM_SETTING_TUN_SETTING_NAME)
-	    || !strcmp (type, NM_SETTING_IP_TUNNEL_SETTING_NAME)
-	    || !strcmp (type, NM_SETTING_MACSEC_SETTING_NAME)
-	    || !strcmp (type, NM_SETTING_MACVLAN_SETTING_NAME)
-	    || !strcmp (type, NM_SETTING_OVS_BRIDGE_SETTING_NAME)
-	    || !strcmp (type, NM_SETTING_OVS_INTERFACE_SETTING_NAME)
-	    || !strcmp (type, NM_SETTING_OVS_PORT_SETTING_NAME)
-	    || !strcmp (type, NM_SETTING_VXLAN_SETTING_NAME))
+	if (NM_IN_STRSET (type, NM_SETTING_6LOWPAN_SETTING_NAME,
+	                        NM_SETTING_BOND_SETTING_NAME,
+	                        NM_SETTING_BRIDGE_SETTING_NAME,
+	                        NM_SETTING_DUMMY_SETTING_NAME,
+	                        NM_SETTING_IP_TUNNEL_SETTING_NAME,
+	                        NM_SETTING_MACSEC_SETTING_NAME,
+	                        NM_SETTING_MACVLAN_SETTING_NAME,
+	                        NM_SETTING_OVS_BRIDGE_SETTING_NAME,
+	                        NM_SETTING_OVS_INTERFACE_SETTING_NAME,
+	                        NM_SETTING_OVS_PORT_SETTING_NAME,
+	                        NM_SETTING_TEAM_SETTING_NAME,
+	                        NM_SETTING_TUN_SETTING_NAME,
+	                        NM_SETTING_VLAN_SETTING_NAME,
+	                        NM_SETTING_VXLAN_SETTING_NAME,
+	                        NM_SETTING_WIREGUARD_SETTING_NAME))
 		return TRUE;
 
-	if (!strcmp (type, NM_SETTING_INFINIBAND_SETTING_NAME)) {
+	if (nm_streq (type, NM_SETTING_INFINIBAND_SETTING_NAME)) {
 		NMSettingInfiniband *s_ib;
 
 		s_ib = nm_connection_get_setting_infiniband (connection);
@@ -2886,7 +3094,7 @@ nm_connection_private_free (NMConnectionPrivate *priv)
 {
 	NMConnection *self = priv->self;
 
-	g_hash_table_foreach_remove (priv->settings, _setting_release, self);
+	g_hash_table_foreach_remove (priv->settings, _setting_release_hfr, self);
 	g_hash_table_destroy (priv->settings);
 	g_free (priv->path);
 
@@ -2910,7 +3118,10 @@ nm_connection_get_private (NMConnection *connection)
 		                         priv, (GDestroyNotify) nm_connection_private_free);
 
 		priv->self = connection;
-		priv->settings = g_hash_table_new_full (nm_str_hash, g_str_equal, NULL, g_object_unref);
+		priv->settings = g_hash_table_new_full (nm_direct_hash,
+		                                        NULL,
+		                                        NULL,
+		                                        g_object_unref);
 	}
 
 	return priv;
@@ -2919,8 +3130,6 @@ nm_connection_get_private (NMConnection *connection)
 static void
 nm_connection_default_init (NMConnectionInterface *iface)
 {
-	/* Signals */
-
 	/**
 	 * NMConnection::secrets-updated:
 	 * @connection: the object on which the signal is emitted
@@ -2931,14 +3140,14 @@ nm_connection_default_init (NMConnectionInterface *iface)
 	 * have been changed.
 	 */
 	signals[SECRETS_UPDATED] =
-		g_signal_new (NM_CONNECTION_SECRETS_UPDATED,
-		              NM_TYPE_CONNECTION,
-		              G_SIGNAL_RUN_FIRST,
-		              G_STRUCT_OFFSET (NMConnectionInterface, secrets_updated),
-		              NULL, NULL,
-		              g_cclosure_marshal_VOID__STRING,
-		              G_TYPE_NONE, 1,
-		              G_TYPE_STRING);
+	    g_signal_new (NM_CONNECTION_SECRETS_UPDATED,
+	                 NM_TYPE_CONNECTION,
+	                 G_SIGNAL_RUN_FIRST,
+	                 G_STRUCT_OFFSET (NMConnectionInterface, secrets_updated),
+	                 NULL, NULL,
+	                 g_cclosure_marshal_VOID__STRING,
+	                 G_TYPE_NONE, 1,
+	                 G_TYPE_STRING);
 
 	/**
 	 * NMConnection::secrets-cleared:
@@ -2948,13 +3157,13 @@ nm_connection_default_init (NMConnectionInterface *iface)
 	 * are cleared.
 	 */
 	signals[SECRETS_CLEARED] =
-		g_signal_new (NM_CONNECTION_SECRETS_CLEARED,
-		              NM_TYPE_CONNECTION,
-		              G_SIGNAL_RUN_FIRST,
-		              G_STRUCT_OFFSET (NMConnectionInterface, secrets_cleared),
-		              NULL, NULL,
-		              g_cclosure_marshal_VOID__VOID,
-		              G_TYPE_NONE, 0);
+	    g_signal_new (NM_CONNECTION_SECRETS_CLEARED,
+	                 NM_TYPE_CONNECTION,
+	                 G_SIGNAL_RUN_FIRST,
+	                 G_STRUCT_OFFSET (NMConnectionInterface, secrets_cleared),
+	                 NULL, NULL,
+	                 g_cclosure_marshal_VOID__VOID,
+	                 G_TYPE_NONE, 0);
 
 	/**
 	 * NMConnection::changed:
@@ -2965,11 +3174,11 @@ nm_connection_default_init (NMConnectionInterface *iface)
 	 * or when settings are added or removed.
 	 */
 	signals[CHANGED] =
-		g_signal_new (NM_CONNECTION_CHANGED,
-		              NM_TYPE_CONNECTION,
-		              G_SIGNAL_RUN_FIRST,
-		              G_STRUCT_OFFSET (NMConnectionInterface, changed),
-		              NULL, NULL,
-		              g_cclosure_marshal_VOID__VOID,
-		              G_TYPE_NONE, 0);
+	    g_signal_new (NM_CONNECTION_CHANGED,
+	                 NM_TYPE_CONNECTION,
+	                 G_SIGNAL_RUN_FIRST,
+	                 G_STRUCT_OFFSET (NMConnectionInterface, changed),
+	                 NULL, NULL,
+	                 g_cclosure_marshal_VOID__VOID,
+	                 G_TYPE_NONE, 0);
 }
diff --git a/libnm-core/nm-connection.h b/libnm-core/nm-connection.h
index b6e00977..8d64a4ce 100644
--- a/libnm-core/nm-connection.h
+++ b/libnm-core/nm-connection.h
@@ -45,7 +45,7 @@ G_BEGIN_DECLS
 
 /*
  * NM_CONNECTION_NORMALIZE_PARAM_IP6_CONFIG_METHOD: overwrite the ip6 method
- * when normalizing ip6 configuration. If omited, this defaults to
+ * when normalizing ip6 configuration. If omitted, this defaults to
  * @NM_SETTING_IP6_CONFIG_METHOD_AUTO.
  */
 #define NM_CONNECTION_NORMALIZE_PARAM_IP6_CONFIG_METHOD "ip6-config-method"
@@ -59,7 +59,7 @@ G_BEGIN_DECLS
 
 /**
  * NMConnectionInterface:
- * @parent: the parent interace struct
+ * @parent: the parent interface struct
  * @secrets_updated: emitted when the connection's secrets are updated
  * @secrets_cleared: emitted when the connection's secrets are cleared
  * @changed: emitted when any change to the connection's settings occurs
@@ -121,8 +121,6 @@ typedef enum { /*< flags >*/
 	NM_CONNECTION_SERIALIZE_ALL = 0x00000000,
 	NM_CONNECTION_SERIALIZE_NO_SECRETS = 0x00000001,
 	NM_CONNECTION_SERIALIZE_ONLY_SECRETS = 0x00000002,
-
-	/* 0x80000000 is used for a private flag */
 } NMConnectionSerializationFlags;
 
 GVariant     *nm_connection_to_dbus       (NMConnection *connection,
diff --git a/libnm-core/nm-core-enum-types.c.template b/libnm-core/nm-core-enum-types.c.template
index 605fa34a..94744827 100644
--- a/libnm-core/nm-core-enum-types.c.template
+++ b/libnm-core/nm-core-enum-types.c.template
@@ -4,7 +4,6 @@
 #include "nm-core-enum-types.h"
 #include "nm-default.h"
 
-#include "nm-version-macros.h"
 #include "nm-connection.h"
 #include "nm-core-types.h"
 #include "nm-dbus-interface.h"
@@ -44,14 +43,17 @@
 #include "nm-setting-vlan.h"
 #include "nm-setting-vpn.h"
 #include "nm-setting-vxlan.h"
+#include "nm-setting-wifi-p2p.h"
 #include "nm-setting-wimax.h"
 #include "nm-setting-wired.h"
+#include "nm-setting-wireguard.h"
 #include "nm-setting-wireless-security.h"
 #include "nm-setting-wireless.h"
 #include "nm-setting-wpan.h"
 #include "nm-setting.h"
 #include "nm-simple-connection.h"
 #include "nm-utils.h"
+#include "nm-version-macros.h"
 #include "nm-version.h"
 #include "nm-vpn-dbus-interface.h"
 #include "nm-vpn-editor-plugin.h"
diff --git a/libnm-core/nm-core-internal.h b/libnm-core/nm-core-internal.h
index 9d2d0f2c..f2332f76 100644
--- a/libnm-core/nm-core-internal.h
+++ b/libnm-core/nm-core-internal.h
@@ -37,6 +37,8 @@
 
 #include "nm-connection.h"
 #include "nm-core-enum-types.h"
+#include "nm-core-types-internal.h"
+#include "nm-meta-setting.h"
 #include "nm-setting-6lowpan.h"
 #include "nm-setting-8021x.h"
 #include "nm-setting-adsl.h"
@@ -52,7 +54,6 @@
 #include "nm-setting-gsm.h"
 #include "nm-setting-infiniband.h"
 #include "nm-setting-ip-tunnel.h"
-#include "nm-setting-proxy.h"
 #include "nm-setting-ip4-config.h"
 #include "nm-setting-ip6-config.h"
 #include "nm-setting-macsec.h"
@@ -65,6 +66,7 @@
 #include "nm-setting-ovs-port.h"
 #include "nm-setting-ppp.h"
 #include "nm-setting-pppoe.h"
+#include "nm-setting-proxy.h"
 #include "nm-setting-serial.h"
 #include "nm-setting-sriov.h"
 #include "nm-setting-tc-config.h"
@@ -74,8 +76,10 @@
 #include "nm-setting-vlan.h"
 #include "nm-setting-vpn.h"
 #include "nm-setting-vxlan.h"
+#include "nm-setting-wifi-p2p.h"
 #include "nm-setting-wimax.h"
 #include "nm-setting-wired.h"
+#include "nm-setting-wireguard.h"
 #include "nm-setting-wireless-security.h"
 #include "nm-setting-wireless.h"
 #include "nm-setting-wpan.h"
@@ -83,9 +87,7 @@
 #include "nm-simple-connection.h"
 #include "nm-utils.h"
 #include "nm-vpn-dbus-interface.h"
-#include "nm-core-types-internal.h"
 #include "nm-vpn-editor-plugin.h"
-#include "nm-meta-setting.h"
 
 /* IEEE 802.1D-1998 timer values */
 #define NM_BR_MIN_HELLO_TIME    1
@@ -126,11 +128,21 @@
  */
 #define NM_SETTING_COMPARE_FLAG_NONE ((NMSettingCompareFlags) 0)
 
-#define NM_SETTING_SECRET_FLAGS_ALL \
-	(NM_SETTING_SECRET_FLAG_NONE | \
-	 NM_SETTING_SECRET_FLAG_AGENT_OWNED | \
-	 NM_SETTING_SECRET_FLAG_NOT_SAVED | \
-	 NM_SETTING_SECRET_FLAG_NOT_REQUIRED)
+/*****************************************************************************/
+
+#define NM_SETTING_SECRET_FLAG_ALL \
+	((NMSettingSecretFlags) (  NM_SETTING_SECRET_FLAG_NONE \
+	                         | NM_SETTING_SECRET_FLAG_AGENT_OWNED \
+	                         | NM_SETTING_SECRET_FLAG_NOT_SAVED \
+	                         | NM_SETTING_SECRET_FLAG_NOT_REQUIRED))
+
+static inline gboolean
+_nm_setting_secret_flags_valid (NMSettingSecretFlags flags)
+{
+	return !NM_FLAGS_ANY (flags, ~NM_SETTING_SECRET_FLAG_ALL);
+}
+
+/*****************************************************************************/
 
 typedef enum { /*< skip >*/
 	NM_SETTING_PARSE_FLAGS_NONE                     = 0,
@@ -151,6 +163,26 @@ gpointer _nm_connection_check_main_setting (NMConnection *connection,
                                             const char *setting_name,
                                             GError **error);
 
+typedef enum {
+	/* whether the connection has any secrets.
+	 *
+	 * @arg may be %NULL or a pointer to a gboolean for the result. The return
+	 *   value of _nm_connection_aggregate() is likewise the boolean result. */
+	NM_CONNECTION_AGGREGATE_ANY_SECRETS,
+
+	/* whether the connection has any secret with flags NM_SETTING_SECRET_FLAG_NONE.
+	 * Note that this only cares about the flags, not whether the secret is actually
+	 * present.
+	 *
+	 * @arg may be %NULL or a pointer to a gboolean for the result. The return
+	 *   value of _nm_connection_aggregate() is likewise the boolean result. */
+	NM_CONNECTION_AGGREGATE_ANY_SYSTEM_SECRET_FLAGS,
+} NMConnectionAggregateType;
+
+gboolean _nm_connection_aggregate (NMConnection *connection,
+                                   NMConnectionAggregateType type,
+                                   gpointer arg);
+
 /**
  * NMSettingVerifyResult:
  * @NM_SETTING_VERIFY_SUCCESS: the setting verifies successfully
@@ -179,13 +211,6 @@ NMSettingPriority _nm_setting_get_setting_priority (NMSetting *setting);
 
 gboolean _nm_setting_get_property (NMSetting *setting, const char *name, GValue *value);
 
-/* NM_CONNECTION_SERIALIZE_NO_SYNTH: This flag is passed to _nm_setting_to_dbus()
- * by nm_setting_to_string() to let it know that it shouldn't serialize the
- * synthetic properties. It wouldn't be able to do so, since the full connection
- * is not available, only the setting alone.
- */
-#define NM_CONNECTION_SERIALIZE_NO_SYNTH ((NMConnectionSerializationFlags) 0x80000000)
-
 /*****************************************************************************/
 
 GHashTable *_nm_setting_gendata_hash (NMSetting *setting,
@@ -224,27 +249,6 @@ guint nm_setting_ethtool_init_features (NMSettingEthtool *setting,
 guint8 *_nm_utils_hwaddr_aton (const char *asc, gpointer buffer, gsize buffer_length, gsize *out_length);
 const char *nm_utils_hwaddr_ntoa_buf (gconstpointer addr, gsize addr_len, gboolean upper_case, char *buf, gsize buf_len);
 
-char *_nm_utils_bin2hexstr_full (gconstpointer addr, gsize length, const char delimiter, gboolean upper_case, char *out);
-
-guint8 *_nm_utils_hexstr2bin_full (const char *hexstr,
-                                   gboolean allow_0x_prefix,
-                                   gboolean delimiter_required,
-                                   const char *delimiter_candidates,
-                                   gsize required_len,
-                                   guint8 *buffer,
-                                   gsize buffer_len,
-                                   gsize *out_len);
-
-#define _nm_utils_hexstr2bin_buf(hexstr, allow_0x_prefix, delimiter_required, delimiter_candidates, buffer) \
-    _nm_utils_hexstr2bin_full ((hexstr), (allow_0x_prefix), (delimiter_required), (delimiter_candidates), G_N_ELEMENTS (buffer), (buffer), G_N_ELEMENTS (buffer), NULL)
-
-guint8 *_nm_utils_hexstr2bin_alloc (const char *hexstr,
-                                    gboolean allow_0x_prefix,
-                                    gboolean delimiter_required,
-                                    const char *delimiter_candidates,
-                                    gsize required_len,
-                                    gsize *out_len);
-
 GSList *    _nm_utils_hash_values_to_slist (GHashTable *hash);
 
 GHashTable *_nm_utils_copy_strdict (GHashTable *strdict);
@@ -334,6 +338,10 @@ void _nm_dbus_errors_init (void);
 
 extern gboolean _nm_utils_is_manager_process;
 
+gboolean _nm_dbus_typecheck_response (GVariant *response,
+                                      const GVariantType *reply_type,
+                                      GError **error);
+
 gulong _nm_dbus_signal_connect_data (GDBusProxy *proxy,
                                      const char *signal_name,
                                      const GVariantType *signature,
@@ -358,6 +366,11 @@ GVariant *_nm_dbus_proxy_call_sync   (GDBusProxy           *proxy,
                                       GCancellable         *cancellable,
                                       GError              **error);
 
+GVariant * _nm_dbus_connection_call_finish (GDBusConnection *dbus_connection,
+                                            GAsyncResult *result,
+                                            const GVariantType *reply_type,
+                                            GError **error);
+
 gboolean _nm_dbus_error_has_name (GError     *error,
                                   const char *dbus_error_name);
 
@@ -436,6 +449,11 @@ gboolean _nm_utils_generate_mac_address_mask_parse (const char *value,
 
 /*****************************************************************************/
 
+NMSettingIPConfig *nm_connection_get_setting_ip_config (NMConnection *connection,
+                                                        int addr_family);
+
+/*****************************************************************************/
+
 typedef enum {
 	NM_BOND_OPTION_TYPE_INT,
 	NM_BOND_OPTION_TYPE_STRING,
@@ -492,6 +510,30 @@ NMSettingBluetooth *_nm_connection_get_setting_bluetooth_for_nap (NMConnection *
 
 const char *nm_utils_inet_ntop (int addr_family, gconstpointer addr, char *dst);
 
+static inline char *
+nm_utils_inet4_ntop_dup (in_addr_t addr)
+{
+	char buf[NM_UTILS_INET_ADDRSTRLEN];
+
+	return g_strdup (nm_utils_inet4_ntop (addr, buf));
+}
+
+static inline char *
+nm_utils_inet6_ntop_dup (const struct in6_addr *addr)
+{
+	char buf[NM_UTILS_INET_ADDRSTRLEN];
+
+	return g_strdup (nm_utils_inet6_ntop (addr, buf));
+}
+
+static inline char *
+nm_utils_inet_ntop_dup (int addr_family, gconstpointer addr)
+{
+	char buf[NM_UTILS_INET_ADDRSTRLEN];
+
+	return g_strdup (nm_utils_inet_ntop (addr_family, addr, buf));
+}
+
 gboolean _nm_utils_inet6_is_token (const struct in6_addr *in6addr);
 
 /*****************************************************************************/
@@ -557,13 +599,44 @@ gboolean _nm_setting_sriov_sort_vfs (NMSettingSriov *setting);
 
 /*****************************************************************************/
 
-typedef struct _NMSettInfoSetting NMSettInfoSetting;
+typedef struct _NMSockAddrEndpoint NMSockAddrEndpoint;
+
+NMSockAddrEndpoint *nm_sock_addr_endpoint_new (const char *endpoint);
+
+NMSockAddrEndpoint *nm_sock_addr_endpoint_ref (NMSockAddrEndpoint *self);
+void nm_sock_addr_endpoint_unref (NMSockAddrEndpoint *self);
+
+const char *nm_sock_addr_endpoint_get_endpoint (NMSockAddrEndpoint *self);
+const char *nm_sock_addr_endpoint_get_host (NMSockAddrEndpoint *self);
+gint32 nm_sock_addr_endpoint_get_port (NMSockAddrEndpoint *self);
+
+gboolean nm_sock_addr_endpoint_get_fixed_sockaddr (NMSockAddrEndpoint *self,
+                                                   gpointer sockaddr);
+
+#define nm_auto_unref_sockaddrendpoint nm_auto(_nm_auto_unref_sockaddrendpoint)
+NM_AUTO_DEFINE_FCN0 (NMSockAddrEndpoint *, _nm_auto_unref_sockaddrendpoint, nm_sock_addr_endpoint_unref)
+
+/*****************************************************************************/
+
+NMSockAddrEndpoint *_nm_wireguard_peer_get_endpoint (const NMWireGuardPeer *self);
+void _nm_wireguard_peer_set_endpoint (NMWireGuardPeer *self,
+                                      NMSockAddrEndpoint *endpoint);
+
+void _nm_wireguard_peer_set_public_key_bin (NMWireGuardPeer *self,
+                                            const guint8 public_key[static NM_WIREGUARD_PUBLIC_KEY_LEN]);
+
+/*****************************************************************************/
+
+typedef struct _NMSettInfoSetting  NMSettInfoSetting;
+typedef struct _NMSettInfoProperty NMSettInfoProperty;
 
 typedef GVariant *(*NMSettingPropertyGetFunc)           (NMSetting     *setting,
                                                          const char    *property);
-typedef GVariant *(*NMSettingPropertySynthFunc)         (NMSetting     *setting,
+typedef GVariant *(*NMSettingPropertySynthFunc)         (const NMSettInfoSetting *sett_info,
+                                                         guint property_idx,
                                                          NMConnection  *connection,
-                                                         const char    *property);
+                                                         NMSetting     *setting,
+                                                         NMConnectionSerializationFlags flags);
 typedef gboolean  (*NMSettingPropertySetFunc)           (NMSetting     *setting,
                                                          GVariant      *connection_dict,
                                                          const char    *property,
@@ -579,7 +652,7 @@ typedef GVariant *(*NMSettingPropertyTransformToFunc)   (const GValue *from);
 typedef void      (*NMSettingPropertyTransformFromFunc) (GVariant *from,
                                                           GValue *to);
 
-typedef struct {
+struct _NMSettInfoProperty {
 	const char *name;
 	GParamSpec *param_spec;
 	const GVariantType *dbus_type;
@@ -591,7 +664,7 @@ typedef struct {
 
 	NMSettingPropertyTransformToFunc   to_dbus;
 	NMSettingPropertyTransformFromFunc from_dbus;
-} NMSettInfoProperty;
+};
 
 typedef struct {
 	const GVariantType *(*get_variant_type) (const struct _NMSettInfoSetting *sett_info,
@@ -616,15 +689,51 @@ typedef struct {
 
 struct _NMSettInfoSetting {
 	NMSettingClass *setting_class;
+
+	/* the properties, sorted by property name. */
 	const NMSettInfoProperty *property_infos;
+
+	/* the @property_infos list is sorted by property name. For some uses we need
+	 * a different sort order. If @property_infos_sorted is set, this is the order
+	 * instead. It is used for:
+	 *
+	 *   - nm_setting_enumerate_values()
+	 *   - keyfile writer adding keys to the group.
+	 *
+	 * Note that currently only NMSettingConnection implements here a sort order
+	 * that differs from alphabetical sort of the property names.
+	 */
+	const NMSettInfoProperty *const*property_infos_sorted;
+
 	guint property_infos_len;
 	NMSettInfoSettDetail detail;
 };
 
-const NMSettInfoSetting *_nm_sett_info_setting_get (NMSettingClass *setting_class);
+static inline const NMSettInfoProperty *
+_nm_sett_info_property_info_get_sorted (const NMSettInfoSetting *sett_info,
+                                        guint idx)
+{
+	nm_assert (sett_info);
+	nm_assert (idx < sett_info->property_infos_len);
+	nm_assert (!sett_info->property_infos_sorted || sett_info->property_infos_sorted[idx]);
+
+	return   sett_info->property_infos_sorted
+	       ? sett_info->property_infos_sorted[idx]
+	       : &sett_info->property_infos[idx];
+}
+
+const NMSettInfoProperty *_nm_sett_info_setting_get_property_info (const NMSettInfoSetting *sett_info,
+                                                                   const char *property_name);
 
-const NMSettInfoProperty *_nm_sett_info_property_get (NMSettingClass *setting_class,
-                                                      const char *property_name);
+const NMSettInfoSetting *_nm_setting_class_get_sett_info (NMSettingClass *setting_class);
+
+static inline const NMSettInfoProperty *
+_nm_setting_class_get_property_info (NMSettingClass *setting_class,
+                                     const char *property_name)
+{
+	return _nm_sett_info_setting_get_property_info (_nm_setting_class_get_sett_info (setting_class),
+	                                                property_name);
+}
 
 /*****************************************************************************/
 
@@ -637,4 +746,29 @@ GBytes *_nm_setting_802_1x_cert_value_to_bytes (NMSetting8021xCKScheme scheme,
 
 /*****************************************************************************/
 
+GVariant *_nm_connection_for_each_secret (NMConnection *self,
+                                          GVariant *secrets,
+                                          gboolean remove_non_secrets,
+                                          _NMConnectionForEachSecretFunc callback,
+                                          gpointer callback_data);
+
+typedef gboolean (*NMConnectionFindSecretFunc) (NMSettingSecretFlags flags,
+                                                gpointer user_data);
+
+gboolean _nm_connection_find_secret (NMConnection *self,
+                                     GVariant *secrets,
+                                     NMConnectionFindSecretFunc callback,
+                                     gpointer callback_data);
+
+/*****************************************************************************/
+
+#define nm_auto_unref_wgpeer nm_auto(_nm_auto_unref_wgpeer)
+NM_AUTO_DEFINE_FCN0 (NMWireGuardPeer *, _nm_auto_unref_wgpeer, nm_wireguard_peer_unref)
+
+gboolean nm_utils_base64secret_normalize (const char *base64_key,
+                                          gsize required_key_len,
+                                          char **out_base64_key_norm);
+
+/*****************************************************************************/
+
 #endif
diff --git a/libnm-core/nm-core-types.h b/libnm-core/nm-core-types.h
index 89d99579..f20ffc09 100644
--- a/libnm-core/nm-core-types.h
+++ b/libnm-core/nm-core-types.h
@@ -43,12 +43,11 @@ typedef struct _NMSettingDummy            NMSettingDummy;
 typedef struct _NMSettingEthtool          NMSettingEthtool;
 typedef struct _NMSettingGeneric          NMSettingGeneric;
 typedef struct _NMSettingGsm              NMSettingGsm;
-typedef struct _NMSettingInfiniband       NMSettingInfiniband;
-typedef struct _NMSettingIPConfig         NMSettingIPConfig;
-typedef struct _NMSettingIPTunnel         NMSettingIPTunnel;
-typedef struct _NMSettingProxy            NMSettingProxy;
 typedef struct _NMSettingIP4Config        NMSettingIP4Config;
 typedef struct _NMSettingIP6Config        NMSettingIP6Config;
+typedef struct _NMSettingIPConfig         NMSettingIPConfig;
+typedef struct _NMSettingIPTunnel         NMSettingIPTunnel;
+typedef struct _NMSettingInfiniband       NMSettingInfiniband;
 typedef struct _NMSettingMacsec           NMSettingMacsec;
 typedef struct _NMSettingMacvlan          NMSettingMacvlan;
 typedef struct _NMSettingMatch            NMSettingMatch;
@@ -59,6 +58,7 @@ typedef struct _NMSettingOvsPatch         NMSettingOvsPatch;
 typedef struct _NMSettingOvsPort          NMSettingOvsPort;
 typedef struct _NMSettingPpp              NMSettingPpp;
 typedef struct _NMSettingPppoe            NMSettingPppoe;
+typedef struct _NMSettingProxy            NMSettingProxy;
 typedef struct _NMSettingSerial           NMSettingSerial;
 typedef struct _NMSettingSriov            NMSettingSriov;
 typedef struct _NMSettingTCConfig         NMSettingTCConfig;
@@ -69,8 +69,10 @@ typedef struct _NMSettingUser             NMSettingUser;
 typedef struct _NMSettingVlan             NMSettingVlan;
 typedef struct _NMSettingVpn              NMSettingVpn;
 typedef struct _NMSettingVxlan            NMSettingVxlan;
+typedef struct _NMSettingWifiP2P          NMSettingWifiP2P;
 typedef struct _NMSettingWimax            NMSettingWimax;
 typedef struct _NMSettingWired            NMSettingWired;
+typedef struct _NMSettingWireGuard        NMSettingWireGuard;
 typedef struct _NMSettingWireless         NMSettingWireless;
 typedef struct _NMSettingWirelessSecurity NMSettingWirelessSecurity;
 typedef struct _NMSettingWpan             NMSettingWpan;
diff --git a/libnm-core/nm-crypto.c b/libnm-core/nm-crypto.c
index 1af2ea28..67f206c4 100644
--- a/libnm-core/nm-crypto.c
+++ b/libnm-core/nm-crypto.c
@@ -25,7 +25,6 @@
 
 #include "nm-crypto.h"
 
-#include 
 #include 
 #include 
 #include 
diff --git a/libnm-core/nm-dbus-interface.h b/libnm-core/nm-dbus-interface.h
index 4e12dc63..038d2c9e 100644
--- a/libnm-core/nm-dbus-interface.h
+++ b/libnm-core/nm-dbus-interface.h
@@ -38,48 +38,52 @@
  */
 #define NM_DBUS_SERVICE                        "org.freedesktop.NetworkManager"
 
-#define NM_DBUS_PATH                           "/org/freedesktop/NetworkManager"
 #define NM_DBUS_INTERFACE                      "org.freedesktop.NetworkManager"
+#define NM_DBUS_INTERFACE_ACCESS_POINT         NM_DBUS_INTERFACE ".AccessPoint"
+#define NM_DBUS_INTERFACE_ACTIVE_CONNECTION    NM_DBUS_INTERFACE ".Connection.Active"
+#define NM_DBUS_INTERFACE_CHECKPOINT           NM_DBUS_INTERFACE ".Checkpoint"
 #define NM_DBUS_INTERFACE_DEVICE               NM_DBUS_INTERFACE ".Device"
-#define NM_DBUS_INTERFACE_DEVICE_WIRED         NM_DBUS_INTERFACE_DEVICE ".Wired"
+#define NM_DBUS_INTERFACE_DEVICE_6LOWPAN       NM_DBUS_INTERFACE_DEVICE ".Lowpan"
 #define NM_DBUS_INTERFACE_DEVICE_ADSL          NM_DBUS_INTERFACE_DEVICE ".Adsl"
-#define NM_DBUS_INTERFACE_DEVICE_WIRELESS      NM_DBUS_INTERFACE_DEVICE ".Wireless"
 #define NM_DBUS_INTERFACE_DEVICE_BLUETOOTH     NM_DBUS_INTERFACE_DEVICE ".Bluetooth"
-#define NM_DBUS_INTERFACE_DEVICE_OLPC_MESH     NM_DBUS_INTERFACE_DEVICE ".OlpcMesh"
-#define NM_DBUS_INTERFACE_DEVICE_OVS_INTERFACE NM_DBUS_INTERFACE_DEVICE ".OvsInterface"
-#define NM_DBUS_INTERFACE_DEVICE_OVS_PORT      NM_DBUS_INTERFACE_DEVICE ".OvsPort"
-#define NM_DBUS_INTERFACE_DEVICE_OVS_BRIDGE    NM_DBUS_INTERFACE_DEVICE ".OvsBridge"
-#define NM_DBUS_PATH_ACCESS_POINT              NM_DBUS_PATH "/AccessPoint"
-#define NM_DBUS_INTERFACE_ACCESS_POINT         NM_DBUS_INTERFACE ".AccessPoint"
-#define NM_DBUS_INTERFACE_DEVICE_MODEM         NM_DBUS_INTERFACE_DEVICE ".Modem"
-#define NM_DBUS_INTERFACE_DEVICE_WIMAX         NM_DBUS_INTERFACE_DEVICE ".WiMax"
-#define NM_DBUS_INTERFACE_WIMAX_NSP            NM_DBUS_INTERFACE ".WiMax.Nsp"
-#define NM_DBUS_PATH_WIMAX_NSP                 NM_DBUS_PATH "/Nsp"
-#define NM_DBUS_INTERFACE_ACTIVE_CONNECTION    NM_DBUS_INTERFACE ".Connection.Active"
-#define NM_DBUS_INTERFACE_IP4_CONFIG           NM_DBUS_INTERFACE ".IP4Config"
-#define NM_DBUS_INTERFACE_DHCP4_CONFIG         NM_DBUS_INTERFACE ".DHCP4Config"
-#define NM_DBUS_INTERFACE_IP6_CONFIG           NM_DBUS_INTERFACE ".IP6Config"
-#define NM_DBUS_INTERFACE_DHCP6_CONFIG         NM_DBUS_INTERFACE ".DHCP6Config"
-#define NM_DBUS_INTERFACE_DEVICE_INFINIBAND    NM_DBUS_INTERFACE_DEVICE ".Infiniband"
 #define NM_DBUS_INTERFACE_DEVICE_BOND          NM_DBUS_INTERFACE_DEVICE ".Bond"
-#define NM_DBUS_INTERFACE_DEVICE_DUMMY         NM_DBUS_INTERFACE_DEVICE ".Dummy"
-#define NM_DBUS_INTERFACE_DEVICE_TEAM          NM_DBUS_INTERFACE_DEVICE ".Team"
-#define NM_DBUS_INTERFACE_DEVICE_VLAN          NM_DBUS_INTERFACE_DEVICE ".Vlan"
 #define NM_DBUS_INTERFACE_DEVICE_BRIDGE        NM_DBUS_INTERFACE_DEVICE ".Bridge"
+#define NM_DBUS_INTERFACE_DEVICE_DUMMY         NM_DBUS_INTERFACE_DEVICE ".Dummy"
 #define NM_DBUS_INTERFACE_DEVICE_GENERIC       NM_DBUS_INTERFACE_DEVICE ".Generic"
-#define NM_DBUS_INTERFACE_DEVICE_VETH          NM_DBUS_INTERFACE_DEVICE ".Veth"
-#define NM_DBUS_INTERFACE_DEVICE_TUN           NM_DBUS_INTERFACE_DEVICE ".Tun"
+#define NM_DBUS_INTERFACE_DEVICE_GRE           NM_DBUS_INTERFACE_DEVICE ".Gre"
+#define NM_DBUS_INTERFACE_DEVICE_INFINIBAND    NM_DBUS_INTERFACE_DEVICE ".Infiniband"
+#define NM_DBUS_INTERFACE_DEVICE_IP_TUNNEL     NM_DBUS_INTERFACE_DEVICE ".IPTunnel"
 #define NM_DBUS_INTERFACE_DEVICE_MACSEC        NM_DBUS_INTERFACE_DEVICE ".Macsec"
 #define NM_DBUS_INTERFACE_DEVICE_MACVLAN       NM_DBUS_INTERFACE_DEVICE ".Macvlan"
+#define NM_DBUS_INTERFACE_DEVICE_MODEM         NM_DBUS_INTERFACE_DEVICE ".Modem"
+#define NM_DBUS_INTERFACE_DEVICE_OLPC_MESH     NM_DBUS_INTERFACE_DEVICE ".OlpcMesh"
+#define NM_DBUS_INTERFACE_DEVICE_OVS_BRIDGE    NM_DBUS_INTERFACE_DEVICE ".OvsBridge"
+#define NM_DBUS_INTERFACE_DEVICE_OVS_INTERFACE NM_DBUS_INTERFACE_DEVICE ".OvsInterface"
+#define NM_DBUS_INTERFACE_DEVICE_OVS_PORT      NM_DBUS_INTERFACE_DEVICE ".OvsPort"
 #define NM_DBUS_INTERFACE_DEVICE_PPP           NM_DBUS_INTERFACE_DEVICE ".Ppp"
+#define NM_DBUS_INTERFACE_DEVICE_STATISTICS    NM_DBUS_INTERFACE_DEVICE ".Statistics"
+#define NM_DBUS_INTERFACE_DEVICE_TEAM          NM_DBUS_INTERFACE_DEVICE ".Team"
+#define NM_DBUS_INTERFACE_DEVICE_TUN           NM_DBUS_INTERFACE_DEVICE ".Tun"
+#define NM_DBUS_INTERFACE_DEVICE_VETH          NM_DBUS_INTERFACE_DEVICE ".Veth"
+#define NM_DBUS_INTERFACE_DEVICE_VLAN          NM_DBUS_INTERFACE_DEVICE ".Vlan"
 #define NM_DBUS_INTERFACE_DEVICE_VXLAN         NM_DBUS_INTERFACE_DEVICE ".Vxlan"
+#define NM_DBUS_INTERFACE_DEVICE_WIFI_P2P      NM_DBUS_INTERFACE_DEVICE ".WifiP2P"
+#define NM_DBUS_INTERFACE_DEVICE_WIMAX         NM_DBUS_INTERFACE_DEVICE ".WiMax"
+#define NM_DBUS_INTERFACE_DEVICE_WIRED         NM_DBUS_INTERFACE_DEVICE ".Wired"
 #define NM_DBUS_INTERFACE_DEVICE_WIREGUARD     NM_DBUS_INTERFACE_DEVICE ".WireGuard"
-#define NM_DBUS_INTERFACE_DEVICE_GRE           NM_DBUS_INTERFACE_DEVICE ".Gre"
-#define NM_DBUS_INTERFACE_DEVICE_IP_TUNNEL     NM_DBUS_INTERFACE_DEVICE ".IPTunnel"
+#define NM_DBUS_INTERFACE_DEVICE_WIRELESS      NM_DBUS_INTERFACE_DEVICE ".Wireless"
 #define NM_DBUS_INTERFACE_DEVICE_WPAN          NM_DBUS_INTERFACE_DEVICE ".Wpan"
-#define NM_DBUS_INTERFACE_DEVICE_6LOWPAN       NM_DBUS_INTERFACE_DEVICE ".Lowpan"
-#define NM_DBUS_INTERFACE_DEVICE_STATISTICS    NM_DBUS_INTERFACE_DEVICE ".Statistics"
-#define NM_DBUS_INTERFACE_CHECKPOINT           NM_DBUS_INTERFACE ".Checkpoint"
+#define NM_DBUS_INTERFACE_DHCP4_CONFIG         NM_DBUS_INTERFACE ".DHCP4Config"
+#define NM_DBUS_INTERFACE_DHCP6_CONFIG         NM_DBUS_INTERFACE ".DHCP6Config"
+#define NM_DBUS_INTERFACE_IP4_CONFIG           NM_DBUS_INTERFACE ".IP4Config"
+#define NM_DBUS_INTERFACE_IP6_CONFIG           NM_DBUS_INTERFACE ".IP6Config"
+#define NM_DBUS_INTERFACE_WIFI_P2P_PEER        NM_DBUS_INTERFACE ".WifiP2PPeer"
+#define NM_DBUS_INTERFACE_WIMAX_NSP            NM_DBUS_INTERFACE ".WiMax.Nsp"
+
+#define NM_DBUS_PATH                           "/org/freedesktop/NetworkManager"
+#define NM_DBUS_PATH_ACCESS_POINT              NM_DBUS_PATH "/AccessPoint"
+#define NM_DBUS_PATH_WIFI_P2P_PEER             NM_DBUS_PATH "/WifiP2PPeer"
+#define NM_DBUS_PATH_WIMAX_NSP                 NM_DBUS_PATH "/Nsp"
 
 #define NM_DBUS_INTERFACE_SETTINGS        "org.freedesktop.NetworkManager.Settings"
 #define NM_DBUS_PATH_SETTINGS             "/org/freedesktop/NetworkManager/Settings"
@@ -168,7 +172,7 @@ typedef enum {
  * @NM_CONNECTIVITY_PORTAL: The Internet connection is hijacked by a captive
  *   portal gateway. The graphical shell may open a sandboxed web browser window
  *   (because the captive portals typically attempt a man-in-the-middle attacks
- *   agains the https connections) for the purpose of authenticating to a gateway
+ *   against the https connections) for the purpose of authenticating to a gateway
  *   and retrigger the connectivity check with CheckConnectivity() when the
  *   browser window is dismissed.
  * @NM_CONNECTIVITY_LIMITED: The host is connected to a network, does not appear
@@ -190,7 +194,7 @@ typedef enum {
  * @NM_DEVICE_TYPE_UNKNOWN: unknown device
  * @NM_DEVICE_TYPE_GENERIC: generic support for unrecognized device types
  * @NM_DEVICE_TYPE_ETHERNET: a wired ethernet device
- * @NM_DEVICE_TYPE_WIFI: an 802.11 WiFi device
+ * @NM_DEVICE_TYPE_WIFI: an 802.11 Wi-Fi device
  * @NM_DEVICE_TYPE_UNUSED1: not used
  * @NM_DEVICE_TYPE_UNUSED2: not used
  * @NM_DEVICE_TYPE_BT: a Bluetooth device supporting PAN or DUN access protocols
@@ -218,6 +222,7 @@ typedef enum {
  * @NM_DEVICE_TYPE_WPAN: a IEEE 802.15.4 (WPAN) MAC Layer Device
  * @NM_DEVICE_TYPE_6LOWPAN: 6LoWPAN interface
  * @NM_DEVICE_TYPE_WIREGUARD: a WireGuard interface
+ * @NM_DEVICE_TYPE_WIFI_P2P: an 802.11 Wi-Fi P2P device (Since: 1.16)
  *
  * #NMDeviceType values indicate the type of hardware represented by a
  * device object.
@@ -253,6 +258,7 @@ typedef enum {
 	NM_DEVICE_TYPE_WPAN          = 27,
 	NM_DEVICE_TYPE_6LOWPAN       = 28,
 	NM_DEVICE_TYPE_WIREGUARD     = 29,
+	NM_DEVICE_TYPE_WIFI_P2P      = 30,
 } NMDeviceType;
 
 /**
@@ -344,6 +350,8 @@ typedef enum { /*< underscore_name=nm_802_11_ap_flags, flags >*/
  * supported
  * @NM_802_11_AP_SEC_KEY_MGMT_802_1X: 802.1x authentication and key management
  * is supported
+ * @NM_802_11_AP_SEC_KEY_MGMT_SAE: WPA/RSN Simultaneous Authentication of Equals is
+ * supported
  *
  * 802.11 access point security and authentication flags.  These flags describe
  * the current security requirements of an access point as determined from the
@@ -361,6 +369,7 @@ typedef enum { /*< underscore_name=nm_802_11_ap_security_flags, flags >*/
 	NM_802_11_AP_SEC_GROUP_CCMP      = 0x00000080,
 	NM_802_11_AP_SEC_KEY_MGMT_PSK    = 0x00000100,
 	NM_802_11_AP_SEC_KEY_MGMT_802_1X = 0x00000200,
+	NM_802_11_AP_SEC_KEY_MGMT_SAE    = 0x00000400,
 } NM80211ApSecurityFlags;
 
 /**
@@ -456,7 +465,7 @@ typedef enum {
  *   setting physical link properties, and anything else required to connect
  *   to the requested network.
  * @NM_DEVICE_STATE_CONFIG: the device is connecting to the requested network.
- *   This may include operations like associating with the WiFi AP, dialing
+ *   This may include operations like associating with the Wi-Fi AP, dialing
  *   the modem, connecting to the remote Bluetooth device, etc.
  * @NM_DEVICE_STATE_NEED_AUTH: the device requires more information to continue
  *   connecting to the requested network.  This includes secrets like WiFi
@@ -549,7 +558,7 @@ typedef enum {
  * @NM_DEVICE_STATE_REASON_DEPENDENCY_FAILED: A dependency of the connection failed
  * @NM_DEVICE_STATE_REASON_BR2684_FAILED: Problem with the RFC 2684 Ethernet over ADSL bridge
  * @NM_DEVICE_STATE_REASON_MODEM_MANAGER_UNAVAILABLE: ModemManager not running
- * @NM_DEVICE_STATE_REASON_SSID_NOT_FOUND: The WiFi network could not be found
+ * @NM_DEVICE_STATE_REASON_SSID_NOT_FOUND: The Wi-Fi network could not be found
  * @NM_DEVICE_STATE_REASON_SECONDARY_CONNECTION_FAILED: A secondary connection of the base connection failed
  * @NM_DEVICE_STATE_REASON_DCB_FCOE_FAILED: DCB or FCoE setup failed
  * @NM_DEVICE_STATE_REASON_TEAMD_CONTROL_FAILED: teamd control failed
@@ -563,6 +572,7 @@ typedef enum {
  * @NM_DEVICE_STATE_REASON_IP_ADDRESS_DUPLICATE: a duplicate IP address was detected
  * @NM_DEVICE_STATE_REASON_IP_METHOD_UNSUPPORTED: The selected IP method is not supported
  * @NM_DEVICE_STATE_REASON_SRIOV_CONFIGURATION_FAILED: configuration of SR-IOV parameters failed
+ * @NM_DEVICE_STATE_REASON_PEER_NOT_FOUND: The Wi-Fi P2P peer could not be found
  *
  * Device state change reason codes
  */
@@ -634,6 +644,7 @@ typedef enum {
 	NM_DEVICE_STATE_REASON_IP_ADDRESS_DUPLICATE           = 64,
 	NM_DEVICE_STATE_REASON_IP_METHOD_UNSUPPORTED          = 65,
 	NM_DEVICE_STATE_REASON_SRIOV_CONFIGURATION_FAILED     = 66,
+	NM_DEVICE_STATE_REASON_PEER_NOT_FOUND                 = 67,
 } NMDeviceStateReason;
 
 /**
@@ -960,20 +971,25 @@ typedef enum { /*< flags >*/
  * @NM_ACTIVATION_STATE_FLAG_IP6_READY: IPv6 setting is completed.
  * @NM_ACTIVATION_STATE_FLAG_MASTER_HAS_SLAVES: The master has any slave devices attached.
  *   This only makes sense if the device is a master.
+ * @NM_ACTIVATION_STATE_FLAG_LIFETIME_BOUND_TO_PROFILE_VISIBILITY: the lifetime
+ *   of the activation is bound to the visilibity of the connection profile,
+ *   which in turn depends on "connection.permissions" and whether a session
+ *   for the user exists. Since: 1.16
  *
  * Flags describing the current activation state.
  *
  * Since: 1.10
  **/
 typedef enum { /*< flags >*/
-	NM_ACTIVATION_STATE_FLAG_NONE                       = 0,
+	NM_ACTIVATION_STATE_FLAG_NONE                                 = 0,
 
-	NM_ACTIVATION_STATE_FLAG_IS_MASTER                  = (1LL <<  0),
-	NM_ACTIVATION_STATE_FLAG_IS_SLAVE                   = (1LL <<  1),
-	NM_ACTIVATION_STATE_FLAG_LAYER2_READY               = (1LL <<  2),
-	NM_ACTIVATION_STATE_FLAG_IP4_READY                  = (1LL <<  3),
-	NM_ACTIVATION_STATE_FLAG_IP6_READY                  = (1LL <<  4),
-	NM_ACTIVATION_STATE_FLAG_MASTER_HAS_SLAVES          = (1LL <<  5),
+	NM_ACTIVATION_STATE_FLAG_IS_MASTER                            = 0x1,
+	NM_ACTIVATION_STATE_FLAG_IS_SLAVE                             = 0x2,
+	NM_ACTIVATION_STATE_FLAG_LAYER2_READY                         = 0x4,
+	NM_ACTIVATION_STATE_FLAG_IP4_READY                            = 0x8,
+	NM_ACTIVATION_STATE_FLAG_IP6_READY                            = 0x10,
+	NM_ACTIVATION_STATE_FLAG_MASTER_HAS_SLAVES                    = 0x20,
+	NM_ACTIVATION_STATE_FLAG_LIFETIME_BOUND_TO_PROFILE_VISIBILITY = 0x40,
 } NMActivationStateFlags;
 
 /**
@@ -1004,7 +1020,7 @@ typedef enum { /*< flags >*/
  *   again (because it's about to be deleted), but a manual activation will
  *   clear the volatile flag.
  * @NM_SETTINGS_UPDATE2_FLAG_BLOCK_AUTOCONNECT: usually, when the connection
- *   has autoconnect enabled and is modified, it becomes elegible to autoconnect
+ *   has autoconnect enabled and is modified, it becomes eligible to autoconnect
  *   right away. Setting this flag, disables autoconnect until the connection
  *   is manually activated.
  *
@@ -1012,12 +1028,12 @@ typedef enum { /*< flags >*/
  */
 typedef enum { /*< flags >*/
 	NM_SETTINGS_UPDATE2_FLAG_NONE                       = 0,
-	NM_SETTINGS_UPDATE2_FLAG_TO_DISK                    = (1LL <<  0),
-	NM_SETTINGS_UPDATE2_FLAG_IN_MEMORY                  = (1LL <<  1),
-	NM_SETTINGS_UPDATE2_FLAG_IN_MEMORY_DETACHED         = (1LL <<  2),
-	NM_SETTINGS_UPDATE2_FLAG_IN_MEMORY_ONLY             = (1LL <<  3),
-	NM_SETTINGS_UPDATE2_FLAG_VOLATILE                   = (1LL <<  4),
-	NM_SETTINGS_UPDATE2_FLAG_BLOCK_AUTOCONNECT          = (1LL <<  5),
+	NM_SETTINGS_UPDATE2_FLAG_TO_DISK                    = 0x1,
+	NM_SETTINGS_UPDATE2_FLAG_IN_MEMORY                  = 0x2,
+	NM_SETTINGS_UPDATE2_FLAG_IN_MEMORY_DETACHED         = 0x4,
+	NM_SETTINGS_UPDATE2_FLAG_IN_MEMORY_ONLY             = 0x8,
+	NM_SETTINGS_UPDATE2_FLAG_VOLATILE                   = 0x10,
+	NM_SETTINGS_UPDATE2_FLAG_BLOCK_AUTOCONNECT          = 0x20,
 } NMSettingsUpdate2Flags;
 
 /**
diff --git a/libnm-core/nm-dbus-types.xml b/libnm-core/nm-dbus-types.xml
index e3e9fca9..a65e1d08 100644
--- a/libnm-core/nm-dbus-types.xml
+++ b/libnm-core/nm-dbus-types.xml
@@ -125,7 +125,7 @@
             
               NM_CONNECTIVITY_PORTAL
               = 2
-              The Internet connection is hijacked by a captive portal gateway. The graphical shell may open a sandboxed web browser window (because the captive portals typically attempt a man-in-the-middle attacks agains the https connections) for the purpose of authenticating to a gateway and retrigger the connectivity check with CheckConnectivity() when the browser window is dismissed.
+              The Internet connection is hijacked by a captive portal gateway. The graphical shell may open a sandboxed web browser window (because the captive portals typically attempt a man-in-the-middle attacks against the https connections) for the purpose of authenticating to a gateway and retrigger the connectivity check with CheckConnectivity() when the browser window is dismissed.
             
             
               NM_CONNECTIVITY_LIMITED
@@ -175,7 +175,7 @@
             
               NM_DEVICE_TYPE_WIFI
               = 2
-              an 802.11 WiFi device
+              an 802.11 Wi-Fi device
             
             
               NM_DEVICE_TYPE_UNUSED1
@@ -307,6 +307,11 @@
               = 29
               a WireGuard interface
             
+            
+              NM_DEVICE_TYPE_WIFI_P2P
+              = 30
+              an 802.11 Wi-Fi P2P device (Since: 1.16)
+            
           
         
       
@@ -552,6 +557,11 @@
               = 0x00000200
               802.1x authentication and key management is supported
             
+            
+              NM_802_11_AP_SEC_KEY_MGMT_SAE
+              = 0x00000400
+              WPA/RSN Simultaneous Authentication of Equals is supported
+            
           
         
       
@@ -760,7 +770,7 @@
             
               NM_DEVICE_STATE_CONFIG
               = 50
-              the device is connecting to the requested network. This may include operations like associating with the WiFi AP, dialing the modem, connecting to the remote Bluetooth device, etc.
+              the device is connecting to the requested network. This may include operations like associating with the Wi-Fi AP, dialing the modem, connecting to the remote Bluetooth device, etc.
             
             
               NM_DEVICE_STATE_NEED_AUTH
@@ -1085,7 +1095,7 @@
             
               NM_DEVICE_STATE_REASON_SSID_NOT_FOUND
               = 53
-              The WiFi network could not be found
+              The Wi-Fi network could not be found
             
             
               NM_DEVICE_STATE_REASON_SECONDARY_CONNECTION_FAILED
@@ -1152,6 +1162,11 @@
               = 66
               configuration of SR-IOV parameters failed
             
+            
+              NM_DEVICE_STATE_REASON_PEER_NOT_FOUND
+              = 67
+              The Wi-Fi P2P peer could not be found
+            
           
         
       
@@ -1694,34 +1709,39 @@
             
             
               NM_ACTIVATION_STATE_FLAG_IS_MASTER
-              = (1LL
+              = 0x1
               the device is a master.
             
             
               NM_ACTIVATION_STATE_FLAG_IS_SLAVE
-              = (1LL
+              = 0x2
               the device is a slave.
             
             
               NM_ACTIVATION_STATE_FLAG_LAYER2_READY
-              = (1LL
+              = 0x4
               layer2 is activated and ready.
             
             
               NM_ACTIVATION_STATE_FLAG_IP4_READY
-              = (1LL
+              = 0x8
               IPv4 setting is completed.
             
             
               NM_ACTIVATION_STATE_FLAG_IP6_READY
-              = (1LL
+              = 0x10
               IPv6 setting is completed.
             
             
               NM_ACTIVATION_STATE_FLAG_MASTER_HAS_SLAVES
-              = (1LL
+              = 0x20
               The master has any slave devices attached. This only makes sense if the device is a master.
             
+            
+              NM_ACTIVATION_STATE_FLAG_LIFETIME_BOUND_TO_PROFILE_VISIBILITY
+              = 0x40
+              the lifetime of the activation is bound to the visilibity of the connection profile, which in turn depends on "connection.permissions" and whether a session for the user exists. Since: 1.16
+            
           
         
       
@@ -1749,33 +1769,33 @@
             
             
               NM_SETTINGS_UPDATE2_FLAG_TO_DISK
-              = (1LL
+              = 0x1
               to persist the connection to disk.
             
             
               NM_SETTINGS_UPDATE2_FLAG_IN_MEMORY
-              = (1LL
+              = 0x2
               to make the connection in-memory only. If the connection was previously persistent, the corresponding file on disk is not deleted but merely the connection is decoupled from the file on disk. If you later delete an in-memory connection, the connection on disk will be deleted as well.
             
             
               NM_SETTINGS_UPDATE2_FLAG_IN_MEMORY_DETACHED
-              = (1LL
+              = 0x4
               this is like @NM_SETTINGS_UPDATE2_FLAG_IN_MEMORY, but if the connection has a corresponding file on disk, the association between the connection and the file is forgotten but the file is not modified. The difference to %NM_SETTINGS_UPDATE2_FLAG_IN_MEMORY is if you later save the connection again to disk, a new file name will be chosen without overwriting the remaining file on disk. Also, if you delete the connection later, the file on disk will not be deleted.
             
             
               NM_SETTINGS_UPDATE2_FLAG_IN_MEMORY_ONLY
-              = (1LL
+              = 0x8
               this is like @NM_SETTINGS_UPDATE2_FLAG_IN_MEMORY, but if the connection has a corresponding file on disk, the file on disk will be deleted.
             
             
               NM_SETTINGS_UPDATE2_FLAG_VOLATILE
-              = (1LL
+              = 0x10
               This can be specified with either %NM_SETTINGS_UPDATE2_FLAG_IN_MEMORY_DETACHED or %NM_SETTINGS_UPDATE2_FLAG_IN_MEMORY_ONLY. After making the connection in-memory only, the connection is marked as volatile. That means, if the connection is currently not active it will be deleted right away. Otherwise, it is marked to for deletion once the connection deactivates. A volatile connection cannot autoactivate again (because it's about to be deleted), but a manual activation will clear the volatile flag.
             
             
               NM_SETTINGS_UPDATE2_FLAG_BLOCK_AUTOCONNECT
-              = (1LL
-              usually, when the connection has autoconnect enabled and is modified, it becomes elegible to autoconnect right away. Setting this flag, disables autoconnect until the connection is manually activated.
+              = 0x20
+              usually, when the connection has autoconnect enabled and is modified, it becomes eligible to autoconnect right away. Setting this flag, disables autoconnect until the connection is manually activated.
             
           
         
diff --git a/libnm-core/nm-dbus-utils.c b/libnm-core/nm-dbus-utils.c
index 25af7c99..8c455971 100644
--- a/libnm-core/nm-dbus-utils.c
+++ b/libnm-core/nm-dbus-utils.c
@@ -20,8 +20,6 @@
 
 #include "nm-default.h"
 
-#include 
-
 #include "nm-core-internal.h"
 
 typedef struct {
@@ -174,23 +172,35 @@ _nm_dbus_signal_connect_data (GDBusProxy *proxy,
  * Returns: the signal handler ID, as with _nm_signal_connect_data().
  */
 
-static void
-typecheck_response (GVariant **response,
-                    const GVariantType *reply_type,
-                    GError **error)
+/**
+ * _nm_dbus_typecheck_response:
+ * @response: the #GVariant response to check.
+ * @reply_type: the expected reply type. It may be %NULL to perform no
+ *   checking.
+ * @error: (allow-none): the error in case the @reply_type does not match.
+ *
+ * Returns: %TRUE, if @response is of the expected @reply_type.
+ */
+gboolean
+_nm_dbus_typecheck_response (GVariant *response,
+                             const GVariantType *reply_type,
+                             GError **error)
 {
-	if (   *response
-	    && reply_type
-	    && !g_variant_is_of_type (*response, reply_type)) {
-		/* This is the same error code that g_dbus_connection_call() returns if
-		 * @reply_type doesn't match.
-		 */
-		g_set_error (error, G_IO_ERROR, G_IO_ERROR_INVALID_ARGUMENT,
-		             _("Method returned type '%s', but expected '%s'"),
-		             g_variant_get_type_string (*response),
-		             g_variant_type_peek_string (reply_type));
-		g_clear_pointer (response, g_variant_unref);
-	}
+	g_return_val_if_fail (response, FALSE);
+
+	if (!reply_type)
+		return TRUE;
+	if (g_variant_is_of_type (response, reply_type))
+		return TRUE;
+
+	/* This is the same error code that g_dbus_connection_call() returns if
+	 * @reply_type doesn't match.
+	 */
+	g_set_error (error, G_IO_ERROR, G_IO_ERROR_INVALID_ARGUMENT,
+	             _("Method returned type '%s', but expected '%s'"),
+	             g_variant_get_type_string (response),
+	             g_variant_type_peek_string (reply_type));
+	return FALSE;
 }
 
 /**
@@ -215,11 +225,15 @@ _nm_dbus_proxy_call_finish (GDBusProxy          *proxy,
                             const GVariantType  *reply_type,
                             GError             **error)
 {
-	GVariant *ret;
+	GVariant *variant;
 
-	ret = g_dbus_proxy_call_finish (proxy, res, error);
-	typecheck_response (&ret, reply_type, error);
-	return ret;
+	variant = g_dbus_proxy_call_finish (proxy,
+	                                    res,
+	                                    error);
+	if (   variant
+	    && !_nm_dbus_typecheck_response (variant, reply_type, error))
+		nm_clear_pointer (&variant, g_variant_unref);
+	return variant;
 }
 
 /**
@@ -253,13 +267,34 @@ _nm_dbus_proxy_call_sync (GDBusProxy          *proxy,
                           GCancellable        *cancellable,
                           GError             **error)
 {
-	GVariant *ret;
+	GVariant *variant;
+
+	variant = g_dbus_proxy_call_sync (proxy,
+	                                  method_name,
+	                                  parameters,
+	                                  flags,
+	                                  timeout_msec,
+	                                  cancellable,
+	                                  error);
+	if (   variant
+	    && !_nm_dbus_typecheck_response (variant, reply_type, error))
+		nm_clear_pointer (&variant, g_variant_unref);
+	return variant;
+}
+
+GVariant *
+_nm_dbus_connection_call_finish (GDBusConnection *dbus_connection,
+                                 GAsyncResult *result,
+                                 const GVariantType *reply_type,
+                                 GError **error)
+{
+	GVariant *variant;
 
-	ret = g_dbus_proxy_call_sync (proxy, method_name, parameters,
-	                              flags, timeout_msec,
-	                              cancellable, error);
-	typecheck_response (&ret, reply_type, error);
-	return ret;
+	variant = g_dbus_connection_call_finish (dbus_connection, result, error);
+	if (   variant
+	    && !_nm_dbus_typecheck_response (variant, reply_type, error))
+		nm_clear_pointer (&variant, g_variant_unref);
+	return variant;
 }
 
 /**
diff --git a/libnm-core/nm-errors.c b/libnm-core/nm-errors.c
index 351bc1d0..beef95c7 100644
--- a/libnm-core/nm-errors.c
+++ b/libnm-core/nm-errors.c
@@ -20,9 +20,8 @@
 
 #include "nm-default.h"
 
-#include 
-
 #include "nm-errors.h"
+
 #include "nm-vpn-dbus-interface.h"
 #include "nm-core-internal.h"
 
diff --git a/libnm-core/nm-errors.h b/libnm-core/nm-errors.h
index bdd6c223..ef73790e 100644
--- a/libnm-core/nm-errors.h
+++ b/libnm-core/nm-errors.h
@@ -145,6 +145,7 @@ GQuark nm_crypto_error_quark (void);
  * @NM_DEVICE_ERROR_VERSION_ID_MISMATCH: the version id did not match.
  * @NM_DEVICE_ERROR_MISSING_DEPENDENCIES: the requested operation could not
  *   be completed due to missing dependencies.
+ * @NM_DEVICE_ERROR_INVALID_ARGUMENT: invalid argument. Since: 1.16
  *
  * Device-related errors.
  *
@@ -163,6 +164,7 @@ typedef enum {
 	NM_DEVICE_ERROR_SPECIFIC_OBJECT_NOT_FOUND, /*< nick=SpecificObjectNotFound >*/
 	NM_DEVICE_ERROR_VERSION_ID_MISMATCH,       /*< nick=VersionIdMismatch >*/
 	NM_DEVICE_ERROR_MISSING_DEPENDENCIES,      /*< nick=MissingDependencies >*/
+	NM_DEVICE_ERROR_INVALID_ARGUMENT,          /*< nick=InvalidArgument >*/
 } NMDeviceError;
 
 #define NM_DEVICE_ERROR nm_device_error_quark ()
diff --git a/libnm-core/nm-keyfile-internal.h b/libnm-core/nm-keyfile-internal.h
index 94228d95..5487f59d 100644
--- a/libnm-core/nm-keyfile-internal.h
+++ b/libnm-core/nm-keyfile-internal.h
@@ -168,4 +168,19 @@ gboolean _nm_keyfile_a_contains_all_in_b (GKeyFile *kf_a, GKeyFile *kf_b);
 gboolean _nm_keyfile_equals (GKeyFile *kf_a, GKeyFile *kf_b, gboolean consider_order);
 gboolean _nm_keyfile_has_values (GKeyFile *keyfile);
 
+/*****************************************************************************/
+
+#define NM_KEYFILE_PATH_NAME_ETC_DEFAULT         NMCONFDIR "/system-connections"
+#define NM_KEYFILE_PATH_NAME_RUN                 NMRUNDIR "/system-connections"
+
+#define NM_KEYFILE_PATH_SUFFIX_NMCONNECTION      ".nmconnection"
+
+#define NM_KEYFILE_PATH_PREFIX_NMLOADED          ".loaded-"
+
+#define NM_KEYFILE_PATH_NMLOADED_NULL            "/dev/null"
+
+gboolean nm_keyfile_utils_ignore_filename (const char *filename, gboolean require_extension);
+
+char *nm_keyfile_utils_create_filename (const char *filename, gboolean with_extension);
+
 #endif /* __NM_KEYFILE_INTERNAL_H__ */
diff --git a/libnm-core/nm-keyfile-utils.c b/libnm-core/nm-keyfile-utils.c
index 21f8b07d..e243150d 100644
--- a/libnm-core/nm-keyfile-utils.c
+++ b/libnm-core/nm-keyfile-utils.c
@@ -20,10 +20,10 @@
 
 #include "nm-default.h"
 
+#include "nm-keyfile-utils.h"
+
 #include 
-#include 
 
-#include "nm-keyfile-utils.h"
 #include "nm-keyfile-internal.h"
 #include "nm-setting-wired.h"
 #include "nm-setting-wireless.h"
@@ -48,7 +48,7 @@ nm_keyfile_plugin_get_alias_for_setting_name (const char *setting_name)
 	g_return_val_if_fail (setting_name != NULL, NULL);
 
 	for (i = 0; i < G_N_ELEMENTS (alias_list); i++) {
-		if (strcmp (setting_name, alias_list[i].setting) == 0)
+		if (nm_streq (setting_name, alias_list[i].setting))
 			return alias_list[i].alias;
 	}
 	return NULL;
@@ -62,7 +62,7 @@ nm_keyfile_plugin_get_setting_name_for_alias (const char *alias)
 	g_return_val_if_fail (alias != NULL, NULL);
 
 	for (i = 0; i < G_N_ELEMENTS (alias_list); i++) {
-		if (strcmp (alias, alias_list[i].alias) == 0)
+		if (nm_streq (alias, alias_list[i].alias))
 			return alias_list[i].setting;
 	}
 	return NULL;
@@ -82,17 +82,22 @@ nm_keyfile_plugin_kf_get_##stype##_list (GKeyFile *kf, \
 	get_ctype list; \
 	const char *alias; \
 	GError *local = NULL; \
+	gsize l; \
  \
-	list = g_key_file_get_##stype##_list (kf, group, key, out_length, &local); \
+	list = g_key_file_get_##stype##_list (kf, group, key, &l, &local); \
 	if (g_error_matches (local, G_KEY_FILE_ERROR, G_KEY_FILE_ERROR_GROUP_NOT_FOUND)) { \
 		alias = nm_keyfile_plugin_get_alias_for_setting_name (group); \
 		if (alias) { \
 			g_clear_error (&local); \
-			list = g_key_file_get_##stype##_list (kf, alias, key, out_length, &local); \
+			list = g_key_file_get_##stype##_list (kf, alias, key, &l, &local); \
 		} \
 	} \
+	nm_assert ((!local) != (!list)); \
 	if (local) \
 		g_propagate_error (error, local); \
+	if (!list) \
+		l = 0; \
+	NM_SET_OUT (out_length, l); \
 	return list; \
 } \
  \
@@ -174,11 +179,41 @@ nm_keyfile_plugin_kf_set_##stype (GKeyFile *kf, \
 }
 
 DEFINE_KF_WRAPPER(string, char*, const char*);
-DEFINE_KF_WRAPPER(integer, int, int);
-DEFINE_KF_WRAPPER(uint64, guint64, guint64);
 DEFINE_KF_WRAPPER(boolean, gboolean, gboolean);
 DEFINE_KF_WRAPPER(value, char*, const char*);
 
+gint64
+nm_keyfile_plugin_kf_get_int64 (GKeyFile *kf,
+                                const char *group,
+                                const char *key,
+                                guint base,
+                                gint64 min,
+                                gint64 max,
+                                gint64 fallback,
+                                GError **error)
+{
+	gs_free char *s = NULL;
+	int errsv;
+	gint64 v;
+
+	s = nm_keyfile_plugin_kf_get_value (kf, group, key, error);
+	if (!s) {
+		errno = ENODATA;
+		return fallback;
+	}
+
+	v = _nm_utils_ascii_str_to_int64 (s, base, min, max, fallback);
+	errsv = errno;
+	if (   errsv != 0
+	    && error) {
+		g_set_error (error, G_KEY_FILE_ERROR, G_KEY_FILE_ERROR_INVALID_VALUE,
+		             _("value is not an integer in range [%lld, %lld]"),
+		             (long long) min, (long long) max);
+		errno = errsv;
+	}
+	return v;
+}
+
 char **
 nm_keyfile_plugin_kf_get_keys (GKeyFile *kf,
                                const char *group,
@@ -188,15 +223,21 @@ nm_keyfile_plugin_kf_get_keys (GKeyFile *kf,
 	char **keys;
 	const char *alias;
 	GError *local = NULL;
+	gsize l;
 
-	keys = g_key_file_get_keys (kf, group, out_length, &local);
+	keys = g_key_file_get_keys (kf, group, &l, &local);
 	if (g_error_matches (local, G_KEY_FILE_ERROR, G_KEY_FILE_ERROR_GROUP_NOT_FOUND)) {
 		alias = nm_keyfile_plugin_get_alias_for_setting_name (group);
 		if (alias) {
 			g_clear_error (&local);
-			keys = g_key_file_get_keys (kf, alias, out_length, error ? &local : NULL);
+			keys = g_key_file_get_keys (kf, alias, &l, error ? &local : NULL);
 		}
 	}
+	nm_assert ((!local) != (!keys));
+	if (!keys)
+		l = 0;
+	nm_assert (l == NM_PTRARRAY_LEN (keys));
+	NM_SET_OUT (out_length, l);
 	if (local)
 		g_propagate_error (error, local);
 	return keys;
diff --git a/libnm-core/nm-keyfile-utils.h b/libnm-core/nm-keyfile-utils.h
index 46a6d564..9403dfa3 100644
--- a/libnm-core/nm-keyfile-utils.h
+++ b/libnm-core/nm-keyfile-utils.h
@@ -25,7 +25,8 @@
 #error Cannot use this header.
 #endif
 
-#define NM_KEYFILE_GROUP_VPN_SECRETS "vpn-secrets"
+#define NM_KEYFILE_GROUP_VPN_SECRETS          "vpn-secrets"
+#define NM_KEYFILE_GROUPPREFIX_WIREGUARD_PEER "wireguard-peer."
 
 const char *nm_keyfile_plugin_get_alias_for_setting_name (const char *setting_name);
 
@@ -67,12 +68,19 @@ void nm_keyfile_plugin_kf_set_##stype (GKeyFile *kf, \
                                        const char *key, \
                                        set_ctype value);
 DEFINE_KF_WRAPPER_PROTO(string, char*, const char*)
-DEFINE_KF_WRAPPER_PROTO(integer, int, int)
-DEFINE_KF_WRAPPER_PROTO(uint64, guint64, guint64)
 DEFINE_KF_WRAPPER_PROTO(boolean, gboolean, gboolean)
 DEFINE_KF_WRAPPER_PROTO(value, char*, const char*)
 
 /* Misc */
+gint64 nm_keyfile_plugin_kf_get_int64 (GKeyFile *kf,
+                                       const char *group,
+                                       const char *key,
+                                       guint base,
+                                       gint64 min,
+                                       gint64 max,
+                                       gint64 fallback,
+                                       GError **error);
+
 char ** nm_keyfile_plugin_kf_get_keys    (GKeyFile *kf,
                                            const char *group,
                                            gsize *out_length,
@@ -90,4 +98,3 @@ const char *nm_keyfile_key_decode (const char *key,
                                    char **out_to_free);
 
 #endif  /* __NM_KEYFILE_UTILS_H__ */
-
diff --git a/libnm-core/nm-keyfile.c b/libnm-core/nm-keyfile.c
index 5aa8a4ac..05c6bf97 100644
--- a/libnm-core/nm-keyfile.c
+++ b/libnm-core/nm-keyfile.c
@@ -23,17 +23,16 @@
 
 #include "nm-keyfile-internal.h"
 
-#include 
 #include 
 #include 
 #include 
 #include 
 #include 
 #include 
-#include 
 #include 
 
 #include "nm-utils/nm-secret-utils.h"
+#include "systemd/nm-sd-utils-shared.h"
 #include "nm-common-macros.h"
 #include "nm-core-internal.h"
 #include "nm-keyfile-utils.h"
@@ -96,6 +95,15 @@ _handle_warn (KeyfileReaderInfo *info,
 		_info->error == NULL; \
 	})
 
+/*****************************************************************************/
+
+static gboolean
+_secret_flags_persist_secret (NMSettingSecretFlags flags)
+{
+	return flags == NM_SETTING_SECRET_FLAG_NONE;
+}
+
+/*****************************************************************************/
 /* Some setting properties also contain setting names, such as
  * NMSettingConnection's 'type' property (which specifies the base type of the
  * connection, e.g. ethernet or wifi) or 'slave-type' (specifies type of slave
@@ -106,17 +114,18 @@ static void
 setting_alias_parser (KeyfileReaderInfo *info, NMSetting *setting, const char *key)
 {
 	const char *setting_name = nm_setting_get_name (setting);
-	char *s;
 	const char *key_setting_name;
+	gs_free char *s = NULL;
 
 	s = nm_keyfile_plugin_kf_get_string (info->keyfile, setting_name, key, NULL);
-	if (s) {
-		key_setting_name = nm_keyfile_plugin_get_setting_name_for_alias (s);
-		g_object_set (G_OBJECT (setting),
-		              key, key_setting_name ?: s,
-		              NULL);
-		g_free (s);
-	}
+	if (!s)
+		return;
+
+	key_setting_name = nm_keyfile_plugin_get_setting_name_for_alias (s);
+	g_object_set (G_OBJECT (setting),
+	              key,
+	              key_setting_name ?: s,
+	              NULL);
 }
 
 static void
@@ -129,7 +138,7 @@ sriov_vfs_parser (KeyfileReaderInfo *info, NMSetting *setting, const char *key)
 	int i;
 
 	keys = nm_keyfile_plugin_kf_get_keys (info->keyfile, setting_name, &n_keys, NULL);
-	if (!keys || n_keys == 0)
+	if (n_keys == 0)
 		return;
 
 	vfs = g_ptr_array_new_with_free_func ((GDestroyNotify) nm_sriov_vf_unref);
@@ -372,7 +381,7 @@ read_field (char **current, const char **out_err_str, const char *characters, co
  * address/plen,gateway,metric (NETWORK via GATEWAY dev DEVICE metric METRIC)
  *
  * For backward, forward and sideward compatibility, slash (/),
- * semicolon (;) and comma (,) are interchangable. The choice of
+ * semicolon (;) and comma (,) are interchangeable. The choice of
  * separator in the above examples is therefore not significant.
  *
  * Leaving out the prefix length is discouraged and DEPRECATED. The
@@ -622,17 +631,16 @@ ip_address_or_route_parser (KeyfileReaderInfo *info, NMSetting *setting, const c
 	gs_free char *gateway = NULL;
 	gs_unref_ptrarray GPtrArray *list = NULL;
 	gs_strfreev char **keys = NULL;
-	gsize i_keys, keys_len;
+	gsize i_keys, n_keys;
 	gs_free IPAddrRouteBuildListData *build_list = NULL;
 	gsize i_build_list, build_list_len = 0;
 
-	keys = nm_keyfile_plugin_kf_get_keys (info->keyfile, setting_name, &keys_len, NULL);
-
-	if (keys_len == 0)
+	keys = nm_keyfile_plugin_kf_get_keys (info->keyfile, setting_name, &n_keys, NULL);
+	if (n_keys == 0)
 		return;
 
 	/* first create a list of all relevant keys, and sort them. */
-	for (i_keys = 0; i_keys < keys_len; i_keys++) {
+	for (i_keys = 0; i_keys < n_keys; i_keys++) {
 		const char *s_key = keys[i_keys];
 		gint32 key_idx;
 		gint8 key_type;
@@ -641,7 +649,7 @@ ip_address_or_route_parser (KeyfileReaderInfo *info, NMSetting *setting, const c
 			continue;
 
 		if (G_UNLIKELY (!build_list))
-			build_list = g_new (IPAddrRouteBuildListData, keys_len - i_keys);
+			build_list = g_new (IPAddrRouteBuildListData, n_keys - i_keys);
 
 		build_list[build_list_len].s_key = s_key;
 		build_list[build_list_len].key_idx = key_idx;
@@ -786,7 +794,6 @@ mac_address_parser (KeyfileReaderInfo *info, NMSetting *setting, const char *key
 	const char *p, *mac_str;
 	gs_free guint8 *buf_arr = NULL;
 	guint buf_len = 0;
-	gsize length;
 
 	tmp_string = nm_keyfile_plugin_kf_get_string (info->keyfile, setting_name, key, NULL);
 
@@ -819,6 +826,7 @@ mac_address_parser (KeyfileReaderInfo *info, NMSetting *setting, const char *key
 
 	if (!buf_arr) {
 		gs_free int *tmp_list = NULL;
+		gsize length;
 
 		/* Old format; list of ints */
 		tmp_list = nm_keyfile_plugin_kf_get_integer_list (info->keyfile, setting_name, key, &length, NULL);
@@ -879,9 +887,10 @@ read_hash_of_string (GKeyFile *file, NMSetting *setting, const char *key)
 	const char *const*iter;
 	const char *setting_name = nm_setting_get_name (setting);
 	gboolean is_vpn;
+	gsize n_keys;
 
-	keys = nm_keyfile_plugin_kf_get_keys (file, setting_name, NULL, NULL);
-	if (!keys || !*keys)
+	keys = nm_keyfile_plugin_kf_get_keys (file, setting_name, &n_keys, NULL);
+	if (n_keys == 0)
 		return;
 
 	if (   (is_vpn = NM_IS_SETTING_VPN (setting))
@@ -902,7 +911,7 @@ read_hash_of_string (GKeyFile *file, NMSetting *setting, const char *key)
 				if (!g_object_class_find_property (G_OBJECT_GET_CLASS (setting), name))
 					nm_setting_vpn_add_data_item (NM_SETTING_VPN (setting), name, value);
 			} else {
-				if (strcmp (name, "interface-name"))
+				if (!nm_streq (name, "interface-name"))
 					nm_setting_bond_add_option (NM_SETTING_BOND (setting), name, value);
 			}
 		}
@@ -1374,55 +1383,119 @@ cert_parser (KeyfileReaderInfo *info, NMSetting *setting, const char *key)
 	g_object_set (setting, key, bytes, NULL);
 }
 
+static int
+_parity_from_char (int ch)
+{
+#if NM_MORE_ASSERTS > 5
+	{
+		static char check = 0;
+
+		if (check == 0) {
+			nm_auto_unref_gtypeclass GEnumClass *klass = g_type_class_ref (NM_TYPE_SETTING_SERIAL_PARITY);
+			guint i;
+
+			check = 1;
+
+			/* In older versions, parity was G_TYPE_CHAR/gint8, and the character
+			 * value was stored as integer.
+			 * For example parity=69 equals parity=E, meaning NM_SETTING_SERIAL_PARITY_EVEN.
+			 *
+			 * That means, certain values are reserved. Assert that these numbers
+			 * are not reused when we extend NMSettingSerialParity enum.
+			 * Actually, since NM_SETTING_SERIAL_PARITY is g_param_spec_enum(),
+			 * we anyway cannot extend the enum without breaking API...
+			 *
+			 * [1] commit "a91e60902e libnm-core: make NMSettingSerial:parity an enum"
+			 * [2] https://cgit.freedesktop.org/NetworkManager/NetworkManager/commit/?id=a91e60902eabae1de93d61323dae6ac894b5d40f
+			 */
+			g_assert (G_IS_ENUM_CLASS (klass));
+			for (i = 0; i < klass->n_values; i++) {
+				const GEnumValue *v = &klass->values[i];
+				int num = v->value;
+
+				g_assert (_parity_from_char (num) == -1);
+				g_assert (!NM_IN_SET (num, 'e', 'E', 'o', 'O', 'n', 'N'));
+			}
+		}
+	}
+#endif
+
+	switch (ch) {
+	case 'E':
+	case 'e':
+		return NM_SETTING_SERIAL_PARITY_EVEN;
+	case 'O':
+	case 'o':
+		return NM_SETTING_SERIAL_PARITY_ODD;
+	case 'N':
+	case 'n':
+		return NM_SETTING_SERIAL_PARITY_NONE;
+	}
+
+	return -1;
+}
+
 static void
 parity_parser (KeyfileReaderInfo *info, NMSetting *setting, const char *key)
 {
 	const char *setting_name = nm_setting_get_name (setting);
-	NMSettingSerialParity parity;
-	int int_val;
-	gs_free char *str_val = NULL;
+	gs_free_error GError *err = NULL;
+	int parity;
+	gs_free char *tmp_str = NULL;
+	gint64 i64;
 
 	/* Keyfile traditionally stored this as the ASCII value for 'E', 'o', or 'n'.
 	 * We now accept either that or the (case-insensitive) character itself (but
 	 * still always write it the old way, for backward compatibility).
 	 */
-	int_val = nm_keyfile_plugin_kf_get_integer (info->keyfile, setting_name, key, NULL);
-	if (!int_val) {
-		str_val = nm_keyfile_plugin_kf_get_string (info->keyfile, setting_name, key, NULL);
-		if (str_val) {
-			if (str_val[0] && !str_val[1])
-				int_val = str_val[0];
-			else {
-				/* This will hit the warning below */
-				int_val = 'X';
-			}
+	tmp_str = nm_keyfile_plugin_kf_get_value (info->keyfile, setting_name, key, &err);
+	if (err)
+		goto out_err;
+
+	if (   tmp_str
+	    && tmp_str[0] != '\0'
+	    && tmp_str[1] == '\0') {
+		/* the ASCII characters like 'E' are taken directly... */
+		parity = _parity_from_char (tmp_str[0]);
+		if (parity >= 0)
+			goto parity_good;
+	}
+
+	i64 = _nm_utils_ascii_str_to_int64 (tmp_str, 0, G_MININT, G_MAXINT, G_MININT64);
+	if (   i64 != G_MININT64
+	    && errno == 0) {
+
+		if ((parity = _parity_from_char (i64)) >= 0) {
+			/* another oddity: the string is a valid number. However, if the numeric values
+			 * is one of the supported ASCII codes, accept it (like 69 for 'E').
+			 */
+			goto parity_good;
 		}
+
+		/* Finally, take the numeric value as is. */
+		parity = i64;
+		goto parity_good;
 	}
 
-	if (!int_val)
-		return;
+	handle_warn (info, key, NM_KEYFILE_WARN_SEVERITY_WARN,
+	             _("invalid parity value '%s'"),
+	             tmp_str ?: "");
+	return;
 
-	switch (int_val) {
-	case 'E':
-	case 'e':
-		parity = NM_SETTING_SERIAL_PARITY_EVEN;
-		break;
-	case 'O':
-	case 'o':
-		parity = NM_SETTING_SERIAL_PARITY_ODD;
-		break;
-	case 'N':
-	case 'n':
-		parity = NM_SETTING_SERIAL_PARITY_NONE;
-		break;
-	default:
-		handle_warn (info, key, NM_KEYFILE_WARN_SEVERITY_WARN,
-		             _("invalid parity value '%s'"),
-		             str_val ?: "");
+parity_good:
+	nm_g_object_set_property_enum (G_OBJECT (setting), key, NM_TYPE_SETTING_SERIAL_PARITY, parity, &err);
+
+out_err:
+	if (!err)
+		return;
+	if (   err->domain == G_KEY_FILE_ERROR
+	    && NM_IN_SET (err->code, G_KEY_FILE_ERROR_GROUP_NOT_FOUND,
+	                             G_KEY_FILE_ERROR_KEY_NOT_FOUND)) {
+		/* ignore such errors. The key is not present. */
 		return;
 	}
-
-	g_object_set (setting, key, parity, NULL);
+	handle_warn (info, key, NM_KEYFILE_WARN_SEVERITY_WARN,
+	             _("invalid setting: %s"), err->message);
 }
 
 static void
@@ -1433,7 +1506,9 @@ team_config_parser (KeyfileReaderInfo *info, NMSetting *setting, const char *key
 	gs_free_error GError *error = NULL;
 
 	conf = nm_keyfile_plugin_kf_get_string (info->keyfile, setting_name, key, NULL);
-	if (conf && conf[0] && !nm_utils_is_json_object (conf, &error)) {
+	if (   conf
+	    && conf[0]
+	    && !nm_utils_is_json_object (conf, &error)) {
 		handle_warn (info, key, NM_KEYFILE_WARN_SEVERITY_WARN,
 		             _("ignoring invalid team configuration: %s"),
 		             error->message);
@@ -1455,7 +1530,7 @@ qdisc_parser (KeyfileReaderInfo *info, NMSetting *setting, const char *key)
 	qdiscs = g_ptr_array_new_with_free_func ((GDestroyNotify) nm_tc_qdisc_unref);
 
 	keys = nm_keyfile_plugin_kf_get_keys (info->keyfile, setting_name, &n_keys, NULL);
-	if (!keys || n_keys == 0)
+	if (n_keys == 0)
 		return;
 
 	for (i = 0; i < n_keys; i++) {
@@ -1503,7 +1578,7 @@ tfilter_parser (KeyfileReaderInfo *info, NMSetting *setting, const char *key)
 	tfilters = g_ptr_array_new_with_free_func ((GDestroyNotify) nm_tc_tfilter_unref);
 
 	keys = nm_keyfile_plugin_kf_get_keys (info->keyfile, setting_name, &n_keys, NULL);
-	if (!keys || n_keys == 0)
+	if (n_keys == 0)
 		return;
 
 	for (i = 0; i < n_keys; i++) {
@@ -1663,16 +1738,21 @@ write_ip_values (GKeyFile *file,
                  const char *gateway,
                  gboolean is_route)
 {
-	GString *output;
-	int family, i;
-	const char *addr, *gw;
+	nm_auto_free_gstring GString *output = NULL;
+	int addr_family;
+	guint i;
+	const char *addr;
+	const char *gw;
 	guint32 plen;
-	char key_name[64], *key_name_idx;
+	char key_name[64];
+	char *key_name_idx;
 
 	if (!array->len)
 		return;
 
-	family = !strcmp (setting_name, NM_SETTING_IP4_CONFIG_SETTING_NAME) ? AF_INET : AF_INET6;
+	addr_family =   nm_streq (setting_name, NM_SETTING_IP4_CONFIG_SETTING_NAME)
+	              ? AF_INET
+	              : AF_INET6;
 
 	strcpy (key_name, is_route ? "route" : "address");
 	key_name_idx = key_name + strlen (key_name);
@@ -1693,7 +1773,9 @@ write_ip_values (GKeyFile *file,
 
 			addr = nm_ip_address_get_address (address);
 			plen = nm_ip_address_get_prefix (address);
-			gw = i == 0 ? gateway : NULL;
+			gw =   (i == 0)
+			     ? gateway
+			     : NULL;
 		}
 
 		g_string_set_size (output, 0);
@@ -1706,18 +1788,19 @@ write_ip_values (GKeyFile *file,
 			 * The current version supports reading of the above form.
 			 */
 			if (!gw) {
-				if (family == AF_INET)
+				if (addr_family == AF_INET)
 					gw = "0.0.0.0";
 				else
 					gw = "::";
 			}
 
 			g_string_append_printf (output, ",%s", gw);
-			if (is_route && metric != -1)
+			if (   is_route
+			    && metric != -1)
 				g_string_append_printf (output, ",%lu", (unsigned long) metric);
 		}
 
-		sprintf (key_name_idx, "%d", i + 1);
+		sprintf (key_name_idx, "%u", i + 1);
 		nm_keyfile_plugin_kf_set_string (file, setting_name, key_name, output->str);
 
 		if (is_route) {
@@ -1732,7 +1815,6 @@ write_ip_values (GKeyFile *file,
 			}
 		}
 	}
-	g_string_free (output, TRUE);
 }
 
 static void
@@ -1843,7 +1925,8 @@ write_hash_of_string (GKeyFile *file,
 	guint i, l;
 
 	/* Write VPN secrets out to a different group to keep them separate */
-	if (NM_IS_SETTING_VPN (setting) && !strcmp (key, NM_SETTING_VPN_SECRETS)) {
+	if (   NM_IS_SETTING_VPN (setting)
+	    && nm_streq (key, NM_SETTING_VPN_SECRETS)) {
 		group_name = NM_KEYFILE_GROUP_VPN_SECRETS;
 		vpn_secrets = TRUE;
 	}
@@ -1852,8 +1935,8 @@ write_hash_of_string (GKeyFile *file,
 
 	keys = nm_utils_strdict_get_keys (hash, TRUE, &l);
 	for (i = 0; i < l; i++) {
+		gs_free char *to_free = NULL;
 		const char *property, *data;
-		gboolean write_item = TRUE;
 
 		property = keys[i];
 
@@ -1864,19 +1947,16 @@ write_hash_of_string (GKeyFile *file,
 		if (vpn_secrets) {
 			NMSettingSecretFlags secret_flags = NM_SETTING_SECRET_FLAG_NONE;
 
-			nm_setting_get_secret_flags (setting, property, &secret_flags, NULL);
-			if (secret_flags != NM_SETTING_SECRET_FLAG_NONE)
-				write_item = FALSE;
+			if (!nm_setting_get_secret_flags (setting, property, &secret_flags, NULL))
+				nm_assert_not_reached ();
+			if (!_secret_flags_persist_secret (secret_flags))
+				continue;
 		}
 
-		if (write_item) {
-			gs_free char *to_free = NULL;
-
-			data = g_hash_table_lookup (hash, property);
-			nm_keyfile_plugin_kf_set_string (file, group_name,
-			                                 nm_keyfile_key_encode (property, &to_free),
-			                                 data);
-		}
+		data = g_hash_table_lookup (hash, property);
+		nm_keyfile_plugin_kf_set_string (file, group_name,
+		                                 nm_keyfile_key_encode (property, &to_free),
+		                                 data);
 	}
 }
 
@@ -1976,9 +2056,10 @@ cert_writer_default (NMConnection *connection,
 
 	scheme = cert_data->vtable->scheme_func (cert_data->setting);
 	if (scheme == NM_SETTING_802_1X_CK_SCHEME_PATH) {
-		const char *path;
-		char *path_free = NULL, *tmp;
+		gs_free char *path_free = NULL;
 		gs_free char *base_dir = NULL;
+		gs_free char *tmp = NULL;
+		const char *path;
 
 		path = cert_data->vtable->path_func (cert_data->setting);
 		g_assert (path);
@@ -1988,7 +2069,8 @@ cert_writer_default (NMConnection *connection,
 		 * context. */
 		if (path[0] && path[0] != '/') {
 			base_dir = g_get_current_dir ();
-			path = path_free = g_strconcat (base_dir, "/", path, NULL);
+			path_free = g_strconcat (base_dir, "/", path, NULL);
+			path = path_free;
 		} else
 			base_dir = g_path_get_dirname (path);
 
@@ -1998,20 +2080,21 @@ cert_writer_default (NMConnection *connection,
 		tmp = nm_keyfile_detect_unqualified_path_scheme (base_dir, path, -1, FALSE, NULL);
 		if (tmp)
 			g_clear_pointer (&tmp, g_free);
-		else
-			path = tmp = g_strconcat (NM_KEYFILE_CERT_SCHEME_PREFIX_PATH, path, NULL);
+		else {
+			tmp = g_strconcat (NM_KEYFILE_CERT_SCHEME_PREFIX_PATH, path, NULL);
+			path = tmp;
+		}
 
 		/* Path contains at least a '/', hence it cannot be recognized as the old
 		 * binary format consisting of a list of integers. */
 
 		nm_keyfile_plugin_kf_set_string (file, setting_name, cert_data->vtable->setting_key, path);
-		g_free (tmp);
-		g_free (path_free);
 	} else if (scheme == NM_SETTING_802_1X_CK_SCHEME_BLOB) {
 		GBytes *blob;
 		const guint8 *blob_data;
 		gsize blob_len;
-		char *blob_base64, *val;
+		gs_free char *blob_base64 = NULL;
+		gs_free char *val = NULL;
 
 		blob = cert_data->vtable->blob_func (cert_data->setting);
 		g_assert (blob);
@@ -2021,8 +2104,6 @@ cert_writer_default (NMConnection *connection,
 		val = g_strconcat (NM_KEYFILE_CERT_SCHEME_PREFIX_BLOB, blob_base64, NULL);
 
 		nm_keyfile_plugin_kf_set_string (file, setting_name, cert_data->vtable->setting_key, val);
-		g_free (val);
-		g_free (blob_base64);
 	} else if (scheme == NM_SETTING_802_1X_CK_SCHEME_PKCS11) {
 		nm_keyfile_plugin_kf_set_string (file, setting_name, cert_data->vtable->setting_key,
 		                                 cert_data->vtable->uri_func (cert_data->setting));
@@ -2048,7 +2129,7 @@ cert_writer (KeyfileWriterInfo *info,
 	NMKeyfileWriteTypeDataCert type_data = { 0 };
 
 	for (i = 0; nm_setting_8021x_scheme_vtable[i].setting_key; i++) {
-		if (g_strcmp0 (nm_setting_8021x_scheme_vtable[i].setting_key, key) == 0) {
+		if (nm_streq0 (nm_setting_8021x_scheme_vtable[i].setting_key, key)) {
 			objtype = &nm_setting_8021x_scheme_vtable[i];
 			break;
 		}
@@ -2506,26 +2587,28 @@ _parse_info_find (NMSetting *setting,
 /*****************************************************************************/
 
 static void
-read_one_setting_value (NMSetting *setting,
-                        const char *key,
-                        const GValue *value,
-                        GParamFlags flags,
-                        gpointer user_data)
+read_one_setting_value (KeyfileReaderInfo *info,
+                        NMSetting *setting,
+                        const NMSettInfoProperty *property_info)
 {
-	KeyfileReaderInfo *info = user_data;
 	GKeyFile *keyfile = info->keyfile;
-	const char *setting_name;
-	int errsv;
-	GType type;
 	gs_free_error GError *err = NULL;
 	const ParseInfoProperty *pip;
+	gs_free char *tmp_str = NULL;
+	const char *setting_name;
+	const char *key;
+	GType type;
+	guint64 u64;
+	gint64 i64;
 
-	if (info->error)
-		return;
+	nm_assert (!info->error);
+	nm_assert (property_info->param_spec);
 
-	if (!(flags & G_PARAM_WRITABLE))
+	if ((property_info->param_spec->flags & (G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY)) != G_PARAM_WRITABLE)
 		return;
 
+	key = property_info->param_spec->name;
+
 	pip = _parse_info_find (setting, key, &setting_name);
 
 	nm_assert (setting_name);
@@ -2544,7 +2627,7 @@ read_one_setting_value (NMSetting *setting,
 	 */
 	if (   (!pip || !pip->parser_no_check_key)
 	    && !nm_keyfile_plugin_kf_has_key (keyfile, setting_name, key, &err)) {
-		/* Key doesn't exist or an error ocurred, thus nothing to do. */
+		/* Key doesn't exist or an error occurred, thus nothing to do. */
 		if (err) {
 			if (!handle_warn (info, key, NM_KEYFILE_WARN_SEVERITY_WARN,
 			                  _("error loading setting value: %s"),
@@ -2559,69 +2642,78 @@ read_one_setting_value (NMSetting *setting,
 		return;
 	}
 
-	type = G_VALUE_TYPE (value);
+	type = G_PARAM_SPEC_VALUE_TYPE (property_info->param_spec);
 
 	if (type == G_TYPE_STRING) {
 		gs_free char *str_val = NULL;
 
-		str_val = nm_keyfile_plugin_kf_get_string (keyfile, setting_name, key, NULL);
-		g_object_set (setting, key, str_val, NULL);
+		str_val = nm_keyfile_plugin_kf_get_string (keyfile, setting_name, key, &err);
+		if (!err)
+			nm_g_object_set_property_string_take (G_OBJECT (setting), key, g_steal_pointer (&str_val), &err);
 	} else if (type == G_TYPE_UINT) {
-		int int_val;
-
-		int_val = nm_keyfile_plugin_kf_get_integer (keyfile, setting_name, key, NULL);
-		if (int_val < 0) {
-			if (!handle_warn (info, key, NM_KEYFILE_WARN_SEVERITY_WARN,
-			                  _("invalid negative value (%i)"),
-			                  int_val))
-				return;
+		tmp_str = nm_keyfile_plugin_kf_get_value (keyfile, setting_name, key, &err);
+		if (!err) {
+			u64 = _nm_utils_ascii_str_to_uint64 (tmp_str, 0, 0, G_MAXUINT, G_MAXUINT64);
+			if (   u64 == G_MAXUINT64
+			    && errno != 0) {
+				g_set_error_literal (&err, G_KEY_FILE_ERROR, G_KEY_FILE_ERROR_INVALID_VALUE,
+				                     _("value cannot be interpreted as integer"));
+			} else
+				nm_g_object_set_property_uint (G_OBJECT (setting), key, u64, &err);
 		}
-		g_object_set (setting, key, int_val, NULL);
 	} else if (type == G_TYPE_INT) {
-		int int_val;
-
-		int_val = nm_keyfile_plugin_kf_get_integer (keyfile, setting_name, key, NULL);
-		g_object_set (setting, key, int_val, NULL);
+		tmp_str = nm_keyfile_plugin_kf_get_value (keyfile, setting_name, key, &err);
+		if (!err) {
+			i64 = _nm_utils_ascii_str_to_int64 (tmp_str, 0, G_MININT, G_MAXINT, G_MININT64);
+			if (   i64 == G_MININT64
+			    && errno != 0) {
+				g_set_error_literal (&err, G_KEY_FILE_ERROR, G_KEY_FILE_ERROR_INVALID_VALUE,
+				                     _("value cannot be interpreted as integer"));
+			} else
+				nm_g_object_set_property_int (G_OBJECT (setting), key, i64, &err);
+		}
 	} else if (type == G_TYPE_BOOLEAN) {
 		gboolean bool_val;
 
-		bool_val = nm_keyfile_plugin_kf_get_boolean (keyfile, setting_name, key, NULL);
-		g_object_set (setting, key, bool_val, NULL);
+		bool_val = nm_keyfile_plugin_kf_get_boolean (keyfile, setting_name, key, &err);
+		if (!err)
+			nm_g_object_set_property_boolean (G_OBJECT (setting), key, bool_val, &err);
 	} else if (type == G_TYPE_CHAR) {
-		int int_val;
-
-		int_val = nm_keyfile_plugin_kf_get_integer (keyfile, setting_name, key, NULL);
-		if (int_val < G_MININT8 || int_val > G_MAXINT8) {
-			if (!handle_warn (info, key, NM_KEYFILE_WARN_SEVERITY_WARN,
-			                  _("invalid char value (%i)"),
-			                  int_val))
-				return;
+		tmp_str = nm_keyfile_plugin_kf_get_value (keyfile, setting_name, key, &err);
+		if (!err) {
+			/* As documented by glib, G_TYPE_CHAR is really a (signed!) gint8. */
+			i64 = _nm_utils_ascii_str_to_int64 (tmp_str, 0, G_MININT8, G_MAXINT8, G_MININT64);
+			if (   i64 == G_MININT64
+			    && errno != 0) {
+				g_set_error_literal (&err, G_KEY_FILE_ERROR, G_KEY_FILE_ERROR_INVALID_VALUE,
+				                     _("value cannot be interpreted as integer"));
+			} else
+				nm_g_object_set_property_char (G_OBJECT (setting), key, i64, &err);
 		}
-
-		g_object_set (setting, key, int_val, NULL);
 	} else if (type == G_TYPE_UINT64) {
-		gs_free char *tmp_str = NULL;
-		guint64 uint_val;
-
-		tmp_str = nm_keyfile_plugin_kf_get_value (keyfile, setting_name, key, NULL);
-		uint_val = g_ascii_strtoull (tmp_str, NULL, 10);
-		g_object_set (setting, key, uint_val, NULL);
+		tmp_str = nm_keyfile_plugin_kf_get_value (keyfile, setting_name, key, &err);
+		if (!err) {
+			u64 = _nm_utils_ascii_str_to_uint64 (tmp_str, 0, 0, G_MAXUINT64, G_MAXUINT64);
+			if (   u64 == G_MAXUINT64
+			    && errno != 0) {
+				g_set_error_literal (&err, G_KEY_FILE_ERROR, G_KEY_FILE_ERROR_INVALID_VALUE,
+				                     _("value cannot be interpreted as integer"));
+			} else
+				nm_g_object_set_property_uint64 (G_OBJECT (setting), key, u64, &err);
+		}
 	} else if (type == G_TYPE_INT64) {
-		gs_free char *tmp_str = NULL;
-		gint64 int_val;
-
-		tmp_str = nm_keyfile_plugin_kf_get_value (keyfile, setting_name, key, NULL);
-		int_val = _nm_utils_ascii_str_to_int64 (tmp_str, 10, G_MININT64, G_MAXINT64, 0);
-		errsv = errno;
-		if (errsv) {
-			if (!handle_warn (info, key, NM_KEYFILE_WARN_SEVERITY_WARN,
-			                  _("invalid int64 value (%s)"),
-			                  tmp_str))
-				return;
-		} else
-			g_object_set (setting, key, int_val, NULL);
+		tmp_str = nm_keyfile_plugin_kf_get_value (keyfile, setting_name, key, &err);
+		if (!err) {
+			i64 = _nm_utils_ascii_str_to_int64 (tmp_str, 0, G_MININT64, G_MAXINT64, G_MAXINT64);
+			if (   i64 == G_MAXINT64
+			    && errno != 0) {
+				g_set_error_literal (&err, G_KEY_FILE_ERROR, G_KEY_FILE_ERROR_INVALID_VALUE,
+				                     _("value cannot be interpreted as integer"));
+			} else
+				nm_g_object_set_property_int64 (G_OBJECT (setting), key, i64, &err);
+		}
 	} else if (type == G_TYPE_BYTES) {
-		int *tmp;
+		gs_free int *tmp = NULL;
 		GByteArray *array;
 		GBytes *bytes;
 		gsize length;
@@ -2632,7 +2724,7 @@ read_one_setting_value (NMSetting *setting,
 
 		array = g_byte_array_sized_new (length);
 		for (i = 0; i < length; i++) {
-			int val = tmp[i];
+			const int val = tmp[i];
 			unsigned char v = (unsigned char) (val & 0xFF);
 
 			if (val < 0 || val > 255) {
@@ -2641,7 +2733,6 @@ read_one_setting_value (NMSetting *setting,
 				                     _("ignoring invalid byte element '%d' (not between 0 and 255 inclusive)"),
 				                     val)) {
 					g_byte_array_unref (array);
-					g_free (tmp);
 					return;
 				}
 				already_warned = TRUE;
@@ -2652,54 +2743,61 @@ read_one_setting_value (NMSetting *setting,
 		bytes = g_byte_array_free_to_bytes (array);
 		g_object_set (setting, key, bytes, NULL);
 		g_bytes_unref (bytes);
-		g_free (tmp);
 	} else if (type == G_TYPE_STRV) {
-		char **sa;
+		gs_strfreev char **sa = NULL;
 		gsize length;
 
 		sa = nm_keyfile_plugin_kf_get_string_list (keyfile, setting_name, key, &length, NULL);
 		g_object_set (setting, key, sa, NULL);
-		g_strfreev (sa);
 	} else if (type == G_TYPE_HASH_TABLE) {
 		read_hash_of_string (keyfile, setting, key);
 	} else if (type == G_TYPE_ARRAY) {
 		read_array_of_uint (keyfile, setting, key);
-	} else if (G_VALUE_HOLDS_FLAGS (value)) {
-		guint64 uint_val;
-
-		/* Flags are guint but GKeyFile has no uint reader, just uint64 */
-		uint_val = nm_keyfile_plugin_kf_get_uint64 (keyfile, setting_name, key, &err);
+	} else if (G_TYPE_IS_FLAGS (type)) {
+		tmp_str = nm_keyfile_plugin_kf_get_value (keyfile, setting_name, key, &err);
 		if (!err) {
-			if (uint_val <= G_MAXUINT)
-				g_object_set (setting, key, (guint) uint_val, NULL);
-			else {
-				if (!handle_warn (info, key, NM_KEYFILE_WARN_SEVERITY_WARN,
-				                  _("too large FLAGS property '%s' (%llu)"),
-				                  G_VALUE_TYPE_NAME (value), (unsigned long long) uint_val))
-					return;
-			}
+			u64 = _nm_utils_ascii_str_to_uint64 (tmp_str, 0, 0, G_MAXUINT, G_MAXUINT64);
+			if (   u64 == G_MAXUINT64
+			    && errno != 0) {
+				g_set_error_literal (&err, G_KEY_FILE_ERROR, G_KEY_FILE_ERROR_INVALID_VALUE,
+				                     _("value cannot be interpreted as integer"));
+			} else
+				nm_g_object_set_property_flags (G_OBJECT (setting), key, type, u64, &err);
+		}
+	} else if (G_TYPE_IS_ENUM (type)) {
+		tmp_str = nm_keyfile_plugin_kf_get_value (keyfile, setting_name, key, &err);
+		if (!err) {
+			i64 = _nm_utils_ascii_str_to_int64 (tmp_str, 0, G_MININT, G_MAXINT, G_MAXINT64);
+			if (   i64 == G_MAXINT64
+			    && errno != 0) {
+				g_set_error_literal (&err, G_KEY_FILE_ERROR, G_KEY_FILE_ERROR_INVALID_VALUE,
+				                     _("value cannot be interpreted as integer"));
+			} else
+				nm_g_object_set_property_enum (G_OBJECT (setting), key, type, i64, &err);
 		}
-	} else if (G_VALUE_HOLDS_ENUM (value)) {
-		int int_val;
+	} else
+		g_return_if_reached ();
 
-		int_val = nm_keyfile_plugin_kf_get_integer (keyfile, setting_name, key, &err);
-		if (!err)
-			g_object_set (setting, key, (int) int_val, NULL);
-	} else {
-		if (!handle_warn (info, key, NM_KEYFILE_WARN_SEVERITY_WARN,
-		                 _("unhandled setting property type '%s'"),
-		                 G_VALUE_TYPE_NAME (value)))
-			return;
+	if (err) {
+		if (   err->domain == G_KEY_FILE_ERROR
+		    && NM_IN_SET (err->code, G_KEY_FILE_ERROR_GROUP_NOT_FOUND,
+		                             G_KEY_FILE_ERROR_KEY_NOT_FOUND)) {
+			/* ignore such errors. The key is not present. */
+		} else {
+			handle_warn (info, key, NM_KEYFILE_WARN_SEVERITY_WARN,
+			             _("invalid setting: %s"), err->message);
+		}
 	}
 }
 
-static NMSetting *
-read_setting (KeyfileReaderInfo *info)
+static void
+_read_setting (KeyfileReaderInfo *info)
 {
 	const NMSettInfoSetting *sett_info;
 	gs_unref_object NMSetting *setting = NULL;
 	const char *alias;
 	GType type;
+	guint i;
 
 	alias = nm_keyfile_plugin_get_setting_name_for_alias (info->group);
 	if (!alias)
@@ -2709,34 +2807,36 @@ read_setting (KeyfileReaderInfo *info)
 	if (!type) {
 		handle_warn (info, NULL, NM_KEYFILE_WARN_SEVERITY_WARN,
 		             _("invalid setting name '%s'"), info->group);
-		return NULL;
+		return;
 	}
 
 	setting = g_object_new (type, NULL);
 
 	info->setting = setting;
 
-	sett_info = _nm_sett_info_setting_get (NM_SETTING_GET_CLASS (setting));
+	sett_info = _nm_setting_class_get_sett_info (NM_SETTING_GET_CLASS (setting));
 
 	if (sett_info->detail.gendata_info) {
 		gs_free char **keys = NULL;
-		gsize i, n_keys;
+		gsize k, n_keys;
 
 		keys = g_key_file_get_keys (info->keyfile, info->group, &n_keys, NULL);
+		if (!keys)
+			n_keys = 0;
 		if (n_keys > 0) {
 			GHashTable *h = _nm_setting_gendata_hash (setting, TRUE);
 
 			nm_utils_strv_sort (keys, n_keys);
-			for (i = 0; i < n_keys; i++) {
-				gs_free char *key = keys[i];
+			for (k = 0; k < n_keys; k++) {
+				gs_free char *key = keys[k];
 				gs_free_error GError *local = NULL;
 				const GVariantType *variant_type;
 				GVariant *variant;
 
-				/* a GKeyfile can return duplicate keys, there is just no API to make sense
+				/* a GKeyFile can return duplicate keys, there is just no API to make sense
 				 * of them. Skip them. */
-				if (   i + 1 < n_keys
-				    && nm_streq (key, keys[i + 1]))
+				if (   k + 1 < n_keys
+				    && nm_streq (key, keys[k + 1]))
 					continue;
 
 				/* currently, the API is very simple. The setting class just returns
@@ -2781,34 +2881,175 @@ read_setting (KeyfileReaderInfo *info)
 				                     g_steal_pointer (&key),
 				                     g_variant_take_ref (variant));
 			}
-			for (; i < n_keys; i++)
-				g_free (keys[i]);
+			for (; k < n_keys; k++)
+				g_free (keys[k]);
 		}
-	} else
-		nm_setting_enumerate_values (setting, read_one_setting_value, info);
+	}
 
+	for (i = 0; i < sett_info->property_infos_len; i++) {
+		const NMSettInfoProperty *property_info = &sett_info->property_infos[i];
+
+		if (property_info->param_spec) {
+			read_one_setting_value (info, setting, property_info);
+			if (info->error)
+				goto out;
+		}
+	}
+
+out:
 	info->setting = NULL;
+	if (!info->error)
+		nm_connection_add_setting (info->connection, g_steal_pointer (&setting));
+}
+
+static void
+_read_setting_wireguard_peer (KeyfileReaderInfo *info)
+{
+	gs_unref_object NMSettingWireGuard *s_wg_new = NULL;
+	nm_auto_unref_wgpeer NMWireGuardPeer *peer = NULL;
+	gs_free_error GError *error = NULL;
+	NMSettingWireGuard *s_wg;
+	gs_free char *str = NULL;
+	const char *cstr = NULL;
+	const char *key;
+	gint64 i64;
+	gs_strfreev char **sa = NULL;
+	gsize n_sa;
+
+	peer = nm_wireguard_peer_new ();
+
+	nm_assert (g_str_has_prefix (info->group, NM_KEYFILE_GROUPPREFIX_WIREGUARD_PEER));
+	cstr = &info->group[NM_STRLEN (NM_KEYFILE_GROUPPREFIX_WIREGUARD_PEER)];
+	if (   !nm_utils_base64secret_normalize (cstr, NM_WIREGUARD_PUBLIC_KEY_LEN, &str)
+	    || !nm_streq0 (str, cstr)) {
+		/* the group name must be identical to the normalized(!) key, so that it
+		 * is uniquely identified. */
+		handle_warn (info, NULL, NM_KEYFILE_WARN_SEVERITY_WARN,
+		             _("invalid peer public key in section '%s'"),
+		             info->group);
+		return;
+	}
+	nm_wireguard_peer_set_public_key (peer, cstr, TRUE);
+	nm_clear_g_free (&str);
+
+	key = NM_WIREGUARD_PEER_ATTR_PRESHARED_KEY;
+	str = nm_keyfile_plugin_kf_get_string (info->keyfile, info->group, key, NULL);
+	if (str) {
+		if (!nm_wireguard_peer_set_preshared_key (peer, str, FALSE)) {
+			if (!handle_warn (info, key, NM_KEYFILE_WARN_SEVERITY_WARN,
+			                  _("key '%s.%s' is not not a valid 256 bit key in base64 encoding"),
+			                  info->group, key))
+				return;
+		}
+		nm_clear_g_free (&str);
+	}
+
+	key = NM_WIREGUARD_PEER_ATTR_PRESHARED_KEY_FLAGS;
+	i64 = nm_keyfile_plugin_kf_get_int64 (info->keyfile, info->group, key, 0, 0, NM_SETTING_SECRET_FLAG_ALL, -1, NULL);
+	if (errno != ENODATA) {
+		if (   i64 == -1
+		    || !_nm_setting_secret_flags_valid (i64)) {
+			if (!handle_warn (info, key, NM_KEYFILE_WARN_SEVERITY_WARN,
+			                  _("key '%s.%s' is not not a valid secret flag"),
+			                  info->group, key))
+				return;
+		} else
+			nm_wireguard_peer_set_preshared_key_flags (peer, i64);
+	}
+
+	key = NM_WIREGUARD_PEER_ATTR_PERSISTENT_KEEPALIVE;
+	i64 = nm_keyfile_plugin_kf_get_int64 (info->keyfile, info->group, key, 0, 0, G_MAXUINT32, -1, NULL);
+	if (errno != ENODATA) {
+		if (i64 == -1) {
+			if (!handle_warn (info, key, NM_KEYFILE_WARN_SEVERITY_WARN,
+			                  _("key '%s.%s' is not not a integer in range 0 to 2^32"),
+			                  info->group, key))
+				return;
+		} else
+			nm_wireguard_peer_set_persistent_keepalive (peer, i64);
+	}
+
+	key = NM_WIREGUARD_PEER_ATTR_ENDPOINT;
+	str = nm_keyfile_plugin_kf_get_string (info->keyfile, info->group, key, NULL);
+	if (str && str[0]) {
+		if (!nm_wireguard_peer_set_endpoint (peer, str, FALSE)) {
+			if (!handle_warn (info, key, NM_KEYFILE_WARN_SEVERITY_WARN,
+			                  _("key '%s.%s' is not not a valid endpoint"),
+			                  info->group, key))
+				return;
+		}
+	}
+	nm_clear_g_free (&str);
+
+	key = NM_WIREGUARD_PEER_ATTR_ALLOWED_IPS;
+	sa = nm_keyfile_plugin_kf_get_string_list (info->keyfile, info->group, key, &n_sa, NULL);
+	if (n_sa > 0) {
+		gboolean has_error = FALSE;
+		gsize i;
+
+		for (i = 0; i < n_sa; i++) {
+			if (!nm_utils_parse_inaddr_prefix_bin (AF_UNSPEC, sa[i], NULL, NULL, NULL)) {
+				has_error = TRUE;
+				continue;
+			}
+			nm_wireguard_peer_append_allowed_ip (peer, sa[i], TRUE);
+		}
+		if (has_error) {
+			if (!handle_warn (info, key, NM_KEYFILE_WARN_SEVERITY_WARN,
+			                  _("key '%s.%s' has invalid allowed-ips"),
+			                  info->group, key))
+				return;
+		}
+	}
+	nm_clear_pointer (&sa, g_strfreev);
 
 	if (info->error)
-		return NULL;
-	return g_steal_pointer (&setting);
+		return;
+
+	if (!nm_wireguard_peer_is_valid (peer, TRUE, TRUE, &error)) {
+		if (!handle_warn (info, key, NM_KEYFILE_WARN_SEVERITY_WARN,
+		                  _("peer '%s' is invalid: %s"),
+		                  info->group, error->message))
+			return;
+		return;
+	}
+
+	s_wg = NM_SETTING_WIREGUARD (nm_connection_get_setting (info->connection, NM_TYPE_SETTING_WIREGUARD));
+	if (!s_wg) {
+		s_wg_new = NM_SETTING_WIREGUARD (nm_setting_wireguard_new ());
+		s_wg = s_wg_new;
+	}
+
+	nm_setting_wireguard_append_peer (s_wg, peer);
+
+	if (s_wg_new) {
+		nm_connection_add_setting (info->connection,
+		                           NM_SETTING (g_steal_pointer (&s_wg_new)));
+	}
 }
 
 static void
-read_vpn_secrets (KeyfileReaderInfo *info, NMSettingVpn *s_vpn)
+_read_setting_vpn_secrets (KeyfileReaderInfo *info)
 {
 	gs_strfreev char **keys = NULL;
-	char **iter;
+	gsize i, n_keys;
+	NMSettingVpn *s_vpn;
+
+	s_vpn = nm_connection_get_setting_vpn (info->connection);
+	if (!s_vpn) {
+		/* if we don't also have a [vpn] section (which must be parsed earlier),
+		 * we don't do anything. */
+		nm_assert (!g_key_file_has_group (info->keyfile, "vpn"));
+		return;
+	}
 
-	keys = nm_keyfile_plugin_kf_get_keys (info->keyfile, NM_KEYFILE_GROUP_VPN_SECRETS, NULL, NULL);
-	for (iter = keys; *iter; iter++) {
-		char *secret;
+	keys = nm_keyfile_plugin_kf_get_keys (info->keyfile, NM_KEYFILE_GROUP_VPN_SECRETS, &n_keys, NULL);
+	for (i = 0; i < n_keys; i++) {
+		gs_free char *secret = NULL;
 
-		secret = nm_keyfile_plugin_kf_get_string (info->keyfile, NM_KEYFILE_GROUP_VPN_SECRETS, *iter, NULL);
-		if (secret) {
-			nm_setting_vpn_add_secret (s_vpn, *iter, secret);
-			g_free (secret);
-		}
+		secret = nm_keyfile_plugin_kf_get_string (info->keyfile, NM_KEYFILE_GROUP_VPN_SECRETS, keys[i], NULL);
+		if (secret)
+			nm_setting_vpn_add_secret (s_vpn, keys[i], secret);
 	}
 }
 
@@ -2876,12 +3117,11 @@ nm_keyfile_read (GKeyFile *keyfile,
 {
 	gs_unref_object NMConnection *connection = NULL;
 	NMSettingConnection *s_con;
-	NMSetting *setting;
-	char **groups;
-	gsize length;
+	gs_strfreev char **groups = NULL;
+	gsize n_groups;
 	gsize i;
 	gboolean vpn_secrets = FALSE;
-	KeyfileReaderInfo info = { 0 };
+	KeyfileReaderInfo info;
 
 	g_return_val_if_fail (keyfile, NULL);
 	g_return_val_if_fail (!error || !*error, NULL);
@@ -2889,31 +3129,35 @@ nm_keyfile_read (GKeyFile *keyfile,
 
 	connection = nm_simple_connection_new ();
 
-	info.connection = connection;
-	info.keyfile = (GKeyFile *) keyfile;
-	info.base_dir = base_dir;
-	info.handler = handler;
-	info.user_data = user_data;
+	info = (KeyfileReaderInfo) {
+		.connection = connection,
+		.keyfile    = keyfile,
+		.base_dir   = base_dir,
+		.handler    = handler,
+		.user_data  = user_data,
+	};
+
+	groups = g_key_file_get_groups (keyfile, &n_groups);
+	if (!groups)
+		n_groups = 0;
 
-	groups = g_key_file_get_groups (keyfile, &length);
-	for (i = 0; i < length; i++) {
-		/* Only read out secrets when needed */
-		if (!strcmp (groups[i], NM_KEYFILE_GROUP_VPN_SECRETS)) {
-			vpn_secrets = TRUE;
-			continue;
-		}
+	for (i = 0; i < n_groups; i++) {
 
 		info.group = groups[i];
-		setting = read_setting (&info);
+
+		if (nm_streq (groups[i], NM_KEYFILE_GROUP_VPN_SECRETS)) {
+			/* Only read out secrets when needed */
+			vpn_secrets = TRUE;
+		} else if (NM_STR_HAS_PREFIX (groups[i], NM_KEYFILE_GROUPPREFIX_WIREGUARD_PEER))
+			_read_setting_wireguard_peer (&info);
+		else
+			_read_setting (&info);
+
 		info.group = NULL;
-		if (info.error) {
-			g_propagate_error (error, info.error);
-			return NULL;
-		}
-		if (setting)
-			nm_connection_add_setting (connection, setting);
+
+		if (info.error)
+			goto out_with_info_error;
 	}
-	g_strfreev (groups);
 
 	s_con = nm_connection_get_setting_connection (connection);
 	if (!s_con) {
@@ -2926,55 +3170,51 @@ nm_keyfile_read (GKeyFile *keyfile,
 	 */
 	if (   !nm_setting_connection_get_interface_name (s_con)
 	    && nm_setting_connection_get_connection_type (s_con)) {
-		char *interface_name;
+		gs_free char *interface_name = NULL;
 
 		interface_name = g_key_file_get_string (keyfile,
 		                                        nm_setting_connection_get_connection_type (s_con),
 		                                        "interface-name",
 		                                        NULL);
-		if (interface_name) {
+		if (interface_name)
 			g_object_set (s_con, NM_SETTING_CONNECTION_INTERFACE_NAME, interface_name, NULL);
-			g_free (interface_name);
-		}
 	}
 
-	/* Handle vpn secrets after the 'vpn' setting was read */
 	if (vpn_secrets) {
-		NMSettingVpn *s_vpn;
-
-		s_vpn = nm_connection_get_setting_vpn (connection);
-		if (s_vpn) {
-			read_vpn_secrets (&info, s_vpn);
-			if (info.error) {
-				g_propagate_error (error, info.error);
-				return NULL;
-			}
-		}
+		info.group = NM_KEYFILE_GROUP_VPN_SECRETS;
+		_read_setting_vpn_secrets (&info);
+		info.group = NULL;;
+		if (info.error)
+			goto out_with_info_error;
 	}
 
 	return g_steal_pointer (&connection);
+
+out_with_info_error:
+	g_propagate_error (error, info.error);
+	return NULL;
 }
 
 /*****************************************************************************/
 
 static void
-write_setting_value (NMSetting *setting,
-                     const char *key,
-                     const GValue *value,
-                     GParamFlags flag,
-                     gpointer user_data)
+write_setting_value (KeyfileWriterInfo *info,
+                     NMSetting *setting,
+                     const NMSettInfoProperty *property_info)
 {
-	KeyfileWriterInfo *info = user_data;
+	const ParseInfoProperty *pip;
 	const char *setting_name;
+	const char *key;
+	char numstr[64];
+	GValue value;
 	GType type;
-	const ParseInfoProperty *pip;
-	GParamSpec *pspec;
 
-	if (info->error)
+	nm_assert (!info->error);
+
+	if (!property_info->param_spec)
 		return;
 
-	pspec = g_object_class_find_property (G_OBJECT_GET_CLASS (setting), key);
-	nm_assert (pspec);
+	key = property_info->param_spec->name;
 
 	pip = _parse_info_find (setting, key, &setting_name);
 
@@ -3002,58 +3242,65 @@ write_setting_value (NMSetting *setting,
 	 * the secret flags there are in a third-level hash in the 'secrets'
 	 * property.
 	 */
-	if (   (pspec->flags & NM_SETTING_PARAM_SECRET)
+	if (   (property_info->param_spec->flags & NM_SETTING_PARAM_SECRET)
 	    && !NM_IS_SETTING_VPN (setting)) {
 		NMSettingSecretFlags secret_flags = NM_SETTING_SECRET_FLAG_NONE;
 
 		if (!nm_setting_get_secret_flags (setting, key, &secret_flags, NULL))
-			g_assert_not_reached ();
-		if (secret_flags != NM_SETTING_SECRET_FLAG_NONE)
+			g_return_if_reached ();
+		if (!_secret_flags_persist_secret (secret_flags))
 			return;
 	}
 
+	value = (GValue) { 0 };
+
+	g_value_init (&value, G_PARAM_SPEC_VALUE_TYPE (property_info->param_spec));
+	g_object_get_property (G_OBJECT (setting), property_info->param_spec->name, &value);
+
 	if (   (!pip || !pip->writer_persist_default)
-	    && g_param_value_defaults (pspec, (GValue *) value)) {
+	    && g_param_value_defaults (property_info->param_spec, &value)) {
 		nm_assert (!g_key_file_has_key (info->keyfile, setting_name, key, NULL));
-		return;
+		goto out_unset_value;
 	}
 
 	if (pip && pip->writer) {
-		pip->writer (info, setting, key, value);
-		return;
+		pip->writer (info, setting, key, &value);
+		goto out_unset_value;
 	}
 
-	type = G_VALUE_TYPE (value);
+	type = G_VALUE_TYPE (&value);
 	if (type == G_TYPE_STRING) {
 		const char *str;
 
-		str = g_value_get_string (value);
+		str = g_value_get_string (&value);
 		if (str)
 			nm_keyfile_plugin_kf_set_string (info->keyfile, setting_name, key, str);
-	} else if (type == G_TYPE_UINT)
-		nm_keyfile_plugin_kf_set_integer (info->keyfile, setting_name, key, (int) g_value_get_uint (value));
-	else if (type == G_TYPE_INT)
-		nm_keyfile_plugin_kf_set_integer (info->keyfile, setting_name, key, g_value_get_int (value));
-	else if (type == G_TYPE_UINT64) {
-		char numstr[30];
-
-		nm_sprintf_buf (numstr, "%" G_GUINT64_FORMAT, g_value_get_uint64 (value));
+	} else if (type == G_TYPE_UINT) {
+		nm_sprintf_buf (numstr, "%u", g_value_get_uint (&value));
+		nm_keyfile_plugin_kf_set_value (info->keyfile, setting_name, key, numstr);
+	} else if (type == G_TYPE_INT) {
+		nm_sprintf_buf (numstr, "%d", g_value_get_int (&value));
+		nm_keyfile_plugin_kf_set_value (info->keyfile, setting_name, key, numstr);
+	} else if (type == G_TYPE_UINT64) {
+		nm_sprintf_buf (numstr, "%" G_GUINT64_FORMAT, g_value_get_uint64 (&value));
 		nm_keyfile_plugin_kf_set_value (info->keyfile, setting_name, key, numstr);
 	} else if (type == G_TYPE_INT64) {
-		char numstr[30];
-
-		nm_sprintf_buf (numstr, "%" G_GINT64_FORMAT, g_value_get_int64 (value));
+		nm_sprintf_buf (numstr, "%" G_GINT64_FORMAT, g_value_get_int64 (&value));
 		nm_keyfile_plugin_kf_set_value (info->keyfile, setting_name, key, numstr);
 	} else if (type == G_TYPE_BOOLEAN) {
-		nm_keyfile_plugin_kf_set_boolean (info->keyfile, setting_name, key, g_value_get_boolean (value));
+		nm_keyfile_plugin_kf_set_value (info->keyfile, setting_name, key,
+		                                  g_value_get_boolean (&value)
+		                                ? "true"
+		                                : "false");
 	} else if (type == G_TYPE_CHAR) {
-		nm_keyfile_plugin_kf_set_integer (info->keyfile, setting_name, key, (int) g_value_get_schar (value));
+		nm_sprintf_buf (numstr, "%d", (int) g_value_get_schar (&value));
+		nm_keyfile_plugin_kf_set_value (info->keyfile, setting_name, key, numstr);
 	} else if (type == G_TYPE_BYTES) {
 		GBytes *bytes;
 		const guint8 *data;
 		gsize len = 0;
 
-		bytes = g_value_get_boxed (value);
+		bytes = g_value_get_boxed (&value);
 		data = bytes ? g_bytes_get_data (bytes, &len) : NULL;
 
 		if (data != NULL && len > 0)
@@ -3061,19 +3308,109 @@ write_setting_value (NMSetting *setting,
 	} else if (type == G_TYPE_STRV) {
 		char **array;
 
-		array = (char **) g_value_get_boxed (value);
+		array = (char **) g_value_get_boxed (&value);
 		nm_keyfile_plugin_kf_set_string_list (info->keyfile, setting_name, key, (const char **const) array, g_strv_length (array));
 	} else if (type == G_TYPE_HASH_TABLE) {
-		write_hash_of_string (info->keyfile, setting, key, value);
+		write_hash_of_string (info->keyfile, setting, key, &value);
 	} else if (type == G_TYPE_ARRAY) {
-		write_array_of_uint (info->keyfile, setting, key, value);
-	} else if (G_VALUE_HOLDS_FLAGS (value)) {
-		/* Flags are guint but GKeyFile has no uint reader, just uint64 */
-		nm_keyfile_plugin_kf_set_uint64 (info->keyfile, setting_name, key, (guint64) g_value_get_flags (value));
-	} else if (G_VALUE_HOLDS_ENUM (value))
-		nm_keyfile_plugin_kf_set_integer (info->keyfile, setting_name, key, (int) g_value_get_enum (value));
-	else
-		g_warn_if_reached ();
+		write_array_of_uint (info->keyfile, setting, key, &value);
+	} else if (G_VALUE_HOLDS_FLAGS (&value)) {
+		nm_sprintf_buf (numstr, "%u", g_value_get_flags (&value));
+		nm_keyfile_plugin_kf_set_value (info->keyfile, setting_name, key, numstr);
+	} else if (G_VALUE_HOLDS_ENUM (&value)) {
+		nm_sprintf_buf (numstr, "%d", g_value_get_enum (&value));
+		nm_keyfile_plugin_kf_set_value (info->keyfile, setting_name, key, numstr);
+	} else
+		g_return_if_reached ();
+
+out_unset_value:
+	g_value_unset (&value);
+}
+
+static void
+_write_setting_wireguard (NMSetting *setting, KeyfileWriterInfo *info)
+{
+	NMSettingWireGuard *s_wg;
+	guint i_peer, n_peers;
+
+	s_wg = NM_SETTING_WIREGUARD (setting);
+
+	n_peers = nm_setting_wireguard_get_peers_len (s_wg);
+	for (i_peer = 0; i_peer < n_peers; i_peer++) {
+		NMWireGuardPeer *peer = nm_setting_wireguard_get_peer (s_wg, i_peer);
+		const char *public_key;
+		char group[NM_STRLEN (NM_KEYFILE_GROUPPREFIX_WIREGUARD_PEER) + 200];
+		NMSettingSecretFlags secret_flags;
+		gboolean any_key = FALSE;
+		guint i_aip, n_aip;
+		const char *cstr;
+		guint32 u32;
+
+		public_key = nm_wireguard_peer_get_public_key (peer);
+		if (   !public_key
+		    || !public_key[0]
+		    || !NM_STRCHAR_ALL (public_key, ch, nm_sd_utils_unbase64char (ch, TRUE) >= 0)) {
+			/* invalid peer. Skip it */
+			continue;
+		}
+
+		if (g_snprintf (group,
+		                sizeof (group),
+		                "%s%s",
+		                NM_KEYFILE_GROUPPREFIX_WIREGUARD_PEER,
+		                nm_wireguard_peer_get_public_key (peer)) >= sizeof (group)) {
+			/* Too long. Not a valid public key. Skip the peer. */
+			continue;
+		}
+
+		cstr = nm_wireguard_peer_get_endpoint (peer);
+		if (cstr) {
+			g_key_file_set_string (info->keyfile, group, NM_WIREGUARD_PEER_ATTR_ENDPOINT, cstr);
+			any_key = TRUE;
+		}
+
+		secret_flags = nm_wireguard_peer_get_preshared_key_flags (peer);
+		if (_secret_flags_persist_secret (secret_flags)) {
+			cstr = nm_wireguard_peer_get_preshared_key (peer);
+			if (cstr) {
+				g_key_file_set_string (info->keyfile, group, NM_WIREGUARD_PEER_ATTR_PRESHARED_KEY, cstr);
+				any_key = TRUE;
+			}
+		}
+
+		/* usually, we don't persist the secret-flags 0 (because they are the default).
+		 * For WireGuard peers, the default secret-flags for preshared-key are 4 (not-required).
+		 * So, in this case behave differently: a missing preshared-key-flag setting means
+		 * "not-required". */
+		if (secret_flags != NM_SETTING_SECRET_FLAG_NOT_REQUIRED) {
+			g_key_file_set_int64 (info->keyfile, group, NM_WIREGUARD_PEER_ATTR_PRESHARED_KEY_FLAGS, secret_flags);
+			any_key = TRUE;
+		}
+
+		u32 = nm_wireguard_peer_get_persistent_keepalive (peer);
+		if (u32) {
+			g_key_file_set_uint64 (info->keyfile, group, NM_WIREGUARD_PEER_ATTR_PERSISTENT_KEEPALIVE, u32);
+			any_key = TRUE;
+		}
+
+		n_aip = nm_wireguard_peer_get_allowed_ips_len (peer);
+		if (n_aip > 0) {
+			gs_free const char **strv = NULL;
+
+			strv = g_new (const char *, ((gsize) n_aip) + 1);
+			for (i_aip = 0; i_aip < n_aip; i_aip++)
+				strv[i_aip] = nm_wireguard_peer_get_allowed_ip (peer, i_aip, NULL);
+			strv[n_aip] = NULL;
+			g_key_file_set_string_list (info->keyfile, group, NM_WIREGUARD_PEER_ATTR_ALLOWED_IPS,
+			                            strv, n_aip);
+			any_key = TRUE;
+		}
+
+		if (!any_key) {
+			/* we cannot omit all keys. At an empty endpoint. */
+			g_key_file_set_string (info->keyfile, group, NM_WIREGUARD_PEER_ATTR_ENDPOINT, "");
+		}
+	}
 }
 
 GKeyFile *
@@ -3082,9 +3419,10 @@ nm_keyfile_write (NMConnection *connection,
                   void *user_data,
                   GError **error)
 {
-	KeyfileWriterInfo info = { 0 };
+	gs_unref_keyfile GKeyFile *keyfile = NULL;
+	KeyfileWriterInfo info;
 	gs_free NMSetting **settings = NULL;
-	guint i, length = 0;
+	guint i, j, n_settings = 0;
 
 	g_return_val_if_fail (NM_IS_CONNECTION (connection), NULL);
 	g_return_val_if_fail (!error || !*error, NULL);
@@ -3092,18 +3430,22 @@ nm_keyfile_write (NMConnection *connection,
 	if (!nm_connection_verify (connection, error))
 		return NULL;
 
-	info.connection = connection;
-	info.keyfile = g_key_file_new ();
-	info.error = NULL;
-	info.handler = handler;
-	info.user_data = user_data;
+	keyfile = g_key_file_new ();
 
-	settings = nm_connection_get_settings (connection, &length);
-	for (i = 0; i < length; i++) {
+	info = (KeyfileWriterInfo) {
+		.connection = connection,
+		.keyfile    = keyfile,
+		.error      = NULL,
+		.handler    = handler,
+		.user_data  = user_data,
+	};
+
+	settings = nm_connection_get_settings (connection, &n_settings);
+	for (i = 0; i < n_settings; i++) {
 		const NMSettInfoSetting *sett_info;
 		NMSetting *setting = settings[i];
 
-		sett_info = _nm_sett_info_setting_get (NM_SETTING_GET_CLASS (setting));
+		sett_info = _nm_setting_class_get_sett_info (NM_SETTING_GET_CLASS (setting));
 
 		if (sett_info->detail.gendata_info) {
 			guint k, n_keys;
@@ -3138,18 +3480,175 @@ nm_keyfile_write (NMConnection *connection,
 					}
 				}
 			}
-		} else
-			nm_setting_enumerate_values (setting, write_setting_value, &info);
+		}
 
-		if (info.error)
-			break;
+		for (j = 0; j < sett_info->property_infos_len; j++) {
+			const NMSettInfoProperty *property_info = _nm_sett_info_property_info_get_sorted (sett_info, j);
+
+			write_setting_value (&info, setting, property_info);
+			if (info.error)
+				goto out_with_info_error;
+		}
+
+		if (NM_IS_SETTING_WIREGUARD (setting)) {
+			_write_setting_wireguard (setting, &info);
+			if (info.error)
+				goto out_with_info_error;
+		}
+
+		nm_assert (!info.error);
 	}
 
-	if (info.error) {
-		g_propagate_error (error, info.error);
-		g_key_file_unref (info.keyfile);
-		return NULL;
+	nm_assert (!info.error);
+
+	return g_steal_pointer (&keyfile);
+
+out_with_info_error:
+	g_propagate_error (error, info.error);
+	return NULL;
+}
+
+/*****************************************************************************/
+
+static const char temp_letters[] =
+"abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789";
+
+/*
+ * Check '.[a-zA-Z0-9]{6}' file suffix used for temporary files by g_file_set_contents() (mkstemp()).
+ */
+static gboolean
+check_mkstemp_suffix (const char *path)
+{
+	const char *ptr;
+
+	nm_assert (path);
+
+	/* Matches *.[a-zA-Z0-9]{6} suffix of mkstemp()'s temporary files */
+	ptr = strrchr (path, '.');
+	if (   ptr
+	    && strspn (&ptr[1], temp_letters) == 6
+	    && ptr[7] == '\0')
+		return TRUE;
+	return FALSE;
+}
+
+static gboolean
+_check_suffix_impl (const char *base, const char *tag, gsize tag_len)
+{
+	gsize len;
+
+	nm_assert (base);
+	nm_assert (tag);
+	nm_assert (strlen (tag) == tag_len);
+
+	len = strlen (base);
+	if (   len > tag_len
+	    && !g_ascii_strcasecmp (base + len - tag_len, tag))
+		return TRUE;
+	return FALSE;
+}
+#define check_suffix(base, tag) _check_suffix_impl ((base), ""tag"", NM_STRLEN (tag))
+
+#define SWP_TAG ".swp"
+#define SWPX_TAG ".swpx"
+#define PEM_TAG ".pem"
+#define DER_TAG ".der"
+
+gboolean
+nm_keyfile_utils_ignore_filename (const char *filename, gboolean require_extension)
+{
+	const char *base;
+	gsize l;
+
+	/* ignore_filename() must mirror nm_keyfile_utils_create_filename() */
+
+	g_return_val_if_fail (filename, TRUE);
+
+	base = strrchr (filename, '/');
+	if (base)
+		base++;
+	else
+		base = filename;
+
+	if (!base[0]) {
+		/* this check above with strrchr() also rejects "/some/path/with/trailing/slash/",
+		 * but that is fine, because such a path would name a directory, and we are not
+		 * interested in directories. */
+		return TRUE;
+	}
+
+	if (base[0] == '.') {
+		/* don't allow hidden files */
+		return TRUE;
+	}
+
+	l = strlen (base);
+
+	if (require_extension) {
+		if (   l <= NM_STRLEN (NM_KEYFILE_PATH_SUFFIX_NMCONNECTION)
+		    || !g_str_has_suffix (base, NM_KEYFILE_PATH_SUFFIX_NMCONNECTION))
+			return TRUE;
+		return FALSE;
 	}
 
-	return info.keyfile;
+	/* Ignore backup files */
+	if (base[l - 1] == '~')
+		return TRUE;
+
+	/* Ignore temporary files */
+	if (check_mkstemp_suffix (base))
+		return TRUE;
+
+	/* Ignore 802.1x certificates and keys */
+	if (   check_suffix (base, PEM_TAG)
+	    || check_suffix (base, DER_TAG))
+		return TRUE;
+
+	return FALSE;
+}
+
+char *
+nm_keyfile_utils_create_filename (const char *name,
+                                  gboolean with_extension)
+{
+	GString *str;
+	const char *f = name;
+	/* keyfile used to escape with '*', do not change that behavior.
+	 *
+	 * But for newly added escapings, use '_' instead.
+	 * Also, @with_extension is new-style. */
+	const char ESCAPE_CHAR = with_extension ? '_' : '*';
+	const char ESCAPE_CHAR2 = '_';
+
+	g_return_val_if_fail (name && name[0], NULL);
+
+	str = g_string_sized_new (60);
+
+	/* Convert '/' to ESCAPE_CHAR */
+	for (f = name; f[0]; f++) {
+		if (f[0] == '/')
+			g_string_append_c (str, ESCAPE_CHAR);
+		else
+			g_string_append_c (str, f[0]);
+	}
+
+	/* nm_keyfile_utils_create_filename() must avoid anything that ignore_filename() would reject.
+	 * We can escape here more aggressivly then what we would read back. */
+	if (str->str[0] == '.')
+		str->str[0] = ESCAPE_CHAR2;
+	if (str->str[str->len - 1] == '~')
+		str->str[str->len - 1] = ESCAPE_CHAR2;
+	if (   check_mkstemp_suffix (str->str)
+	    || check_suffix (str->str, PEM_TAG)
+	    || check_suffix (str->str, DER_TAG))
+		g_string_append_c (str, ESCAPE_CHAR2);
+
+	if (with_extension)
+		g_string_append (str, NM_KEYFILE_PATH_SUFFIX_NMCONNECTION);
+
+	/* nm_keyfile_utils_create_filename() must mirror ignore_filename() */
+	nm_assert (!strchr (str->str, '/'));
+	nm_assert (!nm_keyfile_utils_ignore_filename (str->str, with_extension));
+
+	return g_string_free (str, FALSE);;
 }
diff --git a/libnm-core/nm-property-compare.c b/libnm-core/nm-property-compare.c
index 2a3ee397..d3a19ec7 100644
--- a/libnm-core/nm-property-compare.c
+++ b/libnm-core/nm-property-compare.c
@@ -22,11 +22,10 @@
 
 #include "nm-default.h"
 
-#include 
-#include 
-
 #include "nm-property-compare.h"
 
+#include 
+
 static int
 _nm_property_compare_collection (GVariant *value1, GVariant *value2)
 {
diff --git a/libnm-core/nm-setting-6lowpan.c b/libnm-core/nm-setting-6lowpan.c
index c0ce232d..3a2b084e 100644
--- a/libnm-core/nm-setting-6lowpan.c
+++ b/libnm-core/nm-setting-6lowpan.c
@@ -19,9 +19,20 @@
 
 #include "nm-default.h"
 
-#include "nm-setting-private.h"
 #include "nm-setting-6lowpan.h"
 
+#include "nm-setting-private.h"
+
+/**
+ * SECTION:nm-setting-6lowpan
+ * @short_description: Describes connection properties for 6LoWPAN interfaces
+ *
+ * The #NMSetting6Lowpan object is a #NMSetting subclass that describes properties
+ * necessary for connection to 6LoWPAN interfaces.
+ **/
+
+/*****************************************************************************/
+
 NM_GOBJECT_PROPERTIES_DEFINE_BASE (
 	PROP_PARENT,
 );
@@ -43,33 +54,11 @@ struct _NMSetting6LowpanClass {
 	NMSettingClass parent;
 };
 
-/**
- * SECTION:nm-setting-6lowpan
- * @short_description: Describes connection properties for 6LoWPAN interfaces
- *
- * The #NMSetting6Lowpan object is a #NMSetting subclass that describes properties
- * necessary for connection to 6LoWPAN interfaces.
- **/
-
 G_DEFINE_TYPE (NMSetting6Lowpan, nm_setting_6lowpan, NM_TYPE_SETTING)
 
 #define NM_SETTING_6LOWPAN_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_SETTING_6LOWPAN, NMSetting6LowpanPrivate))
 
-
-/**
- * nm_setting_6lowpan_new:
- *
- * Creates a new #NMSetting6Lowpan object with default values.
- *
- * Returns: (transfer full): the new empty #NMSetting6Lowpan object
- *
- * Since: 1.14
- **/
-NMSetting *
-nm_setting_6lowpan_new (void)
-{
-	return (NMSetting *) g_object_new (NM_TYPE_SETTING_6LOWPAN, NULL);
-}
+/*****************************************************************************/
 
 /**
  * nm_setting_6lowpan_get_parent:
@@ -143,22 +132,18 @@ verify (NMSetting *setting, NMConnection *connection, GError **error)
 	return TRUE;
 }
 
-static void
-nm_setting_6lowpan_init (NMSetting6Lowpan *setting)
-{
-}
+/*****************************************************************************/
 
 static void
-set_property (GObject *object, guint prop_id,
-              const GValue *value, GParamSpec *pspec)
+get_property (GObject *object, guint prop_id,
+              GValue *value, GParamSpec *pspec)
 {
 	NMSetting6Lowpan *setting = NM_SETTING_6LOWPAN (object);
 	NMSetting6LowpanPrivate *priv = NM_SETTING_6LOWPAN_GET_PRIVATE (setting);
 
 	switch (prop_id) {
 	case PROP_PARENT:
-		g_free (priv->parent);
-		priv->parent = g_value_dup_string (value);
+		g_value_set_string (value, priv->parent);
 		break;
 	default:
 		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
@@ -167,15 +152,16 @@ set_property (GObject *object, guint prop_id,
 }
 
 static void
-get_property (GObject *object, guint prop_id,
-              GValue *value, GParamSpec *pspec)
+set_property (GObject *object, guint prop_id,
+              const GValue *value, GParamSpec *pspec)
 {
 	NMSetting6Lowpan *setting = NM_SETTING_6LOWPAN (object);
 	NMSetting6LowpanPrivate *priv = NM_SETTING_6LOWPAN_GET_PRIVATE (setting);
 
 	switch (prop_id) {
 	case PROP_PARENT:
-		g_value_set_string (value, priv->parent);
+		g_free (priv->parent);
+		priv->parent = g_value_dup_string (value);
 		break;
 	default:
 		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
@@ -183,6 +169,28 @@ get_property (GObject *object, guint prop_id,
 	}
 }
 
+/*****************************************************************************/
+
+static void
+nm_setting_6lowpan_init (NMSetting6Lowpan *setting)
+{
+}
+
+/**
+ * nm_setting_6lowpan_new:
+ *
+ * Creates a new #NMSetting6Lowpan object with default values.
+ *
+ * Returns: (transfer full): the new empty #NMSetting6Lowpan object
+ *
+ * Since: 1.14
+ **/
+NMSetting *
+nm_setting_6lowpan_new (void)
+{
+	return (NMSetting *) g_object_new (NM_TYPE_SETTING_6LOWPAN, NULL);
+}
+
 static void
 finalize (GObject *object)
 {
@@ -202,8 +210,8 @@ nm_setting_6lowpan_class_init (NMSetting6LowpanClass *klass)
 
 	g_type_class_add_private (klass, sizeof (NMSetting6LowpanPrivate));
 
-	object_class->set_property = set_property;
 	object_class->get_property = get_property;
+	object_class->set_property = set_property;
 	object_class->finalize     = finalize;
 
 	setting_class->verify = verify;
diff --git a/libnm-core/nm-setting-8021x.c b/libnm-core/nm-setting-8021x.c
index 7e004c90..8a23fb34 100644
--- a/libnm-core/nm-setting-8021x.c
+++ b/libnm-core/nm-setting-8021x.c
@@ -24,8 +24,6 @@
 
 #include "nm-setting-8021x.h"
 
-#include 
-
 #include "nm-utils/nm-secret-utils.h"
 #include "nm-utils.h"
 #include "nm-crypto.h"
@@ -202,7 +200,7 @@ G_DEFINE_TYPE (NMSetting8021x, nm_setting_802_1x, NM_TYPE_SETTING)
  * nm_setting_802_1x_check_cert_scheme:
  * @pdata: (allow-none): the data pointer
  * @length: the length of the data
- * @error: (allow-none): (out): validation reason
+ * @error: (allow-none) (out): validation reason
  *
  * Determines and verifies the blob type.
  * When setting certificate properties of NMSetting8021x
@@ -246,7 +244,7 @@ nm_setting_802_1x_check_cert_scheme (gconstpointer pdata, gsize length, GError *
 	if (scheme != NM_SETTING_802_1X_CK_SCHEME_BLOB) {
 		/* An actual URI must be NUL terminated, contain at least
 		 * one non-NUL character, and contain only one trailing NUL
-		 * chracter.
+		 * character.
 		 * And ensure it's UTF-8 valid too so we can pass it through
 		 * D-Bus and stuff like that. */
 
@@ -3369,8 +3367,6 @@ finalize (GObject *object)
 	NMSetting8021x *self = NM_SETTING_802_1X (object);
 	NMSetting8021xPrivate *priv = NM_SETTING_802_1X_GET_PRIVATE (self);
 
-	/* Strings first. g_free() already checks for NULLs so we don't have to */
-
 	g_free (priv->identity);
 	g_free (priv->anonymous_identity);
 	g_free (priv->ca_path);
@@ -3416,8 +3412,8 @@ nm_setting_802_1x_class_init (NMSetting8021xClass *klass)
 
 	g_type_class_add_private (klass, sizeof (NMSetting8021xPrivate));
 
-	object_class->set_property = set_property;
 	object_class->get_property = get_property;
+	object_class->set_property = set_property;
 	object_class->finalize     = finalize;
 
 	setting_class->verify       = verify;
diff --git a/libnm-core/nm-setting-8021x.h b/libnm-core/nm-setting-8021x.h
index 82ef5eba..eb7b1948 100644
--- a/libnm-core/nm-setting-8021x.h
+++ b/libnm-core/nm-setting-8021x.h
@@ -90,12 +90,11 @@ typedef enum { /*< underscore_name=nm_setting_802_1x_ck_scheme >*/
  */
 typedef enum { /*< underscore_name=nm_setting_802_1x_auth_flags >*/
 	NM_SETTING_802_1X_AUTH_FLAGS_NONE                = 0,
-	NM_SETTING_802_1X_AUTH_FLAGS_TLS_1_0_DISABLE     = (1 << 0),
-	NM_SETTING_802_1X_AUTH_FLAGS_TLS_1_1_DISABLE     = (1 << 1),
-	NM_SETTING_802_1X_AUTH_FLAGS_TLS_1_2_DISABLE     = (1 << 2),
+	NM_SETTING_802_1X_AUTH_FLAGS_TLS_1_0_DISABLE     = 0x1,
+	NM_SETTING_802_1X_AUTH_FLAGS_TLS_1_1_DISABLE     = 0x2,
+	NM_SETTING_802_1X_AUTH_FLAGS_TLS_1_2_DISABLE     = 0x4,
 
-	_NM_SETTING_802_1X_AUTH_FLAGS_LAST, /*< skip >*/
-	NM_SETTING_802_1X_AUTH_FLAGS_ALL                 = (((_NM_SETTING_802_1X_AUTH_FLAGS_LAST - 1) << 1) - 1),
+	NM_SETTING_802_1X_AUTH_FLAGS_ALL                 = 0x7,
 } NMSetting8021xAuthFlags;
 
 #define NM_TYPE_SETTING_802_1X            (nm_setting_802_1x_get_type ())
diff --git a/libnm-core/nm-setting-adsl.c b/libnm-core/nm-setting-adsl.c
index 9ffff927..b2de7027 100644
--- a/libnm-core/nm-setting-adsl.c
+++ b/libnm-core/nm-setting-adsl.c
@@ -21,9 +21,8 @@
 
 #include "nm-default.h"
 
-#include 
-
 #include "nm-setting-adsl.h"
+
 #include "nm-setting-ppp.h"
 #include "nm-setting-private.h"
 #include "nm-utils.h"
@@ -37,9 +36,17 @@
  * properties of ADSL connections.
  */
 
-G_DEFINE_TYPE (NMSettingAdsl, nm_setting_adsl, NM_TYPE_SETTING)
+/*****************************************************************************/
 
-#define NM_SETTING_ADSL_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_SETTING_ADSL, NMSettingAdslPrivate))
+NM_GOBJECT_PROPERTIES_DEFINE_BASE (
+	PROP_USERNAME,
+	PROP_PASSWORD,
+	PROP_PASSWORD_FLAGS,
+	PROP_PROTOCOL,
+	PROP_ENCAPSULATION,
+	PROP_VPI,
+	PROP_VCI,
+);
 
 typedef struct {
 	char *  username;
@@ -51,31 +58,11 @@ typedef struct {
 	guint32 vci;
 } NMSettingAdslPrivate;
 
-enum {
-	PROP_0,
-	PROP_USERNAME,
-	PROP_PASSWORD,
-	PROP_PASSWORD_FLAGS,
-	PROP_PROTOCOL,
-	PROP_ENCAPSULATION,
-	PROP_VPI,
-	PROP_VCI,
+G_DEFINE_TYPE (NMSettingAdsl, nm_setting_adsl, NM_TYPE_SETTING)
 
-	LAST_PROP
-};
+#define NM_SETTING_ADSL_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_SETTING_ADSL, NMSettingAdslPrivate))
 
-/**
- * nm_setting_adsl_new:
- *
- * Creates a new #NMSettingAdsl object with default values.
- *
- * Returns: the new empty #NMSettingAdsl object
- **/
-NMSetting *
-nm_setting_adsl_new (void)
-{
-	return (NMSetting *) g_object_new (NM_TYPE_SETTING_ADSL, NULL);
-}
+/*****************************************************************************/
 
 /**
  * nm_setting_adsl_get_username:
@@ -250,22 +237,40 @@ need_secrets (NMSetting *setting)
 	return secrets;
 }
 
-static void
-nm_setting_adsl_init (NMSettingAdsl *setting)
-{
-}
+/*****************************************************************************/
 
 static void
-finalize (GObject *object)
+get_property (GObject *object, guint prop_id,
+              GValue *value, GParamSpec *pspec)
 {
-	NMSettingAdslPrivate *priv = NM_SETTING_ADSL_GET_PRIVATE (object);
-
-	g_free (priv->username);
-	g_free (priv->password);
-	g_free (priv->protocol);
-	g_free (priv->encapsulation);
+	NMSettingAdsl *setting = NM_SETTING_ADSL (object);
 
-	G_OBJECT_CLASS (nm_setting_adsl_parent_class)->finalize (object);
+	switch (prop_id) {
+	case PROP_USERNAME:
+		g_value_set_string (value, nm_setting_adsl_get_username (setting));
+		break;
+	case PROP_PASSWORD:
+		g_value_set_string (value, nm_setting_adsl_get_password (setting));
+		break;
+	case PROP_PASSWORD_FLAGS:
+		g_value_set_flags (value, nm_setting_adsl_get_password_flags (setting));
+		break;
+	case PROP_PROTOCOL:
+		g_value_set_string (value, nm_setting_adsl_get_protocol (setting));
+		break;
+	case PROP_ENCAPSULATION:
+		g_value_set_string (value, nm_setting_adsl_get_encapsulation (setting));
+		break;
+	case PROP_VPI:
+		g_value_set_uint (value, nm_setting_adsl_get_vpi (setting));
+		break;
+	case PROP_VCI:
+		g_value_set_uint (value, nm_setting_adsl_get_vci (setting));
+		break;
+	default:
+		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+		break;
+	}
 }
 
 static void
@@ -309,38 +314,37 @@ set_property (GObject *object, guint prop_id,
 	}
 }
 
+/*****************************************************************************/
+
 static void
-get_property (GObject *object, guint prop_id,
-              GValue *value, GParamSpec *pspec)
+nm_setting_adsl_init (NMSettingAdsl *setting)
 {
-	NMSettingAdsl *setting = NM_SETTING_ADSL (object);
+}
 
-	switch (prop_id) {
-	case PROP_USERNAME:
-		g_value_set_string (value, nm_setting_adsl_get_username (setting));
-		break;
-	case PROP_PASSWORD:
-		g_value_set_string (value, nm_setting_adsl_get_password (setting));
-		break;
-	case PROP_PASSWORD_FLAGS:
-		g_value_set_flags (value, nm_setting_adsl_get_password_flags (setting));
-		break;
-	case PROP_PROTOCOL:
-		g_value_set_string (value, nm_setting_adsl_get_protocol (setting));
-		break;
-	case PROP_ENCAPSULATION:
-		g_value_set_string (value, nm_setting_adsl_get_encapsulation (setting));
-		break;
-	case PROP_VPI:
-		g_value_set_uint (value, nm_setting_adsl_get_vpi (setting));
-		break;
-	case PROP_VCI:
-		g_value_set_uint (value, nm_setting_adsl_get_vci (setting));
-		break;
-	default:
-		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-		break;
-	}
+/**
+ * nm_setting_adsl_new:
+ *
+ * Creates a new #NMSettingAdsl object with default values.
+ *
+ * Returns: the new empty #NMSettingAdsl object
+ **/
+NMSetting *
+nm_setting_adsl_new (void)
+{
+	return (NMSetting *) g_object_new (NM_TYPE_SETTING_ADSL, NULL);
+}
+
+static void
+finalize (GObject *object)
+{
+	NMSettingAdslPrivate *priv = NM_SETTING_ADSL_GET_PRIVATE (object);
+
+	g_free (priv->username);
+	g_free (priv->password);
+	g_free (priv->protocol);
+	g_free (priv->encapsulation);
+
+	G_OBJECT_CLASS (nm_setting_adsl_parent_class)->finalize (object);
 }
 
 static void
@@ -351,8 +355,8 @@ nm_setting_adsl_class_init (NMSettingAdslClass *klass)
 
 	g_type_class_add_private (klass, sizeof (NMSettingAdslPrivate));
 
-	object_class->set_property = set_property;
 	object_class->get_property = get_property;
+	object_class->set_property = set_property;
 	object_class->finalize     = finalize;
 
 	setting_class->verify         = verify;
@@ -364,86 +368,81 @@ nm_setting_adsl_class_init (NMSettingAdslClass *klass)
 	 *
 	 * Username used to authenticate with the ADSL service.
 	 **/
-	g_object_class_install_property
-		(object_class, PROP_USERNAME,
-		 g_param_spec_string (NM_SETTING_ADSL_USERNAME, "", "",
-		                      NULL,
-		                      G_PARAM_READWRITE |
-		                      G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_USERNAME] =
+	    g_param_spec_string (NM_SETTING_ADSL_USERNAME, "", "",
+	                         NULL,
+	                         G_PARAM_READWRITE |
+	                         G_PARAM_STATIC_STRINGS);
 
 	/**
 	 * NMSettingAdsl:password:
 	 *
 	 * Password used to authenticate with the ADSL service.
 	 **/
-	g_object_class_install_property
-		(object_class, PROP_PASSWORD,
-		 g_param_spec_string (NM_SETTING_ADSL_PASSWORD, "", "",
-		                      NULL,
-		                      G_PARAM_READWRITE |
-		                      NM_SETTING_PARAM_SECRET |
-		                      G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_PASSWORD] =
+	    g_param_spec_string (NM_SETTING_ADSL_PASSWORD, "", "",
+	                         NULL,
+	                         G_PARAM_READWRITE |
+	                         NM_SETTING_PARAM_SECRET |
+	                         G_PARAM_STATIC_STRINGS);
 
 	/**
 	 * NMSettingAdsl:password-flags:
 	 *
 	 * Flags indicating how to handle the #NMSettingAdsl:password property.
 	 **/
-	g_object_class_install_property
-		(object_class, PROP_PASSWORD_FLAGS,
-		 g_param_spec_flags (NM_SETTING_ADSL_PASSWORD_FLAGS, "", "",
-		                     NM_TYPE_SETTING_SECRET_FLAGS,
-		                     NM_SETTING_SECRET_FLAG_NONE,
-		                     G_PARAM_READWRITE |
-		                     G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_PASSWORD_FLAGS] =
+	    g_param_spec_flags (NM_SETTING_ADSL_PASSWORD_FLAGS, "", "",
+	                        NM_TYPE_SETTING_SECRET_FLAGS,
+	                        NM_SETTING_SECRET_FLAG_NONE,
+	                        G_PARAM_READWRITE |
+	                        G_PARAM_STATIC_STRINGS);
 
 	/**
 	 * NMSettingAdsl:protocol:
 	 *
 	 * ADSL connection protocol.  Can be "pppoa", "pppoe" or "ipoatm".
 	 **/
-	g_object_class_install_property
-		(object_class, PROP_PROTOCOL,
-		 g_param_spec_string (NM_SETTING_ADSL_PROTOCOL, "", "",
-		                      NULL,
-		                      G_PARAM_READWRITE |
-		                      G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_PROTOCOL] =
+	    g_param_spec_string (NM_SETTING_ADSL_PROTOCOL, "", "",
+	                         NULL,
+	                         G_PARAM_READWRITE |
+	                         G_PARAM_STATIC_STRINGS);
 
 	/**
 	 * NMSettingAdsl:encapsulation:
 	 *
 	 * Encapsulation of ADSL connection.  Can be "vcmux" or "llc".
 	 **/
-	g_object_class_install_property
-		(object_class, PROP_ENCAPSULATION,
-		 g_param_spec_string (NM_SETTING_ADSL_ENCAPSULATION, "", "",
-		                      NULL,
-		                      G_PARAM_READWRITE |
-		                      G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_ENCAPSULATION] =
+	    g_param_spec_string (NM_SETTING_ADSL_ENCAPSULATION, "", "",
+	                         NULL,
+	                         G_PARAM_READWRITE |
+	                         G_PARAM_STATIC_STRINGS);
 
 	/**
 	 * NMSettingAdsl:vpi:
 	 *
 	 * VPI of ADSL connection
 	 **/
-	g_object_class_install_property
-		(object_class, PROP_VPI,
-		 g_param_spec_uint (NM_SETTING_ADSL_VPI, "", "",
-		                    0, 65536, 0,
-		                    G_PARAM_READWRITE |
-		                    G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_VPI] =
+	    g_param_spec_uint (NM_SETTING_ADSL_VPI, "", "",
+	                       0, 65536, 0,
+	                       G_PARAM_READWRITE |
+	                       G_PARAM_STATIC_STRINGS);
 
 	/**
 	 * NMSettingAdsl:vci:
 	 *
 	 * VCI of ADSL connection
 	 **/
-	g_object_class_install_property
-		(object_class, PROP_VCI,
-		 g_param_spec_uint (NM_SETTING_ADSL_VCI, "", "",
-		                    0, 65536, 0,
-		                    G_PARAM_READWRITE |
-		                    G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_VCI] =
+	    g_param_spec_uint (NM_SETTING_ADSL_VCI, "", "",
+	                       0, 65536, 0,
+	                       G_PARAM_READWRITE |
+	                       G_PARAM_STATIC_STRINGS);
+
+	g_object_class_install_properties (object_class, _PROPERTY_ENUMS_LAST, obj_properties);
 
 	_nm_setting_class_commit (setting_class, NM_META_SETTING_TYPE_ADSL);
 }
diff --git a/libnm-core/nm-setting-bluetooth.c b/libnm-core/nm-setting-bluetooth.c
index bbc6a83d..bc4f8bd0 100644
--- a/libnm-core/nm-setting-bluetooth.c
+++ b/libnm-core/nm-setting-bluetooth.c
@@ -22,11 +22,11 @@
 
 #include "nm-default.h"
 
-#include 
+#include "nm-setting-bluetooth.h"
+
 #include 
 
 #include "nm-connection-private.h"
-#include "nm-setting-bluetooth.h"
 #include "nm-setting-cdma.h"
 #include "nm-setting-gsm.h"
 #include "nm-setting-private.h"
@@ -43,34 +43,23 @@
  * Point (NAP) profiles.
  **/
 
-G_DEFINE_TYPE (NMSettingBluetooth, nm_setting_bluetooth, NM_TYPE_SETTING)
+/*****************************************************************************/
 
-#define NM_SETTING_BLUETOOTH_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_SETTING_BLUETOOTH, NMSettingBluetoothPrivate))
+NM_GOBJECT_PROPERTIES_DEFINE_BASE (
+	PROP_BDADDR,
+	PROP_TYPE,
+);
 
 typedef struct {
 	char *bdaddr;
 	char *type;
 } NMSettingBluetoothPrivate;
 
-enum {
-	PROP_0,
-	PROP_BDADDR,
-	PROP_TYPE,
+G_DEFINE_TYPE (NMSettingBluetooth, nm_setting_bluetooth, NM_TYPE_SETTING)
 
-	LAST_PROP
-};
+#define NM_SETTING_BLUETOOTH_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_SETTING_BLUETOOTH, NMSettingBluetoothPrivate))
 
-/**
- * nm_setting_bluetooth_new:
- *
- * Creates a new #NMSettingBluetooth object with default values.
- *
- * Returns: (transfer full): the new empty #NMSettingBluetooth object
- **/
-NMSetting *nm_setting_bluetooth_new (void)
-{
-	return (NMSetting *) g_object_new (NM_TYPE_SETTING_BLUETOOTH, NULL);
-}
+/*****************************************************************************/
 
 /**
  * nm_setting_bluetooth_get_connection_type:
@@ -224,20 +213,25 @@ verify (NMSetting *setting, NMConnection *connection, GError **error)
 	return TRUE;
 }
 
-static void
-nm_setting_bluetooth_init (NMSettingBluetooth *setting)
-{
-}
+/*****************************************************************************/
 
 static void
-finalize (GObject *object)
+get_property (GObject *object, guint prop_id,
+              GValue *value, GParamSpec *pspec)
 {
-	NMSettingBluetoothPrivate *priv = NM_SETTING_BLUETOOTH_GET_PRIVATE (object);
-
-	g_free (priv->bdaddr);
-	g_free (priv->type);
+	NMSettingBluetooth *setting = NM_SETTING_BLUETOOTH (object);
 
-	G_OBJECT_CLASS (nm_setting_bluetooth_parent_class)->finalize (object);
+	switch (prop_id) {
+	case PROP_BDADDR:
+		g_value_set_string (value, nm_setting_bluetooth_get_bdaddr (setting));
+		break;
+	case PROP_TYPE:
+		g_value_set_string (value, nm_setting_bluetooth_get_connection_type (setting));
+		break;
+	default:
+		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+		break;
+	}
 }
 
 static void
@@ -261,23 +255,34 @@ set_property (GObject *object, guint prop_id,
 	}
 }
 
+/*****************************************************************************/
+
 static void
-get_property (GObject *object, guint prop_id,
-              GValue *value, GParamSpec *pspec)
+nm_setting_bluetooth_init (NMSettingBluetooth *setting)
 {
-	NMSettingBluetooth *setting = NM_SETTING_BLUETOOTH (object);
+}
 
-	switch (prop_id) {
-	case PROP_BDADDR:
-		g_value_set_string (value, nm_setting_bluetooth_get_bdaddr (setting));
-		break;
-	case PROP_TYPE:
-		g_value_set_string (value, nm_setting_bluetooth_get_connection_type (setting));
-		break;
-	default:
-		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-		break;
-	}
+/**
+ * nm_setting_bluetooth_new:
+ *
+ * Creates a new #NMSettingBluetooth object with default values.
+ *
+ * Returns: (transfer full): the new empty #NMSettingBluetooth object
+ **/
+NMSetting *nm_setting_bluetooth_new (void)
+{
+	return (NMSetting *) g_object_new (NM_TYPE_SETTING_BLUETOOTH, NULL);
+}
+
+static void
+finalize (GObject *object)
+{
+	NMSettingBluetoothPrivate *priv = NM_SETTING_BLUETOOTH_GET_PRIVATE (object);
+
+	g_free (priv->bdaddr);
+	g_free (priv->type);
+
+	G_OBJECT_CLASS (nm_setting_bluetooth_parent_class)->finalize (object);
 }
 
 static void
@@ -289,8 +294,8 @@ nm_setting_bluetooth_class_init (NMSettingBluetoothClass *klass)
 
 	g_type_class_add_private (klass, sizeof (NMSettingBluetoothPrivate));
 
-	object_class->set_property = set_property;
 	object_class->get_property = get_property;
+	object_class->set_property = set_property;
 	object_class->finalize     = finalize;
 
 	setting_class->verify       = verify;
@@ -300,17 +305,15 @@ nm_setting_bluetooth_class_init (NMSettingBluetoothClass *klass)
 	 *
 	 * The Bluetooth address of the device.
 	 **/
-	g_object_class_install_property
-		(object_class, PROP_BDADDR,
-		 g_param_spec_string (NM_SETTING_BLUETOOTH_BDADDR, "", "",
-		                      NULL,
-		                      G_PARAM_READWRITE |
-		                      NM_SETTING_PARAM_INFERRABLE |
-		                      G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_BDADDR] =
+	    g_param_spec_string (NM_SETTING_BLUETOOTH_BDADDR, "", "",
+	                         NULL,
+	                         G_PARAM_READWRITE |
+	                         NM_SETTING_PARAM_INFERRABLE |
+	                         G_PARAM_STATIC_STRINGS);
 
 	_properties_override_add_transform (properties_override,
-	                                    g_object_class_find_property (G_OBJECT_CLASS (setting_class),
-	                                                                  NM_SETTING_BLUETOOTH_BDADDR),
+	                                    obj_properties[PROP_BDADDR],
 	                                    G_VARIANT_TYPE_BYTESTRING,
 	                                    _nm_utils_hwaddr_to_dbus,
 	                                    _nm_utils_hwaddr_from_dbus);
@@ -321,13 +324,14 @@ nm_setting_bluetooth_class_init (NMSettingBluetoothClass *klass)
 	 * Either "dun" for Dial-Up Networking connections or "panu" for Personal
 	 * Area Networking connections to devices supporting the NAP profile.
 	 **/
-	g_object_class_install_property
-		(object_class, PROP_TYPE,
-		 g_param_spec_string (NM_SETTING_BLUETOOTH_TYPE, "", "",
-		                      NULL,
-		                      G_PARAM_READWRITE |
-		                      NM_SETTING_PARAM_INFERRABLE |
-		                      G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_TYPE] =
+	    g_param_spec_string (NM_SETTING_BLUETOOTH_TYPE, "", "",
+	                         NULL,
+	                         G_PARAM_READWRITE |
+	                         NM_SETTING_PARAM_INFERRABLE |
+	                         G_PARAM_STATIC_STRINGS);
+
+	g_object_class_install_properties (object_class, _PROPERTY_ENUMS_LAST, obj_properties);
 
 	_nm_setting_class_commit_full (setting_class, NM_META_SETTING_TYPE_BLUETOOTH,
 	                               NULL, properties_override);
diff --git a/libnm-core/nm-setting-bond.c b/libnm-core/nm-setting-bond.c
index 0c84b3a0..51ce2deb 100644
--- a/libnm-core/nm-setting-bond.c
+++ b/libnm-core/nm-setting-bond.c
@@ -21,13 +21,12 @@
 
 #include "nm-default.h"
 
-#include 
+#include "nm-setting-bond.h"
+
 #include 
-#include 
 #include 
 #include 
 
-#include "nm-setting-bond.h"
 #include "nm-utils.h"
 #include "nm-utils-private.h"
 #include "nm-connection-private.h"
@@ -46,11 +45,9 @@
 
 /*****************************************************************************/
 
-enum {
-	PROP_0,
+NM_GOBJECT_PROPERTIES_DEFINE (NMSettingBond,
 	PROP_OPTIONS,
-	LAST_PROP
-};
+);
 
 typedef struct {
 	GHashTable *options;
@@ -178,19 +175,14 @@ nm_setting_bond_get_option (NMSettingBond *setting,
 static gboolean
 validate_int (const char *name, const char *value, const BondDefault *def)
 {
-	long num;
-	guint i;
+	guint64 num;
 
-	for (i = 0; i < strlen (value); i++) {
-		if (!g_ascii_isdigit (value[i]) && value[i] != '-')
-			return FALSE;
-	}
-
-	errno = 0;
-	num = strtol (value, NULL, 10);
-	if (errno)
+	if (!NM_STRCHAR_ALL (value, ch, g_ascii_isdigit (ch)))
 		return FALSE;
-	if (num < def->min || num > def->max)
+
+	num = _nm_utils_ascii_str_to_uint64 (value, 10, def->min, def->max, G_MAXUINT64);
+	if (   num == G_MAXUINT64
+	    && errno != 0)
 		return FALSE;
 
 	return TRUE;
@@ -365,7 +357,7 @@ nm_setting_bond_add_option (NMSettingBond *setting,
 		g_hash_table_remove (priv->options, NM_SETTING_BOND_OPTION_UPDELAY);
 	}
 
-	g_object_notify (G_OBJECT (setting), NM_SETTING_BOND_OPTIONS);
+	_notify (setting, PROP_OPTIONS);
 
 	return TRUE;
 }
@@ -398,7 +390,7 @@ nm_setting_bond_remove_option (NMSettingBond *setting,
 	nm_clear_g_free (&priv->options_idx_cache);
 	found = g_hash_table_remove (priv->options, name);
 	if (found)
-		g_object_notify (G_OBJECT (setting), NM_SETTING_BOND_OPTIONS);
+		_notify (setting, PROP_OPTIONS);
 	return found;
 }
 
@@ -811,15 +803,15 @@ verify (NMSetting *setting, NMConnection *connection, GError **error)
 /*****************************************************************************/
 
 static gboolean
-options_hash_match (NMSettingBond *s_bond,
-                    GHashTable *options1,
-                    GHashTable *options2,
+options_equal_asym (NMSettingBond *s_bond,
+                    NMSettingBond *s_bond2,
                     NMSettingCompareFlags flags)
 {
+	GHashTable *options2 = NM_SETTING_BOND_GET_PRIVATE (s_bond2)->options;
 	GHashTableIter iter;
 	const char *key, *value, *value2;
 
-	g_hash_table_iter_init (&iter, options1);
+	g_hash_table_iter_init (&iter, NM_SETTING_BOND_GET_PRIVATE (s_bond)->options);
 	while (g_hash_table_iter_next (&iter, (gpointer *) &key, (gpointer *) &value)) {
 
 		if (NM_FLAGS_HAS (flags, NM_SETTING_COMPARE_FLAG_INFERRABLE)) {
@@ -841,15 +833,10 @@ options_hash_match (NMSettingBond *s_bond,
 				value2 = g_hash_table_lookup (options2, "num_grat_arp");
 		}
 
-		if (value2) {
-			if (nm_streq (value, value2))
-				continue;
-		} else {
-			if (nm_streq (value, nm_setting_bond_get_option_default (s_bond, key)))
-				continue;
-		}
-
-		return FALSE;
+		if (!value2)
+			value2 = nm_setting_bond_get_option_default (s_bond2, key);
+		if (!nm_streq (value, value2))
+			return FALSE;
 	}
 
 	return TRUE;
@@ -857,31 +844,32 @@ options_hash_match (NMSettingBond *s_bond,
 
 static gboolean
 options_equal (NMSettingBond *s_bond,
-               GHashTable *options1,
-               GHashTable *options2,
+               NMSettingBond *s_bond2,
                NMSettingCompareFlags flags)
 {
-	return    options_hash_match (s_bond, options1, options2, flags)
-	       && options_hash_match (s_bond, options2, options1, flags);
+	return    options_equal_asym (s_bond, s_bond2, flags)
+	       && options_equal_asym (s_bond2, s_bond, flags);
 }
 
-static gboolean
-compare_property (NMSetting *setting,
+static NMTernary
+compare_property (const NMSettInfoSetting *sett_info,
+                  guint property_idx,
+                  NMSetting *setting,
                   NMSetting *other,
-                  const GParamSpec *prop_spec,
                   NMSettingCompareFlags flags)
 {
-	NMSettingClass *setting_class;
-
-	if (nm_streq0 (prop_spec->name, NM_SETTING_BOND_OPTIONS)) {
-		return options_equal (NM_SETTING_BOND (setting),
-		                      NM_SETTING_BOND_GET_PRIVATE (setting)->options,
-		                      NM_SETTING_BOND_GET_PRIVATE (other)->options,
-		                      flags);
+	if (nm_streq (sett_info->property_infos[property_idx].name, NM_SETTING_BOND_OPTIONS)) {
+		return (   !other
+		        || options_equal (NM_SETTING_BOND (setting),
+		                          NM_SETTING_BOND (other),
+		                          flags));
 	}
 
-	setting_class = NM_SETTING_CLASS (nm_setting_bond_parent_class);
-	return setting_class->compare_property (setting, other, prop_spec, flags);
+	return NM_SETTING_CLASS (nm_setting_bond_parent_class)->compare_property (sett_info,
+	                                                                          property_idx,
+	                                                                          setting,
+	                                                                          other,
+	                                                                          flags);
 }
 
 /*****************************************************************************/
@@ -966,8 +954,8 @@ nm_setting_bond_class_init (NMSettingBondClass *klass)
 
 	g_type_class_add_private (klass, sizeof (NMSettingBondPrivate));
 
-	object_class->set_property     = set_property;
 	object_class->get_property     = get_property;
+	object_class->set_property     = set_property;
 	object_class->finalize         = finalize;
 
 	setting_class->verify           = verify;
@@ -987,17 +975,15 @@ nm_setting_bond_class_init (NMSettingBondClass *klass)
 	 * example: BONDING_OPTS="miimon=100 mode=broadcast"
 	 * ---end---
 	 */
-	 g_object_class_install_property
-		 (object_class, PROP_OPTIONS,
-		 g_param_spec_boxed (NM_SETTING_BOND_OPTIONS, "", "",
-		                     G_TYPE_HASH_TABLE,
-		                     G_PARAM_READWRITE |
-		                     NM_SETTING_PARAM_INFERRABLE |
-		                     G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_OPTIONS] =
+	    g_param_spec_boxed (NM_SETTING_BOND_OPTIONS, "", "",
+	                        G_TYPE_HASH_TABLE,
+	                        G_PARAM_READWRITE |
+	                        NM_SETTING_PARAM_INFERRABLE |
+	                        G_PARAM_STATIC_STRINGS);
 
 	_properties_override_add_transform (properties_override,
-	                                    g_object_class_find_property (G_OBJECT_CLASS (setting_class),
-	                                                                  NM_SETTING_BOND_OPTIONS),
+	                                    obj_properties[PROP_OPTIONS],
 	                                    G_VARIANT_TYPE ("a{ss}"),
 	                                    _nm_utils_strdict_to_dbus,
 	                                    _nm_utils_strdict_from_dbus);
@@ -1016,6 +1002,8 @@ nm_setting_bond_class_init (NMSettingBondClass *klass)
 	                                    _nm_setting_get_deprecated_virtual_interface_name,
 	                                    NULL);
 
+	g_object_class_install_properties (object_class, _PROPERTY_ENUMS_LAST, obj_properties);
+
 	_nm_setting_class_commit_full (setting_class, NM_META_SETTING_TYPE_BOND,
 	                               NULL, properties_override);
 }
diff --git a/libnm-core/nm-setting-bridge-port.c b/libnm-core/nm-setting-bridge-port.c
index bc9c3e6f..614c883c 100644
--- a/libnm-core/nm-setting-bridge-port.c
+++ b/libnm-core/nm-setting-bridge-port.c
@@ -21,11 +21,11 @@
 
 #include "nm-default.h"
 
-#include 
+#include "nm-setting-bridge-port.h"
+
 #include 
 #include 
 
-#include "nm-setting-bridge-port.h"
 #include "nm-utils.h"
 #include "nm-utils-private.h"
 #include "nm-connection-private.h"
@@ -40,9 +40,13 @@
  * optional properties that apply to bridge ports.
  **/
 
-G_DEFINE_TYPE (NMSettingBridgePort, nm_setting_bridge_port, NM_TYPE_SETTING)
+/*****************************************************************************/
 
-#define NM_SETTING_BRIDGE_PORT_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_SETTING_BRIDGE_PORT, NMSettingBridgePortPrivate))
+NM_GOBJECT_PROPERTIES_DEFINE_BASE (
+	PROP_PRIORITY,
+	PROP_PATH_COST,
+	PROP_HAIRPIN_MODE,
+);
 
 typedef struct {
 	guint16 priority;
@@ -50,13 +54,9 @@ typedef struct {
 	gboolean hairpin_mode;
 } NMSettingBridgePortPrivate;
 
-enum {
-	PROP_0,
-	PROP_PRIORITY,
-	PROP_PATH_COST,
-	PROP_HAIRPIN_MODE,
-	LAST_PROP
-};
+G_DEFINE_TYPE (NMSettingBridgePort, nm_setting_bridge_port, NM_TYPE_SETTING)
+
+#define NM_SETTING_BRIDGE_PORT_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_SETTING_BRIDGE_PORT, NMSettingBridgePortPrivate))
 
 /*****************************************************************************/
 
@@ -141,39 +141,21 @@ verify (NMSetting *setting, NMConnection *connection, GError **error)
 
 /*****************************************************************************/
 
-/**
- * nm_setting_bridge_port_new:
- *
- * Creates a new #NMSettingBridgePort object with default values.
- *
- * Returns: (transfer full): the new empty #NMSettingBridgePort object
- **/
-NMSetting *
-nm_setting_bridge_port_new (void)
-{
-	return (NMSetting *) g_object_new (NM_TYPE_SETTING_BRIDGE_PORT, NULL);
-}
-
 static void
-nm_setting_bridge_port_init (NMSettingBridgePort *setting)
-{
-}
-
-static void
-set_property (GObject *object, guint prop_id,
-              const GValue *value, GParamSpec *pspec)
+get_property (GObject *object, guint prop_id,
+              GValue *value, GParamSpec *pspec)
 {
 	NMSettingBridgePortPrivate *priv = NM_SETTING_BRIDGE_PORT_GET_PRIVATE (object);
 
 	switch (prop_id) {
 	case PROP_PRIORITY:
-		priv->priority = g_value_get_uint (value);
+		g_value_set_uint (value, priv->priority);
 		break;
 	case PROP_PATH_COST:
-		priv->path_cost = g_value_get_uint (value);
+		g_value_set_uint (value, priv->path_cost);
 		break;
 	case PROP_HAIRPIN_MODE:
-		priv->hairpin_mode = g_value_get_boolean (value);
+		g_value_set_boolean (value, priv->hairpin_mode);
 		break;
 	default:
 		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
@@ -182,20 +164,20 @@ set_property (GObject *object, guint prop_id,
 }
 
 static void
-get_property (GObject *object, guint prop_id,
-              GValue *value, GParamSpec *pspec)
+set_property (GObject *object, guint prop_id,
+              const GValue *value, GParamSpec *pspec)
 {
 	NMSettingBridgePortPrivate *priv = NM_SETTING_BRIDGE_PORT_GET_PRIVATE (object);
 
 	switch (prop_id) {
 	case PROP_PRIORITY:
-		g_value_set_uint (value, priv->priority);
+		priv->priority = g_value_get_uint (value);
 		break;
 	case PROP_PATH_COST:
-		g_value_set_uint (value, priv->path_cost);
+		priv->path_cost = g_value_get_uint (value);
 		break;
 	case PROP_HAIRPIN_MODE:
-		g_value_set_boolean (value, priv->hairpin_mode);
+		priv->hairpin_mode = g_value_get_boolean (value);
 		break;
 	default:
 		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
@@ -203,6 +185,26 @@ get_property (GObject *object, guint prop_id,
 	}
 }
 
+/*****************************************************************************/
+
+static void
+nm_setting_bridge_port_init (NMSettingBridgePort *setting)
+{
+}
+
+/**
+ * nm_setting_bridge_port_new:
+ *
+ * Creates a new #NMSettingBridgePort object with default values.
+ *
+ * Returns: (transfer full): the new empty #NMSettingBridgePort object
+ **/
+NMSetting *
+nm_setting_bridge_port_new (void)
+{
+	return (NMSetting *) g_object_new (NM_TYPE_SETTING_BRIDGE_PORT, NULL);
+}
+
 static void
 nm_setting_bridge_port_class_init (NMSettingBridgePortClass *klass)
 {
@@ -211,8 +213,8 @@ nm_setting_bridge_port_class_init (NMSettingBridgePortClass *klass)
 
 	g_type_class_add_private (klass, sizeof (NMSettingBridgePortPrivate));
 
-	object_class->set_property = set_property;
 	object_class->get_property = get_property;
+	object_class->set_property = set_property;
 
 	setting_class->verify = verify;
 
@@ -229,14 +231,13 @@ nm_setting_bridge_port_class_init (NMSettingBridgePortClass *klass)
 	 * description: STP priority.
 	 * ---end---
 	 */
-	g_object_class_install_property
-		(object_class, PROP_PRIORITY,
-		 g_param_spec_uint (NM_SETTING_BRIDGE_PORT_PRIORITY, "", "",
-		                    0, NM_BR_PORT_MAX_PRIORITY, NM_BR_PORT_DEF_PRIORITY,
-		                    G_PARAM_READWRITE |
-		                    G_PARAM_CONSTRUCT |
-		                    NM_SETTING_PARAM_INFERRABLE |
-		                    G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_PRIORITY] =
+	    g_param_spec_uint (NM_SETTING_BRIDGE_PORT_PRIORITY, "", "",
+	                       0, NM_BR_PORT_MAX_PRIORITY, NM_BR_PORT_DEF_PRIORITY,
+	                       G_PARAM_READWRITE |
+	                       G_PARAM_CONSTRUCT |
+	                       NM_SETTING_PARAM_INFERRABLE |
+	                       G_PARAM_STATIC_STRINGS);
 
 	/**
 	 * NMSettingBridgePort:path-cost:
@@ -252,13 +253,12 @@ nm_setting_bridge_port_class_init (NMSettingBridgePortClass *klass)
 	 * description: STP cost.
 	 * ---end---
 	 */
-	g_object_class_install_property
-		(object_class, PROP_PATH_COST,
-		 g_param_spec_uint (NM_SETTING_BRIDGE_PORT_PATH_COST, "", "",
-		                    0, NM_BR_PORT_MAX_PATH_COST, 100,
-		                    G_PARAM_READWRITE |
-		                    G_PARAM_CONSTRUCT |
-		                    G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_PATH_COST] =
+	    g_param_spec_uint (NM_SETTING_BRIDGE_PORT_PATH_COST, "", "",
+	                       0, NM_BR_PORT_MAX_PATH_COST, 100,
+	                       G_PARAM_READWRITE |
+	                       G_PARAM_CONSTRUCT |
+	                       G_PARAM_STATIC_STRINGS);
 
 	/**
 	 * NMSettingBridgePort:hairpin-mode:
@@ -273,13 +273,14 @@ nm_setting_bridge_port_class_init (NMSettingBridgePortClass *klass)
 	 * description: Hairpin mode of the bridge port.
 	 * ---end---
 	 */
-	g_object_class_install_property
-		(object_class, PROP_HAIRPIN_MODE,
-		 g_param_spec_boolean (NM_SETTING_BRIDGE_PORT_HAIRPIN_MODE, "", "",
-		                       FALSE,
-		                       G_PARAM_READWRITE |
-		                       NM_SETTING_PARAM_INFERRABLE |
-		                       G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_HAIRPIN_MODE] =
+	    g_param_spec_boolean (NM_SETTING_BRIDGE_PORT_HAIRPIN_MODE, "", "",
+	                          FALSE,
+	                          G_PARAM_READWRITE |
+	                          NM_SETTING_PARAM_INFERRABLE |
+	                          G_PARAM_STATIC_STRINGS);
+
+	g_object_class_install_properties (object_class, _PROPERTY_ENUMS_LAST, obj_properties);
 
 	_nm_setting_class_commit (setting_class, NM_META_SETTING_TYPE_BRIDGE_PORT);
 }
diff --git a/libnm-core/nm-setting-bridge.c b/libnm-core/nm-setting-bridge.c
index 71fe2ed2..e418013c 100644
--- a/libnm-core/nm-setting-bridge.c
+++ b/libnm-core/nm-setting-bridge.c
@@ -21,11 +21,11 @@
 
 #include "nm-default.h"
 
-#include 
+#include "nm-setting-bridge.h"
+
 #include 
 #include 
 
-#include "nm-setting-bridge.h"
 #include "nm-connection-private.h"
 #include "nm-utils.h"
 #include "nm-utils-private.h"
@@ -38,9 +38,19 @@
  * necessary for bridging connections.
  **/
 
-G_DEFINE_TYPE (NMSettingBridge, nm_setting_bridge, NM_TYPE_SETTING)
+/*****************************************************************************/
 
-#define NM_SETTING_BRIDGE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_SETTING_BRIDGE, NMSettingBridgePrivate))
+NM_GOBJECT_PROPERTIES_DEFINE_BASE (
+	PROP_MAC_ADDRESS,
+	PROP_STP,
+	PROP_PRIORITY,
+	PROP_FORWARD_DELAY,
+	PROP_HELLO_TIME,
+	PROP_MAX_AGE,
+	PROP_AGEING_TIME,
+	PROP_GROUP_FORWARD_MASK,
+	PROP_MULTICAST_SNOOPING,
+);
 
 typedef struct {
 	char *   mac_address;
@@ -54,32 +64,11 @@ typedef struct {
 	gboolean multicast_snooping;
 } NMSettingBridgePrivate;
 
-enum {
-	PROP_0,
-	PROP_MAC_ADDRESS,
-	PROP_STP,
-	PROP_PRIORITY,
-	PROP_FORWARD_DELAY,
-	PROP_HELLO_TIME,
-	PROP_MAX_AGE,
-	PROP_AGEING_TIME,
-	PROP_GROUP_FORWARD_MASK,
-	PROP_MULTICAST_SNOOPING,
-	LAST_PROP
-};
+G_DEFINE_TYPE (NMSettingBridge, nm_setting_bridge, NM_TYPE_SETTING)
 
-/**
- * nm_setting_bridge_new:
- *
- * Creates a new #NMSettingBridge object with default values.
- *
- * Returns: (transfer full): the new empty #NMSettingBridge object
- **/
-NMSetting *
-nm_setting_bridge_new (void)
-{
-	return (NMSetting *) g_object_new (NM_TYPE_SETTING_BRIDGE, NULL);
-}
+#define NM_SETTING_BRIDGE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_SETTING_BRIDGE, NMSettingBridgePrivate))
+
+/*****************************************************************************/
 
 /**
  * nm_setting_bridge_get_mac_address:
@@ -211,7 +200,7 @@ nm_setting_bridge_get_multicast_snooping (NMSettingBridge *setting)
 	return NM_SETTING_BRIDGE_GET_PRIVATE (setting)->multicast_snooping;
 }
 
-static inline gboolean
+static gboolean
 check_range (guint32 val,
              guint32 min,
              guint32 max,
@@ -292,56 +281,42 @@ verify (NMSetting *setting, NMConnection *connection, GError **error)
 	return _nm_connection_verify_required_interface_name (connection, error);
 }
 
-static void
-nm_setting_bridge_init (NMSettingBridge *setting)
-{
-}
-
-static void
-finalize (GObject *object)
-{
-	NMSettingBridgePrivate *priv = NM_SETTING_BRIDGE_GET_PRIVATE (object);
-
-	g_free (priv->mac_address);
-
-	G_OBJECT_CLASS (nm_setting_bridge_parent_class)->finalize (object);
-}
+/*****************************************************************************/
 
 static void
-set_property (GObject *object, guint prop_id,
-              const GValue *value, GParamSpec *pspec)
+get_property (GObject *object, guint prop_id,
+              GValue *value, GParamSpec *pspec)
 {
 	NMSettingBridgePrivate *priv = NM_SETTING_BRIDGE_GET_PRIVATE (object);
+	NMSettingBridge *setting = NM_SETTING_BRIDGE (object);
 
 	switch (prop_id) {
 	case PROP_MAC_ADDRESS:
-		g_free (priv->mac_address);
-		priv->mac_address = _nm_utils_hwaddr_canonical_or_invalid (g_value_get_string (value),
-		                                                           ETH_ALEN);
+		g_value_set_string (value, nm_setting_bridge_get_mac_address (setting));
 		break;
 	case PROP_STP:
-		priv->stp = g_value_get_boolean (value);
+		g_value_set_boolean (value, priv->stp);
 		break;
 	case PROP_PRIORITY:
-		priv->priority = (guint16) g_value_get_uint (value);
+		g_value_set_uint (value, priv->priority);
 		break;
 	case PROP_FORWARD_DELAY:
-		priv->forward_delay = (guint16) g_value_get_uint (value);
+		g_value_set_uint (value, priv->forward_delay);
 		break;
 	case PROP_HELLO_TIME:
-		priv->hello_time = (guint16) g_value_get_uint (value);
+		g_value_set_uint (value, priv->hello_time);
 		break;
 	case PROP_MAX_AGE:
-		priv->max_age = (guint16) g_value_get_uint (value);
+		g_value_set_uint (value, priv->max_age);
 		break;
 	case PROP_AGEING_TIME:
-		priv->ageing_time = g_value_get_uint (value);
+		g_value_set_uint (value, priv->ageing_time);
 		break;
 	case PROP_GROUP_FORWARD_MASK:
-		priv->group_forward_mask = (guint16) g_value_get_uint (value);
+		g_value_set_uint (value, priv->group_forward_mask);
 		break;
 	case PROP_MULTICAST_SNOOPING:
-		priv->multicast_snooping = g_value_get_boolean (value);
+		g_value_set_boolean (value, priv->multicast_snooping);
 		break;
 	default:
 		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
@@ -350,39 +325,40 @@ set_property (GObject *object, guint prop_id,
 }
 
 static void
-get_property (GObject *object, guint prop_id,
-              GValue *value, GParamSpec *pspec)
+set_property (GObject *object, guint prop_id,
+              const GValue *value, GParamSpec *pspec)
 {
 	NMSettingBridgePrivate *priv = NM_SETTING_BRIDGE_GET_PRIVATE (object);
-	NMSettingBridge *setting = NM_SETTING_BRIDGE (object);
 
 	switch (prop_id) {
 	case PROP_MAC_ADDRESS:
-		g_value_set_string (value, nm_setting_bridge_get_mac_address (setting));
+		g_free (priv->mac_address);
+		priv->mac_address = _nm_utils_hwaddr_canonical_or_invalid (g_value_get_string (value),
+		                                                           ETH_ALEN);
 		break;
 	case PROP_STP:
-		g_value_set_boolean (value, priv->stp);
+		priv->stp = g_value_get_boolean (value);
 		break;
 	case PROP_PRIORITY:
-		g_value_set_uint (value, priv->priority);
+		priv->priority = (guint16) g_value_get_uint (value);
 		break;
 	case PROP_FORWARD_DELAY:
-		g_value_set_uint (value, priv->forward_delay);
+		priv->forward_delay = (guint16) g_value_get_uint (value);
 		break;
 	case PROP_HELLO_TIME:
-		g_value_set_uint (value, priv->hello_time);
+		priv->hello_time = (guint16) g_value_get_uint (value);
 		break;
 	case PROP_MAX_AGE:
-		g_value_set_uint (value, priv->max_age);
+		priv->max_age = (guint16) g_value_get_uint (value);
 		break;
 	case PROP_AGEING_TIME:
-		g_value_set_uint (value, priv->ageing_time);
+		priv->ageing_time = g_value_get_uint (value);
 		break;
 	case PROP_GROUP_FORWARD_MASK:
-		g_value_set_uint (value, priv->group_forward_mask);
+		priv->group_forward_mask = (guint16) g_value_get_uint (value);
 		break;
 	case PROP_MULTICAST_SNOOPING:
-		g_value_set_boolean (value, priv->multicast_snooping);
+		priv->multicast_snooping = g_value_get_boolean (value);
 		break;
 	default:
 		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
@@ -390,6 +366,36 @@ get_property (GObject *object, guint prop_id,
 	}
 }
 
+/*****************************************************************************/
+
+static void
+nm_setting_bridge_init (NMSettingBridge *setting)
+{
+}
+
+/**
+ * nm_setting_bridge_new:
+ *
+ * Creates a new #NMSettingBridge object with default values.
+ *
+ * Returns: (transfer full): the new empty #NMSettingBridge object
+ **/
+NMSetting *
+nm_setting_bridge_new (void)
+{
+	return (NMSetting *) g_object_new (NM_TYPE_SETTING_BRIDGE, NULL);
+}
+
+static void
+finalize (GObject *object)
+{
+	NMSettingBridgePrivate *priv = NM_SETTING_BRIDGE_GET_PRIVATE (object);
+
+	g_free (priv->mac_address);
+
+	G_OBJECT_CLASS (nm_setting_bridge_parent_class)->finalize (object);
+}
+
 static void
 nm_setting_bridge_class_init (NMSettingBridgeClass *klass)
 {
@@ -399,8 +405,8 @@ nm_setting_bridge_class_init (NMSettingBridgeClass *klass)
 
 	g_type_class_add_private (klass, sizeof (NMSettingBridgePrivate));
 
-	object_class->set_property = set_property;
 	object_class->get_property = get_property;
+	object_class->set_property = set_property;
 	object_class->finalize     = finalize;
 
 	setting_class->verify = verify;
@@ -435,17 +441,15 @@ nm_setting_bridge_class_init (NMSettingBridgeClass *klass)
 	 *   BRIDGE_MACADDR for bridges is an NM extension.
 	 * ---end---
 	 */
-	g_object_class_install_property
-		(object_class, PROP_MAC_ADDRESS,
-		 g_param_spec_string (NM_SETTING_BRIDGE_MAC_ADDRESS, "", "",
-		                      NULL,
-		                      G_PARAM_READWRITE |
-		                      NM_SETTING_PARAM_INFERRABLE |
-		                      G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_MAC_ADDRESS] =
+	    g_param_spec_string (NM_SETTING_BRIDGE_MAC_ADDRESS, "", "",
+	                         NULL,
+	                         G_PARAM_READWRITE |
+	                         NM_SETTING_PARAM_INFERRABLE |
+	                         G_PARAM_STATIC_STRINGS);
 
 	_properties_override_add_transform (properties_override,
-	                                    g_object_class_find_property (G_OBJECT_CLASS (setting_class),
-	                                                                  NM_SETTING_BRIDGE_MAC_ADDRESS),
+	                                    obj_properties[PROP_MAC_ADDRESS],
 	                                    G_VARIANT_TYPE_BYTESTRING,
 	                                    _nm_utils_hwaddr_to_dbus,
 	                                    _nm_utils_hwaddr_from_dbus);
@@ -462,14 +466,13 @@ nm_setting_bridge_class_init (NMSettingBridgeClass *klass)
 	 * description: Span tree protocol participation.
 	 * ---end---
 	 */
-	g_object_class_install_property
-		(object_class, PROP_STP,
-		 g_param_spec_boolean (NM_SETTING_BRIDGE_STP, "", "",
-		                       TRUE,
-		                       G_PARAM_READWRITE |
-		                       G_PARAM_CONSTRUCT |
-		                       NM_SETTING_PARAM_INFERRABLE |
-		                       G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_STP] =
+	    g_param_spec_boolean (NM_SETTING_BRIDGE_STP, "", "",
+	                          TRUE,
+	                          G_PARAM_READWRITE |
+	                          G_PARAM_CONSTRUCT |
+	                          NM_SETTING_PARAM_INFERRABLE |
+	                          G_PARAM_STATIC_STRINGS);
 
 	/**
 	 * NMSettingBridge:priority:
@@ -486,14 +489,13 @@ nm_setting_bridge_class_init (NMSettingBridgeClass *klass)
 	 * description: STP priority.
 	 * ---end---
 	 */
-	g_object_class_install_property
-		(object_class, PROP_PRIORITY,
-		 g_param_spec_uint (NM_SETTING_BRIDGE_PRIORITY, "", "",
-		                    0, G_MAXUINT16, 0x8000,
-		                    G_PARAM_READWRITE |
-		                    G_PARAM_CONSTRUCT |
-		                    NM_SETTING_PARAM_INFERRABLE |
-		                    G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_PRIORITY] =
+	    g_param_spec_uint (NM_SETTING_BRIDGE_PRIORITY, "", "",
+	                       0, G_MAXUINT16, 0x8000,
+	                       G_PARAM_READWRITE |
+	                       G_PARAM_CONSTRUCT |
+	                       NM_SETTING_PARAM_INFERRABLE |
+	                       G_PARAM_STATIC_STRINGS);
 
 	/**
 	 * NMSettingBridge:forward-delay:
@@ -508,14 +510,13 @@ nm_setting_bridge_class_init (NMSettingBridgeClass *klass)
 	 * description: STP forwarding delay.
 	 * ---end---
 	 */
-	g_object_class_install_property
-		(object_class, PROP_FORWARD_DELAY,
-		 g_param_spec_uint (NM_SETTING_BRIDGE_FORWARD_DELAY, "", "",
-		                    0, NM_BR_MAX_FORWARD_DELAY, 15,
-		                    G_PARAM_READWRITE |
-		                    G_PARAM_CONSTRUCT |
-		                    NM_SETTING_PARAM_INFERRABLE |
-		                    G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_FORWARD_DELAY] =
+	    g_param_spec_uint (NM_SETTING_BRIDGE_FORWARD_DELAY, "", "",
+	                       0, NM_BR_MAX_FORWARD_DELAY, 15,
+	                       G_PARAM_READWRITE |
+	                       G_PARAM_CONSTRUCT |
+	                       NM_SETTING_PARAM_INFERRABLE |
+	                       G_PARAM_STATIC_STRINGS);
 
 	/**
 	 * NMSettingBridge:hello-time:
@@ -530,14 +531,13 @@ nm_setting_bridge_class_init (NMSettingBridgeClass *klass)
 	 * description: STP hello time.
 	 * ---end---
 	 */
-	g_object_class_install_property
-		(object_class, PROP_HELLO_TIME,
-		 g_param_spec_uint (NM_SETTING_BRIDGE_HELLO_TIME, "", "",
-		                    0, NM_BR_MAX_HELLO_TIME, 2,
-		                    G_PARAM_READWRITE |
-		                    G_PARAM_CONSTRUCT |
-		                    NM_SETTING_PARAM_INFERRABLE |
-		                    G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_HELLO_TIME] =
+	    g_param_spec_uint (NM_SETTING_BRIDGE_HELLO_TIME, "", "",
+	                       0, NM_BR_MAX_HELLO_TIME, 2,
+	                       G_PARAM_READWRITE |
+	                       G_PARAM_CONSTRUCT |
+	                       NM_SETTING_PARAM_INFERRABLE |
+	                       G_PARAM_STATIC_STRINGS);
 
 	/**
 	 * NMSettingBridge:max-age:
@@ -552,14 +552,13 @@ nm_setting_bridge_class_init (NMSettingBridgeClass *klass)
 	 * description: STP maximum message age.
 	 * ---end---
 	 */
-	g_object_class_install_property
-		(object_class, PROP_MAX_AGE,
-		 g_param_spec_uint (NM_SETTING_BRIDGE_MAX_AGE, "", "",
-		                    0, NM_BR_MAX_MAX_AGE, 20,
-		                    G_PARAM_READWRITE |
-		                    G_PARAM_CONSTRUCT |
-		                    NM_SETTING_PARAM_INFERRABLE |
-		                    G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_MAX_AGE] =
+	    g_param_spec_uint (NM_SETTING_BRIDGE_MAX_AGE, "", "",
+	                       0, NM_BR_MAX_MAX_AGE, 20,
+	                       G_PARAM_READWRITE |
+	                       G_PARAM_CONSTRUCT |
+	                       NM_SETTING_PARAM_INFERRABLE |
+	                       G_PARAM_STATIC_STRINGS);
 
 	/**
 	 * NMSettingBridge:ageing-time:
@@ -574,14 +573,13 @@ nm_setting_bridge_class_init (NMSettingBridgeClass *klass)
 	 * description: Ethernet MAC ageing time.
 	 * ---end---
 	 */
-	g_object_class_install_property
-		(object_class, PROP_AGEING_TIME,
-		 g_param_spec_uint (NM_SETTING_BRIDGE_AGEING_TIME, "", "",
-		                    NM_BR_MIN_AGEING_TIME, NM_BR_MAX_AGEING_TIME, 300,
-		                    G_PARAM_READWRITE |
-		                    G_PARAM_CONSTRUCT |
-		                    NM_SETTING_PARAM_INFERRABLE |
-		                    G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_AGEING_TIME] =
+	    g_param_spec_uint (NM_SETTING_BRIDGE_AGEING_TIME, "", "",
+	                       NM_BR_MIN_AGEING_TIME, NM_BR_MAX_AGEING_TIME, 300,
+	                       G_PARAM_READWRITE |
+	                       G_PARAM_CONSTRUCT |
+	                       NM_SETTING_PARAM_INFERRABLE |
+	                       G_PARAM_STATIC_STRINGS);
 
 	/**
 	 * NMSettingBridge:group-forward-mask:
@@ -595,14 +593,13 @@ nm_setting_bridge_class_init (NMSettingBridgeClass *klass)
 	 *
 	 * Since: 1.10
 	 **/
-	g_object_class_install_property
-		(object_class, PROP_GROUP_FORWARD_MASK,
-		 g_param_spec_uint (NM_SETTING_BRIDGE_GROUP_FORWARD_MASK, "", "",
-		                    0, 0xFFFF, 0,
-		                    G_PARAM_READWRITE |
-		                    G_PARAM_CONSTRUCT |
-		                    NM_SETTING_PARAM_INFERRABLE |
-		                    G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_GROUP_FORWARD_MASK] =
+	    g_param_spec_uint (NM_SETTING_BRIDGE_GROUP_FORWARD_MASK, "", "",
+	                       0, 0xFFFF, 0,
+	                       G_PARAM_READWRITE |
+	                       G_PARAM_CONSTRUCT |
+	                       NM_SETTING_PARAM_INFERRABLE |
+	                       G_PARAM_STATIC_STRINGS);
 
 	/**
 	 * NMSettingBridge:multicast-snooping:
@@ -622,14 +619,13 @@ nm_setting_bridge_class_init (NMSettingBridgeClass *klass)
 	 * description: IGMP snooping support.
 	 * ---end---
 	 */
-	g_object_class_install_property
-		(object_class, PROP_MULTICAST_SNOOPING,
-		 g_param_spec_boolean (NM_SETTING_BRIDGE_MULTICAST_SNOOPING, "", "",
-		                       TRUE,
-		                       G_PARAM_READWRITE |
-		                       G_PARAM_CONSTRUCT |
-		                       NM_SETTING_PARAM_INFERRABLE |
-		                       G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_MULTICAST_SNOOPING] =
+	    g_param_spec_boolean (NM_SETTING_BRIDGE_MULTICAST_SNOOPING, "", "",
+	                          TRUE,
+	                          G_PARAM_READWRITE |
+	                          G_PARAM_CONSTRUCT |
+	                          NM_SETTING_PARAM_INFERRABLE |
+	                          G_PARAM_STATIC_STRINGS);
 
 	/* ---dbus---
 	 * property: interface-name
@@ -645,6 +641,8 @@ nm_setting_bridge_class_init (NMSettingBridgeClass *klass)
 	                                    _nm_setting_get_deprecated_virtual_interface_name,
 	                                    NULL);
 
+	g_object_class_install_properties (object_class, _PROPERTY_ENUMS_LAST, obj_properties);
+
 	_nm_setting_class_commit_full (setting_class, NM_META_SETTING_TYPE_BRIDGE,
 	                               NULL, properties_override);
 }
diff --git a/libnm-core/nm-setting-cdma.c b/libnm-core/nm-setting-cdma.c
index a5d5428d..b05daaff 100644
--- a/libnm-core/nm-setting-cdma.c
+++ b/libnm-core/nm-setting-cdma.c
@@ -21,9 +21,8 @@
 
 #include "nm-default.h"
 
-#include 
-
 #include "nm-setting-cdma.h"
+
 #include "nm-utils.h"
 #include "nm-setting-private.h"
 #include "nm-core-enum-types.h"
@@ -37,9 +36,15 @@
  * networks, including those using CDMA2000/EVDO technology.
  */
 
-G_DEFINE_TYPE (NMSettingCdma, nm_setting_cdma, NM_TYPE_SETTING)
+/*****************************************************************************/
 
-#define NM_SETTING_CDMA_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_SETTING_CDMA, NMSettingCdmaPrivate))
+NM_GOBJECT_PROPERTIES_DEFINE_BASE (
+	PROP_NUMBER,
+	PROP_USERNAME,
+	PROP_PASSWORD,
+	PROP_PASSWORD_FLAGS,
+	PROP_MTU,
+);
 
 typedef struct {
 	char *number; /* For dialing, duh */
@@ -49,29 +54,11 @@ typedef struct {
 	guint32 mtu;
 } NMSettingCdmaPrivate;
 
-enum {
-	PROP_0,
-	PROP_NUMBER,
-	PROP_USERNAME,
-	PROP_PASSWORD,
-	PROP_PASSWORD_FLAGS,
-	PROP_MTU,
+G_DEFINE_TYPE (NMSettingCdma, nm_setting_cdma, NM_TYPE_SETTING)
 
-	LAST_PROP
-};
+#define NM_SETTING_CDMA_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_SETTING_CDMA, NMSettingCdmaPrivate))
 
-/**
- * nm_setting_cdma_new:
- *
- * Creates a new #NMSettingCdma object with default values.
- *
- * Returns: the new empty #NMSettingCdma object
- **/
-NMSetting *
-nm_setting_cdma_new (void)
-{
-	return (NMSetting *) g_object_new (NM_TYPE_SETTING_CDMA, NULL);
-}
+/*****************************************************************************/
 
 /**
  * nm_setting_cdma_get_number:
@@ -206,21 +193,34 @@ need_secrets (NMSetting *setting)
 	return secrets;
 }
 
-static void
-nm_setting_cdma_init (NMSettingCdma *setting)
-{
-}
+/*****************************************************************************/
 
 static void
-finalize (GObject *object)
+get_property (GObject *object, guint prop_id,
+              GValue *value, GParamSpec *pspec)
 {
-	NMSettingCdmaPrivate *priv = NM_SETTING_CDMA_GET_PRIVATE (object);
-
-	g_free (priv->number);
-	g_free (priv->username);
-	g_free (priv->password);
+	NMSettingCdma *setting = NM_SETTING_CDMA (object);
 
-	G_OBJECT_CLASS (nm_setting_cdma_parent_class)->finalize (object);
+	switch (prop_id) {
+	case PROP_NUMBER:
+		g_value_set_string (value, nm_setting_cdma_get_number (setting));
+		break;
+	case PROP_USERNAME:
+		g_value_set_string (value, nm_setting_cdma_get_username (setting));
+		break;
+	case PROP_PASSWORD:
+		g_value_set_string (value, nm_setting_cdma_get_password (setting));
+		break;
+	case PROP_PASSWORD_FLAGS:
+		g_value_set_flags (value, nm_setting_cdma_get_password_flags (setting));
+		break;
+	case PROP_MTU:
+		g_value_set_uint (value, nm_setting_cdma_get_mtu (setting));
+		break;
+	default:
+		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+		break;
+	}
 }
 
 static void
@@ -254,32 +254,36 @@ set_property (GObject *object, guint prop_id,
 	}
 }
 
+/*****************************************************************************/
+
 static void
-get_property (GObject *object, guint prop_id,
-              GValue *value, GParamSpec *pspec)
+nm_setting_cdma_init (NMSettingCdma *setting)
 {
-	NMSettingCdma *setting = NM_SETTING_CDMA (object);
+}
 
-	switch (prop_id) {
-	case PROP_NUMBER:
-		g_value_set_string (value, nm_setting_cdma_get_number (setting));
-		break;
-	case PROP_USERNAME:
-		g_value_set_string (value, nm_setting_cdma_get_username (setting));
-		break;
-	case PROP_PASSWORD:
-		g_value_set_string (value, nm_setting_cdma_get_password (setting));
-		break;
-	case PROP_PASSWORD_FLAGS:
-		g_value_set_flags (value, nm_setting_cdma_get_password_flags (setting));
-		break;
-	case PROP_MTU:
-		g_value_set_uint (value, nm_setting_cdma_get_mtu (setting));
-		break;
-	default:
-		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-		break;
-	}
+/**
+ * nm_setting_cdma_new:
+ *
+ * Creates a new #NMSettingCdma object with default values.
+ *
+ * Returns: the new empty #NMSettingCdma object
+ **/
+NMSetting *
+nm_setting_cdma_new (void)
+{
+	return (NMSetting *) g_object_new (NM_TYPE_SETTING_CDMA, NULL);
+}
+
+static void
+finalize (GObject *object)
+{
+	NMSettingCdmaPrivate *priv = NM_SETTING_CDMA_GET_PRIVATE (object);
+
+	g_free (priv->number);
+	g_free (priv->username);
+	g_free (priv->password);
+
+	G_OBJECT_CLASS (nm_setting_cdma_parent_class)->finalize (object);
 }
 
 static void
@@ -290,8 +294,8 @@ nm_setting_cdma_class_init (NMSettingCdmaClass *klass)
 
 	g_type_class_add_private (klass, sizeof (NMSettingCdmaPrivate));
 
-	object_class->set_property = set_property;
 	object_class->get_property = get_property;
+	object_class->set_property = set_property;
 	object_class->finalize     = finalize;
 
 	setting_class->verify         = verify;
@@ -305,12 +309,11 @@ nm_setting_cdma_class_init (NMSettingCdmaClass *klass)
 	 * broadband network, if any.  If not specified, the default number (#777)
 	 * is used when required.
 	 **/
-	g_object_class_install_property
-		(object_class, PROP_NUMBER,
-		 g_param_spec_string (NM_SETTING_CDMA_NUMBER, "", "",
-		                      NULL,
-		                      G_PARAM_READWRITE |
-		                      G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_NUMBER] =
+	    g_param_spec_string (NM_SETTING_CDMA_NUMBER, "", "",
+	                         NULL,
+	                         G_PARAM_READWRITE |
+	                         G_PARAM_STATIC_STRINGS);
 
 	/**
 	 * NMSettingCdma:username:
@@ -319,12 +322,11 @@ nm_setting_cdma_class_init (NMSettingCdmaClass *klass)
 	 * providers do not require a username, or accept any username.  But if a
 	 * username is required, it is specified here.
 	 **/
-	g_object_class_install_property
-		(object_class, PROP_USERNAME,
-		 g_param_spec_string (NM_SETTING_CDMA_USERNAME, "", "",
-		                      NULL,
-		                      G_PARAM_READWRITE |
-		                      G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_USERNAME] =
+	    g_param_spec_string (NM_SETTING_CDMA_USERNAME, "", "",
+	                         NULL,
+	                         G_PARAM_READWRITE |
+	                         G_PARAM_STATIC_STRINGS);
 
 	/**
 	 * NMSettingCdma:password:
@@ -333,26 +335,24 @@ nm_setting_cdma_class_init (NMSettingCdmaClass *klass)
 	 * providers do not require a password, or accept any password.  But if a
 	 * password is required, it is specified here.
 	 **/
-	g_object_class_install_property
-		(object_class, PROP_PASSWORD,
-		 g_param_spec_string (NM_SETTING_CDMA_PASSWORD, "", "",
-		                      NULL,
-		                      G_PARAM_READWRITE |
-		                      NM_SETTING_PARAM_SECRET |
-		                      G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_PASSWORD] =
+	    g_param_spec_string (NM_SETTING_CDMA_PASSWORD, "", "",
+	                         NULL,
+	                         G_PARAM_READWRITE |
+	                         NM_SETTING_PARAM_SECRET |
+	                         G_PARAM_STATIC_STRINGS);
 
 	/**
 	 * NMSettingCdma:password-flags:
 	 *
 	 * Flags indicating how to handle the #NMSettingCdma:password property.
 	 **/
-	g_object_class_install_property
-		(object_class, PROP_PASSWORD_FLAGS,
-		 g_param_spec_flags (NM_SETTING_CDMA_PASSWORD_FLAGS, "", "",
-		                     NM_TYPE_SETTING_SECRET_FLAGS,
-		                     NM_SETTING_SECRET_FLAG_NONE,
-		                     G_PARAM_READWRITE |
-		                     G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_PASSWORD_FLAGS] =
+	    g_param_spec_flags (NM_SETTING_CDMA_PASSWORD_FLAGS, "", "",
+	                        NM_TYPE_SETTING_SECRET_FLAGS,
+	                        NM_SETTING_SECRET_FLAG_NONE,
+	                        G_PARAM_READWRITE |
+	                        G_PARAM_STATIC_STRINGS);
 
 	/**
 	 * NMSettingCdma:mtu:
@@ -362,14 +362,15 @@ nm_setting_cdma_class_init (NMSettingCdmaClass *klass)
 	 *
 	 * Since: 1.8
 	 **/
-	g_object_class_install_property
-		(object_class, PROP_MTU,
-		 g_param_spec_uint (NM_SETTING_CDMA_MTU, "", "",
-		                    0, G_MAXUINT32, 0,
-		                    G_PARAM_READWRITE |
-		                    G_PARAM_CONSTRUCT |
-		                    NM_SETTING_PARAM_FUZZY_IGNORE |
-		                    G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_MTU] =
+	    g_param_spec_uint (NM_SETTING_CDMA_MTU, "", "",
+	                       0, G_MAXUINT32, 0,
+	                       G_PARAM_READWRITE |
+	                       G_PARAM_CONSTRUCT |
+	                       NM_SETTING_PARAM_FUZZY_IGNORE |
+	                       G_PARAM_STATIC_STRINGS);
+
+	g_object_class_install_properties (object_class, _PROPERTY_ENUMS_LAST, obj_properties);
 
 	_nm_setting_class_commit (setting_class, NM_META_SETTING_TYPE_CDMA);
 }
diff --git a/libnm-core/nm-setting-connection.c b/libnm-core/nm-setting-connection.c
index 44021b9c..e8d008e3 100644
--- a/libnm-core/nm-setting-connection.c
+++ b/libnm-core/nm-setting-connection.c
@@ -24,8 +24,6 @@
 
 #include "nm-setting-connection.h"
 
-#include 
-
 #include "nm-utils.h"
 #include "nm-utils-private.h"
 #include "nm-core-enum-types.h"
@@ -45,9 +43,7 @@
  * a #NMSettingConnection setting.
  **/
 
-G_DEFINE_TYPE (NMSettingConnection, nm_setting_connection, NM_TYPE_SETTING)
-
-#define NM_SETTING_CONNECTION_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_SETTING_CONNECTION, NMSettingConnectionPrivate))
+/*****************************************************************************/
 
 typedef enum {
 	PERM_TYPE_USER = 0,
@@ -58,6 +54,32 @@ typedef struct {
 	char *item;
 } Permission;
 
+NM_GOBJECT_PROPERTIES_DEFINE (NMSettingConnection,
+	PROP_ID,
+	PROP_UUID,
+	PROP_INTERFACE_NAME,
+	PROP_TYPE,
+	PROP_PERMISSIONS,
+	PROP_AUTOCONNECT,
+	PROP_AUTOCONNECT_PRIORITY,
+	PROP_AUTOCONNECT_RETRIES,
+	PROP_MULTI_CONNECT,
+	PROP_TIMESTAMP,
+	PROP_READ_ONLY,
+	PROP_ZONE,
+	PROP_MASTER,
+	PROP_SLAVE_TYPE,
+	PROP_AUTOCONNECT_SLAVES,
+	PROP_SECONDARIES,
+	PROP_GATEWAY_PING_TIMEOUT,
+	PROP_METERED,
+	PROP_LLDP,
+	PROP_MDNS,
+	PROP_LLMNR,
+	PROP_STABLE_ID,
+	PROP_AUTH_RETRIES,
+);
+
 typedef struct {
 	char *id;
 	char *uuid;
@@ -84,34 +106,9 @@ typedef struct {
 	int llmnr;
 } NMSettingConnectionPrivate;
 
-enum {
-	PROP_0,
-	PROP_ID,
-	PROP_UUID,
-	PROP_INTERFACE_NAME,
-	PROP_TYPE,
-	PROP_PERMISSIONS,
-	PROP_AUTOCONNECT,
-	PROP_AUTOCONNECT_PRIORITY,
-	PROP_AUTOCONNECT_RETRIES,
-	PROP_MULTI_CONNECT,
-	PROP_TIMESTAMP,
-	PROP_READ_ONLY,
-	PROP_ZONE,
-	PROP_MASTER,
-	PROP_SLAVE_TYPE,
-	PROP_AUTOCONNECT_SLAVES,
-	PROP_SECONDARIES,
-	PROP_GATEWAY_PING_TIMEOUT,
-	PROP_METERED,
-	PROP_LLDP,
-	PROP_MDNS,
-	PROP_LLMNR,
-	PROP_STABLE_ID,
-	PROP_AUTH_RETRIES,
+G_DEFINE_TYPE (NMSettingConnection, nm_setting_connection, NM_TYPE_SETTING)
 
-	LAST_PROP
-};
+#define NM_SETTING_CONNECTION_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_SETTING_CONNECTION, NMSettingConnectionPrivate))
 
 /*****************************************************************************/
 
@@ -196,18 +193,6 @@ permission_free (Permission *p)
 
 /*****************************************************************************/
 
-/**
- * nm_setting_connection_new:
- *
- * Creates a new #NMSettingConnection object with default values.
- *
- * Returns: the new empty #NMSettingConnection object
- **/
-NMSetting *nm_setting_connection_new (void)
-{
-	return (NMSetting *) g_object_new (NM_TYPE_SETTING_CONNECTION, NULL);
-}
-
 /**
  * nm_setting_connection_get_id:
  * @setting: the #NMSettingConnection
@@ -312,7 +297,7 @@ nm_setting_connection_get_num_permissions (NMSettingConnection *setting)
  * @setting: the #NMSettingConnection
  * @idx: the zero-based index of the permissions entry
  * @out_ptype: on return, the permission type (at this time, always "user")
- * @out_pitem: on return, the permission item (formatted accoring to @ptype, see
+ * @out_pitem: on return, the permission item (formatted according to @ptype, see
  * #NMSettingConnection:permissions for more detail
  * @out_detail: on return, the permission detail (at this time, always %NULL)
  *
@@ -431,7 +416,7 @@ nm_setting_connection_add_permission (NMSettingConnection *setting,
 	p = permission_new (pitem);
 	g_return_val_if_fail (p != NULL, FALSE);
 	priv->permissions = g_slist_append (priv->permissions, p);
-	g_object_notify (G_OBJECT (setting), NM_SETTING_CONNECTION_PERMISSIONS);
+	_notify (setting, PROP_PERMISSIONS);
 
 	return TRUE;
 }
@@ -458,7 +443,7 @@ nm_setting_connection_remove_permission (NMSettingConnection *setting,
 
 	permission_free ((Permission *) iter->data);
 	priv->permissions = g_slist_delete_link (priv->permissions, iter);
-	g_object_notify (G_OBJECT (setting), NM_SETTING_CONNECTION_PERMISSIONS);
+	_notify (setting, PROP_PERMISSIONS);
 }
 
 /**
@@ -498,7 +483,7 @@ nm_setting_connection_remove_permission_by_value (NMSettingConnection *setting,
 		if (strcmp (pitem, p->item) == 0) {
 			permission_free ((Permission *) iter->data);
 			priv->permissions = g_slist_delete_link (priv->permissions, iter);
-			g_object_notify (G_OBJECT (setting), NM_SETTING_CONNECTION_PERMISSIONS);
+			_notify (setting, PROP_PERMISSIONS);
 			return TRUE;
 		}
 	}
@@ -748,7 +733,7 @@ nm_setting_connection_get_secondary (NMSettingConnection *setting, guint32 idx)
  * @setting: the #NMSettingConnection
  * @sec_uuid: the secondary connection UUID to add
  *
- * Adds a new secondary connetion UUID to the setting.
+ * Adds a new secondary connection UUID to the setting.
  *
  * Returns: %TRUE if the secondary connection UUID was added; %FALSE if the UUID
  * was already present
@@ -771,7 +756,7 @@ nm_setting_connection_add_secondary (NMSettingConnection *setting,
 	}
 
 	priv->secondaries = g_slist_append (priv->secondaries, g_strdup (sec_uuid));
-	g_object_notify (G_OBJECT (setting), NM_SETTING_CONNECTION_SECONDARIES);
+	_notify (setting, PROP_SECONDARIES);
 	return TRUE;
 }
 
@@ -796,7 +781,7 @@ nm_setting_connection_remove_secondary (NMSettingConnection *setting, guint32 id
 
 	g_free (elt->data);
 	priv->secondaries = g_slist_delete_link (priv->secondaries, elt);
-	g_object_notify (G_OBJECT (setting), NM_SETTING_CONNECTION_SECONDARIES);
+	_notify (setting, PROP_SECONDARIES);
 }
 
 /**
@@ -823,7 +808,7 @@ nm_setting_connection_remove_secondary_by_value (NMSettingConnection *setting,
 	for (iter = priv->secondaries; iter; iter = g_slist_next (iter)) {
 		if (!strcmp (sec_uuid, (char *) iter->data)) {
 			priv->secondaries = g_slist_delete_link (priv->secondaries, iter);
-			g_object_notify (G_OBJECT (setting), NM_SETTING_CONNECTION_SECONDARIES);
+			_notify (setting, PROP_SECONDARIES);
 			return TRUE;
 		}
 	}
@@ -1281,51 +1266,26 @@ nm_setting_connection_no_interface_name (NMSetting *setting,
 	return TRUE;
 }
 
-static gboolean
-compare_property (NMSetting *setting,
+static NMTernary
+compare_property (const NMSettInfoSetting *sett_info,
+                  guint property_idx,
+                  NMSetting *setting,
                   NMSetting *other,
-                  const GParamSpec *prop_spec,
                   NMSettingCompareFlags flags)
 {
-	/* Handle ignore ID */
-	if (   (flags & NM_SETTING_COMPARE_FLAG_IGNORE_ID)
-	    && g_strcmp0 (prop_spec->name, NM_SETTING_CONNECTION_ID) == 0)
-		return TRUE;
-
-	/* Handle ignore timestamp */
-	if (   (flags & NM_SETTING_COMPARE_FLAG_IGNORE_TIMESTAMP)
-	    && g_strcmp0 (prop_spec->name, NM_SETTING_CONNECTION_TIMESTAMP) == 0)
-		return TRUE;
-
-	return NM_SETTING_CLASS (nm_setting_connection_parent_class)->compare_property (setting, other, prop_spec, flags);
-}
-
-static void
-nm_setting_connection_init (NMSettingConnection *setting)
-{
-	NMSettingConnectionPrivate *priv = NM_SETTING_CONNECTION_GET_PRIVATE (setting);
-
-	priv->mdns = NM_SETTING_CONNECTION_MDNS_DEFAULT;
-	priv->llmnr = NM_SETTING_CONNECTION_LLMNR_DEFAULT;
-}
-
-static void
-finalize (GObject *object)
-{
-	NMSettingConnectionPrivate *priv = NM_SETTING_CONNECTION_GET_PRIVATE (object);
-
-	g_free (priv->id);
-	g_free (priv->uuid);
-	g_free (priv->stable_id);
-	g_free (priv->interface_name);
-	g_free (priv->type);
-	g_free (priv->zone);
-	g_free (priv->master);
-	g_free (priv->slave_type);
-	g_slist_free_full (priv->permissions, (GDestroyNotify) permission_free);
-	g_slist_free_full (priv->secondaries, g_free);
-
-	G_OBJECT_CLASS (nm_setting_connection_parent_class)->finalize (object);
+	if (   NM_FLAGS_HAS (flags, NM_SETTING_COMPARE_FLAG_IGNORE_ID)
+	    && nm_streq (sett_info->property_infos[property_idx].name, NM_SETTING_CONNECTION_ID))
+		return NM_TERNARY_DEFAULT;
+
+	if (   NM_FLAGS_HAS(flags, NM_SETTING_COMPARE_FLAG_IGNORE_TIMESTAMP)
+	    && nm_streq (sett_info->property_infos[property_idx].name, NM_SETTING_CONNECTION_TIMESTAMP))
+		return NM_TERNARY_DEFAULT;
+
+	return NM_SETTING_CLASS (nm_setting_connection_parent_class)->compare_property (sett_info,
+	                                                                                property_idx,
+	                                                                                setting,
+	                                                                                other,
+	                                                                                flags);
 }
 
 static GSList *
@@ -1348,91 +1308,98 @@ perm_strv_to_permlist (char **strv)
 	return list;
 }
 
+static char **
+perm_permlist_to_strv (GSList *permlist)
+{
+	GPtrArray *strings;
+	GSList *iter;
+
+	strings = g_ptr_array_new ();
+	for (iter = permlist; iter; iter = g_slist_next (iter))
+		g_ptr_array_add (strings, permission_to_string ((Permission *) iter->data));
+	g_ptr_array_add (strings, NULL);
+
+	return (char **) g_ptr_array_free (strings, FALSE);
+}
+
+/*****************************************************************************/
+
 static void
-set_property (GObject *object, guint prop_id,
-              const GValue *value, GParamSpec *pspec)
+get_property (GObject *object, guint prop_id,
+              GValue *value, GParamSpec *pspec)
 {
-	NMSettingConnectionPrivate *priv = NM_SETTING_CONNECTION_GET_PRIVATE (object);
+	NMSettingConnection *setting = NM_SETTING_CONNECTION (object);
+	NMSettingConnectionPrivate *priv = NM_SETTING_CONNECTION_GET_PRIVATE (setting);
 
 	switch (prop_id) {
 	case PROP_ID:
-		g_free (priv->id);
-		priv->id = g_value_dup_string (value);
+		g_value_set_string (value, nm_setting_connection_get_id (setting));
 		break;
 	case PROP_UUID:
-		g_free (priv->uuid);
-		priv->uuid = g_value_dup_string (value);
+		g_value_set_string (value, nm_setting_connection_get_uuid (setting));
 		break;
 	case PROP_STABLE_ID:
-		g_free (priv->stable_id);
-		priv->stable_id = g_value_dup_string (value);
+		g_value_set_string (value, nm_setting_connection_get_stable_id (setting));
 		break;
 	case PROP_INTERFACE_NAME:
-		g_free (priv->interface_name);
-		priv->interface_name = g_value_dup_string (value);
+		g_value_set_string (value, nm_setting_connection_get_interface_name (setting));
 		break;
 	case PROP_TYPE:
-		g_free (priv->type);
-		priv->type = g_value_dup_string (value);
+		g_value_set_string (value, nm_setting_connection_get_connection_type (setting));
 		break;
 	case PROP_PERMISSIONS:
-		g_slist_free_full (priv->permissions, (GDestroyNotify) permission_free);
-		priv->permissions = perm_strv_to_permlist (g_value_get_boxed (value));
+		g_value_take_boxed (value, perm_permlist_to_strv (priv->permissions));
 		break;
 	case PROP_AUTOCONNECT:
-		priv->autoconnect = g_value_get_boolean (value);
+		g_value_set_boolean (value, nm_setting_connection_get_autoconnect (setting));
 		break;
 	case PROP_AUTOCONNECT_PRIORITY:
-		priv->autoconnect_priority = g_value_get_int (value);
+		g_value_set_int (value, nm_setting_connection_get_autoconnect_priority (setting));
 		break;
 	case PROP_AUTOCONNECT_RETRIES:
-		priv->autoconnect_retries = g_value_get_int (value);
+		g_value_set_int (value, nm_setting_connection_get_autoconnect_retries (setting));
 		break;
 	case PROP_MULTI_CONNECT:
-		priv->multi_connect = g_value_get_int (value);
+		g_value_set_int (value, priv->multi_connect);
 		break;
 	case PROP_TIMESTAMP:
-		priv->timestamp = g_value_get_uint64 (value);
+		g_value_set_uint64 (value, nm_setting_connection_get_timestamp (setting));
 		break;
 	case PROP_READ_ONLY:
-		priv->read_only = g_value_get_boolean (value);
+		g_value_set_boolean (value, nm_setting_connection_get_read_only (setting));
 		break;
 	case PROP_ZONE:
-		g_free (priv->zone);
-		priv->zone = g_value_dup_string (value);
+		g_value_set_string (value, nm_setting_connection_get_zone (setting));
 		break;
 	case PROP_MASTER:
-		g_free (priv->master);
-		priv->master = g_value_dup_string (value);
+		g_value_set_string (value, nm_setting_connection_get_master (setting));
 		break;
 	case PROP_SLAVE_TYPE:
-		g_free (priv->slave_type);
-		priv->slave_type = g_value_dup_string (value);
+		g_value_set_string (value, nm_setting_connection_get_slave_type (setting));
 		break;
 	case PROP_AUTOCONNECT_SLAVES:
-		priv->autoconnect_slaves = g_value_get_enum (value);
+		g_value_set_enum (value, nm_setting_connection_get_autoconnect_slaves (setting));
 		break;
 	case PROP_SECONDARIES:
-		g_slist_free_full (priv->secondaries, g_free);
-		priv->secondaries = _nm_utils_strv_to_slist (g_value_get_boxed (value), TRUE);
+		g_value_take_boxed (value, _nm_utils_slist_to_strv (priv->secondaries, TRUE));
 		break;
 	case PROP_GATEWAY_PING_TIMEOUT:
-		priv->gateway_ping_timeout = g_value_get_uint (value);
+		g_value_set_uint (value, priv->gateway_ping_timeout);
 		break;
 	case PROP_METERED:
-		priv->metered = g_value_get_enum (value);
+		g_value_set_enum (value, priv->metered);
 		break;
 	case PROP_LLDP:
-		priv->lldp = g_value_get_int (value);
+		g_value_set_int (value, priv->lldp);
 		break;
 	case PROP_AUTH_RETRIES:
-		priv->auth_retries = g_value_get_int (value);
+		g_value_set_int (value, priv->auth_retries);
 		break;
 	case PROP_MDNS:
-		priv->mdns = g_value_get_int (value);
+		g_value_set_int (value, priv->mdns);
 		break;
 	case PROP_LLMNR:
-		priv->llmnr = g_value_get_int (value);
+		g_value_set_int (value, priv->llmnr);
 		break;
 	default:
 		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
@@ -1440,96 +1407,91 @@ set_property (GObject *object, guint prop_id,
 	}
 }
 
-static char **
-perm_permlist_to_strv (GSList *permlist)
-{
-	GPtrArray *strings;
-	GSList *iter;
-
-	strings = g_ptr_array_new ();
-	for (iter = permlist; iter; iter = g_slist_next (iter))
-		g_ptr_array_add (strings, permission_to_string ((Permission *) iter->data));
-	g_ptr_array_add (strings, NULL);
-
-	return (char **) g_ptr_array_free (strings, FALSE);
-}
-
 static void
-get_property (GObject *object, guint prop_id,
-              GValue *value, GParamSpec *pspec)
+set_property (GObject *object, guint prop_id,
+              const GValue *value, GParamSpec *pspec)
 {
-	NMSettingConnection *setting = NM_SETTING_CONNECTION (object);
-	NMSettingConnectionPrivate *priv = NM_SETTING_CONNECTION_GET_PRIVATE (setting);
+	NMSettingConnectionPrivate *priv = NM_SETTING_CONNECTION_GET_PRIVATE (object);
 
 	switch (prop_id) {
 	case PROP_ID:
-		g_value_set_string (value, nm_setting_connection_get_id (setting));
+		g_free (priv->id);
+		priv->id = g_value_dup_string (value);
 		break;
 	case PROP_UUID:
-		g_value_set_string (value, nm_setting_connection_get_uuid (setting));
+		g_free (priv->uuid);
+		priv->uuid = g_value_dup_string (value);
 		break;
 	case PROP_STABLE_ID:
-		g_value_set_string (value, nm_setting_connection_get_stable_id (setting));
+		g_free (priv->stable_id);
+		priv->stable_id = g_value_dup_string (value);
 		break;
 	case PROP_INTERFACE_NAME:
-		g_value_set_string (value, nm_setting_connection_get_interface_name (setting));
+		g_free (priv->interface_name);
+		priv->interface_name = g_value_dup_string (value);
 		break;
 	case PROP_TYPE:
-		g_value_set_string (value, nm_setting_connection_get_connection_type (setting));
+		g_free (priv->type);
+		priv->type = g_value_dup_string (value);
 		break;
 	case PROP_PERMISSIONS:
-		g_value_take_boxed (value, perm_permlist_to_strv (priv->permissions));
+		g_slist_free_full (priv->permissions, (GDestroyNotify) permission_free);
+		priv->permissions = perm_strv_to_permlist (g_value_get_boxed (value));
 		break;
 	case PROP_AUTOCONNECT:
-		g_value_set_boolean (value, nm_setting_connection_get_autoconnect (setting));
+		priv->autoconnect = g_value_get_boolean (value);
 		break;
 	case PROP_AUTOCONNECT_PRIORITY:
-		g_value_set_int (value, nm_setting_connection_get_autoconnect_priority (setting));
+		priv->autoconnect_priority = g_value_get_int (value);
 		break;
 	case PROP_AUTOCONNECT_RETRIES:
-		g_value_set_int (value, nm_setting_connection_get_autoconnect_retries (setting));
+		priv->autoconnect_retries = g_value_get_int (value);
 		break;
 	case PROP_MULTI_CONNECT:
-		g_value_set_int (value, priv->multi_connect);
+		priv->multi_connect = g_value_get_int (value);
 		break;
 	case PROP_TIMESTAMP:
-		g_value_set_uint64 (value, nm_setting_connection_get_timestamp (setting));
+		priv->timestamp = g_value_get_uint64 (value);
 		break;
 	case PROP_READ_ONLY:
-		g_value_set_boolean (value, nm_setting_connection_get_read_only (setting));
+		priv->read_only = g_value_get_boolean (value);
 		break;
 	case PROP_ZONE:
-		g_value_set_string (value, nm_setting_connection_get_zone (setting));
+		g_free (priv->zone);
+		priv->zone = g_value_dup_string (value);
 		break;
 	case PROP_MASTER:
-		g_value_set_string (value, nm_setting_connection_get_master (setting));
+		g_free (priv->master);
+		priv->master = g_value_dup_string (value);
 		break;
 	case PROP_SLAVE_TYPE:
-		g_value_set_string (value, nm_setting_connection_get_slave_type (setting));
+		g_free (priv->slave_type);
+		priv->slave_type = g_value_dup_string (value);
 		break;
 	case PROP_AUTOCONNECT_SLAVES:
-		g_value_set_enum (value, nm_setting_connection_get_autoconnect_slaves (setting));
+		priv->autoconnect_slaves = g_value_get_enum (value);
 		break;
 	case PROP_SECONDARIES:
-		g_value_take_boxed (value, _nm_utils_slist_to_strv (priv->secondaries, TRUE));
+		g_slist_free_full (priv->secondaries, g_free);
+		priv->secondaries = _nm_utils_strv_to_slist (g_value_get_boxed (value), TRUE);
 		break;
 	case PROP_GATEWAY_PING_TIMEOUT:
-		g_value_set_uint (value, priv->gateway_ping_timeout);
+		priv->gateway_ping_timeout = g_value_get_uint (value);
 		break;
 	case PROP_METERED:
-		g_value_set_enum (value, priv->metered);
+		priv->metered = g_value_get_enum (value);
 		break;
 	case PROP_LLDP:
-		g_value_set_int (value, priv->lldp);
+		priv->lldp = g_value_get_int (value);
 		break;
 	case PROP_AUTH_RETRIES:
-		g_value_set_int (value, priv->auth_retries);
+		priv->auth_retries = g_value_get_int (value);
 		break;
 	case PROP_MDNS:
-		g_value_set_int (value, priv->mdns);
+		priv->mdns = g_value_get_int (value);
 		break;
 	case PROP_LLMNR:
-		g_value_set_int (value, priv->llmnr);
+		priv->llmnr = g_value_get_int (value);
 		break;
 	default:
 		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
@@ -1537,6 +1499,48 @@ get_property (GObject *object, guint prop_id,
 	}
 }
 
+/*****************************************************************************/
+
+static void
+nm_setting_connection_init (NMSettingConnection *setting)
+{
+	NMSettingConnectionPrivate *priv = NM_SETTING_CONNECTION_GET_PRIVATE (setting);
+
+	priv->mdns = NM_SETTING_CONNECTION_MDNS_DEFAULT;
+	priv->llmnr = NM_SETTING_CONNECTION_LLMNR_DEFAULT;
+}
+
+/**
+ * nm_setting_connection_new:
+ *
+ * Creates a new #NMSettingConnection object with default values.
+ *
+ * Returns: the new empty #NMSettingConnection object
+ **/
+NMSetting *nm_setting_connection_new (void)
+{
+	return (NMSetting *) g_object_new (NM_TYPE_SETTING_CONNECTION, NULL);
+}
+
+static void
+finalize (GObject *object)
+{
+	NMSettingConnectionPrivate *priv = NM_SETTING_CONNECTION_GET_PRIVATE (object);
+
+	g_free (priv->id);
+	g_free (priv->uuid);
+	g_free (priv->stable_id);
+	g_free (priv->interface_name);
+	g_free (priv->type);
+	g_free (priv->zone);
+	g_free (priv->master);
+	g_free (priv->slave_type);
+	g_slist_free_full (priv->permissions, (GDestroyNotify) permission_free);
+	g_slist_free_full (priv->secondaries, g_free);
+
+	G_OBJECT_CLASS (nm_setting_connection_parent_class)->finalize (object);
+}
+
 static void
 nm_setting_connection_class_init (NMSettingConnectionClass *klass)
 {
@@ -1546,8 +1550,8 @@ nm_setting_connection_class_init (NMSettingConnectionClass *klass)
 
 	g_type_class_add_private (klass, sizeof (NMSettingConnectionPrivate));
 
-	object_class->set_property = set_property;
 	object_class->get_property = get_property;
+	object_class->set_property = set_property;
 	object_class->finalize     = finalize;
 
 	setting_class->verify           = verify;
@@ -1565,13 +1569,12 @@ nm_setting_connection_class_init (NMSettingConnectionClass *klass)
 	 * description: User friendly name for the connection profile.
 	 * ---end---
 	 */
-	g_object_class_install_property
-		(object_class, PROP_ID,
-		 g_param_spec_string (NM_SETTING_CONNECTION_ID, "", "",
-		                      NULL,
-		                      G_PARAM_READWRITE |
-		                      NM_SETTING_PARAM_FUZZY_IGNORE |
-		                      G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_ID] =
+	    g_param_spec_string (NM_SETTING_CONNECTION_ID, "", "",
+	                         NULL,
+	                         G_PARAM_READWRITE |
+	                         NM_SETTING_PARAM_FUZZY_IGNORE |
+	                         G_PARAM_STATIC_STRINGS);
 
 	/**
 	 * NMSettingConnection:uuid:
@@ -1596,13 +1599,12 @@ nm_setting_connection_class_init (NMSettingConnectionClass *klass)
 	 *   creates the UUID itself (by hashing the filename).
 	 * ---end---
 	 */
-	g_object_class_install_property
-		(object_class, PROP_UUID,
-		 g_param_spec_string (NM_SETTING_CONNECTION_UUID, "", "",
-		                      NULL,
-		                      G_PARAM_READWRITE |
-		                      NM_SETTING_PARAM_FUZZY_IGNORE |
-		                      G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_UUID] =
+	    g_param_spec_string (NM_SETTING_CONNECTION_UUID, "", "",
+	                         NULL,
+	                         G_PARAM_READWRITE |
+	                         NM_SETTING_PARAM_FUZZY_IGNORE |
+	                         G_PARAM_STATIC_STRINGS);
 
 	/**
 	 * NMSettingConnection:stable-id:
@@ -1629,7 +1631,7 @@ nm_setting_connection_class_init (NMSettingConnectionClass *klass)
 	 * 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 the the interface name of the
+	 * 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
@@ -1650,13 +1652,12 @@ nm_setting_connection_class_init (NMSettingConnectionClass *klass)
 	 * description: Token to generate stable IDs.
 	 * ---end---
 	 */
-	g_object_class_install_property
-		(object_class, PROP_STABLE_ID,
-		 g_param_spec_string (NM_SETTING_CONNECTION_STABLE_ID, "", "",
-		                      NULL,
-		                      G_PARAM_READWRITE |
-		                      NM_SETTING_PARAM_FUZZY_IGNORE |
-		                      G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_STABLE_ID] =
+	    g_param_spec_string (NM_SETTING_CONNECTION_STABLE_ID, "", "",
+	                         NULL,
+	                         G_PARAM_READWRITE |
+	                         NM_SETTING_PARAM_FUZZY_IGNORE |
+	                         G_PARAM_STATIC_STRINGS);
 
 	/**
 	 * NMSettingConnection:interface-name:
@@ -1681,17 +1682,15 @@ nm_setting_connection_class_init (NMSettingConnectionClass *klass)
 	 *   can be required for some connection types.
 	 * ---end---
 	 */
-	g_object_class_install_property
-		(object_class, PROP_INTERFACE_NAME,
-		 g_param_spec_string (NM_SETTING_CONNECTION_INTERFACE_NAME, "", "",
-		                      NULL,
-		                      G_PARAM_READWRITE |
-		                      NM_SETTING_PARAM_INFERRABLE |
-		                      G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_INTERFACE_NAME] =
+	    g_param_spec_string (NM_SETTING_CONNECTION_INTERFACE_NAME, "", "",
+	                         NULL,
+	                         G_PARAM_READWRITE |
+	                         NM_SETTING_PARAM_INFERRABLE |
+	                         G_PARAM_STATIC_STRINGS);
 
 	_properties_override_add_override (properties_override,
-	                                   g_object_class_find_property (G_OBJECT_CLASS (setting_class),
-	                                                                 NM_SETTING_CONNECTION_INTERFACE_NAME),
+	                                   obj_properties[PROP_INTERFACE_NAME],
 	                                   G_VARIANT_TYPE_STRING,
 	                                   NULL,
 	                                   nm_setting_connection_set_interface_name,
@@ -1715,13 +1714,12 @@ nm_setting_connection_class_init (NMSettingConnectionClass *klass)
 	 * example: TYPE=Ethernet; TYPE=Bond; TYPE=Bridge; DEVICETYPE=TeamPort
 	 * ---end---
 	 */
-	g_object_class_install_property
-		(object_class, PROP_TYPE,
-		 g_param_spec_string (NM_SETTING_CONNECTION_TYPE, "", "",
-		                      NULL,
-		                      G_PARAM_READWRITE |
-		                      NM_SETTING_PARAM_INFERRABLE |
-		                      G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_TYPE] =
+	    g_param_spec_string (NM_SETTING_CONNECTION_TYPE, "", "",
+	                         NULL,
+	                         G_PARAM_READWRITE |
+	                         NM_SETTING_PARAM_INFERRABLE |
+	                         G_PARAM_STATIC_STRINGS);
 
 	/**
 	 * NMSettingConnection:permissions:
@@ -1748,12 +1746,11 @@ nm_setting_connection_class_init (NMSettingConnectionClass *klass)
 	 * example: USERS="joe bob"
 	 * ---end---
 	 */
-	g_object_class_install_property
-		(object_class, PROP_PERMISSIONS,
-		 g_param_spec_boxed (NM_SETTING_CONNECTION_PERMISSIONS, "", "",
-		                     G_TYPE_STRV,
-		                     G_PARAM_READWRITE |
-		                     G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_PERMISSIONS] =
+	    g_param_spec_boxed (NM_SETTING_CONNECTION_PERMISSIONS, "", "",
+	                        G_TYPE_STRV,
+	                        G_PARAM_READWRITE |
+	                        G_PARAM_STATIC_STRINGS);
 
 	/**
 	 * NMSettingConnection:autoconnect:
@@ -1774,14 +1771,13 @@ nm_setting_connection_class_init (NMSettingConnectionClass *klass)
 	 * description: Whether the connection should be autoconnected (not only while booting).
 	 * ---end---
 	 */
-	g_object_class_install_property
-		(object_class, PROP_AUTOCONNECT,
-		 g_param_spec_boolean (NM_SETTING_CONNECTION_AUTOCONNECT, "", "",
-		                       TRUE,
-		                       G_PARAM_READWRITE |
-		                       G_PARAM_CONSTRUCT |
-		                       NM_SETTING_PARAM_FUZZY_IGNORE |
-		                       G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_AUTOCONNECT] =
+	    g_param_spec_boolean (NM_SETTING_CONNECTION_AUTOCONNECT, "", "",
+	                          TRUE,
+	                          G_PARAM_READWRITE |
+	                          G_PARAM_CONSTRUCT |
+	                          NM_SETTING_PARAM_FUZZY_IGNORE |
+	                          G_PARAM_STATIC_STRINGS);
 
 	/**
 	 * NMSettingConnection:autoconnect-priority:
@@ -1800,8 +1796,7 @@ nm_setting_connection_class_init (NMSettingConnectionClass *klass)
 	 * example: AUTOCONNECT_PRIORITY=20
 	 * ---end---
 	 */
-	g_object_class_install_property
-	    (object_class, PROP_AUTOCONNECT_PRIORITY,
+	obj_properties[PROP_AUTOCONNECT_PRIORITY] =
 	     g_param_spec_int (NM_SETTING_CONNECTION_AUTOCONNECT_PRIORITY, "", "",
 	                       NM_SETTING_CONNECTION_AUTOCONNECT_PRIORITY_MIN,
 	                       NM_SETTING_CONNECTION_AUTOCONNECT_PRIORITY_MAX,
@@ -1809,7 +1804,7 @@ nm_setting_connection_class_init (NMSettingConnectionClass *klass)
 	                       G_PARAM_READWRITE |
 	                       G_PARAM_CONSTRUCT |
 	                       NM_SETTING_PARAM_FUZZY_IGNORE |
-	                       G_PARAM_STATIC_STRINGS));
+	                       G_PARAM_STATIC_STRINGS);
 
 	/**
 	 * NMSettingConnection:autoconnect-retries:
@@ -1829,14 +1824,13 @@ nm_setting_connection_class_init (NMSettingConnectionClass *klass)
 	 * example: AUTOCONNECT_RETRIES=1
 	 * ---end---
 	 */
-	g_object_class_install_property
-	    (object_class, PROP_AUTOCONNECT_RETRIES,
+	obj_properties[PROP_AUTOCONNECT_RETRIES] =
 	     g_param_spec_int (NM_SETTING_CONNECTION_AUTOCONNECT_RETRIES, "", "",
 	                       -1, G_MAXINT32, -1,
 	                       G_PARAM_READWRITE |
 	                       G_PARAM_CONSTRUCT |
 	                       NM_SETTING_PARAM_FUZZY_IGNORE |
-	                       G_PARAM_STATIC_STRINGS));
+	                       G_PARAM_STATIC_STRINGS);
 
 	/**
 	 * NMSettingConnection:multi-connect:
@@ -1854,13 +1848,12 @@ nm_setting_connection_class_init (NMSettingConnectionClass *klass)
 	 * example: ZONE=3
 	 * ---end---
 	 */
-	g_object_class_install_property
-	    (object_class, PROP_MULTI_CONNECT,
+	obj_properties[PROP_MULTI_CONNECT] =
 	     g_param_spec_int (NM_SETTING_CONNECTION_MULTI_CONNECT, "", "",
 	                       G_MININT32, G_MAXINT32, NM_CONNECTION_MULTI_CONNECT_DEFAULT,
 	                       G_PARAM_READWRITE |
 	                       NM_SETTING_PARAM_FUZZY_IGNORE |
-	                       G_PARAM_STATIC_STRINGS));
+	                       G_PARAM_STATIC_STRINGS);
 
 	/**
 	 * NMSettingConnection:timestamp:
@@ -1873,14 +1866,13 @@ nm_setting_connection_class_init (NMSettingConnectionClass *klass)
 	 * timestamp. The property is only meant for reading (changes to this
 	 * property will not be preserved).
 	 **/
-	g_object_class_install_property
-		(object_class, PROP_TIMESTAMP,
-		 g_param_spec_uint64 (NM_SETTING_CONNECTION_TIMESTAMP, "", "",
-		                      0, G_MAXUINT64, 0,
-		                      G_PARAM_READWRITE |
-		                      G_PARAM_CONSTRUCT |
-		                      NM_SETTING_PARAM_FUZZY_IGNORE |
-		                      G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_TIMESTAMP] =
+	    g_param_spec_uint64 (NM_SETTING_CONNECTION_TIMESTAMP, "", "",
+	                         0, G_MAXUINT64, 0,
+	                         G_PARAM_READWRITE |
+	                         G_PARAM_CONSTRUCT |
+	                         NM_SETTING_PARAM_FUZZY_IGNORE |
+	                         G_PARAM_STATIC_STRINGS);
 
 	/**
 	 * NMSettingConnection:read-only:
@@ -1889,14 +1881,13 @@ nm_setting_connection_class_init (NMSettingConnectionClass *klass)
 	 * service's D-Bus interface with the right privileges, or %TRUE if the
 	 * connection is read-only and cannot be modified.
 	 **/
-	g_object_class_install_property
-		(object_class, PROP_READ_ONLY,
-		 g_param_spec_boolean (NM_SETTING_CONNECTION_READ_ONLY, "", "",
-		                       FALSE,
-		                       G_PARAM_READWRITE |
-		                       G_PARAM_CONSTRUCT |
-		                       NM_SETTING_PARAM_FUZZY_IGNORE |
-		                       G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_READ_ONLY] =
+	    g_param_spec_boolean (NM_SETTING_CONNECTION_READ_ONLY, "", "",
+	                          FALSE,
+	                          G_PARAM_READWRITE |
+	                          G_PARAM_CONSTRUCT |
+	                          NM_SETTING_PARAM_FUZZY_IGNORE |
+	                          G_PARAM_STATIC_STRINGS);
 
 	/**
 	 * NMSettingConnection:zone:
@@ -1917,15 +1908,14 @@ nm_setting_connection_class_init (NMSettingConnectionClass *klass)
 	 * example: ZONE=Work
 	 * ---end---
 	 */
-	g_object_class_install_property
-		(object_class, PROP_ZONE,
-		 g_param_spec_string (NM_SETTING_CONNECTION_ZONE, "", "",
-		                      NULL,
-		                      G_PARAM_READWRITE |
-		                      G_PARAM_CONSTRUCT |
-		                      NM_SETTING_PARAM_FUZZY_IGNORE |
-		                      NM_SETTING_PARAM_REAPPLY_IMMEDIATELY |
-		                      G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_ZONE] =
+	    g_param_spec_string (NM_SETTING_CONNECTION_ZONE, "", "",
+	                         NULL,
+	                         G_PARAM_READWRITE |
+	                         G_PARAM_CONSTRUCT |
+	                         NM_SETTING_PARAM_FUZZY_IGNORE |
+	                         NM_SETTING_PARAM_REAPPLY_IMMEDIATELY |
+	                         G_PARAM_STATIC_STRINGS);
 
 	/**
 	 * NMSettingConnection:master:
@@ -1941,14 +1931,13 @@ nm_setting_connection_class_init (NMSettingConnectionClass *klass)
 	 *   for compatibility with legacy tooling.
 	 * ---end---
 	 */
-	g_object_class_install_property
-		(object_class, PROP_MASTER,
-		 g_param_spec_string (NM_SETTING_CONNECTION_MASTER, "", "",
-		                      NULL,
-		                      G_PARAM_READWRITE |
-		                      NM_SETTING_PARAM_FUZZY_IGNORE |
-		                      NM_SETTING_PARAM_INFERRABLE |
-		                      G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_MASTER] =
+	    g_param_spec_string (NM_SETTING_CONNECTION_MASTER, "", "",
+	                         NULL,
+	                         G_PARAM_READWRITE |
+	                         NM_SETTING_PARAM_FUZZY_IGNORE |
+	                         NM_SETTING_PARAM_INFERRABLE |
+	                         G_PARAM_STATIC_STRINGS);
 
 	/**
 	 * NMSettingConnection:slave-type:
@@ -1967,14 +1956,13 @@ nm_setting_connection_class_init (NMSettingConnectionClass *klass)
 	 *   and BRIDGE_UUID for bridging.
 	 * ---end---
 	 */
-	g_object_class_install_property
-		(object_class, PROP_SLAVE_TYPE,
-		 g_param_spec_string (NM_SETTING_CONNECTION_SLAVE_TYPE, "", "",
-		                      NULL,
-		                      G_PARAM_READWRITE |
-		                      NM_SETTING_PARAM_FUZZY_IGNORE |
-		                      NM_SETTING_PARAM_INFERRABLE |
-		                      G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_SLAVE_TYPE] =
+	    g_param_spec_string (NM_SETTING_CONNECTION_SLAVE_TYPE, "", "",
+	                         NULL,
+	                         G_PARAM_READWRITE |
+	                         NM_SETTING_PARAM_FUZZY_IGNORE |
+	                         NM_SETTING_PARAM_INFERRABLE |
+	                         G_PARAM_STATIC_STRINGS);
 
 	/**
 	 * NMSettingConnection:autoconnect-slaves:
@@ -1999,15 +1987,14 @@ nm_setting_connection_class_init (NMSettingConnectionClass *klass)
 	 *   when this connection is activated.
 	 * ---end---
 	 */
-	g_object_class_install_property
-		(object_class, PROP_AUTOCONNECT_SLAVES,
-		 g_param_spec_enum (NM_SETTING_CONNECTION_AUTOCONNECT_SLAVES, "", "",
-		                    NM_TYPE_SETTING_CONNECTION_AUTOCONNECT_SLAVES,
-		                    NM_SETTING_CONNECTION_AUTOCONNECT_SLAVES_DEFAULT,
-		                    G_PARAM_READWRITE |
-		                    G_PARAM_CONSTRUCT |
-		                    NM_SETTING_PARAM_FUZZY_IGNORE |
-		                    G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_AUTOCONNECT_SLAVES] =
+	    g_param_spec_enum (NM_SETTING_CONNECTION_AUTOCONNECT_SLAVES, "", "",
+	                       NM_TYPE_SETTING_CONNECTION_AUTOCONNECT_SLAVES,
+	                       NM_SETTING_CONNECTION_AUTOCONNECT_SLAVES_DEFAULT,
+	                       G_PARAM_READWRITE |
+	                       G_PARAM_CONSTRUCT |
+	                       NM_SETTING_PARAM_FUZZY_IGNORE |
+	                       G_PARAM_STATIC_STRINGS);
 
 	/**
 	 * NMSettingConnection:secondaries:
@@ -2023,13 +2010,12 @@ nm_setting_connection_class_init (NMSettingConnectionClass *klass)
 	 *   together with this connection.
 	 * ---end---
 	 */
-	g_object_class_install_property
-		(object_class, PROP_SECONDARIES,
-		 g_param_spec_boxed (NM_SETTING_CONNECTION_SECONDARIES, "", "",
-		                     G_TYPE_STRV,
-		                     G_PARAM_READWRITE |
-		                     NM_SETTING_PARAM_FUZZY_IGNORE |
-		                     G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_SECONDARIES] =
+	    g_param_spec_boxed (NM_SETTING_CONNECTION_SECONDARIES, "", "",
+	                        G_TYPE_STRV,
+	                        G_PARAM_READWRITE |
+	                        NM_SETTING_PARAM_FUZZY_IGNORE |
+	                        G_PARAM_STATIC_STRINGS);
 
 	/**
 	 * NMSettingConnection:gateway-ping-timeout:
@@ -2046,13 +2032,12 @@ nm_setting_connection_class_init (NMSettingConnectionClass *klass)
 	 * example: GATEWAY_PING_TIMEOUT=5
 	 * ---end---
 	 */
-	g_object_class_install_property
-		(object_class, PROP_GATEWAY_PING_TIMEOUT,
-		 g_param_spec_uint (NM_SETTING_CONNECTION_GATEWAY_PING_TIMEOUT, "", "",
-		                    0, 600, 0,
-		                    G_PARAM_READWRITE |
-		                    G_PARAM_CONSTRUCT |
-		                    G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_GATEWAY_PING_TIMEOUT] =
+	    g_param_spec_uint (NM_SETTING_CONNECTION_GATEWAY_PING_TIMEOUT, "", "",
+	                       0, 600, 0,
+	                       G_PARAM_READWRITE |
+	                       G_PARAM_CONSTRUCT |
+	                       G_PARAM_STATIC_STRINGS);
 
 	/**
 	 * NMSettingConnection:metered:
@@ -2072,14 +2057,13 @@ nm_setting_connection_class_init (NMSettingConnectionClass *klass)
 	 * example: CONNECTION_METERED=yes
 	 * ---end---
 	 */
-	g_object_class_install_property
-		(object_class, PROP_METERED,
-		 g_param_spec_enum (NM_SETTING_CONNECTION_METERED, "", "",
-		                    NM_TYPE_METERED,
-		                    NM_METERED_UNKNOWN,
-		                    G_PARAM_READWRITE |
-		                    NM_SETTING_PARAM_REAPPLY_IMMEDIATELY |
-		                    G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_METERED] =
+	    g_param_spec_enum (NM_SETTING_CONNECTION_METERED, "", "",
+	                       NM_TYPE_METERED,
+	                       NM_METERED_UNKNOWN,
+	                       G_PARAM_READWRITE |
+	                       NM_SETTING_PARAM_REAPPLY_IMMEDIATELY |
+	                       G_PARAM_STATIC_STRINGS);
 
 	/**
 	 * NMSettingConnection:lldp:
@@ -2097,14 +2081,13 @@ nm_setting_connection_class_init (NMSettingConnectionClass *klass)
 	 * example: LLDP=no
 	 * ---end---
 	 */
-	g_object_class_install_property
-		(object_class, PROP_LLDP,
-		 g_param_spec_int (NM_SETTING_CONNECTION_LLDP, "", "",
-		                   G_MININT32, G_MAXINT32, NM_SETTING_CONNECTION_LLDP_DEFAULT,
-		                   NM_SETTING_PARAM_FUZZY_IGNORE |
-		                   G_PARAM_READWRITE |
-		                   G_PARAM_CONSTRUCT |
-		                   G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_LLDP] =
+	    g_param_spec_int (NM_SETTING_CONNECTION_LLDP, "", "",
+	                      G_MININT32, G_MAXINT32, NM_SETTING_CONNECTION_LLDP_DEFAULT,
+	                      NM_SETTING_PARAM_FUZZY_IGNORE |
+	                      G_PARAM_READWRITE |
+	                      G_PARAM_CONSTRUCT |
+	                      G_PARAM_STATIC_STRINGS);
 
 	/**
 	 * NMSettingConnection:auth-retries:
@@ -2124,14 +2107,13 @@ nm_setting_connection_class_init (NMSettingConnectionClass *klass)
 	 * description: Number of retries for authentication.
 	 * ---end---
 	 */
-	g_object_class_install_property
-		(object_class, PROP_AUTH_RETRIES,
-		 g_param_spec_int (NM_SETTING_CONNECTION_AUTH_RETRIES, "", "",
-		                   -1, G_MAXINT32, -1,
-		                   G_PARAM_READWRITE |
-		                   G_PARAM_CONSTRUCT |
-		                   NM_SETTING_PARAM_FUZZY_IGNORE |
-		                   G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_AUTH_RETRIES] =
+	    g_param_spec_int (NM_SETTING_CONNECTION_AUTH_RETRIES, "", "",
+	                      -1, G_MAXINT32, -1,
+	                      G_PARAM_READWRITE |
+	                      G_PARAM_CONSTRUCT |
+	                      NM_SETTING_PARAM_FUZZY_IGNORE |
+	                      G_PARAM_STATIC_STRINGS);
 
 	/**
 	 * NMSettingConnection:mdns:
@@ -2156,13 +2138,12 @@ nm_setting_connection_class_init (NMSettingConnectionClass *klass)
 	 * example: MDNS=yes
 	 * ---end---
 	 */
-	g_object_class_install_property
-		(object_class, PROP_MDNS,
-		 g_param_spec_int (NM_SETTING_CONNECTION_MDNS, "", "",
-		                   G_MININT32, G_MAXINT32,
-		                   NM_SETTING_CONNECTION_MDNS_DEFAULT,
-		                   G_PARAM_READWRITE |
-		                   G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_MDNS] =
+	    g_param_spec_int (NM_SETTING_CONNECTION_MDNS, "", "",
+	                      G_MININT32, G_MAXINT32,
+	                      NM_SETTING_CONNECTION_MDNS_DEFAULT,
+	                      G_PARAM_READWRITE |
+	                      G_PARAM_STATIC_STRINGS);
 
 	/**
 	 * NMSettingConnection:llmnr:
@@ -2190,13 +2171,14 @@ nm_setting_connection_class_init (NMSettingConnectionClass *klass)
 	 * example: LLMNR=yes
 	 * ---end---
 	 */
-	g_object_class_install_property
-		(object_class, PROP_LLMNR,
-		 g_param_spec_int (NM_SETTING_CONNECTION_LLMNR, "", "",
-		                   G_MININT32, G_MAXINT32,
-		                   NM_SETTING_CONNECTION_LLMNR_DEFAULT,
-		                   G_PARAM_READWRITE |
-		                   G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_LLMNR] =
+	    g_param_spec_int (NM_SETTING_CONNECTION_LLMNR, "", "",
+	                      G_MININT32, G_MAXINT32,
+	                      NM_SETTING_CONNECTION_LLMNR_DEFAULT,
+	                      G_PARAM_READWRITE |
+	                      G_PARAM_STATIC_STRINGS);
+
+	g_object_class_install_properties (object_class, _PROPERTY_ENUMS_LAST, obj_properties);
 
 	_nm_setting_class_commit_full (setting_class, NM_META_SETTING_TYPE_CONNECTION,
 	                               NULL, properties_override);
diff --git a/libnm-core/nm-setting-dcb.c b/libnm-core/nm-setting-dcb.c
index dabcbbaf..419d9825 100644
--- a/libnm-core/nm-setting-dcb.c
+++ b/libnm-core/nm-setting-dcb.c
@@ -21,9 +21,8 @@
 
 #include "nm-default.h"
 
-#include 
-
 #include "nm-setting-dcb.h"
+
 #include "nm-utils.h"
 #include "nm-utils-private.h"
 #include "nm-setting-private.h"
@@ -40,9 +39,30 @@
  * of storage technologies like Fibre Channel over Ethernet (FCoE) and iSCSI.
  **/
 
-G_DEFINE_TYPE (NMSettingDcb, nm_setting_dcb, NM_TYPE_SETTING)
+/*****************************************************************************/
 
-#define NM_SETTING_DCB_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_SETTING_DCB, NMSettingDcbPrivate))
+NM_GOBJECT_PROPERTIES_DEFINE (NMSettingDcb,
+
+	PROP_APP_FCOE_FLAGS,
+	PROP_APP_FCOE_PRIORITY,
+	PROP_APP_FCOE_MODE,
+
+	PROP_APP_ISCSI_FLAGS,
+	PROP_APP_ISCSI_PRIORITY,
+
+	PROP_APP_FIP_FLAGS,
+	PROP_APP_FIP_PRIORITY,
+
+	PROP_PFC_FLAGS,
+	PROP_PRIORITY_FLOW_CONTROL,
+
+	PROP_PRIORITY_GROUP_FLAGS,
+	PROP_PRIORITY_GROUP_ID,
+	PROP_PRIORITY_GROUP_BANDWIDTH,
+	PROP_PRIORITY_BANDWIDTH,
+	PROP_PRIORITY_STRICT_BANDWIDTH,
+	PROP_PRIORITY_TRAFFIC_CLASS,
+);
 
 typedef struct {
 	NMSettingDcbFlags app_fcoe_flags;
@@ -68,43 +88,11 @@ typedef struct {
 	guint             priority_traffic_class[8];
 } NMSettingDcbPrivate;
 
-enum {
-	PROP_0,
-	PROP_APP_FCOE_FLAGS,
-	PROP_APP_FCOE_PRIORITY,
-	PROP_APP_FCOE_MODE,
-
-	PROP_APP_ISCSI_FLAGS,
-	PROP_APP_ISCSI_PRIORITY,
-
-	PROP_APP_FIP_FLAGS,
-	PROP_APP_FIP_PRIORITY,
-
-	PROP_PFC_FLAGS,
-	PROP_PFC,
-
-	PROP_PRIORITY_GROUP_FLAGS,
-	PROP_PRIORITY_GROUP_ID,
-	PROP_PRIORITY_GROUP_BANDWIDTH,
-	PROP_PRIORITY_BANDWIDTH,
-	PROP_PRIORITY_STRICT,
-	PROP_PRIORITY_TRAFFIC_CLASS,
+G_DEFINE_TYPE (NMSettingDcb, nm_setting_dcb, NM_TYPE_SETTING)
 
-	LAST_PROP
-};
+#define NM_SETTING_DCB_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_SETTING_DCB, NMSettingDcbPrivate))
 
-/**
- * nm_setting_dcb_new:
- *
- * Creates a new #NMSettingDcb object with default values.
- *
- * Returns: (transfer full): the new empty #NMSettingDcb object
- **/
-NMSetting *
-nm_setting_dcb_new (void)
-{
-	return (NMSetting *) g_object_new (NM_TYPE_SETTING_DCB, NULL);
-}
+/*****************************************************************************/
 
 /**
  * nm_setting_dcb_get_app_fcoe_flags:
@@ -258,7 +246,7 @@ nm_setting_dcb_set_priority_flow_control (NMSettingDcb *setting,
 	priv = NM_SETTING_DCB_GET_PRIVATE (setting);
 	if (priv->pfc[user_priority] != uint_enabled) {
 		priv->pfc[user_priority] = uint_enabled;
-		g_object_notify (G_OBJECT (setting), NM_SETTING_DCB_PRIORITY_FLOW_CONTROL);
+		_notify (setting, PROP_PRIORITY_FLOW_CONTROL);
 	}
 }
 
@@ -318,7 +306,7 @@ nm_setting_dcb_set_priority_group_id (NMSettingDcb *setting,
 	priv = NM_SETTING_DCB_GET_PRIVATE (setting);
 	if (priv->priority_group_id[user_priority] != group_id) {
 		priv->priority_group_id[user_priority] = group_id;
-		g_object_notify (G_OBJECT (setting), NM_SETTING_DCB_PRIORITY_GROUP_ID);
+		_notify (setting, PROP_PRIORITY_GROUP_ID);
 	}
 }
 
@@ -363,7 +351,7 @@ nm_setting_dcb_set_priority_group_bandwidth (NMSettingDcb *setting,
 	priv = NM_SETTING_DCB_GET_PRIVATE (setting);
 	if (priv->priority_group_bandwidth[group_id] != bandwidth_percent) {
 		priv->priority_group_bandwidth[group_id] = bandwidth_percent;
-		g_object_notify (G_OBJECT (setting), NM_SETTING_DCB_PRIORITY_GROUP_BANDWIDTH);
+		_notify (setting, PROP_PRIORITY_GROUP_BANDWIDTH);
 	}
 }
 
@@ -409,7 +397,7 @@ nm_setting_dcb_set_priority_bandwidth (NMSettingDcb *setting,
 	priv = NM_SETTING_DCB_GET_PRIVATE (setting);
 	if (priv->priority_bandwidth[user_priority] != bandwidth_percent) {
 		priv->priority_bandwidth[user_priority] = bandwidth_percent;
-		g_object_notify (G_OBJECT (setting), NM_SETTING_DCB_PRIORITY_BANDWIDTH);
+		_notify (setting, PROP_PRIORITY_BANDWIDTH);
 	}
 }
 
@@ -455,7 +443,7 @@ nm_setting_dcb_set_priority_strict_bandwidth (NMSettingDcb *setting,
 	priv = NM_SETTING_DCB_GET_PRIVATE (setting);
 	if (priv->priority_strict[user_priority] != uint_strict) {
 		priv->priority_strict[user_priority] = uint_strict;
-		g_object_notify (G_OBJECT (setting), NM_SETTING_DCB_PRIORITY_STRICT_BANDWIDTH);
+		_notify (setting, PROP_PRIORITY_STRICT_BANDWIDTH);
 	}
 }
 
@@ -500,7 +488,7 @@ nm_setting_dcb_set_priority_traffic_class (NMSettingDcb *setting,
 	priv = NM_SETTING_DCB_GET_PRIVATE (setting);
 	if (priv->priority_traffic_class[user_priority] != traffic_class) {
 		priv->priority_traffic_class[user_priority] = traffic_class;
-		g_object_notify (G_OBJECT (setting), NM_SETTING_DCB_PRIORITY_TRAFFIC_CLASS);
+		_notify (setting, PROP_PRIORITY_TRAFFIC_CLASS);
 	}
 }
 
@@ -724,14 +712,9 @@ verify (NMSetting *setting, NMConnection *connection, GError **error)
 
 /*****************************************************************************/
 
-static void
-nm_setting_dcb_init (NMSettingDcb *setting)
-{
-}
-
 G_STATIC_ASSERT (sizeof (guint) == sizeof (gboolean));
 
-static inline void
+static void
 set_array_from_gvalue (const GValue *v, uint *a, size_t len)
 {
 	GArray *src = g_value_get_boxed (v);
@@ -746,7 +729,7 @@ set_array_from_gvalue (const GValue *v, uint *a, size_t len)
 }
 #define SET_ARRAY_FROM_GVALUE(v, a)  set_array_from_gvalue (v, a, G_N_ELEMENTS (a))
 
-static inline void
+static void
 set_gvalue_from_array (GValue *v, uint *a, size_t len)
 {
 	GArray *src = g_array_sized_new (FALSE, TRUE, sizeof (guint), len);
@@ -776,58 +759,60 @@ _nm_setting_dcb_uint_array_from_dbus (GVariant *dbus_value,
 	set_gvalue_from_array (prop_value, (guint *) array, length);
 }
 
+/*****************************************************************************/
+
 static void
-set_property (GObject *object, guint prop_id,
-              const GValue *value, GParamSpec *pspec)
+get_property (GObject *object, guint prop_id,
+              GValue *value, GParamSpec *pspec)
 {
-	NMSettingDcbPrivate *priv = NM_SETTING_DCB_GET_PRIVATE (object);
+	NMSettingDcb *setting = NM_SETTING_DCB (object);
+	NMSettingDcbPrivate *priv = NM_SETTING_DCB_GET_PRIVATE (setting);
 
 	switch (prop_id) {
 	case PROP_APP_FCOE_FLAGS:
-		priv->app_fcoe_flags = g_value_get_flags (value);
+		g_value_set_flags (value, priv->app_fcoe_flags);
 		break;
 	case PROP_APP_FCOE_PRIORITY:
-		priv->app_fcoe_priority = g_value_get_int (value);
+		g_value_set_int (value, priv->app_fcoe_priority);
 		break;
 	case PROP_APP_FCOE_MODE:
-		g_free (priv->app_fcoe_mode);
-		priv->app_fcoe_mode = g_value_dup_string (value);
+		g_value_set_string (value, priv->app_fcoe_mode);
 		break;
 	case PROP_APP_ISCSI_FLAGS:
-		priv->app_iscsi_flags = g_value_get_flags (value);
+		g_value_set_flags (value, priv->app_iscsi_flags);
 		break;
 	case PROP_APP_ISCSI_PRIORITY:
-		priv->app_iscsi_priority = g_value_get_int (value);
+		g_value_set_int (value, priv->app_iscsi_priority);
 		break;
 	case PROP_APP_FIP_FLAGS:
-		priv->app_fip_flags = g_value_get_flags (value);
+		g_value_set_flags (value, priv->app_fip_flags);
 		break;
 	case PROP_APP_FIP_PRIORITY:
-		priv->app_fip_priority = g_value_get_int (value);
+		g_value_set_int (value, priv->app_fip_priority);
 		break;
 	case PROP_PFC_FLAGS:
-		priv->pfc_flags = g_value_get_flags (value);
+		g_value_set_flags (value, priv->pfc_flags);
 		break;
-	case PROP_PFC:
-		SET_ARRAY_FROM_GVALUE (value, priv->pfc);
+	case PROP_PRIORITY_FLOW_CONTROL:
+		SET_GVALUE_FROM_ARRAY (value, priv->pfc);
 		break;
 	case PROP_PRIORITY_GROUP_FLAGS:
-		priv->priority_group_flags = g_value_get_flags (value);
+		g_value_set_flags (value, priv->priority_group_flags);
 		break;
 	case PROP_PRIORITY_GROUP_ID:
-		SET_ARRAY_FROM_GVALUE (value, priv->priority_group_id);
+		SET_GVALUE_FROM_ARRAY (value, priv->priority_group_id);
 		break;
 	case PROP_PRIORITY_GROUP_BANDWIDTH:
-		SET_ARRAY_FROM_GVALUE (value, priv->priority_group_bandwidth);
+		SET_GVALUE_FROM_ARRAY (value, priv->priority_group_bandwidth);
 		break;
 	case PROP_PRIORITY_BANDWIDTH:
-		SET_ARRAY_FROM_GVALUE (value, priv->priority_bandwidth);
+		SET_GVALUE_FROM_ARRAY (value, priv->priority_bandwidth);
 		break;
-	case PROP_PRIORITY_STRICT:
-		SET_ARRAY_FROM_GVALUE (value, priv->priority_strict);
+	case PROP_PRIORITY_STRICT_BANDWIDTH:
+		SET_GVALUE_FROM_ARRAY (value, priv->priority_strict);
 		break;
 	case PROP_PRIORITY_TRAFFIC_CLASS:
-		SET_ARRAY_FROM_GVALUE (value, priv->priority_traffic_class);
+		SET_GVALUE_FROM_ARRAY (value, priv->priority_traffic_class);
 		break;
 	default:
 		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
@@ -836,57 +821,57 @@ set_property (GObject *object, guint prop_id,
 }
 
 static void
-get_property (GObject *object, guint prop_id,
-              GValue *value, GParamSpec *pspec)
+set_property (GObject *object, guint prop_id,
+              const GValue *value, GParamSpec *pspec)
 {
-	NMSettingDcb *setting = NM_SETTING_DCB (object);
-	NMSettingDcbPrivate *priv = NM_SETTING_DCB_GET_PRIVATE (setting);
+	NMSettingDcbPrivate *priv = NM_SETTING_DCB_GET_PRIVATE (object);
 
 	switch (prop_id) {
 	case PROP_APP_FCOE_FLAGS:
-		g_value_set_flags (value, priv->app_fcoe_flags);
+		priv->app_fcoe_flags = g_value_get_flags (value);
 		break;
 	case PROP_APP_FCOE_PRIORITY:
-		g_value_set_int (value, priv->app_fcoe_priority);
+		priv->app_fcoe_priority = g_value_get_int (value);
 		break;
 	case PROP_APP_FCOE_MODE:
-		g_value_set_string (value, priv->app_fcoe_mode);
+		g_free (priv->app_fcoe_mode);
+		priv->app_fcoe_mode = g_value_dup_string (value);
 		break;
 	case PROP_APP_ISCSI_FLAGS:
-		g_value_set_flags (value, priv->app_iscsi_flags);
+		priv->app_iscsi_flags = g_value_get_flags (value);
 		break;
 	case PROP_APP_ISCSI_PRIORITY:
-		g_value_set_int (value, priv->app_iscsi_priority);
+		priv->app_iscsi_priority = g_value_get_int (value);
 		break;
 	case PROP_APP_FIP_FLAGS:
-		g_value_set_flags (value, priv->app_fip_flags);
+		priv->app_fip_flags = g_value_get_flags (value);
 		break;
 	case PROP_APP_FIP_PRIORITY:
-		g_value_set_int (value, priv->app_fip_priority);
+		priv->app_fip_priority = g_value_get_int (value);
 		break;
 	case PROP_PFC_FLAGS:
-		g_value_set_flags (value, priv->pfc_flags);
+		priv->pfc_flags = g_value_get_flags (value);
 		break;
-	case PROP_PFC:
-		SET_GVALUE_FROM_ARRAY (value, priv->pfc);
+	case PROP_PRIORITY_FLOW_CONTROL:
+		SET_ARRAY_FROM_GVALUE (value, priv->pfc);
 		break;
 	case PROP_PRIORITY_GROUP_FLAGS:
-		g_value_set_flags (value, priv->priority_group_flags);
+		priv->priority_group_flags = g_value_get_flags (value);
 		break;
 	case PROP_PRIORITY_GROUP_ID:
-		SET_GVALUE_FROM_ARRAY (value, priv->priority_group_id);
+		SET_ARRAY_FROM_GVALUE (value, priv->priority_group_id);
 		break;
 	case PROP_PRIORITY_GROUP_BANDWIDTH:
-		SET_GVALUE_FROM_ARRAY (value, priv->priority_group_bandwidth);
+		SET_ARRAY_FROM_GVALUE (value, priv->priority_group_bandwidth);
 		break;
 	case PROP_PRIORITY_BANDWIDTH:
-		SET_GVALUE_FROM_ARRAY (value, priv->priority_bandwidth);
+		SET_ARRAY_FROM_GVALUE (value, priv->priority_bandwidth);
 		break;
-	case PROP_PRIORITY_STRICT:
-		SET_GVALUE_FROM_ARRAY (value, priv->priority_strict);
+	case PROP_PRIORITY_STRICT_BANDWIDTH:
+		SET_ARRAY_FROM_GVALUE (value, priv->priority_strict);
 		break;
 	case PROP_PRIORITY_TRAFFIC_CLASS:
-		SET_GVALUE_FROM_ARRAY (value, priv->priority_traffic_class);
+		SET_ARRAY_FROM_GVALUE (value, priv->priority_traffic_class);
 		break;
 	default:
 		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
@@ -894,6 +879,26 @@ get_property (GObject *object, guint prop_id,
 	}
 }
 
+/*****************************************************************************/
+
+static void
+nm_setting_dcb_init (NMSettingDcb *setting)
+{
+}
+
+/**
+ * nm_setting_dcb_new:
+ *
+ * Creates a new #NMSettingDcb object with default values.
+ *
+ * Returns: (transfer full): the new empty #NMSettingDcb object
+ **/
+NMSetting *
+nm_setting_dcb_new (void)
+{
+	return (NMSetting *) g_object_new (NM_TYPE_SETTING_DCB, NULL);
+}
+
 static void
 finalize (GObject *object)
 {
@@ -913,9 +918,9 @@ nm_setting_dcb_class_init (NMSettingDcbClass *klass)
 
 	g_type_class_add_private (klass, sizeof (NMSettingDcbPrivate));
 
-	object_class->set_property = set_property;
 	object_class->get_property = get_property;
-	object_class->finalize = finalize;
+	object_class->set_property = set_property;
+	object_class->finalize     = finalize;
 
 	setting_class->verify = verify;
 
@@ -934,13 +939,12 @@ nm_setting_dcb_class_init (NMSettingDcbClass *klass)
 	 * example: DCB_APP_FCOE_ENABLE=yes DCB_APP_FCOE_ADVERTISE=yes
 	 * ---end---
 	 */
-	g_object_class_install_property
-		(object_class, PROP_APP_FCOE_FLAGS,
-		 g_param_spec_flags (NM_SETTING_DCB_APP_FCOE_FLAGS, "", "",
-		                     NM_TYPE_SETTING_DCB_FLAGS,
-		                     NM_SETTING_DCB_FLAG_NONE,
-		                     G_PARAM_READWRITE |
-		                     G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_APP_FCOE_FLAGS] =
+	    g_param_spec_flags (NM_SETTING_DCB_APP_FCOE_FLAGS, "", "",
+	                        NM_TYPE_SETTING_DCB_FLAGS,
+	                        NM_SETTING_DCB_FLAG_NONE,
+	                        G_PARAM_READWRITE |
+	                        G_PARAM_STATIC_STRINGS);
 
 	/**
 	 * NMSettingDcb:app-fcoe-priority:
@@ -956,13 +960,12 @@ nm_setting_dcb_class_init (NMSettingDcbClass *klass)
 	 * description: Priority of FCoE frames.
 	 * ---end---
 	 */
-	g_object_class_install_property
-		(object_class, PROP_APP_FCOE_PRIORITY,
-		 g_param_spec_int (NM_SETTING_DCB_APP_FCOE_PRIORITY, "", "",
-		                   -1, 7, -1,
-		                   G_PARAM_READWRITE |
-		                   G_PARAM_CONSTRUCT |
-		                   G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_APP_FCOE_PRIORITY] =
+	    g_param_spec_int (NM_SETTING_DCB_APP_FCOE_PRIORITY, "", "",
+	                      -1, 7, -1,
+	                      G_PARAM_READWRITE |
+	                      G_PARAM_CONSTRUCT |
+	                      G_PARAM_STATIC_STRINGS);
 
 	/**
 	 * NMSettingDcb:app-fcoe-mode:
@@ -978,13 +981,12 @@ nm_setting_dcb_class_init (NMSettingDcbClass *klass)
 	 * description: FCoE controller mode.
 	 * ---end---
 	 */
-	g_object_class_install_property
-		(object_class, PROP_APP_FCOE_MODE,
-		 g_param_spec_string (NM_SETTING_DCB_APP_FCOE_MODE, "", "",
-		                      NM_SETTING_DCB_FCOE_MODE_FABRIC,
-		                      G_PARAM_READWRITE |
-		                      G_PARAM_CONSTRUCT |
-		                      G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_APP_FCOE_MODE] =
+	    g_param_spec_string (NM_SETTING_DCB_APP_FCOE_MODE, "", "",
+	                         NM_SETTING_DCB_FCOE_MODE_FABRIC,
+	                         G_PARAM_READWRITE |
+	                         G_PARAM_CONSTRUCT |
+	                         G_PARAM_STATIC_STRINGS);
 
 	/**
 	 * NMSettingDcb:app-iscsi-flags:
@@ -1000,13 +1002,12 @@ nm_setting_dcb_class_init (NMSettingDcbClass *klass)
 	 * description: iSCSI flags.
 	 * ---end---
 	 */
-	g_object_class_install_property
-		(object_class, PROP_APP_ISCSI_FLAGS,
-		 g_param_spec_flags (NM_SETTING_DCB_APP_ISCSI_FLAGS, "", "",
-		                     NM_TYPE_SETTING_DCB_FLAGS,
-		                     NM_SETTING_DCB_FLAG_NONE,
-		                     G_PARAM_READWRITE |
-		                     G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_APP_ISCSI_FLAGS] =
+	    g_param_spec_flags (NM_SETTING_DCB_APP_ISCSI_FLAGS, "", "",
+	                        NM_TYPE_SETTING_DCB_FLAGS,
+	                        NM_SETTING_DCB_FLAG_NONE,
+	                        G_PARAM_READWRITE |
+	                        G_PARAM_STATIC_STRINGS);
 
 	/**
 	 * NMSettingDcb:app-iscsi-priority:
@@ -1022,13 +1023,12 @@ nm_setting_dcb_class_init (NMSettingDcbClass *klass)
 	 * description: Priority of iSCSI frames.
 	 * ---end---
 	 */
-	g_object_class_install_property
-		(object_class, PROP_APP_ISCSI_PRIORITY,
-		 g_param_spec_int (NM_SETTING_DCB_APP_ISCSI_PRIORITY, "", "",
-		                   -1, 7, -1,
-		                   G_PARAM_READWRITE |
-		                   G_PARAM_CONSTRUCT |
-		                   G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_APP_ISCSI_PRIORITY] =
+	    g_param_spec_int (NM_SETTING_DCB_APP_ISCSI_PRIORITY, "", "",
+	                      -1, 7, -1,
+	                      G_PARAM_READWRITE |
+	                      G_PARAM_CONSTRUCT |
+	                      G_PARAM_STATIC_STRINGS);
 
 	/**
 	 * NMSettingDcb:app-fip-flags:
@@ -1044,13 +1044,12 @@ nm_setting_dcb_class_init (NMSettingDcbClass *klass)
 	 * description: FIP flags.
 	 * ---end---
 	 */
-	g_object_class_install_property
-		(object_class, PROP_APP_FIP_FLAGS,
-		 g_param_spec_flags (NM_SETTING_DCB_APP_FIP_FLAGS, "", "",
-		                     NM_TYPE_SETTING_DCB_FLAGS,
-		                     NM_SETTING_DCB_FLAG_NONE,
-		                     G_PARAM_READWRITE |
-		                     G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_APP_FIP_FLAGS] =
+	    g_param_spec_flags (NM_SETTING_DCB_APP_FIP_FLAGS, "", "",
+	                        NM_TYPE_SETTING_DCB_FLAGS,
+	                        NM_SETTING_DCB_FLAG_NONE,
+	                        G_PARAM_READWRITE |
+	                        G_PARAM_STATIC_STRINGS);
 
 	/**
 	 * NMSettingDcb:app-fip-priority:
@@ -1066,13 +1065,12 @@ nm_setting_dcb_class_init (NMSettingDcbClass *klass)
 	 * description: Priority of FIP frames.
 	 * ---end---
 	 */
-	g_object_class_install_property
-		(object_class, PROP_APP_FIP_PRIORITY,
-		 g_param_spec_int (NM_SETTING_DCB_APP_FIP_PRIORITY, "", "",
-		                   -1, 7, -1,
-		                   G_PARAM_READWRITE |
-		                   G_PARAM_CONSTRUCT |
-		                   G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_APP_FIP_PRIORITY] =
+	    g_param_spec_int (NM_SETTING_DCB_APP_FIP_PRIORITY, "", "",
+	                      -1, 7, -1,
+	                      G_PARAM_READWRITE |
+	                      G_PARAM_CONSTRUCT |
+	                      G_PARAM_STATIC_STRINGS);
 
 	/**
 	 * NMSettingDcb:priority-flow-control-flags:
@@ -1088,13 +1086,12 @@ nm_setting_dcb_class_init (NMSettingDcbClass *klass)
 	 * description: Priority flow control flags.
 	 * ---end---
 	 */
-	g_object_class_install_property
-		(object_class, PROP_PFC_FLAGS,
-		 g_param_spec_flags (NM_SETTING_DCB_PRIORITY_FLOW_CONTROL_FLAGS, "", "",
-		                     NM_TYPE_SETTING_DCB_FLAGS,
-		                     NM_SETTING_DCB_FLAG_NONE,
-		                     G_PARAM_READWRITE |
-		                     G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_PFC_FLAGS] =
+	    g_param_spec_flags (NM_SETTING_DCB_PRIORITY_FLOW_CONTROL_FLAGS, "", "",
+	                        NM_TYPE_SETTING_DCB_FLAGS,
+	                        NM_SETTING_DCB_FLAG_NONE,
+	                        G_PARAM_READWRITE |
+	                        G_PARAM_STATIC_STRINGS);
 
 	/**
 	 * NMSettingDcb:priority-flow-control: (type GArray(gboolean))
@@ -1111,19 +1108,17 @@ nm_setting_dcb_class_init (NMSettingDcbClass *klass)
 	 * example: DCB_PFC_UP=01101110
 	 * ---end---
 	 */
-	g_object_class_install_property
-		(object_class, PROP_PFC,
-		 g_param_spec_boxed (NM_SETTING_DCB_PRIORITY_FLOW_CONTROL, "", "",
-		                     G_TYPE_ARRAY,
-		                     G_PARAM_READWRITE |
-		                     G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_PRIORITY_FLOW_CONTROL] =
+	    g_param_spec_boxed (NM_SETTING_DCB_PRIORITY_FLOW_CONTROL, "", "",
+	                        G_TYPE_ARRAY,
+	                        G_PARAM_READWRITE |
+	                        G_PARAM_STATIC_STRINGS);
 
 	_properties_override_add_transform (properties_override,
-	                                    g_object_class_find_property (G_OBJECT_CLASS (setting_class),
-	                                                                  NM_SETTING_DCB_PRIORITY_FLOW_CONTROL),
-	                                    G_VARIANT_TYPE ("au"),
-	                                    _nm_setting_dcb_uint_array_to_dbus,
-	                                    _nm_setting_dcb_uint_array_from_dbus);
+	                                   obj_properties[PROP_PRIORITY_FLOW_CONTROL],
+	                                   G_VARIANT_TYPE ("au"),
+	                                   _nm_setting_dcb_uint_array_to_dbus,
+	                                   _nm_setting_dcb_uint_array_from_dbus);
 
 	/**
 	 * NMSettingDcb:priority-group-flags:
@@ -1139,13 +1134,12 @@ nm_setting_dcb_class_init (NMSettingDcbClass *klass)
 	 * description: Priority groups flags.
 	 * ---end---
 	 */
-	g_object_class_install_property
-		(object_class, PROP_PRIORITY_GROUP_FLAGS,
-		 g_param_spec_flags (NM_SETTING_DCB_PRIORITY_GROUP_FLAGS, "", "",
-		                     NM_TYPE_SETTING_DCB_FLAGS,
-		                     NM_SETTING_DCB_FLAG_NONE,
-		                     G_PARAM_READWRITE |
-		                     G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_PRIORITY_GROUP_FLAGS] =
+	    g_param_spec_flags (NM_SETTING_DCB_PRIORITY_GROUP_FLAGS, "", "",
+	                        NM_TYPE_SETTING_DCB_FLAGS,
+	                        NM_SETTING_DCB_FLAG_NONE,
+	                        G_PARAM_READWRITE |
+	                        G_PARAM_STATIC_STRINGS);
 
 	/**
 	 * NMSettingDcb:priority-group-id: (type GArray(guint))
@@ -1162,19 +1156,17 @@ nm_setting_dcb_class_init (NMSettingDcbClass *klass)
 	 * example: DCB_PG_ID=1205f173
 	 * ---end---
 	 */
-	g_object_class_install_property
-		(object_class, PROP_PRIORITY_GROUP_ID,
-		 g_param_spec_boxed (NM_SETTING_DCB_PRIORITY_GROUP_ID, "", "",
-		                     G_TYPE_ARRAY,
-		                     G_PARAM_READWRITE |
-		                     G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_PRIORITY_GROUP_ID] =
+	    g_param_spec_boxed (NM_SETTING_DCB_PRIORITY_GROUP_ID, "", "",
+	                        G_TYPE_ARRAY,
+	                        G_PARAM_READWRITE |
+	                        G_PARAM_STATIC_STRINGS);
 
 	_properties_override_add_transform (properties_override,
-	                                    g_object_class_find_property (G_OBJECT_CLASS (setting_class),
-	                                                                  NM_SETTING_DCB_PRIORITY_GROUP_ID),
-	                                    G_VARIANT_TYPE ("au"),
-	                                    _nm_setting_dcb_uint_array_to_dbus,
-	                                    _nm_setting_dcb_uint_array_from_dbus);
+	                                   obj_properties[PROP_PRIORITY_GROUP_ID],
+	                                   G_VARIANT_TYPE ("au"),
+	                                   _nm_setting_dcb_uint_array_to_dbus,
+	                                   _nm_setting_dcb_uint_array_from_dbus);
 
 	/**
 	 * NMSettingDcb:priority-group-bandwidth: (type GArray(guint))
@@ -1191,19 +1183,17 @@ nm_setting_dcb_class_init (NMSettingDcbClass *klass)
 	 * example: DCB_PG_PCT=10,5,10,15,10,10,10,30
 	 * ---end---
 	 */
-	g_object_class_install_property
-		(object_class, PROP_PRIORITY_GROUP_BANDWIDTH,
-		 g_param_spec_boxed (NM_SETTING_DCB_PRIORITY_GROUP_BANDWIDTH, "", "",
-		                     G_TYPE_ARRAY,
-		                     G_PARAM_READWRITE |
-		                     G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_PRIORITY_GROUP_BANDWIDTH] =
+	    g_param_spec_boxed (NM_SETTING_DCB_PRIORITY_GROUP_BANDWIDTH, "", "",
+	                        G_TYPE_ARRAY,
+	                        G_PARAM_READWRITE |
+	                        G_PARAM_STATIC_STRINGS);
 
 	_properties_override_add_transform (properties_override,
-	                                    g_object_class_find_property (G_OBJECT_CLASS (setting_class),
-	                                                                  NM_SETTING_DCB_PRIORITY_GROUP_BANDWIDTH),
-	                                    G_VARIANT_TYPE ("au"),
-	                                    _nm_setting_dcb_uint_array_to_dbus,
-	                                    _nm_setting_dcb_uint_array_from_dbus);
+	                                   obj_properties[PROP_PRIORITY_GROUP_BANDWIDTH],
+	                                   G_VARIANT_TYPE ("au"),
+	                                   _nm_setting_dcb_uint_array_to_dbus,
+	                                   _nm_setting_dcb_uint_array_from_dbus);
 
 	/**
 	 * NMSettingDcb:priority-bandwidth: (type GArray(guint))
@@ -1222,19 +1212,17 @@ nm_setting_dcb_class_init (NMSettingDcbClass *klass)
 	 * example: DCB_PG_UPPCT=7,13,10,10,15,15,10,20
 	 * ---end---
 	 */
-	g_object_class_install_property
-		(object_class, PROP_PRIORITY_BANDWIDTH,
-		 g_param_spec_boxed (NM_SETTING_DCB_PRIORITY_BANDWIDTH, "", "",
-		                     G_TYPE_ARRAY,
-		                     G_PARAM_READWRITE |
-		                     G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_PRIORITY_BANDWIDTH] =
+	    g_param_spec_boxed (NM_SETTING_DCB_PRIORITY_BANDWIDTH, "", "",
+	                        G_TYPE_ARRAY,
+	                        G_PARAM_READWRITE |
+	                        G_PARAM_STATIC_STRINGS);
 
 	_properties_override_add_transform (properties_override,
-	                                    g_object_class_find_property (G_OBJECT_CLASS (setting_class),
-	                                                                  NM_SETTING_DCB_PRIORITY_BANDWIDTH),
-	                                    G_VARIANT_TYPE ("au"),
-	                                    _nm_setting_dcb_uint_array_to_dbus,
-	                                    _nm_setting_dcb_uint_array_from_dbus);
+	                                   obj_properties[PROP_PRIORITY_BANDWIDTH],
+	                                   G_VARIANT_TYPE ("au"),
+	                                   _nm_setting_dcb_uint_array_to_dbus,
+	                                   _nm_setting_dcb_uint_array_from_dbus);
 
 	/**
 	 * NMSettingDcb:priority-strict-bandwidth: (type GArray(gboolean))
@@ -1251,19 +1239,17 @@ nm_setting_dcb_class_init (NMSettingDcbClass *klass)
 	 * example: DCB_PG_STRICT=01101110
 	 * ---end---
 	 */
-	g_object_class_install_property
-		(object_class, PROP_PRIORITY_STRICT,
-		 g_param_spec_boxed (NM_SETTING_DCB_PRIORITY_STRICT_BANDWIDTH, "", "",
-		                     G_TYPE_ARRAY,
-		                     G_PARAM_READWRITE |
-		                     G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_PRIORITY_STRICT_BANDWIDTH] =
+	    g_param_spec_boxed (NM_SETTING_DCB_PRIORITY_STRICT_BANDWIDTH, "", "",
+	                        G_TYPE_ARRAY,
+	                        G_PARAM_READWRITE |
+	                        G_PARAM_STATIC_STRINGS);
 
 	_properties_override_add_transform (properties_override,
-	                                    g_object_class_find_property (G_OBJECT_CLASS (setting_class),
-	                                                                  NM_SETTING_DCB_PRIORITY_STRICT_BANDWIDTH),
-	                                    G_VARIANT_TYPE ("au"),
-	                                    _nm_setting_dcb_uint_array_to_dbus,
-	                                    _nm_setting_dcb_uint_array_from_dbus);
+	                                   obj_properties[PROP_PRIORITY_STRICT_BANDWIDTH],
+	                                   G_VARIANT_TYPE ("au"),
+	                                   _nm_setting_dcb_uint_array_to_dbus,
+	                                   _nm_setting_dcb_uint_array_from_dbus);
 
 	/**
 	 * NMSettingDcb:priority-traffic-class: (type GArray(guint))
@@ -1275,24 +1261,24 @@ nm_setting_dcb_class_init (NMSettingDcbClass *klass)
 	/* ---ifcfg-rh---
 	 * property: priority-traffic-class
 	 * variable: DCB_PG_UP2TC
-	 * description: Priority values. String of eight trafic class values (0 - 7).
+	 * description: Priority values. String of eight traffic class values (0 - 7).
 	 * example: DCB_PG_UP2TC=01623701
 	 * ---end---
 	 */
-	g_object_class_install_property
-		(object_class, PROP_PRIORITY_TRAFFIC_CLASS,
-		 g_param_spec_boxed (NM_SETTING_DCB_PRIORITY_TRAFFIC_CLASS, "", "",
-		                     G_TYPE_ARRAY,
-		                     G_PARAM_READWRITE |
-		                     G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_PRIORITY_TRAFFIC_CLASS] =
+	    g_param_spec_boxed (NM_SETTING_DCB_PRIORITY_TRAFFIC_CLASS, "", "",
+	                        G_TYPE_ARRAY,
+	                        G_PARAM_READWRITE |
+	                        G_PARAM_STATIC_STRINGS);
 
 	_properties_override_add_transform (properties_override,
-	                                    g_object_class_find_property (G_OBJECT_CLASS (setting_class),
-	                                                                  NM_SETTING_DCB_PRIORITY_TRAFFIC_CLASS),
+	                                    obj_properties[PROP_PRIORITY_TRAFFIC_CLASS],
 	                                    G_VARIANT_TYPE ("au"),
 	                                    _nm_setting_dcb_uint_array_to_dbus,
 	                                    _nm_setting_dcb_uint_array_from_dbus);
 
+	g_object_class_install_properties (object_class, _PROPERTY_ENUMS_LAST, obj_properties);
+
 	_nm_setting_class_commit_full (setting_class, NM_META_SETTING_TYPE_DCB,
 	                               NULL, properties_override);
 }
diff --git a/libnm-core/nm-setting-dummy.c b/libnm-core/nm-setting-dummy.c
index 9ae05ec4..bd85a74e 100644
--- a/libnm-core/nm-setting-dummy.c
+++ b/libnm-core/nm-setting-dummy.c
@@ -34,22 +34,11 @@
  * necessary for connection to dummy devices
  **/
 
+/*****************************************************************************/
+
 G_DEFINE_TYPE (NMSettingDummy, nm_setting_dummy, NM_TYPE_SETTING)
 
-/**
- * nm_setting_dummy_new:
- *
- * Creates a new #NMSettingDummy object with default values.
- *
- * Returns: (transfer full): the new empty #NMSettingDummy object
- *
- * Since: 1.8
- **/
-NMSetting *
-nm_setting_dummy_new (void)
-{
-	return (NMSetting *) g_object_new (NM_TYPE_SETTING_DUMMY, NULL);
-}
+/*****************************************************************************/
 
 static gboolean
 verify (NMSetting *setting, NMConnection *connection, GError **error)
@@ -60,11 +49,28 @@ verify (NMSetting *setting, NMConnection *connection, GError **error)
 	return TRUE;
 }
 
+/*****************************************************************************/
+
 static void
 nm_setting_dummy_init (NMSettingDummy *setting)
 {
 }
 
+/**
+ * nm_setting_dummy_new:
+ *
+ * Creates a new #NMSettingDummy object with default values.
+ *
+ * Returns: (transfer full): the new empty #NMSettingDummy object
+ *
+ * Since: 1.8
+ **/
+NMSetting *
+nm_setting_dummy_new (void)
+{
+	return (NMSetting *) g_object_new (NM_TYPE_SETTING_DUMMY, NULL);
+}
+
 static void
 nm_setting_dummy_class_init (NMSettingDummyClass *klass)
 {
diff --git a/libnm-core/nm-setting-generic.c b/libnm-core/nm-setting-generic.c
index 44402e39..fe5ce3ca 100644
--- a/libnm-core/nm-setting-generic.c
+++ b/libnm-core/nm-setting-generic.c
@@ -22,6 +22,7 @@
 #include "nm-default.h"
 
 #include "nm-setting-generic.h"
+
 #include "nm-setting-private.h"
 
 /**
@@ -36,16 +37,23 @@
  * the "connection type" setting on #NMConnections for generic devices.
  **/
 
-G_DEFINE_TYPE (NMSettingGeneric, nm_setting_generic, NM_TYPE_SETTING)
-
-#define NM_SETTING_GENERIC_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_SETTING_GENERIC, NMSettingGenericPrivate))
+/*****************************************************************************/
 
 typedef struct {
 	int dummy;
 } NMSettingGenericPrivate;
 
+G_DEFINE_TYPE (NMSettingGeneric, nm_setting_generic, NM_TYPE_SETTING)
+
+#define NM_SETTING_GENERIC_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_SETTING_GENERIC, NMSettingGenericPrivate))
+
 /*****************************************************************************/
 
+static void
+nm_setting_generic_init (NMSettingGeneric *setting)
+{
+}
+
 /**
  * nm_setting_generic_new:
  *
@@ -59,11 +67,6 @@ nm_setting_generic_new (void)
 	return (NMSetting *) g_object_new (NM_TYPE_SETTING_GENERIC, NULL);
 }
 
-static void
-nm_setting_generic_init (NMSettingGeneric *setting)
-{
-}
-
 static void
 nm_setting_generic_class_init (NMSettingGenericClass *klass)
 {
diff --git a/libnm-core/nm-setting-gsm.c b/libnm-core/nm-setting-gsm.c
index b31da689..e6784e42 100644
--- a/libnm-core/nm-setting-gsm.c
+++ b/libnm-core/nm-setting-gsm.c
@@ -22,9 +22,8 @@
 
 #include "nm-default.h"
 
-#include 
-
 #include "nm-setting-gsm.h"
+
 #include "nm-utils.h"
 #include "nm-setting-private.h"
 #include "nm-core-enum-types.h"
@@ -38,9 +37,23 @@
  * networks, including those using GPRS/EDGE and UMTS/HSPA technology.
  */
 
-G_DEFINE_TYPE (NMSettingGsm, nm_setting_gsm, NM_TYPE_SETTING)
+/*****************************************************************************/
 
-#define NM_SETTING_GSM_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_SETTING_GSM, NMSettingGsmPrivate))
+NM_GOBJECT_PROPERTIES_DEFINE_BASE (
+	PROP_NUMBER,
+	PROP_USERNAME,
+	PROP_PASSWORD,
+	PROP_PASSWORD_FLAGS,
+	PROP_APN,
+	PROP_NETWORK_ID,
+	PROP_PIN,
+	PROP_PIN_FLAGS,
+	PROP_HOME_ONLY,
+	PROP_DEVICE_ID,
+	PROP_SIM_ID,
+	PROP_SIM_OPERATOR_ID,
+	PROP_MTU,
+);
 
 typedef struct {
 	char *number; /* For dialing, duh */
@@ -63,43 +76,19 @@ typedef struct {
 	guint32 mtu;
 } NMSettingGsmPrivate;
 
-enum {
-	PROP_0,
-	PROP_NUMBER,
-	PROP_USERNAME,
-	PROP_PASSWORD,
-	PROP_PASSWORD_FLAGS,
-	PROP_APN,
-	PROP_NETWORK_ID,
-	PROP_PIN,
-	PROP_PIN_FLAGS,
-	PROP_HOME_ONLY,
-	PROP_DEVICE_ID,
-	PROP_SIM_ID,
-	PROP_SIM_OPERATOR_ID,
-	PROP_MTU,
+G_DEFINE_TYPE (NMSettingGsm, nm_setting_gsm, NM_TYPE_SETTING)
 
-	LAST_PROP
-};
+#define NM_SETTING_GSM_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_SETTING_GSM, NMSettingGsmPrivate))
 
-/**
- * nm_setting_gsm_new:
- *
- * Creates a new #NMSettingGsm object with default values.
- *
- * Returns: the new empty #NMSettingGsm object
- **/
-NMSetting *
-nm_setting_gsm_new (void)
-{
-	return (NMSetting *) g_object_new (NM_TYPE_SETTING_GSM, NULL);
-}
+/*****************************************************************************/
 
 /**
  * nm_setting_gsm_get_number:
  * @setting: the #NMSettingGsm
  *
  * Returns: the #NMSettingGsm:number property of the setting
+ *
+ * Deprecated: 1.16:  user-provided values for this setting are no longer used.
  **/
 const char *
 nm_setting_gsm_get_number (NMSettingGsm *setting)
@@ -458,27 +447,58 @@ need_secrets (NMSetting *setting)
 	return secrets;
 }
 
-static void
-nm_setting_gsm_init (NMSettingGsm *setting)
-{
-}
+/*****************************************************************************/
 
 static void
-finalize (GObject *object)
+get_property (GObject *object, guint prop_id,
+              GValue *value, GParamSpec *pspec)
 {
-	NMSettingGsmPrivate *priv = NM_SETTING_GSM_GET_PRIVATE (object);
-
-	g_free (priv->number);
-	g_free (priv->username);
-	g_free (priv->password);
-	g_free (priv->apn);
-	g_free (priv->network_id);
-	g_free (priv->pin);
-	g_free (priv->device_id);
-	g_free (priv->sim_id);
-	g_free (priv->sim_operator_id);
+	NMSettingGsm *setting = NM_SETTING_GSM (object);
 
-	G_OBJECT_CLASS (nm_setting_gsm_parent_class)->finalize (object);
+	switch (prop_id) {
+	case PROP_NUMBER:
+		g_value_set_string (value, nm_setting_gsm_get_number (setting));
+		break;
+	case PROP_USERNAME:
+		g_value_set_string (value, nm_setting_gsm_get_username (setting));
+		break;
+	case PROP_PASSWORD:
+		g_value_set_string (value, nm_setting_gsm_get_password (setting));
+		break;
+	case PROP_PASSWORD_FLAGS:
+		g_value_set_flags (value, nm_setting_gsm_get_password_flags (setting));
+		break;
+	case PROP_APN:
+		g_value_set_string (value, nm_setting_gsm_get_apn (setting));
+		break;
+	case PROP_NETWORK_ID:
+		g_value_set_string (value, nm_setting_gsm_get_network_id (setting));
+		break;
+	case PROP_PIN:
+		g_value_set_string (value, nm_setting_gsm_get_pin (setting));
+		break;
+	case PROP_PIN_FLAGS:
+		g_value_set_flags (value, nm_setting_gsm_get_pin_flags (setting));
+		break;
+	case PROP_HOME_ONLY:
+		g_value_set_boolean (value, nm_setting_gsm_get_home_only (setting));
+		break;
+	case PROP_DEVICE_ID:
+		g_value_set_string (value, nm_setting_gsm_get_device_id (setting));
+		break;
+	case PROP_SIM_ID:
+		g_value_set_string (value, nm_setting_gsm_get_sim_id (setting));
+		break;
+	case PROP_SIM_OPERATOR_ID:
+		g_value_set_string (value, nm_setting_gsm_get_sim_operator_id (setting));
+		break;
+	case PROP_MTU:
+		g_value_set_uint (value, nm_setting_gsm_get_mtu (setting));
+		break;
+	default:
+		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+		break;
+	}
 }
 
 static void
@@ -549,56 +569,42 @@ set_property (GObject *object, guint prop_id,
 	}
 }
 
+/*****************************************************************************/
+
 static void
-get_property (GObject *object, guint prop_id,
-              GValue *value, GParamSpec *pspec)
+nm_setting_gsm_init (NMSettingGsm *setting)
 {
-	NMSettingGsm *setting = NM_SETTING_GSM (object);
+}
 
-	switch (prop_id) {
-	case PROP_NUMBER:
-		g_value_set_string (value, nm_setting_gsm_get_number (setting));
-		break;
-	case PROP_USERNAME:
-		g_value_set_string (value, nm_setting_gsm_get_username (setting));
-		break;
-	case PROP_PASSWORD:
-		g_value_set_string (value, nm_setting_gsm_get_password (setting));
-		break;
-	case PROP_PASSWORD_FLAGS:
-		g_value_set_flags (value, nm_setting_gsm_get_password_flags (setting));
-		break;
-	case PROP_APN:
-		g_value_set_string (value, nm_setting_gsm_get_apn (setting));
-		break;
-	case PROP_NETWORK_ID:
-		g_value_set_string (value, nm_setting_gsm_get_network_id (setting));
-		break;
-	case PROP_PIN:
-		g_value_set_string (value, nm_setting_gsm_get_pin (setting));
-		break;
-	case PROP_PIN_FLAGS:
-		g_value_set_flags (value, nm_setting_gsm_get_pin_flags (setting));
-		break;
-	case PROP_HOME_ONLY:
-		g_value_set_boolean (value, nm_setting_gsm_get_home_only (setting));
-		break;
-	case PROP_DEVICE_ID:
-		g_value_set_string (value, nm_setting_gsm_get_device_id (setting));
-		break;
-	case PROP_SIM_ID:
-		g_value_set_string (value, nm_setting_gsm_get_sim_id (setting));
-		break;
-	case PROP_SIM_OPERATOR_ID:
-		g_value_set_string (value, nm_setting_gsm_get_sim_operator_id (setting));
-		break;
-	case PROP_MTU:
-		g_value_set_uint (value, nm_setting_gsm_get_mtu (setting));
-		break;
-	default:
-		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-		break;
-	}
+/**
+ * nm_setting_gsm_new:
+ *
+ * Creates a new #NMSettingGsm object with default values.
+ *
+ * Returns: the new empty #NMSettingGsm object
+ **/
+NMSetting *
+nm_setting_gsm_new (void)
+{
+	return (NMSetting *) g_object_new (NM_TYPE_SETTING_GSM, NULL);
+}
+
+static void
+finalize (GObject *object)
+{
+	NMSettingGsmPrivate *priv = NM_SETTING_GSM_GET_PRIVATE (object);
+
+	g_free (priv->number);
+	g_free (priv->username);
+	g_free (priv->password);
+	g_free (priv->apn);
+	g_free (priv->network_id);
+	g_free (priv->pin);
+	g_free (priv->device_id);
+	g_free (priv->sim_id);
+	g_free (priv->sim_operator_id);
+
+	G_OBJECT_CLASS (nm_setting_gsm_parent_class)->finalize (object);
 }
 
 static void
@@ -610,8 +616,8 @@ nm_setting_gsm_class_init (NMSettingGsmClass *klass)
 
 	g_type_class_add_private (klass, sizeof (NMSettingGsmPrivate));
 
-	object_class->set_property = set_property;
 	object_class->get_property = get_property;
+	object_class->set_property = set_property;
 	object_class->finalize     = finalize;
 
 	setting_class->verify         = verify;
@@ -621,17 +627,16 @@ nm_setting_gsm_class_init (NMSettingGsmClass *klass)
 	/**
 	 * NMSettingGsm:number:
 	 *
-	 * Number to dial when establishing a PPP data session with the GSM-based
-	 * mobile broadband network.  Many modems do not require PPP for connections
-	 * to the mobile network and thus this property should be left blank, which
-	 * allows NetworkManager to select the appropriate settings automatically.
+	 * Legacy setting that used to help establishing PPP data sessions for
+	 * GSM-based modems.
+	 *
+	 * Deprecated: 1.16: user-provided values for this setting are no longer used.
 	 **/
-	g_object_class_install_property
-		(object_class, PROP_NUMBER,
-		 g_param_spec_string (NM_SETTING_GSM_NUMBER, "", "",
-		                      NULL,
-		                      G_PARAM_READWRITE |
-		                      G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_NUMBER] =
+	    g_param_spec_string (NM_SETTING_GSM_NUMBER, "", "",
+	                         NULL,
+	                         G_PARAM_READWRITE |
+	                         G_PARAM_STATIC_STRINGS);
 
 	/**
 	 * NMSettingGsm:username:
@@ -640,12 +645,11 @@ nm_setting_gsm_class_init (NMSettingGsmClass *klass)
 	 * providers do not require a username, or accept any username.  But if a
 	 * username is required, it is specified here.
 	 **/
-	g_object_class_install_property
-		(object_class, PROP_USERNAME,
-		 g_param_spec_string (NM_SETTING_GSM_USERNAME, "", "",
-		                      NULL,
-		                      G_PARAM_READWRITE |
-		                      G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_USERNAME] =
+	    g_param_spec_string (NM_SETTING_GSM_USERNAME, "", "",
+	                         NULL,
+	                         G_PARAM_READWRITE |
+	                         G_PARAM_STATIC_STRINGS);
 
 	/**
 	 * NMSettingGsm:password:
@@ -654,26 +658,24 @@ nm_setting_gsm_class_init (NMSettingGsmClass *klass)
 	 * providers do not require a password, or accept any password.  But if a
 	 * password is required, it is specified here.
 	 **/
-	g_object_class_install_property
-		(object_class, PROP_PASSWORD,
-		 g_param_spec_string (NM_SETTING_GSM_PASSWORD, "", "",
-		                      NULL,
-		                      G_PARAM_READWRITE |
-		                      NM_SETTING_PARAM_SECRET |
-		                      G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_PASSWORD] =
+	    g_param_spec_string (NM_SETTING_GSM_PASSWORD, "", "",
+	                         NULL,
+	                         G_PARAM_READWRITE |
+	                         NM_SETTING_PARAM_SECRET |
+	                         G_PARAM_STATIC_STRINGS);
 
 	/**
 	 * NMSettingGsm:password-flags:
 	 *
 	 * Flags indicating how to handle the #NMSettingGsm:password property.
 	 **/
-	g_object_class_install_property
-		(object_class, PROP_PASSWORD_FLAGS,
-		 g_param_spec_flags (NM_SETTING_GSM_PASSWORD_FLAGS, "", "",
-		                     NM_TYPE_SETTING_SECRET_FLAGS,
-		                     NM_SETTING_SECRET_FLAG_NONE,
-		                     G_PARAM_READWRITE |
-		                     G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_PASSWORD_FLAGS] =
+	    g_param_spec_flags (NM_SETTING_GSM_PASSWORD_FLAGS, "", "",
+	                        NM_TYPE_SETTING_SECRET_FLAGS,
+	                        NM_SETTING_SECRET_FLAG_NONE,
+	                        G_PARAM_READWRITE |
+	                        G_PARAM_STATIC_STRINGS);
 
 	/**
 	 * NMSettingGsm:apn:
@@ -686,12 +688,11 @@ nm_setting_gsm_class_init (NMSettingGsmClass *klass)
 	 * The APN may only be composed of the characters a-z, 0-9, ., and - per GSM
 	 * 03.60 Section 14.9.
 	 **/
-	g_object_class_install_property
-		(object_class, PROP_APN,
-		 g_param_spec_string (NM_SETTING_GSM_APN, "", "",
-		                      NULL,
-		                      G_PARAM_READWRITE |
-		                      G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_APN] =
+	    g_param_spec_string (NM_SETTING_GSM_APN, "", "",
+	                         NULL,
+	                         G_PARAM_READWRITE |
+	                         G_PARAM_STATIC_STRINGS);
 
 	/**
 	 * NMSettingGsm:network-id:
@@ -702,12 +703,11 @@ nm_setting_gsm_class_init (NMSettingGsmClass *klass)
 	 * This can be used to ensure that the device does not roam when direct
 	 * roaming control of the device is not otherwise possible.
 	 **/
-	g_object_class_install_property
-		(object_class, PROP_NETWORK_ID,
-		 g_param_spec_string (NM_SETTING_GSM_NETWORK_ID, "", "",
-		                      NULL,
-		                      G_PARAM_READWRITE |
-		                      G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_NETWORK_ID] =
+	    g_param_spec_string (NM_SETTING_GSM_NETWORK_ID, "", "",
+	                         NULL,
+	                         G_PARAM_READWRITE |
+	                         G_PARAM_STATIC_STRINGS);
 
 	/**
 	 * NMSettingGsm:pin:
@@ -716,26 +716,24 @@ nm_setting_gsm_class_init (NMSettingGsmClass *klass)
 	 * operations are requested.  Specify the PIN here to allow operation of the
 	 * device.
 	 **/
-	g_object_class_install_property
-		(object_class, PROP_PIN,
-		 g_param_spec_string (NM_SETTING_GSM_PIN, "", "",
-		                      NULL,
-		                      G_PARAM_READWRITE |
-		                      NM_SETTING_PARAM_SECRET |
-		                      G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_PIN] =
+	    g_param_spec_string (NM_SETTING_GSM_PIN, "", "",
+	                         NULL,
+	                         G_PARAM_READWRITE |
+	                         NM_SETTING_PARAM_SECRET |
+	                         G_PARAM_STATIC_STRINGS);
 
 	/**
 	 * NMSettingGsm:pin-flags:
 	 *
 	 * Flags indicating how to handle the #NMSettingGsm:pin property.
 	 **/
-	g_object_class_install_property
-		(object_class, PROP_PIN_FLAGS,
-		 g_param_spec_flags (NM_SETTING_GSM_PIN_FLAGS, "", "",
-		                     NM_TYPE_SETTING_SECRET_FLAGS,
-		                     NM_SETTING_SECRET_FLAG_NONE,
-		                     G_PARAM_READWRITE |
-		                     G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_PIN_FLAGS] =
+	    g_param_spec_flags (NM_SETTING_GSM_PIN_FLAGS, "", "",
+	                        NM_TYPE_SETTING_SECRET_FLAGS,
+	                        NM_SETTING_SECRET_FLAG_NONE,
+	                        G_PARAM_READWRITE |
+	                        G_PARAM_STATIC_STRINGS);
 
 	/**
 	 * NMSettingGsm:home-only:
@@ -743,12 +741,11 @@ nm_setting_gsm_class_init (NMSettingGsmClass *klass)
 	 * When %TRUE, only connections to the home network will be allowed.
 	 * Connections to roaming networks will not be made.
 	 **/
-	g_object_class_install_property
-		(object_class, PROP_HOME_ONLY,
-		 g_param_spec_boolean (NM_SETTING_GSM_HOME_ONLY, "", "",
-		                       FALSE,
-		                       G_PARAM_READWRITE |
-		                       G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_HOME_ONLY] =
+	    g_param_spec_boolean (NM_SETTING_GSM_HOME_ONLY, "", "",
+	                          FALSE,
+	                          G_PARAM_READWRITE |
+	                          G_PARAM_STATIC_STRINGS);
 
 	/**
 	 * NMSettingGsm:device-id:
@@ -759,12 +756,11 @@ nm_setting_gsm_class_init (NMSettingGsmClass *klass)
 	 *
 	 * Since: 1.2
 	 **/
-	g_object_class_install_property
-		(object_class, PROP_DEVICE_ID,
-		 g_param_spec_string (NM_SETTING_GSM_DEVICE_ID, "", "",
-		                      NULL,
-		                      G_PARAM_READWRITE |
-		                      G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_DEVICE_ID] =
+	    g_param_spec_string (NM_SETTING_GSM_DEVICE_ID, "", "",
+	                         NULL,
+	                         G_PARAM_READWRITE |
+	                         G_PARAM_STATIC_STRINGS);
 
 	/**
 	 * NMSettingGsm:sim-id:
@@ -776,12 +772,11 @@ nm_setting_gsm_class_init (NMSettingGsmClass *klass)
 	 *
 	 * Since: 1.2
 	 **/
-	g_object_class_install_property
-		(object_class, PROP_SIM_ID,
-		 g_param_spec_string (NM_SETTING_GSM_SIM_ID, "", "",
-		                      NULL,
-		                      G_PARAM_READWRITE |
-		                      G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_SIM_ID] =
+	    g_param_spec_string (NM_SETTING_GSM_SIM_ID, "", "",
+	                         NULL,
+	                         G_PARAM_READWRITE |
+	                         G_PARAM_STATIC_STRINGS);
 
 	/**
 	 * NMSettingGsm:sim-operator-id:
@@ -794,12 +789,11 @@ nm_setting_gsm_class_init (NMSettingGsmClass *klass)
 	 *
 	 * Since: 1.2
 	 **/
-	g_object_class_install_property
-		(object_class, PROP_SIM_OPERATOR_ID,
-		 g_param_spec_string (NM_SETTING_GSM_SIM_OPERATOR_ID, "", "",
-		                      NULL,
-		                      G_PARAM_READWRITE |
-		                      G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_SIM_OPERATOR_ID] =
+	    g_param_spec_string (NM_SETTING_GSM_SIM_OPERATOR_ID, "", "",
+	                         NULL,
+	                         G_PARAM_READWRITE |
+	                         G_PARAM_STATIC_STRINGS);
 
 	/**
 	 * NMSettingGsm:mtu:
@@ -809,14 +803,13 @@ nm_setting_gsm_class_init (NMSettingGsmClass *klass)
 	 *
 	 * Since: 1.8
 	 **/
-	g_object_class_install_property
-		(object_class, PROP_MTU,
-		 g_param_spec_uint (NM_SETTING_GSM_MTU, "", "",
-		                    0, G_MAXUINT32, 0,
-		                    G_PARAM_READWRITE |
-		                    G_PARAM_CONSTRUCT |
-		                    NM_SETTING_PARAM_FUZZY_IGNORE |
-		                    G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_MTU] =
+	    g_param_spec_uint (NM_SETTING_GSM_MTU, "", "",
+	                       0, G_MAXUINT32, 0,
+	                       G_PARAM_READWRITE |
+	                       G_PARAM_CONSTRUCT |
+	                       NM_SETTING_PARAM_FUZZY_IGNORE |
+	                       G_PARAM_STATIC_STRINGS);
 
 	/* Ignore incoming deprecated properties */
 	_properties_override_add_dbus_only (properties_override,
@@ -831,6 +824,8 @@ nm_setting_gsm_class_init (NMSettingGsmClass *klass)
 	                                    NULL,
 	                                    NULL);
 
+	g_object_class_install_properties (object_class, _PROPERTY_ENUMS_LAST, obj_properties);
+
 	_nm_setting_class_commit_full (setting_class, NM_META_SETTING_TYPE_GSM,
 	                               NULL, properties_override);
 }
diff --git a/libnm-core/nm-setting-gsm.h b/libnm-core/nm-setting-gsm.h
index 8516698d..0763b9df 100644
--- a/libnm-core/nm-setting-gsm.h
+++ b/libnm-core/nm-setting-gsm.h
@@ -40,7 +40,6 @@ G_BEGIN_DECLS
 
 #define NM_SETTING_GSM_SETTING_NAME "gsm"
 
-#define NM_SETTING_GSM_NUMBER          "number"
 #define NM_SETTING_GSM_USERNAME        "username"
 #define NM_SETTING_GSM_PASSWORD        "password"
 #define NM_SETTING_GSM_PASSWORD_FLAGS  "password-flags"
@@ -54,6 +53,9 @@ G_BEGIN_DECLS
 #define NM_SETTING_GSM_SIM_OPERATOR_ID "sim-operator-id"
 #define NM_SETTING_GSM_MTU             "mtu"
 
+/* Deprecated */
+#define NM_SETTING_GSM_NUMBER          "number"
+
 /**
  * NMSettingGsm:
  *
@@ -73,7 +75,6 @@ typedef struct {
 GType nm_setting_gsm_get_type (void);
 
 NMSetting *nm_setting_gsm_new                  (void);
-const char *nm_setting_gsm_get_number          (NMSettingGsm *setting);
 const char *nm_setting_gsm_get_username        (NMSettingGsm *setting);
 const char *nm_setting_gsm_get_password        (NMSettingGsm *setting);
 const char *nm_setting_gsm_get_apn             (NMSettingGsm *setting);
@@ -90,6 +91,9 @@ const char *nm_setting_gsm_get_sim_operator_id (NMSettingGsm *setting);
 NM_AVAILABLE_IN_1_8
 guint32 nm_setting_gsm_get_mtu                 (NMSettingGsm *setting);
 
+NM_DEPRECATED_IN_1_16
+const char *nm_setting_gsm_get_number          (NMSettingGsm *setting);
+
 NMSettingSecretFlags nm_setting_gsm_get_pin_flags      (NMSettingGsm *setting);
 NMSettingSecretFlags nm_setting_gsm_get_password_flags (NMSettingGsm *setting);
 
diff --git a/libnm-core/nm-setting-infiniband.c b/libnm-core/nm-setting-infiniband.c
index d5ae7085..9348fa2b 100644
--- a/libnm-core/nm-setting-infiniband.c
+++ b/libnm-core/nm-setting-infiniband.c
@@ -21,9 +21,10 @@
 
 #include "nm-default.h"
 
+#include "nm-setting-infiniband.h"
+
 #include 
 
-#include "nm-setting-infiniband.h"
 #include "nm-utils.h"
 #include "nm-utils-private.h"
 #include "nm-setting-private.h"
@@ -37,9 +38,15 @@
  * necessary for connection to IP-over-InfiniBand networks.
  **/
 
-G_DEFINE_TYPE (NMSettingInfiniband, nm_setting_infiniband, NM_TYPE_SETTING)
+/*****************************************************************************/
 
-#define NM_SETTING_INFINIBAND_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_SETTING_INFINIBAND, NMSettingInfinibandPrivate))
+NM_GOBJECT_PROPERTIES_DEFINE_BASE (
+	PROP_MAC_ADDRESS,
+	PROP_MTU,
+	PROP_TRANSPORT_MODE,
+	PROP_P_KEY,
+	PROP_PARENT,
+);
 
 typedef struct {
 	char *mac_address;
@@ -49,29 +56,11 @@ typedef struct {
 	char *parent, *virtual_iface_name;
 } NMSettingInfinibandPrivate;
 
-enum {
-	PROP_0,
-	PROP_MAC_ADDRESS,
-	PROP_MTU,
-	PROP_TRANSPORT_MODE,
-	PROP_P_KEY,
-	PROP_PARENT,
+G_DEFINE_TYPE (NMSettingInfiniband, nm_setting_infiniband, NM_TYPE_SETTING)
 
-	LAST_PROP
-};
+#define NM_SETTING_INFINIBAND_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_SETTING_INFINIBAND, NMSettingInfinibandPrivate))
 
-/**
- * nm_setting_infiniband_new:
- *
- * Creates a new #NMSettingInfiniband object with default values.
- *
- * Returns: (transfer full): the new empty #NMSettingInfiniband object
- **/
-NMSetting *
-nm_setting_infiniband_new (void)
-{
-	return (NMSetting *) g_object_new (NM_TYPE_SETTING_INFINIBAND, NULL);
-}
+/*****************************************************************************/
 
 /**
  * nm_setting_infiniband_get_mac_address:
@@ -295,22 +284,34 @@ verify (NMSetting *setting, NMConnection *connection, GError **error)
 	return TRUE;
 }
 
-static void
-nm_setting_infiniband_init (NMSettingInfiniband *setting)
-{
-}
+/*****************************************************************************/
 
 static void
-finalize (GObject *object)
+get_property (GObject *object, guint prop_id,
+              GValue *value, GParamSpec *pspec)
 {
-	NMSettingInfinibandPrivate *priv = NM_SETTING_INFINIBAND_GET_PRIVATE (object);
-
-	g_free (priv->transport_mode);
-	g_free (priv->mac_address);
-	g_free (priv->parent);
-	g_free (priv->virtual_iface_name);
+	NMSettingInfiniband *setting = NM_SETTING_INFINIBAND (object);
 
-	G_OBJECT_CLASS (nm_setting_infiniband_parent_class)->finalize (object);
+	switch (prop_id) {
+	case PROP_MAC_ADDRESS:
+		g_value_set_string (value, nm_setting_infiniband_get_mac_address (setting));
+		break;
+	case PROP_MTU:
+		g_value_set_uint (value, nm_setting_infiniband_get_mtu (setting));
+		break;
+	case PROP_TRANSPORT_MODE:
+		g_value_set_string (value, nm_setting_infiniband_get_transport_mode (setting));
+		break;
+	case PROP_P_KEY:
+		g_value_set_int (value, nm_setting_infiniband_get_p_key (setting));
+		break;
+	case PROP_PARENT:
+		g_value_set_string (value, nm_setting_infiniband_get_parent (setting));
+		break;
+	default:
+		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+		break;
+	}
 }
 
 static void
@@ -347,32 +348,37 @@ set_property (GObject *object, guint prop_id,
 	}
 }
 
+/*****************************************************************************/
+
 static void
-get_property (GObject *object, guint prop_id,
-              GValue *value, GParamSpec *pspec)
+nm_setting_infiniband_init (NMSettingInfiniband *setting)
 {
-	NMSettingInfiniband *setting = NM_SETTING_INFINIBAND (object);
+}
 
-	switch (prop_id) {
-	case PROP_MAC_ADDRESS:
-		g_value_set_string (value, nm_setting_infiniband_get_mac_address (setting));
-		break;
-	case PROP_MTU:
-		g_value_set_uint (value, nm_setting_infiniband_get_mtu (setting));
-		break;
-	case PROP_TRANSPORT_MODE:
-		g_value_set_string (value, nm_setting_infiniband_get_transport_mode (setting));
-		break;
-	case PROP_P_KEY:
-		g_value_set_int (value, nm_setting_infiniband_get_p_key (setting));
-		break;
-	case PROP_PARENT:
-		g_value_set_string (value, nm_setting_infiniband_get_parent (setting));
-		break;
-	default:
-		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-		break;
-	}
+/**
+ * nm_setting_infiniband_new:
+ *
+ * Creates a new #NMSettingInfiniband object with default values.
+ *
+ * Returns: (transfer full): the new empty #NMSettingInfiniband object
+ **/
+NMSetting *
+nm_setting_infiniband_new (void)
+{
+	return (NMSetting *) g_object_new (NM_TYPE_SETTING_INFINIBAND, NULL);
+}
+
+static void
+finalize (GObject *object)
+{
+	NMSettingInfinibandPrivate *priv = NM_SETTING_INFINIBAND_GET_PRIVATE (object);
+
+	g_free (priv->transport_mode);
+	g_free (priv->mac_address);
+	g_free (priv->parent);
+	g_free (priv->virtual_iface_name);
+
+	G_OBJECT_CLASS (nm_setting_infiniband_parent_class)->finalize (object);
 }
 
 static void
@@ -384,8 +390,8 @@ nm_setting_infiniband_class_init (NMSettingInfinibandClass *klass)
 
 	g_type_class_add_private (klass, sizeof (NMSettingInfinibandPrivate));
 
-	object_class->set_property = set_property;
 	object_class->get_property = get_property;
+	object_class->set_property = set_property;
 	object_class->finalize     = finalize;
 
 	setting_class->verify = verify;
@@ -415,17 +421,15 @@ nm_setting_infiniband_class_init (NMSettingInfinibandClass *klass)
 	 * example: HWADDR=01:02:03:04:05:06:07:08:09:0A:01:02:03:04:05:06:07:08:09:11
 	 * ---end---
 	 */
-	g_object_class_install_property
-		(object_class, PROP_MAC_ADDRESS,
-		 g_param_spec_string (NM_SETTING_INFINIBAND_MAC_ADDRESS, "", "",
-		                      NULL,
-		                      G_PARAM_READWRITE |
-		                      NM_SETTING_PARAM_INFERRABLE |
-		                      G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_MAC_ADDRESS] =
+	    g_param_spec_string (NM_SETTING_INFINIBAND_MAC_ADDRESS, "", "",
+	                         NULL,
+	                         G_PARAM_READWRITE |
+	                         NM_SETTING_PARAM_INFERRABLE |
+	                         G_PARAM_STATIC_STRINGS);
 
 	_properties_override_add_transform (properties_override,
-	                                    g_object_class_find_property (G_OBJECT_CLASS (setting_class),
-	                                                                  NM_SETTING_INFINIBAND_MAC_ADDRESS),
+	                                    obj_properties[PROP_MAC_ADDRESS],
 	                                    G_VARIANT_TYPE_BYTESTRING,
 	                                    _nm_utils_hwaddr_to_dbus,
 	                                    _nm_utils_hwaddr_from_dbus);
@@ -442,14 +446,13 @@ nm_setting_infiniband_class_init (NMSettingInfinibandClass *klass)
 	 * description: MTU of the interface.
 	 * ---end---
 	 */
-	g_object_class_install_property
-		(object_class, PROP_MTU,
-		 g_param_spec_uint (NM_SETTING_INFINIBAND_MTU, "", "",
-		                    0, G_MAXUINT32, 0,
-		                    G_PARAM_READWRITE |
-		                    G_PARAM_CONSTRUCT |
-		                    NM_SETTING_PARAM_FUZZY_IGNORE |
-		                    G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_MTU] =
+	    g_param_spec_uint (NM_SETTING_INFINIBAND_MTU, "", "",
+	                       0, G_MAXUINT32, 0,
+	                       G_PARAM_READWRITE |
+	                       G_PARAM_CONSTRUCT |
+	                       NM_SETTING_PARAM_FUZZY_IGNORE |
+	                       G_PARAM_STATIC_STRINGS);
 
 	/**
 	 * NMSettingInfiniband:transport-mode:
@@ -465,14 +468,13 @@ nm_setting_infiniband_class_init (NMSettingInfinibandClass *klass)
 	 *   "datagram" mode
 	 * ---end---
 	 */
-	g_object_class_install_property
-		(object_class, PROP_TRANSPORT_MODE,
-		 g_param_spec_string (NM_SETTING_INFINIBAND_TRANSPORT_MODE, "", "",
-		                      NULL,
-		                      G_PARAM_READWRITE |
-		                      G_PARAM_CONSTRUCT |
-		                      NM_SETTING_PARAM_INFERRABLE |
-		                      G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_TRANSPORT_MODE] =
+	    g_param_spec_string (NM_SETTING_INFINIBAND_TRANSPORT_MODE, "", "",
+	                         NULL,
+	                         G_PARAM_READWRITE |
+	                         G_PARAM_CONSTRUCT |
+	                         NM_SETTING_PARAM_INFERRABLE |
+	                         G_PARAM_STATIC_STRINGS);
 
 	/**
 	 * NMSettingInfiniband:p-key:
@@ -492,14 +494,13 @@ nm_setting_infiniband_class_init (NMSettingInfinibandClass *klass)
 	 * example: PKEY=yes PKEY_ID=2 PHYSDEV=mlx4_ib0 DEVICE=mlx4_ib0.8002
 	 * ---end---
 	 */
-	g_object_class_install_property
-		(object_class, PROP_P_KEY,
-		 g_param_spec_int (NM_SETTING_INFINIBAND_P_KEY, "", "",
-		                   -1, 0xFFFF, -1,
-		                   G_PARAM_READWRITE |
-		                   G_PARAM_CONSTRUCT |
-		                   NM_SETTING_PARAM_INFERRABLE |
-		                   G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_P_KEY] =
+	    g_param_spec_int (NM_SETTING_INFINIBAND_P_KEY, "", "",
+	                      -1, 0xFFFF, -1,
+	                      G_PARAM_READWRITE |
+	                      G_PARAM_CONSTRUCT |
+	                      NM_SETTING_PARAM_INFERRABLE |
+	                      G_PARAM_STATIC_STRINGS);
 
 	/**
 	 * NMSettingInfiniband:parent:
@@ -517,14 +518,15 @@ nm_setting_infiniband_class_init (NMSettingInfinibandClass *klass)
 	 * example: PHYSDEV=ib0
 	 * ---end---
 	 */
-	g_object_class_install_property
-		(object_class, PROP_PARENT,
-		 g_param_spec_string (NM_SETTING_INFINIBAND_PARENT, "", "",
-		                      NULL,
-		                      G_PARAM_READWRITE |
-		                      G_PARAM_CONSTRUCT |
-		                      NM_SETTING_PARAM_INFERRABLE |
-		                      G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_PARENT] =
+	    g_param_spec_string (NM_SETTING_INFINIBAND_PARENT, "", "",
+	                         NULL,
+	                         G_PARAM_READWRITE |
+	                         G_PARAM_CONSTRUCT |
+	                         NM_SETTING_PARAM_INFERRABLE |
+	                         G_PARAM_STATIC_STRINGS);
+
+	g_object_class_install_properties (object_class, _PROPERTY_ENUMS_LAST, obj_properties);
 
 	_nm_setting_class_commit_full (setting_class, NM_META_SETTING_TYPE_INFINIBAND,
 	                               NULL, properties_override);
diff --git a/libnm-core/nm-setting-ip-config.c b/libnm-core/nm-setting-ip-config.c
index 2b3134b6..5250ae43 100644
--- a/libnm-core/nm-setting-ip-config.c
+++ b/libnm-core/nm-setting-ip-config.c
@@ -22,10 +22,10 @@
 
 #include "nm-default.h"
 
-#include 
+#include "nm-setting-ip-config.h"
+
 #include 
 
-#include "nm-setting-ip-config.h"
 #include "nm-setting-ip4-config.h"
 #include "nm-setting-ip6-config.h"
 #include "nm-utils.h"
@@ -44,6 +44,8 @@
  * related to IP addressing, routing, and Domain Name Service.
  **/
 
+/*****************************************************************************/
+
 const NMUtilsDNSOptionDesc _nm_utils_dns_option_descs[] = {
 	{ NM_SETTING_DNS_OPTION_DEBUG,                 FALSE,   FALSE },
 	{ NM_SETTING_DNS_OPTION_NDOTS,                 TRUE,    FALSE },
@@ -1123,7 +1125,7 @@ _nm_ip_route_get_attributes_direct (NMIPRoute *route)
  * @route: the #NMIPRoute
  * @sorted: whether to sort the names. Otherwise, their order is
  *   undefined and unstable.
- * @out_length: (allow-none): (out): the number of elements
+ * @out_length: (allow-none) (out): the number of elements
  *
  * Gets an array of attribute names defined on @route.
  *
@@ -1382,9 +1384,26 @@ _nm_ip_route_attribute_validate_all (const NMIPRoute *route)
 
 /*****************************************************************************/
 
-G_DEFINE_ABSTRACT_TYPE (NMSettingIPConfig, nm_setting_ip_config, NM_TYPE_SETTING)
-
-#define NM_SETTING_IP_CONFIG_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_SETTING_IP_CONFIG, NMSettingIPConfigPrivate))
+NM_GOBJECT_PROPERTIES_DEFINE (NMSettingIPConfig,
+	PROP_METHOD,
+	PROP_DNS,
+	PROP_DNS_SEARCH,
+	PROP_DNS_OPTIONS,
+	PROP_DNS_PRIORITY,
+	PROP_ADDRESSES,
+	PROP_GATEWAY,
+	PROP_ROUTES,
+	PROP_ROUTE_METRIC,
+	PROP_ROUTE_TABLE,
+	PROP_IGNORE_AUTO_ROUTES,
+	PROP_IGNORE_AUTO_DNS,
+	PROP_DHCP_HOSTNAME,
+	PROP_DHCP_SEND_HOSTNAME,
+	PROP_NEVER_DEFAULT,
+	PROP_MAY_FAIL,
+	PROP_DAD_TIMEOUT,
+	PROP_DHCP_TIMEOUT,
+);
 
 typedef struct {
 	char *method;
@@ -1407,29 +1426,11 @@ typedef struct {
 	int dhcp_timeout;
 } NMSettingIPConfigPrivate;
 
-enum {
-	PROP_0,
-	PROP_METHOD,
-	PROP_DNS,
-	PROP_DNS_SEARCH,
-	PROP_DNS_OPTIONS,
-	PROP_DNS_PRIORITY,
-	PROP_ADDRESSES,
-	PROP_GATEWAY,
-	PROP_ROUTES,
-	PROP_ROUTE_METRIC,
-	PROP_ROUTE_TABLE,
-	PROP_IGNORE_AUTO_ROUTES,
-	PROP_IGNORE_AUTO_DNS,
-	PROP_DHCP_HOSTNAME,
-	PROP_DHCP_SEND_HOSTNAME,
-	PROP_NEVER_DEFAULT,
-	PROP_MAY_FAIL,
-	PROP_DAD_TIMEOUT,
-	PROP_DHCP_TIMEOUT,
+G_DEFINE_ABSTRACT_TYPE (NMSettingIPConfig, nm_setting_ip_config, NM_TYPE_SETTING)
 
-	LAST_PROP
-};
+#define NM_SETTING_IP_CONFIG_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_SETTING_IP_CONFIG, NMSettingIPConfigPrivate))
+
+/*****************************************************************************/
 
 #define NM_SETTING_IP_CONFIG_GET_FAMILY(setting) (NM_IS_SETTING_IP4_CONFIG (setting) ? AF_INET : AF_INET6)
 
@@ -1515,7 +1516,7 @@ nm_setting_ip_config_add_dns (NMSettingIPConfig *setting, const char *dns)
 	}
 
 	g_ptr_array_add (priv->dns, dns_canonical);
-	g_object_notify (G_OBJECT (setting), NM_SETTING_IP_CONFIG_DNS);
+	_notify (setting, PROP_DNS);
 	return TRUE;
 }
 
@@ -1537,7 +1538,7 @@ nm_setting_ip_config_remove_dns (NMSettingIPConfig *setting, int idx)
 	g_return_if_fail (idx >= 0 && idx < priv->dns->len);
 
 	g_ptr_array_remove_index (priv->dns, idx);
-	g_object_notify (G_OBJECT (setting), NM_SETTING_IP_CONFIG_DNS);
+	_notify (setting, PROP_DNS);
 }
 
 /**
@@ -1566,7 +1567,7 @@ nm_setting_ip_config_remove_dns_by_value (NMSettingIPConfig *setting, const char
 	for (i = 0; i < priv->dns->len; i++) {
 		if (!strcmp (dns_canonical, priv->dns->pdata[i])) {
 			g_ptr_array_remove_index (priv->dns, i);
-			g_object_notify (G_OBJECT (setting), NM_SETTING_IP_CONFIG_DNS);
+			_notify (setting, PROP_DNS);
 			g_free (dns_canonical);
 			return TRUE;
 		}
@@ -1592,7 +1593,7 @@ nm_setting_ip_config_clear_dns (NMSettingIPConfig *setting)
 
 	if (priv->dns->len != 0) {
 		g_ptr_array_set_size (priv->dns, 0);
-		g_object_notify (G_OBJECT (setting), NM_SETTING_IP_CONFIG_DNS);
+		_notify (setting, PROP_DNS);
 	}
 }
 
@@ -1658,7 +1659,7 @@ nm_setting_ip_config_add_dns_search (NMSettingIPConfig *setting,
 	}
 
 	g_ptr_array_add (priv->dns_search, g_strdup (dns_search));
-	g_object_notify (G_OBJECT (setting), NM_SETTING_IP_CONFIG_DNS_SEARCH);
+	_notify (setting, PROP_DNS_SEARCH);
 	return TRUE;
 }
 
@@ -1680,7 +1681,7 @@ nm_setting_ip_config_remove_dns_search (NMSettingIPConfig *setting, int idx)
 	g_return_if_fail (idx >= 0 && idx < priv->dns_search->len);
 
 	g_ptr_array_remove_index (priv->dns_search, idx);
-	g_object_notify (G_OBJECT (setting), NM_SETTING_IP_CONFIG_DNS_SEARCH);
+	_notify (setting, PROP_DNS_SEARCH);
 }
 
 /**
@@ -1707,7 +1708,7 @@ nm_setting_ip_config_remove_dns_search_by_value (NMSettingIPConfig *setting,
 	for (i = 0; i < priv->dns_search->len; i++) {
 		if (!strcmp (dns_search, priv->dns_search->pdata[i])) {
 			g_ptr_array_remove_index (priv->dns_search, i);
-			g_object_notify (G_OBJECT (setting), NM_SETTING_IP_CONFIG_DNS_SEARCH);
+			_notify (setting, PROP_DNS_SEARCH);
 			return TRUE;
 		}
 	}
@@ -1731,7 +1732,7 @@ nm_setting_ip_config_clear_dns_searches (NMSettingIPConfig *setting)
 
 	if (priv->dns_search->len != 0) {
 		g_ptr_array_set_size (priv->dns_search, 0);
-		g_object_notify (G_OBJECT (setting), NM_SETTING_IP_CONFIG_DNS_SEARCH);
+		_notify (setting, PROP_DNS_SEARCH);
 	}
 }
 
@@ -1863,7 +1864,7 @@ nm_setting_ip_config_add_dns_option (NMSettingIPConfig *setting,
 	}
 
 	g_ptr_array_add (priv->dns_options, g_strdup (dns_option));
-	g_object_notify (G_OBJECT (setting), NM_SETTING_IP_CONFIG_DNS_OPTIONS);
+	_notify (setting, PROP_DNS_OPTIONS);
 	return TRUE;
 }
 
@@ -1888,7 +1889,7 @@ nm_setting_ip_config_remove_dns_option (NMSettingIPConfig *setting, int idx)
 	g_return_if_fail (idx >= 0 && idx < priv->dns_options->len);
 
 	g_ptr_array_remove_index (priv->dns_options, idx);
-	g_object_notify (G_OBJECT (setting), NM_SETTING_IP_CONFIG_DNS_OPTIONS);
+	_notify (setting, PROP_DNS_OPTIONS);
 }
 
 /**
@@ -1920,7 +1921,7 @@ nm_setting_ip_config_remove_dns_option_by_value (NMSettingIPConfig *setting,
 	i = _nm_utils_dns_option_find_idx (priv->dns_options, dns_option);
 	if (i >= 0) {
 		g_ptr_array_remove_index (priv->dns_options, i);
-		g_object_notify (G_OBJECT (setting), NM_SETTING_IP_CONFIG_DNS_OPTIONS);
+		_notify (setting, PROP_DNS_OPTIONS);
 		return TRUE;
 	}
 
@@ -1959,7 +1960,7 @@ nm_setting_ip_config_clear_dns_options (NMSettingIPConfig *setting, gboolean is_
 			g_ptr_array_set_size (priv->dns_options, 0);
 		}
 	}
-	g_object_notify (G_OBJECT (setting), NM_SETTING_IP_CONFIG_DNS_OPTIONS);
+	_notify (setting, PROP_DNS_OPTIONS);
 }
 
 /**
@@ -2042,7 +2043,7 @@ nm_setting_ip_config_add_address (NMSettingIPConfig *setting,
 
 	g_ptr_array_add (priv->addresses, nm_ip_address_dup (address));
 
-	g_object_notify (G_OBJECT (setting), NM_SETTING_IP_CONFIG_ADDRESSES);
+	_notify (setting, PROP_ADDRESSES);
 	return TRUE;
 }
 
@@ -2065,7 +2066,7 @@ nm_setting_ip_config_remove_address (NMSettingIPConfig *setting, int idx)
 
 	g_ptr_array_remove_index (priv->addresses, idx);
 
-	g_object_notify (G_OBJECT (setting), NM_SETTING_IP_CONFIG_ADDRESSES);
+	_notify (setting, PROP_ADDRESSES);
 }
 
 /**
@@ -2091,7 +2092,7 @@ nm_setting_ip_config_remove_address_by_value (NMSettingIPConfig *setting,
 	for (i = 0; i < priv->addresses->len; i++) {
 		if (nm_ip_address_equal (priv->addresses->pdata[i], address)) {
 			g_ptr_array_remove_index (priv->addresses, i);
-			g_object_notify (G_OBJECT (setting), NM_SETTING_IP_CONFIG_ADDRESSES);
+			_notify (setting, PROP_ADDRESSES);
 			return TRUE;
 		}
 	}
@@ -2113,7 +2114,7 @@ nm_setting_ip_config_clear_addresses (NMSettingIPConfig *setting)
 
 	if (priv->addresses->len != 0) {
 		g_ptr_array_set_size (priv->addresses, 0);
-		g_object_notify (G_OBJECT (setting), NM_SETTING_IP_CONFIG_ADDRESSES);
+		_notify (setting, PROP_ADDRESSES);
 	}
 }
 
@@ -2200,7 +2201,7 @@ nm_setting_ip_config_add_route (NMSettingIPConfig *setting,
 	}
 
 	g_ptr_array_add (priv->routes, nm_ip_route_dup (route));
-	g_object_notify (G_OBJECT (setting), NM_SETTING_IP_CONFIG_ROUTES);
+	_notify (setting, PROP_ROUTES);
 	return TRUE;
 }
 
@@ -2222,7 +2223,7 @@ nm_setting_ip_config_remove_route (NMSettingIPConfig *setting, int idx)
 	g_return_if_fail (idx >= 0 && idx < priv->routes->len);
 
 	g_ptr_array_remove_index (priv->routes, idx);
-	g_object_notify (G_OBJECT (setting), NM_SETTING_IP_CONFIG_ROUTES);
+	_notify (setting, PROP_ROUTES);
 }
 
 /**
@@ -2250,7 +2251,7 @@ nm_setting_ip_config_remove_route_by_value (NMSettingIPConfig *setting,
 	for (i = 0; i < priv->routes->len; i++) {
 		if (nm_ip_route_equal_full (priv->routes->pdata[i], route, NM_IP_ROUTE_EQUAL_CMP_FLAGS_WITH_ATTRS)) {
 			g_ptr_array_remove_index (priv->routes, i);
-			g_object_notify (G_OBJECT (setting), NM_SETTING_IP_CONFIG_ROUTES);
+			_notify (setting, PROP_ROUTES);
 			return TRUE;
 		}
 	}
@@ -2272,7 +2273,7 @@ nm_setting_ip_config_clear_routes (NMSettingIPConfig *setting)
 
 	if (priv->routes->len != 0) {
 		g_ptr_array_set_size (priv->routes, 0);
-		g_object_notify (G_OBJECT (setting), NM_SETTING_IP_CONFIG_ROUTES);
+		_notify (setting, PROP_ROUTES);
 	}
 }
 
@@ -2612,78 +2613,161 @@ verify (NMSetting *setting, NMConnection *connection, GError **error)
 	return TRUE;
 }
 
-static gboolean
-compare_property (NMSetting *setting,
+static NMTernary
+compare_property (const NMSettInfoSetting *sett_info,
+                  guint property_idx,
+                  NMSetting *setting,
                   NMSetting *other,
-                  const GParamSpec *prop_spec,
                   NMSettingCompareFlags flags)
 {
-	NMSettingIPConfigPrivate *a_priv, *b_priv;
-	NMSettingClass *setting_class;
+	NMSettingIPConfigPrivate *a_priv;
+	NMSettingIPConfigPrivate *b_priv;
 	guint i;
 
-	if (nm_streq (prop_spec->name, NM_SETTING_IP_CONFIG_ADDRESSES)) {
-		a_priv = NM_SETTING_IP_CONFIG_GET_PRIVATE (setting);
-		b_priv = NM_SETTING_IP_CONFIG_GET_PRIVATE (other);
+	if (nm_streq (sett_info->property_infos[property_idx].name, NM_SETTING_IP_CONFIG_ADDRESSES)) {
+		if (other) {
+			a_priv = NM_SETTING_IP_CONFIG_GET_PRIVATE (setting);
+			b_priv = NM_SETTING_IP_CONFIG_GET_PRIVATE (other);
 
-		if (a_priv->addresses->len != b_priv->addresses->len)
-			return FALSE;
-		for (i = 0; i < a_priv->addresses->len; i++) {
-			if (!_nm_ip_address_equal (a_priv->addresses->pdata[i], b_priv->addresses->pdata[i], TRUE))
+			if (a_priv->addresses->len != b_priv->addresses->len)
 				return FALSE;
+			for (i = 0; i < a_priv->addresses->len; i++) {
+				if (!_nm_ip_address_equal (a_priv->addresses->pdata[i], b_priv->addresses->pdata[i], TRUE))
+					return FALSE;
+			}
 		}
 		return TRUE;
 	}
 
-	if (nm_streq (prop_spec->name, NM_SETTING_IP_CONFIG_ROUTES)) {
-		a_priv = NM_SETTING_IP_CONFIG_GET_PRIVATE (setting);
-		b_priv = NM_SETTING_IP_CONFIG_GET_PRIVATE (other);
+	if (nm_streq (sett_info->property_infos[property_idx].name, NM_SETTING_IP_CONFIG_ROUTES)) {
+		if (other) {
+			a_priv = NM_SETTING_IP_CONFIG_GET_PRIVATE (setting);
+			b_priv = NM_SETTING_IP_CONFIG_GET_PRIVATE (other);
 
-		if (a_priv->routes->len != b_priv->routes->len)
-			return FALSE;
-		for (i = 0; i < a_priv->routes->len; i++) {
-			if (!nm_ip_route_equal_full (a_priv->routes->pdata[i], b_priv->routes->pdata[i], NM_IP_ROUTE_EQUAL_CMP_FLAGS_WITH_ATTRS))
+			if (a_priv->routes->len != b_priv->routes->len)
 				return FALSE;
+			for (i = 0; i < a_priv->routes->len; i++) {
+				if (!nm_ip_route_equal_full (a_priv->routes->pdata[i], b_priv->routes->pdata[i], NM_IP_ROUTE_EQUAL_CMP_FLAGS_WITH_ATTRS))
+					return FALSE;
+			}
 		}
 		return TRUE;
 	}
 
-	setting_class = NM_SETTING_CLASS (nm_setting_ip_config_parent_class);
-	return setting_class->compare_property (setting, other, prop_spec, flags);
+	return NM_SETTING_CLASS (nm_setting_ip_config_parent_class)->compare_property (sett_info,
+	                                                                               property_idx,
+	                                                                               setting,
+	                                                                               other,
+	                                                                               flags);
 }
 
 /*****************************************************************************/
 
-static void
-nm_setting_ip_config_init (NMSettingIPConfig *setting)
+static gboolean
+ip_gateway_set (NMSetting  *setting,
+                GVariant   *connection_dict,
+                const char *property,
+                GVariant   *value,
+                NMSettingParseFlags parse_flags,
+                GError    **error)
 {
-	NMSettingIPConfigPrivate *priv = NM_SETTING_IP_CONFIG_GET_PRIVATE (setting);
+	/* FIXME: properly handle errors */
 
-	priv->dns = g_ptr_array_new_with_free_func (g_free);
-	priv->dns_search = g_ptr_array_new_with_free_func (g_free);
-	priv->dns_options = NULL;
-	priv->addresses = g_ptr_array_new_with_free_func ((GDestroyNotify) nm_ip_address_unref);
-	priv->routes = g_ptr_array_new_with_free_func ((GDestroyNotify) nm_ip_route_unref);
+	/* Don't set from 'gateway' if we're going to use the gateway in 'addresses' */
+	if (_nm_setting_use_legacy_property (setting, connection_dict, "addresses", "gateway"))
+		return TRUE;
+
+	g_object_set (setting, property, g_variant_get_string (value, NULL), NULL);
+	return TRUE;
 }
 
-static void
-finalize (GObject *object)
+GArray *
+_nm_sett_info_property_override_create_array_ip_config (void)
 {
-	NMSettingIPConfig *self = NM_SETTING_IP_CONFIG (object);
-	NMSettingIPConfigPrivate *priv = NM_SETTING_IP_CONFIG_GET_PRIVATE (self);
+	GArray *properties_override = _nm_sett_info_property_override_create_array ();
 
-	g_free (priv->method);
-	g_free (priv->gateway);
-	g_free (priv->dhcp_hostname);
+	_properties_override_add_override (properties_override,
+	                                   obj_properties[PROP_GATEWAY],
+	                                   G_VARIANT_TYPE_STRING,
+	                                   NULL,
+	                                   ip_gateway_set,
+	                                   NULL);
 
-	g_ptr_array_unref (priv->dns);
-	g_ptr_array_unref (priv->dns_search);
-	if (priv->dns_options)
-		g_ptr_array_unref (priv->dns_options);
-	g_ptr_array_unref (priv->addresses);
-	g_ptr_array_unref (priv->routes);
+	return properties_override;
+}
 
-	G_OBJECT_CLASS (nm_setting_ip_config_parent_class)->finalize (object);
+/*****************************************************************************/
+
+static void
+get_property (GObject *object, guint prop_id,
+              GValue *value, GParamSpec *pspec)
+{
+	NMSettingIPConfig *setting = NM_SETTING_IP_CONFIG (object);
+	NMSettingIPConfigPrivate *priv = NM_SETTING_IP_CONFIG_GET_PRIVATE (setting);
+
+	switch (prop_id) {
+	case PROP_METHOD:
+		g_value_set_string (value, nm_setting_ip_config_get_method (setting));
+		break;
+	case PROP_DNS:
+		g_value_take_boxed (value, _nm_utils_ptrarray_to_strv (priv->dns));
+		break;
+	case PROP_DNS_SEARCH:
+		g_value_take_boxed (value, _nm_utils_ptrarray_to_strv (priv->dns_search));
+		break;
+	case PROP_DNS_OPTIONS:
+		g_value_take_boxed (value, priv->dns_options ? _nm_utils_ptrarray_to_strv (priv->dns_options) : NULL);
+		break;
+	case PROP_DNS_PRIORITY:
+		g_value_set_int (value, priv->dns_priority);
+		break;
+	case PROP_ADDRESSES:
+		g_value_take_boxed (value, _nm_utils_copy_array (priv->addresses,
+		                                                 (NMUtilsCopyFunc) nm_ip_address_dup,
+		                                                 (GDestroyNotify) nm_ip_address_unref));
+		break;
+	case PROP_GATEWAY:
+		g_value_set_string (value, nm_setting_ip_config_get_gateway (setting));
+		break;
+	case PROP_ROUTES:
+		g_value_take_boxed (value, _nm_utils_copy_array (priv->routes,
+		                                                 (NMUtilsCopyFunc) nm_ip_route_dup,
+		                                                 (GDestroyNotify) nm_ip_route_unref));
+		break;
+	case PROP_ROUTE_METRIC:
+		g_value_set_int64 (value, priv->route_metric);
+		break;
+	case PROP_ROUTE_TABLE:
+		g_value_set_uint (value, priv->route_table);
+		break;
+	case PROP_IGNORE_AUTO_ROUTES:
+		g_value_set_boolean (value, nm_setting_ip_config_get_ignore_auto_routes (setting));
+		break;
+	case PROP_IGNORE_AUTO_DNS:
+		g_value_set_boolean (value, nm_setting_ip_config_get_ignore_auto_dns (setting));
+		break;
+	case PROP_DHCP_HOSTNAME:
+		g_value_set_string (value, nm_setting_ip_config_get_dhcp_hostname (setting));
+		break;
+	case PROP_DHCP_SEND_HOSTNAME:
+		g_value_set_boolean (value, nm_setting_ip_config_get_dhcp_send_hostname (setting));
+		break;
+	case PROP_NEVER_DEFAULT:
+		g_value_set_boolean (value, priv->never_default);
+		break;
+	case PROP_MAY_FAIL:
+		g_value_set_boolean (value, priv->may_fail);
+		break;
+	case PROP_DAD_TIMEOUT:
+		g_value_set_int (value, nm_setting_ip_config_get_dad_timeout (setting));
+		break;
+	case PROP_DHCP_TIMEOUT:
+		g_value_set_int (value, nm_setting_ip_config_get_dhcp_timeout (setting));
+		break;
+	default:
+		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+		break;
+	}
 }
 
 static void
@@ -2786,111 +2870,38 @@ set_property (GObject *object, guint prop_id,
 	}
 }
 
+/*****************************************************************************/
+
 static void
-get_property (GObject *object, guint prop_id,
-              GValue *value, GParamSpec *pspec)
+nm_setting_ip_config_init (NMSettingIPConfig *setting)
 {
-	NMSettingIPConfig *setting = NM_SETTING_IP_CONFIG (object);
 	NMSettingIPConfigPrivate *priv = NM_SETTING_IP_CONFIG_GET_PRIVATE (setting);
 
-	switch (prop_id) {
-	case PROP_METHOD:
-		g_value_set_string (value, nm_setting_ip_config_get_method (setting));
-		break;
-	case PROP_DNS:
-		g_value_take_boxed (value, _nm_utils_ptrarray_to_strv (priv->dns));
-		break;
-	case PROP_DNS_SEARCH:
-		g_value_take_boxed (value, _nm_utils_ptrarray_to_strv (priv->dns_search));
-		break;
-	case PROP_DNS_OPTIONS:
-		g_value_take_boxed (value, priv->dns_options ? _nm_utils_ptrarray_to_strv (priv->dns_options) : NULL);
-		break;
-	case PROP_DNS_PRIORITY:
-		g_value_set_int (value, priv->dns_priority);
-		break;
-	case PROP_ADDRESSES:
-		g_value_take_boxed (value, _nm_utils_copy_array (priv->addresses,
-		                                                 (NMUtilsCopyFunc) nm_ip_address_dup,
-		                                                 (GDestroyNotify) nm_ip_address_unref));
-		break;
-	case PROP_GATEWAY:
-		g_value_set_string (value, nm_setting_ip_config_get_gateway (setting));
-		break;
-	case PROP_ROUTES:
-		g_value_take_boxed (value, _nm_utils_copy_array (priv->routes,
-		                                                 (NMUtilsCopyFunc) nm_ip_route_dup,
-		                                                 (GDestroyNotify) nm_ip_route_unref));
-		break;
-	case PROP_ROUTE_METRIC:
-		g_value_set_int64 (value, priv->route_metric);
-		break;
-	case PROP_ROUTE_TABLE:
-		g_value_set_uint (value, priv->route_table);
-		break;
-	case PROP_IGNORE_AUTO_ROUTES:
-		g_value_set_boolean (value, nm_setting_ip_config_get_ignore_auto_routes (setting));
-		break;
-	case PROP_IGNORE_AUTO_DNS:
-		g_value_set_boolean (value, nm_setting_ip_config_get_ignore_auto_dns (setting));
-		break;
-	case PROP_DHCP_HOSTNAME:
-		g_value_set_string (value, nm_setting_ip_config_get_dhcp_hostname (setting));
-		break;
-	case PROP_DHCP_SEND_HOSTNAME:
-		g_value_set_boolean (value, nm_setting_ip_config_get_dhcp_send_hostname (setting));
-		break;
-	case PROP_NEVER_DEFAULT:
-		g_value_set_boolean (value, priv->never_default);
-		break;
-	case PROP_MAY_FAIL:
-		g_value_set_boolean (value, priv->may_fail);
-		break;
-	case PROP_DAD_TIMEOUT:
-		g_value_set_int (value, nm_setting_ip_config_get_dad_timeout (setting));
-		break;
-	case PROP_DHCP_TIMEOUT:
-		g_value_set_int (value, nm_setting_ip_config_get_dhcp_timeout (setting));
-		break;
-	default:
-		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-		break;
-	}
+	priv->dns = g_ptr_array_new_with_free_func (g_free);
+	priv->dns_search = g_ptr_array_new_with_free_func (g_free);
+	priv->dns_options = NULL;
+	priv->addresses = g_ptr_array_new_with_free_func ((GDestroyNotify) nm_ip_address_unref);
+	priv->routes = g_ptr_array_new_with_free_func ((GDestroyNotify) nm_ip_route_unref);
 }
 
-static gboolean
-ip_gateway_set (NMSetting  *setting,
-                GVariant   *connection_dict,
-                const char *property,
-                GVariant   *value,
-                NMSettingParseFlags parse_flags,
-                GError    **error)
+static void
+finalize (GObject *object)
 {
-	/* FIXME: properly handle errors */
-
-	/* Don't set from 'gateway' if we're going to use the gateway in 'addresses' */
-	if (_nm_setting_use_legacy_property (setting, connection_dict, "addresses", "gateway"))
-		return TRUE;
-
-	g_object_set (setting, property, g_variant_get_string (value, NULL), NULL);
-	return TRUE;
-}
+	NMSettingIPConfig *self = NM_SETTING_IP_CONFIG (object);
+	NMSettingIPConfigPrivate *priv = NM_SETTING_IP_CONFIG_GET_PRIVATE (self);
 
-GArray *
-_nm_sett_info_property_override_create_array_ip_config (void)
-{
-	nm_auto_unref_gtypeclass NMSettingClass *setting_class = g_type_class_ref (NM_TYPE_SETTING_IP_CONFIG);
-	GArray *properties_override = _nm_sett_info_property_override_create_array ();
+	g_free (priv->method);
+	g_free (priv->gateway);
+	g_free (priv->dhcp_hostname);
 
-	_properties_override_add_override (properties_override,
-	                                   g_object_class_find_property (G_OBJECT_CLASS (setting_class),
-	                                                                 NM_SETTING_IP_CONFIG_GATEWAY),
-	                                   G_VARIANT_TYPE_STRING,
-	                                   NULL,
-	                                   ip_gateway_set,
-	                                   NULL);
+	g_ptr_array_unref (priv->dns);
+	g_ptr_array_unref (priv->dns_search);
+	if (priv->dns_options)
+		g_ptr_array_unref (priv->dns_options);
+	g_ptr_array_unref (priv->addresses);
+	g_ptr_array_unref (priv->routes);
 
-	return properties_override;
+	G_OBJECT_CLASS (nm_setting_ip_config_parent_class)->finalize (object);
 }
 
 static void
@@ -2901,8 +2912,8 @@ nm_setting_ip_config_class_init (NMSettingIPConfigClass *klass)
 
 	g_type_class_add_private (klass, sizeof (NMSettingIPConfigPrivate));
 
-	object_class->set_property = set_property;
 	object_class->get_property = get_property;
+	object_class->set_property = set_property;
 	object_class->finalize     = finalize;
 
 	setting_class->verify           = verify;
@@ -2931,25 +2942,23 @@ nm_setting_ip_config_class_init (NMSettingIPConfigClass *klass)
 	 * shared method must be configured on the interface which shares the internet
 	 * to a subnet, not on the uplink which is shared.
 	 **/
-	g_object_class_install_property
-		(object_class, PROP_METHOD,
-		 g_param_spec_string (NM_SETTING_IP_CONFIG_METHOD, "", "",
-		                      NULL,
-		                      G_PARAM_READWRITE |
-		                      NM_SETTING_PARAM_INFERRABLE |
-		                      G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_METHOD] =
+	    g_param_spec_string (NM_SETTING_IP_CONFIG_METHOD, "", "",
+	                         NULL,
+	                         G_PARAM_READWRITE |
+	                         NM_SETTING_PARAM_INFERRABLE |
+	                         G_PARAM_STATIC_STRINGS);
 
 	/**
 	 * NMSettingIPConfig:dns:
 	 *
 	 * Array of IP addresses of DNS servers.
 	 **/
-	g_object_class_install_property
-		(object_class, PROP_DNS,
-		 g_param_spec_boxed (NM_SETTING_IP_CONFIG_DNS, "", "",
-		                     G_TYPE_STRV,
-		                     G_PARAM_READWRITE |
-		                     G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_DNS] =
+	    g_param_spec_boxed (NM_SETTING_IP_CONFIG_DNS, "", "",
+	                        G_TYPE_STRV,
+	                        G_PARAM_READWRITE |
+	                        G_PARAM_STATIC_STRINGS);
 
 	/**
 	 * NMSettingIPConfig:dns-search:
@@ -2959,12 +2968,11 @@ nm_setting_ip_config_class_init (NMSettingIPConfigClass *klass)
 	 * interface over which a query must be forwarded; they are not used
 	 * to complete unqualified host names.
 	 **/
-	g_object_class_install_property
-		(object_class, PROP_DNS_SEARCH,
-		 g_param_spec_boxed (NM_SETTING_IP_CONFIG_DNS_SEARCH, "", "",
-		                     G_TYPE_STRV,
-		                     G_PARAM_READWRITE |
-		                     G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_DNS_SEARCH] =
+	    g_param_spec_boxed (NM_SETTING_IP_CONFIG_DNS_SEARCH, "", "",
+	                        G_TYPE_STRV,
+	                        G_PARAM_READWRITE |
+	                        G_PARAM_STATIC_STRINGS);
 
 	/**
 	 * NMSettingIPConfig:dns-options:
@@ -2977,12 +2985,11 @@ nm_setting_ip_config_class_init (NMSettingIPConfigClass *klass)
 	 *
 	 * Since: 1.2
 	 **/
-	g_object_class_install_property
-		(object_class, PROP_DNS_OPTIONS,
-		 g_param_spec_boxed (NM_SETTING_IP_CONFIG_DNS_OPTIONS, "", "",
-		                     G_TYPE_STRV,
-		                     G_PARAM_READWRITE |
-		                     G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_DNS_OPTIONS] =
+	    g_param_spec_boxed (NM_SETTING_IP_CONFIG_DNS_OPTIONS, "", "",
+	                        G_TYPE_STRV,
+	                        G_PARAM_READWRITE |
+	                        G_PARAM_STATIC_STRINGS);
 
 	/**
 	 * NMSettingIPConfig:dns-priority:
@@ -2990,8 +2997,9 @@ nm_setting_ip_config_class_init (NMSettingIPConfigClass *klass)
 	 * DNS servers priority.
 	 *
 	 * The relative priority for DNS servers specified by this setting.  A lower
-	 * value is better (higher priority).  Zero selects the default value, which
-	 * is 50 for VPNs and 100 for other connections.
+	 * value is better (higher priority). Zero selects a globally configured
+	 * default value. If the latter is missing or zero too, it defaults to
+	 * 50 for VPNs and 100 for other connections.
 	 *
 	 * Note that the priority is to order DNS settings for multiple active
 	 * connections.  It does not disambiguate multiple DNS servers within the
@@ -3018,31 +3026,29 @@ nm_setting_ip_config_class_init (NMSettingIPConfigClass *klass)
 	 *
 	 * Since: 1.4
 	 **/
-	g_object_class_install_property
-	    (object_class, PROP_DNS_PRIORITY,
+	obj_properties[PROP_DNS_PRIORITY] =
 	     g_param_spec_int (NM_SETTING_IP_CONFIG_DNS_PRIORITY, "", "",
 	                       G_MININT32, G_MAXINT32, 0,
 	                       G_PARAM_READWRITE |
 	                       G_PARAM_CONSTRUCT |
-	                       G_PARAM_STATIC_STRINGS));
+	                       G_PARAM_STATIC_STRINGS);
 
 	/**
 	 * NMSettingIPConfig:addresses: (type GPtrArray(NMIPAddress))
 	 *
 	 * Array of IP addresses.
 	 **/
-	g_object_class_install_property
-		(object_class, PROP_ADDRESSES,
-		 g_param_spec_boxed (NM_SETTING_IP_CONFIG_ADDRESSES, "", "",
-		                     G_TYPE_PTR_ARRAY,
-		                     G_PARAM_READWRITE |
-		                     NM_SETTING_PARAM_INFERRABLE |
-		                     /* "addresses" is a legacy D-Bus property, because the
-		                      * "addresses" GObject property normally gets set from
-		                      * the "address-data" D-Bus property...
-		                      */
-		                     NM_SETTING_PARAM_LEGACY |
-		                     G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_ADDRESSES] =
+	    g_param_spec_boxed (NM_SETTING_IP_CONFIG_ADDRESSES, "", "",
+	                        G_TYPE_PTR_ARRAY,
+	                        G_PARAM_READWRITE |
+	                        NM_SETTING_PARAM_INFERRABLE |
+	                        /* "addresses" is a legacy D-Bus property, because the
+	                         * "addresses" GObject property normally gets set from
+	                         * the "address-data" D-Bus property...
+	                         */
+	                        NM_SETTING_PARAM_LEGACY |
+	                        G_PARAM_STATIC_STRINGS);
 
 	/**
 	 * NMSettingIPConfig:gateway:
@@ -3050,28 +3056,26 @@ nm_setting_ip_config_class_init (NMSettingIPConfigClass *klass)
 	 * The gateway associated with this configuration. This is only meaningful
 	 * if #NMSettingIPConfig:addresses is also set.
 	 **/
-	g_object_class_install_property
-		(object_class, PROP_GATEWAY,
-		 g_param_spec_string (NM_SETTING_IP_CONFIG_GATEWAY, "", "",
-		                      NULL,
-		                      G_PARAM_READWRITE |
-		                      NM_SETTING_PARAM_INFERRABLE |
-		                      G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_GATEWAY] =
+	    g_param_spec_string (NM_SETTING_IP_CONFIG_GATEWAY, "", "",
+	                         NULL,
+	                         G_PARAM_READWRITE |
+	                         NM_SETTING_PARAM_INFERRABLE |
+	                         G_PARAM_STATIC_STRINGS);
 
 	/**
 	 * NMSettingIPConfig:routes: (type GPtrArray(NMIPRoute))
 	 *
 	 * Array of IP routes.
 	 **/
-	g_object_class_install_property
-		(object_class, PROP_ROUTES,
-		 g_param_spec_boxed (NM_SETTING_IP_CONFIG_ROUTES, "", "",
-		                     G_TYPE_PTR_ARRAY,
-		                     G_PARAM_READWRITE |
-		                     NM_SETTING_PARAM_INFERRABLE |
-		                     /* See :addresses above Re: LEGACY */
-		                     NM_SETTING_PARAM_LEGACY |
-		                     G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_ROUTES] =
+	    g_param_spec_boxed (NM_SETTING_IP_CONFIG_ROUTES, "", "",
+	                        G_TYPE_PTR_ARRAY,
+	                        G_PARAM_READWRITE |
+	                        NM_SETTING_PARAM_INFERRABLE |
+	                        /* See :addresses above Re: LEGACY */
+	                        NM_SETTING_PARAM_LEGACY |
+	                        G_PARAM_STATIC_STRINGS);
 
 	/**
 	 * NMSettingIPConfig:route-metric:
@@ -3087,13 +3091,12 @@ nm_setting_ip_config_class_init (NMSettingIPConfigClass *klass)
 	 * mean setting it to 1024.
 	 * For IPv4, zero is a regular value for the metric.
 	 **/
-	g_object_class_install_property
-	    (object_class, PROP_ROUTE_METRIC,
+	obj_properties[PROP_ROUTE_METRIC] =
 	     g_param_spec_int64 (NM_SETTING_IP_CONFIG_ROUTE_METRIC, "", "",
 	                         -1, G_MAXUINT32, -1,
 	                         G_PARAM_READWRITE |
 	                         G_PARAM_CONSTRUCT |
-	                         G_PARAM_STATIC_STRINGS));
+	                         G_PARAM_STATIC_STRINGS);
 
 	/**
 	 * NMSettingIPConfig:route-table:
@@ -3116,13 +3119,12 @@ nm_setting_ip_config_class_init (NMSettingIPConfigClass *klass)
 	 *
 	 * Since: 1.10
 	 **/
-	g_object_class_install_property
-		(object_class, PROP_ROUTE_TABLE,
-		 g_param_spec_uint (NM_SETTING_IP_CONFIG_ROUTE_TABLE, "", "",
-		                    0, G_MAXUINT32, 0,
-		                    G_PARAM_READWRITE |
-		                    NM_SETTING_PARAM_FUZZY_IGNORE |
-		                    G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_ROUTE_TABLE] =
+	    g_param_spec_uint (NM_SETTING_IP_CONFIG_ROUTE_TABLE, "", "",
+	                       0, G_MAXUINT32, 0,
+	                       G_PARAM_READWRITE |
+	                       NM_SETTING_PARAM_FUZZY_IGNORE |
+	                       G_PARAM_STATIC_STRINGS);
 	/**
 	 * NMSettingIPConfig:ignore-auto-routes:
 	 *
@@ -3130,13 +3132,12 @@ nm_setting_ip_config_class_init (NMSettingIPConfigClass *klass)
 	 * %TRUE, automatically configured routes are ignored and only routes
 	 * specified in the #NMSettingIPConfig:routes property, if any, are used.
 	 **/
-	g_object_class_install_property
-		(object_class, PROP_IGNORE_AUTO_ROUTES,
-		 g_param_spec_boolean (NM_SETTING_IP_CONFIG_IGNORE_AUTO_ROUTES, "", "",
-		                       FALSE,
-		                       G_PARAM_READWRITE |
-		                       G_PARAM_CONSTRUCT |
-		                       G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_IGNORE_AUTO_ROUTES] =
+	    g_param_spec_boolean (NM_SETTING_IP_CONFIG_IGNORE_AUTO_ROUTES, "", "",
+	                          FALSE,
+	                          G_PARAM_READWRITE |
+	                          G_PARAM_CONSTRUCT |
+	                          G_PARAM_STATIC_STRINGS);
 
 	/**
 	 * NMSettingIPConfig:ignore-auto-dns:
@@ -3147,13 +3148,12 @@ nm_setting_ip_config_class_init (NMSettingIPConfigClass *klass)
 	 * #NMSettingIPConfig:dns and #NMSettingIPConfig:dns-search properties, if
 	 * any, are used.
 	 **/
-	g_object_class_install_property
-		(object_class, PROP_IGNORE_AUTO_DNS,
-		 g_param_spec_boolean (NM_SETTING_IP_CONFIG_IGNORE_AUTO_DNS, "", "",
-		                       FALSE,
-		                       G_PARAM_READWRITE |
-		                       G_PARAM_CONSTRUCT |
-		                       G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_IGNORE_AUTO_DNS] =
+	    g_param_spec_boolean (NM_SETTING_IP_CONFIG_IGNORE_AUTO_DNS, "", "",
+	                          FALSE,
+	                          G_PARAM_READWRITE |
+	                          G_PARAM_CONSTRUCT |
+	                          G_PARAM_STATIC_STRINGS);
 
 	/**
 	 * NMSettingIPConfig:dhcp-hostname:
@@ -3163,12 +3163,11 @@ nm_setting_ip_config_class_init (NMSettingIPConfigClass *klass)
 	 * This property and #NMSettingIP4Config:dhcp-fqdn are mutually exclusive and
 	 * cannot be set at the same time.
 	 **/
-	g_object_class_install_property
-		(object_class, PROP_DHCP_HOSTNAME,
-		 g_param_spec_string (NM_SETTING_IP_CONFIG_DHCP_HOSTNAME, "", "",
-		                      NULL,
-		                      G_PARAM_READWRITE |
-		                      G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_DHCP_HOSTNAME] =
+	    g_param_spec_string (NM_SETTING_IP_CONFIG_DHCP_HOSTNAME, "", "",
+	                         NULL,
+	                         G_PARAM_READWRITE |
+	                         G_PARAM_STATIC_STRINGS);
 
 	/**
 	 * NMSettingIPConfig:dhcp-send-hostname:
@@ -3179,13 +3178,12 @@ nm_setting_ip_config_class_init (NMSettingIPConfigClass *klass)
 	 * #NMSettingIPConfig:dhcp-hostname property is %NULL and this property is
 	 * %TRUE, the current persistent hostname of the computer is sent.
 	 **/
-	g_object_class_install_property
-		(object_class, PROP_DHCP_SEND_HOSTNAME,
-		 g_param_spec_boolean (NM_SETTING_IP_CONFIG_DHCP_SEND_HOSTNAME, "", "",
-		                       TRUE,
-		                       G_PARAM_READWRITE |
-		                       G_PARAM_CONSTRUCT |
-		                       G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_DHCP_SEND_HOSTNAME] =
+	    g_param_spec_boolean (NM_SETTING_IP_CONFIG_DHCP_SEND_HOSTNAME, "", "",
+	                          TRUE,
+	                          G_PARAM_READWRITE |
+	                          G_PARAM_CONSTRUCT |
+	                          G_PARAM_STATIC_STRINGS);
 
 	/**
 	 * NMSettingIPConfig:never-default:
@@ -3194,13 +3192,12 @@ nm_setting_ip_config_class_init (NMSettingIPConfigClass *klass)
 	 * IP type, meaning it will never be assigned the default route by
 	 * NetworkManager.
 	 **/
-	g_object_class_install_property
-		(object_class, PROP_NEVER_DEFAULT,
-		 g_param_spec_boolean (NM_SETTING_IP_CONFIG_NEVER_DEFAULT, "", "",
-		                       FALSE,
-		                       G_PARAM_READWRITE |
-		                       G_PARAM_CONSTRUCT |
-		                       G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_NEVER_DEFAULT] =
+	    g_param_spec_boolean (NM_SETTING_IP_CONFIG_NEVER_DEFAULT, "", "",
+	                          FALSE,
+	                          G_PARAM_READWRITE |
+	                          G_PARAM_CONSTRUCT |
+	                          G_PARAM_STATIC_STRINGS);
 
 	/**
 	 * NMSettingIPConfig:may-fail:
@@ -3213,13 +3210,12 @@ nm_setting_ip_config_class_init (NMSettingIPConfigClass *klass)
 	 * to succeed if IPv4 configuration fails but IPv6 configuration completes
 	 * successfully.
 	 **/
-	g_object_class_install_property
-		(object_class, PROP_MAY_FAIL,
-		 g_param_spec_boolean (NM_SETTING_IP_CONFIG_MAY_FAIL, "", "",
-		                       TRUE,
-		                       G_PARAM_READWRITE |
-		                       G_PARAM_CONSTRUCT |
-		                       G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_MAY_FAIL] =
+	    g_param_spec_boolean (NM_SETTING_IP_CONFIG_MAY_FAIL, "", "",
+	                          TRUE,
+	                          G_PARAM_READWRITE |
+	                          G_PARAM_CONSTRUCT |
+	                          G_PARAM_STATIC_STRINGS);
 
 	/**
 	 * NMSettingIPConfig:dad-timeout:
@@ -3235,25 +3231,25 @@ nm_setting_ip_config_class_init (NMSettingIPConfigClass *klass)
 	 *
 	 * Since: 1.2
 	 **/
-	g_object_class_install_property
-		(object_class, PROP_DAD_TIMEOUT,
-		 g_param_spec_int (NM_SETTING_IP_CONFIG_DAD_TIMEOUT, "", "",
-		                    -1, NM_SETTING_IP_CONFIG_DAD_TIMEOUT_MAX, -1,
-		                    G_PARAM_READWRITE |
-		                    G_PARAM_CONSTRUCT |
-		                    NM_SETTING_PARAM_FUZZY_IGNORE |
-		                    G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_DAD_TIMEOUT] =
+	    g_param_spec_int (NM_SETTING_IP_CONFIG_DAD_TIMEOUT, "", "",
+	                       -1, NM_SETTING_IP_CONFIG_DAD_TIMEOUT_MAX, -1,
+	                       G_PARAM_READWRITE |
+	                       G_PARAM_CONSTRUCT |
+	                       NM_SETTING_PARAM_FUZZY_IGNORE |
+	                       G_PARAM_STATIC_STRINGS);
 
 	/**
 	 * NMSettingIPConfig:dhcp-timeout:
 	 *
 	 * A timeout for a DHCP transaction in seconds.
 	 **/
-	g_object_class_install_property
-		(object_class, PROP_DHCP_TIMEOUT,
-		 g_param_spec_int (NM_SETTING_IP_CONFIG_DHCP_TIMEOUT, "", "",
-		                   0, G_MAXINT32, 0,
-		                   G_PARAM_READWRITE |
-		                   NM_SETTING_PARAM_FUZZY_IGNORE |
-		                   G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_DHCP_TIMEOUT] =
+	    g_param_spec_int (NM_SETTING_IP_CONFIG_DHCP_TIMEOUT, "", "",
+	                      0, G_MAXINT32, 0,
+	                      G_PARAM_READWRITE |
+	                      NM_SETTING_PARAM_FUZZY_IGNORE |
+	                      G_PARAM_STATIC_STRINGS);
+
+	g_object_class_install_properties (object_class, _PROPERTY_ENUMS_LAST, obj_properties);
 }
diff --git a/libnm-core/nm-setting-ip-config.h b/libnm-core/nm-setting-ip-config.h
index 882a88b6..39cb36a4 100644
--- a/libnm-core/nm-setting-ip-config.h
+++ b/libnm-core/nm-setting-ip-config.h
@@ -94,9 +94,9 @@ void         nm_ip_route_unref               (NMIPRoute  *route);
 gboolean     nm_ip_route_equal               (NMIPRoute  *route,
                                               NMIPRoute  *other);
 
-enum {
+enum { /*< flags >*/
 	NM_IP_ROUTE_EQUAL_CMP_FLAGS_NONE         = 0,
-	NM_IP_ROUTE_EQUAL_CMP_FLAGS_WITH_ATTRS   = (1LL <<  0),
+	NM_IP_ROUTE_EQUAL_CMP_FLAGS_WITH_ATTRS   = 0x1,
 };
 
 NM_AVAILABLE_IN_1_10
diff --git a/libnm-core/nm-setting-ip-tunnel.c b/libnm-core/nm-setting-ip-tunnel.c
index 41314f58..9fdb5481 100644
--- a/libnm-core/nm-setting-ip-tunnel.c
+++ b/libnm-core/nm-setting-ip-tunnel.c
@@ -30,9 +30,23 @@
  * @short_description: Describes connection properties for IP tunnel devices
  **/
 
-G_DEFINE_TYPE (NMSettingIPTunnel, nm_setting_ip_tunnel, NM_TYPE_SETTING)
+/*****************************************************************************/
 
-#define NM_SETTING_IP_TUNNEL_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_SETTING_IP_TUNNEL, NMSettingIPTunnelPrivate))
+NM_GOBJECT_PROPERTIES_DEFINE_BASE (
+	PROP_PARENT,
+	PROP_MODE,
+	PROP_LOCAL,
+	PROP_REMOTE,
+	PROP_TTL,
+	PROP_TOS,
+	PROP_PATH_MTU_DISCOVERY,
+	PROP_INPUT_KEY,
+	PROP_OUTPUT_KEY,
+	PROP_ENCAPSULATION_LIMIT,
+	PROP_FLOW_LABEL,
+	PROP_MTU,
+	PROP_FLAGS,
+);
 
 typedef struct {
 	char *parent;
@@ -50,24 +64,11 @@ typedef struct {
 	guint32 flags;
 } NMSettingIPTunnelPrivate;
 
-enum {
-	PROP_0,
-	PROP_PARENT,
-	PROP_MODE,
-	PROP_LOCAL,
-	PROP_REMOTE,
-	PROP_TTL,
-	PROP_TOS,
-	PROP_PATH_MTU_DISCOVERY,
-	PROP_INPUT_KEY,
-	PROP_OUTPUT_KEY,
-	PROP_ENCAPSULATION_LIMIT,
-	PROP_FLOW_LABEL,
-	PROP_MTU,
-	PROP_FLAGS,
+G_DEFINE_TYPE (NMSettingIPTunnel, nm_setting_ip_tunnel, NM_TYPE_SETTING)
 
-	LAST_PROP
-};
+#define NM_SETTING_IP_TUNNEL_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_SETTING_IP_TUNNEL, NMSettingIPTunnelPrivate))
+
+/*****************************************************************************/
 
 /**
  * nm_setting_ip_tunnel_get_parent:
@@ -474,77 +475,54 @@ verify (NMSetting *setting, NMConnection *connection, GError **error)
 	return TRUE;
 }
 
-/**
- * nm_setting_ip_tunnel_new:
- *
- * Creates a new #NMSettingIPTunnel object with default values.
- *
- * Returns: (transfer full): the new empty #NMSettingIPTunnel object
- *
- * Since: 1.2
- **/
-NMSetting *
-nm_setting_ip_tunnel_new (void)
-{
-	return (NMSetting *) g_object_new (NM_TYPE_SETTING_IP_TUNNEL, NULL);
-}
-
-static void
-nm_setting_ip_tunnel_init (NMSettingIPTunnel *setting)
-{
-}
+/*****************************************************************************/
 
 static void
-set_property (GObject *object, guint prop_id,
-              const GValue *value, GParamSpec *pspec)
+get_property (GObject *object, guint prop_id,
+              GValue *value, GParamSpec *pspec)
 {
 	NMSettingIPTunnel *setting = NM_SETTING_IP_TUNNEL (object);
 	NMSettingIPTunnelPrivate *priv = NM_SETTING_IP_TUNNEL_GET_PRIVATE (setting);
 
 	switch (prop_id) {
 	case PROP_PARENT:
-		g_free (priv->parent);
-		priv->parent = g_value_dup_string (value);
+		g_value_set_string (value, priv->parent);
 		break;
 	case PROP_MODE:
-		priv->mode = g_value_get_uint (value);
+		g_value_set_uint (value, priv->mode);
 		break;
 	case PROP_LOCAL:
-		g_free (priv->local);
-		priv->local = g_value_dup_string (value);
+		g_value_set_string (value, priv->local);
 		break;
 	case PROP_REMOTE:
-		g_free (priv->remote);
-		priv->remote = g_value_dup_string (value);
+		g_value_set_string (value, priv->remote);
 		break;
 	case PROP_TTL:
-		priv->ttl = g_value_get_uint (value);
+		g_value_set_uint (value, priv->ttl);
 		break;
 	case PROP_TOS:
-		priv->tos = g_value_get_uint (value);
+		g_value_set_uint (value, priv->tos);
 		break;
 	case PROP_PATH_MTU_DISCOVERY:
-		priv->path_mtu_discovery = g_value_get_boolean (value);
+		g_value_set_boolean (value, priv->path_mtu_discovery);
 		break;
 	case PROP_INPUT_KEY:
-		g_free (priv->input_key);
-		priv->input_key = g_value_dup_string (value);
+		g_value_set_string (value, priv->input_key);
 		break;
 	case PROP_OUTPUT_KEY:
-		g_free (priv->output_key);
-		priv->output_key = g_value_dup_string (value);
+		g_value_set_string (value, priv->output_key);
 		break;
 	case PROP_ENCAPSULATION_LIMIT:
-		priv->encapsulation_limit = g_value_get_uint (value);
+		g_value_set_uint (value, priv->encapsulation_limit);
 		break;
 	case PROP_FLOW_LABEL:
-		priv->flow_label = g_value_get_uint (value);
+		g_value_set_uint (value, priv->flow_label);
 		break;
 	case PROP_MTU:
-		priv->mtu = g_value_get_uint (value);
+		g_value_set_uint (value, priv->mtu);
 		break;
 	case PROP_FLAGS:
-		priv->flags = g_value_get_uint (value);
+		g_value_set_uint (value, priv->flags);
 		break;
 	default:
 		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
@@ -553,51 +531,56 @@ set_property (GObject *object, guint prop_id,
 }
 
 static void
-get_property (GObject *object, guint prop_id,
-              GValue *value, GParamSpec *pspec)
+set_property (GObject *object, guint prop_id,
+              const GValue *value, GParamSpec *pspec)
 {
 	NMSettingIPTunnel *setting = NM_SETTING_IP_TUNNEL (object);
 	NMSettingIPTunnelPrivate *priv = NM_SETTING_IP_TUNNEL_GET_PRIVATE (setting);
 
 	switch (prop_id) {
 	case PROP_PARENT:
-		g_value_set_string (value, priv->parent);
+		g_free (priv->parent);
+		priv->parent = g_value_dup_string (value);
 		break;
 	case PROP_MODE:
-		g_value_set_uint (value, priv->mode);
+		priv->mode = g_value_get_uint (value);
 		break;
 	case PROP_LOCAL:
-		g_value_set_string (value, priv->local);
+		g_free (priv->local);
+		priv->local = g_value_dup_string (value);
 		break;
 	case PROP_REMOTE:
-		g_value_set_string (value, priv->remote);
+		g_free (priv->remote);
+		priv->remote = g_value_dup_string (value);
 		break;
 	case PROP_TTL:
-		g_value_set_uint (value, priv->ttl);
+		priv->ttl = g_value_get_uint (value);
 		break;
 	case PROP_TOS:
-		g_value_set_uint (value, priv->tos);
+		priv->tos = g_value_get_uint (value);
 		break;
 	case PROP_PATH_MTU_DISCOVERY:
-		g_value_set_boolean (value, priv->path_mtu_discovery);
+		priv->path_mtu_discovery = g_value_get_boolean (value);
 		break;
 	case PROP_INPUT_KEY:
-		g_value_set_string (value, priv->input_key);
+		g_free (priv->input_key);
+		priv->input_key = g_value_dup_string (value);
 		break;
 	case PROP_OUTPUT_KEY:
-		g_value_set_string (value, priv->output_key);
+		g_free (priv->output_key);
+		priv->output_key = g_value_dup_string (value);
 		break;
 	case PROP_ENCAPSULATION_LIMIT:
-		g_value_set_uint (value, priv->encapsulation_limit);
+		priv->encapsulation_limit = g_value_get_uint (value);
 		break;
 	case PROP_FLOW_LABEL:
-		g_value_set_uint (value, priv->flow_label);
+		priv->flow_label = g_value_get_uint (value);
 		break;
 	case PROP_MTU:
-		g_value_set_uint (value, priv->mtu);
+		priv->mtu = g_value_get_uint (value);
 		break;
 	case PROP_FLAGS:
-		g_value_set_uint (value, priv->flags);
+		priv->flags = g_value_get_uint (value);
 		break;
 	default:
 		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
@@ -605,6 +588,28 @@ get_property (GObject *object, guint prop_id,
 	}
 }
 
+/*****************************************************************************/
+
+static void
+nm_setting_ip_tunnel_init (NMSettingIPTunnel *setting)
+{
+}
+
+/**
+ * nm_setting_ip_tunnel_new:
+ *
+ * Creates a new #NMSettingIPTunnel object with default values.
+ *
+ * Returns: (transfer full): the new empty #NMSettingIPTunnel object
+ *
+ * Since: 1.2
+ **/
+NMSetting *
+nm_setting_ip_tunnel_new (void)
+{
+	return (NMSetting *) g_object_new (NM_TYPE_SETTING_IP_TUNNEL, NULL);
+}
+
 static void
 finalize (GObject *object)
 {
@@ -628,8 +633,8 @@ nm_setting_ip_tunnel_class_init (NMSettingIPTunnelClass *klass)
 
 	g_type_class_add_private (klass, sizeof (NMSettingIPTunnelPrivate));
 
-	object_class->set_property = set_property;
 	object_class->get_property = get_property;
+	object_class->set_property = set_property;
 	object_class->finalize     = finalize;
 
 	setting_class->verify = verify;
@@ -643,13 +648,12 @@ nm_setting_ip_tunnel_class_init (NMSettingIPTunnelClass *klass)
 	 *
 	 * Since: 1.2
 	 **/
-	g_object_class_install_property
-		(object_class, PROP_PARENT,
-		 g_param_spec_string (NM_SETTING_IP_TUNNEL_PARENT, "", "",
-		                      NULL,
-		                      G_PARAM_READWRITE |
-		                      NM_SETTING_PARAM_INFERRABLE |
-		                      G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_PARENT] =
+	    g_param_spec_string (NM_SETTING_IP_TUNNEL_PARENT, "", "",
+	                         NULL,
+	                         G_PARAM_READWRITE |
+	                         NM_SETTING_PARAM_INFERRABLE |
+	                         G_PARAM_STATIC_STRINGS);
 
 	/**
 	 * NMSettingIPTunnel:mode:
@@ -659,13 +663,12 @@ nm_setting_ip_tunnel_class_init (NMSettingIPTunnelClass *klass)
 	 *
 	 * Since: 1.2
 	 **/
-	g_object_class_install_property
-		(object_class, PROP_MODE,
-		 g_param_spec_uint (NM_SETTING_IP_TUNNEL_MODE, "", "",
-		                    0, G_MAXUINT, 0,
-		                    G_PARAM_READWRITE |
-		                    NM_SETTING_PARAM_INFERRABLE |
-		                    G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_MODE] =
+	    g_param_spec_uint (NM_SETTING_IP_TUNNEL_MODE, "", "",
+	                       0, G_MAXUINT, 0,
+	                       G_PARAM_READWRITE |
+	                       NM_SETTING_PARAM_INFERRABLE |
+	                       G_PARAM_STATIC_STRINGS);
 
 	/**
 	 * NMSettingIPTunnel:local:
@@ -675,13 +678,12 @@ nm_setting_ip_tunnel_class_init (NMSettingIPTunnelClass *klass)
 	 *
 	 * Since: 1.2
 	 **/
-	g_object_class_install_property
-		(object_class, PROP_LOCAL,
-		 g_param_spec_string (NM_SETTING_IP_TUNNEL_LOCAL, "", "",
-		                      NULL,
-		                      G_PARAM_READWRITE |
-		                      NM_SETTING_PARAM_INFERRABLE |
-		                      G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_LOCAL] =
+	    g_param_spec_string (NM_SETTING_IP_TUNNEL_LOCAL, "", "",
+	                         NULL,
+	                         G_PARAM_READWRITE |
+	                         NM_SETTING_PARAM_INFERRABLE |
+	                         G_PARAM_STATIC_STRINGS);
 
 	/**
 	 * NMSettingIPTunnel:remote:
@@ -691,13 +693,12 @@ nm_setting_ip_tunnel_class_init (NMSettingIPTunnelClass *klass)
 	 *
 	 * Since: 1.2
 	 **/
-	g_object_class_install_property
-		(object_class, PROP_REMOTE,
-		 g_param_spec_string (NM_SETTING_IP_TUNNEL_REMOTE, "", "",
-		                      NULL,
-		                      G_PARAM_READWRITE |
-		                      NM_SETTING_PARAM_INFERRABLE |
-		                      G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_REMOTE] =
+	    g_param_spec_string (NM_SETTING_IP_TUNNEL_REMOTE, "", "",
+	                         NULL,
+	                         G_PARAM_READWRITE |
+	                         NM_SETTING_PARAM_INFERRABLE |
+	                         G_PARAM_STATIC_STRINGS);
 
 	/**
 	 * NMSettingIPTunnel:ttl
@@ -707,14 +708,13 @@ nm_setting_ip_tunnel_class_init (NMSettingIPTunnelClass *klass)
 	 *
 	 * Since: 1.2
 	 **/
-	g_object_class_install_property
-		(object_class, PROP_TTL,
-		 g_param_spec_uint (NM_SETTING_IP_TUNNEL_TTL, "", "",
-		                    0, 255, 0,
-		                    G_PARAM_READWRITE |
-		                    G_PARAM_CONSTRUCT |
-		                    NM_SETTING_PARAM_INFERRABLE |
-		                    G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_TTL] =
+	    g_param_spec_uint (NM_SETTING_IP_TUNNEL_TTL, "", "",
+	                       0, 255, 0,
+	                       G_PARAM_READWRITE |
+	                       G_PARAM_CONSTRUCT |
+	                       NM_SETTING_PARAM_INFERRABLE |
+	                       G_PARAM_STATIC_STRINGS);
 
 	/**
 	 * NMSettingIPTunnel:tos
@@ -724,14 +724,13 @@ nm_setting_ip_tunnel_class_init (NMSettingIPTunnelClass *klass)
 	 *
 	 * Since: 1.2
 	 **/
-	g_object_class_install_property
-		(object_class, PROP_TOS,
-		 g_param_spec_uint (NM_SETTING_IP_TUNNEL_TOS, "", "",
-		                    0, 255, 0,
-		                    G_PARAM_READWRITE |
-		                    G_PARAM_CONSTRUCT |
-		                    NM_SETTING_PARAM_INFERRABLE |
-		                    G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_TOS] =
+	    g_param_spec_uint (NM_SETTING_IP_TUNNEL_TOS, "", "",
+	                       0, 255, 0,
+	                       G_PARAM_READWRITE |
+	                       G_PARAM_CONSTRUCT |
+	                       NM_SETTING_PARAM_INFERRABLE |
+	                       G_PARAM_STATIC_STRINGS);
 
 	/**
 	 * NMSettingIPTunnel:path-mtu-discovery
@@ -740,14 +739,13 @@ nm_setting_ip_tunnel_class_init (NMSettingIPTunnelClass *klass)
 	 *
 	 * Since: 1.2
 	 **/
-	g_object_class_install_property
-		(object_class, PROP_PATH_MTU_DISCOVERY,
-		 g_param_spec_boolean (NM_SETTING_IP_TUNNEL_PATH_MTU_DISCOVERY, "", "",
-		                       TRUE,
-		                       G_PARAM_READWRITE |
-		                       G_PARAM_CONSTRUCT |
-		                       NM_SETTING_PARAM_INFERRABLE |
-		                       G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_PATH_MTU_DISCOVERY] =
+	    g_param_spec_boolean (NM_SETTING_IP_TUNNEL_PATH_MTU_DISCOVERY, "", "",
+	                          TRUE,
+	                          G_PARAM_READWRITE |
+	                          G_PARAM_CONSTRUCT |
+	                          NM_SETTING_PARAM_INFERRABLE |
+	                          G_PARAM_STATIC_STRINGS);
 
 	/**
 	 * NMSettingIPTunnel:input-key:
@@ -757,13 +755,12 @@ nm_setting_ip_tunnel_class_init (NMSettingIPTunnelClass *klass)
 	 *
 	 * Since: 1.2
 	 **/
-	g_object_class_install_property
-		(object_class, PROP_INPUT_KEY,
-		 g_param_spec_string (NM_SETTING_IP_TUNNEL_INPUT_KEY, "", "",
-		                      NULL,
-		                      G_PARAM_READWRITE |
-		                      NM_SETTING_PARAM_INFERRABLE |
-		                      G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_INPUT_KEY] =
+	    g_param_spec_string (NM_SETTING_IP_TUNNEL_INPUT_KEY, "", "",
+	                         NULL,
+	                         G_PARAM_READWRITE |
+	                         NM_SETTING_PARAM_INFERRABLE |
+	                         G_PARAM_STATIC_STRINGS);
 
 	/**
 	 * NMSettingIPTunnel:output-key:
@@ -773,13 +770,12 @@ nm_setting_ip_tunnel_class_init (NMSettingIPTunnelClass *klass)
 	 *
 	 * Since: 1.2
 	 **/
-	g_object_class_install_property
-		(object_class, PROP_OUTPUT_KEY,
-		 g_param_spec_string (NM_SETTING_IP_TUNNEL_OUTPUT_KEY, "", "",
-		                      NULL,
-		                      G_PARAM_READWRITE |
-		                      NM_SETTING_PARAM_INFERRABLE |
-		                      G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_OUTPUT_KEY] =
+	    g_param_spec_string (NM_SETTING_IP_TUNNEL_OUTPUT_KEY, "", "",
+	                         NULL,
+	                         G_PARAM_READWRITE |
+	                         NM_SETTING_PARAM_INFERRABLE |
+	                         G_PARAM_STATIC_STRINGS);
 
 	/**
 	 * NMSettingIPTunnel:encapsulation-limit:
@@ -789,14 +785,13 @@ nm_setting_ip_tunnel_class_init (NMSettingIPTunnelClass *klass)
 	 *
 	 * Since: 1.2
 	 **/
-	g_object_class_install_property
-		(object_class, PROP_ENCAPSULATION_LIMIT,
-		 g_param_spec_uint (NM_SETTING_IP_TUNNEL_ENCAPSULATION_LIMIT, "", "",
-		                    0, 255, 0,
-		                    G_PARAM_READWRITE |
-		                    G_PARAM_CONSTRUCT |
-		                    NM_SETTING_PARAM_INFERRABLE |
-		                    G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_ENCAPSULATION_LIMIT] =
+	    g_param_spec_uint (NM_SETTING_IP_TUNNEL_ENCAPSULATION_LIMIT, "", "",
+	                       0, 255, 0,
+	                       G_PARAM_READWRITE |
+	                       G_PARAM_CONSTRUCT |
+	                       NM_SETTING_PARAM_INFERRABLE |
+	                       G_PARAM_STATIC_STRINGS);
 
 	/**
 	 * NMSettingIPTunnel:flow-label:
@@ -806,14 +801,13 @@ nm_setting_ip_tunnel_class_init (NMSettingIPTunnelClass *klass)
 	 *
 	 * Since: 1.2
 	 **/
-	g_object_class_install_property
-		(object_class, PROP_FLOW_LABEL,
-		 g_param_spec_uint (NM_SETTING_IP_TUNNEL_FLOW_LABEL, "", "",
-		                    0, (1 << 20) - 1, 0,
-		                    G_PARAM_READWRITE |
-		                    G_PARAM_CONSTRUCT |
-		                    NM_SETTING_PARAM_INFERRABLE |
-		                    G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_FLOW_LABEL] =
+	    g_param_spec_uint (NM_SETTING_IP_TUNNEL_FLOW_LABEL, "", "",
+	                       0, (1 << 20) - 1, 0,
+	                       G_PARAM_READWRITE |
+	                       G_PARAM_CONSTRUCT |
+	                       NM_SETTING_PARAM_INFERRABLE |
+	                       G_PARAM_STATIC_STRINGS);
 
 	/**
 	 * NMSettingIPTunnel:mtu:
@@ -823,14 +817,13 @@ nm_setting_ip_tunnel_class_init (NMSettingIPTunnelClass *klass)
 	 *
 	 * Since: 1.2
 	 **/
-	g_object_class_install_property
-		(object_class, PROP_MTU,
-		 g_param_spec_uint (NM_SETTING_IP_TUNNEL_MTU, "", "",
-		                    0, G_MAXUINT, 0,
-		                    G_PARAM_READWRITE |
-		                    G_PARAM_CONSTRUCT |
-		                    NM_SETTING_PARAM_FUZZY_IGNORE |
-		                    G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_MTU] =
+	    g_param_spec_uint (NM_SETTING_IP_TUNNEL_MTU, "", "",
+	                       0, G_MAXUINT, 0,
+	                       G_PARAM_READWRITE |
+	                       G_PARAM_CONSTRUCT |
+	                       NM_SETTING_PARAM_FUZZY_IGNORE |
+	                       G_PARAM_STATIC_STRINGS);
 
 	/**
 	 * NMSettingIPTunnel:flags:
@@ -843,13 +836,14 @@ nm_setting_ip_tunnel_class_init (NMSettingIPTunnelClass *klass)
 	 *
 	 * Since: 1.12
 	 **/
-	g_object_class_install_property
-		(object_class, PROP_FLAGS,
-		 g_param_spec_uint (NM_SETTING_IP_TUNNEL_FLAGS, "", "",
-		                    0, G_MAXUINT32, 0,
-		                    G_PARAM_READWRITE |
-		                    NM_SETTING_PARAM_FUZZY_IGNORE |
-		                    G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_FLAGS] =
+	    g_param_spec_uint (NM_SETTING_IP_TUNNEL_FLAGS, "", "",
+	                       0, G_MAXUINT32, 0,
+	                       G_PARAM_READWRITE |
+	                       NM_SETTING_PARAM_FUZZY_IGNORE |
+	                       G_PARAM_STATIC_STRINGS);
+
+	g_object_class_install_properties (object_class, _PROPERTY_ENUMS_LAST, obj_properties);
 
 	_nm_setting_class_commit (setting_class, NM_META_SETTING_TYPE_IP_TUNNEL);
 }
diff --git a/libnm-core/nm-setting-ip4-config.c b/libnm-core/nm-setting-ip4-config.c
index 36765484..dd3b79b7 100644
--- a/libnm-core/nm-setting-ip4-config.c
+++ b/libnm-core/nm-setting-ip4-config.c
@@ -21,9 +21,8 @@
 
 #include "nm-default.h"
 
-#include 
-
 #include "nm-setting-ip4-config.h"
+
 #include "nm-setting-private.h"
 
 /**
@@ -50,35 +49,23 @@
  * connection.
  **/
 
-G_DEFINE_TYPE (NMSettingIP4Config, nm_setting_ip4_config, NM_TYPE_SETTING_IP_CONFIG)
+/*****************************************************************************/
 
-#define NM_SETTING_IP4_CONFIG_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_SETTING_IP4_CONFIG, NMSettingIP4ConfigPrivate))
+NM_GOBJECT_PROPERTIES_DEFINE_BASE (
+	PROP_DHCP_CLIENT_ID,
+	PROP_DHCP_FQDN,
+);
 
 typedef struct {
 	char *dhcp_client_id;
 	char *dhcp_fqdn;
 } NMSettingIP4ConfigPrivate;
 
-enum {
-	PROP_0,
-	PROP_DHCP_CLIENT_ID,
-	PROP_DHCP_FQDN,
+G_DEFINE_TYPE (NMSettingIP4Config, nm_setting_ip4_config, NM_TYPE_SETTING_IP_CONFIG)
 
-	LAST_PROP
-};
+#define NM_SETTING_IP4_CONFIG_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_SETTING_IP4_CONFIG, NMSettingIP4ConfigPrivate))
 
-/**
- * nm_setting_ip4_config_new:
- *
- * Creates a new #NMSettingIP4Config object with default values.
- *
- * Returns: (transfer full): the new empty #NMSettingIP4Config object
- **/
-NMSetting *
-nm_setting_ip4_config_new (void)
-{
-	return (NMSetting *) g_object_new (NM_TYPE_SETTING_IP4_CONFIG, NULL);
-}
+/*****************************************************************************/
 
 /**
  * nm_setting_ip4_config_get_dhcp_client_id:
@@ -252,62 +239,6 @@ verify (NMSetting *setting, NMConnection *connection, GError **error)
 	return TRUE;
 }
 
-static void
-nm_setting_ip4_config_init (NMSettingIP4Config *setting)
-{
-}
-
-static void
-finalize (GObject *object)
-{
-	NMSettingIP4ConfigPrivate *priv = NM_SETTING_IP4_CONFIG_GET_PRIVATE (object);
-
-	g_free (priv->dhcp_client_id);
-	g_free (priv->dhcp_fqdn);
-
-	G_OBJECT_CLASS (nm_setting_ip4_config_parent_class)->finalize (object);
-}
-
-static void
-set_property (GObject *object, guint prop_id,
-              const GValue *value, GParamSpec *pspec)
-{
-	NMSettingIP4ConfigPrivate *priv = NM_SETTING_IP4_CONFIG_GET_PRIVATE (object);
-
-	switch (prop_id) {
-	case PROP_DHCP_CLIENT_ID:
-		g_free (priv->dhcp_client_id);
-		priv->dhcp_client_id = g_value_dup_string (value);
-		break;
-	case PROP_DHCP_FQDN:
-		g_free (priv->dhcp_fqdn);
-		priv->dhcp_fqdn = g_value_dup_string (value);
-		break;
-	default:
-		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-		break;
-	}
-}
-
-static void
-get_property (GObject *object, guint prop_id,
-              GValue *value, GParamSpec *pspec)
-{
-	NMSettingIP4Config *s_ip4 = NM_SETTING_IP4_CONFIG (object);
-
-	switch (prop_id) {
-	case PROP_DHCP_CLIENT_ID:
-		g_value_set_string (value, nm_setting_ip4_config_get_dhcp_client_id (s_ip4));
-		break;
-	case PROP_DHCP_FQDN:
-		g_value_set_string (value, nm_setting_ip4_config_get_dhcp_fqdn (s_ip4));
-		break;
-	default:
-		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-		break;
-	}
-}
-
 static GVariant *
 ip4_dns_to_dbus (const GValue *prop_value)
 {
@@ -376,9 +307,11 @@ ip4_addresses_set (NMSetting  *setting,
 }
 
 static GVariant *
-ip4_address_labels_get (NMSetting    *setting,
+ip4_address_labels_get (const NMSettInfoSetting *sett_info,
+                        guint property_idx,
                         NMConnection *connection,
-                        const char   *property)
+                        NMSetting *setting,
+                        NMConnectionSerializationFlags flags)
 {
 	NMSettingIPConfig *s_ip = NM_SETTING_IP_CONFIG (setting);
 	gboolean have_labels = FALSE;
@@ -386,6 +319,9 @@ ip4_address_labels_get (NMSetting    *setting,
 	GVariant *ret;
 	int num_addrs, i;
 
+	if (flags & NM_CONNECTION_SERIALIZE_ONLY_SECRETS)
+		return NULL;
+
 	num_addrs = nm_setting_ip_config_get_num_addresses (s_ip);
 	for (i = 0; i < num_addrs; i++) {
 		NMIPAddress *addr = nm_setting_ip_config_get_address (s_ip, i);
@@ -414,18 +350,19 @@ ip4_address_labels_get (NMSetting    *setting,
 }
 
 static GVariant *
-ip4_address_data_get (NMSetting    *setting,
+ip4_address_data_get (const NMSettInfoSetting *sett_info,
+                      guint property_idx,
                       NMConnection *connection,
-                      const char   *property)
+                      NMSetting *setting,
+                      NMConnectionSerializationFlags flags)
 {
-	GPtrArray *addrs;
-	GVariant *ret;
+	gs_unref_ptrarray GPtrArray *addrs = NULL;
 
-	g_object_get (setting, NM_SETTING_IP_CONFIG_ADDRESSES, &addrs, NULL);
-	ret = nm_utils_ip_addresses_to_variant (addrs);
-	g_ptr_array_unref (addrs);
+	if (flags & NM_CONNECTION_SERIALIZE_ONLY_SECRETS)
+		return NULL;
 
-	return ret;
+	g_object_get (setting, NM_SETTING_IP_CONFIG_ADDRESSES, &addrs, NULL);
+	return nm_utils_ip_addresses_to_variant (addrs);
 }
 
 static gboolean
@@ -486,18 +423,19 @@ ip4_routes_set (NMSetting  *setting,
 }
 
 static GVariant *
-ip4_route_data_get (NMSetting    *setting,
+ip4_route_data_get (const NMSettInfoSetting *sett_info,
+                    guint property_idx,
                     NMConnection *connection,
-                    const char   *property)
+                    NMSetting *setting,
+                    NMConnectionSerializationFlags flags)
 {
-	GPtrArray *routes;
-	GVariant *ret;
+	gs_unref_ptrarray GPtrArray *routes = NULL;
 
-	g_object_get (setting, NM_SETTING_IP_CONFIG_ROUTES, &routes, NULL);
-	ret = nm_utils_ip_routes_to_variant (routes);
-	g_ptr_array_unref (routes);
+	if (flags & NM_CONNECTION_SERIALIZE_ONLY_SECRETS)
+		return NULL;
 
-	return ret;
+	g_object_get (setting, NM_SETTING_IP_CONFIG_ROUTES, &routes, NULL);
+	return nm_utils_ip_routes_to_variant (routes);
 }
 
 static gboolean
@@ -522,6 +460,79 @@ ip4_route_data_set (NMSetting  *setting,
 	return TRUE;
 }
 
+/*****************************************************************************/
+
+static void
+get_property (GObject *object, guint prop_id,
+              GValue *value, GParamSpec *pspec)
+{
+	NMSettingIP4Config *s_ip4 = NM_SETTING_IP4_CONFIG (object);
+
+	switch (prop_id) {
+	case PROP_DHCP_CLIENT_ID:
+		g_value_set_string (value, nm_setting_ip4_config_get_dhcp_client_id (s_ip4));
+		break;
+	case PROP_DHCP_FQDN:
+		g_value_set_string (value, nm_setting_ip4_config_get_dhcp_fqdn (s_ip4));
+		break;
+	default:
+		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+		break;
+	}
+}
+
+static void
+set_property (GObject *object, guint prop_id,
+              const GValue *value, GParamSpec *pspec)
+{
+	NMSettingIP4ConfigPrivate *priv = NM_SETTING_IP4_CONFIG_GET_PRIVATE (object);
+
+	switch (prop_id) {
+	case PROP_DHCP_CLIENT_ID:
+		g_free (priv->dhcp_client_id);
+		priv->dhcp_client_id = g_value_dup_string (value);
+		break;
+	case PROP_DHCP_FQDN:
+		g_free (priv->dhcp_fqdn);
+		priv->dhcp_fqdn = g_value_dup_string (value);
+		break;
+	default:
+		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+		break;
+	}
+}
+
+/*****************************************************************************/
+
+static void
+nm_setting_ip4_config_init (NMSettingIP4Config *setting)
+{
+}
+
+/**
+ * nm_setting_ip4_config_new:
+ *
+ * Creates a new #NMSettingIP4Config object with default values.
+ *
+ * Returns: (transfer full): the new empty #NMSettingIP4Config object
+ **/
+NMSetting *
+nm_setting_ip4_config_new (void)
+{
+	return (NMSetting *) g_object_new (NM_TYPE_SETTING_IP4_CONFIG, NULL);
+}
+
+static void
+finalize (GObject *object)
+{
+	NMSettingIP4ConfigPrivate *priv = NM_SETTING_IP4_CONFIG_GET_PRIVATE (object);
+
+	g_free (priv->dhcp_client_id);
+	g_free (priv->dhcp_fqdn);
+
+	G_OBJECT_CLASS (nm_setting_ip4_config_parent_class)->finalize (object);
+}
+
 static void
 nm_setting_ip4_config_class_init (NMSettingIP4ConfigClass *klass)
 {
@@ -531,8 +542,8 @@ nm_setting_ip4_config_class_init (NMSettingIP4ConfigClass *klass)
 
 	g_type_class_add_private (setting_class, sizeof (NMSettingIP4ConfigPrivate));
 
-	object_class->set_property = set_property;
 	object_class->get_property = get_property;
+	object_class->set_property = set_property;
 	object_class->finalize     = finalize;
 
 	setting_class->verify = verify;
@@ -740,12 +751,11 @@ nm_setting_ip4_config_class_init (NMSettingIP4ConfigClass *klass)
 	 * example: DHCP_CLIENT_ID=ax-srv-1; DHCP_CLIENT_ID=01:44:44:44:44:44:44
 	 * ---end---
 	 */
-	g_object_class_install_property
-		(object_class, PROP_DHCP_CLIENT_ID,
-		 g_param_spec_string (NM_SETTING_IP4_CONFIG_DHCP_CLIENT_ID, "", "",
-		                      NULL,
-		                      G_PARAM_READWRITE |
-		                      G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_DHCP_CLIENT_ID] =
+	    g_param_spec_string (NM_SETTING_IP4_CONFIG_DHCP_CLIENT_ID, "", "",
+	                         NULL,
+	                         G_PARAM_READWRITE |
+	                         G_PARAM_STATIC_STRINGS);
 
 	/* ---ifcfg-rh---
 	 * property: dad-timeout
@@ -784,12 +794,11 @@ nm_setting_ip4_config_class_init (NMSettingIP4ConfigClass *klass)
 	 * example: DHCP_FQDN=foo.bar.com
 	 * ---end---
 	 */
-	g_object_class_install_property
-		(object_class, PROP_DHCP_FQDN,
-		 g_param_spec_string (NM_SETTING_IP4_CONFIG_DHCP_FQDN, "", "",
-		                      NULL,
-		                      G_PARAM_READWRITE |
-		                      G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_DHCP_FQDN] =
+	    g_param_spec_string (NM_SETTING_IP4_CONFIG_DHCP_FQDN, "", "",
+	                         NULL,
+	                         G_PARAM_READWRITE |
+	                         G_PARAM_STATIC_STRINGS);
 
 	/* IP4-specific property overrides */
 
@@ -895,6 +904,8 @@ nm_setting_ip4_config_class_init (NMSettingIP4ConfigClass *klass)
 	                                    ip4_route_data_get,
 	                                    ip4_route_data_set);
 
+	g_object_class_install_properties (object_class, _PROPERTY_ENUMS_LAST, obj_properties);
+
 	_nm_setting_class_commit_full (setting_class, NM_META_SETTING_TYPE_IP4_CONFIG,
 	                               NULL, properties_override);
 }
diff --git a/libnm-core/nm-setting-ip6-config.c b/libnm-core/nm-setting-ip6-config.c
index fa65be91..d6c085ac 100644
--- a/libnm-core/nm-setting-ip6-config.c
+++ b/libnm-core/nm-setting-ip6-config.c
@@ -23,7 +23,6 @@
 
 #include "nm-setting-ip6-config.h"
 
-#include 
 #include 
 
 #include "nm-setting-private.h"
@@ -52,9 +51,14 @@
  * supported.
  **/
 
-G_DEFINE_TYPE (NMSettingIP6Config, nm_setting_ip6_config, NM_TYPE_SETTING_IP_CONFIG)
+/*****************************************************************************/
 
-#define NM_SETTING_IP6_CONFIG_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_SETTING_IP6_CONFIG, NMSettingIP6ConfigPrivate))
+NM_GOBJECT_PROPERTIES_DEFINE_BASE (
+	PROP_IP6_PRIVACY,
+	PROP_ADDR_GEN_MODE,
+	PROP_TOKEN,
+	PROP_DHCP_DUID,
+);
 
 typedef struct {
 	NMSettingIP6ConfigPrivacy ip6_privacy;
@@ -63,28 +67,11 @@ typedef struct {
 	char *dhcp_duid;
 } NMSettingIP6ConfigPrivate;
 
-enum {
-	PROP_0,
-	PROP_IP6_PRIVACY,
-	PROP_ADDR_GEN_MODE,
-	PROP_TOKEN,
-	PROP_DHCP_DUID,
+G_DEFINE_TYPE (NMSettingIP6Config, nm_setting_ip6_config, NM_TYPE_SETTING_IP_CONFIG)
 
-	LAST_PROP
-};
+#define NM_SETTING_IP6_CONFIG_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_SETTING_IP6_CONFIG, NMSettingIP6ConfigPrivate))
 
-/**
- * nm_setting_ip6_config_new:
- *
- * Creates a new #NMSettingIP6Config object with default values.
- *
- * Returns: (transfer full): the new empty #NMSettingIP6Config object
- **/
-NMSetting *
-nm_setting_ip6_config_new (void)
-{
-	return (NMSetting *) g_object_new (NM_TYPE_SETTING_IP6_CONFIG, NULL);
-}
+/*****************************************************************************/
 
 /**
  * nm_setting_ip6_config_get_ip6_privacy:
@@ -312,11 +299,6 @@ verify (NMSetting *setting, NMConnection *connection, GError **error)
 	return TRUE;
 }
 
-static void
-nm_setting_ip6_config_init (NMSettingIP6Config *setting)
-{
-}
-
 static GVariant *
 ip6_dns_to_dbus (const GValue *prop_value)
 {
@@ -374,18 +356,19 @@ ip6_addresses_set (NMSetting  *setting,
 }
 
 static GVariant *
-ip6_address_data_get (NMSetting    *setting,
+ip6_address_data_get (const NMSettInfoSetting *sett_info,
+                      guint property_idx,
                       NMConnection *connection,
-                      const char   *property)
+                      NMSetting *setting,
+                      NMConnectionSerializationFlags flags)
 {
-	GPtrArray *addrs;
-	GVariant *ret;
+	gs_unref_ptrarray GPtrArray *addrs = NULL;
 
-	g_object_get (setting, NM_SETTING_IP_CONFIG_ADDRESSES, &addrs, NULL);
-	ret = nm_utils_ip_addresses_to_variant (addrs);
-	g_ptr_array_unref (addrs);
+	if (flags & NM_CONNECTION_SERIALIZE_ONLY_SECRETS)
+		return NULL;
 
-	return ret;
+	g_object_get (setting, NM_SETTING_IP_CONFIG_ADDRESSES, &addrs, NULL);
+	return nm_utils_ip_addresses_to_variant (addrs);
 }
 
 static gboolean
@@ -446,18 +429,19 @@ ip6_routes_set (NMSetting  *setting,
 }
 
 static GVariant *
-ip6_route_data_get (NMSetting    *setting,
+ip6_route_data_get (const NMSettInfoSetting *sett_info,
+                    guint property_idx,
                     NMConnection *connection,
-                    const char   *property)
+                    NMSetting *setting,
+                    NMConnectionSerializationFlags flags)
 {
-	GPtrArray *routes;
-	GVariant *ret;
+	gs_unref_ptrarray GPtrArray *routes = NULL;
 
-	g_object_get (setting, NM_SETTING_IP_CONFIG_ROUTES, &routes, NULL);
-	ret = nm_utils_ip_routes_to_variant (routes);
-	g_ptr_array_unref (routes);
+	if (flags & NM_CONNECTION_SERIALIZE_ONLY_SECRETS)
+		return NULL;
 
-	return ret;
+	g_object_get (setting, NM_SETTING_IP_CONFIG_ROUTES, &routes, NULL);
+	return nm_utils_ip_routes_to_variant (routes);
 }
 
 static gboolean
@@ -482,26 +466,26 @@ ip6_route_data_set (NMSetting  *setting,
 	return TRUE;
 }
 
+/*****************************************************************************/
+
 static void
-set_property (GObject *object, guint prop_id,
-              const GValue *value, GParamSpec *pspec)
+get_property (GObject *object, guint prop_id,
+              GValue *value, GParamSpec *pspec)
 {
 	NMSettingIP6ConfigPrivate *priv = NM_SETTING_IP6_CONFIG_GET_PRIVATE (object);
 
 	switch (prop_id) {
 	case PROP_IP6_PRIVACY:
-		priv->ip6_privacy = g_value_get_enum (value);
+		g_value_set_enum (value, priv->ip6_privacy);
 		break;
 	case PROP_ADDR_GEN_MODE:
-		priv->addr_gen_mode = g_value_get_int (value);
+		g_value_set_int (value, priv->addr_gen_mode);
 		break;
 	case PROP_TOKEN:
-		g_free (priv->token);
-		priv->token = g_value_dup_string (value);
+		g_value_set_string (value, priv->token);
 		break;
 	case PROP_DHCP_DUID:
-		g_free (priv->dhcp_duid);
-		priv->dhcp_duid = g_value_dup_string (value);
+		g_value_set_string (value, priv->dhcp_duid);
 		break;
 	default:
 		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
@@ -510,23 +494,25 @@ set_property (GObject *object, guint prop_id,
 }
 
 static void
-get_property (GObject *object, guint prop_id,
-              GValue *value, GParamSpec *pspec)
+set_property (GObject *object, guint prop_id,
+              const GValue *value, GParamSpec *pspec)
 {
 	NMSettingIP6ConfigPrivate *priv = NM_SETTING_IP6_CONFIG_GET_PRIVATE (object);
 
 	switch (prop_id) {
 	case PROP_IP6_PRIVACY:
-		g_value_set_enum (value, priv->ip6_privacy);
+		priv->ip6_privacy = g_value_get_enum (value);
 		break;
 	case PROP_ADDR_GEN_MODE:
-		g_value_set_int (value, priv->addr_gen_mode);
+		priv->addr_gen_mode = g_value_get_int (value);
 		break;
 	case PROP_TOKEN:
-		g_value_set_string (value, priv->token);
+		g_free (priv->token);
+		priv->token = g_value_dup_string (value);
 		break;
 	case PROP_DHCP_DUID:
-		g_value_set_string (value, priv->dhcp_duid);
+		g_free (priv->dhcp_duid);
+		priv->dhcp_duid = g_value_dup_string (value);
 		break;
 	default:
 		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
@@ -534,6 +520,26 @@ get_property (GObject *object, guint prop_id,
 	}
 }
 
+/*****************************************************************************/
+
+static void
+nm_setting_ip6_config_init (NMSettingIP6Config *setting)
+{
+}
+
+/**
+ * nm_setting_ip6_config_new:
+ *
+ * Creates a new #NMSettingIP6Config object with default values.
+ *
+ * Returns: (transfer full): the new empty #NMSettingIP6Config object
+ **/
+NMSetting *
+nm_setting_ip6_config_new (void)
+{
+	return (NMSetting *) g_object_new (NM_TYPE_SETTING_IP6_CONFIG, NULL);
+}
+
 static void
 finalize (GObject *object)
 {
@@ -555,8 +561,8 @@ nm_setting_ip6_config_class_init (NMSettingIP6ConfigClass *klass)
 
 	g_type_class_add_private (klass, sizeof (NMSettingIP6ConfigPrivate));
 
-	object_class->set_property = set_property;
 	object_class->get_property = get_property;
+	object_class->set_property = set_property;
 	object_class->finalize     = finalize;
 
 	setting_class->verify = verify;
@@ -747,14 +753,13 @@ nm_setting_ip6_config_class_init (NMSettingIP6ConfigClass *klass)
 	 * example: IPV6_PRIVACY=rfc3041 IPV6_PRIVACY_PREFER_PUBLIC_IP=yes
 	 * ---end---
 	 */
-	g_object_class_install_property
-		(object_class, PROP_IP6_PRIVACY,
-		 g_param_spec_enum (NM_SETTING_IP6_CONFIG_IP6_PRIVACY, "", "",
-		                    NM_TYPE_SETTING_IP6_CONFIG_PRIVACY,
-		                    NM_SETTING_IP6_CONFIG_PRIVACY_UNKNOWN,
-		                    G_PARAM_READWRITE |
-		                    G_PARAM_CONSTRUCT |
-		                    G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_IP6_PRIVACY] =
+	    g_param_spec_enum (NM_SETTING_IP6_CONFIG_IP6_PRIVACY, "", "",
+	                       NM_TYPE_SETTING_IP6_CONFIG_PRIVACY,
+	                       NM_SETTING_IP6_CONFIG_PRIVACY_UNKNOWN,
+	                       G_PARAM_READWRITE |
+	                       G_PARAM_CONSTRUCT |
+	                       G_PARAM_STATIC_STRINGS);
 
 	/**
 	 * NMSettingIP6Config:addr-gen-mode:
@@ -797,14 +802,13 @@ nm_setting_ip6_config_class_init (NMSettingIP6ConfigClass *klass)
 	 * example: IPV6_ADDR_GEN_MODE=stable-privacy
 	 * ---end---
 	 */
-	g_object_class_install_property
-		(object_class, PROP_ADDR_GEN_MODE,
-		 g_param_spec_int (NM_SETTING_IP6_CONFIG_ADDR_GEN_MODE, "", "",
-		                   G_MININT, G_MAXINT,
-		                   NM_SETTING_IP6_CONFIG_ADDR_GEN_MODE_STABLE_PRIVACY,
-		                   G_PARAM_READWRITE |
-		                   G_PARAM_CONSTRUCT |
-		                   G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_ADDR_GEN_MODE] =
+	    g_param_spec_int (NM_SETTING_IP6_CONFIG_ADDR_GEN_MODE, "", "",
+	                      G_MININT, G_MAXINT,
+	                      NM_SETTING_IP6_CONFIG_ADDR_GEN_MODE_STABLE_PRIVACY,
+	                      G_PARAM_READWRITE |
+	                      G_PARAM_CONSTRUCT |
+	                      G_PARAM_STATIC_STRINGS);
 
 	/**
 	 * NMSettingIP6Config:token:
@@ -821,13 +825,12 @@ nm_setting_ip6_config_class_init (NMSettingIP6ConfigClass *klass)
 	 * example: IPV6_TOKEN=::53
 	 * ---end---
 	 */
-	g_object_class_install_property
-		(object_class, PROP_TOKEN,
-		 g_param_spec_string (NM_SETTING_IP6_CONFIG_TOKEN, "", "",
-		                      NULL,
-		                      G_PARAM_READWRITE |
-		                      NM_SETTING_PARAM_INFERRABLE |
-		                      G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_TOKEN] =
+	    g_param_spec_string (NM_SETTING_IP6_CONFIG_TOKEN, "", "",
+	                         NULL,
+	                         G_PARAM_READWRITE |
+	                         NM_SETTING_PARAM_INFERRABLE |
+	                         G_PARAM_STATIC_STRINGS);
 
 	/**
 	 * NMSettingIP6Config:dhcp-duid:
@@ -874,12 +877,11 @@ nm_setting_ip6_config_class_init (NMSettingIP6ConfigClass *klass)
 	 * example: DHCPV6_DUID=LL; DHCPV6_DUID=0301deadbeef0001; DHCPV6_DUID=03:01:de:ad:be:ef:00:01
 	 * ---end---
 	 */
-	g_object_class_install_property
-		(object_class, PROP_DHCP_DUID,
-		 g_param_spec_string (NM_SETTING_IP6_CONFIG_DHCP_DUID, "", "",
-		                      NULL,
-		                      G_PARAM_READWRITE |
-		                      G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_DHCP_DUID] =
+	    g_param_spec_string (NM_SETTING_IP6_CONFIG_DHCP_DUID, "", "",
+	                         NULL,
+	                         G_PARAM_READWRITE |
+	                         G_PARAM_STATIC_STRINGS);
 
 	/* IP6-specific property overrides */
 
@@ -974,6 +976,8 @@ nm_setting_ip6_config_class_init (NMSettingIP6ConfigClass *klass)
 	                                    ip6_route_data_get,
 	                                    ip6_route_data_set);
 
+	g_object_class_install_properties (object_class, _PROPERTY_ENUMS_LAST, obj_properties);
+
 	_nm_setting_class_commit_full (setting_class, NM_META_SETTING_TYPE_IP6_CONFIG,
 	                               NULL, properties_override);
 }
diff --git a/libnm-core/nm-setting-macsec.c b/libnm-core/nm-setting-macsec.c
index 5c468221..040aa17d 100644
--- a/libnm-core/nm-setting-macsec.c
+++ b/libnm-core/nm-setting-macsec.c
@@ -23,7 +23,8 @@
 #include "nm-setting-macsec.h"
 
 #include 
-#include 
+
+#include "nm-utils/nm-secret-utils.h"
 
 #include "nm-utils.h"
 #include "nm-core-types-internal.h"
@@ -40,9 +41,19 @@
  * necessary for connection to MACsec (IEEE 802.1AE) interfaces.
  **/
 
-G_DEFINE_TYPE (NMSettingMacsec, nm_setting_macsec, NM_TYPE_SETTING)
+/*****************************************************************************/
 
-#define NM_SETTING_MACSEC_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_SETTING_MACSEC, NMSettingMacsecPrivate))
+NM_GOBJECT_PROPERTIES_DEFINE_BASE (
+	PROP_PARENT,
+	PROP_MODE,
+	PROP_ENCRYPT,
+	PROP_MKA_CAK,
+	PROP_MKA_CAK_FLAGS,
+	PROP_MKA_CKN,
+	PROP_PORT,
+	PROP_VALIDATION,
+	PROP_SEND_SCI,
+);
 
 typedef struct {
 	char *parent;
@@ -56,32 +67,11 @@ typedef struct {
 	NMSettingMacsecValidation validation;
 } NMSettingMacsecPrivate;
 
-NM_GOBJECT_PROPERTIES_DEFINE_BASE (
-	PROP_PARENT,
-	PROP_MODE,
-	PROP_ENCRYPT,
-	PROP_MKA_CAK,
-	PROP_MKA_CAK_FLAGS,
-	PROP_MKA_CKN,
-	PROP_PORT,
-	PROP_VALIDATION,
-	PROP_SEND_SCI,
-);
+G_DEFINE_TYPE (NMSettingMacsec, nm_setting_macsec, NM_TYPE_SETTING)
 
-/**
- * nm_setting_macsec_new:
- *
- * Creates a new #NMSettingMacsec object with default values.
- *
- * Returns: (transfer full): the new empty #NMSettingMacsec object
- *
- * Since: 1.6
- **/
-NMSetting *
-nm_setting_macsec_new (void)
-{
-	return (NMSetting *) g_object_new (NM_TYPE_SETTING_MACSEC, NULL);
-}
+#define NM_SETTING_MACSEC_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_SETTING_MACSEC, NMSettingMacsecPrivate))
+
+/*****************************************************************************/
 
 /**
  * nm_setting_macsec_get_parent:
@@ -393,48 +383,42 @@ verify (NMSetting *setting, NMConnection *connection, GError **error)
 	return TRUE;
 }
 
-static void
-nm_setting_macsec_init (NMSettingMacsec *setting)
-{
-}
+/*****************************************************************************/
 
 static void
-set_property (GObject *object, guint prop_id,
-              const GValue *value, GParamSpec *pspec)
+get_property (GObject *object, guint prop_id,
+              GValue *value, GParamSpec *pspec)
 {
 	NMSettingMacsec *setting = NM_SETTING_MACSEC (object);
 	NMSettingMacsecPrivate *priv = NM_SETTING_MACSEC_GET_PRIVATE (setting);
 
 	switch (prop_id) {
 	case PROP_PARENT:
-		g_free (priv->parent);
-		priv->parent = g_value_dup_string (value);
+		g_value_set_string (value, priv->parent);
 		break;
 	case PROP_MODE:
-		priv->mode = g_value_get_int (value);
+		g_value_set_int (value, priv->mode);
 		break;
 	case PROP_ENCRYPT:
-		priv->encrypt = g_value_get_boolean (value);
+		g_value_set_boolean (value, priv->encrypt);
 		break;
 	case PROP_MKA_CAK:
-		g_free (priv->mka_cak);
-		priv->mka_cak = g_value_dup_string (value);
+		g_value_set_string (value, priv->mka_cak);
 		break;
 	case PROP_MKA_CAK_FLAGS:
-		priv->mka_cak_flags = g_value_get_flags (value);
+		g_value_set_flags (value, priv->mka_cak_flags);
 		break;
 	case PROP_MKA_CKN:
-		g_free (priv->mka_ckn);
-		priv->mka_ckn = g_value_dup_string (value);
+		g_value_set_string (value, priv->mka_ckn);
 		break;
 	case PROP_PORT:
-		priv->port = g_value_get_int (value);
+		g_value_set_int (value, priv->port);
 		break;
 	case PROP_VALIDATION:
-		priv->validation = g_value_get_int (value);
+		g_value_set_int (value, priv->validation);
 		break;
 	case PROP_SEND_SCI:
-		priv->send_sci = g_value_get_boolean (value);
+		g_value_set_boolean (value, priv->send_sci);
 		break;
 	default:
 		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
@@ -443,39 +427,42 @@ set_property (GObject *object, guint prop_id,
 }
 
 static void
-get_property (GObject *object, guint prop_id,
-              GValue *value, GParamSpec *pspec)
+set_property (GObject *object, guint prop_id,
+              const GValue *value, GParamSpec *pspec)
 {
 	NMSettingMacsec *setting = NM_SETTING_MACSEC (object);
 	NMSettingMacsecPrivate *priv = NM_SETTING_MACSEC_GET_PRIVATE (setting);
 
 	switch (prop_id) {
 	case PROP_PARENT:
-		g_value_set_string (value, priv->parent);
+		g_free (priv->parent);
+		priv->parent = g_value_dup_string (value);
 		break;
 	case PROP_MODE:
-		g_value_set_int (value, priv->mode);
+		priv->mode = g_value_get_int (value);
 		break;
 	case PROP_ENCRYPT:
-		g_value_set_boolean (value, priv->encrypt);
+		priv->encrypt = g_value_get_boolean (value);
 		break;
 	case PROP_MKA_CAK:
-		g_value_set_string (value, priv->mka_cak);
+		nm_free_secret (priv->mka_cak);
+		priv->mka_cak = g_value_dup_string (value);
 		break;
 	case PROP_MKA_CAK_FLAGS:
-		g_value_set_flags (value, priv->mka_cak_flags);
+		priv->mka_cak_flags = g_value_get_flags (value);
 		break;
 	case PROP_MKA_CKN:
-		g_value_set_string (value, priv->mka_ckn);
+		g_free (priv->mka_ckn);
+		priv->mka_ckn = g_value_dup_string (value);
 		break;
 	case PROP_PORT:
-		g_value_set_int (value, priv->port);
+		priv->port = g_value_get_int (value);
 		break;
 	case PROP_VALIDATION:
-		g_value_set_int (value, priv->validation);
+		priv->validation = g_value_get_int (value);
 		break;
 	case PROP_SEND_SCI:
-		g_value_set_boolean (value, priv->send_sci);
+		priv->send_sci = g_value_get_boolean (value);
 		break;
 	default:
 		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
@@ -483,6 +470,28 @@ get_property (GObject *object, guint prop_id,
 	}
 }
 
+/*****************************************************************************/
+
+static void
+nm_setting_macsec_init (NMSettingMacsec *setting)
+{
+}
+
+/**
+ * nm_setting_macsec_new:
+ *
+ * Creates a new #NMSettingMacsec object with default values.
+ *
+ * Returns: (transfer full): the new empty #NMSettingMacsec object
+ *
+ * Since: 1.6
+ **/
+NMSetting *
+nm_setting_macsec_new (void)
+{
+	return (NMSetting *) g_object_new (NM_TYPE_SETTING_MACSEC, NULL);
+}
+
 static void
 finalize (GObject *object)
 {
@@ -490,10 +499,7 @@ finalize (GObject *object)
 	NMSettingMacsecPrivate *priv = NM_SETTING_MACSEC_GET_PRIVATE (setting);
 
 	g_free (priv->parent);
-	if (priv->mka_cak) {
-		memset (priv->mka_cak, 0, strlen (priv->mka_cak));
-		g_free (priv->mka_cak);
-	}
+	nm_free_secret (priv->mka_cak);
 	g_free (priv->mka_ckn);
 
 	G_OBJECT_CLASS (nm_setting_macsec_parent_class)->finalize (object);
@@ -507,8 +513,8 @@ nm_setting_macsec_class_init (NMSettingMacsecClass *klass)
 
 	g_type_class_add_private (klass, sizeof (NMSettingMacsecPrivate));
 
-	object_class->set_property = set_property;
 	object_class->get_property = get_property;
+	object_class->set_property = set_property;
 	object_class->finalize     = finalize;
 
 	setting_class->verify       = verify;
diff --git a/libnm-core/nm-setting-macvlan.c b/libnm-core/nm-setting-macvlan.c
index 1fc16116..332dc007 100644
--- a/libnm-core/nm-setting-macvlan.c
+++ b/libnm-core/nm-setting-macvlan.c
@@ -21,10 +21,10 @@
 
 #include "nm-default.h"
 
+#include "nm-setting-macvlan.h"
+
 #include 
-#include 
 
-#include "nm-setting-macvlan.h"
 #include "nm-utils.h"
 #include "nm-setting-connection.h"
 #include "nm-setting-private.h"
@@ -39,9 +39,14 @@
  * necessary for connection to macvlan interfaces.
  **/
 
-G_DEFINE_TYPE (NMSettingMacvlan, nm_setting_macvlan, NM_TYPE_SETTING)
+/*****************************************************************************/
 
-#define NM_SETTING_MACVLAN_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_SETTING_MACVLAN, NMSettingMacvlanPrivate))
+NM_GOBJECT_PROPERTIES_DEFINE_BASE (
+	PROP_PARENT,
+	PROP_MODE,
+	PROP_PROMISCUOUS,
+	PROP_TAP,
+);
 
 typedef struct {
 	char *parent;
@@ -50,29 +55,11 @@ typedef struct {
 	gboolean tap;
 } NMSettingMacvlanPrivate;
 
-enum {
-	PROP_0,
-	PROP_PARENT,
-	PROP_MODE,
-	PROP_PROMISCUOUS,
-	PROP_TAP,
-	LAST_PROP
-};
+G_DEFINE_TYPE (NMSettingMacvlan, nm_setting_macvlan, NM_TYPE_SETTING)
 
-/**
- * nm_setting_macvlan_new:
- *
- * Creates a new #NMSettingMacvlan object with default values.
- *
- * Returns: (transfer full): the new empty #NMSettingMacvlan object
- *
- * Since: 1.2
- **/
-NMSetting *
-nm_setting_macvlan_new (void)
-{
-	return (NMSetting *) g_object_new (NM_TYPE_SETTING_MACVLAN, NULL);
-}
+#define NM_SETTING_MACVLAN_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_SETTING_MACVLAN, NMSettingMacvlanPrivate))
+
+/*****************************************************************************/
 
 /**
  * nm_setting_macvlan_get_parent:
@@ -136,11 +123,6 @@ nm_setting_macvlan_get_tap (NMSettingMacvlan *setting)
 
 /*****************************************************************************/
 
-static void
-nm_setting_macvlan_init (NMSettingMacvlan *setting)
-{
-}
-
 static gboolean
 verify (NMSetting *setting, NMConnection *connection, GError **error)
 {
@@ -193,26 +175,27 @@ verify (NMSetting *setting, NMConnection *connection, GError **error)
 	return TRUE;
 }
 
+/*****************************************************************************/
+
 static void
-set_property (GObject *object, guint prop_id,
-              const GValue *value, GParamSpec *pspec)
+get_property (GObject *object, guint prop_id,
+              GValue *value, GParamSpec *pspec)
 {
 	NMSettingMacvlan *setting = NM_SETTING_MACVLAN (object);
 	NMSettingMacvlanPrivate *priv = NM_SETTING_MACVLAN_GET_PRIVATE (setting);
 
 	switch (prop_id) {
 	case PROP_PARENT:
-		g_free (priv->parent);
-		priv->parent = g_value_dup_string (value);
+		g_value_set_string (value, priv->parent);
 		break;
 	case PROP_MODE:
-		priv->mode = g_value_get_uint (value);
+		g_value_set_uint (value, priv->mode);
 		break;
 	case PROP_PROMISCUOUS:
-		priv->promiscuous = g_value_get_boolean (value);
+		g_value_set_boolean (value, priv->promiscuous);
 		break;
 	case PROP_TAP:
-		priv->tap = g_value_get_boolean (value);
+		g_value_set_boolean (value, priv->tap);
 		break;
 	default:
 		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
@@ -221,24 +204,25 @@ set_property (GObject *object, guint prop_id,
 }
 
 static void
-get_property (GObject *object, guint prop_id,
-              GValue *value, GParamSpec *pspec)
+set_property (GObject *object, guint prop_id,
+              const GValue *value, GParamSpec *pspec)
 {
 	NMSettingMacvlan *setting = NM_SETTING_MACVLAN (object);
 	NMSettingMacvlanPrivate *priv = NM_SETTING_MACVLAN_GET_PRIVATE (setting);
 
 	switch (prop_id) {
 	case PROP_PARENT:
-		g_value_set_string (value, priv->parent);
+		g_free (priv->parent);
+		priv->parent = g_value_dup_string (value);
 		break;
 	case PROP_MODE:
-		g_value_set_uint (value, priv->mode);
+		priv->mode = g_value_get_uint (value);
 		break;
 	case PROP_PROMISCUOUS:
-		g_value_set_boolean (value, priv->promiscuous);
+		priv->promiscuous = g_value_get_boolean (value);
 		break;
 	case PROP_TAP:
-		g_value_set_boolean (value, priv->tap);
+		priv->tap = g_value_get_boolean (value);
 		break;
 	default:
 		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
@@ -246,6 +230,28 @@ get_property (GObject *object, guint prop_id,
 	}
 }
 
+/*****************************************************************************/
+
+static void
+nm_setting_macvlan_init (NMSettingMacvlan *setting)
+{
+}
+
+/**
+ * nm_setting_macvlan_new:
+ *
+ * Creates a new #NMSettingMacvlan object with default values.
+ *
+ * Returns: (transfer full): the new empty #NMSettingMacvlan object
+ *
+ * Since: 1.2
+ **/
+NMSetting *
+nm_setting_macvlan_new (void)
+{
+	return (NMSetting *) g_object_new (NM_TYPE_SETTING_MACVLAN, NULL);
+}
+
 static void
 finalize (GObject *object)
 {
@@ -265,8 +271,8 @@ nm_setting_macvlan_class_init (NMSettingMacvlanClass *klass)
 
 	g_type_class_add_private (klass, sizeof (NMSettingMacvlanPrivate));
 
-	object_class->set_property = set_property;
 	object_class->get_property = get_property;
+	object_class->set_property = set_property;
 	object_class->finalize     = finalize;
 
 	setting_class->verify = verify;
@@ -281,14 +287,13 @@ nm_setting_macvlan_class_init (NMSettingMacvlanClass *klass)
 	 *
 	 * Since: 1.2
 	 **/
-	g_object_class_install_property
-		(object_class, PROP_PARENT,
-		 g_param_spec_string (NM_SETTING_MACVLAN_PARENT, "", "",
-		                      NULL,
-		                      G_PARAM_READWRITE |
-		                      G_PARAM_CONSTRUCT |
-		                      NM_SETTING_PARAM_INFERRABLE |
-		                      G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_PARENT] =
+	    g_param_spec_string (NM_SETTING_MACVLAN_PARENT, "", "",
+	                         NULL,
+	                         G_PARAM_READWRITE |
+	                         G_PARAM_CONSTRUCT |
+	                         NM_SETTING_PARAM_INFERRABLE |
+	                         G_PARAM_STATIC_STRINGS);
 
 	/**
 	 * NMSettingMacvlan:mode:
@@ -298,14 +303,13 @@ nm_setting_macvlan_class_init (NMSettingMacvlanClass *klass)
 	 *
 	 * Since: 1.2
 	 **/
-	g_object_class_install_property
-		(object_class, PROP_MODE,
-		 g_param_spec_uint (NM_SETTING_MACVLAN_MODE, "", "",
-		                    0, G_MAXUINT, 0,
-		                    G_PARAM_READWRITE |
-		                    G_PARAM_CONSTRUCT |
-		                    NM_SETTING_PARAM_INFERRABLE |
-		                    G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_MODE] =
+	    g_param_spec_uint (NM_SETTING_MACVLAN_MODE, "", "",
+	                       0, G_MAXUINT, 0,
+	                       G_PARAM_READWRITE |
+	                       G_PARAM_CONSTRUCT |
+	                       NM_SETTING_PARAM_INFERRABLE |
+	                       G_PARAM_STATIC_STRINGS);
 
 	/**
 	 * NMSettingMacvlan:promiscuous:
@@ -314,14 +318,13 @@ nm_setting_macvlan_class_init (NMSettingMacvlanClass *klass)
 	 *
 	 * Since: 1.2
 	 **/
-	g_object_class_install_property
-		(object_class, PROP_PROMISCUOUS,
-		 g_param_spec_boolean (NM_SETTING_MACVLAN_PROMISCUOUS, "", "",
-		                       TRUE,
-		                       G_PARAM_READWRITE |
-		                       G_PARAM_CONSTRUCT |
-		                       NM_SETTING_PARAM_INFERRABLE |
-		                       G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_PROMISCUOUS] =
+	    g_param_spec_boolean (NM_SETTING_MACVLAN_PROMISCUOUS, "", "",
+	                          TRUE,
+	                          G_PARAM_READWRITE |
+	                          G_PARAM_CONSTRUCT |
+	                          NM_SETTING_PARAM_INFERRABLE |
+	                          G_PARAM_STATIC_STRINGS);
 
 	/**
 	 * NMSettingMacvlan:tap:
@@ -330,14 +333,15 @@ nm_setting_macvlan_class_init (NMSettingMacvlanClass *klass)
 	 *
 	 * Since: 1.2
 	 **/
-	g_object_class_install_property
-		(object_class, PROP_TAP,
-		 g_param_spec_boolean (NM_SETTING_MACVLAN_TAP, "", "",
-		                       FALSE,
-		                       G_PARAM_READWRITE |
-		                       G_PARAM_CONSTRUCT |
-		                       NM_SETTING_PARAM_INFERRABLE |
-		                       G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_TAP] =
+	    g_param_spec_boolean (NM_SETTING_MACVLAN_TAP, "", "",
+	                          FALSE,
+	                          G_PARAM_READWRITE |
+	                          G_PARAM_CONSTRUCT |
+	                          NM_SETTING_PARAM_INFERRABLE |
+	                          G_PARAM_STATIC_STRINGS);
+
+	g_object_class_install_properties (object_class, _PROPERTY_ENUMS_LAST, obj_properties);
 
 	_nm_setting_class_commit (setting_class, NM_META_SETTING_TYPE_MACVLAN);
 }
diff --git a/libnm-core/nm-setting-match.c b/libnm-core/nm-setting-match.c
index 0964c644..2f331060 100644
--- a/libnm-core/nm-setting-match.c
+++ b/libnm-core/nm-setting-match.c
@@ -15,6 +15,7 @@
 #include "nm-default.h"
 
 #include "nm-setting-match.h"
+
 #include "nm-setting-private.h"
 #include "nm-utils-private.h"
 
@@ -24,6 +25,12 @@
  * @include: nm-setting-match.h
  **/
 
+/*****************************************************************************/
+
+NM_GOBJECT_PROPERTIES_DEFINE (NMSettingMatch,
+	PROP_INTERFACE_NAME,
+);
+
 /**
  * NMSettingMatch:
  *
@@ -42,10 +49,6 @@ struct _NMSettingMatchClass {
 
 G_DEFINE_TYPE (NMSettingMatch, nm_setting_match, NM_TYPE_SETTING)
 
-NM_GOBJECT_PROPERTIES_DEFINE (NMSettingMatch,
-	PROP_INTERFACE_NAME,
-);
-
 /*****************************************************************************/
 
 /**
@@ -194,6 +197,8 @@ nm_setting_match_get_interface_names (NMSettingMatch *setting, guint *length)
 	return (const char *const *) setting->interface_name->pdata;
 }
 
+/*****************************************************************************/
+
 static void
 get_property (GObject *object, guint prop_id,
               GValue *value, GParamSpec *pspec)
@@ -227,6 +232,8 @@ set_property (GObject *object, guint prop_id,
 	}
 }
 
+/*****************************************************************************/
+
 static void
 nm_setting_match_init (NMSettingMatch *setting)
 {
@@ -264,9 +271,9 @@ nm_setting_match_class_init (NMSettingMatchClass *klass)
 	GObjectClass *object_class = G_OBJECT_CLASS (klass);
 	NMSettingClass *setting_class = NM_SETTING_CLASS (klass);
 
-	object_class->finalize     = finalize;
 	object_class->get_property = get_property;
 	object_class->set_property = set_property;
+	object_class->finalize     = finalize;
 
 	/**
 	 * NMSettingMatch:interface-name
diff --git a/libnm-core/nm-setting-olpc-mesh.c b/libnm-core/nm-setting-olpc-mesh.c
index 7f4a1bbf..f6a32dbb 100644
--- a/libnm-core/nm-setting-olpc-mesh.c
+++ b/libnm-core/nm-setting-olpc-mesh.c
@@ -22,9 +22,8 @@
 
 #include "nm-default.h"
 
-#include 
-
 #include "nm-setting-olpc-mesh.h"
+
 #include "nm-utils.h"
 #include "nm-utils-private.h"
 #include "nm-setting-private.h"
@@ -37,11 +36,13 @@
  * necessary for connection to OLPC-Mesh devices.
  **/
 
-static void nm_setting_olpc_mesh_init (NMSettingOlpcMesh *setting);
-
-G_DEFINE_TYPE (NMSettingOlpcMesh, nm_setting_olpc_mesh, NM_TYPE_SETTING)
+/*****************************************************************************/
 
-#define NM_SETTING_OLPC_MESH_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_SETTING_OLPC_MESH, NMSettingOlpcMeshPrivate))
+NM_GOBJECT_PROPERTIES_DEFINE_BASE (
+	PROP_SSID,
+	PROP_CHANNEL,
+	PROP_DHCP_ANYCAST_ADDRESS,
+);
 
 typedef struct {
 	GBytes *ssid;
@@ -49,31 +50,11 @@ typedef struct {
 	char *dhcp_anycast_addr;
 } NMSettingOlpcMeshPrivate;
 
-enum {
-	PROP_0,
-	PROP_SSID,
-	PROP_CHANNEL,
-	PROP_DHCP_ANYCAST_ADDRESS,
-
-	LAST_PROP
-};
+G_DEFINE_TYPE (NMSettingOlpcMesh, nm_setting_olpc_mesh, NM_TYPE_SETTING)
 
-/**
- * nm_setting_olpc_mesh_new:
- *
- * Creates a new #NMSettingOlpcMesh object with default values.
- *
- * Returns: the new empty #NMSettingOlpcMesh object
- **/
-NMSetting *nm_setting_olpc_mesh_new (void)
-{
-	return (NMSetting *) g_object_new (NM_TYPE_SETTING_OLPC_MESH, NULL);
-}
+#define NM_SETTING_OLPC_MESH_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_SETTING_OLPC_MESH, NMSettingOlpcMeshPrivate))
 
-static void
-nm_setting_olpc_mesh_init (NMSettingOlpcMesh *setting)
-{
-}
+/*****************************************************************************/
 
 /**
  * nm_setting_olpc_mesh_get_ssid:
@@ -152,16 +133,28 @@ verify (NMSetting *setting, NMConnection *connection, GError **error)
 	return TRUE;
 }
 
+/*****************************************************************************/
+
 static void
-finalize (GObject *object)
+get_property (GObject *object, guint prop_id,
+              GValue *value, GParamSpec *pspec)
 {
-	NMSettingOlpcMeshPrivate *priv = NM_SETTING_OLPC_MESH_GET_PRIVATE (object);
-
-	if (priv->ssid)
-		g_bytes_unref (priv->ssid);
-	g_free (priv->dhcp_anycast_addr);
+	NMSettingOlpcMesh *setting = NM_SETTING_OLPC_MESH (object);
 
-	G_OBJECT_CLASS (nm_setting_olpc_mesh_parent_class)->finalize (object);
+	switch (prop_id) {
+	case PROP_SSID:
+		g_value_set_boxed (value, nm_setting_olpc_mesh_get_ssid (setting));
+		break;
+	case PROP_CHANNEL:
+		g_value_set_uint (value, nm_setting_olpc_mesh_get_channel (setting));
+		break;
+	case PROP_DHCP_ANYCAST_ADDRESS:
+		g_value_set_string (value, nm_setting_olpc_mesh_get_dhcp_anycast_address (setting));
+		break;
+	default:
+		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+		break;
+	}
 }
 
 static void
@@ -189,26 +182,35 @@ set_property (GObject *object, guint prop_id,
 	}
 }
 
+/*****************************************************************************/
+
 static void
-get_property (GObject *object, guint prop_id,
-              GValue *value, GParamSpec *pspec)
+nm_setting_olpc_mesh_init (NMSettingOlpcMesh *setting)
 {
-	NMSettingOlpcMesh *setting = NM_SETTING_OLPC_MESH (object);
+}
 
-	switch (prop_id) {
-	case PROP_SSID:
-		g_value_set_boxed (value, nm_setting_olpc_mesh_get_ssid (setting));
-		break;
-	case PROP_CHANNEL:
-		g_value_set_uint (value, nm_setting_olpc_mesh_get_channel (setting));
-		break;
-	case PROP_DHCP_ANYCAST_ADDRESS:
-		g_value_set_string (value, nm_setting_olpc_mesh_get_dhcp_anycast_address (setting));
-		break;
-	default:
-		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-		break;
-	}
+/**
+ * nm_setting_olpc_mesh_new:
+ *
+ * Creates a new #NMSettingOlpcMesh object with default values.
+ *
+ * Returns: the new empty #NMSettingOlpcMesh object
+ **/
+NMSetting *nm_setting_olpc_mesh_new (void)
+{
+	return (NMSetting *) g_object_new (NM_TYPE_SETTING_OLPC_MESH, NULL);
+}
+
+static void
+finalize (GObject *object)
+{
+	NMSettingOlpcMeshPrivate *priv = NM_SETTING_OLPC_MESH_GET_PRIVATE (object);
+
+	if (priv->ssid)
+		g_bytes_unref (priv->ssid);
+	g_free (priv->dhcp_anycast_addr);
+
+	G_OBJECT_CLASS (nm_setting_olpc_mesh_parent_class)->finalize (object);
 }
 
 static void
@@ -220,8 +222,8 @@ nm_setting_olpc_mesh_class_init (NMSettingOlpcMeshClass *klass)
 
 	g_type_class_add_private (klass, sizeof (NMSettingOlpcMeshPrivate));
 
-	object_class->set_property = set_property;
 	object_class->get_property = get_property;
+	object_class->set_property = set_property;
 	object_class->finalize     = finalize;
 
 	setting_class->verify = verify;
@@ -231,27 +233,25 @@ nm_setting_olpc_mesh_class_init (NMSettingOlpcMeshClass *klass)
 	 *
 	 * SSID of the mesh network to join.
 	 **/
-	g_object_class_install_property
-		(object_class, PROP_SSID,
-		 g_param_spec_boxed (NM_SETTING_OLPC_MESH_SSID, "", "",
-		                     G_TYPE_BYTES,
-		                     G_PARAM_READWRITE |
-		                     NM_SETTING_PARAM_INFERRABLE |
-		                     G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_SSID] =
+	    g_param_spec_boxed (NM_SETTING_OLPC_MESH_SSID, "", "",
+	                        G_TYPE_BYTES,
+	                        G_PARAM_READWRITE |
+	                        NM_SETTING_PARAM_INFERRABLE |
+	                        G_PARAM_STATIC_STRINGS);
 
 	/**
 	 * NMSettingOlpcMesh:channel:
 	 *
 	 * Channel on which the mesh network to join is located.
 	 **/
-	g_object_class_install_property
-		(object_class, PROP_CHANNEL,
-		 g_param_spec_uint (NM_SETTING_OLPC_MESH_CHANNEL, "", "",
-		                    0, G_MAXUINT32, 0,
-		                    G_PARAM_READWRITE |
-		                    G_PARAM_CONSTRUCT |
-		                    NM_SETTING_PARAM_INFERRABLE |
-		                    G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_CHANNEL] =
+	    g_param_spec_uint (NM_SETTING_OLPC_MESH_CHANNEL, "", "",
+	                       0, G_MAXUINT32, 0,
+	                       G_PARAM_READWRITE |
+	                       G_PARAM_CONSTRUCT |
+	                       NM_SETTING_PARAM_INFERRABLE |
+	                       G_PARAM_STATIC_STRINGS);
 
 	/**
 	 * NMSettingOlpcMesh:dhcp-anycast-address:
@@ -260,20 +260,20 @@ nm_setting_olpc_mesh_class_init (NMSettingOlpcMeshClass *klass)
 	 * The specific anycast address used determines which DHCP server class
 	 * answers the request.
 	 **/
-	g_object_class_install_property
-		(object_class, PROP_DHCP_ANYCAST_ADDRESS,
-		 g_param_spec_string (NM_SETTING_OLPC_MESH_DHCP_ANYCAST_ADDRESS, "", "",
-		                      NULL,
-		                      G_PARAM_READWRITE |
-		                      G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_DHCP_ANYCAST_ADDRESS] =
+	    g_param_spec_string (NM_SETTING_OLPC_MESH_DHCP_ANYCAST_ADDRESS, "", "",
+	                         NULL,
+	                         G_PARAM_READWRITE |
+	                         G_PARAM_STATIC_STRINGS);
 
 	_properties_override_add_transform (properties_override,
-	                                    g_object_class_find_property (G_OBJECT_CLASS (setting_class),
-	                                                                  NM_SETTING_OLPC_MESH_DHCP_ANYCAST_ADDRESS),
+	                                    obj_properties[PROP_DHCP_ANYCAST_ADDRESS],
 	                                    G_VARIANT_TYPE_BYTESTRING,
 	                                    _nm_utils_hwaddr_to_dbus,
 	                                    _nm_utils_hwaddr_from_dbus);
 
+	g_object_class_install_properties (object_class, _PROPERTY_ENUMS_LAST, obj_properties);
+
 	_nm_setting_class_commit_full (setting_class, NM_META_SETTING_TYPE_OLPC_MESH,
 	                               NULL, properties_override);
 }
diff --git a/libnm-core/nm-setting-ovs-bridge.c b/libnm-core/nm-setting-ovs-bridge.c
index 9ca5566f..e69dcdea 100644
--- a/libnm-core/nm-setting-ovs-bridge.c
+++ b/libnm-core/nm-setting-ovs-bridge.c
@@ -34,14 +34,14 @@
  * necessary for Open vSwitch bridges.
  **/
 
-enum {
-	PROP_0,
+/*****************************************************************************/
+
+NM_GOBJECT_PROPERTIES_DEFINE_BASE (
 	PROP_FAIL_MODE,
 	PROP_MCAST_SNOOPING_ENABLE,
 	PROP_RSTP_ENABLE,
 	PROP_STP_ENABLE,
-	LAST_PROP
-};
+);
 
 /**
  * NMSettingOvsBridge:
@@ -267,8 +267,8 @@ nm_setting_ovs_bridge_class_init (NMSettingOvsBridgeClass *klass)
 	GObjectClass *object_class = G_OBJECT_CLASS (klass);
 	NMSettingClass *setting_class = NM_SETTING_CLASS (klass);
 
-	object_class->set_property = set_property;
 	object_class->get_property = get_property;
+	object_class->set_property = set_property;
 	object_class->finalize     = finalize;
 
 	setting_class->verify = verify;
@@ -280,14 +280,13 @@ nm_setting_ovs_bridge_class_init (NMSettingOvsBridgeClass *klass)
 	 *
 	 * Since: 1.10
 	 **/
-	g_object_class_install_property
-	        (object_class, PROP_FAIL_MODE,
-	         g_param_spec_string (NM_SETTING_OVS_BRIDGE_FAIL_MODE, "", "",
-	                              NULL,
-	                              G_PARAM_READWRITE |
-	                              G_PARAM_CONSTRUCT |
-	                              NM_SETTING_PARAM_INFERRABLE |
-	                              G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_FAIL_MODE] =
+	    g_param_spec_string (NM_SETTING_OVS_BRIDGE_FAIL_MODE, "", "",
+	                         NULL,
+	                         G_PARAM_READWRITE |
+	                         G_PARAM_CONSTRUCT |
+	                         NM_SETTING_PARAM_INFERRABLE |
+	                         G_PARAM_STATIC_STRINGS);
 
 	/**
 	 * NMSettingOvsBridge:mcast-snooping-enable:
@@ -296,13 +295,12 @@ nm_setting_ovs_bridge_class_init (NMSettingOvsBridgeClass *klass)
 	 *
 	 * Since: 1.10
 	 **/
-	g_object_class_install_property
-	        (object_class, PROP_MCAST_SNOOPING_ENABLE,
-	         g_param_spec_boolean (NM_SETTING_OVS_BRIDGE_MCAST_SNOOPING_ENABLE, "", "",
-	                               FALSE,
-	                               G_PARAM_READWRITE |
-	                               G_PARAM_CONSTRUCT |
-	                               G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_MCAST_SNOOPING_ENABLE] =
+	    g_param_spec_boolean (NM_SETTING_OVS_BRIDGE_MCAST_SNOOPING_ENABLE, "", "",
+	                          FALSE,
+	                          G_PARAM_READWRITE |
+	                          G_PARAM_CONSTRUCT |
+	                          G_PARAM_STATIC_STRINGS);
 
 	/**
 	 * NMSettingOvsBridge:rstp-enable:
@@ -311,13 +309,12 @@ nm_setting_ovs_bridge_class_init (NMSettingOvsBridgeClass *klass)
 	 *
 	 * Since: 1.10
 	 **/
-	g_object_class_install_property
-	        (object_class, PROP_RSTP_ENABLE,
-	         g_param_spec_boolean (NM_SETTING_OVS_BRIDGE_RSTP_ENABLE, "", "",
-	                               FALSE,
-	                               G_PARAM_READWRITE |
-	                               G_PARAM_CONSTRUCT |
-	                               G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_RSTP_ENABLE] =
+	    g_param_spec_boolean (NM_SETTING_OVS_BRIDGE_RSTP_ENABLE, "", "",
+	                          FALSE,
+	                          G_PARAM_READWRITE |
+	                          G_PARAM_CONSTRUCT |
+	                          G_PARAM_STATIC_STRINGS);
 
 	/**
 	 * NMSettingOvsBridge:stp-enable:
@@ -326,13 +323,14 @@ nm_setting_ovs_bridge_class_init (NMSettingOvsBridgeClass *klass)
 	 *
 	 * Since: 1.10
 	 **/
-	g_object_class_install_property
-	        (object_class, PROP_STP_ENABLE,
-	         g_param_spec_boolean (NM_SETTING_OVS_BRIDGE_STP_ENABLE, "", "",
-	                               FALSE,
-	                               G_PARAM_READWRITE |
-	                               G_PARAM_CONSTRUCT |
-	                               G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_STP_ENABLE] =
+	    g_param_spec_boolean (NM_SETTING_OVS_BRIDGE_STP_ENABLE, "", "",
+	                          FALSE,
+	                          G_PARAM_READWRITE |
+	                          G_PARAM_CONSTRUCT |
+	                          G_PARAM_STATIC_STRINGS);
+
+	g_object_class_install_properties (object_class, _PROPERTY_ENUMS_LAST, obj_properties);
 
 	_nm_setting_class_commit (setting_class, NM_META_SETTING_TYPE_OVS_BRIDGE);
 }
diff --git a/libnm-core/nm-setting-ovs-interface.c b/libnm-core/nm-setting-ovs-interface.c
index a177098d..ad7f2ead 100644
--- a/libnm-core/nm-setting-ovs-interface.c
+++ b/libnm-core/nm-setting-ovs-interface.c
@@ -33,11 +33,11 @@
  * necessary for Open vSwitch interfaces.
  **/
 
-enum {
-	PROP_0,
+/*****************************************************************************/
+
+NM_GOBJECT_PROPERTIES_DEFINE_BASE (
 	PROP_TYPE,
-	LAST_PROP
-};
+);
 
 /**
  * NMSettingOvsInterface:
@@ -366,8 +366,8 @@ nm_setting_ovs_interface_class_init (NMSettingOvsInterfaceClass *klass)
 	GObjectClass *object_class = G_OBJECT_CLASS (klass);
 	NMSettingClass *setting_class = NM_SETTING_CLASS (klass);
 
-	object_class->set_property = set_property;
 	object_class->get_property = get_property;
+	object_class->set_property = set_property;
 	object_class->finalize     = finalize;
 
 	setting_class->verify = verify;
@@ -379,14 +379,15 @@ nm_setting_ovs_interface_class_init (NMSettingOvsInterfaceClass *klass)
 	 *
 	 * Since: 1.10
 	 **/
-	g_object_class_install_property
-	        (object_class, PROP_TYPE,
-	         g_param_spec_string (NM_SETTING_OVS_INTERFACE_TYPE, "", "",
-	                              NULL,
-	                              G_PARAM_READWRITE |
-	                              G_PARAM_CONSTRUCT |
-	                              NM_SETTING_PARAM_INFERRABLE |
-	                              G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_TYPE] =
+	    g_param_spec_string (NM_SETTING_OVS_INTERFACE_TYPE, "", "",
+	                         NULL,
+	                         G_PARAM_READWRITE |
+	                         G_PARAM_CONSTRUCT |
+	                         NM_SETTING_PARAM_INFERRABLE |
+	                         G_PARAM_STATIC_STRINGS);
+
+	g_object_class_install_properties (object_class, _PROPERTY_ENUMS_LAST, obj_properties);
 
 	_nm_setting_class_commit (setting_class, NM_META_SETTING_TYPE_OVS_INTERFACE);
 }
diff --git a/libnm-core/nm-setting-ovs-patch.c b/libnm-core/nm-setting-ovs-patch.c
index 15005eea..2a46810c 100644
--- a/libnm-core/nm-setting-ovs-patch.c
+++ b/libnm-core/nm-setting-ovs-patch.c
@@ -34,11 +34,11 @@
  * necessary for Open vSwitch interfaces of type "patch".
  **/
 
-enum {
-	PROP_0,
+/*****************************************************************************/
+
+NM_GOBJECT_PROPERTIES_DEFINE_BASE (
 	PROP_PEER,
-	LAST_PROP
-};
+);
 
 /**
  * NMSettingOvsPatch:
@@ -199,14 +199,15 @@ nm_setting_ovs_patch_class_init (NMSettingOvsPatchClass *klass)
 	 *
 	 * Since: 1.10
 	 **/
-	g_object_class_install_property
-	        (object_class, PROP_PEER,
-	         g_param_spec_string (NM_SETTING_OVS_PATCH_PEER, "", "",
-	                              NULL,
-	                              G_PARAM_READWRITE |
-	                              G_PARAM_CONSTRUCT |
-	                              NM_SETTING_PARAM_INFERRABLE |
-	                              G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_PEER] =
+	    g_param_spec_string (NM_SETTING_OVS_PATCH_PEER, "", "",
+	                         NULL,
+	                         G_PARAM_READWRITE |
+	                         G_PARAM_CONSTRUCT |
+	                         NM_SETTING_PARAM_INFERRABLE |
+	                         G_PARAM_STATIC_STRINGS);
+
+	g_object_class_install_properties (object_class, _PROPERTY_ENUMS_LAST, obj_properties);
 
 	_nm_setting_class_commit (setting_class, NM_META_SETTING_TYPE_OVS_PATCH);
 }
diff --git a/libnm-core/nm-setting-ovs-port.c b/libnm-core/nm-setting-ovs-port.c
index 10e542e7..e690d641 100644
--- a/libnm-core/nm-setting-ovs-port.c
+++ b/libnm-core/nm-setting-ovs-port.c
@@ -34,16 +34,16 @@
  * necessary for Open vSwitch ports.
  **/
 
-enum {
-	PROP_0,
+/*****************************************************************************/
+
+NM_GOBJECT_PROPERTIES_DEFINE_BASE (
 	PROP_VLAN_MODE,
 	PROP_TAG,
 	PROP_LACP,
 	PROP_BOND_MODE,
 	PROP_BOND_UPDELAY,
 	PROP_BOND_DOWNDELAY,
-	LAST_PROP
-};
+);
 
 /**
  * NMSettingOvsPort:
@@ -364,8 +364,8 @@ nm_setting_ovs_port_class_init (NMSettingOvsPortClass *klass)
 	GObjectClass *object_class = G_OBJECT_CLASS (klass);
 	NMSettingClass *setting_class = NM_SETTING_CLASS (klass);
 
-	object_class->set_property = set_property;
 	object_class->get_property = get_property;
+	object_class->set_property = set_property;
 	object_class->finalize     = finalize;
 
 	setting_class->verify = verify;
@@ -378,14 +378,13 @@ nm_setting_ovs_port_class_init (NMSettingOvsPortClass *klass)
 	 *
 	 * Since: 1.10
 	 **/
-	g_object_class_install_property
-	        (object_class, PROP_VLAN_MODE,
-	         g_param_spec_string (NM_SETTING_OVS_PORT_VLAN_MODE, "", "",
-	                              NULL,
-	                              G_PARAM_READWRITE |
-	                              G_PARAM_CONSTRUCT |
-	                              NM_SETTING_PARAM_INFERRABLE |
-	                              G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_VLAN_MODE] =
+	    g_param_spec_string (NM_SETTING_OVS_PORT_VLAN_MODE, "", "",
+	                         NULL,
+	                         G_PARAM_READWRITE |
+	                         G_PARAM_CONSTRUCT |
+	                         NM_SETTING_PARAM_INFERRABLE |
+	                         G_PARAM_STATIC_STRINGS);
 
 	/**
 	 * NMSettingOvsPort:tag:
@@ -394,14 +393,13 @@ nm_setting_ovs_port_class_init (NMSettingOvsPortClass *klass)
 	 *
 	 * Since: 1.10
 	 **/
-	g_object_class_install_property
-	        (object_class, PROP_TAG,
-	         g_param_spec_uint (NM_SETTING_OVS_PORT_TAG, "", "",
-	                            0, 4095, 0,
-	                            G_PARAM_READWRITE |
-	                            G_PARAM_CONSTRUCT |
-	                            NM_SETTING_PARAM_INFERRABLE |
-	                            G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_TAG] =
+	    g_param_spec_uint (NM_SETTING_OVS_PORT_TAG, "", "",
+	                       0, 4095, 0,
+	                       G_PARAM_READWRITE |
+	                       G_PARAM_CONSTRUCT |
+	                       NM_SETTING_PARAM_INFERRABLE |
+	                       G_PARAM_STATIC_STRINGS);
 
 	/**
 	 * NMSettingOvsPort:lacp:
@@ -410,14 +408,13 @@ nm_setting_ovs_port_class_init (NMSettingOvsPortClass *klass)
 	 *
 	 * Since: 1.10
 	 **/
-	g_object_class_install_property
-	        (object_class, PROP_LACP,
-	         g_param_spec_string (NM_SETTING_OVS_PORT_LACP, "", "",
-	                              NULL,
-	                              G_PARAM_READWRITE |
-	                              G_PARAM_CONSTRUCT |
-	                              NM_SETTING_PARAM_INFERRABLE |
-	                              G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_LACP] =
+	    g_param_spec_string (NM_SETTING_OVS_PORT_LACP, "", "",
+	                         NULL,
+	                         G_PARAM_READWRITE |
+	                         G_PARAM_CONSTRUCT |
+	                         NM_SETTING_PARAM_INFERRABLE |
+	                         G_PARAM_STATIC_STRINGS);
 
 	/**
 	 * NMSettingOvsPort:bond-mode:
@@ -426,14 +423,13 @@ nm_setting_ovs_port_class_init (NMSettingOvsPortClass *klass)
 	 *
 	 * Since: 1.10
 	 **/
-	g_object_class_install_property
-	        (object_class, PROP_BOND_MODE,
-	         g_param_spec_string (NM_SETTING_OVS_PORT_BOND_MODE, "", "",
-	                              NULL,
-	                              G_PARAM_READWRITE |
-	                              G_PARAM_CONSTRUCT |
-	                              NM_SETTING_PARAM_INFERRABLE |
-	                              G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_BOND_MODE] =
+	    g_param_spec_string (NM_SETTING_OVS_PORT_BOND_MODE, "", "",
+	                         NULL,
+	                         G_PARAM_READWRITE |
+	                         G_PARAM_CONSTRUCT |
+	                         NM_SETTING_PARAM_INFERRABLE |
+	                         G_PARAM_STATIC_STRINGS);
 
 	/**
 	 * NMSettingOvsPort:bond-updelay:
@@ -442,14 +438,13 @@ nm_setting_ovs_port_class_init (NMSettingOvsPortClass *klass)
 	 *
 	 * Since: 1.10
 	 **/
-	g_object_class_install_property
-	        (object_class, PROP_BOND_UPDELAY,
-	         g_param_spec_uint (NM_SETTING_OVS_PORT_BOND_UPDELAY, "", "",
-	                            0, G_MAXUINT, 0,
-	                            G_PARAM_READWRITE |
-	                            G_PARAM_CONSTRUCT |
-	                            NM_SETTING_PARAM_INFERRABLE |
-	                            G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_BOND_UPDELAY] =
+	    g_param_spec_uint (NM_SETTING_OVS_PORT_BOND_UPDELAY, "", "",
+	                       0, G_MAXUINT, 0,
+	                       G_PARAM_READWRITE |
+	                       G_PARAM_CONSTRUCT |
+	                       NM_SETTING_PARAM_INFERRABLE |
+	                       G_PARAM_STATIC_STRINGS);
 
 	/**
 	 * NMSettingOvsPort:bond-downdelay:
@@ -458,14 +453,15 @@ nm_setting_ovs_port_class_init (NMSettingOvsPortClass *klass)
 	 *
 	 * Since: 1.10
 	 **/
-	g_object_class_install_property
-	        (object_class, PROP_BOND_DOWNDELAY,
-	         g_param_spec_uint (NM_SETTING_OVS_PORT_BOND_DOWNDELAY, "", "",
-	                            0, G_MAXUINT, 0,
-	                            G_PARAM_READWRITE |
-	                            G_PARAM_CONSTRUCT |
-	                            NM_SETTING_PARAM_INFERRABLE |
-	                            G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_BOND_DOWNDELAY] =
+	    g_param_spec_uint (NM_SETTING_OVS_PORT_BOND_DOWNDELAY, "", "",
+	                       0, G_MAXUINT, 0,
+	                       G_PARAM_READWRITE |
+	                       G_PARAM_CONSTRUCT |
+	                       NM_SETTING_PARAM_INFERRABLE |
+	                       G_PARAM_STATIC_STRINGS);
+
+	g_object_class_install_properties (object_class, _PROPERTY_ENUMS_LAST, obj_properties);
 
 	_nm_setting_class_commit (setting_class, NM_META_SETTING_TYPE_OVS_PORT);
 }
diff --git a/libnm-core/nm-setting-ppp.c b/libnm-core/nm-setting-ppp.c
index 7425da19..12a8c366 100644
--- a/libnm-core/nm-setting-ppp.c
+++ b/libnm-core/nm-setting-ppp.c
@@ -23,6 +23,7 @@
 #include "nm-default.h"
 
 #include "nm-setting-ppp.h"
+
 #include "nm-setting-private.h"
 
 /**
@@ -35,9 +36,28 @@
  * cable and DSL modems and some mobile broadband devices.
  **/
 
-G_DEFINE_TYPE (NMSettingPpp, nm_setting_ppp, NM_TYPE_SETTING)
+/*****************************************************************************/
 
-#define NM_SETTING_PPP_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_SETTING_PPP, NMSettingPppPrivate))
+NM_GOBJECT_PROPERTIES_DEFINE_BASE (
+	PROP_NOAUTH,
+	PROP_REFUSE_EAP,
+	PROP_REFUSE_PAP,
+	PROP_REFUSE_CHAP,
+	PROP_REFUSE_MSCHAP,
+	PROP_REFUSE_MSCHAPV2,
+	PROP_NOBSDCOMP,
+	PROP_NODEFLATE,
+	PROP_NO_VJ_COMP,
+	PROP_REQUIRE_MPPE,
+	PROP_REQUIRE_MPPE_128,
+	PROP_MPPE_STATEFUL,
+	PROP_CRTSCTS,
+	PROP_BAUD,
+	PROP_MRU,
+	PROP_MTU,
+	PROP_LCP_ECHO_FAILURE,
+	PROP_LCP_ECHO_INTERVAL,
+);
 
 typedef struct {
 	gboolean noauth;
@@ -60,42 +80,11 @@ typedef struct {
 	guint32 lcp_echo_interval;
 } NMSettingPppPrivate;
 
-enum {
-	PROP_0,
-	PROP_NOAUTH,
-	PROP_REFUSE_EAP,
-	PROP_REFUSE_PAP,
-	PROP_REFUSE_CHAP,
-	PROP_REFUSE_MSCHAP,
-	PROP_REFUSE_MSCHAPV2,
-	PROP_NOBSDCOMP,
-	PROP_NODEFLATE,
-	PROP_NO_VJ_COMP,
-	PROP_REQUIRE_MPPE,
-	PROP_REQUIRE_MPPE_128,
-	PROP_MPPE_STATEFUL,
-	PROP_CRTSCTS,
-	PROP_BAUD,
-	PROP_MRU,
-	PROP_MTU,
-	PROP_LCP_ECHO_FAILURE,
-	PROP_LCP_ECHO_INTERVAL,
+G_DEFINE_TYPE (NMSettingPpp, nm_setting_ppp, NM_TYPE_SETTING)
 
-	LAST_PROP
-};
+#define NM_SETTING_PPP_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_SETTING_PPP, NMSettingPppPrivate))
 
-/**
- * nm_setting_ppp_new:
- *
- * Creates a new #NMSettingPpp object with default values.
- *
- * Returns: (transfer full): the new empty #NMSettingPpp object
- **/
-NMSetting *
-nm_setting_ppp_new (void)
-{
-	return (NMSetting *) g_object_new (NM_TYPE_SETTING_PPP, NULL);
-}
+/*****************************************************************************/
 
 /**
  * nm_setting_ppp_get_noauth:
@@ -383,71 +372,68 @@ verify (NMSetting *setting, NMConnection *connection, GError **error)
 	return TRUE;
 }
 
-static void
-nm_setting_ppp_init (NMSettingPpp *setting)
-{
-}
+/*****************************************************************************/
 
 static void
-set_property (GObject *object, guint prop_id,
-              const GValue *value, GParamSpec *pspec)
+get_property (GObject *object, guint prop_id,
+              GValue *value, GParamSpec *pspec)
 {
-	NMSettingPppPrivate *priv = NM_SETTING_PPP_GET_PRIVATE (object);
+	NMSettingPpp *setting = NM_SETTING_PPP (object);
 
 	switch (prop_id) {
 	case PROP_NOAUTH:
-		priv->noauth = g_value_get_boolean (value);
+		g_value_set_boolean (value, nm_setting_ppp_get_noauth (setting));
 		break;
 	case PROP_REFUSE_EAP:
-		priv->refuse_eap = g_value_get_boolean (value);
+		g_value_set_boolean (value, nm_setting_ppp_get_refuse_eap (setting));
 		break;
 	case PROP_REFUSE_PAP:
-		priv->refuse_pap = g_value_get_boolean (value);
+		g_value_set_boolean (value, nm_setting_ppp_get_refuse_pap (setting));
 		break;
 	case PROP_REFUSE_CHAP:
-		priv->refuse_chap = g_value_get_boolean (value);
+		g_value_set_boolean (value, nm_setting_ppp_get_refuse_chap (setting));
 		break;
 	case PROP_REFUSE_MSCHAP:
-		priv->refuse_mschap = g_value_get_boolean (value);
+		g_value_set_boolean (value, nm_setting_ppp_get_refuse_mschap (setting));
 		break;
 	case PROP_REFUSE_MSCHAPV2:
-		priv->refuse_mschapv2 = g_value_get_boolean (value);
+		g_value_set_boolean (value, nm_setting_ppp_get_refuse_mschapv2 (setting));
 		break;
 	case PROP_NOBSDCOMP:
-		priv->nobsdcomp = g_value_get_boolean (value);
+		g_value_set_boolean (value, nm_setting_ppp_get_nobsdcomp (setting));
 		break;
 	case PROP_NODEFLATE:
-		priv->nodeflate = g_value_get_boolean (value);
+		g_value_set_boolean (value, nm_setting_ppp_get_nodeflate (setting));
 		break;
 	case PROP_NO_VJ_COMP:
-		priv->no_vj_comp = g_value_get_boolean (value);
+		g_value_set_boolean (value, nm_setting_ppp_get_no_vj_comp (setting));
 		break;
 	case PROP_REQUIRE_MPPE:
-		priv->require_mppe = g_value_get_boolean (value);
+		g_value_set_boolean (value, nm_setting_ppp_get_require_mppe (setting));
 		break;
 	case PROP_REQUIRE_MPPE_128:
-		priv->require_mppe_128 = g_value_get_boolean (value);
+		g_value_set_boolean (value, nm_setting_ppp_get_require_mppe_128 (setting));
 		break;
 	case PROP_MPPE_STATEFUL:
-		priv->mppe_stateful = g_value_get_boolean (value);
+		g_value_set_boolean (value, nm_setting_ppp_get_mppe_stateful (setting));
 		break;
 	case PROP_CRTSCTS:
-		priv->crtscts = g_value_get_boolean (value);
+		g_value_set_boolean (value, nm_setting_ppp_get_crtscts (setting));
 		break;
 	case PROP_BAUD:
-		priv->baud = g_value_get_uint (value);
+		g_value_set_uint (value, nm_setting_ppp_get_baud (setting));
 		break;
 	case PROP_MRU:
-		priv->mru = g_value_get_uint (value);
+		g_value_set_uint (value, nm_setting_ppp_get_mru (setting));
 		break;
 	case PROP_MTU:
-		priv->mtu = g_value_get_uint (value);
+		g_value_set_uint (value, nm_setting_ppp_get_mtu (setting));
 		break;
 	case PROP_LCP_ECHO_FAILURE:
-		priv->lcp_echo_failure = g_value_get_uint (value);
+		g_value_set_uint (value, nm_setting_ppp_get_lcp_echo_failure (setting));
 		break;
 	case PROP_LCP_ECHO_INTERVAL:
-		priv->lcp_echo_interval = g_value_get_uint (value);
+		g_value_set_uint (value, nm_setting_ppp_get_lcp_echo_interval (setting));
 		break;
 	default:
 		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
@@ -456,65 +442,65 @@ set_property (GObject *object, guint prop_id,
 }
 
 static void
-get_property (GObject *object, guint prop_id,
-              GValue *value, GParamSpec *pspec)
+set_property (GObject *object, guint prop_id,
+              const GValue *value, GParamSpec *pspec)
 {
-	NMSettingPpp *setting = NM_SETTING_PPP (object);
+	NMSettingPppPrivate *priv = NM_SETTING_PPP_GET_PRIVATE (object);
 
 	switch (prop_id) {
 	case PROP_NOAUTH:
-		g_value_set_boolean (value, nm_setting_ppp_get_noauth (setting));
+		priv->noauth = g_value_get_boolean (value);
 		break;
 	case PROP_REFUSE_EAP:
-		g_value_set_boolean (value, nm_setting_ppp_get_refuse_eap (setting));
+		priv->refuse_eap = g_value_get_boolean (value);
 		break;
 	case PROP_REFUSE_PAP:
-		g_value_set_boolean (value, nm_setting_ppp_get_refuse_pap (setting));
+		priv->refuse_pap = g_value_get_boolean (value);
 		break;
 	case PROP_REFUSE_CHAP:
-		g_value_set_boolean (value, nm_setting_ppp_get_refuse_chap (setting));
+		priv->refuse_chap = g_value_get_boolean (value);
 		break;
 	case PROP_REFUSE_MSCHAP:
-		g_value_set_boolean (value, nm_setting_ppp_get_refuse_mschap (setting));
+		priv->refuse_mschap = g_value_get_boolean (value);
 		break;
 	case PROP_REFUSE_MSCHAPV2:
-		g_value_set_boolean (value, nm_setting_ppp_get_refuse_mschapv2 (setting));
+		priv->refuse_mschapv2 = g_value_get_boolean (value);
 		break;
 	case PROP_NOBSDCOMP:
-		g_value_set_boolean (value, nm_setting_ppp_get_nobsdcomp (setting));
+		priv->nobsdcomp = g_value_get_boolean (value);
 		break;
 	case PROP_NODEFLATE:
-		g_value_set_boolean (value, nm_setting_ppp_get_nodeflate (setting));
+		priv->nodeflate = g_value_get_boolean (value);
 		break;
 	case PROP_NO_VJ_COMP:
-		g_value_set_boolean (value, nm_setting_ppp_get_no_vj_comp (setting));
+		priv->no_vj_comp = g_value_get_boolean (value);
 		break;
 	case PROP_REQUIRE_MPPE:
-		g_value_set_boolean (value, nm_setting_ppp_get_require_mppe (setting));
+		priv->require_mppe = g_value_get_boolean (value);
 		break;
 	case PROP_REQUIRE_MPPE_128:
-		g_value_set_boolean (value, nm_setting_ppp_get_require_mppe_128 (setting));
+		priv->require_mppe_128 = g_value_get_boolean (value);
 		break;
 	case PROP_MPPE_STATEFUL:
-		g_value_set_boolean (value, nm_setting_ppp_get_mppe_stateful (setting));
+		priv->mppe_stateful = g_value_get_boolean (value);
 		break;
 	case PROP_CRTSCTS:
-		g_value_set_boolean (value, nm_setting_ppp_get_crtscts (setting));
+		priv->crtscts = g_value_get_boolean (value);
 		break;
 	case PROP_BAUD:
-		g_value_set_uint (value, nm_setting_ppp_get_baud (setting));
+		priv->baud = g_value_get_uint (value);
 		break;
 	case PROP_MRU:
-		g_value_set_uint (value, nm_setting_ppp_get_mru (setting));
+		priv->mru = g_value_get_uint (value);
 		break;
 	case PROP_MTU:
-		g_value_set_uint (value, nm_setting_ppp_get_mtu (setting));
+		priv->mtu = g_value_get_uint (value);
 		break;
 	case PROP_LCP_ECHO_FAILURE:
-		g_value_set_uint (value, nm_setting_ppp_get_lcp_echo_failure (setting));
+		priv->lcp_echo_failure = g_value_get_uint (value);
 		break;
 	case PROP_LCP_ECHO_INTERVAL:
-		g_value_set_uint (value, nm_setting_ppp_get_lcp_echo_interval (setting));
+		priv->lcp_echo_interval = g_value_get_uint (value);
 		break;
 	default:
 		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
@@ -522,6 +508,26 @@ get_property (GObject *object, guint prop_id,
 	}
 }
 
+/*****************************************************************************/
+
+static void
+nm_setting_ppp_init (NMSettingPpp *setting)
+{
+}
+
+/**
+ * nm_setting_ppp_new:
+ *
+ * Creates a new #NMSettingPpp object with default values.
+ *
+ * Returns: (transfer full): the new empty #NMSettingPpp object
+ **/
+NMSetting *
+nm_setting_ppp_new (void)
+{
+	return (NMSetting *) g_object_new (NM_TYPE_SETTING_PPP, NULL);
+}
+
 static void
 nm_setting_ppp_class_init (NMSettingPppClass *klass)
 {
@@ -530,8 +536,8 @@ nm_setting_ppp_class_init (NMSettingPppClass *klass)
 
 	g_type_class_add_private (klass, sizeof (NMSettingPppPrivate));
 
-	object_class->set_property = set_property;
 	object_class->get_property = get_property;
+	object_class->set_property = set_property;
 
 	setting_class->verify = verify;
 
@@ -542,120 +548,111 @@ nm_setting_ppp_class_init (NMSettingPppClass *klass)
 	 * authenticate itself to the client.  If %FALSE, require authentication
 	 * from the remote side.  In almost all cases, this should be %TRUE.
 	 **/
-	g_object_class_install_property
-		(object_class, PROP_NOAUTH,
-		 g_param_spec_boolean (NM_SETTING_PPP_NOAUTH, "", "",
-		                       TRUE,
-		                       G_PARAM_READWRITE |
-		                       G_PARAM_CONSTRUCT |
-		                       G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_NOAUTH] =
+	    g_param_spec_boolean (NM_SETTING_PPP_NOAUTH, "", "",
+	                          TRUE,
+	                          G_PARAM_READWRITE |
+	                          G_PARAM_CONSTRUCT |
+	                          G_PARAM_STATIC_STRINGS);
 
 	/**
 	 * NMSettingPpp:refuse-eap:
 	 *
 	 * If %TRUE, the EAP authentication method will not be used.
 	 **/
-	g_object_class_install_property
-		(object_class, PROP_REFUSE_EAP,
-		 g_param_spec_boolean (NM_SETTING_PPP_REFUSE_EAP, "", "",
-		                       FALSE,
-		                       G_PARAM_READWRITE |
-		                       G_PARAM_CONSTRUCT |
-		                       G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_REFUSE_EAP] =
+	    g_param_spec_boolean (NM_SETTING_PPP_REFUSE_EAP, "", "",
+	                          FALSE,
+	                          G_PARAM_READWRITE |
+	                          G_PARAM_CONSTRUCT |
+	                          G_PARAM_STATIC_STRINGS);
 
 	/**
 	 * NMSettingPpp:refuse-pap:
 	 *
 	 * If %TRUE, the PAP authentication method will not be used.
 	 **/
-	g_object_class_install_property
-		(object_class, PROP_REFUSE_PAP,
-		 g_param_spec_boolean (NM_SETTING_PPP_REFUSE_PAP, "", "",
-		                       FALSE,
-		                       G_PARAM_READWRITE |
-		                       G_PARAM_CONSTRUCT |
-		                       G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_REFUSE_PAP] =
+	    g_param_spec_boolean (NM_SETTING_PPP_REFUSE_PAP, "", "",
+	                          FALSE,
+	                          G_PARAM_READWRITE |
+	                          G_PARAM_CONSTRUCT |
+	                          G_PARAM_STATIC_STRINGS);
 
 	/**
 	 * NMSettingPpp:refuse-chap:
 	 *
 	 * If %TRUE, the CHAP authentication method will not be used.
 	 **/
-	g_object_class_install_property
-		(object_class, PROP_REFUSE_CHAP,
-		 g_param_spec_boolean (NM_SETTING_PPP_REFUSE_CHAP, "", "",
-		                       FALSE,
-		                       G_PARAM_READWRITE |
-		                       G_PARAM_CONSTRUCT |
-		                       G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_REFUSE_CHAP] =
+	    g_param_spec_boolean (NM_SETTING_PPP_REFUSE_CHAP, "", "",
+	                          FALSE,
+	                          G_PARAM_READWRITE |
+	                          G_PARAM_CONSTRUCT |
+	                          G_PARAM_STATIC_STRINGS);
 
 	/**
 	 * NMSettingPpp:refuse-mschap:
 	 *
 	 * If %TRUE, the MSCHAP authentication method will not be used.
 	 **/
-	g_object_class_install_property
-		(object_class, PROP_REFUSE_MSCHAP,
-		 g_param_spec_boolean (NM_SETTING_PPP_REFUSE_MSCHAP, "", "",
-		                       FALSE,
-		                       G_PARAM_READWRITE |
-		                       G_PARAM_CONSTRUCT |
-		                       G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_REFUSE_MSCHAP] =
+	    g_param_spec_boolean (NM_SETTING_PPP_REFUSE_MSCHAP, "", "",
+	                          FALSE,
+	                          G_PARAM_READWRITE |
+	                          G_PARAM_CONSTRUCT |
+	                          G_PARAM_STATIC_STRINGS);
 
 	/**
 	 * NMSettingPpp:refuse-mschapv2:
 	 *
 	 * If %TRUE, the MSCHAPv2 authentication method will not be used.
 	 **/
-	g_object_class_install_property
-		(object_class, PROP_REFUSE_MSCHAPV2,
-		 g_param_spec_boolean (NM_SETTING_PPP_REFUSE_MSCHAPV2, "", "",
-		                       FALSE,
-		                       G_PARAM_READWRITE |
-		                       G_PARAM_CONSTRUCT |
-		                       G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_REFUSE_MSCHAPV2] =
+	    g_param_spec_boolean (NM_SETTING_PPP_REFUSE_MSCHAPV2, "", "",
+	                          FALSE,
+	                          G_PARAM_READWRITE |
+	                          G_PARAM_CONSTRUCT |
+	                          G_PARAM_STATIC_STRINGS);
 
 	/**
 	 * NMSettingPpp:nobsdcomp:
 	 *
 	 * If %TRUE, BSD compression will not be requested.
 	 **/
-	g_object_class_install_property
-		(object_class, PROP_NOBSDCOMP,
-		 g_param_spec_boolean (NM_SETTING_PPP_NOBSDCOMP, "", "",
-		                       FALSE,
-		                       G_PARAM_READWRITE |
-		                       G_PARAM_CONSTRUCT |
-		                       NM_SETTING_PARAM_FUZZY_IGNORE |
-		                       G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_NOBSDCOMP] =
+	    g_param_spec_boolean (NM_SETTING_PPP_NOBSDCOMP, "", "",
+	                          FALSE,
+	                          G_PARAM_READWRITE |
+	                          G_PARAM_CONSTRUCT |
+	                          NM_SETTING_PARAM_FUZZY_IGNORE |
+	                          G_PARAM_STATIC_STRINGS);
 
 	/**
 	 * NMSettingPpp:nodeflate:
 	 *
 	 * If %TRUE, "deflate" compression will not be requested.
 	 **/
-	g_object_class_install_property
-		(object_class, PROP_NODEFLATE,
-		 g_param_spec_boolean (NM_SETTING_PPP_NODEFLATE, "", "",
-		                       FALSE,
-		                       G_PARAM_READWRITE |
-		                       G_PARAM_CONSTRUCT |
-		                       NM_SETTING_PARAM_FUZZY_IGNORE |
-		                       G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_NODEFLATE] =
+	    g_param_spec_boolean (NM_SETTING_PPP_NODEFLATE, "", "",
+	                          FALSE,
+	                          G_PARAM_READWRITE |
+	                          G_PARAM_CONSTRUCT |
+	                          NM_SETTING_PARAM_FUZZY_IGNORE |
+	                          G_PARAM_STATIC_STRINGS);
 
 	/**
 	 * NMSettingPpp:no-vj-comp:
 	 *
 	 * If %TRUE, Van Jacobsen TCP header compression will not be requested.
 	 **/
-	g_object_class_install_property
-		(object_class, PROP_NO_VJ_COMP,
-		 g_param_spec_boolean (NM_SETTING_PPP_NO_VJ_COMP, "", "",
-		                       FALSE,
-		                       G_PARAM_READWRITE |
-		                       G_PARAM_CONSTRUCT |
-		                       NM_SETTING_PARAM_FUZZY_IGNORE |
-		                       G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_NO_VJ_COMP] =
+	    g_param_spec_boolean (NM_SETTING_PPP_NO_VJ_COMP, "", "",
+	                          FALSE,
+	                          G_PARAM_READWRITE |
+	                          G_PARAM_CONSTRUCT |
+	                          NM_SETTING_PARAM_FUZZY_IGNORE |
+	                          G_PARAM_STATIC_STRINGS);
 
 	/**
 	 * NMSettingPpp:require-mppe:
@@ -665,13 +662,12 @@ nm_setting_ppp_class_init (NMSettingPppClass *klass)
 	 * session will fail.  Note that MPPE is not used on mobile broadband
 	 * connections.
 	 **/
-	g_object_class_install_property
-		(object_class, PROP_REQUIRE_MPPE,
-		 g_param_spec_boolean (NM_SETTING_PPP_REQUIRE_MPPE, "", "",
-		                       FALSE,
-		                       G_PARAM_READWRITE |
-		                       G_PARAM_CONSTRUCT |
-		                       G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_REQUIRE_MPPE] =
+	    g_param_spec_boolean (NM_SETTING_PPP_REQUIRE_MPPE, "", "",
+	                          FALSE,
+	                          G_PARAM_READWRITE |
+	                          G_PARAM_CONSTRUCT |
+	                          G_PARAM_STATIC_STRINGS);
 
 	/**
 	 * NMSettingPpp:require-mppe-128:
@@ -680,12 +676,11 @@ nm_setting_ppp_class_init (NMSettingPppClass *klass)
 	 * required for the PPP session, and the "require-mppe" property must also
 	 * be set to %TRUE.  If 128-bit MPPE is not available the session will fail.
 	 **/
-	g_object_class_install_property
-		(object_class, PROP_REQUIRE_MPPE_128,
-		 g_param_spec_boolean (NM_SETTING_PPP_REQUIRE_MPPE_128, "", "",
-		                       FALSE,
-		                       G_PARAM_READWRITE  | G_PARAM_CONSTRUCT |
-		                       G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_REQUIRE_MPPE_128] =
+	    g_param_spec_boolean (NM_SETTING_PPP_REQUIRE_MPPE_128, "", "",
+	                          FALSE,
+	                          G_PARAM_READWRITE  | G_PARAM_CONSTRUCT |
+	                          G_PARAM_STATIC_STRINGS);
 
 	/**
 	 * NMSettingPpp:mppe-stateful:
@@ -693,13 +688,12 @@ nm_setting_ppp_class_init (NMSettingPppClass *klass)
 	 * If %TRUE, stateful MPPE is used.  See pppd documentation for more
 	 * information on stateful MPPE.
 	 **/
-	g_object_class_install_property
-		(object_class, PROP_MPPE_STATEFUL,
-		 g_param_spec_boolean (NM_SETTING_PPP_MPPE_STATEFUL, "", "",
-		                       FALSE,
-		                       G_PARAM_READWRITE |
-		                       G_PARAM_CONSTRUCT |
-		                       G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_MPPE_STATEFUL] =
+	    g_param_spec_boolean (NM_SETTING_PPP_MPPE_STATEFUL, "", "",
+	                          FALSE,
+	                          G_PARAM_READWRITE |
+	                          G_PARAM_CONSTRUCT |
+	                          G_PARAM_STATIC_STRINGS);
 
 	/**
 	 * NMSettingPpp:crtscts:
@@ -708,13 +702,12 @@ nm_setting_ppp_class_init (NMSettingPppClass *klass)
 	 * flow control with RTS and CTS signals.  This value should normally be set
 	 * to %FALSE.
 	 **/
-	g_object_class_install_property
-		(object_class, PROP_CRTSCTS,
-		 g_param_spec_boolean (NM_SETTING_PPP_CRTSCTS, "", "",
-		                       FALSE,
-		                       G_PARAM_READWRITE |
-		                       G_PARAM_CONSTRUCT |
-		                       G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_CRTSCTS] =
+	    g_param_spec_boolean (NM_SETTING_PPP_CRTSCTS, "", "",
+	                          FALSE,
+	                          G_PARAM_READWRITE |
+	                          G_PARAM_CONSTRUCT |
+	                          G_PARAM_STATIC_STRINGS);
 
 	/**
 	 * NMSettingPpp:baud:
@@ -723,14 +716,13 @@ nm_setting_ppp_class_init (NMSettingPppClass *klass)
 	 * baudrate.  This value should normally be left as 0 to automatically
 	 * choose the speed.
 	 **/
-	g_object_class_install_property
-		(object_class, PROP_BAUD,
-		 g_param_spec_uint (NM_SETTING_PPP_BAUD, "", "",
-		                    0, G_MAXUINT32, 0,
-		                    G_PARAM_READWRITE |
-		                    G_PARAM_CONSTRUCT |
-		                    NM_SETTING_PARAM_FUZZY_IGNORE |
-		                    G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_BAUD] =
+	    g_param_spec_uint (NM_SETTING_PPP_BAUD, "", "",
+	                       0, G_MAXUINT32, 0,
+	                       G_PARAM_READWRITE |
+	                       G_PARAM_CONSTRUCT |
+	                       NM_SETTING_PARAM_FUZZY_IGNORE |
+	                       G_PARAM_STATIC_STRINGS);
 
 	/**
 	 * NMSettingPpp:mru:
@@ -739,13 +731,12 @@ nm_setting_ppp_class_init (NMSettingPppClass *klass)
 	 * larger than the specified size.  If non-zero, the MRU should be between
 	 * 128 and 16384.
 	 */
-	g_object_class_install_property
-		(object_class, PROP_MRU,
-		 g_param_spec_uint (NM_SETTING_PPP_MRU, "", "",
-		                    0, 16384, 0,
-		                    G_PARAM_READWRITE |
-		                    G_PARAM_CONSTRUCT |
-		                    G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_MRU] =
+	    g_param_spec_uint (NM_SETTING_PPP_MRU, "", "",
+	                       0, 16384, 0,
+	                       G_PARAM_READWRITE |
+	                       G_PARAM_CONSTRUCT |
+	                       G_PARAM_STATIC_STRINGS);
 
 	/**
 	 * NMSettingPpp:mtu:
@@ -753,14 +744,13 @@ nm_setting_ppp_class_init (NMSettingPppClass *klass)
 	 * If non-zero, instruct pppd to send packets no larger than the specified
 	 * size.
 	 **/
-	g_object_class_install_property
-		(object_class, PROP_MTU,
-		 g_param_spec_uint (NM_SETTING_PPP_MTU, "", "",
-		                    0, G_MAXUINT32, 0,
-		                    G_PARAM_READWRITE |
-		                    G_PARAM_CONSTRUCT |
-		                    NM_SETTING_PARAM_FUZZY_IGNORE |
-		                    G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_MTU] =
+	    g_param_spec_uint (NM_SETTING_PPP_MTU, "", "",
+	                       0, G_MAXUINT32, 0,
+	                       G_PARAM_READWRITE |
+	                       G_PARAM_CONSTRUCT |
+	                       NM_SETTING_PARAM_FUZZY_IGNORE |
+	                       G_PARAM_STATIC_STRINGS);
 
 	/**
 	 * NMSettingPpp:lcp-echo-failure:
@@ -770,14 +760,13 @@ nm_setting_ppp_class_init (NMSettingPppClass *klass)
 	 * peer.  The "lcp-echo-interval" property must also be set to a non-zero
 	 * value if this property is used.
 	 **/
-	g_object_class_install_property
-		(object_class, PROP_LCP_ECHO_FAILURE,
-		 g_param_spec_uint (NM_SETTING_PPP_LCP_ECHO_FAILURE, "", "",
-		                    0, G_MAXUINT32, 0,
-		                    G_PARAM_READWRITE |
-		                    G_PARAM_CONSTRUCT |
-		                    NM_SETTING_PARAM_FUZZY_IGNORE |
-		                    G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_LCP_ECHO_FAILURE] =
+	    g_param_spec_uint (NM_SETTING_PPP_LCP_ECHO_FAILURE, "", "",
+	                       0, G_MAXUINT32, 0,
+	                       G_PARAM_READWRITE |
+	                       G_PARAM_CONSTRUCT |
+	                       NM_SETTING_PARAM_FUZZY_IGNORE |
+	                       G_PARAM_STATIC_STRINGS);
 
 	/**
 	 * NMSettingPpp:lcp-echo-interval:
@@ -787,14 +776,15 @@ nm_setting_ppp_class_init (NMSettingPppClass *klass)
 	 * peers will respond to echo requests and some will not, and it is not
 	 * possible to autodetect this.
 	 **/
-	g_object_class_install_property
-		(object_class, PROP_LCP_ECHO_INTERVAL,
-		 g_param_spec_uint (NM_SETTING_PPP_LCP_ECHO_INTERVAL, "", "",
-		                    0, G_MAXUINT32, 0,
-		                    G_PARAM_READWRITE |
-		                    G_PARAM_CONSTRUCT |
-		                    NM_SETTING_PARAM_FUZZY_IGNORE |
-		                    G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_LCP_ECHO_INTERVAL] =
+	    g_param_spec_uint (NM_SETTING_PPP_LCP_ECHO_INTERVAL, "", "",
+	                       0, G_MAXUINT32, 0,
+	                       G_PARAM_READWRITE |
+	                       G_PARAM_CONSTRUCT |
+	                       NM_SETTING_PARAM_FUZZY_IGNORE |
+	                       G_PARAM_STATIC_STRINGS);
+
+	g_object_class_install_properties (object_class, _PROPERTY_ENUMS_LAST, obj_properties);
 
 	_nm_setting_class_commit (setting_class, NM_META_SETTING_TYPE_PPP);
 }
diff --git a/libnm-core/nm-setting-pppoe.c b/libnm-core/nm-setting-pppoe.c
index 793d93ce..e2d516c5 100644
--- a/libnm-core/nm-setting-pppoe.c
+++ b/libnm-core/nm-setting-pppoe.c
@@ -22,9 +22,8 @@
 
 #include "nm-default.h"
 
-#include 
-
 #include "nm-setting-pppoe.h"
+
 #include "nm-setting-ppp.h"
 #include "nm-setting-private.h"
 #include "nm-core-enum-types.h"
@@ -38,9 +37,15 @@
  * to provide IP transport, for example cable or DSL modems.
  **/
 
-G_DEFINE_TYPE (NMSettingPppoe, nm_setting_pppoe, NM_TYPE_SETTING)
+/*****************************************************************************/
 
-#define NM_SETTING_PPPOE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_SETTING_PPPOE, NMSettingPppoePrivate))
+NM_GOBJECT_PROPERTIES_DEFINE_BASE (
+	PROP_PARENT,
+	PROP_SERVICE,
+	PROP_USERNAME,
+	PROP_PASSWORD,
+	PROP_PASSWORD_FLAGS,
+);
 
 typedef struct {
 	char *parent;
@@ -50,29 +55,11 @@ typedef struct {
 	NMSettingSecretFlags password_flags;
 } NMSettingPppoePrivate;
 
-enum {
-	PROP_0,
-	PROP_PARENT,
-	PROP_SERVICE,
-	PROP_USERNAME,
-	PROP_PASSWORD,
-	PROP_PASSWORD_FLAGS,
+G_DEFINE_TYPE (NMSettingPppoe, nm_setting_pppoe, NM_TYPE_SETTING)
 
-	LAST_PROP
-};
+#define NM_SETTING_PPPOE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_SETTING_PPPOE, NMSettingPppoePrivate))
 
-/**
- * nm_setting_pppoe_new:
- *
- * Creates a new #NMSettingPppoe object with default values.
- *
- * Returns: (transfer full): the new empty #NMSettingPppoe object
- **/
-NMSetting *
-nm_setting_pppoe_new (void)
-{
-	return (NMSetting *) g_object_new (NM_TYPE_SETTING_PPPOE, NULL);
-}
+/*****************************************************************************/
 
 /**
  * nm_setting_pppoe_get_parent:
@@ -207,36 +194,29 @@ need_secrets (NMSetting *setting)
 	return secrets;
 }
 
-static void
-nm_setting_pppoe_init (NMSettingPppoe *setting)
-{
-}
+/*****************************************************************************/
 
 static void
-set_property (GObject *object, guint prop_id,
-              const GValue *value, GParamSpec *pspec)
+get_property (GObject *object, guint prop_id,
+              GValue *value, GParamSpec *pspec)
 {
-	NMSettingPppoePrivate *priv = NM_SETTING_PPPOE_GET_PRIVATE (object);
+	NMSettingPppoe *setting = NM_SETTING_PPPOE (object);
 
 	switch (prop_id) {
 	case PROP_PARENT:
-		g_free (priv->parent);
-		priv->parent = g_value_dup_string (value);
+		g_value_set_string (value, nm_setting_pppoe_get_parent (setting));
 		break;
 	case PROP_SERVICE:
-		g_free (priv->service);
-		priv->service = g_value_dup_string (value);
+		g_value_set_string (value, nm_setting_pppoe_get_service (setting));
 		break;
 	case PROP_USERNAME:
-		g_free (priv->username);
-		priv->username = g_value_dup_string (value);
+		g_value_set_string (value, nm_setting_pppoe_get_username (setting));
 		break;
 	case PROP_PASSWORD:
-		g_free (priv->password);
-		priv->password = g_value_dup_string (value);
+		g_value_set_string (value, nm_setting_pppoe_get_password (setting));
 		break;
 	case PROP_PASSWORD_FLAGS:
-		priv->password_flags = g_value_get_flags (value);
+		g_value_set_flags (value, nm_setting_pppoe_get_password_flags (setting));
 		break;
 	default:
 		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
@@ -245,26 +225,30 @@ set_property (GObject *object, guint prop_id,
 }
 
 static void
-get_property (GObject *object, guint prop_id,
-              GValue *value, GParamSpec *pspec)
+set_property (GObject *object, guint prop_id,
+              const GValue *value, GParamSpec *pspec)
 {
-	NMSettingPppoe *setting = NM_SETTING_PPPOE (object);
+	NMSettingPppoePrivate *priv = NM_SETTING_PPPOE_GET_PRIVATE (object);
 
 	switch (prop_id) {
 	case PROP_PARENT:
-		g_value_set_string (value, nm_setting_pppoe_get_parent (setting));
+		g_free (priv->parent);
+		priv->parent = g_value_dup_string (value);
 		break;
 	case PROP_SERVICE:
-		g_value_set_string (value, nm_setting_pppoe_get_service (setting));
+		g_free (priv->service);
+		priv->service = g_value_dup_string (value);
 		break;
 	case PROP_USERNAME:
-		g_value_set_string (value, nm_setting_pppoe_get_username (setting));
+		g_free (priv->username);
+		priv->username = g_value_dup_string (value);
 		break;
 	case PROP_PASSWORD:
-		g_value_set_string (value, nm_setting_pppoe_get_password (setting));
+		g_free (priv->password);
+		priv->password = g_value_dup_string (value);
 		break;
 	case PROP_PASSWORD_FLAGS:
-		g_value_set_flags (value, nm_setting_pppoe_get_password_flags (setting));
+		priv->password_flags = g_value_get_flags (value);
 		break;
 	default:
 		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
@@ -272,6 +256,26 @@ get_property (GObject *object, guint prop_id,
 	}
 }
 
+/*****************************************************************************/
+
+static void
+nm_setting_pppoe_init (NMSettingPppoe *setting)
+{
+}
+
+/**
+ * nm_setting_pppoe_new:
+ *
+ * Creates a new #NMSettingPppoe object with default values.
+ *
+ * Returns: (transfer full): the new empty #NMSettingPppoe object
+ **/
+NMSetting *
+nm_setting_pppoe_new (void)
+{
+	return (NMSetting *) g_object_new (NM_TYPE_SETTING_PPPOE, NULL);
+}
+
 static void
 finalize (GObject *object)
 {
@@ -293,8 +297,8 @@ nm_setting_pppoe_class_init (NMSettingPppoeClass *klass)
 
 	g_type_class_add_private (klass, sizeof (NMSettingPppoePrivate));
 
-	object_class->set_property = set_property;
 	object_class->get_property = get_property;
+	object_class->set_property = set_property;
 	object_class->finalize     = finalize;
 
 	setting_class->verify       = verify;
@@ -310,14 +314,13 @@ nm_setting_pppoe_class_init (NMSettingPppoeClass *klass)
 	 *
 	 * Since: 1.10
 	 **/
-	g_object_class_install_property
-		(object_class, PROP_PARENT,
-		 g_param_spec_string (NM_SETTING_PPPOE_PARENT, "", "",
-		                      NULL,
-		                      G_PARAM_READWRITE |
-		                      G_PARAM_CONSTRUCT |
-		                      NM_SETTING_PARAM_INFERRABLE |
-		                      G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_PARENT] =
+	    g_param_spec_string (NM_SETTING_PPPOE_PARENT, "", "",
+	                         NULL,
+	                         G_PARAM_READWRITE |
+	                         G_PARAM_CONSTRUCT |
+	                         NM_SETTING_PARAM_INFERRABLE |
+	                         G_PARAM_STATIC_STRINGS);
 
 	/**
 	 * NMSettingPppoe:service:
@@ -327,50 +330,48 @@ nm_setting_pppoe_class_init (NMSettingPppoeClass *klass)
 	 * this should be left blank.  It is only required if there are multiple
 	 * access concentrators or a specific service is known to be required.
 	 **/
-	g_object_class_install_property
-		(object_class, PROP_SERVICE,
-		 g_param_spec_string (NM_SETTING_PPPOE_SERVICE, "", "",
-		                      NULL,
-		                      G_PARAM_READWRITE |
-		                      G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_SERVICE] =
+	    g_param_spec_string (NM_SETTING_PPPOE_SERVICE, "", "",
+	                         NULL,
+	                         G_PARAM_READWRITE |
+	                         G_PARAM_STATIC_STRINGS);
 
 	/**
 	 * NMSettingPppoe:username:
 	 *
 	 * Username used to authenticate with the PPPoE service.
 	 **/
-	g_object_class_install_property
-		(object_class, PROP_USERNAME,
-		 g_param_spec_string (NM_SETTING_PPPOE_USERNAME, "", "",
-		                      NULL,
-		                      G_PARAM_READWRITE |
-		                      G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_USERNAME] =
+	    g_param_spec_string (NM_SETTING_PPPOE_USERNAME, "", "",
+	                         NULL,
+	                         G_PARAM_READWRITE |
+	                         G_PARAM_STATIC_STRINGS);
 
 	/**
 	 * NMSettingPppoe:password:
 	 *
 	 * Password used to authenticate with the PPPoE service.
 	 **/
-	g_object_class_install_property
-		(object_class, PROP_PASSWORD,
-		 g_param_spec_string (NM_SETTING_PPPOE_PASSWORD, "", "",
-		                      NULL,
-		                      G_PARAM_READWRITE |
-		                      NM_SETTING_PARAM_SECRET |
-		                      G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_PASSWORD] =
+	    g_param_spec_string (NM_SETTING_PPPOE_PASSWORD, "", "",
+	                         NULL,
+	                         G_PARAM_READWRITE |
+	                         NM_SETTING_PARAM_SECRET |
+	                         G_PARAM_STATIC_STRINGS);
 
 	/**
 	 * NMSettingPppoe:password-flags:
 	 *
 	 * Flags indicating how to handle the #NMSettingPppoe:password property.
 	 **/
-	g_object_class_install_property
-		(object_class, PROP_PASSWORD_FLAGS,
-		 g_param_spec_flags (NM_SETTING_PPPOE_PASSWORD_FLAGS, "", "",
-		                     NM_TYPE_SETTING_SECRET_FLAGS,
-		                     NM_SETTING_SECRET_FLAG_NONE,
-		                     G_PARAM_READWRITE |
-		                     G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_PASSWORD_FLAGS] =
+	    g_param_spec_flags (NM_SETTING_PPPOE_PASSWORD_FLAGS, "", "",
+	                        NM_TYPE_SETTING_SECRET_FLAGS,
+	                        NM_SETTING_SECRET_FLAG_NONE,
+	                        G_PARAM_READWRITE |
+	                        G_PARAM_STATIC_STRINGS);
+
+	g_object_class_install_properties (object_class, _PROPERTY_ENUMS_LAST, obj_properties);
 
 	_nm_setting_class_commit (setting_class, NM_META_SETTING_TYPE_PPPOE);
 }
diff --git a/libnm-core/nm-setting-private.h b/libnm-core/nm-setting-private.h
index 1e25226e..2af74ec4 100644
--- a/libnm-core/nm-setting-private.h
+++ b/libnm-core/nm-setting-private.h
@@ -39,6 +39,8 @@ int _nm_setting_compare_priority (gconstpointer a, gconstpointer b);
 
 /*****************************************************************************/
 
+void _nm_setting_emit_property_changed (NMSetting *setting);
+
 typedef enum NMSettingUpdateSecretResult {
 	NM_SETTING_UPDATE_SECRET_ERROR              = FALSE,
 	NM_SETTING_UPDATE_SECRET_SUCCESS_MODIFIED   = TRUE,
@@ -48,10 +50,9 @@ typedef enum NMSettingUpdateSecretResult {
 NMSettingUpdateSecretResult _nm_setting_update_secrets (NMSetting *setting,
                                                         GVariant *secrets,
                                                         GError **error);
-gboolean _nm_setting_clear_secrets (NMSetting *setting);
-gboolean _nm_setting_clear_secrets_with_flags (NMSetting *setting,
-                                               NMSettingClearSecretsWithFlagsFn func,
-                                               gpointer user_data);
+gboolean _nm_setting_clear_secrets (NMSetting *setting,
+                                    NMSettingClearSecretsWithFlagsFn func,
+                                    gpointer user_data);
 
 /* The property of the #NMSetting should be considered during comparisons that
  * use the %NM_SETTING_COMPARE_FLAG_INFERRABLE flag. Properties that don't have
@@ -82,9 +83,11 @@ gboolean _nm_setting_clear_secrets_with_flags (NMSetting *setting,
 
 #define NM_SETTING_PARAM_GENDATA_BACKED (1 << (7 + G_PARAM_USER_SHIFT))
 
-GVariant *_nm_setting_get_deprecated_virtual_interface_name (NMSetting *setting,
+GVariant *_nm_setting_get_deprecated_virtual_interface_name (const NMSettInfoSetting *sett_info,
+                                                             guint property_idx,
                                                              NMConnection *connection,
-                                                             const char *property);
+                                                             NMSetting *setting,
+                                                             NMConnectionSerializationFlags flags);
 
 NMSettingVerifyResult _nm_setting_verify (NMSetting *setting,
                                           NMConnection *connection,
@@ -95,6 +98,10 @@ gboolean _nm_setting_verify_secret_string (const char *str,
                                            const char *property,
                                            GError **error);
 
+gboolean _nm_setting_aggregate (NMSetting *setting,
+                                NMConnectionAggregateType type,
+                                gpointer arg);
+
 gboolean _nm_setting_slave_type_is_valid (const char *slave_type, const char **out_port_type);
 
 GVariant   *_nm_setting_to_dbus       (NMSetting *setting,
@@ -107,6 +114,11 @@ NMSetting  *_nm_setting_new_from_dbus (GType setting_type,
                                        NMSettingParseFlags parse_flags,
                                        GError **error);
 
+gboolean _nm_setting_property_is_regular_secret (NMSetting *setting,
+                                                 const char *secret_name);
+gboolean _nm_setting_property_is_regular_secret_flags (NMSetting *setting,
+                                                       const char *secret_flags_name);
+
 /*****************************************************************************/
 
 static inline GArray *
@@ -187,6 +199,11 @@ gboolean _nm_setting_use_legacy_property (NMSetting *setting,
 
 GPtrArray  *_nm_setting_need_secrets (NMSetting *setting);
 
+gboolean _nm_setting_should_compare_secret_property (NMSetting *setting,
+                                                     NMSetting *other,
+                                                     const char *secret_name,
+                                                     NMSettingCompareFlags flags);
+
 /*****************************************************************************/
 
 #endif  /* NM_SETTING_PRIVATE_H */
diff --git a/libnm-core/nm-setting-proxy.c b/libnm-core/nm-setting-proxy.c
index d544c7fa..dbb69aeb 100644
--- a/libnm-core/nm-setting-proxy.c
+++ b/libnm-core/nm-setting-proxy.c
@@ -22,6 +22,7 @@
 #include "nm-default.h"
 
 #include "nm-setting-proxy.h"
+
 #include "nm-utils.h"
 #include "nm-setting-private.h"
 
@@ -39,9 +40,14 @@
  * to fulfill client queries.
  **/
 
-G_DEFINE_TYPE (NMSettingProxy, nm_setting_proxy, NM_TYPE_SETTING)
+/*****************************************************************************/
 
-#define NM_SETTING_PROXY_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_SETTING_PROXY, NMSettingProxyPrivate))
+NM_GOBJECT_PROPERTIES_DEFINE_BASE (
+	PROP_METHOD,
+	PROP_BROWSER_ONLY,
+	PROP_PAC_URL,
+	PROP_PAC_SCRIPT,
+);
 
 typedef struct {
 	NMSettingProxyMethod method;
@@ -50,30 +56,11 @@ typedef struct {
 	char *pac_script;
 } NMSettingProxyPrivate;
 
-enum {
-	PROP_0,
-	PROP_METHOD,
-	PROP_BROWSER_ONLY,
-	PROP_PAC_URL,
-	PROP_PAC_SCRIPT,
+G_DEFINE_TYPE (NMSettingProxy, nm_setting_proxy, NM_TYPE_SETTING)
 
-	LAST_PROP
-};
+#define NM_SETTING_PROXY_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_SETTING_PROXY, NMSettingProxyPrivate))
 
-/**
- * nm_setting_proxy_new:
- *
- * Creates a new #NMSettingProxy object.
- *
- * Returns: the new empty #NMSettingProxy object
- *
- * Since: 1.6
- **/
-NMSetting *
-nm_setting_proxy_new (void)
-{
-	return (NMSetting *) g_object_new (NM_TYPE_SETTING_PROXY, NULL);
-}
+/*****************************************************************************/
 
 /**
  * nm_setting_proxy_get_method:
@@ -213,22 +200,7 @@ verify (NMSetting *setting, NMConnection *connection, GError **error)
 	return TRUE;
 }
 
-static void
-nm_setting_proxy_init (NMSettingProxy *setting)
-{
-}
-
-static void
-finalize (GObject *object)
-{
-	NMSettingProxy *self = NM_SETTING_PROXY (object);
-	NMSettingProxyPrivate *priv = NM_SETTING_PROXY_GET_PRIVATE (self);
-
-	g_free (priv->pac_url);
-	g_free (priv->pac_script);
-
-	G_OBJECT_CLASS (nm_setting_proxy_parent_class)->finalize (object);
-}
+/*****************************************************************************/
 
 static void
 get_property (GObject *object, guint prop_id,
@@ -282,6 +254,40 @@ set_property (GObject *object, guint prop_id,
 	}
 }
 
+/*****************************************************************************/
+
+static void
+nm_setting_proxy_init (NMSettingProxy *setting)
+{
+}
+
+/**
+ * nm_setting_proxy_new:
+ *
+ * Creates a new #NMSettingProxy object.
+ *
+ * Returns: the new empty #NMSettingProxy object
+ *
+ * Since: 1.6
+ **/
+NMSetting *
+nm_setting_proxy_new (void)
+{
+	return (NMSetting *) g_object_new (NM_TYPE_SETTING_PROXY, NULL);
+}
+
+static void
+finalize (GObject *object)
+{
+	NMSettingProxy *self = NM_SETTING_PROXY (object);
+	NMSettingProxyPrivate *priv = NM_SETTING_PROXY_GET_PRIVATE (self);
+
+	g_free (priv->pac_url);
+	g_free (priv->pac_script);
+
+	G_OBJECT_CLASS (nm_setting_proxy_parent_class)->finalize (object);
+}
+
 static void
 nm_setting_proxy_class_init (NMSettingProxyClass *klass)
 {
@@ -290,8 +296,8 @@ nm_setting_proxy_class_init (NMSettingProxyClass *klass)
 
 	g_type_class_add_private (klass, sizeof (NMSettingProxyPrivate));
 
-	object_class->set_property = set_property;
 	object_class->get_property = get_property;
+	object_class->set_property = set_property;
 	object_class->finalize     = finalize;
 
 	setting_class->verify = verify;
@@ -312,13 +318,12 @@ nm_setting_proxy_class_init (NMSettingProxyClass *klass)
 	 * values: none, auto
 	 * ---end---
 	 */
-	g_object_class_install_property
-	    (object_class, PROP_METHOD,
-	     g_param_spec_int (NM_SETTING_PROXY_METHOD, "", "",
-	                       G_MININT32, G_MAXINT32, NM_SETTING_PROXY_METHOD_NONE,
-	                       G_PARAM_READWRITE |
-	                       G_PARAM_CONSTRUCT |
-	                       G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_METHOD] =
+	    g_param_spec_int (NM_SETTING_PROXY_METHOD, "", "",
+	                      G_MININT32, G_MAXINT32, NM_SETTING_PROXY_METHOD_NONE,
+	                      G_PARAM_READWRITE |
+	                      G_PARAM_CONSTRUCT |
+	                      G_PARAM_STATIC_STRINGS);
 
 	/**
 	 * NMSettingProxy:browser-only:
@@ -334,12 +339,11 @@ nm_setting_proxy_class_init (NMSettingProxyClass *klass)
 	 * description: Whether the proxy configuration is for browser only.
 	 * ---end---
 	 */
-	g_object_class_install_property
-	    (object_class, PROP_BROWSER_ONLY,
-	     g_param_spec_boolean (NM_SETTING_PROXY_BROWSER_ONLY, "", "",
-	                           FALSE,
-	                           G_PARAM_READWRITE |
-	                           G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_BROWSER_ONLY] =
+	    g_param_spec_boolean (NM_SETTING_PROXY_BROWSER_ONLY, "", "",
+	                          FALSE,
+	                          G_PARAM_READWRITE |
+	                          G_PARAM_STATIC_STRINGS);
 
 	/**
 	 * NMSettingProxy:pac-url:
@@ -355,12 +359,11 @@ nm_setting_proxy_class_init (NMSettingProxyClass *klass)
 	 * example: PAC_URL=http://wpad.mycompany.com/wpad.dat
 	 * ---end---
 	 */
-	g_object_class_install_property
-	    (object_class, PROP_PAC_URL,
-	     g_param_spec_string (NM_SETTING_PROXY_PAC_URL, "", "",
-	                          NULL,
-	                          G_PARAM_READWRITE |
-	                          G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_PAC_URL] =
+	    g_param_spec_string (NM_SETTING_PROXY_PAC_URL, "", "",
+	                         NULL,
+	                         G_PARAM_READWRITE |
+	                         G_PARAM_STATIC_STRINGS);
 
 	/**
 	 * NMSettingProxy:pac-script:
@@ -376,12 +379,13 @@ nm_setting_proxy_class_init (NMSettingProxyClass *klass)
 	 * example: PAC_SCRIPT=/home/joe/proxy.pac
 	 * ---end---
 	 */
-	g_object_class_install_property
-	    (object_class, PROP_PAC_SCRIPT,
-	     g_param_spec_string (NM_SETTING_PROXY_PAC_SCRIPT, "", "",
-	                          NULL,
-	                          G_PARAM_READWRITE |
-	                          G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_PAC_SCRIPT] =
+	    g_param_spec_string (NM_SETTING_PROXY_PAC_SCRIPT, "", "",
+	                         NULL,
+	                         G_PARAM_READWRITE |
+	                         G_PARAM_STATIC_STRINGS);
+
+	g_object_class_install_properties (object_class, _PROPERTY_ENUMS_LAST, obj_properties);
 
 	_nm_setting_class_commit (setting_class, NM_META_SETTING_TYPE_PROXY);
 }
diff --git a/libnm-core/nm-setting-serial.c b/libnm-core/nm-setting-serial.c
index b173197d..36bc4f69 100644
--- a/libnm-core/nm-setting-serial.c
+++ b/libnm-core/nm-setting-serial.c
@@ -22,9 +22,8 @@
 
 #include "nm-default.h"
 
-#include 
-
 #include "nm-setting-serial.h"
+
 #include "nm-setting-private.h"
 
 /**
@@ -37,9 +36,15 @@
  * such as mobile broadband or analog telephone connections.
  **/
 
-G_DEFINE_TYPE (NMSettingSerial, nm_setting_serial, NM_TYPE_SETTING)
+/*****************************************************************************/
 
-#define NM_SETTING_SERIAL_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_SETTING_SERIAL, NMSettingSerialPrivate))
+NM_GOBJECT_PROPERTIES_DEFINE_BASE (
+	PROP_BAUD,
+	PROP_BITS,
+	PROP_PARITY,
+	PROP_STOPBITS,
+	PROP_SEND_DELAY,
+);
 
 typedef struct {
 	guint baud;
@@ -49,29 +54,11 @@ typedef struct {
 	guint64 send_delay;
 } NMSettingSerialPrivate;
 
-enum {
-	PROP_0,
-	PROP_BAUD,
-	PROP_BITS,
-	PROP_PARITY,
-	PROP_STOPBITS,
-	PROP_SEND_DELAY,
+G_DEFINE_TYPE (NMSettingSerial, nm_setting_serial, NM_TYPE_SETTING)
 
-	LAST_PROP
-};
+#define NM_SETTING_SERIAL_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_SETTING_SERIAL, NMSettingSerialPrivate))
 
-/**
- * nm_setting_serial_new:
- *
- * Creates a new #NMSettingSerial object with default values.
- *
- * Returns: (transfer full): the new empty #NMSettingSerial object
- **/
-NMSetting *
-nm_setting_serial_new (void)
-{
-	return (NMSetting *) g_object_new (NM_TYPE_SETTING_SERIAL, NULL);
-}
+/*****************************************************************************/
 
 /**
  * nm_setting_serial_get_baud:
@@ -143,11 +130,6 @@ nm_setting_serial_get_send_delay (NMSettingSerial *setting)
 	return NM_SETTING_SERIAL_GET_PRIVATE (setting)->send_delay;
 }
 
-static void
-nm_setting_serial_init (NMSettingSerial *setting)
-{
-}
-
 static GVariant *
 parity_to_dbus (const GValue *from)
 {
@@ -179,27 +161,29 @@ parity_from_dbus (GVariant *from, GValue *to)
 	}
 }
 
+/*****************************************************************************/
+
 static void
-set_property (GObject *object, guint prop_id,
-              const GValue *value, GParamSpec *pspec)
+get_property (GObject *object, guint prop_id,
+              GValue *value, GParamSpec *pspec)
 {
-	NMSettingSerialPrivate *priv = NM_SETTING_SERIAL_GET_PRIVATE (object);
+	NMSettingSerial *setting = NM_SETTING_SERIAL (object);
 
 	switch (prop_id) {
 	case PROP_BAUD:
-		priv->baud = g_value_get_uint (value);
+		g_value_set_uint (value, nm_setting_serial_get_baud (setting));
 		break;
 	case PROP_BITS:
-		priv->bits = g_value_get_uint (value);
+		g_value_set_uint (value, nm_setting_serial_get_bits (setting));
 		break;
 	case PROP_PARITY:
-		priv->parity = g_value_get_enum (value);
+		g_value_set_enum (value, nm_setting_serial_get_parity (setting));
 		break;
 	case PROP_STOPBITS:
-		priv->stopbits = g_value_get_uint (value);
+		g_value_set_uint (value, nm_setting_serial_get_stopbits (setting));
 		break;
 	case PROP_SEND_DELAY:
-		priv->send_delay = g_value_get_uint64 (value);
+		g_value_set_uint64 (value, nm_setting_serial_get_send_delay (setting));
 		break;
 	default:
 		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
@@ -208,26 +192,26 @@ set_property (GObject *object, guint prop_id,
 }
 
 static void
-get_property (GObject *object, guint prop_id,
-              GValue *value, GParamSpec *pspec)
+set_property (GObject *object, guint prop_id,
+              const GValue *value, GParamSpec *pspec)
 {
-	NMSettingSerial *setting = NM_SETTING_SERIAL (object);
+	NMSettingSerialPrivate *priv = NM_SETTING_SERIAL_GET_PRIVATE (object);
 
 	switch (prop_id) {
 	case PROP_BAUD:
-		g_value_set_uint (value, nm_setting_serial_get_baud (setting));
+		priv->baud = g_value_get_uint (value);
 		break;
 	case PROP_BITS:
-		g_value_set_uint (value, nm_setting_serial_get_bits (setting));
+		priv->bits = g_value_get_uint (value);
 		break;
 	case PROP_PARITY:
-		g_value_set_enum (value, nm_setting_serial_get_parity (setting));
+		priv->parity = g_value_get_enum (value);
 		break;
 	case PROP_STOPBITS:
-		g_value_set_uint (value, nm_setting_serial_get_stopbits (setting));
+		priv->stopbits = g_value_get_uint (value);
 		break;
 	case PROP_SEND_DELAY:
-		g_value_set_uint64 (value, nm_setting_serial_get_send_delay (setting));
+		priv->send_delay = g_value_get_uint64 (value);
 		break;
 	default:
 		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
@@ -235,6 +219,26 @@ get_property (GObject *object, guint prop_id,
 	}
 }
 
+/*****************************************************************************/
+
+static void
+nm_setting_serial_init (NMSettingSerial *setting)
+{
+}
+
+/**
+ * nm_setting_serial_new:
+ *
+ * Creates a new #NMSettingSerial object with default values.
+ *
+ * Returns: (transfer full): the new empty #NMSettingSerial object
+ **/
+NMSetting *
+nm_setting_serial_new (void)
+{
+	return (NMSetting *) g_object_new (NM_TYPE_SETTING_SERIAL, NULL);
+}
+
 static void
 nm_setting_serial_class_init (NMSettingSerialClass *klass)
 {
@@ -244,8 +248,8 @@ nm_setting_serial_class_init (NMSettingSerialClass *klass)
 
 	g_type_class_add_private (klass, sizeof (NMSettingSerialPrivate));
 
-	object_class->set_property = set_property;
 	object_class->get_property = get_property;
+	object_class->set_property = set_property;
 
 	/**
 	 * NMSettingSerial:baud:
@@ -254,26 +258,24 @@ nm_setting_serial_class_init (NMSettingSerialClass *klass)
 	 * value usually has no effect for mobile broadband modems as they generally
 	 * ignore speed settings and use the highest available speed.
 	 **/
-	g_object_class_install_property
-		(object_class, PROP_BAUD,
-		 g_param_spec_uint (NM_SETTING_SERIAL_BAUD, "", "",
-		                    0, G_MAXUINT, 57600,
-		                    G_PARAM_READWRITE |
-		                    G_PARAM_CONSTRUCT |
-		                    G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_BAUD] =
+	    g_param_spec_uint (NM_SETTING_SERIAL_BAUD, "", "",
+	                       0, G_MAXUINT, 57600,
+	                       G_PARAM_READWRITE |
+	                       G_PARAM_CONSTRUCT |
+	                       G_PARAM_STATIC_STRINGS);
 
 	/**
 	 * NMSettingSerial:bits:
 	 *
 	 * Byte-width of the serial communication. The 8 in "8n1" for example.
 	 **/
-	g_object_class_install_property
-		(object_class, PROP_BITS,
-		 g_param_spec_uint (NM_SETTING_SERIAL_BITS, "", "",
-		                    5, 8, 8,
-		                    G_PARAM_READWRITE |
-		                    G_PARAM_CONSTRUCT |
-		                    G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_BITS] =
+	    g_param_spec_uint (NM_SETTING_SERIAL_BITS, "", "",
+	                       5, 8, 8,
+	                       G_PARAM_READWRITE |
+	                       G_PARAM_CONSTRUCT |
+	                       G_PARAM_STATIC_STRINGS);
 
 	/**
 	 * NMSettingSerial:parity:
@@ -295,18 +297,16 @@ nm_setting_serial_class_init (NMSettingSerialClass *klass)
 	 *   111 (ASCII 'o') for odd, 110 (ASCII 'n') for none.
 	 * ---end---
 	 */
-	g_object_class_install_property
-		(object_class, PROP_PARITY,
-		 g_param_spec_enum (NM_SETTING_SERIAL_PARITY, "", "",
-		                    NM_TYPE_SETTING_SERIAL_PARITY,
-		                    NM_SETTING_SERIAL_PARITY_NONE,
-		                    G_PARAM_READWRITE |
-		                    G_PARAM_CONSTRUCT |
-		                    G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_PARITY] =
+	    g_param_spec_enum (NM_SETTING_SERIAL_PARITY, "", "",
+	                       NM_TYPE_SETTING_SERIAL_PARITY,
+	                       NM_SETTING_SERIAL_PARITY_NONE,
+	                       G_PARAM_READWRITE |
+	                       G_PARAM_CONSTRUCT |
+	                       G_PARAM_STATIC_STRINGS);
 
 	_properties_override_add_transform (properties_override,
-	                                    g_object_class_find_property (G_OBJECT_CLASS (setting_class),
-	                                                                  NM_SETTING_SERIAL_PARITY),
+	                                    obj_properties[PROP_PARITY],
 	                                    G_VARIANT_TYPE_BYTE,
 	                                    parity_to_dbus,
 	                                    parity_from_dbus);
@@ -317,26 +317,26 @@ nm_setting_serial_class_init (NMSettingSerialClass *klass)
 	 * Number of stop bits for communication on the serial port.  Either 1 or 2.
 	 * The 1 in "8n1" for example.
 	 **/
-	g_object_class_install_property
-		(object_class, PROP_STOPBITS,
-		 g_param_spec_uint (NM_SETTING_SERIAL_STOPBITS, "", "",
-		                    1, 2, 1,
-		                    G_PARAM_READWRITE |
-		                    G_PARAM_CONSTRUCT |
-		                    G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_STOPBITS] =
+	    g_param_spec_uint (NM_SETTING_SERIAL_STOPBITS, "", "",
+	                       1, 2, 1,
+	                       G_PARAM_READWRITE |
+	                       G_PARAM_CONSTRUCT |
+	                       G_PARAM_STATIC_STRINGS);
 
 	/**
 	 * NMSettingSerial:send-delay:
 	 *
 	 * Time to delay between each byte sent to the modem, in microseconds.
 	 **/
-	g_object_class_install_property
-		(object_class, PROP_SEND_DELAY,
-		 g_param_spec_uint64 (NM_SETTING_SERIAL_SEND_DELAY, "", "",
-		                      0, G_MAXUINT64, 0,
-		                      G_PARAM_READWRITE |
-		                      G_PARAM_CONSTRUCT |
-		                      G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_SEND_DELAY] =
+	    g_param_spec_uint64 (NM_SETTING_SERIAL_SEND_DELAY, "", "",
+	                         0, G_MAXUINT64, 0,
+	                         G_PARAM_READWRITE |
+	                         G_PARAM_CONSTRUCT |
+	                         G_PARAM_STATIC_STRINGS);
+
+	g_object_class_install_properties (object_class, _PROPERTY_ENUMS_LAST, obj_properties);
 
 	_nm_setting_class_commit_full (setting_class, NM_META_SETTING_TYPE_SERIAL,
 	                               NULL, properties_override);
diff --git a/libnm-core/nm-setting-sriov.c b/libnm-core/nm-setting-sriov.c
index 0addd972..9c7306e0 100644
--- a/libnm-core/nm-setting-sriov.c
+++ b/libnm-core/nm-setting-sriov.c
@@ -15,6 +15,7 @@
 #include "nm-default.h"
 
 #include "nm-setting-sriov.h"
+
 #include "nm-setting-private.h"
 #include "nm-utils-private.h"
 
@@ -24,6 +25,14 @@
  * @include: nm-setting-sriov.h
  **/
 
+/*****************************************************************************/
+
+NM_GOBJECT_PROPERTIES_DEFINE (NMSettingSriov,
+	PROP_TOTAL_VFS,
+	PROP_VFS,
+	PROP_AUTOPROBE_DRIVERS,
+);
+
 /**
  * NMSettingSriov:
  *
@@ -44,15 +53,6 @@ struct _NMSettingSriovClass {
 
 G_DEFINE_TYPE (NMSettingSriov, nm_setting_sriov, NM_TYPE_SETTING)
 
-enum {
-	PROP_0,
-	PROP_TOTAL_VFS,
-	PROP_VFS,
-	PROP_AUTOPROBE_DRIVERS,
-
-	LAST_PROP
-};
-
 /*****************************************************************************/
 
 G_DEFINE_BOXED_TYPE (NMSriovVF, nm_sriov_vf, nm_sriov_vf_dup, nm_sriov_vf_unref)
@@ -704,21 +704,6 @@ nm_sriov_vf_get_vlan_protocol (const NMSriovVF *vf, guint vlan_id)
 
 /*****************************************************************************/
 
-/**
- * nm_setting_sriov_new:
- *
- * Creates a new #NMSettingSriov object with default values.
- *
- * Returns: (transfer full): the new empty #NMSettingSriov object
- *
- * Since: 1.14
- **/
-NMSetting *
-nm_setting_sriov_new (void)
-{
-	return (NMSetting *) g_object_new (NM_TYPE_SETTING_SRIOV, NULL);
-}
-
 /**
  * nm_setting_sriov_get_total_vfs:
  * @setting: the #NMSettingSriov
@@ -790,7 +775,7 @@ nm_setting_sriov_add_vf (NMSettingSriov *setting, NMSriovVF *vf)
 	g_return_if_fail (vf->refcount > 0);
 
 	g_ptr_array_add (setting->vfs, nm_sriov_vf_dup (vf));
-	g_object_notify (G_OBJECT (setting), NM_SETTING_SRIOV_VFS);
+	_notify (setting, PROP_VFS);
 }
 
 /**
@@ -809,7 +794,7 @@ nm_setting_sriov_remove_vf (NMSettingSriov *setting, guint idx)
 	g_return_if_fail (idx < setting->vfs->len);
 
 	g_ptr_array_remove_index (setting->vfs, idx);
-	g_object_notify (G_OBJECT (setting), NM_SETTING_SRIOV_VFS);
+	_notify (setting, PROP_VFS);
 }
 
 /**
@@ -834,7 +819,7 @@ nm_setting_sriov_remove_vf_by_index (NMSettingSriov *setting,
 	for (i = 0; i < setting->vfs->len; i++) {
 		if (nm_sriov_vf_get_index  (setting->vfs->pdata[i]) == index) {
 			g_ptr_array_remove_index (setting->vfs, i);
-			g_object_notify (G_OBJECT (setting), NM_SETTING_SRIOV_VFS);
+			_notify (setting, PROP_VFS);
 			return TRUE;
 		}
 	}
@@ -856,7 +841,7 @@ nm_setting_sriov_clear_vfs (NMSettingSriov *setting)
 
 	if (setting->vfs->len != 0) {
 		g_ptr_array_set_size (setting->vfs, 0);
-		g_object_notify (G_OBJECT (setting), NM_SETTING_SRIOV_VFS);
+		_notify (setting, PROP_VFS);
 	}
 }
 
@@ -934,7 +919,7 @@ vfs_to_dbus (NMSetting *setting, const char *property)
 			GVariantBuilder vf_builder;
 			const guint *vlan_ids;
 			const char **name;
-			guint num_vlans;
+			guint num_vlans = 0;
 
 			g_variant_builder_init (&vf_builder, G_VARIANT_TYPE_VARDICT);
 			g_variant_builder_add (&vf_builder, "{sv}", "index",
@@ -952,7 +937,7 @@ vfs_to_dbus (NMSetting *setting, const char *property)
 
 			/* VLANs are translated into an array of maps, where each map has
 			 * keys 'id', 'qos' and 'proto'. This guarantees enough flexibility
-			 * to accomodate any future new option. */
+			 * to accommodate any future new option. */
 			vlan_ids = nm_sriov_vf_get_vlan_ids (vf, &num_vlans);
 			if (num_vlans) {
 				GVariantBuilder vlans_builder;
@@ -1139,24 +1124,58 @@ verify (NMSetting *setting, NMConnection *connection, GError **error)
 	return TRUE;
 }
 
+static NMTernary
+compare_property (const NMSettInfoSetting *sett_info,
+                  guint property_idx,
+                  NMSetting *setting,
+                  NMSetting *other,
+                  NMSettingCompareFlags flags)
+{
+	NMSettingSriov *a;
+	NMSettingSriov *b;
+	guint i;
+
+	if (nm_streq (sett_info->property_infos[property_idx].name, NM_SETTING_SRIOV_VFS)) {
+		if (other) {
+			a = NM_SETTING_SRIOV (setting);
+			b = NM_SETTING_SRIOV (other);
+
+			if (a->vfs->len != b->vfs->len)
+				return FALSE;
+			for (i = 0; i < a->vfs->len; i++) {
+				if (!nm_sriov_vf_equal (a->vfs->pdata[i], b->vfs->pdata[i]))
+					return FALSE;
+			}
+		}
+		return TRUE;
+	}
+
+	return NM_SETTING_CLASS (nm_setting_sriov_parent_class)->compare_property (sett_info,
+	                                                                           property_idx,
+	                                                                           setting,
+	                                                                           other,
+	                                                                           flags);
+}
+
+/*****************************************************************************/
+
 static void
-set_property (GObject *object, guint prop_id,
-              const GValue *value, GParamSpec *pspec)
+get_property (GObject *object, guint prop_id,
+              GValue *value, GParamSpec *pspec)
 {
 	NMSettingSriov *self = NM_SETTING_SRIOV (object);
 
 	switch (prop_id) {
 	case PROP_TOTAL_VFS:
-		self->total_vfs = g_value_get_uint (value);
+		g_value_set_uint (value, self->total_vfs);
 		break;
 	case PROP_VFS:
-		g_ptr_array_unref (self->vfs);
-		self->vfs = _nm_utils_copy_array (g_value_get_boxed (value),
-		                                  (NMUtilsCopyFunc) nm_sriov_vf_dup,
-		                                  (GDestroyNotify) nm_sriov_vf_unref);
+		g_value_take_boxed (value, _nm_utils_copy_array (self->vfs,
+		                                                 (NMUtilsCopyFunc) nm_sriov_vf_dup,
+		                                                 (GDestroyNotify) nm_sriov_vf_unref));
 		break;
 	case PROP_AUTOPROBE_DRIVERS:
-		self->autoprobe_drivers = g_value_get_enum (value);
+		g_value_set_enum (value, self->autoprobe_drivers);
 		break;
 	default:
 		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
@@ -1165,22 +1184,23 @@ set_property (GObject *object, guint prop_id,
 }
 
 static void
-get_property (GObject *object, guint prop_id,
-              GValue *value, GParamSpec *pspec)
+set_property (GObject *object, guint prop_id,
+              const GValue *value, GParamSpec *pspec)
 {
 	NMSettingSriov *self = NM_SETTING_SRIOV (object);
 
 	switch (prop_id) {
 	case PROP_TOTAL_VFS:
-		g_value_set_uint (value, self->total_vfs);
+		self->total_vfs = g_value_get_uint (value);
 		break;
 	case PROP_VFS:
-		g_value_take_boxed (value, _nm_utils_copy_array (self->vfs,
-		                                                 (NMUtilsCopyFunc) nm_sriov_vf_dup,
-		                                                 (GDestroyNotify) nm_sriov_vf_unref));
+		g_ptr_array_unref (self->vfs);
+		self->vfs = _nm_utils_copy_array (g_value_get_boxed (value),
+		                                  (NMUtilsCopyFunc) nm_sriov_vf_dup,
+		                                  (GDestroyNotify) nm_sriov_vf_unref);
 		break;
 	case PROP_AUTOPROBE_DRIVERS:
-		g_value_set_enum (value, self->autoprobe_drivers);
+		self->autoprobe_drivers = g_value_get_enum (value);
 		break;
 	default:
 		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
@@ -1188,30 +1208,7 @@ get_property (GObject *object, guint prop_id,
 	}
 }
 
-static gboolean
-compare_property (NMSetting *setting,
-                  NMSetting *other,
-                  const GParamSpec *prop_spec,
-                  NMSettingCompareFlags flags)
-{
-	NMSettingSriov *a = NM_SETTING_SRIOV (setting);
-	NMSettingSriov *b = NM_SETTING_SRIOV (other);
-	NMSettingClass *setting_class;
-	guint i;
-
-	if (nm_streq (prop_spec->name, NM_SETTING_SRIOV_VFS)) {
-		if (a->vfs->len != b->vfs->len)
-			return FALSE;
-		for (i = 0; i < a->vfs->len; i++) {
-			if (!nm_sriov_vf_equal (a->vfs->pdata[i], b->vfs->pdata[i]))
-				return FALSE;
-		}
-		return TRUE;
-	}
-
-	setting_class = NM_SETTING_CLASS (nm_setting_sriov_parent_class);
-	return setting_class->compare_property (setting, other, prop_spec, flags);
-}
+/*****************************************************************************/
 
 static void
 nm_setting_sriov_init (NMSettingSriov *setting)
@@ -1219,6 +1216,21 @@ nm_setting_sriov_init (NMSettingSriov *setting)
 	setting->vfs = g_ptr_array_new_with_free_func ((GDestroyNotify) nm_sriov_vf_unref);
 }
 
+/**
+ * nm_setting_sriov_new:
+ *
+ * Creates a new #NMSettingSriov object with default values.
+ *
+ * Returns: (transfer full): the new empty #NMSettingSriov object
+ *
+ * Since: 1.14
+ **/
+NMSetting *
+nm_setting_sriov_new (void)
+{
+	return (NMSetting *) g_object_new (NM_TYPE_SETTING_SRIOV, NULL);
+}
+
 static void
 finalize (GObject *object)
 {
@@ -1262,14 +1274,13 @@ nm_setting_sriov_class_init (NMSettingSriovClass *klass)
 	 * example: SRIOV_TOTAL_VFS=16
 	 * ---end---
 	 */
-	g_object_class_install_property
-		(object_class, PROP_TOTAL_VFS,
-		 g_param_spec_uint (NM_SETTING_SRIOV_TOTAL_VFS, "", "",
-		                    0, G_MAXUINT32, 0,
-		                    NM_SETTING_PARAM_FUZZY_IGNORE |
-		                    G_PARAM_READWRITE |
-		                    G_PARAM_CONSTRUCT |
-		                    G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_TOTAL_VFS] =
+	    g_param_spec_uint (NM_SETTING_SRIOV_TOTAL_VFS, "", "",
+	                       0, G_MAXUINT32, 0,
+	                       NM_SETTING_PARAM_FUZZY_IGNORE |
+	                       G_PARAM_READWRITE |
+	                       G_PARAM_CONSTRUCT |
+	                       G_PARAM_STATIC_STRINGS);
 
 	/**
 	 * NMSettingSriov:vfs: (type GPtrArray(NMSriovVF))
@@ -1310,17 +1321,15 @@ nm_setting_sriov_class_init (NMSettingSriovClass *klass)
 	 * example: SRIOV_VF10="mac=00:11:22:33:44:55", ...
 	 * ---end---
 	 */
-	g_object_class_install_property
-		(object_class, PROP_VFS,
-		 g_param_spec_boxed (NM_SETTING_SRIOV_VFS, "", "",
-		                     G_TYPE_PTR_ARRAY,
-		                     G_PARAM_READWRITE |
-		                     NM_SETTING_PARAM_INFERRABLE |
-		                     G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_VFS] =
+	    g_param_spec_boxed (NM_SETTING_SRIOV_VFS, "", "",
+	                        G_TYPE_PTR_ARRAY,
+	                        G_PARAM_READWRITE |
+	                        NM_SETTING_PARAM_INFERRABLE |
+	                        G_PARAM_STATIC_STRINGS);
 
 	_properties_override_add_override (properties_override,
-	                                   g_object_class_find_property (G_OBJECT_CLASS (setting_class),
-	                                                                 NM_SETTING_SRIOV_VFS),
+	                                   obj_properties[PROP_VFS],
 	                                   G_VARIANT_TYPE ("aa{sv}"),
 	                                   vfs_to_dbus,
 	                                   vfs_from_dbus,
@@ -1352,15 +1361,16 @@ nm_setting_sriov_class_init (NMSettingSriovClass *klass)
 	 * example: SRIOV_AUTOPROBE_DRIVERS=0,1
 	 * ---end---
 	 */
-	g_object_class_install_property
-		(object_class, PROP_AUTOPROBE_DRIVERS,
-		 g_param_spec_enum (NM_SETTING_SRIOV_AUTOPROBE_DRIVERS, "", "",
-		                    nm_ternary_get_type (),
-		                    NM_TERNARY_DEFAULT,
-		                    NM_SETTING_PARAM_FUZZY_IGNORE |
-		                    G_PARAM_READWRITE |
-		                    G_PARAM_CONSTRUCT |
-		                    G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_AUTOPROBE_DRIVERS] =
+	    g_param_spec_enum (NM_SETTING_SRIOV_AUTOPROBE_DRIVERS, "", "",
+	                       nm_ternary_get_type (),
+	                       NM_TERNARY_DEFAULT,
+	                       NM_SETTING_PARAM_FUZZY_IGNORE |
+	                       G_PARAM_READWRITE |
+	                       G_PARAM_CONSTRUCT |
+	                       G_PARAM_STATIC_STRINGS);
+
+	g_object_class_install_properties (object_class, _PROPERTY_ENUMS_LAST, obj_properties);
 
 	_nm_setting_class_commit_full (setting_class, NM_META_SETTING_TYPE_SRIOV,
 	                               NULL, properties_override);
diff --git a/libnm-core/nm-setting-tc-config.c b/libnm-core/nm-setting-tc-config.c
index 43015d37..7425ae73 100644
--- a/libnm-core/nm-setting-tc-config.c
+++ b/libnm-core/nm-setting-tc-config.c
@@ -19,9 +19,10 @@
 
 #include "nm-default.h"
 
+#include "nm-setting-tc-config.h"
+
 #include 
 
-#include "nm-setting-tc-config.h"
 #include "nm-setting-private.h"
 
 /**
@@ -809,13 +810,10 @@ nm_tc_tfilter_set_action (NMTCTfilter *tfilter, NMTCAction *action)
 
 /*****************************************************************************/
 
-enum {
-	PROP_0,
+NM_GOBJECT_PROPERTIES_DEFINE (NMSettingTCConfig,
 	PROP_QDISCS,
 	PROP_TFILTERS,
-
-	LAST_PROP
-};
+);
 
 /**
  * NMSettingTCConfig:
@@ -836,20 +834,7 @@ struct _NMSettingTCConfigClass {
 
 G_DEFINE_TYPE (NMSettingTCConfig, nm_setting_tc_config, NM_TYPE_SETTING)
 
-/**
- * nm_setting_tc_config_new:
- *
- * Creates a new #NMSettingTCConfig object with default values.
- *
- * Returns: (transfer full): the new empty #NMSettingTCConfig object
- *
- * Since: 1.12
- **/
-NMSetting *
-nm_setting_tc_config_new (void)
-{
-	return (NMSetting *) g_object_new (NM_TYPE_SETTING_TC_CONFIG, NULL);
-}
+/*****************************************************************************/
 
 /**
  * nm_setting_tc_config_get_num_qdiscs:
@@ -914,7 +899,7 @@ nm_setting_tc_config_add_qdisc (NMSettingTCConfig *self,
 	}
 
 	g_ptr_array_add (self->qdiscs, nm_tc_qdisc_dup (qdisc));
-	g_object_notify (G_OBJECT (self), NM_SETTING_TC_CONFIG_QDISCS);
+	_notify (self, PROP_QDISCS);
 	return TRUE;
 }
 
@@ -935,7 +920,7 @@ nm_setting_tc_config_remove_qdisc (NMSettingTCConfig *self, guint idx)
 	g_return_if_fail (idx < self->qdiscs->len);
 
 	g_ptr_array_remove_index (self->qdiscs, idx);
-	g_object_notify (G_OBJECT (self), NM_SETTING_TC_CONFIG_QDISCS);
+	_notify (self, PROP_QDISCS);
 }
 
 /**
@@ -961,7 +946,7 @@ nm_setting_tc_config_remove_qdisc_by_value (NMSettingTCConfig *self,
 	for (i = 0; i < self->qdiscs->len; i++) {
 		if (nm_tc_qdisc_equal (self->qdiscs->pdata[i], qdisc)) {
 			g_ptr_array_remove_index (self->qdiscs, i);
-			g_object_notify (G_OBJECT (self), NM_SETTING_TC_CONFIG_QDISCS);
+			_notify (self, PROP_QDISCS);
 			return TRUE;
 		}
 	}
@@ -983,7 +968,7 @@ nm_setting_tc_config_clear_qdiscs (NMSettingTCConfig *self)
 
 	if (self->qdiscs->len != 0) {
 		g_ptr_array_set_size (self->qdiscs, 0);
-		g_object_notify (G_OBJECT (self), NM_SETTING_TC_CONFIG_QDISCS);
+		_notify (self, PROP_QDISCS);
 	}
 }
 
@@ -1051,7 +1036,7 @@ nm_setting_tc_config_add_tfilter (NMSettingTCConfig *self,
 	}
 
 	g_ptr_array_add (self->tfilters, nm_tc_tfilter_dup (tfilter));
-	g_object_notify (G_OBJECT (self), NM_SETTING_TC_CONFIG_TFILTERS);
+	_notify (self, PROP_TFILTERS);
 	return TRUE;
 }
 
@@ -1071,7 +1056,7 @@ nm_setting_tc_config_remove_tfilter (NMSettingTCConfig *self, guint idx)
 	g_return_if_fail (idx < self->tfilters->len);
 
 	g_ptr_array_remove_index (self->tfilters, idx);
-	g_object_notify (G_OBJECT (self), NM_SETTING_TC_CONFIG_TFILTERS);
+	_notify (self, PROP_TFILTERS);
 }
 
 /**
@@ -1097,7 +1082,7 @@ nm_setting_tc_config_remove_tfilter_by_value (NMSettingTCConfig *self,
 	for (i = 0; i < self->tfilters->len; i++) {
 		if (nm_tc_tfilter_equal (self->tfilters->pdata[i], tfilter)) {
 			g_ptr_array_remove_index (self->tfilters, i);
-			g_object_notify (G_OBJECT (self), NM_SETTING_TC_CONFIG_TFILTERS);
+			_notify (self, PROP_TFILTERS);
 			return TRUE;
 		}
 	}
@@ -1119,71 +1104,12 @@ nm_setting_tc_config_clear_tfilters (NMSettingTCConfig *self)
 
 	if (self->tfilters->len != 0) {
 		g_ptr_array_set_size (self->tfilters, 0);
-		g_object_notify (G_OBJECT (self), NM_SETTING_TC_CONFIG_TFILTERS);
+		_notify (self, PROP_TFILTERS);
 	}
 }
 
 /*****************************************************************************/
 
-static void
-set_property (GObject *object, guint prop_id,
-              const GValue *value, GParamSpec *pspec)
-{
-	NMSettingTCConfig *self = NM_SETTING_TC_CONFIG (object);
-
-	switch (prop_id) {
-	case PROP_QDISCS:
-		g_ptr_array_unref (self->qdiscs);
-		self->qdiscs = _nm_utils_copy_array (g_value_get_boxed (value),
-		                                     (NMUtilsCopyFunc) nm_tc_qdisc_dup,
-		                                     (GDestroyNotify) nm_tc_qdisc_unref);
-		break;
-	case PROP_TFILTERS:
-		g_ptr_array_unref (self->tfilters);
-		self->tfilters = _nm_utils_copy_array (g_value_get_boxed (value),
-		                                       (NMUtilsCopyFunc) nm_tc_tfilter_dup,
-		                                       (GDestroyNotify) nm_tc_tfilter_unref);
-		break;
-	default:
-		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-		break;
-	}
-}
-
-static void
-get_property (GObject *object, guint prop_id,
-              GValue *value, GParamSpec *pspec)
-{
-	NMSettingTCConfig *self = NM_SETTING_TC_CONFIG (object);
-
-	switch (prop_id) {
-	case PROP_QDISCS:
-		g_value_take_boxed (value, _nm_utils_copy_array (self->qdiscs,
-		                                                 (NMUtilsCopyFunc) nm_tc_qdisc_dup,
-		                                                 (GDestroyNotify) nm_tc_qdisc_unref));
-		break;
-	case PROP_TFILTERS:
-		g_value_take_boxed (value, _nm_utils_copy_array (self->tfilters,
-		                                                 (NMUtilsCopyFunc) nm_tc_tfilter_dup,
-		                                                 (GDestroyNotify) nm_tc_tfilter_unref));
-		break;
-	default:
-		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-		break;
-	}
-}
-
-static void
-finalize (GObject *object)
-{
-	NMSettingTCConfig *self = NM_SETTING_TC_CONFIG (object);
-
-	g_ptr_array_unref (self->qdiscs);
-	g_ptr_array_unref (self->tfilters);
-
-	G_OBJECT_CLASS (nm_setting_tc_config_parent_class)->finalize (object);
-}
-
 static gboolean
 verify (NMSetting *setting, NMConnection *connection, GError **error)
 {
@@ -1233,46 +1159,46 @@ verify (NMSetting *setting, NMConnection *connection, GError **error)
 	return TRUE;
 }
 
-static gboolean
-compare_property (NMSetting *setting,
+static NMTernary
+compare_property (const NMSettInfoSetting *sett_info,
+                  guint property_idx,
+                  NMSetting *setting,
                   NMSetting *other,
-                  const GParamSpec *prop_spec,
                   NMSettingCompareFlags flags)
 {
 	NMSettingTCConfig *a_tc_config = NM_SETTING_TC_CONFIG (setting);
 	NMSettingTCConfig *b_tc_config = NM_SETTING_TC_CONFIG (other);
-	NMSettingClass *setting_class;
 	guint i;
 
-	if (nm_streq (prop_spec->name, NM_SETTING_TC_CONFIG_QDISCS)) {
-		if (a_tc_config->qdiscs->len != b_tc_config->qdiscs->len)
-			return FALSE;
-		for (i = 0; i < a_tc_config->qdiscs->len; i++) {
-			if (!nm_tc_qdisc_equal (a_tc_config->qdiscs->pdata[i], b_tc_config->qdiscs->pdata[i]))
+	if (nm_streq (sett_info->property_infos[property_idx].name, NM_SETTING_TC_CONFIG_QDISCS)) {
+		if (other) {
+			if (a_tc_config->qdiscs->len != b_tc_config->qdiscs->len)
 				return FALSE;
+			for (i = 0; i < a_tc_config->qdiscs->len; i++) {
+				if (!nm_tc_qdisc_equal (a_tc_config->qdiscs->pdata[i], b_tc_config->qdiscs->pdata[i]))
+					return FALSE;
+			}
 		}
 		return TRUE;
 	}
 
-	if (nm_streq (prop_spec->name, NM_SETTING_TC_CONFIG_TFILTERS)) {
-		if (a_tc_config->tfilters->len != b_tc_config->tfilters->len)
-			return FALSE;
-		for (i = 0; i < a_tc_config->tfilters->len; i++) {
-			if (!nm_tc_tfilter_equal (a_tc_config->tfilters->pdata[i], b_tc_config->tfilters->pdata[i]))
+	if (nm_streq (sett_info->property_infos[property_idx].name, NM_SETTING_TC_CONFIG_TFILTERS)) {
+		if (other) {
+			if (a_tc_config->tfilters->len != b_tc_config->tfilters->len)
 				return FALSE;
+			for (i = 0; i < a_tc_config->tfilters->len; i++) {
+				if (!nm_tc_tfilter_equal (a_tc_config->tfilters->pdata[i], b_tc_config->tfilters->pdata[i]))
+					return FALSE;
+			}
 		}
 		return TRUE;
 	}
 
-	setting_class = NM_SETTING_CLASS (nm_setting_tc_config_parent_class);
-	return setting_class->compare_property (setting, other, prop_spec, flags);
-}
-
-static void
-nm_setting_tc_config_init (NMSettingTCConfig *self)
-{
-	self->qdiscs = g_ptr_array_new_with_free_func ((GDestroyNotify) nm_tc_qdisc_unref);
-	self->tfilters = g_ptr_array_new_with_free_func ((GDestroyNotify) nm_tc_tfilter_unref);
+	return NM_SETTING_CLASS (nm_setting_tc_config_parent_class)->compare_property (sett_info,
+	                                                                               property_idx,
+	                                                                               setting,
+	                                                                               other,
+	                                                                               flags);
 }
 
 /**
@@ -1586,6 +1512,91 @@ tc_tfilters_set (NMSetting *setting,
 	return TRUE;
 }
 
+/*****************************************************************************/
+
+static void
+get_property (GObject *object, guint prop_id,
+              GValue *value, GParamSpec *pspec)
+{
+	NMSettingTCConfig *self = NM_SETTING_TC_CONFIG (object);
+
+	switch (prop_id) {
+	case PROP_QDISCS:
+		g_value_take_boxed (value, _nm_utils_copy_array (self->qdiscs,
+		                                                 (NMUtilsCopyFunc) nm_tc_qdisc_dup,
+		                                                 (GDestroyNotify) nm_tc_qdisc_unref));
+		break;
+	case PROP_TFILTERS:
+		g_value_take_boxed (value, _nm_utils_copy_array (self->tfilters,
+		                                                 (NMUtilsCopyFunc) nm_tc_tfilter_dup,
+		                                                 (GDestroyNotify) nm_tc_tfilter_unref));
+		break;
+	default:
+		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+		break;
+	}
+}
+
+static void
+set_property (GObject *object, guint prop_id,
+              const GValue *value, GParamSpec *pspec)
+{
+	NMSettingTCConfig *self = NM_SETTING_TC_CONFIG (object);
+
+	switch (prop_id) {
+	case PROP_QDISCS:
+		g_ptr_array_unref (self->qdiscs);
+		self->qdiscs = _nm_utils_copy_array (g_value_get_boxed (value),
+		                                     (NMUtilsCopyFunc) nm_tc_qdisc_dup,
+		                                     (GDestroyNotify) nm_tc_qdisc_unref);
+		break;
+	case PROP_TFILTERS:
+		g_ptr_array_unref (self->tfilters);
+		self->tfilters = _nm_utils_copy_array (g_value_get_boxed (value),
+		                                       (NMUtilsCopyFunc) nm_tc_tfilter_dup,
+		                                       (GDestroyNotify) nm_tc_tfilter_unref);
+		break;
+	default:
+		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+		break;
+	}
+}
+
+/*****************************************************************************/
+
+static void
+nm_setting_tc_config_init (NMSettingTCConfig *self)
+{
+	self->qdiscs = g_ptr_array_new_with_free_func ((GDestroyNotify) nm_tc_qdisc_unref);
+	self->tfilters = g_ptr_array_new_with_free_func ((GDestroyNotify) nm_tc_tfilter_unref);
+}
+
+/**
+ * nm_setting_tc_config_new:
+ *
+ * Creates a new #NMSettingTCConfig object with default values.
+ *
+ * Returns: (transfer full): the new empty #NMSettingTCConfig object
+ *
+ * Since: 1.12
+ **/
+NMSetting *
+nm_setting_tc_config_new (void)
+{
+	return (NMSetting *) g_object_new (NM_TYPE_SETTING_TC_CONFIG, NULL);
+}
+
+static void
+finalize (GObject *object)
+{
+	NMSettingTCConfig *self = NM_SETTING_TC_CONFIG (object);
+
+	g_ptr_array_unref (self->qdiscs);
+	g_ptr_array_unref (self->tfilters);
+
+	G_OBJECT_CLASS (nm_setting_tc_config_parent_class)->finalize (object);
+}
+
 static void
 nm_setting_tc_config_class_init (NMSettingTCConfigClass *klass)
 {
@@ -1593,8 +1604,8 @@ nm_setting_tc_config_class_init (NMSettingTCConfigClass *klass)
 	NMSettingClass *setting_class = NM_SETTING_CLASS (klass);
 	GArray *properties_override = _nm_sett_info_property_override_create_array ();
 
-	object_class->set_property     = set_property;
 	object_class->get_property     = get_property;
+	object_class->set_property     = set_property;
 	object_class->finalize         = finalize;
 
 	setting_class->compare_property = compare_property;
@@ -1612,17 +1623,15 @@ nm_setting_tc_config_class_init (NMSettingTCConfigClass *klass)
 	 * example: QDISC1=ingress, QDISC2="root handle 1234: fq_codel"
 	 * ---end---
 	 */
-	g_object_class_install_property
-		(object_class, PROP_QDISCS,
-		 g_param_spec_boxed (NM_SETTING_TC_CONFIG_QDISCS, "", "",
-		                     G_TYPE_PTR_ARRAY,
-		                     G_PARAM_READWRITE |
-		                     NM_SETTING_PARAM_INFERRABLE |
-		                     G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_QDISCS] =
+	    g_param_spec_boxed (NM_SETTING_TC_CONFIG_QDISCS, "", "",
+	                        G_TYPE_PTR_ARRAY,
+	                        G_PARAM_READWRITE |
+	                        NM_SETTING_PARAM_INFERRABLE |
+	                        G_PARAM_STATIC_STRINGS);
 
 	_properties_override_add_override (properties_override,
-	                                   g_object_class_find_property (G_OBJECT_CLASS (setting_class),
-	                                                                 NM_SETTING_TC_CONFIG_QDISCS),
+	                                   obj_properties[PROP_QDISCS],
 	                                   G_VARIANT_TYPE ("aa{sv}"),
 	                                   tc_qdiscs_get,
 	                                   tc_qdiscs_set,
@@ -1640,22 +1649,22 @@ nm_setting_tc_config_class_init (NMSettingTCConfigClass *klass)
 	 * example: FILTER1="parent ffff: matchall action simple sdata Input", ...
 	 * ---end---
 	 */
-	g_object_class_install_property
-		(object_class, PROP_TFILTERS,
-		 g_param_spec_boxed (NM_SETTING_TC_CONFIG_TFILTERS, "", "",
-		                     G_TYPE_PTR_ARRAY,
-		                     G_PARAM_READWRITE |
-		                     NM_SETTING_PARAM_INFERRABLE |
-		                     G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_TFILTERS] =
+	    g_param_spec_boxed (NM_SETTING_TC_CONFIG_TFILTERS, "", "",
+	                        G_TYPE_PTR_ARRAY,
+	                        G_PARAM_READWRITE |
+	                        NM_SETTING_PARAM_INFERRABLE |
+	                        G_PARAM_STATIC_STRINGS);
 
 	_properties_override_add_override (properties_override,
-	                                   g_object_class_find_property (G_OBJECT_CLASS (setting_class),
-	                                                                 NM_SETTING_TC_CONFIG_TFILTERS),
+	                                   obj_properties[PROP_TFILTERS],
 	                                   G_VARIANT_TYPE ("aa{sv}"),
 	                                   tc_tfilters_get,
 	                                   tc_tfilters_set,
 	                                   NULL);
 
+	g_object_class_install_properties (object_class, _PROPERTY_ENUMS_LAST, obj_properties);
+
 	_nm_setting_class_commit_full (setting_class, NM_META_SETTING_TYPE_TC_CONFIG,
 	                               NULL, properties_override);
 }
diff --git a/libnm-core/nm-setting-team-port.c b/libnm-core/nm-setting-team-port.c
index ee84aaf7..1db8f22a 100644
--- a/libnm-core/nm-setting-team-port.c
+++ b/libnm-core/nm-setting-team-port.c
@@ -21,11 +21,11 @@
 
 #include "nm-default.h"
 
-#include 
+#include "nm-setting-team-port.h"
+
 #include 
 #include 
 
-#include "nm-setting-team-port.h"
 #include "nm-utils.h"
 #include "nm-utils-private.h"
 #include "nm-connection-private.h"
@@ -39,9 +39,27 @@
  * optional properties that apply to team ports.
  **/
 
-G_DEFINE_TYPE (NMSettingTeamPort, nm_setting_team_port, NM_TYPE_SETTING)
+/*****************************************************************************/
 
-#define NM_SETTING_TEAM_PORT_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_SETTING_TEAM_PORT, NMSettingTeamPortPrivate))
+NM_GOBJECT_PROPERTIES_DEFINE (NMSettingTeamPort,
+	PROP_CONFIG,
+	PROP_QUEUE_ID,
+	PROP_PRIO,
+	PROP_STICKY,
+	PROP_LACP_PRIO,
+	PROP_LACP_KEY,
+	PROP_LINK_WATCHERS,
+);
+
+static const _NMUtilsTeamPropertyKeys _prop_to_keys[_PROPERTY_ENUMS_LAST] = {
+	[PROP_CONFIG] =        { },
+	[PROP_QUEUE_ID] =      { .key1 = "queue_id",   .default_int = NM_SETTING_TEAM_PORT_QUEUE_ID_DEFAULT, },
+	[PROP_PRIO] =          { .key1 = "prio",       },
+	[PROP_STICKY] =        { .key1 = "sticky",     },
+	[PROP_LACP_PRIO] =     { .key1 = "lacp_prio",  .default_int = NM_SETTING_TEAM_PORT_LACP_PRIO_DEFAULT, },
+	[PROP_LACP_KEY] =      { .key1 = "lacp_key",   },
+	[PROP_LINK_WATCHERS] = { .key1 = "link_watch", },
+};
 
 typedef struct {
 	char *config;
@@ -53,43 +71,11 @@ typedef struct {
 	GPtrArray *link_watchers; /* Array of NMTeamLinkWatcher */
 } NMSettingTeamPortPrivate;
 
-/* Keep aligned with _prop_to_keys[] */
-enum {
-	PROP_0,
-	PROP_CONFIG,
-	PROP_QUEUE_ID,
-	PROP_PRIO,
-	PROP_STICKY,
-	PROP_LACP_PRIO,
-	PROP_LACP_KEY,
-	PROP_LINK_WATCHERS,
-	LAST_PROP
-};
+G_DEFINE_TYPE (NMSettingTeamPort, nm_setting_team_port, NM_TYPE_SETTING)
 
-/* Keep aligned with team-port properties enum */
-static const _NMUtilsTeamPropertyKeys _prop_to_keys[LAST_PROP] = {
-	[PROP_0] =             { NULL, NULL, NULL, 0 },
-	[PROP_CONFIG] =        { NULL, NULL, NULL, 0 },
-	[PROP_QUEUE_ID] =      { "queue_id", NULL, NULL, NM_SETTING_TEAM_PORT_QUEUE_ID_DEFAULT },
-	[PROP_PRIO] =          { "prio", NULL, NULL, 0 },
-	[PROP_STICKY] =        { "sticky", NULL, NULL, 0 },
-	[PROP_LACP_PRIO] =     { "lacp_prio", NULL, NULL, NM_SETTING_TEAM_PORT_LACP_PRIO_DEFAULT },
-	[PROP_LACP_KEY] =      { "lacp_key", NULL, NULL, 0 },
-	[PROP_LINK_WATCHERS] = { "link_watch", NULL, NULL, 0 }
-};
+#define NM_SETTING_TEAM_PORT_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_SETTING_TEAM_PORT, NMSettingTeamPortPrivate))
 
-/**
- * nm_setting_team_port_new:
- *
- * Creates a new #NMSettingTeamPort object with default values.
- *
- * Returns: (transfer full): the new empty #NMSettingTeamPort object
- **/
-NMSetting *
-nm_setting_team_port_new (void)
-{
-	return (NMSetting *) g_object_new (NM_TYPE_SETTING_TEAM_PORT, NULL);
-}
+/*****************************************************************************/
 
 /**
  * nm_setting_team_port_get_config:
@@ -251,7 +237,7 @@ nm_setting_team_port_add_link_watcher (NMSettingTeamPort *setting,
 	}
 
 	g_ptr_array_add (priv->link_watchers, nm_team_link_watcher_dup (link_watcher));
-	g_object_notify (G_OBJECT (setting), NM_SETTING_TEAM_PORT_LINK_WATCHERS);
+	_notify (setting, PROP_LINK_WATCHERS);
 	return TRUE;
 }
 
@@ -273,7 +259,7 @@ nm_setting_team_port_remove_link_watcher (NMSettingTeamPort *setting, guint idx)
 	g_return_if_fail (idx < priv->link_watchers->len);
 
 	g_ptr_array_remove_index (priv->link_watchers, idx);
-	g_object_notify (G_OBJECT (setting), NM_SETTING_TEAM_PORT_LINK_WATCHERS);
+	_notify (setting, PROP_LINK_WATCHERS);
 }
 
 /**
@@ -299,7 +285,7 @@ nm_setting_team_port_remove_link_watcher_by_value (NMSettingTeamPort *setting,
 	for (i = 0; i < priv->link_watchers->len; i++) {
 		if (nm_team_link_watcher_equal (priv->link_watchers->pdata[i], link_watcher)) {
 			g_ptr_array_remove_index (priv->link_watchers, i);
-			g_object_notify (G_OBJECT (setting), NM_SETTING_TEAM_PORT_LINK_WATCHERS);
+			_notify (setting, PROP_LINK_WATCHERS);
 			return TRUE;
 		}
 	}
@@ -323,7 +309,7 @@ nm_setting_team_port_clear_link_watchers (NMSettingTeamPort *setting)
 
 	if (priv->link_watchers->len != 0) {
 		g_ptr_array_set_size (priv->link_watchers, 0);
-		g_object_notify (G_OBJECT (setting), NM_SETTING_TEAM_PORT_LINK_WATCHERS);
+		_notify (setting, PROP_LINK_WATCHERS);
 	}
 }
 
@@ -401,62 +387,109 @@ verify (NMSetting *setting, NMConnection *connection, GError **error)
 	return TRUE;
 }
 
-static gboolean
-compare_property (NMSetting *setting,
+static NMTernary
+compare_property (const NMSettInfoSetting *sett_info,
+                  guint property_idx,
+                  NMSetting *setting,
                   NMSetting *other,
-                  const GParamSpec *prop_spec,
                   NMSettingCompareFlags flags)
 {
-	NMSettingClass *setting_class;
-	NMSettingTeamPortPrivate *a_priv, *b_priv;
+	NMSettingTeamPortPrivate *a_priv;
+	NMSettingTeamPortPrivate *b_priv;
 	guint i, j;
 
-	/* If we are trying to match a connection in order to assume it (and thus
-	 * @flags contains INFERRABLE), use the "relaxed" matching for team
-	 * configuration. Otherwise, for all other purposes (including connection
-	 * comparison before an update), resort to the default string comparison.
-	 */
-	if (   NM_FLAGS_HAS (flags, NM_SETTING_COMPARE_FLAG_INFERRABLE)
-	    && nm_streq0 (prop_spec->name, NM_SETTING_TEAM_PORT_CONFIG)) {
-		return _nm_utils_team_config_equal (NM_SETTING_TEAM_PORT_GET_PRIVATE (setting)->config,
-		                                    NM_SETTING_TEAM_PORT_GET_PRIVATE (other)->config,
-		                                    TRUE);
-	}
-	if (nm_streq0 (prop_spec->name, NM_SETTING_TEAM_PORT_LINK_WATCHERS)) {
-		a_priv = NM_SETTING_TEAM_PORT_GET_PRIVATE (setting);
-		b_priv = NM_SETTING_TEAM_PORT_GET_PRIVATE (other);
+	if (nm_streq (sett_info->property_infos[property_idx].name, NM_SETTING_TEAM_PORT_LINK_WATCHERS)) {
 
-		if (a_priv->link_watchers->len != b_priv->link_watchers->len)
-			return FALSE;
-		for (i = 0; i < a_priv->link_watchers->len; i++) {
-			for (j = 0; j < b_priv->link_watchers->len; j++) {
-				if (nm_team_link_watcher_equal (a_priv->link_watchers->pdata[i],
-				                                b_priv->link_watchers->pdata[j])) {
-					break;
+		if (NM_FLAGS_HAS (flags, NM_SETTING_COMPARE_FLAG_INFERRABLE))
+			return NM_TERNARY_DEFAULT;
+
+		if (other) {
+			a_priv = NM_SETTING_TEAM_PORT_GET_PRIVATE (setting);
+			b_priv = NM_SETTING_TEAM_PORT_GET_PRIVATE (other);
+
+			if (a_priv->link_watchers->len != b_priv->link_watchers->len)
+				return FALSE;
+			for (i = 0; i < a_priv->link_watchers->len; i++) {
+				for (j = 0; j < b_priv->link_watchers->len; j++) {
+					if (nm_team_link_watcher_equal (a_priv->link_watchers->pdata[i],
+					                                b_priv->link_watchers->pdata[j])) {
+						break;
+					}
 				}
+				if (j == b_priv->link_watchers->len)
+					return FALSE;
 			}
-			if (j == b_priv->link_watchers->len)
-				return FALSE;
 		}
 		return TRUE;
 	}
 
-	setting_class = NM_SETTING_CLASS (nm_setting_team_port_parent_class);
-	return setting_class->compare_property (setting, other, prop_spec, flags);
+	if (nm_streq (sett_info->property_infos[property_idx].name, NM_SETTING_TEAM_PORT_CONFIG)) {
+		if (other) {
+			a_priv = NM_SETTING_TEAM_PORT_GET_PRIVATE (setting);
+			b_priv = NM_SETTING_TEAM_PORT_GET_PRIVATE (other);
+
+			if (NM_FLAGS_HAS (flags, NM_SETTING_COMPARE_FLAG_INFERRABLE)) {
+				/* If we are trying to match a connection in order to assume it (and thus
+				 * @flags contains INFERRABLE), use the "relaxed" matching for team
+				 * configuration. Otherwise, for all other purposes (including connection
+				 * comparison before an update), resort to the default string comparison. */
+				return _nm_utils_team_config_equal (a_priv->config,
+				                                    b_priv->config,
+				                                    TRUE);
+			}
+
+			return nm_streq0 (a_priv->config, b_priv->config);
+		}
+
+		return TRUE;
+	}
+
+	return NM_SETTING_CLASS (nm_setting_team_port_parent_class)->compare_property (sett_info,
+	                                                                               property_idx,
+	                                                                               setting,
+	                                                                               other,
+	                                                                               flags);
 }
 
+/*****************************************************************************/
+
 static void
-nm_setting_team_port_init (NMSettingTeamPort *setting)
+get_property (GObject *object, guint prop_id,
+              GValue *value, GParamSpec *pspec)
 {
+	NMSettingTeamPort *setting = NM_SETTING_TEAM_PORT (object);
 	NMSettingTeamPortPrivate *priv = NM_SETTING_TEAM_PORT_GET_PRIVATE (setting);
 
-	priv->queue_id = NM_SETTING_TEAM_PORT_QUEUE_ID_DEFAULT;
-	priv->lacp_prio = NM_SETTING_TEAM_PORT_LACP_PRIO_DEFAULT;
-	priv->link_watchers = g_ptr_array_new_with_free_func ((GDestroyNotify) nm_team_link_watcher_unref);
+	switch (prop_id) {
+	case PROP_CONFIG:
+		g_value_set_string (value, nm_setting_team_port_get_config (setting));
+		break;
+	case PROP_QUEUE_ID:
+		g_value_set_int (value, priv->queue_id);
+		break;
+	case PROP_PRIO:
+		g_value_set_int (value, priv->prio);
+		break;
+	case PROP_STICKY:
+		g_value_set_boolean (value, priv->sticky);
+		break;
+	case PROP_LACP_PRIO:
+		g_value_set_int (value, priv->lacp_prio);
+		break;
+	case PROP_LACP_KEY:
+		g_value_set_int (value, priv->lacp_key);
+		break;
+	case PROP_LINK_WATCHERS:
+		g_value_take_boxed (value, _nm_utils_copy_array (priv->link_watchers,
+		                                                 (NMUtilsCopyFunc) nm_team_link_watcher_dup,
+		                                                 (GDestroyNotify) nm_team_link_watcher_unref));
+		break;
+	default:
+		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+		break;
+	}
 }
 
-#define JSON_TO_VAL(typ, id)   _nm_utils_json_extract_##typ (priv->config, _prop_to_keys[id], TRUE)
-
 static void
 set_property (GObject *object, guint prop_id,
               const GValue *value, GParamSpec *pspec)
@@ -465,6 +498,8 @@ set_property (GObject *object, guint prop_id,
 	const GValue *align_value = NULL;
 	gboolean align_config = FALSE;
 
+#define JSON_TO_VAL(typ, id)   _nm_utils_json_extract_##typ (priv->config, _prop_to_keys[id], TRUE)
+
 	switch (prop_id) {
 	case PROP_CONFIG:
 		g_free (priv->config);
@@ -536,41 +571,29 @@ set_property (GObject *object, guint prop_id,
 		_nm_utils_json_append_gvalue (&priv->config, _prop_to_keys[prop_id], align_value);
 }
 
+/*****************************************************************************/
+
 static void
-get_property (GObject *object, guint prop_id,
-              GValue *value, GParamSpec *pspec)
+nm_setting_team_port_init (NMSettingTeamPort *setting)
 {
-	NMSettingTeamPort *setting = NM_SETTING_TEAM_PORT (object);
 	NMSettingTeamPortPrivate *priv = NM_SETTING_TEAM_PORT_GET_PRIVATE (setting);
 
-	switch (prop_id) {
-	case PROP_CONFIG:
-		g_value_set_string (value, nm_setting_team_port_get_config (setting));
-		break;
-	case PROP_QUEUE_ID:
-		g_value_set_int (value, priv->queue_id);
-		break;
-	case PROP_PRIO:
-		g_value_set_int (value, priv->prio);
-		break;
-	case PROP_STICKY:
-		g_value_set_boolean (value, priv->sticky);
-		break;
-	case PROP_LACP_PRIO:
-		g_value_set_int (value, priv->lacp_prio);
-		break;
-	case PROP_LACP_KEY:
-		g_value_set_int (value, priv->lacp_key);
-		break;
-	case PROP_LINK_WATCHERS:
-		g_value_take_boxed (value, _nm_utils_copy_array (priv->link_watchers,
-		                                                 (NMUtilsCopyFunc) nm_team_link_watcher_dup,
-		                                                 (GDestroyNotify) nm_team_link_watcher_unref));
-		break;
-	default:
-		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-		break;
-	}
+	priv->queue_id = NM_SETTING_TEAM_PORT_QUEUE_ID_DEFAULT;
+	priv->lacp_prio = NM_SETTING_TEAM_PORT_LACP_PRIO_DEFAULT;
+	priv->link_watchers = g_ptr_array_new_with_free_func ((GDestroyNotify) nm_team_link_watcher_unref);
+}
+
+/**
+ * nm_setting_team_port_new:
+ *
+ * Creates a new #NMSettingTeamPort object with default values.
+ *
+ * Returns: (transfer full): the new empty #NMSettingTeamPort object
+ **/
+NMSetting *
+nm_setting_team_port_new (void)
+{
+	return (NMSetting *) g_object_new (NM_TYPE_SETTING_TEAM_PORT, NULL);
 }
 
 static void
@@ -593,8 +616,8 @@ nm_setting_team_port_class_init (NMSettingTeamPortClass *klass)
 
 	g_type_class_add_private (klass, sizeof (NMSettingTeamPortPrivate));
 
-	object_class->set_property     = set_property;
 	object_class->get_property     = get_property;
+	object_class->set_property     = set_property;
 	object_class->finalize         = finalize;
 
 	setting_class->compare_property = compare_property;
@@ -614,13 +637,12 @@ nm_setting_team_port_class_init (NMSettingTeamPortClass *klass)
 	 * description: Team port configuration in JSON. See man teamd.conf for details.
 	 * ---end---
 	 */
-	g_object_class_install_property
-		(object_class, PROP_CONFIG,
-		 g_param_spec_string (NM_SETTING_TEAM_PORT_CONFIG, "", "",
-		                      NULL,
-		                      G_PARAM_READWRITE |
-		                      NM_SETTING_PARAM_INFERRABLE |
-		                      G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_CONFIG] =
+	    g_param_spec_string (NM_SETTING_TEAM_PORT_CONFIG, "", "",
+	                         NULL,
+	                         G_PARAM_READWRITE |
+	                         NM_SETTING_PARAM_INFERRABLE |
+	                         G_PARAM_STATIC_STRINGS);
 
 	/**
 	 * NMSettingTeamPort:queue-id:
@@ -630,12 +652,11 @@ nm_setting_team_port_class_init (NMSettingTeamPortClass *klass)
 	 *
 	 * Since: 1.12
 	 **/
-	g_object_class_install_property
-		(object_class, PROP_QUEUE_ID,
-		 g_param_spec_int (NM_SETTING_TEAM_PORT_QUEUE_ID, "", "",
-		                   G_MININT32, G_MAXINT32, 0,
-		                   G_PARAM_READWRITE |
-		                   G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_QUEUE_ID] =
+	    g_param_spec_int (NM_SETTING_TEAM_PORT_QUEUE_ID, "", "",
+	                      G_MININT32, G_MAXINT32, 0,
+	                      G_PARAM_READWRITE |
+	                      G_PARAM_STATIC_STRINGS);
 
 	/**
 	 * NMSettingTeamPort:prio:
@@ -644,12 +665,11 @@ nm_setting_team_port_class_init (NMSettingTeamPortClass *klass)
 	 *
 	 * Since: 1.12
 	 **/
-	g_object_class_install_property
-		(object_class, PROP_PRIO,
-		 g_param_spec_int (NM_SETTING_TEAM_PORT_PRIO, "", "",
-		                   G_MININT32, G_MAXINT32, 0,
-		                   G_PARAM_READWRITE |
-		                   G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_PRIO] =
+	    g_param_spec_int (NM_SETTING_TEAM_PORT_PRIO, "", "",
+	                      G_MININT32, G_MAXINT32, 0,
+	                      G_PARAM_READWRITE |
+	                      G_PARAM_STATIC_STRINGS);
 
 	/**
 	 * NMSettingTeamPort:sticky:
@@ -658,12 +678,11 @@ nm_setting_team_port_class_init (NMSettingTeamPortClass *klass)
 	 *
 	 * Since: 1.12
 	 **/
-	g_object_class_install_property
-		(object_class, PROP_STICKY,
-		 g_param_spec_boolean (NM_SETTING_TEAM_PORT_STICKY, "", "",
-		                       FALSE,
-		                       G_PARAM_READWRITE |
-		                       G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_STICKY] =
+	    g_param_spec_boolean (NM_SETTING_TEAM_PORT_STICKY, "", "",
+	                          FALSE,
+	                          G_PARAM_READWRITE |
+	                          G_PARAM_STATIC_STRINGS);
 
 	/**
 	 * NMSettingTeamPort:lacp-prio:
@@ -672,12 +691,11 @@ nm_setting_team_port_class_init (NMSettingTeamPortClass *klass)
 	 *
 	 * Since: 1.12
 	 **/
-	g_object_class_install_property
-		(object_class, PROP_LACP_PRIO,
-		 g_param_spec_int (NM_SETTING_TEAM_PORT_LACP_PRIO, "", "",
-		                   G_MININT32, G_MAXINT32, 0,
-		                   G_PARAM_READWRITE |
-		                   G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_LACP_PRIO] =
+	    g_param_spec_int (NM_SETTING_TEAM_PORT_LACP_PRIO, "", "",
+	                      G_MININT32, G_MAXINT32, 0,
+	                      G_PARAM_READWRITE |
+	                      G_PARAM_STATIC_STRINGS);
 
 	/**
 	 * NMSettingTeamPort:lacp-key:
@@ -686,12 +704,11 @@ nm_setting_team_port_class_init (NMSettingTeamPortClass *klass)
 	 *
 	 * Since: 1.12
 	 **/
-	g_object_class_install_property
-		(object_class, PROP_LACP_KEY,
-		 g_param_spec_int (NM_SETTING_TEAM_PORT_LACP_KEY, "", "",
-		                   G_MININT32, G_MAXINT32, 0,
-		                   G_PARAM_READWRITE |
-		                   G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_LACP_KEY] =
+	    g_param_spec_int (NM_SETTING_TEAM_PORT_LACP_KEY, "", "",
+	                      G_MININT32, G_MAXINT32, 0,
+	                      G_PARAM_READWRITE |
+	                      G_PARAM_STATIC_STRINGS);
 
 	/**
 	 * NMSettingTeamPort:link-watchers: (type GPtrArray(NMTeamLinkWatcher))
@@ -703,24 +720,24 @@ nm_setting_team_port_class_init (NMSettingTeamPortClass *klass)
 	 * Available keys are:   ethtool: 'delay-up', 'delay-down', 'init-wait';
 	 * nsna_ping: 'init-wait', 'interval', 'missed-max', 'target-host';
 	 * arp_ping: all the ones in nsna_ping and 'source-host', 'validate-active',
-	 * 'validate-incative', 'send-always'. See teamd.conf man for more details.
+	 * 'validate-inactive', 'send-always'. See teamd.conf man for more details.
 	 *
 	 * Since: 1.12
 	 **/
-	g_object_class_install_property
-		(object_class, PROP_LINK_WATCHERS,
-		 g_param_spec_boxed (NM_SETTING_TEAM_PORT_LINK_WATCHERS, "", "",
-		                     G_TYPE_PTR_ARRAY,
-		                     G_PARAM_READWRITE |
-		                     G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_LINK_WATCHERS] =
+	    g_param_spec_boxed (NM_SETTING_TEAM_PORT_LINK_WATCHERS, "", "",
+	                        G_TYPE_PTR_ARRAY,
+	                        G_PARAM_READWRITE |
+	                        G_PARAM_STATIC_STRINGS);
 
 	_properties_override_add_transform (properties_override,
-	                                    g_object_class_find_property (G_OBJECT_CLASS (setting_class),
-	                                                                  NM_SETTING_TEAM_PORT_LINK_WATCHERS),
+	                                    obj_properties[PROP_LINK_WATCHERS],
 	                                    G_VARIANT_TYPE ("aa{sv}"),
 	                                    team_link_watchers_to_dbus,
 	                                    team_link_watchers_from_dbus);
 
+	g_object_class_install_properties (object_class, _PROPERTY_ENUMS_LAST, obj_properties);
+
 	_nm_setting_class_commit_full (setting_class, NM_META_SETTING_TYPE_TEAM_PORT,
 	                               NULL, properties_override);
 }
diff --git a/libnm-core/nm-setting-team.c b/libnm-core/nm-setting-team.c
index 3d151462..42ee3eec 100644
--- a/libnm-core/nm-setting-team.c
+++ b/libnm-core/nm-setting-team.c
@@ -21,10 +21,10 @@
 
 #include "nm-default.h"
 
-#include 
+#include "nm-setting-team.h"
+
 #include 
 
-#include "nm-setting-team.h"
 #include "nm-utils.h"
 #include "nm-utils-private.h"
 #include "nm-connection-private.h"
@@ -86,6 +86,7 @@ struct NMTeamLinkWatcher {
 			char *target_host;
 			char *source_host;
 			NMTeamLinkWatcherArpPingFlags flags;
+			int vlanid;
 		} arp_ping;
 	};
 };
@@ -232,6 +233,45 @@ nm_team_link_watcher_new_arp_ping (int init_wait,
                                    const char *source_host,
                                    NMTeamLinkWatcherArpPingFlags flags,
                                    GError **error)
+{
+	return nm_team_link_watcher_new_arp_ping2 (init_wait,
+	                                           interval,
+	                                           missed_max,
+	                                           -1,
+	                                           target_host,
+	                                           source_host,
+	                                           flags,
+	                                           error);
+}
+
+/**
+ * nm_team_link_watcher_new_arp_ping2:
+ * @init_wait: init_wait value
+ * @interval: interval value
+ * @missed_max: missed_max value
+ * @vlanid: vlanid value
+ * @target_host: the host name or the ip address that will be used as destination
+ *   address in the arp request
+ * @source_host: the host name or the ip address that will be used as source
+ *   address in the arp request
+ * @flags: the watcher #NMTeamLinkWatcherArpPingFlags
+ * @error: (out) (allow-none): location to store the error on failure
+ *
+ * Creates a new arp_ping #NMTeamLinkWatcher object
+ *
+ * Returns: (transfer full): the new #NMTeamLinkWatcher object, or %NULL on error
+ *
+ * Since: 1.16
+ **/
+NMTeamLinkWatcher *
+nm_team_link_watcher_new_arp_ping2 (int init_wait,
+                                    int interval,
+                                    int missed_max,
+                                    int vlanid,
+                                    const char *target_host,
+                                    const char *source_host,
+                                    NMTeamLinkWatcherArpPingFlags flags,
+                                    GError **error)
 {
 	NMTeamLinkWatcher *watcher;
 	const char *val_fail = NULL;
@@ -255,11 +295,11 @@ nm_team_link_watcher_new_arp_ping (int init_wait,
 		return NULL;
 	}
 
-	if (init_wait < 0 || !_NM_INT_LE_MAXINT32 (init_wait))
+	else if (init_wait < 0 || !_NM_INT_LE_MAXINT32 (init_wait))
 		val_fail = "init-wait";
-	if (interval < 0 || !_NM_INT_LE_MAXINT32 (interval))
+	else if (interval < 0 || !_NM_INT_LE_MAXINT32 (interval))
 		val_fail = "interval";
-	if (missed_max < 0 || !_NM_INT_LE_MAXINT32 (missed_max))
+	else if (missed_max < 0 || !_NM_INT_LE_MAXINT32 (missed_max))
 		val_fail = "missed-max";
 	if (val_fail) {
 		g_set_error (error, NM_CONNECTION_ERROR, NM_CONNECTION_ERROR_FAILED,
@@ -267,6 +307,12 @@ nm_team_link_watcher_new_arp_ping (int init_wait,
 		return NULL;
 	}
 
+	if (vlanid < -1 || vlanid > 4094) {
+		g_set_error_literal (error, NM_CONNECTION_ERROR, NM_CONNECTION_ERROR_FAILED,
+		                     _("vlanid is out of range [-1, 4094]"));
+		return NULL;
+	}
+
 	watcher = g_slice_new0 (NMTeamLinkWatcher);
 	watcher->refcount = 1;
 
@@ -277,6 +323,7 @@ nm_team_link_watcher_new_arp_ping (int init_wait,
 	watcher->arp_ping.target_host = g_strdup (target_host);
 	watcher->arp_ping.source_host = g_strdup (source_host);
 	watcher->arp_ping.flags = flags;
+	watcher->arp_ping.vlanid = vlanid;
 
 	return watcher;
 }
@@ -342,6 +389,7 @@ nm_team_link_watcher_equal (NMTeamLinkWatcher *watcher, NMTeamLinkWatcher *other
 	    || watcher->arp_ping.init_wait != other->arp_ping.init_wait
 	    || watcher->arp_ping.interval != other->arp_ping.interval
 	    || watcher->arp_ping.missed_max != other->arp_ping.missed_max
+	    || watcher->arp_ping.vlanid != other->arp_ping.vlanid
 	    || watcher->arp_ping.flags != other->arp_ping.flags)
 		return FALSE;
 
@@ -377,12 +425,13 @@ nm_team_link_watcher_dup (NMTeamLinkWatcher *watcher)
 		                                           NULL);
 		break;
 	case LINK_WATCHER_ARP_PING:
-		return nm_team_link_watcher_new_arp_ping (watcher->arp_ping.init_wait,
-		                                          watcher->arp_ping.interval,
-		                                          watcher->arp_ping.missed_max,
-		                                          watcher->arp_ping.target_host,
-		                                          watcher->arp_ping.source_host,
-		                                          watcher->arp_ping.flags,
+		return nm_team_link_watcher_new_arp_ping2 (watcher->arp_ping.init_wait,
+		                                           watcher->arp_ping.interval,
+		                                           watcher->arp_ping.missed_max,
+		                                           watcher->arp_ping.vlanid,
+		                                           watcher->arp_ping.target_host,
+		                                           watcher->arp_ping.source_host,
+		                                           watcher->arp_ping.flags,
 		                                          NULL);
 	default:
 		g_assert_not_reached ();
@@ -411,7 +460,7 @@ nm_team_link_watcher_get_name (NMTeamLinkWatcher *watcher)
  * @watcher: the #NMTeamLinkWatcher
  *
  * Gets the delay_up interval (in milliseconds) that elapses between the link
- * coming up and the runner beeing notified about it.
+ * coming up and the runner being notified about it.
  *
  * Since: 1.12
  **/
@@ -430,7 +479,7 @@ nm_team_link_watcher_get_delay_up (NMTeamLinkWatcher *watcher)
  * @watcher: the #NMTeamLinkWatcher
  *
  * Gets the delay_down interval (in milliseconds) that elapses between the link
- * going down and the runner beeing notified about it.
+ * going down and the runner being notified about it.
  *
  * Since: 1.12
  **/
@@ -506,6 +555,24 @@ nm_team_link_watcher_get_missed_max (NMTeamLinkWatcher *watcher)
 	return watcher->arp_ping.missed_max;
 }
 
+/**
+ * nm_team_link_watcher_get_vlanid:
+ * @watcher: the #NMTeamLinkWatcher
+ *
+ * Gets the VLAN tag ID to be used to outgoing link probes
+ *
+ * Since: 1.16
+ **/
+int
+nm_team_link_watcher_get_vlanid (NMTeamLinkWatcher *watcher)
+{
+	_CHECK_WATCHER (watcher, -1);
+
+	if (watcher->type != LINK_WATCHER_ARP_PING)
+		return -1;
+	return watcher->arp_ping.vlanid;
+}
+
 /**
  * nm_team_link_watcher_get_target_host:
  * @watcher: the #NMTeamLinkWatcher
@@ -557,9 +624,43 @@ nm_team_link_watcher_get_flags (NMTeamLinkWatcher *watcher)
 
 /*****************************************************************************/
 
-G_DEFINE_TYPE (NMSettingTeam, nm_setting_team, NM_TYPE_SETTING)
-
-#define NM_SETTING_TEAM_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_SETTING_TEAM, NMSettingTeamPrivate))
+NM_GOBJECT_PROPERTIES_DEFINE (NMSettingTeam,
+	PROP_CONFIG,
+	PROP_NOTIFY_PEERS_COUNT,
+	PROP_NOTIFY_PEERS_INTERVAL,
+	PROP_MCAST_REJOIN_COUNT,
+	PROP_MCAST_REJOIN_INTERVAL,
+	PROP_RUNNER,
+	PROP_RUNNER_HWADDR_POLICY,
+	PROP_RUNNER_TX_HASH,
+	PROP_RUNNER_TX_BALANCER,
+	PROP_RUNNER_TX_BALANCER_INTERVAL,
+	PROP_RUNNER_ACTIVE,
+	PROP_RUNNER_FAST_RATE,
+	PROP_RUNNER_SYS_PRIO,
+	PROP_RUNNER_MIN_PORTS,
+	PROP_RUNNER_AGG_SELECT_POLICY,
+	PROP_LINK_WATCHERS,
+);
+
+static const _NMUtilsTeamPropertyKeys _prop_to_keys[_PROPERTY_ENUMS_LAST] = {
+	[PROP_CONFIG] =                      { },
+	[PROP_NOTIFY_PEERS_COUNT] =          { .key1 = "notify_peers", .key2 = "count",                                           },
+	[PROP_NOTIFY_PEERS_INTERVAL] =       { .key1 = "notify_peers", .key2 = "interval",                                        },
+	[PROP_MCAST_REJOIN_COUNT] =          { .key1 = "mcast_rejoin", .key2 = "count",                                           },
+	[PROP_MCAST_REJOIN_INTERVAL] =       { .key1 = "mcast_rejoin", .key2 = "interval",                                        },
+	[PROP_RUNNER] =                      { .key1 = "runner",       .key2 = "name",                                            .default_str = NM_SETTING_TEAM_RUNNER_DEFAULT, },
+	[PROP_RUNNER_HWADDR_POLICY] =        { .key1 = "runner",       .key2 = "hwaddr_policy",                                   },
+	[PROP_RUNNER_TX_HASH] =              { .key1 = "runner",       .key2 = "tx_hash",                                         },
+	[PROP_RUNNER_TX_BALANCER] =          { .key1 = "runner",       .key2 = "tx_balancer",       .key3 = "name", },
+	[PROP_RUNNER_TX_BALANCER_INTERVAL] = { .key1 = "runner",       .key2 = "tx_balancer",       .key3 = "balancing_interval", .default_int = -1 },
+	[PROP_RUNNER_ACTIVE] =               { .key1 = "runner",       .key2 = "active",                                          },
+	[PROP_RUNNER_FAST_RATE] =            { .key1 = "runner",       .key2 = "fast_rate",                                       },
+	[PROP_RUNNER_SYS_PRIO] =             { .key1 = "runner",       .key2 = "sys_prio",                                        .default_int = -1, },
+	[PROP_RUNNER_MIN_PORTS] =            { .key1 = "runner",       .key2 = "min_ports",                                       .default_int = -1, },
+	[PROP_RUNNER_AGG_SELECT_POLICY] =    { .key1 = "runner",       .key2 = "agg_select_policy",                               },
+	[PROP_LINK_WATCHERS] =               { .key1 = "link_watch",                                                              },
+};
 
 typedef struct {
 	char *config;
@@ -580,62 +681,11 @@ typedef struct {
 	GPtrArray *link_watchers; /* Array of NMTeamLinkWatcher */
 } NMSettingTeamPrivate;
 
-/* Keep aligned with _prop_to_keys[] */
-enum {
-	PROP_0,
-	PROP_CONFIG,
-	PROP_NOTIFY_PEERS_COUNT,
-	PROP_NOTIFY_PEERS_INTERVAL,
-	PROP_MCAST_REJOIN_COUNT,
-	PROP_MCAST_REJOIN_INTERVAL,
-	PROP_RUNNER,
-	PROP_RUNNER_HWADDR_POLICY,
-	PROP_RUNNER_TX_HASH,
-	PROP_RUNNER_TX_BALANCER,
-	PROP_RUNNER_TX_BALANCER_INTERVAL,
-	PROP_RUNNER_ACTIVE,
-	PROP_RUNNER_FAST_RATE,
-	PROP_RUNNER_SYS_PRIO,
-	PROP_RUNNER_MIN_PORTS,
-	PROP_RUNNER_AGG_SELECT_POLICY,
-	PROP_LINK_WATCHERS,
-	LAST_PROP
-};
+G_DEFINE_TYPE (NMSettingTeam, nm_setting_team, NM_TYPE_SETTING)
 
-/* Keep aligned with team properties enum */
-static const _NMUtilsTeamPropertyKeys _prop_to_keys[LAST_PROP] = {
-	[PROP_0] =                           { NULL, NULL, NULL, 0 },
-	[PROP_CONFIG] =                      { NULL, NULL, NULL, 0 },
-	[PROP_NOTIFY_PEERS_COUNT] =          { "notify_peers", "count", NULL, 0 },
-	[PROP_NOTIFY_PEERS_INTERVAL] =       { "notify_peers", "interval", NULL, 0 },
-	[PROP_MCAST_REJOIN_COUNT] =          { "mcast_rejoin", "count", NULL, 0 },
-	[PROP_MCAST_REJOIN_INTERVAL] =       { "mcast_rejoin", "interval", NULL, 0 },
-	[PROP_RUNNER] =                      { "runner", "name", NULL,
-	                                       {.default_str = NM_SETTING_TEAM_RUNNER_DEFAULT} },
-	[PROP_RUNNER_HWADDR_POLICY] =        { "runner", "hwaddr_policy", NULL, 0 },
-	[PROP_RUNNER_TX_HASH] =              { "runner", "tx_hash", NULL, 0 },
-	[PROP_RUNNER_TX_BALANCER] =          { "runner", "tx_balancer", "name", 0 },
-	[PROP_RUNNER_TX_BALANCER_INTERVAL] = { "runner", "tx_balancer", "balancing_interval", -1 },
-	[PROP_RUNNER_ACTIVE] =               { "runner", "active", NULL, 0 },
-	[PROP_RUNNER_FAST_RATE] =            { "runner", "fast_rate", NULL, 0 },
-	[PROP_RUNNER_SYS_PRIO] =             { "runner", "sys_prio", NULL, -1 },
-	[PROP_RUNNER_MIN_PORTS] =            { "runner", "min_ports", NULL, -1 },
-	[PROP_RUNNER_AGG_SELECT_POLICY] =    { "runner", "agg_select_policy", NULL, 0 },
-	[PROP_LINK_WATCHERS] =               { "link_watch", NULL, NULL, 0 }
-};
+#define NM_SETTING_TEAM_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_SETTING_TEAM, NMSettingTeamPrivate))
 
-/**
- * nm_setting_team_new:
- *
- * Creates a new #NMSettingTeam object with default values.
- *
- * Returns: (transfer full): the new empty #NMSettingTeam object
- **/
-NMSetting *
-nm_setting_team_new (void)
-{
-	return (NMSetting *) g_object_new (NM_TYPE_SETTING_TEAM, NULL);
-}
+/*****************************************************************************/
 
 /**
  * nm_setting_team_get_config:
@@ -884,7 +934,7 @@ nm_setting_team_remove_runner_tx_hash_by_value (NMSettingTeam *setting,
 	for (i = 0; i < priv->runner_tx_hash->len; i++) {
 		if (nm_streq (txhash, priv->runner_tx_hash->pdata[i])) {
 			g_ptr_array_remove_index (priv->runner_tx_hash, i);
-			g_object_notify (G_OBJECT (setting), NM_SETTING_TEAM_RUNNER_TX_HASH);
+			_notify (setting, PROP_RUNNER_TX_HASH);
 			return TRUE;
 		}
 	}
@@ -947,7 +997,7 @@ nm_setting_team_remove_runner_tx_hash (NMSettingTeam *setting, guint idx)
 	g_return_if_fail (idx < priv->runner_tx_hash->len);
 
 	g_ptr_array_remove_index (priv->runner_tx_hash, idx);
-	g_object_notify (G_OBJECT (setting), NM_SETTING_TEAM_RUNNER_TX_HASH);
+	_notify (setting, PROP_RUNNER_TX_HASH);
 }
 
 /**
@@ -980,7 +1030,7 @@ nm_setting_team_add_runner_tx_hash (NMSettingTeam *setting, const char *txhash)
 	}
 
 	g_ptr_array_add (priv->runner_tx_hash, g_strdup (txhash));
-	g_object_notify (G_OBJECT (setting), NM_SETTING_TEAM_RUNNER_TX_HASH);
+	_notify (setting, PROP_RUNNER_TX_HASH);
 	return TRUE;
 }
 
@@ -1050,7 +1100,7 @@ nm_setting_team_add_link_watcher (NMSettingTeam *setting,
 	}
 
 	g_ptr_array_add (priv->link_watchers, nm_team_link_watcher_dup (link_watcher));
-	g_object_notify (G_OBJECT (setting), NM_SETTING_TEAM_LINK_WATCHERS);
+	_notify (setting, PROP_LINK_WATCHERS);
 	return TRUE;
 }
 
@@ -1072,7 +1122,7 @@ nm_setting_team_remove_link_watcher (NMSettingTeam *setting, guint idx)
 	g_return_if_fail (idx < priv->link_watchers->len);
 
 	g_ptr_array_remove_index (priv->link_watchers, idx);
-	g_object_notify (G_OBJECT (setting), NM_SETTING_TEAM_LINK_WATCHERS);
+	_notify (setting, PROP_LINK_WATCHERS);
 }
 
 /**
@@ -1098,7 +1148,7 @@ nm_setting_team_remove_link_watcher_by_value (NMSettingTeam *setting,
 	for (i = 0; i < priv->link_watchers->len; i++) {
 		if (nm_team_link_watcher_equal (priv->link_watchers->pdata[i], link_watcher)) {
 			g_ptr_array_remove_index (priv->link_watchers, i);
-			g_object_notify (G_OBJECT (setting), NM_SETTING_TEAM_LINK_WATCHERS);
+			_notify (setting, PROP_LINK_WATCHERS);
 			return TRUE;
 		}
 	}
@@ -1121,7 +1171,7 @@ nm_setting_team_clear_link_watchers (NMSettingTeam *setting) {
 
 	if (priv->link_watchers->len != 0) {
 		g_ptr_array_set_size (priv->link_watchers, 0);
-		g_object_notify (G_OBJECT (setting), NM_SETTING_TEAM_LINK_WATCHERS);
+		_notify (setting, PROP_LINK_WATCHERS);
 	}
 }
 
@@ -1230,38 +1280,33 @@ verify (NMSetting *setting, NMConnection *connection, GError **error)
 	return TRUE;
 }
 
-static gboolean
-compare_property (NMSetting *setting,
+static NMTernary
+compare_property (const NMSettInfoSetting *sett_info,
+                  guint property_idx,
+                  NMSetting *setting,
                   NMSetting *other,
-                  const GParamSpec *prop_spec,
                   NMSettingCompareFlags flags)
 {
 	NMSettingTeamPrivate *a_priv, *b_priv;
-	NMSettingClass *setting_class;
 	guint i, j;
 
-	/* If we are trying to match a connection in order to assume it (and thus
-	 * @flags contains INFERRABLE), use the "relaxed" matching for team
-	 * configuration. Otherwise, for all other purposes (including connection
-	 * comparison before an update), resort to the default string comparison.
-	 */
-	if (   NM_FLAGS_HAS (flags, NM_SETTING_COMPARE_FLAG_INFERRABLE)
-	    && nm_streq0 (prop_spec->name, NM_SETTING_TEAM_CONFIG)) {
-		return _nm_utils_team_config_equal (NM_SETTING_TEAM_GET_PRIVATE (setting)->config,
-		                                    NM_SETTING_TEAM_GET_PRIVATE (other)->config,
-		                                    FALSE);
-	}
-	if (nm_streq0 (prop_spec->name, NM_SETTING_TEAM_LINK_WATCHERS)) {
-		a_priv = NM_SETTING_TEAM_GET_PRIVATE (setting);
-		b_priv = NM_SETTING_TEAM_GET_PRIVATE (other);
+	if (nm_streq (sett_info->property_infos[property_idx].name, NM_SETTING_TEAM_LINK_WATCHERS)) {
 
-		if (a_priv->link_watchers->len != b_priv->link_watchers->len)
-			return FALSE;
-		for (i = 0; i < a_priv->link_watchers->len; i++) {
-			for (j = 0; j < b_priv->link_watchers->len; j++) {
-				if (nm_team_link_watcher_equal (a_priv->link_watchers->pdata[i],
-				                                b_priv->link_watchers->pdata[j])) {
-					break;
+		if (NM_FLAGS_HAS (flags, NM_SETTING_COMPARE_FLAG_INFERRABLE))
+			return NM_TERNARY_DEFAULT;
+
+		if (other) {
+			a_priv = NM_SETTING_TEAM_GET_PRIVATE (setting);
+			b_priv = NM_SETTING_TEAM_GET_PRIVATE (other);
+
+			if (a_priv->link_watchers->len != b_priv->link_watchers->len)
+				return FALSE;
+			for (i = 0; i < a_priv->link_watchers->len; i++) {
+				for (j = 0; j < b_priv->link_watchers->len; j++) {
+					if (nm_team_link_watcher_equal (a_priv->link_watchers->pdata[i],
+					                                b_priv->link_watchers->pdata[j])) {
+						break;
+					}
 				}
 				if (j == b_priv->link_watchers->len)
 					return FALSE;
@@ -1270,37 +1315,32 @@ compare_property (NMSetting *setting,
 		return TRUE;
 	}
 
-	setting_class = NM_SETTING_CLASS (nm_setting_team_parent_class);
-	return setting_class->compare_property (setting, other, prop_spec, flags);
-}
-
-static void
-nm_setting_team_init (NMSettingTeam *setting)
-{
-	NMSettingTeamPrivate *priv = NM_SETTING_TEAM_GET_PRIVATE (setting);
-
-	priv->runner = g_strdup (NM_SETTING_TEAM_RUNNER_ROUNDROBIN);
-	priv->runner_tx_balancer_interval = -1;
-	priv->runner_sys_prio = -1;
-	priv->runner_min_ports = -1;
-	priv->link_watchers = g_ptr_array_new_with_free_func ((GDestroyNotify) nm_team_link_watcher_unref);
-}
+	if (nm_streq (sett_info->property_infos[property_idx].name, NM_SETTING_TEAM_CONFIG)) {
+		if (other) {
+			a_priv = NM_SETTING_TEAM_GET_PRIVATE (setting);
+			b_priv = NM_SETTING_TEAM_GET_PRIVATE (other);
+
+			if (NM_FLAGS_HAS (flags, NM_SETTING_COMPARE_FLAG_INFERRABLE)) {
+				/* If we are trying to match a connection in order to assume it (and thus
+				 * @flags contains INFERRABLE), use the "relaxed" matching for team
+				 * configuration. Otherwise, for all other purposes (including connection
+				 * comparison before an update), resort to the default string comparison. */
+				return _nm_utils_team_config_equal (a_priv->config,
+				                                    b_priv->config,
+				                                    TRUE);
+			}
 
-static void
-finalize (GObject *object)
-{
-	NMSettingTeamPrivate *priv = NM_SETTING_TEAM_GET_PRIVATE (object);
+			return nm_streq0 (a_priv->config, b_priv->config);
+		}
 
-	g_free (priv->config);
-	g_free (priv->runner);
-	g_free (priv->runner_hwaddr_policy);
-	g_free (priv->runner_tx_balancer);
-	g_free (priv->runner_agg_select_policy);
-	if (priv->runner_tx_hash)
-		g_ptr_array_unref (priv->runner_tx_hash);
-	g_ptr_array_unref (priv->link_watchers);
+		return TRUE;
+	}
 
-	G_OBJECT_CLASS (nm_setting_team_parent_class)->finalize (object);
+	return NM_SETTING_CLASS (nm_setting_team_parent_class)->compare_property (sett_info,
+	                                                                          property_idx,
+	                                                                          setting,
+	                                                                          other,
+	                                                                          flags);
 }
 
 #define JSON_TO_VAL(typ, id)   _nm_utils_json_extract_##typ (priv->config, _prop_to_keys[id], FALSE)
@@ -1347,6 +1387,73 @@ _align_team_properties (NMSettingTeam *setting)
 	priv->link_watchers = JSON_TO_VAL (ptr_array, PROP_LINK_WATCHERS);
 }
 
+/*****************************************************************************/
+
+static void
+get_property (GObject *object, guint prop_id,
+              GValue *value, GParamSpec *pspec)
+{
+	NMSettingTeam *setting = NM_SETTING_TEAM (object);
+	NMSettingTeamPrivate *priv = NM_SETTING_TEAM_GET_PRIVATE (setting);
+
+	switch (prop_id) {
+	case PROP_CONFIG:
+		g_value_set_string (value, nm_setting_team_get_config (setting));
+		break;
+	case PROP_NOTIFY_PEERS_COUNT:
+		g_value_set_int (value, priv->notify_peers_count);
+		break;
+	case PROP_NOTIFY_PEERS_INTERVAL:
+		g_value_set_int (value, priv->notify_peers_interval);
+		break;
+	case PROP_MCAST_REJOIN_COUNT:
+		g_value_set_int (value, priv->mcast_rejoin_count);
+		break;
+	case PROP_MCAST_REJOIN_INTERVAL:
+		g_value_set_int (value, priv->mcast_rejoin_interval);
+		break;
+	case PROP_RUNNER:
+		g_value_set_string (value, nm_setting_team_get_runner (setting));
+		break;
+	case PROP_RUNNER_HWADDR_POLICY:
+		g_value_set_string (value, nm_setting_team_get_runner_hwaddr_policy (setting));
+		break;
+	case PROP_RUNNER_TX_HASH:
+		g_value_take_boxed (value, priv->runner_tx_hash ?
+		                    _nm_utils_ptrarray_to_strv (priv->runner_tx_hash): NULL);
+		break;
+	case PROP_RUNNER_TX_BALANCER:
+		g_value_set_string (value, nm_setting_team_get_runner_tx_balancer (setting));
+		break;
+	case PROP_RUNNER_TX_BALANCER_INTERVAL:
+		g_value_set_int (value, priv->runner_tx_balancer_interval);
+		break;
+	case PROP_RUNNER_ACTIVE:
+		g_value_set_boolean (value, nm_setting_team_get_runner_active (setting));
+		break;
+	case PROP_RUNNER_FAST_RATE:
+		g_value_set_boolean (value, nm_setting_team_get_runner_fast_rate (setting));
+		break;
+	case PROP_RUNNER_SYS_PRIO:
+		g_value_set_int (value, priv->runner_sys_prio);
+		break;
+	case PROP_RUNNER_MIN_PORTS:
+		g_value_set_int (value, priv->runner_min_ports);
+		break;
+	case PROP_RUNNER_AGG_SELECT_POLICY:
+		g_value_set_string (value, nm_setting_team_get_runner_agg_select_policy (setting));
+		break;
+	case PROP_LINK_WATCHERS:
+		g_value_take_boxed (value, _nm_utils_copy_array (priv->link_watchers,
+		                                                 (NMUtilsCopyFunc) nm_team_link_watcher_dup,
+		                                                 (GDestroyNotify) nm_team_link_watcher_unref));
+		break;
+	default:
+		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+		break;
+	}
+}
+
 static void
 set_property (GObject *object, guint prop_id,
               const GValue *value, GParamSpec *pspec)
@@ -1490,69 +1597,48 @@ set_property (GObject *object, guint prop_id,
 	}
 }
 
+/*****************************************************************************/
+
 static void
-get_property (GObject *object, guint prop_id,
-              GValue *value, GParamSpec *pspec)
+nm_setting_team_init (NMSettingTeam *setting)
 {
-	NMSettingTeam *setting = NM_SETTING_TEAM (object);
 	NMSettingTeamPrivate *priv = NM_SETTING_TEAM_GET_PRIVATE (setting);
 
-	switch (prop_id) {
-	case PROP_CONFIG:
-		g_value_set_string (value, nm_setting_team_get_config (setting));
-		break;
-	case PROP_NOTIFY_PEERS_COUNT:
-		g_value_set_int (value, priv->notify_peers_count);
-		break;
-	case PROP_NOTIFY_PEERS_INTERVAL:
-		g_value_set_int (value, priv->notify_peers_interval);
-		break;
-	case PROP_MCAST_REJOIN_COUNT:
-		g_value_set_int (value, priv->mcast_rejoin_count);
-		break;
-	case PROP_MCAST_REJOIN_INTERVAL:
-		g_value_set_int (value, priv->mcast_rejoin_interval);
-		break;
-	case PROP_RUNNER:
-		g_value_set_string (value, nm_setting_team_get_runner (setting));
-		break;
-	case PROP_RUNNER_HWADDR_POLICY:
-		g_value_set_string (value, nm_setting_team_get_runner_hwaddr_policy (setting));
-		break;
-	case PROP_RUNNER_TX_HASH:
-		g_value_take_boxed (value, priv->runner_tx_hash ?
-		                    _nm_utils_ptrarray_to_strv (priv->runner_tx_hash): NULL);
-		break;
-	case PROP_RUNNER_TX_BALANCER:
-		g_value_set_string (value, nm_setting_team_get_runner_tx_balancer (setting));
-		break;
-	case PROP_RUNNER_TX_BALANCER_INTERVAL:
-		g_value_set_int (value, priv->runner_tx_balancer_interval);
-		break;
-	case PROP_RUNNER_ACTIVE:
-		g_value_set_boolean (value, nm_setting_team_get_runner_active (setting));
-		break;
-	case PROP_RUNNER_FAST_RATE:
-		g_value_set_boolean (value, nm_setting_team_get_runner_fast_rate (setting));
-		break;
-	case PROP_RUNNER_SYS_PRIO:
-		g_value_set_int (value, priv->runner_sys_prio);
-		break;
-	case PROP_RUNNER_MIN_PORTS:
-		g_value_set_int (value, priv->runner_min_ports);
-		break;
-	case PROP_RUNNER_AGG_SELECT_POLICY:
-		g_value_set_string (value, nm_setting_team_get_runner_agg_select_policy (setting));
-		break;
-	case PROP_LINK_WATCHERS:
-		g_value_take_boxed (value, _nm_utils_copy_array (priv->link_watchers,
-		                                                 (NMUtilsCopyFunc) nm_team_link_watcher_dup,
-		                                                 (GDestroyNotify) nm_team_link_watcher_unref));
-		break;
-	default:
-		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-		break;
-	}
+	priv->runner = g_strdup (NM_SETTING_TEAM_RUNNER_ROUNDROBIN);
+	priv->runner_tx_balancer_interval = -1;
+	priv->runner_sys_prio = -1;
+	priv->runner_min_ports = -1;
+	priv->link_watchers = g_ptr_array_new_with_free_func ((GDestroyNotify) nm_team_link_watcher_unref);
+}
+
+/**
+ * nm_setting_team_new:
+ *
+ * Creates a new #NMSettingTeam object with default values.
+ *
+ * Returns: (transfer full): the new empty #NMSettingTeam object
+ **/
+NMSetting *
+nm_setting_team_new (void)
+{
+	return (NMSetting *) g_object_new (NM_TYPE_SETTING_TEAM, NULL);
+}
+
+static void
+finalize (GObject *object)
+{
+	NMSettingTeamPrivate *priv = NM_SETTING_TEAM_GET_PRIVATE (object);
+
+	g_free (priv->config);
+	g_free (priv->runner);
+	g_free (priv->runner_hwaddr_policy);
+	g_free (priv->runner_tx_balancer);
+	g_free (priv->runner_agg_select_policy);
+	if (priv->runner_tx_hash)
+		g_ptr_array_unref (priv->runner_tx_hash);
+	g_ptr_array_unref (priv->link_watchers);
+
+	G_OBJECT_CLASS (nm_setting_team_parent_class)->finalize (object);
 }
 
 static void
@@ -1564,8 +1650,8 @@ nm_setting_team_class_init (NMSettingTeamClass *klass)
 
 	g_type_class_add_private (klass, sizeof (NMSettingTeamPrivate));
 
-	object_class->set_property     = set_property;
 	object_class->get_property     = get_property;
+	object_class->set_property     = set_property;
 	object_class->finalize         = finalize;
 
 	setting_class->compare_property = compare_property;
@@ -1585,13 +1671,12 @@ nm_setting_team_class_init (NMSettingTeamClass *klass)
 	 * description: Team configuration in JSON. See man teamd.conf for details.
 	 * ---end---
 	 */
-	g_object_class_install_property
-		(object_class, PROP_CONFIG,
-		 g_param_spec_string (NM_SETTING_TEAM_CONFIG, "", "",
-		                      NULL,
-		                      G_PARAM_READWRITE |
-		                      NM_SETTING_PARAM_INFERRABLE |
-		                      G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_CONFIG] =
+	    g_param_spec_string (NM_SETTING_TEAM_CONFIG, "", "",
+	                         NULL,
+	                         G_PARAM_READWRITE |
+	                         NM_SETTING_PARAM_INFERRABLE |
+	                         G_PARAM_STATIC_STRINGS);
 
 	/**
 	 * NMSettingTeam:notify-peers-count:
@@ -1600,12 +1685,11 @@ nm_setting_team_class_init (NMSettingTeamClass *klass)
 	 *
 	 * Since: 1.12
 	 **/
-	g_object_class_install_property
-		(object_class, PROP_NOTIFY_PEERS_COUNT,
-		 g_param_spec_int (NM_SETTING_TEAM_NOTIFY_PEERS_COUNT, "", "",
-		                   G_MININT32, G_MAXINT32, 0,
-		                   G_PARAM_READWRITE |
-		                   G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_NOTIFY_PEERS_COUNT] =
+	    g_param_spec_int (NM_SETTING_TEAM_NOTIFY_PEERS_COUNT, "", "",
+	                      G_MININT32, G_MAXINT32, 0,
+	                      G_PARAM_READWRITE |
+	                      G_PARAM_STATIC_STRINGS);
 
 	/**
 	 * NMSettingTeam:notify-peers-interval:
@@ -1614,12 +1698,11 @@ nm_setting_team_class_init (NMSettingTeamClass *klass)
 	 *
 	 * Since: 1.12
 	 **/
-	g_object_class_install_property
-		(object_class, PROP_NOTIFY_PEERS_INTERVAL,
-		 g_param_spec_int (NM_SETTING_TEAM_NOTIFY_PEERS_INTERVAL, "", "",
-		                   G_MININT32, G_MAXINT32, 0,
-		                   G_PARAM_READWRITE |
-		                   G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_NOTIFY_PEERS_INTERVAL] =
+	    g_param_spec_int (NM_SETTING_TEAM_NOTIFY_PEERS_INTERVAL, "", "",
+	                      G_MININT32, G_MAXINT32, 0,
+	                      G_PARAM_READWRITE |
+	                      G_PARAM_STATIC_STRINGS);
 
 	/**
 	 * NMSettingTeam:mcast-rejoin-count:
@@ -1628,12 +1711,11 @@ nm_setting_team_class_init (NMSettingTeamClass *klass)
 	 *
 	 * Since: 1.12
 	 **/
-	g_object_class_install_property
-		(object_class, PROP_MCAST_REJOIN_COUNT,
-		 g_param_spec_int (NM_SETTING_TEAM_MCAST_REJOIN_COUNT, "", "",
-		                   G_MININT32, G_MAXINT32, 0,
-		                   G_PARAM_READWRITE |
-		                   G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_MCAST_REJOIN_COUNT] =
+	    g_param_spec_int (NM_SETTING_TEAM_MCAST_REJOIN_COUNT, "", "",
+	                      G_MININT32, G_MAXINT32, 0,
+	                      G_PARAM_READWRITE |
+	                      G_PARAM_STATIC_STRINGS);
 
 	/**
 	 * NMSettingTeam:mcast-rejoin-interval:
@@ -1642,12 +1724,11 @@ nm_setting_team_class_init (NMSettingTeamClass *klass)
 	 *
 	 * Since: 1.12
 	 **/
-	g_object_class_install_property
-		(object_class, PROP_MCAST_REJOIN_INTERVAL,
-		 g_param_spec_int (NM_SETTING_TEAM_MCAST_REJOIN_INTERVAL, "", "",
-		                   G_MININT32, G_MAXINT32, 0,
-		                   G_PARAM_READWRITE |
-		                   G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_MCAST_REJOIN_INTERVAL] =
+	    g_param_spec_int (NM_SETTING_TEAM_MCAST_REJOIN_INTERVAL, "", "",
+	                      G_MININT32, G_MAXINT32, 0,
+	                      G_PARAM_READWRITE |
+	                      G_PARAM_STATIC_STRINGS);
 
 	/**
 	 * NMSettingTeam:runner:
@@ -1662,12 +1743,11 @@ nm_setting_team_class_init (NMSettingTeamClass *klass)
 	 *
 	 * Since: 1.12
 	 **/
-	g_object_class_install_property
-		(object_class, PROP_RUNNER,
-		 g_param_spec_string (NM_SETTING_TEAM_RUNNER, "", "",
-		                      NULL,
-		                      G_PARAM_READWRITE |
-		                      G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_RUNNER] =
+	    g_param_spec_string (NM_SETTING_TEAM_RUNNER, "", "",
+	                         NULL,
+	                         G_PARAM_READWRITE |
+	                         G_PARAM_STATIC_STRINGS);
 
 	/**
 	 * NMSettingTeam:runner-hwaddr-policy:
@@ -1676,12 +1756,11 @@ nm_setting_team_class_init (NMSettingTeamClass *klass)
 	 *
 	 * Since: 1.12
 	 **/
-	g_object_class_install_property
-		(object_class, PROP_RUNNER_HWADDR_POLICY,
-		 g_param_spec_string (NM_SETTING_TEAM_RUNNER_HWADDR_POLICY, "", "",
-		                      NULL,
-		                      G_PARAM_READWRITE |
-		                      G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_RUNNER_HWADDR_POLICY] =
+	    g_param_spec_string (NM_SETTING_TEAM_RUNNER_HWADDR_POLICY, "", "",
+	                         NULL,
+	                         G_PARAM_READWRITE |
+	                         G_PARAM_STATIC_STRINGS);
 
 	/**
 	 * NMSettingTeam:runner-tx-hash:
@@ -1690,13 +1769,12 @@ nm_setting_team_class_init (NMSettingTeamClass *klass)
 	 *
 	 * Since: 1.12
 	 **/
-	g_object_class_install_property
-		(object_class, PROP_RUNNER_TX_HASH,
-		 g_param_spec_boxed (NM_SETTING_TEAM_RUNNER_TX_HASH, "", "",
-		                     G_TYPE_STRV,
+	obj_properties[PROP_RUNNER_TX_HASH] =
+	    g_param_spec_boxed (NM_SETTING_TEAM_RUNNER_TX_HASH, "", "",
+	                        G_TYPE_STRV,
 	                             G_PARAM_READWRITE |
-		                     NM_SETTING_PARAM_INFERRABLE |
-	                             G_PARAM_STATIC_STRINGS));
+	                        NM_SETTING_PARAM_INFERRABLE |
+	                             G_PARAM_STATIC_STRINGS);
 
 	/**
 	 * NMSettingTeam:runner-tx-balancer:
@@ -1705,12 +1783,11 @@ nm_setting_team_class_init (NMSettingTeamClass *klass)
 	 *
 	 * Since: 1.12
 	 **/
-	g_object_class_install_property
-		(object_class, PROP_RUNNER_TX_BALANCER,
-		 g_param_spec_string (NM_SETTING_TEAM_RUNNER_TX_BALANCER, "", "",
-		                      NULL,
-		                      G_PARAM_READWRITE |
-		                      G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_RUNNER_TX_BALANCER] =
+	    g_param_spec_string (NM_SETTING_TEAM_RUNNER_TX_BALANCER, "", "",
+	                         NULL,
+	                         G_PARAM_READWRITE |
+	                         G_PARAM_STATIC_STRINGS);
 
 	/**
 	 * NMSettingTeam:runner-tx-balancer-interval:
@@ -1719,12 +1796,11 @@ nm_setting_team_class_init (NMSettingTeamClass *klass)
 	 *
 	 * Since: 1.12
 	 **/
-	g_object_class_install_property
-		(object_class, PROP_RUNNER_TX_BALANCER_INTERVAL,
-		 g_param_spec_int (NM_SETTING_TEAM_RUNNER_TX_BALANCER_INTERVAL, "", "",
-		                   G_MININT32, G_MAXINT32, 0,
-		                   G_PARAM_READWRITE |
-		                   G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_RUNNER_TX_BALANCER_INTERVAL] =
+	    g_param_spec_int (NM_SETTING_TEAM_RUNNER_TX_BALANCER_INTERVAL, "", "",
+	                      G_MININT32, G_MAXINT32, 0,
+	                      G_PARAM_READWRITE |
+	                      G_PARAM_STATIC_STRINGS);
 
 	/**
 	 * NMSettingTeam:runner-active:
@@ -1733,12 +1809,11 @@ nm_setting_team_class_init (NMSettingTeamClass *klass)
 	 *
 	 * Since: 1.12
 	 **/
-	g_object_class_install_property
-		(object_class, PROP_RUNNER_ACTIVE,
-		 g_param_spec_boolean (NM_SETTING_TEAM_RUNNER_ACTIVE, "", "",
-		                       FALSE,
-		                       G_PARAM_READWRITE |
-		                       G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_RUNNER_ACTIVE] =
+	    g_param_spec_boolean (NM_SETTING_TEAM_RUNNER_ACTIVE, "", "",
+	                          FALSE,
+	                          G_PARAM_READWRITE |
+	                          G_PARAM_STATIC_STRINGS);
 
 	/**
 	 * NMSettingTeam:runner-fast-rate:
@@ -1747,12 +1822,11 @@ nm_setting_team_class_init (NMSettingTeamClass *klass)
 	 *
 	 * Since: 1.12
 	 **/
-	g_object_class_install_property
-		(object_class, PROP_RUNNER_FAST_RATE,
-		 g_param_spec_boolean (NM_SETTING_TEAM_RUNNER_FAST_RATE, "", "",
-		                       FALSE,
-		                       G_PARAM_READWRITE |
-		                       G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_RUNNER_FAST_RATE] =
+	    g_param_spec_boolean (NM_SETTING_TEAM_RUNNER_FAST_RATE, "", "",
+	                          FALSE,
+	                          G_PARAM_READWRITE |
+	                          G_PARAM_STATIC_STRINGS);
 
 	/**
 	 * NMSettingTeam:runner-sys-prio:
@@ -1761,12 +1835,11 @@ nm_setting_team_class_init (NMSettingTeamClass *klass)
 	 *
 	 * Since: 1.12
 	 **/
-	g_object_class_install_property
-		(object_class, PROP_RUNNER_SYS_PRIO,
-		 g_param_spec_int (NM_SETTING_TEAM_RUNNER_SYS_PRIO, "", "",
-		                   G_MININT32, G_MAXINT32, 0,
-		                   G_PARAM_READWRITE |
-		                   G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_RUNNER_SYS_PRIO] =
+	    g_param_spec_int (NM_SETTING_TEAM_RUNNER_SYS_PRIO, "", "",
+	                      G_MININT32, G_MAXINT32, 0,
+	                      G_PARAM_READWRITE |
+	                      G_PARAM_STATIC_STRINGS);
 
 	/**
 	 * NMSettingTeam:runner-min-ports:
@@ -1775,12 +1848,11 @@ nm_setting_team_class_init (NMSettingTeamClass *klass)
 	 *
 	 * Since: 1.12
 	 **/
-	g_object_class_install_property
-		(object_class, PROP_RUNNER_MIN_PORTS,
-		 g_param_spec_int (NM_SETTING_TEAM_RUNNER_MIN_PORTS, "", "",
-		                   G_MININT32, G_MAXINT32, 0,
-		                   G_PARAM_READWRITE |
-		                   G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_RUNNER_MIN_PORTS] =
+	    g_param_spec_int (NM_SETTING_TEAM_RUNNER_MIN_PORTS, "", "",
+	                      G_MININT32, G_MAXINT32, 0,
+	                      G_PARAM_READWRITE |
+	                      G_PARAM_STATIC_STRINGS);
 
 	/**
 	 * NMSettingTeam:runner-agg-select-policy:
@@ -1789,12 +1861,11 @@ nm_setting_team_class_init (NMSettingTeamClass *klass)
 	 *
 	 * Since: 1.12
 	 **/
-	g_object_class_install_property
-		(object_class, PROP_RUNNER_AGG_SELECT_POLICY,
-		 g_param_spec_string (NM_SETTING_TEAM_RUNNER_AGG_SELECT_POLICY, "", "",
-		                      NULL,
-		                      G_PARAM_READWRITE |
-		                      G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_RUNNER_AGG_SELECT_POLICY] =
+	    g_param_spec_string (NM_SETTING_TEAM_RUNNER_AGG_SELECT_POLICY, "", "",
+	                         NULL,
+	                         G_PARAM_READWRITE |
+	                         G_PARAM_STATIC_STRINGS);
 
 	/**
 	 * NMSettingTeam:link-watchers: (type GPtrArray(NMTeamLinkWatcher))
@@ -1806,20 +1877,18 @@ nm_setting_team_class_init (NMSettingTeamClass *klass)
 	 * Available keys are:   ethtool: 'delay-up', 'delay-down', 'init-wait';
 	 * nsna_ping: 'init-wait', 'interval', 'missed-max', 'target-host';
 	 * arp_ping: all the ones in nsna_ping and 'source-host', 'validate-active',
-	 * 'validate-incative', 'send-always'. See teamd.conf man for more details.
+	 * 'validate-inactive', 'send-always'. See teamd.conf man for more details.
 	 *
 	 * Since: 1.12
 	 **/
-	g_object_class_install_property
-		(object_class, PROP_LINK_WATCHERS,
-		 g_param_spec_boxed (NM_SETTING_TEAM_LINK_WATCHERS, "", "",
-		                     G_TYPE_PTR_ARRAY,
-		                     G_PARAM_READWRITE |
-		                     G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_LINK_WATCHERS] =
+	    g_param_spec_boxed (NM_SETTING_TEAM_LINK_WATCHERS, "", "",
+	                        G_TYPE_PTR_ARRAY,
+	                        G_PARAM_READWRITE |
+	                        G_PARAM_STATIC_STRINGS);
 
 	_properties_override_add_transform (properties_override,
-	                                    g_object_class_find_property (G_OBJECT_CLASS (setting_class),
-	                                                                  NM_SETTING_TEAM_LINK_WATCHERS),
+	                                    obj_properties[PROP_LINK_WATCHERS],
 	                                    G_VARIANT_TYPE ("aa{sv}"),
 	                                    team_link_watchers_to_dbus,
 	                                    team_link_watchers_from_dbus);
@@ -1838,6 +1907,8 @@ nm_setting_team_class_init (NMSettingTeamClass *klass)
 	                                    _nm_setting_get_deprecated_virtual_interface_name,
 	                                    NULL);
 
+	g_object_class_install_properties (object_class, _PROPERTY_ENUMS_LAST, obj_properties);
+
 	_nm_setting_class_commit_full (setting_class, NM_META_SETTING_TYPE_TEAM,
 	                               NULL, properties_override);
 }
diff --git a/libnm-core/nm-setting-team.h b/libnm-core/nm-setting-team.h
index a600053a..a6ef387f 100644
--- a/libnm-core/nm-setting-team.h
+++ b/libnm-core/nm-setting-team.h
@@ -43,9 +43,9 @@ G_BEGIN_DECLS
  */
 typedef enum { /*< flags >*/
 	NM_TEAM_LINK_WATCHER_ARP_PING_FLAG_NONE              = 0, /*< skip >*/
-	NM_TEAM_LINK_WATCHER_ARP_PING_FLAG_VALIDATE_ACTIVE   = (1 << 1),
-	NM_TEAM_LINK_WATCHER_ARP_PING_FLAG_VALIDATE_INACTIVE = (1 << 2),
-	NM_TEAM_LINK_WATCHER_ARP_PING_FLAG_SEND_ALWAYS       = (1 << 3)
+	NM_TEAM_LINK_WATCHER_ARP_PING_FLAG_VALIDATE_ACTIVE   = 0x2,
+	NM_TEAM_LINK_WATCHER_ARP_PING_FLAG_VALIDATE_INACTIVE = 0x4,
+	NM_TEAM_LINK_WATCHER_ARP_PING_FLAG_SEND_ALWAYS       = 0x8,
 } NMTeamLinkWatcherArpPingFlags;
 
 #define NM_TEAM_LINK_WATCHER_ETHTOOL   "ethtool"
@@ -74,6 +74,15 @@ NMTeamLinkWatcher *nm_team_link_watcher_new_arp_ping (int init_wait,
                                                       const char *source_host,
                                                       NMTeamLinkWatcherArpPingFlags flags,
                                                       GError **error);
+NM_AVAILABLE_IN_1_16
+NMTeamLinkWatcher *nm_team_link_watcher_new_arp_ping2 (int init_wait,
+                                                       int interval,
+                                                       int missed_max,
+                                                       int vlanid,
+                                                       const char *target_host,
+                                                       const char *source_host,
+                                                       NMTeamLinkWatcherArpPingFlags flags,
+                                                       GError **error);
 NM_AVAILABLE_IN_1_12
 void nm_team_link_watcher_ref                    (NMTeamLinkWatcher *watcher);
 NM_AVAILABLE_IN_1_12
@@ -100,6 +109,8 @@ NM_AVAILABLE_IN_1_12
 const char *nm_team_link_watcher_get_source_host (NMTeamLinkWatcher *watcher);
 NM_AVAILABLE_IN_1_12
 NMTeamLinkWatcherArpPingFlags nm_team_link_watcher_get_flags (NMTeamLinkWatcher *watcher);
+NM_AVAILABLE_IN_1_16
+int nm_team_link_watcher_get_vlanid              (NMTeamLinkWatcher *watcher);
 
 #define NM_TYPE_SETTING_TEAM            (nm_setting_team_get_type ())
 #define NM_SETTING_TEAM(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_SETTING_TEAM, NMSettingTeam))
diff --git a/libnm-core/nm-setting-tun.c b/libnm-core/nm-setting-tun.c
index 3e033e25..9801f5cf 100644
--- a/libnm-core/nm-setting-tun.c
+++ b/libnm-core/nm-setting-tun.c
@@ -21,10 +21,10 @@
 
 #include "nm-default.h"
 
+#include "nm-setting-tun.h"
+
 #include 
-#include 
 
-#include "nm-setting-tun.h"
 #include "nm-utils.h"
 #include "nm-setting-connection.h"
 #include "nm-setting-private.h"
@@ -38,9 +38,16 @@
  * necessary for connection to TUN/TAP interfaces.
  **/
 
-G_DEFINE_TYPE (NMSettingTun, nm_setting_tun, NM_TYPE_SETTING)
+/*****************************************************************************/
 
-#define NM_SETTING_TUN_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_SETTING_TUN, NMSettingTunPrivate))
+NM_GOBJECT_PROPERTIES_DEFINE_BASE (
+	PROP_MODE,
+	PROP_OWNER,
+	PROP_GROUP,
+	PROP_PI,
+	PROP_VNET_HDR,
+	PROP_MULTI_QUEUE,
+);
 
 typedef struct {
 	NMSettingTunMode mode;
@@ -51,31 +58,11 @@ typedef struct {
 	gboolean multi_queue;
 } NMSettingTunPrivate;
 
-enum {
-	PROP_0,
-	PROP_MODE,
-	PROP_OWNER,
-	PROP_GROUP,
-	PROP_PI,
-	PROP_VNET_HDR,
-	PROP_MULTI_QUEUE,
-	LAST_PROP
-};
+G_DEFINE_TYPE (NMSettingTun, nm_setting_tun, NM_TYPE_SETTING)
 
-/**
- * nm_setting_tun_new:
- *
- * Creates a new #NMSettingTun object with default values.
- *
- * Returns: (transfer full): the new empty #NMSettingTun object
- *
- * Since: 1.2
- **/
-NMSetting *
-nm_setting_tun_new (void)
-{
-	return (NMSetting *) g_object_new (NM_TYPE_SETTING_TUN, NULL);
-}
+#define NM_SETTING_TUN_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_SETTING_TUN, NMSettingTunPrivate))
+
+/*****************************************************************************/
 
 /**
  * nm_setting_tun_get_mode:
@@ -167,11 +154,6 @@ nm_setting_tun_get_multi_queue (NMSettingTun *setting)
 	return NM_SETTING_TUN_GET_PRIVATE (setting)->multi_queue;
 }
 
-static void
-nm_setting_tun_init (NMSettingTun *setting)
-{
-}
-
 static gboolean
 verify (NMSetting *setting, NMConnection *connection, GError **error)
 {
@@ -212,70 +194,94 @@ verify (NMSetting *setting, NMConnection *connection, GError **error)
 	return TRUE;
 }
 
+/*****************************************************************************/
+
 static void
-set_property (GObject *object, guint prop_id,
-              const GValue *value, GParamSpec *pspec)
+get_property (GObject *object, guint prop_id,
+              GValue *value, GParamSpec *pspec)
 {
 	NMSettingTun *setting = NM_SETTING_TUN (object);
 	NMSettingTunPrivate *priv = NM_SETTING_TUN_GET_PRIVATE (setting);
 
 	switch (prop_id) {
 	case PROP_MODE:
-		priv->mode = g_value_get_uint (value);
+		g_value_set_uint (value, priv->mode);
 		break;
 	case PROP_OWNER:
-		g_free (priv->owner);
-		priv->owner = g_value_dup_string (value);
+		g_value_set_string (value, priv->owner);
 		break;
 	case PROP_GROUP:
-		g_free (priv->group);
-		priv->group = g_value_dup_string (value);
+		g_value_set_string (value, priv->group);
 		break;
 	case PROP_PI:
-		priv->pi = g_value_get_boolean (value);
+		g_value_set_boolean (value, priv->pi);
 		break;
 	case PROP_VNET_HDR:
-		priv->vnet_hdr = g_value_get_boolean (value);
+		g_value_set_boolean (value, priv->vnet_hdr);
 		break;
 	case PROP_MULTI_QUEUE:
-		priv->multi_queue = g_value_get_boolean (value);
+		g_value_set_boolean (value, priv->multi_queue);
 		break;
 	default:
 		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
 		break;
 	}
 }
+
 static void
-get_property (GObject *object, guint prop_id,
-              GValue *value, GParamSpec *pspec)
+set_property (GObject *object, guint prop_id,
+              const GValue *value, GParamSpec *pspec)
 {
 	NMSettingTun *setting = NM_SETTING_TUN (object);
 	NMSettingTunPrivate *priv = NM_SETTING_TUN_GET_PRIVATE (setting);
 
 	switch (prop_id) {
 	case PROP_MODE:
-		g_value_set_uint (value, priv->mode);
+		priv->mode = g_value_get_uint (value);
 		break;
 	case PROP_OWNER:
-		g_value_set_string (value, priv->owner);
+		g_free (priv->owner);
+		priv->owner = g_value_dup_string (value);
 		break;
 	case PROP_GROUP:
-		g_value_set_string (value, priv->group);
+		g_free (priv->group);
+		priv->group = g_value_dup_string (value);
 		break;
 	case PROP_PI:
-		g_value_set_boolean (value, priv->pi);
+		priv->pi = g_value_get_boolean (value);
 		break;
 	case PROP_VNET_HDR:
-		g_value_set_boolean (value, priv->vnet_hdr);
+		priv->vnet_hdr = g_value_get_boolean (value);
 		break;
 	case PROP_MULTI_QUEUE:
-		g_value_set_boolean (value, priv->multi_queue);
+		priv->multi_queue = g_value_get_boolean (value);
 		break;
 	default:
 		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
 		break;
 	}
 }
+/*****************************************************************************/
+
+static void
+nm_setting_tun_init (NMSettingTun *setting)
+{
+}
+
+/**
+ * nm_setting_tun_new:
+ *
+ * Creates a new #NMSettingTun object with default values.
+ *
+ * Returns: (transfer full): the new empty #NMSettingTun object
+ *
+ * Since: 1.2
+ **/
+NMSetting *
+nm_setting_tun_new (void)
+{
+	return (NMSetting *) g_object_new (NM_TYPE_SETTING_TUN, NULL);
+}
 
 static void
 finalize (GObject *object)
@@ -297,8 +303,8 @@ nm_setting_tun_class_init (NMSettingTunClass *klass)
 
 	g_type_class_add_private (klass, sizeof (NMSettingTunPrivate));
 
-	object_class->set_property = set_property;
 	object_class->get_property = get_property;
+	object_class->set_property = set_property;
 	object_class->finalize     = finalize;
 
 	setting_class->verify = verify;
@@ -313,14 +319,13 @@ nm_setting_tun_class_init (NMSettingTunClass *klass)
 	 *
 	 * Since: 1.2
 	 */
-	g_object_class_install_property
-		(object_class, PROP_MODE,
-		 g_param_spec_uint (NM_SETTING_TUN_MODE, "", "",
-		                    0, G_MAXUINT, NM_SETTING_TUN_MODE_TUN,
-		                    G_PARAM_READWRITE |
-		                    G_PARAM_CONSTRUCT |
-		                    NM_SETTING_PARAM_INFERRABLE |
-		                    G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_MODE] =
+	    g_param_spec_uint (NM_SETTING_TUN_MODE, "", "",
+	                       0, G_MAXUINT, NM_SETTING_TUN_MODE_TUN,
+	                       G_PARAM_READWRITE |
+	                       G_PARAM_CONSTRUCT |
+	                       NM_SETTING_PARAM_INFERRABLE |
+	                       G_PARAM_STATIC_STRINGS);
 
 	/**
 	 * NMSettingTun:owner:
@@ -330,13 +335,12 @@ nm_setting_tun_class_init (NMSettingTunClass *klass)
 	 *
 	 * Since: 1.2
 	 */
-	g_object_class_install_property
-		(object_class, PROP_OWNER,
-		 g_param_spec_string (NM_SETTING_TUN_OWNER, "", "",
-		                      NULL,
-		                      G_PARAM_READWRITE |
-		                      NM_SETTING_PARAM_INFERRABLE |
-		                      G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_OWNER] =
+	    g_param_spec_string (NM_SETTING_TUN_OWNER, "", "",
+	                         NULL,
+	                         G_PARAM_READWRITE |
+	                         NM_SETTING_PARAM_INFERRABLE |
+	                         G_PARAM_STATIC_STRINGS);
 
 	/**
 	 * NMSettingTun:group:
@@ -346,13 +350,12 @@ nm_setting_tun_class_init (NMSettingTunClass *klass)
 	 *
 	 * Since: 1.2
 	 */
-	g_object_class_install_property
-		(object_class, PROP_GROUP,
-		 g_param_spec_string (NM_SETTING_TUN_GROUP, "", "",
-		                      NULL,
-		                      G_PARAM_READWRITE |
-		                      NM_SETTING_PARAM_INFERRABLE |
-		                      G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_GROUP] =
+	    g_param_spec_string (NM_SETTING_TUN_GROUP, "", "",
+	                         NULL,
+	                         G_PARAM_READWRITE |
+	                         NM_SETTING_PARAM_INFERRABLE |
+	                         G_PARAM_STATIC_STRINGS);
 
 	/**
 	 * NMSettingTun:pi:
@@ -362,13 +365,12 @@ nm_setting_tun_class_init (NMSettingTunClass *klass)
 	 *
 	 * Since: 1.2
 	 */
-	g_object_class_install_property
-		(object_class, PROP_PI,
-		 g_param_spec_boolean (NM_SETTING_TUN_PI, "", "",
-		                       FALSE,
-		                       G_PARAM_READWRITE |
-		                       NM_SETTING_PARAM_INFERRABLE |
-		                       G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_PI] =
+	    g_param_spec_boolean (NM_SETTING_TUN_PI, "", "",
+	                          FALSE,
+	                          G_PARAM_READWRITE |
+	                          NM_SETTING_PARAM_INFERRABLE |
+	                          G_PARAM_STATIC_STRINGS);
 
 	/**
 	 * NMSettingTun:vnet-hdr:
@@ -378,13 +380,12 @@ nm_setting_tun_class_init (NMSettingTunClass *klass)
 	 *
 	 * Since: 1.2
 	 */
-	g_object_class_install_property
-		(object_class, PROP_VNET_HDR,
-		 g_param_spec_boolean (NM_SETTING_TUN_VNET_HDR, "", "",
-		                       FALSE,
-		                       G_PARAM_READWRITE |
-		                       NM_SETTING_PARAM_INFERRABLE |
-		                       G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_VNET_HDR] =
+	    g_param_spec_boolean (NM_SETTING_TUN_VNET_HDR, "", "",
+	                          FALSE,
+	                          G_PARAM_READWRITE |
+	                          NM_SETTING_PARAM_INFERRABLE |
+	                          G_PARAM_STATIC_STRINGS);
 
 	/**
 	 * NMSettingTun:multi-queue:
@@ -396,13 +397,14 @@ nm_setting_tun_class_init (NMSettingTunClass *klass)
 	 *
 	 * Since: 1.2
 	 */
-	g_object_class_install_property
-		(object_class, PROP_MULTI_QUEUE,
-		 g_param_spec_boolean (NM_SETTING_TUN_MULTI_QUEUE, "", "",
-		                       FALSE,
-		                       G_PARAM_READWRITE |
-		                       NM_SETTING_PARAM_INFERRABLE |
-		                       G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_MULTI_QUEUE] =
+	    g_param_spec_boolean (NM_SETTING_TUN_MULTI_QUEUE, "", "",
+	                          FALSE,
+	                          G_PARAM_READWRITE |
+	                          NM_SETTING_PARAM_INFERRABLE |
+	                          G_PARAM_STATIC_STRINGS);
+
+	g_object_class_install_properties (object_class, _PROPERTY_ENUMS_LAST, obj_properties);
 
 	_nm_setting_class_commit (setting_class, NM_META_SETTING_TYPE_TUN);
 }
diff --git a/libnm-core/nm-setting-user.c b/libnm-core/nm-setting-user.c
index d72c9094..01ac671b 100644
--- a/libnm-core/nm-setting-user.c
+++ b/libnm-core/nm-setting-user.c
@@ -395,33 +395,34 @@ verify (NMSetting *setting, NMConnection *connection, GError **error)
 	return TRUE;
 }
 
-static gboolean
-compare_property (NMSetting *setting,
+static NMTernary
+compare_property (const NMSettInfoSetting *sett_info,
+                  guint property_idx,
+                  NMSetting *setting,
                   NMSetting *other,
-                  const GParamSpec *prop_spec,
                   NMSettingCompareFlags flags)
 {
 	NMSettingUserPrivate *priv, *pri2;
 
-	g_return_val_if_fail (NM_IS_SETTING_USER (setting), FALSE);
-	g_return_val_if_fail (NM_IS_SETTING_USER (other), FALSE);
-
-	if (!nm_streq0 (prop_spec->name, NM_SETTING_USER_DATA))
-		goto call_parent;
+	if (nm_streq (sett_info->property_infos[property_idx].name, NM_SETTING_USER_DATA)) {
 
-	priv = NM_SETTING_USER_GET_PRIVATE (NM_SETTING_USER (setting));
-	pri2 = NM_SETTING_USER_GET_PRIVATE (NM_SETTING_USER (other));
-
-	if (!nm_utils_hash_table_equal (priv->data, pri2->data, TRUE, g_str_equal))
-		return FALSE;
+		if (NM_FLAGS_HAS (flags, NM_SETTING_COMPARE_FLAG_INFERRABLE))
+			return NM_TERNARY_DEFAULT;
 
-	if (!nm_utils_hash_table_equal (priv->data_invalid, pri2->data_invalid, TRUE, g_str_equal))
-		return FALSE;
+		if (!other)
+			return TRUE;
 
-	return TRUE;
+		priv = NM_SETTING_USER_GET_PRIVATE (NM_SETTING_USER (setting));
+		pri2 = NM_SETTING_USER_GET_PRIVATE (NM_SETTING_USER (other));
+		return    nm_utils_hash_table_equal (priv->data, pri2->data, TRUE, g_str_equal)
+		       && nm_utils_hash_table_equal (priv->data_invalid, pri2->data_invalid, TRUE, g_str_equal);
+	}
 
-call_parent:
-	return NM_SETTING_CLASS (nm_setting_user_parent_class)->compare_property (setting, other, prop_spec, flags);
+	return NM_SETTING_CLASS (nm_setting_user_parent_class)->compare_property (sett_info,
+	                                                                          property_idx,
+	                                                                          setting,
+	                                                                          other,
+	                                                                          flags);
 }
 
 /*****************************************************************************/
@@ -549,8 +550,8 @@ nm_setting_user_class_init (NMSettingUserClass *klass)
 	NMSettingClass *setting_class = NM_SETTING_CLASS (klass);
 	GArray *properties_override = _nm_sett_info_property_override_create_array ();
 
-	object_class->set_property = set_property;
 	object_class->get_property = get_property;
+	object_class->set_property = set_property;
 	object_class->finalize     = finalize;
 
 	setting_class->compare_property = compare_property;
@@ -583,15 +584,14 @@ nm_setting_user_class_init (NMSettingUserClass *klass)
 	                        G_PARAM_READWRITE |
 	                        G_PARAM_STATIC_STRINGS);
 
-	g_object_class_install_properties (object_class, _PROPERTY_ENUMS_LAST, obj_properties);
-
 	_properties_override_add_transform (properties_override,
-	                                    g_object_class_find_property (G_OBJECT_CLASS (setting_class),
-	                                                                  NM_SETTING_USER_DATA),
+	                                    obj_properties[PROP_DATA],
 	                                    G_VARIANT_TYPE ("a{ss}"),
 	                                    _nm_utils_strdict_to_dbus,
 	                                    _nm_utils_strdict_from_dbus);
 
+	g_object_class_install_properties (object_class, _PROPERTY_ENUMS_LAST, obj_properties);
+
 	_nm_setting_class_commit_full (setting_class, NM_META_SETTING_TYPE_USER,
 	                               NULL, properties_override);
 }
diff --git a/libnm-core/nm-setting-vlan.c b/libnm-core/nm-setting-vlan.c
index 1b61da55..5b8a49d4 100644
--- a/libnm-core/nm-setting-vlan.c
+++ b/libnm-core/nm-setting-vlan.c
@@ -24,7 +24,6 @@
 #include "nm-setting-vlan.h"
 
 #include 
-#include 
 
 #include "nm-utils.h"
 #include "nm-core-types-internal.h"
@@ -41,9 +40,15 @@
  * necessary for connection to VLAN interfaces.
  **/
 
-G_DEFINE_TYPE (NMSettingVlan, nm_setting_vlan, NM_TYPE_SETTING)
+/*****************************************************************************/
 
-#define NM_SETTING_VLAN_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_SETTING_VLAN, NMSettingVlanPrivate))
+NM_GOBJECT_PROPERTIES_DEFINE (NMSettingVlan,
+	PROP_PARENT,
+	PROP_ID,
+	PROP_FLAGS,
+	PROP_INGRESS_PRIORITY_MAP,
+	PROP_EGRESS_PRIORITY_MAP,
+);
 
 typedef struct {
 	char *parent;
@@ -53,32 +58,15 @@ typedef struct {
 	GSList *egress_priority_map;
 } NMSettingVlanPrivate;
 
-enum {
-	PROP_0,
-	PROP_PARENT,
-	PROP_ID,
-	PROP_FLAGS,
-	PROP_INGRESS_PRIORITY_MAP,
-	PROP_EGRESS_PRIORITY_MAP,
-	LAST_PROP
-};
+G_DEFINE_TYPE (NMSettingVlan, nm_setting_vlan, NM_TYPE_SETTING)
+
+#define NM_SETTING_VLAN_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_SETTING_VLAN, NMSettingVlanPrivate))
+
+/*****************************************************************************/
 
 #define MAX_SKB_PRIO   G_MAXUINT32
 #define MAX_8021P_PRIO 7  /* Max 802.1p priority */
 
-/**
- * nm_setting_vlan_new:
- *
- * Creates a new #NMSettingVlan object with default values.
- *
- * Returns: (transfer full): the new empty #NMSettingVlan object
- **/
-NMSetting *
-nm_setting_vlan_new (void)
-{
-	return (NMSetting *) g_object_new (NM_TYPE_SETTING_VLAN, NULL);
-}
-
 /**
  * nm_setting_vlan_get_parent:
  * @setting: the #NMSettingVlan
@@ -214,10 +202,10 @@ set_map (NMSettingVlan *self, NMVlanPriorityMap map, GSList *list)
 
 	if (map == NM_VLAN_INGRESS_MAP) {
 		NM_SETTING_VLAN_GET_PRIVATE (self)->ingress_priority_map = list;
-		g_object_notify (G_OBJECT (self), NM_SETTING_VLAN_INGRESS_PRIORITY_MAP);
+		_notify (self, PROP_INGRESS_PRIORITY_MAP);
 	} else if (map == NM_VLAN_EGRESS_MAP) {
 		NM_SETTING_VLAN_GET_PRIVATE (self)->egress_priority_map = list;
-		g_object_notify (G_OBJECT (self), NM_SETTING_VLAN_EGRESS_PRIORITY_MAP);
+		_notify (self, PROP_EGRESS_PRIORITY_MAP);
 	} else
 		g_assert_not_reached ();
 }
@@ -273,9 +261,9 @@ nm_setting_vlan_add_priority_str (NMSettingVlan *setting,
 	if (check_replace_duplicate_priority (list, item->from, item->to)) {
 		g_free (item);
 		if (map == NM_VLAN_INGRESS_MAP)
-			g_object_notify (G_OBJECT (setting), NM_SETTING_VLAN_INGRESS_PRIORITY_MAP);
+			_notify (setting, PROP_INGRESS_PRIORITY_MAP);
 		else
-			g_object_notify (G_OBJECT (setting), NM_SETTING_VLAN_EGRESS_PRIORITY_MAP);
+			_notify (setting, PROP_EGRESS_PRIORITY_MAP);
 		return TRUE;
 	}
 
@@ -377,9 +365,9 @@ nm_setting_vlan_add_priority (NMSettingVlan *setting,
 	list = get_map (setting, map);
 	if (check_replace_duplicate_priority (list, from, to)) {
 		if (map == NM_VLAN_INGRESS_MAP)
-			g_object_notify (G_OBJECT (setting), NM_SETTING_VLAN_INGRESS_PRIORITY_MAP);
+			_notify (setting, PROP_INGRESS_PRIORITY_MAP);
 		else
-			g_object_notify (G_OBJECT (setting), NM_SETTING_VLAN_EGRESS_PRIORITY_MAP);
+			_notify (setting, PROP_EGRESS_PRIORITY_MAP);
 		return TRUE;
 	}
 
@@ -593,11 +581,6 @@ nm_setting_vlan_clear_priorities (NMSettingVlan *setting, NMVlanPriorityMap map)
 
 /*****************************************************************************/
 
-static void
-nm_setting_vlan_init (NMSettingVlan *setting)
-{
-}
-
 static int
 verify (NMSetting *setting, NMConnection *connection, GError **error)
 {
@@ -736,38 +719,6 @@ priority_strv_to_maplist (NMVlanPriorityMap map, char **strv)
 	return g_slist_sort (list, prio_map_compare);
 }
 
-static void
-set_property (GObject *object, guint prop_id,
-              const GValue *value, GParamSpec *pspec)
-{
-	NMSettingVlan *setting = NM_SETTING_VLAN (object);
-	NMSettingVlanPrivate *priv = NM_SETTING_VLAN_GET_PRIVATE (setting);
-
-	switch (prop_id) {
-	case PROP_PARENT:
-		g_free (priv->parent);
-		priv->parent = g_value_dup_string (value);
-		break;
-	case PROP_ID:
-		priv->id = g_value_get_uint (value);
-		break;
-	case PROP_FLAGS:
-		priv->flags = g_value_get_flags (value);
-		break;
-	case PROP_INGRESS_PRIORITY_MAP:
-		g_slist_free_full (priv->ingress_priority_map, g_free);
-		priv->ingress_priority_map = priority_strv_to_maplist (NM_VLAN_INGRESS_MAP, g_value_get_boxed (value));
-		break;
-	case PROP_EGRESS_PRIORITY_MAP:
-		g_slist_free_full (priv->egress_priority_map, g_free);
-		priv->egress_priority_map = priority_strv_to_maplist (NM_VLAN_EGRESS_MAP, g_value_get_boxed (value));
-		break;
-	default:
-		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-		break;
-	}
-}
-
 static char **
 priority_maplist_to_strv (GSList *list)
 {
@@ -786,6 +737,8 @@ priority_maplist_to_strv (GSList *list)
 	return (char **) g_ptr_array_free (strv, FALSE);
 }
 
+/*****************************************************************************/
+
 static void
 get_property (GObject *object, guint prop_id,
               GValue *value, GParamSpec *pspec)
@@ -815,6 +768,58 @@ get_property (GObject *object, guint prop_id,
 	}
 }
 
+static void
+set_property (GObject *object, guint prop_id,
+              const GValue *value, GParamSpec *pspec)
+{
+	NMSettingVlan *setting = NM_SETTING_VLAN (object);
+	NMSettingVlanPrivate *priv = NM_SETTING_VLAN_GET_PRIVATE (setting);
+
+	switch (prop_id) {
+	case PROP_PARENT:
+		g_free (priv->parent);
+		priv->parent = g_value_dup_string (value);
+		break;
+	case PROP_ID:
+		priv->id = g_value_get_uint (value);
+		break;
+	case PROP_FLAGS:
+		priv->flags = g_value_get_flags (value);
+		break;
+	case PROP_INGRESS_PRIORITY_MAP:
+		g_slist_free_full (priv->ingress_priority_map, g_free);
+		priv->ingress_priority_map = priority_strv_to_maplist (NM_VLAN_INGRESS_MAP, g_value_get_boxed (value));
+		break;
+	case PROP_EGRESS_PRIORITY_MAP:
+		g_slist_free_full (priv->egress_priority_map, g_free);
+		priv->egress_priority_map = priority_strv_to_maplist (NM_VLAN_EGRESS_MAP, g_value_get_boxed (value));
+		break;
+	default:
+		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+		break;
+	}
+}
+
+/*****************************************************************************/
+
+static void
+nm_setting_vlan_init (NMSettingVlan *setting)
+{
+}
+
+/**
+ * nm_setting_vlan_new:
+ *
+ * Creates a new #NMSettingVlan object with default values.
+ *
+ * Returns: (transfer full): the new empty #NMSettingVlan object
+ **/
+NMSetting *
+nm_setting_vlan_new (void)
+{
+	return (NMSetting *) g_object_new (NM_TYPE_SETTING_VLAN, NULL);
+}
+
 static void
 finalize (GObject *object)
 {
@@ -837,8 +842,8 @@ nm_setting_vlan_class_init (NMSettingVlanClass *klass)
 
 	g_type_class_add_private (klass, sizeof (NMSettingVlanPrivate));
 
-	object_class->set_property = set_property;
 	object_class->get_property = get_property;
+	object_class->set_property = set_property;
 	object_class->finalize     = finalize;
 
 	setting_class->verify = verify;
@@ -857,14 +862,13 @@ nm_setting_vlan_class_init (NMSettingVlanClass *klass)
 	 * description: Parent interface of the VLAN.
 	 * ---end---
 	 */
-	g_object_class_install_property
-		(object_class, PROP_PARENT,
-		 g_param_spec_string (NM_SETTING_VLAN_PARENT, "", "",
-		                      NULL,
-		                      G_PARAM_READWRITE |
-		                      G_PARAM_CONSTRUCT |
-		                      NM_SETTING_PARAM_INFERRABLE |
-		                      G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_PARENT] =
+	    g_param_spec_string (NM_SETTING_VLAN_PARENT, "", "",
+	                         NULL,
+	                         G_PARAM_READWRITE |
+	                         G_PARAM_CONSTRUCT |
+	                         NM_SETTING_PARAM_INFERRABLE |
+	                         G_PARAM_STATIC_STRINGS);
 
 	/**
 	 * NMSettingVlan:id:
@@ -878,14 +882,13 @@ nm_setting_vlan_class_init (NMSettingVlanClass *klass)
 	 * description: VLAN identifier.
 	 * ---end---
 	 */
-	g_object_class_install_property
-		(object_class, PROP_ID,
-		 g_param_spec_uint (NM_SETTING_VLAN_ID, "", "",
-		                    0, 4095, 0,
-		                    G_PARAM_READWRITE |
-		                    G_PARAM_CONSTRUCT |
-		                    NM_SETTING_PARAM_INFERRABLE |
-		                    G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_ID] =
+	    g_param_spec_uint (NM_SETTING_VLAN_ID, "", "",
+	                       0, 4095, 0,
+	                       G_PARAM_READWRITE |
+	                       G_PARAM_CONSTRUCT |
+	                       NM_SETTING_PARAM_INFERRABLE |
+	                       G_PARAM_STATIC_STRINGS);
 
 	/**
 	 * NMSettingVlan:flags:
@@ -909,19 +912,17 @@ nm_setting_vlan_class_init (NMSettingVlanClass *klass)
 	 * description: VLAN flags.
 	 * ---end---
 	 */
-	g_object_class_install_property
-		(object_class, PROP_FLAGS,
-		 g_param_spec_flags (NM_SETTING_VLAN_FLAGS, "", "",
-		                     NM_TYPE_VLAN_FLAGS,
-		                     NM_VLAN_FLAG_REORDER_HEADERS,
-		                     G_PARAM_READWRITE |
-		                     G_PARAM_CONSTRUCT |
-		                     NM_SETTING_PARAM_INFERRABLE |
-		                     G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_FLAGS] =
+	    g_param_spec_flags (NM_SETTING_VLAN_FLAGS, "", "",
+	                        NM_TYPE_VLAN_FLAGS,
+	                        NM_VLAN_FLAG_REORDER_HEADERS,
+	                        G_PARAM_READWRITE |
+	                        G_PARAM_CONSTRUCT |
+	                        NM_SETTING_PARAM_INFERRABLE |
+	                        G_PARAM_STATIC_STRINGS);
 
 	_properties_override_add_override (properties_override,
-	                                   g_object_class_find_property (G_OBJECT_CLASS (setting_class),
-	                                                                 NM_SETTING_VLAN_FLAGS),
+	                                   obj_properties[PROP_FLAGS],
 	                                   NULL,
 	                                   _override_flags_get,
 	                                   NULL,
@@ -941,13 +942,12 @@ nm_setting_vlan_class_init (NMSettingVlanClass *klass)
 	 * example: VLAN_INGRESS_PRIORITY_MAP=4:2,3:5
 	 * ---end---
 	 */
-	g_object_class_install_property
-		(object_class, PROP_INGRESS_PRIORITY_MAP,
-		 g_param_spec_boxed (NM_SETTING_VLAN_INGRESS_PRIORITY_MAP, "", "",
-		                     G_TYPE_STRV,
-		                     G_PARAM_READWRITE |
-		                     NM_SETTING_PARAM_INFERRABLE |
-		                     G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_INGRESS_PRIORITY_MAP] =
+	    g_param_spec_boxed (NM_SETTING_VLAN_INGRESS_PRIORITY_MAP, "", "",
+	                        G_TYPE_STRV,
+	                        G_PARAM_READWRITE |
+	                        NM_SETTING_PARAM_INFERRABLE |
+	                        G_PARAM_STATIC_STRINGS);
 
 	/**
 	 * NMSettingVlan:egress-priority-map:
@@ -963,13 +963,12 @@ nm_setting_vlan_class_init (NMSettingVlanClass *klass)
 	 * example: VLAN_EGRESS_PRIORITY_MAP=5:4,4:1,3:7
 	 * ---end---
 	 */
-	g_object_class_install_property
-		(object_class, PROP_EGRESS_PRIORITY_MAP,
-		 g_param_spec_boxed (NM_SETTING_VLAN_EGRESS_PRIORITY_MAP, "", "",
-		                     G_TYPE_STRV,
-		                     G_PARAM_READWRITE |
-		                     NM_SETTING_PARAM_INFERRABLE |
-		                     G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_EGRESS_PRIORITY_MAP] =
+	    g_param_spec_boxed (NM_SETTING_VLAN_EGRESS_PRIORITY_MAP, "", "",
+	                        G_TYPE_STRV,
+	                        G_PARAM_READWRITE |
+	                        NM_SETTING_PARAM_INFERRABLE |
+	                        G_PARAM_STATIC_STRINGS);
 
 	/* ---ifcfg-rh---
 	 * property: interface-name
@@ -993,6 +992,8 @@ nm_setting_vlan_class_init (NMSettingVlanClass *klass)
 	                                    _nm_setting_get_deprecated_virtual_interface_name,
 	                                    NULL);
 
+	g_object_class_install_properties (object_class, _PROPERTY_ENUMS_LAST, obj_properties);
+
 	_nm_setting_class_commit_full (setting_class, NM_META_SETTING_TYPE_VLAN,
 	                               NULL, properties_override);
 }
diff --git a/libnm-core/nm-setting-vpn.c b/libnm-core/nm-setting-vpn.c
index fcbeec68..20a0ae14 100644
--- a/libnm-core/nm-setting-vpn.c
+++ b/libnm-core/nm-setting-vpn.c
@@ -21,13 +21,11 @@
 
 #include "nm-default.h"
 
-#include 
-#include 
+#include "nm-setting-vpn.h"
+
 #include 
 
 #include "nm-utils/nm-secret-utils.h"
-
-#include "nm-setting-vpn.h"
 #include "nm-utils.h"
 #include "nm-utils-private.h"
 #include "nm-setting-private.h"
@@ -45,9 +43,16 @@
  * properties.
  **/
 
-G_DEFINE_TYPE (NMSettingVpn, nm_setting_vpn, NM_TYPE_SETTING)
+/*****************************************************************************/
 
-#define NM_SETTING_VPN_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_SETTING_VPN, NMSettingVpnPrivate))
+NM_GOBJECT_PROPERTIES_DEFINE (NMSettingVpn,
+	PROP_SERVICE_TYPE,
+	PROP_USER_NAME,
+	PROP_PERSISTENT,
+	PROP_DATA,
+	PROP_SECRETS,
+	PROP_TIMEOUT,
+);
 
 typedef struct {
 	char *service_type;
@@ -85,30 +90,11 @@ typedef struct {
 	guint32 timeout;
 } NMSettingVpnPrivate;
 
-enum {
-	PROP_0,
-	PROP_SERVICE_TYPE,
-	PROP_USER_NAME,
-	PROP_PERSISTENT,
-	PROP_DATA,
-	PROP_SECRETS,
-	PROP_TIMEOUT,
+G_DEFINE_TYPE (NMSettingVpn, nm_setting_vpn, NM_TYPE_SETTING)
 
-	LAST_PROP
-};
+#define NM_SETTING_VPN_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_SETTING_VPN, NMSettingVpnPrivate))
 
-/**
- * nm_setting_vpn_new:
- *
- * Creates a new #NMSettingVpn object with default values.
- *
- * Returns: (transfer full): the new empty #NMSettingVpn object
- **/
-NMSetting *
-nm_setting_vpn_new (void)
-{
-	return (NMSetting *) g_object_new (NM_TYPE_SETTING_VPN, NULL);
-}
+/*****************************************************************************/
 
 /**
  * nm_setting_vpn_get_service_type:
@@ -194,7 +180,7 @@ nm_setting_vpn_add_data_item (NMSettingVpn *setting,
 
 	g_hash_table_insert (NM_SETTING_VPN_GET_PRIVATE (setting)->data,
 	                     g_strdup (key), g_strdup (item));
-	g_object_notify (G_OBJECT (setting), NM_SETTING_VPN_DATA);
+	_notify (setting, PROP_DATA);
 }
 
 /**
@@ -218,7 +204,7 @@ nm_setting_vpn_get_data_item (NMSettingVpn *setting, const char *key)
 /**
  * nm_setting_vpn_get_data_keys:
  * @setting: the #NMSettingVpn
- * @out_length: (allow-none): (out): the length of the returned array
+ * @out_length: (allow-none) (out): the length of the returned array
  *
  * Retrieves every data key inside @setting, as an array.
  *
@@ -259,7 +245,7 @@ nm_setting_vpn_remove_data_item (NMSettingVpn *setting, const char *key)
 
 	found = g_hash_table_remove (NM_SETTING_VPN_GET_PRIVATE (setting)->data, key);
 	if (found)
-		g_object_notify (G_OBJECT (setting), NM_SETTING_VPN_DATA);
+		_notify (setting, PROP_DATA);
 	return found;
 }
 
@@ -371,7 +357,7 @@ nm_setting_vpn_add_secret (NMSettingVpn *setting,
 
 	g_hash_table_insert (NM_SETTING_VPN_GET_PRIVATE (setting)->secrets,
 	                     g_strdup (key), g_strdup (secret));
-	g_object_notify (G_OBJECT (setting), NM_SETTING_VPN_SECRETS);
+	_notify (setting, PROP_SECRETS);
 }
 
 /**
@@ -395,7 +381,7 @@ nm_setting_vpn_get_secret (NMSettingVpn *setting, const char *key)
 /**
  * nm_setting_vpn_get_secret_keys:
  * @setting: the #NMSettingVpn
- * @out_length: (allow-none): (out): the length of the returned array
+ * @out_length: (allow-none) (out): the length of the returned array
  *
  * Retrieves every secret key inside @setting, as an array.
  *
@@ -436,7 +422,7 @@ nm_setting_vpn_remove_secret (NMSettingVpn *setting, const char *key)
 
 	found = g_hash_table_remove (NM_SETTING_VPN_GET_PRIVATE (setting)->secrets, key);
 	if (found)
-		g_object_notify (G_OBJECT (setting), NM_SETTING_VPN_SECRETS);
+		_notify (setting, PROP_SECRETS);
 	return found;
 }
 
@@ -461,6 +447,63 @@ nm_setting_vpn_foreach_secret (NMSettingVpn *setting,
 	foreach_item_helper (setting, TRUE, func, user_data);
 }
 
+static gboolean
+aggregate (NMSetting *setting,
+           int type_i,
+           gpointer arg)
+{
+	NMSettingVpnPrivate *priv = NM_SETTING_VPN_GET_PRIVATE (setting);
+	NMConnectionAggregateType type = type_i;
+	NMSettingSecretFlags secret_flags;
+	const char *key_name;
+	GHashTableIter iter;
+
+	switch (type) {
+
+	case NM_CONNECTION_AGGREGATE_ANY_SECRETS:
+		if (g_hash_table_size (priv->secrets) > 0) {
+			*((gboolean *) arg) = TRUE;
+			return TRUE;
+		}
+		return FALSE;
+
+	case NM_CONNECTION_AGGREGATE_ANY_SYSTEM_SECRET_FLAGS:
+
+		g_hash_table_iter_init (&iter, priv->secrets);
+		while (g_hash_table_iter_next (&iter, (gpointer *) &key_name, NULL)) {
+			if (!nm_setting_get_secret_flags (NM_SETTING (setting), key_name, &secret_flags, NULL))
+				nm_assert_not_reached ();
+			if (secret_flags == NM_SETTING_SECRET_FLAG_NONE) {
+				*((gboolean *) arg) = TRUE;
+				return TRUE;
+			}
+		}
+
+		/* Ok, we have no secrets with system-secret flags.
+		 * But do we have any secret-flags (without secrets) that indicate system secrets? */
+		g_hash_table_iter_init (&iter, priv->data);
+		while (g_hash_table_iter_next (&iter, (gpointer *) &key_name, NULL)) {
+			gs_free char *secret_name = NULL;
+
+			if (!g_str_has_suffix (key_name, "-flags"))
+				continue;
+			secret_name = g_strndup (key_name, strlen (key_name) - NM_STRLEN ("-flags"));
+			if (secret_name[0] == '\0')
+				continue;
+			if (!nm_setting_get_secret_flags (NM_SETTING (setting), secret_name, &secret_flags, NULL))
+				nm_assert_not_reached ();
+			if (secret_flags == NM_SETTING_SECRET_FLAG_NONE) {
+				*((gboolean *) arg) = TRUE;
+				return TRUE;
+			}
+		}
+
+		return FALSE;
+	}
+
+	g_return_val_if_reached (FALSE);
+}
+
 /**
  * nm_setting_vpn_get_timeout:
  * @setting: the #NMSettingVpn
@@ -634,56 +677,118 @@ update_one_secret (NMSetting *setting, const char *key, GVariant *value, GError
 	}
 
 	if (success == NM_SETTING_UPDATE_SECRET_SUCCESS_MODIFIED)
-		g_object_notify (G_OBJECT (setting), NM_SETTING_VPN_SECRETS);
+		_notify (NM_SETTING_VPN (setting), PROP_SECRETS);
 
 	return success;
 }
 
+static void
+for_each_secret (NMSetting *setting,
+                 const char *secret_name,
+                 GVariant *val,
+                 gboolean remove_non_secrets,
+                 _NMConnectionForEachSecretFunc callback,
+                 gpointer callback_data,
+                 GVariantBuilder *setting_builder)
+{
+	GVariantBuilder vpn_secrets_builder;
+	GVariantIter vpn_secrets_iter;
+	const char *vpn_secret_name;
+	const char *secret;
+
+	if (!nm_streq (secret_name, NM_SETTING_VPN_SECRETS)) {
+		NM_SETTING_CLASS (nm_setting_vpn_parent_class)->for_each_secret (setting,
+		                                                                 secret_name,
+		                                                                 val,
+		                                                                 remove_non_secrets,
+		                                                                 callback,
+		                                                                 callback_data,
+		                                                                 setting_builder);
+		return;
+	}
+
+	if (!g_variant_is_of_type (val, G_VARIANT_TYPE ("a{ss}"))) {
+		/* invalid type. Silently ignore the secrets as we cannot find out the
+		 * secret-flags. */
+		return;
+	}
+
+	/* Iterate through each secret from the VPN dict in the overall secrets dict */
+	g_variant_builder_init (&vpn_secrets_builder, G_VARIANT_TYPE ("a{ss}"));
+	g_variant_iter_init (&vpn_secrets_iter, val);
+	while (g_variant_iter_next (&vpn_secrets_iter, "{&s&s}", &vpn_secret_name, &secret)) {
+		NMSettingSecretFlags secret_flags = NM_SETTING_SECRET_FLAG_NONE;
+
+		/* we ignore the return value of get_secret_flags. The function may determine
+		 * that this is not a secret, based on having not secret-flags and no secrets.
+		 * But we have the secret at hand. We know it would be a valid secret, if we
+		 * only add it to the VPN settings. */
+		nm_setting_get_secret_flags (setting, vpn_secret_name, &secret_flags, NULL);
+
+		if (callback (secret_flags, callback_data))
+			g_variant_builder_add (&vpn_secrets_builder, "{ss}", vpn_secret_name, secret);
+	}
+
+	g_variant_builder_add (setting_builder, "{sv}",
+	                       secret_name, g_variant_builder_end (&vpn_secrets_builder));
+}
+
 static gboolean
 get_secret_flags (NMSetting *setting,
                   const char *secret_name,
-                  gboolean verify_secret,
                   NMSettingSecretFlags *out_flags,
                   GError **error)
 {
 	NMSettingVpnPrivate *priv = NM_SETTING_VPN_GET_PRIVATE (setting);
-	gs_free char *flags_key = NULL;
-	gpointer val;
-	unsigned long tmp;
-	NMSettingSecretFlags flags = NM_SETTING_SECRET_FLAG_NONE;
-
-	flags_key = g_strdup_printf ("%s-flags", secret_name);
-	if (g_hash_table_lookup_extended (priv->data, flags_key, NULL, &val)) {
-		errno = 0;
-		tmp = strtoul ((const char *) val, NULL, 10);
-		if ((errno != 0) || (tmp > NM_SETTING_SECRET_FLAGS_ALL)) {
-			g_set_error (error,
-			             NM_CONNECTION_ERROR,
-			             NM_CONNECTION_ERROR_INVALID_PROPERTY,
-			             _("failed to convert value '%s' to uint"),
-			             (const char *) val);
+	gs_free char *flags_key_free = NULL;
+	const char *flags_key;
+	const char *flags_val;
+	gint64 i64;
+
+	flags_key = nm_construct_name_a ("%s-flags", secret_name, &flags_key_free);
+
+	if (!g_hash_table_lookup_extended (priv->data, flags_key, NULL, (gpointer *) &flags_val)) {
+		NM_SET_OUT (out_flags, NM_SETTING_SECRET_FLAG_NONE);
+
+		/* having no secret flag for the secret is fine, as long as there
+		 * is the secret itself... */
+		if (!g_hash_table_contains (priv->secrets, secret_name)) {
+			g_set_error_literal (error,
+			                     NM_CONNECTION_ERROR,
+			                     NM_CONNECTION_ERROR_PROPERTY_NOT_SECRET,
+			                     _("secret flags property not found"));
 			g_prefix_error (error, "%s.%s: ", NM_SETTING_VPN_SETTING_NAME, flags_key);
 			return FALSE;
 		}
-		flags = (NMSettingSecretFlags) tmp;
+		return TRUE;
+	}
+
+	i64 = _nm_utils_ascii_str_to_int64 (flags_val, 10, 0, NM_SETTING_SECRET_FLAG_ALL, -1);
+	if (   i64 == -1
+	    || !_nm_setting_secret_flags_valid (i64)) {
+		/* The flags keys is set to an unexpected value. That is a configuration
+		 * error. Note that keys named "*-flags" are reserved for secrets. The user
+		 * must not use this for anything but secret flags. Hence, we cannot fail
+		 * to read the secret, we pretend that the secret flag is set to the default
+		 * NM_SETTING_SECRET_FLAG_NONE. */
+		NM_SET_OUT (out_flags, NM_SETTING_SECRET_FLAG_NONE);
+		return TRUE;
 	}
 
-	if (out_flags)
-		*out_flags = flags;
+	NM_SET_OUT (out_flags, (NMSettingSecretFlags) i64);
 	return TRUE;
 }
 
 static gboolean
 set_secret_flags (NMSetting *setting,
                   const char *secret_name,
-                  gboolean verify_secret,
                   NMSettingSecretFlags flags,
                   GError **error)
 {
 	g_hash_table_insert (NM_SETTING_VPN_GET_PRIVATE (setting)->data,
 	                     g_strdup_printf ("%s-flags", secret_name),
 	                     g_strdup_printf ("%u", flags));
-	g_object_notify (G_OBJECT (setting), NM_SETTING_VPN_SECRETS);
+	_notify (NM_SETTING_VPN (setting), PROP_SECRETS);
 	return TRUE;
 }
 
@@ -694,131 +799,143 @@ need_secrets (NMSetting *setting)
 	return g_ptr_array_sized_new (1);
 }
 
-static gboolean
-_compare_secrets (NMSettingVpn *a,
-                  NMSettingVpn *b,
-                  NMSettingCompareFlags flags)
+static NMTernary
+compare_property_secrets (NMSettingVpn *a,
+                          NMSettingVpn *b,
+                          NMSettingCompareFlags flags)
 {
-	GHashTable *a_secrets;
 	GHashTableIter iter;
 	const char *key, *val;
+	int run;
 
-	a_secrets = NM_SETTING_VPN_GET_PRIVATE (a)->secrets;
-	g_hash_table_iter_init (&iter, a_secrets);
-	while (g_hash_table_iter_next (&iter, (gpointer) &key, (gpointer) &val)) {
-		NMSettingSecretFlags a_secret_flags = NM_SETTING_SECRET_FLAG_NONE;
-		NMSettingSecretFlags b_secret_flags = NM_SETTING_SECRET_FLAG_NONE;
+	if (NM_FLAGS_HAS (flags, NM_SETTING_COMPARE_FLAG_FUZZY))
+		return NM_TERNARY_DEFAULT;
+	if (NM_FLAGS_HAS (flags, NM_SETTING_COMPARE_FLAG_IGNORE_SECRETS))
+		return NM_TERNARY_DEFAULT;
 
-		nm_setting_get_secret_flags (NM_SETTING (a), key, &a_secret_flags, NULL);
-		nm_setting_get_secret_flags (NM_SETTING (b), key, &b_secret_flags, NULL);
+	if (!b)
+		return TRUE;
 
-		/* If the secret flags aren't the same, the settings aren't the same */
-		if (a_secret_flags != b_secret_flags)
-			return FALSE;
+	for (run = 0; run < 2; run++) {
+		NMSettingVpn *current_a = (run == 0) ? a : b;
+		NMSettingVpn *current_b = (run == 0) ? b : a;
 
-		if (   (flags & NM_SETTING_COMPARE_FLAG_IGNORE_AGENT_OWNED_SECRETS)
-		    && (a_secret_flags & NM_SETTING_SECRET_FLAG_AGENT_OWNED))
-			continue;
+		g_hash_table_iter_init (&iter, NM_SETTING_VPN_GET_PRIVATE (current_a)->secrets);
+		while (g_hash_table_iter_next (&iter, (gpointer) &key, (gpointer) &val)) {
 
-		if (   (flags & NM_SETTING_COMPARE_FLAG_IGNORE_NOT_SAVED_SECRETS)
-		    && (a_secret_flags & NM_SETTING_SECRET_FLAG_NOT_SAVED))
-			continue;
+			if (nm_streq0 (val, nm_setting_vpn_get_secret (current_b, key)))
+				continue;
+			if (!_nm_setting_should_compare_secret_property (NM_SETTING (current_a),
+			                                                 NM_SETTING (current_b),
+			                                                 key,
+			                                                 flags))
+				continue;
 
-		/* Now compare the values themselves */
-		if (g_strcmp0 (val, nm_setting_vpn_get_secret (b, key)) != 0)
 			return FALSE;
+		}
 	}
 
 	return TRUE;
 }
 
-static gboolean
-compare_one_secret (NMSettingVpn *a,
-                    NMSettingVpn *b,
-                    NMSettingCompareFlags flags)
-{
-	if (!_compare_secrets (a, b, flags))
-		return FALSE;
-	if (!_compare_secrets (b, a, flags))
-		return FALSE;
-
-	return TRUE;
-}
-
-static gboolean
-compare_property (NMSetting *setting,
+static NMTernary
+compare_property (const NMSettInfoSetting *sett_info,
+                  guint property_idx,
+                  NMSetting *setting,
                   NMSetting *other,
-                  const GParamSpec *prop_spec,
                   NMSettingCompareFlags flags)
 {
-	gboolean same;
-
-	/* We only need to treat the 'secrets' property specially */
-	if (g_strcmp0 (prop_spec->name, NM_SETTING_VPN_SECRETS) != 0)
-		return NM_SETTING_CLASS (nm_setting_vpn_parent_class)->compare_property (setting, other, prop_spec, flags);
-
-	/* Compare A to B to ensure everything in A is found in B */
-	same = compare_one_secret (NM_SETTING_VPN (setting), NM_SETTING_VPN (other), flags);
-	if (same) {
-		/* And then B to A to ensure everything in B is also found in A */
-		same = compare_one_secret (NM_SETTING_VPN (other), NM_SETTING_VPN (setting), flags);
+	if (nm_streq (sett_info->property_infos[property_idx].name, NM_SETTING_VPN_SECRETS)) {
+		if (NM_FLAGS_HAS (flags, NM_SETTING_COMPARE_FLAG_INFERRABLE))
+			return NM_TERNARY_DEFAULT;
+		return compare_property_secrets (NM_SETTING_VPN (setting), NM_SETTING_VPN (other), flags);
 	}
 
-	return same;
+	return NM_SETTING_CLASS (nm_setting_vpn_parent_class)->compare_property (sett_info,
+	                                                                         property_idx,
+	                                                                         setting,
+	                                                                         other,
+	                                                                         flags);
 }
 
 static gboolean
-clear_secrets_with_flags (NMSetting *setting,
-                          GParamSpec *pspec,
-                          NMSettingClearSecretsWithFlagsFn func,
-                          gpointer user_data)
+clear_secrets (const NMSettInfoSetting *sett_info,
+               guint property_idx,
+               NMSetting *setting,
+               NMSettingClearSecretsWithFlagsFn func,
+               gpointer user_data)
 {
 	NMSettingVpnPrivate *priv = NM_SETTING_VPN_GET_PRIVATE (setting);
+	GParamSpec *prop_spec = sett_info->property_infos[property_idx].param_spec;
 	GHashTableIter iter;
 	const char *secret;
 	gboolean changed = TRUE;
 
-	if (priv->secrets == NULL)
+	if (   !prop_spec
+	    || !NM_FLAGS_HAS (prop_spec->flags, NM_SETTING_PARAM_SECRET))
+		return FALSE;
+
+	nm_assert (nm_streq (prop_spec->name, NM_SETTING_VPN_SECRETS));
+
+	if (!priv->secrets)
 		return FALSE;
 
-	/* Iterate through secrets hash and check each entry */
 	g_hash_table_iter_init (&iter, priv->secrets);
 	while (g_hash_table_iter_next (&iter, (gpointer) &secret, NULL)) {
-		NMSettingSecretFlags flags = NM_SETTING_SECRET_FLAG_NONE;
 
-		nm_setting_get_secret_flags (setting, secret, &flags, NULL);
-		if (func (setting, pspec->name, flags, user_data) == TRUE) {
-			g_hash_table_iter_remove (&iter);
-			changed = TRUE;
-		}
+		if (func) {
+			NMSettingSecretFlags flags = NM_SETTING_SECRET_FLAG_NONE;
+
+			if (!nm_setting_get_secret_flags (setting, secret, &flags, NULL))
+				nm_assert_not_reached ();
+
+			if (!func (setting, secret, flags, user_data))
+				continue;
+		} else
+			nm_assert (nm_setting_get_secret_flags (setting, secret, NULL, NULL));
+
+		g_hash_table_iter_remove (&iter);
+		changed = TRUE;
 	}
 
 	if (changed)
-		g_object_notify (G_OBJECT (setting), NM_SETTING_VPN_SECRETS);
+		_notify (NM_SETTING_VPN (setting), PROP_SECRETS);
 
 	return changed;
 }
 
-static void
-nm_setting_vpn_init (NMSettingVpn *setting)
-{
-	NMSettingVpnPrivate *priv = NM_SETTING_VPN_GET_PRIVATE (setting);
-
-	priv->data = g_hash_table_new_full (nm_str_hash, g_str_equal, g_free, g_free);
-	priv->secrets = g_hash_table_new_full (nm_str_hash, g_str_equal, g_free, (GDestroyNotify) nm_free_secret);
-}
+/*****************************************************************************/
 
 static void
-finalize (GObject *object)
+get_property (GObject *object, guint prop_id,
+              GValue *value, GParamSpec *pspec)
 {
-	NMSettingVpnPrivate *priv = NM_SETTING_VPN_GET_PRIVATE (object);
-
-	g_free (priv->service_type);
-	g_free (priv->user_name);
-	g_hash_table_destroy (priv->data);
-	g_hash_table_destroy (priv->secrets);
+	NMSettingVpn *setting = NM_SETTING_VPN (object);
+	NMSettingVpnPrivate *priv = NM_SETTING_VPN_GET_PRIVATE (setting);
 
-	G_OBJECT_CLASS (nm_setting_vpn_parent_class)->finalize (object);
+	switch (prop_id) {
+	case PROP_SERVICE_TYPE:
+		g_value_set_string (value, nm_setting_vpn_get_service_type (setting));
+		break;
+	case PROP_USER_NAME:
+		g_value_set_string (value, nm_setting_vpn_get_user_name (setting));
+		break;
+	case PROP_PERSISTENT:
+		g_value_set_boolean (value, priv->persistent);
+		break;
+	case PROP_DATA:
+		g_value_take_boxed (value, _nm_utils_copy_strdict (priv->data));
+		break;
+	case PROP_SECRETS:
+		g_value_take_boxed (value, _nm_utils_copy_strdict (priv->secrets));
+		break;
+	case PROP_TIMEOUT:
+		g_value_set_uint (value, nm_setting_vpn_get_timeout (setting));
+		break;
+	default:
+		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+		break;
+	}
 }
 
 static void
@@ -856,36 +973,41 @@ set_property (GObject *object, guint prop_id,
 	}
 }
 
+/*****************************************************************************/
+
 static void
-get_property (GObject *object, guint prop_id,
-              GValue *value, GParamSpec *pspec)
+nm_setting_vpn_init (NMSettingVpn *setting)
 {
-	NMSettingVpn *setting = NM_SETTING_VPN (object);
 	NMSettingVpnPrivate *priv = NM_SETTING_VPN_GET_PRIVATE (setting);
 
-	switch (prop_id) {
-	case PROP_SERVICE_TYPE:
-		g_value_set_string (value, nm_setting_vpn_get_service_type (setting));
-		break;
-	case PROP_USER_NAME:
-		g_value_set_string (value, nm_setting_vpn_get_user_name (setting));
-		break;
-	case PROP_PERSISTENT:
-		g_value_set_boolean (value, priv->persistent);
-		break;
-	case PROP_DATA:
-		g_value_take_boxed (value, _nm_utils_copy_strdict (priv->data));
-		break;
-	case PROP_SECRETS:
-		g_value_take_boxed (value, _nm_utils_copy_strdict (priv->secrets));
-		break;
-	case PROP_TIMEOUT:
-		g_value_set_uint (value, nm_setting_vpn_get_timeout (setting));
-		break;
-	default:
-		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-		break;
-	}
+	priv->data = g_hash_table_new_full (nm_str_hash, g_str_equal, g_free, g_free);
+	priv->secrets = g_hash_table_new_full (nm_str_hash, g_str_equal, g_free, (GDestroyNotify) nm_free_secret);
+}
+
+/**
+ * nm_setting_vpn_new:
+ *
+ * Creates a new #NMSettingVpn object with default values.
+ *
+ * Returns: (transfer full): the new empty #NMSettingVpn object
+ **/
+NMSetting *
+nm_setting_vpn_new (void)
+{
+	return (NMSetting *) g_object_new (NM_TYPE_SETTING_VPN, NULL);
+}
+
+static void
+finalize (GObject *object)
+{
+	NMSettingVpnPrivate *priv = NM_SETTING_VPN_GET_PRIVATE (object);
+
+	g_free (priv->service_type);
+	g_free (priv->user_name);
+	g_hash_table_destroy (priv->data);
+	g_hash_table_destroy (priv->secrets);
+
+	G_OBJECT_CLASS (nm_setting_vpn_parent_class)->finalize (object);
 }
 
 static void
@@ -897,17 +1019,19 @@ nm_setting_vpn_class_init (NMSettingVpnClass *klass)
 
 	g_type_class_add_private (klass, sizeof (NMSettingVpnPrivate));
 
-	object_class->set_property = set_property;
 	object_class->get_property = get_property;
+	object_class->set_property = set_property;
 	object_class->finalize     = finalize;
 
-	setting_class->verify                   = verify;
-	setting_class->update_one_secret        = update_one_secret;
-	setting_class->get_secret_flags         = get_secret_flags;
-	setting_class->set_secret_flags         = set_secret_flags;
-	setting_class->need_secrets             = need_secrets;
-	setting_class->compare_property         = compare_property;
-	setting_class->clear_secrets_with_flags = clear_secrets_with_flags;
+	setting_class->verify            = verify;
+	setting_class->update_one_secret = update_one_secret;
+	setting_class->for_each_secret   = for_each_secret;
+	setting_class->get_secret_flags  = get_secret_flags;
+	setting_class->set_secret_flags  = set_secret_flags;
+	setting_class->need_secrets      = need_secrets;
+	setting_class->compare_property  = compare_property;
+	setting_class->clear_secrets     = clear_secrets;
+	setting_class->aggregate         = aggregate;
 
 	/**
 	 * NMSettingVpn:service-type:
@@ -916,12 +1040,11 @@ nm_setting_vpn_class_init (NMSettingVpnClass *klass)
 	 * its network.  i.e. org.freedesktop.NetworkManager.vpnc for the vpnc
 	 * plugin.
 	 **/
-	g_object_class_install_property
-		(object_class, PROP_SERVICE_TYPE,
-		 g_param_spec_string (NM_SETTING_VPN_SERVICE_TYPE, "", "",
-		                      NULL,
-		                      G_PARAM_READWRITE |
-		                      G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_SERVICE_TYPE] =
+	    g_param_spec_string (NM_SETTING_VPN_SERVICE_TYPE, "", "",
+	                         NULL,
+	                         G_PARAM_READWRITE |
+	                         G_PARAM_STATIC_STRINGS);
 
 	/**
 	 * NMSettingVpn:user-name:
@@ -933,12 +1056,11 @@ nm_setting_vpn_class_init (NMSettingVpnClass *klass)
 	 * will automatically supply the username of the user which requested the
 	 * VPN connection.
 	 **/
-	g_object_class_install_property
-		(object_class, PROP_USER_NAME,
-		 g_param_spec_string (NM_SETTING_VPN_USER_NAME, "", "",
-		                      NULL,
-		                      G_PARAM_READWRITE |
-		                      G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_USER_NAME] =
+	    g_param_spec_string (NM_SETTING_VPN_USER_NAME, "", "",
+	                         NULL,
+	                         G_PARAM_READWRITE |
+	                         G_PARAM_STATIC_STRINGS);
 
 	/**
 	 * NMSettingVpn:persistent:
@@ -947,12 +1069,11 @@ nm_setting_vpn_class_init (NMSettingVpnClass *klass)
 	 * the VPN will attempt to stay connected across link changes and outages,
 	 * until explicitly disconnected.
 	 **/
-	g_object_class_install_property
-		(object_class, PROP_PERSISTENT,
-		 g_param_spec_boolean (NM_SETTING_VPN_PERSISTENT, "", "",
-		                       FALSE,
-		                       G_PARAM_READWRITE |
-		                       G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_PERSISTENT] =
+	    g_param_spec_boolean (NM_SETTING_VPN_PERSISTENT, "", "",
+	                          FALSE,
+	                          G_PARAM_READWRITE |
+	                          G_PARAM_STATIC_STRINGS);
 
 	/**
 	 * NMSettingVpn:data: (type GHashTable(utf8,utf8)):
@@ -968,16 +1089,14 @@ nm_setting_vpn_class_init (NMSettingVpnClass *klass)
 	 * example: remote=ovpn.corp.com cipher=AES-256-CBC username=joe
 	 * ---end---
 	 */
-	g_object_class_install_property
-		(object_class, PROP_DATA,
-		 g_param_spec_boxed (NM_SETTING_VPN_DATA, "", "",
-		                     G_TYPE_HASH_TABLE,
-		                     G_PARAM_READWRITE |
-		                     G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_DATA] =
+	    g_param_spec_boxed (NM_SETTING_VPN_DATA, "", "",
+	                        G_TYPE_HASH_TABLE,
+	                        G_PARAM_READWRITE |
+	                        G_PARAM_STATIC_STRINGS);
 
 	_properties_override_add_transform (properties_override,
-	                                    g_object_class_find_property (G_OBJECT_CLASS (setting_class),
-	                                                                  NM_SETTING_VPN_DATA),
+	                                    obj_properties[PROP_DATA],
 	                                    G_VARIANT_TYPE ("a{ss}"),
 	                                    _nm_utils_strdict_to_dbus,
 	                                    _nm_utils_strdict_from_dbus);
@@ -996,17 +1115,15 @@ nm_setting_vpn_class_init (NMSettingVpnClass *klass)
 	 * example: password=Popocatepetl
 	 * ---end---
 	 */
-	g_object_class_install_property
-		(object_class, PROP_SECRETS,
-		 g_param_spec_boxed (NM_SETTING_VPN_SECRETS, "", "",
-		                     G_TYPE_HASH_TABLE,
-		                     G_PARAM_READWRITE |
-		                     NM_SETTING_PARAM_SECRET |
-		                     G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_SECRETS] =
+	    g_param_spec_boxed (NM_SETTING_VPN_SECRETS, "", "",
+	                        G_TYPE_HASH_TABLE,
+	                        G_PARAM_READWRITE |
+	                        NM_SETTING_PARAM_SECRET |
+	                        G_PARAM_STATIC_STRINGS);
 
 	_properties_override_add_transform (properties_override,
-	                                    g_object_class_find_property (G_OBJECT_CLASS (setting_class),
-	                                                                  NM_SETTING_VPN_SECRETS),
+	                                    obj_properties[PROP_SECRETS],
 	                                    G_VARIANT_TYPE ("a{ss}"),
 	                                    _nm_utils_strdict_to_dbus,
 	                                    _nm_utils_strdict_from_dbus);
@@ -1022,12 +1139,13 @@ nm_setting_vpn_class_init (NMSettingVpnClass *klass)
 	 *
 	 * Since: 1.2
 	 **/
-	g_object_class_install_property
-		(object_class, PROP_TIMEOUT,
-		 g_param_spec_uint (NM_SETTING_VPN_TIMEOUT, "", "",
-		                    0, G_MAXUINT32, 0,
-		                    G_PARAM_READWRITE |
-		                    G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_TIMEOUT] =
+	    g_param_spec_uint (NM_SETTING_VPN_TIMEOUT, "", "",
+	                       0, G_MAXUINT32, 0,
+	                       G_PARAM_READWRITE |
+	                       G_PARAM_STATIC_STRINGS);
+
+	g_object_class_install_properties (object_class, _PROPERTY_ENUMS_LAST, obj_properties);
 
 	_nm_setting_class_commit_full (setting_class, NM_META_SETTING_TYPE_VPN,
 	                               NULL, properties_override);
diff --git a/libnm-core/nm-setting-vxlan.c b/libnm-core/nm-setting-vxlan.c
index d00c5a7a..0c116f06 100644
--- a/libnm-core/nm-setting-vxlan.c
+++ b/libnm-core/nm-setting-vxlan.c
@@ -21,10 +21,10 @@
 
 #include "nm-default.h"
 
+#include "nm-setting-vxlan.h"
+
 #include 
-#include 
 
-#include "nm-setting-vxlan.h"
 #include "nm-utils.h"
 #include "nm-setting-private.h"
 
@@ -36,9 +36,28 @@
  * necessary for connection to VXLAN interfaces.
  **/
 
-G_DEFINE_TYPE (NMSettingVxlan, nm_setting_vxlan, NM_TYPE_SETTING)
+#define DST_PORT_DEFAULT   8472
 
-#define NM_SETTING_VXLAN_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_SETTING_VXLAN, NMSettingVxlanPrivate))
+/*****************************************************************************/
+
+NM_GOBJECT_PROPERTIES_DEFINE_BASE (
+	PROP_PARENT,
+	PROP_ID,
+	PROP_LOCAL,
+	PROP_REMOTE,
+	PROP_SOURCE_PORT_MIN,
+	PROP_SOURCE_PORT_MAX,
+	PROP_DESTINATION_PORT,
+	PROP_TOS,
+	PROP_TTL,
+	PROP_AGEING,
+	PROP_LIMIT,
+	PROP_LEARNING,
+	PROP_PROXY,
+	PROP_RSC,
+	PROP_L2_MISS,
+	PROP_L3_MISS,
+);
 
 typedef struct {
 	char *parent;
@@ -59,44 +78,11 @@ typedef struct {
 	gboolean l3_miss;
 } NMSettingVxlanPrivate;
 
-enum {
-	PROP_0,
-	PROP_PARENT,
-	PROP_ID,
-	PROP_LOCAL,
-	PROP_REMOTE,
-	PROP_SOURCE_PORT_MIN,
-	PROP_SOURCE_PORT_MAX,
-	PROP_DESTINATION_PORT,
-	PROP_TOS,
-	PROP_TTL,
-	PROP_AGEING,
-	PROP_LIMIT,
-	PROP_LEARNING,
-	PROP_PROXY,
-	PROP_RSC,
-	PROP_L2_MISS,
-	PROP_L3_MISS,
-
-	LAST_PROP
-};
+G_DEFINE_TYPE (NMSettingVxlan, nm_setting_vxlan, NM_TYPE_SETTING)
 
-#define DST_PORT_DEFAULT   8472
+#define NM_SETTING_VXLAN_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_SETTING_VXLAN, NMSettingVxlanPrivate))
 
-/**
- * nm_setting_vxlan_new:
- *
- * Creates a new #NMSettingVxlan object with default values.
- *
- * Returns: (transfer full): the new empty #NMSettingVxlan object
- *
- * Since: 1.2
- **/
-NMSetting *
-nm_setting_vxlan_new (void)
-{
-	return (NMSetting *) g_object_new (NM_TYPE_SETTING_VXLAN, NULL);
-}
+/*****************************************************************************/
 
 /**
  * nm_setting_vxlan_get_parent:
@@ -340,11 +326,6 @@ nm_setting_vxlan_get_l3_miss (NMSettingVxlan *setting)
 
 /*****************************************************************************/
 
-static void
-nm_setting_vxlan_init (NMSettingVxlan *setting)
-{
-}
-
 static gboolean
 verify (NMSetting *setting, NMConnection *connection, GError **error)
 {
@@ -422,64 +403,63 @@ verify (NMSetting *setting, NMConnection *connection, GError **error)
 	return TRUE;
 }
 
+/*****************************************************************************/
+
 static void
-set_property (GObject *object, guint prop_id,
-              const GValue *value, GParamSpec *pspec)
+get_property (GObject *object, guint prop_id,
+              GValue *value, GParamSpec *pspec)
 {
 	NMSettingVxlan *setting = NM_SETTING_VXLAN (object);
 	NMSettingVxlanPrivate *priv = NM_SETTING_VXLAN_GET_PRIVATE (setting);
 
 	switch (prop_id) {
 	case PROP_PARENT:
-		g_free (priv->parent);
-		priv->parent = g_value_dup_string (value);
+		g_value_set_string (value, priv->parent);
 		break;
 	case PROP_ID:
-		priv->id = g_value_get_uint (value);
+		g_value_set_uint (value, priv->id);
 		break;
 	case PROP_LOCAL:
-		g_free (priv->local);
-		priv->local = g_value_dup_string (value);
+		g_value_set_string (value, priv->local);
 		break;
 	case PROP_REMOTE:
-		g_free (priv->remote);
-		priv->remote = g_value_dup_string (value);
+		g_value_set_string (value, priv->remote);
 		break;
 	case PROP_SOURCE_PORT_MIN:
-		priv->source_port_min = g_value_get_uint (value);
+		g_value_set_uint (value, priv->source_port_min);
 		break;
 	case PROP_SOURCE_PORT_MAX:
-		priv->source_port_max = g_value_get_uint (value);
+		g_value_set_uint (value, priv->source_port_max);
 		break;
 	case PROP_DESTINATION_PORT:
-		priv->destination_port = g_value_get_uint (value);
+		g_value_set_uint (value, priv->destination_port);
 		break;
 	case PROP_TOS:
-		priv->tos = g_value_get_uint (value);
+		g_value_set_uint (value, priv->tos);
 		break;
 	case PROP_AGEING:
-		priv->ageing = g_value_get_uint (value);
+		g_value_set_uint (value, priv->ageing);
 		break;
 	case PROP_LIMIT:
-		priv->limit = g_value_get_uint (value);
+		g_value_set_uint (value, priv->limit);
 		break;
 	case PROP_PROXY:
-		priv->proxy = g_value_get_boolean (value);
+		g_value_set_boolean (value, priv->proxy);
 		break;
 	case PROP_TTL:
-		priv->ttl = g_value_get_uint (value);
+		g_value_set_uint (value, priv->ttl);
 		break;
 	case PROP_LEARNING:
-		priv->learning = g_value_get_boolean (value);
+		g_value_set_boolean (value, priv->learning);
 		break;
 	case PROP_RSC:
-		priv->rsc = g_value_get_boolean (value);
+		g_value_set_boolean (value, priv->rsc);
 		break;
 	case PROP_L2_MISS:
-		priv->l2_miss = g_value_get_boolean (value);
+		g_value_set_boolean (value, priv->l2_miss);
 		break;
 	case PROP_L3_MISS:
-		priv->l3_miss = g_value_get_boolean (value);
+		g_value_set_boolean (value, priv->l3_miss);
 		break;
 	default:
 		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
@@ -488,60 +468,63 @@ set_property (GObject *object, guint prop_id,
 }
 
 static void
-get_property (GObject *object, guint prop_id,
-              GValue *value, GParamSpec *pspec)
+set_property (GObject *object, guint prop_id,
+              const GValue *value, GParamSpec *pspec)
 {
 	NMSettingVxlan *setting = NM_SETTING_VXLAN (object);
 	NMSettingVxlanPrivate *priv = NM_SETTING_VXLAN_GET_PRIVATE (setting);
 
 	switch (prop_id) {
 	case PROP_PARENT:
-		g_value_set_string (value, priv->parent);
+		g_free (priv->parent);
+		priv->parent = g_value_dup_string (value);
 		break;
 	case PROP_ID:
-		g_value_set_uint (value, priv->id);
+		priv->id = g_value_get_uint (value);
 		break;
 	case PROP_LOCAL:
-		g_value_set_string (value, priv->local);
+		g_free (priv->local);
+		priv->local = g_value_dup_string (value);
 		break;
 	case PROP_REMOTE:
-		g_value_set_string (value, priv->remote);
+		g_free (priv->remote);
+		priv->remote = g_value_dup_string (value);
 		break;
 	case PROP_SOURCE_PORT_MIN:
-		g_value_set_uint (value, priv->source_port_min);
+		priv->source_port_min = g_value_get_uint (value);
 		break;
 	case PROP_SOURCE_PORT_MAX:
-		g_value_set_uint (value, priv->source_port_max);
+		priv->source_port_max = g_value_get_uint (value);
 		break;
 	case PROP_DESTINATION_PORT:
-		g_value_set_uint (value, priv->destination_port);
+		priv->destination_port = g_value_get_uint (value);
 		break;
 	case PROP_TOS:
-		g_value_set_uint (value, priv->tos);
+		priv->tos = g_value_get_uint (value);
 		break;
 	case PROP_AGEING:
-		g_value_set_uint (value, priv->ageing);
+		priv->ageing = g_value_get_uint (value);
 		break;
 	case PROP_LIMIT:
-		g_value_set_uint (value, priv->limit);
+		priv->limit = g_value_get_uint (value);
 		break;
 	case PROP_PROXY:
-		g_value_set_boolean (value, priv->proxy);
+		priv->proxy = g_value_get_boolean (value);
 		break;
 	case PROP_TTL:
-		g_value_set_uint (value, priv->ttl);
+		priv->ttl = g_value_get_uint (value);
 		break;
 	case PROP_LEARNING:
-		g_value_set_boolean (value, priv->learning);
+		priv->learning = g_value_get_boolean (value);
 		break;
 	case PROP_RSC:
-		g_value_set_boolean (value, priv->rsc);
+		priv->rsc = g_value_get_boolean (value);
 		break;
 	case PROP_L2_MISS:
-		g_value_set_boolean (value, priv->l2_miss);
+		priv->l2_miss = g_value_get_boolean (value);
 		break;
 	case PROP_L3_MISS:
-		g_value_set_boolean (value, priv->l3_miss);
+		priv->l3_miss = g_value_get_boolean (value);
 		break;
 	default:
 		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
@@ -549,6 +532,28 @@ get_property (GObject *object, guint prop_id,
 	}
 }
 
+/*****************************************************************************/
+
+static void
+nm_setting_vxlan_init (NMSettingVxlan *setting)
+{
+}
+
+/**
+ * nm_setting_vxlan_new:
+ *
+ * Creates a new #NMSettingVxlan object with default values.
+ *
+ * Returns: (transfer full): the new empty #NMSettingVxlan object
+ *
+ * Since: 1.2
+ **/
+NMSetting *
+nm_setting_vxlan_new (void)
+{
+	return (NMSetting *) g_object_new (NM_TYPE_SETTING_VXLAN, NULL);
+}
+
 static void
 finalize (GObject *object)
 {
@@ -570,8 +575,8 @@ nm_setting_vxlan_class_init (NMSettingVxlanClass *klass)
 
 	g_type_class_add_private (klass, sizeof (NMSettingVxlanPrivate));
 
-	object_class->set_property = set_property;
 	object_class->get_property = get_property;
+	object_class->set_property = set_property;
 	object_class->finalize     = finalize;
 
 	setting_class->verify = verify;
@@ -583,14 +588,13 @@ nm_setting_vxlan_class_init (NMSettingVxlanClass *klass)
 	 *
 	 * Since: 1.2
 	 **/
-	g_object_class_install_property
-		(object_class, PROP_PARENT,
-		 g_param_spec_string (NM_SETTING_VXLAN_PARENT, "", "",
-		                      NULL,
-		                      G_PARAM_READWRITE |
-		                      G_PARAM_CONSTRUCT |
-		                      NM_SETTING_PARAM_INFERRABLE |
-		                      G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_PARENT] =
+	    g_param_spec_string (NM_SETTING_VXLAN_PARENT, "", "",
+	                         NULL,
+	                         G_PARAM_READWRITE |
+	                         G_PARAM_CONSTRUCT |
+	                         NM_SETTING_PARAM_INFERRABLE |
+	                         G_PARAM_STATIC_STRINGS);
 	/**
 	 * NMSettingVxlan:id:
 	 *
@@ -599,14 +603,13 @@ nm_setting_vxlan_class_init (NMSettingVxlanClass *klass)
 	 *
 	 * Since: 1.2
 	 **/
-	g_object_class_install_property
-		(object_class, PROP_ID,
-		 g_param_spec_uint (NM_SETTING_VXLAN_ID, "", "",
-		                    0, (1 << 24) - 1, 0,
-		                    G_PARAM_READWRITE |
-		                    G_PARAM_CONSTRUCT |
-		                    NM_SETTING_PARAM_INFERRABLE |
-		                    G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_ID] =
+	    g_param_spec_uint (NM_SETTING_VXLAN_ID, "", "",
+	                       0, (1 << 24) - 1, 0,
+	                       G_PARAM_READWRITE |
+	                       G_PARAM_CONSTRUCT |
+	                       NM_SETTING_PARAM_INFERRABLE |
+	                       G_PARAM_STATIC_STRINGS);
 
 	/**
 	 * NMSettingVxlan:local:
@@ -615,14 +618,13 @@ nm_setting_vxlan_class_init (NMSettingVxlanClass *klass)
 	 *
 	 * Since: 1.2
 	 **/
-	g_object_class_install_property
-		(object_class, PROP_LOCAL,
-		 g_param_spec_string (NM_SETTING_VXLAN_LOCAL, "", "",
-		                      NULL,
-		                      G_PARAM_READWRITE |
-		                      G_PARAM_CONSTRUCT |
-		                      NM_SETTING_PARAM_INFERRABLE |
-		                      G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_LOCAL] =
+	    g_param_spec_string (NM_SETTING_VXLAN_LOCAL, "", "",
+	                         NULL,
+	                         G_PARAM_READWRITE |
+	                         G_PARAM_CONSTRUCT |
+	                         NM_SETTING_PARAM_INFERRABLE |
+	                         G_PARAM_STATIC_STRINGS);
 
 	/**
 	 * NMSettingVxlan:remote:
@@ -633,14 +635,13 @@ nm_setting_vxlan_class_init (NMSettingVxlanClass *klass)
 	 *
 	 * Since: 1.2
 	 **/
-	g_object_class_install_property
-		(object_class, PROP_REMOTE,
-		 g_param_spec_string (NM_SETTING_VXLAN_REMOTE, "", "",
-		                      NULL,
-		                      G_PARAM_READWRITE |
-		                      G_PARAM_CONSTRUCT |
-		                      NM_SETTING_PARAM_INFERRABLE |
-		                      G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_REMOTE] =
+	    g_param_spec_string (NM_SETTING_VXLAN_REMOTE, "", "",
+	                         NULL,
+	                         G_PARAM_READWRITE |
+	                         G_PARAM_CONSTRUCT |
+	                         NM_SETTING_PARAM_INFERRABLE |
+	                         G_PARAM_STATIC_STRINGS);
 
 	/**
 	 * NMSettingVxlan:source-port-min:
@@ -650,14 +651,13 @@ nm_setting_vxlan_class_init (NMSettingVxlanClass *klass)
 	 *
 	 * Since: 1.2
 	 **/
-	g_object_class_install_property
-		(object_class, PROP_SOURCE_PORT_MIN,
-		 g_param_spec_uint (NM_SETTING_VXLAN_SOURCE_PORT_MIN, "", "",
-		                    0, G_MAXUINT16, 0,
-		                    G_PARAM_READWRITE |
-		                    G_PARAM_CONSTRUCT |
-		                    NM_SETTING_PARAM_INFERRABLE |
-		                    G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_SOURCE_PORT_MIN] =
+	    g_param_spec_uint (NM_SETTING_VXLAN_SOURCE_PORT_MIN, "", "",
+	                       0, G_MAXUINT16, 0,
+	                       G_PARAM_READWRITE |
+	                       G_PARAM_CONSTRUCT |
+	                       NM_SETTING_PARAM_INFERRABLE |
+	                       G_PARAM_STATIC_STRINGS);
 
 	/**
 	 * NMSettingVxlan:source-port-max:
@@ -667,14 +667,13 @@ nm_setting_vxlan_class_init (NMSettingVxlanClass *klass)
 	 *
 	 * Since: 1.2
 	 **/
-	g_object_class_install_property
-		(object_class, PROP_SOURCE_PORT_MAX,
-		 g_param_spec_uint (NM_SETTING_VXLAN_SOURCE_PORT_MAX, "", "",
-		                    0, G_MAXUINT16, 0,
-		                    G_PARAM_READWRITE |
-		                    G_PARAM_CONSTRUCT |
-		                    NM_SETTING_PARAM_INFERRABLE |
-		                    G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_SOURCE_PORT_MAX] =
+	    g_param_spec_uint (NM_SETTING_VXLAN_SOURCE_PORT_MAX, "", "",
+	                       0, G_MAXUINT16, 0,
+	                       G_PARAM_READWRITE |
+	                       G_PARAM_CONSTRUCT |
+	                       NM_SETTING_PARAM_INFERRABLE |
+	                       G_PARAM_STATIC_STRINGS);
 
 	/**
 	 * NMSettingVxlan:destination-port:
@@ -684,14 +683,13 @@ nm_setting_vxlan_class_init (NMSettingVxlanClass *klass)
 	 *
 	 * Since: 1.2
 	 **/
-	g_object_class_install_property
-		(object_class, PROP_DESTINATION_PORT,
-		 g_param_spec_uint (NM_SETTING_VXLAN_DESTINATION_PORT, "", "",
-		                    0, G_MAXUINT16, DST_PORT_DEFAULT,
-		                    G_PARAM_READWRITE |
-		                    G_PARAM_CONSTRUCT |
-		                    NM_SETTING_PARAM_INFERRABLE |
-		                    G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_DESTINATION_PORT] =
+	    g_param_spec_uint (NM_SETTING_VXLAN_DESTINATION_PORT, "", "",
+	                       0, G_MAXUINT16, DST_PORT_DEFAULT,
+	                       G_PARAM_READWRITE |
+	                       G_PARAM_CONSTRUCT |
+	                       NM_SETTING_PARAM_INFERRABLE |
+	                       G_PARAM_STATIC_STRINGS);
 
 	/**
 	 * NMSettingVxlan:ageing:
@@ -700,14 +698,13 @@ nm_setting_vxlan_class_init (NMSettingVxlanClass *klass)
 	 *
 	 * Since: 1.2
 	 **/
-	g_object_class_install_property
-		(object_class, PROP_AGEING,
-		 g_param_spec_uint (NM_SETTING_VXLAN_AGEING, "", "",
-		                    0, G_MAXUINT32, 300,
-		                    G_PARAM_READWRITE |
-		                    G_PARAM_CONSTRUCT |
-		                    NM_SETTING_PARAM_INFERRABLE |
-		                    G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_AGEING] =
+	    g_param_spec_uint (NM_SETTING_VXLAN_AGEING, "", "",
+	                       0, G_MAXUINT32, 300,
+	                       G_PARAM_READWRITE |
+	                       G_PARAM_CONSTRUCT |
+	                       NM_SETTING_PARAM_INFERRABLE |
+	                       G_PARAM_STATIC_STRINGS);
 
 	/**
 	 * NMSettingVxlan:limit:
@@ -717,14 +714,13 @@ nm_setting_vxlan_class_init (NMSettingVxlanClass *klass)
 	 *
 	 * Since: 1.2
 	 **/
-	g_object_class_install_property
-		(object_class, PROP_LIMIT,
-		 g_param_spec_uint (NM_SETTING_VXLAN_LIMIT, "", "",
-		                    0, G_MAXUINT32, 0,
-		                    G_PARAM_READWRITE |
-		                    G_PARAM_CONSTRUCT |
-		                    NM_SETTING_PARAM_INFERRABLE |
-		                    G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_LIMIT] =
+	    g_param_spec_uint (NM_SETTING_VXLAN_LIMIT, "", "",
+	                       0, G_MAXUINT32, 0,
+	                       G_PARAM_READWRITE |
+	                       G_PARAM_CONSTRUCT |
+	                       NM_SETTING_PARAM_INFERRABLE |
+	                       G_PARAM_STATIC_STRINGS);
 
 	/**
 	 * NMSettingVxlan:tos:
@@ -733,14 +729,13 @@ nm_setting_vxlan_class_init (NMSettingVxlanClass *klass)
 	 *
 	 * Since: 1.2
 	 **/
-	g_object_class_install_property
-		(object_class, PROP_TOS,
-		 g_param_spec_uint (NM_SETTING_VXLAN_TOS, "", "",
-		                    0, 255, 0,
-		                    G_PARAM_READWRITE |
-		                    G_PARAM_CONSTRUCT |
-		                    NM_SETTING_PARAM_INFERRABLE |
-		                    G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_TOS] =
+	    g_param_spec_uint (NM_SETTING_VXLAN_TOS, "", "",
+	                       0, 255, 0,
+	                       G_PARAM_READWRITE |
+	                       G_PARAM_CONSTRUCT |
+	                       NM_SETTING_PARAM_INFERRABLE |
+	                       G_PARAM_STATIC_STRINGS);
 
 	/**
 	 * NMSettingVxlan:ttl:
@@ -749,14 +744,13 @@ nm_setting_vxlan_class_init (NMSettingVxlanClass *klass)
 	 *
 	 * Since: 1.2
 	 **/
-	g_object_class_install_property
-		(object_class, PROP_TTL,
-		 g_param_spec_uint (NM_SETTING_VXLAN_TTL, "", "",
-		                    0, 255, 0,
-		                    G_PARAM_READWRITE |
-		                    G_PARAM_CONSTRUCT |
-		                    NM_SETTING_PARAM_INFERRABLE |
-		                    G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_TTL] =
+	    g_param_spec_uint (NM_SETTING_VXLAN_TTL, "", "",
+	                       0, 255, 0,
+	                       G_PARAM_READWRITE |
+	                       G_PARAM_CONSTRUCT |
+	                       NM_SETTING_PARAM_INFERRABLE |
+	                       G_PARAM_STATIC_STRINGS);
 
 	/**
 	 * NMSettingVxlan:proxy:
@@ -765,14 +759,13 @@ nm_setting_vxlan_class_init (NMSettingVxlanClass *klass)
 	 *
 	 * Since: 1.2
 	 **/
-	g_object_class_install_property
-		(object_class, PROP_PROXY,
-		 g_param_spec_boolean (NM_SETTING_VXLAN_PROXY, "", "",
-		                       FALSE,
-		                       G_PARAM_READWRITE |
-		                       G_PARAM_CONSTRUCT |
-		                       NM_SETTING_PARAM_INFERRABLE |
-		                       G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_PROXY] =
+	    g_param_spec_boolean (NM_SETTING_VXLAN_PROXY, "", "",
+	                          FALSE,
+	                          G_PARAM_READWRITE |
+	                          G_PARAM_CONSTRUCT |
+	                          NM_SETTING_PARAM_INFERRABLE |
+	                          G_PARAM_STATIC_STRINGS);
 
 	/**
 	 * NMSettingVxlan:learning:
@@ -782,14 +775,13 @@ nm_setting_vxlan_class_init (NMSettingVxlanClass *klass)
 	 *
 	 * Since: 1.2
 	 **/
-	g_object_class_install_property
-		(object_class, PROP_LEARNING,
-		 g_param_spec_boolean (NM_SETTING_VXLAN_LEARNING, "", "",
-		                       TRUE,
-		                       G_PARAM_READWRITE |
-		                       G_PARAM_CONSTRUCT |
-		                       NM_SETTING_PARAM_INFERRABLE |
-		                       G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_LEARNING] =
+	    g_param_spec_boolean (NM_SETTING_VXLAN_LEARNING, "", "",
+	                          TRUE,
+	                          G_PARAM_READWRITE |
+	                          G_PARAM_CONSTRUCT |
+	                          NM_SETTING_PARAM_INFERRABLE |
+	                          G_PARAM_STATIC_STRINGS);
 	/**
 	 * NMSettingVxlan:rsc:
 	 *
@@ -797,14 +789,13 @@ nm_setting_vxlan_class_init (NMSettingVxlanClass *klass)
 	 *
 	 * Since: 1.2
 	 **/
-	g_object_class_install_property
-		(object_class, PROP_RSC,
-		 g_param_spec_boolean (NM_SETTING_VXLAN_RSC, "", "",
-		                       FALSE,
-		                       G_PARAM_READWRITE |
-		                       G_PARAM_CONSTRUCT |
-		                       NM_SETTING_PARAM_INFERRABLE |
-		                       G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_RSC] =
+	    g_param_spec_boolean (NM_SETTING_VXLAN_RSC, "", "",
+	                          FALSE,
+	                          G_PARAM_READWRITE |
+	                          G_PARAM_CONSTRUCT |
+	                          NM_SETTING_PARAM_INFERRABLE |
+	                          G_PARAM_STATIC_STRINGS);
 	/**
 	 * NMSettingVxlan:l2-miss:
 	 *
@@ -812,14 +803,13 @@ nm_setting_vxlan_class_init (NMSettingVxlanClass *klass)
 	 *
 	 * Since: 1.2
 	 **/
-	g_object_class_install_property
-		(object_class, PROP_L2_MISS,
-		 g_param_spec_boolean (NM_SETTING_VXLAN_L2_MISS, "", "",
-		                       FALSE,
-		                       G_PARAM_READWRITE |
-		                       G_PARAM_CONSTRUCT |
-		                       NM_SETTING_PARAM_INFERRABLE |
-		                       G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_L2_MISS] =
+	    g_param_spec_boolean (NM_SETTING_VXLAN_L2_MISS, "", "",
+	                          FALSE,
+	                          G_PARAM_READWRITE |
+	                          G_PARAM_CONSTRUCT |
+	                          NM_SETTING_PARAM_INFERRABLE |
+	                          G_PARAM_STATIC_STRINGS);
 
 	/**
 	 * NMSettingVxlan:l3-miss:
@@ -828,14 +818,15 @@ nm_setting_vxlan_class_init (NMSettingVxlanClass *klass)
 	 *
 	 * Since: 1.2
 	 **/
-	g_object_class_install_property
-		(object_class, PROP_L3_MISS,
-		 g_param_spec_boolean (NM_SETTING_VXLAN_L3_MISS, "", "",
-		                       FALSE,
-		                       G_PARAM_READWRITE |
-		                       G_PARAM_CONSTRUCT |
-		                       NM_SETTING_PARAM_INFERRABLE |
-		                       G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_L3_MISS] =
+	    g_param_spec_boolean (NM_SETTING_VXLAN_L3_MISS, "", "",
+	                          FALSE,
+	                          G_PARAM_READWRITE |
+	                          G_PARAM_CONSTRUCT |
+	                          NM_SETTING_PARAM_INFERRABLE |
+	                          G_PARAM_STATIC_STRINGS);
+
+	g_object_class_install_properties (object_class, _PROPERTY_ENUMS_LAST, obj_properties);
 
 	_nm_setting_class_commit (setting_class, NM_META_SETTING_TYPE_VXLAN);
 }
diff --git a/libnm-core/nm-setting-wifi-p2p.c b/libnm-core/nm-setting-wifi-p2p.c
new file mode 100644
index 00000000..da978720
--- /dev/null
+++ b/libnm-core/nm-setting-wifi-p2p.c
@@ -0,0 +1,317 @@
+/*
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301 USA.
+ *
+ * Copyright 2019 Red Hat, Inc.
+ */
+
+#include "nm-default.h"
+
+#include "nm-setting-wifi-p2p.h"
+
+#include 
+
+#include "nm-utils.h"
+#include "nm-common-macros.h"
+#include "nm-utils-private.h"
+#include "nm-setting-private.h"
+
+/**
+ * SECTION:nm-setting-wifi-p2p
+ * @short_description: Describes connection properties for 802.11 Wi-Fi P2P networks
+ *
+ * The #NMSettingWifiP2P object is a #NMSetting subclass that describes properties
+ * necessary for connection to 802.11 Wi-Fi P2P networks (aka Wi-Fi Direct).
+ **/
+
+/**
+ * NMSettingWifiP2P:
+ *
+ * Wi-Fi P2P Settings
+ *
+ * Since: 1.16
+ */
+
+/*****************************************************************************/
+
+NM_GOBJECT_PROPERTIES_DEFINE_BASE (
+	PROP_PEER,
+	PROP_WPS_METHOD,
+	PROP_WFD_IES,
+);
+
+typedef struct {
+	char *peer_mac_address;
+	GBytes *wfd_ies;
+
+	NMSettingWirelessSecurityWpsMethod wps_method;
+} NMSettingWifiP2PPrivate;
+
+struct _NMSettingWifiP2P {
+	NMSetting parent;
+	NMSettingWifiP2PPrivate _priv;
+};
+
+struct _NMSettingWifiP2PClass {
+	NMSettingClass parent;
+};
+
+G_DEFINE_TYPE (NMSettingWifiP2P, nm_setting_wifi_p2p, NM_TYPE_SETTING)
+
+#define NM_SETTING_WIFI_P2P_GET_PRIVATE(self) _NM_GET_PRIVATE (self, NMSettingWifiP2P, NM_IS_SETTING_WIFI_P2P, NMSetting)
+
+/*****************************************************************************/
+
+/**
+ * nm_setting_wifi_p2p_get_peer:
+ * @setting: the #NMSettingWifiP2P
+ *
+ * Returns: the #NMSettingWifiP2P:peer property of the setting
+ *
+ * Since: 1.16
+ **/
+const char *
+nm_setting_wifi_p2p_get_peer (NMSettingWifiP2P *setting)
+{
+	g_return_val_if_fail (NM_IS_SETTING_WIFI_P2P (setting), NULL);
+
+	return NM_SETTING_WIFI_P2P_GET_PRIVATE (setting)->peer_mac_address;
+}
+
+/**
+ * nm_setting_wifi_p2p_get_wps_method:
+ * @setting: the #NMSettingWifiP2P
+ *
+ * Returns: the #NMSettingWifiP2P:wps-method property of the setting
+ *
+ * Since: 1.16
+ **/
+NMSettingWirelessSecurityWpsMethod
+nm_setting_wifi_p2p_get_wps_method (NMSettingWifiP2P *setting)
+{
+	g_return_val_if_fail (NM_IS_SETTING_WIFI_P2P (setting), NM_SETTING_WIRELESS_SECURITY_WPS_METHOD_DEFAULT);
+
+	return NM_SETTING_WIFI_P2P_GET_PRIVATE (setting)->wps_method;
+}
+
+/**
+ * nm_setting_wifi_p2p_get_wfd_ies:
+ * @setting: the #NMSettingWiFiP2P
+ *
+ * Returns: (transfer none): the #NMSettingWiFiP2P:wfd-ies property of the setting
+ *
+ * Since: 1.16
+ **/
+GBytes *
+nm_setting_wifi_p2p_get_wfd_ies (NMSettingWifiP2P *setting)
+{
+	g_return_val_if_fail (NM_IS_SETTING_WIFI_P2P (setting), NULL);
+
+	return NM_SETTING_WIFI_P2P_GET_PRIVATE (setting)->wfd_ies;
+}
+
+/*****************************************************************************/
+
+static gboolean
+verify (NMSetting *setting, NMConnection *connection, GError **error)
+{
+	NMSettingWifiP2PPrivate *priv = NM_SETTING_WIFI_P2P_GET_PRIVATE (setting);
+
+	if (!priv->peer_mac_address) {
+		g_set_error_literal (error,
+		                     NM_CONNECTION_ERROR,
+		                     NM_CONNECTION_ERROR_MISSING_PROPERTY,
+		                     _("property is missing"));
+		g_prefix_error (error, "%s.%s: ", NM_SETTING_WIFI_P2P_SETTING_NAME, NM_SETTING_WIFI_P2P_PEER);
+		return FALSE;
+	}
+
+	if (!nm_utils_hwaddr_valid (priv->peer_mac_address, ETH_ALEN)) {
+		g_set_error_literal (error,
+		                     NM_CONNECTION_ERROR,
+		                     NM_CONNECTION_ERROR_INVALID_PROPERTY,
+		                     _("property is invalid"));
+		g_prefix_error (error, "%s.%s: ", NM_SETTING_WIFI_P2P_SETTING_NAME, NM_SETTING_WIFI_P2P_PEER);
+		return FALSE;
+	}
+
+	if (!_nm_utils_wps_method_validate (priv->wps_method,
+	                                    NM_SETTING_WIFI_P2P_SETTING_NAME,
+	                                    NM_SETTING_WIFI_P2P_WPS_METHOD,
+	                                    TRUE,
+	                                    error))
+		return FALSE;
+
+	return TRUE;
+}
+
+/*****************************************************************************/
+
+static void
+get_property (GObject *object, guint prop_id,
+              GValue *value, GParamSpec *pspec)
+{
+	NMSettingWifiP2P *setting = NM_SETTING_WIFI_P2P (object);
+
+	switch (prop_id) {
+	case PROP_PEER:
+		g_value_set_string (value, nm_setting_wifi_p2p_get_peer (setting));
+		break;
+	case PROP_WPS_METHOD:
+		g_value_set_uint (value, nm_setting_wifi_p2p_get_wps_method (setting));
+		break;
+	case PROP_WFD_IES:
+		g_value_set_boxed (value, nm_setting_wifi_p2p_get_wfd_ies (setting));
+		break;
+	default:
+		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+		break;
+	}
+}
+
+static void
+set_property (GObject *object, guint prop_id,
+              const GValue *value, GParamSpec *pspec)
+{
+	NMSettingWifiP2PPrivate *priv = NM_SETTING_WIFI_P2P_GET_PRIVATE (object);
+
+	switch (prop_id) {
+	case PROP_PEER:
+		g_free (priv->peer_mac_address);
+		priv->peer_mac_address = _nm_utils_hwaddr_canonical_or_invalid (g_value_get_string (value),
+		                                                                ETH_ALEN);
+		break;
+	case PROP_WPS_METHOD:
+		priv->wps_method = g_value_get_uint (value);
+		break;
+	case PROP_WFD_IES:
+		g_clear_pointer (&priv->wfd_ies, g_bytes_unref);
+		priv->wfd_ies = g_value_dup_boxed (value);
+		break;
+	default:
+		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+		break;
+	}
+}
+
+/*****************************************************************************/
+
+static void
+nm_setting_wifi_p2p_init (NMSettingWifiP2P *setting)
+{
+}
+
+/**
+ * nm_setting_wifi_p2p_new:
+ *
+ * Creates a new #NMSettingWifiP2P object with default values.
+ *
+ * Returns: (transfer full): the new empty #NMSettingWifiP2P object
+ *
+ * Since: 1.16
+ **/
+NMSetting *
+nm_setting_wifi_p2p_new (void)
+{
+	return g_object_new (NM_TYPE_SETTING_WIFI_P2P, NULL);
+}
+
+static void
+finalize (GObject *object)
+{
+	NMSettingWifiP2PPrivate *priv = NM_SETTING_WIFI_P2P_GET_PRIVATE (object);
+
+	g_free (priv->peer_mac_address);
+	g_bytes_unref (priv->wfd_ies);
+
+	G_OBJECT_CLASS (nm_setting_wifi_p2p_parent_class)->finalize (object);
+}
+
+static void
+nm_setting_wifi_p2p_class_init (NMSettingWifiP2PClass *setting_wifi_p2p_class)
+{
+	GObjectClass *object_class = G_OBJECT_CLASS (setting_wifi_p2p_class);
+	NMSettingClass *setting_class = NM_SETTING_CLASS (setting_wifi_p2p_class);
+
+	object_class->get_property = get_property;
+	object_class->set_property = set_property;
+	object_class->finalize     = finalize;
+
+	setting_class->verify      = verify;
+
+	/**
+	 * NMSettingWifiP2P:peer:
+	 *
+	 * The P2P device that should be connected to. Currently this is the only
+	 * way to create or join a group.
+	 *
+	 * Since: 1.16
+	 */
+	/* ---keyfile---
+	 * property: peer
+	 * format: usual hex-digits-and-colons notation
+	 * description: MAC address in traditional hex-digits-and-colons notation
+	 *   (e.g. 00:22:68:12:79:A2), or semicolon separated list of 6 bytes (obsolete)
+	 *   (e.g. 0;34;104;18;121;162).
+	 * ---end---
+	 */
+	obj_properties[PROP_PEER] =
+	    g_param_spec_string (NM_SETTING_WIFI_P2P_PEER, "", "",
+	                         NULL,
+	                         G_PARAM_READWRITE |
+	                         G_PARAM_STATIC_STRINGS);
+
+	/**
+	 * NMSettingWifiP2P:wps-method:
+	 *
+	 * Flags indicating which mode of WPS is to be used.
+	 *
+	 * There's little point in changing the default setting as NetworkManager will
+	 * automatically determine the best method to use.
+	 *
+	 * Since: 1.16
+	 */
+	obj_properties[PROP_WPS_METHOD] =
+	    g_param_spec_uint (NM_SETTING_WIFI_P2P_WPS_METHOD, "", "",
+	                       0,
+	                       G_MAXUINT32,
+	                       NM_SETTING_WIRELESS_SECURITY_WPS_METHOD_DEFAULT,
+	                       G_PARAM_READWRITE |
+	                       NM_SETTING_PARAM_FUZZY_IGNORE |
+	                       G_PARAM_STATIC_STRINGS);
+
+	/**
+	 * NMSettingWifiP2P:wfd-ies:
+	 *
+	 * The Wi-Fi Display (WFD) Information Elements (IEs) to set.
+	 *
+	 * Wi-Fi Display requires a protocol specific information element to be
+	 * set in certain Wi-Fi frames. These can be specified here for the
+	 * purpose of establishing a connection.
+	 * This setting is only useful when implementing a Wi-Fi Display client.
+	 *
+	 * Since: 1.16
+	 */
+	obj_properties[PROP_WFD_IES] =
+	    g_param_spec_boxed (NM_SETTING_WIFI_P2P_WFD_IES, "", "",
+	                        G_TYPE_BYTES,
+	                        G_PARAM_READWRITE |
+	                        NM_SETTING_PARAM_FUZZY_IGNORE |
+	                        G_PARAM_STATIC_STRINGS);
+
+	g_object_class_install_properties (object_class, _PROPERTY_ENUMS_LAST, obj_properties);
+
+	_nm_setting_class_commit (setting_class, NM_META_SETTING_TYPE_WIFI_P2P);
+}
diff --git a/libnm-core/nm-setting-wifi-p2p.h b/libnm-core/nm-setting-wifi-p2p.h
new file mode 100644
index 00000000..ddb611c1
--- /dev/null
+++ b/libnm-core/nm-setting-wifi-p2p.h
@@ -0,0 +1,69 @@
+/*
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301 USA.
+ *
+ * Copyright 2019 Red Hat, Inc.
+ */
+
+#ifndef __NM_SETTING_WIFI_P2P_H__
+#define __NM_SETTING_WIFI_P2P_H__
+
+#if !defined (__NETWORKMANAGER_H_INSIDE__) && !defined (NETWORKMANAGER_COMPILATION)
+#error "Only  can be included directly."
+#endif
+
+#include "nm-setting.h"
+#include "nm-setting-wireless-security.h"
+
+G_BEGIN_DECLS
+
+#define NM_TYPE_SETTING_WIFI_P2P            (nm_setting_wifi_p2p_get_type ())
+#define NM_SETTING_WIFI_P2P(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_SETTING_WIFI_P2P, NMSettingWifiP2P))
+#define NM_SETTING_WIFI_P2P_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_SETTING_WIFI_P2P, NMSettingWifiP2PClass))
+#define NM_IS_SETTING_WIFI_P2P(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NM_TYPE_SETTING_WIFI_P2P))
+#define NM_IS_SETTING_WIFI_P2P_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), NM_TYPE_SETTING_WIFI_P2P))
+#define NM_SETTING_WIFI_P2P_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_SETTING_WIFI_P2P, NMSettingWifiP2PClass))
+
+#define NM_SETTING_WIFI_P2P_SETTING_NAME "wifi-p2p"
+
+/**
+ * NM_SETTING_WIFI_P2P_PEER:
+ *
+ * The mac address of the peer to connect to.
+ */
+#define NM_SETTING_WIFI_P2P_PEER        "peer"
+#define NM_SETTING_WIFI_P2P_WPS_METHOD  "wps-method"
+#define NM_SETTING_WIFI_P2P_WFD_IES     "wfd-ies"
+
+typedef struct _NMSettingWifiP2PClass NMSettingWifiP2PClass;
+
+NM_AVAILABLE_IN_1_16
+GType nm_setting_wifi_p2p_get_type (void);
+
+NM_AVAILABLE_IN_1_16
+NMSetting *nm_setting_wifi_p2p_new (void);
+
+NM_AVAILABLE_IN_1_16
+const char *nm_setting_wifi_p2p_get_peer (NMSettingWifiP2P *setting);
+
+NM_AVAILABLE_IN_1_16
+NMSettingWirelessSecurityWpsMethod nm_setting_wifi_p2p_get_wps_method (NMSettingWifiP2P *setting);
+
+NM_AVAILABLE_IN_1_16
+GBytes *nm_setting_wifi_p2p_get_wfd_ies (NMSettingWifiP2P *setting);
+
+G_END_DECLS
+
+#endif /* __NM_SETTING_WIFI_P2P_H__ */
diff --git a/libnm-core/nm-setting-wimax.c b/libnm-core/nm-setting-wimax.c
index 4c1a572e..a700f7fe 100644
--- a/libnm-core/nm-setting-wimax.c
+++ b/libnm-core/nm-setting-wimax.c
@@ -22,10 +22,10 @@
 
 #include "nm-default.h"
 
-#include 
+#include "nm-setting-wimax.h"
+
 #include 
 
-#include "nm-setting-wimax.h"
 #include "nm-setting-private.h"
 #include "nm-utils.h"
 #include "nm-utils-private.h"
@@ -42,37 +42,23 @@
  * connections cannot be activated.
  **/
 
-G_DEFINE_TYPE (NMSettingWimax, nm_setting_wimax, NM_TYPE_SETTING)
+/*****************************************************************************/
 
-#define NM_SETTING_WIMAX_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_SETTING_WIMAX, NMSettingWimaxPrivate))
+NM_GOBJECT_PROPERTIES_DEFINE_BASE (
+	PROP_NETWORK_NAME,
+	PROP_MAC_ADDRESS,
+);
 
 typedef struct {
 	char *network_name;
 	char *mac_address;
 } NMSettingWimaxPrivate;
 
-enum {
-	PROP_0,
-	PROP_NETWORK_NAME,
-	PROP_MAC_ADDRESS,
+G_DEFINE_TYPE (NMSettingWimax, nm_setting_wimax, NM_TYPE_SETTING)
 
-	LAST_PROP
-};
+#define NM_SETTING_WIMAX_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_SETTING_WIMAX, NMSettingWimaxPrivate))
 
-/**
- * nm_setting_wimax_new:
- *
- * Creates a new #NMSettingWimax object with default values.
- *
- * Returns: the new empty #NMSettingWimax object
- *
- * Deprecated: 1.2: WiMAX is no longer supported.
- **/
-NMSetting *
-nm_setting_wimax_new (void)
-{
-	return (NMSetting *) g_object_new (NM_TYPE_SETTING_WIMAX, NULL);
-}
+/*****************************************************************************/
 
 /**
  * nm_setting_wimax_get_network_name:
@@ -147,20 +133,25 @@ verify (NMSetting *setting, NMConnection *connection, GError **error)
 	return TRUE;
 }
 
-static void
-nm_setting_wimax_init (NMSettingWimax *setting)
-{
-}
+/*****************************************************************************/
 
 static void
-finalize (GObject *object)
+get_property (GObject *object, guint prop_id,
+              GValue *value, GParamSpec *pspec)
 {
-	NMSettingWimaxPrivate *priv = NM_SETTING_WIMAX_GET_PRIVATE (object);
-
-	g_free (priv->network_name);
-	g_free (priv->mac_address);
+	NMSettingWimax *setting = NM_SETTING_WIMAX (object);
 
-	G_OBJECT_CLASS (nm_setting_wimax_parent_class)->finalize (object);
+	switch (prop_id) {
+	case PROP_NETWORK_NAME:
+		g_value_set_string (value, nm_setting_wimax_get_network_name (setting));
+		break;
+	case PROP_MAC_ADDRESS:
+		g_value_set_string (value, nm_setting_wimax_get_mac_address (setting));
+		break;
+	default:
+		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+		break;
+	}
 }
 
 static void
@@ -185,23 +176,37 @@ set_property (GObject *object, guint prop_id,
 	}
 }
 
+/*****************************************************************************/
+
 static void
-get_property (GObject *object, guint prop_id,
-              GValue *value, GParamSpec *pspec)
+nm_setting_wimax_init (NMSettingWimax *setting)
 {
-	NMSettingWimax *setting = NM_SETTING_WIMAX (object);
+}
 
-	switch (prop_id) {
-	case PROP_NETWORK_NAME:
-		g_value_set_string (value, nm_setting_wimax_get_network_name (setting));
-		break;
-	case PROP_MAC_ADDRESS:
-		g_value_set_string (value, nm_setting_wimax_get_mac_address (setting));
-		break;
-	default:
-		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-		break;
-	}
+/**
+ * nm_setting_wimax_new:
+ *
+ * Creates a new #NMSettingWimax object with default values.
+ *
+ * Returns: the new empty #NMSettingWimax object
+ *
+ * Deprecated: 1.2: WiMAX is no longer supported.
+ **/
+NMSetting *
+nm_setting_wimax_new (void)
+{
+	return (NMSetting *) g_object_new (NM_TYPE_SETTING_WIMAX, NULL);
+}
+
+static void
+finalize (GObject *object)
+{
+	NMSettingWimaxPrivate *priv = NM_SETTING_WIMAX_GET_PRIVATE (object);
+
+	g_free (priv->network_name);
+	g_free (priv->mac_address);
+
+	G_OBJECT_CLASS (nm_setting_wimax_parent_class)->finalize (object);
 }
 
 static void
@@ -213,8 +218,8 @@ nm_setting_wimax_class_init (NMSettingWimaxClass *klass)
 
 	g_type_class_add_private (klass, sizeof (NMSettingWimaxPrivate));
 
-	object_class->set_property = set_property;
 	object_class->get_property = get_property;
+	object_class->set_property = set_property;
 	object_class->finalize     = finalize;
 
 	setting_class->verify = verify;
@@ -227,12 +232,11 @@ nm_setting_wimax_class_init (NMSettingWimaxClass *klass)
 	 *
 	 * Deprecated: 1.2: WiMAX is no longer supported.
 	 **/
-	g_object_class_install_property
-		(object_class, PROP_NETWORK_NAME,
-		 g_param_spec_string (NM_SETTING_WIMAX_NETWORK_NAME, "", "",
-		                      NULL,
-		                      G_PARAM_READWRITE |
-		                      G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_NETWORK_NAME] =
+	    g_param_spec_string (NM_SETTING_WIMAX_NETWORK_NAME, "", "",
+	                         NULL,
+	                         G_PARAM_READWRITE |
+	                         G_PARAM_STATIC_STRINGS);
 
 	/**
 	 * NMSettingWimax:mac-address:
@@ -243,20 +247,20 @@ nm_setting_wimax_class_init (NMSettingWimaxClass *klass)
 	 *
 	 * Deprecated: 1.2: WiMAX is no longer supported.
 	 **/
-	g_object_class_install_property
-		(object_class, PROP_MAC_ADDRESS,
-		 g_param_spec_string (NM_SETTING_WIMAX_MAC_ADDRESS, "", "",
-		                      NULL,
-		                      G_PARAM_READWRITE |
-		                      G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_MAC_ADDRESS] =
+	    g_param_spec_string (NM_SETTING_WIMAX_MAC_ADDRESS, "", "",
+	                         NULL,
+	                         G_PARAM_READWRITE |
+	                         G_PARAM_STATIC_STRINGS);
 
 	_properties_override_add_transform (properties_override,
-	                                    g_object_class_find_property (G_OBJECT_CLASS (setting_class),
-	                                                                  NM_SETTING_WIMAX_MAC_ADDRESS),
+	                                    obj_properties[PROP_MAC_ADDRESS],
 	                                    G_VARIANT_TYPE_BYTESTRING,
 	                                    _nm_utils_hwaddr_to_dbus,
 	                                    _nm_utils_hwaddr_from_dbus);
 
+	g_object_class_install_properties (object_class, _PROPERTY_ENUMS_LAST, obj_properties);
+
 	_nm_setting_class_commit_full (setting_class, NM_META_SETTING_TYPE_WIMAX,
 	                               NULL, properties_override);
 }
diff --git a/libnm-core/nm-setting-wired.c b/libnm-core/nm-setting-wired.c
index baa40cc4..ef23294f 100644
--- a/libnm-core/nm-setting-wired.c
+++ b/libnm-core/nm-setting-wired.c
@@ -24,7 +24,6 @@
 
 #include "nm-setting-wired.h"
 
-#include 
 #include 
 
 #include "nm-utils.h"
@@ -40,9 +39,29 @@
  * necessary for connection to Ethernet networks.
  **/
 
-G_DEFINE_TYPE (NMSettingWired, nm_setting_wired, NM_TYPE_SETTING)
+/*****************************************************************************/
 
-#define NM_SETTING_WIRED_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_SETTING_WIRED, NMSettingWiredPrivate))
+G_STATIC_ASSERT (NM_SETTING_WIRED_WAKE_ON_LAN_EXCLUSIVE_FLAGS == (  NM_SETTING_WIRED_WAKE_ON_LAN_DEFAULT
+                                                                  | NM_SETTING_WIRED_WAKE_ON_LAN_IGNORE));
+
+/*****************************************************************************/
+
+NM_GOBJECT_PROPERTIES_DEFINE (NMSettingWired,
+	PROP_PORT,
+	PROP_SPEED,
+	PROP_DUPLEX,
+	PROP_AUTO_NEGOTIATE,
+	PROP_MAC_ADDRESS,
+	PROP_CLONED_MAC_ADDRESS,
+	PROP_GENERATE_MAC_ADDRESS_MASK,
+	PROP_MAC_ADDRESS_BLACKLIST,
+	PROP_MTU,
+	PROP_S390_SUBCHANNELS,
+	PROP_S390_NETTYPE,
+	PROP_S390_OPTIONS,
+	PROP_WAKE_ON_LAN,
+	PROP_WAKE_ON_LAN_PASSWORD,
+);
 
 typedef struct {
 	char *port;
@@ -61,25 +80,11 @@ typedef struct {
 	char *wol_password;
 } NMSettingWiredPrivate;
 
-enum {
-	PROP_0,
-	PROP_PORT,
-	PROP_SPEED,
-	PROP_DUPLEX,
-	PROP_AUTO_NEGOTIATE,
-	PROP_MAC_ADDRESS,
-	PROP_CLONED_MAC_ADDRESS,
-	PROP_GENERATE_MAC_ADDRESS_MASK,
-	PROP_MAC_ADDRESS_BLACKLIST,
-	PROP_MTU,
-	PROP_S390_SUBCHANNELS,
-	PROP_S390_NETTYPE,
-	PROP_S390_OPTIONS,
-	PROP_WAKE_ON_LAN,
-	PROP_WAKE_ON_LAN_PASSWORD,
+G_DEFINE_TYPE (NMSettingWired, nm_setting_wired, NM_TYPE_SETTING)
 
-	LAST_PROP
-};
+#define NM_SETTING_WIRED_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_SETTING_WIRED, NMSettingWiredPrivate))
+
+/*****************************************************************************/
 
 static const char *valid_s390_opts[] = {
 	"portno", "layer2", "portname", "protocol", "priority_queueing",
@@ -91,19 +96,6 @@ static const char *valid_s390_opts[] = {
 	NULL
 };
 
-/**
- * nm_setting_wired_new:
- *
- * Creates a new #NMSettingWired object with default values.
- *
- * Returns: (transfer full): the new empty #NMSettingWired object
- **/
-NMSetting *
-nm_setting_wired_new (void)
-{
-	return (NMSetting *) g_object_new (NM_TYPE_SETTING_WIRED, NULL);
-}
-
 /**
  * nm_setting_wired_get_port:
  * @setting: the #NMSettingWired
@@ -288,7 +280,7 @@ nm_setting_wired_add_mac_blacklist_item (NMSettingWired *setting, const char *ma
 
 	mac = nm_utils_hwaddr_canonical (mac, ETH_ALEN);
 	g_array_append_val (priv->mac_address_blacklist, mac);
-	g_object_notify (G_OBJECT (setting), NM_SETTING_WIRED_MAC_ADDRESS_BLACKLIST);
+	_notify (setting, PROP_MAC_ADDRESS_BLACKLIST);
 	return TRUE;
 }
 
@@ -310,7 +302,7 @@ nm_setting_wired_remove_mac_blacklist_item (NMSettingWired *setting, guint32 idx
 	g_return_if_fail (idx < priv->mac_address_blacklist->len);
 
 	g_array_remove_index (priv->mac_address_blacklist, idx);
-	g_object_notify (G_OBJECT (setting), NM_SETTING_WIRED_MAC_ADDRESS_BLACKLIST);
+	_notify (setting, PROP_MAC_ADDRESS_BLACKLIST);
 }
 
 /**
@@ -338,7 +330,7 @@ nm_setting_wired_remove_mac_blacklist_item_by_value (NMSettingWired *setting, co
 		candidate = g_array_index (priv->mac_address_blacklist, char *, i);
 		if (!nm_utils_hwaddr_matches (mac, -1, candidate, -1)) {
 			g_array_remove_index (priv->mac_address_blacklist, i);
-			g_object_notify (G_OBJECT (setting), NM_SETTING_WIRED_MAC_ADDRESS_BLACKLIST);
+			_notify (setting, PROP_MAC_ADDRESS_BLACKLIST);
 			return TRUE;
 		}
 	}
@@ -357,7 +349,7 @@ nm_setting_wired_clear_mac_blacklist_items (NMSettingWired *setting)
 	g_return_if_fail (NM_IS_SETTING_WIRED (setting));
 
 	g_array_set_size (NM_SETTING_WIRED_GET_PRIVATE (setting)->mac_address_blacklist, 0);
-	g_object_notify (G_OBJECT (setting), NM_SETTING_WIRED_MAC_ADDRESS_BLACKLIST);
+	_notify (setting, PROP_MAC_ADDRESS_BLACKLIST);
 }
 
 /**
@@ -530,7 +522,7 @@ nm_setting_wired_add_s390_option (NMSettingWired *setting,
 	g_hash_table_insert (NM_SETTING_WIRED_GET_PRIVATE (setting)->s390_options,
 	                     g_strdup (key),
 	                     g_strdup (value));
-	g_object_notify (G_OBJECT (setting), NM_SETTING_WIRED_S390_OPTIONS);
+	_notify (setting, PROP_S390_OPTIONS);
 	return TRUE;
 }
 
@@ -557,7 +549,7 @@ nm_setting_wired_remove_s390_option (NMSettingWired *setting,
 
 	found = g_hash_table_remove (NM_SETTING_WIRED_GET_PRIVATE (setting)->s390_options, key);
 	if (found)
-		g_object_notify (G_OBJECT (setting), NM_SETTING_WIRED_S390_OPTIONS);
+		_notify (setting, PROP_S390_OPTIONS);
 	return found;
 }
 
@@ -775,21 +767,25 @@ verify (NMSetting *setting, NMConnection *connection, GError **error)
 	return TRUE;
 }
 
-static gboolean
-compare_property (NMSetting *setting,
+static NMTernary
+compare_property (const NMSettInfoSetting *sett_info,
+                  guint property_idx,
+                  NMSetting *setting,
                   NMSetting *other,
-                  const GParamSpec *prop_spec,
                   NMSettingCompareFlags flags)
 {
-	NMSettingClass *setting_class;
 
-	if (nm_streq (prop_spec->name, NM_SETTING_WIRED_CLONED_MAC_ADDRESS)) {
-		return nm_streq0 (NM_SETTING_WIRED_GET_PRIVATE (setting)->cloned_mac_address,
-		                  NM_SETTING_WIRED_GET_PRIVATE (other)->cloned_mac_address);
+	if (nm_streq (sett_info->property_infos[property_idx].name, NM_SETTING_WIRED_CLONED_MAC_ADDRESS)) {
+		return    !other
+		       || nm_streq0 (NM_SETTING_WIRED_GET_PRIVATE (setting)->cloned_mac_address,
+		                     NM_SETTING_WIRED_GET_PRIVATE (other)->cloned_mac_address);
 	}
 
-	setting_class = NM_SETTING_CLASS (nm_setting_wired_parent_class);
-	return setting_class->compare_property (setting, other, prop_spec, flags);
+	return NM_SETTING_CLASS (nm_setting_wired_parent_class)->compare_property (sett_info,
+	                                                                           property_idx,
+	                                                                           setting,
+	                                                                           other,
+	                                                                           flags);
 }
 
 static GVariant *
@@ -806,40 +802,62 @@ clear_blacklist_item (char **item_p)
 	g_free (*item_p);
 }
 
-static void
-nm_setting_wired_init (NMSettingWired *setting)
-{
-	NMSettingWiredPrivate *priv = NM_SETTING_WIRED_GET_PRIVATE (setting);
-
-	priv->s390_options = g_hash_table_new_full (nm_str_hash, g_str_equal, g_free, g_free);
-
-	/* We use GArray rather than GPtrArray so it will automatically be NULL-terminated */
-	priv->mac_address_blacklist = g_array_new (TRUE, FALSE, sizeof (char *));
-	g_array_set_clear_func (priv->mac_address_blacklist, (GDestroyNotify) clear_blacklist_item);
-}
+/*****************************************************************************/
 
 static void
-finalize (GObject *object)
+get_property (GObject *object, guint prop_id,
+              GValue *value, GParamSpec *pspec)
 {
-	NMSettingWiredPrivate *priv = NM_SETTING_WIRED_GET_PRIVATE (object);
-
-	g_free (priv->port);
-	g_free (priv->duplex);
-	g_free (priv->s390_nettype);
-
-	g_hash_table_destroy (priv->s390_options);
-
-	g_free (priv->device_mac_address);
-	g_free (priv->cloned_mac_address);
-	g_free (priv->generate_mac_address_mask);
-	g_array_unref (priv->mac_address_blacklist);
-
-	if (priv->s390_subchannels)
-		g_strfreev (priv->s390_subchannels);
-
-	g_free (priv->wol_password);
+	NMSettingWired *setting = NM_SETTING_WIRED (object);
+	NMSettingWiredPrivate *priv = NM_SETTING_WIRED_GET_PRIVATE (setting);
 
-	G_OBJECT_CLASS (nm_setting_wired_parent_class)->finalize (object);
+	switch (prop_id) {
+	case PROP_PORT:
+		g_value_set_string (value, nm_setting_wired_get_port (setting));
+		break;
+	case PROP_SPEED:
+		g_value_set_uint (value, nm_setting_wired_get_speed (setting));
+		break;
+	case PROP_DUPLEX:
+		g_value_set_string (value, nm_setting_wired_get_duplex (setting));
+		break;
+	case PROP_AUTO_NEGOTIATE:
+		g_value_set_boolean (value, nm_setting_wired_get_auto_negotiate (setting));
+		break;
+	case PROP_MAC_ADDRESS:
+		g_value_set_string (value, nm_setting_wired_get_mac_address (setting));
+		break;
+	case PROP_CLONED_MAC_ADDRESS:
+		g_value_set_string (value, nm_setting_wired_get_cloned_mac_address (setting));
+		break;
+	case PROP_GENERATE_MAC_ADDRESS_MASK:
+		g_value_set_string (value, nm_setting_wired_get_generate_mac_address_mask (setting));
+		break;
+	case PROP_MAC_ADDRESS_BLACKLIST:
+		g_value_set_boxed (value, (char **) priv->mac_address_blacklist->data);
+		break;
+	case PROP_MTU:
+		g_value_set_uint (value, nm_setting_wired_get_mtu (setting));
+		break;
+	case PROP_S390_SUBCHANNELS:
+		g_value_set_boxed (value, priv->s390_subchannels);
+		break;
+	case PROP_S390_NETTYPE:
+		g_value_set_string (value, nm_setting_wired_get_s390_nettype (setting));
+		break;
+	case PROP_S390_OPTIONS:
+		g_value_take_boxed (value, _nm_utils_copy_strdict (priv->s390_options));
+		break;
+	case PROP_WAKE_ON_LAN:
+		g_value_set_uint (value, priv->wol);
+		break;
+	case PROP_WAKE_ON_LAN_PASSWORD:
+		g_value_set_string (value, priv->wol_password);
+		break;
+	default:
+		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+		break;
+	}
 }
 
 static void
@@ -919,60 +937,55 @@ set_property (GObject *object, guint prop_id,
 	}
 }
 
+/*****************************************************************************/
+
 static void
-get_property (GObject *object, guint prop_id,
-              GValue *value, GParamSpec *pspec)
+nm_setting_wired_init (NMSettingWired *setting)
 {
-	NMSettingWired *setting = NM_SETTING_WIRED (object);
 	NMSettingWiredPrivate *priv = NM_SETTING_WIRED_GET_PRIVATE (setting);
 
-	switch (prop_id) {
-	case PROP_PORT:
-		g_value_set_string (value, nm_setting_wired_get_port (setting));
-		break;
-	case PROP_SPEED:
-		g_value_set_uint (value, nm_setting_wired_get_speed (setting));
-		break;
-	case PROP_DUPLEX:
-		g_value_set_string (value, nm_setting_wired_get_duplex (setting));
-		break;
-	case PROP_AUTO_NEGOTIATE:
-		g_value_set_boolean (value, nm_setting_wired_get_auto_negotiate (setting));
-		break;
-	case PROP_MAC_ADDRESS:
-		g_value_set_string (value, nm_setting_wired_get_mac_address (setting));
-		break;
-	case PROP_CLONED_MAC_ADDRESS:
-		g_value_set_string (value, nm_setting_wired_get_cloned_mac_address (setting));
-		break;
-	case PROP_GENERATE_MAC_ADDRESS_MASK:
-		g_value_set_string (value, nm_setting_wired_get_generate_mac_address_mask (setting));
-		break;
-	case PROP_MAC_ADDRESS_BLACKLIST:
-		g_value_set_boxed (value, (char **) priv->mac_address_blacklist->data);
-		break;
-	case PROP_MTU:
-		g_value_set_uint (value, nm_setting_wired_get_mtu (setting));
-		break;
-	case PROP_S390_SUBCHANNELS:
-		g_value_set_boxed (value, priv->s390_subchannels);
-		break;
-	case PROP_S390_NETTYPE:
-		g_value_set_string (value, nm_setting_wired_get_s390_nettype (setting));
-		break;
-	case PROP_S390_OPTIONS:
-		g_value_take_boxed (value, _nm_utils_copy_strdict (priv->s390_options));
-		break;
-	case PROP_WAKE_ON_LAN:
-		g_value_set_uint (value, priv->wol);
-		break;
-	case PROP_WAKE_ON_LAN_PASSWORD:
-		g_value_set_string (value, priv->wol_password);
-		break;
-	default:
-		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-		break;
-	}
+	priv->s390_options = g_hash_table_new_full (nm_str_hash, g_str_equal, g_free, g_free);
+
+	/* We use GArray rather than GPtrArray so it will automatically be NULL-terminated */
+	priv->mac_address_blacklist = g_array_new (TRUE, FALSE, sizeof (char *));
+	g_array_set_clear_func (priv->mac_address_blacklist, (GDestroyNotify) clear_blacklist_item);
+}
+
+/**
+ * nm_setting_wired_new:
+ *
+ * Creates a new #NMSettingWired object with default values.
+ *
+ * Returns: (transfer full): the new empty #NMSettingWired object
+ **/
+NMSetting *
+nm_setting_wired_new (void)
+{
+	return (NMSetting *) g_object_new (NM_TYPE_SETTING_WIRED, NULL);
+}
+
+static void
+finalize (GObject *object)
+{
+	NMSettingWiredPrivate *priv = NM_SETTING_WIRED_GET_PRIVATE (object);
+
+	g_free (priv->port);
+	g_free (priv->duplex);
+	g_free (priv->s390_nettype);
+
+	g_hash_table_destroy (priv->s390_options);
+
+	g_free (priv->device_mac_address);
+	g_free (priv->cloned_mac_address);
+	g_free (priv->generate_mac_address_mask);
+	g_array_unref (priv->mac_address_blacklist);
+
+	if (priv->s390_subchannels)
+		g_strfreev (priv->s390_subchannels);
+
+	g_free (priv->wol_password);
+
+	G_OBJECT_CLASS (nm_setting_wired_parent_class)->finalize (object);
 }
 
 static void
@@ -984,8 +997,8 @@ nm_setting_wired_class_init (NMSettingWiredClass *klass)
 
 	g_type_class_add_private (klass, sizeof (NMSettingWiredPrivate));
 
-	object_class->set_property = set_property;
 	object_class->get_property = get_property;
+	object_class->set_property = set_property;
 	object_class->finalize     = finalize;
 
 	setting_class->verify           = verify;
@@ -1005,12 +1018,11 @@ nm_setting_wired_class_init (NMSettingWiredClass *klass)
 	 * description: The property is not saved by the plugin.
 	 * ---end---
 	 */
-	g_object_class_install_property
-		(object_class, PROP_PORT,
-		 g_param_spec_string (NM_SETTING_WIRED_PORT, "", "",
-		                      NULL,
-		                      G_PARAM_READWRITE |
-		                      G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_PORT] =
+	    g_param_spec_string (NM_SETTING_WIRED_PORT, "", "",
+	                         NULL,
+	                         G_PARAM_READWRITE |
+	                         G_PARAM_STATIC_STRINGS);
 
 	/**
 	 * NMSettingWired:speed:
@@ -1036,13 +1048,12 @@ nm_setting_wired_class_init (NMSettingWiredClass *klass)
 	 *    parameter in the ETHTOOL_OPTS variable.
 	 * ---end---
 	 */
-	g_object_class_install_property
-		(object_class, PROP_SPEED,
-		 g_param_spec_uint (NM_SETTING_WIRED_SPEED, "", "",
-		                    0, G_MAXUINT32, 0,
-		                    G_PARAM_READWRITE |
-		                    G_PARAM_CONSTRUCT |
-		                    G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_SPEED] =
+	    g_param_spec_uint (NM_SETTING_WIRED_SPEED, "", "",
+	                       0, G_MAXUINT32, 0,
+	                       G_PARAM_READWRITE |
+	                       G_PARAM_CONSTRUCT |
+	                       G_PARAM_STATIC_STRINGS);
 
 	/**
 	 * NMSettingWired:duplex:
@@ -1067,12 +1078,11 @@ nm_setting_wired_class_init (NMSettingWiredClass *klass)
 	 *    "duplex" parameter in the ETHOOL_OPTS variable.
 	 * ---end---
 	 */
-	g_object_class_install_property
-		(object_class, PROP_DUPLEX,
-		 g_param_spec_string (NM_SETTING_WIRED_DUPLEX, "", "",
-		                      NULL,
-		                      G_PARAM_READWRITE |
-		                      G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_DUPLEX] =
+	    g_param_spec_string (NM_SETTING_WIRED_DUPLEX, "", "",
+	                         NULL,
+	                         G_PARAM_READWRITE |
+	                         G_PARAM_STATIC_STRINGS);
 
 	/**
 	 * NMSettingWired:auto-negotiate:
@@ -1094,17 +1104,15 @@ nm_setting_wired_class_init (NMSettingWiredClass *klass)
 	 *    "speed" and "duplex" parameters (skips link configuration).
 	 * ---end---
 	 */
-	g_object_class_install_property
-		(object_class, PROP_AUTO_NEGOTIATE,
-		 g_param_spec_boolean (NM_SETTING_WIRED_AUTO_NEGOTIATE, "", "",
-		                       FALSE,
-		                       G_PARAM_READWRITE |
-		                       G_PARAM_CONSTRUCT |
-		                       G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_AUTO_NEGOTIATE] =
+	    g_param_spec_boolean (NM_SETTING_WIRED_AUTO_NEGOTIATE, "", "",
+	                          FALSE,
+	                          G_PARAM_READWRITE |
+	                          G_PARAM_CONSTRUCT |
+	                          G_PARAM_STATIC_STRINGS);
 
 	_properties_override_add_override (properties_override,
-	                                   g_object_class_find_property (G_OBJECT_CLASS (setting_class),
-	                                                                 NM_SETTING_WIRED_AUTO_NEGOTIATE),
+	                                   obj_properties[PROP_AUTO_NEGOTIATE],
 	                                   G_VARIANT_TYPE_BOOLEAN,
 	                                   _override_autoneg_get,
 	                                   NULL,
@@ -1134,17 +1142,15 @@ nm_setting_wired_class_init (NMSettingWiredClass *klass)
 	 *    permanent MAC address exists, the MAC address initially configured on the device.
 	 * ---end---
 	 */
-	g_object_class_install_property
-		(object_class, PROP_MAC_ADDRESS,
-		 g_param_spec_string (NM_SETTING_WIRED_MAC_ADDRESS, "", "",
-		                      NULL,
-		                      G_PARAM_READWRITE |
-		                      NM_SETTING_PARAM_INFERRABLE |
-		                      G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_MAC_ADDRESS] =
+	    g_param_spec_string (NM_SETTING_WIRED_MAC_ADDRESS, "", "",
+	                         NULL,
+	                         G_PARAM_READWRITE |
+	                         NM_SETTING_PARAM_INFERRABLE |
+	                         G_PARAM_STATIC_STRINGS);
 
 	_properties_override_add_transform (properties_override,
-	                                    g_object_class_find_property (G_OBJECT_CLASS (setting_class),
-	                                                                  NM_SETTING_WIRED_MAC_ADDRESS),
+	                                    obj_properties[PROP_MAC_ADDRESS],
 	                                    G_VARIANT_TYPE_BYTESTRING,
 	                                    _nm_utils_hwaddr_to_dbus,
 	                                    _nm_utils_hwaddr_from_dbus);
@@ -1192,17 +1198,15 @@ nm_setting_wired_class_init (NMSettingWiredClass *klass)
 	 *    For libnm and nmcli, this field is called "cloned-mac-address".
 	 * ---end---
 	 */
-	g_object_class_install_property
-		(object_class, PROP_CLONED_MAC_ADDRESS,
-		 g_param_spec_string (NM_SETTING_WIRED_CLONED_MAC_ADDRESS, "", "",
-		                      NULL,
-		                      G_PARAM_READWRITE |
-		                      NM_SETTING_PARAM_INFERRABLE |
-		                      G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_CLONED_MAC_ADDRESS] =
+	    g_param_spec_string (NM_SETTING_WIRED_CLONED_MAC_ADDRESS, "", "",
+	                         NULL,
+	                         G_PARAM_READWRITE |
+	                         NM_SETTING_PARAM_INFERRABLE |
+	                         G_PARAM_STATIC_STRINGS);
 
 	_properties_override_add_override (properties_override,
-	                                     g_object_class_find_property (G_OBJECT_CLASS (setting_class),
-	                                                                   NM_SETTING_WIRED_CLONED_MAC_ADDRESS),
+	                                     obj_properties[PROP_CLONED_MAC_ADDRESS],
 	                                     G_VARIANT_TYPE_BYTESTRING,
 	                                     _nm_utils_hwaddr_cloned_get,
 	                                     _nm_utils_hwaddr_cloned_set,
@@ -1215,7 +1219,7 @@ nm_setting_wired_class_init (NMSettingWiredClass *klass)
 	 *   a hardware address in ASCII representation, or one of the special values
 	 *   "preserve", "permanent", "random" or "stable".
 	 *   This field replaces the deprecated "cloned-mac-address" on D-Bus, which
-	 *   can only contain explict hardware addresses. Note that this property
+	 *   can only contain explicit hardware addresses. Note that this property
 	 *   only exists in D-Bus API. libnm and nmcli continue to call this property
 	 *   "cloned-mac-address".
 	 * ---end---
@@ -1265,13 +1269,12 @@ nm_setting_wired_class_init (NMSettingWiredClass *klass)
 	 *   cloned-mac-address.
 	 * ---end---
 	 */
-	g_object_class_install_property
-	    (object_class, PROP_GENERATE_MAC_ADDRESS_MASK,
+	obj_properties[PROP_GENERATE_MAC_ADDRESS_MASK] =
 	     g_param_spec_string (NM_SETTING_WIRED_GENERATE_MAC_ADDRESS_MASK, "", "",
 	                          NULL,
 	                          G_PARAM_READWRITE |
 	                          NM_SETTING_PARAM_FUZZY_IGNORE |
-	                          G_PARAM_STATIC_STRINGS));
+	                          G_PARAM_STATIC_STRINGS);
 
 	/**
 	 * NMSettingWired:mac-address-blacklist:
@@ -1295,13 +1298,12 @@ nm_setting_wired_class_init (NMSettingWiredClass *klass)
 	 * example: HWADDR_BLACKLIST="00:22:68:11:69:08 00:11:22:11:44:55"
 	 * ---end---
 	 */
-	g_object_class_install_property
-		(object_class, PROP_MAC_ADDRESS_BLACKLIST,
-		 g_param_spec_boxed (NM_SETTING_WIRED_MAC_ADDRESS_BLACKLIST, "", "",
-		                     G_TYPE_STRV,
-		                     G_PARAM_READWRITE |
-		                     NM_SETTING_PARAM_FUZZY_IGNORE |
-		                     G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_MAC_ADDRESS_BLACKLIST] =
+	    g_param_spec_boxed (NM_SETTING_WIRED_MAC_ADDRESS_BLACKLIST, "", "",
+	                        G_TYPE_STRV,
+	                        G_PARAM_READWRITE |
+	                        NM_SETTING_PARAM_FUZZY_IGNORE |
+	                        G_PARAM_STATIC_STRINGS);
 
 	/**
 	 * NMSettingWired:mtu:
@@ -1315,14 +1317,13 @@ nm_setting_wired_class_init (NMSettingWiredClass *klass)
 	 * description: MTU of the interface.
 	 * ---end---
 	 */
-	g_object_class_install_property
-		(object_class, PROP_MTU,
-		 g_param_spec_uint (NM_SETTING_WIRED_MTU, "", "",
-		                    0, G_MAXUINT32, 0,
-		                    G_PARAM_READWRITE |
-		                    G_PARAM_CONSTRUCT |
-		                    NM_SETTING_PARAM_FUZZY_IGNORE |
-		                    G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_MTU] =
+	    g_param_spec_uint (NM_SETTING_WIRED_MTU, "", "",
+	                       0, G_MAXUINT32, 0,
+	                       G_PARAM_READWRITE |
+	                       G_PARAM_CONSTRUCT |
+	                       NM_SETTING_PARAM_FUZZY_IGNORE |
+	                       G_PARAM_STATIC_STRINGS);
 
 	/**
 	 * NMSettingWired:s390-subchannels:
@@ -1342,13 +1343,12 @@ nm_setting_wired_class_init (NMSettingWiredClass *klass)
 	 * example: SUBCHANNELS=0.0.b00a,0.0.b00b,0.0.b00c
 	 * ---end---
 	 */
-	g_object_class_install_property
-		(object_class, PROP_S390_SUBCHANNELS,
-		 g_param_spec_boxed (NM_SETTING_WIRED_S390_SUBCHANNELS, "", "",
-		                     G_TYPE_STRV,
-		                     G_PARAM_READWRITE |
-		                     NM_SETTING_PARAM_INFERRABLE |
-		                     G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_S390_SUBCHANNELS] =
+	    g_param_spec_boxed (NM_SETTING_WIRED_S390_SUBCHANNELS, "", "",
+	                        G_TYPE_STRV,
+	                        G_PARAM_READWRITE |
+	                        NM_SETTING_PARAM_INFERRABLE |
+	                        G_PARAM_STATIC_STRINGS);
 
 	/**
 	 * NMSettingWired:s390-nettype:
@@ -1364,13 +1364,12 @@ nm_setting_wired_class_init (NMSettingWiredClass *klass)
 	 * example: NETTYPE=qeth
 	 * ---end---
 	 */
-	g_object_class_install_property
-		(object_class, PROP_S390_NETTYPE,
-		 g_param_spec_string (NM_SETTING_WIRED_S390_NETTYPE, "", "",
-		                      NULL,
-		                      G_PARAM_READWRITE |
-		                      NM_SETTING_PARAM_INFERRABLE |
-		                      G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_S390_NETTYPE] =
+	    g_param_spec_string (NM_SETTING_WIRED_S390_NETTYPE, "", "",
+	                         NULL,
+	                         G_PARAM_READWRITE |
+	                         NM_SETTING_PARAM_INFERRABLE |
+	                         G_PARAM_STATIC_STRINGS);
 
 	/**
 	 * NMSettingWired:s390-options: (type GHashTable(utf8,utf8)):
@@ -1387,17 +1386,15 @@ nm_setting_wired_class_init (NMSettingWiredClass *klass)
 	 *   "portname" and "ctcprot" that have their own variables.
 	 * ---end---
 	 */
-	g_object_class_install_property
-		(object_class, PROP_S390_OPTIONS,
-		 g_param_spec_boxed (NM_SETTING_WIRED_S390_OPTIONS, "", "",
-		                     G_TYPE_HASH_TABLE,
-		                     G_PARAM_READWRITE |
-		                     NM_SETTING_PARAM_INFERRABLE |
-		                     G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_S390_OPTIONS] =
+	    g_param_spec_boxed (NM_SETTING_WIRED_S390_OPTIONS, "", "",
+	                        G_TYPE_HASH_TABLE,
+	                        G_PARAM_READWRITE |
+	                        NM_SETTING_PARAM_INFERRABLE |
+	                        G_PARAM_STATIC_STRINGS);
 
 	_properties_override_add_transform (properties_override,
-	                                    g_object_class_find_property (G_OBJECT_CLASS (setting_class),
-	                                                                  NM_SETTING_WIRED_S390_OPTIONS),
+	                                    obj_properties[PROP_S390_OPTIONS],
 	                                    G_VARIANT_TYPE ("a{ss}"),
 	                                    _nm_utils_strdict_to_dbus,
 	                                    _nm_utils_strdict_from_dbus);
@@ -1416,13 +1413,12 @@ nm_setting_wired_class_init (NMSettingWiredClass *klass)
 	 *
 	 * Since: 1.2
 	 **/
-	g_object_class_install_property
-		(object_class, PROP_WAKE_ON_LAN,
-		 g_param_spec_uint (NM_SETTING_WIRED_WAKE_ON_LAN, "", "",
-		                    0, G_MAXUINT32, NM_SETTING_WIRED_WAKE_ON_LAN_DEFAULT,
-		                    G_PARAM_CONSTRUCT |
-		                    G_PARAM_READWRITE |
-		                    G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_WAKE_ON_LAN] =
+	    g_param_spec_uint (NM_SETTING_WIRED_WAKE_ON_LAN, "", "",
+	                       0, G_MAXUINT32, NM_SETTING_WIRED_WAKE_ON_LAN_DEFAULT,
+	                       G_PARAM_CONSTRUCT |
+	                       G_PARAM_READWRITE |
+	                       G_PARAM_STATIC_STRINGS);
 
 	/**
 	 * NMSettingWired:wake-on-lan-password:
@@ -1433,12 +1429,13 @@ nm_setting_wired_class_init (NMSettingWiredClass *klass)
 	 *
 	 * Since: 1.2
 	 **/
-	g_object_class_install_property
-		(object_class, PROP_WAKE_ON_LAN_PASSWORD,
-		 g_param_spec_string (NM_SETTING_WIRED_WAKE_ON_LAN_PASSWORD, "", "",
-		                      NULL,
-		                      G_PARAM_READWRITE |
-		                      G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_WAKE_ON_LAN_PASSWORD] =
+	    g_param_spec_string (NM_SETTING_WIRED_WAKE_ON_LAN_PASSWORD, "", "",
+	                         NULL,
+	                         G_PARAM_READWRITE |
+	                         G_PARAM_STATIC_STRINGS);
+
+	g_object_class_install_properties (object_class, _PROPERTY_ENUMS_LAST, obj_properties);
 
 	_nm_setting_class_commit_full (setting_class, NM_META_SETTING_TYPE_WIRED,
 	                               NULL, properties_override);
diff --git a/libnm-core/nm-setting-wired.h b/libnm-core/nm-setting-wired.h
index 015f09da..8e707b1b 100644
--- a/libnm-core/nm-setting-wired.h
+++ b/libnm-core/nm-setting-wired.h
@@ -63,20 +63,19 @@ G_BEGIN_DECLS
  * Since: 1.2
  */
 typedef enum { /*< flags >*/
-	NM_SETTING_WIRED_WAKE_ON_LAN_NONE      = 0, /*< skip >*/
-	NM_SETTING_WIRED_WAKE_ON_LAN_PHY       = (1 << 1),
-	NM_SETTING_WIRED_WAKE_ON_LAN_UNICAST   = (1 << 2),
-	NM_SETTING_WIRED_WAKE_ON_LAN_MULTICAST = (1 << 3),
-	NM_SETTING_WIRED_WAKE_ON_LAN_BROADCAST = (1 << 4),
-	NM_SETTING_WIRED_WAKE_ON_LAN_ARP       = (1 << 5),
-	NM_SETTING_WIRED_WAKE_ON_LAN_MAGIC     = (1 << 6),
-
-	_NM_SETTING_WIRED_WAKE_ON_LAN_LAST_OPT, /*< skip >*/
-	NM_SETTING_WIRED_WAKE_ON_LAN_ALL       = (((_NM_SETTING_WIRED_WAKE_ON_LAN_LAST_OPT - 1) << 1) - 1) - (1 << 0 /*DEFAULT*/), /*< skip >*/
-
-	NM_SETTING_WIRED_WAKE_ON_LAN_DEFAULT   = (1 << 0),
-	NM_SETTING_WIRED_WAKE_ON_LAN_IGNORE    = (1 << 15),
-	NM_SETTING_WIRED_WAKE_ON_LAN_EXCLUSIVE_FLAGS = NM_SETTING_WIRED_WAKE_ON_LAN_DEFAULT | NM_SETTING_WIRED_WAKE_ON_LAN_IGNORE, /*< skip >*/
+	NM_SETTING_WIRED_WAKE_ON_LAN_NONE            = 0, /*< skip >*/
+	NM_SETTING_WIRED_WAKE_ON_LAN_PHY             = 0x2,
+	NM_SETTING_WIRED_WAKE_ON_LAN_UNICAST         = 0x4,
+	NM_SETTING_WIRED_WAKE_ON_LAN_MULTICAST       = 0x8,
+	NM_SETTING_WIRED_WAKE_ON_LAN_BROADCAST       = 0x10,
+	NM_SETTING_WIRED_WAKE_ON_LAN_ARP             = 0x20,
+	NM_SETTING_WIRED_WAKE_ON_LAN_MAGIC           = 0x40,
+
+	NM_SETTING_WIRED_WAKE_ON_LAN_ALL             = 0x7E, /*< skip >*/
+
+	NM_SETTING_WIRED_WAKE_ON_LAN_DEFAULT         = 0x1,
+	NM_SETTING_WIRED_WAKE_ON_LAN_IGNORE          = 0x8000,
+	NM_SETTING_WIRED_WAKE_ON_LAN_EXCLUSIVE_FLAGS = 0x8001, /*< skip >*/
 } NMSettingWiredWakeOnLan;
 
 #define NM_SETTING_WIRED_PORT "port"
diff --git a/libnm-core/nm-setting-wireguard.c b/libnm-core/nm-setting-wireguard.c
new file mode 100644
index 00000000..8c5b25a5
--- /dev/null
+++ b/libnm-core/nm-setting-wireguard.c
@@ -0,0 +1,2499 @@
+/*
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301 USA.
+ *
+ * Copyright 2018 - 2019 Red Hat, Inc.
+ */
+
+#include "nm-default.h"
+
+#include "nm-setting-wireguard.h"
+
+#include "nm-setting-private.h"
+#include "nm-utils-private.h"
+#include "nm-connection-private.h"
+#include "nm-utils/nm-secret-utils.h"
+
+/*****************************************************************************/
+
+/**
+ * SECTION:nm-setting-wireguard
+ * @short_description: Describes connection properties for wireguard related options
+ *
+ * The #NMSettingWireGuard object is a #NMSetting subclass that contains settings
+ * for configuring WireGuard.
+ **/
+
+/*****************************************************************************/
+
+static NMWireGuardPeer *_wireguard_peer_dup (const NMWireGuardPeer *self);
+
+G_DEFINE_BOXED_TYPE (NMWireGuardPeer, nm_wireguard_peer, _wireguard_peer_dup, nm_wireguard_peer_unref)
+
+/* NMWireGuardPeer can also track invalid allowed-ip settings, and only reject
+ * them later during is_valid(). Such values are marked by a leading 'X' character
+ * in the @allowed_ips. It is expected, that such values are the expception, and
+ * commonly not present. */
+#define ALLOWED_IP_INVALID_X     'X'
+#define ALLOWED_IP_INVALID_X_STR "X"
+
+/**
+ * NMWireGuardPeer:
+ *
+ * The settings of one WireGuard peer.
+ *
+ * Since: 1.16
+ */
+struct _NMWireGuardPeer {
+	NMSockAddrEndpoint *endpoint;
+	char *public_key;
+	char *preshared_key;
+	GPtrArray *allowed_ips;
+	guint refcount;
+	NMSettingSecretFlags preshared_key_flags;
+	guint16 persistent_keepalive;
+	bool public_key_valid:1;
+	bool preshared_key_valid:1;
+	bool sealed:1;
+};
+
+static gboolean
+NM_IS_WIREGUARD_PEER (const NMWireGuardPeer *self, gboolean also_sealed)
+{
+	return    self
+	       && self->refcount > 0
+	       && (   also_sealed
+	           || !self->sealed);
+}
+
+/**
+ * nm_wireguard_peer_new:
+ *
+ * Returns: (transfer full): a new, default, unsealed #NMWireGuardPeer instance.
+ *
+ * Since: 1.16
+ */
+NMWireGuardPeer *
+nm_wireguard_peer_new (void)
+{
+	NMWireGuardPeer *self;
+
+	self = g_slice_new (NMWireGuardPeer);
+	*self = (NMWireGuardPeer) {
+		.refcount            = 1,
+		.preshared_key_flags = NM_SETTING_SECRET_FLAG_NOT_REQUIRED,
+	};
+	return self;
+}
+
+/**
+ * nm_wireguard_peer_new_clone:
+ * @self: the #NMWireGuardPeer instance to copy.
+ * @with_secrets: if %TRUE, the preshared-key secrets are copied
+ *  as well. Otherwise, they will be removed.
+ *
+ * Returns: (transfer full): a clone of @self. This instance
+ *   is always unsealed.
+ *
+ * Since: 1.16
+ */
+NMWireGuardPeer *
+nm_wireguard_peer_new_clone (const NMWireGuardPeer *self,
+                             gboolean with_secrets)
+{
+	NMWireGuardPeer *new;
+	guint i;
+
+	g_return_val_if_fail (NM_IS_WIREGUARD_PEER (self, TRUE), NULL);
+
+	new = g_slice_new (NMWireGuardPeer);
+	*new = (NMWireGuardPeer) {
+		.refcount             = 1,
+		.public_key           = g_strdup (self->public_key),
+		.public_key_valid     = self->public_key_valid,
+		.preshared_key        = with_secrets ? g_strdup (self->preshared_key) : NULL,
+		.preshared_key_valid  = self->preshared_key_valid,
+		.preshared_key_flags  = self->preshared_key_flags,
+		.endpoint             = nm_sock_addr_endpoint_ref (self->endpoint),
+		.persistent_keepalive = self->persistent_keepalive,
+	};
+	if (   self->allowed_ips
+	    && self->allowed_ips->len > 0) {
+		new->allowed_ips = g_ptr_array_new_full (self->allowed_ips->len,
+		                                         g_free);
+		for (i = 0; i < self->allowed_ips->len; i++) {
+			g_ptr_array_add (new->allowed_ips,
+			                 g_strdup (self->allowed_ips->pdata[i]));
+		}
+	}
+	return new;
+}
+
+/**
+ * nm_wireguard_peer_ref:
+ * @self: (allow-none): the #NMWireGuardPeer instance
+ *
+ * This is not thread-safe.
+ *
+ * Returns: returns the input argument @self after incrementing
+ *   the reference count.
+ *
+ * Since: 1.16
+ */
+NMWireGuardPeer *
+nm_wireguard_peer_ref (NMWireGuardPeer *self)
+{
+	if (!self)
+		return NULL;
+
+	g_return_val_if_fail (NM_IS_WIREGUARD_PEER (self, TRUE), NULL);
+
+	nm_assert (self->refcount < G_MAXUINT);
+
+	self->refcount++;
+	return self;
+}
+
+/**
+ * nm_wireguard_peer_unref:
+ * @self: (allow-none): the #NMWireGuardPeer instance
+ *
+ * Drop a reference to @self. If the last reference is dropped,
+ * the instance is freed and all accociate data released.
+ *
+ * This is not thread-safe.
+ *
+ * Since: 1.16
+ */
+void
+nm_wireguard_peer_unref (NMWireGuardPeer *self)
+{
+	if (!self)
+		return;
+
+	g_return_if_fail (NM_IS_WIREGUARD_PEER (self, TRUE));
+
+	if (--self->refcount > 0)
+		return;
+
+	nm_sock_addr_endpoint_unref (self->endpoint);
+	if (self->allowed_ips)
+		g_ptr_array_unref (self->allowed_ips);
+	g_free (self->public_key);
+	nm_free_secret (self->preshared_key);
+	g_slice_free (NMWireGuardPeer, self);
+}
+
+/**
+ * _wireguard_peer_dup:
+ * @self: the #NMWireGuardPeer instance
+ *
+ * Duplicates the #NMWireGuardPeer instance. Note that if @self
+ * is already sealed, this increments the reference count and
+ * returns it. If the instance is still unsealed, it is copied.
+ *
+ * Returns: (transfer full): a duplicate of @self, or (if the
+ *   instance is sealed and thus immutable) a reference to @self.
+ *   As such, the instance will be sealed if and only if @self is
+ *   sealed.
+ */
+static NMWireGuardPeer *
+_wireguard_peer_dup (const NMWireGuardPeer *self)
+{
+	g_return_val_if_fail (NM_IS_WIREGUARD_PEER (self, TRUE), NULL);
+
+	if (self->sealed)
+		return nm_wireguard_peer_ref ((NMWireGuardPeer *) self);
+	return nm_wireguard_peer_new_clone (self, TRUE);
+}
+
+/**
+ * nm_wireguard_peer_seal:
+ * @self: the #NMWireGuardPeer instance
+ *
+ * Seal the #NMWireGuardPeer instance. Afterwards, it is a bug
+ * to call all functions that modify the instance (except ref/unref).
+ * A sealed instance cannot be unsealed again, but you can create
+ * an unsealed copy with nm_wireguard_peer_new_clone().
+ *
+ * Since: 1.16
+ */
+void
+nm_wireguard_peer_seal (NMWireGuardPeer *self)
+{
+	g_return_if_fail (NM_IS_WIREGUARD_PEER (self, TRUE));
+
+	self->sealed = TRUE;
+
+	if (self->allowed_ips) {
+		if (self->allowed_ips->len == 0)
+			nm_clear_pointer (&self->allowed_ips, g_ptr_array_unref);
+	}
+}
+
+/**
+ * nm_wireguard_peer_is_sealed:
+ * @self: the #NMWireGuardPeer instance
+ *
+ * Returns: whether @self is sealed or not.
+ *
+ * Since: 1.16
+ */
+gboolean
+nm_wireguard_peer_is_sealed (const NMWireGuardPeer *self)
+{
+	g_return_val_if_fail (NM_IS_WIREGUARD_PEER (self, TRUE), FALSE);
+
+	return self->sealed;
+}
+
+/**
+ * nm_wireguard_peer_get_public_key:
+ * @self: the #NMWireGuardPeer instance
+ *
+ * Returns: (transfer none): the public key or %NULL if unset.
+ *
+ * Since: 1.16
+ */
+const char *
+nm_wireguard_peer_get_public_key (const NMWireGuardPeer *self)
+{
+	g_return_val_if_fail (NM_IS_WIREGUARD_PEER (self, TRUE), NULL);
+
+	return self->public_key;
+}
+
+/**
+ * nm_wireguard_peer_set_public_key:
+ * @self: the unsealed #NMWireGuardPeer instance
+ * @public_key: (allow-none) (transfer none): the new public
+ *   key or %NULL to clear the public key.
+ * @accept_invalid: if %TRUE and @public_key is not %NULL and
+ *   invalid, then do not modify the instance.
+ *
+ * Reset the public key. Note that if the public key is valid, it
+ * will be normalized (which may or may not modify the set value).
+ *
+ * It is a bug trying to modify a sealed #NMWireGuardPeer instance.
+ *
+ * Returns: %TRUE if the key was valid or %NULL. Returns
+ *   %FALSE for invalid keys. Depending on @accept_invalid
+ *   will an invalid key be set or not.
+ *
+ * Since: 1.16
+ */
+gboolean
+nm_wireguard_peer_set_public_key (NMWireGuardPeer *self,
+                                  const char *public_key,
+                                  gboolean accept_invalid)
+{
+	char *public_key_normalized = NULL;
+	gboolean is_valid;
+
+	g_return_val_if_fail (NM_IS_WIREGUARD_PEER (self, FALSE), FALSE);
+
+	if (!public_key) {
+		nm_clear_g_free (&self->public_key);
+		return TRUE;
+	}
+
+	is_valid = nm_utils_base64secret_normalize (public_key,
+	                                            NM_WIREGUARD_PUBLIC_KEY_LEN,
+	                                            &public_key_normalized);
+	nm_assert (is_valid == (public_key_normalized != NULL));
+
+	if (   !is_valid
+	    && !accept_invalid)
+		return FALSE;
+
+	self->public_key_valid = is_valid;
+	g_free (self->public_key);
+	self->public_key = public_key_normalized ?: g_strdup (public_key);
+	return is_valid;
+}
+
+void
+_nm_wireguard_peer_set_public_key_bin (NMWireGuardPeer *self,
+                                       const guint8 public_key[static NM_WIREGUARD_PUBLIC_KEY_LEN])
+{
+	g_return_if_fail (NM_IS_WIREGUARD_PEER (self, FALSE));
+
+	nm_clear_g_free (&self->public_key);
+
+	if (!public_key)
+		return;
+
+	self->public_key = g_base64_encode (public_key, NM_WIREGUARD_PUBLIC_KEY_LEN);
+	self->public_key_valid = TRUE;
+}
+
+/**
+ * nm_wireguard_peer_get_preshared_key:
+ * @self: the #NMWireGuardPeer instance
+ *
+ * Returns: (transfer none): the preshared key or %NULL if unset.
+ *
+ * Since: 1.16
+ */
+const char *
+nm_wireguard_peer_get_preshared_key (const NMWireGuardPeer *self)
+{
+	g_return_val_if_fail (NM_IS_WIREGUARD_PEER (self, TRUE), NULL);
+
+	return self->preshared_key;
+}
+
+/**
+ * nm_wireguard_peer_set_preshared_key:
+ * @self: the unsealed #NMWireGuardPeer instance
+ * @preshared_key: (allow-none) (transfer none): the new preshared
+ *   key or %NULL to clear the preshared key.
+ * @accept_invalid: whether to allow setting the key to an invalid
+ *   value. If %FALSE, @self is unchanged if the key is invalid
+ *   and if %FALSE is returned.
+ *
+ * Reset the preshared key. Note that if the preshared key is valid, it
+ * will be normalized (which may or may not modify the set value).
+ *
+ * Note that the preshared-key is a secret and consequently has corresponding
+ * preshared-key-flags property. This is so that secrets can be optional
+ * and requested on demand from a secret-agent. Also, an invalid  preshared-key
+ * may optionally cause nm_wireguard_peer_is_valid() to fail or it may
+ * be accepted.
+ *
+ * It is a bug trying to modify a sealed #NMWireGuardPeer instance.
+ *
+ * Returns: %TRUE if the preshared-key is valid, otherwise %FALSE.
+ *   %NULL is considered a valid value.
+ *   If the key is invalid, it depends on @accept_invalid whether the
+ *   previous value was reset.
+ *
+ * Since: 1.16
+ */
+gboolean
+nm_wireguard_peer_set_preshared_key (NMWireGuardPeer *self,
+                                     const char *preshared_key,
+                                     gboolean accept_invalid)
+{
+	char *preshared_key_normalized = NULL;
+	gboolean is_valid;
+
+	g_return_val_if_fail (NM_IS_WIREGUARD_PEER (self, FALSE), FALSE);
+
+	if (!preshared_key) {
+		nm_clear_pointer (&self->preshared_key, nm_free_secret);
+		return TRUE;
+	}
+
+	is_valid = nm_utils_base64secret_normalize (preshared_key,
+	                                            NM_WIREGUARD_SYMMETRIC_KEY_LEN,
+	                                            &preshared_key_normalized);
+	nm_assert (is_valid == (preshared_key_normalized != NULL));
+
+	if (   !is_valid
+	    && !accept_invalid)
+		return FALSE;
+
+	self->preshared_key_valid = is_valid;
+	nm_free_secret (self->preshared_key);
+	self->preshared_key = preshared_key_normalized ?: g_strdup (preshared_key);
+	return is_valid;
+}
+
+/**
+ * nm_wireguard_peer_get_preshared_key_flags:
+ * @self: the #NMWireGuardPeer instance
+ *
+ * Returns: get the secret flags for the preshared-key.
+ *
+ * Since: 1.16
+ */
+NMSettingSecretFlags
+nm_wireguard_peer_get_preshared_key_flags (const NMWireGuardPeer *self)
+{
+	g_return_val_if_fail (NM_IS_WIREGUARD_PEER (self, TRUE), 0);
+
+	return self->preshared_key_flags;
+}
+
+/**
+ * nm_wireguard_peer_set_preshared_key_flags:
+ * @self: the unsealed #NMWireGuardPeer instance
+ * @preshared_key_flags: the secret flags to set.
+ *
+ * It is a bug trying to modify a sealed #NMWireGuardPeer instance.
+ *
+ * Since: 1.16
+ */
+void
+nm_wireguard_peer_set_preshared_key_flags (NMWireGuardPeer *self,
+                                           NMSettingSecretFlags preshared_key_flags)
+{
+	g_return_if_fail (NM_IS_WIREGUARD_PEER (self, FALSE));
+
+	self->preshared_key_flags = preshared_key_flags;
+}
+
+/**
+ * nm_wireguard_peer_get_persistent_keepalive:
+ * @self: the #NMWireGuardPeer instance
+ *
+ * Returns: get the persistent-keepalive setting in seconds. Set to zero to disable
+ *   keep-alive.
+ *
+ * Since: 1.16
+ */
+guint16
+nm_wireguard_peer_get_persistent_keepalive (const NMWireGuardPeer *self)
+{
+	g_return_val_if_fail (NM_IS_WIREGUARD_PEER (self, TRUE), 0);
+
+	return self->persistent_keepalive;
+}
+
+/**
+ * nm_wireguard_peer_set_persistent_keepalive:
+ * @self: the unsealed #NMWireGuardPeer instance
+ * @persistent_keepalive: the keep-alive value to set.
+ *
+ * It is a bug trying to modify a sealed #NMWireGuardPeer instance.
+ *
+ * Since: 1.16
+ */
+void
+nm_wireguard_peer_set_persistent_keepalive (NMWireGuardPeer *self,
+                                            guint16 persistent_keepalive)
+{
+	g_return_if_fail (NM_IS_WIREGUARD_PEER (self, FALSE));
+
+	self->persistent_keepalive = persistent_keepalive;
+}
+
+NMSockAddrEndpoint *
+_nm_wireguard_peer_get_endpoint (const NMWireGuardPeer *self)
+{
+	g_return_val_if_fail (NM_IS_WIREGUARD_PEER (self, TRUE), NULL);
+
+	return self->endpoint;
+}
+
+/**
+ * nm_wireguard_peer_get_endpoint:
+ * @self: the #NMWireGuardPeer instance
+ *
+ * Returns: (transfer none): the endpoint or %NULL if none was set.
+ *
+ * Since: 1.16
+ */
+const char *
+nm_wireguard_peer_get_endpoint (const NMWireGuardPeer *self)
+{
+	g_return_val_if_fail (NM_IS_WIREGUARD_PEER (self, TRUE), NULL);
+
+	return   self->endpoint
+	       ? nm_sock_addr_endpoint_get_endpoint (self->endpoint)
+	       : NULL;
+}
+
+void
+_nm_wireguard_peer_set_endpoint (NMWireGuardPeer *self,
+                                 NMSockAddrEndpoint *endpoint)
+{
+	NMSockAddrEndpoint *old;
+
+	nm_assert (NM_IS_WIREGUARD_PEER (self, FALSE));
+
+	old = self->endpoint;
+	self->endpoint = nm_sock_addr_endpoint_ref (endpoint);
+	nm_sock_addr_endpoint_unref (old);
+}
+
+/**
+ * nm_wireguard_peer_set_endpoint:
+ * @self: the unsealed #NMWireGuardPeer instance
+ * @endpoint: the socket address endpoint to set or %NULL.
+ * @allow_invalid: if %TRUE, also invalid values are set.
+ *   If %FALSE, the function does nothing for invalid @endpoint
+ *   arguments.
+ *
+ * Sets or clears the endpoint of @self.
+ *
+ * It is a bug trying to modify a sealed #NMWireGuardPeer instance.
+ *
+ * Returns: %TRUE if the endpoint is %NULL or valid. For an
+ *   invalid @endpoint argument, %FALSE is returned. Depending
+ *   on @allow_invalid, the instance will be modified.
+ *
+ * Since: 1.16
+ */
+gboolean
+nm_wireguard_peer_set_endpoint (NMWireGuardPeer *self,
+                                const char *endpoint,
+                                gboolean allow_invalid)
+{
+	NMSockAddrEndpoint *old;
+	NMSockAddrEndpoint *new;
+	gboolean is_valid;
+
+	g_return_val_if_fail (NM_IS_WIREGUARD_PEER (self, FALSE), FALSE);
+
+	if (!endpoint) {
+		nm_clear_pointer (&self->endpoint, nm_sock_addr_endpoint_unref);
+		return TRUE;
+	}
+
+	new = nm_sock_addr_endpoint_new (endpoint);
+
+	is_valid = (nm_sock_addr_endpoint_get_host (new) != NULL);
+
+	if (   !allow_invalid
+	    && !is_valid) {
+		nm_sock_addr_endpoint_unref (new);
+		return FALSE;
+	}
+
+	old = self->endpoint;
+	self->endpoint = new;
+	nm_sock_addr_endpoint_unref (old);
+	return is_valid;
+}
+
+/**
+ * nm_wireguard_peer_get_allowed_ips_len:
+ * @self: the #NMWireGuardPeer instance
+ *
+ * Returns: the number of allowed-ips entries.
+ *
+ * Since: 1.16
+ */
+guint
+nm_wireguard_peer_get_allowed_ips_len (const NMWireGuardPeer *self)
+{
+	g_return_val_if_fail (NM_IS_WIREGUARD_PEER (self, TRUE), 0);
+
+	return self->allowed_ips ? self->allowed_ips->len : 0u;
+}
+
+/**
+ * nm_wireguard_peer_get_allowed_ip:
+ * @self: the #NMWireGuardPeer instance
+ * @idx: the index from zero to (allowed-ips-len - 1) to
+ *   retrieve.
+ * @out_is_valid: (allow-none): %TRUE if the returned value is a valid allowed-ip
+ *   setting.
+ *
+ * Returns: (transfer none): the allowed-ip setting at index @idx.
+ *   If @idx is out of range, %NULL will be returned.
+ *
+ * Since: 1.16
+ */
+const char *
+nm_wireguard_peer_get_allowed_ip (const NMWireGuardPeer *self,
+                                  guint idx,
+                                  gboolean *out_is_valid)
+{
+	const char *s;
+
+	g_return_val_if_fail (NM_IS_WIREGUARD_PEER (self, TRUE), NULL);
+
+	if (   !self->allowed_ips
+	    || idx >= self->allowed_ips->len) {
+		NM_SET_OUT (out_is_valid, FALSE);
+		return NULL;
+	}
+
+	s = self->allowed_ips->pdata[idx];
+	NM_SET_OUT (out_is_valid, s[0] != ALLOWED_IP_INVALID_X);
+	return s[0] == ALLOWED_IP_INVALID_X ? &s[1] : s;
+}
+
+/**
+ * nm_wireguard_peer_clear_allowed_ips:
+ * @self: the unsealed #NMWireGuardPeer instance
+ *
+ * Removes all allowed-ip entries.
+ *
+ * It is a bug trying to modify a sealed #NMWireGuardPeer instance.
+ *
+ * Since: 1.16
+ */
+void
+nm_wireguard_peer_clear_allowed_ips (NMWireGuardPeer *self)
+{
+	g_return_if_fail (NM_IS_WIREGUARD_PEER (self, FALSE));
+
+	if (self->allowed_ips)
+		g_ptr_array_set_size (self->allowed_ips, 0);
+}
+
+static gboolean
+_peer_append_allowed_ip (NMWireGuardPeer *self,
+                         const char *allowed_ip,
+                         gboolean accept_invalid)
+{
+	int addr_family;
+	int prefix;
+	NMIPAddr addrbin;
+	char *str;
+	gboolean is_valid = TRUE;
+
+	nm_assert (NM_IS_WIREGUARD_PEER (self, FALSE));
+	nm_assert (allowed_ip);
+
+	/* normalize the address (if it is valid. Otherwise, take it
+	 * as-is (it will render the instance invalid). */
+	if (!nm_utils_parse_inaddr_prefix_bin (AF_UNSPEC,
+	                                       allowed_ip,
+	                                       &addr_family,
+	                                       &addrbin,
+	                                       &prefix)) {
+		if (!accept_invalid)
+			return FALSE;
+		/* mark the entry as invalid by having a "X" prefix. */
+		str = g_strconcat (ALLOWED_IP_INVALID_X_STR, allowed_ip, NULL);
+		is_valid = FALSE;
+	} else {
+		char addrstr[NM_UTILS_INET_ADDRSTRLEN];
+
+		nm_assert_addr_family (addr_family);
+
+		nm_utils_inet_ntop (addr_family, &addrbin, addrstr);
+		if (prefix >= 0)
+			str = g_strdup_printf ("%s/%d", addrstr, prefix);
+		else
+			str = g_strdup (addrstr);
+		nm_assert (str[0] != ALLOWED_IP_INVALID_X);
+	}
+
+	if (!self->allowed_ips)
+		self->allowed_ips = g_ptr_array_new_with_free_func (g_free);
+
+	g_ptr_array_add (self->allowed_ips, str);
+	return is_valid;
+}
+
+/**
+ * nm_wireguard_peer_append_allowed_ip:
+ * @self: the unsealed #NMWireGuardPeer instance
+ * @allowed_ip: the allowed-ip entry to set.
+ * @accept_invalid: if %TRUE, also invalid @allowed_ip value
+ *   will be appended. Otherwise, the function does nothing
+ *   in face of invalid values and returns %FALSE.
+ *
+ * Appends @allowed_ip setting to the list. This does not check
+ * for duplicates and always appends @allowed_ip to the end of the
+ * list. If @allowed_ip is valid, it will be normalized and a modified
+ * for might be appended. If @allowed_ip is invalid, it will still be
+ * appended, but later verification will fail.
+ *
+ * It is a bug trying to modify a sealed #NMWireGuardPeer instance.
+ *
+ * Returns: %TRUE if the value is a valid allowed-ips value, %FALSE otherwise.
+ *   Depending on @accept_invalid, also invalid values are added.
+ *
+ * Since: 1.16
+ */
+gboolean
+nm_wireguard_peer_append_allowed_ip (NMWireGuardPeer *self,
+                                     const char *allowed_ip,
+                                     gboolean accept_invalid)
+{
+	g_return_val_if_fail (NM_IS_WIREGUARD_PEER (self, FALSE), FALSE);
+	g_return_val_if_fail (allowed_ip, FALSE);
+
+	return _peer_append_allowed_ip (self, allowed_ip, accept_invalid);
+}
+
+/**
+ * nm_wireguard_peer_remove_allowed_ip:
+ * @self: the unsealed #NMWireGuardPeer instance
+ * @idx: the index from zero to (allowed-ips-len - 1) to
+ *   retrieve. If the index is out of range, %FALSE is returned
+ *   and nothing is done.
+ *
+ * Removes the allowed-ip at the given @idx. This shifts all
+ * following entries one index down.
+ *
+ * It is a bug trying to modify a sealed #NMWireGuardPeer instance.
+ *
+ * Returns: %TRUE if @idx was valid and the allowed-ip was removed.
+ *   %FALSE otherwise, and the peer will not be changed.
+ *
+ * Since: 1.16
+ */
+gboolean
+nm_wireguard_peer_remove_allowed_ip (NMWireGuardPeer *self,
+                                     guint idx)
+{
+	g_return_val_if_fail (NM_IS_WIREGUARD_PEER (self, FALSE), FALSE);
+
+	if (   !self->allowed_ips
+	    || idx >= self->allowed_ips->len)
+		return FALSE;
+
+	g_ptr_array_remove_index (self->allowed_ips, idx);
+	return TRUE;
+}
+
+/**
+ * nm_wireguard_peer_is_valid:
+ * @self: the #NMWireGuardPeer instance
+ * @check_secrets: if %TRUE, non-secret properties are validated.
+ *   Otherwise they are ignored for this purpose.
+ * @check_non_secrets: if %TRUE, secret properties are validated.
+ *   Otherwise they are ignored for this purpose.
+ * @error: the #GError location for returning the failure reason.
+ *
+ * Returns:  %TRUE if the peer is valid or fails with an error
+ *   reason.
+ *
+ * Since: 1.16
+ */
+gboolean
+nm_wireguard_peer_is_valid (const NMWireGuardPeer *self,
+                            gboolean check_non_secrets,
+                            gboolean check_secrets,
+                            GError **error)
+{
+	guint i;
+
+	g_return_val_if_fail (NM_IS_WIREGUARD_PEER (self, TRUE), FALSE);
+	g_return_val_if_fail (!error || !*error, FALSE);
+
+	if (check_non_secrets) {
+		if (!self->public_key) {
+			g_set_error_literal (error, NM_CONNECTION_ERROR, NM_CONNECTION_ERROR_MISSING_PROPERTY,
+			                     _("missing public-key for peer"));
+			return FALSE;
+		} else if (!self->public_key_valid) {
+			g_set_error_literal (error, NM_CONNECTION_ERROR, NM_CONNECTION_ERROR_INVALID_PROPERTY,
+			                     _("invalid public-key for peer"));
+			return FALSE;
+		}
+	}
+
+	if (check_secrets) {
+		if (   self->preshared_key
+		    && !self->preshared_key_valid) {
+			g_set_error_literal (error, NM_CONNECTION_ERROR, NM_CONNECTION_ERROR_INVALID_PROPERTY,
+			                     _("invalid preshared-key for peer"));
+			return FALSE;
+		}
+	}
+
+	if (check_non_secrets) {
+		if (!_nm_utils_secret_flags_validate (self->preshared_key_flags,
+		                                      NULL,
+		                                      NULL,
+		                                      NM_SETTING_SECRET_FLAG_NONE,
+		                                      error))
+			return FALSE;
+	}
+
+	if (check_non_secrets) {
+		if (   self->endpoint
+		    && !nm_sock_addr_endpoint_get_host (self->endpoint)) {
+			g_set_error_literal (error, NM_CONNECTION_ERROR, NM_CONNECTION_ERROR_INVALID_PROPERTY,
+			                     _("invalid endpoint for peer"));
+			return FALSE;
+		}
+
+		if (self->allowed_ips) {
+			for (i = 0; i < self->allowed_ips->len; i++) {
+				const char *s = self->allowed_ips->pdata[i];
+
+				if (s[0] == ALLOWED_IP_INVALID_X) {
+					g_set_error (error, NM_CONNECTION_ERROR, NM_CONNECTION_ERROR_INVALID_PROPERTY,
+					             _("invalid IP address \"%s\" for allowed-ip of peer"),
+					             &s[1]);
+					return FALSE;
+				}
+			}
+		}
+
+		if (!_nm_setting_secret_flags_valid (self->preshared_key_flags)) {
+			g_set_error_literal (error, NM_CONNECTION_ERROR, NM_CONNECTION_ERROR_INVALID_PROPERTY,
+			                     _("invalid preshared-key-flags for peer"));
+			return FALSE;
+		}
+	}
+
+	return TRUE;
+}
+
+/**
+ * nm_wireguard_peer_cmp:
+ * @a: (allow-none): the #NMWireGuardPeer to compare.
+ * @b: (allow-none): the other #NMWireGuardPeer to compare.
+ * @compare_flags: #NMSettingCompareFlags to affect the comparison.
+ *
+ * Returns: zero of the two instances are equivalent or
+ *   a non-zero integer otherwise. This defines a total ordering
+ *   over the peers. Whether a peer is sealed or not, does not
+ *   affect the comparison.
+ *
+ * Since: 1.16
+ */
+int
+nm_wireguard_peer_cmp (const NMWireGuardPeer *a,
+                       const NMWireGuardPeer *b,
+                       NMSettingCompareFlags compare_flags)
+{
+	guint i, n;
+
+	NM_CMP_SELF (a, b);
+
+	/* regardless of the @compare_flags, the public-key is the ID of the peer. It must
+	 * always be compared. */
+	NM_CMP_FIELD_BOOL (a, b, public_key_valid);
+	NM_CMP_FIELD_STR0 (a, b, public_key);
+
+	if (NM_FLAGS_ANY (compare_flags,   NM_SETTING_COMPARE_FLAG_INFERRABLE
+	                                 | NM_SETTING_COMPARE_FLAG_FUZZY))
+		return 0;
+
+	NM_CMP_FIELD_BOOL (a, b, endpoint);
+	if (a->endpoint) {
+		NM_CMP_DIRECT_STRCMP0 (nm_sock_addr_endpoint_get_endpoint (a->endpoint),
+		                       nm_sock_addr_endpoint_get_endpoint (b->endpoint));
+	}
+
+	NM_CMP_FIELD (a, b, persistent_keepalive);
+
+	NM_CMP_DIRECT ((n = (a->allowed_ips ? a->allowed_ips->len : 0u)),
+	               (     b->allowed_ips ? b->allowed_ips->len : 0u ));
+	for (i = 0; i < n; i++)
+		NM_CMP_DIRECT_STRCMP0 (a->allowed_ips->pdata[i], b->allowed_ips->pdata[i]);
+
+	NM_CMP_FIELD (a, b, preshared_key_flags);
+
+	if (!NM_FLAGS_HAS (compare_flags, NM_SETTING_COMPARE_FLAG_IGNORE_SECRETS)) {
+		if (   NM_FLAGS_HAS (compare_flags, NM_SETTING_COMPARE_FLAG_IGNORE_AGENT_OWNED_SECRETS)
+		    && NM_FLAGS_HAS (a->preshared_key_flags, NM_SETTING_SECRET_FLAG_AGENT_OWNED)) {
+			/* pass */
+		} else if (   NM_FLAGS_HAS (compare_flags, NM_SETTING_COMPARE_FLAG_IGNORE_NOT_SAVED_SECRETS)
+		           && NM_FLAGS_HAS (a->preshared_key_flags, NM_SETTING_SECRET_FLAG_NOT_SAVED)) {
+			/* pass */
+		} else {
+			NM_CMP_FIELD_BOOL (a, b, preshared_key_valid);
+			NM_CMP_FIELD_STR0 (a, b, preshared_key);
+		}
+	}
+
+	return 0;
+}
+
+/*****************************************************************************/
+
+typedef struct {
+	const char *public_key;
+	NMWireGuardPeer *peer;
+	guint idx;
+} PeerData;
+
+/*****************************************************************************/
+
+NM_GOBJECT_PROPERTIES_DEFINE_BASE (
+	PROP_FWMARK,
+	PROP_LISTEN_PORT,
+	PROP_MTU,
+	PROP_PEER_ROUTES,
+	PROP_PRIVATE_KEY,
+	PROP_PRIVATE_KEY_FLAGS,
+);
+
+typedef struct {
+	char *private_key;
+	GPtrArray *peers_arr;
+	GHashTable *peers_hash;
+	NMSettingSecretFlags private_key_flags;
+	guint32 fwmark;
+	guint32 mtu;
+	guint16 listen_port;
+	bool private_key_valid:1;
+	bool peer_routes:1;
+} NMSettingWireGuardPrivate;
+
+/**
+ * NMSettingWireGuard:
+ *
+ * WireGuard Ethernet Settings
+ *
+ * Since: 1.16
+ */
+struct _NMSettingWireGuard {
+	NMSetting parent;
+	NMSettingWireGuardPrivate _priv;
+};
+
+struct _NMSettingWireGuardClass {
+	NMSettingClass parent;
+};
+
+G_DEFINE_TYPE (NMSettingWireGuard, nm_setting_wireguard, NM_TYPE_SETTING)
+
+#define NM_SETTING_WIREGUARD_GET_PRIVATE(self) _NM_GET_PRIVATE (self, NMSettingWireGuard, NM_IS_SETTING_WIREGUARD, NMSetting)
+
+/*****************************************************************************/
+
+#define peers_psk_get_secret_name_a(public_key, to_free) \
+	nm_construct_name_a (NM_SETTING_WIREGUARD_PEERS".%s."NM_WIREGUARD_PEER_ATTR_PRESHARED_KEY, (public_key), (to_free))
+
+#define peers_psk_get_secret_name_dup(public_key) \
+	g_strdup_printf (NM_SETTING_WIREGUARD_PEERS".%s."NM_WIREGUARD_PEER_ATTR_PRESHARED_KEY, (public_key))
+
+#define peers_psk_get_secret_parse_a(secret_public_key, public_key_free) \
+	({ \
+		const char *_secret_public_key = (secret_public_key); \
+		char **_public_key_free = (public_key_free); \
+		const char *_public_key = NULL; \
+		\
+		nm_assert (_public_key_free && !*_public_key_free); \
+		\
+		if (NM_STR_HAS_PREFIX (_secret_public_key, NM_SETTING_WIREGUARD_PEERS".")) { \
+			_secret_public_key += NM_STRLEN (NM_SETTING_WIREGUARD_PEERS"."); \
+			if (NM_STR_HAS_SUFFIX (_secret_public_key, "."NM_WIREGUARD_PEER_ATTR_PRESHARED_KEY)) { \
+				_public_key = nm_strndup_a (300, _secret_public_key, strlen (_secret_public_key) - NM_STRLEN ("."NM_WIREGUARD_PEER_ATTR_PRESHARED_KEY), _public_key_free); \
+			} \
+		} \
+		\
+		_public_key; \
+	})
+
+/*****************************************************************************/
+
+/**
+ * nm_setting_wireguard_get_private_key:
+ * @self: the #NMSettingWireGuard instance
+ *
+ * Returns: (transfer none): the set private-key or %NULL.
+ *
+ * Since: 1.16
+ */
+const char *
+nm_setting_wireguard_get_private_key (NMSettingWireGuard *self)
+{
+	g_return_val_if_fail (NM_IS_SETTING_WIREGUARD (self), NULL);
+
+	return NM_SETTING_WIREGUARD_GET_PRIVATE (self)->private_key;
+}
+
+/**
+ * nm_setting_wireguard_get_private_key_flags:
+ * @self: the #NMSettingWireGuard instance
+ *
+ * Returns: the secret-flags for #NMSettingWireGuard:private-key.
+ *
+ * Since: 1.16
+ */
+NMSettingSecretFlags
+nm_setting_wireguard_get_private_key_flags (NMSettingWireGuard *self)
+{
+	g_return_val_if_fail (NM_IS_SETTING_WIREGUARD (self), 0);
+
+	return NM_SETTING_WIREGUARD_GET_PRIVATE (self)->private_key_flags;
+}
+
+/**
+ * nm_setting_wireguard_get_fwmark:
+ * @self: the #NMSettingWireGuard instance
+ *
+ * Returns: the set firewall mark.
+ *
+ * Since: 1.16
+ */
+guint32
+nm_setting_wireguard_get_fwmark (NMSettingWireGuard *self)
+{
+	g_return_val_if_fail (NM_IS_SETTING_WIREGUARD (self), 0);
+
+	return NM_SETTING_WIREGUARD_GET_PRIVATE (self)->fwmark;
+}
+
+/**
+ * nm_setting_wireguard_get_listen_port:
+ * @self: the #NMSettingWireGuard instance
+ *
+ * Returns: the set UDP listen port.
+ *
+ * Since: 1.16
+ */
+guint16
+nm_setting_wireguard_get_listen_port (NMSettingWireGuard *self)
+{
+	g_return_val_if_fail (NM_IS_SETTING_WIREGUARD (self), 0);
+
+	return NM_SETTING_WIREGUARD_GET_PRIVATE (self)->listen_port;
+}
+
+/**
+ * nm_setting_wireguard_get_peer_routes:
+ * @self: the #NMSettingWireGuard instance
+ *
+ * Returns: whether automatically add peer routes.
+ *
+ * Since: 1.16
+ */
+gboolean
+nm_setting_wireguard_get_peer_routes (NMSettingWireGuard *self)
+{
+	g_return_val_if_fail (NM_IS_SETTING_WIREGUARD (self), TRUE);
+
+	return NM_SETTING_WIREGUARD_GET_PRIVATE (self)->peer_routes;
+}
+
+/**
+ * nm_setting_wireguard_get_mtu:
+ * @self: the #NMSettingWireGuard instance
+ *
+ * Returns: the MTU of the setting.
+ *
+ * Since: 1.16
+ */
+guint32
+nm_setting_wireguard_get_mtu (NMSettingWireGuard *self)
+{
+	g_return_val_if_fail (NM_IS_SETTING_WIREGUARD (self), 0);
+
+	return NM_SETTING_WIREGUARD_GET_PRIVATE (self)->mtu;
+}
+
+/*****************************************************************************/
+
+static void
+_peer_free (PeerData *pd)
+{
+	nm_assert (pd);
+
+	nm_wireguard_peer_unref (pd->peer);
+	g_slice_free (PeerData, pd);
+}
+
+/*****************************************************************************/
+
+static void
+_peers_notify (gpointer self)
+{
+	_nm_setting_emit_property_changed (self);
+}
+
+static PeerData *
+_peers_get (NMSettingWireGuardPrivate *priv,
+            guint idx)
+{
+	PeerData *pd;
+
+	nm_assert (priv);
+	nm_assert (idx < priv->peers_arr->len);
+
+	pd = priv->peers_arr->pdata[idx];
+
+	nm_assert (pd);
+	nm_assert (pd->idx == idx);
+	nm_assert (NM_IS_WIREGUARD_PEER (pd->peer, TRUE));
+	nm_assert (nm_wireguard_peer_is_sealed (pd->peer));
+	nm_assert (pd->public_key == nm_wireguard_peer_get_public_key (pd->peer));
+	nm_assert (g_hash_table_lookup (priv->peers_hash, pd) == pd);
+
+	return pd;
+}
+
+static PeerData *
+_peers_get_by_public_key (NMSettingWireGuardPrivate *priv,
+                          const char *public_key,
+                          gboolean try_with_normalized_key)
+{
+	gs_free char *public_key_normalized = NULL;
+	PeerData *pd;
+
+again:
+	nm_assert (priv);
+	nm_assert (public_key);
+
+	pd = g_hash_table_lookup (priv->peers_hash, &public_key);
+	if (pd) {
+		nm_assert (_peers_get (priv, pd->idx) == pd);
+		return pd;
+	}
+	if (   try_with_normalized_key
+	    && nm_utils_base64secret_normalize (public_key,
+	                                        NM_WIREGUARD_PUBLIC_KEY_LEN,
+	                                        &public_key_normalized)) {
+		public_key = public_key_normalized;
+		try_with_normalized_key = FALSE;
+		goto again;
+	}
+	return NULL;
+}
+
+static void
+_peers_remove (NMSettingWireGuardPrivate *priv,
+               PeerData *pd,
+               gboolean do_free)
+{
+	guint i;
+
+	nm_assert (pd);
+	nm_assert (_peers_get (priv, pd->idx) == pd);
+
+	for (i = pd->idx + 1; i < priv->peers_arr->len; i++)
+		_peers_get (priv, i)->idx--;
+
+	g_ptr_array_remove_index (priv->peers_arr, pd->idx);
+	if (!g_hash_table_remove (priv->peers_hash, pd))
+		nm_assert_not_reached ();
+	if (do_free)
+		_peer_free (pd);
+}
+
+/**
+ * nm_setting_wireguard_get_peers_len:
+ * @self: the #NMSettingWireGuard instance
+ *
+ * Returns: the number of registered peers.
+ *
+ * Since: 1.16
+ */
+guint
+nm_setting_wireguard_get_peers_len (NMSettingWireGuard *self)
+{
+	g_return_val_if_fail (NM_IS_SETTING_WIREGUARD (self), 0);
+
+	return NM_SETTING_WIREGUARD_GET_PRIVATE (self)->peers_arr->len;
+}
+
+/**
+ * nm_setting_wireguard_get_peer:
+ * @self: the #NMSettingWireGuard instance
+ * @idx: the index to lookup.
+ *
+ * Returns: (transfer none): the #NMWireGuardPeer entry at
+ *   index @idx. If the index is out of range, %NULL is returned.
+ *
+ * Since: 1.16
+ */
+NMWireGuardPeer *
+nm_setting_wireguard_get_peer (NMSettingWireGuard *self,
+                               guint idx)
+{
+	NMSettingWireGuardPrivate *priv;
+
+	g_return_val_if_fail (NM_IS_SETTING_WIREGUARD (self), NULL);
+
+	priv = NM_SETTING_WIREGUARD_GET_PRIVATE (self);
+
+	if (idx >= priv->peers_arr->len)
+		return NULL;
+
+	return _peers_get (priv, idx)->peer;
+}
+
+/**
+ * nm_setting_wireguard_get_peer_by_public_key:
+ * @self: the #NMSettingWireGuard instance
+ * @public_key: the public key for looking up the
+ *   peer.
+ * @out_idx: (out) (allow-none): optional output argument
+ *   for the index of the found peer. If no index is found,
+ *   this is set to the nm_setting_wireguard_get_peers_len().
+ *
+ * Returns: (transfer none): the #NMWireGuardPeer instance with a
+ *   matching public key. If no such peer exists, %NULL is returned.
+ *
+ * Since: 1.16
+ */
+NMWireGuardPeer *
+nm_setting_wireguard_get_peer_by_public_key (NMSettingWireGuard *self,
+                                             const char *public_key,
+                                             guint *out_idx)
+{
+	NMSettingWireGuardPrivate *priv;
+	PeerData *pd;
+
+	g_return_val_if_fail (NM_IS_SETTING_WIREGUARD (self), NULL);
+	g_return_val_if_fail (public_key, NULL);
+
+	priv = NM_SETTING_WIREGUARD_GET_PRIVATE (self);
+
+	pd = _peers_get_by_public_key (priv, public_key, TRUE);
+	if (!pd) {
+		NM_SET_OUT (out_idx, priv->peers_arr->len);
+		return NULL;
+	}
+	NM_SET_OUT (out_idx, pd->idx);
+	return pd->peer;
+}
+
+static gboolean
+_peers_set (NMSettingWireGuardPrivate *priv,
+            NMWireGuardPeer *peer,
+            guint idx,
+            gboolean check_same_key)
+{
+	PeerData *pd_same_key = NULL;
+	PeerData *pd_idx = NULL;
+	const char *public_key;
+
+	nm_assert (idx <= priv->peers_arr->len);
+
+	public_key = nm_wireguard_peer_get_public_key (peer);
+
+	if (idx < priv->peers_arr->len) {
+		pd_idx = _peers_get (priv, idx);
+
+		if (pd_idx->peer == peer)
+			return FALSE;
+
+		if (   check_same_key
+		    && nm_streq (public_key, nm_wireguard_peer_get_public_key (pd_idx->peer)))
+			check_same_key = FALSE;
+	}
+
+	nm_wireguard_peer_seal (peer);
+	nm_wireguard_peer_ref (peer);
+
+	if (check_same_key) {
+		pd_same_key = _peers_get_by_public_key (priv, public_key, FALSE);
+		if (pd_same_key) {
+			if (pd_idx) {
+				nm_assert (pd_same_key != pd_idx);
+				_peers_remove (priv, pd_same_key, TRUE);
+				pd_same_key = NULL;
+			} else {
+				if (   pd_same_key->peer == peer
+				    && pd_same_key->idx == priv->peers_arr->len - 1) {
+					nm_wireguard_peer_unref (peer);
+					return FALSE;
+				}
+				_peers_remove (priv, pd_same_key, FALSE);
+				nm_wireguard_peer_unref (pd_same_key->peer);
+			}
+		}
+	} else
+		nm_assert (_peers_get_by_public_key (priv, public_key, FALSE) == pd_idx);
+
+	if (pd_idx) {
+		g_hash_table_remove (priv->peers_hash, pd_idx);
+		nm_wireguard_peer_unref (pd_idx->peer);
+		pd_idx->public_key = public_key;
+		pd_idx->peer = peer;
+		g_hash_table_add (priv->peers_hash, pd_idx);
+		return TRUE;
+	}
+
+
+	if (!pd_same_key)
+		pd_same_key = g_slice_new (PeerData);
+
+	*pd_same_key = (PeerData) {
+		.peer = peer,
+		.public_key = public_key,
+		.idx = priv->peers_arr->len,
+	};
+
+	g_ptr_array_add (priv->peers_arr, pd_same_key);
+	if (!nm_g_hash_table_add (priv->peers_hash, pd_same_key))
+		nm_assert_not_reached ();
+
+	nm_assert (_peers_get (priv, pd_same_key->idx) == pd_same_key);
+
+	return TRUE;
+}
+
+static gboolean
+_peers_append (NMSettingWireGuardPrivate *priv,
+               NMWireGuardPeer *peer,
+               gboolean check_same_key)
+{
+	return _peers_set (priv, peer, priv->peers_arr->len, check_same_key);
+}
+
+/**
+ * nm_setting_wireguard_set_peer:
+ * @self: the #NMSettingWireGuard instance
+ * @peer: the #NMWireGuardPeer instance to set.
+ *   This seals @peer and keeps a reference on the
+ *   instance.
+ * @idx: the index, in the range of 0 to the number of
+ *   peers (including). That means, if @idx is one past
+ *   the end of the number of peers, this is the same as
+ *   nm_setting_wireguard_append_peer(). Otherwise, the
+ *   peer at this index is replaced.
+ *
+ * If @idx is one past the last peer, the behavior is the same
+ * as nm_setting_wireguard_append_peer().
+ * Otherwise, the peer will be at @idx and replace the peer
+ * instance at that index. Note that if a peer with the same
+ * public-key exists on another index, then that peer will also
+ * be replaced. In that case, the number of peers will shrink
+ * by one (because the one at @idx got replace and then one
+ * with the same public-key got removed). This also means,
+ * that the resulting index afterwards may be one less than
+ * @idx (if another peer with a lower index was dropped).
+ *
+ * Since: 1.16
+ */
+void
+nm_setting_wireguard_set_peer (NMSettingWireGuard *self,
+                               NMWireGuardPeer *peer,
+                               guint idx)
+{
+	NMSettingWireGuardPrivate *priv;
+
+	g_return_if_fail (NM_IS_SETTING_WIREGUARD (self));
+	g_return_if_fail (NM_IS_WIREGUARD_PEER (peer, TRUE));
+
+	priv = NM_SETTING_WIREGUARD_GET_PRIVATE (self);
+
+	g_return_if_fail (idx <= priv->peers_arr->len);
+
+	if (_peers_set (priv, peer, idx, TRUE))
+		_peers_notify (self);
+}
+
+/**
+ * nm_setting_wireguard_append_peer:
+ * @self: the #NMSettingWireGuard instance
+ * @peer: the #NMWireGuardPeer instance to append.
+ *   This seals @peer and keeps a reference on the
+ *   instance.
+ *
+ * If a peer with the same public-key already exists, that
+ * one is replaced by @peer. The new @peer is always appended
+ * (or moved to) the end, so in case a peer is replaced, the
+ * indexes are shifted and the number of peers stays unchanged.
+ *
+ * Since: 1.16
+ */
+void
+nm_setting_wireguard_append_peer (NMSettingWireGuard *self,
+                                  NMWireGuardPeer *peer)
+{
+	g_return_if_fail (NM_IS_SETTING_WIREGUARD (self));
+	g_return_if_fail (NM_IS_WIREGUARD_PEER (peer, TRUE));
+
+	if (_peers_append (NM_SETTING_WIREGUARD_GET_PRIVATE (self),
+	                   peer,
+	                   TRUE))
+		_peers_notify (self);
+}
+
+/**
+ * nm_setting_wireguard_remove_peer
+ * @self: the #NMSettingWireGuard instance
+ * @idx: the index to remove.
+ *
+ * Returns: %TRUE if @idx was in range and a peer
+ *   was removed. Otherwise, @self is unchanged.
+ *
+ * Since: 1.16
+ */
+gboolean
+nm_setting_wireguard_remove_peer (NMSettingWireGuard *self,
+                                  guint idx)
+{
+	NMSettingWireGuardPrivate *priv;
+
+	g_return_val_if_fail (NM_IS_SETTING_WIREGUARD (self), FALSE);
+
+	priv = NM_SETTING_WIREGUARD_GET_PRIVATE (self);
+
+	if (idx >= priv->peers_arr->len)
+		return FALSE;
+
+	_peers_remove (priv, _peers_get (priv, idx), TRUE);
+	_peers_notify (self);
+	return TRUE;
+}
+
+static guint
+_peers_clear (NMSettingWireGuardPrivate *priv)
+{
+	guint l;
+
+	l = priv->peers_arr->len;
+	while (priv->peers_arr->len > 0) {
+		_peers_remove (priv,
+		               _peers_get (priv, priv->peers_arr->len - 1),
+		               TRUE);
+	}
+	return l;
+}
+
+/**
+ * nm_setting_wireguard_:
+ * @self: the #NMSettingWireGuard instance
+ *
+ * Returns: the number of cleared peers.
+ *
+ * Since: 1.16
+ */
+guint
+nm_setting_wireguard_clear_peers (NMSettingWireGuard *self)
+{
+	guint l;
+
+	g_return_val_if_fail (NM_IS_SETTING_WIREGUARD (self), 0);
+
+	l = _peers_clear (NM_SETTING_WIREGUARD_GET_PRIVATE (self));
+	if (l > 0)
+		_peers_notify (self);
+	return l;
+}
+
+/*****************************************************************************/
+
+static GVariant *
+_peers_dbus_only_synth (const NMSettInfoSetting *sett_info,
+                        guint property_idx,
+                        NMConnection *connection,
+                        NMSetting *setting,
+                        NMConnectionSerializationFlags flags)
+{
+	NMSettingWireGuard *self = NM_SETTING_WIREGUARD (setting);
+	NMSettingWireGuardPrivate *priv;
+	gboolean any_peers = FALSE;
+	GVariantBuilder peers_builder;
+	guint i_peer, n_peers;
+	guint i;
+
+	n_peers = nm_setting_wireguard_get_peers_len (self);
+	if (n_peers == 0)
+		return NULL;
+
+	priv = NM_SETTING_WIREGUARD_GET_PRIVATE (self);
+
+	for (i_peer = 0; i_peer < n_peers; i_peer++) {
+		const NMWireGuardPeer *peer = _peers_get (priv, i_peer)->peer;
+		GVariantBuilder builder;
+
+		if (!peer->public_key)
+			continue;
+
+		g_variant_builder_init (&builder, G_VARIANT_TYPE ("a{sv}"));
+
+		g_variant_builder_add (&builder, "{sv}", NM_WIREGUARD_PEER_ATTR_PUBLIC_KEY, g_variant_new_string (peer->public_key));
+
+		if (   !NM_FLAGS_HAS (flags, NM_CONNECTION_SERIALIZE_ONLY_SECRETS)
+		    && peer->endpoint)
+			g_variant_builder_add (&builder, "{sv}", NM_WIREGUARD_PEER_ATTR_ENDPOINT, g_variant_new_string (nm_sock_addr_endpoint_get_endpoint (peer->endpoint)));
+
+		if (   !NM_FLAGS_HAS (flags, NM_CONNECTION_SERIALIZE_NO_SECRETS)
+		    && peer->preshared_key)
+			g_variant_builder_add (&builder, "{sv}", NM_WIREGUARD_PEER_ATTR_PRESHARED_KEY, g_variant_new_string (peer->preshared_key));
+
+		if (   !NM_FLAGS_HAS (flags, NM_CONNECTION_SERIALIZE_ONLY_SECRETS)
+		    && peer->preshared_key_flags != NM_SETTING_SECRET_FLAG_NOT_REQUIRED)
+			g_variant_builder_add (&builder, "{sv}", NM_WIREGUARD_PEER_ATTR_PRESHARED_KEY_FLAGS, g_variant_new_uint32 (peer->preshared_key_flags));
+
+		if (   !NM_FLAGS_HAS (flags, NM_CONNECTION_SERIALIZE_ONLY_SECRETS)
+		    && peer->persistent_keepalive != 0)
+			g_variant_builder_add (&builder, "{sv}", NM_WIREGUARD_PEER_ATTR_PERSISTENT_KEEPALIVE, g_variant_new_uint32 (peer->persistent_keepalive));
+
+		if (   !NM_FLAGS_HAS (flags, NM_CONNECTION_SERIALIZE_ONLY_SECRETS)
+		    && peer->allowed_ips
+		    && peer->allowed_ips->len > 0) {
+			const char *const*strv = (const char *const*) peer->allowed_ips->pdata;
+			gs_free const char **strv_fixed = NULL;
+
+			for (i = 0; i < peer->allowed_ips->len; i++) {
+				if (strv[i][0] != ALLOWED_IP_INVALID_X)
+					continue;
+				if (!strv_fixed) {
+					strv_fixed = nm_memdup (strv, sizeof (strv[0]) * peer->allowed_ips->len);
+					strv = strv_fixed;
+				}
+				((const char **) strv)[i]++;
+			}
+			g_variant_builder_add (&builder, "{sv}", NM_WIREGUARD_PEER_ATTR_ALLOWED_IPS,
+			                       g_variant_new_strv (strv, peer->allowed_ips->len));
+		}
+
+		if (!any_peers) {
+			g_variant_builder_init (&peers_builder, G_VARIANT_TYPE ("aa{sv}"));
+			any_peers = TRUE;
+		}
+		g_variant_builder_add (&peers_builder, "a{sv}", &builder);
+	}
+
+	return   any_peers
+	       ? g_variant_builder_end (&peers_builder)
+	       : NULL;
+}
+
+static gboolean
+_peers_dbus_only_set (NMSetting     *setting,
+                      GVariant      *connection_dict,
+                      const char    *property,
+                      GVariant      *value,
+                      NMSettingParseFlags parse_flags,
+                      GError       **error)
+{
+	GVariantIter iter_peers;
+	GVariant *peer_var;
+	guint i_peer;
+	gboolean success = FALSE;
+	gboolean peers_changed = FALSE;
+
+	nm_assert (g_variant_is_of_type (value, G_VARIANT_TYPE ("aa{sv}")));
+
+	g_variant_iter_init (&iter_peers, value);
+
+	i_peer = 0;
+	while (g_variant_iter_next (&iter_peers, "@a{sv}", &peer_var)) {
+		_nm_unused gs_unref_variant GVariant *peer_var_unref = peer_var;
+		nm_auto_unref_wgpeer NMWireGuardPeer *peer = NULL;
+		const char *cstr;
+		guint32 u32;
+		GVariant *var;
+
+		i_peer++;
+
+		if (!g_variant_lookup (peer_var, NM_WIREGUARD_PEER_ATTR_PUBLIC_KEY, "&s", &cstr)) {
+			if (NM_FLAGS_HAS (parse_flags, NM_SETTING_PARSE_FLAGS_STRICT)) {
+				g_set_error (error, NM_CONNECTION_ERROR, NM_CONNECTION_ERROR_MISSING_PROPERTY,
+				             _("peer #%u has no public-key"),
+				             i_peer);
+				goto out;
+			}
+			continue;
+		}
+
+		peer = nm_wireguard_peer_new ();
+		if (!nm_wireguard_peer_set_public_key (peer, cstr, TRUE)) {
+			if (NM_FLAGS_HAS (parse_flags, NM_SETTING_PARSE_FLAGS_STRICT)) {
+				g_set_error (error, NM_CONNECTION_ERROR, NM_CONNECTION_ERROR_MISSING_PROPERTY,
+				             _("peer #%u has invalid public-key"),
+				             i_peer);
+				goto out;
+			}
+			continue;
+		}
+
+		if (g_variant_lookup (peer_var, NM_WIREGUARD_PEER_ATTR_ENDPOINT, "&s", &cstr)) {
+			nm_auto_unref_sockaddrendpoint NMSockAddrEndpoint *ep = NULL;
+
+			ep = nm_sock_addr_endpoint_new (cstr);
+			if (!nm_sock_addr_endpoint_get_host (ep)) {
+				if (NM_FLAGS_HAS (parse_flags, NM_SETTING_PARSE_FLAGS_STRICT)) {
+					g_set_error (error, NM_CONNECTION_ERROR, NM_CONNECTION_ERROR_MISSING_PROPERTY,
+					             _("peer #%u has invalid endpoint"),
+					             i_peer);
+					goto out;
+				}
+			} else
+				_nm_wireguard_peer_set_endpoint (peer, ep);
+		}
+
+		if (g_variant_lookup (peer_var, NM_WIREGUARD_PEER_ATTR_PRESHARED_KEY, "&s", &cstr))
+			nm_wireguard_peer_set_preshared_key (peer, cstr, TRUE);
+
+		if (g_variant_lookup (peer_var, NM_WIREGUARD_PEER_ATTR_PRESHARED_KEY_FLAGS, "u", &u32))
+			nm_wireguard_peer_set_preshared_key_flags (peer, u32);
+
+		if (g_variant_lookup (peer_var, NM_WIREGUARD_PEER_ATTR_PERSISTENT_KEEPALIVE, "u", &u32))
+			nm_wireguard_peer_set_persistent_keepalive (peer, u32);
+
+		if (g_variant_lookup (peer_var, NM_WIREGUARD_PEER_ATTR_ALLOWED_IPS, "@as", &var)) {
+			_nm_unused gs_unref_variant GVariant *var_free = var;
+			gs_free const char **allowed_ips = NULL;
+			gsize i, l;
+
+			allowed_ips = g_variant_get_strv (var, &l);
+			if (allowed_ips) {
+				for (i = 0; i < l; i++) {
+					if (_peer_append_allowed_ip (peer, allowed_ips[i], FALSE))
+						continue;
+					if (!NM_FLAGS_HAS (parse_flags, NM_SETTING_PARSE_FLAGS_STRICT))
+						continue;
+					g_set_error (error, NM_CONNECTION_ERROR, NM_CONNECTION_ERROR_MISSING_PROPERTY,
+					             _("peer #%u has invalid allowed-ips setting"),
+					             i_peer);
+					goto out;
+				}
+			}
+		}
+
+		if (NM_FLAGS_HAS (parse_flags, NM_SETTING_PARSE_FLAGS_STRICT)) {
+			gs_free_error GError *local = NULL;
+
+			if (!nm_wireguard_peer_is_valid (peer, TRUE, FALSE, &local)) {
+				g_set_error (error, NM_CONNECTION_ERROR, NM_CONNECTION_ERROR_MISSING_PROPERTY,
+				             _("peer #%u is invalid: %s"),
+				             i_peer, local->message);
+				goto out;
+			}
+		}
+
+		/* we could easily reject duplicate peers (by public-key) or duplicate GVariant attributes.
+		 * However, don't do that. In case of duplicate values, the latter peer overwrite the earlier
+		 * and GVariant attributes are ignored by g_variant_lookup() above. */
+		if (_peers_append (NM_SETTING_WIREGUARD_GET_PRIVATE (setting),
+		                   peer,
+		                   TRUE))
+			peers_changed = TRUE;
+	}
+
+	success = TRUE;
+
+out:
+	if (peers_changed)
+		_peers_notify (setting);
+	return success;
+}
+
+/*****************************************************************************/
+
+static gboolean
+verify (NMSetting *setting, NMConnection *connection, GError **error)
+{
+	NMSettingWireGuard *s_wg = NM_SETTING_WIREGUARD (setting);
+	NMSettingWireGuardPrivate *priv = NM_SETTING_WIREGUARD_GET_PRIVATE (setting);
+	guint i;
+
+	if (!_nm_connection_verify_required_interface_name (connection, error))
+		return FALSE;
+
+	if (!_nm_utils_secret_flags_validate (nm_setting_wireguard_get_private_key_flags (s_wg),
+	                                      NM_SETTING_WIREGUARD_SETTING_NAME,
+	                                      NM_SETTING_WIREGUARD_PRIVATE_KEY_FLAGS,
+	                                      NM_SETTING_SECRET_FLAG_NOT_REQUIRED,
+	                                      error))
+		return FALSE;
+
+	for (i = 0; i < priv->peers_arr->len; i++) {
+		NMWireGuardPeer *peer = _peers_get (priv, i)->peer;
+
+		if (!nm_wireguard_peer_is_valid (peer, TRUE, FALSE, error)) {
+			g_prefix_error (error,
+			                "%s.%s[%u]: ",
+			                NM_SETTING_WIREGUARD_SETTING_NAME,
+			                NM_SETTING_WIREGUARD_PEERS,
+			                i);
+			return FALSE;
+		}
+	}
+
+	if (connection) {
+		NMSettingIPConfig *s_ip4;
+		NMSettingIPConfig *s_ip6;
+		const char *method;
+
+		/* WireGuard is Layer 3 only. For the moment, we only support a restricted set of
+		 * IP methods. We may relax that later, once we fix the implementations so they
+		 * actually work. */
+
+		if (   (s_ip4 = nm_connection_get_setting_ip4_config (connection))
+		    && (method = nm_setting_ip_config_get_method (s_ip4))
+		    && !NM_IN_STRSET (method, NM_SETTING_IP4_CONFIG_METHOD_DISABLED,
+		                              NM_SETTING_IP4_CONFIG_METHOD_MANUAL)) {
+			g_set_error (error,
+			             NM_CONNECTION_ERROR,
+			             NM_CONNECTION_ERROR_INVALID_PROPERTY,
+			             _("method \"%s\" is not supported for WireGuard"),
+			             method);
+			g_prefix_error (error, "%s.%s: ", NM_SETTING_IP4_CONFIG_SETTING_NAME, NM_SETTING_IP_CONFIG_METHOD);
+			return FALSE;
+		}
+
+		if (   (s_ip6 = nm_connection_get_setting_ip6_config (connection))
+		    && (method = nm_setting_ip_config_get_method (s_ip6))
+		    && !NM_IN_STRSET (method, NM_SETTING_IP6_CONFIG_METHOD_IGNORE,
+		                              NM_SETTING_IP6_CONFIG_METHOD_LINK_LOCAL,
+		                              NM_SETTING_IP6_CONFIG_METHOD_MANUAL)) {
+			g_set_error (error,
+			             NM_CONNECTION_ERROR,
+			             NM_CONNECTION_ERROR_INVALID_PROPERTY,
+			             _("method \"%s\" is not supported for WireGuard"),
+			             method);
+			g_prefix_error (error, "%s.%s: ", NM_SETTING_IP6_CONFIG_SETTING_NAME, NM_SETTING_IP_CONFIG_METHOD);
+			return FALSE;
+		}
+	}
+
+	/* private-key is a secret, hence we cannot verify it like a regular property. */
+	return TRUE;
+}
+
+static gboolean
+verify_secrets (NMSetting *setting, NMConnection *connection, GError **error)
+{
+	NMSettingWireGuardPrivate *priv = NM_SETTING_WIREGUARD_GET_PRIVATE (setting);
+	guint i;
+
+	if (   priv->private_key
+	    && !priv->private_key_valid) {
+		g_set_error_literal (error, NM_CONNECTION_ERROR, NM_CONNECTION_ERROR_INVALID_PROPERTY,
+		                     _("key must be 32 bytes base64 encoded"));
+		g_prefix_error (error, "%s.%s: ", NM_SETTING_WIREGUARD_SETTING_NAME, NM_SETTING_WIREGUARD_PRIVATE_KEY);
+		return FALSE;
+	}
+
+	for (i = 0; i < priv->peers_arr->len; i++) {
+		NMWireGuardPeer *peer = _peers_get (priv, i)->peer;
+
+		if (!nm_wireguard_peer_is_valid (peer, FALSE, TRUE, error)) {
+			g_prefix_error (error,
+			                "%s.%s[%u]: ",
+			                NM_SETTING_WIREGUARD_SETTING_NAME,
+			                NM_SETTING_WIREGUARD_PEERS,
+			                i);
+			return FALSE;
+		}
+	}
+
+	return TRUE;
+}
+
+static GPtrArray *
+need_secrets (NMSetting *setting)
+{
+	NMSettingWireGuardPrivate *priv = NM_SETTING_WIREGUARD_GET_PRIVATE (setting);
+	GPtrArray *secrets = NULL;
+	guint i;
+
+	if (   !priv->private_key
+	    || !priv->private_key_valid) {
+		secrets = g_ptr_array_new_full (1, g_free);
+		g_ptr_array_add (secrets, g_strdup (NM_SETTING_WIREGUARD_PRIVATE_KEY));
+	}
+
+	for (i = 0; i < priv->peers_arr->len; i++) {
+		NMWireGuardPeer *peer = _peers_get (priv, i)->peer;
+
+		if (NM_FLAGS_HAS (peer->preshared_key_flags, NM_SETTING_SECRET_FLAG_NOT_REQUIRED))
+			continue;
+
+		if (peer->preshared_key_valid)
+			continue;
+
+		if (!peer->public_key_valid)
+			continue;
+
+		if (!secrets)
+			secrets = g_ptr_array_new_full (1, g_free);
+		g_ptr_array_add (secrets, peers_psk_get_secret_name_dup (peer->public_key));
+	}
+
+	return secrets;
+}
+
+static gboolean
+clear_secrets (const NMSettInfoSetting *sett_info,
+               guint property_idx,
+               NMSetting *setting,
+               NMSettingClearSecretsWithFlagsFn func,
+               gpointer user_data)
+{
+	if (nm_streq (sett_info->property_infos[property_idx].name, NM_SETTING_WIREGUARD_PEERS)) {
+		NMSettingWireGuardPrivate *priv = NM_SETTING_WIREGUARD_GET_PRIVATE (setting);
+		gboolean peers_changed = FALSE;
+		guint i, j;
+
+		j = 0;
+		for (i = 0; i < priv->peers_arr->len; i++) {
+			NMWireGuardPeer *peer = _peers_get (priv, i)->peer;
+
+			if (!peer->preshared_key)
+				continue;
+
+			if (func) {
+				gs_free char *name_free = NULL;
+				const char *name;
+
+				/* only stack-allocate (alloca) a few times. */
+				if (j++ < 5)
+					name = peers_psk_get_secret_name_a (peer->public_key, &name_free);
+				else {
+					name_free = peers_psk_get_secret_name_dup (peer->public_key);
+					name = name_free;
+				}
+
+				if (!func (setting, name, peer->preshared_key_flags, user_data))
+					continue;
+			}
+
+			{
+				nm_auto_unref_wgpeer NMWireGuardPeer *peer2 = NULL;
+
+				peer2 = nm_wireguard_peer_new_clone (peer, FALSE);
+
+				if (_peers_set (priv, peer2, i, FALSE))
+					peers_changed = TRUE;
+			}
+		}
+
+		if (peers_changed)
+			_peers_notify (setting);
+		return peers_changed;
+	}
+
+	return NM_SETTING_CLASS (nm_setting_wireguard_parent_class)->clear_secrets (sett_info,
+	                                                                            property_idx,
+	                                                                            setting,
+	                                                                            func,
+	                                                                            user_data);
+}
+
+static int
+update_one_secret (NMSetting *setting,
+                   const char *key,
+                   GVariant *value,
+                   GError **error)
+{
+	NMSettingWireGuard *self = NM_SETTING_WIREGUARD (setting);
+	NMSettingWireGuardPrivate *priv;
+	gboolean has_changes = FALSE;
+	gboolean has_error = FALSE;
+	GVariantIter iter_peers;
+	GVariant *peer_var;
+	guint i_peer;
+
+	if (!nm_streq (key, NM_SETTING_WIREGUARD_PEERS)) {
+		return NM_SETTING_CLASS (nm_setting_wireguard_parent_class)->update_one_secret (setting,
+		                                                                                key,
+		                                                                                value,
+		                                                                                error);
+	}
+
+	if (!g_variant_is_of_type (value, G_VARIANT_TYPE ("aa{sv}"))) {
+		g_set_error_literal (error,
+		                     NM_CONNECTION_ERROR,
+		                     NM_CONNECTION_ERROR_PROPERTY_NOT_SECRET,
+		                     _("invalid peer secrets"));
+		g_prefix_error (error, "%s.%s: ", NM_SETTING_WIREGUARD_SETTING_NAME, NM_SETTING_WIREGUARD_PEERS);
+		return NM_SETTING_UPDATE_SECRET_ERROR;
+	}
+
+	priv = NM_SETTING_WIREGUARD_GET_PRIVATE (self);
+
+	g_variant_iter_init (&iter_peers, value);
+
+	i_peer = 0;
+	while (g_variant_iter_next (&iter_peers, "@a{sv}", &peer_var)) {
+		_nm_unused gs_unref_variant GVariant *peer_var_unref = peer_var;
+		PeerData *pd;
+		NMWireGuardPeer *peer;
+		const char *cstr;
+
+		i_peer++;
+
+		if (!g_variant_lookup (peer_var, NM_WIREGUARD_PEER_ATTR_PUBLIC_KEY, "&s", &cstr)) {
+			if (!has_error) {
+				g_set_error (error,
+				             NM_CONNECTION_ERROR,
+				             NM_CONNECTION_ERROR_PROPERTY_NOT_SECRET,
+				             _("peer #%u lacks public-key"),
+				             i_peer - 1);
+				g_prefix_error (error, "%s.%s: ", NM_SETTING_WIREGUARD_SETTING_NAME, NM_SETTING_WIREGUARD_PEERS);
+				has_error = TRUE;
+			}
+			continue;
+		}
+
+		pd = _peers_get_by_public_key (priv, cstr, TRUE);
+		if (!pd) {
+			if (!has_error) {
+				g_set_error (error,
+				             NM_CONNECTION_ERROR,
+				             NM_CONNECTION_ERROR_PROPERTY_NOT_SECRET,
+				             _("non-existing peer '%s'"),
+				             cstr);
+				g_prefix_error (error, "%s.%s: ", NM_SETTING_WIREGUARD_SETTING_NAME, NM_SETTING_WIREGUARD_PEERS);
+				has_error = TRUE;
+			}
+			continue;
+		}
+
+		if (!g_variant_lookup (peer_var, NM_WIREGUARD_PEER_ATTR_PRESHARED_KEY, "&s", &cstr)) {
+			/* no preshared-key. Ignore the rest.
+			 *
+			 * In particular, we don't reject all unknown fields. */
+			continue;
+		}
+
+		if (nm_streq0  (cstr, nm_wireguard_peer_get_preshared_key (pd->peer)))
+			continue;
+
+		peer = nm_wireguard_peer_new_clone (pd->peer, FALSE);
+		nm_wireguard_peer_set_preshared_key (peer, cstr, TRUE);
+
+		if (!_peers_set (priv, peer, pd->idx, FALSE))
+			nm_assert_not_reached ();
+		has_changes = TRUE;
+	}
+
+	if (has_error)
+		return NM_SETTING_UPDATE_SECRET_ERROR;
+	if (has_changes)
+		return NM_SETTING_UPDATE_SECRET_SUCCESS_MODIFIED;
+	return NM_SETTING_UPDATE_SECRET_SUCCESS_UNCHANGED;
+}
+
+static NMTernary
+compare_property (const NMSettInfoSetting *sett_info,
+                  guint property_idx,
+                  NMSetting *setting,
+                  NMSetting *other,
+                  NMSettingCompareFlags flags)
+{
+	NMSettingWireGuardPrivate *a_priv;
+	NMSettingWireGuardPrivate *b_priv;
+	guint i;
+
+	if (nm_streq (sett_info->property_infos[property_idx].name, NM_SETTING_WIREGUARD_PEERS)) {
+
+		if (NM_FLAGS_HAS (flags, NM_SETTING_COMPARE_FLAG_INFERRABLE))
+			return NM_TERNARY_DEFAULT;
+
+		if (!other)
+			return TRUE;
+
+		a_priv = NM_SETTING_WIREGUARD_GET_PRIVATE (setting);
+		b_priv = NM_SETTING_WIREGUARD_GET_PRIVATE (other);
+
+		if (a_priv->peers_arr->len != b_priv->peers_arr->len)
+			return FALSE;
+		for (i = 0; i < a_priv->peers_arr->len; i++) {
+			NMWireGuardPeer *a_peer = _peers_get (a_priv, i)->peer;
+			NMWireGuardPeer *b_peer = _peers_get (b_priv, i)->peer;
+
+			if (nm_wireguard_peer_cmp (a_peer,
+			                           b_peer,
+			                           flags) != 0)
+				return FALSE;
+		}
+
+		return TRUE;
+	}
+
+	return NM_SETTING_CLASS (nm_setting_wireguard_parent_class)->compare_property (sett_info,
+	                                                                               property_idx,
+	                                                                               setting,
+	                                                                               other,
+	                                                                               flags);
+}
+
+static void
+duplicate_copy_properties (const NMSettInfoSetting *sett_info,
+                           NMSetting *src,
+                           NMSetting *dst)
+{
+	NMSettingWireGuardPrivate *priv_src = NM_SETTING_WIREGUARD_GET_PRIVATE (src);
+	NMSettingWireGuardPrivate *priv_dst = NM_SETTING_WIREGUARD_GET_PRIVATE (dst);
+	guint i;
+	gboolean peers_changed = FALSE;
+
+	NM_SETTING_CLASS (nm_setting_wireguard_parent_class)->duplicate_copy_properties (sett_info,
+	                                                                                 src,
+	                                                                                 dst);
+
+	/* We don't bother comparing the existing peers with what we are about to set.
+	 * Always reset all. */
+	if (_peers_clear (priv_dst) > 0)
+		peers_changed = TRUE;
+	for (i = 0; i < priv_src->peers_arr->len; i++) {
+		if (_peers_append (priv_dst,
+		                   _peers_get (priv_src, i)->peer,
+		                   FALSE))
+			peers_changed = TRUE;
+	}
+	if (peers_changed)
+		_peers_notify (dst);
+}
+
+static void
+enumerate_values (const NMSettInfoProperty *property_info,
+                  NMSetting *setting,
+                  NMSettingValueIterFn func,
+                  gpointer user_data)
+{
+	if (nm_streq (property_info->name, NM_SETTING_WIREGUARD_PEERS)) {
+		NMSettingWireGuardPrivate *priv = NM_SETTING_WIREGUARD_GET_PRIVATE (setting);
+		nm_auto_unset_gvalue GValue value = G_VALUE_INIT;
+		GPtrArray *ptr = NULL;
+		guint i;
+
+		if (priv->peers_arr && priv->peers_arr->len > 0) {
+			ptr = g_ptr_array_new_with_free_func ((GDestroyNotify) nm_wireguard_peer_unref);
+			for (i = 0; i < priv->peers_arr->len; i++)
+				g_ptr_array_add (ptr, nm_wireguard_peer_ref (_peers_get (priv, i)->peer));
+		}
+		g_value_init (&value, G_TYPE_PTR_ARRAY);
+		g_value_take_boxed (&value, ptr);
+		func (setting,
+		      property_info->name,
+		      &value,
+		      0,
+		      user_data);
+		return;
+	}
+
+	NM_SETTING_CLASS (nm_setting_wireguard_parent_class)->enumerate_values (property_info,
+	                                                                        setting,
+	                                                                        func,
+	                                                                        user_data);
+}
+
+static gboolean
+aggregate (NMSetting *setting,
+           int type_i,
+           gpointer arg)
+{
+	NMSettingWireGuardPrivate *priv = NM_SETTING_WIREGUARD_GET_PRIVATE (setting);
+	NMConnectionAggregateType type = type_i;
+	NMSettingSecretFlags secret_flags;
+	guint i;
+
+	nm_assert (NM_IN_SET (type, NM_CONNECTION_AGGREGATE_ANY_SECRETS,
+	                            NM_CONNECTION_AGGREGATE_ANY_SYSTEM_SECRET_FLAGS));
+
+	switch (type) {
+
+	case NM_CONNECTION_AGGREGATE_ANY_SECRETS:
+		if (priv->private_key)
+			goto out_done;
+		for (i = 0; i < priv->peers_arr->len; i++) {
+			if (nm_wireguard_peer_get_preshared_key (_peers_get (priv, i)->peer))
+				goto out_done;
+		}
+		break;
+
+	case NM_CONNECTION_AGGREGATE_ANY_SYSTEM_SECRET_FLAGS:
+#if NM_MORE_ASSERTS
+		if (!nm_setting_get_secret_flags (setting, NM_SETTING_WIREGUARD_PRIVATE_KEY, &secret_flags, NULL))
+			nm_assert_not_reached ();
+		nm_assert (secret_flags == priv->private_key_flags);
+#endif
+		if (priv->private_key_flags == NM_SETTING_SECRET_FLAG_NONE)
+			goto out_done;
+		for (i = 0; i < priv->peers_arr->len; i++) {
+			secret_flags = nm_wireguard_peer_get_preshared_key_flags (_peers_get (priv, i)->peer);
+			if (secret_flags == NM_SETTING_SECRET_FLAG_NONE)
+				goto out_done;
+		}
+		break;
+	}
+
+	return FALSE;
+
+out_done:
+	*((gboolean *) arg) = TRUE;
+	return TRUE;
+}
+
+static gboolean
+get_secret_flags (NMSetting *setting,
+                  const char *secret_name,
+                  NMSettingSecretFlags *out_flags,
+                  GError **error)
+{
+	if (NM_STR_HAS_PREFIX (secret_name, NM_SETTING_WIREGUARD_PEERS".")) {
+		NMSettingWireGuardPrivate *priv = NM_SETTING_WIREGUARD_GET_PRIVATE (setting);
+		gs_free char *public_key_free = NULL;
+		const char *public_key;
+		PeerData *pd;
+
+		public_key = peers_psk_get_secret_parse_a (secret_name, &public_key_free);
+		if (   public_key
+		    && (pd = _peers_get_by_public_key (priv, public_key, FALSE))) {
+			NM_SET_OUT (out_flags, nm_wireguard_peer_get_preshared_key_flags (pd->peer));
+			return TRUE;
+		}
+	}
+
+	return NM_SETTING_CLASS (nm_setting_wireguard_parent_class)->get_secret_flags (setting,
+	                                                                               secret_name,
+	                                                                               out_flags,
+	                                                                               error);
+}
+
+static gboolean
+set_secret_flags (NMSetting *setting,
+                  const char *secret_name,
+                  NMSettingSecretFlags flags,
+                  GError **error)
+{
+	if (NM_STR_HAS_PREFIX (secret_name, NM_SETTING_WIREGUARD_PEERS".")) {
+		NMSettingWireGuard *self = NM_SETTING_WIREGUARD (setting);
+		NMSettingWireGuardPrivate *priv = NM_SETTING_WIREGUARD_GET_PRIVATE (self);
+		gs_free char *public_key_free = NULL;
+		const char *public_key;
+		PeerData *pd;
+
+		public_key = peers_psk_get_secret_parse_a (secret_name, &public_key_free);
+		if (   public_key
+		    && (pd = _peers_get_by_public_key (priv, public_key, FALSE))) {
+
+			if (nm_wireguard_peer_get_preshared_key_flags (pd->peer) != flags) {
+				nm_auto_unref_wgpeer NMWireGuardPeer *peer = NULL;
+
+				peer = nm_wireguard_peer_new_clone (pd->peer, TRUE);
+				peer->preshared_key_flags = flags;
+				if (_peers_set (priv, peer, pd->idx, FALSE))
+					_peers_notify (self);
+			}
+
+			return TRUE;
+		}
+	}
+
+	return NM_SETTING_CLASS (nm_setting_wireguard_parent_class)->set_secret_flags (setting,
+	                                                                               secret_name,
+	                                                                               flags,
+	                                                                               error);
+}
+
+static void
+for_each_secret (NMSetting *setting,
+                 const char *data_key,
+                 GVariant *data_val,
+                 gboolean remove_non_secrets,
+                 _NMConnectionForEachSecretFunc callback,
+                 gpointer callback_data,
+                 GVariantBuilder *setting_builder)
+{
+	NMSettingWireGuard *s_wg;
+	NMSettingWireGuardPrivate *priv;
+	GVariantBuilder peers_builder;
+	GVariantIter *peer_iter;
+	GVariantIter data_iter;
+	const char *key;
+
+	if (!nm_streq (data_key, NM_SETTING_WIREGUARD_PEERS)) {
+		NM_SETTING_CLASS (nm_setting_wireguard_parent_class)->for_each_secret (setting,
+		                                                                       data_key,
+		                                                                       data_val,
+		                                                                       remove_non_secrets,
+		                                                                       callback,
+		                                                                       callback_data,
+		                                                                       setting_builder);
+		return;
+	}
+
+	if (!g_variant_is_of_type (data_val, G_VARIANT_TYPE ("aa{sv}"))) {
+		/* invalid type. Silently ignore content as we cannot find secret-keys
+		 * here. */
+		return;
+	}
+
+	s_wg = NM_SETTING_WIREGUARD (setting);
+	priv = NM_SETTING_WIREGUARD_GET_PRIVATE (s_wg);
+
+	g_variant_builder_init (&peers_builder, G_VARIANT_TYPE ("aa{sv}"));
+	g_variant_iter_init (&data_iter, data_val);
+	while (g_variant_iter_next (&data_iter, "a{sv}", &peer_iter)) {
+		_nm_unused nm_auto_free_variant_iter GVariantIter *peer_iter_free = peer_iter;
+		gs_unref_variant GVariant *preshared_key = NULL;
+		PeerData *pd = NULL;
+		NMSettingSecretFlags secret_flags;
+		GVariant *val;
+		GVariantBuilder peer_builder;
+
+		g_variant_builder_init (&peer_builder, G_VARIANT_TYPE ("a{sv}"));
+
+		while (g_variant_iter_next (peer_iter, "{&sv}", &key, &val)) {
+			_nm_unused gs_unref_variant GVariant *val_free = val;
+
+			if (nm_streq (key, NM_WIREGUARD_PEER_ATTR_PRESHARED_KEY)) {
+				if (   !preshared_key
+				    && g_variant_is_of_type (val, G_VARIANT_TYPE_STRING))
+					preshared_key = g_variant_ref (val);
+				continue;
+			}
+
+			if (nm_streq (key, NM_WIREGUARD_PEER_ATTR_PUBLIC_KEY)) {
+				if (   !pd
+				    && g_variant_is_of_type (val, G_VARIANT_TYPE_STRING))
+					pd = _peers_get_by_public_key (priv, g_variant_get_string (val, NULL), TRUE);
+			} else if (remove_non_secrets)
+				continue;
+
+			g_variant_builder_add (&peer_builder, "{sv}", key, val);
+		}
+
+		if (pd && preshared_key) {
+			/* without specifying a public-key of an existing peer, the secret is
+			 * ignored. */
+			secret_flags = nm_wireguard_peer_get_preshared_key_flags (pd->peer);
+			if (callback (secret_flags, callback_data))
+				g_variant_builder_add (&peer_builder, "{sv}", NM_WIREGUARD_PEER_ATTR_PRESHARED_KEY, preshared_key);
+		}
+
+		g_variant_builder_add (&peers_builder, "a{sv}", &peer_builder);
+	}
+
+	g_variant_builder_add (setting_builder,
+	                       "{sv}",
+	                       NM_SETTING_WIREGUARD_PEERS,
+	                       g_variant_builder_end (&peers_builder));
+}
+
+/*****************************************************************************/
+
+static void
+get_property (GObject *object, guint prop_id,
+              GValue *value, GParamSpec *pspec)
+{
+	NMSettingWireGuard *setting = NM_SETTING_WIREGUARD (object);
+	NMSettingWireGuardPrivate *priv = NM_SETTING_WIREGUARD_GET_PRIVATE (setting);
+
+	switch (prop_id) {
+	case PROP_FWMARK:
+		g_value_set_uint (value, priv->fwmark);
+		break;
+	case PROP_LISTEN_PORT:
+		g_value_set_uint (value, priv->listen_port);
+		break;
+	case PROP_MTU:
+		g_value_set_uint (value, priv->mtu);
+		break;
+	case PROP_PEER_ROUTES:
+		g_value_set_boolean (value, priv->peer_routes);
+		break;
+	case PROP_PRIVATE_KEY:
+		g_value_set_string (value, priv->private_key);
+		break;
+	case PROP_PRIVATE_KEY_FLAGS:
+		g_value_set_flags (value, priv->private_key_flags);
+		break;
+	default:
+		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+		break;
+	}
+}
+
+static void
+set_property (GObject *object, guint prop_id,
+              const GValue *value, GParamSpec *pspec)
+{
+	NMSettingWireGuardPrivate *priv = NM_SETTING_WIREGUARD_GET_PRIVATE (object);
+	const char *str;
+
+	switch (prop_id) {
+	case PROP_FWMARK:
+		priv->fwmark = g_value_get_uint (value);
+		break;
+	case PROP_LISTEN_PORT:
+		priv->listen_port = g_value_get_uint (value);
+		break;
+	case PROP_MTU:
+		priv->mtu = g_value_get_uint (value);
+		break;
+	case PROP_PEER_ROUTES:
+		priv->peer_routes = g_value_get_boolean (value);
+		break;
+	case PROP_PRIVATE_KEY:
+		nm_clear_pointer (&priv->private_key, nm_free_secret);
+		str = g_value_get_string (value);
+		if (str) {
+			if (nm_utils_base64secret_normalize (str,
+			                                     NM_WIREGUARD_PUBLIC_KEY_LEN,
+			                                     &priv->private_key))
+				priv->private_key_valid = TRUE;
+			else {
+				priv->private_key = g_strdup (str);
+				priv->private_key_valid = FALSE;
+			}
+		}
+		break;
+	case PROP_PRIVATE_KEY_FLAGS:
+		priv->private_key_flags = g_value_get_flags (value);
+		break;
+	default:
+		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+		break;
+	}
+}
+
+/*****************************************************************************/
+
+static void
+nm_setting_wireguard_init (NMSettingWireGuard *setting)
+{
+	NMSettingWireGuardPrivate *priv = NM_SETTING_WIREGUARD_GET_PRIVATE (setting);
+
+	priv->peers_arr = g_ptr_array_new ();
+	priv->peers_hash = g_hash_table_new (nm_pstr_hash, nm_pstr_equal);
+	priv->peer_routes = TRUE;
+}
+
+/**
+ * nm_setting_wireguard_new:
+ *
+ * Creates a new #NMSettingWireGuard object with default values.
+ *
+ * Returns: (transfer full): the new empty #NMSettingWireGuard object
+ *
+ * Since: 1.16
+ **/
+NMSetting *
+nm_setting_wireguard_new (void)
+{
+	return g_object_new (NM_TYPE_SETTING_WIREGUARD, NULL);
+}
+
+static void
+finalize (GObject *object)
+{
+	NMSettingWireGuardPrivate *priv = NM_SETTING_WIREGUARD_GET_PRIVATE (object);
+
+	nm_free_secret (priv->private_key);
+
+	_peers_clear (priv);
+	g_ptr_array_unref (priv->peers_arr);
+	g_hash_table_unref (priv->peers_hash);
+
+	G_OBJECT_CLASS (nm_setting_wireguard_parent_class)->finalize (object);
+}
+
+static void
+nm_setting_wireguard_class_init (NMSettingWireGuardClass *klass)
+{
+	GObjectClass *object_class = G_OBJECT_CLASS (klass);
+	NMSettingClass *setting_class = NM_SETTING_CLASS (klass);
+	GArray *properties_override = _nm_sett_info_property_override_create_array ();
+
+	object_class->get_property = get_property;
+	object_class->set_property = set_property;
+	object_class->finalize     = finalize;
+
+	setting_class->verify                    = verify;
+	setting_class->verify_secrets            = verify_secrets;
+	setting_class->need_secrets              = need_secrets;
+	setting_class->clear_secrets             = clear_secrets;
+	setting_class->update_one_secret         = update_one_secret;
+	setting_class->compare_property          = compare_property;
+	setting_class->duplicate_copy_properties = duplicate_copy_properties;
+	setting_class->enumerate_values          = enumerate_values;
+	setting_class->aggregate                 = aggregate;
+	setting_class->get_secret_flags          = get_secret_flags;
+	setting_class->set_secret_flags          = set_secret_flags;
+	setting_class->for_each_secret           = for_each_secret;
+
+	/**
+	 * NMSettingWireGuard:private-key:
+	 *
+	 * The 256 bit private-key in base64 encoding.
+	 *
+	 * Since: 1.16
+	 **/
+	obj_properties[PROP_PRIVATE_KEY] =
+	    g_param_spec_string (NM_SETTING_WIREGUARD_PRIVATE_KEY, "", "",
+	                         NULL,
+	                           G_PARAM_READWRITE
+	                         | NM_SETTING_PARAM_SECRET
+	                         | G_PARAM_STATIC_STRINGS);
+
+	/**
+	 * NMSettingWireGuard:private-key-flags:
+	 *
+	 * Flags indicating how to handle the #NMSettingWirelessSecurity:private-key
+	 * property.
+	 *
+	 * Since: 1.16
+	 **/
+	obj_properties[PROP_PRIVATE_KEY_FLAGS] =
+	    g_param_spec_flags (NM_SETTING_WIREGUARD_PRIVATE_KEY_FLAGS, "", "",
+	                        NM_TYPE_SETTING_SECRET_FLAGS,
+	                        NM_SETTING_SECRET_FLAG_NONE,
+	                          G_PARAM_READWRITE
+	                        | G_PARAM_STATIC_STRINGS);
+
+	/**
+	 * NMSettingWireGuard:fwmark:
+	 *
+	 * The use of fwmark is optional and is by default off. Setting it to 0
+	 * disables it. Otherwise it is a 32-bit fwmark for outgoing packets.
+	 *
+	 * Since: 1.16
+	 **/
+	obj_properties[PROP_FWMARK] =
+	    g_param_spec_uint (NM_SETTING_WIREGUARD_FWMARK, "", "",
+	                       0, G_MAXUINT32, 0,
+	                         G_PARAM_READWRITE
+	                       | NM_SETTING_PARAM_INFERRABLE
+	                       | G_PARAM_STATIC_STRINGS);
+
+	/**
+	 * NMSettingWireGuard:listen-port:
+	 *
+	 * The listen-port. If listen-port is not specified, the port will be chosen
+	 * randomly when the interface comes up.
+	 *
+	 * Since: 1.16
+	 **/
+	obj_properties[PROP_LISTEN_PORT] =
+	    g_param_spec_uint (NM_SETTING_WIREGUARD_LISTEN_PORT, "", "",
+	                       0, 65535, 0,
+	                         G_PARAM_READWRITE
+	                       | NM_SETTING_PARAM_INFERRABLE
+	                       | G_PARAM_STATIC_STRINGS);
+
+	/**
+	 * NMSettingWireGuard:peer-routes:
+	 *
+	 * Whether to automatically add routes for the AllowedIPs ranges
+	 * of the peers. If %TRUE (the default), NetworkManager will automatically
+	 * add routes in the routing tables according to ipv4.route-table and
+	 * ipv6.route-table.
+	 * If %FALSE, no such routes are added automatically. In this case, the
+	 * user may want to configure static routes in ipv4.routes and ipv6.routes,
+	 * respectively.
+	 *
+	 * Since: 1.16
+	 **/
+	obj_properties[PROP_PEER_ROUTES] =
+	    g_param_spec_boolean (NM_SETTING_WIREGUARD_PEER_ROUTES, "", "",
+	                          TRUE,
+	                            G_PARAM_READWRITE
+	                          | NM_SETTING_PARAM_INFERRABLE
+	                          | G_PARAM_STATIC_STRINGS);
+
+	/**
+	 * NMSettingWireGuard:mtu:
+	 *
+	 * If non-zero, only transmit packets of the specified size or smaller,
+	 * breaking larger packets up into multiple fragments.
+	 *
+	 * If zero a default MTU is used. Note that contrary to wg-quick's MTU
+	 * setting, this does not take into account the current routes at the
+	 * time of activation.
+	 *
+	 * Since: 1.16
+	 **/
+	obj_properties[PROP_MTU] =
+	    g_param_spec_uint (NM_SETTING_WIREGUARD_MTU, "", "",
+	                       0, G_MAXUINT32, 0,
+	                         G_PARAM_READWRITE
+	                       | NM_SETTING_PARAM_INFERRABLE
+	                       | G_PARAM_STATIC_STRINGS);
+
+	/* ---dbus---
+	 * property: peers
+	 * format: array of 'a{sv}'
+	 * description: Array of dictionaries for the WireGuard peers.
+	 * ---end---
+	 */
+	_properties_override_add_dbus_only (properties_override,
+	                                    NM_SETTING_WIREGUARD_PEERS,
+	                                    G_VARIANT_TYPE ("aa{sv}"),
+	                                    _peers_dbus_only_synth,
+	                                    _peers_dbus_only_set);
+
+	g_object_class_install_properties (object_class, _PROPERTY_ENUMS_LAST, obj_properties);
+
+	_nm_setting_class_commit_full (setting_class, NM_META_SETTING_TYPE_WIREGUARD, NULL, properties_override);
+}
diff --git a/libnm-core/nm-setting-wireguard.h b/libnm-core/nm-setting-wireguard.h
new file mode 100644
index 00000000..017eb1f6
--- /dev/null
+++ b/libnm-core/nm-setting-wireguard.h
@@ -0,0 +1,213 @@
+/*
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301 USA.
+ *
+ * Copyright 2018 - 2019 Red Hat, Inc.
+ */
+
+#ifndef __NM_SETTING_WIREGUARD_H__
+#define __NM_SETTING_WIREGUARD_H__
+
+#if !defined (__NETWORKMANAGER_H_INSIDE__) && !defined (NETWORKMANAGER_COMPILATION)
+#error "Only  can be included directly."
+#endif
+
+#include "nm-setting.h"
+#include "nm-utils.h"
+
+G_BEGIN_DECLS
+
+/*****************************************************************************/
+
+#define NM_WIREGUARD_PUBLIC_KEY_LEN     32
+#define NM_WIREGUARD_SYMMETRIC_KEY_LEN  32
+
+/*****************************************************************************/
+
+typedef struct _NMWireGuardPeer NMWireGuardPeer;
+
+NM_AVAILABLE_IN_1_16
+GType nm_wireguard_peer_get_type (void);
+
+NM_AVAILABLE_IN_1_16
+NMWireGuardPeer *nm_wireguard_peer_new (void);
+
+NM_AVAILABLE_IN_1_16
+NMWireGuardPeer *nm_wireguard_peer_new_clone (const NMWireGuardPeer *self,
+                                              gboolean with_secrets);
+
+NM_AVAILABLE_IN_1_16
+NMWireGuardPeer *nm_wireguard_peer_ref (NMWireGuardPeer *self);
+NM_AVAILABLE_IN_1_16
+void nm_wireguard_peer_unref (NMWireGuardPeer *self);
+
+NM_AVAILABLE_IN_1_16
+void nm_wireguard_peer_seal (NMWireGuardPeer *self);
+NM_AVAILABLE_IN_1_16
+gboolean nm_wireguard_peer_is_sealed (const NMWireGuardPeer *self);
+
+NM_AVAILABLE_IN_1_16
+const char *nm_wireguard_peer_get_public_key (const NMWireGuardPeer *self);
+NM_AVAILABLE_IN_1_16
+gboolean nm_wireguard_peer_set_public_key (NMWireGuardPeer *self,
+                                           const char *public_key,
+                                           gboolean accept_invalid);
+
+NM_AVAILABLE_IN_1_16
+const char *nm_wireguard_peer_get_preshared_key (const NMWireGuardPeer *self);
+NM_AVAILABLE_IN_1_16
+gboolean nm_wireguard_peer_set_preshared_key (NMWireGuardPeer *self,
+                                              const char *preshared_key,
+                                              gboolean accept_invalid);
+
+NM_AVAILABLE_IN_1_16
+NMSettingSecretFlags nm_wireguard_peer_get_preshared_key_flags (const NMWireGuardPeer *self);
+NM_AVAILABLE_IN_1_16
+void nm_wireguard_peer_set_preshared_key_flags (NMWireGuardPeer *self,
+                                                NMSettingSecretFlags preshared_key_flags);
+
+NM_AVAILABLE_IN_1_16
+guint16 nm_wireguard_peer_get_persistent_keepalive (const NMWireGuardPeer *self);
+NM_AVAILABLE_IN_1_16
+void nm_wireguard_peer_set_persistent_keepalive (NMWireGuardPeer *self,
+                                                 guint16 persistent_keepalive);
+
+NM_AVAILABLE_IN_1_16
+const char *nm_wireguard_peer_get_endpoint (const NMWireGuardPeer *self);
+NM_AVAILABLE_IN_1_16
+gboolean nm_wireguard_peer_set_endpoint (NMWireGuardPeer *self,
+                                         const char *endpoint,
+                                         gboolean allow_invalid);
+
+NM_AVAILABLE_IN_1_16
+guint nm_wireguard_peer_get_allowed_ips_len (const NMWireGuardPeer *self);
+NM_AVAILABLE_IN_1_16
+const char *nm_wireguard_peer_get_allowed_ip (const NMWireGuardPeer *self,
+                                              guint idx,
+                                              gboolean *out_is_valid);
+NM_AVAILABLE_IN_1_16
+void nm_wireguard_peer_clear_allowed_ips (NMWireGuardPeer *self);
+NM_AVAILABLE_IN_1_16
+gboolean nm_wireguard_peer_append_allowed_ip (NMWireGuardPeer *self,
+                                              const char *allowed_ip,
+                                              gboolean accept_invalid);
+NM_AVAILABLE_IN_1_16
+gboolean nm_wireguard_peer_remove_allowed_ip (NMWireGuardPeer *self,
+                                              guint idx);
+
+NM_AVAILABLE_IN_1_16
+gboolean nm_wireguard_peer_is_valid (const NMWireGuardPeer *self,
+                                     gboolean check_non_secrets,
+                                     gboolean check_secrets,
+                                     GError **error);
+
+NM_AVAILABLE_IN_1_16
+int nm_wireguard_peer_cmp (const NMWireGuardPeer *a,
+                           const NMWireGuardPeer *b,
+                           NMSettingCompareFlags compare_flags);
+
+/*****************************************************************************/
+
+#define NM_TYPE_SETTING_WIREGUARD            (nm_setting_wireguard_get_type ())
+#define NM_SETTING_WIREGUARD(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_SETTING_WIREGUARD, NMSettingWireGuard))
+#define NM_SETTING_WIREGUARD_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_SETTING_WIREGUARD, NMSettingWireGuardClass))
+#define NM_IS_SETTING_WIREGUARD(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NM_TYPE_SETTING_WIREGUARD))
+#define NM_IS_SETTING_WIREGUARD_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), NM_TYPE_SETTING_WIREGUARD))
+#define NM_SETTING_WIREGUARD_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_SETTING_WIREGUARD, NMSettingWireGuardClass))
+
+#define NM_SETTING_WIREGUARD_SETTING_NAME "wireguard"
+
+#define NM_SETTING_WIREGUARD_FWMARK            "fwmark"
+#define NM_SETTING_WIREGUARD_LISTEN_PORT       "listen-port"
+#define NM_SETTING_WIREGUARD_PRIVATE_KEY       "private-key"
+#define NM_SETTING_WIREGUARD_PRIVATE_KEY_FLAGS "private-key-flags"
+
+#define NM_SETTING_WIREGUARD_PEERS             "peers"
+
+#define NM_SETTING_WIREGUARD_MTU               "mtu"
+#define NM_SETTING_WIREGUARD_PEER_ROUTES       "peer-routes"
+
+#define NM_WIREGUARD_PEER_ATTR_ALLOWED_IPS          "allowed-ips"
+#define NM_WIREGUARD_PEER_ATTR_ENDPOINT             "endpoint"
+#define NM_WIREGUARD_PEER_ATTR_PERSISTENT_KEEPALIVE "persistent-keepalive"
+#define NM_WIREGUARD_PEER_ATTR_PRESHARED_KEY        "preshared-key"
+#define NM_WIREGUARD_PEER_ATTR_PRESHARED_KEY_FLAGS  "preshared-key-flags"
+#define NM_WIREGUARD_PEER_ATTR_PUBLIC_KEY           "public-key"
+
+/*****************************************************************************/
+
+typedef struct _NMSettingWireGuardClass NMSettingWireGuardClass;
+
+NM_AVAILABLE_IN_1_16
+GType nm_setting_wireguard_get_type (void);
+
+NM_AVAILABLE_IN_1_16
+NMSetting *nm_setting_wireguard_new (void);
+
+/*****************************************************************************/
+
+NM_AVAILABLE_IN_1_16
+const char *nm_setting_wireguard_get_private_key (NMSettingWireGuard *self);
+
+NM_AVAILABLE_IN_1_16
+NMSettingSecretFlags nm_setting_wireguard_get_private_key_flags (NMSettingWireGuard *self);
+
+NM_AVAILABLE_IN_1_16
+guint16 nm_setting_wireguard_get_listen_port (NMSettingWireGuard *self);
+
+NM_AVAILABLE_IN_1_16
+guint32 nm_setting_wireguard_get_fwmark (NMSettingWireGuard *self);
+
+/*****************************************************************************/
+
+NM_AVAILABLE_IN_1_16
+guint nm_setting_wireguard_get_peers_len (NMSettingWireGuard *self);
+
+NM_AVAILABLE_IN_1_16
+NMWireGuardPeer *nm_setting_wireguard_get_peer (NMSettingWireGuard *self,
+                                                guint idx);
+
+NM_AVAILABLE_IN_1_16
+NMWireGuardPeer *nm_setting_wireguard_get_peer_by_public_key (NMSettingWireGuard *self,
+                                                              const char *public_key,
+                                                              guint *out_idx);
+
+NM_AVAILABLE_IN_1_16
+void nm_setting_wireguard_set_peer (NMSettingWireGuard *self,
+                                    NMWireGuardPeer *peer,
+                                    guint idx);
+
+NM_AVAILABLE_IN_1_16
+void nm_setting_wireguard_append_peer (NMSettingWireGuard *self,
+                                       NMWireGuardPeer *peer);
+
+NM_AVAILABLE_IN_1_16
+gboolean nm_setting_wireguard_remove_peer (NMSettingWireGuard *self,
+                                           guint idx);
+
+NM_AVAILABLE_IN_1_16
+guint nm_setting_wireguard_clear_peers (NMSettingWireGuard *self);
+
+NM_AVAILABLE_IN_1_16
+gboolean nm_setting_wireguard_get_peer_routes (NMSettingWireGuard *self);
+
+NM_AVAILABLE_IN_1_16
+guint32 nm_setting_wireguard_get_mtu (NMSettingWireGuard *self);
+
+/*****************************************************************************/
+
+G_END_DECLS
+
+#endif /* __NM_SETTING_WIREGUARD_H__ */
diff --git a/libnm-core/nm-setting-wireless-security.c b/libnm-core/nm-setting-wireless-security.c
index d1527821..f689751e 100644
--- a/libnm-core/nm-setting-wireless-security.c
+++ b/libnm-core/nm-setting-wireless-security.c
@@ -22,9 +22,8 @@
 
 #include "nm-default.h"
 
-#include 
-
 #include "nm-setting-wireless-security.h"
+
 #include "nm-setting-8021x.h"
 #include "nm-utils.h"
 #include "nm-utils-private.h"
@@ -53,9 +52,30 @@
  *       ISBN: 978-1587051548
  **/
 
-G_DEFINE_TYPE (NMSettingWirelessSecurity, nm_setting_wireless_security, NM_TYPE_SETTING)
+/*****************************************************************************/
 
-#define NM_SETTING_WIRELESS_SECURITY_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_SETTING_WIRELESS_SECURITY, NMSettingWirelessSecurityPrivate))
+NM_GOBJECT_PROPERTIES_DEFINE (NMSettingWirelessSecurity,
+	PROP_KEY_MGMT,
+	PROP_WEP_TX_KEYIDX,
+	PROP_AUTH_ALG,
+	PROP_PROTO,
+	PROP_PAIRWISE,
+	PROP_GROUP,
+	PROP_PMF,
+	PROP_LEAP_USERNAME,
+	PROP_WEP_KEY0,
+	PROP_WEP_KEY1,
+	PROP_WEP_KEY2,
+	PROP_WEP_KEY3,
+	PROP_WEP_KEY_FLAGS,
+	PROP_WEP_KEY_TYPE,
+	PROP_PSK,
+	PROP_PSK_FLAGS,
+	PROP_LEAP_PASSWORD,
+	PROP_LEAP_PASSWORD_FLAGS,
+	PROP_WPS_METHOD,
+	PROP_FILS,
+);
 
 typedef struct {
 	char *key_mgmt;
@@ -90,44 +110,11 @@ typedef struct {
 	NMSettingWirelessSecurityFils fils;
 } NMSettingWirelessSecurityPrivate;
 
-enum {
-	PROP_0,
-	PROP_KEY_MGMT,
-	PROP_WEP_TX_KEYIDX,
-	PROP_AUTH_ALG,
-	PROP_PROTO,
-	PROP_PAIRWISE,
-	PROP_GROUP,
-	PROP_PMF,
-	PROP_LEAP_USERNAME,
-	PROP_WEP_KEY0,
-	PROP_WEP_KEY1,
-	PROP_WEP_KEY2,
-	PROP_WEP_KEY3,
-	PROP_WEP_KEY_FLAGS,
-	PROP_WEP_KEY_TYPE,
-	PROP_PSK,
-	PROP_PSK_FLAGS,
-	PROP_LEAP_PASSWORD,
-	PROP_LEAP_PASSWORD_FLAGS,
-	PROP_WPS_METHOD,
-	PROP_FILS,
+G_DEFINE_TYPE (NMSettingWirelessSecurity, nm_setting_wireless_security, NM_TYPE_SETTING)
 
-	LAST_PROP
-};
+#define NM_SETTING_WIRELESS_SECURITY_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_SETTING_WIRELESS_SECURITY, NMSettingWirelessSecurityPrivate))
 
-/**
- * nm_setting_wireless_security_new:
- *
- * Creates a new #NMSettingWirelessSecurity object with default values.
- *
- * Returns: (transfer full): the new empty #NMSettingWirelessSecurity object
- **/
-NMSetting *
-nm_setting_wireless_security_new (void)
-{
-	return (NMSetting *) g_object_new (NM_TYPE_SETTING_WIRELESS_SECURITY, NULL);
-}
+/*****************************************************************************/
 
 /**
  * nm_setting_wireless_security_get_key_mgmt:
@@ -209,7 +196,7 @@ nm_setting_wireless_security_add_proto (NMSettingWirelessSecurity *setting, cons
 	}
 
 	priv->proto = g_slist_append (priv->proto, g_ascii_strdown (proto, -1));
-	g_object_notify (G_OBJECT (setting), NM_SETTING_WIRELESS_SECURITY_PROTO);
+	_notify (setting, PROP_PROTO);
 	return TRUE;
 }
 
@@ -234,7 +221,7 @@ nm_setting_wireless_security_remove_proto (NMSettingWirelessSecurity *setting, g
 
 	g_free (elt->data);
 	priv->proto = g_slist_delete_link (priv->proto, elt);
-	g_object_notify (G_OBJECT (setting), NM_SETTING_WIRELESS_SECURITY_PROTO);
+	_notify (setting, PROP_PROTO);
 }
 
 /**
@@ -260,7 +247,7 @@ nm_setting_wireless_security_remove_proto_by_value (NMSettingWirelessSecurity *s
 	for (iter = priv->proto; iter; iter = g_slist_next (iter)) {
 		if (strcasecmp (proto, (char *) iter->data) == 0) {
 			priv->proto = g_slist_delete_link (priv->proto, iter);
-			g_object_notify (G_OBJECT (setting), NM_SETTING_WIRELESS_SECURITY_PROTO);
+			_notify (setting, PROP_PROTO);
 			return TRUE;
 		}
 	}
@@ -284,7 +271,7 @@ nm_setting_wireless_security_clear_protos (NMSettingWirelessSecurity *setting)
 	priv = NM_SETTING_WIRELESS_SECURITY_GET_PRIVATE (setting);
 	g_slist_free_full (priv->proto, g_free);
 	priv->proto = NULL;
-	g_object_notify (G_OBJECT (setting), NM_SETTING_WIRELESS_SECURITY_PROTO);
+	_notify (setting, PROP_PROTO);
 }
 
 /**
@@ -353,7 +340,7 @@ nm_setting_wireless_security_add_pairwise (NMSettingWirelessSecurity *setting, c
 	}
 
 	priv->pairwise = g_slist_append (priv->pairwise, g_ascii_strdown (pairwise, -1));
-	g_object_notify (G_OBJECT (setting), NM_SETTING_WIRELESS_SECURITY_PAIRWISE);
+	_notify (setting, PROP_PAIRWISE);
 	return TRUE;
 }
 
@@ -379,7 +366,7 @@ nm_setting_wireless_security_remove_pairwise (NMSettingWirelessSecurity *setting
 
 	g_free (elt->data);
 	priv->pairwise = g_slist_delete_link (priv->pairwise, elt);
-	g_object_notify (G_OBJECT (setting), NM_SETTING_WIRELESS_SECURITY_PAIRWISE);
+	_notify (setting, PROP_PAIRWISE);
 }
 
 /**
@@ -390,7 +377,7 @@ nm_setting_wireless_security_remove_pairwise (NMSettingWirelessSecurity *setting
  * Removes an encryption algorithm from the allowed pairwise encryption
  * algorithm list.
  *
- * Returns: %TRUE if the encryption algorith was found and removed; %FALSE if it was not.
+ * Returns: %TRUE if the encryption algorithm was found and removed; %FALSE if it was not.
  **/
 gboolean
 nm_setting_wireless_security_remove_pairwise_by_value (NMSettingWirelessSecurity *setting,
@@ -406,7 +393,7 @@ nm_setting_wireless_security_remove_pairwise_by_value (NMSettingWirelessSecurity
 	for (iter = priv->pairwise; iter; iter = g_slist_next (iter)) {
 		if (strcasecmp (pairwise, (char *) iter->data) == 0) {
 			priv->pairwise = g_slist_delete_link (priv->pairwise, iter);
-			g_object_notify (G_OBJECT (setting), NM_SETTING_WIRELESS_SECURITY_PAIRWISE);
+			_notify (setting, PROP_PAIRWISE);
 			return TRUE;
 		}
 	}
@@ -430,7 +417,7 @@ nm_setting_wireless_security_clear_pairwise (NMSettingWirelessSecurity *setting)
 	priv = NM_SETTING_WIRELESS_SECURITY_GET_PRIVATE (setting);
 	g_slist_free_full (priv->pairwise, g_free);
 	priv->pairwise = NULL;
-	g_object_notify (G_OBJECT (setting), NM_SETTING_WIRELESS_SECURITY_PAIRWISE);
+	_notify (setting, PROP_PAIRWISE);
 }
 
 /**
@@ -500,7 +487,7 @@ nm_setting_wireless_security_add_group (NMSettingWirelessSecurity *setting, cons
 	}
 
 	priv->group = g_slist_append (priv->group, g_ascii_strdown (group, -1));
-	g_object_notify (G_OBJECT (setting), NM_SETTING_WIRELESS_SECURITY_GROUP);
+	_notify (setting, PROP_GROUP);
 	return TRUE;
 }
 
@@ -526,7 +513,7 @@ nm_setting_wireless_security_remove_group (NMSettingWirelessSecurity *setting, g
 
 	g_free (elt->data);
 	priv->group = g_slist_delete_link (priv->group, elt);
-	g_object_notify (G_OBJECT (setting), NM_SETTING_WIRELESS_SECURITY_GROUP);
+	_notify (setting, PROP_GROUP);
 }
 
 /**
@@ -554,7 +541,7 @@ nm_setting_wireless_security_remove_group_by_value (NMSettingWirelessSecurity *s
 	for (iter = priv->group; iter; iter = g_slist_next (iter)) {
 		if (strcasecmp (group, (char *) iter->data) == 0) {
 			priv->group = g_slist_delete_link (priv->group, iter);
-			g_object_notify (G_OBJECT (setting), NM_SETTING_WIRELESS_SECURITY_GROUP);
+			_notify (setting, PROP_GROUP);
 			return TRUE;
 		}
 	}
@@ -578,7 +565,7 @@ nm_setting_wireless_security_clear_groups (NMSettingWirelessSecurity *setting)
 	priv = NM_SETTING_WIRELESS_SECURITY_GET_PRIVATE (setting);
 	g_slist_free_full (priv->group, g_free);
 	priv->group = NULL;
-	g_object_notify (G_OBJECT (setting), NM_SETTING_WIRELESS_SECURITY_GROUP);
+	_notify (setting, PROP_GROUP);
 }
 
 /*
@@ -721,22 +708,22 @@ nm_setting_wireless_security_set_wep_key (NMSettingWirelessSecurity *setting, gu
 	case 0:
 		g_free (priv->wep_key0);
 		priv->wep_key0 = g_strdup (key);
-		g_object_notify (G_OBJECT (setting), NM_SETTING_WIRELESS_SECURITY_WEP_KEY0);
+		_notify (setting, PROP_WEP_KEY0);
 		break;
 	case 1:
 		g_free (priv->wep_key1);
 		priv->wep_key1 = g_strdup (key);
-		g_object_notify (G_OBJECT (setting), NM_SETTING_WIRELESS_SECURITY_WEP_KEY1);
+		_notify (setting, PROP_WEP_KEY1);
 		break;
 	case 2:
 		g_free (priv->wep_key2);
 		priv->wep_key2 = g_strdup (key);
-		g_object_notify (G_OBJECT (setting), NM_SETTING_WIRELESS_SECURITY_WEP_KEY2);
+		_notify (setting, PROP_WEP_KEY2);
 		break;
 	case 3:
 		g_free (priv->wep_key3);
 		priv->wep_key3 = g_strdup (key);
-		g_object_notify (G_OBJECT (setting), NM_SETTING_WIRELESS_SECURITY_WEP_KEY3);
+		_notify (setting, PROP_WEP_KEY3);
 		break;
 	default:
 		g_assert_not_reached ();
@@ -874,6 +861,15 @@ need_secrets (NMSetting *setting)
 		goto no_secrets;
 	}
 
+	/* SAE, used in MESH and WPA3-Personal */
+	if (strcmp (priv->key_mgmt, "sae") == 0) {
+		if (!priv->psk || !*priv->psk) {
+			g_ptr_array_add (secrets, NM_SETTING_WIRELESS_SECURITY_PSK);
+			return secrets;
+		}
+		goto no_secrets;
+	}
+
 	/* LEAP */
 	if (   priv->auth_alg
 	    && !strcmp (priv->auth_alg, "leap")
@@ -905,7 +901,7 @@ verify (NMSetting *setting, NMConnection *connection, GError **error)
 {
 	NMSettingWirelessSecurity *self = NM_SETTING_WIRELESS_SECURITY (setting);
 	NMSettingWirelessSecurityPrivate *priv = NM_SETTING_WIRELESS_SECURITY_GET_PRIVATE (self);
-	const char *valid_key_mgmt[] = { "none", "ieee8021x", "wpa-none", "wpa-psk", "wpa-eap", NULL };
+	const char *valid_key_mgmt[] = { "none", "ieee8021x", "wpa-none", "wpa-psk", "wpa-eap", "sae", NULL };
 	const char *valid_auth_algs[] = { "open", "shared", "leap", NULL };
 	const char *valid_protos[] = { "wpa", "rsn", NULL };
 	const char *valid_pairwise[] = { "tkip", "ccmp", NULL };
@@ -1083,36 +1079,22 @@ verify (NMSetting *setting, NMConnection *connection, GError **error)
 	if (   NM_IN_SET (priv->pmf,
 	                  NM_SETTING_WIRELESS_SECURITY_PMF_OPTIONAL,
 	                  NM_SETTING_WIRELESS_SECURITY_PMF_REQUIRED)
-	    && !NM_IN_STRSET (priv->key_mgmt, "wpa-eap", "wpa-psk")) {
+	    && !NM_IN_STRSET (priv->key_mgmt, "wpa-eap", "wpa-psk", "sae")) {
 		g_set_error (error,
 		             NM_CONNECTION_ERROR,
 		             NM_CONNECTION_ERROR_INVALID_PROPERTY,
-		             _("'%s' can only be used with '%s=%s' or '%s=%s'"),
-		             priv->pmf == NM_SETTING_WIRELESS_SECURITY_PMF_OPTIONAL ? "optional" : "required",
-		             NM_SETTING_WIRELESS_SECURITY_KEY_MGMT, "wpa-eap",
-		             NM_SETTING_WIRELESS_SECURITY_KEY_MGMT, "wpa-psk");
+		             _("'%s' can only be used with 'wpa-eap', 'wpa-psk' or 'sae' key management "),
+		             priv->pmf == NM_SETTING_WIRELESS_SECURITY_PMF_OPTIONAL ? "optional" : "required");
 		g_prefix_error (error, "%s.%s: ", NM_SETTING_WIRELESS_SECURITY_SETTING_NAME, NM_SETTING_WIRELESS_SECURITY_PMF);
 		return FALSE;
 	}
 
-	/* WPS */
-	if (priv->wps_method > NM_SETTING_WIRELESS_SECURITY_WPS_METHOD_PIN) {
-		g_set_error_literal (error,
-		                     NM_CONNECTION_ERROR,
-		                     NM_CONNECTION_ERROR_INVALID_PROPERTY,
-		                     _("property is invalid"));
-		g_prefix_error (error, "%s.%s: ", NM_SETTING_WIRELESS_SECURITY_SETTING_NAME, NM_SETTING_WIRELESS_SECURITY_WPS_METHOD);
-		return FALSE;
-	}
-
-	if (priv->wps_method & NM_SETTING_WIRELESS_SECURITY_WPS_METHOD_DISABLED && priv->wps_method != NM_SETTING_WIRELESS_SECURITY_WPS_METHOD_DISABLED) {
-		g_set_error_literal (error,
-		                     NM_CONNECTION_ERROR,
-		                     NM_CONNECTION_ERROR_INVALID_PROPERTY,
-		                     _("can't be simultaneously disabled and enabled"));
-		g_prefix_error (error, "%s.%s: ", NM_SETTING_WIRELESS_SECURITY_SETTING_NAME, NM_SETTING_WIRELESS_SECURITY_WPS_METHOD);
+	if (!_nm_utils_wps_method_validate (priv->wps_method,
+	                                    NM_SETTING_WIRELESS_SECURITY_SETTING_NAME,
+	                                    NM_SETTING_WIRELESS_SECURITY_WPS_METHOD,
+	                                    FALSE,
+	                                    error))
 		return FALSE;
-	}
 
 	return TRUE;
 }
@@ -1162,7 +1144,9 @@ verify_secrets (NMSetting *setting, NMConnection *connection, GError **error)
 		return FALSE;
 
 	/* WPA-PSK */
-	if (priv->psk && !nm_utils_wpa_psk_valid (priv->psk)) {
+	if (   priv->psk
+	    && strcmp (priv->key_mgmt, "sae") != 0
+	    && !nm_utils_wpa_psk_valid (priv->psk)) {
 		g_set_error_literal (error,
 		                     NM_CONNECTION_ERROR,
 		                     NM_CONNECTION_ERROR_INVALID_PROPERTY,
@@ -1177,83 +1161,56 @@ verify_secrets (NMSetting *setting, NMConnection *connection, GError **error)
 static gboolean
 get_secret_flags (NMSetting *setting,
                   const char *secret_name,
-                  gboolean verify_secret,
                   NMSettingSecretFlags *out_flags,
                   GError **error)
 {
-	NMSettingClass *setting_class;
-	gboolean verify_override = verify_secret;
-
-	/* There's only one 'flags' property for WEP keys, so alias all the WEP key
-	 * property names to that flags property.
-	 */
-	if (   !g_strcmp0 (secret_name, NM_SETTING_WIRELESS_SECURITY_WEP_KEY0)
-	    || !g_strcmp0 (secret_name, NM_SETTING_WIRELESS_SECURITY_WEP_KEY1)
-	    || !g_strcmp0 (secret_name, NM_SETTING_WIRELESS_SECURITY_WEP_KEY2)
-	    || !g_strcmp0 (secret_name, NM_SETTING_WIRELESS_SECURITY_WEP_KEY3)) {
-		secret_name = "wep-key";
-		verify_override = FALSE; /* Already know it's a secret */
+	NMSettingSecretFlags flags;
+
+	if (NM_IN_STRSET (secret_name, NM_SETTING_WIRELESS_SECURITY_WEP_KEY0,
+	                               NM_SETTING_WIRELESS_SECURITY_WEP_KEY1,
+	                               NM_SETTING_WIRELESS_SECURITY_WEP_KEY2,
+	                               NM_SETTING_WIRELESS_SECURITY_WEP_KEY3)) {
+		/* There's only one 'flags' property for WEP keys, so alias all the WEP key
+		 * property names to that flags property. */
+		nm_assert (_nm_setting_property_is_regular_secret (setting, secret_name));
+		nm_assert (_nm_setting_property_is_regular_secret_flags (setting, NM_SETTING_WIRELESS_SECURITY_WEP_KEY_FLAGS));
+
+		g_object_get (G_OBJECT (setting),
+		              NM_SETTING_WIRELESS_SECURITY_WEP_KEY_FLAGS,
+		              &flags,
+		              NULL);
+		NM_SET_OUT (out_flags, flags);
+		return TRUE;
 	}
 
-	/* Chain up to superclass with modified key name */
-	setting_class = NM_SETTING_CLASS (nm_setting_wireless_security_parent_class);
-	return setting_class->get_secret_flags (setting, secret_name, verify_override, out_flags, error);
+	return NM_SETTING_CLASS (nm_setting_wireless_security_parent_class)->get_secret_flags (setting, secret_name, out_flags, error);
 }
 
 static gboolean
 set_secret_flags (NMSetting *setting,
                   const char *secret_name,
-                  gboolean verify_secret,
                   NMSettingSecretFlags flags,
                   GError **error)
 {
-	NMSettingClass *setting_class;
-	gboolean verify_override = verify_secret;
-
-	/* There's only one 'flags' property for WEP keys, so alias all the WEP key
-	 * property names to that flags property.
-	 */
-	if (   !g_strcmp0 (secret_name, NM_SETTING_WIRELESS_SECURITY_WEP_KEY0)
-	    || !g_strcmp0 (secret_name, NM_SETTING_WIRELESS_SECURITY_WEP_KEY1)
-	    || !g_strcmp0 (secret_name, NM_SETTING_WIRELESS_SECURITY_WEP_KEY2)
-	    || !g_strcmp0 (secret_name, NM_SETTING_WIRELESS_SECURITY_WEP_KEY3)) {
-		secret_name = "wep-key";
-		verify_override = FALSE; /* Already know it's a secret */
+	if (NM_IN_STRSET (secret_name, NM_SETTING_WIRELESS_SECURITY_WEP_KEY0,
+	                               NM_SETTING_WIRELESS_SECURITY_WEP_KEY1,
+	                               NM_SETTING_WIRELESS_SECURITY_WEP_KEY2,
+	                               NM_SETTING_WIRELESS_SECURITY_WEP_KEY3)) {
+		/* There's only one 'flags' property for WEP keys, so alias all the WEP key
+		 * property names to that flags property. */
+		nm_assert (_nm_setting_property_is_regular_secret (setting, secret_name));
+		nm_assert (_nm_setting_property_is_regular_secret_flags (setting, NM_SETTING_WIRELESS_SECURITY_WEP_KEY_FLAGS));
+
+		if (!nm_g_object_set_property_flags (G_OBJECT (setting),
+		                                     NM_SETTING_WIRELESS_SECURITY_WEP_KEY_FLAGS,
+		                                     NM_TYPE_SETTING_SECRET_FLAGS,
+		                                     flags,
+		                                     error))
+			g_return_val_if_reached (FALSE);
+		return TRUE;
 	}
 
-	/* Chain up to superclass with modified key name */
-	setting_class = NM_SETTING_CLASS (nm_setting_wireless_security_parent_class);
-	return setting_class->set_secret_flags (setting, secret_name, verify_override, flags, error);
-}
-
-static void
-nm_setting_wireless_security_init (NMSettingWirelessSecurity *setting)
-{
-}
-
-static void
-finalize (GObject *object)
-{
-	NMSettingWirelessSecurity *self = NM_SETTING_WIRELESS_SECURITY (object);
-	NMSettingWirelessSecurityPrivate *priv = NM_SETTING_WIRELESS_SECURITY_GET_PRIVATE (self);
-
-	/* Strings first. g_free() already checks for NULLs so we don't have to */
-
-	g_free (priv->key_mgmt);
-	g_free (priv->auth_alg);
-	g_free (priv->leap_username);
-	g_free (priv->wep_key0);
-	g_free (priv->wep_key1);
-	g_free (priv->wep_key2);
-	g_free (priv->wep_key3);
-	g_free (priv->psk);
-	g_free (priv->leap_password);
-
-	g_slist_free_full (priv->proto, g_free);
-	g_slist_free_full (priv->pairwise, g_free);
-	g_slist_free_full (priv->group, g_free);
-
-	G_OBJECT_CLASS (nm_setting_wireless_security_parent_class)->finalize (object);
+	return NM_SETTING_CLASS (nm_setting_wireless_security_parent_class)->set_secret_flags (setting, secret_name, flags, error);
 }
 
 /* NMSettingWirelessSecurity:wep-key-type is an enum, but needs to be marshalled
@@ -1265,88 +1222,75 @@ wep_key_type_to_dbus (const GValue *from)
 	return g_variant_new_uint32 (g_value_get_enum (from));
 }
 
+/*****************************************************************************/
+
 static void
-set_property (GObject *object, guint prop_id,
-              const GValue *value, GParamSpec *pspec)
+get_property (GObject *object, guint prop_id,
+              GValue *value, GParamSpec *pspec)
 {
 	NMSettingWirelessSecurity *setting = NM_SETTING_WIRELESS_SECURITY (object);
 	NMSettingWirelessSecurityPrivate *priv = NM_SETTING_WIRELESS_SECURITY_GET_PRIVATE (setting);
-	const char *str;
 
 	switch (prop_id) {
 	case PROP_KEY_MGMT:
-		g_free (priv->key_mgmt);
-		str = g_value_get_string (value);
-		priv->key_mgmt = str ? g_ascii_strdown (str, -1) : NULL;
+		g_value_set_string (value, priv->key_mgmt);
 		break;
 	case PROP_WEP_TX_KEYIDX:
-		priv->wep_tx_keyidx = g_value_get_uint (value);
+		g_value_set_uint (value, priv->wep_tx_keyidx);
 		break;
 	case PROP_AUTH_ALG:
-		g_free (priv->auth_alg);
-		str = g_value_get_string (value);
-		priv->auth_alg = str ? g_ascii_strdown (str, -1) : NULL;
+		g_value_set_string (value, priv->auth_alg);
 		break;
 	case PROP_PROTO:
-		g_slist_free_full (priv->proto, g_free);
-		priv->proto = _nm_utils_strv_to_slist (g_value_get_boxed (value), TRUE);
+		g_value_take_boxed (value, _nm_utils_slist_to_strv (priv->proto, TRUE));
 		break;
 	case PROP_PAIRWISE:
-		g_slist_free_full (priv->pairwise, g_free);
-		priv->pairwise = _nm_utils_strv_to_slist (g_value_get_boxed (value), TRUE);
+		g_value_take_boxed (value, _nm_utils_slist_to_strv (priv->pairwise, TRUE));
 		break;
 	case PROP_GROUP:
-		g_slist_free_full (priv->group, g_free);
-		priv->group = _nm_utils_strv_to_slist (g_value_get_boxed (value), TRUE);
+		g_value_take_boxed (value, _nm_utils_slist_to_strv (priv->group, TRUE));
 		break;
 	case PROP_PMF:
-		priv->pmf = g_value_get_int (value);
+		g_value_set_int (value, nm_setting_wireless_security_get_pmf (setting));
 		break;
 	case PROP_LEAP_USERNAME:
-		g_free (priv->leap_username);
-		priv->leap_username = g_value_dup_string (value);
+		g_value_set_string (value, priv->leap_username);
 		break;
 	case PROP_WEP_KEY0:
-		g_free (priv->wep_key0);
-		priv->wep_key0 = g_value_dup_string (value);
+		g_value_set_string (value, priv->wep_key0);
 		break;
 	case PROP_WEP_KEY1:
-		g_free (priv->wep_key1);
-		priv->wep_key1 = g_value_dup_string (value);
+		g_value_set_string (value, priv->wep_key1);
 		break;
 	case PROP_WEP_KEY2:
-		g_free (priv->wep_key2);
-		priv->wep_key2 = g_value_dup_string (value);
+		g_value_set_string (value, priv->wep_key2);
 		break;
 	case PROP_WEP_KEY3:
-		g_free (priv->wep_key3);
-		priv->wep_key3 = g_value_dup_string (value);
+		g_value_set_string (value, priv->wep_key3);
 		break;
 	case PROP_WEP_KEY_FLAGS:
-		priv->wep_key_flags = g_value_get_flags (value);
+		g_value_set_flags (value, priv->wep_key_flags);
 		break;
 	case PROP_PSK:
-		g_free (priv->psk);
-		priv->psk = g_value_dup_string (value);
+		g_value_set_string (value, priv->psk);
 		break;
 	case PROP_PSK_FLAGS:
-		priv->psk_flags = g_value_get_flags (value);
+		g_value_set_flags (value, priv->psk_flags);
 		break;
 	case PROP_LEAP_PASSWORD:
-		g_free (priv->leap_password);
-		priv->leap_password = g_value_dup_string (value);
+		g_value_set_string (value, priv->leap_password);
 		break;
 	case PROP_LEAP_PASSWORD_FLAGS:
-		priv->leap_password_flags = g_value_get_flags (value);
+		g_value_set_flags (value, priv->leap_password_flags);
 		break;
 	case PROP_WEP_KEY_TYPE:
-		priv->wep_key_type = g_value_get_enum (value);
+		g_value_set_enum (value, priv->wep_key_type);
 		break;
 	case PROP_WPS_METHOD:
-		priv->wps_method = g_value_get_uint (value);
+		g_value_set_uint (value, priv->wps_method);
 		break;
 	case PROP_FILS:
-		priv->fils = g_value_get_int (value);
+		g_value_set_int (value, nm_setting_wireless_security_get_fils (setting));
 		break;
 	default:
 		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
@@ -1355,72 +1299,87 @@ set_property (GObject *object, guint prop_id,
 }
 
 static void
-get_property (GObject *object, guint prop_id,
-              GValue *value, GParamSpec *pspec)
+set_property (GObject *object, guint prop_id,
+              const GValue *value, GParamSpec *pspec)
 {
 	NMSettingWirelessSecurity *setting = NM_SETTING_WIRELESS_SECURITY (object);
 	NMSettingWirelessSecurityPrivate *priv = NM_SETTING_WIRELESS_SECURITY_GET_PRIVATE (setting);
+	const char *str;
 
 	switch (prop_id) {
 	case PROP_KEY_MGMT:
-		g_value_set_string (value, priv->key_mgmt);
+		g_free (priv->key_mgmt);
+		str = g_value_get_string (value);
+		priv->key_mgmt = str ? g_ascii_strdown (str, -1) : NULL;
 		break;
 	case PROP_WEP_TX_KEYIDX:
-		g_value_set_uint (value, priv->wep_tx_keyidx);
+		priv->wep_tx_keyidx = g_value_get_uint (value);
 		break;
 	case PROP_AUTH_ALG:
-		g_value_set_string (value, priv->auth_alg);
+		g_free (priv->auth_alg);
+		str = g_value_get_string (value);
+		priv->auth_alg = str ? g_ascii_strdown (str, -1) : NULL;
 		break;
 	case PROP_PROTO:
-		g_value_take_boxed (value, _nm_utils_slist_to_strv (priv->proto, TRUE));
+		g_slist_free_full (priv->proto, g_free);
+		priv->proto = _nm_utils_strv_to_slist (g_value_get_boxed (value), TRUE);
 		break;
 	case PROP_PAIRWISE:
-		g_value_take_boxed (value, _nm_utils_slist_to_strv (priv->pairwise, TRUE));
+		g_slist_free_full (priv->pairwise, g_free);
+		priv->pairwise = _nm_utils_strv_to_slist (g_value_get_boxed (value), TRUE);
 		break;
 	case PROP_GROUP:
-		g_value_take_boxed (value, _nm_utils_slist_to_strv (priv->group, TRUE));
+		g_slist_free_full (priv->group, g_free);
+		priv->group = _nm_utils_strv_to_slist (g_value_get_boxed (value), TRUE);
 		break;
 	case PROP_PMF:
-		g_value_set_int (value, nm_setting_wireless_security_get_pmf (setting));
+		priv->pmf = g_value_get_int (value);
 		break;
 	case PROP_LEAP_USERNAME:
-		g_value_set_string (value, priv->leap_username);
+		g_free (priv->leap_username);
+		priv->leap_username = g_value_dup_string (value);
 		break;
 	case PROP_WEP_KEY0:
-		g_value_set_string (value, priv->wep_key0);
+		g_free (priv->wep_key0);
+		priv->wep_key0 = g_value_dup_string (value);
 		break;
 	case PROP_WEP_KEY1:
-		g_value_set_string (value, priv->wep_key1);
+		g_free (priv->wep_key1);
+		priv->wep_key1 = g_value_dup_string (value);
 		break;
 	case PROP_WEP_KEY2:
-		g_value_set_string (value, priv->wep_key2);
+		g_free (priv->wep_key2);
+		priv->wep_key2 = g_value_dup_string (value);
 		break;
 	case PROP_WEP_KEY3:
-		g_value_set_string (value, priv->wep_key3);
+		g_free (priv->wep_key3);
+		priv->wep_key3 = g_value_dup_string (value);
 		break;
 	case PROP_WEP_KEY_FLAGS:
-		g_value_set_flags (value, priv->wep_key_flags);
+		priv->wep_key_flags = g_value_get_flags (value);
 		break;
 	case PROP_PSK:
-		g_value_set_string (value, priv->psk);
+		g_free (priv->psk);
+		priv->psk = g_value_dup_string (value);
 		break;
 	case PROP_PSK_FLAGS:
-		g_value_set_flags (value, priv->psk_flags);
+		priv->psk_flags = g_value_get_flags (value);
 		break;
 	case PROP_LEAP_PASSWORD:
-		g_value_set_string (value, priv->leap_password);
+		g_free (priv->leap_password);
+		priv->leap_password = g_value_dup_string (value);
 		break;
 	case PROP_LEAP_PASSWORD_FLAGS:
-		g_value_set_flags (value, priv->leap_password_flags);
+		priv->leap_password_flags = g_value_get_flags (value);
 		break;
 	case PROP_WEP_KEY_TYPE:
-		g_value_set_enum (value, priv->wep_key_type);
+		priv->wep_key_type = g_value_get_enum (value);
 		break;
 	case PROP_WPS_METHOD:
-		g_value_set_uint (value, priv->wps_method);
+		priv->wps_method = g_value_get_uint (value);
 		break;
 	case PROP_FILS:
-		g_value_set_int (value, nm_setting_wireless_security_get_fils (setting));
+		priv->fils = g_value_get_int (value);
 		break;
 	default:
 		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
@@ -1428,6 +1387,49 @@ get_property (GObject *object, guint prop_id,
 	}
 }
 
+/*****************************************************************************/
+
+static void
+nm_setting_wireless_security_init (NMSettingWirelessSecurity *setting)
+{
+}
+
+/**
+ * nm_setting_wireless_security_new:
+ *
+ * Creates a new #NMSettingWirelessSecurity object with default values.
+ *
+ * Returns: (transfer full): the new empty #NMSettingWirelessSecurity object
+ **/
+NMSetting *
+nm_setting_wireless_security_new (void)
+{
+	return (NMSetting *) g_object_new (NM_TYPE_SETTING_WIRELESS_SECURITY, NULL);
+}
+
+static void
+finalize (GObject *object)
+{
+	NMSettingWirelessSecurity *self = NM_SETTING_WIRELESS_SECURITY (object);
+	NMSettingWirelessSecurityPrivate *priv = NM_SETTING_WIRELESS_SECURITY_GET_PRIVATE (self);
+
+	g_free (priv->key_mgmt);
+	g_free (priv->auth_alg);
+	g_free (priv->leap_username);
+	g_free (priv->wep_key0);
+	g_free (priv->wep_key1);
+	g_free (priv->wep_key2);
+	g_free (priv->wep_key3);
+	g_free (priv->psk);
+	g_free (priv->leap_password);
+
+	g_slist_free_full (priv->proto, g_free);
+	g_slist_free_full (priv->pairwise, g_free);
+	g_slist_free_full (priv->group, g_free);
+
+	G_OBJECT_CLASS (nm_setting_wireless_security_parent_class)->finalize (object);
+}
+
 static void
 nm_setting_wireless_security_class_init (NMSettingWirelessSecurityClass *klass)
 {
@@ -1437,8 +1439,8 @@ nm_setting_wireless_security_class_init (NMSettingWirelessSecurityClass *klass)
 
 	g_type_class_add_private (klass, sizeof (NMSettingWirelessSecurityPrivate));
 
-	object_class->set_property = set_property;
 	object_class->get_property = get_property;
+	object_class->set_property = set_property;
 	object_class->finalize     = finalize;
 
 	setting_class->verify           = verify;
@@ -1452,8 +1454,8 @@ nm_setting_wireless_security_class_init (NMSettingWirelessSecurityClass *klass)
 	 *
 	 * Key management used for the connection.  One of "none" (WEP), "ieee8021x"
 	 * (Dynamic WEP), "wpa-none" (Ad-Hoc WPA-PSK), "wpa-psk" (infrastructure
-	 * WPA-PSK), or "wpa-eap" (WPA-Enterprise).  This property must be set for
-	 * any Wi-Fi connection that uses security.
+	 * WPA-PSK), "sae" (SAE) or "wpa-eap" (WPA-Enterprise).
+	 * This property must be set for any Wi-Fi connection that uses security.
 	 **/
 	/* ---ifcfg-rh---
 	 * property: key-mgmt
@@ -1462,13 +1464,12 @@ nm_setting_wireless_security_class_init (NMSettingWirelessSecurityClass *klass)
 	 * description: Key management menthod.
 	 * ---end---
 	 */
-	g_object_class_install_property
-		(object_class, PROP_KEY_MGMT,
-		 g_param_spec_string (NM_SETTING_WIRELESS_SECURITY_KEY_MGMT, "", "",
-		                      NULL,
-		                      G_PARAM_READWRITE |
-		                      NM_SETTING_PARAM_REQUIRED |
-		                      G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_KEY_MGMT] =
+	    g_param_spec_string (NM_SETTING_WIRELESS_SECURITY_KEY_MGMT, "", "",
+	                         NULL,
+	                         G_PARAM_READWRITE |
+	                         NM_SETTING_PARAM_REQUIRED |
+	                         G_PARAM_STATIC_STRINGS);
 
 	/**
 	 * NMSettingWirelessSecurity:wep-tx-keyidx:
@@ -1486,13 +1487,12 @@ nm_setting_wireless_security_class_init (NMSettingWirelessSecurityClass *klass)
 	 * description: Index of active WEP key.
 	 * ---end---
 	 */
-	g_object_class_install_property
-		(object_class, PROP_WEP_TX_KEYIDX,
-		 g_param_spec_uint (NM_SETTING_WIRELESS_SECURITY_WEP_TX_KEYIDX, "", "",
-		                    0, 3, 0,
-		                    G_PARAM_READWRITE |
-		                    G_PARAM_CONSTRUCT |
-		                    G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_WEP_TX_KEYIDX] =
+	    g_param_spec_uint (NM_SETTING_WIRELESS_SECURITY_WEP_TX_KEYIDX, "", "",
+	                       0, 3, 0,
+	                       G_PARAM_READWRITE |
+	                       G_PARAM_CONSTRUCT |
+	                       G_PARAM_STATIC_STRINGS);
 
 	/**
 	 * NMSettingWirelessSecurity:auth-alg:
@@ -1510,12 +1510,11 @@ nm_setting_wireless_security_class_init (NMSettingWirelessSecurityClass *klass)
 	 * description: Authentication algorithm for WEP.
 	 * ---end---
 	 */
-	g_object_class_install_property
-		(object_class, PROP_AUTH_ALG,
-		 g_param_spec_string (NM_SETTING_WIRELESS_SECURITY_AUTH_ALG, "", "",
-		                      NULL,
-		                      G_PARAM_READWRITE |
-		                      G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_AUTH_ALG] =
+	    g_param_spec_string (NM_SETTING_WIRELESS_SECURITY_AUTH_ALG, "", "",
+	                         NULL,
+	                         G_PARAM_READWRITE |
+	                         G_PARAM_STATIC_STRINGS);
 
 	/**
 	 * NMSettingWirelessSecurity:proto:
@@ -1532,12 +1531,11 @@ nm_setting_wireless_security_class_init (NMSettingWirelessSecurityClass *klass)
 	 * description: Allowed WPA protocols, WPA and WPA2 (RSN).
 	 * ---end---
 	 */
-	g_object_class_install_property
-		(object_class, PROP_PROTO,
-		 g_param_spec_boxed (NM_SETTING_WIRELESS_SECURITY_PROTO, "", "",
-		                     G_TYPE_STRV,
-		                     G_PARAM_READWRITE |
-		                     G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_PROTO] =
+	    g_param_spec_boxed (NM_SETTING_WIRELESS_SECURITY_PROTO, "", "",
+	                        G_TYPE_STRV,
+	                        G_PARAM_READWRITE |
+	                        G_PARAM_STATIC_STRINGS);
 
 	/**
 	 * NMSettingWirelessSecurity:pairwise:
@@ -1555,12 +1553,11 @@ nm_setting_wireless_security_class_init (NMSettingWirelessSecurityClass *klass)
 	 *   separated list.
 	 * ---end---
 	 */
-	g_object_class_install_property
-		(object_class, PROP_PAIRWISE,
-		 g_param_spec_boxed (NM_SETTING_WIRELESS_SECURITY_PAIRWISE, "", "",
-		                     G_TYPE_STRV,
-		                     G_PARAM_READWRITE |
-		                     G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_PAIRWISE] =
+	    g_param_spec_boxed (NM_SETTING_WIRELESS_SECURITY_PAIRWISE, "", "",
+	                        G_TYPE_STRV,
+	                        G_PARAM_READWRITE |
+	                        G_PARAM_STATIC_STRINGS);
 
 	/**
 	 * NMSettingWirelessSecurity:group:
@@ -1578,12 +1575,11 @@ nm_setting_wireless_security_class_init (NMSettingWirelessSecurityClass *klass)
 	 *   separated list.
 	 * ---end---
 	 */
-	g_object_class_install_property
-		(object_class, PROP_GROUP,
-		 g_param_spec_boxed (NM_SETTING_WIRELESS_SECURITY_GROUP, "", "",
-		                     G_TYPE_STRV,
-		                     G_PARAM_READWRITE |
-		                     G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_GROUP] =
+	    g_param_spec_boxed (NM_SETTING_WIRELESS_SECURITY_GROUP, "", "",
+	                        G_TYPE_STRV,
+	                        G_PARAM_READWRITE |
+	                        G_PARAM_STATIC_STRINGS);
 
 	/**
 	 * NMSettingWirelessSecurity:pmf:
@@ -1607,14 +1603,13 @@ nm_setting_wireless_security_class_init (NMSettingWirelessSecurityClass *klass)
 	 * example: PMF=required
 	 * ---end---
 	 */
-	g_object_class_install_property
-		(object_class, PROP_PMF,
-		 g_param_spec_int (NM_SETTING_WIRELESS_SECURITY_PMF, "", "",
-		                   G_MININT32, G_MAXINT32, 0,
-		                   G_PARAM_READWRITE |
-		                   G_PARAM_CONSTRUCT |
-		                   NM_SETTING_PARAM_FUZZY_IGNORE |
-		                   G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_PMF] =
+	    g_param_spec_int (NM_SETTING_WIRELESS_SECURITY_PMF, "", "",
+	                      G_MININT32, G_MAXINT32, 0,
+	                      G_PARAM_READWRITE |
+	                      G_PARAM_CONSTRUCT |
+	                      NM_SETTING_PARAM_FUZZY_IGNORE |
+	                      G_PARAM_STATIC_STRINGS);
 
 	/**
 	 * NMSettingWirelessSecurity:leap-username:
@@ -1628,12 +1623,11 @@ nm_setting_wireless_security_class_init (NMSettingWirelessSecurityClass *klass)
 	 * description: Login name for LEAP.
 	 * ---end---
 	 */
-	g_object_class_install_property
-		(object_class, PROP_LEAP_USERNAME,
-		 g_param_spec_string (NM_SETTING_WIRELESS_SECURITY_LEAP_USERNAME, "", "",
-		                      NULL,
-		                      G_PARAM_READWRITE |
-		                      G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_LEAP_USERNAME] =
+	    g_param_spec_string (NM_SETTING_WIRELESS_SECURITY_LEAP_USERNAME, "", "",
+	                         NULL,
+	                         G_PARAM_READWRITE |
+	                         G_PARAM_STATIC_STRINGS);
 
 	/**
 	 * NMSettingWirelessSecurity:wep-key0:
@@ -1647,13 +1641,12 @@ nm_setting_wireless_security_class_init (NMSettingWirelessSecurityClass *klass)
 	 * description: The first WEP key (used in most networks). See also DEFAULTKEY for key index.
 	 * ---end---
 	 */
-	g_object_class_install_property
-		(object_class, PROP_WEP_KEY0,
-		 g_param_spec_string (NM_SETTING_WIRELESS_SECURITY_WEP_KEY0, "", "",
-		                      NULL,
-		                      G_PARAM_READWRITE |
-		                      NM_SETTING_PARAM_SECRET |
-		                      G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_WEP_KEY0] =
+	    g_param_spec_string (NM_SETTING_WIRELESS_SECURITY_WEP_KEY0, "", "",
+	                         NULL,
+	                         G_PARAM_READWRITE |
+	                         NM_SETTING_PARAM_SECRET |
+	                         G_PARAM_STATIC_STRINGS);
 
 	/**
 	 * NMSettingWirelessSecurity:wep-key1:
@@ -1667,13 +1660,12 @@ nm_setting_wireless_security_class_init (NMSettingWirelessSecurityClass *klass)
 	 * description: WEP key with index 1. See also DEFAULTKEY for key index.
 	 * ---end---
 	 */
-	g_object_class_install_property
-		(object_class, PROP_WEP_KEY1,
-		 g_param_spec_string (NM_SETTING_WIRELESS_SECURITY_WEP_KEY1, "", "",
-		                      NULL,
-		                      G_PARAM_READWRITE |
-		                      NM_SETTING_PARAM_SECRET |
-		                      G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_WEP_KEY1] =
+	    g_param_spec_string (NM_SETTING_WIRELESS_SECURITY_WEP_KEY1, "", "",
+	                         NULL,
+	                         G_PARAM_READWRITE |
+	                         NM_SETTING_PARAM_SECRET |
+	                         G_PARAM_STATIC_STRINGS);
 
 	/**
 	 * NMSettingWirelessSecurity:wep-key2:
@@ -1687,13 +1679,12 @@ nm_setting_wireless_security_class_init (NMSettingWirelessSecurityClass *klass)
 	 * description: WEP key with index 2. See also DEFAULTKEY for key index.
 	 * ---end---
 	 */
-	g_object_class_install_property
-		(object_class, PROP_WEP_KEY2,
-		 g_param_spec_string (NM_SETTING_WIRELESS_SECURITY_WEP_KEY2, "", "",
-		                      NULL,
-		                      G_PARAM_READWRITE |
-		                      NM_SETTING_PARAM_SECRET |
-		                      G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_WEP_KEY2] =
+	    g_param_spec_string (NM_SETTING_WIRELESS_SECURITY_WEP_KEY2, "", "",
+	                         NULL,
+	                         G_PARAM_READWRITE |
+	                         NM_SETTING_PARAM_SECRET |
+	                         G_PARAM_STATIC_STRINGS);
 
 	/**
 	 * NMSettingWirelessSecurity:wep-key3:
@@ -1707,13 +1698,12 @@ nm_setting_wireless_security_class_init (NMSettingWirelessSecurityClass *klass)
 	 * description: WEP key with index 3. See also DEFAULTKEY for key index.
 	 * ---end---
 	 */
-	g_object_class_install_property
-		(object_class, PROP_WEP_KEY3,
-		 g_param_spec_string (NM_SETTING_WIRELESS_SECURITY_WEP_KEY3, "", "",
-		                      NULL,
-		                      G_PARAM_READWRITE |
-		                      NM_SETTING_PARAM_SECRET |
-		                      G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_WEP_KEY3] =
+	    g_param_spec_string (NM_SETTING_WIRELESS_SECURITY_WEP_KEY3, "", "",
+	                         NULL,
+	                         G_PARAM_READWRITE |
+	                         NM_SETTING_PARAM_SECRET |
+	                         G_PARAM_STATIC_STRINGS);
 
 	/**
 	 * NMSettingWirelessSecurity:wep-key-flags:
@@ -1729,23 +1719,21 @@ nm_setting_wireless_security_class_init (NMSettingWirelessSecurityClass *klass)
 	 * description: Password flags for KEY, KEY_PASSPHRASE password.
 	 * ---end---
 	 */
-	g_object_class_install_property
-		(object_class, PROP_WEP_KEY_FLAGS,
-		 g_param_spec_flags (NM_SETTING_WIRELESS_SECURITY_WEP_KEY_FLAGS, "", "",
-		                     NM_TYPE_SETTING_SECRET_FLAGS,
-		                     NM_SETTING_SECRET_FLAG_NONE,
-		                     G_PARAM_READWRITE |
-		                     G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_WEP_KEY_FLAGS] =
+	    g_param_spec_flags (NM_SETTING_WIRELESS_SECURITY_WEP_KEY_FLAGS, "", "",
+	                        NM_TYPE_SETTING_SECRET_FLAGS,
+	                        NM_SETTING_SECRET_FLAG_NONE,
+	                        G_PARAM_READWRITE |
+	                        G_PARAM_STATIC_STRINGS);
 
 	/**
 	 * NMSettingWirelessSecurity:psk:
 	 *
-	 * Pre-Shared-Key for WPA networks.  If the key is 64-characters long, it
-	 * must contain only hexadecimal characters and is interpreted as a
-	 * hexadecimal WPA key.  Otherwise, the key must be between 8 and 63 ASCII
-	 * characters (as specified in the 802.11i standard) and is interpreted as a
-	 * WPA passphrase, and is hashed to derive the actual WPA-PSK used when
-	 * connecting to the Wi-Fi network.
+	 * Pre-Shared-Key for WPA networks. For WPA-PSK, it's either an ASCII
+	 * passphrase of 8 to 63 characters that is (as specified in the 802.11i
+	 * standard) hashed to derive the actual key, or the key in form of 64
+	 * hexadecimal character. The WPA3-Personal networks use a passphrase
+	 * of any length for SAE authentication.
 	 **/
 	/* ---ifcfg-rh---
 	 * property: psk
@@ -1753,13 +1741,12 @@ nm_setting_wireless_security_class_init (NMSettingWirelessSecurityClass *klass)
 	 * description: Pre-Shared-Key for WPA networks.
 	 * ---end---
 	 */
-	g_object_class_install_property
-		(object_class, PROP_PSK,
-		 g_param_spec_string (NM_SETTING_WIRELESS_SECURITY_PSK, "", "",
-		                      NULL,
-		                      G_PARAM_READWRITE |
-		                      NM_SETTING_PARAM_SECRET |
-		                      G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_PSK] =
+	    g_param_spec_string (NM_SETTING_WIRELESS_SECURITY_PSK, "", "",
+	                         NULL,
+	                         G_PARAM_READWRITE |
+	                         NM_SETTING_PARAM_SECRET |
+	                         G_PARAM_STATIC_STRINGS);
 
 	/**
 	 * NMSettingWirelessSecurity:psk-flags:
@@ -1775,13 +1762,12 @@ nm_setting_wireless_security_class_init (NMSettingWirelessSecurityClass *klass)
 	 * example: WPA_PSK_FLAGS=user
 	 * ---end---
 	 */
-	g_object_class_install_property
-		(object_class, PROP_PSK_FLAGS,
-		 g_param_spec_flags (NM_SETTING_WIRELESS_SECURITY_PSK_FLAGS, "", "",
-		                     NM_TYPE_SETTING_SECRET_FLAGS,
-		                     NM_SETTING_SECRET_FLAG_NONE,
-		                     G_PARAM_READWRITE |
-		                     G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_PSK_FLAGS] =
+	    g_param_spec_flags (NM_SETTING_WIRELESS_SECURITY_PSK_FLAGS, "", "",
+	                        NM_TYPE_SETTING_SECRET_FLAGS,
+	                        NM_SETTING_SECRET_FLAG_NONE,
+	                        G_PARAM_READWRITE |
+	                        G_PARAM_STATIC_STRINGS);
 
 	/**
 	 * NMSettingWirelessSecurity:leap-password:
@@ -1796,13 +1782,12 @@ nm_setting_wireless_security_class_init (NMSettingWirelessSecurityClass *klass)
 	 *  lookaside file, or it can be owned by a secret agent.
 	 * ---end---
 	 */
-	g_object_class_install_property
-		(object_class, PROP_LEAP_PASSWORD,
-		 g_param_spec_string (NM_SETTING_WIRELESS_SECURITY_LEAP_PASSWORD, "", "",
-		                      NULL,
-		                      G_PARAM_READWRITE |
-		                      NM_SETTING_PARAM_SECRET |
-		                      G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_LEAP_PASSWORD] =
+	    g_param_spec_string (NM_SETTING_WIRELESS_SECURITY_LEAP_PASSWORD, "", "",
+	                         NULL,
+	                         G_PARAM_READWRITE |
+	                         NM_SETTING_PARAM_SECRET |
+	                         G_PARAM_STATIC_STRINGS);
 
 	/**
 	 * NMSettingWirelessSecurity:leap-password-flags:
@@ -1817,13 +1802,12 @@ nm_setting_wireless_security_class_init (NMSettingWirelessSecurityClass *klass)
 	 * description: Password flags for IEEE_8021X_PASSWORD_FLAGS.
 	 * ---end---
 	 */
-	g_object_class_install_property
-		(object_class, PROP_LEAP_PASSWORD_FLAGS,
-		 g_param_spec_flags (NM_SETTING_WIRELESS_SECURITY_LEAP_PASSWORD_FLAGS, "", "",
-		                     NM_TYPE_SETTING_SECRET_FLAGS,
-		                     NM_SETTING_SECRET_FLAG_NONE,
-		                     G_PARAM_READWRITE |
-		                     G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_LEAP_PASSWORD_FLAGS] =
+	    g_param_spec_flags (NM_SETTING_WIRELESS_SECURITY_LEAP_PASSWORD_FLAGS, "", "",
+	                        NM_TYPE_SETTING_SECRET_FLAGS,
+	                        NM_SETTING_SECRET_FLAG_NONE,
+	                        G_PARAM_READWRITE |
+	                        G_PARAM_STATIC_STRINGS);
 
 	/**
 	 * NMSettingWirelessSecurity:wep-key-type:
@@ -1845,18 +1829,16 @@ nm_setting_wireless_security_class_init (NMSettingWirelessSecurityClass *klass)
 	 * example: KEY1=s:ahoj, KEY1=0a1c45bc02, KEY_PASSPHRASE1=mysupersecretkey
 	 * ---end---
 	 */
-	g_object_class_install_property
-		(object_class, PROP_WEP_KEY_TYPE,
-		 g_param_spec_enum (NM_SETTING_WIRELESS_SECURITY_WEP_KEY_TYPE, "", "",
-		                    NM_TYPE_WEP_KEY_TYPE,
-		                    NM_WEP_KEY_TYPE_UNKNOWN,
-		                    G_PARAM_READWRITE |
-		                    G_PARAM_CONSTRUCT |
-		                    G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_WEP_KEY_TYPE] =
+	    g_param_spec_enum (NM_SETTING_WIRELESS_SECURITY_WEP_KEY_TYPE, "", "",
+	                       NM_TYPE_WEP_KEY_TYPE,
+	                       NM_WEP_KEY_TYPE_UNKNOWN,
+	                       G_PARAM_READWRITE |
+	                       G_PARAM_CONSTRUCT |
+	                       G_PARAM_STATIC_STRINGS);
 
 	_properties_override_add_transform (properties_override,
-	                                    g_object_class_find_property (G_OBJECT_CLASS (setting_class),
-	                                                                  NM_SETTING_WIRELESS_SECURITY_WEP_KEY_TYPE),
+	                                    obj_properties[PROP_WEP_KEY_TYPE],
 	                                    G_VARIANT_TYPE_UINT32,
 	                                    wep_key_type_to_dbus,
 	                                    NULL);
@@ -1882,14 +1864,13 @@ nm_setting_wireless_security_class_init (NMSettingWirelessSecurityClass *klass)
 	 * example: WPS_METHOD=disabled, WPS_METHOD="pin pbc"
 	 * ---end---
 	 */
-	g_object_class_install_property
-		(object_class, PROP_WPS_METHOD,
-		 g_param_spec_uint (NM_SETTING_WIRELESS_SECURITY_WPS_METHOD, "", "",
-		                    0, G_MAXUINT32, NM_SETTING_WIRELESS_SECURITY_WPS_METHOD_DEFAULT,
-		                    G_PARAM_READWRITE |
-		                    G_PARAM_CONSTRUCT |
-		                    NM_SETTING_PARAM_FUZZY_IGNORE |
-		                    G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_WPS_METHOD] =
+	    g_param_spec_uint (NM_SETTING_WIRELESS_SECURITY_WPS_METHOD, "", "",
+	                       0, G_MAXUINT32, NM_SETTING_WIRELESS_SECURITY_WPS_METHOD_DEFAULT,
+	                       G_PARAM_READWRITE |
+	                       G_PARAM_CONSTRUCT |
+	                       NM_SETTING_PARAM_FUZZY_IGNORE |
+	                       G_PARAM_STATIC_STRINGS);
 
 	/**
 	 * NMSettingWirelessSecurity:fils:
@@ -1913,14 +1894,15 @@ nm_setting_wireless_security_class_init (NMSettingWirelessSecurityClass *klass)
 	 * example: FILS=required
 	 * ---end---
 	 */
-	g_object_class_install_property
-		(object_class, PROP_FILS,
-		 g_param_spec_int (NM_SETTING_WIRELESS_SECURITY_FILS, "", "",
-		                   G_MININT32, G_MAXINT32, 0,
-		                   G_PARAM_READWRITE |
-		                   G_PARAM_CONSTRUCT |
-		                   NM_SETTING_PARAM_FUZZY_IGNORE |
-		                   G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_FILS] =
+	    g_param_spec_int (NM_SETTING_WIRELESS_SECURITY_FILS, "", "",
+	                      G_MININT32, G_MAXINT32, 0,
+	                      G_PARAM_READWRITE |
+	                      G_PARAM_CONSTRUCT |
+	                      NM_SETTING_PARAM_FUZZY_IGNORE |
+	                      G_PARAM_STATIC_STRINGS);
+
+	g_object_class_install_properties (object_class, _PROPERTY_ENUMS_LAST, obj_properties);
 
 	_nm_setting_class_commit_full (setting_class, NM_META_SETTING_TYPE_WIRELESS_SECURITY,
 	                               NULL, properties_override);
diff --git a/libnm-core/nm-setting-wireless-security.h b/libnm-core/nm-setting-wireless-security.h
index 5a732ac0..c560f348 100644
--- a/libnm-core/nm-setting-wireless-security.h
+++ b/libnm-core/nm-setting-wireless-security.h
@@ -54,9 +54,9 @@ G_BEGIN_DECLS
  * @NM_WEP_KEY_TYPE_LAST: placeholder value for bounds-checking
  *
  * The #NMWepKeyType values specify how any WEP keys present in the setting
- * are intepreted.  There are no standards governing how to hash the various WEP
+ * are interpreted.  There are no standards governing how to hash the various WEP
  * key/passphrase formats into the actual WEP key.  Unfortunately some WEP keys
- * can be interpreted in multiple ways, requring the setting to specify how to
+ * can be interpreted in multiple ways, requiring the setting to specify how to
  * interpret the any WEP keys.  For example, the key "732f2d712e4a394a375d366931"
  * is both a valid Hexadecimal WEP key and a WEP passphrase.  Further, many
  * ASCII keys are also valid WEP passphrases, but since passphrases and ASCII
@@ -99,9 +99,12 @@ typedef enum {
  *
  * Configure the use of WPS by a connection while it activates.
  *
+ * Note: prior to 1.16, this was a GEnum type instead of a GFlags type
+ * although, with the same numeric values.
+ *
  * Since: 1.10
  **/
-typedef enum {
+typedef enum { /*< flags >*/
 	NM_SETTING_WIRELESS_SECURITY_WPS_METHOD_DEFAULT     = 0x00000000,
 	NM_SETTING_WIRELESS_SECURITY_WPS_METHOD_DISABLED    = 0x00000001,
 	NM_SETTING_WIRELESS_SECURITY_WPS_METHOD_AUTO        = 0x00000002,
diff --git a/libnm-core/nm-setting-wireless.c b/libnm-core/nm-setting-wireless.c
index 6f6175b7..b4cb1056 100644
--- a/libnm-core/nm-setting-wireless.c
+++ b/libnm-core/nm-setting-wireless.c
@@ -24,7 +24,6 @@
 
 #include "nm-setting-wireless.h"
 
-#include 
 #include 
 
 #include "nm-utils.h"
@@ -40,9 +39,27 @@
  * necessary for connection to 802.11 Wi-Fi networks.
  **/
 
-G_DEFINE_TYPE (NMSettingWireless, nm_setting_wireless, NM_TYPE_SETTING)
+/*****************************************************************************/
 
-#define NM_SETTING_WIRELESS_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_SETTING_WIRELESS, NMSettingWirelessPrivate))
+NM_GOBJECT_PROPERTIES_DEFINE (NMSettingWireless,
+	PROP_SSID,
+	PROP_MODE,
+	PROP_BAND,
+	PROP_CHANNEL,
+	PROP_BSSID,
+	PROP_RATE,
+	PROP_TX_POWER,
+	PROP_MAC_ADDRESS,
+	PROP_CLONED_MAC_ADDRESS,
+	PROP_GENERATE_MAC_ADDRESS_MASK,
+	PROP_MAC_ADDRESS_BLACKLIST,
+	PROP_MTU,
+	PROP_SEEN_BSSIDS,
+	PROP_HIDDEN,
+	PROP_POWERSAVE,
+	PROP_MAC_ADDRESS_RANDOMIZATION,
+	PROP_WAKE_ON_WLAN,
+);
 
 typedef struct {
 	GBytes *ssid;
@@ -64,28 +81,11 @@ typedef struct {
 	guint32 wowl;
 } NMSettingWirelessPrivate;
 
-enum {
-	PROP_0,
-	PROP_SSID,
-	PROP_MODE,
-	PROP_BAND,
-	PROP_CHANNEL,
-	PROP_BSSID,
-	PROP_RATE,
-	PROP_TX_POWER,
-	PROP_MAC_ADDRESS,
-	PROP_CLONED_MAC_ADDRESS,
-	PROP_GENERATE_MAC_ADDRESS_MASK,
-	PROP_MAC_ADDRESS_BLACKLIST,
-	PROP_MTU,
-	PROP_SEEN_BSSIDS,
-	PROP_HIDDEN,
-	PROP_POWERSAVE,
-	PROP_MAC_ADDRESS_RANDOMIZATION,
-	PROP_WAKE_ON_WLAN,
+G_DEFINE_TYPE (NMSettingWireless, nm_setting_wireless, NM_TYPE_SETTING)
 
-	LAST_PROP
-};
+#define NM_SETTING_WIRELESS_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_SETTING_WIRELESS, NMSettingWirelessPrivate))
+
+/*****************************************************************************/
 
 static gboolean
 match_cipher (const char *cipher,
@@ -284,19 +284,6 @@ nm_setting_wireless_ap_security_compatible (NMSettingWireless *s_wireless,
 	return FALSE;
 }
 
-/**
- * nm_setting_wireless_new:
- *
- * Creates a new #NMSettingWireless object with default values.
- *
- * Returns: (transfer full): the new empty #NMSettingWireless object
- **/
-NMSetting *
-nm_setting_wireless_new (void)
-{
-	return (NMSetting *) g_object_new (NM_TYPE_SETTING_WIRELESS, NULL);
-}
-
 /**
  * nm_setting_wireless_get_ssid:
  * @setting: the #NMSettingWireless
@@ -523,7 +510,7 @@ nm_setting_wireless_add_mac_blacklist_item (NMSettingWireless *setting, const ch
 
 	mac = nm_utils_hwaddr_canonical (mac, ETH_ALEN);
 	g_array_append_val (priv->mac_address_blacklist, mac);
-	g_object_notify (G_OBJECT (setting), NM_SETTING_WIRELESS_MAC_ADDRESS_BLACKLIST);
+	_notify (setting, PROP_MAC_ADDRESS_BLACKLIST);
 	return TRUE;
 }
 
@@ -545,7 +532,7 @@ nm_setting_wireless_remove_mac_blacklist_item (NMSettingWireless *setting, guint
 	g_return_if_fail (idx < priv->mac_address_blacklist->len);
 
 	g_array_remove_index (priv->mac_address_blacklist, idx);
-	g_object_notify (G_OBJECT (setting), NM_SETTING_WIRELESS_MAC_ADDRESS_BLACKLIST);
+	_notify (setting, PROP_MAC_ADDRESS_BLACKLIST);
 }
 
 /**
@@ -573,7 +560,7 @@ nm_setting_wireless_remove_mac_blacklist_item_by_value (NMSettingWireless *setti
 		candidate = g_array_index (priv->mac_address_blacklist, char *, i);
 		if (!nm_utils_hwaddr_matches (mac, -1, candidate, -1)) {
 			g_array_remove_index (priv->mac_address_blacklist, i);
-			g_object_notify (G_OBJECT (setting), NM_SETTING_WIRELESS_MAC_ADDRESS_BLACKLIST);
+			_notify (setting, PROP_MAC_ADDRESS_BLACKLIST);
 			return TRUE;
 		}
 	}
@@ -592,7 +579,7 @@ nm_setting_wireless_clear_mac_blacklist_items (NMSettingWireless *setting)
 	g_return_if_fail (NM_IS_SETTING_WIRELESS (setting));
 
 	g_array_set_size (NM_SETTING_WIRELESS_GET_PRIVATE (setting)->mac_address_blacklist, 0);
-	g_object_notify (G_OBJECT (setting), NM_SETTING_WIRELESS_MAC_ADDRESS_BLACKLIST);
+	_notify (setting, PROP_MAC_ADDRESS_BLACKLIST);
 }
 
 /**
@@ -695,7 +682,7 @@ nm_setting_wireless_add_seen_bssid (NMSettingWireless *setting,
 
 	if (!found) {
 		priv->seen_bssids = g_slist_prepend (priv->seen_bssids, lower_bssid);
-		g_object_notify (G_OBJECT (setting), NM_SETTING_WIRELESS_SEEN_BSSIDS);
+		_notify (setting, PROP_SEEN_BSSIDS);
 	} else
 		g_free (lower_bssid);
 
@@ -929,34 +916,45 @@ mac_addr_rand_ok:
 	return TRUE;
 }
 
-static gboolean
-compare_property (NMSetting *setting,
+static NMTernary
+compare_property (const NMSettInfoSetting *sett_info,
+                  guint property_idx,
+                  NMSetting *setting,
                   NMSetting *other,
-                  const GParamSpec *prop_spec,
                   NMSettingCompareFlags flags)
 {
-	NMSettingClass *setting_class;
-
-	if (nm_streq (prop_spec->name, NM_SETTING_WIRELESS_CLONED_MAC_ADDRESS)) {
-		return nm_streq0 (NM_SETTING_WIRELESS_GET_PRIVATE (setting)->cloned_mac_address,
-		                  NM_SETTING_WIRELESS_GET_PRIVATE (other)->cloned_mac_address);
+	if (nm_streq (sett_info->property_infos[property_idx].name, NM_SETTING_WIRELESS_CLONED_MAC_ADDRESS)) {
+		return    !other
+		       || nm_streq0 (NM_SETTING_WIRELESS_GET_PRIVATE (setting)->cloned_mac_address,
+		                     NM_SETTING_WIRELESS_GET_PRIVATE (other)->cloned_mac_address);
 	}
 
-	setting_class = NM_SETTING_CLASS (nm_setting_wireless_parent_class);
-	return setting_class->compare_property (setting, other, prop_spec, flags);
+	return NM_SETTING_CLASS (nm_setting_wireless_parent_class)->compare_property (sett_info,
+	                                                                              property_idx,
+	                                                                              setting,
+	                                                                              other,
+	                                                                              flags);
 }
 
 /*****************************************************************************/
 
 static GVariant *
-nm_setting_wireless_get_security (NMSetting    *setting,
+nm_setting_wireless_get_security (const NMSettInfoSetting *sett_info,
+                                  guint property_idx,
                                   NMConnection *connection,
-                                  const char   *property_name)
+                                  NMSetting *setting,
+                                  NMConnectionSerializationFlags flags)
 {
-	if (nm_connection_get_setting_wireless_security (connection))
-		return g_variant_new_string (NM_SETTING_WIRELESS_SECURITY_SETTING_NAME);
-	else
+	if (flags & NM_CONNECTION_SERIALIZE_ONLY_SECRETS)
+		return NULL;
+
+	if (!connection)
 		return NULL;
+
+	if (!nm_connection_get_setting_wireless_security (connection))
+		return NULL;
+
+	return g_variant_new_string (NM_SETTING_WIRELESS_SECURITY_SETTING_NAME);
 }
 
 /**
@@ -983,34 +981,71 @@ clear_blacklist_item (char **item_p)
 	g_free (*item_p);
 }
 
-static void
-nm_setting_wireless_init (NMSettingWireless *setting)
-{
-	NMSettingWirelessPrivate *priv = NM_SETTING_WIRELESS_GET_PRIVATE (setting);
-
-	/* We use GArray rather than GPtrArray so it will automatically be NULL-terminated */
-	priv->mac_address_blacklist = g_array_new (TRUE, FALSE, sizeof (char *));
-	g_array_set_clear_func (priv->mac_address_blacklist, (GDestroyNotify) clear_blacklist_item);
-}
+/*****************************************************************************/
 
 static void
-finalize (GObject *object)
+get_property (GObject *object, guint prop_id,
+              GValue *value, GParamSpec *pspec)
 {
+	NMSettingWireless *setting = NM_SETTING_WIRELESS (object);
 	NMSettingWirelessPrivate *priv = NM_SETTING_WIRELESS_GET_PRIVATE (object);
 
-	g_free (priv->mode);
-	g_free (priv->band);
-
-	if (priv->ssid)
-		g_bytes_unref (priv->ssid);
-	g_free (priv->bssid);
-	g_free (priv->device_mac_address);
-	g_free (priv->cloned_mac_address);
-	g_free (priv->generate_mac_address_mask);
-	g_array_unref (priv->mac_address_blacklist);
-	g_slist_free_full (priv->seen_bssids, g_free);
-
-	G_OBJECT_CLASS (nm_setting_wireless_parent_class)->finalize (object);
+	switch (prop_id) {
+	case PROP_SSID:
+		g_value_set_boxed (value, nm_setting_wireless_get_ssid (setting));
+		break;
+	case PROP_MODE:
+		g_value_set_string (value, nm_setting_wireless_get_mode (setting));
+		break;
+	case PROP_BAND:
+		g_value_set_string (value, nm_setting_wireless_get_band (setting));
+		break;
+	case PROP_CHANNEL:
+		g_value_set_uint (value, nm_setting_wireless_get_channel (setting));
+		break;
+	case PROP_BSSID:
+		g_value_set_string (value, nm_setting_wireless_get_bssid (setting));
+		break;
+	case PROP_RATE:
+		g_value_set_uint (value, nm_setting_wireless_get_rate (setting));
+		break;
+	case PROP_TX_POWER:
+		g_value_set_uint (value, nm_setting_wireless_get_tx_power (setting));
+		break;
+	case PROP_MAC_ADDRESS:
+		g_value_set_string (value, nm_setting_wireless_get_mac_address (setting));
+		break;
+	case PROP_CLONED_MAC_ADDRESS:
+		g_value_set_string (value, nm_setting_wireless_get_cloned_mac_address (setting));
+		break;
+	case PROP_GENERATE_MAC_ADDRESS_MASK:
+		g_value_set_string (value, nm_setting_wireless_get_generate_mac_address_mask (setting));
+		break;
+	case PROP_MAC_ADDRESS_BLACKLIST:
+		g_value_set_boxed (value, (char **) priv->mac_address_blacklist->data);
+		break;
+	case PROP_MTU:
+		g_value_set_uint (value, nm_setting_wireless_get_mtu (setting));
+		break;
+	case PROP_SEEN_BSSIDS:
+		g_value_take_boxed (value, _nm_utils_slist_to_strv (priv->seen_bssids, TRUE));
+		break;
+	case PROP_HIDDEN:
+		g_value_set_boolean (value, nm_setting_wireless_get_hidden (setting));
+		break;
+	case PROP_POWERSAVE:
+		g_value_set_uint (value, nm_setting_wireless_get_powersave (setting));
+		break;
+	case PROP_MAC_ADDRESS_RANDOMIZATION:
+		g_value_set_uint (value, nm_setting_wireless_get_mac_address_randomization (setting));
+		break;
+	case PROP_WAKE_ON_WLAN:
+		g_value_set_uint (value, nm_setting_wireless_get_wake_on_wlan (setting));
+		break;
+	default:
+		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+		break;
+	}
 }
 
 static void
@@ -1065,7 +1100,7 @@ set_property (GObject *object, guint prop_id,
 			 * In this case, we also clear mac-address-randomization flag */
 			if (priv->mac_address_randomization != NM_SETTING_MAC_RANDOMIZATION_DEFAULT) {
 				priv->mac_address_randomization = NM_SETTING_MAC_RANDOMIZATION_DEFAULT;
-				g_object_notify (object, NM_SETTING_WIRELESS_MAC_ADDRESS);
+				_notify (NM_SETTING_WIRELESS (object), PROP_MAC_ADDRESS_RANDOMIZATION);
 			}
 		}
 		break;
@@ -1108,69 +1143,49 @@ set_property (GObject *object, guint prop_id,
 	}
 }
 
+/*****************************************************************************/
+
 static void
-get_property (GObject *object, guint prop_id,
-              GValue *value, GParamSpec *pspec)
+nm_setting_wireless_init (NMSettingWireless *setting)
+{
+	NMSettingWirelessPrivate *priv = NM_SETTING_WIRELESS_GET_PRIVATE (setting);
+
+	/* We use GArray rather than GPtrArray so it will automatically be NULL-terminated */
+	priv->mac_address_blacklist = g_array_new (TRUE, FALSE, sizeof (char *));
+	g_array_set_clear_func (priv->mac_address_blacklist, (GDestroyNotify) clear_blacklist_item);
+}
+
+/**
+ * nm_setting_wireless_new:
+ *
+ * Creates a new #NMSettingWireless object with default values.
+ *
+ * Returns: (transfer full): the new empty #NMSettingWireless object
+ **/
+NMSetting *
+nm_setting_wireless_new (void)
+{
+	return (NMSetting *) g_object_new (NM_TYPE_SETTING_WIRELESS, NULL);
+}
+
+static void
+finalize (GObject *object)
 {
-	NMSettingWireless *setting = NM_SETTING_WIRELESS (object);
 	NMSettingWirelessPrivate *priv = NM_SETTING_WIRELESS_GET_PRIVATE (object);
 
-	switch (prop_id) {
-	case PROP_SSID:
-		g_value_set_boxed (value, nm_setting_wireless_get_ssid (setting));
-		break;
-	case PROP_MODE:
-		g_value_set_string (value, nm_setting_wireless_get_mode (setting));
-		break;
-	case PROP_BAND:
-		g_value_set_string (value, nm_setting_wireless_get_band (setting));
-		break;
-	case PROP_CHANNEL:
-		g_value_set_uint (value, nm_setting_wireless_get_channel (setting));
-		break;
-	case PROP_BSSID:
-		g_value_set_string (value, nm_setting_wireless_get_bssid (setting));
-		break;
-	case PROP_RATE:
-		g_value_set_uint (value, nm_setting_wireless_get_rate (setting));
-		break;
-	case PROP_TX_POWER:
-		g_value_set_uint (value, nm_setting_wireless_get_tx_power (setting));
-		break;
-	case PROP_MAC_ADDRESS:
-		g_value_set_string (value, nm_setting_wireless_get_mac_address (setting));
-		break;
-	case PROP_CLONED_MAC_ADDRESS:
-		g_value_set_string (value, nm_setting_wireless_get_cloned_mac_address (setting));
-		break;
-	case PROP_GENERATE_MAC_ADDRESS_MASK:
-		g_value_set_string (value, nm_setting_wireless_get_generate_mac_address_mask (setting));
-		break;
-	case PROP_MAC_ADDRESS_BLACKLIST:
-		g_value_set_boxed (value, (char **) priv->mac_address_blacklist->data);
-		break;
-	case PROP_MTU:
-		g_value_set_uint (value, nm_setting_wireless_get_mtu (setting));
-		break;
-	case PROP_SEEN_BSSIDS:
-		g_value_take_boxed (value, _nm_utils_slist_to_strv (priv->seen_bssids, TRUE));
-		break;
-	case PROP_HIDDEN:
-		g_value_set_boolean (value, nm_setting_wireless_get_hidden (setting));
-		break;
-	case PROP_POWERSAVE:
-		g_value_set_uint (value, nm_setting_wireless_get_powersave (setting));
-		break;
-	case PROP_MAC_ADDRESS_RANDOMIZATION:
-		g_value_set_uint (value, nm_setting_wireless_get_mac_address_randomization (setting));
-		break;
-	case PROP_WAKE_ON_WLAN:
-		g_value_set_uint (value, nm_setting_wireless_get_wake_on_wlan (setting));
-		break;
-	default:
-		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-		break;
-	}
+	g_free (priv->mode);
+	g_free (priv->band);
+
+	if (priv->ssid)
+		g_bytes_unref (priv->ssid);
+	g_free (priv->bssid);
+	g_free (priv->device_mac_address);
+	g_free (priv->cloned_mac_address);
+	g_free (priv->generate_mac_address_mask);
+	g_array_unref (priv->mac_address_blacklist);
+	g_slist_free_full (priv->seen_bssids, g_free);
+
+	G_OBJECT_CLASS (nm_setting_wireless_parent_class)->finalize (object);
 }
 
 static void
@@ -1207,12 +1222,11 @@ nm_setting_wireless_class_init (NMSettingWirelessClass *klass)
 	 * example: ESSID="Quick Net"
 	 * ---end---
 	 */
-	g_object_class_install_property
-		(object_class, PROP_SSID,
-		 g_param_spec_boxed (NM_SETTING_WIRELESS_SSID, "", "",
-		                     G_TYPE_BYTES,
-		                     G_PARAM_READWRITE |
-		                     G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_SSID] =
+	    g_param_spec_boxed (NM_SETTING_WIRELESS_SSID, "", "",
+	                        G_TYPE_BYTES,
+	                        G_PARAM_READWRITE |
+	                        G_PARAM_STATIC_STRINGS);
 
 	/**
 	 * NMSettingWireless:mode:
@@ -1227,12 +1241,11 @@ nm_setting_wireless_class_init (NMSettingWirelessClass *klass)
 	 * description: Wi-Fi network mode.
 	 * ---end---
 	 */
-	g_object_class_install_property
-		(object_class, PROP_MODE,
-		 g_param_spec_string (NM_SETTING_WIRELESS_MODE, "", "",
-		                      NULL,
-		                      G_PARAM_READWRITE |
-		                      G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_MODE] =
+	    g_param_spec_string (NM_SETTING_WIRELESS_MODE, "", "",
+	                         NULL,
+	                         G_PARAM_READWRITE |
+	                         G_PARAM_STATIC_STRINGS);
 
 	/**
 	 * NMSettingWireless:band:
@@ -1253,12 +1266,11 @@ nm_setting_wireless_class_init (NMSettingWirelessClass *klass)
 	 * example: BAND=bg
 	 * ---end---
 	 */
-	g_object_class_install_property
-		(object_class, PROP_BAND,
-		 g_param_spec_string (NM_SETTING_WIRELESS_BAND, "", "",
-		                      NULL,
-		                      G_PARAM_READWRITE |
-		                      G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_BAND] =
+	    g_param_spec_string (NM_SETTING_WIRELESS_BAND, "", "",
+	                         NULL,
+	                         G_PARAM_READWRITE |
+	                         G_PARAM_STATIC_STRINGS);
 
 	/**
 	 * NMSettingWireless:channel:
@@ -1277,13 +1289,12 @@ nm_setting_wireless_class_init (NMSettingWirelessClass *klass)
 	 * example: CHANNEL=6
 	 * ---end---
 	 */
-	g_object_class_install_property
-		(object_class, PROP_CHANNEL,
-		 g_param_spec_uint (NM_SETTING_WIRELESS_CHANNEL, "", "",
-		                    0, G_MAXUINT32, 0,
-		                    G_PARAM_READWRITE |
-		                    G_PARAM_CONSTRUCT |
-		                    G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_CHANNEL] =
+	    g_param_spec_uint (NM_SETTING_WIRELESS_CHANNEL, "", "",
+	                       0, G_MAXUINT32, 0,
+	                       G_PARAM_READWRITE |
+	                       G_PARAM_CONSTRUCT |
+	                       G_PARAM_STATIC_STRINGS);
 
 	/**
 	 * NMSettingWireless:bssid:
@@ -1300,16 +1311,14 @@ nm_setting_wireless_class_init (NMSettingWirelessClass *klass)
 	 * example: BSSID=00:1E:BD:64:83:21
 	 * ---end---
 	 */
-	g_object_class_install_property
-		(object_class, PROP_BSSID,
-		 g_param_spec_string (NM_SETTING_WIRELESS_BSSID, "", "",
-		                      NULL,
-		                      G_PARAM_READWRITE |
-		                      G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_BSSID] =
+	    g_param_spec_string (NM_SETTING_WIRELESS_BSSID, "", "",
+	                         NULL,
+	                         G_PARAM_READWRITE |
+	                         G_PARAM_STATIC_STRINGS);
 
 	_properties_override_add_transform (properties_override,
-	                                    g_object_class_find_property (G_OBJECT_CLASS (setting_class),
-	                                                                  NM_SETTING_WIRELESS_BSSID),
+	                                    obj_properties[PROP_BSSID],
 	                                    G_VARIANT_TYPE_BYTESTRING,
 	                                    _nm_utils_hwaddr_to_dbus,
 	                                    _nm_utils_hwaddr_from_dbus);
@@ -1328,14 +1337,13 @@ nm_setting_wireless_class_init (NMSettingWirelessClass *klass)
 	 * description: This property is not handled by ifcfg-rh plugin.
 	 * ---end---
 	 */
-	g_object_class_install_property
-		(object_class, PROP_RATE,
-		 g_param_spec_uint (NM_SETTING_WIRELESS_RATE, "", "",
-		                    0, G_MAXUINT32, 0,
-		                    G_PARAM_READWRITE |
-		                    G_PARAM_CONSTRUCT |
-		                    NM_SETTING_PARAM_FUZZY_IGNORE |
-		                    G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_RATE] =
+	    g_param_spec_uint (NM_SETTING_WIRELESS_RATE, "", "",
+	                       0, G_MAXUINT32, 0,
+	                       G_PARAM_READWRITE |
+	                       G_PARAM_CONSTRUCT |
+	                       NM_SETTING_PARAM_FUZZY_IGNORE |
+	                       G_PARAM_STATIC_STRINGS);
 
 	/**
 	 * NMSettingWireless:tx-power:
@@ -1350,14 +1358,13 @@ nm_setting_wireless_class_init (NMSettingWirelessClass *klass)
 	 * description: This property is not handled by ifcfg-rh plugin.
 	 * ---end---
 	 */
-	g_object_class_install_property
-		(object_class, PROP_TX_POWER,
-		 g_param_spec_uint (NM_SETTING_WIRELESS_TX_POWER, "", "",
-		                    0, G_MAXUINT32, 0,
-		                    G_PARAM_READWRITE |
-		                    G_PARAM_CONSTRUCT |
-		                    NM_SETTING_PARAM_FUZZY_IGNORE |
-		                    G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_TX_POWER] =
+	    g_param_spec_uint (NM_SETTING_WIRELESS_TX_POWER, "", "",
+	                       0, G_MAXUINT32, 0,
+	                       G_PARAM_READWRITE |
+	                       G_PARAM_CONSTRUCT |
+	                       NM_SETTING_PARAM_FUZZY_IGNORE |
+	                       G_PARAM_STATIC_STRINGS);
 
 	/**
 	 * NMSettingWireless:mac-address:
@@ -1383,16 +1390,14 @@ nm_setting_wireless_class_init (NMSettingWirelessClass *klass)
 	 *    permanent MAC address exists, the MAC address initially configured on the device.
 	 * ---end---
 	 */
-	g_object_class_install_property
-		(object_class, PROP_MAC_ADDRESS,
-		 g_param_spec_string (NM_SETTING_WIRELESS_MAC_ADDRESS, "", "",
-		                      NULL,
-		                      G_PARAM_READWRITE |
-		                      G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_MAC_ADDRESS] =
+	    g_param_spec_string (NM_SETTING_WIRELESS_MAC_ADDRESS, "", "",
+	                         NULL,
+	                         G_PARAM_READWRITE |
+	                         G_PARAM_STATIC_STRINGS);
 
 	_properties_override_add_transform (properties_override,
-	                                    g_object_class_find_property (G_OBJECT_CLASS (setting_class),
-	                                                                  NM_SETTING_WIRELESS_MAC_ADDRESS),
+	                                    obj_properties[PROP_MAC_ADDRESS],
 	                                    G_VARIANT_TYPE_BYTESTRING,
 	                                    _nm_utils_hwaddr_to_dbus,
 	                                    _nm_utils_hwaddr_from_dbus);
@@ -1439,16 +1444,15 @@ nm_setting_wireless_class_init (NMSettingWirelessClass *klass)
 	 *    For libnm and nmcli, this field is called "cloned-mac-address".
 	 * ---end---
 	 */
-	g_object_class_install_property
-		(object_class, PROP_CLONED_MAC_ADDRESS,
-		 g_param_spec_string (NM_SETTING_WIRELESS_CLONED_MAC_ADDRESS, "", "",
-		                      NULL,
-		                      G_PARAM_READWRITE |
-		                      G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_CLONED_MAC_ADDRESS] =
+	    g_param_spec_string (NM_SETTING_WIRELESS_CLONED_MAC_ADDRESS, "", "",
+	                         NULL,
+	                         G_PARAM_READWRITE |
+	                         NM_SETTING_PARAM_INFERRABLE |
+	                         G_PARAM_STATIC_STRINGS);
 
 	_properties_override_add_override (properties_override,
-	                                   g_object_class_find_property (G_OBJECT_CLASS (setting_class),
-	                                                                 NM_SETTING_WIRELESS_CLONED_MAC_ADDRESS),
+	                                   obj_properties[PROP_CLONED_MAC_ADDRESS],
 	                                   G_VARIANT_TYPE_BYTESTRING,
 	                                   _nm_utils_hwaddr_cloned_get,
 	                                   _nm_utils_hwaddr_cloned_set,
@@ -1461,7 +1465,7 @@ nm_setting_wireless_class_init (NMSettingWirelessClass *klass)
 	 *   a hardware address in ASCII representation, or one of the special values
 	 *   "preserve", "permanent", "random" or "stable".
 	 *   This field replaces the deprecated "cloned-mac-address" on D-Bus, which
-	 *   can only contain explict hardware addresses. Note that this property
+	 *   can only contain explicit hardware addresses. Note that this property
 	 *   only exists in D-Bus API. libnm and nmcli continue to call this property
 	 *   "cloned-mac-address".
 	 * ---end---
@@ -1511,13 +1515,12 @@ nm_setting_wireless_class_init (NMSettingWirelessClass *klass)
 	 *   cloned-mac-address.
 	 * ---end---
 	 */
-	g_object_class_install_property
-	    (object_class, PROP_GENERATE_MAC_ADDRESS_MASK,
+	obj_properties[PROP_GENERATE_MAC_ADDRESS_MASK] =
 	     g_param_spec_string (NM_SETTING_WIRELESS_GENERATE_MAC_ADDRESS_MASK, "", "",
 	                          NULL,
 	                          G_PARAM_READWRITE |
 	                          NM_SETTING_PARAM_FUZZY_IGNORE |
-	                          G_PARAM_STATIC_STRINGS));
+	                          G_PARAM_STATIC_STRINGS);
 
 	/**
 	 * NMSettingWireless:mac-address-blacklist:
@@ -1539,13 +1542,12 @@ nm_setting_wireless_class_init (NMSettingWirelessClass *klass)
 	 *   is listed.
 	 * ---end---
 	 */
-	g_object_class_install_property
-		(object_class, PROP_MAC_ADDRESS_BLACKLIST,
-		 g_param_spec_boxed (NM_SETTING_WIRELESS_MAC_ADDRESS_BLACKLIST, "", "",
-		                     G_TYPE_STRV,
-		                     G_PARAM_READWRITE |
-		                     NM_SETTING_PARAM_FUZZY_IGNORE |
-		                     G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_MAC_ADDRESS_BLACKLIST] =
+	    g_param_spec_boxed (NM_SETTING_WIRELESS_MAC_ADDRESS_BLACKLIST, "", "",
+	                        G_TYPE_STRV,
+	                        G_PARAM_READWRITE |
+	                        NM_SETTING_PARAM_FUZZY_IGNORE |
+	                        G_PARAM_STATIC_STRINGS);
 
 	/**
 	 * NMSettingWireless:seen-bssids:
@@ -1563,13 +1565,12 @@ nm_setting_wireless_class_init (NMSettingWirelessClass *klass)
 	 * description: This property is not handled by ifcfg-rh plugin.
 	 * ---end---
 	 */
-	g_object_class_install_property
-		(object_class, PROP_SEEN_BSSIDS,
-		 g_param_spec_boxed (NM_SETTING_WIRELESS_SEEN_BSSIDS, "", "",
-		                     G_TYPE_STRV,
-		                     G_PARAM_READWRITE |
-		                     NM_SETTING_PARAM_FUZZY_IGNORE |
-		                     G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_SEEN_BSSIDS] =
+	    g_param_spec_boxed (NM_SETTING_WIRELESS_SEEN_BSSIDS, "", "",
+	                        G_TYPE_STRV,
+	                        G_PARAM_READWRITE |
+	                        NM_SETTING_PARAM_FUZZY_IGNORE |
+	                        G_PARAM_STATIC_STRINGS);
 
 	/**
 	 * NMSettingWireless:mtu:
@@ -1583,14 +1584,13 @@ nm_setting_wireless_class_init (NMSettingWirelessClass *klass)
 	 * description: MTU of the wireless interface.
 	 * ---end---
 	 */
-	g_object_class_install_property
-		(object_class, PROP_MTU,
-		 g_param_spec_uint (NM_SETTING_WIRELESS_MTU, "", "",
-		                    0, G_MAXUINT32, 0,
-		                    G_PARAM_READWRITE |
-		                    G_PARAM_CONSTRUCT |
-		                    NM_SETTING_PARAM_FUZZY_IGNORE |
-		                    G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_MTU] =
+	    g_param_spec_uint (NM_SETTING_WIRELESS_MTU, "", "",
+	                       0, G_MAXUINT32, 0,
+	                       G_PARAM_READWRITE |
+	                       G_PARAM_CONSTRUCT |
+	                       NM_SETTING_PARAM_FUZZY_IGNORE |
+	                       G_PARAM_STATIC_STRINGS);
 
 	/**
 	 * NMSettingWireless:hidden:
@@ -1616,12 +1616,11 @@ nm_setting_wireless_class_init (NMSettingWirelessClass *klass)
 	 * description: Whether the network hides the SSID.
 	 * ---end---
 	 */
-	g_object_class_install_property
-		(object_class, PROP_HIDDEN,
-		 g_param_spec_boolean (NM_SETTING_WIRELESS_HIDDEN, "", "",
-		                       FALSE,
-		                       G_PARAM_READWRITE |
-		                       G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_HIDDEN] =
+	    g_param_spec_boolean (NM_SETTING_WIRELESS_HIDDEN, "", "",
+	                          FALSE,
+	                          G_PARAM_READWRITE |
+	                          G_PARAM_STATIC_STRINGS);
 
 	/**
 	 * NMSettingWireless:powersave:
@@ -1642,12 +1641,11 @@ nm_setting_wireless_class_init (NMSettingWirelessClass *klass)
 	 * example: POWERSAVE=enable
 	 * ---end---
 	 */
-	g_object_class_install_property
-		(object_class, PROP_POWERSAVE,
-		 g_param_spec_uint (NM_SETTING_WIRELESS_POWERSAVE, "", "",
-		                    0, G_MAXUINT32, NM_SETTING_WIRELESS_POWERSAVE_DEFAULT,
-		                    G_PARAM_READWRITE |
-		                    G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_POWERSAVE] =
+	    g_param_spec_uint (NM_SETTING_WIRELESS_POWERSAVE, "", "",
+	                       0, G_MAXUINT32, NM_SETTING_WIRELESS_POWERSAVE_DEFAULT,
+	                       G_PARAM_READWRITE |
+	                       G_PARAM_STATIC_STRINGS);
 
 	/**
 	 * NMSettingWireless:mac-address-randomization:
@@ -1670,12 +1668,11 @@ nm_setting_wireless_class_init (NMSettingWirelessClass *klass)
 	 * example: MAC_ADDRESS_RANDOMIZATION=always
 	 * ---end---
 	 */
-	g_object_class_install_property
-		(object_class, PROP_MAC_ADDRESS_RANDOMIZATION,
-		 g_param_spec_uint (NM_SETTING_WIRELESS_MAC_ADDRESS_RANDOMIZATION, "", "",
-		                    0, G_MAXUINT32, NM_SETTING_MAC_RANDOMIZATION_DEFAULT,
-		                    G_PARAM_READWRITE |
-		                    G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_MAC_ADDRESS_RANDOMIZATION] =
+	    g_param_spec_uint (NM_SETTING_WIRELESS_MAC_ADDRESS_RANDOMIZATION, "", "",
+	                       0, G_MAXUINT32, NM_SETTING_MAC_RANDOMIZATION_DEFAULT,
+	                       G_PARAM_READWRITE |
+	                       G_PARAM_STATIC_STRINGS);
 
 	/* Compatibility for deprecated property */
 	/* ---ifcfg-rh---
@@ -1715,13 +1712,14 @@ nm_setting_wireless_class_init (NMSettingWirelessClass *klass)
 	 *
 	 * Since: 1.12
 	 **/
-	g_object_class_install_property
-		(object_class, PROP_WAKE_ON_WLAN,
-		 g_param_spec_uint (NM_SETTING_WIRELESS_WAKE_ON_WLAN, "", "",
-		                    0, G_MAXUINT32, NM_SETTING_WIRELESS_WAKE_ON_WLAN_DEFAULT,
-		                    G_PARAM_CONSTRUCT |
-		                    G_PARAM_READWRITE |
-		                    G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_WAKE_ON_WLAN] =
+	    g_param_spec_uint (NM_SETTING_WIRELESS_WAKE_ON_WLAN, "", "",
+	                       0, G_MAXUINT32, NM_SETTING_WIRELESS_WAKE_ON_WLAN_DEFAULT,
+	                       G_PARAM_CONSTRUCT |
+	                       G_PARAM_READWRITE |
+	                       G_PARAM_STATIC_STRINGS);
+
+	g_object_class_install_properties (object_class, _PROPERTY_ENUMS_LAST, obj_properties);
 
 	_nm_setting_class_commit_full (setting_class, NM_META_SETTING_TYPE_WIRELESS,
 	                               NULL, properties_override);
diff --git a/libnm-core/nm-setting-wireless.h b/libnm-core/nm-setting-wireless.h
index e9afe2c6..a2ae38a4 100644
--- a/libnm-core/nm-setting-wireless.h
+++ b/libnm-core/nm-setting-wireless.h
@@ -49,7 +49,7 @@ G_BEGIN_DECLS
  * @NM_SETTING_WIRELESS_WAKE_ON_WLAN_MAGIC: Wake on magic packet
  * @NM_SETTING_WIRELESS_WAKE_ON_WLAN_GTK_REKEY_FAILURE: Wake on GTK rekey failure
  * @NM_SETTING_WIRELESS_WAKE_ON_WLAN_EAP_IDENTITY_REQUEST: Wake on EAP identity request
- * @NM_SETTING_WIRELESS_WAKE_ON_WLAN_4WAY_HANDSHAKE: Wake on 4way hanshake
+ * @NM_SETTING_WIRELESS_WAKE_ON_WLAN_4WAY_HANDSHAKE: Wake on 4way handshake
  * @NM_SETTING_WIRELESS_WAKE_ON_WLAN_RFKILL_RELEASE: Wake on rfkill release
  * @NM_SETTING_WIRELESS_WAKE_ON_WLAN_ALL: Wake on all events. This does not
  *   include the exclusive flags @NM_SETTING_WIRELESS_WAKE_ON_WLAN_DEFAULT or
@@ -66,21 +66,21 @@ G_BEGIN_DECLS
  */
 typedef enum { /*< flags >*/
 	NM_SETTING_WIRELESS_WAKE_ON_WLAN_NONE                 = 0, /*< skip >*/
-	NM_SETTING_WIRELESS_WAKE_ON_WLAN_ANY                  = (1 << 1),
-	NM_SETTING_WIRELESS_WAKE_ON_WLAN_DISCONNECT           = (1 << 2),
-	NM_SETTING_WIRELESS_WAKE_ON_WLAN_MAGIC                = (1 << 3),
-	NM_SETTING_WIRELESS_WAKE_ON_WLAN_GTK_REKEY_FAILURE    = (1 << 4),
-	NM_SETTING_WIRELESS_WAKE_ON_WLAN_EAP_IDENTITY_REQUEST = (1 << 5),
-	NM_SETTING_WIRELESS_WAKE_ON_WLAN_4WAY_HANDSHAKE       = (1 << 6),
-	NM_SETTING_WIRELESS_WAKE_ON_WLAN_RFKILL_RELEASE       = (1 << 7),
-	NM_SETTING_WIRELESS_WAKE_ON_WLAN_TCP                  = (1 << 8),
-	_NM_SETTING_WIRELESS_WAKE_ON_WLAN_NUM, /*< skip >*/
-	NM_SETTING_WIRELESS_WAKE_ON_WLAN_LAST                 = _NM_SETTING_WIRELESS_WAKE_ON_WLAN_NUM - 1, /*< skip >*/
-	NM_SETTING_WIRELESS_WAKE_ON_WLAN_ALL                  = ((NM_SETTING_WIRELESS_WAKE_ON_WLAN_LAST << 1) - 1) - (1 << 0 /*DEFAULT*/), /*< skip >*/
-
-	NM_SETTING_WIRELESS_WAKE_ON_WLAN_DEFAULT              = (1 << 0),
-	NM_SETTING_WIRELESS_WAKE_ON_WLAN_IGNORE               = (1 << 15),
-	NM_SETTING_WIRELESS_WAKE_ON_WLAN_EXCLUSIVE_FLAGS = NM_SETTING_WIRELESS_WAKE_ON_WLAN_DEFAULT | NM_SETTING_WIRELESS_WAKE_ON_WLAN_IGNORE, /*< skip >*/
+	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,
+
+	NM_SETTING_WIRELESS_WAKE_ON_WLAN_ALL                  = 0x1FE,
+
+	NM_SETTING_WIRELESS_WAKE_ON_WLAN_DEFAULT              = 0x1,
+	NM_SETTING_WIRELESS_WAKE_ON_WLAN_IGNORE               = 0x8000,
+
+	NM_SETTING_WIRELESS_WAKE_ON_WLAN_EXCLUSIVE_FLAGS      = NM_SETTING_WIRELESS_WAKE_ON_WLAN_DEFAULT | NM_SETTING_WIRELESS_WAKE_ON_WLAN_IGNORE, /*< skip >*/
 } NMSettingWirelessWakeOnWLan;
 
 #define NM_SETTING_WIRELESS_SSID        "ssid"
diff --git a/libnm-core/nm-setting-wpan.c b/libnm-core/nm-setting-wpan.c
index 6e1aaadc..f4270032 100644
--- a/libnm-core/nm-setting-wpan.c
+++ b/libnm-core/nm-setting-wpan.c
@@ -26,22 +26,43 @@
 #include "nm-setting-private.h"
 #include "nm-utils-private.h"
 
-/* Ideally we'll be able to get this from a public header. */
+/**
+ * SECTION:nm-setting-wpan
+ * @short_description: Describes connection properties for IEEE 802.15.4 (WPAN) MAC
+ *
+ * The #NMSettingWpan object is a #NMSetting subclass that describes properties
+ * necessary for configuring IEEE 802.15.4 (WPAN) MAC layer devices.
+ **/
+
+/* Ideally we'll be able to get these from a public header. */
 #ifndef IEEE802154_ADDR_LEN
 #define IEEE802154_ADDR_LEN 8
 #endif
 
-enum {
-	PROP_0,
+#ifndef IEEE802154_MAX_PAGE
+#define IEEE802154_MAX_PAGE 31
+#endif
+
+#ifndef IEEE802154_MAX_CHANNEL
+#define IEEE802154_MAX_CHANNEL 26
+#endif
+
+/*****************************************************************************/
+
+NM_GOBJECT_PROPERTIES_DEFINE_BASE (
 	PROP_MAC_ADDRESS,
 	PROP_PAN_ID,
 	PROP_SHORT_ADDRESS,
-};
+	PROP_PAGE,
+	PROP_CHANNEL,
+);
 
 typedef struct {
 	char *mac_address;
 	guint16 pan_id;
 	guint16 short_address;
+	gint16 page;
+	gint16 channel;
 } NMSettingWpanPrivate;
 
 /**
@@ -57,18 +78,12 @@ struct _NMSettingWpanClass {
         NMSettingClass parent;
 };
 
-/**
- * SECTION:nm-setting-wpan
- * @short_description: Describes connection properties for IEEE 802.15.4 (WPAN) MAC
- *
- * The #NMSettingWpan object is a #NMSetting subclass that describes properties
- * necessary for configuring IEEE 802.15.4 (WPAN) MAC layer devices.
- **/
-
 G_DEFINE_TYPE (NMSettingWpan, nm_setting_wpan, NM_TYPE_SETTING)
 
 #define NM_SETTING_WPAN_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_SETTING_WPAN, NMSettingWpanPrivate))
 
+/*****************************************************************************/
+
 /**
  * nm_setting_wpan_get_mac_address:
  * @setting: the #NMSettingWpan
@@ -117,6 +132,38 @@ nm_setting_wpan_get_short_address (NMSettingWpan *setting)
 	return NM_SETTING_WPAN_GET_PRIVATE (setting)->short_address;
 }
 
+/**
+ * nm_setting_wpan_get_page:
+ * @setting: the #NMSettingWpan
+ *
+ * Returns: the #NMSettingWpan:page property of the setting
+ *
+ * Since: 1.16
+ **/
+gint16
+nm_setting_wpan_get_page (NMSettingWpan *setting)
+{
+	g_return_val_if_fail (NM_IS_SETTING_WPAN (setting), NM_SETTING_WPAN_PAGE_DEFAULT);
+
+	return NM_SETTING_WPAN_GET_PRIVATE (setting)->page;
+}
+
+/**
+ * nm_setting_wpan_get_channel:
+ * @setting: the #NMSettingWpan
+ *
+ * Returns: the #NMSettingWpan:channel property of the setting
+ *
+ * Since: 1.16
+ **/
+gint16
+nm_setting_wpan_get_channel (NMSettingWpan *setting)
+{
+	g_return_val_if_fail (NM_IS_SETTING_WPAN (setting), NM_SETTING_WPAN_CHANNEL_DEFAULT);
+
+	return NM_SETTING_WPAN_GET_PRIVATE (setting)->channel;
+}
+
 static gboolean
 verify (NMSetting *setting, NMConnection *connection, GError **error)
 {
@@ -131,9 +178,42 @@ verify (NMSetting *setting, NMConnection *connection, GError **error)
 		return FALSE;
 	}
 
+	if ((priv->page == NM_SETTING_WPAN_PAGE_DEFAULT) != (priv->channel == NM_SETTING_WPAN_CHANNEL_DEFAULT)) {
+		g_set_error_literal (error,
+		                     NM_CONNECTION_ERROR,
+		                     NM_CONNECTION_ERROR_INVALID_PROPERTY,
+		                     _("page must be defined along with a channel"));
+		g_prefix_error (error, "%s.%s: ", NM_SETTING_WPAN_SETTING_NAME, NM_SETTING_WPAN_PAGE);
+		return FALSE;
+	}
+
+	if (priv->page < NM_SETTING_WPAN_PAGE_DEFAULT || priv->page > IEEE802154_MAX_PAGE) {
+		g_set_error (error,
+		             NM_CONNECTION_ERROR,
+		             NM_CONNECTION_ERROR_INVALID_PROPERTY,
+		             _("page must be between %d and %d"),
+		             NM_SETTING_WPAN_PAGE_DEFAULT,
+		             IEEE802154_MAX_PAGE);
+		g_prefix_error (error, "%s.%s: ", NM_SETTING_WPAN_SETTING_NAME, NM_SETTING_WPAN_PAGE);
+		return FALSE;
+	}
+
+	if (priv->channel < NM_SETTING_WPAN_CHANNEL_DEFAULT || priv->channel > IEEE802154_MAX_CHANNEL) {
+		g_set_error (error,
+		             NM_CONNECTION_ERROR,
+		             NM_CONNECTION_ERROR_INVALID_PROPERTY,
+		             _("channel must not be between %d and %d"),
+		             NM_SETTING_WPAN_CHANNEL_DEFAULT,
+		             IEEE802154_MAX_CHANNEL);
+		g_prefix_error (error, "%s.%s: ", NM_SETTING_WPAN_SETTING_NAME, NM_SETTING_WPAN_CHANNEL);
+		return FALSE;
+	}
+
 	return TRUE;
 }
 
+/*****************************************************************************/
+
 static void
 get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec)
 {
@@ -149,6 +229,12 @@ get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec)
 	case PROP_SHORT_ADDRESS:
 		g_value_set_uint (value, nm_setting_wpan_get_short_address (setting));
 		break;
+	case PROP_PAGE:
+		g_value_set_int (value, nm_setting_wpan_get_page (setting));
+		break;
+	case PROP_CHANNEL:
+		g_value_set_int (value, nm_setting_wpan_get_channel (setting));
+		break;
 	default:
 		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
 		break;
@@ -172,19 +258,29 @@ set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *p
 	case PROP_SHORT_ADDRESS:
 		priv->short_address = g_value_get_uint (value);
 		break;
+	case PROP_PAGE:
+		priv->page = g_value_get_int (value);
+		break;
+	case PROP_CHANNEL:
+		priv->channel = g_value_get_int (value);
+		break;
 	default:
 		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
 		break;
 	}
 }
 
+/*****************************************************************************/
+
 static void
 nm_setting_wpan_init (NMSettingWpan *setting)
 {
 	NMSettingWpanPrivate *priv = NM_SETTING_WPAN_GET_PRIVATE (setting);
 
-	priv->short_address = G_MAXUINT16;
 	priv->pan_id = G_MAXUINT16;
+	priv->short_address = G_MAXUINT16;
+	priv->page = NM_SETTING_WPAN_PAGE_DEFAULT;
+	priv->channel = NM_SETTING_WPAN_CHANNEL_DEFAULT;
 }
 
 /**
@@ -220,8 +316,8 @@ nm_setting_wpan_class_init (NMSettingWpanClass *klass)
 
 	g_type_class_add_private (setting_class, sizeof (NMSettingWpanPrivate));
 
-	object_class->set_property = set_property;
 	object_class->get_property = get_property;
+	object_class->set_property = set_property;
 	object_class->finalize     = finalize;
 
 	setting_class->verify = verify;
@@ -239,36 +335,67 @@ nm_setting_wpan_class_init (NMSettingWpanClass *klass)
 	 *   (e.g. 76:d8:9b:87:66:60:84:ee).
 	 * ---end---
 	 */
-	g_object_class_install_property
-	        (object_class, PROP_MAC_ADDRESS,
-	         g_param_spec_string (NM_SETTING_WPAN_MAC_ADDRESS, "", "",
-	                              NULL,
-	                              G_PARAM_READWRITE |
-	                              G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_MAC_ADDRESS] =
+	    g_param_spec_string (NM_SETTING_WPAN_MAC_ADDRESS, "", "",
+	                         NULL,
+	                         G_PARAM_READWRITE |
+	                         G_PARAM_STATIC_STRINGS);
 
 	/**
 	 * NMSettingWpan:pan-id:
 	 *
 	 * IEEE 802.15.4 Personal Area Network (PAN) identifier.
 	 **/
-	g_object_class_install_property
-	        (object_class, PROP_PAN_ID,
-	         g_param_spec_uint (NM_SETTING_WPAN_PAN_ID, "", "",
-	                            0, G_MAXUINT16, G_MAXUINT16,
-	                            G_PARAM_READWRITE |
-	                            G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_PAN_ID] =
+	    g_param_spec_uint (NM_SETTING_WPAN_PAN_ID, "", "",
+	                       0, G_MAXUINT16, G_MAXUINT16,
+	                       G_PARAM_READWRITE |
+	                       G_PARAM_STATIC_STRINGS);
 
 	/**
 	 * NMSettingWpan:short-address:
 	 *
 	 * Short IEEE 802.15.4 address to be used within a restricted environment.
 	 **/
-	g_object_class_install_property
-	        (object_class, PROP_SHORT_ADDRESS,
-	         g_param_spec_uint (NM_SETTING_WPAN_SHORT_ADDRESS, "", "",
-	                            0, G_MAXUINT16, G_MAXUINT16,
-	                            G_PARAM_READWRITE |
-	                            G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_SHORT_ADDRESS] =
+	    g_param_spec_uint (NM_SETTING_WPAN_SHORT_ADDRESS, "", "",
+	                       0, G_MAXUINT16, G_MAXUINT16,
+	                       G_PARAM_READWRITE |
+	                       G_PARAM_STATIC_STRINGS);
+
+	/**
+	 * NMSettingWpan:page:
+	 *
+	 * IEEE 802.15.4 channel page. A positive integer or -1, meaning "do not
+	 * set, use whatever the device is already set to".
+	 *
+	 * Since: 1.16
+	 **/
+	obj_properties[PROP_PAGE] =
+	    g_param_spec_int (NM_SETTING_WPAN_PAGE, "", "",
+	                       G_MININT16,
+	                       G_MAXINT16,
+	                       NM_SETTING_WPAN_PAGE_DEFAULT,
+	                       G_PARAM_READWRITE |
+	                       G_PARAM_STATIC_STRINGS);
+
+	/**
+	 * NMSettingWpan:channel:
+	 *
+	 * IEEE 802.15.4 channel. A positive integer or -1, meaning "do not
+	 * set, use whatever the device is already set to".
+	 *
+	 * Since: 1.16
+	 **/
+	obj_properties[PROP_CHANNEL] =
+	    g_param_spec_int (NM_SETTING_WPAN_CHANNEL, "", "",
+	                       G_MININT16,
+	                       G_MAXINT16,
+	                       NM_SETTING_WPAN_CHANNEL_DEFAULT,
+	                       G_PARAM_READWRITE |
+	                       G_PARAM_STATIC_STRINGS);
+
+	g_object_class_install_properties (object_class, _PROPERTY_ENUMS_LAST, obj_properties);
 
 	_nm_setting_class_commit (setting_class, NM_META_SETTING_TYPE_WPAN);
 }
diff --git a/libnm-core/nm-setting-wpan.h b/libnm-core/nm-setting-wpan.h
index a39e377e..aaea1086 100644
--- a/libnm-core/nm-setting-wpan.h
+++ b/libnm-core/nm-setting-wpan.h
@@ -39,6 +39,11 @@ G_BEGIN_DECLS
 #define NM_SETTING_WPAN_MAC_ADDRESS        "mac-address"
 #define NM_SETTING_WPAN_PAN_ID             "pan-id"
 #define NM_SETTING_WPAN_SHORT_ADDRESS      "short-address"
+#define NM_SETTING_WPAN_PAGE               "page"
+#define NM_SETTING_WPAN_CHANNEL            "channel"
+
+#define NM_SETTING_WPAN_PAGE_DEFAULT    -1
+#define NM_SETTING_WPAN_CHANNEL_DEFAULT -1
 
 typedef struct _NMSettingWpanClass NMSettingWpanClass;
 
@@ -53,6 +58,10 @@ NM_AVAILABLE_IN_1_14
 guint16     nm_setting_wpan_get_pan_id             (NMSettingWpan *setting);
 NM_AVAILABLE_IN_1_14
 guint16     nm_setting_wpan_get_short_address      (NMSettingWpan *setting);
+NM_AVAILABLE_IN_1_16
+gint16      nm_setting_wpan_get_page               (NMSettingWpan *setting);
+NM_AVAILABLE_IN_1_16
+gint16      nm_setting_wpan_get_channel            (NMSettingWpan *setting);
 
 G_END_DECLS
 
diff --git a/libnm-core/nm-setting.c b/libnm-core/nm-setting.c
index 047391ce..2e9081df 100644
--- a/libnm-core/nm-setting.c
+++ b/libnm-core/nm-setting.c
@@ -24,23 +24,12 @@
 
 #include "nm-setting.h"
 
-#include 
-
 #include "nm-setting-private.h"
 #include "nm-utils.h"
 #include "nm-core-internal.h"
 #include "nm-utils-private.h"
 #include "nm-property-compare.h"
 
-#include "nm-setting-connection.h"
-#include "nm-setting-bond.h"
-#include "nm-setting-bridge.h"
-#include "nm-setting-bridge-port.h"
-#include "nm-setting-pppoe.h"
-#include "nm-setting-team.h"
-#include "nm-setting-team-port.h"
-#include "nm-setting-vpn.h"
-
 /**
  * SECTION:nm-setting
  * @short_description: Describes related configuration information
@@ -67,12 +56,9 @@ typedef struct {
 	NMSettingPriority priority;
 } SettingInfo;
 
-enum {
-	PROP_0,
+NM_GOBJECT_PROPERTIES_DEFINE (NMSetting,
 	PROP_NAME,
-
-	PROP_LAST
-};
+);
 
 typedef struct {
 	GenData *gendata;
@@ -354,6 +340,77 @@ _properties_override_add_transform (GArray *properties_override,
 
 static NMSettInfoSetting _sett_info_settings[_NM_META_SETTING_TYPE_NUM];
 
+static int
+_property_infos_sort_cmp_setting_connection (gconstpointer p_a,
+                                             gconstpointer p_b,
+                                             gpointer user_data)
+{
+	const NMSettInfoProperty *a = *((const NMSettInfoProperty *const*) p_a);
+	const NMSettInfoProperty *b = *((const NMSettInfoProperty *const*) p_b);
+	int c_name;
+
+	c_name = strcmp (a->name, b->name);
+	nm_assert (c_name != 0);
+
+#define CMP_AND_RETURN(n_a, n_b, name) \
+	G_STMT_START { \
+		gboolean _is = nm_streq (n_a, ""name); \
+		\
+		if (   _is \
+		    || nm_streq (n_b, ""name)) \
+			return _is ? -1 : 1; \
+	} G_STMT_END
+
+	/* for [connection], report first id, uuid, type in that order. */
+	if (c_name != 0) {
+		CMP_AND_RETURN (a->name, b->name, NM_SETTING_CONNECTION_ID);
+		CMP_AND_RETURN (a->name, b->name, NM_SETTING_CONNECTION_UUID);
+		CMP_AND_RETURN (a->name, b->name, NM_SETTING_CONNECTION_TYPE);
+	}
+
+#undef CMP_AND_RETURN
+
+	return c_name;
+}
+
+static const NMSettInfoProperty *const*
+_property_infos_sort (const NMSettInfoProperty *property_infos,
+                      guint property_infos_len,
+                      NMSettingClass *setting_class)
+{
+	const NMSettInfoProperty **arr;
+	guint i;
+
+#if NM_MORE_ASSERTS > 5
+	/* assert that the property names are all unique and sorted. */
+	for (i = 0; i < property_infos_len; i++) {
+		if (property_infos[i].param_spec)
+			nm_assert (nm_streq (property_infos[i].name, property_infos[i].param_spec->name));
+		if (i > 0)
+			nm_assert (strcmp (property_infos[i - 1].name, property_infos[i].name) < 0);
+	}
+#endif
+
+	if (property_infos_len <= 1)
+		return NULL;
+	if (G_TYPE_FROM_CLASS (setting_class) != NM_TYPE_SETTING_CONNECTION) {
+		/* we only do something special for certain setting types. This one,
+		 * has just alphabetical sorting. */
+		return NULL;
+	}
+
+	arr = g_new (const NMSettInfoProperty *, property_infos_len);
+	for (i = 0; i < property_infos_len; i++)
+		arr[i] = &property_infos[i];
+
+	g_qsort_with_data (arr,
+	                   property_infos_len,
+	                   sizeof (const NMSettInfoProperty *),
+	                   _property_infos_sort_cmp_setting_connection,
+	                   NULL);
+	return arr;
+}
+
 void
 _nm_setting_class_commit_full (NMSettingClass *setting_class,
                                NMMetaSettingType meta_type,
@@ -387,19 +444,21 @@ _nm_setting_class_commit_full (NMSettingClass *setting_class,
 #if NM_MORE_ASSERTS > 10
 	/* assert that properties_override is constructed consistently. */
 	for (i = 0; i < override_len; i++) {
-		guint j;
 		const NMSettInfoProperty *p = &g_array_index (properties_override, NMSettInfoProperty, i);
+		gboolean found = FALSE;
+		guint j;
 
 		nm_assert (!_nm_sett_info_property_find_in_array ((NMSettInfoProperty *) properties_override->data,
 		                                                  i,
 		                                                  p->name));
 		for (j = 0; j < n_property_specs; j++) {
-			if (nm_streq (property_specs[j]->name, p->name)) {
-				nm_assert (p->param_spec == property_specs[j]);
-				break;
-			}
+			if (!nm_streq (property_specs[j]->name, p->name))
+				continue;
+			nm_assert (!found);
+			found = TRUE;
+			nm_assert (p->param_spec == property_specs[j]);
 		}
-		nm_assert ((j == n_property_specs) == (p->param_spec == NULL));
+		nm_assert (found == (p->param_spec != NULL));
 	}
 #endif
 
@@ -429,27 +488,21 @@ _nm_setting_class_commit_full (NMSettingClass *setting_class,
 	sett_info->property_infos_len = properties_override->len;
 	sett_info->property_infos = (const NMSettInfoProperty *) g_array_free (properties_override,
 	                                                                       properties_override->len == 0);
-}
 
-const NMSettInfoSetting *
-_nm_sett_info_setting_get (NMSettingClass *setting_class)
-{
-	if (   NM_IS_SETTING_CLASS (setting_class)
-	    && setting_class->setting_info) {
-		nm_assert (setting_class->setting_info->meta_type < G_N_ELEMENTS (_sett_info_settings));
-		return &_sett_info_settings[setting_class->setting_info->meta_type];
-	}
-	return NULL;
+	sett_info->property_infos_sorted = _property_infos_sort (sett_info->property_infos,
+	                                                         sett_info->property_infos_len,
+	                                                         setting_class);
 }
 
 const NMSettInfoProperty *
-_nm_sett_info_property_get (NMSettingClass *setting_class,
-                            const char *property_name)
+_nm_sett_info_setting_get_property_info (const NMSettInfoSetting *sett_info,
+                                         const char *property_name)
 {
-	const NMSettInfoSetting *sett_info = _nm_sett_info_setting_get (setting_class);
 	const NMSettInfoProperty *property;
 	gssize idx;
 
+	nm_assert (property_name);
+
 	if (!sett_info)
 		return NULL;
 
@@ -472,6 +525,50 @@ _nm_sett_info_property_get (NMSettingClass *setting_class,
 	return property;
 }
 
+const NMSettInfoSetting *
+_nm_setting_class_get_sett_info (NMSettingClass *setting_class)
+{
+	const NMSettInfoSetting *sett_info;
+
+	if (   !NM_IS_SETTING_CLASS (setting_class)
+	    || !setting_class->setting_info)
+		return NULL;
+
+	nm_assert (setting_class->setting_info->meta_type < G_N_ELEMENTS (_sett_info_settings));
+	sett_info = &_sett_info_settings[setting_class->setting_info->meta_type];
+	nm_assert (sett_info->setting_class == setting_class);
+	return sett_info;
+}
+
+/*****************************************************************************/
+
+void
+_nm_setting_emit_property_changed (NMSetting *setting)
+{
+	/* Some settings have "properties" that are not implemented as GObject properties.
+	 *
+	 * For example:
+	 *
+	 *   - gendata-base settings like NMSettingEthtool. Here properties are just
+	 *     GVariant values in the gendata hash.
+	 *
+	 *   - NMSettingWireGuard's peers are not backed by a GObject property. Instead
+	 *     there is C-API to access/modify peers.
+	 *
+	 * We still want to emit property-changed notifications for such properties,
+	 * in particular because NMConnection registers to such signals to re-emit
+	 * it as NM_CONNECTION_CHANGED signal. In fact, there are unlikely any other
+	 * uses of such a property-changed signal, because generally it doesn't make
+	 * too much sense.
+	 *
+	 * So, instead of adding yet another (artificial) signal "setting-changed",
+	 * hijack the "notify" signal and just notify about changes of the "name".
+	 * Of course, the "name" doesn't really ever change, because it's tied to
+	 * the GObject's type.
+	 */
+	_notify (setting, PROP_NAME);
+}
+
 /*****************************************************************************/
 
 gboolean
@@ -654,7 +751,7 @@ _nm_setting_to_dbus (NMSetting *setting, NMConnection *connection, NMConnectionS
 		                       g_hash_table_lookup (priv->gendata->hash, gendata_keys[i]));
 	}
 
-	sett_info = _nm_sett_info_setting_get (NM_SETTING_GET_CLASS (setting));
+	sett_info = _nm_setting_class_get_sett_info (NM_SETTING_GET_CLASS (setting));
 	for (i = 0; i < sett_info->property_infos_len; i++) {
 		const NMSettInfoProperty *property = &sett_info->property_infos[i];
 		GParamSpec *prop_spec = property->param_spec;
@@ -662,10 +759,13 @@ _nm_setting_to_dbus (NMSetting *setting, NMConnection *connection, NMConnectionS
 		if (!prop_spec) {
 			if (!property->synth_func)
 				continue;
-
-			if (flags & NM_CONNECTION_SERIALIZE_ONLY_SECRETS)
-				continue;
 		} else {
+
+			/* For the moment, properties backed by a GObject property don't
+			 * define a synth function. There is no problem supporting that,
+			 * however, for now just disallow it. */
+			nm_assert (!property->synth_func);
+
 			if (!(prop_spec->flags & G_PARAM_WRITABLE))
 				continue;
 
@@ -685,14 +785,10 @@ _nm_setting_to_dbus (NMSetting *setting, NMConnection *connection, NMConnectionS
 				continue;
 		}
 
-		if (property->synth_func) {
-			if (!(flags & NM_CONNECTION_SERIALIZE_NO_SYNTH))
-				dbus_value = property->synth_func (setting, connection, property->name);
-			else
-				dbus_value = NULL;
-		} else {
+		if (property->synth_func)
+			dbus_value = property->synth_func (sett_info, i, connection, setting, flags);
+		else
 			dbus_value = get_property_for_dbus (setting, property, TRUE);
-		}
 
 		if (dbus_value) {
 			/* Allow dbus_value to be either floating or not. */
@@ -780,7 +876,7 @@ _nm_setting_new_from_dbus (GType setting_type,
 		}
 	}
 
-	sett_info = _nm_sett_info_setting_get (NM_SETTING_GET_CLASS (setting));
+	sett_info = _nm_setting_class_get_sett_info (NM_SETTING_GET_CLASS (setting));
 
 	if (sett_info->detail.gendata_info) {
 		GHashTable *hash;
@@ -802,89 +898,94 @@ _nm_setting_new_from_dbus (GType setting_type,
 	}
 
 	for (i = 0; i < sett_info->property_infos_len; i++) {
-		const NMSettInfoProperty *property = &sett_info->property_infos[i];
+		const NMSettInfoProperty *property_info = &sett_info->property_infos[i];
 		gs_unref_variant GVariant *value = NULL;
 		gs_free_error GError *local = NULL;
 
-		if (property->param_spec && !(property->param_spec->flags & G_PARAM_WRITABLE))
+		if (   property_info->param_spec
+		    && !(property_info->param_spec->flags & G_PARAM_WRITABLE))
 			continue;
 
-		value = g_variant_lookup_value (setting_dict, property->name, NULL);
+		value = g_variant_lookup_value (setting_dict, property_info->name, NULL);
 
 		if (value && keys)
-			g_hash_table_remove (keys, property->name);
+			g_hash_table_remove (keys, property_info->name);
 
-		if (value && property->set_func) {
+		if (   value
+		    && property_info->set_func) {
 
-			if (!g_variant_type_equal (g_variant_get_type (value), property->dbus_type)) {
+			if (!g_variant_type_equal (g_variant_get_type (value), property_info->dbus_type)) {
 				/* for backward behavior, fail unless best-effort is chosen. */
 				if (NM_FLAGS_HAS (parse_flags, NM_SETTING_PARSE_FLAGS_BEST_EFFORT))
 					continue;
 				g_set_error (error, NM_CONNECTION_ERROR, NM_CONNECTION_ERROR_INVALID_PROPERTY,
 				             _("can't set property of type '%s' from value of type '%s'"),
-				             property->dbus_type ?
-				                 g_variant_type_peek_string (property->dbus_type) :
-				                 property->param_spec ?
-				                     g_type_name (property->param_spec->value_type) : "(unknown)",
+				             property_info->dbus_type ?
+				                 g_variant_type_peek_string (property_info->dbus_type) :
+				                 property_info->param_spec ?
+				                     g_type_name (property_info->param_spec->value_type) : "(unknown)",
 				             g_variant_get_type_string (value));
-				g_prefix_error (error, "%s.%s: ", nm_setting_get_name (setting), property->name);
+				g_prefix_error (error, "%s.%s: ", nm_setting_get_name (setting), property_info->name);
 				return NULL;
 			}
 
-			if (!property->set_func (setting,
-			                         connection_dict,
-			                         property->name,
-			                         value,
-			                         parse_flags,
-			                         &local)) {
+			if (!property_info->set_func (setting,
+			                             connection_dict,
+			                             property_info->name,
+			                             value,
+			                             parse_flags,
+			                             &local)) {
 				if (!NM_FLAGS_HAS (parse_flags, NM_SETTING_PARSE_FLAGS_STRICT))
 					continue;
 				g_set_error (error, NM_CONNECTION_ERROR, NM_CONNECTION_ERROR_INVALID_PROPERTY,
 				             _("failed to set property: %s"),
 				             local->message);
-				g_prefix_error (error, "%s.%s: ", nm_setting_get_name (setting), property->name);
+				g_prefix_error (error, "%s.%s: ", nm_setting_get_name (setting), property_info->name);
 				return NULL;
 			}
-		} else if (!value && property->not_set_func) {
-			if (!property->not_set_func (setting,
-			                             connection_dict,
-			                             property->name,
-			                             parse_flags,
-			                             &local)) {
+		} else if (   !value
+		           && property_info->not_set_func) {
+			if (!property_info->not_set_func (setting,
+			                                  connection_dict,
+			                                  property_info->name,
+			                                  parse_flags,
+			                                  &local)) {
 				if (!NM_FLAGS_HAS (parse_flags, NM_SETTING_PARSE_FLAGS_STRICT))
 					continue;
 				g_set_error (error, NM_CONNECTION_ERROR, NM_CONNECTION_ERROR_INVALID_PROPERTY,
 				             _("failed to set property: %s"),
 				             local->message);
-				g_prefix_error (error, "%s.%s: ", nm_setting_get_name (setting), property->name);
+				g_prefix_error (error, "%s.%s: ", nm_setting_get_name (setting), property_info->name);
 				return NULL;
 			}
-		} else if (value && property->param_spec) {
+		} else if (   value
+		           && property_info->param_spec) {
 			nm_auto_unset_gvalue GValue object_value = G_VALUE_INIT;
 
-			g_value_init (&object_value, property->param_spec->value_type);
-			if (!set_property_from_dbus (property, value, &object_value)) {
+			g_value_init (&object_value, property_info->param_spec->value_type);
+			if (!set_property_from_dbus (property_info, value, &object_value)) {
 				/* for backward behavior, fail unless best-effort is chosen. */
 				if (NM_FLAGS_HAS (parse_flags, NM_SETTING_PARSE_FLAGS_BEST_EFFORT))
 					continue;
 				g_set_error (error, NM_CONNECTION_ERROR, NM_CONNECTION_ERROR_INVALID_PROPERTY,
 				             _("can't set property of type '%s' from value of type '%s'"),
-				             property->dbus_type ?
-				                 g_variant_type_peek_string (property->dbus_type) :
-				                 property->param_spec ?
-				                     g_type_name (property->param_spec->value_type) : "(unknown)",
+				               property_info->dbus_type
+				             ? g_variant_type_peek_string (property_info->dbus_type)
+				             : (  property_info->param_spec
+				                ? g_type_name (property_info->param_spec->value_type)
+				                : "(unknown)"),
 				             g_variant_get_type_string (value));
-				g_prefix_error (error, "%s.%s: ", nm_setting_get_name (setting), property->name);
+				g_prefix_error (error, "%s.%s: ", nm_setting_get_name (setting), property_info->name);
 				return NULL;
 			}
 
-			if (!nm_g_object_set_property (G_OBJECT (setting), property->param_spec->name, &object_value, &local)) {
+			if (!nm_g_object_set_property (G_OBJECT (setting), property_info->param_spec->name, &object_value, &local)) {
 				if (!NM_FLAGS_HAS (parse_flags, NM_SETTING_PARSE_FLAGS_STRICT))
 					continue;
 				g_set_error (error, NM_CONNECTION_ERROR, NM_CONNECTION_ERROR_INVALID_PROPERTY,
 				             _("can not set property: %s"),
 				             local->message);
-				g_prefix_error (error, "%s.%s: ", nm_setting_get_name (setting), property->name);
+				g_prefix_error (error, "%s.%s: ", nm_setting_get_name (setting), property_info->name);
 				return NULL;
 			}
 		}
@@ -926,7 +1027,7 @@ nm_setting_get_dbus_property_type (NMSetting *setting,
 	g_return_val_if_fail (NM_IS_SETTING (setting), NULL);
 	g_return_val_if_fail (property_name != NULL, NULL);
 
-	property = _nm_sett_info_property_get (NM_SETTING_GET_CLASS (setting), property_name);
+	property = _nm_setting_class_get_property_info (NM_SETTING_GET_CLASS (setting), property_name);
 	g_return_val_if_fail (property != NULL, NULL);
 
 	if (property->dbus_type)
@@ -939,13 +1040,13 @@ gboolean
 _nm_setting_get_property (NMSetting *setting, const char *property_name, GValue *value)
 {
 	const NMSettInfoSetting *sett_info;
-	GParamSpec *prop_spec;
+	const NMSettInfoProperty *property_info;
 
 	g_return_val_if_fail (NM_IS_SETTING (setting), FALSE);
 	g_return_val_if_fail (property_name, FALSE);
 	g_return_val_if_fail (value, FALSE);
 
-	sett_info = _nm_sett_info_setting_get (NM_SETTING_GET_CLASS (setting));
+	sett_info = _nm_setting_class_get_sett_info (NM_SETTING_GET_CLASS (setting));
 
 	if (sett_info->detail.gendata_info) {
 		GVariant *variant;
@@ -963,26 +1064,86 @@ _nm_setting_get_property (NMSetting *setting, const char *property_name, GValue
 		return TRUE;
 	}
 
-	prop_spec = g_object_class_find_property (G_OBJECT_GET_CLASS (setting), property_name);
-	if (!prop_spec) {
+	property_info = _nm_sett_info_setting_get_property_info (sett_info, property_name);
+	if (   !property_info
+	    || !property_info->param_spec) {
 		g_value_unset (value);
 		return FALSE;
 	}
 
-	g_value_init (value, prop_spec->value_type);
+	g_value_init (value, property_info->param_spec->value_type);
 	g_object_get_property (G_OBJECT (setting), property_name, value);
 	return TRUE;
 }
 
 static void
-duplicate_setting (NMSetting *setting,
-                   const char *name,
-                   const GValue *value,
-                   GParamFlags flags,
-                   gpointer user_data)
+_gobject_copy_property (GObject *src,
+                        GObject *dst,
+                        const char *property_name,
+                        GType gtype)
 {
-	if ((flags & (G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY)) == G_PARAM_WRITABLE)
-		g_object_set_property (G_OBJECT (user_data), name, value);
+	nm_auto_unset_gvalue GValue value = G_VALUE_INIT;
+
+	nm_assert (G_IS_OBJECT (src));
+	nm_assert (G_IS_OBJECT (dst));
+
+	g_value_init (&value, gtype);
+	g_object_get_property (src, property_name, &value);
+	g_object_set_property (dst, property_name, &value);
+}
+
+static void
+duplicate_copy_properties (const NMSettInfoSetting *sett_info,
+                           NMSetting *src,
+                           NMSetting *dst)
+{
+	if (sett_info->detail.gendata_info) {
+		GenData *gendata = _gendata_hash (src, FALSE);
+
+		nm_assert (!_gendata_hash (dst, FALSE));
+
+		if (   gendata
+		    && g_hash_table_size (gendata->hash) > 0) {
+			GHashTableIter iter;
+			GHashTable *h = _gendata_hash (dst, TRUE)->hash;
+			const char *key;
+			GVariant *val;
+
+			g_hash_table_iter_init (&iter, gendata->hash);
+			while (g_hash_table_iter_next (&iter, (gpointer *) &key, (gpointer *) &val)) {
+				g_hash_table_insert (h,
+				                     g_strdup (key),
+				                     g_variant_ref (val));
+			}
+		}
+	}
+
+	if (sett_info->property_infos_len > 0) {
+		gboolean frozen = FALSE;
+		guint i;
+
+		for (i = 0; i < sett_info->property_infos_len; i++) {
+			const NMSettInfoProperty *property_info = &sett_info->property_infos[i];
+
+			if (property_info->param_spec) {
+				if ((property_info->param_spec->flags & (G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY)) != G_PARAM_WRITABLE)
+					continue;
+
+				if (!frozen) {
+					g_object_freeze_notify (G_OBJECT (dst));
+					frozen = TRUE;
+				}
+				_gobject_copy_property (G_OBJECT (src),
+				                        G_OBJECT (dst),
+				                        property_info->param_spec->name,
+				                        G_PARAM_SPEC_VALUE_TYPE (property_info->param_spec));
+				continue;
+			}
+		}
+
+		if (frozen)
+			g_object_thaw_notify (G_OBJECT (dst));
+	}
 }
 
 /**
@@ -998,37 +1159,22 @@ NMSetting *
 nm_setting_duplicate (NMSetting *setting)
 {
 	const NMSettInfoSetting *sett_info;
-	GObject *dup;
+	NMSettingClass *klass;
+	NMSetting *dst;
 
 	g_return_val_if_fail (NM_IS_SETTING (setting), NULL);
 
-	dup = g_object_new (G_OBJECT_TYPE (setting), NULL);
+	klass = NM_SETTING_GET_CLASS (setting);
+	nm_assert (NM_IS_SETTING_CLASS (klass));
+	nm_assert (klass->duplicate_copy_properties);
 
-	sett_info = _nm_sett_info_setting_get (NM_SETTING_GET_CLASS (setting));
+	dst = g_object_new (G_TYPE_FROM_CLASS (klass), NULL);
 
-	if (sett_info->detail.gendata_info) {
-		GenData *gendata = _gendata_hash (setting, FALSE);
+	sett_info = _nm_setting_class_get_sett_info (klass);
+	nm_assert (sett_info);
 
-		if (   gendata
-		    && g_hash_table_size (gendata->hash) > 0) {
-			GHashTableIter iter;
-			GHashTable *h = _gendata_hash (NM_SETTING (dup), TRUE)->hash;
-			const char *key;
-			GVariant *val;
-
-			g_hash_table_iter_init (&iter, gendata->hash);
-			while (g_hash_table_iter_next (&iter, (gpointer *) &key, (gpointer *) &val)) {
-				g_hash_table_insert (h,
-				                     g_strdup (key),
-				                     g_variant_ref (val));
-			}
-		}
-	} else {
-		g_object_freeze_notify (dup);
-		nm_setting_enumerate_values (setting, duplicate_setting, dup);
-		g_object_thaw_notify (dup);
-	}
-	return NM_SETTING (dup);
+	klass->duplicate_copy_properties (sett_info, setting, dst);
+	return dst;
 }
 
 /**
@@ -1136,58 +1282,148 @@ _nm_setting_verify_secret_string (const char *str,
 	return TRUE;
 }
 
-static gboolean
-compare_property (NMSetting *setting,
+gboolean
+_nm_setting_should_compare_secret_property (NMSetting *setting,
+                                            NMSetting *other,
+                                            const char *secret_name,
+                                            NMSettingCompareFlags flags)
+{
+	NMSettingSecretFlags a_secret_flags = NM_SETTING_SECRET_FLAG_NONE;
+	NMSettingSecretFlags b_secret_flags = NM_SETTING_SECRET_FLAG_NONE;
+
+	nm_assert (NM_IS_SETTING (setting));
+	nm_assert (!other || G_OBJECT_TYPE (setting) == G_OBJECT_TYPE (other));
+
+	/* secret_name must be a valid secret for @setting. */
+	nm_assert (nm_setting_get_secret_flags (setting, secret_name, NULL, NULL));
+
+	if (!NM_FLAGS_ANY (flags,   NM_SETTING_COMPARE_FLAG_IGNORE_AGENT_OWNED_SECRETS
+	                          | NM_SETTING_COMPARE_FLAG_IGNORE_NOT_SAVED_SECRETS))
+		return TRUE;
+
+	nm_setting_get_secret_flags (setting, secret_name, &a_secret_flags, NULL);
+	if (other) {
+		if (!nm_setting_get_secret_flags (other, secret_name, &b_secret_flags, NULL)) {
+			/* secret-name may not be a valid secret for @other. That is fine, we ignore that
+			 * and treat @b_secret_flags as NM_SETTING_SECRET_FLAG_NONE.
+			 *
+			 * This can happen with VPN secrets, where the caller knows that @secret_name
+			 * is a secret for setting, but it may not be a secret for @other. Accept that.
+			 *
+			 * Mark @other as missing. */
+			other = NULL;
+		}
+	}
+
+	/* when @setting has the secret-flags that should be ignored,
+	 * we skip the comparisong if:
+	 *
+	 *   - @other is not present,
+	 *   - @other does not have a secret named @secret_name
+	 *   - @other also has the secret flat to be ignored.
+	 *
+	 * This makes the check symmetric (aside the fact that @setting must
+	 * have the secret while @other may not -- which is asymmetric). */
+	if (   NM_FLAGS_HAS (flags, NM_SETTING_COMPARE_FLAG_IGNORE_AGENT_OWNED_SECRETS)
+	    && NM_FLAGS_HAS (a_secret_flags, NM_SETTING_SECRET_FLAG_AGENT_OWNED)
+	    && (   !other
+	        || NM_FLAGS_HAS (b_secret_flags, NM_SETTING_SECRET_FLAG_AGENT_OWNED)))
+		return FALSE;
+
+	if (   NM_FLAGS_HAS (flags, NM_SETTING_COMPARE_FLAG_IGNORE_NOT_SAVED_SECRETS)
+	    && NM_FLAGS_HAS (a_secret_flags, NM_SETTING_SECRET_FLAG_NOT_SAVED)
+	    && (   !other
+	        || NM_FLAGS_HAS (b_secret_flags, NM_SETTING_SECRET_FLAG_NOT_SAVED)))
+		return FALSE;
+
+	return TRUE;
+}
+
+static NMTernary
+compare_property (const NMSettInfoSetting *sett_info,
+                  guint property_idx,
+                  NMSetting *setting,
                   NMSetting *other,
-                  const GParamSpec *prop_spec,
                   NMSettingCompareFlags flags)
 {
-	const NMSettInfoProperty *property;
-	GVariant *value1, *value2;
-	int cmp;
+	const NMSettInfoProperty *property_info = &sett_info->property_infos[property_idx];
+	const GParamSpec *param_spec = property_info->param_spec;
 
-	/* Handle compare flags */
-	if (prop_spec->flags & NM_SETTING_PARAM_SECRET) {
-		NMSettingSecretFlags a_secret_flags = NM_SETTING_SECRET_FLAG_NONE;
-		NMSettingSecretFlags b_secret_flags = NM_SETTING_SECRET_FLAG_NONE;
+	if (!param_spec)
+		return NM_TERNARY_DEFAULT;
 
-		g_return_val_if_fail (!NM_IS_SETTING_VPN (setting), FALSE);
+	if (   NM_FLAGS_HAS (flags, NM_SETTING_COMPARE_FLAG_FUZZY)
+	    && NM_FLAGS_ANY (param_spec->flags, NM_SETTING_PARAM_FUZZY_IGNORE | NM_SETTING_PARAM_SECRET))
+		return NM_TERNARY_DEFAULT;
 
-		if (!nm_setting_get_secret_flags (setting, prop_spec->name, &a_secret_flags, NULL))
-			g_return_val_if_reached (FALSE);
-		if (!nm_setting_get_secret_flags (other, prop_spec->name, &b_secret_flags, NULL))
-			g_return_val_if_reached (FALSE);
+	if (   NM_FLAGS_HAS (flags, NM_SETTING_COMPARE_FLAG_INFERRABLE)
+	    && !NM_FLAGS_HAS (param_spec->flags, NM_SETTING_PARAM_INFERRABLE))
+		return NM_TERNARY_DEFAULT;
 
-		/* If the secret flags aren't the same the settings aren't the same */
-		if (a_secret_flags != b_secret_flags)
-			return FALSE;
+	if (   NM_FLAGS_HAS (flags, NM_SETTING_COMPARE_FLAG_IGNORE_REAPPLY_IMMEDIATELY)
+	    && NM_FLAGS_HAS (param_spec->flags, NM_SETTING_PARAM_REAPPLY_IMMEDIATELY))
+		return NM_TERNARY_DEFAULT;
 
-		/* Check for various secret flags that might cause us to ignore comparing
-		 * this property.
-		 */
-		if (   (flags & NM_SETTING_COMPARE_FLAG_IGNORE_AGENT_OWNED_SECRETS)
-		    && (a_secret_flags & NM_SETTING_SECRET_FLAG_AGENT_OWNED))
-			return TRUE;
+	if (   NM_FLAGS_HAS (flags, NM_SETTING_COMPARE_FLAG_IGNORE_SECRETS)
+	    && NM_FLAGS_HAS (param_spec->flags, NM_SETTING_PARAM_SECRET))
+		return NM_TERNARY_DEFAULT;
 
-		if (   (flags & NM_SETTING_COMPARE_FLAG_IGNORE_NOT_SAVED_SECRETS)
-		    && (a_secret_flags & NM_SETTING_SECRET_FLAG_NOT_SAVED))
-			return TRUE;
-	}
+	if (nm_streq (param_spec->name, NM_SETTING_NAME))
+		return NM_TERNARY_DEFAULT;
+
+	if (   NM_FLAGS_HAS (param_spec->flags, NM_SETTING_PARAM_SECRET)
+	    && !_nm_setting_should_compare_secret_property (setting,
+	                                                    other,
+	                                                    param_spec->name,
+	                                                    flags))
+		return NM_TERNARY_DEFAULT;
 
-	property = _nm_sett_info_property_get (NM_SETTING_GET_CLASS (setting), prop_spec->name);
-	g_return_val_if_fail (property != NULL, FALSE);
+	if (other) {
+		gs_unref_variant GVariant *value1  = NULL;
+		gs_unref_variant GVariant *value2  = NULL;
 
-	value1 = get_property_for_dbus (setting, property, TRUE);
-	value2 = get_property_for_dbus (other, property, TRUE);
+		value1 = get_property_for_dbus (setting, property_info, TRUE);
+		value2 = get_property_for_dbus (other, property_info, TRUE);
 
-	cmp = nm_property_compare (value1, value2);
+		if (nm_property_compare (value1, value2) != 0)
+			return NM_TERNARY_FALSE;
+	}
 
-	if (value1)
-		g_variant_unref (value1);
-	if (value2)
-		g_variant_unref (value2);
+	return NM_TERNARY_TRUE;
+}
 
-	return cmp == 0;
+static NMTernary
+_compare_property (const NMSettInfoSetting *sett_info,
+                   guint property_idx,
+                   NMSetting *setting,
+                   NMSetting *other,
+                   NMSettingCompareFlags flags)
+{
+	NMTernary compare_result;
+
+	nm_assert (sett_info);
+	nm_assert (NM_IS_SETTING_CLASS (sett_info->setting_class));
+	nm_assert (property_idx < sett_info->property_infos_len);
+	nm_assert (NM_SETTING_GET_CLASS (setting) == sett_info->setting_class);
+	nm_assert (!other || NM_SETTING_GET_CLASS (other) == sett_info->setting_class);
+
+	compare_result = NM_SETTING_GET_CLASS (setting)->compare_property (sett_info,
+	                                                                   property_idx,
+	                                                                   setting,
+	                                                                   other,
+	                                                                   flags);
+
+	nm_assert (NM_IN_SET (compare_result, NM_TERNARY_DEFAULT,
+	                                      NM_TERNARY_FALSE,
+	                                      NM_TERNARY_TRUE));
+
+	/* check that the inferable flag and the GObject property flag corresponds. */
+	nm_assert (   !NM_FLAGS_HAS (flags, NM_SETTING_COMPARE_FLAG_INFERRABLE)
+	           || !sett_info->property_infos[property_idx].param_spec
+	           || NM_FLAGS_HAS (sett_info->property_infos[property_idx].param_spec->flags, NM_SETTING_PARAM_INFERRABLE)
+	           || compare_result == NM_TERNARY_DEFAULT);
+
+	return compare_result;
 }
 
 /**
@@ -1208,9 +1444,6 @@ nm_setting_compare (NMSetting *a,
                     NMSettingCompareFlags flags)
 {
 	const NMSettInfoSetting *sett_info;
-	GParamSpec **property_specs;
-	guint n_property_specs;
-	int same = TRUE;
 	guint i;
 
 	g_return_val_if_fail (NM_IS_SETTING (a), FALSE);
@@ -1220,7 +1453,7 @@ nm_setting_compare (NMSetting *a,
 	if (G_OBJECT_TYPE (a) != G_OBJECT_TYPE (b))
 		return FALSE;
 
-	sett_info = _nm_sett_info_setting_get (NM_SETTING_GET_CLASS (a));
+	sett_info = _nm_setting_class_get_sett_info (NM_SETTING_GET_CLASS (a));
 
 	if (sett_info->detail.gendata_info) {
 		GenData *a_gendata = _gendata_hash (a, FALSE);
@@ -1232,88 +1465,11 @@ nm_setting_compare (NMSetting *a,
 		                                  g_variant_equal);
 	}
 
-	/* And now all properties */
-	property_specs = g_object_class_list_properties (G_OBJECT_GET_CLASS (a), &n_property_specs);
-	for (i = 0; i < n_property_specs && same; i++) {
-		GParamSpec *prop_spec = property_specs[i];
-
-		/* Fuzzy compare ignores secrets and properties defined with the FUZZY_IGNORE flag */
-		if (   NM_FLAGS_HAS (flags, NM_SETTING_COMPARE_FLAG_FUZZY)
-		    && !NM_FLAGS_ANY (prop_spec->flags, NM_SETTING_PARAM_FUZZY_IGNORE | NM_SETTING_PARAM_SECRET))
-			continue;
-
-		if (   NM_FLAGS_HAS (flags, NM_SETTING_COMPARE_FLAG_INFERRABLE)
-		    && !NM_FLAGS_HAS (prop_spec->flags, NM_SETTING_PARAM_INFERRABLE))
-			continue;
-
-		if (   NM_FLAGS_HAS (flags, NM_SETTING_COMPARE_FLAG_IGNORE_REAPPLY_IMMEDIATELY)
-		    && NM_FLAGS_HAS (prop_spec->flags, NM_SETTING_PARAM_REAPPLY_IMMEDIATELY))
-			continue;
-
-		if (   NM_FLAGS_HAS (flags, NM_SETTING_COMPARE_FLAG_IGNORE_SECRETS)
-		    && NM_FLAGS_HAS (prop_spec->flags, NM_SETTING_PARAM_SECRET))
-			continue;
-
-		same = NM_SETTING_GET_CLASS (a)->compare_property (a, b, prop_spec, flags);
-	}
-	g_free (property_specs);
-
-	return same;
-}
-
-static inline gboolean
-should_compare_prop (NMSetting *setting,
-                     const char *prop_name,
-                     NMSettingCompareFlags comp_flags,
-                     GParamFlags prop_flags)
-{
-	/* Fuzzy compare ignores secrets and properties defined with the FUZZY_IGNORE flag */
-	if (   (comp_flags & NM_SETTING_COMPARE_FLAG_FUZZY)
-	    && (prop_flags & (NM_SETTING_PARAM_FUZZY_IGNORE | NM_SETTING_PARAM_SECRET)))
-		return FALSE;
-
-	if ((comp_flags & NM_SETTING_COMPARE_FLAG_INFERRABLE) && !(prop_flags & NM_SETTING_PARAM_INFERRABLE))
-		return FALSE;
-
-	if ((comp_flags & NM_SETTING_COMPARE_FLAG_IGNORE_REAPPLY_IMMEDIATELY) && !(prop_flags & NM_SETTING_PARAM_REAPPLY_IMMEDIATELY))
-		return FALSE;
-
-	if (prop_flags & NM_SETTING_PARAM_SECRET) {
-		NMSettingSecretFlags secret_flags = NM_SETTING_SECRET_FLAG_NONE;
-
-		if (comp_flags & NM_SETTING_COMPARE_FLAG_IGNORE_SECRETS)
-			return FALSE;
-
-		if (   NM_IS_SETTING_VPN (setting)
-		    && g_strcmp0 (prop_name, NM_SETTING_VPN_SECRETS) == 0) {
-			/* FIXME: NMSettingVPN:NM_SETTING_VPN_SECRETS has NM_SETTING_PARAM_SECRET.
-			 * nm_setting_get_secret_flags() quite possibly fails, but it might succeed if the
-			 * setting accidently uses a key "secrets". */
-			return TRUE;
-		}
-
-		if (!nm_setting_get_secret_flags (setting, prop_name, &secret_flags, NULL))
-			g_return_val_if_reached (FALSE);
-
-		if (   (comp_flags & NM_SETTING_COMPARE_FLAG_IGNORE_AGENT_OWNED_SECRETS)
-		    && (secret_flags & NM_SETTING_SECRET_FLAG_AGENT_OWNED))
-			return FALSE;
-
-		if (   (comp_flags & NM_SETTING_COMPARE_FLAG_IGNORE_NOT_SAVED_SECRETS)
-		    && (secret_flags & NM_SETTING_SECRET_FLAG_NOT_SAVED))
+	for (i = 0; i < sett_info->property_infos_len; i++) {
+		if (_compare_property (sett_info, i, a, b, flags) == NM_TERNARY_FALSE)
 			return FALSE;
 	}
 
-	if (   (comp_flags & NM_SETTING_COMPARE_FLAG_IGNORE_ID)
-	    && NM_IS_SETTING_CONNECTION (setting)
-	    && !strcmp (prop_name, NM_SETTING_CONNECTION_ID))
-		return FALSE;
-
-	if (   (comp_flags & NM_SETTING_COMPARE_FLAG_IGNORE_TIMESTAMP)
-	    && NM_IS_SETTING_CONNECTION (setting)
-	    && !strcmp (prop_name, NM_SETTING_CONNECTION_TIMESTAMP))
-		return FALSE;
-
 	return TRUE;
 }
 
@@ -1404,7 +1560,7 @@ nm_setting_diff (NMSetting *a,
 		results_created = TRUE;
 	}
 
-	sett_info = _nm_sett_info_setting_get (NM_SETTING_GET_CLASS (a));
+	sett_info = _nm_setting_class_get_sett_info (NM_SETTING_GET_CLASS (a));
 
 	if (sett_info->detail.gendata_info) {
 		const char *key;
@@ -1447,71 +1603,93 @@ nm_setting_diff (NMSetting *a,
 			}
 		}
 	} else {
-		gs_free GParamSpec **property_specs = NULL;
-		guint n_property_specs;
-
-		property_specs = g_object_class_list_properties (G_OBJECT_GET_CLASS (a), &n_property_specs);
-
-		for (i = 0; i < n_property_specs; i++) {
-			GParamSpec *prop_spec = property_specs[i];
+		for (i = 0; i < sett_info->property_infos_len; i++) {
 			NMSettingDiffResult r = NM_SETTING_DIFF_RESULT_UNKNOWN;
+			const NMSettInfoProperty *property_info;
+			NMTernary compare_result;
+			GParamSpec *prop_spec;
 
-			/* Handle compare flags */
-			if (!should_compare_prop (a, prop_spec->name, flags, prop_spec->flags))
-				continue;
-			if (strcmp (prop_spec->name, NM_SETTING_NAME) == 0)
+			compare_result = _compare_property (sett_info, i, a, b, flags);
+			if (compare_result == NM_TERNARY_DEFAULT)
 				continue;
 
-			compared_any = TRUE;
-
-			if (b) {
-				gboolean different;
-
-				different = !NM_SETTING_GET_CLASS (a)->compare_property (a, b, prop_spec, flags);
-				if (different) {
-					gboolean a_is_default, b_is_default;
-					GValue value = G_VALUE_INIT;
+			if (   NM_FLAGS_ANY (flags,   NM_SETTING_COMPARE_FLAG_IGNORE_AGENT_OWNED_SECRETS
+			                            | NM_SETTING_COMPARE_FLAG_IGNORE_NOT_SAVED_SECRETS)
+			    && b
+			    && compare_result == NM_TERNARY_FALSE) {
+				/* we have setting @b and the property is not the same. But we also are instructed
+				 * to ignore secrets based on the flags.
+				 *
+				 * Note that compare_property() called with two settings will ignore secrets
+				 * based on the flags, but it will do so if *both* settings have the flag we
+				 * look for. So that is symmetric behavior and good.
+				 *
+				 * But for the purpose of diff(), we do a asymmetric comparison because and
+				 * we want to skip testing the property if setting @a alone indicates to do
+				 * so.
+				 *
+				 * We need to double-check whether the property should be ignored by
+				 * looking at @a alone. */
+				if (_compare_property (sett_info, i, a, NULL, flags) == NM_TERNARY_DEFAULT)
+					continue;
+			}
 
-					g_value_init (&value, prop_spec->value_type);
-					g_object_get_property (G_OBJECT (a), prop_spec->name, &value);
-					a_is_default = g_param_value_defaults (prop_spec, &value);
+			compared_any = TRUE;
 
-					g_value_reset (&value);
-					g_object_get_property (G_OBJECT (b), prop_spec->name, &value);
-					b_is_default = g_param_value_defaults (prop_spec, &value);
+			property_info = &sett_info->property_infos[i];
+			prop_spec = property_info->param_spec;
 
-					g_value_unset (&value);
-					if ((flags & NM_SETTING_COMPARE_FLAG_DIFF_RESULT_WITH_DEFAULT) == 0) {
-						if (!a_is_default)
-							r |= a_result;
-						if (!b_is_default)
-							r |= b_result;
-					} else {
+			if (b) {
+				if (compare_result == NM_TERNARY_FALSE) {
+					if (prop_spec) {
+						gboolean a_is_default, b_is_default;
+						GValue value = G_VALUE_INIT;
+
+						g_value_init (&value, prop_spec->value_type);
+						g_object_get_property (G_OBJECT (a), prop_spec->name, &value);
+						a_is_default = g_param_value_defaults (prop_spec, &value);
+
+						g_value_reset (&value);
+						g_object_get_property (G_OBJECT (b), prop_spec->name, &value);
+						b_is_default = g_param_value_defaults (prop_spec, &value);
+
+						g_value_unset (&value);
+						if (!NM_FLAGS_HAS (flags, NM_SETTING_COMPARE_FLAG_DIFF_RESULT_WITH_DEFAULT)) {
+							if (!a_is_default)
+								r |= a_result;
+							if (!b_is_default)
+								r |= b_result;
+						} else {
+							r |= a_result | b_result;
+							if (a_is_default)
+								r |= a_result_default;
+							if (b_is_default)
+								r |= b_result_default;
+						}
+					} else
 						r |= a_result | b_result;
-						if (a_is_default)
-							r |= a_result_default;
-						if (b_is_default)
-							r |= b_result_default;
-					}
 				}
 			} else if ((flags & (NM_SETTING_COMPARE_FLAG_DIFF_RESULT_WITH_DEFAULT | NM_SETTING_COMPARE_FLAG_DIFF_RESULT_NO_DEFAULT)) == 0)
 				r = a_result;  /* only in A */
 			else {
-				GValue value = G_VALUE_INIT;
+				if (prop_spec) {
+					GValue value = G_VALUE_INIT;
 
-				g_value_init (&value, prop_spec->value_type);
-				g_object_get_property (G_OBJECT (a), prop_spec->name, &value);
-				if (!g_param_value_defaults (prop_spec, &value))
-					r |= a_result;
-				else if (flags & NM_SETTING_COMPARE_FLAG_DIFF_RESULT_WITH_DEFAULT)
-					r |= a_result | a_result_default;
+					g_value_init (&value, prop_spec->value_type);
+					g_object_get_property (G_OBJECT (a), prop_spec->name, &value);
+					if (!g_param_value_defaults (prop_spec, &value))
+						r |= a_result;
+					else if (flags & NM_SETTING_COMPARE_FLAG_DIFF_RESULT_WITH_DEFAULT)
+						r |= a_result | a_result_default;
 
-				g_value_unset (&value);
+					g_value_unset (&value);
+				} else
+					r |= a_result;
 			}
 
 			if (r != NM_SETTING_DIFF_RESULT_UNKNOWN) {
 				diff_found = TRUE;
-				_setting_diff_add_result (*results, prop_spec->name, r);
+				_setting_diff_add_result (*results, property_info->name, r);
 			}
 		}
 	}
@@ -1540,32 +1718,26 @@ nm_setting_diff (NMSetting *a,
 	}
 }
 
-#define CMP_AND_RETURN(n_a, n_b, name) \
-	G_STMT_START { \
-		gboolean _is = (strcmp (n_a, ""name) == 0); \
-		\
-		if (_is || (strcmp (n_b, ""name) == 0)) \
-			return _is ? -1 : 1; \
-	} G_STMT_END
+static void
+enumerate_values (const NMSettInfoProperty *property_info,
+                  NMSetting *setting,
+                  NMSettingValueIterFn func,
+                  gpointer user_data)
+{
+	GValue value = G_VALUE_INIT;
 
-static int
-_enumerate_values_sort (GParamSpec **p_a, GParamSpec **p_b, GType *p_type)
-{
-	const char *n_a = (*p_a)->name;
-	const char *n_b = (*p_b)->name;
-	int c = strcmp (n_a, n_b);
-
-	if (c) {
-		if (*p_type == NM_TYPE_SETTING_CONNECTION) {
-			/* for [connection], report first id, uuid, type in that order. */
-			CMP_AND_RETURN (n_a, n_b, NM_SETTING_CONNECTION_ID);
-			CMP_AND_RETURN (n_a, n_b, NM_SETTING_CONNECTION_UUID);
-			CMP_AND_RETURN (n_a, n_b, NM_SETTING_CONNECTION_TYPE);
-		}
-	}
-	return c;
+	if (!property_info->param_spec)
+		return;
+
+	g_value_init (&value, G_PARAM_SPEC_VALUE_TYPE (property_info->param_spec));
+	g_object_get_property (G_OBJECT (setting), property_info->param_spec->name, &value);
+	func (setting,
+	      property_info->param_spec->name,
+	      &value,
+	      property_info->param_spec->flags,
+	      user_data);
+	g_value_unset (&value);
 }
-#undef CMP_AND_RETURN
 
 /**
  * nm_setting_enumerate_values:
@@ -1582,18 +1754,16 @@ nm_setting_enumerate_values (NMSetting *setting,
                              gpointer user_data)
 {
 	const NMSettInfoSetting *sett_info;
-	GParamSpec **property_specs;
-	guint n_properties;
 	guint i;
-	GType type;
 
 	g_return_if_fail (NM_IS_SETTING (setting));
 	g_return_if_fail (func != NULL);
 
-	sett_info = _nm_sett_info_setting_get (NM_SETTING_GET_CLASS (setting));
+	sett_info = _nm_setting_class_get_sett_info (NM_SETTING_GET_CLASS (setting));
 
 	if (sett_info->detail.gendata_info) {
 		const char *const*names;
+		guint n_properties;
 
 		/* the properties of this setting are not real GObject properties.
 		 * Hence, this API makes little sense (or does it?). Still, call
@@ -1623,100 +1793,138 @@ nm_setting_enumerate_values (NMSetting *setting,
 		return;
 	}
 
-	property_specs = g_object_class_list_properties (G_OBJECT_GET_CLASS (setting), &n_properties);
-
-	/* sort the properties. This has an effect on the order in which keyfile
-	 * prints them. */
-	type = G_OBJECT_TYPE (setting);
-	g_qsort_with_data (property_specs, n_properties, sizeof (gpointer),
-	                   (GCompareDataFunc) _enumerate_values_sort, &type);
-
-	for (i = 0; i < n_properties; i++) {
-		GParamSpec *prop_spec = property_specs[i];
-		GValue value = G_VALUE_INIT;
-
-		g_value_init (&value, G_PARAM_SPEC_VALUE_TYPE (prop_spec));
-		g_object_get_property (G_OBJECT (setting), prop_spec->name, &value);
-		func (setting, prop_spec->name, &value, prop_spec->flags, user_data);
-		g_value_unset (&value);
+	for (i = 0; i < sett_info->property_infos_len; i++) {
+		NM_SETTING_GET_CLASS (setting)->enumerate_values (_nm_sett_info_property_info_get_sorted (sett_info, i),
+		                                                  setting,
+		                                                  func,
+		                                                  user_data);
 	}
-
-	g_free (property_specs);
 }
 
-/**
- * _nm_setting_clear_secrets:
- * @setting: the #NMSetting
- *
- * Resets and clears any secrets in the setting.  Secrets should be added to the
- * setting only when needed, and cleared immediately after use to prevent
- * leakage of information.
- *
- * Returns: %TRUE if the setting changed at all
- **/
-gboolean
-_nm_setting_clear_secrets (NMSetting *setting)
+static gboolean
+aggregate (NMSetting *setting,
+           int type_i,
+           gpointer arg)
 {
-	gs_free GParamSpec **property_specs = NULL;
-	guint n_property_specs;
+	NMConnectionAggregateType type = type_i;
+	const NMSettInfoSetting *sett_info;
 	guint i;
-	gboolean changed = FALSE;
 
-	g_return_val_if_fail (NM_IS_SETTING (setting), FALSE);
+	nm_assert (NM_IN_SET (type, NM_CONNECTION_AGGREGATE_ANY_SECRETS,
+	                            NM_CONNECTION_AGGREGATE_ANY_SYSTEM_SECRET_FLAGS));
 
-	property_specs = g_object_class_list_properties (G_OBJECT_GET_CLASS (setting), &n_property_specs);
-	for (i = 0; i < n_property_specs; i++) {
-		GParamSpec *prop_spec = property_specs[i];
+	sett_info = _nm_setting_class_get_sett_info (NM_SETTING_GET_CLASS (setting));
+	for (i = 0; i < sett_info->property_infos_len; i++) {
+		const NMSettInfoProperty *property_info = &sett_info->property_infos[i];
+		GParamSpec *prop_spec = property_info->param_spec;
+		nm_auto_unset_gvalue GValue value = G_VALUE_INIT;
+		NMSettingSecretFlags secret_flags;
+
+		if (   !prop_spec
+		    || !NM_FLAGS_HAS (prop_spec->flags, NM_SETTING_PARAM_SECRET)) {
+			nm_assert (!nm_setting_get_secret_flags (setting, property_info->name, NULL, NULL));
+			continue;
+		}
 
-		if (prop_spec->flags & NM_SETTING_PARAM_SECRET) {
-			GValue value = G_VALUE_INIT;
+		/* for the moment, all aggregate types only care about secrets. */
+		nm_assert (nm_setting_get_secret_flags (setting, property_info->name, NULL, NULL));
 
-			g_value_init (&value, prop_spec->value_type);
+		switch (type) {
+
+		case NM_CONNECTION_AGGREGATE_ANY_SECRETS:
+			g_value_init (&value, G_PARAM_SPEC_VALUE_TYPE (prop_spec));
 			g_object_get_property (G_OBJECT (setting), prop_spec->name, &value);
 			if (!g_param_value_defaults (prop_spec, &value)) {
-				g_param_value_set_default (prop_spec, &value);
-				g_object_set_property (G_OBJECT (setting), prop_spec->name, &value);
-				changed = TRUE;
+				*((gboolean *) arg) = TRUE;
+				return TRUE;
+			}
+			break;
+
+		case NM_CONNECTION_AGGREGATE_ANY_SYSTEM_SECRET_FLAGS:
+			if (!nm_setting_get_secret_flags (setting, prop_spec->name, &secret_flags, NULL))
+				nm_assert_not_reached ();
+			if (secret_flags == NM_SETTING_SECRET_FLAG_NONE) {
+				*((gboolean *) arg) = TRUE;
+				return TRUE;
 			}
-			g_value_unset (&value);
+			break;
+
 		}
 	}
-	return changed;
+
+	return FALSE;
+}
+
+/**
+ * _nm_setting_aggregate:
+ * @setting: the #NMSetting to aggregate.
+ * @type: the #NMConnectionAggregateType aggregate type.
+ * @arg: the in/out arguments for aggregation. They depend on @type.
+ *
+ * This is the implementation detail of _nm_connection_aggregate(). It
+ * makes no sense to call this function directly outside of _nm_connection_aggregate().
+ *
+ * Returns: %TRUE if afterwards the aggregation is complete. That means,
+ *   the only caller _nm_connection_aggregate() will not visit other settings
+ *   after a setting returns %TRUE (indicating that there is nothing further
+ *   to aggregate). Note that is very different from the boolean return
+ *   argument of _nm_connection_aggregate(), which serves a different purpose.
+ */
+gboolean
+_nm_setting_aggregate (NMSetting *setting,
+                       NMConnectionAggregateType type,
+                       gpointer arg)
+{
+	g_return_val_if_fail (NM_IS_SETTING (setting), FALSE);
+	g_return_val_if_fail (arg, FALSE);
+	g_return_val_if_fail (NM_IN_SET (type, NM_CONNECTION_AGGREGATE_ANY_SECRETS,
+	                                       NM_CONNECTION_AGGREGATE_ANY_SYSTEM_SECRET_FLAGS),
+	                      FALSE);
+
+	return NM_SETTING_GET_CLASS (setting)->aggregate (setting, type, arg);
 }
 
 static gboolean
-clear_secrets_with_flags (NMSetting *setting,
-                          GParamSpec *pspec,
-                          NMSettingClearSecretsWithFlagsFn func,
-                          gpointer user_data)
+clear_secrets (const NMSettInfoSetting *sett_info,
+               guint property_idx,
+               NMSetting *setting,
+               NMSettingClearSecretsWithFlagsFn func,
+               gpointer user_data)
 {
 	NMSettingSecretFlags flags = NM_SETTING_SECRET_FLAG_NONE;
-	gboolean changed = FALSE;
+	GParamSpec *param_spec = sett_info->property_infos[property_idx].param_spec;
 
-	g_return_val_if_fail (!NM_IS_SETTING_VPN (setting), FALSE);
+	if (!param_spec)
+		return FALSE;
 
-	/* Clear the secret if the user function says to do so */
-	if (!nm_setting_get_secret_flags (setting, pspec->name, &flags, NULL))
-		g_return_val_if_reached (FALSE);
+	if (!NM_FLAGS_HAS (param_spec->flags, NM_SETTING_PARAM_SECRET))
+		return FALSE;
+
+	if (func) {
+		if (!nm_setting_get_secret_flags (setting, param_spec->name, &flags, NULL))
+			nm_assert_not_reached ();
+		if (!func (setting, param_spec->name, flags, user_data))
+			return FALSE;
+	} else
+		nm_assert (nm_setting_get_secret_flags (setting, param_spec->name, NULL, NULL));
 
-	if (func (setting, pspec->name, flags, user_data) == TRUE) {
-		GValue value = G_VALUE_INIT;
+	{
+		nm_auto_unset_gvalue GValue value = G_VALUE_INIT;
 
-		g_value_init (&value, pspec->value_type);
-		g_object_get_property (G_OBJECT (setting), pspec->name, &value);
-		if (!g_param_value_defaults (pspec, &value)) {
-			g_param_value_set_default (pspec, &value);
-			g_object_set_property (G_OBJECT (setting), pspec->name, &value);
-			changed = TRUE;
-		}
-		g_value_unset (&value);
+		g_value_init (&value, param_spec->value_type);
+		g_object_get_property (G_OBJECT (setting), param_spec->name, &value);
+		if (g_param_value_defaults (param_spec, &value))
+			return FALSE;
+
+		g_param_value_set_default (param_spec, &value);
+		g_object_set_property (G_OBJECT (setting), param_spec->name, &value);
 	}
 
-	return changed;
+	return TRUE;
 }
 
 /**
- * _nm_setting_clear_secrets_with_flags:
+ * _nm_setting_clear_secrets:
  * @setting: the #NMSetting
  * @func: (scope call): function to be called to determine whether a
  *     specific secret should be cleared or not
@@ -1727,27 +1935,30 @@ clear_secrets_with_flags (NMSetting *setting,
  * Returns: %TRUE if the setting changed at all
  **/
 gboolean
-_nm_setting_clear_secrets_with_flags (NMSetting *setting,
-                                      NMSettingClearSecretsWithFlagsFn func,
-                                      gpointer user_data)
+_nm_setting_clear_secrets (NMSetting *setting,
+                           NMSettingClearSecretsWithFlagsFn func,
+                           gpointer user_data)
 {
-	gs_free GParamSpec **property_specs = NULL;
-	guint n_property_specs;
-	guint i;
+	const NMSettInfoSetting *sett_info;
 	gboolean changed = FALSE;
+	guint i;
+	gboolean (*my_clear_secrets) (const struct _NMSettInfoSetting *sett_info,
+	                              guint property_idx,
+	                              NMSetting *setting,
+	                              NMSettingClearSecretsWithFlagsFn func,
+	                              gpointer user_data);
 
-	g_return_val_if_fail (setting, FALSE);
 	g_return_val_if_fail (NM_IS_SETTING (setting), FALSE);
-	g_return_val_if_fail (func != NULL, FALSE);
 
-	property_specs = g_object_class_list_properties (G_OBJECT_GET_CLASS (setting), &n_property_specs);
-	for (i = 0; i < n_property_specs; i++) {
-		if (property_specs[i]->flags & NM_SETTING_PARAM_SECRET) {
-			changed |= NM_SETTING_GET_CLASS (setting)->clear_secrets_with_flags (setting,
-			                                                                     property_specs[i],
-			                                                                     func,
-			                                                                     user_data);
-		}
+	my_clear_secrets = NM_SETTING_GET_CLASS (setting)->clear_secrets;
+
+	sett_info = _nm_setting_class_get_sett_info (NM_SETTING_GET_CLASS (setting));
+	for (i = 0; i < sett_info->property_infos_len; i++) {
+		changed |= my_clear_secrets (sett_info,
+		                             i,
+		                             setting,
+		                             func,
+		                             user_data);
 	}
 	return changed;
 }
@@ -1786,7 +1997,7 @@ update_one_secret (NMSetting *setting, const char *key, GVariant *value, GError
 	GParamSpec *prop_spec;
 	GValue prop_value = { 0, };
 
-	property = _nm_sett_info_property_get (NM_SETTING_GET_CLASS (setting), key);
+	property = _nm_setting_class_get_property_info (NM_SETTING_GET_CLASS (setting), key);
 	if (!property) {
 		g_set_error_literal (error,
 		                     NM_CONNECTION_ERROR,
@@ -1856,7 +2067,7 @@ _nm_setting_update_secrets (NMSetting *setting, GVariant *secrets, GError **erro
 		int success;
 
 		success = NM_SETTING_GET_CLASS (setting)->update_one_secret (setting, secret_key, secret_value, &tmp_error);
-		g_assert (!((success == NM_SETTING_UPDATE_SECRET_ERROR) ^ (!!tmp_error)));
+		nm_assert (!((success == NM_SETTING_UPDATE_SECRET_ERROR) ^ (!!tmp_error)));
 
 		g_variant_unref (secret_value);
 
@@ -1872,52 +2083,92 @@ _nm_setting_update_secrets (NMSetting *setting, GVariant *secrets, GError **erro
 	return result;
 }
 
-static gboolean
-is_secret_prop (NMSetting *setting, const char *secret_name, GError **error)
+static void
+for_each_secret (NMSetting *setting,
+                 const char *secret_name,
+                 GVariant *val,
+                 gboolean remove_non_secrets,
+                 _NMConnectionForEachSecretFunc callback,
+                 gpointer callback_data,
+                 GVariantBuilder *setting_builder)
 {
-	const NMSettInfoProperty *property;
-	GParamSpec *pspec;
+	NMSettingSecretFlags secret_flags = NM_SETTING_SECRET_FLAG_NONE;
 
-	property = _nm_sett_info_property_get (NM_SETTING_GET_CLASS (setting), secret_name);
-	if (!property) {
-		g_set_error_literal (error,
-		                     NM_CONNECTION_ERROR,
-		                     NM_CONNECTION_ERROR_PROPERTY_NOT_FOUND,
-		                     _("secret is not set"));
-		g_prefix_error (error, "%s.%s: ", nm_setting_get_name (setting), secret_name);
-		return FALSE;
+	if (!nm_setting_get_secret_flags (setting, secret_name, &secret_flags, NULL)) {
+		if (!remove_non_secrets)
+			g_variant_builder_add (setting_builder, "{sv}", secret_name, val);
+		return;
 	}
+	if (callback (secret_flags, callback_data))
+		g_variant_builder_add (setting_builder, "{sv}", secret_name, val);
+}
 
-	pspec = property->param_spec;
-	if (!pspec || !(pspec->flags & NM_SETTING_PARAM_SECRET)) {
-		g_set_error_literal (error,
-		                     NM_CONNECTION_ERROR,
-		                     NM_CONNECTION_ERROR_PROPERTY_NOT_SECRET,
-		                     _("not a secret property"));
-		g_prefix_error (error, "%s.%s: ", nm_setting_get_name (setting), secret_name);
-		return FALSE;
-	}
+static void
+_set_error_secret_property_not_found (GError **error,
+                                      NMSetting *setting,
+                                      const char *secret_name)
+{
+	g_set_error_literal (error,
+	                     NM_CONNECTION_ERROR,
+	                     NM_CONNECTION_ERROR_PROPERTY_NOT_FOUND,
+	                     _("not a secret property"));
+	g_prefix_error (error, "%s.%s: ", nm_setting_get_name (setting), secret_name);
+}
 
-	return TRUE;
+gboolean
+_nm_setting_property_is_regular_secret (NMSetting *setting,
+                                        const char *secret_name)
+{
+	const NMSettInfoProperty *property;
+
+	nm_assert (NM_IS_SETTING (setting));
+	nm_assert (secret_name);
+
+	property = _nm_setting_class_get_property_info (NM_SETTING_GET_CLASS (setting), secret_name);
+	return    property
+	       && property->param_spec
+	       && NM_FLAGS_HAS (property->param_spec->flags, NM_SETTING_PARAM_SECRET);
+}
+
+gboolean
+_nm_setting_property_is_regular_secret_flags (NMSetting *setting,
+                                              const char *secret_flags_name)
+{
+	const NMSettInfoProperty *property;
+
+	nm_assert (NM_IS_SETTING (setting));
+	nm_assert (secret_flags_name);
+
+	property = _nm_setting_class_get_property_info (NM_SETTING_GET_CLASS (setting), secret_flags_name);
+	return    property
+	       && property->param_spec
+	       && !NM_FLAGS_HAS (property->param_spec->flags, NM_SETTING_PARAM_SECRET)
+	       && G_PARAM_SPEC_VALUE_TYPE (property->param_spec) == NM_TYPE_SETTING_SECRET_FLAGS;
 }
 
 static gboolean
 get_secret_flags (NMSetting *setting,
                   const char *secret_name,
-                  gboolean verify_secret,
                   NMSettingSecretFlags *out_flags,
                   GError **error)
 {
-	gs_free char *name_to_free = NULL;
-	NMSettingSecretFlags flags = NM_SETTING_SECRET_FLAG_NONE;
+	gs_free char *secret_flags_name_free = NULL;
+	const char *secret_flags_name;
+	NMSettingSecretFlags flags;
 
-	if (verify_secret && !is_secret_prop (setting, secret_name, error)) {
+	if (!_nm_setting_property_is_regular_secret (setting,
+	                                             secret_name)) {
+		_set_error_secret_property_not_found (error, setting, secret_name);
 		NM_SET_OUT (out_flags, NM_SETTING_SECRET_FLAG_NONE);
 		return FALSE;
 	}
 
+	secret_flags_name = nm_construct_name_a ("%s-flags", secret_name, &secret_flags_name_free);
+
+	nm_assert (_nm_setting_property_is_regular_secret_flags (setting, secret_flags_name));
+
 	g_object_get (G_OBJECT (setting),
-	              nm_construct_name_a ("%s-flags", secret_name, &name_to_free),
+	              secret_flags_name,
 	              &flags,
 	              NULL);
 	NM_SET_OUT (out_flags, flags);
@@ -1946,25 +2197,34 @@ nm_setting_get_secret_flags (NMSetting *setting,
 	g_return_val_if_fail (NM_IS_SETTING (setting), FALSE);
 	g_return_val_if_fail (secret_name != NULL, FALSE);
 
-	return NM_SETTING_GET_CLASS (setting)->get_secret_flags (setting, secret_name, TRUE, out_flags, error);
+	return NM_SETTING_GET_CLASS (setting)->get_secret_flags (setting, secret_name, out_flags, error);
 }
 
 static gboolean
 set_secret_flags (NMSetting *setting,
                   const char *secret_name,
-                  gboolean verify_secret,
                   NMSettingSecretFlags flags,
                   GError **error)
 {
-	gs_free char *name_to_free = NULL;
+	gs_free char *secret_flags_name_free = NULL;
+	const char *secret_flags_name;
 
-	if (verify_secret)
-		g_return_val_if_fail (is_secret_prop (setting, secret_name, error), FALSE);
+	if (!_nm_setting_property_is_regular_secret (setting,
+	                                             secret_name)) {
+		_set_error_secret_property_not_found (error, setting, secret_name);
+		return FALSE;
+	}
 
-	g_object_set (G_OBJECT (setting),
-	              nm_construct_name_a ("%s-flags", secret_name, &name_to_free),
-	              flags,
-	              NULL);
+	secret_flags_name = nm_construct_name_a ("%s-flags", secret_name, &secret_flags_name_free);
+
+	nm_assert (_nm_setting_property_is_regular_secret_flags (setting, secret_flags_name));
+
+	if (!nm_g_object_set_property_flags (G_OBJECT (setting),
+	                                     secret_flags_name,
+	                                     NM_TYPE_SETTING_SECRET_FLAGS,
+	                                     flags,
+	                                     error))
+		g_return_val_if_reached (FALSE);
 	return TRUE;
 }
 
@@ -1989,9 +2249,9 @@ nm_setting_set_secret_flags (NMSetting *setting,
 {
 	g_return_val_if_fail (NM_IS_SETTING (setting), FALSE);
 	g_return_val_if_fail (secret_name != NULL, FALSE);
-	g_return_val_if_fail (flags <= NM_SETTING_SECRET_FLAGS_ALL, FALSE);
+	g_return_val_if_fail (_nm_setting_secret_flags_valid (flags), FALSE);
 
-	return NM_SETTING_GET_CLASS (setting)->set_secret_flags (setting, secret_name, TRUE, flags, error);
+	return NM_SETTING_GET_CLASS (setting)->set_secret_flags (setting, secret_name, flags, error);
 }
 
 /**
@@ -2018,8 +2278,7 @@ nm_setting_to_string (NMSetting *setting)
 	string = g_string_new (nm_setting_get_name (setting));
 	g_string_append_c (string, '\n');
 
-	variant = _nm_setting_to_dbus (setting, NULL,   NM_CONNECTION_SERIALIZE_ALL
-	                                              | NM_CONNECTION_SERIALIZE_NO_SYNTH);
+	variant = _nm_setting_to_dbus (setting, NULL, NM_CONNECTION_SERIALIZE_ALL);
 
 	g_variant_iter_init (&iter, variant);
 	while ((child = g_variant_iter_next_value (&iter))) {
@@ -2037,9 +2296,11 @@ nm_setting_to_string (NMSetting *setting)
 }
 
 GVariant *
-_nm_setting_get_deprecated_virtual_interface_name (NMSetting *setting,
+_nm_setting_get_deprecated_virtual_interface_name (const NMSettInfoSetting *sett_info,
+                                                   guint property_idx,
                                                    NMConnection *connection,
-                                                   const char *property)
+                                                   NMSetting *setting,
+                                                   NMConnectionSerializationFlags flags)
 {
 	NMSettingConnection *s_con;
 
@@ -2096,7 +2357,7 @@ _nm_setting_gendata_notify (NMSetting *setting,
 
 	gendata = _gendata_hash (setting, FALSE);
 	if (!gendata)
-		return;
+		goto out;
 
 	nm_clear_g_free (&gendata->values);
 
@@ -2106,7 +2367,7 @@ _nm_setting_gendata_notify (NMSetting *setting,
 		nm_clear_g_free (&gendata->names);
 	}
 
-	/* Note, that currently there is now way to notify the subclass when gendata changed.
+	/* Note, currently there is no way to notify the subclass when gendata changed.
 	 * gendata is only changed in two situations:
 	 *   1) from within NMSetting itself, for example when creating a NMSetting instance
 	 *      from keyfile or a D-Bus GVariant.
@@ -2119,6 +2380,9 @@ _nm_setting_gendata_notify (NMSetting *setting,
 	 *
 	 * If we ever need it, then we would need to call a virtual function to notify the subclass
 	 * that gendata changed. */
+
+out:
+	_nm_setting_emit_property_changed (setting);
 }
 
 GVariant *
@@ -2185,7 +2449,7 @@ out_zero:
 /**
  * nm_setting_gendata_get_all_names:
  * @setting: the #NMSetting
- * @out_len: (allow-none): (out):
+ * @out_len: (allow-none) (out):
  *
  * Gives the number of generic data elements and optionally returns all their
  * key names and values. This API is low level access and unless you know what you
@@ -2241,7 +2505,7 @@ nm_setting_gendata_get_all_values (NMSetting *setting)
 
 void
 _nm_setting_gendata_to_gvalue (NMSetting *setting,
-                                GValue *value)
+                               GValue *value)
 {
 	GenData *gendata;
 	GHashTable *new;
@@ -2293,7 +2557,7 @@ _nm_setting_gendata_reset_from_hash (NMSetting *setting,
 	}
 
 	/* let's not bother to find out whether the new hash has any different
-	 * content the the current gendata. Just replace it. */
+	 * content the current gendata. Just replace it. */
 	g_hash_table_remove_all (gendata->hash);
 	if (num > 0) {
 		g_hash_table_iter_init (&iter, new);
@@ -2306,11 +2570,6 @@ _nm_setting_gendata_reset_from_hash (NMSetting *setting,
 
 /*****************************************************************************/
 
-static void
-nm_setting_init (NMSetting *setting)
-{
-}
-
 static void
 get_property (GObject *object, guint prop_id,
               GValue *value, GParamSpec *pspec)
@@ -2327,6 +2586,13 @@ get_property (GObject *object, guint prop_id,
 	}
 }
 
+/*****************************************************************************/
+
+static void
+nm_setting_init (NMSetting *setting)
+{
+}
+
 static void
 finalize (GObject *object)
 {
@@ -2367,11 +2633,15 @@ nm_setting_class_init (NMSettingClass *setting_class)
 	object_class->get_property = get_property;
 	object_class->finalize     = finalize;
 
-	setting_class->update_one_secret = update_one_secret;
-	setting_class->get_secret_flags = get_secret_flags;
-	setting_class->set_secret_flags = set_secret_flags;
-	setting_class->compare_property = compare_property;
-	setting_class->clear_secrets_with_flags = clear_secrets_with_flags;
+	setting_class->update_one_secret         = update_one_secret;
+	setting_class->get_secret_flags          = get_secret_flags;
+	setting_class->set_secret_flags          = set_secret_flags;
+	setting_class->compare_property          = compare_property;
+	setting_class->clear_secrets             = clear_secrets;
+	setting_class->for_each_secret           = for_each_secret;
+	setting_class->duplicate_copy_properties = duplicate_copy_properties;
+	setting_class->enumerate_values          = enumerate_values;
+	setting_class->aggregate                 = aggregate;
 
 	/**
 	 * NMSetting:name:
@@ -2380,10 +2650,11 @@ nm_setting_class_init (NMSettingClass *setting_class)
 	 * connection.  Each setting type has a name unique to that type, for
 	 * example "ppp" or "802-11-wireless" or "802-3-ethernet".
 	 **/
-	g_object_class_install_property
-		(object_class, PROP_NAME,
-		 g_param_spec_string (NM_SETTING_NAME, "", "",
-		                      NULL,
-		                      G_PARAM_READABLE |
-		                      G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_NAME] =
+	    g_param_spec_string (NM_SETTING_NAME, "", "",
+	                         NULL,
+	                         G_PARAM_READABLE |
+	                         G_PARAM_STATIC_STRINGS);
+
+	g_object_class_install_properties (object_class, _PROPERTY_ENUMS_LAST, obj_properties);
 }
diff --git a/libnm-core/nm-setting.h b/libnm-core/nm-setting.h
index a7a0f81f..fdf4a4c5 100644
--- a/libnm-core/nm-setting.h
+++ b/libnm-core/nm-setting.h
@@ -64,7 +64,7 @@ G_BEGIN_DECLS
  * should be requested from the user each time it is needed
  * @NM_SETTING_SECRET_FLAG_NOT_REQUIRED: in situations where it cannot be
  * automatically determined that the secret is required (some VPNs and PPP
- * providers dont require all secrets) this flag indicates that the specific
+ * providers don't require all secrets) this flag indicates that the specific
  * secret is not required
  *
  * These flags indicate specific behavior related to handling of a secret.  Each
@@ -169,6 +169,27 @@ typedef gboolean (*NMSettingClearSecretsWithFlagsFn) (NMSetting *setting,
                                                       gpointer user_data);
 
 struct _NMMetaSettingInfo;
+struct _NMSettInfoSetting;
+struct _NMSettInfoProperty;
+
+/**
+ * NMSettingValueIterFn:
+ * @setting: The setting for which properties are being iterated, given to
+ * nm_setting_enumerate_values()
+ * @key: The value/property name
+ * @value: The property's value
+ * @flags: The property's flags, like %NM_SETTING_PARAM_SECRET
+ * @user_data: User data passed to nm_setting_enumerate_values()
+ */
+typedef void (*NMSettingValueIterFn) (NMSetting *setting,
+                                      const char *key,
+                                      const GValue *value,
+                                      GParamFlags flags,
+                                      gpointer user_data);
+
+/*< private >*/
+typedef gboolean (*_NMConnectionForEachSecretFunc) (NMSettingSecretFlags flags,
+                                                    gpointer user_data);
 
 typedef struct {
 	GObjectClass parent;
@@ -191,48 +212,65 @@ typedef struct {
 
 	gboolean    (*get_secret_flags)  (NMSetting  *setting,
 	                                  const char *secret_name,
-	                                  gboolean verify_secret,
 	                                  NMSettingSecretFlags *out_flags,
 	                                  GError **error);
 
 	gboolean    (*set_secret_flags)  (NMSetting  *setting,
 	                                  const char *secret_name,
-	                                  gboolean verify_secret,
 	                                  NMSettingSecretFlags flags,
 	                                  GError **error);
 
-	gboolean    (*clear_secrets_with_flags) (NMSetting *setting,
-	                                         GParamSpec *pspec,
-	                                         NMSettingClearSecretsWithFlagsFn func,
-	                                         gpointer user_data);
+	/*< private >*/
+	gboolean    (*clear_secrets) (const struct _NMSettInfoSetting *sett_info,
+	                              guint property_idx,
+	                              NMSetting *setting,
+	                              NMSettingClearSecretsWithFlagsFn func,
+	                              gpointer user_data);
+
+	/* compare_property() returns a ternary, where DEFAULT means that the property should not
+	 * be compared due to the compare @flags. A TRUE/FALSE result means that the property is
+	 * equal/not-equal.
+	 *
+	 * @other may be %NULL, in which case the function only determines whether
+	 * the setting should be compared (TRUE) or not (DEFAULT). */
+	/*< private >*/
+	NMTernary  (*compare_property)  (const struct _NMSettInfoSetting *sett_info,
+	                                 guint property_idx,
+	                                 NMSetting *setting,
+	                                 NMSetting *other,
+	                                 NMSettingCompareFlags flags);
 
-	/* Returns TRUE if the given property contains the same value in both settings */
-	gboolean    (*compare_property)  (NMSetting *setting,
-	                                  NMSetting *other,
-	                                  const GParamSpec *prop_spec,
-	                                  NMSettingCompareFlags flags);
+	/*< private >*/
+	void (*duplicate_copy_properties) (const struct _NMSettInfoSetting *sett_info,
+	                                   NMSetting *src,
+	                                   NMSetting *dst);
 
 	/*< private >*/
-	const struct _NMMetaSettingInfo *setting_info;
+	void (*enumerate_values) (const struct _NMSettInfoProperty *property_info,
+	                          NMSetting *setting,
+	                          NMSettingValueIterFn func,
+	                          gpointer user_data);
 
 	/*< private >*/
-	gpointer padding[6];
-} NMSettingClass;
+	gboolean (*aggregate) (NMSetting *setting,
+	                       int type_i,
+	                       gpointer arg);
 
-/**
- * NMSettingValueIterFn:
- * @setting: The setting for which properties are being iterated, given to
- * nm_setting_enumerate_values()
- * @key: The value/property name
- * @value: The property's value
- * @flags: The property's flags, like %NM_SETTING_PARAM_SECRET
- * @user_data: User data passed to nm_setting_enumerate_values()
- */
-typedef void (*NMSettingValueIterFn) (NMSetting *setting,
-                                      const char *key,
-                                      const GValue *value,
-                                      GParamFlags flags,
-                                      gpointer user_data);
+	/*< private >*/
+	void (*for_each_secret) (NMSetting *setting,
+	                         const char *secret_name,
+	                         GVariant *val,
+	                         gboolean remove_non_secrets,
+	                         _NMConnectionForEachSecretFunc callback,
+	                         gpointer callback_data,
+	                         GVariantBuilder *setting_builder);
+
+	/*< private >*/
+	gpointer padding[2];
+
+	/*< private >*/
+	const struct _NMMetaSettingInfo *setting_info;
+} NMSettingClass;
 
 GType nm_setting_get_type (void);
 
@@ -272,7 +310,7 @@ typedef enum {
 	NM_SETTING_DIFF_RESULT_IN_A =    0x00000001,
 	NM_SETTING_DIFF_RESULT_IN_B =    0x00000002,
 	NM_SETTING_DIFF_RESULT_IN_A_DEFAULT = 0x00000004,
-	NM_SETTING_DIFF_RESULT_IN_B_DEFAULT = 0x00000004,
+	NM_SETTING_DIFF_RESULT_IN_B_DEFAULT = 0x00000008,
 } NMSettingDiffResult;
 
 gboolean    nm_setting_diff          (NMSetting *a,
diff --git a/libnm-core/nm-simple-connection.c b/libnm-core/nm-simple-connection.c
index 9ccdbb21..55e8229f 100644
--- a/libnm-core/nm-simple-connection.c
+++ b/libnm-core/nm-simple-connection.c
@@ -22,6 +22,7 @@
 #include "nm-default.h"
 
 #include "nm-simple-connection.h"
+
 #include "nm-setting-private.h"
 
 /**
@@ -32,12 +33,16 @@
  * but might be used in the process of creating a new one.
  **/
 
+/*****************************************************************************/
+
 static void nm_simple_connection_interface_init (NMConnectionInterface *iface);
 
 G_DEFINE_TYPE_WITH_CODE (NMSimpleConnection, nm_simple_connection, G_TYPE_OBJECT,
                          G_IMPLEMENT_INTERFACE (NM_TYPE_CONNECTION, nm_simple_connection_interface_init);
                          )
 
+/*****************************************************************************/
+
 static void
 nm_simple_connection_init (NMSimpleConnection *self)
 {
diff --git a/libnm-core/nm-utils-private.h b/libnm-core/nm-utils-private.h
index b886730a..46af26ed 100644
--- a/libnm-core/nm-utils-private.h
+++ b/libnm-core/nm-utils-private.h
@@ -41,6 +41,18 @@ struct _NMVariantAttributeSpec {
 gboolean    _nm_utils_string_slist_validate (GSList *list,
                                              const char **valid_values);
 
+gboolean _nm_utils_secret_flags_validate (NMSettingSecretFlags secret_flags,
+                                          const char *setting_name,
+                                          const char *property_name,
+                                          NMSettingSecretFlags disallowed_flags,
+                                          GError **error);
+
+gboolean _nm_utils_wps_method_validate (NMSettingWirelessSecurityWpsMethod wps_method,
+                                        const char *setting_name,
+                                        const char *property_name,
+                                        gboolean wps_required,
+                                        GError **error);
+
 /* D-Bus transform funcs */
 
 GVariant   *_nm_utils_hwaddr_cloned_get (NMSetting     *setting,
@@ -56,9 +68,11 @@ gboolean    _nm_utils_hwaddr_cloned_not_set (NMSetting *setting,
                                              const char    *property,
                                              NMSettingParseFlags parse_flags,
                                              GError       **error);
-GVariant *  _nm_utils_hwaddr_cloned_data_synth (NMSetting *setting,
+GVariant *  _nm_utils_hwaddr_cloned_data_synth (const NMSettInfoSetting *sett_info,
+                                                guint property_idx,
                                                 NMConnection *connection,
-                                                const char *property);
+                                                NMSetting *setting,
+                                                NMConnectionSerializationFlags flags);
 gboolean    _nm_utils_hwaddr_cloned_data_set (NMSetting *setting,
                                               GVariant *connection_dict,
                                               const char *property,
diff --git a/libnm-core/nm-utils.c b/libnm-core/nm-utils.c
index f75276c7..d276cfe6 100644
--- a/libnm-core/nm-utils.c
+++ b/libnm-core/nm-utils.c
@@ -23,8 +23,6 @@
 
 #include "nm-utils.h"
 
-#include 
-#include 
 #include 
 #include 
 #include 
@@ -40,6 +38,8 @@
 #endif
 
 #include "nm-utils/nm-enum-utils.h"
+#include "nm-utils/nm-secret-utils.h"
+#include "systemd/nm-sd-utils-shared.h"
 #include "nm-common-macros.h"
 #include "nm-utils-private.h"
 #include "nm-setting-private.h"
@@ -61,13 +61,284 @@
  * access points and devices, among other things.
  */
 
+/*****************************************************************************/
+
+struct _NMSockAddrEndpoint {
+	const char *host;
+	guint16 port;
+	guint refcount;
+	char endpoint[];
+};
+
+static gboolean
+NM_IS_SOCK_ADDR_ENDPOINT (const NMSockAddrEndpoint *self)
+{
+	return self && self->refcount > 0;
+}
+
+static const char *
+_parse_endpoint (char *str,
+                 guint16 *out_port)
+{
+	char *s;
+	const char *s_port;
+	gint16 port;
+
+	/* Like
+	 * - https://git.zx2c4.com/WireGuard/tree/src/tools/config.c?id=5e99a6d43fe2351adf36c786f5ea2086a8fe7ab8#n192
+	 * - https://github.com/systemd/systemd/blob/911649fdd43f3a9158b847947724a772a5a45c34/src/network/netdev/wireguard.c#L614
+	 */
+
+	g_strstrip (str);
+
+	if (!str[0])
+		return NULL;
+
+	if (str[0] == '[') {
+		str++;
+		s = strchr (str, ']');
+		if (!s)
+			return NULL;
+		if (s == str)
+			return NULL;
+		if (s[1] != ':')
+			return NULL;
+		if (!s[2])
+			return NULL;
+		*s = '\0';
+		s_port = &s[2];
+	} else {
+		s = strrchr (str, ':');
+		if (!s)
+			return NULL;
+		if (s == str)
+			return NULL;
+		if (!s[1])
+			return NULL;
+		*s = '\0';
+		s_port = &s[1];
+	}
+
+	if (!NM_STRCHAR_ALL (s_port, ch, (ch >= '0' && ch <= '9')))
+		return NULL;
+
+	port = _nm_utils_ascii_str_to_int64 (s_port, 10, 1, G_MAXUINT16, 0);
+	if (port == 0)
+		return NULL;
+
+	*out_port = port;
+	return str;
+}
+
+/**
+ * nm_sock_addr_endpoint_new:
+ * @endpoint: the endpoint string.
+ *
+ * This function cannot fail, even if the @endpoint is invalid.
+ * The reason is to allow NMSockAddrEndpoint also to be used
+ * for tracking invalid endpoints. Use nm_sock_addr_endpoint_get_host()
+ * to determine whether the endpoint is valid.
+ *
+ * Returns: (transfer full): the new #NMSockAddrEndpoint endpoint.
+ */
+NMSockAddrEndpoint *
+nm_sock_addr_endpoint_new (const char *endpoint)
+{
+	NMSockAddrEndpoint *ep;
+	gsize l_endpoint;
+	gsize l_host = 0;
+	gsize i;
+	gs_free char *host_clone = NULL;
+	const char *host;
+	guint16 port;
+
+	g_return_val_if_fail (endpoint, NULL);
+
+	l_endpoint = strlen (endpoint) + 1;
+
+	host = _parse_endpoint (nm_strndup_a (200, endpoint, l_endpoint - 1, &host_clone),
+	                        &port);
+
+	if (host)
+		l_host = strlen (host) + 1;
+
+	ep = g_malloc (sizeof (NMSockAddrEndpoint) + l_endpoint + l_host);
+	ep->refcount = 1;
+	memcpy (ep->endpoint, endpoint, l_endpoint);
+	if (host) {
+		i = l_endpoint;
+		memcpy (&ep->endpoint[i], host, l_host);
+		ep->host = &ep->endpoint[i];
+		ep->port = port;
+	} else {
+		ep->host = NULL;
+		ep->port = 0;
+	}
+	return ep;
+}
+
+/**
+ * nm_sock_addr_endpoint_ref:
+ * @self: (allow-none): the #NMSockAddrEndpoint
+ */
+NMSockAddrEndpoint *
+nm_sock_addr_endpoint_ref (NMSockAddrEndpoint *self)
+{
+	if (!self)
+		return NULL;
+
+	g_return_val_if_fail (NM_IS_SOCK_ADDR_ENDPOINT (self), NULL);
+
+	nm_assert (self->refcount < G_MAXUINT);
+
+	self->refcount++;
+	return self;
+}
+
+/**
+ * nm_sock_addr_endpoint_unref:
+ * @self: (allow-none): the #NMSockAddrEndpoint
+ */
+void
+nm_sock_addr_endpoint_unref (NMSockAddrEndpoint *self)
+{
+	if (!self)
+		return;
+
+	g_return_if_fail (NM_IS_SOCK_ADDR_ENDPOINT (self));
+
+	if (--self->refcount == 0)
+		g_free (self);
+}
+
+/**
+ * nm_sock_addr_endpoint_get_endpoint:
+ * @self: the #NMSockAddrEndpoint
+ *
+ * Gives the endpoint string. Since #NMSockAddrEndpoint's only
+ * information is the endpoint string, this can be used for comparing
+ * to instances for equality and order them lexically.
+ *
+ * Returns: (transfer none): the endpoint.
+ */
+const char *
+nm_sock_addr_endpoint_get_endpoint (NMSockAddrEndpoint *self)
+{
+	g_return_val_if_fail (NM_IS_SOCK_ADDR_ENDPOINT (self), NULL);
+
+	return self->endpoint;
+}
+
+/**
+ * nm_sock_addr_endpoint_get_host:
+ * @self: the #NMSockAddrEndpoint
+ *
+ * Returns: (transfer none): the parsed host part of the endpoint.
+ *   If the endpoint is invalid, %NULL will be returned.
+ */
+const char *
+nm_sock_addr_endpoint_get_host (NMSockAddrEndpoint *self)
+{
+	g_return_val_if_fail (NM_IS_SOCK_ADDR_ENDPOINT (self), NULL);
+
+	return self->host;
+}
+
+/**
+ * nm_sock_addr_endpoint_get_port:
+ * @self: the #NMSockAddrEndpoint
+ *
+ * Returns: the parsed port part of the endpoint (the service).
+ *   If the endpoint is invalid, -1 will be returned.
+ */
+gint32
+nm_sock_addr_endpoint_get_port (NMSockAddrEndpoint *self)
+{
+	g_return_val_if_fail (NM_IS_SOCK_ADDR_ENDPOINT (self), -1);
+
+	return self->host ? (int) self->port : -1;
+}
+
+gboolean
+nm_sock_addr_endpoint_get_fixed_sockaddr (NMSockAddrEndpoint *self,
+                                          gpointer sockaddr)
+{
+	int addr_family;
+	NMIPAddr addrbin;
+	const char *s;
+	guint scope_id = 0;
+
+	g_return_val_if_fail (NM_IS_SOCK_ADDR_ENDPOINT (self), FALSE);
+	g_return_val_if_fail (sockaddr, FALSE);
+
+	if (!self->host)
+		return FALSE;
+
+	if (nm_utils_parse_inaddr_bin (AF_UNSPEC, self->host, &addr_family, &addrbin))
+		goto good;
+
+	/* See if there is an IPv6 scope-id...
+	 *
+	 * Note that it does not make sense to persist connection profiles to disk,
+	 * that refenrence a scope-id (because the interface's ifindex changes on
+	 * reboot). However, we also support runtime only changes like `nmcli device modify`
+	 * where nothing is persisted to disk. At least in that case, passing a scope-id
+	 * might be reasonable. So, parse that too. */
+	s = strchr (self->host, '%');
+	if (!s)
+		return FALSE;
+
+	if (   s[1] == '\0'
+	    || !NM_STRCHAR_ALL (&s[1], ch, (ch >= '0' && ch <= '9')))
+		return FALSE;
+
+	scope_id = _nm_utils_ascii_str_to_int64 (&s[1], 10, 0, G_MAXINT32, G_MAXUINT);
+	if (scope_id == G_MAXUINT && errno)
+		return FALSE;
+
+	{
+		gs_free char *tmp_str = NULL;
+		const char *host_part;
+
+		host_part = nm_strndup_a (200, self->host, s - self->host, &tmp_str);
+		if (nm_utils_parse_inaddr_bin (AF_INET6, host_part, &addr_family, &addrbin))
+			goto good;
+	}
+
+	return FALSE;
+
+good:
+	switch (addr_family) {
+	case AF_INET:
+		*((struct sockaddr_in *) sockaddr) = (struct sockaddr_in) {
+			.sin_family = AF_INET,
+			.sin_addr   = addrbin.addr4_struct,
+			.sin_port   = htons (self->port),
+		};
+		return TRUE;
+	case AF_INET6:
+		*((struct sockaddr_in6 *) sockaddr) = (struct sockaddr_in6) {
+			.sin6_family   = AF_INET6,
+			.sin6_addr     = addrbin.addr6,
+			.sin6_port     = htons (self->port),
+			.sin6_scope_id = scope_id,
+			.sin6_flowinfo = 0,
+		};
+		return TRUE;
+	}
+
+	return FALSE;
+}
+
+/*****************************************************************************/
+
 struct IsoLangToEncodings
 {
 	const char *lang;
 	const char *const *encodings;
 };
 
-#define LANG_ENCODINGS(l, ...) { .lang = l, .encodings = (const char *[]) { __VA_ARGS__, NULL }}
+#define LANG_ENCODINGS(l, ...) { .lang = l, .encodings = NM_MAKE_STRV (__VA_ARGS__), }
 
 /* 5-letter language codes */
 static const struct IsoLangToEncodings isoLangEntries5[] =
@@ -112,7 +383,7 @@ static const struct IsoLangToEncodings isoLangEntries2[] =
 	LANG_ENCODINGS ("bg",      "windows-1251","koi8-r", "iso-8859-5"), /* Bulgarian */
 	LANG_ENCODINGS ("mk",      "koi8-r", "windows-1251", "iso-8859-5"),/* Macedonian */
 	LANG_ENCODINGS ("sr",      "koi8-r", "windows-1251", "iso-8859-5"),/* Serbian */
-	LANG_ENCODINGS ("uk",      "koi8-u", "koi8-r", "windows-1251"),    /* Ukranian */
+	LANG_ENCODINGS ("uk",      "koi8-u", "koi8-r", "windows-1251"),    /* Ukrainian */
 
 	/* Arabic */
 	LANG_ENCODINGS ("ar",      "iso-8859-6","windows-1256"),
@@ -836,7 +1107,7 @@ device_supports_ap_ciphers (guint32 dev_caps,
 
 /**
  * nm_utils_ap_mode_security_valid:
- * @type: the security type to check device capabilties against,
+ * @type: the security type to check device capabilities against,
  * e.g. #NMU_SEC_STATIC_WEP
  * @wifi_caps: bitfield of the capabilities of the specific Wi-Fi device, e.g.
  * #NM_WIFI_DEVICE_CAP_CIPHER_WEP40
@@ -872,16 +1143,16 @@ nm_utils_ap_mode_security_valid (NMUtilsSecurityType type,
 
 /**
  * nm_utils_security_valid:
- * @type: the security type to check AP flags and device capabilties against,
+ * @type: the security type to check AP flags and device capabilities against,
  * e.g. #NMU_SEC_STATIC_WEP
  * @wifi_caps: bitfield of the capabilities of the specific Wi-Fi device, e.g.
  * #NM_WIFI_DEVICE_CAP_CIPHER_WEP40
  * @have_ap: whether the @ap_flags, @ap_wpa, and @ap_rsn arguments are valid
  * @adhoc: whether the capabilities being tested are from an Ad-Hoc AP (IBSS)
  * @ap_flags: bitfield of AP capabilities, e.g. #NM_802_11_AP_FLAGS_PRIVACY
- * @ap_wpa: bitfield of AP capabilties derived from the AP's WPA beacon,
+ * @ap_wpa: bitfield of AP capabilities derived from the AP's WPA beacon,
  * e.g. (#NM_802_11_AP_SEC_PAIR_TKIP | #NM_802_11_AP_SEC_KEY_MGMT_PSK)
- * @ap_rsn: bitfield of AP capabilties derived from the AP's RSN/WPA2 beacon,
+ * @ap_rsn: bitfield of AP capabilities derived from the AP's RSN/WPA2 beacon,
  * e.g. (#NM_802_11_AP_SEC_PAIR_CCMP | #NM_802_11_AP_SEC_PAIR_TKIP)
  *
  * Given a set of device capabilities, and a desired security type to check
@@ -891,7 +1162,7 @@ nm_utils_ap_mode_security_valid (NMUtilsSecurityType type,
  * NOTE: this function cannot handle checking security for AP/Hotspot mode;
  * use nm_utils_ap_mode_security_valid() instead.
  *
- * Returns: %TRUE if the device capabilities and AP capabilties intersect and are
+ * Returns: %TRUE if the device capabilities and AP capabilities intersect and are
  * compatible with the desired @type, %FALSE if they are not
  **/
 gboolean
@@ -1173,7 +1444,7 @@ nm_utils_ip4_dns_from_variant (GVariant *value)
 	dns = g_new (char *, length + 1);
 
 	for (i = 0; i < length; i++)
-		dns[i] = g_strdup (nm_utils_inet4_ntop (array[i], NULL));
+		dns[i] = nm_utils_inet4_ntop_dup (array[i]);
 	dns[i] = NULL;
 
 	return dns;
@@ -1271,7 +1542,7 @@ nm_utils_ip4_addresses_from_variant (GVariant *value, char **out_gateway)
 			g_ptr_array_add (addresses, addr);
 
 			if (addr_array[2] && out_gateway && !*out_gateway)
-				*out_gateway = g_strdup (nm_utils_inet4_ntop (addr_array[2], NULL));
+				*out_gateway = nm_utils_inet4_ntop_dup (addr_array[2]);
 		} else {
 			g_warning ("Ignoring invalid IP4 address: %s", error->message);
 			g_clear_error (&error);
@@ -1389,30 +1660,13 @@ nm_utils_ip4_routes_from_variant (GVariant *value)
 guint32
 nm_utils_ip4_netmask_to_prefix (guint32 netmask)
 {
-	guint32 prefix;
-	guint8 v;
-	const guint8 *p = (guint8 *) &netmask;
-
-	if (p[3]) {
-		prefix = 24;
-		v = p[3];
-	} else if (p[2]) {
-		prefix = 16;
-		v = p[2];
-	} else if (p[1]) {
-		prefix = 8;
-		v = p[1];
-	} else {
-		prefix = 0;
-		v = p[0];
-	}
-
-	while (v) {
-		prefix++;
-		v <<= 1;
-	}
+	G_STATIC_ASSERT_EXPR (__SIZEOF_INT__   == 4);
+	G_STATIC_ASSERT_EXPR (sizeof (int)     == 4);
+	G_STATIC_ASSERT_EXPR (sizeof (netmask) == 4);
 
-	return prefix;
+	return  (  (netmask != 0)
+	         ? (32 - __builtin_ctz (ntohl (netmask)))
+	         : 0);
 }
 
 /**
@@ -1510,7 +1764,7 @@ nm_utils_ip6_dns_from_variant (GVariant *value)
 			continue;
 		}
 
-		dns[i++] = g_strdup (nm_utils_inet6_ntop (ip, NULL));
+		dns[i++] = nm_utils_inet6_ntop_dup (ip);
 		g_variant_unref (ip_var);
 	}
 	dns[i] = NULL;
@@ -1629,7 +1883,7 @@ nm_utils_ip6_addresses_from_variant (GVariant *value, char **out_gateway)
 					goto next;
 				}
 				if (!IN6_IS_ADDR_UNSPECIFIED (gateway_bytes))
-					*out_gateway = g_strdup (nm_utils_inet6_ntop (gateway_bytes, NULL));
+					*out_gateway = nm_utils_inet6_ntop_dup (gateway_bytes);
 			}
 		} else {
 			g_warning ("Ignoring invalid IP6 address: %s", error->message);
@@ -2017,7 +2271,7 @@ _string_append_tc_handle (GString *string, guint32 handle)
  * or to pretty-format (use symbolic name for root) the key in keyfile.
  * The presence of prefix determnines which one is the case.
  *
- * Private API due to general uglyness and overall uselessness for anything
+ * Private API due to general ugliness and overall uselessness for anything
  * sensible.
  */
 void
@@ -2909,7 +3163,7 @@ nm_utils_uuid_generate_from_string_bin (NMUuid *uuid, const char *s, gssize slen
 		break;
 	case NM_UTILS_UUID_TYPE_VERSION3:
 	case NM_UTILS_UUID_TYPE_VERSION5: {
-		NMUuid ns_uuid = { 0 };
+		NMUuid ns_uuid = { };
 
 		if (type_args) {
 			/* type_args can be a name space UUID. Interpret it as (char *) */
@@ -3124,7 +3378,7 @@ _nm_utils_check_file (const char *filename,
 		g_set_error (error,
 		             NM_VPN_PLUGIN_ERROR,
 		             NM_VPN_PLUGIN_ERROR_FAILED,
-		             _("failed stat file %s: %s"), filename, strerror (errsv));
+		             _("failed stat file %s: %s"), filename, nm_strerror_native (errsv));
 		return FALSE;
 	}
 
@@ -3243,7 +3497,7 @@ _nm_utils_check_module_file (const char *name,
  * @predicate: (scope call): if given, pass the file name to this function
  *   for additional checks. This check is performed after the check for
  *   @file_test_flags. You cannot omit both @file_test_flags and @predicate.
- * @user_data: (closure): (allow-none): user data for @predicate function.
+ * @user_data: (closure) (allow-none): user data for @predicate function.
  * @error: (allow-none): on failure, set a "not found" error %G_IO_ERROR %G_IO_ERROR_NOT_FOUND.
  *
  * Searches for a @progname file in a list of search @paths.
@@ -3620,147 +3874,6 @@ nm_utils_hwaddr_len (int type)
 	g_return_val_if_reached (0);
 }
 
-guint8 *
-_nm_utils_hexstr2bin_full (const char *hexstr,
-                           gboolean allow_0x_prefix,
-                           gboolean delimiter_required,
-                           const char *delimiter_candidates,
-                           gsize required_len,
-                           guint8 *buffer,
-                           gsize buffer_len,
-                           gsize *out_len)
-{
-	const char *in = hexstr;
-	guint8 *out = buffer;
-	gboolean delimiter_has = TRUE;
-	guint8 delimiter = '\0';
-	gsize len;
-
-	nm_assert (hexstr);
-	nm_assert (buffer);
-	nm_assert (required_len > 0 || out_len);
-
-	if (   allow_0x_prefix
-	    && in[0] == '0'
-	    && in[1] == 'x')
-		in += 2;
-
-	while (TRUE) {
-		const guint8 d1 = in[0];
-		guint8 d2;
-		int i1, i2;
-
-		i1 = nm_utils_hexchar_to_int (d1);
-		if (i1 < 0)
-			goto fail;
-
-		/* If there's no leading zero (ie "aa:b:cc") then fake it */
-		d2 = in[1];
-		if (   d2
-		    && (i2 = nm_utils_hexchar_to_int (d2)) >= 0) {
-			*out++ = (i1 << 4) + i2;
-			d2 = in[2];
-			if (!d2)
-				break;
-			in += 2;
-		} else {
-			/* Fake leading zero */
-			*out++ = i1;
-			if (!d2) {
-				if (!delimiter_has) {
-					/* when using no delimiter, there must be pairs of hex chars */
-					goto fail;
-				}
-				break;
-			}
-			in += 1;
-		}
-
-		if (--buffer_len == 0)
-			goto fail;
-
-		if (delimiter_has) {
-			if (d2 != delimiter) {
-				if (delimiter)
-					goto fail;
-				if (delimiter_candidates) {
-					while (delimiter_candidates[0]) {
-						if (delimiter_candidates++[0] == d2)
-							delimiter = d2;
-					}
-				}
-				if (!delimiter) {
-					if (delimiter_required)
-						goto fail;
-					delimiter_has = FALSE;
-					continue;
-				}
-			}
-			in++;
-		}
-	}
-
-	len = out - buffer;
-	if (   required_len == 0
-	    || len == required_len) {
-		NM_SET_OUT (out_len, len);
-		return buffer;
-	}
-
-fail:
-	NM_SET_OUT (out_len, 0);
-	return NULL;
-}
-
-guint8 *
-_nm_utils_hexstr2bin_alloc (const char *hexstr,
-                            gboolean allow_0x_prefix,
-                            gboolean delimiter_required,
-                            const char *delimiter_candidates,
-                            gsize required_len,
-                            gsize *out_len)
-{
-	guint8 *buffer;
-	gsize buffer_len, len;
-
-	g_return_val_if_fail (hexstr, NULL);
-
-	nm_assert (required_len > 0 || out_len);
-
-	if (   allow_0x_prefix
-	    && hexstr[0] == '0'
-	    && hexstr[1] == 'x')
-		hexstr += 2;
-
-	if (!hexstr[0])
-		goto fail;
-
-	if (required_len > 0)
-		buffer_len = required_len;
-	else
-		buffer_len = strlen (hexstr) / 2 + 3;
-
-	buffer = g_malloc (buffer_len);
-
-	if (_nm_utils_hexstr2bin_full (hexstr,
-	                               FALSE,
-	                               delimiter_required,
-	                               delimiter_candidates,
-	                               required_len,
-	                               buffer,
-	                               buffer_len,
-	                               &len)) {
-		NM_SET_OUT (out_len, len);
-		return buffer;
-	}
-
-	g_free (buffer);
-
-fail:
-	NM_SET_OUT (out_len, 0);
-	return NULL;
-}
-
 /**
  * nm_utils_hexstr2bin:
  * @hex: a string of hexadecimal characters with optional ':' separators
@@ -3778,14 +3891,14 @@ nm_utils_hexstr2bin (const char *hex)
 	guint8 *buffer;
 	gsize len;
 
-	buffer = _nm_utils_hexstr2bin_alloc (hex, TRUE, FALSE, ":", 0, &len);
+	buffer = nm_utils_hexstr2bin_alloc (hex, TRUE, FALSE, ":", 0, &len);
 	if (!buffer)
 		return NULL;
 	buffer = g_realloc (buffer, len);
 	return g_bytes_new_take (buffer, len);
 }
 
-#define hwaddr_aton(asc, buffer, buffer_len, out_len) _nm_utils_hexstr2bin_full ((asc), FALSE, TRUE, ":-", 0, (buffer), (buffer_len), (out_len))
+#define hwaddr_aton(asc, buffer, buffer_len, out_len) nm_utils_hexstr2bin_full ((asc), FALSE, TRUE, ":-", 0, (buffer), (buffer_len), (out_len))
 
 /**
  * nm_utils_hwaddr_atoba:
@@ -3879,64 +3992,7 @@ nm_utils_hwaddr_aton (const char *asc, gpointer buffer, gsize length)
 	return buffer;
 }
 
-/**
- * _nm_utils_bin2hexstr_full:
- * @addr: pointer of @length bytes.
- * @length: number of bytes in @addr
- * @delimiter: either '\0', otherwise the output string will have the
- *   given delimiter character between each two hex numbers.
- * @upper_case: if TRUE, use upper case ASCII characters for hex.
- * @out: if %NULL, the function will allocate a new buffer of
- *   either (@length*2+1) or (@length*3) bytes, depending on whether
- *   a @delimiter is specified. In that case, the allocated buffer will
- *   be returned and must be freed by the caller.
- *   If not %NULL, the buffer must already be preallocated and contain
- *   at least (@length*2+1) or (@length*3) bytes, depending on the delimiter.
- *
- * Returns: the binary value converted to a hex string. If @out is given,
- *   this always returns @out. If @out is %NULL, a newly allocated string
- *   is returned.
- */
-char *
-_nm_utils_bin2hexstr_full (gconstpointer addr,
-                           gsize length,
-                           char delimiter,
-                           gboolean upper_case,
-                           char *out)
-{
-	const guint8 *in = addr;
-	const char *LOOKUP = upper_case ? "0123456789ABCDEF" : "0123456789abcdef";
-	char *out0;
-
-	nm_assert (addr);
-	nm_assert (length > 0);
-
-	if (out)
-		out0 = out;
-	else {
-		out0 = out = g_new (char, delimiter == '\0'
-		                          ? length * 2 + 1
-		                          : length * 3);
-	}
-
-	/* @out must contain at least @length*3 bytes if @delimiter is set,
-	 * otherwise, @length*2+1. */
-
-	for (;;) {
-		const guint8 v = *in++;
 
-		*out++ = LOOKUP[v >> 4];
-		*out++ = LOOKUP[v & 0x0F];
-		length--;
-		if (!length)
-			break;
-		if (delimiter)
-			*out++ = delimiter;
-	}
-
-	*out = 0;
-	return out0;
-}
 
 /**
  * nm_utils_bin2hexstr:
@@ -3962,7 +4018,7 @@ nm_utils_bin2hexstr (gconstpointer src, gsize len, int final_len)
 
 	result = g_malloc (buflen);
 
-	_nm_utils_bin2hexstr_full (src, len, '\0', FALSE, result);
+	nm_utils_bin2hexstr_full (src, len, '\0', FALSE, result);
 
 	/* Cut converted key off at the correct length for this cipher type */
 	if (final_len >= 0 && (gsize) final_len < buflen)
@@ -3986,7 +4042,7 @@ nm_utils_hwaddr_ntoa (gconstpointer addr, gsize length)
 	g_return_val_if_fail (addr, g_strdup (""));
 	g_return_val_if_fail (length > 0, g_strdup (""));
 
-	return _nm_utils_bin2hexstr_full (addr, length, ':', TRUE, NULL);
+	return nm_utils_bin2hexstr_full (addr, length, ':', TRUE, NULL);
 }
 
 const char *
@@ -3998,7 +4054,7 @@ nm_utils_hwaddr_ntoa_buf (gconstpointer addr, gsize addr_len, gboolean upper_cas
 	if (buf_len < addr_len * 3)
 		g_return_val_if_reached (NULL);
 
-	return _nm_utils_bin2hexstr_full (addr, addr_len, ':', upper_case, buf);
+	return nm_utils_bin2hexstr_full (addr, addr_len, ':', upper_case, buf);
 }
 
 /**
@@ -4251,13 +4307,18 @@ _nm_utils_hwaddr_cloned_not_set (NMSetting *setting,
 }
 
 GVariant *
-_nm_utils_hwaddr_cloned_data_synth (NMSetting *setting,
+_nm_utils_hwaddr_cloned_data_synth (const NMSettInfoSetting *sett_info,
+                                    guint property_idx,
                                     NMConnection *connection,
-                                    const char *property)
+                                    NMSetting *setting,
+                                    NMConnectionSerializationFlags flags)
 {
 	gs_free char *addr = NULL;
 
-	nm_assert (nm_streq0 (property, "assigned-mac-address"));
+	if (flags & NM_CONNECTION_SERIALIZE_ONLY_SECRETS)
+		return NULL;
+
+	nm_assert (nm_streq0 (sett_info->property_infos[property_idx].name, "assigned-mac-address"));
 
 	g_object_get (setting,
 	              "cloned-mac-address",
@@ -4278,7 +4339,9 @@ _nm_utils_hwaddr_cloned_data_synth (NMSetting *setting,
 	 * To preserve that behavior, serialize "" as NULL.
 	 */
 
-	return addr && addr[0] ? g_variant_new_string (addr) : NULL;
+	return addr && addr[0]
+	       ? g_variant_new_take_string (g_steal_pointer (&addr))
+	       : NULL;
 }
 
 gboolean
@@ -4321,6 +4384,102 @@ _nm_utils_hwaddr_from_dbus (GVariant *dbus_value,
 
 /*****************************************************************************/
 
+/* Validate secret-flags. Most settings don't validate them, which is a bug.
+ * But we possibly cannot enforce a strict validation now.
+ *
+ * For new settings, they shall validate the secret-flags strictly. */
+gboolean
+_nm_utils_secret_flags_validate (NMSettingSecretFlags secret_flags,
+                                 const char *setting_name,
+                                 const char *property_name,
+                                 NMSettingSecretFlags disallowed_flags,
+                                 GError **error)
+{
+	if (secret_flags == NM_SETTING_SECRET_FLAG_NONE)
+		return TRUE;
+
+	if (NM_FLAGS_ANY (secret_flags, ~NM_SETTING_SECRET_FLAG_ALL)) {
+		g_set_error_literal (error,
+		                     NM_CONNECTION_ERROR,
+		                     NM_CONNECTION_ERROR_INVALID_PROPERTY,
+		                     _("unknown secret flags"));
+		if (setting_name)
+			g_prefix_error (error, "%s.%s: ", setting_name, property_name);
+		return FALSE;
+	}
+
+	if (!nm_utils_is_power_of_two (secret_flags)) {
+		g_set_error_literal (error,
+		                     NM_CONNECTION_ERROR,
+		                     NM_CONNECTION_ERROR_INVALID_PROPERTY,
+		                     _("conflicting secret flags"));
+		if (setting_name)
+			g_prefix_error (error, "%s.%s: ", setting_name, property_name);
+		return FALSE;
+	}
+
+	if (NM_FLAGS_ANY (secret_flags, disallowed_flags)) {
+		if (NM_FLAGS_HAS (secret_flags, NM_SETTING_SECRET_FLAG_NOT_REQUIRED)) {
+			g_set_error_literal (error,
+			                     NM_CONNECTION_ERROR,
+			                     NM_CONNECTION_ERROR_INVALID_PROPERTY,
+			                     _("secret flags must not be \"not-required\""));
+			if (setting_name)
+				g_prefix_error (error, "%s.%s: ", setting_name, property_name);
+			return FALSE;
+		}
+		g_set_error_literal (error,
+		                     NM_CONNECTION_ERROR,
+		                     NM_CONNECTION_ERROR_INVALID_PROPERTY,
+		                     _("unsupported secret flags"));
+		if (setting_name)
+			g_prefix_error (error, "%s.%s: ", setting_name, property_name);
+		return FALSE;
+	}
+
+	return TRUE;
+}
+
+gboolean
+_nm_utils_wps_method_validate (NMSettingWirelessSecurityWpsMethod wps_method,
+                               const char *setting_name,
+                               const char *property_name,
+                               gboolean wps_required,
+                               GError **error)
+{
+	if (wps_method > NM_SETTING_WIRELESS_SECURITY_WPS_METHOD_PIN) {
+		g_set_error_literal (error,
+		                     NM_CONNECTION_ERROR,
+		                     NM_CONNECTION_ERROR_INVALID_PROPERTY,
+		                     _("property is invalid"));
+		g_prefix_error (error, "%s.%s: ", setting_name, property_name);
+		return FALSE;
+	}
+
+	if (NM_FLAGS_HAS (wps_method, NM_SETTING_WIRELESS_SECURITY_WPS_METHOD_DISABLED)) {
+		if (wps_method != NM_SETTING_WIRELESS_SECURITY_WPS_METHOD_DISABLED) {
+			g_set_error_literal (error,
+			                     NM_CONNECTION_ERROR,
+			                     NM_CONNECTION_ERROR_INVALID_PROPERTY,
+			                     _("can't be simultaneously disabled and enabled"));
+			g_prefix_error (error, "%s.%s: ", setting_name, property_name);
+			return FALSE;
+		}
+		if (wps_required) {
+			g_set_error_literal (error,
+			                     NM_CONNECTION_ERROR,
+			                     NM_CONNECTION_ERROR_INVALID_PROPERTY,
+			                     _("WPS is required"));
+			g_prefix_error (error, "%s.%s: ", setting_name, property_name);
+			return FALSE;
+		}
+	}
+
+	return TRUE;
+}
+
+/*****************************************************************************/
+
 static char *
 _split_word (char *s)
 {
@@ -4517,10 +4676,11 @@ nm_utils_inet_ntop (int addr_family, gconstpointer addr, char *dst)
 
 	nm_assert_addr_family (addr_family);
 	nm_assert (addr);
+	nm_assert (dst);
 
 	s = inet_ntop (addr_family,
 	               addr,
-	               dst ?: _nm_utils_inet_ntop_buffer,
+	               dst,
 	               addr_family == AF_INET6 ? INET6_ADDRSTRLEN : INET_ADDRSTRLEN);
 	nm_assert (s);
 	return s;
@@ -4546,6 +4706,11 @@ nm_utils_inet_ntop (int addr_family, gconstpointer addr, char *dst)
 const char *
 nm_utils_inet4_ntop (in_addr_t inaddr, char *dst)
 {
+	/* relying on the static buffer (by leaving @dst as %NULL) is discouraged.
+	 * Don't do that!
+	 *
+	 * However, still support it to be lenient against mistakes and because
+	 * this is public API of libnm. */
 	return inet_ntop (AF_INET, &inaddr, dst ?: _nm_utils_inet_ntop_buffer,
 	                  INET_ADDRSTRLEN);
 }
@@ -4571,6 +4736,11 @@ nm_utils_inet4_ntop (in_addr_t inaddr, char *dst)
 const char *
 nm_utils_inet6_ntop (const struct in6_addr *in6addr, char *dst)
 {
+	/* relying on the static buffer (by leaving @dst as %NULL) is discouraged.
+	 * Don't do that!
+	 *
+	 * However, still support it to be lenient against mistakes and because
+	 * this is public API of libnm. */
 	g_return_val_if_fail (in6addr, NULL);
 	return inet_ntop (AF_INET6, in6addr, dst ?: _nm_utils_inet_ntop_buffer,
 	                  INET6_ADDRSTRLEN);
@@ -4665,7 +4835,7 @@ _nm_utils_dhcp_duid_valid (const char *duid, GBytes **out_duid_bin)
 		return TRUE;
 	}
 
-	if (_nm_utils_hexstr2bin_full (duid, FALSE, FALSE, ":", 0, duid_arr, sizeof (duid_arr), &duid_len)) {
+	if (nm_utils_hexstr2bin_full (duid, FALSE, FALSE, ":", 0, duid_arr, sizeof (duid_arr), &duid_len)) {
 		/* MAX DUID length is 128 octects + the type code (2 octects). */
 		if (   duid_len > 2
 		    && duid_len <= (128 + 2)) {
@@ -5315,7 +5485,7 @@ _json_find_object (json_t *json,
 	return json_element;
 }
 
-static inline void
+static void
 _json_delete_object_on_int_match (json_t *json,
                                   const char *key1,
                                   const char *key2,
@@ -5331,7 +5501,7 @@ _json_delete_object_on_int_match (json_t *json,
 		_json_del_object (json, key1, key2, key3);
 }
 
-static inline void
+static void
 _json_delete_object_on_bool_match (json_t *json,
                                    const char *key1,
                                    const char *key2,
@@ -5347,7 +5517,7 @@ _json_delete_object_on_bool_match (json_t *json,
 		_json_del_object (json, key1, key2, key3);
 }
 
-static inline void
+static void
 _json_delete_object_on_string_match (json_t *json,
                                      const char *key1,
                                      const char *key2,
@@ -5435,7 +5605,7 @@ _nm_utils_team_link_watcher_from_json (json_t *json_element)
 	const char *j_key;
 	json_t *j_val;
 	gs_free char *name = NULL, *target_host = NULL, *source_host = NULL;
-	int val1 = 0, val2 = 0, val3 = 3;
+	int val1 = 0, val2 = 0, val3 = 3, val4 = -1;
 	NMTeamLinkWatcherArpPingFlags flags = 0;
 
 	g_return_val_if_fail (json_element, NULL);
@@ -5456,6 +5626,8 @@ _nm_utils_team_link_watcher_from_json (json_t *json_element)
 			val2 = json_integer_value (j_val);
 		else if (nm_streq (j_key, "missed_max"))
 			val3 = json_integer_value (j_val);
+		else if (nm_streq (j_key, "vlanid"))
+			val4 = json_integer_value (j_val);
 		else if (nm_streq (j_key, "validate_active")) {
 			if (json_is_true (j_val))
 				flags |= NM_TEAM_LINK_WATCHER_ARP_PING_FLAG_VALIDATE_ACTIVE;
@@ -5473,8 +5645,8 @@ _nm_utils_team_link_watcher_from_json (json_t *json_element)
 	else if (nm_streq0 (name, NM_TEAM_LINK_WATCHER_NSNA_PING))
 		return nm_team_link_watcher_new_nsna_ping (val1, val2, val3, target_host, NULL);
 	else if (nm_streq0 (name, NM_TEAM_LINK_WATCHER_ARP_PING)) {
-		return nm_team_link_watcher_new_arp_ping (val1, val2, val3, target_host,
-		                                          source_host, flags, NULL);
+		return nm_team_link_watcher_new_arp_ping2 (val1, val2, val3, val4, target_host,
+		                                           source_host, flags, NULL);
 	} else
 		return NULL;
 }
@@ -5524,6 +5696,9 @@ _nm_utils_team_link_watcher_to_json (NMTeamLinkWatcher *watcher)
 	if (nm_streq (name, NM_TEAM_LINK_WATCHER_NSNA_PING))
 		return json_element;
 
+	int_val = nm_team_link_watcher_get_vlanid (watcher);
+	if (int_val != -1)
+		json_object_set_new (json_element, "vlanid", json_integer (int_val));
 	str_val = nm_team_link_watcher_get_source_host (watcher);
 	if (!str_val)
 		goto fail;
@@ -5976,15 +6151,15 @@ _nm_utils_team_link_watchers_to_variant (GPtrArray *link_watchers)
 
 		name = nm_team_link_watcher_get_name (watcher);
 		g_variant_builder_add (&watcher_builder, "{sv}",
-				       "name",
-				       g_variant_new_string (name));
+		                       "name",
+		                       g_variant_new_string (name));
 
-		if nm_streq (name, NM_TEAM_LINK_WATCHER_ETHTOOL) {
+		if (nm_streq (name, NM_TEAM_LINK_WATCHER_ETHTOOL)) {
 			int_val = nm_team_link_watcher_get_delay_up (watcher);
 			if (int_val) {
 				g_variant_builder_add (&watcher_builder, "{sv}",
-						       "delay-up",
-						       g_variant_new_int32 (int_val));
+				                       "delay-up",
+				                       g_variant_new_int32 (int_val));
 			}
 			int_val = nm_team_link_watcher_get_delay_down (watcher);
 			if (int_val) {
@@ -6019,12 +6194,18 @@ _nm_utils_team_link_watchers_to_variant (GPtrArray *link_watchers)
 		                       "target-host",
 		                       g_variant_new_string (nm_team_link_watcher_get_target_host (watcher)));
 
-		if nm_streq (name, NM_TEAM_LINK_WATCHER_NSNA_PING) {
+		if (nm_streq (name, NM_TEAM_LINK_WATCHER_NSNA_PING)) {
 			g_variant_builder_add (&builder, "a{sv}", &watcher_builder);
 			continue;
 		}
 
 		/* arp_ping watcher only */
+		int_val = nm_team_link_watcher_get_vlanid (watcher);
+		if (int_val != -1) {
+			g_variant_builder_add (&watcher_builder, "{sv}",
+			                       "vlanid",
+			                       g_variant_new_int32 (int_val));
+		}
 		g_variant_builder_add (&watcher_builder, "{sv}",
 		                       "source-host",
 		                       g_variant_new_string (nm_team_link_watcher_get_source_host (watcher)));
@@ -6075,7 +6256,7 @@ _nm_utils_team_link_watchers_from_variant (GVariant *value)
 	while (g_variant_iter_next (&iter, "@a{sv}", &watcher_var)) {
 		NMTeamLinkWatcher *watcher;
 		const char *name;
-		int val1, val2, val3 = 0;
+		int val1, val2, val3 = 0, val4 = -1;
 		const char *target_host = NULL, *source_host = NULL;
 		gboolean bval;
 		NMTeamLinkWatcherArpPingFlags flags = NM_TEAM_LINK_WATCHER_ARP_PING_FLAG_NONE;
@@ -6105,7 +6286,9 @@ _nm_utils_team_link_watchers_from_variant (GVariant *value)
 				val2 = 0;
 			if (!g_variant_lookup (watcher_var, "missed-max", "i", &val3))
 				val3 = 3;
-			if nm_streq (name, NM_TEAM_LINK_WATCHER_ARP_PING) {
+			if (nm_streq (name, NM_TEAM_LINK_WATCHER_ARP_PING)) {
+				if (!g_variant_lookup (watcher_var, "vlanid", "i", &val4))
+					val4 = -1;
 				if (!g_variant_lookup (watcher_var, "source-host", "&s", &source_host))
 					goto next;
 				if (!g_variant_lookup (watcher_var, "validate-active", "b", &bval))
@@ -6120,9 +6303,9 @@ _nm_utils_team_link_watchers_from_variant (GVariant *value)
 					bval = FALSE;
 				if (bval)
 					flags |= NM_TEAM_LINK_WATCHER_ARP_PING_FLAG_SEND_ALWAYS;
-				watcher = nm_team_link_watcher_new_arp_ping (val1, val2, val3,
-				                                             target_host, source_host,
-				                                             flags, &error);
+				watcher = nm_team_link_watcher_new_arp_ping2 (val1, val2, val3, val4,
+				                                              target_host, source_host,
+				                                              flags, &error);
 			} else
 				watcher = nm_team_link_watcher_new_nsna_ping (val1, val2, val3,
 				                                              target_host, &error);
@@ -6487,3 +6670,73 @@ nm_utils_version (void)
 	return NM_VERSION;
 }
 
+/*****************************************************************************/
+
+/**
+ * nm_utils_base64secret_decode:
+ * @base64_key: the (possibly invalid) base64 encode key.
+ * @required_key_len: the expected (binary) length of the key after
+ *   decoding. If the length does not match, the validation fails.
+ * @out_key: (allow-none): (out): an optional output buffer for the binary
+ *   key. If given, it will be filled with exactly @required_key_len
+ *   bytes.
+ *
+ * Returns: %TRUE if the input key is a valid base64 encoded key
+ *   with @required_key_len bytes.
+ *
+ * Since: 1.16
+ */
+gboolean
+nm_utils_base64secret_decode (const char *base64_key,
+                              gsize required_key_len,
+                              guint8 *out_key)
+{
+	gs_free guint8 *bin_arr = NULL;
+	gsize base64_key_len;
+	gsize bin_len;
+	int r;
+
+	if (!base64_key)
+		return FALSE;
+
+	base64_key_len = strlen (base64_key);
+
+	r = nm_sd_utils_unbase64mem (base64_key, base64_key_len, &bin_arr, &bin_len);
+	if (r < 0)
+		return FALSE;
+	if (bin_len != required_key_len) {
+		nm_explicit_bzero (bin_arr, bin_len);
+		return FALSE;
+	}
+
+	if (out_key)
+		memcpy (out_key, bin_arr, required_key_len);
+
+	nm_explicit_bzero (bin_arr, bin_len);
+	return TRUE;
+}
+
+gboolean
+nm_utils_base64secret_normalize (const char *base64_key,
+                                 gsize required_key_len,
+                                 char **out_base64_key_norm)
+{
+	gs_free guint8 *buf_free = NULL;
+	guint8 buf_static[200];
+	guint8 *buf;
+
+	if (required_key_len > sizeof (buf_static)) {
+		buf_free = g_new (guint8, required_key_len);
+		buf = buf_free;
+	} else
+		buf = buf_static;
+
+	if (!nm_utils_base64secret_decode (base64_key, required_key_len, buf)) {
+		NM_SET_OUT (out_base64_key_norm, NULL);
+		return FALSE;
+	}
+
+	NM_SET_OUT (out_base64_key_norm, g_base64_encode (buf, required_key_len));
+	nm_explicit_bzero (buf, required_key_len);
+	return TRUE;
+}
diff --git a/libnm-core/nm-utils.h b/libnm-core/nm-utils.h
index cf9572b9..2b5baba4 100644
--- a/libnm-core/nm-utils.h
+++ b/libnm-core/nm-utils.h
@@ -40,6 +40,8 @@
 
 G_BEGIN_DECLS
 
+/*****************************************************************************/
+
 typedef struct _NMVariantAttributeSpec NMVariantAttributeSpec;
 
 /* SSID helpers */
@@ -261,6 +263,10 @@ NMSriovVF *nm_utils_sriov_vf_from_str (const char *str, GError **error);
 NM_AVAILABLE_IN_1_12
 gint64 nm_utils_get_timestamp_msec         (void);
 
+NM_AVAILABLE_IN_1_16
+gboolean nm_utils_base64secret_decode (const char *base64_key,
+                                       gsize required_key_len,
+                                       guint8 *out_key);
 
 G_END_DECLS
 
diff --git a/libnm-core/nm-version.h b/libnm-core/nm-version.h
index 59482d4e..7fe2e45b 100644
--- a/libnm-core/nm-version.h
+++ b/libnm-core/nm-version.h
@@ -174,4 +174,18 @@
 # define NM_AVAILABLE_IN_1_14
 #endif
 
+#if NM_VERSION_MIN_REQUIRED >= NM_VERSION_1_16
+# define NM_DEPRECATED_IN_1_16           G_DEPRECATED
+# define NM_DEPRECATED_IN_1_16_FOR(f)    G_DEPRECATED_FOR(f)
+#else
+# define NM_DEPRECATED_IN_1_16
+# define NM_DEPRECATED_IN_1_16_FOR(f)
+#endif
+
+#if NM_VERSION_MAX_ALLOWED < NM_VERSION_1_16
+# define NM_AVAILABLE_IN_1_16            G_UNAVAILABLE(1,16)
+#else
+# define NM_AVAILABLE_IN_1_16
+#endif
+
 #endif  /* NM_VERSION_H */
diff --git a/libnm-core/nm-vpn-editor-plugin.c b/libnm-core/nm-vpn-editor-plugin.c
index d690d9b0..30213ea0 100644
--- a/libnm-core/nm-vpn-editor-plugin.c
+++ b/libnm-core/nm-vpn-editor-plugin.c
@@ -29,6 +29,8 @@
 
 #include "nm-core-internal.h"
 
+/*****************************************************************************/
+
 static void nm_vpn_editor_plugin_default_init (NMVpnEditorPluginInterface *iface);
 
 G_DEFINE_INTERFACE (NMVpnEditorPlugin, nm_vpn_editor_plugin, G_TYPE_OBJECT)
@@ -36,18 +38,16 @@ G_DEFINE_INTERFACE (NMVpnEditorPlugin, nm_vpn_editor_plugin, G_TYPE_OBJECT)
 static void
 nm_vpn_editor_plugin_default_init (NMVpnEditorPluginInterface *iface)
 {
-	/* Properties */
-
 	/**
 	 * NMVpnEditorPlugin:name:
 	 *
 	 * Short display name of the VPN plugin.
 	 */
 	g_object_interface_install_property (iface,
-		 g_param_spec_string (NM_VPN_EDITOR_PLUGIN_NAME, "", "",
-		                      NULL,
-		                      G_PARAM_READABLE |
-		                      G_PARAM_STATIC_STRINGS));
+	    g_param_spec_string (NM_VPN_EDITOR_PLUGIN_NAME, "", "",
+	                         NULL,
+	                         G_PARAM_READABLE |
+	                         G_PARAM_STATIC_STRINGS));
 
 	/**
 	 * NMVpnEditorPlugin:description:
@@ -55,10 +55,10 @@ nm_vpn_editor_plugin_default_init (NMVpnEditorPluginInterface *iface)
 	 * Longer description of the VPN plugin.
 	 */
 	g_object_interface_install_property (iface,
-		 g_param_spec_string (NM_VPN_EDITOR_PLUGIN_DESCRIPTION, "", "",
-		                      NULL,
-		                      G_PARAM_READABLE |
-		                      G_PARAM_STATIC_STRINGS));
+	    g_param_spec_string (NM_VPN_EDITOR_PLUGIN_DESCRIPTION, "", "",
+	                         NULL,
+	                         G_PARAM_READABLE |
+	                         G_PARAM_STATIC_STRINGS));
 
 	/**
 	 * NMVpnEditorPlugin:service:
@@ -66,10 +66,10 @@ nm_vpn_editor_plugin_default_init (NMVpnEditorPluginInterface *iface)
 	 * D-Bus service name of the plugin's VPN service.
 	 */
 	g_object_interface_install_property (iface,
-		 g_param_spec_string (NM_VPN_EDITOR_PLUGIN_SERVICE, "", "",
-		                      NULL,
-		                      G_PARAM_READABLE |
-		                      G_PARAM_STATIC_STRINGS));
+	    g_param_spec_string (NM_VPN_EDITOR_PLUGIN_SERVICE, "", "",
+	                         NULL,
+	                         G_PARAM_READABLE |
+	                         G_PARAM_STATIC_STRINGS));
 }
 
 /*****************************************************************************/
@@ -379,8 +379,8 @@ _nm_vpn_editor_plugin_load (const char *plugin_name,
  * @user_data: user data for @check_file
  * @error: on failure the error reason.
  *
- * Load the shared libary @plugin_name and create a new
- * #NMVpnEditorPlugin instace via the #NMVpnEditorPluginFactory
+ * Load the shared library @plugin_name and create a new
+ * #NMVpnEditorPlugin instance via the #NMVpnEditorPluginFactory
  * function.
  *
  * If @plugin_name is not an absolute path name, it assumes the file
@@ -419,8 +419,8 @@ nm_vpn_editor_plugin_load_from_file  (const char *plugin_name,
  *  the given service.
  * @error: on failure the error reason.
  *
- * Load the shared libary @plugin_name and create a new
- * #NMVpnEditorPlugin instace via the #NMVpnEditorPluginFactory
+ * Load the shared library @plugin_name and create a new
+ * #NMVpnEditorPlugin instance via the #NMVpnEditorPluginFactory
  * function.
  *
  * This is similar to nm_vpn_editor_plugin_load_from_file(), but
diff --git a/libnm-core/nm-vpn-plugin-info.c b/libnm-core/nm-vpn-plugin-info.c
index 79542279..bfcd70a5 100644
--- a/libnm-core/nm-vpn-plugin-info.c
+++ b/libnm-core/nm-vpn-plugin-info.c
@@ -22,8 +22,6 @@
 
 #include "nm-vpn-plugin-info.h"
 
-#include 
-#include 
 #include 
 
 #include "nm-errors.h"
@@ -148,7 +146,7 @@ nm_vpn_plugin_info_check_file_full (const char *filename,
  *   other users.
  * @check_file: pass a callback to do your own validation.
  * @user_data: user data for @check_file.
- * @error: (allow-none): (out): the error reason if the check fails.
+ * @error: (allow-none) (out): the error reason if the check fails.
  *
  * Check whether the file exists and is a valid name file (in keyfile format).
  * Additionally, also check for file permissions.
@@ -1095,60 +1093,42 @@ nm_vpn_plugin_info_load_editor_plugin (NMVpnPluginInfo *self, GError **error)
 
 /*****************************************************************************/
 
-/**
- * nm_vpn_plugin_info_new_from_file:
- * @filename: filename to read.
- * @error: on failure, the error reason.
- *
- * Read the plugin info from file @filename. Does not do
- * any further verification on the file. You might want to check
- * file permissions and ownership of the file.
- *
- * Returns: %NULL if there is any error or a newly created
- * #NMVpnPluginInfo instance.
- *
- * Since: 1.2
- */
-NMVpnPluginInfo *
-nm_vpn_plugin_info_new_from_file (const char *filename,
-                                  GError **error)
+static void
+get_property (GObject *object, guint prop_id,
+              GValue *value, GParamSpec *pspec)
 {
-	g_return_val_if_fail (filename, NULL);
+	NMVpnPluginInfoPrivate *priv = NM_VPN_PLUGIN_INFO_GET_PRIVATE (object);
 
-	return NM_VPN_PLUGIN_INFO (g_initable_new (NM_TYPE_VPN_PLUGIN_INFO,
-	                                           NULL,
-	                                           error,
-	                                           NM_VPN_PLUGIN_INFO_FILENAME, filename,
-	                                           NULL));
+	switch (prop_id) {
+	case PROP_NAME:
+		g_value_set_string (value, priv->name);
+		break;
+	case PROP_FILENAME:
+		g_value_set_string (value, priv->filename);
+		break;
+	default:
+		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+		break;
+	}
 }
 
-/**
- * nm_vpn_plugin_info_new_with_data:
- * @filename: optional filename.
- * @keyfile: inject data for the plugin info instance.
- * @error: construction may fail if the keyfile lacks mandatory fields.
- *   In this case, return the error reason.
- *
- * This constructor does not read any data from file but
- * takes instead a @keyfile argument.
- *
- * Returns: new plugin info instance.
- *
- * Since: 1.2
- */
-NMVpnPluginInfo *
-nm_vpn_plugin_info_new_with_data (const char *filename,
-                                  GKeyFile *keyfile,
-                                  GError **error)
+static void
+set_property (GObject *object, guint prop_id,
+              const GValue *value, GParamSpec *pspec)
 {
-	g_return_val_if_fail (keyfile, NULL);
+	NMVpnPluginInfoPrivate *priv = NM_VPN_PLUGIN_INFO_GET_PRIVATE (object);
 
-	return NM_VPN_PLUGIN_INFO (g_initable_new (NM_TYPE_VPN_PLUGIN_INFO,
-	                                           NULL,
-	                                           error,
-	                                           NM_VPN_PLUGIN_INFO_FILENAME, filename,
-	                                           NM_VPN_PLUGIN_INFO_KEYFILE, keyfile,
-	                                           NULL));
+	switch (prop_id) {
+	case PROP_FILENAME:
+		priv->filename = g_value_dup_string (value);
+		break;
+	case PROP_KEYFILE:
+		priv->keyfile = g_value_dup_boxed (value);
+		break;
+	default:
+		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+		break;
+	}
 }
 
 /*****************************************************************************/
@@ -1224,42 +1204,60 @@ init_sync (GInitable *initable, GCancellable *cancellable, GError **error)
 	return TRUE;
 }
 
-static void
-set_property (GObject *object, guint prop_id,
-              const GValue *value, GParamSpec *pspec)
+/**
+ * nm_vpn_plugin_info_new_from_file:
+ * @filename: filename to read.
+ * @error: on failure, the error reason.
+ *
+ * Read the plugin info from file @filename. Does not do
+ * any further verification on the file. You might want to check
+ * file permissions and ownership of the file.
+ *
+ * Returns: %NULL if there is any error or a newly created
+ * #NMVpnPluginInfo instance.
+ *
+ * Since: 1.2
+ */
+NMVpnPluginInfo *
+nm_vpn_plugin_info_new_from_file (const char *filename,
+                                  GError **error)
 {
-	NMVpnPluginInfoPrivate *priv = NM_VPN_PLUGIN_INFO_GET_PRIVATE (object);
+	g_return_val_if_fail (filename, NULL);
 
-	switch (prop_id) {
-	case PROP_FILENAME:
-		priv->filename = g_value_dup_string (value);
-		break;
-	case PROP_KEYFILE:
-		priv->keyfile = g_value_dup_boxed (value);
-		break;
-	default:
-		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-		break;
-	}
+	return NM_VPN_PLUGIN_INFO (g_initable_new (NM_TYPE_VPN_PLUGIN_INFO,
+	                                           NULL,
+	                                           error,
+	                                           NM_VPN_PLUGIN_INFO_FILENAME, filename,
+	                                           NULL));
 }
 
-static void
-get_property (GObject *object, guint prop_id,
-              GValue *value, GParamSpec *pspec)
+/**
+ * nm_vpn_plugin_info_new_with_data:
+ * @filename: optional filename.
+ * @keyfile: inject data for the plugin info instance.
+ * @error: construction may fail if the keyfile lacks mandatory fields.
+ *   In this case, return the error reason.
+ *
+ * This constructor does not read any data from file but
+ * takes instead a @keyfile argument.
+ *
+ * Returns: new plugin info instance.
+ *
+ * Since: 1.2
+ */
+NMVpnPluginInfo *
+nm_vpn_plugin_info_new_with_data (const char *filename,
+                                  GKeyFile *keyfile,
+                                  GError **error)
 {
-	NMVpnPluginInfoPrivate *priv = NM_VPN_PLUGIN_INFO_GET_PRIVATE (object);
+	g_return_val_if_fail (keyfile, NULL);
 
-	switch (prop_id) {
-	case PROP_NAME:
-		g_value_set_string (value, priv->name);
-		break;
-	case PROP_FILENAME:
-		g_value_set_string (value, priv->filename);
-		break;
-	default:
-		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-		break;
-	}
+	return NM_VPN_PLUGIN_INFO (g_initable_new (NM_TYPE_VPN_PLUGIN_INFO,
+	                                           NULL,
+	                                           error,
+	                                           NM_VPN_PLUGIN_INFO_FILENAME, filename,
+	                                           NM_VPN_PLUGIN_INFO_KEYFILE, keyfile,
+	                                           NULL));
 }
 
 static void
@@ -1298,14 +1296,11 @@ nm_vpn_plugin_info_class_init (NMVpnPluginInfoClass *plugin_class)
 
 	g_type_class_add_private (object_class, sizeof (NMVpnPluginInfoPrivate));
 
-	/* virtual methods */
 	object_class->set_property = set_property;
 	object_class->get_property = get_property;
 	object_class->dispose      = dispose;
 	object_class->finalize     = finalize;
 
-	/* properties */
-
 	/**
 	 * NMVpnPluginInfo:name:
 	 *
@@ -1341,7 +1336,7 @@ nm_vpn_plugin_info_class_init (NMVpnPluginInfoClass *plugin_class)
 	/**
 	 * NMVpnPluginInfo:keyfile:
 	 *
-	 * Initalize the instance with a different keyfile instance.
+	 * Initialize the instance with a different keyfile instance.
 	 * When passing a keyfile instance, the constructor will not
 	 * try to read from filename.
 	 *
@@ -1361,4 +1356,3 @@ nm_vpn_plugin_info_initable_iface_init (GInitableIface *iface)
 {
 	iface->init = init_sync;
 }
-
diff --git a/libnm-core/tests/meson.build b/libnm-core/tests/meson.build
index 627e6b53..7d772c80 100644
--- a/libnm-core/tests/meson.build
+++ b/libnm-core/tests/meson.build
@@ -14,7 +14,7 @@ enum = gnome.mkenums(
   sources: 'test-general-enums.h',
   identifier_prefix: nm_id_prefix,
   c_template: enum_types + '.c.template',
-  h_template: enum_types + '.h.template'
+  h_template: enum_types + '.h.template',
 )
 
 test_units = [
@@ -24,7 +24,7 @@ test_units = [
   'test-keyfile',
   'test-secrets',
   'test-setting',
-  'test-settings-defaults'
+  'test-settings-defaults',
 ]
 
 test_cert_dir = join_paths(meson.current_source_dir(), 'certs')
@@ -33,16 +33,20 @@ foreach test_unit: test_units
   exe = executable(
     'libnm-core-' + test_unit,
     [test_unit + '.c'] + enum,
-    dependencies: nm_core_dep,
+    dependencies: [
+      nm_core_dep,
+      libnm_systemd_shared_no_logging_dep,
+    ],
     c_args: [
         '-DNETWORKMANAGER_COMPILATION_TEST',
         '-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIBNM_CORE',
       ],
-    link_with: libnm_core
+    link_with: libnm_core,
   )
   test(
     'libnm-core/' + test_unit,
     test_script,
-    args: test_args + [exe.full_path()]
+    args: test_args + [exe.full_path()],
+    timeout: default_test_timeout,
   )
 endforeach
diff --git a/libnm-core/tests/test-crypto.c b/libnm-core/tests/test-crypto.c
index 6b63e6fd..4ac9679b 100644
--- a/libnm-core/tests/test-crypto.c
+++ b/libnm-core/tests/test-crypto.c
@@ -26,7 +26,6 @@
 #include 
 #include 
 #include 
-#include 
 
 #include "nm-crypto-impl.h"
 #include "nm-utils.h"
diff --git a/libnm-core/tests/test-general.c b/libnm-core/tests/test-general.c
index 67b80098..7d97296a 100644
--- a/libnm-core/tests/test-general.c
+++ b/libnm-core/tests/test-general.c
@@ -23,8 +23,6 @@
 
 #include "nm-default.h"
 
-#include 
-
 #include "nm-utils/c-list-util.h"
 #include "nm-utils/nm-enum-utils.h"
 
@@ -755,10 +753,12 @@ vpn_check_empty_func (const char *key, const char *value, gpointer user_data)
 static void
 test_setting_vpn_items (void)
 {
-	gs_unref_object NMSettingVpn *s_vpn = NULL;
+	gs_unref_object NMConnection *connection = NULL;
+	NMSettingVpn *s_vpn;
 
-	s_vpn = (NMSettingVpn *) nm_setting_vpn_new ();
-	g_assert (s_vpn);
+	connection = nmtst_create_minimal_connection ("vpn-items", NULL, NM_SETTING_VPN_SETTING_NAME, NULL);
+
+	s_vpn = nm_connection_get_setting_vpn (connection);
 
 	nm_setting_vpn_add_data_item (s_vpn, "foobar1", "blahblah1");
 	nm_setting_vpn_add_data_item (s_vpn, "foobar2", "blahblah2");
@@ -772,7 +772,14 @@ test_setting_vpn_items (void)
 	nm_setting_vpn_remove_data_item (s_vpn, "foobar3");
 	nm_setting_vpn_remove_data_item (s_vpn, "foobar4");
 
+	g_assert (!_nm_connection_aggregate (connection, NM_CONNECTION_AGGREGATE_ANY_SECRETS, NULL));
+	g_assert (!_nm_connection_aggregate (connection, NM_CONNECTION_AGGREGATE_ANY_SYSTEM_SECRET_FLAGS, NULL));
+
 	nm_setting_vpn_add_secret (s_vpn, "foobar1", "blahblah1");
+
+	g_assert (_nm_connection_aggregate (connection, NM_CONNECTION_AGGREGATE_ANY_SECRETS, NULL));
+	g_assert (_nm_connection_aggregate (connection, NM_CONNECTION_AGGREGATE_ANY_SYSTEM_SECRET_FLAGS, NULL));
+
 	nm_setting_vpn_add_secret (s_vpn, "foobar2", "blahblah2");
 	nm_setting_vpn_add_secret (s_vpn, "foobar3", "blahblah3");
 	nm_setting_vpn_add_secret (s_vpn, "foobar4", "blahblah4");
@@ -782,8 +789,25 @@ test_setting_vpn_items (void)
 	nm_setting_vpn_remove_secret (s_vpn, "foobar1");
 	nm_setting_vpn_remove_secret (s_vpn, "foobar2");
 	nm_setting_vpn_remove_secret (s_vpn, "foobar3");
+
+	g_assert (_nm_connection_aggregate (connection, NM_CONNECTION_AGGREGATE_ANY_SECRETS, NULL));
+	g_assert (_nm_connection_aggregate (connection, NM_CONNECTION_AGGREGATE_ANY_SYSTEM_SECRET_FLAGS, NULL));
+
+	nm_setting_vpn_add_data_item (s_vpn, "foobar4-flags", "blahblah4");
+
+	g_assert (_nm_connection_aggregate (connection, NM_CONNECTION_AGGREGATE_ANY_SYSTEM_SECRET_FLAGS, NULL));
+
+	nm_setting_vpn_add_data_item (s_vpn, "foobar4-flags", "2");
+
+	g_assert (!_nm_connection_aggregate (connection, NM_CONNECTION_AGGREGATE_ANY_SYSTEM_SECRET_FLAGS, NULL));
+
 	nm_setting_vpn_remove_secret (s_vpn, "foobar4");
 
+	g_assert (!_nm_connection_aggregate (connection, NM_CONNECTION_AGGREGATE_ANY_SECRETS, NULL));
+	g_assert (!_nm_connection_aggregate (connection, NM_CONNECTION_AGGREGATE_ANY_SYSTEM_SECRET_FLAGS, NULL));
+
+	nm_setting_vpn_remove_data_item (s_vpn, "foobar4-flags");
+
 	/* Try to add some blank values and make sure they are rejected */
 	NMTST_EXPECT_LIBNM_CRITICAL (NMTST_G_RETURN_MSG (key != NULL));
 	nm_setting_vpn_add_data_item (s_vpn, NULL, NULL);
@@ -1351,8 +1375,6 @@ test_setting_gsm_apn_bad_chars (void)
 	s_gsm = (NMSettingGsm *) nm_setting_gsm_new ();
 	g_assert (s_gsm);
 
-	g_object_set (s_gsm, NM_SETTING_GSM_NUMBER, "*99#", NULL);
-
 	/* Make sure a valid APN works */
 	g_object_set (s_gsm, NM_SETTING_GSM_APN, "foobar123.-baz", NULL);
 	g_assert (nm_setting_verify (NM_SETTING (s_gsm), NULL, NULL));
@@ -1382,8 +1404,6 @@ test_setting_gsm_apn_underscore (void)
 	s_gsm = (NMSettingGsm *) nm_setting_gsm_new ();
 	g_assert (s_gsm);
 
-	g_object_set (s_gsm, NM_SETTING_GSM_NUMBER, "*99#", NULL);
-
 	/* 65-character long */
 	g_object_set (s_gsm, NM_SETTING_GSM_APN, "foobar_baz", NULL);
 	nmtst_assert_setting_verifies (NM_SETTING (s_gsm));
@@ -1636,6 +1656,25 @@ test_connection_to_dbus_setting_name (void)
 	s_wsec = make_test_wsec_setting ("connection-to-dbus-setting-name");
 	nm_connection_add_setting (connection, NM_SETTING (s_wsec));
 
+	g_assert (_nm_connection_aggregate (connection, NM_CONNECTION_AGGREGATE_ANY_SECRETS, NULL));
+	g_assert (_nm_connection_aggregate (connection, NM_CONNECTION_AGGREGATE_ANY_SYSTEM_SECRET_FLAGS, NULL));
+
+	g_object_set (s_wsec,
+	              NM_SETTING_WIRELESS_SECURITY_WEP_KEY_FLAGS, NM_SETTING_SECRET_FLAG_NOT_SAVED,
+	              NM_SETTING_WIRELESS_SECURITY_LEAP_PASSWORD_FLAGS, NM_SETTING_SECRET_FLAG_NOT_SAVED,
+	              NULL);
+
+	g_assert (_nm_connection_aggregate (connection, NM_CONNECTION_AGGREGATE_ANY_SECRETS, NULL));
+	g_assert (!_nm_connection_aggregate (connection, NM_CONNECTION_AGGREGATE_ANY_SYSTEM_SECRET_FLAGS, NULL));
+
+	g_object_set (s_wsec,
+	              NM_SETTING_WIRELESS_SECURITY_WEP_KEY_FLAGS, NM_SETTING_SECRET_FLAG_NONE,
+	              NM_SETTING_WIRELESS_SECURITY_LEAP_PASSWORD_FLAGS, NM_SETTING_SECRET_FLAG_NONE,
+	              NULL);
+
+	g_assert (_nm_connection_aggregate (connection, NM_CONNECTION_AGGREGATE_ANY_SECRETS, NULL));
+	g_assert (_nm_connection_aggregate (connection, NM_CONNECTION_AGGREGATE_ANY_SYSTEM_SECRET_FLAGS, NULL));
+
 	dict = nm_connection_to_dbus (connection, NM_CONNECTION_SERIALIZE_ALL);
 
 	/* Make sure the keys of the first level dict are setting names, not
@@ -2946,7 +2985,6 @@ test_connection_good_base_types (void)
 
 	setting = nm_setting_gsm_new ();
 	g_object_set (setting,
-	              NM_SETTING_GSM_NUMBER, "*99#",
 	              NM_SETTING_GSM_APN, "metered.billing.sucks",
 	              NULL);
 	nm_connection_add_setting (connection, setting);
@@ -3266,12 +3304,111 @@ test_data_compare_secrets_new (NMSettingSecretFlags secret_flags,
 	return data;
 }
 
+static void
+_test_compare_secrets_check_diff (NMSetting *a,
+                                  NMSetting *b,
+                                  NMSettingCompareFlags flags,
+                                  gboolean exp_same_psk,
+                                  gboolean exp_same_psk_flags)
+{
+	gs_unref_hashtable GHashTable *h = NULL;
+	NMSettingDiffResult _RESULT_IN_A = NM_SETTING_DIFF_RESULT_IN_A;
+	NMSettingDiffResult _RESULT_IN_B = NM_SETTING_DIFF_RESULT_IN_B;
+	gboolean invert_results;
+	gboolean diff_result;
+	NMSettingSecretFlags a_psk_flags = nm_setting_wireless_security_get_psk_flags (NM_SETTING_WIRELESS_SECURITY (a));
+	NMSettingSecretFlags b_psk_flags = nm_setting_wireless_security_get_psk_flags (NM_SETTING_WIRELESS_SECURITY (b));
+	const char *a_psk = nm_setting_wireless_security_get_psk (NM_SETTING_WIRELESS_SECURITY (a));
+	const char *b_psk = nm_setting_wireless_security_get_psk (NM_SETTING_WIRELESS_SECURITY (b));
+
+	g_assert (NM_IS_SETTING_WIRELESS_SECURITY (a));
+	g_assert (NM_IS_SETTING_WIRELESS_SECURITY (b));
+
+	invert_results = nmtst_get_rand_bool ();
+	if (invert_results) {
+		_RESULT_IN_A = NM_SETTING_DIFF_RESULT_IN_B;
+		_RESULT_IN_B = NM_SETTING_DIFF_RESULT_IN_A;
+	}
+
+	diff_result = nm_setting_diff (a, b, flags, invert_results, &h);
+
+	g_assert (exp_same_psk_flags == (a_psk_flags == b_psk_flags));
+
+	if (nm_streq0 (a_psk, b_psk))
+		g_assert (exp_same_psk);
+	else {
+		if (flags == NM_SETTING_COMPARE_FLAG_EXACT)
+			g_assert (!exp_same_psk);
+		else if (flags == NM_SETTING_COMPARE_FLAG_IGNORE_AGENT_OWNED_SECRETS) {
+			if (   !NM_FLAGS_HAS (a_psk_flags, NM_SETTING_SECRET_FLAG_AGENT_OWNED)
+			    && !NM_FLAGS_HAS (b_psk_flags, NM_SETTING_SECRET_FLAG_AGENT_OWNED))
+				g_assert (!exp_same_psk);
+			else if (   !NM_FLAGS_HAS (a_psk_flags, NM_SETTING_SECRET_FLAG_AGENT_OWNED)
+			         && NM_FLAGS_HAS (b_psk_flags, NM_SETTING_SECRET_FLAG_AGENT_OWNED))
+				g_assert (!exp_same_psk);
+			else
+				g_assert (exp_same_psk);
+		} else if (flags == NM_SETTING_COMPARE_FLAG_IGNORE_NOT_SAVED_SECRETS) {
+			if (   !NM_FLAGS_HAS (a_psk_flags, NM_SETTING_SECRET_FLAG_NOT_SAVED)
+			    && !NM_FLAGS_HAS (b_psk_flags, NM_SETTING_SECRET_FLAG_NOT_SAVED))
+				g_assert (!exp_same_psk);
+			else if (   !NM_FLAGS_HAS (a_psk_flags, NM_SETTING_SECRET_FLAG_NOT_SAVED)
+			         && NM_FLAGS_HAS (b_psk_flags, NM_SETTING_SECRET_FLAG_NOT_SAVED))
+				g_assert (!exp_same_psk);
+			else
+				g_assert (exp_same_psk);
+		} else if (flags == NM_SETTING_COMPARE_FLAG_IGNORE_SECRETS)
+			g_assert (exp_same_psk);
+		else
+			g_assert_not_reached ();
+	}
+
+	g_assert (diff_result == (exp_same_psk && exp_same_psk_flags));
+	g_assert (diff_result == (!h));
+
+	if (!diff_result) {
+		if (flags == NM_SETTING_COMPARE_FLAG_EXACT)
+			g_assert (!exp_same_psk);
+		else if (   NM_IN_SET (flags, NM_SETTING_COMPARE_FLAG_IGNORE_AGENT_OWNED_SECRETS,
+		                              NM_SETTING_COMPARE_FLAG_IGNORE_NOT_SAVED_SECRETS)
+		         && (a_psk_flags != b_psk_flags)
+		         && nm_setting_wireless_security_get_psk_flags (NM_SETTING_WIRELESS_SECURITY (a)) == NM_SETTING_SECRET_FLAG_NONE)
+			g_assert (!exp_same_psk);
+		else
+			g_assert (exp_same_psk);
+
+		g_assert ((!exp_same_psk) == g_hash_table_contains (h, NM_SETTING_WIRELESS_SECURITY_PSK));
+		if (!exp_same_psk) {
+			if (nm_setting_wireless_security_get_psk (NM_SETTING_WIRELESS_SECURITY (a)))
+				g_assert_cmpint (GPOINTER_TO_UINT (g_hash_table_lookup (h, NM_SETTING_WIRELESS_SECURITY_PSK)), ==, _RESULT_IN_A);
+			else
+				g_assert_cmpint (GPOINTER_TO_UINT (g_hash_table_lookup (h, NM_SETTING_WIRELESS_SECURITY_PSK)), ==, _RESULT_IN_B);
+		}
+
+		g_assert ((!exp_same_psk_flags) == g_hash_table_contains (h, NM_SETTING_WIRELESS_SECURITY_PSK_FLAGS));
+		if (!exp_same_psk_flags) {
+			if (nm_setting_wireless_security_get_psk_flags (NM_SETTING_WIRELESS_SECURITY (a)) != NM_SETTING_SECRET_FLAG_NONE)
+				g_assert_cmpint (GPOINTER_TO_UINT (g_hash_table_lookup (h, NM_SETTING_WIRELESS_SECURITY_PSK_FLAGS)), ==, _RESULT_IN_A);
+			else
+				g_assert_cmpint (GPOINTER_TO_UINT (g_hash_table_lookup (h, NM_SETTING_WIRELESS_SECURITY_PSK_FLAGS)), ==, _RESULT_IN_B);
+		}
+
+		g_assert_cmpint (g_hash_table_size (h), ==, (!exp_same_psk) + (!exp_same_psk_flags));
+	}
+
+	g_assert (diff_result == nm_setting_compare (a, b, flags));
+	g_assert (diff_result == nm_setting_compare (b, a, flags));
+
+}
+
 static void
 test_setting_compare_secrets (gconstpointer test_data)
 {
 	const TestDataCompareSecrets *data = test_data;
-	gs_unref_object NMSetting *old = NULL, *new = NULL;
-	gboolean success;
+	gs_unref_object NMConnection *conn_old = NULL;
+	gs_unref_object NMConnection *conn_new = NULL;
+	gs_unref_object NMSetting *old = NULL;
+	gs_unref_object NMSetting *new = NULL;
 
 	/* Make sure that a connection with transient/unsaved secrets compares
 	 * successfully to the same connection without those secrets.
@@ -3284,17 +3421,45 @@ test_setting_compare_secrets (gconstpointer test_data)
 	              NULL);
 	nm_setting_set_secret_flags (old, NM_SETTING_WIRELESS_SECURITY_PSK, data->secret_flags, NULL);
 
-	/* Clear the PSK from the duplicated setting */
 	new = nm_setting_duplicate (old);
-	if (data->remove_secret) {
+	if (data->remove_secret)
 		g_object_set (new, NM_SETTING_WIRELESS_SECURITY_PSK, NULL, NULL);
 
-		success = nm_setting_compare (old, new, NM_SETTING_COMPARE_FLAG_EXACT);
-		g_assert (success == FALSE);
+	g_assert ((!data->remove_secret) == nm_setting_compare (old, new, NM_SETTING_COMPARE_FLAG_EXACT));
+	g_assert ((!data->remove_secret) == nm_setting_compare (new, old, NM_SETTING_COMPARE_FLAG_EXACT));
+
+	_test_compare_secrets_check_diff (old, new, NM_SETTING_COMPARE_FLAG_EXACT, !data->remove_secret, TRUE);
+	_test_compare_secrets_check_diff (new, old, NM_SETTING_COMPARE_FLAG_EXACT, !data->remove_secret, TRUE);
+
+	g_assert (nm_setting_compare (old, new, data->comp_flags));
+	g_assert (nm_setting_compare (new, old, data->comp_flags));
+
+	_test_compare_secrets_check_diff (old, new, data->comp_flags, TRUE, TRUE);
+	_test_compare_secrets_check_diff (new, old, data->comp_flags, TRUE, TRUE);
+
+	/* OK. Try again, but this time not only change the secret, also let the secret flags differ... */
+	if (data->secret_flags != NM_SETTING_SECRET_FLAG_NONE) {
+		nm_setting_set_secret_flags (new, NM_SETTING_WIRELESS_SECURITY_PSK, NM_SETTING_SECRET_FLAG_NONE, NULL);
+
+		_test_compare_secrets_check_diff (old, new, NM_SETTING_COMPARE_FLAG_EXACT, FALSE, FALSE);
+		_test_compare_secrets_check_diff (new, old, NM_SETTING_COMPARE_FLAG_EXACT, FALSE, FALSE);
+
+		_test_compare_secrets_check_diff (old, new, data->comp_flags, TRUE, FALSE);
+		_test_compare_secrets_check_diff (new, old, data->comp_flags, FALSE, FALSE);
+
+		nm_setting_set_secret_flags (new, NM_SETTING_WIRELESS_SECURITY_PSK, data->secret_flags, NULL);
 	}
 
-	success = nm_setting_compare (old, new, data->comp_flags);
-	g_assert (success);
+	conn_old = nmtst_create_minimal_connection ("test-compare-secrets", NULL, NM_SETTING_WIRELESS_SETTING_NAME, NULL);
+	nm_connection_add_setting (conn_old, nm_setting_duplicate (old));
+	conn_new = nm_simple_connection_new_clone (conn_old);
+	nm_connection_add_setting (conn_new, nm_setting_duplicate (new));
+
+	g_assert ((!data->remove_secret) == nm_connection_compare (conn_old, conn_new, NM_SETTING_COMPARE_FLAG_EXACT));
+	g_assert ((!data->remove_secret) == nm_connection_compare (conn_new, conn_old, NM_SETTING_COMPARE_FLAG_EXACT));
+
+	g_assert (nm_connection_compare (conn_old, conn_new, data->comp_flags));
+	g_assert (nm_connection_compare (conn_new, conn_old, data->comp_flags));
 }
 
 static void
@@ -3473,6 +3638,41 @@ test_connection_changed_cb (NMConnection *connection, gboolean *data)
 	*data = TRUE;
 }
 
+static guint32
+_netmask_to_prefix (guint32 netmask)
+{
+	guint32 prefix;
+	guint8 v;
+	const guint8 *p = (guint8 *) &netmask;
+
+	if (p[3]) {
+		prefix = 24;
+		v = p[3];
+	} else if (p[2]) {
+		prefix = 16;
+		v = p[2];
+	} else if (p[1]) {
+		prefix = 8;
+		v = p[1];
+	} else {
+		prefix = 0;
+		v = p[0];
+	}
+
+	while (v) {
+		prefix++;
+		v <<= 1;
+	}
+
+	g_assert_cmpint (prefix, <=, 32);
+
+	/* we re-implemented the netmask-to-prefix code differently. Check
+	 * that they agree. */
+	g_assert_cmpint (prefix, ==, nm_utils_ip4_netmask_to_prefix (netmask));
+
+	return prefix;
+}
+
 static void
 test_ip4_prefix_to_netmask (void)
 {
@@ -3480,7 +3680,7 @@ test_ip4_prefix_to_netmask (void)
 
 	for (i = 0; i<=32; i++) {
 		guint32 netmask = _nm_utils_ip4_prefix_to_netmask (i);
-		int plen = nm_utils_ip4_netmask_to_prefix (netmask);
+		int plen = _netmask_to_prefix (netmask);
 
 		g_assert_cmpint (i, ==, plen);
 		{
@@ -3510,7 +3710,7 @@ test_ip4_netmask_to_prefix (void)
 		guint32 netmask = _nm_utils_ip4_prefix_to_netmask (i);
 		guint32 netmask_lowest_bit = netmask & ~_nm_utils_ip4_prefix_to_netmask (i-1);
 
-		g_assert_cmpint (i, ==, nm_utils_ip4_netmask_to_prefix (netmask));
+		g_assert_cmpint (i, ==, _netmask_to_prefix (netmask));
 
 		for (j = 0; j < 2*i; j++) {
 			guint32 r = g_rand_int (rand);
@@ -3524,7 +3724,7 @@ test_ip4_netmask_to_prefix (void)
 
 			/* create an invalid netmask with holes and check that the function
 			 * returns the longest prefix. */
-			prefix_holey = nm_utils_ip4_netmask_to_prefix (netmask_holey);
+			prefix_holey = _netmask_to_prefix (netmask_holey);
 
 			g_assert_cmpint (i, ==, prefix_holey);
 		}
@@ -5054,7 +5254,7 @@ test_setting_ip4_gateway (void)
 	GVariantBuilder addrs_builder;
 	GError *error = NULL;
 
-	g_assert_cmpstr (nm_utils_inet4_ntop (addr_vals_0[0], NULL), ==, "192.168.1.10");
+	nmtst_assert_ip4_address (addr_vals_0[0], "192.168.1.10");
 
 	/* When serializing on the daemon side, ipv4.gateway is copied to the first
 	 * entry of ipv4.addresses
@@ -5096,7 +5296,7 @@ test_setting_ip4_gateway (void)
 
 		addr_array = g_variant_get_fixed_array (addr_var, &length, sizeof (guint32));
 		g_assert_cmpint (length, ==, 3);
-		g_assert_cmpstr (nm_utils_inet4_ntop (addr_array[2], NULL), ==, "192.168.1.1");
+		nmtst_assert_ip4_address (addr_array[2], "192.168.1.1");
 		g_variant_unref (addr_var);
 	}
 	g_variant_unref (value);
@@ -5203,7 +5403,7 @@ test_setting_ip6_gateway (void)
 
 		gateway_bytes = g_variant_get_fixed_array (gateway_var, &length, 1);
 		g_assert_cmpint (length, ==, 16);
-		g_assert_cmpstr (nm_utils_inet6_ntop ((struct in6_addr *) gateway_bytes, NULL), ==, "abcd::1");
+		nmtst_assert_ip6_address ((struct in6_addr *) gateway_bytes, "abcd::1");
 		g_variant_unref (gateway_var);
 	}
 	g_variant_unref (value);
@@ -5322,6 +5522,158 @@ test_setting_user_data (void)
 
 /*****************************************************************************/
 
+typedef union {
+	struct sockaddr     sa;
+	struct sockaddr_in  in;
+	struct sockaddr_in6 in6;
+} SockAddrUnion;
+
+static void
+_sock_addr_endpoint (const char *endpoint,
+                     const char *host,
+                     gint32 port)
+{
+	nm_auto_unref_sockaddrendpoint NMSockAddrEndpoint *ep = NULL;
+	const char *s_endpoint;
+	const char *s_host;
+	gint32 s_port;
+	SockAddrUnion sockaddr = { };
+
+	g_assert (endpoint);
+	g_assert (!host == (port == -1));
+	g_assert (port >= -1 && port <= G_MAXUINT16);
+
+	ep = nm_sock_addr_endpoint_new (endpoint);
+	g_assert (ep);
+
+	s_endpoint = nm_sock_addr_endpoint_get_endpoint (ep);
+	s_host = nm_sock_addr_endpoint_get_host (ep);
+	s_port = nm_sock_addr_endpoint_get_port (ep);
+	g_assert_cmpstr (endpoint, ==, s_endpoint);
+	g_assert_cmpstr (host,     ==, s_host);
+	g_assert_cmpint (port,     ==, s_port);
+
+	g_assert (!nm_sock_addr_endpoint_get_fixed_sockaddr (ep, &sockaddr));
+
+	if (endpoint[0] != ' ') {
+		gs_free char *endpoint2 = NULL;
+
+		/* also test with a leading space */
+		endpoint2 = g_strdup_printf (" %s", endpoint);
+		_sock_addr_endpoint (endpoint2, host, port);
+	}
+
+	if (endpoint[0] && endpoint[strlen (endpoint) - 1] != ' ') {
+		gs_free char *endpoint2 = NULL;
+
+		/* also test with a trailing space */
+		endpoint2 = g_strdup_printf ("%s ", endpoint);
+		_sock_addr_endpoint (endpoint2, host, port);
+	}
+}
+
+static void
+_sock_addr_endpoint_fixed (const char *endpoint,
+                           const char *host,
+                           guint16 port,
+                           guint scope_id)
+{
+	nm_auto_unref_sockaddrendpoint NMSockAddrEndpoint *ep = NULL;
+	const char *s_endpoint;
+	const char *s_host;
+	gint32 s_port;
+	int addr_family;
+	NMIPAddr addrbin;
+	SockAddrUnion sockaddr = { };
+
+	g_assert (endpoint);
+	g_assert (host);
+	g_assert (port > 0);
+
+	if (!nm_utils_parse_inaddr_bin (AF_UNSPEC, host, &addr_family, &addrbin))
+		g_assert_not_reached ();
+
+	ep = nm_sock_addr_endpoint_new (endpoint);
+	g_assert (ep);
+
+	s_endpoint = nm_sock_addr_endpoint_get_endpoint (ep);
+	s_host = nm_sock_addr_endpoint_get_host (ep);
+	s_port = nm_sock_addr_endpoint_get_port (ep);
+	g_assert_cmpstr (endpoint, ==, s_endpoint);
+	g_assert_cmpstr (NULL,     !=, s_host);
+	g_assert_cmpint (port,     ==, s_port);
+
+	if (!nm_sock_addr_endpoint_get_fixed_sockaddr (ep, &sockaddr))
+		g_assert_not_reached ();
+
+	g_assert_cmpint (sockaddr.sa.sa_family, ==, addr_family);
+	if (addr_family == AF_INET) {
+		const SockAddrUnion s = {
+			.in = {
+				.sin_family = AF_INET,
+				.sin_addr   = addrbin.addr4_struct,
+				.sin_port   = htons (port),
+			},
+		};
+
+		g_assert_cmpint (sockaddr.in.sin_addr.s_addr, ==, addrbin.addr4);
+		g_assert_cmpint (sockaddr.in.sin_port, ==, htons (port));
+		g_assert (memcmp (&s, &sockaddr, sizeof (s.in)) == 0);
+	} else if (addr_family == AF_INET6) {
+		const SockAddrUnion s = {
+			.in6 = {
+				.sin6_family   = AF_INET6,
+				.sin6_addr     = addrbin.addr6,
+				.sin6_scope_id = scope_id,
+				.sin6_port     = htons (port),
+			},
+		};
+
+		g_assert (memcmp (&sockaddr.in6.sin6_addr, &addrbin, sizeof (addrbin.addr6)) == 0);
+		g_assert_cmpint (sockaddr.in6.sin6_port, ==, htons (port));
+		g_assert_cmpint (sockaddr.in6.sin6_scope_id, ==, scope_id);
+		g_assert_cmpint (sockaddr.in6.sin6_flowinfo, ==, 0);
+		g_assert (memcmp (&s, &sockaddr, sizeof (s.in6)) == 0);
+	} else
+		g_assert_not_reached ();
+}
+
+static void
+test_sock_addr_endpoint (void)
+{
+	_sock_addr_endpoint ("",                NULL, -1);
+	_sock_addr_endpoint (":",               NULL, -1);
+	_sock_addr_endpoint ("a",               NULL, -1);
+	_sock_addr_endpoint ("a:",              NULL, -1);
+	_sock_addr_endpoint (":a",              NULL, -1);
+	_sock_addr_endpoint ("[]:a",            NULL, -1);
+	_sock_addr_endpoint ("[]a",             NULL, -1);
+	_sock_addr_endpoint ("[]:",             NULL, -1);
+	_sock_addr_endpoint ("[a]b",            NULL, -1);
+	_sock_addr_endpoint ("[a:b",            NULL, -1);
+	_sock_addr_endpoint ("[a[:b",           NULL, -1);
+	_sock_addr_endpoint ("a:6",             "a",  6);
+	_sock_addr_endpoint ("a:6",             "a",  6);
+	_sock_addr_endpoint ("[a]:6",           "a",  6);
+	_sock_addr_endpoint ("[a]:6",           "a",  6);
+	_sock_addr_endpoint ("[a]:655",         "a",  655);
+	_sock_addr_endpoint ("[ab]:][6",        NULL, -1);
+	_sock_addr_endpoint ("[ab]:]:[6",       NULL, -1);
+	_sock_addr_endpoint ("[a[]:b",          NULL, -1);
+	_sock_addr_endpoint ("[192.169.6.x]:6", "192.169.6.x", 6);
+	_sock_addr_endpoint ("[192.169.6.x]:0", NULL, -1);
+	_sock_addr_endpoint ("192.169.6.7:0",   NULL, -1);
+
+	_sock_addr_endpoint_fixed ("192.169.6.7:6",   "192.169.6.7", 6, 0);
+	_sock_addr_endpoint_fixed ("[192.169.6.7]:6", "192.169.6.7", 6, 0);
+	_sock_addr_endpoint_fixed ("[a:b::]:6", "a:b::", 6, 0);
+	_sock_addr_endpoint_fixed ("[a:b::%7]:6", "a:b::", 6, 7);
+	_sock_addr_endpoint_fixed ("a:b::1%75:6", "a:b::1", 6, 75);
+	_sock_addr_endpoint_fixed ("a:b::1%0:64", "a:b::1", 64, 0);
+}
+
+/*****************************************************************************/
+
 static void
 test_hexstr2bin (void)
 {
@@ -5687,7 +6039,7 @@ __test_uuid (const char *expected_uuid, const char *str, gssize slen, char *uuid
 static void
 test_nm_utils_uuid_generate_from_strings (void)
 {
-	const NMUuid uuid0 = { 0 };
+	const NMUuid uuid0 = { };
 
 	g_assert_cmpmem (&uuid0, sizeof (uuid0), _uuid ("00000000-0000-0000-0000-000000000000"), 16);
 
@@ -7535,6 +7887,8 @@ int main (int argc, char **argv)
 	g_test_add_func ("/core/general/test_setting_compare_default_strv", test_setting_compare_default_strv);
 	g_test_add_func ("/core/general/test_setting_user_data", test_setting_user_data);
 
+	g_test_add_func ("/core/general/test_sock_addr_endpoint", test_sock_addr_endpoint);
+
 	g_test_add_func ("/core/general/hexstr2bin", test_hexstr2bin);
 	g_test_add_func ("/core/general/nm_strquote", test_nm_strquote);
 	g_test_add_func ("/core/general/test_nm_utils_uuid_generate_from_string", test_nm_utils_uuid_generate_from_string);
@@ -7564,4 +7918,3 @@ int main (int argc, char **argv)
 
 	return g_test_run ();
 }
-
diff --git a/libnm-core/tests/test-keyfile.c b/libnm-core/tests/test-keyfile.c
index 78e01ce9..9b9d1c04 100644
--- a/libnm-core/tests/test-keyfile.c
+++ b/libnm-core/tests/test-keyfile.c
@@ -249,7 +249,7 @@ _keyfile_convert (NMConnection **con,
 		k0_c1_k2 = _nm_keyfile_write (k0_c1, write_handler, write_data);
 		k0_c1_k2_c3 = _nm_keyfile_read (k0_c1_k2, keyfile_name, read_handler, read_data, FALSE);
 
-		/* It is a expeced behavior, that if @k0 contains a relative path ca-cert, @k0_c1 will
+		/* It is a expected behavior, that if @k0 contains a relative path ca-cert, @k0_c1 will
 		 * contain that path as relative. But @k0_c1_k2 and @k0_c1_k2_c3 will have absolute paths.
 		 * In this case, hack up @k0_c1_k2_c3 to contain the same relative path. */
 		s1 = nm_connection_get_setting_802_1x (k0_c1);
@@ -417,7 +417,7 @@ test_8021x_cert (void)
 	g_assert_no_error (error);
 	g_assert (success);
 
-	/* test reseting ca-cert to different values and see whether we can write/read. */
+	/* test resetting ca-cert to different values and see whether we can write/read. */
 
 	nm_connection_add_setting (con, NM_SETTING (s_8021x));
 	nmtst_assert_connection_verifies_and_normalizable (con);
diff --git a/libnm-core/tests/test-secrets.c b/libnm-core/tests/test-secrets.c
index d31c43d2..5debe5cf 100644
--- a/libnm-core/tests/test-secrets.c
+++ b/libnm-core/tests/test-secrets.c
@@ -21,8 +21,6 @@
 
 #include "nm-default.h"
 
-#include 
-
 #include "nm-setting-8021x.h"
 #include "nm-setting-cdma.h"
 #include "nm-setting-connection.h"
diff --git a/libnm-core/tests/test-setting.c b/libnm-core/tests/test-setting.c
index 4e010feb..2011273a 100644
--- a/libnm-core/tests/test-setting.c
+++ b/libnm-core/tests/test-setting.c
@@ -20,7 +20,6 @@
 #include "nm-default.h"
 
 #include 
-#include 
 
 #include "nm-utils.h"
 #include "nm-utils-private.h"
@@ -45,6 +44,101 @@
 
 /*****************************************************************************/
 
+/* converts @dict to a connection. In this case, @dict must be good, without warnings, so that
+ * NM_SETTING_PARSE_FLAGS_STRICT and NM_SETTING_PARSE_FLAGS_BEST_EFFORT yield the exact same results. */
+static NMConnection *
+_connection_new_from_dbus_strict (GVariant *dict,
+                                  gboolean normalize)
+{
+	gs_unref_object NMConnection *con_x_0 = NULL;
+	gs_unref_object NMConnection *con_x_s = NULL;
+	gs_unref_object NMConnection *con_x_e = NULL;
+	gs_unref_object NMConnection *con_n_0 = NULL;
+	gs_unref_object NMConnection *con_n_s = NULL;
+	gs_unref_object NMConnection *con_n_e = NULL;
+	gs_free_error GError *error = NULL;
+	guint i;
+
+	g_assert (g_variant_is_of_type (dict, NM_VARIANT_TYPE_CONNECTION));
+
+	con_x_0 = _nm_simple_connection_new_from_dbus (dict, NM_SETTING_PARSE_FLAGS_NONE, &error);
+	nmtst_assert_success (NM_IS_CONNECTION (con_x_0), error);
+
+	con_x_s = _nm_simple_connection_new_from_dbus (dict, NM_SETTING_PARSE_FLAGS_STRICT, &error);
+	nmtst_assert_success (NM_IS_CONNECTION (con_x_s), error);
+
+	con_x_e = _nm_simple_connection_new_from_dbus (dict, NM_SETTING_PARSE_FLAGS_BEST_EFFORT, &error);
+	nmtst_assert_success (NM_IS_CONNECTION (con_x_e), error);
+
+	con_n_0 = _nm_simple_connection_new_from_dbus (dict, NM_SETTING_PARSE_FLAGS_NORMALIZE, &error);
+	nmtst_assert_success (NM_IS_CONNECTION (con_n_0), error);
+
+	con_n_s = _nm_simple_connection_new_from_dbus (dict, NM_SETTING_PARSE_FLAGS_STRICT | NM_SETTING_PARSE_FLAGS_NORMALIZE, &error);
+	nmtst_assert_success (NM_IS_CONNECTION (con_n_s), error);
+
+	con_n_e = _nm_simple_connection_new_from_dbus (dict, NM_SETTING_PARSE_FLAGS_BEST_EFFORT | NM_SETTING_PARSE_FLAGS_NORMALIZE, &error);
+	nmtst_assert_success (NM_IS_CONNECTION (con_n_e), error);
+
+	nmtst_assert_connection_verifies (con_x_0);
+	nmtst_assert_connection_verifies (con_x_e);
+	nmtst_assert_connection_verifies (con_x_s);
+
+	nmtst_assert_connection_verifies_without_normalization (con_n_0);
+	nmtst_assert_connection_verifies_without_normalization (con_n_e);
+	nmtst_assert_connection_verifies_without_normalization (con_n_s);
+
+	/* randomly compare some pairs that we created. They must all be equal,
+	 * after accounting for normalization. */
+	for (i = 0; i < 10; i++) {
+		NMConnection *cons[] = { con_x_0, con_x_s, con_x_e, con_n_0, con_n_s, con_n_e };
+		guint idx_a = (nmtst_get_rand_int () % G_N_ELEMENTS (cons));
+		guint idx_b = (nmtst_get_rand_int () % G_N_ELEMENTS (cons));
+		gboolean normalize_a, normalize_b;
+
+		if (idx_a <= 2 && idx_b <= 2) {
+			normalize_a = nmtst_get_rand_bool ();
+			normalize_b = normalize_a;
+		} else if (idx_a > 2 && idx_b > 2) {
+			normalize_a = nmtst_get_rand_bool ();
+			normalize_b = nmtst_get_rand_bool ();
+		} else {
+			normalize_a = (idx_a <= 2) ? TRUE : nmtst_get_rand_bool ();
+			normalize_b = (idx_b <= 2) ? TRUE : nmtst_get_rand_bool ();
+		}
+		nmtst_assert_connection_equals (cons[idx_a], normalize_a, cons[idx_b], normalize_b);
+	}
+
+	return (normalize)
+	       ? g_steal_pointer (&con_x_0)
+	       : g_steal_pointer (&con_n_0);
+}
+
+/*****************************************************************************/
+
+static char *
+_create_random_ipaddr (int addr_family, gboolean as_service)
+{
+	char delimiter = as_service ? ':' : '/';
+	int num;
+
+	if (addr_family == AF_UNSPEC)
+		addr_family = nmtst_rand_select (AF_INET, AF_INET6);
+
+	g_assert (NM_IN_SET (addr_family, AF_INET, AF_INET6));
+
+	if (as_service)
+		num = (nmtst_get_rand_int () % 1000) + 30000;
+	else
+		num = addr_family == AF_INET ? 32 : 128;
+
+	if (addr_family == AF_INET)
+		return g_strdup_printf ("192.168.%u.%u%c%d", nmtst_get_rand_int () % 256, nmtst_get_rand_int () % 256, delimiter, num);
+	else
+		return g_strdup_printf ("a:b:c::%02x:%02x%c%d", nmtst_get_rand_int () % 256, nmtst_get_rand_int () % 256, delimiter, num);
+}
+
+/*****************************************************************************/
+
 static void
 compare_blob_data (const char *test,
                    const char *key_path,
@@ -421,20 +515,17 @@ create_bond_connection (NMConnection **con, NMSettingBond **s_bond)
 }
 
 #define test_verify_options(exp, ...) \
-	G_STMT_START { \
-		const char *__opts[] = { __VA_ARGS__ , NULL }; \
-		\
-		_test_verify_options (__opts, exp); \
-	} G_STMT_END
+	_test_verify_options (NM_MAKE_STRV (__VA_ARGS__), exp)
 
 static void
-_test_verify_options (const char **options, gboolean expected_result)
+_test_verify_options (const char *const *options,
+                      gboolean expected_result)
 {
 	gs_unref_object NMConnection *con = NULL;
 	NMSettingBond *s_bond;
 	GError *error = NULL;
 	gboolean success;
-	const char **option;
+	const char *const *option;
 
 	create_bond_connection (&con, &s_bond);
 
@@ -1946,6 +2037,587 @@ test_tc_config_dbus (void)
 
 /*****************************************************************************/
 
+static GPtrArray *
+_rndt_wg_peers_create (void)
+{
+	GPtrArray *wg_peers;
+	guint i, n;
+
+	wg_peers = g_ptr_array_new_with_free_func ((GDestroyNotify) nm_wireguard_peer_unref);
+
+	n = nmtst_get_rand_int () % 10;
+	for (i = 0; i < n; i++) {
+		NMWireGuardPeer *peer;
+		guint8 public_key_buf[NM_WIREGUARD_PUBLIC_KEY_LEN];
+		guint8 preshared_key_buf[NM_WIREGUARD_SYMMETRIC_KEY_LEN];
+		gs_free char *public_key = NULL;
+		gs_free char *preshared_key = NULL;
+		gs_free char *s_endpoint = NULL;
+		guint i_aip, n_aip;
+
+		/* we don't bother to create a valid curve25519 public key. Of course, libnm cannot
+		 * check whether the public key is bogus or not. Hence, for our purpose a random
+		 * bogus key is good enough. */
+		public_key = g_base64_encode (nmtst_rand_buf (NULL, public_key_buf, sizeof (public_key_buf)), sizeof (public_key_buf));
+
+		preshared_key = g_base64_encode (nmtst_rand_buf (NULL, preshared_key_buf, sizeof (preshared_key_buf)), sizeof (preshared_key_buf));
+
+		s_endpoint = _create_random_ipaddr (AF_UNSPEC, TRUE);
+
+		peer = nm_wireguard_peer_new ();
+		if (!nm_wireguard_peer_set_public_key (peer, public_key, TRUE))
+			g_assert_not_reached ();
+
+		if (!nm_wireguard_peer_set_preshared_key (peer, nmtst_rand_select (NULL, preshared_key), TRUE))
+			g_assert_not_reached ();
+
+		nm_wireguard_peer_set_preshared_key_flags (peer, nmtst_rand_select (NM_SETTING_SECRET_FLAG_NONE,
+		                                                                    NM_SETTING_SECRET_FLAG_NOT_SAVED,
+		                                                                    NM_SETTING_SECRET_FLAG_AGENT_OWNED));
+
+		nm_wireguard_peer_set_persistent_keepalive (peer,
+		                                            nmtst_rand_select ((guint32) 0, nmtst_get_rand_int ()));
+
+		if (!nm_wireguard_peer_set_endpoint (peer, nmtst_rand_select (s_endpoint, NULL), TRUE))
+			g_assert_not_reached ();
+
+		n_aip = nmtst_rand_select (0, nmtst_get_rand_int () % 10);
+		for (i_aip = 0; i_aip < n_aip; i_aip++) {
+			gs_free char *aip = NULL;
+
+			aip = _create_random_ipaddr (AF_UNSPEC, FALSE);
+			if (!nm_wireguard_peer_append_allowed_ip (peer, aip, FALSE))
+				g_assert_not_reached ();
+		}
+
+		g_assert (nm_wireguard_peer_is_valid (peer, TRUE, TRUE, NULL));
+
+		nm_wireguard_peer_seal (peer);
+		g_ptr_array_add (wg_peers, peer);
+	}
+
+	return wg_peers;
+}
+
+static const char *
+_rndt_wg_peers_to_keyfile (GPtrArray *wg_peers,
+                           gboolean strict,
+                           char **out_str)
+{
+	nm_auto_free_gstring GString *gstr = NULL;
+	nm_auto_free_gstring GString *gstr_aip = NULL;
+	guint i, j;
+
+	g_assert (wg_peers);
+	g_assert (out_str && !*out_str);
+
+	nm_gstring_prepare (&gstr);
+	for (i = 0; i < wg_peers->len; i++) {
+		const NMWireGuardPeer *peer = wg_peers->pdata[i];
+		gs_free char *s_endpoint = NULL;
+		gs_free char *s_preshared_key = NULL;
+		gs_free char *s_preshared_key_flags = NULL;
+		gs_free char *s_persistent_keepalive = NULL;
+		gs_free char *s_allowed_ips = NULL;
+
+		if (nm_wireguard_peer_get_endpoint (peer))
+			s_endpoint = g_strdup_printf ("endpoint=%s\n", nm_wireguard_peer_get_endpoint (peer));
+		else if (!strict)
+			s_endpoint = g_strdup_printf ("endpoint=\n");
+
+		if (   nm_wireguard_peer_get_preshared_key (peer)
+		    || !strict) {
+			if (nm_wireguard_peer_get_preshared_key_flags (peer) == NM_SETTING_SECRET_FLAG_NONE)
+				s_preshared_key = g_strdup_printf ("preshared-key=%s\n", nm_wireguard_peer_get_preshared_key (peer) ?: "");
+		}
+
+		if (   nm_wireguard_peer_get_preshared_key_flags (peer) != NM_SETTING_SECRET_FLAG_NOT_REQUIRED
+		    || !strict)
+			s_preshared_key_flags = g_strdup_printf ("preshared-key-flags=%d\n", (int) nm_wireguard_peer_get_preshared_key_flags (peer));
+
+		if (   nm_wireguard_peer_get_persistent_keepalive (peer) != 0
+		    || !strict)
+			s_persistent_keepalive = g_strdup_printf ("persistent-keepalive=%u\n", nm_wireguard_peer_get_persistent_keepalive (peer));
+
+		if (   nm_wireguard_peer_get_allowed_ips_len (peer) > 0
+		    || !strict) {
+			nm_gstring_prepare (&gstr_aip);
+			for (j = 0; j < nm_wireguard_peer_get_allowed_ips_len (peer); j++)
+				g_string_append_printf (gstr_aip, "%s;", nm_wireguard_peer_get_allowed_ip (peer, j, NULL));
+			s_allowed_ips = g_strdup_printf ("allowed-ips=%s\n", gstr_aip->str);
+		}
+
+		if (   !s_endpoint
+		    && !s_preshared_key
+		    && !s_preshared_key_flags
+		    && !s_persistent_keepalive
+		    && !s_allowed_ips)
+			s_endpoint = g_strdup_printf ("endpoint=\n");
+
+		g_string_append_printf (gstr,
+		                        "\n"
+		                        "[wireguard-peer.%s]\n"
+		                        "%s" /* endpoint */
+		                        "%s" /* preshared-key */
+		                        "%s" /* preshared-key-flags */
+		                        "%s" /* persistent-keepalive */
+		                        "%s" /* allowed-ips */
+		                        "",
+		                        nm_wireguard_peer_get_public_key (peer),
+		                        s_endpoint ?: "",
+		                        s_preshared_key ?: "",
+		                        s_preshared_key_flags ?: "",
+		                        s_persistent_keepalive ?: "",
+		                        s_allowed_ips ?: "");
+	}
+
+	return (*out_str = g_string_free (g_steal_pointer (&gstr), FALSE));
+}
+
+static void
+_rndt_wg_peers_assert_equal (NMSettingWireGuard *s_wg,
+                             GPtrArray *peers,
+                             gboolean consider_persistent_secrets,
+                             gboolean consider_all_secrets,
+                             gboolean expect_no_secrets)
+{
+	guint i;
+
+	g_assert (NM_IS_SETTING_WIREGUARD (s_wg));
+	g_assert (peers);
+
+	g_assert_cmpint (peers->len, ==, nm_setting_wireguard_get_peers_len (s_wg));
+
+	for (i = 0; i < peers->len; i++) {
+		const NMWireGuardPeer *a = peers->pdata[i];
+		const NMWireGuardPeer *b = nm_setting_wireguard_get_peer (s_wg, i);
+		gboolean consider_secrets;
+
+		g_assert (a);
+		g_assert (b);
+
+		g_assert_cmpint (nm_wireguard_peer_cmp (a, b, NM_SETTING_COMPARE_FLAG_IGNORE_SECRETS), ==, 0);
+
+		if (   consider_all_secrets
+		    || !nm_wireguard_peer_get_preshared_key (a))
+			consider_secrets = TRUE;
+		else if (nm_wireguard_peer_get_preshared_key (b))
+			consider_secrets = TRUE;
+		else if (   consider_persistent_secrets
+		         && nm_wireguard_peer_get_preshared_key_flags (b) == NM_SETTING_SECRET_FLAG_NONE)
+			consider_secrets = TRUE;
+		else
+			consider_secrets = FALSE;
+
+		if (consider_secrets) {
+			g_assert_cmpstr (nm_wireguard_peer_get_preshared_key (a), ==, nm_wireguard_peer_get_preshared_key (b));
+			g_assert_cmpint (nm_wireguard_peer_cmp (a, b, NM_SETTING_COMPARE_FLAG_EXACT), ==, 0);
+		}
+
+		if (expect_no_secrets)
+			g_assert_cmpstr (nm_wireguard_peer_get_preshared_key (b), ==, NULL);
+	}
+}
+
+static void
+_rndt_wg_peers_fix_secrets (NMSettingWireGuard *s_wg,
+                            GPtrArray *peers)
+{
+	guint i;
+
+	g_assert (NM_IS_SETTING_WIREGUARD (s_wg));
+	g_assert (peers);
+
+	g_assert_cmpint (peers->len, ==, nm_setting_wireguard_get_peers_len (s_wg));
+
+	for (i = 0; i < peers->len; i++) {
+		const NMWireGuardPeer *a = peers->pdata[i];
+		const NMWireGuardPeer *b = nm_setting_wireguard_get_peer (s_wg, i);
+		nm_auto_unref_wgpeer NMWireGuardPeer *b_clone = NULL;
+
+		g_assert (a);
+		g_assert (b);
+
+		g_assert_cmpint (nm_wireguard_peer_get_preshared_key_flags (a), ==, nm_wireguard_peer_get_preshared_key_flags (b));
+		g_assert_cmpint (nm_wireguard_peer_cmp (a, b, NM_SETTING_COMPARE_FLAG_IGNORE_SECRETS), ==, 0);
+
+		if (!nm_streq0 (nm_wireguard_peer_get_preshared_key (a),
+		                nm_wireguard_peer_get_preshared_key (b))) {
+			g_assert_cmpstr (nm_wireguard_peer_get_preshared_key (a), !=, NULL);
+			g_assert_cmpstr (nm_wireguard_peer_get_preshared_key (b), ==, NULL);
+			g_assert (NM_IN_SET (nm_wireguard_peer_get_preshared_key_flags (a), NM_SETTING_SECRET_FLAG_AGENT_OWNED,
+			                                                                    NM_SETTING_SECRET_FLAG_NOT_SAVED));
+			b_clone = nm_wireguard_peer_new_clone (b, TRUE);
+			if (!nm_wireguard_peer_set_preshared_key (b_clone, nm_wireguard_peer_get_preshared_key (a), TRUE))
+				g_assert_not_reached ();
+			nm_setting_wireguard_set_peer (s_wg, b_clone, i);
+			b = nm_setting_wireguard_get_peer (s_wg, i);
+			g_assert (b == b_clone);
+		} else {
+			if (nm_wireguard_peer_get_preshared_key (a)) {
+				g_assert (NM_IN_SET (nm_wireguard_peer_get_preshared_key_flags (a), NM_SETTING_SECRET_FLAG_NONE,
+				                                                                    NM_SETTING_SECRET_FLAG_NOT_REQUIRED));
+			} else {
+				g_assert (NM_IN_SET (nm_wireguard_peer_get_preshared_key_flags (a), NM_SETTING_SECRET_FLAG_AGENT_OWNED,
+				                                                                    NM_SETTING_SECRET_FLAG_NONE,
+				                                                                    NM_SETTING_SECRET_FLAG_NOT_SAVED,
+				                                                                    NM_SETTING_SECRET_FLAG_NOT_REQUIRED));
+			}
+		}
+
+		g_assert_cmpstr (nm_wireguard_peer_get_preshared_key (a), ==, nm_wireguard_peer_get_preshared_key (b));
+		g_assert_cmpint (nm_wireguard_peer_cmp (a, b, NM_SETTING_COMPARE_FLAG_EXACT), ==, 0);
+	}
+}
+
+static void
+test_roundtrip_conversion (gconstpointer test_data)
+{
+	const int MODE = GPOINTER_TO_INT (test_data);
+	const char *ID= nm_sprintf_bufa (100, "roundtip-conversion-%d", MODE);
+	const char *UUID= "63376701-b61e-4318-bf7e-664a1c1eeaab";
+	const char *INTERFACE_NAME = nm_sprintf_bufa (100, "ifname%d", MODE);
+	guint32 ETH_MTU = nmtst_rand_select ((guint32) 0u,
+	                                     nmtst_get_rand_int ());
+	const char *WG_PRIVATE_KEY = nmtst_get_rand_bool ()
+	                             ? "yGXGK+5bVnxSJUejH4vbpXbq+ZtaG4NB8IHRK/aVtE0="
+	                             : NULL;
+	const NMSettingSecretFlags WG_PRIVATE_KEY_FLAGS = nmtst_rand_select (NM_SETTING_SECRET_FLAG_NONE,
+	                                                                     NM_SETTING_SECRET_FLAG_NOT_SAVED,
+	                                                                     NM_SETTING_SECRET_FLAG_AGENT_OWNED);
+	const guint WG_LISTEN_PORT = nmtst_rand_select (0u,
+	                                                nmtst_get_rand_int () % 0x10000);
+	const guint WG_FWMARK = nmtst_rand_select (0u,
+	                                           nmtst_get_rand_int ());
+	gs_unref_ptrarray GPtrArray *kf_data_arr = g_ptr_array_new_with_free_func (g_free);
+	gs_unref_ptrarray GPtrArray *wg_peers = NULL;
+	const NMConnectionSerializationFlags dbus_serialization_flags[] = {
+		NM_CONNECTION_SERIALIZE_ALL,
+		NM_CONNECTION_SERIALIZE_NO_SECRETS,
+		NM_CONNECTION_SERIALIZE_ONLY_SECRETS,
+	};
+	guint dbus_serialization_flags_idx;
+	gs_unref_object NMConnection *con = NULL;
+	gs_free_error GError *error = NULL;
+	gs_free char *tmp_str = NULL;
+	guint kf_data_idx;
+	NMSettingConnection *s_con = NULL;
+	NMSettingWired *s_eth = NULL;
+	NMSettingWireGuard *s_wg = NULL;
+	guint i;
+
+	switch (MODE) {
+	case 0:
+		con = nmtst_create_minimal_connection (ID, UUID, NM_SETTING_WIRED_SETTING_NAME, &s_con);
+		g_object_set (s_con,
+		              NM_SETTING_CONNECTION_INTERFACE_NAME,
+		              INTERFACE_NAME,
+		              NULL);
+		nmtst_connection_normalize (con);
+
+		s_eth = NM_SETTING_WIRED (nm_connection_get_setting (con, NM_TYPE_SETTING_WIRED));
+		g_assert (NM_IS_SETTING_WIRED (s_eth));
+
+		g_object_set (s_eth,
+		              NM_SETTING_WIRED_MTU,
+		              ETH_MTU,
+		              NULL);
+
+		g_ptr_array_add (kf_data_arr,
+		    g_strdup_printf ("[connection]\n"
+		                     "id=%s\n"
+		                     "uuid=%s\n"
+		                     "type=ethernet\n"
+		                     "interface-name=%s\n"
+		                     "permissions=\n"
+		                     "\n"
+		                     "[ethernet]\n"
+		                     "mac-address-blacklist=\n"
+		                     "%s" /* mtu */
+		                     "\n"
+		                     "[ipv4]\n"
+		                     "dns-search=\n"
+		                     "method=auto\n"
+		                     "\n"
+		                     "[ipv6]\n"
+		                     "addr-gen-mode=stable-privacy\n"
+		                     "dns-search=\n"
+		                     "method=auto\n"
+		                     "",
+		                     ID,
+		                     UUID,
+		                     INTERFACE_NAME,
+		                       (ETH_MTU != 0)
+		                     ? nm_sprintf_bufa (100, "mtu=%u\n", ETH_MTU)
+		                     : ""));
+
+		g_ptr_array_add (kf_data_arr,
+		    g_strdup_printf ("[connection]\n"
+		                     "id=%s\n"
+		                     "uuid=%s\n"
+		                     "type=ethernet\n"
+		                     "interface-name=%s\n"
+		                     "permissions=\n"
+		                     "\n"
+		                     "[ethernet]\n"
+		                     "mac-address-blacklist=\n"
+		                     "%s" /* mtu */
+		                     "\n"
+		                     "[ipv4]\n"
+		                     "dns-search=\n"
+		                     "method=auto\n"
+		                     "\n"
+		                     "[ipv6]\n"
+		                     "addr-gen-mode=stable-privacy\n"
+		                     "dns-search=\n"
+		                     "method=auto\n"
+		                     "",
+		                     ID,
+		                     UUID,
+		                     INTERFACE_NAME,
+		                       (ETH_MTU != 0)
+		                     ? nm_sprintf_bufa (100, "mtu=%d\n", (int) ETH_MTU)
+		                     : ""));
+
+		break;
+
+	case 1:
+		con = nmtst_create_minimal_connection (ID, UUID, "wireguard", &s_con);
+		g_object_set (s_con,
+		              NM_SETTING_CONNECTION_INTERFACE_NAME,
+		              INTERFACE_NAME,
+		              NULL);
+		nmtst_connection_normalize (con);
+
+		s_wg = NM_SETTING_WIREGUARD (nm_connection_get_setting (con, NM_TYPE_SETTING_WIREGUARD));
+
+		g_ptr_array_add (kf_data_arr,
+		    g_strdup_printf ("[connection]\n"
+		                     "id=%s\n"
+		                     "uuid=%s\n"
+		                     "type=wireguard\n"
+		                     "interface-name=%s\n"
+		                     "permissions=\n"
+		                     "\n"
+		                     "[ipv4]\n"
+		                     "dns-search=\n"
+		                     "method=disabled\n"
+		                     "\n"
+		                     "[ipv6]\n"
+		                     "addr-gen-mode=stable-privacy\n"
+		                     "dns-search=\n"
+		                     "method=ignore\n"
+		                     "",
+		                     ID,
+		                     UUID,
+		                     INTERFACE_NAME));
+		break;
+
+	case 2:
+		con = nmtst_create_minimal_connection (ID, UUID, "wireguard", &s_con);
+		g_object_set (s_con,
+		              NM_SETTING_CONNECTION_INTERFACE_NAME,
+		              INTERFACE_NAME,
+		              NULL);
+		nmtst_connection_normalize (con);
+
+		s_wg = NM_SETTING_WIREGUARD (nm_connection_get_setting (con, NM_TYPE_SETTING_WIREGUARD));
+		g_object_set (s_wg,
+		              NM_SETTING_WIREGUARD_PRIVATE_KEY,
+		              WG_PRIVATE_KEY,
+		              NM_SETTING_WIREGUARD_PRIVATE_KEY_FLAGS,
+		              WG_PRIVATE_KEY_FLAGS,
+		              NM_SETTING_WIREGUARD_LISTEN_PORT,
+		              WG_LISTEN_PORT,
+		              NM_SETTING_WIREGUARD_FWMARK,
+		              WG_FWMARK,
+		              NULL);
+
+		wg_peers = _rndt_wg_peers_create ();
+
+		for (i = 0; i < wg_peers->len; i++)
+			nm_setting_wireguard_append_peer (s_wg, wg_peers->pdata[i]);
+
+		nm_clear_g_free (&tmp_str);
+
+		g_ptr_array_add (kf_data_arr,
+		    g_strdup_printf ("[connection]\n"
+		                     "id=%s\n"
+		                     "uuid=%s\n"
+		                     "type=wireguard\n"
+		                     "interface-name=%s\n"
+		                     "permissions=\n"
+		                     "%s" /* [wireguard] */
+		                     "%s" /* fwmark */
+		                     "%s" /* listen-port */
+		                     "%s" /* private-key-flags */
+		                     "%s" /* private-key */
+		                     "%s" /* [wireguard-peers*] */
+		                     "\n"
+		                     "[ipv4]\n"
+		                     "dns-search=\n"
+		                     "method=disabled\n"
+		                     "\n"
+		                     "[ipv6]\n"
+		                     "addr-gen-mode=stable-privacy\n"
+		                     "dns-search=\n"
+		                     "method=ignore\n"
+		                     "",
+		                     ID,
+		                     UUID,
+		                     INTERFACE_NAME,
+		                     (  (   (WG_FWMARK != 0)
+		                         || (WG_LISTEN_PORT != 0)
+		                         || (WG_PRIVATE_KEY_FLAGS != NM_SETTING_SECRET_FLAG_NONE)
+		                         || (   WG_PRIVATE_KEY
+		                             && WG_PRIVATE_KEY_FLAGS == NM_SETTING_SECRET_FLAG_NONE))
+		                      ? "\n[wireguard]\n"
+		                      : ""),
+		                     (  (WG_FWMARK != 0)
+		                      ? nm_sprintf_bufa (100, "fwmark=%u\n", WG_FWMARK)
+		                      : ""),
+		                     (  (WG_LISTEN_PORT != 0)
+		                      ? nm_sprintf_bufa (100, "listen-port=%u\n", WG_LISTEN_PORT)
+		                      : ""),
+		                     (  (WG_PRIVATE_KEY_FLAGS != NM_SETTING_SECRET_FLAG_NONE)
+		                      ? nm_sprintf_bufa (100, "private-key-flags=%u\n", (guint) WG_PRIVATE_KEY_FLAGS)
+		                      : ""),
+		                     (  (   WG_PRIVATE_KEY
+		                         && WG_PRIVATE_KEY_FLAGS == NM_SETTING_SECRET_FLAG_NONE)
+		                      ? nm_sprintf_bufa (100, "private-key=%s\n", WG_PRIVATE_KEY)
+		                      : ""),
+		                     _rndt_wg_peers_to_keyfile (wg_peers, TRUE, &tmp_str)));
+
+		_rndt_wg_peers_assert_equal (s_wg, wg_peers, TRUE, TRUE, FALSE);
+		break;
+
+	default:
+		g_assert_not_reached ();
+	}
+
+	/* the first kf_data_arr entry is special: it is the exact result of what we expect
+	 * when converting @con to keyfile. Write @con to keyfile and compare the expected result
+	 * literally. */
+	{
+		gs_unref_keyfile GKeyFile *kf = NULL;
+
+		kf = nm_keyfile_write (con, NULL, NULL, &error);
+		nmtst_assert_success (kf, error);
+
+		/* the first kf_data_arr entry is special: it must be what the writer would
+		 * produce again. */
+		nmtst_keyfile_assert_data (kf, kf_data_arr->pdata[0], -1);
+	}
+
+	/* check that reading any of kf_data_arr yields the same result that we expect. */
+	for (kf_data_idx = 0; kf_data_idx < kf_data_arr->len; kf_data_idx++) {
+		gs_unref_object NMConnection *con2 = NULL;
+		NMSettingWireGuard *s_wg2 = NULL;
+		NMSettingWired *s_eth2 = NULL;
+
+		con2 = nmtst_create_connection_from_keyfile (kf_data_arr->pdata[kf_data_idx], "/no/where/file.nmconnection");
+
+		switch (MODE) {
+		case 0:
+			s_eth2 = NM_SETTING_WIRED (nm_connection_get_setting (con2, NM_TYPE_SETTING_WIRED));
+			g_assert (NM_IS_SETTING_WIRED (s_eth2));
+
+			if (   ETH_MTU > (guint32) G_MAXINT
+			    && kf_data_idx == 1) {
+				/* older versions wrote values > 2^21 as signed integers, but the reader would
+				 * always reject such negative values for G_TYPE_UINT.
+				 *
+				 * The test case kf_data_idx #1 still writes the values in the old style.
+				 * The behavior was fixed, but such values are still rejected as invalid.
+				 *
+				 * Patch the setting so that the comparison below succeeds are usual. */
+				g_assert_cmpint (nm_setting_wired_get_mtu (s_eth2), ==, 0);
+				g_object_set (s_eth2,
+				              NM_SETTING_WIRED_MTU,
+				              ETH_MTU,
+				              NULL);
+			}
+
+			g_assert_cmpint (nm_setting_wired_get_mtu (s_eth), ==, ETH_MTU);
+			g_assert_cmpint (nm_setting_wired_get_mtu (s_eth2), ==, ETH_MTU);
+			break;
+
+		case 1:
+			s_wg2 = NM_SETTING_WIREGUARD (nm_connection_get_setting (con2, NM_TYPE_SETTING_WIREGUARD));
+			g_assert (NM_IS_SETTING_WIREGUARD (s_wg2));
+
+			g_assert_cmpstr (nm_setting_wireguard_get_private_key (s_wg), ==, NULL);
+			g_assert_cmpstr (nm_setting_wireguard_get_private_key (s_wg2), ==, NULL);
+			break;
+
+		case 2:
+			s_wg2 = NM_SETTING_WIREGUARD (nm_connection_get_setting (con2, NM_TYPE_SETTING_WIREGUARD));
+			g_assert (NM_IS_SETTING_WIREGUARD (s_wg2));
+
+			/* the private key was lost due to the secret-flags. Patch it. */
+			if (WG_PRIVATE_KEY_FLAGS != NM_SETTING_SECRET_FLAG_NONE) {
+				g_assert_cmpstr (nm_setting_wireguard_get_private_key (s_wg2), ==, NULL);
+				g_object_set (s_wg2,
+				              NM_SETTING_WIREGUARD_PRIVATE_KEY,
+				              WG_PRIVATE_KEY,
+				              NULL);
+			}
+
+			g_assert_cmpstr (nm_setting_wireguard_get_private_key (s_wg), ==, WG_PRIVATE_KEY);
+			g_assert_cmpstr (nm_setting_wireguard_get_private_key (s_wg2), ==, WG_PRIVATE_KEY);
+
+			_rndt_wg_peers_assert_equal (s_wg2, wg_peers, TRUE, FALSE, FALSE);
+			_rndt_wg_peers_fix_secrets (s_wg2, wg_peers);
+			_rndt_wg_peers_assert_equal (s_wg2, wg_peers, TRUE, TRUE, FALSE);
+			break;
+		}
+
+		nmtst_assert_connection_equals (con, nmtst_get_rand_bool (), con2, nmtst_get_rand_bool ());
+	}
+
+	for (dbus_serialization_flags_idx = 0; dbus_serialization_flags_idx < G_N_ELEMENTS (dbus_serialization_flags); dbus_serialization_flags_idx++) {
+		NMConnectionSerializationFlags flag = dbus_serialization_flags[dbus_serialization_flags_idx];
+		gs_unref_variant GVariant *con_var = NULL;
+		gs_unref_object NMConnection *con2 = NULL;
+		NMSettingWireGuard *s_wg2 = NULL;
+
+		con_var = nm_connection_to_dbus (con, flag);
+		g_assert (g_variant_is_of_type (con_var, NM_VARIANT_TYPE_CONNECTION));
+		g_assert (g_variant_is_floating (con_var));
+		g_variant_ref_sink (con_var);
+
+		if (flag == NM_CONNECTION_SERIALIZE_ALL) {
+			con2 = _connection_new_from_dbus_strict (con_var, TRUE);
+			nmtst_assert_connection_equals (con, nmtst_get_rand_bool (), con2, nmtst_get_rand_bool ());
+
+			{
+				gs_unref_keyfile GKeyFile *kf = NULL;
+
+				kf = nm_keyfile_write (con2, NULL, NULL, &error);
+				nmtst_assert_success (kf, error);
+				nmtst_keyfile_assert_data (kf, kf_data_arr->pdata[0], -1);
+			}
+		}
+
+		switch (MODE) {
+		case 2:
+			if (flag == NM_CONNECTION_SERIALIZE_ALL) {
+				s_wg2 = NM_SETTING_WIREGUARD (nm_connection_get_setting (con2, NM_TYPE_SETTING_WIREGUARD));
+
+				if (flag == NM_CONNECTION_SERIALIZE_ALL)
+					_rndt_wg_peers_assert_equal (s_wg2, wg_peers, TRUE, TRUE, FALSE);
+				else if (flag == NM_CONNECTION_SERIALIZE_NO_SECRETS)
+					_rndt_wg_peers_assert_equal (s_wg2, wg_peers, FALSE, FALSE, TRUE);
+				else
+					g_assert_not_reached ();
+			}
+			break;
+		}
+	}
+}
+
+/*****************************************************************************/
+
 NMTST_DEFINE ();
 
 int
@@ -2022,5 +2694,9 @@ main (int argc, char **argv)
 	g_test_add_func ("/libnm/settings/team-port/sycn_from_config_full", test_team_port_full_config);
 #endif
 
+	g_test_add_data_func ("/libnm/settings/roundtrip-conversion/general/0", GINT_TO_POINTER (0), test_roundtrip_conversion);
+	g_test_add_data_func ("/libnm/settings/roundtrip-conversion/wireguard/1", GINT_TO_POINTER (1), test_roundtrip_conversion);
+	g_test_add_data_func ("/libnm/settings/roundtrip-conversion/wireguard/2", GINT_TO_POINTER (2), test_roundtrip_conversion);
+
 	return g_test_run ();
 }
diff --git a/libnm-core/tests/test-settings-defaults.c b/libnm-core/tests/test-settings-defaults.c
index 95570b03..9e640543 100644
--- a/libnm-core/tests/test-settings-defaults.c
+++ b/libnm-core/tests/test-settings-defaults.c
@@ -21,8 +21,6 @@
 
 #include "nm-default.h"
 
-#include 
-
 #include "nm-utils.h"
 #include "nm-setting-8021x.h"
 #include "nm-setting-cdma.h"
diff --git a/libnm-glib/meson.build b/libnm-glib/meson.build
index 016aa638..3882d59a 100644
--- a/libnm-glib/meson.build
+++ b/libnm-glib/meson.build
@@ -5,7 +5,7 @@ dbus_binding_tool = find_program('dbus-binding-tool')
 common_deps = [
   dbus_dep,
   dbus_glib_dep,
-  shared_dep
+  shared_nm_utils_base_dep,
 ]
 
 common_cflags = [
@@ -13,13 +13,13 @@ common_cflags = [
 ]
 
 cflags = common_cflags + [
-  '-DG_LOG_DOMAIN="@0@"'.format(libnm_glib_name)
+  '-DG_LOG_DOMAIN="@0@"'.format(libnm_glib_name),
 ]
 
 vpn_headers = files(
   'nm-vpn-plugin.h',
   'nm-vpn-plugin-ui-interface.h',
-  'nm-vpn-plugin-utils.h'
+  'nm-vpn-plugin-utils.h',
 )
 
 headers = files(
@@ -50,14 +50,14 @@ headers = files(
   'nm-secret-agent.h',
   'nm-types.h',
   'nm-vpn-connection.h',
-  'nm-wimax-nsp.h'
+  'nm-wimax-nsp.h',
 )
 
 deprecated_headers = files('libnm_glib.h')
 
 install_headers(
   headers + vpn_headers + deprecated_headers,
-  subdir: libnm_glib_name
+  subdir: libnm_glib_name,
 )
 
 libdeprecated_nm_glib = static_library(
@@ -74,7 +74,7 @@ libdeprecated_nm_glib = static_library(
 sources = files(
   'nm-vpn-plugin.c',
   'nm-vpn-plugin-ui-interface.c',
-  'nm-vpn-plugin-utils.c'
+  'nm-vpn-plugin-utils.c',
 )
 
 glue = 'nm-vpn-plugin-glue.h'
@@ -88,11 +88,9 @@ libnm_glib_vpn_enum = gnome.mkenums(
   c_template: enum_types + '.c.template',
   h_template: enum_types + '.h.template',
   install_header: true,
-  install_dir: libnm_glib_pkgincludedir
+  install_dir: libnm_glib_pkgincludedir,
 )
 
-deps = common_deps + [libnm_util_dep]
-
 linker_script = join_paths(meson.current_source_dir(), 'libnm-glib-vpn.ver')
 
 libnm_glib_vpn = shared_library(
@@ -110,18 +108,18 @@ libnm_glib_vpn = shared_library(
     ),
   ] + libnm_glib_vpn_enum,
   version: libnm_glib_vpn_version,
-  dependencies: deps,
+  dependencies: common_deps + [libnm_util_dep],
   c_args: cflags,
   link_args: [
     '-Wl,--version-script,@0@'.format(linker_script),
   ],
   link_depends: linker_script,
-  install: true
+  install: true,
 )
 
 libnm_glib_vpn_dep = declare_dependency(
   include_directories: libnm_glib_inc,
-  link_with: libnm_glib_vpn
+  link_with: libnm_glib_vpn,
 )
 
 pkg.generate(
@@ -132,10 +130,10 @@ pkg.generate(
   filebase: libnm_glib_vpn_name,
   subdirs: libnm_glib_name,
   requires: 'NetworkManager >= ' + nm_version + ' glib-2.0 dbus-glib-1',
-  variables: 'exec_prefix=${prefix}'
+  variables: 'exec_prefix=${prefix}',
 )
 
-libnm_glib_sources = shared_files_libnm_glib + files(
+libnm_glib_sources = files(
   'nm-access-point.c',
   'nm-active-connection.c',
   'nm-client.c',
@@ -165,7 +163,7 @@ libnm_glib_sources = shared_files_libnm_glib + files(
   'nm-secret-agent.c',
   'nm-types.c',
   'nm-vpn-connection.c',
-  'nm-wimax-nsp.c'
+  'nm-wimax-nsp.c',
 )
 
 glue = 'nm-secret-agent-glue.h'
@@ -174,7 +172,7 @@ nm_secret_agent_glue = custom_target(
   glue,
   input: ifaces_secret_agent_xml,
   output: glue,
-  command: [dbus_binding_tool, '--prefix=nm_secret_agent', '--mode=glib-server', '--output=@OUTPUT@', '@INPUT@']
+  command: [dbus_binding_tool, '--prefix=nm_secret_agent', '--mode=glib-server', '--output=@OUTPUT@', '@INPUT@'],
 )
 
 enum_types = 'nm-glib-enum-types'
@@ -186,33 +184,32 @@ libnm_glib_enum = gnome.mkenums(
   c_template: enum_types + '.c.template',
   h_template: enum_types + '.h.template',
   install_header: true,
-  install_dir: libnm_glib_pkgincludedir
+  install_dir: libnm_glib_pkgincludedir,
 )
 
-deps = common_deps + [
-  libnm_util_dep,
-  libudev_dep
-]
-
 linker_script = join_paths(meson.current_source_dir(), 'libnm-glib.ver')
 
 libnm_glib = shared_library(
   'nm-glib',
   sources: libnm_glib_sources + libnm_glib_enum + [nm_secret_agent_glue],
   version: libnm_glib_version,
-  dependencies: deps,
+  dependencies: common_deps + [
+    libnm_util_dep,
+    libudev_dep,
+    shared_nm_utils_udev_dep,
+  ],
   c_args: cflags,
   link_whole: libdeprecated_nm_glib,
   link_args: [
     '-Wl,--version-script,@0@'.format(linker_script),
   ],
   link_depends: linker_script,
-  install: true
+  install: true,
 )
 
 libnm_glib_dep = declare_dependency(
   include_directories: libnm_glib_inc,
-  link_with: libnm_glib
+  link_with: libnm_glib,
 )
 
 pkg.generate(
@@ -223,50 +220,44 @@ pkg.generate(
   filebase: libnm_glib_name,
   subdirs: libnm_glib_name,
   requires: 'libnm-util >= ' + nm_version + ' NetworkManager >= ' + nm_version + ' gobject-2.0 dbus-glib-1',
-  variables: 'exec_prefix=${prefix}'
+  variables: 'exec_prefix=${prefix}',
 )
 
 if enable_introspection
   gir_sources = libnm_glib_sources + headers + libnm_glib_enum
 
-  deps = [
-    dbus_glib_dep,
-    libnm_glib_dep,
-    libnm_util_gir_dep
-  ]
-
-  gir_includes = [
-    'DBusGLib-1.0',
-    'Gio-2.0'
-  ]
-
   libnm_glib_gir = gnome.generate_gir(
     libnm_glib,
     sources: gir_sources,
-    dependencies: deps,
+    dependencies: [
+      dbus_glib_dep,
+      libnm_glib_dep,
+      libnm_util_gir_dep,
+    ],
     nsversion: nm_gir_version,
     namespace: 'NMClient',
     identifier_prefix: nm_id_prefix,
     symbol_prefix: nm_id_prefix.to_lower(),
     export_packages: [libnm_glib_name, libnm_glib_vpn_name],
-    includes: gir_includes,
+    includes: [
+      'DBusGLib-1.0',
+      'Gio-2.0',
+    ],
     extra_args: cflags + [
       '--include-uninstalled=' + libnm_util_gir[0].full_path(),
     ],
-    install: true
+    install: true,
   )
 endif
 
 name = libnm_glib_name + '-test'
 
-deps = common_deps + [libnm_util_dep]
-
 executable(
   name,
   name + '.c',
-  dependencies: deps,
+  dependencies: common_deps + [libnm_util_dep],
   c_args: cflags,
-  link_with: libnm_glib
+  link_with: libnm_glib,
 )
 
 test(
@@ -290,6 +281,6 @@ pkg.generate(
     'exec_prefix=${prefix}',
     'libgnome_serverdir=' + nm_libexecdir,
     'plugindir=' + nm_vpndir,
-    'configdir=' + nm_pkgconfdir
-  ]
+    'configdir=' + nm_pkgconfdir,
+  ],
 )
diff --git a/libnm-glib/nm-client.c b/libnm-glib/nm-client.c
index 0da7b0f4..16fee714 100644
--- a/libnm-glib/nm-client.c
+++ b/libnm-glib/nm-client.c
@@ -1840,7 +1840,7 @@ constructed (GObject *object)
 	GError *error = NULL;
 
 	if (!nm_utils_init (&error)) {
-		g_warning ("Couldn't initilize nm-utils/crypto system: %s",
+		g_warning ("Couldn't initialize nm-utils/crypto system: %s",
 		           error->message);
 		g_clear_error (&error);
 	}
diff --git a/libnm-glib/nm-object.c b/libnm-glib/nm-object.c
index e2c96d62..967400e7 100644
--- a/libnm-glib/nm-object.c
+++ b/libnm-glib/nm-object.c
@@ -451,10 +451,10 @@ nm_object_class_init (NMObjectClass *nm_object_class)
 	/**
 	 * NMObject::object-creation-failed:
 	 * @master_object: the object that received the signal
-	 * @error: the error that occured while creating object
+	 * @error: the error that occurred while creating object
 	 * @failed_path: object path of the failed object
 	 *
-	 * Indicates that an error occured while creating an #NMObject object
+	 * Indicates that an error occurred while creating an #NMObject object
 	 * during property handling of @master_object.
 	 *
 	 * Note: Be aware that the signal is private for libnm-glib's internal
diff --git a/libnm-glib/nm-object.h b/libnm-glib/nm-object.h
index 73aa9de5..d37fb683 100644
--- a/libnm-glib/nm-object.h
+++ b/libnm-glib/nm-object.h
@@ -66,7 +66,7 @@ typedef struct {
 	/* Signals */
 	/* The "object-creation-failed" signal is PRIVATE for libnm-glib and
 	 * is not meant for any external usage.  It indicates that an error
-	 * occured during creation of an object.
+	 * occurred during creation of an object.
 	 */
 	void (*object_creation_failed) (NMObject *master_object,
 	                                GError *error,
diff --git a/libnm-glib/nm-secret-agent.c b/libnm-glib/nm-secret-agent.c
index 16e3199d..361af6f8 100644
--- a/libnm-glib/nm-secret-agent.c
+++ b/libnm-glib/nm-secret-agent.c
@@ -703,7 +703,7 @@ auto_register_cb (gpointer user_data)
  * @callback: (scope async): a callback, to be invoked when the operation is done
  * @user_data: (closure): caller-specific data to be passed to @callback
  *
- * Asyncronously retrieve secrets belonging to @connection for the
+ * Asynchronously retrieve secrets belonging to @connection for the
  * setting @setting_name.  @flags indicate specific behavior that the secret
  * agent should use when performing the request, for example returning only
  * existing secrets without user interaction, or requesting entirely new
@@ -742,7 +742,7 @@ nm_secret_agent_get_secrets (NMSecretAgent *self,
  * @callback: (scope async): a callback, to be invoked when the operation is done
  * @user_data: (closure): caller-specific data to be passed to @callback
  *
- * Asyncronously ensure that all secrets inside @connection
+ * Asynchronously ensure that all secrets inside @connection
  * are stored to disk.
  */
 void
@@ -1031,7 +1031,7 @@ nm_secret_agent_class_init (NMSecretAgentClass *class)
 	/**
 	 * NMSecretAgent::registration-result:
 	 * @agent: the agent that received the signal
-	 * @error: the error, if any, that occured while registering
+	 * @error: the error, if any, that occurred while registering
 	 *
 	 * Indicates the result of a registration request; if @error is NULL the
 	 * request was successful.
diff --git a/libnm-glib/nm-vpn-plugin-utils.c b/libnm-glib/nm-vpn-plugin-utils.c
index ca652d1b..30949d19 100644
--- a/libnm-glib/nm-vpn-plugin-utils.c
+++ b/libnm-glib/nm-vpn-plugin-utils.c
@@ -20,7 +20,6 @@
 
 #include "nm-default.h"
 
-#include 
 #include 
 #include 
 #include 
@@ -83,7 +82,6 @@ nm_vpn_plugin_utils_read_vpn_details (int fd,
 		ssize_t nr;
 		GHashTable *hash = NULL;
 
-		errno = 0;
 		nr = read (fd, &c, 1);
 		if (nr == -1) {
 			if (errno == EAGAIN) {
diff --git a/libnm-glib/tests/meson.build b/libnm-glib/tests/meson.build
index 3fd37c4f..7d6007cb 100644
--- a/libnm-glib/tests/meson.build
+++ b/libnm-glib/tests/meson.build
@@ -3,12 +3,12 @@ deps = [
   dbus_glib_dep,
   libnm_glib_dep,
   libnm_util_dep,
-  shared_dep
+  shared_nm_utils_base_dep,
 ]
 
 test_units = [
   'test-nm-client',
-  'test-remote-settings-client'
+  'test-remote-settings-client',
 ]
 
 foreach test_unit: test_units
@@ -25,6 +25,6 @@ foreach test_unit: test_units
   test(
     'libnm-glib/' + test_unit,
     test_script,
-    args: test_args + [exe.full_path()]
+    args: test_args + [exe.full_path()],
   )
 endforeach
diff --git a/libnm-util/NetworkManager.h b/libnm-util/NetworkManager.h
index 2aa2e357..b4f8b97f 100644
--- a/libnm-util/NetworkManager.h
+++ b/libnm-util/NetworkManager.h
@@ -132,7 +132,7 @@ typedef enum {
  * @NM_DEVICE_TYPE_UNKNOWN: unknown device
  * @NM_DEVICE_TYPE_GENERIC: generic support for unrecognized device types
  * @NM_DEVICE_TYPE_ETHERNET: a wired ethernet device
- * @NM_DEVICE_TYPE_WIFI: an 802.11 WiFi device
+ * @NM_DEVICE_TYPE_WIFI: an 802.11 Wi-Fi device
  * @NM_DEVICE_TYPE_UNUSED1: not used
  * @NM_DEVICE_TYPE_UNUSED2: not used
  * @NM_DEVICE_TYPE_BT: a Bluetooth device supporting PAN or DUN access protocols
@@ -356,7 +356,7 @@ typedef enum { /*< flags >*/
  *   setting physical link properties, and anything else required to connect
  *   to the requested network.
  * @NM_DEVICE_STATE_CONFIG: the device is connecting to the requested network.
- *   This may include operations like associating with the WiFi AP, dialing
+ *   This may include operations like associating with the Wi-Fi AP, dialing
  *   the modem, connecting to the remote Bluetooth device, etc.
  * @NM_DEVICE_STATE_NEED_AUTH: the device requires more information to continue
  *   connecting to the requested network.  This includes secrets like WiFi
@@ -449,7 +449,7 @@ typedef enum {
  * @NM_DEVICE_STATE_REASON_DEPENDENCY_FAILED: A dependency of the connection failed
  * @NM_DEVICE_STATE_REASON_BR2684_FAILED: Problem with the RFC 2684 Ethernet over ADSL bridge
  * @NM_DEVICE_STATE_REASON_MODEM_MANAGER_UNAVAILABLE: ModemManager not running
- * @NM_DEVICE_STATE_REASON_SSID_NOT_FOUND: The WiFi network could not be found
+ * @NM_DEVICE_STATE_REASON_SSID_NOT_FOUND: The Wi-Fi network could not be found
  * @NM_DEVICE_STATE_REASON_SECONDARY_CONNECTION_FAILED: A secondary connection of the base connection failed
  * @NM_DEVICE_STATE_REASON_DCB_FCOE_FAILED: DCB or FCoE setup failed
  * @NM_DEVICE_STATE_REASON_TEAMD_CONTROL_FAILED: teamd control failed
diff --git a/libnm-util/meson.build b/libnm-util/meson.build
index 44d9e735..468064c1 100644
--- a/libnm-util/meson.build
+++ b/libnm-util/meson.build
@@ -30,17 +30,17 @@ enums_headers = [version_header] + files(
   'nm-setting-wireless.h',
   'nm-setting-wireless-security.h',
   'nm-utils.h',
-  'nm-version.h'
+  'nm-version.h',
 )
 
 headers = enums_headers + files(
   'NetworkManager.h',
-  'NetworkManagerVPN.h'
+  'NetworkManagerVPN.h',
 )
 
 install_headers(
   headers,
-  subdir: nm_name
+  subdir: nm_name,
 )
 
 enum_types = 'nm-utils-enum-types'
@@ -52,7 +52,7 @@ libnm_utils_enum = gnome.mkenums(
   c_template: enum_types + '.c.template',
   h_template: enum_types + '.h.template',
   install_header: true,
-  install_dir: nm_pkgincludedir
+  install_dir: nm_pkgincludedir,
 )
 
 sources = files(
@@ -87,15 +87,14 @@ sources = files(
   'nm-setting-vlan.c',
   'nm-setting-vpn.c',
   'nm-utils.c',
-  'nm-value-transforms.c'
+  'nm-value-transforms.c',
 )
-sources += shared_files_libnm_util
 
 deps = [
   dbus_dep,
   dbus_glib_dep,
-  shared_dep,
-  uuid_dep
+  shared_nm_utils_base_dep,
+  uuid_dep,
 ]
 
 common_cflags = [
@@ -103,7 +102,7 @@ common_cflags = [
 ]
 
 cflags = common_cflags + [
-  '-DG_LOG_DOMAIN="@0@"'.format(libnm_util_name)
+  '-DG_LOG_DOMAIN="@0@"'.format(libnm_util_name),
 ]
 
 if crypto_gnutls_dep.found()
@@ -111,7 +110,7 @@ if crypto_gnutls_dep.found()
     'nm-util-crypto-gnutls',
     sources: [ 'crypto_gnutls.c' ],
     dependencies: deps + [ crypto_gnutls_dep ],
-    c_args: cflags
+    c_args: cflags,
   )
 endif
 
@@ -120,7 +119,7 @@ if crypto_nss_dep.found()
     'nm-util-crypto-nss',
     sources: [ 'crypto_nss.c' ],
     dependencies: deps + [ crypto_nss_dep ],
-    c_args: cflags
+    c_args: cflags,
   )
 endif
 
@@ -145,13 +144,13 @@ libnm_util = shared_library(
   ],
   link_depends: linker_script,
   link_with: libnm_util_crypto,
-  install: true
+  install: true,
 )
 
 libnm_util_dep = declare_dependency(
   sources: libnm_utils_enum[1],
   include_directories: libnm_util_inc,
-  link_with: libnm_util
+  link_with: libnm_util,
 )
 
 pkg.generate(
@@ -162,7 +161,7 @@ pkg.generate(
   filebase: libnm_util_name,
   subdirs: nm_name,
   requires: 'NetworkManager >= ' + nm_version + ' glib-2.0 dbus-glib-1',
-  variables: 'exec_prefix=${prefix}'
+  variables: 'exec_prefix=${prefix}',
 )
 
 if enable_introspection
@@ -170,7 +169,7 @@ if enable_introspection
 
   gir_includes = [
     'DBusGLib-1.0',
-    'GObject-2.0'
+    'GObject-2.0',
   ]
 
   libnm_util_gir = gnome.generate_gir(
@@ -182,12 +181,12 @@ if enable_introspection
     symbol_prefix: nm_id_prefix.to_lower(),
     export_packages: libnm_util_name,
     includes: gir_includes,
-    install: true
+    install: true,
   )
 
   libnm_util_gir_dep = declare_dependency(
     sources: libnm_util_gir,
-    link_with: libnm_util
+    link_with: libnm_util,
   )
 endif
 
@@ -202,7 +201,7 @@ sources = files(
 )
 
 deps = [
-  shared_dep
+  shared_nm_utils_base_dep,
 ]
 
 libtest_crypto = static_library(
@@ -210,7 +209,7 @@ libtest_crypto = static_library(
   sources: sources,
   dependencies: deps,
   link_with: libnm_util_crypto,
-  c_args: cflags
+  c_args: cflags,
 )
 
 if enable_tests
diff --git a/libnm-util/nm-connection.h b/libnm-util/nm-connection.h
index 6e119c2c..9bee219e 100644
--- a/libnm-util/nm-connection.h
+++ b/libnm-util/nm-connection.h
@@ -100,7 +100,7 @@ typedef enum
 
 /*
  * NM_CONNECTION_NORMALIZE_PARAM_IP6_CONFIG_METHOD: overwrite the ip6 method
- * when normalizing ip6 configuration. If omited, this defaults to
+ * when normalizing ip6 configuration. If omitted, this defaults to
  * @NM_SETTING_IP6_CONFIG_METHOD_AUTO.
  */
 #define NM_CONNECTION_NORMALIZE_PARAM_IP6_CONFIG_METHOD "ip6-config-method"
diff --git a/libnm-util/nm-param-spec-specialized.c b/libnm-util/nm-param-spec-specialized.c
index dfc8ea98..8581ecc5 100644
--- a/libnm-util/nm-param-spec-specialized.c
+++ b/libnm-util/nm-param-spec-specialized.c
@@ -539,9 +539,9 @@ _gvalues_compare (const GValue *value1, const GValue *value2)
 		if (p1 == p2)
 			ret = 0; /* Exactly the same values */
 		else if (!p1)
-			ret = 1; /* The comparision functions below don't handle NULLs */
+			ret = 1; /* The comparison functions below don't handle NULLs */
 		else if (!p2)
-			ret = -1; /* The comparision functions below don't handle NULLs */
+			ret = -1; /* The comparison functions below don't handle NULLs */
 		else if (type1 == G_TYPE_STRV)
 			ret = _gvalues_compare_strv (value1, value2);
 		else if (dbus_g_type_is_collection (type1))
diff --git a/libnm-util/nm-setting-8021x.c b/libnm-util/nm-setting-8021x.c
index ae7a47e6..805a5d25 100644
--- a/libnm-util/nm-setting-8021x.c
+++ b/libnm-util/nm-setting-8021x.c
@@ -435,7 +435,7 @@ get_cert_scheme (GByteArray *array)
 	    && !memcmp (array->data, SCHEME_PATH, NM_STRLEN (SCHEME_PATH))) {
 		/* But it must also be NUL terminated, contain at least
 		 * one non-NUL character, and contain only one trailing NUL
-		 * chracter.
+		 * character.
 		 * And ensure it's UTF-8 valid too so we can pass it through
 		 * D-Bus and stuff like that. */
 		if (   array->len > NM_STRLEN (SCHEME_PATH) + 1
@@ -3723,7 +3723,7 @@ nm_setting_802_1x_class_init (NMSetting8021xClass *setting_class)
 
 	/* Initialize crypto lbrary. */
 	if (!nm_utils_init (&error)) {
-		g_warning ("Couldn't initilize nm-utils/crypto system: %s",
+		g_warning ("Couldn't initialize nm-utils/crypto system: %s",
 		           error->message);
 		g_error_free (error);
 	}
diff --git a/libnm-util/nm-setting-bond.c b/libnm-util/nm-setting-bond.c
index a54e93c3..9a1c5c73 100644
--- a/libnm-util/nm-setting-bond.c
+++ b/libnm-util/nm-setting-bond.c
@@ -23,7 +23,6 @@
 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
diff --git a/libnm-util/nm-setting-bridge.c b/libnm-util/nm-setting-bridge.c
index cc189c57..ceebb982 100644
--- a/libnm-util/nm-setting-bridge.c
+++ b/libnm-util/nm-setting-bridge.c
@@ -254,7 +254,7 @@ nm_setting_bridge_get_ageing_time (NMSettingBridge *setting)
 #define BR_MIN_AGEING_TIME   0
 #define BR_MAX_AGEING_TIME   1000000
 
-static inline gboolean
+static gboolean
 check_range (guint32 val,
              guint32 min,
              guint32 max,
diff --git a/libnm-util/nm-setting-connection.c b/libnm-util/nm-setting-connection.c
index c7da1aa4..4750733f 100644
--- a/libnm-util/nm-setting-connection.c
+++ b/libnm-util/nm-setting-connection.c
@@ -294,7 +294,7 @@ nm_setting_connection_get_num_permissions (NMSettingConnection *setting)
  * @setting: the #NMSettingConnection
  * @idx: the zero-based index of the permissions entry
  * @out_ptype: on return, the permission type (at this time, always "user")
- * @out_pitem: on return, the permission item (formatted accoring to @ptype, see
+ * @out_pitem: on return, the permission item (formatted according to @ptype, see
  * #NMSettingConnection:permissions for more detail
  * @out_detail: on return, the permission detail (at this time, always %NULL)
  *
@@ -646,7 +646,7 @@ nm_setting_connection_get_secondary (NMSettingConnection *setting, guint32 idx)
  * @setting: the #NMSettingConnection
  * @sec_uuid: the secondary connection UUID to add
  *
- * Adds a new secondary connetion UUID to the setting.
+ * Adds a new secondary connection UUID to the setting.
  *
  * Returns: %TRUE if the secondary connection UUID was added; %FALSE if the UUID
  * was already present
diff --git a/libnm-util/nm-setting-dcb.c b/libnm-util/nm-setting-dcb.c
index 17a3a871..c3cf89dd 100644
--- a/libnm-util/nm-setting-dcb.c
+++ b/libnm-util/nm-setting-dcb.c
@@ -802,7 +802,7 @@ nm_setting_dcb_init (NMSettingDcb *setting)
 {
 }
 
-static inline void
+static void
 set_uint_array (const GValue *v, uint *a, size_t len)
 {
 	GArray *src = g_value_get_boxed (v);
diff --git a/libnm-util/nm-setting-vpn.c b/libnm-util/nm-setting-vpn.c
index 1fed9eca..626ba4ca 100644
--- a/libnm-util/nm-setting-vpn.c
+++ b/libnm-util/nm-setting-vpn.c
@@ -22,7 +22,6 @@
 #include "nm-default.h"
 
 #include 
-#include 
 #include 
 #include 
 
diff --git a/libnm-util/nm-setting-wireless-security.c b/libnm-util/nm-setting-wireless-security.c
index 00d35a2f..33598dfe 100644
--- a/libnm-util/nm-setting-wireless-security.c
+++ b/libnm-util/nm-setting-wireless-security.c
@@ -407,7 +407,7 @@ nm_setting_wireless_security_remove_pairwise (NMSettingWirelessSecurity *setting
  * Removes an encryption algorithm from the allowed pairwise encryption
  * algorithm list.
  *
- * Returns: %TRUE if the encryption algorith was found and removed; %FALSE if it was not.
+ * Returns: %TRUE if the encryption algorithm was found and removed; %FALSE if it was not.
  *
  * Since: 0.9.10
  **/
diff --git a/libnm-util/nm-setting-wireless-security.h b/libnm-util/nm-setting-wireless-security.h
index 1140582b..cbeeb9bf 100644
--- a/libnm-util/nm-setting-wireless-security.h
+++ b/libnm-util/nm-setting-wireless-security.h
@@ -79,9 +79,9 @@ GQuark nm_setting_wireless_security_error_quark (void);
  * @NM_WEP_KEY_TYPE_LAST: placeholder value for bounds-checking
  *
  * The #NMWepKeyType values specify how any WEP keys present in the setting
- * are intepreted.  There are no standards governing how to hash the various WEP
+ * are interpreted.  There are no standards governing how to hash the various WEP
  * key/passphrase formats into the actual WEP key.  Unfortunately some WEP keys
- * can be interpreted in multiple ways, requring the setting to specify how to
+ * can be interpreted in multiple ways, requiring the setting to specify how to
  * interpret the any WEP keys.  For example, the key "732f2d712e4a394a375d366931"
  * is both a valid Hexadecimal WEP key and a WEP passphrase.  Further, many
  * ASCII keys are also valid WEP passphrases, but since passphrases and ASCII
diff --git a/libnm-util/nm-setting.c b/libnm-util/nm-setting.c
index 9147dfe1..3edf4005 100644
--- a/libnm-util/nm-setting.c
+++ b/libnm-util/nm-setting.c
@@ -650,7 +650,7 @@ nm_setting_compare (NMSetting *a,
 	return same;
 }
 
-static inline gboolean
+static gboolean
 should_compare_prop (NMSetting *setting,
                      const char *prop_name,
                      NMSettingCompareFlags comp_flags,
@@ -674,7 +674,7 @@ should_compare_prop (NMSetting *setting,
 		    && g_strcmp0 (prop_name, NM_SETTING_VPN_SECRETS) == 0) {
 			/* FIXME: NMSettingVPN:NM_SETTING_VPN_SECRETS has NM_SETTING_PARAM_SECRET.
 			 * nm_setting_get_secret_flags() quite possibly fails, but it might succeed if the
-			 * setting accidently uses a key "secrets". */
+			 * setting accidentally uses a key "secrets". */
 			return FALSE;
 		}
 
diff --git a/libnm-util/nm-setting.h b/libnm-util/nm-setting.h
index d235efbd..d70445a2 100644
--- a/libnm-util/nm-setting.h
+++ b/libnm-util/nm-setting.h
@@ -91,7 +91,7 @@ GQuark nm_setting_error_quark (void);
  * should be requested from the user each time it is needed
  * @NM_SETTING_SECRET_FLAG_NOT_REQUIRED: in situations where it cannot be
  * automatically determined that the secret is required (some VPNs and PPP
- * providers dont require all secrets) this flag indicates that the specific
+ * providers don't require all secrets) this flag indicates that the specific
  * secret is not required
  *
  * These flags indicate specific behavior related to handling of a secret.  Each
diff --git a/libnm-util/nm-utils.c b/libnm-util/nm-utils.c
index 054d69f4..eae80a04 100644
--- a/libnm-util/nm-utils.c
+++ b/libnm-util/nm-utils.c
@@ -103,7 +103,7 @@ static const struct IsoLangToEncodings isoLangEntries2[] =
 	{ "bg",         {"windows-1251","koi8-r",               "iso-8859-5"} },        /* Bulgarian */
 	{ "mk",         {"koi8-r",      "windows-1251", "iso-8859-5"} },        /* Macedonian */
 	{ "sr",         {"koi8-r",      "windows-1251", "iso-8859-5"} },        /* Serbian */
-	{ "uk",         {"koi8-u",      "koi8-r",                       "windows-1251"} },      /* Ukranian */
+	{ "uk",         {"koi8-u",      "koi8-r",                       "windows-1251"} },      /* Ukrainian */
 
 	/* Arabic */
 	{ "ar",         {"iso-8859-6",  "windows-1256", NULL} },
@@ -600,7 +600,7 @@ device_supports_ap_ciphers (guint32 dev_caps,
 
 /**
  * nm_utils_ap_mode_security_valid:
- * @type: the security type to check device capabilties against,
+ * @type: the security type to check device capabilities against,
  * e.g. #NMU_SEC_STATIC_WEP
  * @wifi_caps: bitfield of the capabilities of the specific Wi-Fi device, e.g.
  * #NM_WIFI_DEVICE_CAP_CIPHER_WEP40
@@ -638,16 +638,16 @@ nm_utils_ap_mode_security_valid (NMUtilsSecurityType type,
 
 /**
  * nm_utils_security_valid:
- * @type: the security type to check AP flags and device capabilties against,
+ * @type: the security type to check AP flags and device capabilities against,
  * e.g. #NMU_SEC_STATIC_WEP
  * @wifi_caps: bitfield of the capabilities of the specific Wi-Fi device, e.g.
  * #NM_WIFI_DEVICE_CAP_CIPHER_WEP40
  * @have_ap: whether the @ap_flags, @ap_wpa, and @ap_rsn arguments are valid
  * @adhoc: whether the capabilities being tested are from an Ad-Hoc AP (IBSS)
  * @ap_flags: bitfield of AP capabilities, e.g. #NM_802_11_AP_FLAGS_PRIVACY
- * @ap_wpa: bitfield of AP capabilties derived from the AP's WPA beacon,
+ * @ap_wpa: bitfield of AP capabilities derived from the AP's WPA beacon,
  * e.g. (#NM_802_11_AP_SEC_PAIR_TKIP | #NM_802_11_AP_SEC_KEY_MGMT_PSK)
- * @ap_rsn: bitfield of AP capabilties derived from the AP's RSN/WPA2 beacon,
+ * @ap_rsn: bitfield of AP capabilities derived from the AP's RSN/WPA2 beacon,
  * e.g. (#NM_802_11_AP_SEC_PAIR_CCMP | #NM_802_11_AP_SEC_PAIR_TKIP)
  *
  * Given a set of device capabilities, and a desired security type to check
@@ -657,7 +657,7 @@ nm_utils_ap_mode_security_valid (NMUtilsSecurityType type,
  * NOTE: this function cannot handle checking security for AP/Hotspot mode;
  * use nm_utils_ap_mode_security_valid() instead.
  *
- * Returns: %TRUE if the device capabilities and AP capabilties intersect and are
+ * Returns: %TRUE if the device capabilities and AP capabilities intersect and are
  * compatible with the desired @type, %FALSE if they are not
  **/
 gboolean
@@ -1736,7 +1736,7 @@ nm_utils_file_is_pkcs12 (const char *filename)
  * @predicate: (scope call): if given, pass the file name to this function
  *   for additional checks. This check is performed after the check for
  *   @file_test_flags. You cannot omit both @file_test_flags and @predicate.
- * @user_data: (closure): (allow-none): user data for @predicate function.
+ * @user_data: (closure) (allow-none): user data for @predicate function.
  * @error: (allow-none): on failure, set a "not found" error %G_IO_ERROR %G_IO_ERROR_NOT_FOUND.
  *
  * Searches for a @progname file in a list of search @paths.
diff --git a/libnm-util/tests/meson.build b/libnm-util/tests/meson.build
index 49c35a51..5e8b84fa 100644
--- a/libnm-util/tests/meson.build
+++ b/libnm-util/tests/meson.build
@@ -2,7 +2,7 @@ deps = [
   dbus_dep,
   dbus_glib_dep,
   libnm_util_dep,
-  shared_dep
+  shared_nm_utils_base_dep,
 ]
 
 cflags = common_cflags + [
@@ -15,7 +15,7 @@ test_libnm_linking = executable(
   test,
   test + '.c',
   dependencies: deps + [libnm_dep],
-  c_args: cflags
+  c_args: cflags,
 )
 
 test_units = [
@@ -24,7 +24,7 @@ test_units = [
   ['test-secrets', [], []],
   ['test-setting-8021x', [], []],
   ['test-setting-dcb', [], []],
-  ['test-settings-defaults', [], []]
+  ['test-settings-defaults', [], []],
 ]
 
 foreach test_unit: test_units
@@ -34,12 +34,12 @@ foreach test_unit: test_units
     dependencies: deps,
     c_args: cflags,
     link_with: test_unit[1],
-    link_depends: test_unit[2]
+    link_depends: test_unit[2],
   )
 
   test(
     'libnm-util/' + test_unit[0],
     test_script,
-    args: test_args + [exe.full_path()]
+    args: test_args + [exe.full_path()],
   )
 endforeach
diff --git a/libnm-util/tests/test-general.c b/libnm-util/tests/test-general.c
index 304797a9..9e097f19 100644
--- a/libnm-util/tests/test-general.c
+++ b/libnm-util/tests/test-general.c
@@ -2314,7 +2314,7 @@ test_connection_verify_sets_interface_name (void)
 
 	g_assert_cmpstr (nm_connection_get_interface_name (con), ==, NULL);
 
-	/* for backward compatiblity, normalizes the interface name */
+	/* for backward compatibility, normalizes the interface name */
 	success = nm_connection_verify (con, &error);
 	g_assert (success && !error);
 
@@ -2373,7 +2373,7 @@ test_connection_normalize_virtual_iface_name (void)
 	g_assert_cmpstr (nm_connection_get_interface_name (con), ==, IFACE_NAME);
 	g_assert_cmpstr (nm_setting_vlan_get_interface_name (s_vlan), ==, IFACE_VIRT);
 
-	/* for backward compatiblity, normalizes the interface name */
+	/* for backward compatibility, normalizes the interface name */
 	success = nm_connection_verify (con, &error);
 	g_assert (success && !error);
 
diff --git a/libnm/NetworkManager.h b/libnm/NetworkManager.h
index 759a4131..7c70a226 100644
--- a/libnm/NetworkManager.h
+++ b/libnm/NetworkManager.h
@@ -43,14 +43,15 @@
 #include "nm-device-macvlan.h"
 #include "nm-device-modem.h"
 #include "nm-device-olpc-mesh.h"
+#include "nm-device-ovs-bridge.h"
 #include "nm-device-ovs-interface.h"
 #include "nm-device-ovs-port.h"
-#include "nm-device-ovs-bridge.h"
 #include "nm-device-ppp.h"
 #include "nm-device-team.h"
 #include "nm-device-tun.h"
 #include "nm-device-vlan.h"
 #include "nm-device-vxlan.h"
+#include "nm-device-wifi-p2p.h"
 #include "nm-device-wifi.h"
 #include "nm-device-wimax.h"
 #include "nm-device-wireguard.h"
@@ -88,6 +89,7 @@
 #include "nm-setting-ovs-interface.h"
 #include "nm-setting-ovs-patch.h"
 #include "nm-setting-ovs-port.h"
+#include "nm-setting-wifi-p2p.h"
 #include "nm-setting-ppp.h"
 #include "nm-setting-pppoe.h"
 #include "nm-setting-proxy.h"
@@ -103,6 +105,7 @@
 #include "nm-setting-vxlan.h"
 #include "nm-setting-wimax.h"
 #include "nm-setting-wired.h"
+#include "nm-setting-wireguard.h"
 #include "nm-setting-wireless.h"
 #include "nm-setting-wireless-security.h"
 #include "nm-setting-wpan.h"
@@ -116,6 +119,7 @@
 #include "nm-vpn-editor-plugin.h"
 #include "nm-vpn-plugin-info.h"
 #include "nm-vpn-service-plugin.h"
+#include "nm-wifi-p2p-peer.h"
 #include "nm-wimax-nsp.h"
 
 #include "nm-autoptr.h"
diff --git a/libnm/fake-typelib/meson.build b/libnm/fake-typelib/meson.build
index c0a779a2..fdbb2920 100644
--- a/libnm/fake-typelib/meson.build
+++ b/libnm/fake-typelib/meson.build
@@ -2,7 +2,7 @@ g_ir_compiler = find_program('g-ir-compiler')
 
 girs = [
   'NetworkManager',
-  'NMClient'
+  'NMClient',
 ]
 
 resource_data = []
@@ -14,17 +14,17 @@ foreach gir: girs
     gir_typelib,
     input: gir + '.gir',
     output: gir_typelib,
-    command: [g_ir_compiler, '@INPUT@', '-o', '@OUTPUT@']
+    command: [g_ir_compiler, '@INPUT@', '-o', '@OUTPUT@'],
   )
 endforeach
 
 resource = 'typelibs'
 
-sources += gnome.compile_resources(
+libnm_utils_sources += gnome.compile_resources(
   resource,
   resource + '.gresource.xml',
   source_dir: '.',
   dependencies: resource_data,
   extra_args: '--manual-register',
-  export: true
+  export: true,
 )
diff --git a/libnm/generate-plugin-docs.pl b/libnm/generate-plugin-docs.pl
index e4963b7c..74e2126c 100755
--- a/libnm/generate-plugin-docs.pl
+++ b/libnm/generate-plugin-docs.pl
@@ -60,7 +60,7 @@ open $fo, '>', $output or die "Can't open $output: $!";
 # write XML header
 write_header();
 
-# write generated documenation for each setting
+# write generated documentation for each setting
 foreach my $c_file (@source_files) {
   my $setting_name = get_setting_name($c_file);
   if ($setting_name) {
diff --git a/libnm/libnm.ver b/libnm/libnm.ver
index 1f76dc0f..ece9686e 100644
--- a/libnm/libnm.ver
+++ b/libnm/libnm.ver
@@ -1444,3 +1444,77 @@ global:
 	nm_utils_sriov_vf_from_str;
 	nm_utils_sriov_vf_to_str;
 } libnm_1_12_0;
+
+libnm_1_16_0 {
+global:
+	nm_client_add_and_activate_connection2;
+	nm_client_add_and_activate_connection2_finish;
+	nm_device_get_connectivity;
+	nm_device_wifi_p2p_get_hw_address;
+	nm_device_wifi_p2p_get_peers;
+	nm_device_wifi_p2p_get_type;
+	nm_device_wifi_p2p_start_find;
+	nm_device_wifi_p2p_start_find_finish;
+	nm_device_wifi_p2p_stop_find;
+	nm_device_wifi_p2p_stop_find_finish;
+	nm_setting_wifi_p2p_get_peer;
+	nm_setting_wifi_p2p_get_type;
+	nm_setting_wifi_p2p_get_wfd_ies;
+	nm_setting_wifi_p2p_get_wps_method;
+	nm_setting_wifi_p2p_new;
+	nm_setting_wireguard_append_peer;
+	nm_setting_wireguard_clear_peers;
+	nm_setting_wireguard_get_fwmark;
+	nm_setting_wireguard_get_listen_port;
+	nm_setting_wireguard_get_mtu;
+	nm_setting_wireguard_get_peer;
+	nm_setting_wireguard_get_peer_by_public_key;
+	nm_setting_wireguard_get_peer_routes;
+	nm_setting_wireguard_get_peers_len;
+	nm_setting_wireguard_get_private_key;
+	nm_setting_wireguard_get_private_key_flags;
+	nm_setting_wireguard_get_type;
+	nm_setting_wireguard_new;
+	nm_setting_wireguard_remove_peer;
+	nm_setting_wireguard_set_peer;
+	nm_team_link_watcher_get_vlanid;
+	nm_team_link_watcher_new_arp_ping2;
+	nm_utils_base64secret_decode;
+	nm_wifi_p2p_peer_connection_valid;
+	nm_wifi_p2p_peer_filter_connections;
+	nm_wifi_p2p_peer_get_flags;
+	nm_wifi_p2p_peer_get_hw_address;
+	nm_wifi_p2p_peer_get_last_seen;
+	nm_wifi_p2p_peer_get_manufacturer;
+	nm_wifi_p2p_peer_get_model;
+	nm_wifi_p2p_peer_get_model_number;
+	nm_wifi_p2p_peer_get_name;
+	nm_wifi_p2p_peer_get_serial;
+	nm_wifi_p2p_peer_get_strength;
+	nm_wifi_p2p_peer_get_type;
+	nm_wifi_p2p_peer_get_wfd_ies;
+	nm_wireguard_peer_append_allowed_ip;
+	nm_wireguard_peer_clear_allowed_ips;
+	nm_wireguard_peer_cmp;
+	nm_wireguard_peer_get_allowed_ip;
+	nm_wireguard_peer_get_allowed_ips_len;
+	nm_wireguard_peer_get_endpoint;
+	nm_wireguard_peer_get_persistent_keepalive;
+	nm_wireguard_peer_get_preshared_key;
+	nm_wireguard_peer_get_preshared_key_flags;
+	nm_wireguard_peer_get_public_key;
+	nm_wireguard_peer_get_type;
+	nm_wireguard_peer_is_sealed;
+	nm_wireguard_peer_is_valid;
+	nm_wireguard_peer_new;
+	nm_wireguard_peer_new_clone;
+	nm_wireguard_peer_ref;
+	nm_wireguard_peer_remove_allowed_ip;
+	nm_wireguard_peer_seal;
+	nm_wireguard_peer_set_endpoint;
+	nm_wireguard_peer_set_persistent_keepalive;
+	nm_wireguard_peer_set_preshared_key;
+	nm_wireguard_peer_set_preshared_key_flags;
+	nm_wireguard_peer_set_public_key;
+	nm_wireguard_peer_unref;
+} libnm_1_14_0;
diff --git a/libnm/meson.build b/libnm/meson.build
index 62e37993..558a587b 100644
--- a/libnm/meson.build
+++ b/libnm/meson.build
@@ -1,17 +1,18 @@
 libnm_inc = include_directories('.')
 
-sources = files('nm-libnm-utils.c')
-
-deps = [
-  libnmdbus_dep,
-  shared_dep
-]
-
 cflags = [
   '-DG_LOG_DOMAIN="@0@"'.format(libnm_name),
   '-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIBNM',
 ]
 
+libnm_utils_sources = files('nm-libnm-utils.c')
+
+deps = [
+  libnmdbus_dep,
+  shared_nm_utils_base_dep,
+  nm_core_dep,
+]
+
 if have_fake_typelibs
   deps += gir_dep
   subdir('fake-typelib')
@@ -19,10 +20,10 @@ endif
 
 libnm_utils = static_library(
   'nm-utils',
-  sources: sources,
+  sources: libnm_utils_sources,
   include_directories: libnm_core_inc,
   dependencies: deps,
-  c_args: cflags
+  c_args: cflags,
 )
 
 libnm_headers = files(
@@ -40,25 +41,26 @@ libnm_headers = files(
   'nm-device-dummy.h',
   'nm-device-ethernet.h',
   'nm-device-generic.h',
-  'nm-device.h',
   'nm-device-infiniband.h',
   'nm-device-ip-tunnel.h',
   'nm-device-macsec.h',
   'nm-device-macvlan.h',
   'nm-device-modem.h',
   'nm-device-olpc-mesh.h',
+  'nm-device-ovs-bridge.h',
   'nm-device-ovs-interface.h',
   'nm-device-ovs-port.h',
-  'nm-device-ovs-bridge.h',
   'nm-device-ppp.h',
   'nm-device-team.h',
   'nm-device-tun.h',
   'nm-device-vlan.h',
   'nm-device-vxlan.h',
+  'nm-device-wifi-p2p.h',
   'nm-device-wifi.h',
   'nm-device-wimax.h',
   'nm-device-wireguard.h',
   'nm-device-wpan.h',
+  'nm-device.h',
   'nm-dhcp-config.h',
   'nm-ip-config.h',
   'nm-object.h',
@@ -69,12 +71,13 @@ libnm_headers = files(
   'nm-vpn-editor.h',
   'nm-vpn-plugin-old.h',
   'nm-vpn-service-plugin.h',
-  'nm-wimax-nsp.h'
+  'nm-wifi-p2p-peer.h',
+  'nm-wimax-nsp.h',
 )
 
 install_headers(
   libnm_core_headers + libnm_headers + [version_header],
-  subdir: libnm_name
+  subdir: libnm_name,
 )
 
 enum_headers = libnm_headers + [version_header]
@@ -87,7 +90,7 @@ libnm_enum = gnome.mkenums(
   c_template: enum_types + '.c.template',
   h_template: enum_types + '.h.template',
   install_header: true,
-  install_dir: libnm_pkgincludedir
+  install_dir: libnm_pkgincludedir,
 )
 
 libnm_sources = files(
@@ -101,7 +104,6 @@ libnm_sources = files(
   'nm-device-bond.c',
   'nm-device-bridge.c',
   'nm-device-bt.c',
-  'nm-device.c',
   'nm-device-dummy.c',
   'nm-device-ethernet.c',
   'nm-device-generic.c',
@@ -111,18 +113,20 @@ libnm_sources = files(
   'nm-device-macvlan.c',
   'nm-device-modem.c',
   'nm-device-olpc-mesh.c',
+  'nm-device-ovs-bridge.c',
   'nm-device-ovs-interface.c',
   'nm-device-ovs-port.c',
-  'nm-device-ovs-bridge.c',
   'nm-device-ppp.c',
   'nm-device-team.c',
   'nm-device-tun.c',
   'nm-device-vlan.c',
   'nm-device-vxlan.c',
+  'nm-device-wifi-p2p.c',
   'nm-device-wifi.c',
   'nm-device-wimax.c',
   'nm-device-wireguard.c',
   'nm-device-wpan.c',
+  'nm-device.c',
   'nm-dhcp-config.c',
   'nm-dhcp4-config.c',
   'nm-dhcp6-config.c',
@@ -136,19 +140,13 @@ libnm_sources = files(
   'nm-remote-settings.c',
   'nm-secret-agent-old.c',
   'nm-vpn-connection.c',
-  'nm-vpn-plugin-old.c',
   'nm-vpn-editor.c',
+  'nm-vpn-plugin-old.c',
   'nm-vpn-service-plugin.c',
-  'nm-wimax-nsp.c'
+  'nm-wifi-p2p-peer.c',
+  'nm-wimax-nsp.c',
 )
 
-deps = [
-  dl_dep,
-  libudev_dep,
-  shared_dep,
-  uuid_dep
-]
-
 linker_script = join_paths(meson.current_source_dir(), 'libnm.ver')
 
 
@@ -157,7 +155,14 @@ libnm = shared_library(
   sources: libnm_sources + libnm_enum,
   version: libnm_version,
   include_directories: libnm_core_inc,
-  dependencies: deps,
+  dependencies: [
+    dl_dep,
+    libudev_dep,
+    shared_nm_utils_base_dep,
+    nm_core_dep,
+    uuid_dep,
+    libnm_systemd_shared_no_logging_dep,
+  ],
   c_args: cflags,
   link_with: libnm_utils,
   link_whole: libnm_core,
@@ -165,13 +170,13 @@ libnm = shared_library(
     '-Wl,--version-script,@0@'.format(linker_script),
   ],
   link_depends: linker_script,
-  install: true
+  install: true,
 )
 
 libnm_dep = declare_dependency(
   sources: libnm_enum[1],
   include_directories: libnm_inc,
-  link_with: libnm
+  link_with: libnm,
 )
 
 pkg.generate(
@@ -184,8 +189,8 @@ pkg.generate(
   requires: 'gio-2.0',
   variables: [
     'exec_prefix=${prefix}',
-    'vpnservicedir=' + join_paths('${prefix}', 'lib', nm_name, 'VPN')
-  ]
+    'vpnservicedir=' + join_paths('${prefix}', 'lib', nm_name, 'VPN'),
+  ],
 )
 
 test(
@@ -208,7 +213,7 @@ if enable_introspection
     includes: 'Gio-2.0',
     extra_args: cflags,
     header: 'NetworkManager.h',
-    install: true
+    install: true,
   )
 
   generate_plugin_docs = join_paths(meson.current_source_dir(), 'generate-plugin-docs.pl')
@@ -218,7 +223,7 @@ if enable_introspection
     name,
     input: libnm_core_settings_sources,
     output: name,
-    command: [perl, generate_plugin_docs, 'keyfile', '@OUTPUT@', '@INPUT@']
+    command: [perl, generate_plugin_docs, 'keyfile', '@OUTPUT@', '@INPUT@'],
   )
 
   name = 'nm-settings-docs-overrides.xml'
@@ -226,7 +231,7 @@ if enable_introspection
     name,
     input: libnm_core_settings_sources,
     output: name,
-    command: [perl, generate_plugin_docs, 'dbus', '@OUTPUT@', '@INPUT@']
+    command: [perl, generate_plugin_docs, 'dbus', '@OUTPUT@', '@INPUT@'],
   )
 
   if enable_ifcfg_rh
@@ -235,7 +240,7 @@ if enable_introspection
       name,
       input: libnm_core_settings_sources,
       output: name,
-      command: [perl, generate_plugin_docs, 'ifcfg-rh', '@OUTPUT@', '@INPUT@']
+      command: [perl, generate_plugin_docs, 'ifcfg-rh', '@OUTPUT@', '@INPUT@'],
     )
   endif
 
@@ -256,7 +261,7 @@ if enable_introspection
   generate_setting_docs_env = [
     'env', '-i',
     'GI_TYPELIB_PATH=' + gi_typelib_path,
-    'LD_LIBRARY_PATH=' + ld_library_path
+    'LD_LIBRARY_PATH=' + ld_library_path,
   ]
 
   name = 'nm-property-docs.xml'
@@ -265,7 +270,7 @@ if enable_introspection
     input: libnm_gir[0],
     output: name,
     command: [generate_setting_docs_env, generate_setting_docs, '--lib-path', meson.current_build_dir(), '--gir', '@INPUT@', '--output', '@OUTPUT@'],
-    depends: libnm_gir
+    depends: libnm_gir,
   )
 
   name = 'nm-settings-docs.xml'
@@ -274,7 +279,7 @@ if enable_introspection
     input: libnm_gir[0],
     output: name,
     command: [generate_setting_docs_env, generate_setting_docs, '--lib-path', meson.current_build_dir(), '--gir', '@INPUT@', '--overrides', nm_settings_docs_overrides, '--output', '@OUTPUT@'],
-    depends: libnm_gir
+    depends: libnm_gir,
   )
 endif
 
diff --git a/libnm/nm-access-point.c b/libnm/nm-access-point.c
index 25281c92..ac00d6e1 100644
--- a/libnm/nm-access-point.c
+++ b/libnm/nm-access-point.c
@@ -23,8 +23,6 @@
 
 #include "nm-access-point.h"
 
-#include 
-
 #include "nm-connection.h"
 #include "nm-setting-connection.h"
 #include "nm-setting-wireless.h"
diff --git a/libnm/nm-active-connection.c b/libnm/nm-active-connection.c
index 0314667f..fdade4bc 100644
--- a/libnm/nm-active-connection.c
+++ b/libnm/nm-active-connection.c
@@ -21,10 +21,9 @@
 
 #include "nm-default.h"
 
-#include 
+#include "nm-active-connection.h"
 
 #include "nm-dbus-interface.h"
-#include "nm-active-connection.h"
 #include "nm-object-private.h"
 #include "nm-core-internal.h"
 #include "nm-device.h"
@@ -795,7 +794,12 @@ nm_active_connection_class_init (NMActiveConnectionClass *ap_class)
 		                      G_PARAM_READABLE |
 		                      G_PARAM_STATIC_STRINGS));
 
-	/* signals */
+	/**
+	 * NMActiveConnection::state-changed:
+	 * @active_connection: the source #NMActiveConnection
+	 * @state: the new state number (#NMActiveConnectionState)
+	 * @reason: the state change reason (#NMActiveConnectionStateReason)
+	 */
 	signals[STATE_CHANGED] =
 		g_signal_new ("state-changed",
 		              G_OBJECT_CLASS_TYPE (object_class),
diff --git a/libnm/nm-autoptr.h b/libnm/nm-autoptr.h
index e96a03a0..40248dcd 100644
--- a/libnm/nm-autoptr.h
+++ b/libnm/nm-autoptr.h
@@ -51,11 +51,11 @@ G_DEFINE_AUTOPTR_CLEANUP_FUNC (NMSettingDummy, g_object_unref)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC (NMSettingEthtool, g_object_unref)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC (NMSettingGeneric, g_object_unref)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC (NMSettingGsm, g_object_unref)
-G_DEFINE_AUTOPTR_CLEANUP_FUNC (NMSettingInfiniband, g_object_unref)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC (NMSettingIP4Config, g_object_unref)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC (NMSettingIP6Config, g_object_unref)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC (NMSettingIPConfig, g_object_unref)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC (NMSettingIPTunnel, g_object_unref)
+G_DEFINE_AUTOPTR_CLEANUP_FUNC (NMSettingInfiniband, g_object_unref)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC (NMSettingMacsec, g_object_unref)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC (NMSettingMacvlan, g_object_unref)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC (NMSettingMatch, g_object_unref)
@@ -77,8 +77,10 @@ G_DEFINE_AUTOPTR_CLEANUP_FUNC (NMSettingUser, g_object_unref)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC (NMSettingVlan, g_object_unref)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC (NMSettingVpn, g_object_unref)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC (NMSettingVxlan, g_object_unref)
+G_DEFINE_AUTOPTR_CLEANUP_FUNC (NMSettingWifiP2P, g_object_unref)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC (NMSettingWimax, g_object_unref)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC (NMSettingWired, g_object_unref)
+G_DEFINE_AUTOPTR_CLEANUP_FUNC (NMSettingWireGuard, g_object_unref)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC (NMSettingWireless, g_object_unref)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC (NMSettingWirelessSecurity, g_object_unref)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC (NMSettingWpan, g_object_unref)
diff --git a/libnm/nm-checkpoint.c b/libnm/nm-checkpoint.c
index ce15d087..0dde238e 100644
--- a/libnm/nm-checkpoint.c
+++ b/libnm/nm-checkpoint.c
@@ -91,7 +91,7 @@ nm_checkpoint_get_created (NMCheckpoint *checkpoint)
  * nm_checkpoint_get_rollback_timeout:
  * @checkpoint: a #NMCheckpoint
  *
- * Gets the the timeout in seconds for automatic rollback.
+ * Gets the timeout in seconds for automatic rollback.
  *
  * Returns: the rollback timeout.
  *
diff --git a/libnm/nm-client.c b/libnm/nm-client.c
index 1da22540..14bca3c3 100644
--- a/libnm/nm-client.c
+++ b/libnm/nm-client.c
@@ -21,11 +21,11 @@
 
 #include "nm-default.h"
 
-#include 
+#include "nm-client.h"
+
 #include 
 
 #include "nm-utils.h"
-#include "nm-client.h"
 #include "nm-manager.h"
 #include "nm-dns-manager.h"
 #include "nm-remote-settings.h"
@@ -41,6 +41,7 @@
 
 #include "introspection/org.freedesktop.NetworkManager.h"
 #include "introspection/org.freedesktop.NetworkManager.Device.Wireless.h"
+#include "introspection/org.freedesktop.NetworkManager.Device.WifiP2P.h"
 #include "introspection/org.freedesktop.NetworkManager.Device.h"
 #include "introspection/org.freedesktop.NetworkManager.DnsManager.h"
 #include "introspection/org.freedesktop.NetworkManager.Settings.h"
@@ -65,24 +66,26 @@
 #include "nm-device-macvlan.h"
 #include "nm-device-modem.h"
 #include "nm-device-olpc-mesh.h"
+#include "nm-device-ovs-bridge.h"
 #include "nm-device-ovs-interface.h"
 #include "nm-device-ovs-port.h"
-#include "nm-device-ovs-bridge.h"
 #include "nm-device-ppp.h"
 #include "nm-device-team.h"
 #include "nm-device-tun.h"
 #include "nm-device-vlan.h"
 #include "nm-device-vxlan.h"
+#include "nm-device-wifi-p2p.h"
 #include "nm-device-wifi.h"
 #include "nm-device-wimax.h"
 #include "nm-device-wireguard.h"
 #include "nm-device-wpan.h"
+#include "nm-dhcp-config.h"
 #include "nm-dhcp4-config.h"
 #include "nm-dhcp6-config.h"
-#include "nm-dhcp-config.h"
 #include "nm-ip4-config.h"
 #include "nm-ip6-config.h"
 #include "nm-manager.h"
+#include "nm-wifi-p2p-peer.h"
 #include "nm-remote-connection.h"
 #include "nm-remote-settings.h"
 #include "nm-vpn-connection.h"
@@ -1163,18 +1166,20 @@ add_activate_cb (GObject *object,
                  GAsyncResult *result,
                  gpointer user_data)
 {
-	GSimpleAsyncResult *simple = user_data;
-	NMActiveConnection *ac;
+	gs_unref_object GSimpleAsyncResult *simple = user_data;
+	gs_unref_variant GVariant *result_data = NULL;
+	gs_unref_object NMActiveConnection *ac = NULL;
 	GError *error = NULL;
 
-	ac = nm_manager_add_and_activate_connection_finish (NM_MANAGER (object), result, &error);
-	if (ac)
-		g_simple_async_result_set_op_res_gpointer (simple, ac, g_object_unref);
-	else
+	ac = nm_manager_add_and_activate_connection_finish (NM_MANAGER (object), result, &result_data, &error);
+	if (ac) {
+		g_simple_async_result_set_op_res_gpointer (simple,
+		                                           _nm_activate_result_new (ac, result_data),
+		                                           (GDestroyNotify) _nm_activate_result_free);
+	} else
 		g_simple_async_result_take_error (simple, error);
 
 	g_simple_async_result_complete (simple);
-	g_object_unref (simple);
 }
 
 /**
@@ -1233,8 +1238,14 @@ nm_client_add_and_activate_connection_async (NMClient *client,
 	if (cancellable)
 		g_simple_async_result_set_check_cancellable (simple, cancellable);
 	nm_manager_add_and_activate_connection_async (NM_CLIENT_GET_PRIVATE (client)->manager,
-	                                              partial, device, specific_object,
-	                                              cancellable, add_activate_cb, simple);
+	                                              partial,
+	                                              device,
+	                                              specific_object,
+	                                              NULL,
+	                                              FALSE,
+	                                              cancellable,
+	                                              add_activate_cb,
+	                                              simple);
 }
 
 /**
@@ -1257,6 +1268,7 @@ nm_client_add_and_activate_connection_finish (NMClient *client,
                                               GError **error)
 {
 	GSimpleAsyncResult *simple;
+	_NMActivateResult *r;
 
 	g_return_val_if_fail (NM_IS_CLIENT (client), NULL);
 	g_return_val_if_fail (G_IS_SIMPLE_ASYNC_RESULT (result), NULL);
@@ -1264,8 +1276,128 @@ nm_client_add_and_activate_connection_finish (NMClient *client,
 	simple = G_SIMPLE_ASYNC_RESULT (result);
 	if (g_simple_async_result_propagate_error (simple, error))
 		return NULL;
-	else
-		return g_object_ref (g_simple_async_result_get_op_res_gpointer (simple));
+	r = g_simple_async_result_get_op_res_gpointer (simple);
+	return g_object_ref (r->active);
+}
+
+/**
+ * nm_client_add_and_activate_connection2:
+ * @client: a #NMClient
+ * @partial: (allow-none): an #NMConnection to add; the connection may be
+ *   partially filled (or even %NULL) and will be completed by NetworkManager
+ *   using the given @device and @specific_object before being added
+ * @device: the #NMDevice
+ * @specific_object: (allow-none): the object path of a connection-type-specific
+ *   object this activation should use. This parameter is currently ignored for
+ *   wired and mobile broadband connections, and the value of %NULL should be used
+ *   (ie, no specific object).  For Wi-Fi or WiMAX connections, pass the object
+ *   path of a #NMAccessPoint or #NMWimaxNsp owned by @device, which you can
+ *   get using nm_object_get_path(), and which will be used to complete the
+ *   details of the newly added connection.
+ * @options: a #GVariant containing a dictionary with options, or %NULL
+ * @cancellable: a #GCancellable, or %NULL
+ * @callback: callback to be called when the activation has started
+ * @user_data: caller-specific data passed to @callback
+ *
+ * Adds a new connection using the given details (if any) as a template,
+ * automatically filling in missing settings with the capabilities of the given
+ * device and specific object.  The new connection is then asynchronously
+ * activated as with nm_client_activate_connection_async(). Cannot be used for
+ * VPN connections at this time.
+ *
+ * Note that the callback is invoked when NetworkManager has started activating
+ * the new connection, not when it finishes. You can used the returned
+ * #NMActiveConnection object (in particular, #NMActiveConnection:state) to
+ * track the activation to its completion.
+ *
+ * This is identitcal to nm_client_add_and_activate_connection_async() but takes
+ * a further @options parameter. Currently the following options are supported
+ * by the daemon:
+ *  * "persist": A string describing how the connection should be stored.
+ *               The default is "disk", but it can be modified to "memory" (until
+ *               the daemon quits) or "volatile" (will be deleted on disconnect).
+ *  * "bind-activation": Bind the connection lifetime to something. The default is "none",
+ *            meaning an explicit disconnect is needed. The value "dbus-client"
+ *            means the connection will automatically be deactivated when the calling
+ *            DBus client disappears from the system bus.
+ *
+ * Since: 1.16
+ **/
+void
+nm_client_add_and_activate_connection2 (NMClient *client,
+                                        NMConnection *partial,
+                                        NMDevice *device,
+                                        const char *specific_object,
+                                        GVariant *options,
+                                        GCancellable *cancellable,
+                                        GAsyncReadyCallback callback,
+                                        gpointer user_data)
+{
+	GSimpleAsyncResult *simple;
+	GError *error = NULL;
+
+	g_return_if_fail (NM_IS_CLIENT (client));
+	g_return_if_fail (NM_IS_DEVICE (device));
+	if (partial)
+		g_return_if_fail (NM_IS_CONNECTION (partial));
+
+	if (!_nm_client_check_nm_running (client, &error)) {
+		g_simple_async_report_take_gerror_in_idle (G_OBJECT (client), callback, user_data, error);
+		return;
+	}
+
+	simple = g_simple_async_result_new (G_OBJECT (client), callback, user_data,
+	                                    nm_client_add_and_activate_connection2);
+	if (cancellable)
+		g_simple_async_result_set_check_cancellable (simple, cancellable);
+	nm_manager_add_and_activate_connection_async (NM_CLIENT_GET_PRIVATE (client)->manager,
+	                                              partial,
+	                                              device,
+	                                              specific_object,
+	                                              options,
+	                                              TRUE,
+	                                              cancellable,
+	                                              add_activate_cb,
+	                                              simple);
+}
+
+/**
+ * nm_client_add_and_activate_connection2_finish:
+ * @client: an #NMClient
+ * @result: the result passed to the #GAsyncReadyCallback
+ * @error: location for a #GError, or %NULL
+ * @out_result: (allow-none) (transfer full): the output result
+ *   of type "a{sv}" returned by D-Bus' AddAndActivate2 call. Currently no
+ *   output is implemented yet.
+ *
+ * Gets the result of a call to nm_client_add_and_activate_connection2().
+ *
+ * You can call nm_active_connection_get_connection() on the returned
+ * #NMActiveConnection to find the path of the created #NMConnection.
+ *
+ * Returns: (transfer full): the new #NMActiveConnection on success, %NULL on
+ *   failure, in which case @error will be set.
+ **/
+NMActiveConnection *
+nm_client_add_and_activate_connection2_finish (NMClient *client,
+                                               GAsyncResult *result,
+                                               GVariant **out_result,
+                                               GError **error)
+{
+	GSimpleAsyncResult *simple;
+	_NMActivateResult *r;
+
+	g_return_val_if_fail (NM_IS_CLIENT (client), NULL);
+	g_return_val_if_fail (G_IS_SIMPLE_ASYNC_RESULT (result), NULL);
+
+	simple = G_SIMPLE_ASYNC_RESULT (result);
+	if (g_simple_async_result_propagate_error (simple, error)) {
+		NM_SET_OUT (out_result, NULL);
+		return NULL;
+	}
+	r = g_simple_async_result_get_op_res_gpointer (simple);
+	NM_SET_OUT (out_result, nm_g_variant_ref (r->add_and_activate_output));
+	return g_object_ref (r->active);
 }
 
 /**
@@ -2470,7 +2602,7 @@ proxy_type (GDBusObjectManagerClient *manager,
             const char *interface_name,
             gpointer user_data)
 {
-	/* ObjectManager asks us for an object proxy. Unfortunatelly, we can't
+	/* ObjectManager asks us for an object proxy. Unfortunately, we can't
 	 * decide that by interface name and GDBusObjectManager doesn't allow
 	 * us to look at the known interface list. Thus we need to create a
 	 * generic GDBusObject and only couple a NMObject subclass later. */
@@ -2482,6 +2614,8 @@ proxy_type (GDBusObjectManagerClient *manager,
 		return NMDBUS_TYPE_MANAGER_PROXY;
 	else if (strcmp (interface_name, NM_DBUS_INTERFACE_DEVICE_WIRELESS) == 0)
 		return NMDBUS_TYPE_DEVICE_WIFI_PROXY;
+	else if (strcmp (interface_name, NM_DBUS_INTERFACE_DEVICE_WIFI_P2P) == 0)
+		return NMDBUS_TYPE_DEVICE_WIFI_P2P_PROXY;
 	else if (strcmp (interface_name, NM_DBUS_INTERFACE_DEVICE) == 0)
 		return NMDBUS_TYPE_DEVICE_PROXY;
 	else if (strcmp (interface_name, NM_DBUS_INTERFACE_SETTINGS_CONNECTION) == 0)
@@ -2560,6 +2694,8 @@ obj_nm_for_gdbus_object (NMClient *self, GDBusObject *object, GDBusObjectManager
 			type = NM_TYPE_DEVICE_OVS_PORT;
 		else if (strcmp (ifname, NM_DBUS_INTERFACE_DEVICE_OVS_BRIDGE) == 0)
 			type = NM_TYPE_DEVICE_OVS_BRIDGE;
+		else if (strcmp (ifname, NM_DBUS_INTERFACE_DEVICE_WIFI_P2P) == 0)
+			type = NM_TYPE_DEVICE_WIFI_P2P;
 		else if (strcmp (ifname, NM_DBUS_INTERFACE_DEVICE_PPP) == 0)
 			type = NM_TYPE_DEVICE_PPP;
 		else if (strcmp (ifname, NM_DBUS_INTERFACE_DEVICE_TEAM) == 0)
@@ -2586,6 +2722,8 @@ obj_nm_for_gdbus_object (NMClient *self, GDBusObject *object, GDBusObjectManager
 			type = NM_TYPE_IP4_CONFIG;
 		else if (strcmp (ifname, NM_DBUS_INTERFACE_IP6_CONFIG) == 0)
 			type = NM_TYPE_IP6_CONFIG;
+		else if (strcmp (ifname, NM_DBUS_INTERFACE_WIFI_P2P_PEER) == 0)
+			type = NM_TYPE_WIFI_P2P_PEER;
 		else if (strcmp (ifname, NM_DBUS_INTERFACE_SETTINGS_CONNECTION) == 0)
 			type = NM_TYPE_REMOTE_CONNECTION;
 		else if (strcmp (ifname, NM_DBUS_INTERFACE_SETTINGS) == 0)
@@ -3563,15 +3701,10 @@ nm_client_class_init (NMClientClass *client_class)
 		                      G_PARAM_STATIC_STRINGS));
 
 	/**
-	 * NMClient:dns-configuration: (type GPtrArray(GVariant))
+	 * NMClient:dns-configuration: (type GPtrArray(NMDnsEntry))
 	 *
-	 * The current DNS configuration represented as an array of
-	 * dictionaries.  Each dictionary has the "nameservers",
-	 * "priority" keys and, optionally, "interface" and "vpn".
-	 * "nameservers" is the list of DNS servers, "priority" their
-	 * relative priority, "interface" the interface on which these
-	 * servers are contacted, "vpn" a boolean telling whether the
-	 * configuration was obtained from a VPN connection.
+	 * The current DNS configuration, represented as an array
+	 * of #NMDnsEntry objects.
 	 *
 	 * Since: 1.6
 	 **/
diff --git a/libnm/nm-client.h b/libnm/nm-client.h
index 6259b122..edb3ed78 100644
--- a/libnm/nm-client.h
+++ b/libnm/nm-client.h
@@ -107,6 +107,7 @@ G_BEGIN_DECLS
  *  statistics can be globally enabled or disabled
  * @NM_CLIENT_PERMISSION_ENABLE_DISABLE_CONNECTIVITY_CHECK: controls whether
  *  connectivity check can be enabled or disabled
+ * @NM_CLIENT_PERMISSION_WIFI_SCAN: controls whether wifi scans can be performed
  * @NM_CLIENT_PERMISSION_LAST: a reserved boundary value
  *
  * #NMClientPermission values indicate various permissions that NetworkManager
@@ -130,8 +131,9 @@ typedef enum {
 	NM_CLIENT_PERMISSION_CHECKPOINT_ROLLBACK = 14,
 	NM_CLIENT_PERMISSION_ENABLE_DISABLE_STATISTICS = 15,
 	NM_CLIENT_PERMISSION_ENABLE_DISABLE_CONNECTIVITY_CHECK = 16,
+	NM_CLIENT_PERMISSION_WIFI_SCAN = 17,
 
-	NM_CLIENT_PERMISSION_LAST = 16,
+	NM_CLIENT_PERMISSION_LAST = 17,
 } NMClientPermission;
 
 /**
@@ -339,6 +341,21 @@ NMActiveConnection *nm_client_add_and_activate_connection_finish (NMClient *clie
                                                                   GAsyncResult *result,
                                                                   GError **error);
 
+NM_AVAILABLE_IN_1_16
+void                nm_client_add_and_activate_connection2 (NMClient *client,
+                                                            NMConnection *partial,
+                                                            NMDevice *device,
+                                                            const char *specific_object,
+                                                            GVariant *options,
+                                                            GCancellable *cancellable,
+                                                            GAsyncReadyCallback callback,
+                                                            gpointer user_data);
+NM_AVAILABLE_IN_1_16
+NMActiveConnection *nm_client_add_and_activate_connection2_finish (NMClient *client,
+                                                                   GAsyncResult *result,
+                                                                   GVariant **out_result,
+                                                                   GError **error);
+
 gboolean nm_client_deactivate_connection        (NMClient *client,
                                                  NMActiveConnection *active,
                                                  GCancellable *cancellable,
diff --git a/libnm/nm-dbus-helpers.c b/libnm/nm-dbus-helpers.c
index 33c68191..a507c658 100644
--- a/libnm/nm-dbus-helpers.c
+++ b/libnm/nm-dbus-helpers.c
@@ -22,8 +22,6 @@
 
 #include "nm-dbus-helpers.h"
 
-#include 
-
 #include "nm-dbus-interface.h"
 
 static GBusType nm_bus = G_BUS_TYPE_SYSTEM;
@@ -105,7 +103,7 @@ _nm_dbus_is_connection_private (GDBusConnection *connection)
  * rule the proxy added and ensure a less granular rule is present instead.
  *
  * Also, don't do this immediately since it has a performance penalty.
- * Still better than loosing the signals altogether.
+ * Still better than losing the signals altogether.
  *
  * Ideally, we should be able to tell glib not to hook its rules:
  * https://bugzilla.gnome.org/show_bug.cgi?id=758749
diff --git a/libnm/nm-device-adsl.c b/libnm/nm-device-adsl.c
index a82aa8d0..f63468aa 100644
--- a/libnm/nm-device-adsl.c
+++ b/libnm/nm-device-adsl.c
@@ -23,10 +23,7 @@
 
 #include "nm-device-adsl.h"
 
-#include 
-
 #include "nm-object-private.h"
-
 #include "nm-setting-adsl.h"
 #include "nm-setting-connection.h"
 
diff --git a/libnm/nm-device-bond.c b/libnm/nm-device-bond.c
index 83b7c3b4..4cc47b5c 100644
--- a/libnm/nm-device-bond.c
+++ b/libnm/nm-device-bond.c
@@ -20,12 +20,10 @@
 
 #include "nm-default.h"
 
-#include 
+#include "nm-setting-bond.h"
 
 #include "nm-setting-connection.h"
-#include "nm-setting-bond.h"
 #include "nm-utils.h"
-
 #include "nm-device-bond.h"
 #include "nm-object-private.h"
 #include "nm-core-internal.h"
diff --git a/libnm/nm-device-bridge.c b/libnm/nm-device-bridge.c
index 39c48d2a..2db3a238 100644
--- a/libnm/nm-device-bridge.c
+++ b/libnm/nm-device-bridge.c
@@ -20,12 +20,10 @@
 
 #include "nm-default.h"
 
-#include 
+#include "nm-setting-bridge.h"
 
 #include "nm-setting-connection.h"
-#include "nm-setting-bridge.h"
 #include "nm-utils.h"
-
 #include "nm-device-bridge.h"
 #include "nm-object-private.h"
 #include "nm-core-internal.h"
diff --git a/libnm/nm-device-bt.c b/libnm/nm-device-bt.c
index a47e3958..d0af0ff6 100644
--- a/libnm/nm-device-bt.c
+++ b/libnm/nm-device-bt.c
@@ -21,13 +21,11 @@
 
 #include "nm-default.h"
 
-#include 
+#include "nm-device-bt.h"
 
 #include "nm-setting-connection.h"
 #include "nm-setting-bluetooth.h"
 #include "nm-utils.h"
-
-#include "nm-device-bt.h"
 #include "nm-object-private.h"
 #include "nm-enum-types.h"
 
diff --git a/libnm/nm-device-dummy.c b/libnm/nm-device-dummy.c
index 4c202025..8a372143 100644
--- a/libnm/nm-device-dummy.c
+++ b/libnm/nm-device-dummy.c
@@ -20,9 +20,8 @@
 
 #include "nm-default.h"
 
-#include 
-
 #include "nm-device-dummy.h"
+
 #include "nm-object-private.h"
 #include "nm-setting-dummy.h"
 #include "nm-setting-connection.h"
diff --git a/libnm/nm-device-ethernet.c b/libnm/nm-device-ethernet.c
index ebb019dc..5d2acdb2 100644
--- a/libnm/nm-device-ethernet.c
+++ b/libnm/nm-device-ethernet.c
@@ -21,14 +21,12 @@
 
 #include "nm-default.h"
 
-#include 
+#include "nm-device-ethernet.h"
 
 #include "nm-setting-connection.h"
 #include "nm-setting-wired.h"
 #include "nm-setting-pppoe.h"
 #include "nm-utils.h"
-
-#include "nm-device-ethernet.h"
 #include "nm-object-private.h"
 
 G_DEFINE_TYPE (NMDeviceEthernet, nm_device_ethernet, NM_TYPE_DEVICE)
diff --git a/libnm/nm-device-generic.c b/libnm/nm-device-generic.c
index 62cb89eb..c0bf4d70 100644
--- a/libnm/nm-device-generic.c
+++ b/libnm/nm-device-generic.c
@@ -20,9 +20,8 @@
 
 #include "nm-default.h"
 
-#include 
-
 #include "nm-device-generic.h"
+
 #include "nm-object-private.h"
 #include "nm-setting-generic.h"
 #include "nm-setting-connection.h"
diff --git a/libnm/nm-device-infiniband.c b/libnm/nm-device-infiniband.c
index 1ed942b5..aaf5ff86 100644
--- a/libnm/nm-device-infiniband.c
+++ b/libnm/nm-device-infiniband.c
@@ -20,13 +20,11 @@
 
 #include "nm-default.h"
 
-#include 
+#include "nm-device-infiniband.h"
 
 #include "nm-setting-connection.h"
 #include "nm-setting-infiniband.h"
 #include "nm-utils.h"
-
-#include "nm-device-infiniband.h"
 #include "nm-object-private.h"
 
 G_DEFINE_TYPE (NMDeviceInfiniband, nm_device_infiniband, NM_TYPE_DEVICE)
diff --git a/libnm/nm-device-ip-tunnel.c b/libnm/nm-device-ip-tunnel.c
index 2f7efe9d..150dc989 100644
--- a/libnm/nm-device-ip-tunnel.c
+++ b/libnm/nm-device-ip-tunnel.c
@@ -20,13 +20,11 @@
 
 #include "nm-default.h"
 
-#include 
+#include "nm-device-ip-tunnel.h"
 
 #include "nm-setting-connection.h"
 #include "nm-setting-ip-tunnel.h"
 #include "nm-utils.h"
-
-#include "nm-device-ip-tunnel.h"
 #include "nm-object-private.h"
 #include "nm-core-internal.h"
 
diff --git a/libnm/nm-device-macsec.c b/libnm/nm-device-macsec.c
index 16bbbebb..493bff87 100644
--- a/libnm/nm-device-macsec.c
+++ b/libnm/nm-device-macsec.c
@@ -20,9 +20,8 @@
 
 #include "nm-default.h"
 
-#include 
-
 #include "nm-device-macsec.h"
+
 #include "nm-device-private.h"
 #include "nm-object-private.h"
 #include "nm-utils.h"
diff --git a/libnm/nm-device-macvlan.c b/libnm/nm-device-macvlan.c
index 23c649cc..37484770 100644
--- a/libnm/nm-device-macvlan.c
+++ b/libnm/nm-device-macvlan.c
@@ -20,13 +20,11 @@
 
 #include "nm-default.h"
 
-#include 
+#include "nm-setting-macvlan.h"
 
 #include "nm-setting-connection.h"
-#include "nm-setting-macvlan.h"
 #include "nm-setting-wired.h"
 #include "nm-utils.h"
-
 #include "nm-device-macvlan.h"
 #include "nm-object-private.h"
 
diff --git a/libnm/nm-device-modem.c b/libnm/nm-device-modem.c
index 7fc843f6..0373b3c0 100644
--- a/libnm/nm-device-modem.c
+++ b/libnm/nm-device-modem.c
@@ -21,13 +21,11 @@
 
 #include "nm-default.h"
 
-#include 
+#include "nm-device-modem.h"
 
 #include "nm-setting-connection.h"
 #include "nm-setting-gsm.h"
 #include "nm-setting-cdma.h"
-
-#include "nm-device-modem.h"
 #include "nm-object-private.h"
 #include "nm-enum-types.h"
 
diff --git a/libnm/nm-device-olpc-mesh.c b/libnm/nm-device-olpc-mesh.c
index 875f11a9..62589164 100644
--- a/libnm/nm-device-olpc-mesh.c
+++ b/libnm/nm-device-olpc-mesh.c
@@ -20,12 +20,10 @@
 
 #include "nm-default.h"
 
-#include 
+#include "nm-device-olpc-mesh.h"
 
 #include "nm-setting-connection.h"
 #include "nm-setting-olpc-mesh.h"
-
-#include "nm-device-olpc-mesh.h"
 #include "nm-object-private.h"
 #include "nm-device-wifi.h"
 
diff --git a/libnm/nm-device-ovs-bridge.c b/libnm/nm-device-ovs-bridge.c
index 27ee97cf..4671c8a9 100644
--- a/libnm/nm-device-ovs-bridge.c
+++ b/libnm/nm-device-ovs-bridge.c
@@ -19,9 +19,8 @@
 
 #include "nm-default.h"
 
-#include 
-
 #include "nm-device-ovs-bridge.h"
+
 #include "nm-object-private.h"
 #include "nm-setting-ovs-bridge.h"
 #include "nm-setting-ovs-port.h"
diff --git a/libnm/nm-device-ovs-interface.c b/libnm/nm-device-ovs-interface.c
index ed3dbd4c..b07373e1 100644
--- a/libnm/nm-device-ovs-interface.c
+++ b/libnm/nm-device-ovs-interface.c
@@ -19,9 +19,8 @@
 
 #include "nm-default.h"
 
-#include 
-
 #include "nm-device-ovs-interface.h"
+
 #include "nm-object-private.h"
 #include "nm-setting-ovs-interface.h"
 #include "nm-setting-ovs-port.h"
diff --git a/libnm/nm-device-ovs-port.c b/libnm/nm-device-ovs-port.c
index 8be5549a..49cf11cc 100644
--- a/libnm/nm-device-ovs-port.c
+++ b/libnm/nm-device-ovs-port.c
@@ -19,9 +19,8 @@
 
 #include "nm-default.h"
 
-#include 
-
 #include "nm-device-ovs-port.h"
+
 #include "nm-object-private.h"
 #include "nm-setting-ovs-port.h"
 #include "nm-setting-ovs-port.h"
@@ -76,6 +75,7 @@ get_type_description (NMDevice *device)
 {
 	return "ovs-port";
 }
+
 static gboolean
 connection_compatible (NMDevice *device, NMConnection *connection, GError **error)
 {
diff --git a/libnm/nm-device-team.c b/libnm/nm-device-team.c
index 101e3160..749739ff 100644
--- a/libnm/nm-device-team.c
+++ b/libnm/nm-device-team.c
@@ -20,13 +20,11 @@
 
 #include "nm-default.h"
 
-#include 
+#include "nm-device-team.h"
 
 #include "nm-setting-connection.h"
 #include "nm-setting-team.h"
 #include "nm-utils.h"
-
-#include "nm-device-team.h"
 #include "nm-object-private.h"
 #include "nm-core-internal.h"
 
diff --git a/libnm/nm-device-tun.c b/libnm/nm-device-tun.c
index b5721350..62460244 100644
--- a/libnm/nm-device-tun.c
+++ b/libnm/nm-device-tun.c
@@ -20,14 +20,13 @@
 
 #include "nm-default.h"
 
-#include 
+#include "nm-device-tun.h"
+
 #include 
 
 #include "nm-setting-connection.h"
 #include "nm-setting-tun.h"
 #include "nm-utils.h"
-
-#include "nm-device-tun.h"
 #include "nm-object-private.h"
 
 G_DEFINE_TYPE (NMDeviceTun, nm_device_tun, NM_TYPE_DEVICE)
diff --git a/libnm/nm-device-vlan.c b/libnm/nm-device-vlan.c
index 5728d404..e0437245 100644
--- a/libnm/nm-device-vlan.c
+++ b/libnm/nm-device-vlan.c
@@ -20,14 +20,12 @@
 
 #include "nm-default.h"
 
-#include 
+#include "nm-device-vlan.h"
 
 #include "nm-setting-connection.h"
 #include "nm-setting-vlan.h"
 #include "nm-setting-wired.h"
 #include "nm-utils.h"
-
-#include "nm-device-vlan.h"
 #include "nm-object-private.h"
 
 G_DEFINE_TYPE (NMDeviceVlan, nm_device_vlan, NM_TYPE_DEVICE)
diff --git a/libnm/nm-device-vxlan.c b/libnm/nm-device-vxlan.c
index 27b9c981..8dbf1336 100644
--- a/libnm/nm-device-vxlan.c
+++ b/libnm/nm-device-vxlan.c
@@ -20,13 +20,11 @@
 
 #include "nm-default.h"
 
-#include 
+#include "nm-device-vxlan.h"
 
 #include "nm-setting-connection.h"
 #include "nm-setting-vxlan.h"
 #include "nm-utils.h"
-
-#include "nm-device-vxlan.h"
 #include "nm-object-private.h"
 
 G_DEFINE_TYPE (NMDeviceVxlan, nm_device_vxlan, NM_TYPE_DEVICE)
@@ -361,7 +359,7 @@ nm_device_vxlan_get_l2miss (NMDeviceVxlan *device)
  * nm_device_vxlan_get_l3miss:
  * @device: a #NMDeviceVxlan
  *
- * Returns: wether netlink IP ADDR miss notifications are generated
+ * Returns: whether netlink IP ADDR miss notifications are generated
  *
  * Since: 1.2
  **/
diff --git a/libnm/nm-device-wifi-p2p.c b/libnm/nm-device-wifi-p2p.c
new file mode 100644
index 00000000..01397738
--- /dev/null
+++ b/libnm/nm-device-wifi-p2p.c
@@ -0,0 +1,502 @@
+/*
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301 USA.
+ *
+ * Copyright 2018 - 2019 Red Hat, Inc.
+ */
+
+#include "nm-default.h"
+
+#include "nm-device-wifi-p2p.h"
+
+#include "nm-setting-connection.h"
+#include "nm-setting-wifi-p2p.h"
+#include "nm-utils.h"
+#include "nm-wifi-p2p-peer.h"
+#include "nm-object-private.h"
+#include "nm-core-internal.h"
+#include "nm-dbus-helpers.h"
+
+#include "introspection/org.freedesktop.NetworkManager.Device.WifiP2P.h"
+
+/*****************************************************************************/
+
+typedef struct {
+	NMDeviceWifiP2P *device;
+	GSimpleAsyncResult *simple;
+} RequestScanInfo;
+
+NM_GOBJECT_PROPERTIES_DEFINE_BASE (
+	PROP_HW_ADDRESS,
+	PROP_PEERS,
+);
+
+enum {
+	PEER_ADDED,
+	PEER_REMOVED,
+
+	LAST_SIGNAL
+};
+
+static guint signals[LAST_SIGNAL] = { 0 };
+
+typedef struct {
+	NMDBusDeviceWifiP2P *proxy;
+
+	char *hw_address;
+
+	GPtrArray   *peers;
+} NMDeviceWifiP2PPrivate;
+
+/**
+ * NMDeviceWifiP2P:
+ *
+ * Since: 1.16
+ */
+struct _NMDeviceWifiP2P {
+	NMDevice parent;
+	NMDeviceWifiP2PPrivate _priv;
+};
+
+struct _NMDeviceWifiP2PClass {
+	NMDeviceClass parent;
+};
+
+G_DEFINE_TYPE (NMDeviceWifiP2P, nm_device_wifi_p2p, NM_TYPE_DEVICE)
+
+#define NM_DEVICE_WIFI_P2P_GET_PRIVATE(self) _NM_GET_PRIVATE (self, NMDeviceWifiP2P, NM_IS_DEVICE_WIFI_P2P, NMDevice, NMObject)
+
+/*****************************************************************************/
+
+/**
+ * nm_device_wifi_p2p_get_hw_address:
+ * @device: a #NMDeviceWifiP2P
+ *
+ * Gets the actual hardware (MAC) address of the #NMDeviceWifiP2P
+ *
+ * Returns: the actual hardware address. This is the internal string used by the
+ * device, and must not be modified.
+ *
+ * Since: 1.16
+ **/
+const char *
+nm_device_wifi_p2p_get_hw_address (NMDeviceWifiP2P *device)
+{
+	g_return_val_if_fail (NM_IS_DEVICE_WIFI_P2P (device), NULL);
+
+	return nm_str_not_empty (NM_DEVICE_WIFI_P2P_GET_PRIVATE (device)->hw_address);
+}
+
+/**
+ * nm_device_wifi_p2p_get_peers:
+ * @device: a #NMDeviceWifiP2P
+ *
+ * Gets all the found peers of the #NMDeviceWifiP2P.
+ *
+ * Returns: (element-type NMWifiP2PPeer): a #GPtrArray containing all the
+ *          found #NMWifiP2PPeers.
+ * The returned array is owned by the client and should not be modified.
+ *
+ * Since: 1.16
+ **/
+const GPtrArray *
+nm_device_wifi_p2p_get_peers (NMDeviceWifiP2P *device)
+{
+	g_return_val_if_fail (NM_IS_DEVICE_WIFI_P2P (device), NULL);
+
+	return NM_DEVICE_WIFI_P2P_GET_PRIVATE (device)->peers;
+}
+
+/**
+ * nm_device_wifi_p2p_get_peer_by_path:
+ * @device: a #NMDeviceWifiP2P
+ * @path: the object path of the peer
+ *
+ * Gets a #NMWifiP2PPeer by path.
+ *
+ * Returns: (transfer none): the peer or %NULL if none is found.
+ *
+ * Since: 1.16
+ **/
+NMWifiP2PPeer *
+nm_device_wifi_p2p_get_peer_by_path (NMDeviceWifiP2P *device,
+                                     const char *path)
+{
+	const GPtrArray *peers;
+	int i;
+	NMWifiP2PPeer *peer = NULL;
+
+	g_return_val_if_fail (NM_IS_DEVICE_WIFI_P2P (device), NULL);
+	g_return_val_if_fail (path != NULL, NULL);
+
+	peers = nm_device_wifi_p2p_get_peers (device);
+	if (!peers)
+		return NULL;
+
+	for (i = 0; i < peers->len; i++) {
+		NMWifiP2PPeer *candidate = g_ptr_array_index (peers, i);
+		if (!strcmp (nm_object_get_path (NM_OBJECT (candidate)), path)) {
+			peer = candidate;
+			break;
+		}
+	}
+
+	return peer;
+}
+
+static void
+start_find_finished_cb (GObject      *obj,
+                        GAsyncResult *res,
+                        gpointer user_data)
+{
+	NMDBusDeviceWifiP2P *proxy = (NMDBusDeviceWifiP2P*) obj;
+	gs_unref_object GTask *task = G_TASK (user_data);
+	GError *error = NULL;
+	gboolean success;
+
+	success = nmdbus_device_wifi_p2p_call_start_find_finish (proxy, res, &error);
+	if (!success)
+		g_task_return_error (task, error);
+	else
+		g_task_return_boolean (task, TRUE);
+}
+
+/**
+ * nm_device_wifi_p2p_start_find:
+ * @device: a #NMDeviceWifiP2P
+ * @options: (allow-none): optional options passed to StartFind.
+ * @cancellable: a #GCancellable, or %NULL
+ * @callback: a #GAsyncReadyCallback, or %NULL
+ * @user_data: user_data for @callback
+ *
+ * Request NM to search for Wi-Fi P2P peers on @device. Note that the call
+ * returns immediately after requesting the find, and it may take some time
+ * after that for peers to be found.
+ *
+ * The find operation will run for 30s by default. You can stop it earlier
+ * using nm_device_p2p_wifi_stop_find().
+ *
+ * Since: 1.16
+ **/
+void
+nm_device_wifi_p2p_start_find (NMDeviceWifiP2P     *device,
+                               GVariant            *options,
+                               GCancellable        *cancellable,
+                               GAsyncReadyCallback  callback,
+                               gpointer             user_data)
+{
+	NMDeviceWifiP2PPrivate *priv = NM_DEVICE_WIFI_P2P_GET_PRIVATE (device);
+	GTask *task;
+
+	g_return_if_fail (NM_IS_DEVICE_WIFI_P2P (device));
+
+	task = g_task_new (device, cancellable, callback, user_data);
+
+	if (!options)
+		options = g_variant_new_array (G_VARIANT_TYPE ("{sv}"), NULL, 0);
+	nmdbus_device_wifi_p2p_call_start_find (priv->proxy,
+	                                        options,
+	                                        cancellable,
+	                                        start_find_finished_cb,
+	                                        task);
+}
+
+/**
+ * nm_device_wifi_p2p_start_find_finish:
+ * @device: a #NMDeviceWifiP2P
+ * @result: the #GAsyncResult
+ * @error: #GError return address
+ *
+ * Finish an operation started by nm_device_wifi_p2p_start_find().
+ *
+ * Returns: %TRUE if the call was successful
+ *
+ * Since: 1.16
+ **/
+gboolean
+nm_device_wifi_p2p_start_find_finish (NMDeviceWifiP2P  *device,
+                                      GAsyncResult     *result,
+                                      GError          **error)
+{
+	return g_task_propagate_boolean (G_TASK (result), error);
+}
+
+static void
+stop_find_finished_cb (GObject      *obj,
+                       GAsyncResult *res,
+                       gpointer user_data)
+{
+	NMDBusDeviceWifiP2P *proxy = (NMDBusDeviceWifiP2P*) obj;
+	gs_unref_object GTask *task = G_TASK (user_data);
+	GError *error = NULL;
+	gboolean success;
+
+	success = nmdbus_device_wifi_p2p_call_stop_find_finish (proxy, res, &error);
+	if (!success)
+		g_task_return_error (task, error);
+	else
+		g_task_return_boolean (task, TRUE);
+}
+
+/**
+ * nm_device_wifi_p2p_stop_find:
+ * @device: a #NMDeviceWifiP2P
+ * @cancellable: a #GCancellable, or %NULL
+ * @callback: a #GAsyncReadyCallback, or %NULL
+ * @user_data: user_data for @callback
+ *
+ * Request NM to stop any ongoing find operation for Wi-Fi P2P peers on @device.
+ *
+ * Since: 1.16
+ **/
+void
+nm_device_wifi_p2p_stop_find (NMDeviceWifiP2P     *device,
+                              GCancellable        *cancellable,
+                              GAsyncReadyCallback  callback,
+                              gpointer             user_data)
+{
+	NMDeviceWifiP2PPrivate *priv = NM_DEVICE_WIFI_P2P_GET_PRIVATE (device);
+	GTask *task;
+
+	g_return_if_fail (NM_IS_DEVICE_WIFI_P2P (device));
+
+	task = g_task_new (device, cancellable, callback, user_data);
+
+	nmdbus_device_wifi_p2p_call_stop_find (priv->proxy,
+	                                       cancellable,
+	                                       stop_find_finished_cb,
+	                                       task);
+}
+
+/**
+ * nm_device_wifi_p2p_stop_find_finish:
+ * @device: a #NMDeviceWifiP2P
+ * @result: the #GAsyncResult
+ * @error: #GError return address
+ *
+ * Finish an operation started by nm_device_wifi_p2p_stop_find().
+ *
+ * Returns: %TRUE if the call was successful
+ *
+ * Since: 1.16
+ **/
+gboolean
+nm_device_wifi_p2p_stop_find_finish (NMDeviceWifiP2P  *device,
+                                      GAsyncResult     *result,
+                                      GError          **error)
+{
+	return g_task_propagate_boolean (G_TASK (result), error);
+}
+
+static void
+clean_up_peers (NMDeviceWifiP2P *self)
+{
+	NMDeviceWifiP2PPrivate *priv = NM_DEVICE_WIFI_P2P_GET_PRIVATE (self);
+
+	while (priv->peers->len > 0) {
+		NMWifiP2PPeer *peer;
+
+		peer = priv->peers->pdata[priv->peers->len - 1];
+		g_ptr_array_remove_index (priv->peers, priv->peers->len - 1);
+
+		g_signal_emit (self, signals[PEER_REMOVED], 0, peer);
+	}
+}
+
+static gboolean
+connection_compatible (NMDevice *device, NMConnection *connection, GError **error)
+{
+	if (!NM_DEVICE_CLASS (nm_device_wifi_p2p_parent_class)->connection_compatible (device, connection, error))
+		return FALSE;
+
+	if (!nm_connection_is_type (connection, NM_SETTING_WIFI_P2P_SETTING_NAME)) {
+		g_set_error_literal (error, NM_DEVICE_ERROR, NM_DEVICE_ERROR_INCOMPATIBLE_CONNECTION,
+		                     _("The connection was not a Wi-Fi P2P connection."));
+		return FALSE;
+	}
+
+	return TRUE;
+}
+
+static GType
+get_setting_type (NMDevice *device)
+{
+	return NM_TYPE_SETTING_WIRELESS;
+}
+
+static const char *
+get_hw_address (NMDevice *device)
+{
+	return nm_device_wifi_p2p_get_hw_address (NM_DEVICE_WIFI_P2P (device));
+}
+
+static const char *
+get_type_description (NMDevice *device)
+{
+	return "wifi-p2p";
+}
+
+/*****************************************************************************/
+
+static void
+get_property (GObject *object,
+              guint prop_id,
+              GValue *value,
+              GParamSpec *pspec)
+{
+	NMDeviceWifiP2P *self = NM_DEVICE_WIFI_P2P (object);
+
+	switch (prop_id) {
+	case PROP_HW_ADDRESS:
+		g_value_set_string (value, nm_device_wifi_p2p_get_hw_address (self));
+		break;
+	case PROP_PEERS:
+		g_value_take_boxed (value, _nm_utils_copy_object_array (nm_device_wifi_p2p_get_peers (self)));
+		break;
+	default:
+		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+		break;
+	}
+}
+
+static void
+nm_device_wifi_p2p_init (NMDeviceWifiP2P *device)
+{
+	NMDeviceWifiP2PPrivate *priv = NM_DEVICE_WIFI_P2P_GET_PRIVATE (device);
+
+	priv->peers = g_ptr_array_new ();
+}
+
+static void
+init_dbus (NMObject *object)
+{
+	NMDeviceWifiP2PPrivate *priv = NM_DEVICE_WIFI_P2P_GET_PRIVATE (object);
+	const NMPropertiesInfo property_info[] = {
+		{ NM_DEVICE_WIFI_P2P_HW_ADDRESS,           &priv->hw_address },
+		{ NM_DEVICE_WIFI_P2P_PEERS,                &priv->peers, NULL, NM_TYPE_WIFI_P2P_PEER, "peer" },
+		{ NULL },
+	};
+
+	NM_OBJECT_CLASS (nm_device_wifi_p2p_parent_class)->init_dbus (object);
+
+	priv->proxy = NMDBUS_DEVICE_WIFI_P2P (_nm_object_get_proxy (object, NM_DBUS_INTERFACE_DEVICE_WIFI_P2P));
+	_nm_object_register_properties (object,
+	                                NM_DBUS_INTERFACE_DEVICE_WIFI_P2P,
+	                                property_info);
+}
+
+static void
+dispose (GObject *object)
+{
+	clean_up_peers (NM_DEVICE_WIFI_P2P (object));
+
+	G_OBJECT_CLASS (nm_device_wifi_p2p_parent_class)->dispose (object);
+}
+
+static void
+finalize (GObject *object)
+{
+	NMDeviceWifiP2PPrivate *priv = NM_DEVICE_WIFI_P2P_GET_PRIVATE (object);
+
+	g_clear_object (&priv->proxy);
+	g_free (priv->hw_address);
+	if (priv->peers)
+		g_ptr_array_unref (priv->peers);
+
+	G_OBJECT_CLASS (nm_device_wifi_p2p_parent_class)->finalize (object);
+}
+
+static void
+nm_device_wifi_p2p_class_init (NMDeviceWifiP2PClass *wifi_class)
+{
+	GObjectClass *object_class = G_OBJECT_CLASS (wifi_class);
+	NMObjectClass *nm_object_class = NM_OBJECT_CLASS (wifi_class);
+	NMDeviceClass *device_class = NM_DEVICE_CLASS (wifi_class);
+
+	object_class->get_property = get_property;
+	object_class->dispose      = dispose;
+	object_class->finalize     = finalize;
+
+	device_class->connection_compatible = connection_compatible;
+	device_class->get_setting_type      = get_setting_type;
+	device_class->get_hw_address        = get_hw_address;
+	device_class->get_type_description  = get_type_description;
+
+	nm_object_class->init_dbus = init_dbus;
+
+	/**
+	 * NMDeviceWifiP2P:hw-address:
+	 *
+	 * The hardware (MAC) address of the device.
+	 *
+	 * Since: 1.16
+	 **/
+	obj_properties[PROP_HW_ADDRESS] =
+	    g_param_spec_string (NM_DEVICE_WIFI_P2P_HW_ADDRESS, "", "",
+	                         NULL,
+	                         G_PARAM_READABLE |
+	                         G_PARAM_STATIC_STRINGS);
+
+	/**
+	 * NMDeviceWifiP2P:peers: (type GPtrArray(NMWifiP2PPeer))
+	 *
+	 * List of all Wi-Fi P2P peers the device can see.
+	 *
+	 * Since: 1.16
+	 **/
+	obj_properties[PROP_PEERS] =
+	    g_param_spec_boxed (NM_DEVICE_WIFI_P2P_PEERS, "", "",
+	                        G_TYPE_PTR_ARRAY,
+	                        G_PARAM_READABLE |
+	                        G_PARAM_STATIC_STRINGS);
+
+	g_object_class_install_properties (object_class, _PROPERTY_ENUMS_LAST, obj_properties);
+
+	/**
+	 * NMDeviceWifiP2P::peer-added:
+	 * @device: the Wi-Fi P2P device that received the signal
+	 * @peer: the new access point
+	 *
+	 * Notifies that a #NMWifiP2PPeer is added to the Wi-Fi P2P device.
+	 *
+	 * Since: 1.16
+	 **/
+	signals[PEER_ADDED] =
+	    g_signal_new ("peer-added",
+	                 G_OBJECT_CLASS_TYPE (object_class),
+	                 G_SIGNAL_RUN_FIRST,
+	                 0, NULL, NULL,
+	                 g_cclosure_marshal_VOID__OBJECT,
+	                 G_TYPE_NONE, 1,
+	                 G_TYPE_OBJECT);
+
+	/**
+	 * NMDeviceWifiP2P::peer-removed:
+	 * @device: the Wi-Fi P2P device that received the signal
+	 * @peer: the removed access point
+	 *
+	 * Notifies that a #NMWifiP2PPeer is removed from the Wi-Fi P2P device.
+	 *
+	 * Since: 1.16
+	 **/
+	signals[PEER_REMOVED] =
+	    g_signal_new ("peer-removed",
+	                 G_OBJECT_CLASS_TYPE (object_class),
+	                 G_SIGNAL_RUN_FIRST,
+	                 0, NULL, NULL,
+	                 g_cclosure_marshal_VOID__OBJECT,
+	                 G_TYPE_NONE, 1,
+	                 G_TYPE_OBJECT);
+}
diff --git a/libnm/nm-device-wifi-p2p.h b/libnm/nm-device-wifi-p2p.h
new file mode 100644
index 00000000..ddca122f
--- /dev/null
+++ b/libnm/nm-device-wifi-p2p.h
@@ -0,0 +1,80 @@
+/*
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301 USA.
+ *
+ * Copyright 2018 - 2019 Red Hat, Inc.
+ */
+
+#ifndef __NM_DEVICE_WIFI_P2P_H__
+#define __NM_DEVICE_WIFI_P2P_H__
+
+#if !defined (__NETWORKMANAGER_H_INSIDE__) && !defined (NETWORKMANAGER_COMPILATION)
+#error "Only  can be included directly."
+#endif
+
+#include "nm-device.h"
+
+G_BEGIN_DECLS
+
+#define NM_TYPE_DEVICE_WIFI_P2P            (nm_device_wifi_p2p_get_type ())
+#define NM_DEVICE_WIFI_P2P(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_DEVICE_WIFI_P2P, NMDeviceWifiP2P))
+#define NM_DEVICE_WIFI_P2P_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_DEVICE_WIFI_P2P, NMDeviceWifiP2PClass))
+#define NM_IS_DEVICE_WIFI_P2P(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NM_TYPE_DEVICE_WIFI_P2P))
+#define NM_IS_DEVICE_WIFI_P2P_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), NM_TYPE_DEVICE_WIFI_P2P))
+#define NM_DEVICE_WIFI_P2P_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_DEVICE_WIFI_P2P, NMDeviceWifiP2PClass))
+
+#define NM_DEVICE_WIFI_P2P_HW_ADDRESS          "hw-address"
+#define NM_DEVICE_WIFI_P2P_PEERS               "peers"
+#define NM_DEVICE_WIFI_P2P_WFDIES              "wfdies"
+
+typedef struct _NMDeviceWifiP2PClass NMDeviceWifiP2PClass;
+
+NM_AVAILABLE_IN_1_16
+GType nm_device_wifi_p2p_get_type (void);
+
+NM_AVAILABLE_IN_1_16
+const char *             nm_device_wifi_p2p_get_hw_address   (NMDeviceWifiP2P *device);
+
+NM_AVAILABLE_IN_1_16
+NMWifiP2PPeer *          nm_device_wifi_p2p_get_peer_by_path (NMDeviceWifiP2P *device,
+                                                              const char *path);
+
+NM_AVAILABLE_IN_1_16
+const GPtrArray *        nm_device_wifi_p2p_get_peers        (NMDeviceWifiP2P *device);
+
+NM_AVAILABLE_IN_1_16
+void                     nm_device_wifi_p2p_start_find        (NMDeviceWifiP2P     *device,
+                                                               GVariant            *options,
+                                                               GCancellable        *cancellable,
+                                                               GAsyncReadyCallback  callback,
+                                                               gpointer             user_data);
+NM_AVAILABLE_IN_1_16
+gboolean                 nm_device_wifi_p2p_start_find_finish (NMDeviceWifiP2P     *device,
+                                                               GAsyncResult        *result,
+                                                               GError             **error);
+
+NM_AVAILABLE_IN_1_16
+void                     nm_device_wifi_p2p_stop_find         (NMDeviceWifiP2P     *device,
+                                                               GCancellable        *cancellable,
+                                                               GAsyncReadyCallback  callback,
+                                                               gpointer             user_data);
+NM_AVAILABLE_IN_1_16
+gboolean                 nm_device_wifi_p2p_stop_find_finish  (NMDeviceWifiP2P     *device,
+                                                               GAsyncResult        *result,
+                                                               GError             **error);
+
+G_END_DECLS
+
+#endif /* __NM_DEVICE_WIFI_P2P_H__ */
diff --git a/libnm/nm-device-wifi.c b/libnm/nm-device-wifi.c
index 848e297c..9af3639d 100644
--- a/libnm/nm-device-wifi.c
+++ b/libnm/nm-device-wifi.c
@@ -23,13 +23,10 @@
 
 #include "nm-device-wifi.h"
 
-#include 
-
 #include "nm-setting-connection.h"
 #include "nm-setting-wireless.h"
 #include "nm-setting-wireless-security.h"
 #include "nm-utils.h"
-
 #include "nm-access-point.h"
 #include "nm-object-private.h"
 #include "nm-core-internal.h"
@@ -370,7 +367,7 @@ nm_device_wifi_request_scan (NMDeviceWifi *device,
  * after that for the scan to complete.
  * This is the same as @nm_device_wifi_request_scan except it accepts @options
  * for the scanning. The argument is the dictionary passed to RequestScan()
- * D-Bus call. Valid otions inside the dictionary are:
+ * D-Bus call. Valid options inside the dictionary are:
  * 'ssids' => array of SSIDs (saay)
  *
  * Returns: %TRUE on success, %FALSE on error, in which case @error will be
@@ -487,7 +484,7 @@ nm_device_wifi_request_scan_async (NMDeviceWifi *device,
  * that for the scan to complete.
  * This is the same as @nm_device_wifi_request_scan_async except it accepts @options
  * for the scanning. The argument is the dictionary passed to RequestScan()
- * D-Bus call. Valid otions inside the dictionary are:
+ * D-Bus call. Valid options inside the dictionary are:
  * 'ssids' => array of SSIDs (saay)
  *
  * Since: 1.2
diff --git a/libnm/nm-device-wimax.c b/libnm/nm-device-wimax.c
index 08624594..36cebcf2 100644
--- a/libnm/nm-device-wimax.c
+++ b/libnm/nm-device-wimax.c
@@ -21,13 +21,11 @@
 
 #include "nm-default.h"
 
-#include 
+#include "nm-device-wimax.h"
 
 #include "nm-setting-connection.h"
 #include "nm-setting-wimax.h"
 #include "nm-utils.h"
-
-#include "nm-device-wimax.h"
 #include "nm-wimax-nsp.h"
 #include "nm-object-private.h"
 #include "nm-core-internal.h"
diff --git a/libnm/nm-device-wpan.c b/libnm/nm-device-wpan.c
index 61183623..d6acda61 100644
--- a/libnm/nm-device-wpan.c
+++ b/libnm/nm-device-wpan.c
@@ -19,9 +19,8 @@
 
 #include "nm-default.h"
 
-#include 
-
 #include "nm-device-wpan.h"
+
 #include "nm-object-private.h"
 #include "nm-setting-wpan.h"
 #include "nm-setting-connection.h"
diff --git a/libnm/nm-device.c b/libnm/nm-device.c
index 3f1cc636..5965cb3b 100644
--- a/libnm/nm-device.c
+++ b/libnm/nm-device.c
@@ -23,7 +23,6 @@
 
 #include "nm-device.h"
 
-#include 
 #include 
 
 #include "nm-libnm-utils.h"
@@ -74,6 +73,8 @@ typedef struct {
 	NMDhcpConfig *dhcp4_config;
 	NMIPConfig *ip6_config;
 	NMDhcpConfig *dhcp6_config;
+	NMConnectivityState ip4_connectivity;
+	NMConnectivityState ip6_connectivity;
 	NMDeviceState state;
 	NMDeviceState last_seen_state;
 	NMDeviceStateReason reason;
@@ -120,6 +121,8 @@ enum {
 	PROP_MTU,
 	PROP_METERED,
 	PROP_LLDP_NEIGHBORS,
+	PROP_IP4_CONNECTIVITY,
+	PROP_IP6_CONNECTIVITY,
 
 	LAST_PROP
 };
@@ -144,6 +147,8 @@ nm_device_init (NMDevice *device)
 {
 	NMDevicePrivate *priv = NM_DEVICE_GET_PRIVATE (device);
 
+	priv->ip4_connectivity = NM_CONNECTIVITY_UNKNOWN;
+	priv->ip6_connectivity = NM_CONNECTIVITY_UNKNOWN;
 	priv->state = NM_DEVICE_STATE_UNKNOWN;
 	priv->reason = NM_DEVICE_STATE_REASON_NONE;
 	priv->lldp_neighbors = g_ptr_array_new ();
@@ -216,6 +221,8 @@ init_dbus (NMObject *object)
 		{ NM_DEVICE_DHCP4_CONFIG,      &priv->dhcp4_config, NULL, NM_TYPE_DHCP4_CONFIG },
 		{ NM_DEVICE_IP6_CONFIG,        &priv->ip6_config, NULL, NM_TYPE_IP6_CONFIG },
 		{ NM_DEVICE_DHCP6_CONFIG,      &priv->dhcp6_config, NULL, NM_TYPE_DHCP6_CONFIG },
+		{ NM_DEVICE_IP4_CONNECTIVITY,  &priv->ip4_connectivity },
+		{ NM_DEVICE_IP6_CONNECTIVITY,  &priv->ip6_connectivity },
 		{ NM_DEVICE_STATE,             &priv->state },
 		{ NM_DEVICE_STATE_REASON,      &priv->reason, demarshal_state_reason },
 		{ NM_DEVICE_ACTIVE_CONNECTION, &priv->active_connection, NULL, NM_TYPE_ACTIVE_CONNECTION },
@@ -287,6 +294,7 @@ coerce_type (NMDeviceType type)
 	case NM_DEVICE_TYPE_WPAN:
 	case NM_DEVICE_TYPE_6LOWPAN:
 	case NM_DEVICE_TYPE_WIREGUARD:
+	case NM_DEVICE_TYPE_WIFI_P2P:
 		return type;
 	}
 	return NM_DEVICE_TYPE_UNKNOWN;
@@ -348,7 +356,7 @@ get_property (GObject *object,
 
 	switch (prop_id) {
 	case PROP_DEVICE_TYPE:
-		g_value_set_enum (value, coerce_type (nm_device_get_device_type (device)));
+		g_value_set_enum (value, nm_device_get_device_type (device));
 		break;
 	case PROP_UDI:
 		g_value_set_string (value, nm_device_get_udi (device));
@@ -428,6 +436,12 @@ get_property (GObject *object,
 	case PROP_LLDP_NEIGHBORS:
 		g_value_set_boxed (value, nm_device_get_lldp_neighbors (device));
 		break;
+	case PROP_IP4_CONNECTIVITY:
+		g_value_set_enum (value, nm_device_get_connectivity (device, AF_INET));
+		break;
+	case PROP_IP6_CONNECTIVITY:
+		g_value_set_enum (value, nm_device_get_connectivity (device, AF_INET6));
+		break;
 	default:
 		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
 		break;
@@ -700,6 +714,36 @@ nm_device_class_init (NMDeviceClass *device_class)
 		                      G_PARAM_READABLE |
 		                      G_PARAM_STATIC_STRINGS));
 
+	/**
+	 * NMDevice:ip4-connectivity:
+	 *
+	 * The IPv4 connectivity state of the device.
+	 *
+	 * Since: 1.16
+	 **/
+	g_object_class_install_property
+		(object_class, PROP_IP4_CONNECTIVITY,
+		 g_param_spec_enum (NM_DEVICE_IP4_CONNECTIVITY, "", "",
+		                    NM_TYPE_CONNECTIVITY_STATE,
+		                    NM_CONNECTIVITY_UNKNOWN,
+		                    G_PARAM_READABLE |
+		                    G_PARAM_STATIC_STRINGS));
+
+	/**
+	 * NMDevice:ip6-connectivity:
+	 *
+	 * The IPv6 connectivity state of the device.
+	 *
+	 * Since: 1.16
+	 **/
+	g_object_class_install_property
+		(object_class, PROP_IP6_CONNECTIVITY,
+		 g_param_spec_enum (NM_DEVICE_IP6_CONNECTIVITY, "", "",
+		                    NM_TYPE_CONNECTIVITY_STATE,
+		                    NM_CONNECTIVITY_UNKNOWN,
+		                    G_PARAM_READABLE |
+		                    G_PARAM_STATIC_STRINGS));
+
 	/**
 	 * NMDevice:state:
 	 *
@@ -893,7 +937,7 @@ nm_device_get_device_type (NMDevice *self)
 {
 	g_return_val_if_fail (NM_IS_DEVICE (self), NM_DEVICE_TYPE_UNKNOWN);
 
-	return NM_DEVICE_GET_PRIVATE (self)->device_type;
+	return coerce_type (NM_DEVICE_GET_PRIVATE (self)->device_type);
 }
 
 /**
@@ -1230,6 +1274,36 @@ nm_device_get_dhcp6_config (NMDevice *device)
 	return NM_DEVICE_GET_PRIVATE (device)->dhcp6_config;
 }
 
+/**
+ * nm_device_get_connectivity:
+ * @device: a #NMDevice
+ * @addr_family: network address family
+ *
+ * The connectivity state of the device for given address family.
+ * Supported address families are %AF_INET for IPv4, %AF_INET6
+ * for IPv6 or %AF_UNSPEC for any.
+ *
+ * Returns: the current connectivity state
+ *
+ * Since: 1.16
+ **/
+NMConnectivityState
+nm_device_get_connectivity (NMDevice *device, int addr_family)
+{
+	NMDevicePrivate *priv = NM_DEVICE_GET_PRIVATE (device);
+
+	switch (addr_family) {
+	case AF_INET:
+		return priv->ip4_connectivity;
+	case AF_INET6:
+		return priv->ip6_connectivity;
+	case AF_UNSPEC:
+		return NM_MAX (priv->ip4_connectivity, priv->ip6_connectivity);
+	default:
+		g_return_val_if_reached (NM_CONNECTIVITY_UNKNOWN);
+	}
+}
+
 /**
  * nm_device_get_state:
  * @device: a #NMDevice
@@ -1354,6 +1428,8 @@ get_type_name (NMDevice *device)
 		return _("6LoWPAN");
 	case NM_DEVICE_TYPE_WIREGUARD:
 		return _("WireGuard");
+	case NM_DEVICE_TYPE_WIFI_P2P:
+		return _("Wi-Fi P2P");
 	case NM_DEVICE_TYPE_GENERIC:
 	case NM_DEVICE_TYPE_UNUSED1:
 	case NM_DEVICE_TYPE_UNUSED2:
@@ -2059,7 +2135,7 @@ nm_device_reapply_finish (NMDevice *device,
  * nm_device_get_applied_connection:
  * @device: a #NMDevice
  * @flags: the flags argument. Currently this value must always be zero.
- * @version_id: (out): (allow-none): returns the current version id of
+ * @version_id: (out) (allow-none): returns the current version id of
  *   the applied connection
  * @cancellable: a #GCancellable, or %NULL
  * @error: location for a #GError, or %NULL
@@ -2193,7 +2269,7 @@ nm_device_get_applied_connection_async  (NMDevice *device,
  * nm_device_get_applied_connection_finish:
  * @device: a #NMDevice
  * @result: the result passed to the #GAsyncReadyCallback
- * @version_id: (out): (allow-none): the current version id of the applied
+ * @version_id: (out) (allow-none): the current version id of the applied
  *   connection.
  * @error: location for a #GError, or %NULL
  *
@@ -2392,7 +2468,7 @@ device_delete_cb (GObject *proxy,
  * @callback: callback to be called when delete operation completes
  * @user_data: caller-specific data passed to @callback
  *
- * Asynchronously begins deleteing the software device. Hardware devices can't
+ * Asynchronously begins deleting the software device. Hardware devices can't
  * be deleted.
  **/
 void
diff --git a/libnm/nm-device.h b/libnm/nm-device.h
index 91f31b87..fcda93ab 100644
--- a/libnm/nm-device.h
+++ b/libnm/nm-device.h
@@ -64,6 +64,8 @@ G_BEGIN_DECLS
 #define NM_DEVICE_MTU "mtu"
 #define NM_DEVICE_METERED "metered"
 #define NM_DEVICE_LLDP_NEIGHBORS "lldp-neighbors"
+#define NM_DEVICE_IP4_CONNECTIVITY "ip4-connectivity"
+#define NM_DEVICE_IP6_CONNECTIVITY "ip6-connectivity"
 
 /**
  * NMDevice:
@@ -121,6 +123,8 @@ NMIPConfig *         nm_device_get_ip4_config       (NMDevice *device);
 NMDhcpConfig *       nm_device_get_dhcp4_config     (NMDevice *device);
 NMIPConfig *         nm_device_get_ip6_config       (NMDevice *device);
 NMDhcpConfig *       nm_device_get_dhcp6_config     (NMDevice *device);
+NM_AVAILABLE_IN_1_16
+NMConnectivityState  nm_device_get_connectivity     (NMDevice *device, int addr_family);
 NMDeviceState        nm_device_get_state            (NMDevice *device);
 NMDeviceStateReason  nm_device_get_state_reason     (NMDevice *device);
 NMActiveConnection * nm_device_get_active_connection(NMDevice *device);
diff --git a/libnm/nm-dhcp-config.c b/libnm/nm-dhcp-config.c
index 3f835670..e13bbd34 100644
--- a/libnm/nm-dhcp-config.c
+++ b/libnm/nm-dhcp-config.c
@@ -21,9 +21,8 @@
 
 #include "nm-default.h"
 
-#include 
-
 #include "nm-dhcp-config.h"
+
 #include "nm-dhcp4-config.h"
 #include "nm-dhcp6-config.h"
 #include "nm-dbus-interface.h"
diff --git a/libnm/nm-dhcp4-config.c b/libnm/nm-dhcp4-config.c
index 0e783576..b01e1677 100644
--- a/libnm/nm-dhcp4-config.c
+++ b/libnm/nm-dhcp4-config.c
@@ -21,6 +21,7 @@
 #include "nm-default.h"
 
 #include "nm-dhcp4-config.h"
+
 #include "nm-object-private.h"
 
 G_DEFINE_TYPE (NMDhcp4Config, nm_dhcp4_config, NM_TYPE_DHCP_CONFIG)
diff --git a/libnm/nm-dhcp6-config.c b/libnm/nm-dhcp6-config.c
index 9252e734..03dbcc30 100644
--- a/libnm/nm-dhcp6-config.c
+++ b/libnm/nm-dhcp6-config.c
@@ -21,6 +21,7 @@
 #include "nm-default.h"
 
 #include "nm-dhcp6-config.h"
+
 #include "nm-object-private.h"
 
 G_DEFINE_TYPE (NMDhcp6Config, nm_dhcp6_config, NM_TYPE_DHCP_CONFIG)
diff --git a/libnm/nm-dns-manager.c b/libnm/nm-dns-manager.c
index 37117b72..a3c2bba3 100644
--- a/libnm/nm-dns-manager.c
+++ b/libnm/nm-dns-manager.c
@@ -22,11 +22,8 @@
 
 #include "nm-dns-manager.h"
 
-#include 
-
 #include "nm-dbus-interface.h"
 #include "nm-connection.h"
-
 #include "nm-client.h"
 #include "nm-object-private.h"
 #include "nm-dbus-helpers.h"
diff --git a/libnm/nm-ip-config.c b/libnm/nm-ip-config.c
index c1e888be..618b05f1 100644
--- a/libnm/nm-ip-config.c
+++ b/libnm/nm-ip-config.c
@@ -21,9 +21,8 @@
 
 #include "nm-default.h"
 
-#include 
-
 #include "nm-ip-config.h"
+
 #include "nm-ip4-config.h"
 #include "nm-ip6-config.h"
 #include "nm-setting-ip-config.h"
diff --git a/libnm/nm-ip4-config.c b/libnm/nm-ip4-config.c
index 322ea4e8..ac16ef6a 100644
--- a/libnm/nm-ip4-config.c
+++ b/libnm/nm-ip4-config.c
@@ -21,6 +21,7 @@
 #include "nm-default.h"
 
 #include "nm-ip4-config.h"
+
 #include "nm-object-private.h"
 
 G_DEFINE_TYPE (NMIP4Config, nm_ip4_config, NM_TYPE_IP_CONFIG)
diff --git a/libnm/nm-ip6-config.c b/libnm/nm-ip6-config.c
index 93cdf332..773faf6a 100644
--- a/libnm/nm-ip6-config.c
+++ b/libnm/nm-ip6-config.c
@@ -21,6 +21,7 @@
 #include "nm-default.h"
 
 #include "nm-ip6-config.h"
+
 #include "nm-object-private.h"
 
 G_DEFINE_TYPE (NMIP6Config, nm_ip6_config, NM_TYPE_IP_CONFIG)
diff --git a/libnm/nm-libnm-utils.c b/libnm/nm-libnm-utils.c
index 36219065..f740c37c 100644
--- a/libnm/nm-libnm-utils.c
+++ b/libnm/nm-libnm-utils.c
@@ -125,7 +125,7 @@ next:
 	}
 	if (square_brackets_sensible) {
 		/* If there's a [] that survived the substitution, then the string
-		 * is a short form that is generally preferrable. */
+		 * is a short form that is generally preferable. */
 		q = strchr (desc_full, ']');
 		if (p && q > p) {
 			p++;
diff --git a/libnm/nm-manager.c b/libnm/nm-manager.c
index e108f2b0..7a169863 100644
--- a/libnm/nm-manager.c
+++ b/libnm/nm-manager.c
@@ -23,8 +23,6 @@
 
 #include "nm-manager.h"
 
-#include 
-
 #include "nm-utils.h"
 #include "nm-checkpoint.h"
 #include "nm-common-macros.h"
@@ -312,6 +310,8 @@ nm_permission_to_client (const char *nm)
 		return NM_CLIENT_PERMISSION_ENABLE_DISABLE_STATISTICS;
 	else if (!strcmp (nm, NM_AUTH_PERMISSION_ENABLE_DISABLE_CONNECTIVITY_CHECK))
 		return NM_CLIENT_PERMISSION_ENABLE_DISABLE_CONNECTIVITY_CHECK;
+	else if (!strcmp (nm, NM_AUTH_PERMISSION_WIFI_SCAN))
+		return NM_CLIENT_PERMISSION_WIFI_SCAN;
 
 	return NM_CLIENT_PERMISSION_NONE;
 }
@@ -870,31 +870,71 @@ nm_manager_get_activating_connection (NMManager *manager)
 	return NM_MANAGER_GET_PRIVATE (manager)->activating_connection;
 }
 
+typedef enum {
+	ACTIVATE_TYPE_ACTIVATE_CONNECTION,
+	ACTIVATE_TYPE_ADD_AND_ACTIVATE_CONNECTION,
+	ACTIVATE_TYPE_ADD_AND_ACTIVATE_CONNECTION2,
+} ActivateType;
+
 typedef struct {
 	CList lst;
 	NMManager *manager;
 	GSimpleAsyncResult *simple;
 	GCancellable *cancellable;
-	gulong cancelled_id;
 	char *active_path;
 	char *new_connection_path;
+	GVariant *add_and_activate_output;
+	gulong cancelled_id;
+	ActivateType activate_type;
 } ActivateInfo;
 
+_NMActivateResult *
+_nm_activate_result_new (NMActiveConnection *active,
+                         GVariant *add_and_activate_output)
+{
+	_NMActivateResult *r;
+
+	nm_assert (!add_and_activate_output || g_variant_is_of_type (add_and_activate_output, G_VARIANT_TYPE ("a{sv}")));
+	nm_assert (!add_and_activate_output || !g_variant_is_floating (add_and_activate_output));
+
+	r = g_slice_new (_NMActivateResult);
+	*r = (_NMActivateResult) {
+		.active                  = g_object_ref (active),
+		.add_and_activate_output = nm_g_variant_ref (add_and_activate_output),
+	};
+	return r;
+}
+
+void
+_nm_activate_result_free (_NMActivateResult *result)
+{
+	g_object_unref (result->active);
+	nm_g_variant_unref (result->add_and_activate_output);
+	g_slice_free (_NMActivateResult, result);
+}
+
 static void
 activate_info_complete (ActivateInfo *info,
                         NMActiveConnection *active,
                         GError *error)
 {
+	nm_assert ((!error) != (!active));
+
 	nm_clear_g_signal_handler (info->cancellable, &info->cancelled_id);
 
 	c_list_unlink_stale (&info->lst);
 
-	if (active)
-		g_simple_async_result_set_op_res_gpointer (info->simple, g_object_ref (active), g_object_unref);
-	else
+	if (active) {
+		g_simple_async_result_set_op_res_gpointer (info->simple,
+		                                           _nm_activate_result_new (active,
+		                                                                    info->add_and_activate_output),
+		                                           (GDestroyNotify) _nm_activate_result_free);
+	} else
 		g_simple_async_result_set_from_error (info->simple, error);
+
 	g_simple_async_result_complete (info->simple);
 
+	nm_g_variant_unref (info->add_and_activate_output);
 	g_free (info->active_path);
 	g_free (info->new_connection_path);
 	g_object_unref (info->simple);
@@ -1035,6 +1075,7 @@ nm_manager_activate_connection_async (NMManager *manager,
 	priv = NM_MANAGER_GET_PRIVATE (manager);
 
 	info = g_slice_new0 (ActivateInfo);
+	info->activate_type = ACTIVATE_TYPE_ACTIVATE_CONNECTION;
 	info->manager = manager;
 	info->simple = g_simple_async_result_new (G_OBJECT (manager), callback, user_data,
 	                                          nm_manager_activate_connection_async);
@@ -1058,14 +1099,16 @@ nm_manager_activate_connection_finish (NMManager *manager,
                                        GError **error)
 {
 	GSimpleAsyncResult *simple;
+	_NMActivateResult *r;
 
 	g_return_val_if_fail (g_simple_async_result_is_valid (result, G_OBJECT (manager), nm_manager_activate_connection_async), NULL);
 
 	simple = G_SIMPLE_ASYNC_RESULT (result);
 	if (g_simple_async_result_propagate_error (simple, error))
 		return NULL;
-	else
-		return g_object_ref (g_simple_async_result_get_op_res_gpointer (simple));
+
+	r = g_simple_async_result_get_op_res_gpointer (simple);
+	return g_object_ref (r->active);
 }
 
 static void
@@ -1074,23 +1117,39 @@ add_activate_cb (GObject *object,
                  gpointer user_data)
 {
 	ActivateInfo *info = user_data;
-	GError *error = NULL;
-
-	if (nmdbus_manager_call_add_and_activate_connection_finish (NMDBUS_MANAGER (object),
-	                                                            NULL,
-	                                                            &info->active_path,
-	                                                            result, &error)) {
-		if (info->cancellable) {
-			info->cancelled_id = g_signal_connect (info->cancellable, "cancelled",
-			                                       G_CALLBACK (activation_cancelled), info);
-		}
-
-		recheck_pending_activations (info->manager);
+	gs_free_error GError *error = NULL;
+	gboolean success;
+
+	nm_assert (info);
+	nm_assert (!info->active_path);
+	nm_assert (!info->add_and_activate_output);
+
+	if (info->activate_type == ACTIVATE_TYPE_ADD_AND_ACTIVATE_CONNECTION) {
+		success = nmdbus_manager_call_add_and_activate_connection_finish (NMDBUS_MANAGER (object),
+		                                                                  NULL,
+		                                                                  &info->active_path,
+		                                                                  result,
+		                                                                  &error);
 	} else {
+		success = nmdbus_manager_call_add_and_activate_connection2_finish (NMDBUS_MANAGER (object),
+		                                                                   NULL,
+		                                                                   &info->active_path,
+		                                                                   &info->add_and_activate_output,
+		                                                                   result,
+		                                                                   &error);
+	}
+	if (!success) {
 		g_dbus_error_strip_remote_error (error);
 		activate_info_complete (info, NULL, error);
-		g_clear_error (&error);
+		return;
+	}
+
+	if (info->cancellable) {
+		info->cancelled_id = g_signal_connect (info->cancellable, "cancelled",
+		                                       G_CALLBACK (activation_cancelled), info);
 	}
+
+	recheck_pending_activations (info->manager);
 }
 
 void
@@ -1098,6 +1157,8 @@ nm_manager_add_and_activate_connection_async (NMManager *manager,
                                               NMConnection *partial,
                                               NMDevice *device,
                                               const char *specific_object,
+                                              GVariant *options,
+                                              gboolean force_v2,
                                               GCancellable *cancellable,
                                               GAsyncReadyCallback callback,
                                               gpointer user_data)
@@ -1105,6 +1166,7 @@ nm_manager_add_and_activate_connection_async (NMManager *manager,
 	NMManagerPrivate *priv;
 	GVariant *dict = NULL;
 	ActivateInfo *info;
+	ActivateType activate_type = ACTIVATE_TYPE_ADD_AND_ACTIVATE_CONNECTION;
 
 	g_return_if_fail (NM_IS_MANAGER (manager));
 	g_return_if_fail (NM_IS_DEVICE (device));
@@ -1127,29 +1189,61 @@ nm_manager_add_and_activate_connection_async (NMManager *manager,
 		dict = nm_connection_to_dbus (partial, NM_CONNECTION_SERIALIZE_ALL);
 	if (!dict)
 		dict = g_variant_new_array (G_VARIANT_TYPE ("{sa{sv}}"), NULL, 0);
+	if (force_v2) {
+		if (!options)
+			options = g_variant_new_array (G_VARIANT_TYPE ("{sv}"), NULL, 0);
+		activate_type = ACTIVATE_TYPE_ADD_AND_ACTIVATE_CONNECTION2;
+	} else {
+		if (options) {
+			if (g_variant_n_children (options) > 0)
+				activate_type = ACTIVATE_TYPE_ADD_AND_ACTIVATE_CONNECTION2;
+			else
+				nm_g_variant_unref_floating (options);
+		}
+	}
 
-	nmdbus_manager_call_add_and_activate_connection (priv->proxy,
-	                                                 dict,
-	                                                 nm_object_get_path (NM_OBJECT (device)),
-	                                                 specific_object ?: "/",
-	                                                 cancellable,
-	                                                 add_activate_cb, info);
+	info->activate_type = activate_type;
+
+	if (activate_type == ACTIVATE_TYPE_ADD_AND_ACTIVATE_CONNECTION2) {
+		nmdbus_manager_call_add_and_activate_connection2 (priv->proxy,
+		                                                  dict,
+		                                                  nm_object_get_path (NM_OBJECT (device)),
+		                                                  specific_object ?: "/",
+		                                                  options,
+		                                                  cancellable,
+		                                                  add_activate_cb,
+		                                                  info);
+	} else {
+		nmdbus_manager_call_add_and_activate_connection (priv->proxy,
+		                                                 dict,
+		                                                 nm_object_get_path (NM_OBJECT (device)),
+		                                                 specific_object ?: "/",
+		                                                 cancellable,
+		                                                 add_activate_cb,
+		                                                 info);
+	}
 }
 
 NMActiveConnection *
 nm_manager_add_and_activate_connection_finish (NMManager *manager,
                                                GAsyncResult *result,
+                                               GVariant **out_result,
                                                GError **error)
 {
 	GSimpleAsyncResult *simple;
+	_NMActivateResult *r;
 
 	g_return_val_if_fail (g_simple_async_result_is_valid (result, G_OBJECT (manager), nm_manager_add_and_activate_connection_async), NULL);
 
 	simple = G_SIMPLE_ASYNC_RESULT (result);
-	if (g_simple_async_result_propagate_error (simple, error))
+	if (g_simple_async_result_propagate_error (simple, error)) {
+		NM_SET_OUT (out_result, NULL);
 		return NULL;
-	else
-		return g_object_ref (g_simple_async_result_get_op_res_gpointer (simple));
+	}
+
+	r = g_simple_async_result_get_op_res_gpointer (simple);
+	NM_SET_OUT (out_result, nm_g_variant_ref (r->add_and_activate_output));
+	return g_object_ref (r->active);
 }
 
 static void
diff --git a/libnm/nm-manager.h b/libnm/nm-manager.h
index 0a278aee..04e12eb3 100644
--- a/libnm/nm-manager.h
+++ b/libnm/nm-manager.h
@@ -163,11 +163,14 @@ void                nm_manager_add_and_activate_connection_async  (NMManager *ma
                                                                    NMConnection *partial,
                                                                    NMDevice *device,
                                                                    const char *specific_object,
+                                                                   GVariant *options,
+                                                                   gboolean force_v2,
                                                                    GCancellable *cancellable,
                                                                    GAsyncReadyCallback callback,
                                                                    gpointer user_data);
 NMActiveConnection *nm_manager_add_and_activate_connection_finish (NMManager *manager,
                                                                    GAsyncResult *result,
+                                                                   GVariant **out_result,
                                                                    GError **error);
 
 gboolean nm_manager_deactivate_connection        (NMManager *manager,
@@ -220,4 +223,18 @@ gboolean nm_manager_checkpoint_adjust_rollback_timeout_finish (NMManager *manage
                                                                GAsyncResult *result,
                                                                GError **error);
 
+/*****************************************************************************/
+
+typedef struct {
+	NMActiveConnection *active;
+	GVariant *add_and_activate_output;
+} _NMActivateResult;
+
+_NMActivateResult *_nm_activate_result_new (NMActiveConnection *active,
+                                            GVariant *add_and_activate_output);
+
+void _nm_activate_result_free (_NMActivateResult *result);
+
+/*****************************************************************************/
+
 #endif /* __NM_MANAGER_H__ */
diff --git a/libnm/nm-object.c b/libnm/nm-object.c
index 70f90b63..f54dac5d 100644
--- a/libnm/nm-object.c
+++ b/libnm/nm-object.c
@@ -23,7 +23,6 @@
 
 #include "nm-object.h"
 
-#include 
 #include 
 #include 
 
@@ -612,7 +611,7 @@ handle_object_property (NMObject *self, const char *property_name, GVariant *val
 		 *
 		 * NOTE: We've ignored this before and the server hits the condition
 		 * more often that it should. Given we're able to recover from
-		 * ther error, let's lower the severity of the log message to
+		 * the error, let's lower the severity of the log message to
 		 * avoid unnecessarily bothering the user. This can be removed
 		 * once the issue is fixed on the server. */
 #if NM_MORE_ASSERTS
diff --git a/libnm/nm-object.h b/libnm/nm-object.h
index 5b4580eb..1cc61a73 100644
--- a/libnm/nm-object.h
+++ b/libnm/nm-object.h
@@ -57,7 +57,7 @@ typedef struct {
 
 	/* The "object-creation-failed" method is PRIVATE for libnm and
 	 * is not meant for any external usage.  It indicates that an error
-	 * occured during creation of an object.
+	 * occurred during creation of an object.
 	 */
 	void (*object_creation_failed) (NMObject *master_object,
 	                                const char *failed_path);
diff --git a/libnm/nm-property-docs.xml b/libnm/nm-property-docs.xml
index 4016bc07..6344f784 100644
--- a/libnm/nm-property-docs.xml
+++ b/libnm/nm-property-docs.xml
@@ -22,7 +22,7 @@
     
     
     
-    
+    
     
     
     
@@ -145,7 +145,7 @@
     
     
     
-    
+    
     
     
     
@@ -171,7 +171,7 @@
     
     
     
-    
+    
     
     
     
@@ -193,7 +193,7 @@
     
     
     
-    
+    
     
     
     
@@ -318,7 +318,7 @@
   
   
     
-    
+    
     
     
     
@@ -338,7 +338,7 @@
     
     
     
-    
+    
     
     
     
@@ -387,6 +387,11 @@
     
     
   
+  
+    
+    
+    
+  
   
     
     
@@ -407,6 +412,14 @@
     
     
   
+  
+    
+    
+    
+    
+    
+    
+  
   
     
     
@@ -430,14 +443,14 @@
     
     
     
-    
+    
     
     
     
     
     
     
-    
+    
     
     
     
@@ -449,7 +462,9 @@
     
   
   
+    
     
+    
     
     
   
diff --git a/libnm/nm-remote-connection.c b/libnm/nm-remote-connection.c
index 08faa77e..a011ca87 100644
--- a/libnm/nm-remote-connection.c
+++ b/libnm/nm-remote-connection.c
@@ -21,14 +21,12 @@
 
 #include "nm-default.h"
 
-#include 
+#include "nm-remote-connection.h"
 
 #include "nm-dbus-interface.h"
 #include "nm-utils.h"
 #include "nm-setting-connection.h"
 #include "nm-core-internal.h"
-
-#include "nm-remote-connection.h"
 #include "nm-remote-connection-private.h"
 #include "nm-object-private.h"
 #include "nm-dbus-helpers.h"
diff --git a/libnm/nm-remote-settings.c b/libnm/nm-remote-settings.c
index f2b26215..6b2d6e92 100644
--- a/libnm/nm-remote-settings.c
+++ b/libnm/nm-remote-settings.c
@@ -23,11 +23,8 @@
 
 #include "nm-remote-settings.h"
 
-#include 
-
 #include "nm-dbus-interface.h"
 #include "nm-connection.h"
-
 #include "nm-client.h"
 #include "nm-remote-connection.h"
 #include "nm-remote-connection-private.h"
diff --git a/libnm/nm-secret-agent-old.c b/libnm/nm-secret-agent-old.c
index 1b9e8915..56a88b00 100644
--- a/libnm/nm-secret-agent-old.c
+++ b/libnm/nm-secret-agent-old.c
@@ -20,55 +20,63 @@
 
 #include "nm-default.h"
 
-#include 
+#include "nm-secret-agent-old.h"
 
 #include "nm-dbus-interface.h"
-#include "nm-secret-agent-old.h"
 #include "nm-enum-types.h"
 #include "nm-dbus-helpers.h"
 #include "nm-simple-connection.h"
 #include "nm-core-internal.h"
+#include "c-list/src/c-list.h"
 
 #include "introspection/org.freedesktop.NetworkManager.SecretAgent.h"
 #include "introspection/org.freedesktop.NetworkManager.AgentManager.h"
 
-static void nm_secret_agent_old_initable_iface_init (GInitableIface *iface);
-static void nm_secret_agent_old_async_initable_iface_init (GAsyncInitableIface *iface);
-G_DEFINE_ABSTRACT_TYPE_WITH_CODE (NMSecretAgentOld, nm_secret_agent_old, G_TYPE_OBJECT,
-                                  G_IMPLEMENT_INTERFACE (G_TYPE_INITABLE, nm_secret_agent_old_initable_iface_init);
-                                  G_IMPLEMENT_INTERFACE (G_TYPE_ASYNC_INITABLE, nm_secret_agent_old_async_initable_iface_init);
-                                  )
-
-#define NM_SECRET_AGENT_OLD_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_SECRET_AGENT_OLD, NMSecretAgentOldPrivate))
+/*****************************************************************************/
 
 typedef struct {
-	gboolean registered;
-	gboolean registering;
-	NMSecretAgentCapabilities capabilities;
+	char *path;
+	char *setting_name;
+	GDBusMethodInvocation *context;
+	CList gsi_lst;
+} GetSecretsInfo;
 
+NM_GOBJECT_PROPERTIES_DEFINE (NMSecretAgentOld,
+	PROP_IDENTIFIER,
+	PROP_AUTO_REGISTER,
+	PROP_REGISTERED,
+	PROP_CAPABILITIES,
+);
+
+typedef struct {
 	GDBusConnection *bus;
-	gboolean private_bus;
-	gboolean session_bus;
 	NMDBusAgentManager *manager_proxy;
 	NMDBusSecretAgent *dbus_secret_agent;
 
 	/* GetSecretsInfo structs of in-flight GetSecrets requests */
-	GSList *pending_gets;
+	CList gsi_lst_head;
 
 	char *identifier;
-	gboolean auto_register;
-	gboolean suppress_auto;
+
+	NMSecretAgentCapabilities capabilities;
+
+	bool registered:1;
+	bool registering:1;
+	bool private_bus:1;
+	bool session_bus:1;
+	bool auto_register:1;
+	bool suppress_auto:1;
 } NMSecretAgentOldPrivate;
 
-enum {
-	PROP_0,
-	PROP_IDENTIFIER,
-	PROP_AUTO_REGISTER,
-	PROP_REGISTERED,
-	PROP_CAPABILITIES,
+static void nm_secret_agent_old_initable_iface_init (GInitableIface *iface);
+static void nm_secret_agent_old_async_initable_iface_init (GAsyncInitableIface *iface);
 
-	LAST_PROP
-};
+G_DEFINE_ABSTRACT_TYPE_WITH_CODE (NMSecretAgentOld, nm_secret_agent_old, G_TYPE_OBJECT,
+                                  G_IMPLEMENT_INTERFACE (G_TYPE_INITABLE, nm_secret_agent_old_initable_iface_init);
+                                  G_IMPLEMENT_INTERFACE (G_TYPE_ASYNC_INITABLE, nm_secret_agent_old_async_initable_iface_init);
+                                  )
+
+#define NM_SECRET_AGENT_OLD_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_SECRET_AGENT_OLD, NMSecretAgentOldPrivate))
 
 /*****************************************************************************/
 
@@ -81,32 +89,23 @@ _internal_unregister (NMSecretAgentOld *self)
 		g_dbus_interface_skeleton_unexport (G_DBUS_INTERFACE_SKELETON (priv->dbus_secret_agent));
 		priv->registered = FALSE;
 		priv->registering = FALSE;
-		g_object_notify (G_OBJECT (self), NM_SECRET_AGENT_OLD_REGISTERED);
+		_notify (self, PROP_REGISTERED);
 	}
 }
 
-typedef struct {
-	char *path;
-	char *setting_name;
-	GDBusMethodInvocation *context;
-} GetSecretsInfo;
-
 static void
-get_secrets_info_finalize (NMSecretAgentOld *self, GetSecretsInfo *info)
+get_secrets_info_free (GetSecretsInfo *info)
 {
-	NMSecretAgentOldPrivate *priv = NM_SECRET_AGENT_OLD_GET_PRIVATE (self);
-
-	g_return_if_fail (info != NULL);
+	nm_assert (info);
 
-	priv->pending_gets = g_slist_remove (priv->pending_gets, info);
+	c_list_unlink_stale (&info->gsi_lst);
 
 	g_free (info->path);
 	g_free (info->setting_name);
-	memset (info, 0, sizeof (*info));
-	g_free (info);
+	g_slice_free (GetSecretsInfo, info);
 }
 
-static inline gboolean
+static gboolean
 should_auto_register (NMSecretAgentOld *self)
 {
 	NMSecretAgentOldPrivate *priv = NM_SECRET_AGENT_OLD_GET_PRIVATE (self);
@@ -124,25 +123,20 @@ name_owner_changed (GObject *proxy,
 {
 	NMSecretAgentOld *self = NM_SECRET_AGENT_OLD (user_data);
 	NMSecretAgentOldPrivate *priv = NM_SECRET_AGENT_OLD_GET_PRIVATE (self);
-	GSList *iter;
-	char *owner;
+	gs_free char *owner = NULL;
+	GetSecretsInfo *info;
 
 	owner = g_dbus_proxy_get_name_owner (G_DBUS_PROXY (proxy));
-	if (owner != NULL) {
+	if (owner) {
 		if (should_auto_register (self))
 			nm_secret_agent_old_register_async (self, NULL, NULL, NULL);
-		g_free (owner);
 	} else {
-		/* Cancel any pending secrets requests */
-		for (iter = priv->pending_gets; iter; iter = g_slist_next (iter)) {
-			GetSecretsInfo *info = iter->data;
-
+		while ((info = c_list_first_entry (&priv->gsi_lst_head, GetSecretsInfo, gsi_lst))) {
+			c_list_unlink (&info->gsi_lst);
 			NM_SECRET_AGENT_OLD_GET_CLASS (self)->cancel_get_secrets (self,
-			                                                      info->path,
-			                                                      info->setting_name);
+			                                                          info->path,
+			                                                          info->setting_name);
 		}
-		g_slist_free (priv->pending_gets);
-		priv->pending_gets = NULL;
 
 		_internal_unregister (self);
 	}
@@ -154,11 +148,11 @@ verify_sender (NMSecretAgentOld *self,
                GError **error)
 {
 	NMSecretAgentOldPrivate *priv = NM_SECRET_AGENT_OLD_GET_PRIVATE (self);
-	char *nm_owner;
+	gs_free char *owner = NULL;
 	const char *sender;
 	guint32 sender_uid;
-	GVariant *ret;
-	GError *local = NULL;
+	gs_unref_variant GVariant *ret = NULL;
+	gs_free_error GError *local = NULL;
 
 	g_return_val_if_fail (context != NULL, FALSE);
 
@@ -170,8 +164,8 @@ verify_sender (NMSecretAgentOld *self,
 
 	/* Verify that the sender is the same as NetworkManager's bus name owner. */
 
-	nm_owner = g_dbus_proxy_get_name_owner (G_DBUS_PROXY (priv->manager_proxy));
-	if (!nm_owner) {
+	owner = g_dbus_proxy_get_name_owner (G_DBUS_PROXY (priv->manager_proxy));
+	if (!owner) {
 		g_set_error_literal (error,
 		                     NM_SECRET_AGENT_ERROR,
 		                     NM_SECRET_AGENT_ERROR_PERMISSION_DENIED,
@@ -185,20 +179,16 @@ verify_sender (NMSecretAgentOld *self,
 		                     NM_SECRET_AGENT_ERROR,
 		                     NM_SECRET_AGENT_ERROR_PERMISSION_DENIED,
 		                     "Failed to get request sender.");
-		g_free (nm_owner);
 		return FALSE;
 	}
 
-	/* Check that the sender matches the current NM bus name owner */
-	if (strcmp (sender, nm_owner) != 0) {
+	if (!nm_streq (sender, owner)) {
 		g_set_error_literal (error,
 		                     NM_SECRET_AGENT_ERROR,
 		                     NM_SECRET_AGENT_ERROR_PERMISSION_DENIED,
 		                     "Request sender does not match NetworkManager bus name owner.");
-		g_free (nm_owner);
 		return FALSE;
 	}
-	g_free (nm_owner);
 
 	/* If we're connected to the session bus, then this must be a test program,
 	 * so skip the UID check.
@@ -217,8 +207,9 @@ verify_sender (NMSecretAgentOld *self,
 	                                   G_DBUS_CALL_FLAGS_NONE, -1,
 	                                   NULL, &local);
 	if (!ret) {
-		char *remote_error = g_dbus_error_get_remote_error (local);
+		gs_free char *remote_error = NULL;
 
+		remote_error = g_dbus_error_get_remote_error (local);
 		g_dbus_error_strip_remote_error (local);
 		g_set_error (error,
 		             NM_SECRET_AGENT_ERROR,
@@ -226,15 +217,12 @@ verify_sender (NMSecretAgentOld *self,
 		             "Failed to request unix user: (%s) %s.",
 		             remote_error ?: "",
 		             local->message);
-		g_free (remote_error);
-		g_error_free (local);
 		return FALSE;
 	}
 	g_variant_get (ret, "(u)", &sender_uid);
-	g_variant_unref (ret);
 
 	/* We only accept requests from NM, which always runs as root */
-	if (0 != sender_uid) {
+	if (sender_uid != 0) {
 		g_set_error_literal (error,
 		                     NM_SECRET_AGENT_ERROR,
 		                     NM_SECRET_AGENT_ERROR_PERMISSION_DENIED,
@@ -253,8 +241,8 @@ verify_request (NMSecretAgentOld *self,
                 NMConnection **out_connection,
                 GError **error)
 {
-	NMConnection *connection = NULL;
-	GError *local = NULL;
+	gs_unref_object NMConnection *connection = NULL;
+	gs_free_error GError *local = NULL;
 
 	if (!verify_sender (self, context, error))
 		return FALSE;
@@ -273,20 +261,18 @@ verify_request (NMSecretAgentOld *self,
 	}
 
 	/* Make sure the given connection is valid */
-	g_assert (out_connection);
 	connection = _nm_simple_connection_new_from_dbus (connection_dict, NM_SETTING_PARSE_FLAGS_BEST_EFFORT, &local);
-	if (connection) {
-		nm_connection_set_path (connection, connection_path);
-		*out_connection = connection;
-	} else {
+	if (!connection) {
 		g_set_error (error,
 		             NM_SECRET_AGENT_ERROR,
 		             NM_SECRET_AGENT_ERROR_INVALID_CONNECTION,
 		             "Invalid connection: %s", local->message);
-		g_clear_error (&local);
+		return FALSE;
 	}
 
-	return !!connection;
+	nm_connection_set_path (connection, connection_path);
+	NM_SET_OUT (out_connection, g_steal_pointer (&connection));
+	return TRUE;
 }
 
 static void
@@ -306,8 +292,7 @@ get_secrets_cb (NMSecretAgentOld *self,
 		                                       g_variant_new ("(@a{sa{sv}})", secrets));
 	}
 
-	/* Remove the request from internal tracking */
-	get_secrets_info_finalize (self, info);
+	get_secrets_info_free (info);
 }
 
 static void
@@ -322,7 +307,7 @@ impl_secret_agent_old_get_secrets (NMSecretAgentOld *self,
 {
 	NMSecretAgentOldPrivate *priv = NM_SECRET_AGENT_OLD_GET_PRIVATE (self);
 	GError *error = NULL;
-	NMConnection *connection = NULL;
+	gs_unref_object NMConnection *connection = NULL;
 	GetSecretsInfo *info;
 
 	/* Make sure the request comes from NetworkManager and is valid */
@@ -331,34 +316,35 @@ impl_secret_agent_old_get_secrets (NMSecretAgentOld *self,
 		return;
 	}
 
-	info = g_malloc0 (sizeof (GetSecretsInfo));
-	info->path = g_strdup (connection_path);
-	info->setting_name = g_strdup (setting_name);
-	info->context = context;
-	priv->pending_gets = g_slist_append (priv->pending_gets, info);
+	info = g_slice_new (GetSecretsInfo);
+	*info = (GetSecretsInfo) {
+		.path = g_strdup (connection_path),
+		.setting_name = g_strdup (setting_name),
+		.context = context,
+	};
+	c_list_link_tail (&priv->gsi_lst_head, &info->gsi_lst);
 
 	NM_SECRET_AGENT_OLD_GET_CLASS (self)->get_secrets (self,
-	                                               connection,
-	                                               connection_path,
-	                                               setting_name,
-	                                               (const char **) hints,
-	                                               flags,
-	                                               get_secrets_cb,
-	                                               info);
-	g_object_unref (connection);
+	                                                   connection,
+	                                                   connection_path,
+	                                                   setting_name,
+	                                                   (const char **) hints,
+	                                                   flags,
+	                                                   get_secrets_cb,
+	                                                   info);
 }
 
 static GetSecretsInfo *
-find_get_secrets_info (GSList *list, const char *path, const char *setting_name)
+find_get_secrets_info (NMSecretAgentOldPrivate *priv,
+                       const char *path,
+                       const char *setting_name)
 {
-	GSList *iter;
-
-	for (iter = list; iter; iter = g_slist_next (iter)) {
-		GetSecretsInfo *candidate = iter->data;
+	GetSecretsInfo *info;
 
-		if (   g_strcmp0 (path, candidate->path) == 0
-		    && g_strcmp0 (setting_name, candidate->setting_name) == 0)
-			return candidate;
+	c_list_for_each_entry (info, &priv->gsi_lst_head, gsi_lst) {
+		if (   nm_streq0 (path, info->path)
+		    && nm_streq0 (setting_name, info->setting_name))
+			return info;
 	}
 	return NULL;
 }
@@ -380,7 +366,7 @@ impl_secret_agent_old_cancel_get_secrets (NMSecretAgentOld *self,
 		return;
 	}
 
-	info = find_get_secrets_info (priv->pending_gets, connection_path, setting_name);
+	info = find_get_secrets_info (priv, connection_path, setting_name);
 	if (!info) {
 		g_dbus_method_invocation_return_error (context,
 		                                       NM_SECRET_AGENT_ERROR,
@@ -389,10 +375,12 @@ impl_secret_agent_old_cancel_get_secrets (NMSecretAgentOld *self,
 		return;
 	}
 
-	/* Send the cancel request up to the subclass and finalize it */
+	c_list_unlink (&info->gsi_lst);
+
 	NM_SECRET_AGENT_OLD_GET_CLASS (self)->cancel_get_secrets (self,
-	                                                      info->path,
-	                                                      info->setting_name);
+	                                                          info->path,
+	                                                          info->setting_name);
+
 	g_dbus_method_invocation_return_value (context, NULL);
 }
 
@@ -417,8 +405,8 @@ impl_secret_agent_old_save_secrets (NMSecretAgentOld *self,
                                     const char *connection_path,
                                     gpointer user_data)
 {
+	gs_unref_object NMConnection *connection = NULL;
 	GError *error = NULL;
-	NMConnection *connection = NULL;
 
 	/* Make sure the request comes from NetworkManager and is valid */
 	if (!verify_request (self, context, connection_dict, connection_path, &connection, &error)) {
@@ -427,11 +415,10 @@ impl_secret_agent_old_save_secrets (NMSecretAgentOld *self,
 	}
 
 	NM_SECRET_AGENT_OLD_GET_CLASS (self)->save_secrets (self,
-	                                                connection,
-	                                                connection_path,
-	                                                save_secrets_cb,
-	                                                context);
-	g_object_unref (connection);
+	                                                    connection,
+	                                                    connection_path,
+	                                                    save_secrets_cb,
+	                                                    context);
 }
 
 static void
@@ -455,8 +442,8 @@ impl_secret_agent_old_delete_secrets (NMSecretAgentOld *self,
                                       const char *connection_path,
                                       gpointer user_data)
 {
+	gs_unref_object NMConnection *connection = NULL;
 	GError *error = NULL;
-	NMConnection *connection = NULL;
 
 	/* Make sure the request comes from NetworkManager and is valid */
 	if (!verify_request (self, context, connection_dict, connection_path, &connection, &error)) {
@@ -465,11 +452,10 @@ impl_secret_agent_old_delete_secrets (NMSecretAgentOld *self,
 	}
 
 	NM_SECRET_AGENT_OLD_GET_CLASS (self)->delete_secrets (self,
-	                                                  connection,
-	                                                  connection_path,
-	                                                  delete_secrets_cb,
-	                                                  context);
-	g_object_unref (connection);
+	                                                      connection,
+	                                                      connection_path,
+	                                                      delete_secrets_cb,
+	                                                      context);
 }
 
 /*****************************************************************************/
@@ -478,15 +464,13 @@ static gboolean
 check_nm_running (NMSecretAgentOld *self, GError **error)
 {
 	NMSecretAgentOldPrivate *priv = NM_SECRET_AGENT_OLD_GET_PRIVATE (self);
-	char *owner;
+	gs_free char *owner = NULL;
 
 	if (priv->private_bus)
 		return TRUE;
 	owner = g_dbus_proxy_get_name_owner (G_DBUS_PROXY (priv->manager_proxy));
-	if (owner) {
-		g_free (owner);
+	if (owner)
 		return TRUE;
-	}
 
 	g_set_error (error, NM_SECRET_AGENT_ERROR, NM_SECRET_AGENT_ERROR_FAILED,
 	             "NetworkManager is not running");
@@ -568,7 +552,7 @@ nm_secret_agent_old_register (NMSecretAgentOld *self,
 success:
 	priv->registering = FALSE;
 	priv->registered = TRUE;
-	g_object_notify (G_OBJECT (self), NM_SECRET_AGENT_OLD_REGISTERED);
+	_notify (self, PROP_REGISTERED);
 	return TRUE;
 }
 
@@ -576,6 +560,7 @@ static void
 reg_result (NMSecretAgentOld *self, GSimpleAsyncResult *simple, GError *error)
 {
 	NMSecretAgentOldPrivate *priv = NM_SECRET_AGENT_OLD_GET_PRIVATE (self);
+	_nm_unused gs_unref_object GSimpleAsyncResult *simple_free = simple;
 
 	priv->registering = FALSE;
 
@@ -587,13 +572,11 @@ reg_result (NMSecretAgentOld *self, GSimpleAsyncResult *simple, GError *error)
 		_internal_unregister (self);
 	} else {
 		priv->registered = TRUE;
-		g_object_notify (G_OBJECT (self), NM_SECRET_AGENT_OLD_REGISTERED);
+		_notify (self, PROP_REGISTERED);
 
 		g_simple_async_result_set_op_res_gboolean (simple, TRUE);
 		g_simple_async_result_complete (simple);
 	}
-
-	g_object_unref (simple);
 }
 
 static void
@@ -624,6 +607,7 @@ reg_with_caps_cb (GObject *proxy,
 
 	self = NM_SECRET_AGENT_OLD (g_async_result_get_source_object (G_ASYNC_RESULT (simple)));
 	g_object_unref (self); /* drop extra ref added by get_source_object() */
+
 	priv = NM_SECRET_AGENT_OLD_GET_PRIVATE (self);
 
 	if (nmdbus_agent_manager_call_register_with_capabilities_finish (NMDBUS_AGENT_MANAGER (proxy), result, NULL)) {
@@ -661,7 +645,7 @@ nm_secret_agent_old_register_async (NMSecretAgentOld *self,
 {
 	NMSecretAgentOldPrivate *priv;
 	NMSecretAgentOldClass *class;
-	GSimpleAsyncResult *simple;
+	gs_unref_object GSimpleAsyncResult *simple = NULL;
 	GError *error = NULL;
 
 	g_return_if_fail (NM_IS_SECRET_AGENT_OLD (self));
@@ -687,7 +671,6 @@ nm_secret_agent_old_register_async (NMSecretAgentOld *self,
 	if (!check_nm_running (self, &error)) {
 		g_simple_async_result_take_error (simple, error);
 		g_simple_async_result_complete_in_idle (simple);
-		g_object_unref (simple);
 		return;
 	}
 
@@ -698,7 +681,6 @@ nm_secret_agent_old_register_async (NMSecretAgentOld *self,
 	                                       &error)) {
 		g_simple_async_result_take_error (simple, error);
 		g_simple_async_result_complete_in_idle (simple);
-		g_object_unref (simple);
 		return;
 	}
 
@@ -709,7 +691,8 @@ nm_secret_agent_old_register_async (NMSecretAgentOld *self,
 	                                                      priv->identifier,
 	                                                      priv->capabilities,
 	                                                      NULL,
-	                                                      reg_with_caps_cb, simple);
+	                                                      reg_with_caps_cb,
+	                                                      g_steal_pointer (&simple));
 }
 
 /**
@@ -775,7 +758,7 @@ nm_secret_agent_old_unregister (NMSecretAgentOld *self,
 static void
 unregister_cb (GObject *proxy, GAsyncResult *result, gpointer user_data)
 {
-	GSimpleAsyncResult *simple = user_data;
+	gs_unref_object GSimpleAsyncResult *simple = user_data;
 	NMSecretAgentOld *self;
 	GError *error = NULL;
 
@@ -793,7 +776,6 @@ unregister_cb (GObject *proxy, GAsyncResult *result, gpointer user_data)
 	}
 
 	g_simple_async_result_complete (simple);
-	g_object_unref (simple);
 }
 
 /**
@@ -814,7 +796,7 @@ nm_secret_agent_old_unregister_async (NMSecretAgentOld *self,
                                       gpointer user_data)
 {
 	NMSecretAgentOldPrivate *priv;
-	GSimpleAsyncResult *simple;
+	gs_unref_object GSimpleAsyncResult *simple = NULL;
 	GError *error = NULL;
 
 	g_return_if_fail (NM_IS_SECRET_AGENT_OLD (self));
@@ -832,14 +814,15 @@ nm_secret_agent_old_unregister_async (NMSecretAgentOld *self,
 	if (!check_nm_running (self, &error)) {
 		g_simple_async_result_take_error (simple, error);
 		g_simple_async_result_complete_in_idle (simple);
-		g_object_unref (simple);
 		return;
 	}
 
 	priv->suppress_auto = TRUE;
 
-	nmdbus_agent_manager_call_unregister (priv->manager_proxy, cancellable,
-	                                      unregister_cb, simple);
+	nmdbus_agent_manager_call_unregister (priv->manager_proxy,
+	                                      cancellable,
+	                                      unregister_cb,
+	                                      g_steal_pointer (&simple));
 }
 
 /**
@@ -916,13 +899,13 @@ nm_secret_agent_old_get_secrets (NMSecretAgentOld *self,
 	g_return_if_fail (callback != NULL);
 
 	NM_SECRET_AGENT_OLD_GET_CLASS (self)->get_secrets (self,
-	                                               connection,
-	                                               nm_connection_get_path (connection),
-	                                               setting_name,
-	                                               hints,
-	                                               flags,
-	                                               callback,
-	                                               user_data);
+	                                                   connection,
+	                                                   nm_connection_get_path (connection),
+	                                                   setting_name,
+	                                                   hints,
+	                                                   flags,
+	                                                   callback,
+	                                                   user_data);
 }
 
 /**
@@ -946,10 +929,10 @@ nm_secret_agent_old_save_secrets (NMSecretAgentOld *self,
 	g_return_if_fail (nm_connection_get_path (connection));
 
 	NM_SECRET_AGENT_OLD_GET_CLASS (self)->save_secrets (self,
-	                                                connection,
-	                                                nm_connection_get_path (connection),
-	                                                callback,
-	                                                user_data);
+	                                                    connection,
+	                                                    nm_connection_get_path (connection),
+	                                                    callback,
+	                                                    user_data);
 }
 
 /**
@@ -973,10 +956,10 @@ nm_secret_agent_old_delete_secrets (NMSecretAgentOld *self,
 	g_return_if_fail (nm_connection_get_path (connection));
 
 	NM_SECRET_AGENT_OLD_GET_CLASS (self)->delete_secrets (self,
-	                                                  connection,
-	                                                  nm_connection_get_path (connection),
-	                                                  callback,
-	                                                  user_data);
+	                                                      connection,
+	                                                      nm_connection_get_path (connection),
+	                                                      callback,
+	                                                      user_data);
 }
 
 /*****************************************************************************/
@@ -1007,20 +990,7 @@ validate_identifier (const char *identifier)
 	return TRUE;
 }
 
-static void
-nm_secret_agent_old_init (NMSecretAgentOld *self)
-{
-	NMSecretAgentOldPrivate *priv = NM_SECRET_AGENT_OLD_GET_PRIVATE (self);
-
-	priv->dbus_secret_agent = nmdbus_secret_agent_skeleton_new ();
-	_nm_dbus_bind_properties (self, priv->dbus_secret_agent);
-	_nm_dbus_bind_methods (self, priv->dbus_secret_agent,
-	                       "GetSecrets", impl_secret_agent_old_get_secrets,
-	                       "CancelGetSecrets", impl_secret_agent_old_cancel_get_secrets,
-	                       "DeleteSecrets", impl_secret_agent_old_delete_secrets,
-	                       "SaveSecrets", impl_secret_agent_old_save_secrets,
-	                       NULL);
-}
+/*****************************************************************************/
 
 static void
 init_common (NMSecretAgentOld *self)
@@ -1037,42 +1007,14 @@ init_common (NMSecretAgentOld *self)
 	}
 }
 
-static gboolean
-init_sync (GInitable *initable, GCancellable *cancellable, GError **error)
-{
-	NMSecretAgentOld *self = NM_SECRET_AGENT_OLD (initable);
-	NMSecretAgentOldPrivate *priv = NM_SECRET_AGENT_OLD_GET_PRIVATE (self);
-
-	priv->bus = _nm_dbus_new_connection (cancellable, error);
-	if (!priv->bus)
-		return FALSE;
-
-	priv->manager_proxy = nmdbus_agent_manager_proxy_new_sync (priv->bus,
-	                                                             G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES
-	                                                           | G_DBUS_PROXY_FLAGS_DO_NOT_AUTO_START,
-	                                                           NM_DBUS_SERVICE,
-	                                                           NM_DBUS_PATH_AGENT_MANAGER,
-	                                                           cancellable,
-	                                                           error);
-	if (!priv->manager_proxy)
-		return FALSE;
-
-	init_common (self);
-
-	if (priv->auto_register)
-		return nm_secret_agent_old_register (self, cancellable, error);
-	else
-		return TRUE;
-}
-
 typedef struct {
 	NMSecretAgentOld *self;
 	GCancellable *cancellable;
 	GSimpleAsyncResult *simple;
-} NMSecretAgentOldInitData;
+} InitData;
 
 static void
-init_async_complete (NMSecretAgentOldInitData *init_data, GError *error)
+init_async_complete (InitData *init_data, GError *error)
 {
 	if (!error)
 		g_simple_async_result_set_op_res_gboolean (init_data->simple, TRUE);
@@ -1083,14 +1025,14 @@ init_async_complete (NMSecretAgentOldInitData *init_data, GError *error)
 
 	g_object_unref (init_data->simple);
 	g_clear_object (&init_data->cancellable);
-	g_slice_free (NMSecretAgentOldInitData, init_data);
+	g_slice_free (InitData, init_data);
 }
 
 static void
 init_async_registered (GObject *object, GAsyncResult *result, gpointer user_data)
 {
 	NMSecretAgentOld *self = NM_SECRET_AGENT_OLD (object);
-	NMSecretAgentOldInitData *init_data = user_data;
+	InitData *init_data = user_data;
 	GError *error = NULL;
 
 	nm_secret_agent_old_register_finish (self, result, &error);
@@ -1100,7 +1042,7 @@ init_async_registered (GObject *object, GAsyncResult *result, gpointer user_data
 static void
 init_async_got_proxy (GObject *object, GAsyncResult *result, gpointer user_data)
 {
-	NMSecretAgentOldInitData *init_data = user_data;
+	InitData *init_data = user_data;
 	NMSecretAgentOldPrivate *priv = NM_SECRET_AGENT_OLD_GET_PRIVATE (init_data->self);
 	GError *error = NULL;
 
@@ -1122,7 +1064,7 @@ init_async_got_proxy (GObject *object, GAsyncResult *result, gpointer user_data)
 static void
 init_async_got_bus (GObject *initable, GAsyncResult *result, gpointer user_data)
 {
-	NMSecretAgentOldInitData *init_data = user_data;
+	InitData *init_data = user_data;
 	NMSecretAgentOldPrivate *priv = NM_SECRET_AGENT_OLD_GET_PRIVATE (init_data->self);
 	GError *error = NULL;
 
@@ -1141,36 +1083,7 @@ init_async_got_bus (GObject *initable, GAsyncResult *result, gpointer user_data)
 	                                init_async_got_proxy, init_data);
 }
 
-static void
-init_async (GAsyncInitable *initable, int io_priority,
-            GCancellable *cancellable, GAsyncReadyCallback callback,
-            gpointer user_data)
-{
-	NMSecretAgentOld *self = NM_SECRET_AGENT_OLD (initable);
-	NMSecretAgentOldInitData *init_data;
-
-	init_data = g_slice_new (NMSecretAgentOldInitData);
-	init_data->self = self;
-	init_data->cancellable = cancellable ? g_object_ref (cancellable) : NULL;
-
-	init_data->simple = g_simple_async_result_new (G_OBJECT (initable), callback,
-	                                               user_data, init_async);
-	if (cancellable)
-		g_simple_async_result_set_check_cancellable (init_data->simple, cancellable);
-
-	_nm_dbus_new_connection_async (cancellable, init_async_got_bus, init_data);
-}
-
-static gboolean
-init_finish (GAsyncInitable *initable, GAsyncResult *result, GError **error)
-{
-	GSimpleAsyncResult *simple = G_SIMPLE_ASYNC_RESULT (result);
-
-	if (g_simple_async_result_propagate_error (simple, error))
-		return FALSE;
-	else
-		return TRUE;
-}
+/*****************************************************************************/
 
 static void
 get_property (GObject *object,
@@ -1229,23 +1142,109 @@ set_property (GObject *object,
 	}
 }
 
+/*****************************************************************************/
+
+static void
+nm_secret_agent_old_init (NMSecretAgentOld *self)
+{
+	NMSecretAgentOldPrivate *priv = NM_SECRET_AGENT_OLD_GET_PRIVATE (self);
+
+	c_list_init (&priv->gsi_lst_head);
+	priv->dbus_secret_agent = nmdbus_secret_agent_skeleton_new ();
+	_nm_dbus_bind_properties (self, priv->dbus_secret_agent);
+	_nm_dbus_bind_methods (self, priv->dbus_secret_agent,
+	                       "GetSecrets", impl_secret_agent_old_get_secrets,
+	                       "CancelGetSecrets", impl_secret_agent_old_cancel_get_secrets,
+	                       "DeleteSecrets", impl_secret_agent_old_delete_secrets,
+	                       "SaveSecrets", impl_secret_agent_old_save_secrets,
+	                       NULL);
+}
+
+static gboolean
+init_sync (GInitable *initable, GCancellable *cancellable, GError **error)
+{
+	NMSecretAgentOld *self = NM_SECRET_AGENT_OLD (initable);
+	NMSecretAgentOldPrivate *priv = NM_SECRET_AGENT_OLD_GET_PRIVATE (self);
+
+	priv->bus = _nm_dbus_new_connection (cancellable, error);
+	if (!priv->bus)
+		return FALSE;
+
+	priv->manager_proxy = nmdbus_agent_manager_proxy_new_sync (priv->bus,
+	                                                             G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES
+	                                                           | G_DBUS_PROXY_FLAGS_DO_NOT_AUTO_START,
+	                                                           NM_DBUS_SERVICE,
+	                                                           NM_DBUS_PATH_AGENT_MANAGER,
+	                                                           cancellable,
+	                                                           error);
+	if (!priv->manager_proxy)
+		return FALSE;
+
+	init_common (self);
+
+	if (priv->auto_register)
+		return nm_secret_agent_old_register (self, cancellable, error);
+	else
+		return TRUE;
+}
+
+static void
+init_async (GAsyncInitable *initable, int io_priority,
+            GCancellable *cancellable, GAsyncReadyCallback callback,
+            gpointer user_data)
+{
+	NMSecretAgentOld *self = NM_SECRET_AGENT_OLD (initable);
+	InitData *init_data;
+
+	init_data = g_slice_new (InitData);
+	*init_data = (InitData) {
+		.self = self,
+		.cancellable = nm_g_object_ref (cancellable),
+		.simple = g_simple_async_result_new (G_OBJECT (initable),
+		                                     callback,
+		                                     user_data,
+		                                     init_async),
+	};
+
+	if (cancellable)
+		g_simple_async_result_set_check_cancellable (init_data->simple, cancellable);
+
+	_nm_dbus_new_connection_async (cancellable, init_async_got_bus, init_data);
+}
+
+static gboolean
+init_finish (GAsyncInitable *initable, GAsyncResult *result, GError **error)
+{
+	GSimpleAsyncResult *simple = G_SIMPLE_ASYNC_RESULT (result);
+
+	if (g_simple_async_result_propagate_error (simple, error))
+		return FALSE;
+	else
+		return TRUE;
+}
+
 static void
 dispose (GObject *object)
 {
 	NMSecretAgentOld *self = NM_SECRET_AGENT_OLD (object);
 	NMSecretAgentOldPrivate *priv = NM_SECRET_AGENT_OLD_GET_PRIVATE (self);
+	GetSecretsInfo *info;
 
-	if (priv->registered)
+	if (priv->registered) {
+		priv->registered = FALSE;
 		nm_secret_agent_old_unregister_async (self, NULL, NULL, NULL);
+	}
 
-	g_clear_pointer (&priv->identifier, g_free);
+	nm_clear_g_free (&priv->identifier);
 
-	while (priv->pending_gets)
-		get_secrets_info_finalize (self, priv->pending_gets->data);
+	while ((info = c_list_first_entry (&priv->gsi_lst_head, GetSecretsInfo, gsi_lst)))
+		get_secrets_info_free (info);
 
-	g_signal_handlers_disconnect_matched (priv->dbus_secret_agent, G_SIGNAL_MATCH_DATA,
-	                                      0, 0, NULL, NULL, self);
-	g_object_unref (priv->dbus_secret_agent);
+	if (priv->dbus_secret_agent) {
+		g_signal_handlers_disconnect_matched (priv->dbus_secret_agent, G_SIGNAL_MATCH_DATA,
+		                                      0, 0, NULL, NULL, self);
+		g_clear_object (&priv->dbus_secret_agent);
+	}
 
 	g_clear_object (&priv->manager_proxy);
 	g_clear_object (&priv->bus);
@@ -1260,7 +1259,6 @@ nm_secret_agent_old_class_init (NMSecretAgentOldClass *class)
 
 	g_type_class_add_private (class, sizeof (NMSecretAgentOldPrivate));
 
-	/* Virtual methods */
 	object_class->dispose = dispose;
 	object_class->get_property = get_property;
 	object_class->set_property = set_property;
@@ -1276,13 +1274,12 @@ nm_secret_agent_old_class_init (NMSecretAgentOldClass *class)
 	 * of 3 characters.  An example valid identifier is 'org.gnome.nm-applet'
 	 * (without quotes).
 	 **/
-	g_object_class_install_property
-		(object_class, PROP_IDENTIFIER,
-		 g_param_spec_string (NM_SECRET_AGENT_OLD_IDENTIFIER, "", "",
-		                      NULL,
-		                      G_PARAM_READWRITE |
-		                      G_PARAM_CONSTRUCT_ONLY |
-		                      G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_IDENTIFIER] =
+	    g_param_spec_string (NM_SECRET_AGENT_OLD_IDENTIFIER, "", "",
+	                         NULL,
+	                         G_PARAM_READWRITE |
+	                         G_PARAM_CONSTRUCT_ONLY |
+	                         G_PARAM_STATIC_STRINGS);
 
 	/**
 	 * NMSecretAgentOld:auto-register:
@@ -1305,39 +1302,38 @@ nm_secret_agent_old_class_init (NMSecretAgentOldClass *class)
 	 * auto-registration. This ensures that the agent remains un-registered when
 	 * you expect it to be unregistered.
 	 **/
-	g_object_class_install_property
-		(object_class, PROP_AUTO_REGISTER,
-		 g_param_spec_boolean (NM_SECRET_AGENT_OLD_AUTO_REGISTER, "", "",
-		                       TRUE,
-		                       G_PARAM_READWRITE |
-		                       G_PARAM_CONSTRUCT |
-		                       G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_AUTO_REGISTER] =
+	    g_param_spec_boolean (NM_SECRET_AGENT_OLD_AUTO_REGISTER, "", "",
+	                          TRUE,
+	                          G_PARAM_READWRITE |
+	                          G_PARAM_CONSTRUCT |
+	                          G_PARAM_STATIC_STRINGS);
 
 	/**
 	 * NMSecretAgentOld:registered:
 	 *
 	 * %TRUE if the agent is registered with NetworkManager, %FALSE if not.
 	 **/
-	g_object_class_install_property
-		(object_class, PROP_REGISTERED,
-		 g_param_spec_boolean (NM_SECRET_AGENT_OLD_REGISTERED, "", "",
-		                       FALSE,
-		                       G_PARAM_READABLE |
-		                       G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_REGISTERED] =
+	    g_param_spec_boolean (NM_SECRET_AGENT_OLD_REGISTERED, "", "",
+	                          FALSE,
+	                          G_PARAM_READABLE |
+	                          G_PARAM_STATIC_STRINGS);
 
 	/**
 	 * NMSecretAgentOld:capabilities:
 	 *
 	 * A bitfield of %NMSecretAgentCapabilities.
 	 **/
-	g_object_class_install_property
-		(object_class, PROP_CAPABILITIES,
-		 g_param_spec_flags (NM_SECRET_AGENT_OLD_CAPABILITIES, "", "",
-		                     NM_TYPE_SECRET_AGENT_CAPABILITIES,
-		                     NM_SECRET_AGENT_CAPABILITY_NONE,
-		                     G_PARAM_READWRITE |
-		                     G_PARAM_CONSTRUCT |
-		                     G_PARAM_STATIC_STRINGS));
+	obj_properties[PROP_CAPABILITIES] =
+	    g_param_spec_flags (NM_SECRET_AGENT_OLD_CAPABILITIES, "", "",
+	                        NM_TYPE_SECRET_AGENT_CAPABILITIES,
+	                        NM_SECRET_AGENT_CAPABILITY_NONE,
+	                        G_PARAM_READWRITE |
+	                        G_PARAM_CONSTRUCT |
+	                        G_PARAM_STATIC_STRINGS);
+
+	g_object_class_install_properties (object_class, _PROPERTY_ENUMS_LAST, obj_properties);
 }
 
 static void
diff --git a/libnm/nm-settings-docs-overrides.xml b/libnm/nm-settings-docs-overrides.xml
index 276253c6..8f14996d 100644
--- a/libnm/nm-settings-docs-overrides.xml
+++ b/libnm/nm-settings-docs-overrides.xml
@@ -162,6 +162,8 @@ vlan's interface name."/>
 
 
 
+
+
 
 
 
@@ -172,10 +174,13 @@ For libnm and nmcli, this field is called "cloned-mac-address"."/>
 a hardware address in ASCII representation, or one of the special values
 "preserve", "permanent", "random" or "stable".
 This field replaces the deprecated "cloned-mac-address" on D-Bus, which
-can only contain explict hardware addresses. Note that this property
+can only contain explicit hardware addresses. Note that this property
 only exists in D-Bus API. libnm and nmcli continue to call this property
 "cloned-mac-address"."/>
 
+
+
+
 
 
 
@@ -186,7 +191,7 @@ For libnm and nmcli, this field is called "cloned-mac-address"."/>
 a hardware address in ASCII representation, or one of the special values
 "preserve", "permanent", "random" or "stable".
 This field replaces the deprecated "cloned-mac-address" on D-Bus, which
-can only contain explict hardware addresses. Note that this property
+can only contain explicit hardware addresses. Note that this property
 only exists in D-Bus API. libnm and nmcli continue to call this property
 "cloned-mac-address"."/>
 
     
     
-    
+    
     
     
     
@@ -147,7 +147,7 @@
     
     
     
-    
+    
     
     
     
@@ -174,7 +174,7 @@
     
     
     
-    
+    
     
     
     
@@ -198,7 +198,7 @@
     
     
     
-    
+    
     
     
     
@@ -325,7 +325,7 @@
   
     
     
-    
+    
     
     
     
@@ -345,7 +345,7 @@
     
     
     
-    
+    
     
     
     
@@ -395,12 +395,17 @@
     
     
   
+  
+    
+    
+    
+  
   
     
     
   
   
-    
+    
     
     
     
@@ -416,8 +421,17 @@
     
     
   
+  
+    
+    
+    
+    
+    
+    
+    
+  
   
-    
+    
     
     
     
@@ -441,14 +455,14 @@
     
     
     
-    
+    
     
     
     
     
     
     
-    
+    
     
     
     
@@ -460,7 +474,9 @@
     
   
   
+    
     
+    
     
     
   
diff --git a/libnm/nm-settings-ifcfg-rh-docs.xml b/libnm/nm-settings-ifcfg-rh-docs.xml
index 11f3115d..cec2d527 100644
--- a/libnm/nm-settings-ifcfg-rh-docs.xml
+++ b/libnm/nm-settings-ifcfg-rh-docs.xml
@@ -135,7 +135,7 @@ means "do not transmit priority pause", "1" means "tran
 The sum of the numbers must be 100."/>
 
-
+
 
 
 
@@ -297,6 +297,8 @@ but VLAN id from DEVICE takes precedence over VLAN_ID."/>
 
 
 
+
+
 
 
 
@@ -325,6 +327,8 @@ is listed."/>
 
 
+
+
 
 
 
diff --git a/libnm/nm-settings-keyfile-docs.xml b/libnm/nm-settings-keyfile-docs.xml
index 09b119a2..002d5609 100644
--- a/libnm/nm-settings-keyfile-docs.xml
+++ b/libnm/nm-settings-keyfile-docs.xml
@@ -102,6 +102,11 @@ under [vpn-secrets] section."/>
 
 
 
+
+
+
 
 
 
@@ -113,6 +118,8 @@ under [vpn-secrets] section."/>
 (e.g. 0;34;104;18;121;178)."/>
 
 
+
+
 
 
 
diff --git a/libnm/nm-types.h b/libnm/nm-types.h
index bb77e642..16a2ba18 100644
--- a/libnm/nm-types.h
+++ b/libnm/nm-types.h
@@ -39,8 +39,8 @@ typedef struct _NMDeviceBt           NMDeviceBt;
 typedef struct _NMDeviceDummy        NMDeviceDummy;
 typedef struct _NMDeviceEthernet     NMDeviceEthernet;
 typedef struct _NMDeviceGeneric      NMDeviceGeneric;
-typedef struct _NMDeviceInfiniband   NMDeviceInfiniband;
 typedef struct _NMDeviceIPTunnel     NMDeviceIPTunnel;
+typedef struct _NMDeviceInfiniband   NMDeviceInfiniband;
 typedef struct _NMDeviceMacsec       NMDeviceMacsec;
 typedef struct _NMDeviceMacvlan      NMDeviceMacvlan;
 typedef struct _NMDeviceModem        NMDeviceModem;
@@ -54,6 +54,7 @@ typedef struct _NMDeviceTun          NMDeviceTun;
 typedef struct _NMDeviceVlan         NMDeviceVlan;
 typedef struct _NMDeviceVxlan        NMDeviceVxlan;
 typedef struct _NMDeviceWifi         NMDeviceWifi;
+typedef struct _NMDeviceWifiP2P      NMDeviceWifiP2P;
 typedef struct _NMDeviceWimax        NMDeviceWimax;
 typedef struct _NMDeviceWireGuard    NMDeviceWireGuard;
 typedef struct _NMDeviceWpan         NMDeviceWpan;
@@ -62,6 +63,7 @@ typedef struct _NMIPConfig           NMIPConfig;
 typedef struct _NMObject             NMObject;
 typedef struct _NMRemoteConnection   NMRemoteConnection;
 typedef struct _NMVpnConnection      NMVpnConnection;
+typedef struct _NMWifiP2PPeer        NMWifiP2PPeer;
 typedef struct _NMWimaxNsp           NMWimaxNsp;
 
 #endif  /* NM_TYPES_H */
diff --git a/libnm/nm-vpn-connection.c b/libnm/nm-vpn-connection.c
index bc26d0b9..9fc32ed6 100644
--- a/libnm/nm-vpn-connection.c
+++ b/libnm/nm-vpn-connection.c
@@ -21,9 +21,8 @@
 
 #include "nm-default.h"
 
-#include 
-
 #include "nm-vpn-connection.h"
+
 #include "nm-dbus-interface.h"
 #include "nm-utils.h"
 #include "nm-object-private.h"
diff --git a/libnm/nm-vpn-plugin-old.c b/libnm/nm-vpn-plugin-old.c
index bfafc7b7..80900cec 100644
--- a/libnm/nm-vpn-plugin-old.c
+++ b/libnm/nm-vpn-plugin-old.c
@@ -23,7 +23,6 @@
 
 #include "nm-vpn-plugin-old.h"
 
-#include 
 #include 
 #include 
 
diff --git a/libnm/nm-vpn-service-plugin.c b/libnm/nm-vpn-service-plugin.c
index 2213824e..a2728342 100644
--- a/libnm/nm-vpn-service-plugin.c
+++ b/libnm/nm-vpn-service-plugin.c
@@ -23,7 +23,6 @@
 
 #include "nm-vpn-service-plugin.h"
 
-#include 
 #include 
 #include 
 
@@ -787,10 +786,13 @@ nm_vpn_service_plugin_read_vpn_details (int fd,
 	gs_unref_hashtable GHashTable *data = NULL;
 	gs_unref_hashtable GHashTable *secrets = NULL;
 	gboolean success = FALSE;
-	char *key = NULL, *val = NULL;
+	GHashTable *hash = NULL;
+	GString *key = NULL, *val = NULL;
 	nm_auto_free_gstring GString *line = NULL;
 	char c;
 
+	GString *str = NULL;
+
 	if (out_data)
 		g_return_val_if_fail (*out_data == NULL, FALSE);
 	if (out_secrets)
@@ -804,49 +806,79 @@ nm_vpn_service_plugin_read_vpn_details (int fd,
 	/* Read stdin for data and secret items until we get a DONE */
 	while (1) {
 		ssize_t nr;
-		GHashTable *hash = NULL;
 
-		errno = 0;
 		nr = read (fd, &c, 1);
-		if (nr == -1) {
+		if (nr < 0) {
 			if (errno == EAGAIN) {
 				g_usleep (100);
 				continue;
 			}
 			break;
 		}
-
-		if (c != '\n') {
+		if (nr > 0 && c != '\n') {
 			g_string_append_c (line, c);
 			continue;
 		}
 
-		/* Check for the finish marker */
-		if (strcmp (line->str, "DONE") == 0)
-			break;
+		if (str && *line->str == '=') {
+			/* continuation */
+			g_string_append_c (str, '\n');
+			g_string_append (str, line->str + 1);
+		} else if (key && val) {
+			/* done a line */
+			g_return_val_if_fail (hash, FALSE);
+			g_hash_table_insert (hash,
+			                     g_string_free (key, FALSE),
+			                     g_string_free (val, FALSE));
+			key = NULL;
+			val = NULL;
+			hash = NULL;
+			success = TRUE;  /* Got at least one value */
+		}
 
-		/* Otherwise it's a data/secret item */
-		if (strncmp (line->str, DATA_KEY_TAG, strlen (DATA_KEY_TAG)) == 0) {
+		if (strcmp (line->str, "DONE") == 0) {
+			/* finish marker */
+			break;
+		} else if (strncmp (line->str, DATA_KEY_TAG, strlen (DATA_KEY_TAG)) == 0) {
+			if (key != NULL) {
+				g_warning ("a value expected");
+				g_string_free (key, TRUE);
+			}
+			key = g_string_new (line->str + strlen (DATA_KEY_TAG));
+			str = key;
 			hash = data;
-			key = g_strdup (line->str + strlen (DATA_KEY_TAG));
 		} else if (strncmp (line->str, DATA_VAL_TAG, strlen (DATA_VAL_TAG)) == 0) {
-			hash = data;
-			val = g_strdup (line->str + strlen (DATA_VAL_TAG));
+			if (val != NULL)
+				g_string_free (val, TRUE);
+			if (val || !key || hash != data) {
+				g_warning ("%s not preceded by %s", DATA_VAL_TAG, DATA_KEY_TAG);
+				break;
+			}
+			val = g_string_new (line->str + strlen (DATA_VAL_TAG));
+			str = val;
 		} else if (strncmp (line->str, SECRET_KEY_TAG, strlen (SECRET_KEY_TAG)) == 0) {
+			if (key != NULL) {
+				g_warning ("a value expected");
+				g_string_free (key, TRUE);
+			}
+			key = g_string_new (line->str + strlen (SECRET_KEY_TAG));
+			str = key;
 			hash = secrets;
-			key = g_strdup (line->str + strlen (SECRET_KEY_TAG));
 		} else if (strncmp (line->str, SECRET_VAL_TAG, strlen (SECRET_VAL_TAG)) == 0) {
-			hash = secrets;
-			val = g_strdup (line->str + strlen (SECRET_VAL_TAG));
+			if (val != NULL)
+				g_string_free (val, TRUE);
+			if (val || !key || hash != secrets) {
+				g_warning ("%s not preceded by %s", SECRET_VAL_TAG, SECRET_KEY_TAG);
+				break;
+			}
+			val = g_string_new (line->str + strlen (SECRET_VAL_TAG));
+			str = val;
 		}
+
 		g_string_truncate (line, 0);
 
-		if (key && val && hash) {
-			g_hash_table_insert (hash, key, val);
-			key = NULL;
-			val = NULL;
-			success = TRUE;  /* Got at least one value */
-		}
+		if (nr == 0)
+			break;
 	}
 
 	if (success) {
@@ -1325,7 +1357,7 @@ nm_vpn_service_plugin_initable_iface_init (GInitableIface *iface)
 /*****************************************************************************/
 
 /* this header is intended to be copied to users of nm_vpn_editor_plugin_call(),
- * to simplify invocation of generic functions. Include it here, to complile
+ * to simplify invocation of generic functions. Include it here, to compile
  * the code. */
 #include "nm-utils/nm-vpn-editor-plugin-call.h"
 
diff --git a/libnm/nm-wifi-p2p-peer.c b/libnm/nm-wifi-p2p-peer.c
new file mode 100644
index 00000000..4dd8545d
--- /dev/null
+++ b/libnm/nm-wifi-p2p-peer.c
@@ -0,0 +1,600 @@
+/*
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301 USA.
+ *
+ * Copyright 2018 - 2019 Red Hat, Inc.
+ */
+
+#include "nm-default.h"
+
+#include "nm-wifi-p2p-peer.h"
+
+#include "nm-connection.h"
+#include "nm-setting-connection.h"
+#include "nm-setting-wifi-p2p.h"
+#include "nm-utils.h"
+#include "nm-dbus-interface.h"
+#include "nm-object-private.h"
+
+/*****************************************************************************/
+
+NM_GOBJECT_PROPERTIES_DEFINE_BASE (
+	PROP_FLAGS,
+	PROP_NAME,
+	PROP_MANUFACTURER,
+	PROP_MODEL,
+	PROP_MODEL_NUMBER,
+	PROP_SERIAL,
+	PROP_WFD_IES,
+	PROP_HW_ADDRESS,
+	PROP_STRENGTH,
+	PROP_LAST_SEEN,
+);
+
+typedef struct {
+	char *name;
+	char *manufacturer;
+	char *model;
+	char *model_number;
+	char *serial;
+
+	GBytes *wfd_ies;
+
+	char *hw_address;
+
+	int last_seen;
+
+	NM80211ApFlags flags;
+
+	guint8 strength;
+} NMWifiP2PPeerPrivate;
+
+/**
+ * NMWifiP2PPeer:
+ */
+struct _NMWifiP2PPeer {
+	NMObject parent;
+	NMWifiP2PPeerPrivate _priv;
+};
+
+struct _NMWifiP2PPeerClass {
+	NMObjectClass parent;
+};
+
+G_DEFINE_TYPE (NMWifiP2PPeer, nm_wifi_p2p_peer, NM_TYPE_OBJECT)
+
+#define NM_WIFI_P2P_PEER_GET_PRIVATE(self) _NM_GET_PRIVATE (self, NMWifiP2PPeer, NM_IS_WIFI_P2P_PEER, NMObject)
+
+/*****************************************************************************/
+
+/**
+ * nm_wifi_p2p_peer_get_flags:
+ * @peer: a #NMWifiP2PPeer
+ *
+ * Gets the flags of the P2P peer.
+ *
+ * Returns: the flags
+ *
+ * Since: 1.16
+ **/
+NM80211ApFlags
+nm_wifi_p2p_peer_get_flags (NMWifiP2PPeer *peer)
+{
+	g_return_val_if_fail (NM_IS_WIFI_P2P_PEER (peer), NM_802_11_AP_FLAGS_NONE);
+
+	return NM_WIFI_P2P_PEER_GET_PRIVATE (peer)->flags;
+}
+
+/**
+ * nm_wifi_p2p_peer_get_name:
+ * @peer: a #NMWifiP2PPeer
+ *
+ * Gets the name of the P2P peer.
+ *
+ * Returns: the name
+ *
+ * Since: 1.16
+ **/
+const char *
+nm_wifi_p2p_peer_get_name (NMWifiP2PPeer *peer)
+{
+	g_return_val_if_fail (NM_IS_WIFI_P2P_PEER (peer), NULL);
+
+	return NM_WIFI_P2P_PEER_GET_PRIVATE (peer)->name;
+}
+
+/**
+ * nm_wifi_p2p_peer_get_manufacturer:
+ * @peer: a #NMWifiP2PPeer
+ *
+ * Gets the manufacturer of the P2P peer.
+ *
+ * Returns: the manufacturer
+ *
+ * Since: 1.16
+ **/
+const char *
+nm_wifi_p2p_peer_get_manufacturer (NMWifiP2PPeer *peer)
+{
+	g_return_val_if_fail (NM_IS_WIFI_P2P_PEER (peer), NULL);
+
+	return NM_WIFI_P2P_PEER_GET_PRIVATE (peer)->manufacturer;
+}
+
+/**
+ * nm_wifi_p2p_peer_get_model:
+ * @peer: a #NMWifiP2PPeer
+ *
+ * Gets the model of the P2P peer.
+ *
+ * Returns: the model
+ *
+ * Since: 1.16
+ **/
+const char *
+nm_wifi_p2p_peer_get_model (NMWifiP2PPeer *peer)
+{
+	g_return_val_if_fail (NM_IS_WIFI_P2P_PEER (peer), NULL);
+
+	return NM_WIFI_P2P_PEER_GET_PRIVATE (peer)->model;
+}
+
+/**
+ * nm_wifi_p2p_peer_get_model_number:
+ * @peer: a #NMWifiP2PPeer
+ *
+ * Gets the model number of the P2P peer.
+ *
+ * Returns: the model number
+ *
+ * Since: 1.16
+ **/
+const char *
+nm_wifi_p2p_peer_get_model_number (NMWifiP2PPeer *peer)
+{
+	g_return_val_if_fail (NM_IS_WIFI_P2P_PEER (peer), NULL);
+
+	return NM_WIFI_P2P_PEER_GET_PRIVATE (peer)->model_number;
+}
+
+/**
+ * nm_wifi_p2p_peer_get_serial:
+ * @peer: a #NMWifiP2PPeer
+ *
+ * Gets the serial number of the P2P peer.
+ *
+ * Returns: the serial number
+ *
+ * Since: 1.16
+ **/
+const char *
+nm_wifi_p2p_peer_get_serial (NMWifiP2PPeer *peer)
+{
+	g_return_val_if_fail (NM_IS_WIFI_P2P_PEER (peer), NULL);
+
+	return NM_WIFI_P2P_PEER_GET_PRIVATE (peer)->serial;
+}
+
+/**
+ * nm_wifi_p2p_peer_get_wfd_ies:
+ * @peer: a #NMWifiP2PPeer
+ *
+ * Gets the WFD information elements of the P2P peer.
+ *
+ * Returns: (transfer none): the #GBytes containing the WFD IEs, or %NULL.
+ *
+ * Since: 1.16
+ **/
+GBytes *
+nm_wifi_p2p_peer_get_wfd_ies (NMWifiP2PPeer *peer)
+{
+	NMWifiP2PPeerPrivate *priv;
+
+	g_return_val_if_fail (NM_IS_WIFI_P2P_PEER (peer), NULL);
+
+	priv = NM_WIFI_P2P_PEER_GET_PRIVATE (peer);
+	if (!priv->wfd_ies || g_bytes_get_size (priv->wfd_ies) == 0)
+		return NULL;
+
+	return priv->wfd_ies;
+}
+
+/**
+ * nm_wifi_p2p_peer_get_hw_address:
+ * @peer: a #NMWifiP2PPeer
+ *
+ * Gets the hardware address of the P2P peer.
+ *
+ * Returns: the hardware address
+ *
+ * Since: 1.16
+ **/
+const char *
+nm_wifi_p2p_peer_get_hw_address (NMWifiP2PPeer *peer)
+{
+	g_return_val_if_fail (NM_IS_WIFI_P2P_PEER (peer), NULL);
+
+	return NM_WIFI_P2P_PEER_GET_PRIVATE (peer)->hw_address;
+}
+
+/**
+ * nm_wifi_p2p_peer_get_strength:
+ * @peer: a #NMWifiP2PPeer
+ *
+ * Gets the current signal strength of the P2P peer as a percentage.
+ *
+ * Returns: the signal strength (0 to 100)
+ *
+ * Since: 1.16
+ **/
+guint8
+nm_wifi_p2p_peer_get_strength (NMWifiP2PPeer *peer)
+{
+	g_return_val_if_fail (NM_IS_WIFI_P2P_PEER (peer), 0);
+
+	return NM_WIFI_P2P_PEER_GET_PRIVATE (peer)->strength;
+}
+
+/**
+ * nm_wifi_p2p_peer_get_last_seen:
+ * @peer: a #NMWifiP2PPeer
+ *
+ * Returns the timestamp (in CLOCK_BOOTTIME seconds) for the last time the
+ * P2P peer was seen.  A value of -1 means the P2P peer has never been seen.
+ *
+ * Returns: the last seen time in seconds
+ *
+ * Since: 1.16
+ **/
+int
+nm_wifi_p2p_peer_get_last_seen (NMWifiP2PPeer *peer)
+{
+	g_return_val_if_fail (NM_IS_WIFI_P2P_PEER (peer), -1);
+
+	return NM_WIFI_P2P_PEER_GET_PRIVATE (peer)->last_seen;
+}
+
+/**
+ * nm_wifi_p2p_peer_connection_valid:
+ * @peer: an #NMWifiP2PPeer to validate @connection against
+ * @connection: an #NMConnection to validate against @peer
+ *
+ * Validates a given connection against a given Wi-Fi P2P peer to ensure that
+ * the connection may be activated with that peer. The connection must match the
+ * @peer's address and in the future possibly other attributes.
+ *
+ * Returns: %TRUE if the connection may be activated with this Wi-Fi P2P Peer,
+ * %FALSE if it cannot be.
+ *
+ * Since: 1.16
+ **/
+gboolean
+nm_wifi_p2p_peer_connection_valid (NMWifiP2PPeer *peer, NMConnection *connection)
+{
+	NMSettingConnection *s_con;
+	NMSettingWifiP2P *s_wifi_p2p;
+	const char *ctype;
+	const char *hw_address;
+	const char *setting_peer;
+
+	s_wifi_p2p = (NMSettingWifiP2P *) nm_connection_get_setting (connection, NM_TYPE_SETTING_WIFI_P2P);
+	if (!s_wifi_p2p)
+		return FALSE;
+
+	s_con = nm_connection_get_setting_connection (connection);
+	if (!s_con)
+		return FALSE;
+
+	ctype = nm_setting_connection_get_connection_type (s_con);
+	if (   !ctype
+	    || !nm_streq (ctype, NM_SETTING_WIFI_P2P_SETTING_NAME))
+		return FALSE;
+
+	/* HW Address check */
+	hw_address = nm_wifi_p2p_peer_get_hw_address (peer);
+	if (!hw_address)
+		return FALSE;
+
+	setting_peer = nm_setting_wifi_p2p_get_peer (s_wifi_p2p);
+	if (   !setting_peer
+	    || !nm_streq (hw_address, setting_peer))
+		return FALSE;
+
+	return TRUE;
+}
+
+/**
+ * nm_wifi_p2p_peer_filter_connections:
+ * @peer: an #NMWifiP2PPeer to filter connections for
+ * @connections: (element-type NMConnection): an array of #NMConnections to
+ * filter
+ *
+ * Filters a given array of connections for a given #NMWifiP2PPeer object and
+ * returns connections which may be activated with the P2P peer.  Any
+ * returned connections will match the @peers's HW address and in the future
+ * possibly other attributes.
+ *
+ * To obtain the list of connections that are compatible with this P2P peer,
+ * use nm_client_get_connections() and then filter the returned list for a given
+ * #NMDevice using nm_device_filter_connections() and finally filter that list
+ * with this function.
+ *
+ * Returns: (transfer container) (element-type NMConnection): an array of
+ * #NMConnections that could be activated with the given @peer. The array should
+ * be freed with g_ptr_array_unref() when it is no longer required.
+ *
+ * Since: 1.16
+ **/
+GPtrArray *
+nm_wifi_p2p_peer_filter_connections (NMWifiP2PPeer *peer, const GPtrArray *connections)
+{
+	GPtrArray *filtered;
+	guint i;
+
+	filtered = g_ptr_array_new_with_free_func (g_object_unref);
+	for (i = 0; i < connections->len; i++) {
+		NMConnection *candidate = connections->pdata[i];
+
+		if (nm_wifi_p2p_peer_connection_valid (peer, candidate))
+			g_ptr_array_add (filtered, g_object_ref (candidate));
+	}
+
+	return filtered;
+}
+
+/*****************************************************************************/
+
+static void
+init_dbus (NMObject *object)
+{
+	NMWifiP2PPeerPrivate *priv = NM_WIFI_P2P_PEER_GET_PRIVATE (object);
+	const NMPropertiesInfo property_info[] = {
+		{ NM_WIFI_P2P_PEER_FLAGS,        &priv->flags },
+		{ NM_WIFI_P2P_PEER_NAME,         &priv->name },
+		{ NM_WIFI_P2P_PEER_MANUFACTURER, &priv->manufacturer },
+		{ NM_WIFI_P2P_PEER_MODEL,        &priv->model },
+		{ NM_WIFI_P2P_PEER_MODEL_NUMBER, &priv->model_number },
+		{ NM_WIFI_P2P_PEER_SERIAL,       &priv->serial },
+		{ NM_WIFI_P2P_PEER_WFD_IES,      &priv->wfd_ies },
+		{ NM_WIFI_P2P_PEER_HW_ADDRESS,   &priv->hw_address },
+		{ NM_WIFI_P2P_PEER_STRENGTH,     &priv->strength },
+		{ NM_WIFI_P2P_PEER_LAST_SEEN,    &priv->last_seen },
+		{ NULL },
+	};
+
+	NM_OBJECT_CLASS (nm_wifi_p2p_peer_parent_class)->init_dbus (object);
+
+	_nm_object_register_properties (object,
+	                                NM_DBUS_INTERFACE_WIFI_P2P_PEER,
+	                                property_info);
+}
+
+/*****************************************************************************/
+
+static void
+get_property (GObject *object,
+              guint prop_id,
+              GValue *value,
+              GParamSpec *pspec)
+{
+	NMWifiP2PPeer *peer = NM_WIFI_P2P_PEER (object);
+
+	switch (prop_id) {
+	case PROP_FLAGS:
+		g_value_set_flags (value, nm_wifi_p2p_peer_get_flags (peer));
+		break;
+	case PROP_NAME:
+		g_value_set_string (value, nm_wifi_p2p_peer_get_name (peer));
+		break;
+	case PROP_MANUFACTURER:
+		g_value_set_string (value, nm_wifi_p2p_peer_get_manufacturer (peer));
+		break;
+	case PROP_MODEL:
+		g_value_set_string (value, nm_wifi_p2p_peer_get_model (peer));
+		break;
+	case PROP_MODEL_NUMBER:
+		g_value_set_string (value, nm_wifi_p2p_peer_get_model_number (peer));
+		break;
+	case PROP_SERIAL:
+		g_value_set_string (value, nm_wifi_p2p_peer_get_serial (peer));
+		break;
+	case PROP_WFD_IES:
+		g_value_set_boxed (value, nm_wifi_p2p_peer_get_wfd_ies (peer));
+		break;
+	case PROP_HW_ADDRESS:
+		g_value_set_string (value, nm_wifi_p2p_peer_get_hw_address (peer));
+		break;
+	case PROP_STRENGTH:
+		g_value_set_uchar (value, nm_wifi_p2p_peer_get_strength (peer));
+		break;
+	case PROP_LAST_SEEN:
+		g_value_set_int (value, nm_wifi_p2p_peer_get_last_seen (peer));
+		break;
+	default:
+		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+		break;
+	}
+}
+
+/*****************************************************************************/
+
+static void
+nm_wifi_p2p_peer_init (NMWifiP2PPeer *peer)
+{
+	NM_WIFI_P2P_PEER_GET_PRIVATE (peer)->last_seen = -1;
+}
+
+static void
+finalize (GObject *object)
+{
+	NMWifiP2PPeerPrivate *priv = NM_WIFI_P2P_PEER_GET_PRIVATE (object);
+
+	g_free (priv->name);
+	g_free (priv->manufacturer);
+	g_free (priv->model);
+	g_free (priv->model_number);
+	g_free (priv->serial);
+
+	g_free (priv->hw_address);
+
+	g_bytes_unref (priv->wfd_ies);
+
+	G_OBJECT_CLASS (nm_wifi_p2p_peer_parent_class)->finalize (object);
+}
+
+static void
+nm_wifi_p2p_peer_class_init (NMWifiP2PPeerClass *klass)
+{
+	GObjectClass *object_class = G_OBJECT_CLASS (klass);
+	NMObjectClass *nm_object_class = NM_OBJECT_CLASS (klass);
+
+	object_class->get_property = get_property;
+	object_class->finalize     = finalize;
+
+	nm_object_class->init_dbus = init_dbus;
+
+	/**
+	 * NMWifiP2PPeer:flags:
+	 *
+	 * The flags of the P2P peer.
+	 *
+	 * Since: 1.16
+	 **/
+	obj_properties[PROP_FLAGS] =
+	    g_param_spec_flags (NM_WIFI_P2P_PEER_FLAGS, "", "",
+	                        NM_TYPE_802_11_AP_FLAGS,
+	                        NM_802_11_AP_FLAGS_NONE,
+	                        G_PARAM_READABLE |
+	                        G_PARAM_STATIC_STRINGS);
+
+	/**
+	 * NMWifiP2PPeer:name:
+	 *
+	 * The name of the P2P peer.
+	 *
+	 * Since: 1.16
+	 **/
+	obj_properties[PROP_NAME] =
+	    g_param_spec_string (NM_WIFI_P2P_PEER_NAME, "", "",
+	                         NULL,
+	                         G_PARAM_READABLE |
+	                         G_PARAM_STATIC_STRINGS);
+
+	/**
+	 * NMWifiP2PPeer:manufacturer:
+	 *
+	 * The manufacturer of the P2P peer.
+	 *
+	 * Since: 1.16
+	 **/
+	obj_properties[PROP_MANUFACTURER] =
+	    g_param_spec_string (NM_WIFI_P2P_PEER_MANUFACTURER, "", "",
+	                         NULL,
+	                         G_PARAM_READABLE |
+	                         G_PARAM_STATIC_STRINGS);
+
+	/**
+	 * NMWifiP2PPeer:model:
+	 *
+	 * The model of the P2P peer.
+	 *
+	 * Since: 1.16
+	 **/
+	obj_properties[PROP_MODEL] =
+	    g_param_spec_string (NM_WIFI_P2P_PEER_MODEL, "", "",
+	                         NULL,
+	                         G_PARAM_READABLE |
+	                         G_PARAM_STATIC_STRINGS);
+
+	/**
+	 * NMWifiP2PPeer:model-number:
+	 *
+	 * The hardware address of the P2P peer.
+	 *
+	 * Since: 1.16
+	 **/
+	obj_properties[PROP_MODEL_NUMBER] =
+	    g_param_spec_string (NM_WIFI_P2P_PEER_MODEL_NUMBER, "", "",
+	                         NULL,
+	                         G_PARAM_READABLE |
+	                         G_PARAM_STATIC_STRINGS);
+
+	/**
+	 * NMWifiP2PPeer:serial:
+	 *
+	 * The serial number of the P2P peer.
+	 *
+	 * Since: 1.16
+	 **/
+	obj_properties[PROP_SERIAL] =
+	    g_param_spec_string (NM_WIFI_P2P_PEER_SERIAL, "", "",
+	                         NULL,
+	                         G_PARAM_READABLE |
+	                         G_PARAM_STATIC_STRINGS);
+
+	/**
+	 * NMWifiP2PPeer:wfd-ies:
+	 *
+	 * The WFD information elements of the P2P peer.
+	 *
+	 * Since: 1.16
+	 **/
+	obj_properties[PROP_WFD_IES] =
+	    g_param_spec_boxed (NM_WIFI_P2P_PEER_WFD_IES, "", "",
+	                        G_TYPE_BYTES,
+	                        G_PARAM_READABLE |
+	                        G_PARAM_STATIC_STRINGS);
+	/**
+	 * NMWifiP2PPeer:hw-address:
+	 *
+	 * The hardware address of the P2P peer.
+	 *
+	 * Since: 1.16
+	 **/
+	obj_properties[PROP_HW_ADDRESS] =
+	    g_param_spec_string (NM_WIFI_P2P_PEER_HW_ADDRESS, "", "",
+	                         NULL,
+	                         G_PARAM_READABLE |
+	                         G_PARAM_STATIC_STRINGS);
+
+	/**
+	 * NMWifiP2PPeer:strength:
+	 *
+	 * The current signal strength of the P2P peer.
+	 *
+	 * Since: 1.16
+	 **/
+	obj_properties[PROP_STRENGTH] =
+	    g_param_spec_uchar (NM_WIFI_P2P_PEER_STRENGTH, "", "",
+	                        0, G_MAXUINT8, 0,
+	                        G_PARAM_READABLE |
+	                        G_PARAM_STATIC_STRINGS);
+
+	/**
+	 * NMWifiP2PPeer:last-seen:
+	 *
+	 * The timestamp (in CLOCK_BOOTTIME seconds) for the last time the
+	 * P2P peer was found.  A value of -1 means the peer has never been seen.
+	 *
+	 * Since: 1.16
+	 **/
+	obj_properties[PROP_LAST_SEEN] =
+	    g_param_spec_int (NM_WIFI_P2P_PEER_LAST_SEEN, "", "",
+	                      -1, G_MAXINT, -1,
+	                      G_PARAM_READABLE |
+	                      G_PARAM_STATIC_STRINGS);
+
+	g_object_class_install_properties (object_class, _PROPERTY_ENUMS_LAST, obj_properties);
+}
diff --git a/libnm/nm-wifi-p2p-peer.h b/libnm/nm-wifi-p2p-peer.h
new file mode 100644
index 00000000..7d48883b
--- /dev/null
+++ b/libnm/nm-wifi-p2p-peer.h
@@ -0,0 +1,89 @@
+/*
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301 USA.
+ *
+ * Copyright 2018 - 2019 Red Hat, Inc.
+ */
+
+#ifndef __NM_WIFI_P2P_PEER_H__
+#define __NM_WIFI_P2P_PEER_H__
+
+#if !defined (__NETWORKMANAGER_H_INSIDE__) && !defined (NETWORKMANAGER_COMPILATION)
+#error "Only  can be included directly."
+#endif
+
+#include "nm-object.h"
+
+G_BEGIN_DECLS
+
+#define NM_TYPE_WIFI_P2P_PEER            (nm_wifi_p2p_peer_get_type ())
+#define NM_WIFI_P2P_PEER(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_WIFI_P2P_PEER, NMWifiP2PPeer))
+#define NM_WIFI_P2P_PEER_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_WIFI_P2P_PEER, NMWifiP2PPeerClass))
+#define NM_IS_WIFI_P2P_PEER(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NM_TYPE_WIFI_P2P_PEER))
+#define NM_IS_WIFI_P2P_PEER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), NM_TYPE_WIFI_P2P_PEER))
+#define NM_WIFI_P2P_PEER_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_WIFI_P2P_PEER, NMWifiP2PPeerClass))
+
+#define NM_WIFI_P2P_PEER_FLAGS                "flags"
+#define NM_WIFI_P2P_PEER_NAME                 "name"
+#define NM_WIFI_P2P_PEER_MANUFACTURER         "manufacturer"
+#define NM_WIFI_P2P_PEER_MODEL                "model"
+#define NM_WIFI_P2P_PEER_MODEL_NUMBER         "model-number"
+#define NM_WIFI_P2P_PEER_SERIAL               "serial"
+#define NM_WIFI_P2P_PEER_WFD_IES              "wfd-ies"
+#define NM_WIFI_P2P_PEER_HW_ADDRESS           "hw-address"
+#define NM_WIFI_P2P_PEER_STRENGTH             "strength"
+#define NM_WIFI_P2P_PEER_LAST_SEEN            "last-seen"
+
+typedef struct _NMWifiP2PPeerClass NMWifiP2PPeerClass;
+
+NM_AVAILABLE_IN_1_16
+GType nm_wifi_p2p_peer_get_type (void);
+
+NM_AVAILABLE_IN_1_16
+NM80211ApFlags         nm_wifi_p2p_peer_get_flags        (NMWifiP2PPeer *peer);
+
+NM_AVAILABLE_IN_1_16
+const char *           nm_wifi_p2p_peer_get_name         (NMWifiP2PPeer *peer);
+NM_AVAILABLE_IN_1_16
+const char *           nm_wifi_p2p_peer_get_manufacturer (NMWifiP2PPeer *peer);
+NM_AVAILABLE_IN_1_16
+const char *           nm_wifi_p2p_peer_get_model        (NMWifiP2PPeer *peer);
+NM_AVAILABLE_IN_1_16
+const char *           nm_wifi_p2p_peer_get_model_number (NMWifiP2PPeer *peer);
+NM_AVAILABLE_IN_1_16
+const char *           nm_wifi_p2p_peer_get_serial       (NMWifiP2PPeer *peer);
+
+NM_AVAILABLE_IN_1_16
+GBytes *               nm_wifi_p2p_peer_get_wfd_ies      (NMWifiP2PPeer *peer);
+
+NM_AVAILABLE_IN_1_16
+const char *           nm_wifi_p2p_peer_get_hw_address   (NMWifiP2PPeer *peer);
+
+NM_AVAILABLE_IN_1_16
+guint8                 nm_wifi_p2p_peer_get_strength     (NMWifiP2PPeer *peer);
+NM_AVAILABLE_IN_1_16
+int                    nm_wifi_p2p_peer_get_last_seen    (NMWifiP2PPeer *peer);
+
+NM_AVAILABLE_IN_1_16
+GPtrArray *            nm_wifi_p2p_peer_filter_connections (NMWifiP2PPeer *peer,
+                                                            const GPtrArray *connections);
+
+NM_AVAILABLE_IN_1_16
+gboolean               nm_wifi_p2p_peer_connection_valid   (NMWifiP2PPeer *peer,
+                                                            NMConnection *connection);
+
+G_END_DECLS
+
+#endif /* __NM_WIFI_P2P_PEER_H__ */
diff --git a/libnm/nm-wimax-nsp.c b/libnm/nm-wimax-nsp.c
index 90c2c2bb..7baf7f02 100644
--- a/libnm/nm-wimax-nsp.c
+++ b/libnm/nm-wimax-nsp.c
@@ -20,13 +20,11 @@
 
 #include "nm-default.h"
 
-#include 
+#include "nm-wimax-nsp.h"
 
 #include "nm-connection.h"
 #include "nm-setting-connection.h"
 #include "nm-setting-wimax.h"
-
-#include "nm-wimax-nsp.h"
 #include "nm-dbus-interface.h"
 #include "nm-object-private.h"
 #include "nm-enum-types.h"
diff --git a/libnm/tests/meson.build b/libnm/tests/meson.build
index ae2f7124..d0a2dd30 100644
--- a/libnm/tests/meson.build
+++ b/libnm/tests/meson.build
@@ -20,16 +20,17 @@ foreach test_unit: test_units
     dependencies: [
       libnm_dep,
       nm_core_dep,
+      libnm_systemd_shared_no_logging_dep,
     ],
     c_args: cflags,
-    link_with: test_unit[1]
+    link_with: test_unit[1],
   )
 
   test(
     'libnm/' + test_unit[0],
     test_script,
     timeout: test_unit[2],
-    args: test_args + [exe.full_path()]
+    args: test_args + [exe.full_path()],
   )
 endforeach
 
@@ -39,5 +40,5 @@ libnm_vpn_plugin_utils_test = static_library(
   sources: shared_nm_utils_nm_vpn_plugin_utils_c + [libnm_enum[1]],
   include_directories: libnm_inc,
   dependencies: nm_core_dep,
-  c_args: cflags
+  c_args: cflags,
 )
diff --git a/libnm/tests/test-general.c b/libnm/tests/test-general.c
index 5959a4e6..410087af 100644
--- a/libnm/tests/test-general.c
+++ b/libnm/tests/test-general.c
@@ -20,8 +20,16 @@
 
 #include "nm-default.h"
 
+#if defined (HAVE_DECL_MEMFD_CREATE) && HAVE_DECL_MEMFD_CREATE
+#include 
+#endif
+
+#include 
+
 #include "nm-libnm-utils.h"
 
+#include "nm-vpn-service-plugin.h"
+
 #include "nm-utils/nm-test-utils.h"
 
 /*****************************************************************************/
@@ -2158,6 +2166,271 @@ test_fixup_product_string (void)
 
 /*****************************************************************************/
 
+static int
+_memfd_create (const char *name)
+{
+#if defined (HAVE_DECL_MEMFD_CREATE) && HAVE_DECL_MEMFD_CREATE
+	return memfd_create (name, MFD_CLOEXEC);
+#endif
+	return -1;
+}
+
+typedef struct {
+	const char *key;
+	const char *val;
+} ReadVpnDetailData;
+
+#define READ_VPN_DETAIL_DATA(...) \
+	((ReadVpnDetailData []) { __VA_ARGS__ })
+
+static gboolean
+_do_read_vpn_details_impl1 (const char *file,
+                            int line,
+                            int memfd,
+                            char *mem,
+                            gsize len,
+                            const ReadVpnDetailData *expected_data,
+                            guint expected_data_len,
+                            const ReadVpnDetailData *expected_secrets,
+                            guint expected_secrets_len)
+{
+	gssize written;
+	off_t lseeked;
+	gs_unref_hashtable GHashTable *data = NULL;
+	gs_unref_hashtable GHashTable *secrets = NULL;
+
+	written = write (memfd, mem, len);
+	g_assert_cmpint (written, ==, (gssize) len);
+
+	lseeked = lseek (memfd, 0, SEEK_SET);
+	g_assert_cmpint (lseeked, ==, 0);
+
+	if (!nm_vpn_service_plugin_read_vpn_details (memfd,
+	                                             &data,
+	                                             &secrets)) {
+		g_assert (!data);
+		g_assert (!secrets);
+		g_assert_cmpint (expected_data_len, ==, 0);
+		g_assert_cmpint (expected_secrets_len, ==, 0);
+		return TRUE;
+	}
+
+#define _assert_hash(hash, expected, expected_len) \
+	G_STMT_START { \
+		GHashTable *_hash = (hash); \
+		guint _expected_len = (expected_len); \
+		const ReadVpnDetailData *_expected = (expected); \
+		GHashTableIter _iter; \
+		const char *_k, *_v; \
+		guint _i; \
+		\
+		g_assert (_hash); \
+		\
+		g_hash_table_iter_init (&_iter, _hash); \
+		while (g_hash_table_iter_next (&_iter, (gpointer *) &_k, (gpointer *) &_v)) { \
+			for (_i = 0; _i < _expected_len; _i++) { \
+				if (nm_streq (_expected[_i].key, _k)) \
+					break; \
+			} \
+			if (_i >= _expected_len) \
+				g_error ("%s:%d: hash '%s' contains unexpected data key '%s' with value '%s'", file, line, G_STRINGIFY (hash), _k, _v); \
+		} \
+		\
+		for (_i = 0; _i < _expected_len; _i++) { \
+			const ReadVpnDetailData *_d = &_expected[_i]; \
+			\
+			g_assert (_d->key); \
+			g_assert (_d->val); \
+			_v = g_hash_table_lookup (_hash, _d->key); \
+			if (!nm_streq0 (_v, _d->val)) \
+				g_error ("%s:%d: hash '%s' contains data key '%s' with value %s%s%s but we expected '%s'", file, line, G_STRINGIFY (hash), _d->key, NM_PRINT_FMT_QUOTE_STRING (_v), _d->val); \
+		} \
+		\
+		g_assert_cmpint (g_hash_table_size (_hash), ==, _expected_len); \
+	} G_STMT_END
+
+	_assert_hash (data, expected_data, expected_data_len);
+	_assert_hash (secrets, expected_secrets, expected_secrets_len);
+
+#undef _assert_hash
+	return TRUE;
+}
+
+#define _do_read_vpn_details_impl0(str, expected_data, expected_data_len, expected_secrets, expected_secrets_len, pre_setup_cmd) \
+	G_STMT_START { \
+		nm_auto_close int _memfd = _memfd_create ("libnm-test-read-vpn-details"); \
+		\
+		if (_memfd < 0) \
+			g_test_skip ("cannot create memfd"); \
+		else { \
+			{ pre_setup_cmd ; } \
+			_do_read_vpn_details_impl1 (__FILE__, \
+			                            __LINE__, \
+			                            _memfd, \
+			                            ""str"", \
+			                            NM_STRLEN (str), \
+			                            expected_data, \
+			                            expected_data_len, \
+			                            expected_secrets, \
+			                            expected_secrets_len); \
+		} \
+	} G_STMT_END
+
+#define _do_read_vpn_details_empty(str) \
+	_do_read_vpn_details_impl0 (str, \
+	                            NULL, \
+	                            0, \
+	                            NULL, \
+	                            0, \
+	                            { } )
+
+#define _do_read_vpn_details(str, expected_data, expected_secrets, pre_setup_cmd) \
+	_do_read_vpn_details_impl0 (str, \
+	                            expected_data, \
+	                            G_N_ELEMENTS (expected_data), \
+	                            expected_secrets, \
+	                            G_N_ELEMENTS (expected_secrets), \
+	                            pre_setup_cmd)
+
+static void
+test_nm_vpn_service_plugin_read_vpn_details (void)
+{
+	_do_read_vpn_details_empty ("");
+	_do_read_vpn_details_empty ("hallo");
+	_do_read_vpn_details_empty ("DONE");
+	_do_read_vpn_details_empty ("DONE\n");
+	_do_read_vpn_details_empty ("DONE\0");
+	_do_read_vpn_details_empty ("\0DONE\0");
+
+	_do_read_vpn_details (""
+	                      "DATA_KEY=some-key\n"
+	                      "DATA_VAL=string\n"
+	                      "\n"
+	                      "DATA_KEY=some-other-key\n"
+	                      "DATA_VAL=val2\n"
+	                      "\n"
+	                      "SECRET_KEY=some-secret\n"
+	                      "SECRET_VAL=val3\n"
+	                      "\n"
+	                      "DONE\n"
+	                      "\n"
+	                      "",
+	                      READ_VPN_DETAIL_DATA (
+	                        { "some-key", "string" },
+	                        { "some-other-key", "val2" },
+	                      ),
+	                      READ_VPN_DETAIL_DATA (
+	                        { "some-secret", "val3" },
+	                      ),
+	                      );
+
+	_do_read_vpn_details (""
+	                      "DATA_KEY=some-key\n"
+	                      "DATA_VAL=string\n"
+	                      "DONE\n",
+	                      READ_VPN_DETAIL_DATA (
+	                        { "some-key", "string" },
+	                      ),
+	                      READ_VPN_DETAIL_DATA (),
+	                      );
+
+	_do_read_vpn_details (""
+	                      "DATA_KEY=some-key\n"
+	                      "DATA_VAL=string\n"
+	                      "=continued after a line break\n"
+	                      "SECRET_KEY=key names\n"
+	                      "=can have\n"
+	                      "=continuations too\n"
+	                      "bogus1=\n"
+	                      "SECRET_VAL=value\n"
+	                      "bogus=value\n"
+	                      "bogus=\n"
+	                      "DATA_VAL=x\n"
+	                      "DATA_KEY=\n"
+	                      "DATA_VAL=\n"
+	                      "DATA_VAL=y\n"
+	                      "DATA_KEY=y\n"
+	                      "DATA_KEY=y\n"
+	                      "DATA_KEY=z\n"
+	                      "SECRET_KEY=s1\n"
+	                      "DATA_VAL=z\n"
+	                      "SECRET_VAL=S1\n"
+	                      "\n"
+	                      "DONE\n"
+	                      "",
+	                      READ_VPN_DETAIL_DATA (
+	                        { "some-key", "string\ncontinued after a line break" },
+	                      ),
+	                      READ_VPN_DETAIL_DATA (
+	                        { "key names\ncan have\ncontinuations too", "value" },
+	                      ),
+	                      NMTST_EXPECT_LIBNM_WARNING ("DATA_VAL= not preceded by DATA_KEY=")
+	                      );
+
+	_do_read_vpn_details (""
+	                      "DATA_KEY=some-key\n"
+	                      "DATA_VAL=string\n"
+	                      "=continued after a line break\n"
+	                      "SECRET_KEY=key names\n"
+	                      "=can have\n"
+	                      "=continuations too\n"
+	                      "SECRET_VAL=value\n"
+	                      "",
+	                      READ_VPN_DETAIL_DATA (
+	                        { "some-key", "string\ncontinued after a line break" },
+	                      ),
+	                      READ_VPN_DETAIL_DATA (
+	                        { "key names\ncan have\ncontinuations too", "value" },
+	                      ),
+	                      );
+
+	_do_read_vpn_details (""
+	                      "DATA_KEY=some-key\n"
+	                      "DATA_VAL=string\n"
+	                      "\n"
+	                      "DATA_KEY=some\n"
+	                      "=key-2\n"
+	                      "DATA_VAL=val2\n"
+	                      "\n"
+	                      "DATA_KEY=key3\0"
+	                      "=key-2\n"
+	                      "DATA_VAL=val3\n"
+	                      "\n"
+	                      "SECRET_KEY=some-secret\n"
+	                      "SECRET_VAL=val3\n"
+	                      "\n"
+	                      "SECRET_KEY=\n"
+	                      "SECRET_VAL=val3\n"
+	                      "\n"
+	                      "SECRET_KEY=keyx\n"
+	                      "SECRET_VAL=\n"
+	                      "\n"
+	                      "SECRET_KEY=ke\xc0yx\n"
+	                      "SECRET_VAL=inval\n"
+	                      "\n"
+	                      "SECRET_KEY=key-inval\n"
+	                      "SECRET_VAL=in\xc1val\n"
+	                      "\n"
+	                      "DONE\n"
+	                      "\n"
+	                      "",
+	                      READ_VPN_DETAIL_DATA (
+	                        { "some\nkey-2", "val2" },
+	                        { "some-key", "string" },
+	                        { "key3", "val3" },
+	                      ),
+	                      READ_VPN_DETAIL_DATA (
+	                        { "some-secret", "val3" },
+	                        { "", "val3" },
+	                        { "keyx", "" },
+	                        { "ke\xc0yx", "inval" },
+	                        { "key-inval", "in\xc1val" },
+	                      ),
+	                      );
+}
+
+/*****************************************************************************/
+
 NMTST_DEFINE ();
 
 int main (int argc, char **argv)
@@ -2166,6 +2439,7 @@ int main (int argc, char **argv)
 
 	g_test_add_func ("/libnm/general/fixup_product_string", test_fixup_product_string);
 	g_test_add_func ("/libnm/general/fixup_vendor_string", test_fixup_vendor_string);
+	g_test_add_func ("/libnm/general/nm_vpn_service_plugin_read_vpn_details", test_nm_vpn_service_plugin_read_vpn_details);
 
 	return g_test_run ();
 }
diff --git a/libnm/tests/test-nm-client.c b/libnm/tests/test-nm-client.c
index 21272e4d..35ae33be 100644
--- a/libnm/tests/test-nm-client.c
+++ b/libnm/tests/test-nm-client.c
@@ -20,7 +20,6 @@
 
 #include "nm-default.h"
 
-#include 
 #include 
 #include 
 
diff --git a/libnm/tests/test-remote-settings-client.c b/libnm/tests/test-remote-settings-client.c
index 45d60c06..1b211494 100644
--- a/libnm/tests/test-remote-settings-client.c
+++ b/libnm/tests/test-remote-settings-client.c
@@ -20,7 +20,6 @@
 
 #include "nm-default.h"
 
-#include 
 #include 
 #include 
 
diff --git a/libnm/tests/test-secret-agent.c b/libnm/tests/test-secret-agent.c
index 53110be6..35a215ca 100644
--- a/libnm/tests/test-secret-agent.c
+++ b/libnm/tests/test-secret-agent.c
@@ -20,7 +20,6 @@
 
 #include "nm-default.h"
 
-#include 
 #include 
 #include 
 
diff --git a/m4/compiler_options.m4 b/m4/compiler_options.m4
index 0683e44e..bf847bfc 100644
--- a/m4/compiler_options.m4
+++ b/m4/compiler_options.m4
@@ -31,7 +31,7 @@ AC_DEFUN([NM_COMPILER_FLAG], [
 
 dnl Check whether a particular warning is not emitted with code provided,
 dnl append an option to disable the warning to a specified variable if the check fails.
-dnl NM_COMPILER_WARNING([ENV-VAR], [C-SNIPPET], [WARNING]])
+dnl NM_COMPILER_WARNING([ENV-VAR], [WARNING], [C-SNIPPET])
 AC_DEFUN([NM_COMPILER_WARNING], [
         _NM_COMPILER_FLAG([-W$2], [$3], [eval "AS_TR_SH([$1])='$$1 -W$2'"], [eval "AS_TR_SH([$1])='$$1 -Wno-$2'"])
 ])
@@ -47,10 +47,10 @@ if test "$GCC" = "yes" -a "$set_more_warnings" != "no"; then
 
 	dnl This is enabled in clang by default, makes little sense,
 	dnl and causes the build to abort with -Werror.
-	CFLAGS_SAVED="$$1"
-	eval "AS_TR_SH([$1])='$$1 -Qunused-arguments'"
-	AC_COMPILE_IFELSE([AC_LANG_SOURCE([])], [], eval "AS_TR_SH([$1])='$CFLAGS_SAVED'")
-	unset CFLAGS_SAVED
+	CFLAGS_SAVED="$CFLAGS"
+	CFLAGS="$CFLAGS -Qunused-arguments"
+	AC_COMPILE_IFELSE([AC_LANG_SOURCE([])], eval "AS_TR_SH([$1])='$$1 -Qunused-arguments'", [])
+	CFLAGS="$CFLAGS_SAVED"
 
 	dnl clang only warns about unknown warnings, unless
 	dnl called with "-Werror=unknown-warning-option"
@@ -124,12 +124,6 @@ if test "$GCC" = "yes" -a "$set_more_warnings" != "no"; then
 		[int f () { int i = yolo; yolo; return i; }]
 	)
 
-	dnl clang 3.9 would like to see "{ { 0 } }" here, but that does not
-	dnl look too wise.
-	NM_COMPILER_WARNING([$1], [missing-braces],
-		[union { int a[1]; int b[2]; } c = { 0 }]
-	)
-
 	dnl a new warning in gcc 8, glib 2.55 doesn't play nice yet
 	dnl https://bugzilla.gnome.org/show_bug.cgi?id=793272
 	NM_COMPILER_WARNING([$1], [cast-function-type],
@@ -150,9 +144,9 @@ fi
 AC_DEFUN([NM_LTO],
 [AC_ARG_ENABLE(lto, AS_HELP_STRING([--enable-lto], [Enable Link Time Optimization for smaller size (default: no)]))
 if (test "${enable_lto}" = "yes"); then
-	CC_CHECK_FLAG_APPEND([lto_flags], [CFLAGS], [-flto])
+	CC_CHECK_FLAG_APPEND([lto_flags], [CFLAGS], [-flto -flto-partition=none])
 	if (test -n "${lto_flags}"); then
-		CFLAGS="-flto $CFLAGS"
+		CFLAGS="-flto -flto-partition=none $CFLAGS"
 	else
 		AC_MSG_ERROR([Link Time Optimization -flto is not supported.])
 	fi
diff --git a/man/NetworkManager.8 b/man/NetworkManager.8
index 4d82097c..98a62766 100644
--- a/man/NetworkManager.8
+++ b/man/NetworkManager.8
@@ -2,12 +2,12 @@
 .\"     Title: NetworkManager
 .\"    Author: 
 .\" Generator: DocBook XSL Stylesheets vsnapshot 
-.\"      Date: 02/23/2019
+.\"      Date: 03/15/2019
 .\"    Manual: Network management daemons
-.\"    Source: NetworkManager 1.14.6
+.\"    Source: NetworkManager 1.16.0
 .\"  Language: English
 .\"
-.TH "NETWORKMANAGER" "8" "" "NetworkManager 1\&.14\&.6" "Network management daemons"
+.TH "NETWORKMANAGER" "8" "" "NetworkManager 1\&.16\&.0" "Network management daemons"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -34,7 +34,7 @@ NetworkManager \- network management daemon
 \fBNetworkManager \fR\fB[OPTIONS...]\fR
 .SH "DESCRIPTION"
 .PP
-The NetworkManager daemon attempts to make networking configuration and operation as painless and automatic as possible by managing the primary network connection and other network interfaces, like Ethernet, WiFi, and Mobile Broadband devices\&. NetworkManager will connect any network device when a connection for that device becomes available, unless that behavior is disabled\&. Information about networking is exported via a D\-Bus interface to any interested application, providing a rich API with which to inspect and control network settings and operation\&.
+The NetworkManager daemon attempts to make networking configuration and operation as painless and automatic as possible by managing the primary network connection and other network interfaces, like Ethernet, Wi\-Fi, and Mobile Broadband devices\&. NetworkManager will connect any network device when a connection for that device becomes available, unless that behavior is disabled\&. Information about networking is exported via a D\-Bus interface to any interested application, providing a rich API with which to inspect and control network settings and operation\&.
 .SH "DISPATCHER SCRIPTS"
 .PP
 NetworkManager will execute scripts in the
@@ -305,9 +305,14 @@ device manager is used for the network device discovery\&. The following propert
 .PP
 \fINM_UNMANAGED\fR
 .RS 4
-No default connection will be created and automatic activation will not be attempted when this property of a device is set to a true value ("1" or "true")\&. You will still be able to attach a connection to the device manually or observe externally added configuration such as addresses or routes\&.
-.sp
-Create an udev rule that sets this property to prevent NetworkManager from interfering with virtual Ethernet device interfaces that are managed by virtualization tools\&.
+If set to
+"1"
+or
+"true", the device is configured as unmanaged by NetworkManager\&. Note that the user still can explicitly overrule this configuration via means like
+\fBnmcli device set "$DEVICE" managed yes\fR
+or
+"device*\&.managed=1"
+in NetworkManager\&.conf\&.
 .RE
 .SH "SIGNALS"
 .PP
diff --git a/man/NetworkManager.conf.5 b/man/NetworkManager.conf.5
index 13efa991..63e8dea2 100644
--- a/man/NetworkManager.conf.5
+++ b/man/NetworkManager.conf.5
@@ -2,12 +2,12 @@
 .\"     Title: NetworkManager.conf
 .\"    Author: 
 .\" Generator: DocBook XSL Stylesheets vsnapshot 
-.\"      Date: 02/23/2019
+.\"      Date: 03/15/2019
 .\"    Manual: Configuration
-.\"    Source: NetworkManager 1.14.6
+.\"    Source: NetworkManager 1.16.0
 .\"  Language: English
 .\"
-.TH "NETWORKMANAGER\&.CONF" "5" "" "NetworkManager 1\&.14\&.6" "Configuration"
+.TH "NETWORKMANAGER\&.CONF" "5" "" "NetworkManager 1\&.16\&.0" "Configuration"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -121,6 +121,16 @@ plugin is always appended to the end of this list (if it doesn\*(Aqt already app
 \fImonitor\-connection\-files\fR
 .RS 4
 Whether the configured settings plugin(s) should set up file monitors and immediately pick up changes made to connection files while NetworkManager is running\&. This is disabled by default; NetworkManager will only read the connection files at startup, and when explicitly requested via the ReloadConnections D\-Bus call\&. If this key is set to \*(Aqtrue\*(Aq, then NetworkManager will reload connection files any time they changed\&. Automatic reloading is not advised because there are race conditions involved and it depends on the way how the editor updates the file\&. In some situations, NetworkManager might first delete and add the connection anew, instead of updating the existing one\&. Also, NetworkManager might pick up incomplete settings while the user is still editing the files\&.
+.sp
+Note that neither this setting nor restarting the NetworkManager daemon is the advised way to reload connection profiles from disk\&. Instead, after modifying the files reload them with
+\fBnmcli connection reload\fR
+or
+\fBnmcli connection load "$FILENAME"\fR\&. Even better, instead of modifying files directly, use NetworkManager tools like
+\fBnmcli\fR,
+\fBnmtui\fR
+or the GUI\&.
+.sp
+This setting is deprecated and will have no effect in the future\&.
 .RE
 .PP
 \fIauth\-polkit\fR
@@ -158,7 +168,7 @@ Specify devices for which NetworkManager shouldn\*(Aqt create default wired conn
 to apply to all devices\&.
 .sp
 When the default wired connection is deleted or saved to a new persistent connection by a plugin, the device is added to a list in the file
-/run/NetworkManager/no\-auto\-default\&.state
+/var/lib/NetworkManager/no\-auto\-default\&.state
 to prevent creating the default connection for that device again\&.
 .sp
 See
@@ -203,7 +213,7 @@ for the syntax how to specify a device\&.
 \fIconfigure\-and\-quit\fR
 .RS 4
 When set to \*(Aqtrue\*(Aq, NetworkManager quits after performing initial network configuration but spawns small helpers to preserve DHCP leases and IPv6 addresses\&. This is useful in environments where network setup is more or less static or it is desirable to save process time but still handle some dynamic configurations\&. When this option is
-true, network configuration for WiFi, WWAN, Bluetooth, ADSL, and PPPoE interfaces cannot be preserved due to their use of external services, and these devices will be deconfigured when NetworkManager quits even though other interface\*(Aqs configuration may be preserved\&. Also, to preserve DHCP addresses the \*(Aqdhcp\*(Aq option must be set to \*(Aqinternal\*(Aq\&. The default value of the \*(Aqconfigure\-and\-quit\*(Aq option is \*(Aqfalse\*(Aq, meaning that NetworkManager will continue running after initial network configuration and continue responding to system and hardware events, D\-Bus requests, and user commands\&.
+true, network configuration for Wi\-Fi, WWAN, Bluetooth, ADSL, and PPPoE interfaces cannot be preserved due to their use of external services, and these devices will be deconfigured when NetworkManager quits even though other interface\*(Aqs configuration may be preserved\&. Also, to preserve DHCP addresses the \*(Aqdhcp\*(Aq option must be set to \*(Aqinternal\*(Aq\&. The default value of the \*(Aqconfigure\-and\-quit\*(Aq option is \*(Aqfalse\*(Aq, meaning that NetworkManager will continue running after initial network configuration and continue responding to system and hardware events, D\-Bus requests, and user commands\&.
 .RE
 .PP
 \fIhostname\-mode\fR
@@ -219,7 +229,9 @@ none: NetworkManager will not manage the transient hostname and will never set i
 .PP
 \fIdns\fR
 .RS 4
-Set the DNS (resolv\&.conf) processing mode\&. If the key is unspecified,
+Set the DNS processing mode\&.
+.sp
+If the key is unspecified,
 default
 is used, unless
 /etc/resolv\&.conf
@@ -240,14 +252,29 @@ dnsmasq: NetworkManager will run dnsmasq as a local caching nameserver, using a
 resolv\&.conf
 to point to the local nameserver\&. It is possible to pass custom options to the dnsmasq instance by adding them to files in the "/etc/NetworkManager/dnsmasq\&.d/" directory\&. Note that when multiple upstream servers are available, dnsmasq will initially contact them in parallel and then use the fastest to respond, probing again other servers after some time\&. This behavior can be modified passing the \*(Aqall\-servers\*(Aq or \*(Aqstrict\-order\*(Aq options to dnsmasq (see the manual page for more details)\&.
 .sp
+systemd\-resolved: NetworkManager will push the DNS configuration to systemd\-resolved
+.sp
 unbound: NetworkManager will talk to unbound and dnssec\-triggerd, providing a "split DNS" configuration with DNSSEC support\&.
 /etc/resolv\&.conf
 will be managed by dnssec\-trigger daemon\&.
 .sp
-systemd\-resolved: NetworkManager will push the DNS configuration to systemd\-resolved
-.sp
 none: NetworkManager will not modify resolv\&.conf\&. This implies
 rc\-manager\ \&unmanaged
+.sp
+Note that the plugins
+dnsmasq,
+systemd\-resolved
+and
+unbound
+are caching local nameservers\&. Hence, when NetworkManager writes
+/var/run/NetworkManager/resolv\&.conf
+and
+/etc/resolv\&.conf
+(according to
+rc\-manager
+setting below), the name server there will be localhost only\&. NetworkManager also writes a file
+/var/run/NetworkManager/no\-stub\-resolv\&.conf
+that contains the original name servers pushed to the DNS plugin\&.
 .RE
 .PP
 \fIrc\-manager\fR
@@ -281,6 +308,26 @@ none: deprecated alias for
 symlink\&.
 .RE
 .PP
+\fIsystemd\-resolved\fR
+.RS 4
+Send the connection DNS configuration to
+systemd\-resolved\&. Defaults to "true"\&.
+.sp
+Note that this setting is complementary to the
+\fIdns\fR
+setting\&. You can keep this enabled while using
+\fIdns\fR
+set to another DNS plugin alongside
+systemd\-resolved, or
+\fIdns\fR
+set to
+systemd\-resolved
+to configure the system resolver to use
+systemd\-resolved\&.
+.sp
+If systemd\-resolved is enabled, the connectivity check resolves the hostname per\-device\&.
+.RE
+.PP
 \fIdebug\fR
 .RS 4
 Comma separated list of options to aid debugging\&. This value will be combined with the environment variable
@@ -583,6 +630,8 @@ ipv6\&.ip6\-privacy=0
 Not all properties can be overwritten, only the following properties are supported to have their default values configured (see
 \fBnm-settings\fR(5)
 for details)\&. A default value is only consulted if the corresponding per\-connection value explicitly allows for that\&.
+
+
 .PP
 \fI802\-1x\&.auth\-timeout\fR
 .RS 4
@@ -662,6 +711,11 @@ If configured explicitly to 0, the MTU is not reconfigured during device activat
 If left unspecified, the default value for the interface type is used\&.
 .RE
 .PP
+\fIipv4\&.dns\-priority\fR
+.RS 4
+If unspecified or zero, use 50 for VPN profiles and 100 for other profiles\&.
+.RE
+.PP
 \fIipv4\&.route\-metric\fR
 .RS 4
 .RE
@@ -681,6 +735,11 @@ If left unspecified, it defaults to "lease"\&.
 If left unspecified, the default value for the interface type is used\&.
 .RE
 .PP
+\fIipv6\&.dns\-priority\fR
+.RS 4
+If unspecified or zero, use 50 for VPN profiles and 100 for other profiles\&.
+.RE
+.PP
 \fIipv6\&.ip6\-privacy\fR
 .RS 4
 If
@@ -745,6 +804,11 @@ If left unspecified, the default value "optional" will be used\&.
 \fIwifi\&.wake\-on\-wlan\fR
 .RS 4
 .RE
+.PP
+\fIwireguard\&.mtu\fR
+.RS 4
+.RE
+
 .SS "Sections"
 .PP
 You can configure multiple
@@ -902,6 +966,12 @@ for details\&.
 .PP
 This section controls NetworkManager\*(Aqs optional connectivity checking functionality\&. This allows NetworkManager to detect whether or not the system can actually access the internet or whether it is behind a captive portal\&.
 .PP
+Connectivity checking serves two purposes\&. For one, it exposes a connectivity state on D\-Bus, which other applications may use\&. For example, Gnome\*(Aqs portal helper uses this as signal to show a captive portal login page\&. The other use is that default\-route of devices without global connectivity get a penalty of +20000 to the route\-metric\&. This has the purpose to give a better default\-route to devices that have global connectivity\&. For example, when being connected to WWAN and to a Wi\-Fi network which is behind a captive portal, WWAN still gets preferred until login\&.
+.PP
+Note that your distribution might set
+/proc/sys/net/ipv4/conf/*/rp_filter
+to strict filtering\&. That works badly with per\-device connectivity checking, which uses SO_BINDDEVICE to send requests on all devices\&. A strict rp_filter setting will reject any response and the connectivity check on all but the best route will fail\&.
+.PP
 .PP
 \fIuri\fR
 .RS 4
@@ -917,7 +987,7 @@ Specified in seconds; controls how often connectivity is checked when a network
 .PP
 \fIresponse\fR
 .RS 4
-If set controls what body content NetworkManager checks for when requesting the URI for connectivity checking\&. If missing, defaults to "NetworkManager is online"
+If set, controls what body content NetworkManager checks for when requesting the URI for connectivity checking\&. Note that this only compares that the HTTP response starts with the specifid text, it does not compare the exact string\&. This behavior might change in the future, so avoid relying on it\&. If missing, the response defaults to "NetworkManager is online"\&. If set to empty, the HTTP server is expected to answer with status code 204 or send no data\&.
 .RE
 .SH "GLOBAL\-DNS SECTION"
 .PP
@@ -931,7 +1001,7 @@ A list of search domains to be used during hostname lookup\&.
 .PP
 \fIoptions\fR
 .RS 4
-A list of of options to be passed to the hostname resolver\&.
+A list of options to be passed to the hostname resolver\&.
 .RE
 .SH "GLOBAL\-DNS\-DOMAIN SECTIONS"
 .PP
diff --git a/man/NetworkManager.conf.xml b/man/NetworkManager.conf.xml
index 94a23fe8..28934247 100644
--- a/man/NetworkManager.conf.xml
+++ b/man/NetworkManager.conf.xml
@@ -166,6 +166,15 @@ plugins-=remove-me
         In some situations, NetworkManager might first delete and add the
         connection anew, instead of updating the existing one. Also, NetworkManager
         might pick up incomplete settings while the user is still editing the files.
+        
+        Note that neither this setting nor restarting the NetworkManager daemon
+        is the advised way to reload connection profiles from disk. Instead, after
+        modifying the files reload them with nmcli connection reload
+        or nmcli connection load "$FILENAME". Even better,
+        instead of modifying files directly, use NetworkManager tools like
+        nmcli, nmtui or the GUI.
+        
+        This setting is deprecated and will have no effect in the future.
         
       
       
@@ -204,7 +213,7 @@ plugins-=remove-me
         When the default wired connection is deleted or saved
         to a new persistent connection by a plugin, the device is
         added to a list in the file
-        /run/NetworkManager/no-auto-default.state
+        &nmstatedir;/no-auto-default.state
         to prevent creating the default connection for that device
         again.
         See  for the syntax how to
@@ -262,7 +271,7 @@ no-auto-default=*
             environments where network setup is more or less static or it is
             desirable to save process time but still handle some dynamic
             configurations.  When this option is true,
-            network configuration for WiFi, WWAN, Bluetooth, ADSL, and PPPoE
+            network configuration for Wi-Fi, WWAN, Bluetooth, ADSL, and PPPoE
             interfaces cannot be preserved due to their use of external
             services, and these devices will be deconfigured when NetworkManager
             quits even though other interface's configuration may be preserved.
@@ -306,8 +315,8 @@ no-auto-default=*
       
       
         dns
-        Set the DNS (resolv.conf) processing mode.
-        If the key is unspecified, default is used,
+        Set the DNS processing mode.
+        If the key is unspecified, default is used,
         unless /etc/resolv.conf is a symlink to
         /run/systemd/resolve/stub-resolv.conf,
         /run/systemd/resolve/resolv.conf,
@@ -331,15 +340,23 @@ no-auto-default=*
         after some time. This behavior can be modified passing the
         'all-servers' or 'strict-order' options to dnsmasq (see the
         manual page for more details).
+        systemd-resolved: NetworkManager will
+        push the DNS configuration to systemd-resolved
         unbound: NetworkManager will talk
         to unbound and dnssec-triggerd, providing a "split DNS"
         configuration with DNSSEC support. /etc/resolv.conf
         will be managed by dnssec-trigger daemon.
-        systemd-resolved: NetworkManager will
-        push the DNS configuration to systemd-resolved
         none: NetworkManager will not
         modify resolv.conf. This implies
         rc-manager unmanaged
+
+        Note that the plugins dnsmasq, systemd-resolved
+        and unbound are caching local nameservers.
+        Hence, when NetworkManager writes &nmrundir;/resolv.conf
+        and /etc/resolv.conf (according to rc-manager
+        setting below), the name server there will be localhost only.
+        NetworkManager also writes a file &nmrundir;/no-stub-resolv.conf
+        that contains the original name servers pushed to the DNS plugin.
         
       
 
@@ -379,6 +396,22 @@ no-auto-default=*
         
       
 
+      
+        systemd-resolved
+        Send the connection DNS configuration to
+        systemd-resolved. Defaults to "true".
+        
+        Note that this setting is complementary to the
+        dns setting. You can keep this enabled while using
+        dns set to another DNS plugin alongside
+        systemd-resolved, or dns set to
+        systemd-resolved to configure the system resolver to use
+        systemd-resolved.
+        If systemd-resolved is enabled, the connectivity check resolves the
+        hostname per-device.
+        
+      
+
       
         debug
         Comma separated list of options to aid
@@ -641,6 +674,8 @@ ipv6.ip6-privacy=0
       (see nm-settings5 for details).
       A default value is only consulted if the corresponding per-connection value
       explicitly allows for that.
+      
+      
       
         
           802-1x.auth-timeout
@@ -704,6 +739,11 @@ ipv6.ip6-privacy=0
           If left unspecified, the default value for
            the interface type is used.
         
+        
+          ipv4.dns-priority
+          If unspecified or zero, use 50 for VPN profiles
+           and 100 for other profiles.
+        
         
           ipv4.route-metric
         
@@ -723,6 +763,11 @@ ipv6.ip6-privacy=0
           If left unspecified, the default value for
            the interface type is used.
         
+        
+          ipv6.dns-priority
+          If unspecified or zero, use 50 for VPN profiles
+           and 100 for other profiles.
+        
         
           ipv6.ip6-privacy
           If ipv6.ip6-privacy is unset, use the content of
@@ -782,7 +827,12 @@ ipv6.ip6-privacy=0
         
           wifi.wake-on-wlan
         
+        
+          wireguard.mtu
+        
       
+      
+      
     
     
 
@@ -1009,11 +1059,28 @@ managed=1
 
   
     <literal>connectivity</literal> section
+
     This section controls NetworkManager's optional connectivity
     checking functionality.  This allows NetworkManager to detect
     whether or not the system can actually access the internet or
     whether it is behind a captive portal.
 
+    Connectivity checking serves two purposes. For one, it exposes
+    a connectivity state on D-Bus, which other applications may use. For example,
+    Gnome's portal helper uses this as signal to show a captive portal login
+    page.
+    The other use is that default-route of devices without global connectivity
+    get a penalty of +20000 to the route-metric. This has the purpose to give a
+    better default-route to devices that have global connectivity. For example,
+    when being connected to WWAN and to a Wi-Fi network which is behind a captive
+    portal, WWAN still gets preferred until login.
+
+    Note that your distribution might set /proc/sys/net/ipv4/conf/*/rp_filter to
+    strict filtering. That works badly with per-device connectivity checking,
+    which uses SO_BINDDEVICE to send requests on all devices. A strict rp_filter
+    setting will reject any response and the connectivity check on all but the
+    best route will fail.
+
     
       
         
@@ -1037,10 +1104,15 @@ managed=1
         
         
           response
-          If set controls what body content
+          If set, controls what body content
           NetworkManager checks for when requesting the URI for
-          connectivity checking.  If missing, defaults to
-          "NetworkManager is online" 
+          connectivity checking.  Note that this only compares
+          that the HTTP response starts with the specifid text,
+          it does not compare the exact string. This behavior
+          might change in the future, so avoid relying on it.
+          If missing, the response defaults to "NetworkManager is online".
+          If set to empty, the HTTP server is expected to answer with
+          status code 204 or send no data.
         
       
     
@@ -1064,7 +1136,7 @@ managed=1
           options
           
             
-             A list of of options to be passed to the hostname resolver.
+             A list of options to be passed to the hostname resolver.
            
           
         
diff --git a/man/NetworkManager.xml b/man/NetworkManager.xml
index f78a44f4..2a13671b 100644
--- a/man/NetworkManager.xml
+++ b/man/NetworkManager.xml
@@ -55,7 +55,7 @@
       The NetworkManager daemon attempts to make networking
       configuration and operation as painless and automatic as
       possible by managing the primary network connection and other
-      network interfaces, like Ethernet, WiFi, and Mobile Broadband
+      network interfaces, like Ethernet, Wi-Fi, and Mobile Broadband
       devices.  NetworkManager will connect any network device when a
       connection for that device becomes available, unless that
       behavior is disabled.  Information about networking is exported
@@ -437,16 +437,13 @@
       
         NM_UNMANAGED
         
-          No default connection will be created and automatic activation
-          will not be attempted when this property of a device is set to a
-          true value ("1" or "true"). You will still be able to attach a
-          connection to the device manually or observe externally added
-          configuration such as addresses or routes.
-        
-          Create an udev rule that sets this property to prevent NetworkManager
-          from interfering with virtual Ethernet device interfaces that are
-          managed by virtualization tools.
-        
+          If set to "1" or "true", the device is
+          configured as unmanaged by NetworkManager. Note that the user still can
+          explicitly overrule this configuration via means like
+          nmcli device set "$DEVICE" managed yes or
+          "device*.managed=1" in NetworkManager.conf.
+        
+        
       
     
   
diff --git a/man/common.ent.in b/man/common.ent.in
index ddfbb69a..9632b4ef 100644
--- a/man/common.ent.in
+++ b/man/common.ent.in
@@ -2,6 +2,7 @@
 
 
 
+
 
 
 
diff --git a/man/meson.build b/man/meson.build
index 21fac21d..a4ef3d9e 100644
--- a/man/meson.build
+++ b/man/meson.build
@@ -2,6 +2,7 @@ common_conf = configuration_data()
 common_conf.set('NM_VERSION', nm_version)
 common_conf.set('sysconfdir', nm_sysconfdir)
 common_conf.set('nmrundir', nm_pkgrundir)
+common_conf.set('nmstatedir', nm_pkgstatedir)
 common_conf.set('NM_CONFIG_DEFAULT_MAIN_AUTH_POLKIT_TEXT', config_default_main_auth_polkit)
 common_conf.set('NM_CONFIG_DEFAULT_LOGGING_BACKEND_TEXT', config_logging_backend_default)
 common_conf.set('NM_CONFIG_DEFAULT_LOGGING_AUDIT_TEXT', config_default_logging_audit)
@@ -13,7 +14,7 @@ common = 'common.ent'
 common_ent_file = configure_file(
   input: common + '.in',
   output: common,
-  configuration: common_conf
+  configuration: common_conf,
 )
 
 xsltproc_options = [
@@ -27,7 +28,7 @@ xsltproc_options = [
   '--stringparam', 'man.th.extra1.suppress', '1',
   '--stringparam', 'man.authors.section.enabled', '0',
   '--stringparam', 'man.copyright.section.enabled', '0',
-  '--stringparam', 'man.th.title.max.length', '30'
+  '--stringparam', 'man.th.title.max.length', '30',
 ]
 
 docbook_xls = 'http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl'
@@ -61,14 +62,14 @@ foreach man: mans
     command: xsltproc_options + [docbook_xls, '@INPUT@'],
     depend_files: common_ent_file,
     install: true,
-    install_dir: join_paths(nm_mandir, 'man' + man[1])
+    install_dir: join_paths(nm_mandir, 'man' + man[1]),
   )
 endforeach
 
 if enable_introspection
   mans = [
     ['nm-settings-keyfile', '5', nm_settings_keyfile_docs],
-    ['nm-settings', '5', nm_settings_docs]
+    ['nm-settings', '5', nm_settings_docs],
   ]
 
   if enable_ifcfg_rh
@@ -82,7 +83,7 @@ if enable_introspection
       output,
       input: man[2],
       output: output,
-      command: xsltproc_options + [join_paths(meson.current_source_dir(), man[0] + '.xsl'), '@INPUT@']
+      command: xsltproc_options + [join_paths(meson.current_source_dir(), man[0] + '.xsl'), '@INPUT@'],
     )
     content_files += input.full_path()
 
@@ -94,7 +95,7 @@ if enable_introspection
       output: output,
       command: xsltproc_options + [docbook_xls, '@INPUT@'],
       install: true,
-      install_dir: join_paths(nm_mandir, 'man' + man[1])
+      install_dir: join_paths(nm_mandir, 'man' + man[1]),
     )
   endforeach
 endif
diff --git a/man/nm-initrd-generator.8 b/man/nm-initrd-generator.8
index eaebea30..016e172c 100644
--- a/man/nm-initrd-generator.8
+++ b/man/nm-initrd-generator.8
@@ -2,12 +2,12 @@
 .\"     Title: nm-initrd-generator
 .\"    Author: 
 .\" Generator: DocBook XSL Stylesheets vsnapshot 
-.\"      Date: 02/23/2019
+.\"      Date: 03/15/2019
 .\"    Manual: System Administration
-.\"    Source: NetworkManager 1.14.6
+.\"    Source: NetworkManager 1.16.0
 .\"  Language: English
 .\"
-.TH "NM\-INITRD\-GENERATOR" "8" "" "NetworkManager 1\&.14\&.6" "System Administration"
+.TH "NM\-INITRD\-GENERATOR" "8" "" "NetworkManager 1\&.16\&.0" "System Administration"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/nm-online.1 b/man/nm-online.1
index be044e0b..4ad7cdbf 100644
--- a/man/nm-online.1
+++ b/man/nm-online.1
@@ -2,12 +2,12 @@
 .\"     Title: nm-online
 .\"    Author: 
 .\" Generator: DocBook XSL Stylesheets vsnapshot 
-.\"      Date: 02/23/2019
+.\"      Date: 03/15/2019
 .\"    Manual: General Commands Manual
-.\"    Source: NetworkManager 1.14.6
+.\"    Source: NetworkManager 1.16.0
 .\"  Language: English
 .\"
-.TH "NM\-ONLINE" "1" "" "NetworkManager 1\&.14\&.6" "General Commands Manual"
+.TH "NM\-ONLINE" "1" "" "NetworkManager 1\&.16\&.0" "General Commands Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -50,14 +50,9 @@ or
 dhcp, to indicate that IPv6 connectivity is expected\&.
 .SH "OPTIONS"
 .PP
-\fB\-t\fR | \fB\-\-timeout\fR \fIseconds\fR
+\fB\-h\fR | \fB\-\-help\fR
 .RS 4
-Time to wait for a connection, in seconds\&. If the option is not provided, the default timeout is 30 seconds\&.
-.RE
-.PP
-\fB\-x\fR | \fB\-\-exit\fR
-.RS 4
-Exit immediately if NetworkManager is not running or connecting\&.
+Print help information\&.
 .RE
 .PP
 \fB\-q\fR | \fB\-\-quiet\fR
@@ -71,6 +66,16 @@ Wait for NetworkManager startup to complete, rather than waiting for network con
 \fBnm\-online \-s\fR
 will just return immediately, regardless of the current network state\&.)
 .RE
+.PP
+\fB\-t\fR | \fB\-\-timeout\fR \fIseconds\fR
+.RS 4
+Time to wait for a connection, in seconds\&. If the option is not provided, the default timeout is 30 seconds\&.
+.RE
+.PP
+\fB\-x\fR | \fB\-\-exit\fR
+.RS 4
+Exit immediately if NetworkManager is not running or connecting\&.
+.RE
 .SH "EXIT STATUS"
 .PP
 \fBnm\-online\fR
diff --git a/man/nm-online.xml b/man/nm-online.xml
index 297920dd..d40aef98 100644
--- a/man/nm-online.xml
+++ b/man/nm-online.xml
@@ -67,30 +67,14 @@
 
   Options
     
-      
-        
-          
-            
-            
-          
-          seconds
-        
-
-        
-          Time to wait for a connection, in seconds. If the option is not provided,
-          the default timeout is 30 seconds.
-        
-      
-
-
       
         
-          
-          
+          
+          
         
 
         
-          Exit immediately if NetworkManager is not running or connecting.
+          Print help information.
         
       
 
@@ -122,6 +106,33 @@
         
       
 
+      
+        
+          
+            
+            
+          
+          seconds
+        
+
+        
+          Time to wait for a connection, in seconds. If the option is not provided,
+          the default timeout is 30 seconds.
+        
+      
+
+
+      
+        
+          
+          
+        
+
+        
+          Exit immediately if NetworkManager is not running or connecting.
+        
+      
+
     
   
 
diff --git a/man/nm-openvswitch.7 b/man/nm-openvswitch.7
index 1a63813b..9109071e 100644
--- a/man/nm-openvswitch.7
+++ b/man/nm-openvswitch.7
@@ -2,12 +2,12 @@
 .\"     Title: nm-openvswitch
 .\"    Author: 
 .\" Generator: DocBook XSL Stylesheets vsnapshot 
-.\"      Date: 02/23/2019
-.\"    Manual: OpenVSwitch support overview
-.\"    Source: NetworkManager 1.14.6
+.\"      Date: 03/15/2019
+.\"    Manual: Open vSwitch support overview
+.\"    Source: NetworkManager 1.16.0
 .\"  Language: English
 .\"
-.TH "NM\-OPENVSWITCH" "7" "" "NetworkManager 1\&.14\&.6" "OpenVSwitch support overview"
+.TH "NM\-OPENVSWITCH" "7" "" "NetworkManager 1\&.16\&.0" "Open vSwitch support overview"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -28,10 +28,10 @@
 .\" * MAIN CONTENT STARTS HERE *
 .\" -----------------------------------------------------------------
 .SH "NAME"
-nm-openvswitch \- overview of NetworkManager OpenVSwitch support
+nm-openvswitch \- overview of NetworkManager Open vSwitch support
 .SH "OVERVIEW"
 .PP
-NetworkManager includes basic OpenVSwitch support, good enough to be capable of setting up simple OpenVSwitch configurations\&. It is not extensive and does not expose all functionality of OpenVSwitch provides\&. For large or complicated deployments users are advised to use native tools shipped with OpenVSwitch\&. This document seeks to provide overview of functionality currently provided by NetworkManager, its capabilities and limitations\&.
+NetworkManager includes basic Open vSwitch support, good enough to be capable of setting up simple Open vSwitch configurations\&. It is not extensive and does not expose all functionality of Open vSwitch provides\&. For large or complicated deployments users are advised to use native tools shipped with Open vSwitch\&. This document seeks to provide overview of functionality currently provided by NetworkManager, its capabilities and limitations\&.
 .PP
 First and foremost: NetworkManager applies the configuration by modifying the OVSDB directly\&. Its configuration model follows the OVSDB database model closely and it does not provide the level of abstraction
 \fBovs\-vsctl\fR
@@ -206,7 +206,7 @@ It\*(Aqs just a Port with multiple interfaces\&. See nm\-settings manual for Bon
 .sp -1
 .IP \(bu 2.3
 .\}
-Not all OpenVSwitch capabilities are supported\&.
+Not all Open vSwitch capabilities are supported\&.
 .RE
 .sp
 .RS 4
@@ -217,7 +217,7 @@ Not all OpenVSwitch capabilities are supported\&.
 .sp -1
 .IP \(bu 2.3
 .\}
-OpenVSwitch devices don\*(Aqt expose many useful properties on D\-Bus\&.
+Open vSwitch devices don\*(Aqt expose many useful properties on D\-Bus\&.
 .RE
 .PP
 Probably many more\&.
diff --git a/man/nm-openvswitch.xml b/man/nm-openvswitch.xml
index 7195adcc..d156e78e 100644
--- a/man/nm-openvswitch.xml
+++ b/man/nm-openvswitch.xml
@@ -26,30 +26,30 @@
 
   
     nm-openvswitch
-    NetworkManager OpenVSwitch support
+    NetworkManager Open vSwitch support
   
 
   
     nm-openvswitch
     7
     NetworkManager
-    OpenVSwitch support overview
+    Open vSwitch support overview
     &NM_VERSION;
   
 
   
     nm-openvswitch
-    overview of NetworkManager OpenVSwitch support
+    overview of NetworkManager Open vSwitch support
   
 
   
     Overview
 
-    NetworkManager includes basic OpenVSwitch support, good enough
-    to be capable of setting up simple OpenVSwitch configurations. It is not
-    extensive and does not expose all functionality of OpenVSwitch provides.
+    NetworkManager includes basic Open vSwitch support, good enough
+    to be capable of setting up simple Open vSwitch configurations. It is not
+    extensive and does not expose all functionality of Open vSwitch provides.
     For large or complicated deployments users are advised to use native tools
-    shipped with OpenVSwitch. This document seeks to provide overview of
+    shipped with Open vSwitch. This document seeks to provide overview of
     functionality currently provided by NetworkManager, its capabilities and
     limitations.
 
@@ -182,10 +182,10 @@ Connection 'ovs-slave-eth3' (8dedeecb-ed12-482b-b77a-24a4fb835136) successfully
 
     
        
-          Not all OpenVSwitch capabilities are supported.
+          Not all Open vSwitch capabilities are supported.
        
        
-          OpenVSwitch devices don't expose many useful properties on D-Bus.
+          Open vSwitch devices don't expose many useful properties on D-Bus.
        
     
     Probably many more.
diff --git a/man/nm-settings-ifcfg-rh.5 b/man/nm-settings-ifcfg-rh.5
index eba90b88..97953009 100644
--- a/man/nm-settings-ifcfg-rh.5
+++ b/man/nm-settings-ifcfg-rh.5
@@ -2,12 +2,12 @@
 .\"     Title: nm-settings-ifcfg-rh
 .\"    Author: 
 .\" Generator: DocBook XSL Stylesheets vsnapshot 
-.\"      Date: 02/23/2019
+.\"      Date: 03/15/2019
 .\"    Manual: Configuration
-.\"    Source: NetworkManager 1.14.6
+.\"    Source: NetworkManager 1.16.0
 .\"  Language: English
 .\"
-.TH "NM\-SETTINGS\-IFCFG\-RH" "5" "" "NetworkManager 1\&.14\&.6" "Configuration"
+.TH "NM\-SETTINGS\-IFCFG\-RH" "5" "" "NetworkManager 1\&.16\&.0" "Configuration"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -1413,7 +1413,7 @@ DCB_PG_UP2TC
 T}:T{
 \ \&
 T}:T{
-Priority values\&. String of eight trafic class values (0 \- 7)\&.\fB
+Priority values\&. String of eight traffic class values (0 \- 7)\&.\fB
 
 Example: \fRDCB_PG_UP2TC=01623701
 T}
@@ -2460,7 +2460,29 @@ T}
 .nr an-no-space-flag 1
 .nr an-break-flag 1
 .br
-.B Table\ \&24.\ \&802\-3\-ethernet setting
+.B Table\ \&24.\ \&wifi\-p2p setting
+.TS
+allbox tab(:);
+lB lB lB lB.
+T{
+Property
+T}:T{
+Ifcfg\-rh Variable
+T}:T{
+Default
+T}:T{
+Description
+T}
+.T&
+.
+.TE
+.sp 1
+.sp
+.it 1 an-trap
+.nr an-no-space-flag 1
+.nr an-break-flag 1
+.br
+.B Table\ \&25.\ \&802\-3\-ethernet setting
 .TS
 allbox tab(:);
 lB lB lB lB.
@@ -2609,7 +2631,29 @@ T}
 .nr an-no-space-flag 1
 .nr an-break-flag 1
 .br
-.B Table\ \&25.\ \&802\-11\-wireless\-security setting
+.B Table\ \&26.\ \&wireguard setting
+.TS
+allbox tab(:);
+lB lB lB lB.
+T{
+Property
+T}:T{
+Ifcfg\-rh Variable
+T}:T{
+Default
+T}:T{
+Description
+T}
+.T&
+.
+.TE
+.sp 1
+.sp
+.it 1 an-trap
+.nr an-no-space-flag 1
+.nr an-break-flag 1
+.br
+.B Table\ \&27.\ \&802\-11\-wireless\-security setting
 .TS
 allbox tab(:);
 lB lB lB lB.
@@ -2856,7 +2900,7 @@ T}
 .nr an-no-space-flag 1
 .nr an-break-flag 1
 .br
-.B Table\ \&26.\ \&802\-11\-wireless setting
+.B Table\ \&28.\ \&802\-11\-wireless setting
 .TS
 allbox tab(:);
 lB lB lB lB.
@@ -3067,7 +3111,7 @@ T}
 .nr an-no-space-flag 1
 .nr an-break-flag 1
 .br
-.B Table\ \&27.\ \&wpan setting
+.B Table\ \&29.\ \&wpan setting
 .TS
 allbox tab(:);
 lB lB lB lB.
diff --git a/man/nm-settings-ifcfg-rh.xml b/man/nm-settings-ifcfg-rh.xml
index 0c534728..c0f834a1 100644
--- a/man/nm-settings-ifcfg-rh.xml
+++ b/man/nm-settings-ifcfg-rh.xml
@@ -1,6 +1,6 @@
 
 
-nm-settings-ifcfg-rhNetworkManager developersnm-settings-ifcfg-rh5NetworkManagerConfiguration1.14.6nm-settings-ifcfg-rhDescription of ifcfg-rh settings pluginDescription
+nm-settings-ifcfg-rhNetworkManager developersnm-settings-ifcfg-rh5NetworkManagerConfiguration1.16.0nm-settings-ifcfg-rhDescription of ifcfg-rh settings pluginDescription
           NetworkManager is based on the concept of connection profiles that contain
           network configuration (see nm-settings5 for details). The profiles can be
           stored in various formats. NetworkManager uses plugins for reading and writing
@@ -287,7 +287,7 @@ Example: DCB_PG_PCT=10,5,10,15,10,10,10,30DCB_PG_UPPCT=7,13,10,10,15,15,10,20priority-strict-bandwidthDCB_PG_STRICTPriority values. String of eight "0" or "1", where "0" means "may not utilize all bandwidth", "1" means "may utilize all bandwidth".
 
-Example: DCB_PG_STRICT=01101110priority-traffic-classDCB_PG_UP2TCPriority values. String of eight trafic class values (0 - 7).
+Example: DCB_PG_STRICT=01101110priority-traffic-classDCB_PG_UP2TCPriority values. String of eight traffic class values (0 - 7).
 
 Example: DCB_PG_UP2TC=01623701
           All DCB related configuration is a NetworkManager extension. DCB=yes must be
@@ -364,7 +364,7 @@ Example: VLAN_INGRESS_PRIORITY_MAP=4:2,3:5VLAN_EGRESS_PRIORITY_MAP=5:4,4:1,3:7interface-namePHYSDEV and VLAN_ID, or DEVICEVLAN interface name. If all variables are set, parent device from PHYSDEV takes precedence over DEVICE, but VLAN id from DEVICE takes precedence over VLAN_ID.
 
-Example: PHYSDEV=eth0, VLAN_ID=12; or DEVICE=eth0.12802-3-ethernet settingPropertyIfcfg-rh VariableDefaultDescriptionport(none)The property is not saved by the plugin.speedETHTOOL_OPTSFixed speed for the ethernet link. It is added as "speed" parameter in the ETHTOOL_OPTS variable.duplexETHTOOL_OPTSFixed duplex mode for the ethernet link. It is added as "duplex" parameter in the ETHOOL_OPTS variable.auto-negotiateETHTOOL_OPTSWhether link speed and duplex autonegotiation is enabled. It is not saved only if disabled and no values are provided for the "speed" and "duplex" parameters (skips link configuration).mac-addressHWADDRHardware address of the device in traditional hex-digits-and-colons notation (e.g. 00:22:68:14:5A:05). Note that for initscripts this is the current MAC address of the device as found during ifup. For NetworkManager this is the permanent MAC address. Or in case no permanent MAC address exists, the MAC address initially configured on the device.cloned-mac-addressMACADDRCloned (spoofed) MAC address in traditional hex-digits-and-colons notation (e.g. 00:22:68:14:5A:99).generate-mac-address-maskGENERATE_MAC_ADDRESS_MASK(+)the MAC address mask for generating randomized and stable cloned-mac-address.mac-address-blacklistHWADDR_BLACKLIST(+)It denies usage of the connection for any device whose address is listed.
+Example: PHYSDEV=eth0, VLAN_ID=12; or DEVICE=eth0.12
wifi-p2p settingPropertyIfcfg-rh VariableDefaultDescription
802-3-ethernet settingPropertyIfcfg-rh VariableDefaultDescriptionport(none)The property is not saved by the plugin.speedETHTOOL_OPTSFixed speed for the ethernet link. It is added as "speed" parameter in the ETHTOOL_OPTS variable.duplexETHTOOL_OPTSFixed duplex mode for the ethernet link. It is added as "duplex" parameter in the ETHOOL_OPTS variable.auto-negotiateETHTOOL_OPTSWhether link speed and duplex autonegotiation is enabled. It is not saved only if disabled and no values are provided for the "speed" and "duplex" parameters (skips link configuration).mac-addressHWADDRHardware address of the device in traditional hex-digits-and-colons notation (e.g. 00:22:68:14:5A:05). Note that for initscripts this is the current MAC address of the device as found during ifup. For NetworkManager this is the permanent MAC address. Or in case no permanent MAC address exists, the MAC address initially configured on the device.cloned-mac-addressMACADDRCloned (spoofed) MAC address in traditional hex-digits-and-colons notation (e.g. 00:22:68:14:5A:99).generate-mac-address-maskGENERATE_MAC_ADDRESS_MASK(+)the MAC address mask for generating randomized and stable cloned-mac-address.mac-address-blacklistHWADDR_BLACKLIST(+)It denies usage of the connection for any device whose address is listed.
 
 Example: HWADDR_BLACKLIST="00:22:68:11:69:08 00:11:22:11:44:55"mtuMTUMTU of the interface.s390-subchannelsSUBCHANNELSSubchannels for IBM S390 hosts.
 
@@ -372,7 +372,7 @@ Example: SUBCHANNELS=0.0.b00a,0.0.b00b,0.0.b00cNETTYPE=qeth
 
-Allowed values: "qeth", "lcs" or "ctc"s390-optionsOPTIONS and PORTNAME, CTCPROTO,S390 device options. All options go to OPTIONS, except for "portname" and "ctcprot" that have their own variables.
802-11-wireless-security settingPropertyIfcfg-rh VariableDefaultDescriptionkey-mgmtKEY_MGMT(+)Key management menthod.
+Allowed values: "qeth", "lcs" or "ctc"s390-optionsOPTIONS and PORTNAME, CTCPROTO,S390 device options. All options go to OPTIONS, except for "portname" and "ctcprot" that have their own variables.
wireguard settingPropertyIfcfg-rh VariableDefaultDescription
802-11-wireless-security settingPropertyIfcfg-rh VariableDefaultDescriptionkey-mgmtKEY_MGMT(+)Key management menthod.
 
 Allowed values: IEEE8021X, WPA-PSK, WPA-EAPwep-tx-keyidxDEFAULTKEY1Index of active WEP key.
 
diff --git a/man/nm-settings-keyfile.5 b/man/nm-settings-keyfile.5
index e6fe5c05..dd7995de 100644
--- a/man/nm-settings-keyfile.5
+++ b/man/nm-settings-keyfile.5
@@ -2,12 +2,12 @@
 .\"     Title: nm-settings-keyfile
 .\"    Author: 
 .\" Generator: DocBook XSL Stylesheets vsnapshot 
-.\"      Date: 02/23/2019
+.\"      Date: 03/15/2019
 .\"    Manual: Configuration
-.\"    Source: NetworkManager 1.14.6
+.\"    Source: NetworkManager 1.16.0
 .\"  Language: English
 .\"
-.TH "NM\-SETTINGS\-KEYFILE" "5" "" "NetworkManager 1\&.14\&.6" "Configuration"
+.TH "NM\-SETTINGS\-KEYFILE" "5" "" "NetworkManager 1\&.16\&.0" "Configuration"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -513,7 +513,38 @@ T}
 .nr an-no-space-flag 1
 .nr an-break-flag 1
 .br
-.B Table\ \&7.\ \&802\-3\-ethernet setting (section)
+.B Table\ \&7.\ \&wifi\-p2p setting (section)
+.TS
+allbox tab(:);
+lB lB lB lB.
+T{
+Property
+T}:T{
+Keyfile Variable
+T}:T{
+Format
+T}:T{
+Description
+T}
+.T&
+l l l l.
+T{
+peer
+T}:T{
+peer
+T}:T{
+usual hex\-digits\-and\-colons notation
+T}:T{
+MAC address in traditional hex\-digits\-and\-colons notation (e\&.g\&. 00:22:68:12:79:A2), or semicolon separated list of 6 bytes (obsolete) (e\&.g\&. 0;34;104;18;121;162)\&.
+T}
+.TE
+.sp 1
+.sp
+.it 1 an-trap
+.nr an-no-space-flag 1
+.nr an-break-flag 1
+.br
+.B Table\ \&8.\ \&802\-3\-ethernet setting (section)
 .TS
 allbox tab(:);
 lB lB lB lB.
@@ -566,7 +597,7 @@ T}
 .nr an-no-space-flag 1
 .nr an-break-flag 1
 .br
-.B Table\ \&8.\ \&802\-11\-wireless setting (section)
+.B Table\ \&9.\ \&802\-11\-wireless setting (section)
 .TS
 allbox tab(:);
 lB lB lB lB.
@@ -631,7 +662,7 @@ T}
 .nr an-no-space-flag 1
 .nr an-break-flag 1
 .br
-.B Table\ \&9.\ \&wpan setting (section)
+.B Table\ \&10.\ \&wpan setting (section)
 .TS
 allbox tab(:);
 lB lB lB lB.
diff --git a/man/nm-settings-keyfile.xml b/man/nm-settings-keyfile.xml
index 4fbbef11..3281f887 100644
--- a/man/nm-settings-keyfile.xml
+++ b/man/nm-settings-keyfile.xml
@@ -1,6 +1,6 @@
 
 
-nm-settings-keyfileNetworkManager developersnm-settings-keyfile5NetworkManagerConfiguration1.14.6nm-settings-keyfileDescription of keyfile settings pluginDescription
+nm-settings-keyfileNetworkManager developersnm-settings-keyfile5NetworkManagerConfiguration1.16.0nm-settings-keyfileDescription of keyfile settings pluginDescription
           NetworkManager is based on the concept of connection profiles that contain
           network configuration (see nm-settings5 for details). The profiles can be
           stored in various formats. NetworkManager uses plugins for reading and writing
@@ -218,6 +218,9 @@ Example: remote=ovpn.corp.com cipher=AES-256-CBC username=joe
 Example: password=Popocatepetl

 

 
+wifi-p2p setting (section)PropertyKeyfile VariableFormatDescription
+peerpeerusual hex-digits-and-colons notationMAC address in traditional hex-digits-and-colons notation (e.g. 00:22:68:12:79:A2), or semicolon separated list of 6 bytes (obsolete) (e.g. 0;34;104;18;121;162).
+

 
 802-3-ethernet setting (section)PropertyKeyfile VariableFormatDescriptionmac-addressmac-addressusual hex-digits-and-colons notationMAC address in traditional hex-digits-and-colons notation (e.g. 00:22:68:12:79:A2), or semicolon separated list of 6 bytes (obsolete) (e.g. 0;34;104;18;121;162)
@@ -227,6 +230,7 @@ Example: password=Popocatepetl
 Example: mac-address-blacklist= 00:22:68:12:79:A6;00:22:68:12:79:78

 
 

 
+
 802-11-wireless setting (section)PropertyKeyfile VariableFormatDescriptionssidssidstring (or decimal-byte list - obsolete)SSID of Wi-Fi network.
 
diff --git a/man/nm-settings.5 b/man/nm-settings.5
index 70ee2711..aa08919a 100644
--- a/man/nm-settings.5
+++ b/man/nm-settings.5
@@ -2,12 +2,12 @@
 .\"     Title: nm-settings
 .\"    Author: 
 .\" Generator: DocBook XSL Stylesheets vsnapshot 
-.\"      Date: 02/23/2019
+.\"      Date: 03/15/2019
 .\"    Manual: Configuration
-.\"    Source: NetworkManager 1.14.6
+.\"    Source: NetworkManager 1.16.0
 .\"  Language: English
 .\"
-.TH "NM\-SETTINGS" "5" "" "NetworkManager 1\&.14\&.6" "Configuration"
+.TH "NM\-SETTINGS" "5" "" "NetworkManager 1\&.16\&.0" "Configuration"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -266,7 +266,7 @@ string
 T}:T{
 \ \&
 T}:T{
-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 as DHCP client identifier with ipv4\&.dhcp\-client\-id=stable and to derive the DHCP DUID with ipv6\&.dhcp\-duid=stable\-[llt,ll,uuid]\&. 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\*(Aqs name is included, so that different interfaces yield different addresses\&. The \*(Aq$\*(Aq 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 the the interface name of the device and "${MAC}" is the permanent MAC address of the device\&. Any unrecognized patterns following \*(Aq$\*(Aq are treated verbatim, however are reserved for future use\&. You are thus advised to avoid \*(Aq$\*(Aq 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\&.
+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 as DHCP client identifier with ipv4\&.dhcp\-client\-id=stable and to derive the DHCP DUID with ipv6\&.dhcp\-duid=stable\-[llt,ll,uuid]\&. 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\*(Aqs name is included, so that different interfaces yield different addresses\&. The \*(Aq$\*(Aq 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 \*(Aq$\*(Aq are treated verbatim, however are reserved for future use\&. You are thus advised to avoid \*(Aq$\*(Aq 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\&.
 T}
 T{
 timestamp
@@ -1496,7 +1496,7 @@ string
 T}:T{
 \ \&
 T}:T{
-Number to dial when establishing a PPP data session with the GSM\-based mobile broadband network\&.  Many modems do not require PPP for connections to the mobile network and thus this property should be left blank, which allows NetworkManager to select the appropriate settings automatically\&.
+Legacy setting that used to help establishing PPP data sessions for GSM\-based modems\&. Deprecated: 1
 T}
 T{
 password
@@ -1766,7 +1766,7 @@ int32
 T}:T{
 0
 T}:T{
-DNS servers priority\&. The relative priority for DNS servers specified by this setting\&.  A lower value is better (higher priority)\&.  Zero selects the default value, which is 50 for VPNs and 100 for other connections\&. Note that the priority is to order DNS settings for multiple active connections\&.  It does not disambiguate multiple DNS servers within the same connection profile\&. When using dns=default, servers with higher priority will be on top of resolv\&.conf\&.  To prioritize a given server over another one within the same connection, just specify them in the desired order\&.  When multiple devices have configurations with the same priority, the one with an active default route will be preferred\&.  Negative values have the special effect of excluding other configurations with a greater priority value; so in presence of at least a negative priority, only DNS servers from connections with the lowest priority value will be used\&. When using a DNS resolver that supports split\-DNS as dns=dnsmasq or dns=systemd\-resolved, each connection is used to query domains in its search list\&.  Queries for domains not present in any search list are routed through connections having the \*(Aq~\&.\*(Aq special wildcard domain, which is added automatically to connections with the default route (or can be added manually)\&.  When multiple connections specify the same domain, the one with the highest priority (lowest numerical value) wins\&.  If a connection specifies a domain which is subdomain of another domain with a negative DNS priority value, the subdomain is ignored\&.
+DNS servers priority\&. The relative priority for DNS servers specified by this setting\&.  A lower value is better (higher priority)\&. Zero selects a globally configured default value\&. If the latter is missing or zero too, it defaults to 50 for VPNs and 100 for other connections\&. Note that the priority is to order DNS settings for multiple active connections\&.  It does not disambiguate multiple DNS servers within the same connection profile\&. When using dns=default, servers with higher priority will be on top of resolv\&.conf\&.  To prioritize a given server over another one within the same connection, just specify them in the desired order\&.  When multiple devices have configurations with the same priority, the one with an active default route will be preferred\&.  Negative values have the special effect of excluding other configurations with a greater priority value; so in presence of at least a negative priority, only DNS servers from connections with the lowest priority value will be used\&. When using a DNS resolver that supports split\-DNS as dns=dnsmasq or dns=systemd\-resolved, each connection is used to query domains in its search list\&.  Queries for domains not present in any search list are routed through connections having the \*(Aq~\&.\*(Aq special wildcard domain, which is added automatically to connections with the default route (or can be added manually)\&.  When multiple connections specify the same domain, the one with the highest priority (lowest numerical value) wins\&.  If a connection specifies a domain which is subdomain of another domain with a negative DNS priority value, the subdomain is ignored\&.
 T}
 T{
 dns\-search
@@ -2006,7 +2006,7 @@ int32
 T}:T{
 0
 T}:T{
-DNS servers priority\&. The relative priority for DNS servers specified by this setting\&.  A lower value is better (higher priority)\&.  Zero selects the default value, which is 50 for VPNs and 100 for other connections\&. Note that the priority is to order DNS settings for multiple active connections\&.  It does not disambiguate multiple DNS servers within the same connection profile\&. When using dns=default, servers with higher priority will be on top of resolv\&.conf\&.  To prioritize a given server over another one within the same connection, just specify them in the desired order\&.  When multiple devices have configurations with the same priority, the one with an active default route will be preferred\&.  Negative values have the special effect of excluding other configurations with a greater priority value; so in presence of at least a negative priority, only DNS servers from connections with the lowest priority value will be used\&. When using a DNS resolver that supports split\-DNS as dns=dnsmasq or dns=systemd\-resolved, each connection is used to query domains in its search list\&.  Queries for domains not present in any search list are routed through connections having the \*(Aq~\&.\*(Aq special wildcard domain, which is added automatically to connections with the default route (or can be added manually)\&.  When multiple connections specify the same domain, the one with the highest priority (lowest numerical value) wins\&.  If a connection specifies a domain which is subdomain of another domain with a negative DNS priority value, the subdomain is ignored\&.
+DNS servers priority\&. The relative priority for DNS servers specified by this setting\&.  A lower value is better (higher priority)\&. Zero selects a globally configured default value\&. If the latter is missing or zero too, it defaults to 50 for VPNs and 100 for other connections\&. Note that the priority is to order DNS settings for multiple active connections\&.  It does not disambiguate multiple DNS servers within the same connection profile\&. When using dns=default, servers with higher priority will be on top of resolv\&.conf\&.  To prioritize a given server over another one within the same connection, just specify them in the desired order\&.  When multiple devices have configurations with the same priority, the one with an active default route will be preferred\&.  Negative values have the special effect of excluding other configurations with a greater priority value; so in presence of at least a negative priority, only DNS servers from connections with the lowest priority value will be used\&. When using a DNS resolver that supports split\-DNS as dns=dnsmasq or dns=systemd\-resolved, each connection is used to query domains in its search list\&.  Queries for domains not present in any search list are routed through connections having the \*(Aq~\&.\*(Aq special wildcard domain, which is added automatically to connections with the default route (or can be added manually)\&.  When multiple connections specify the same domain, the one with the highest priority (lowest numerical value) wins\&.  If a connection specifies a domain which is subdomain of another domain with a negative DNS priority value, the subdomain is ignored\&.
 T}
 T{
 dns\-search
@@ -3245,7 +3245,7 @@ array of vardict
 T}:T{
 []
 T}:T{
-Link watchers configuration for the connection: each link watcher is defined by a dictionary, whose keys depend upon the selected link watcher\&. Available link watchers are \*(Aqethtool\*(Aq, \*(Aqnsna_ping\*(Aq and \*(Aqarp_ping\*(Aq and it is specified in the dictionary with the key \*(Aqname\*(Aq\&. Available keys are:   ethtool: \*(Aqdelay\-up\*(Aq, \*(Aqdelay\-down\*(Aq, \*(Aqinit\-wait\*(Aq; nsna_ping: \*(Aqinit\-wait\*(Aq, \*(Aqinterval\*(Aq, \*(Aqmissed\-max\*(Aq, \*(Aqtarget\-host\*(Aq; arp_ping: all the ones in nsna_ping and \*(Aqsource\-host\*(Aq, \*(Aqvalidate\-active\*(Aq, \*(Aqvalidate\-incative\*(Aq, \*(Aqsend\-always\*(Aq\&. See teamd\&.conf man for more details\&.
+Link watchers configuration for the connection: each link watcher is defined by a dictionary, whose keys depend upon the selected link watcher\&. Available link watchers are \*(Aqethtool\*(Aq, \*(Aqnsna_ping\*(Aq and \*(Aqarp_ping\*(Aq and it is specified in the dictionary with the key \*(Aqname\*(Aq\&. Available keys are:   ethtool: \*(Aqdelay\-up\*(Aq, \*(Aqdelay\-down\*(Aq, \*(Aqinit\-wait\*(Aq; nsna_ping: \*(Aqinit\-wait\*(Aq, \*(Aqinterval\*(Aq, \*(Aqmissed\-max\*(Aq, \*(Aqtarget\-host\*(Aq; arp_ping: all the ones in nsna_ping and \*(Aqsource\-host\*(Aq, \*(Aqvalidate\-active\*(Aq, \*(Aqvalidate\-inactive\*(Aq, \*(Aqsend\-always\*(Aq\&. See teamd\&.conf man for more details\&.
 T}
 T{
 mcast\-rejoin\-count
@@ -3432,7 +3432,7 @@ array of vardict
 T}:T{
 []
 T}:T{
-Link watchers configuration for the connection: each link watcher is defined by a dictionary, whose keys depend upon the selected link watcher\&. Available link watchers are \*(Aqethtool\*(Aq, \*(Aqnsna_ping\*(Aq and \*(Aqarp_ping\*(Aq and it is specified in the dictionary with the key \*(Aqname\*(Aq\&. Available keys are:   ethtool: \*(Aqdelay\-up\*(Aq, \*(Aqdelay\-down\*(Aq, \*(Aqinit\-wait\*(Aq; nsna_ping: \*(Aqinit\-wait\*(Aq, \*(Aqinterval\*(Aq, \*(Aqmissed\-max\*(Aq, \*(Aqtarget\-host\*(Aq; arp_ping: all the ones in nsna_ping and \*(Aqsource\-host\*(Aq, \*(Aqvalidate\-active\*(Aq, \*(Aqvalidate\-incative\*(Aq, \*(Aqsend\-always\*(Aq\&. See teamd\&.conf man for more details\&.
+Link watchers configuration for the connection: each link watcher is defined by a dictionary, whose keys depend upon the selected link watcher\&. Available link watchers are \*(Aqethtool\*(Aq, \*(Aqnsna_ping\*(Aq and \*(Aqarp_ping\*(Aq and it is specified in the dictionary with the key \*(Aqname\*(Aq\&. Available keys are:   ethtool: \*(Aqdelay\-up\*(Aq, \*(Aqdelay\-down\*(Aq, \*(Aqinit\-wait\*(Aq; nsna_ping: \*(Aqinit\-wait\*(Aq, \*(Aqinterval\*(Aq, \*(Aqmissed\-max\*(Aq, \*(Aqtarget\-host\*(Aq; arp_ping: all the ones in nsna_ping and \*(Aqsource\-host\*(Aq, \*(Aqvalidate\-active\*(Aq, \*(Aqvalidate\-inactive\*(Aq, \*(Aqsend\-always\*(Aq\&. See teamd\&.conf man for more details\&.
 T}
 T{
 prio
@@ -3903,6 +3903,54 @@ Specifies the time\-to\-live value to use in outgoing packets\&.
 T}
 .TE
 .sp 1
+.SS "wifi\-p2p setting"
+.PP
+Wi\-Fi P2P Settings\&.
+.TS
+allbox tab(:);
+lB lB lB lB.
+T{
+Key Name
+T}:T{
+Value Type
+T}:T{
+Default Value
+T}:T{
+Value Description
+T}
+.T&
+l l l l
+l l l l
+l l l l.
+T{
+peer
+T}:T{
+string
+T}:T{
+\ \&
+T}:T{
+The P2P device that should be connected to\&. Currently this is the only way to create or join a group\&.
+T}
+T{
+wfd\-ies
+T}:T{
+byte array
+T}:T{
+\ \&
+T}:T{
+The Wi\-Fi Display (WFD) Information Elements (IEs) to set\&. Wi\-Fi Display requires a protocol specific information element to be set in certain Wi\-Fi frames\&. These can be specified here for the purpose of establishing a connection\&. This setting is only useful when implementing a Wi\-Fi Display client\&.
+T}
+T{
+wps\-method
+T}:T{
+uint32
+T}:T{
+0
+T}:T{
+Flags indicating which mode of WPS is to be used\&. There\*(Aqs little point in changing the default setting as NetworkManager will automatically determine the best method to use\&.
+T}
+.TE
+.sp 1
 .SS "wimax setting"
 .PP
 WiMax Settings\&.
@@ -3979,7 +4027,7 @@ string
 T}:T{
 \ \&
 T}:T{
-The new field for the cloned MAC address\&. It can be either a hardware address in ASCII representation, or one of the special values "preserve", "permanent", "random" or "stable"\&. This field replaces the deprecated "cloned\-mac\-address" on D\-Bus, which can only contain explict hardware addresses\&. Note that this property only exists in D\-Bus API\&. libnm and nmcli continue to call this property "cloned\-mac\-address"\&.
+The new field for the cloned MAC address\&. It can be either a hardware address in ASCII representation, or one of the special values "preserve", "permanent", "random" or "stable"\&. This field replaces the deprecated "cloned\-mac\-address" on D\-Bus, which can only contain explicit hardware addresses\&. Note that this property only exists in D\-Bus API\&. libnm and nmcli continue to call this property "cloned\-mac\-address"\&.
 T}
 T{
 auto\-negotiate
@@ -4109,6 +4157,94 @@ If specified, the password used with magic\-packet\-based Wake\-on\-LAN, represe
 T}
 .TE
 .sp 1
+.SS "wireguard setting"
+.PP
+WireGuard Ethernet Settings\&.
+.TS
+allbox tab(:);
+lB lB lB lB.
+T{
+Key Name
+T}:T{
+Value Type
+T}:T{
+Default Value
+T}:T{
+Value Description
+T}
+.T&
+l l l l
+l l l l
+l l l l
+l l l l
+l l l l
+l l l l
+l l l l.
+T{
+fwmark
+T}:T{
+uint32
+T}:T{
+0
+T}:T{
+The use of fwmark is optional and is by default off\&. Setting it to 0 disables it\&. Otherwise it is a 32\-bit fwmark for outgoing packets\&.
+T}
+T{
+listen\-port
+T}:T{
+uint32
+T}:T{
+0
+T}:T{
+The listen\-port\&. If listen\-port is not specified, the port will be chosen randomly when the interface comes up\&.
+T}
+T{
+mtu
+T}:T{
+uint32
+T}:T{
+0
+T}:T{
+If non\-zero, only transmit packets of the specified size or smaller, breaking larger packets up into multiple fragments\&. If zero a default MTU is used\&. Note that contrary to wg\-quick\*(Aqs MTU setting, this does not take into account the current routes at the time of activation\&.
+T}
+T{
+peer\-routes
+T}:T{
+boolean
+T}:T{
+TRUE
+T}:T{
+Whether to automatically add routes for the AllowedIPs ranges of the peers\&. If TRUE (the default), NetworkManager will automatically add routes in the routing tables according to ipv4\&.route\-table and ipv6\&.route\-table\&. If FALSE, no such routes are added automatically\&. In this case, the user may want to configure static routes in ipv4\&.routes and ipv6\&.routes, respectively\&.
+T}
+T{
+peers
+T}:T{
+array of \*(Aqa{sv}\*(Aq
+T}:T{
+\ \&
+T}:T{
+Array of dictionaries for the WireGuard peers\&.
+T}
+T{
+private\-key
+T}:T{
+string
+T}:T{
+\ \&
+T}:T{
+The 256 bit private\-key in base64 encoding\&.
+T}
+T{
+private\-key\-flags
+T}:T{
+NMSettingSecretFlags (uint32)
+T}:T{
+\ \&
+T}:T{
+Flags indicating how to handle the "private\-key" property\&. (see the section called \(lqSecret flag types:\(rq for flag values)
+T}
+.TE
+.sp 1
 .SS "802\-11\-wireless setting"
 .PP
 Wi\-Fi Settings\&.
@@ -4151,7 +4287,7 @@ string
 T}:T{
 \ \&
 T}:T{
-The new field for the cloned MAC address\&. It can be either a hardware address in ASCII representation, or one of the special values "preserve", "permanent", "random" or "stable"\&. This field replaces the deprecated "cloned\-mac\-address" on D\-Bus, which can only contain explict hardware addresses\&. Note that this property only exists in D\-Bus API\&. libnm and nmcli continue to call this property "cloned\-mac\-address"\&.
+The new field for the cloned MAC address\&. It can be either a hardware address in ASCII representation, or one of the special values "preserve", "permanent", "random" or "stable"\&. This field replaces the deprecated "cloned\-mac\-address" on D\-Bus, which can only contain explicit hardware addresses\&. Note that this property only exists in D\-Bus API\&. libnm and nmcli continue to call this property "cloned\-mac\-address"\&.
 T}
 T{
 band
@@ -4387,7 +4523,7 @@ string
 T}:T{
 \ \&
 T}:T{
-Key management used for the connection\&.  One of "none" (WEP), "ieee8021x" (Dynamic WEP), "wpa\-none" (Ad\-Hoc WPA\-PSK), "wpa\-psk" (infrastructure WPA\-PSK), or "wpa\-eap" (WPA\-Enterprise)\&.  This property must be set for any Wi\-Fi connection that uses security\&.
+Key management used for the connection\&.  One of "none" (WEP), "ieee8021x" (Dynamic WEP), "wpa\-none" (Ad\-Hoc WPA\-PSK), "wpa\-psk" (infrastructure WPA\-PSK), "sae" (SAE) or "wpa\-eap" (WPA\-Enterprise)\&. This property must be set for any Wi\-Fi connection that uses security\&.
 T}
 T{
 leap\-password
@@ -4450,7 +4586,7 @@ string
 T}:T{
 \ \&
 T}:T{
-Pre\-Shared\-Key for WPA networks\&.  If the key is 64\-characters long, it must contain only hexadecimal characters and is interpreted as a hexadecimal WPA key\&.  Otherwise, the key must be between 8 and 63 ASCII characters (as specified in the 802\&.11i standard) and is interpreted as a WPA passphrase, and is hashed to derive the actual WPA\-PSK used when connecting to the Wi\-Fi network\&.
+Pre\-Shared\-Key for WPA networks\&. For WPA\-PSK, it\*(Aqs either an ASCII passphrase of 8 to 63 characters that is (as specified in the 802\&.11i standard) hashed to derive the actual key, or the key in form of 64 hexadecimal character\&. The WPA3\-Personal networks use a passphrase of any length for SAE authentication\&.
 T}
 T{
 psk\-flags
@@ -4553,8 +4689,19 @@ T}
 .T&
 l l l l
 l l l l
+l l l l
+l l l l
 l l l l.
 T{
+channel
+T}:T{
+int32
+T}:T{
+\-1
+T}:T{
+IEEE 802\&.15\&.4 channel\&. A positive integer or \-1, meaning "do not set, use whatever the device is already set to"\&.
+T}
+T{
 mac\-address
 T}:T{
 string
@@ -4564,6 +4711,15 @@ T}:T{
 If specified, this connection will only apply to the IEEE 802\&.15\&.4 (WPAN) MAC layer device whose permanent MAC address matches\&.
 T}
 T{
+page
+T}:T{
+int32
+T}:T{
+\-1
+T}:T{
+IEEE 802\&.15\&.4 channel page\&. A positive integer or \-1, meaning "do not set, use whatever the device is already set to"\&.
+T}
+T{
 pan\-id
 T}:T{
 uint32
diff --git a/man/nm-settings.xml b/man/nm-settings.xml
index 5e7029e0..50e573dc 100644
--- a/man/nm-settings.xml
+++ b/man/nm-settings.xml
@@ -1,6 +1,6 @@
 
 
-nm-settingsNetworkManager developersnm-settings5NetworkManagerConfiguration1.14.6nm-settingsDescription of settings and properties of NetworkManager connection profilesDescription
+nm-settingsNetworkManager developersnm-settings5NetworkManagerConfiguration1.16.0nm-settingsDescription of settings and properties of NetworkManager connection profilesDescription
           NetworkManager is based on a concept of connection profiles, sometimes referred to as
           connections only. These connection profiles contain a network configuration. When
           NetworkManager activates a connection profile on a network device the configuration will
@@ -52,7 +52,7 @@
     read-onlybooleanFALSEFALSE 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.
     secondariesarray of string[]List of connection UUIDs that should be activated when the base connection itself is activated. Currently only VPN connections are supported.
     slave-typestringSetting name of the device type of this slave's master connection (eg, "bond"), or NULL if this connection is not a slave.
-    stable-idstringThis 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 as DHCP client identifier with ipv4.dhcp-client-id=stable and to derive the DHCP DUID with ipv6.dhcp-duid=stable-[llt,ll,uuid]. 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 '$' 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 the 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.
+    stable-idstringThis 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 as DHCP client identifier with ipv4.dhcp-client-id=stable and to derive the DHCP DUID with ipv6.dhcp-duid=stable-[llt,ll,uuid]. 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 '$' 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.
     timestampuint640The 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).
     typestringBase type of the connection. For hardware-dependent connections, should contain the setting name of the hardware-type specific setting (ie, "802-3-ethernet" or "802-11-wireless" or "bluetooth", etc), and for non-hardware dependent connections like VPN or otherwise, should contain the setting name of that setting type (ie, "vpn" or "bridge", etc).
     uuidstringA universally unique identifier for the connection, for example generated with libuuid.  It should be assigned when the connection is created, and never changed as long as the connection still applies to the same network.  For example, it should not be changed when the "id" property or NMSettingIP4Config changes, but might need to be re-created when the Wi-Fi SSID, mobile broadband network provider, or "type" property changes. The UUID must be in the format "2815492f-7e56-435e-b2e9-246bd7cdc664" (ie, contains only hexadecimal characters and "-").
@@ -177,7 +177,7 @@
     home-onlybooleanFALSEWhen TRUE, only connections to the home network will be allowed. Connections to roaming networks will not be made.
     mtuuint320If non-zero, only transmit packets of the specified size or smaller, breaking larger packets up into multiple frames.
     network-idstringThe Network ID (GSM LAI format, ie MCC-MNC) to force specific network registration.  If the Network ID is specified, NetworkManager will attempt to force the device to register only on the specified network. This can be used to ensure that the device does not roam when direct roaming control of the device is not otherwise possible.
-    numberstringNumber to dial when establishing a PPP data session with the GSM-based mobile broadband network.  Many modems do not require PPP for connections to the mobile network and thus this property should be left blank, which allows NetworkManager to select the appropriate settings automatically.
+    numberstringLegacy setting that used to help establishing PPP data sessions for GSM-based modems. Deprecated: 1
     passwordstringThe password used to authenticate with the network, if required.  Many providers do not require a password, or accept any password.  But if a password is required, it is specified here.
     password-flagsNMSettingSecretFlags (uint32)Flags indicating how to handle the "password" property. (see  for flag values)
     pinstringIf the SIM is locked with a PIN it must be unlocked before any other operations are requested.  Specify the PIN here to allow operation of the device.
@@ -204,7 +204,7 @@
     dhcp-timeoutint320A timeout for a DHCP transaction in seconds.
     dnsarray of uint32[]Array of IP addresses of DNS servers (as network-byte-order integers)
     dns-optionsarray of string[]Array of DNS options as described in man 5 resolv.conf. NULL means that the options are unset and left at the default. In this case NetworkManager will use default options. This is distinct from an empty list of properties.
-    dns-priorityint320DNS servers priority. The relative priority for DNS servers specified by this setting.  A lower value is better (higher priority).  Zero selects the default value, which is 50 for VPNs and 100 for other connections. Note that the priority is to order DNS settings for multiple active connections.  It does not disambiguate multiple DNS servers within the same connection profile. When using dns=default, servers with higher priority will be on top of resolv.conf.  To prioritize a given server over another one within the same connection, just specify them in the desired order.  When multiple devices have configurations with the same priority, the one with an active default route will be preferred.  Negative values have the special effect of excluding other configurations with a greater priority value; so in presence of at least a negative priority, only DNS servers from connections with the lowest priority value will be used. When using a DNS resolver that supports split-DNS as dns=dnsmasq or dns=systemd-resolved, each connection is used to query domains in its search list.  Queries for domains not present in any search list are routed through connections having the '~.' special wildcard domain, which is added automatically to connections with the default route (or can be added manually).  When multiple connections specify the same domain, the one with the highest priority (lowest numerical value) wins.  If a connection specifies a domain which is subdomain of another domain with a negative DNS priority value, the subdomain is ignored.
+    dns-priorityint320DNS servers priority. The relative priority for DNS servers specified by this setting.  A lower value is better (higher priority). Zero selects a globally configured default value. If the latter is missing or zero too, it defaults to 50 for VPNs and 100 for other connections. Note that the priority is to order DNS settings for multiple active connections.  It does not disambiguate multiple DNS servers within the same connection profile. When using dns=default, servers with higher priority will be on top of resolv.conf.  To prioritize a given server over another one within the same connection, just specify them in the desired order.  When multiple devices have configurations with the same priority, the one with an active default route will be preferred.  Negative values have the special effect of excluding other configurations with a greater priority value; so in presence of at least a negative priority, only DNS servers from connections with the lowest priority value will be used. When using a DNS resolver that supports split-DNS as dns=dnsmasq or dns=systemd-resolved, each connection is used to query domains in its search list.  Queries for domains not present in any search list are routed through connections having the '~.' special wildcard domain, which is added automatically to connections with the default route (or can be added manually).  When multiple connections specify the same domain, the one with the highest priority (lowest numerical value) wins.  If a connection specifies a domain which is subdomain of another domain with a negative DNS priority value, the subdomain is ignored.
     dns-searcharray of string[]Array of DNS search domains. Domains starting with a tilde ('~') are considered 'routing' domains and are used only to decide the interface over which a query must be forwarded; they are not used to complete unqualified host names.
     gatewaystringThe gateway associated with this configuration. This is only meaningful if "addresses" is also set.
     ignore-auto-dnsbooleanFALSEWhen "method" is set to "auto" and this property to TRUE, automatically configured nameservers and search domains are ignored and only nameservers and search domains specified in the "dns" and "dns-search" properties, if any, are used.
@@ -228,7 +228,7 @@
     dhcp-timeoutint320A timeout for a DHCP transaction in seconds.
     dnsarray of byte array[]Array of IP addresses of DNS servers (in network byte order)
     dns-optionsarray of string[]Array of DNS options as described in man 5 resolv.conf. NULL means that the options are unset and left at the default. In this case NetworkManager will use default options. This is distinct from an empty list of properties.
-    dns-priorityint320DNS servers priority. The relative priority for DNS servers specified by this setting.  A lower value is better (higher priority).  Zero selects the default value, which is 50 for VPNs and 100 for other connections. Note that the priority is to order DNS settings for multiple active connections.  It does not disambiguate multiple DNS servers within the same connection profile. When using dns=default, servers with higher priority will be on top of resolv.conf.  To prioritize a given server over another one within the same connection, just specify them in the desired order.  When multiple devices have configurations with the same priority, the one with an active default route will be preferred.  Negative values have the special effect of excluding other configurations with a greater priority value; so in presence of at least a negative priority, only DNS servers from connections with the lowest priority value will be used. When using a DNS resolver that supports split-DNS as dns=dnsmasq or dns=systemd-resolved, each connection is used to query domains in its search list.  Queries for domains not present in any search list are routed through connections having the '~.' special wildcard domain, which is added automatically to connections with the default route (or can be added manually).  When multiple connections specify the same domain, the one with the highest priority (lowest numerical value) wins.  If a connection specifies a domain which is subdomain of another domain with a negative DNS priority value, the subdomain is ignored.
+    dns-priorityint320DNS servers priority. The relative priority for DNS servers specified by this setting.  A lower value is better (higher priority). Zero selects a globally configured default value. If the latter is missing or zero too, it defaults to 50 for VPNs and 100 for other connections. Note that the priority is to order DNS settings for multiple active connections.  It does not disambiguate multiple DNS servers within the same connection profile. When using dns=default, servers with higher priority will be on top of resolv.conf.  To prioritize a given server over another one within the same connection, just specify them in the desired order.  When multiple devices have configurations with the same priority, the one with an active default route will be preferred.  Negative values have the special effect of excluding other configurations with a greater priority value; so in presence of at least a negative priority, only DNS servers from connections with the lowest priority value will be used. When using a DNS resolver that supports split-DNS as dns=dnsmasq or dns=systemd-resolved, each connection is used to query domains in its search list.  Queries for domains not present in any search list are routed through connections having the '~.' special wildcard domain, which is added automatically to connections with the default route (or can be added manually).  When multiple connections specify the same domain, the one with the highest priority (lowest numerical value) wins.  If a connection specifies a domain which is subdomain of another domain with a negative DNS priority value, the subdomain is ignored.
     dns-searcharray of string[]Array of DNS search domains. Domains starting with a tilde ('~') are considered 'routing' domains and are used only to decide the interface over which a query must be forwarded; they are not used to complete unqualified host names.
     gatewaystringThe gateway associated with this configuration. This is only meaningful if "addresses" is also set.
     ignore-auto-dnsbooleanFALSEWhen "method" is set to "auto" and this property to TRUE, automatically configured nameservers and search domains are ignored and only nameservers and search domains specified in the "dns" and "dns-search" properties, if any, are used.
@@ -355,7 +355,7 @@
   team settingTeaming Settings.Key NameValue TypeDefault ValueValue DescriptionconfigstringThe JSON configuration for the team network interface.  The property should contain raw JSON configuration data suitable for teamd, because the value is passed directly to teamd. If not specified, the default configuration is used.  See man teamd.conf for the format details.interface-namestringDeprecated in favor of connection.interface-name, but can be used for backward-compatibility with older daemons, to set the team's interface name.
-    link-watchersarray of vardict[]Link watchers configuration for the connection: each link watcher is defined by a dictionary, whose keys depend upon the selected link watcher. Available link watchers are 'ethtool', 'nsna_ping' and 'arp_ping' and it is specified in the dictionary with the key 'name'. Available keys are:   ethtool: 'delay-up', 'delay-down', 'init-wait'; nsna_ping: 'init-wait', 'interval', 'missed-max', 'target-host'; arp_ping: all the ones in nsna_ping and 'source-host', 'validate-active', 'validate-incative', 'send-always'. See teamd.conf man for more details.
+    link-watchersarray of vardict[]Link watchers configuration for the connection: each link watcher is defined by a dictionary, whose keys depend upon the selected link watcher. Available link watchers are 'ethtool', 'nsna_ping' and 'arp_ping' and it is specified in the dictionary with the key 'name'. Available keys are:   ethtool: 'delay-up', 'delay-down', 'init-wait'; nsna_ping: 'init-wait', 'interval', 'missed-max', 'target-host'; arp_ping: all the ones in nsna_ping and 'source-host', 'validate-active', 'validate-inactive', 'send-always'. See teamd.conf man for more details.mcast-rejoin-countint320Corresponds to the teamd mcast_rejoin.count.mcast-rejoin-intervalint320Corresponds to the teamd mcast_rejoin.interval.notify-peers-countint320Corresponds to the teamd notify_peers.count.
@@ -375,7 +375,7 @@
     configstringThe JSON configuration for the team port. The property should contain raw JSON configuration data suitable for teamd, because the value is passed directly to teamd. If not specified, the default configuration is used. See man teamd.conf for the format details.lacp-keyint320Corresponds to the teamd ports.PORTIFNAME.lacp_key.lacp-prioint32255Corresponds to the teamd ports.PORTIFNAME.lacp_prio.
-    link-watchersarray of vardict[]Link watchers configuration for the connection: each link watcher is defined by a dictionary, whose keys depend upon the selected link watcher. Available link watchers are 'ethtool', 'nsna_ping' and 'arp_ping' and it is specified in the dictionary with the key 'name'. Available keys are:   ethtool: 'delay-up', 'delay-down', 'init-wait'; nsna_ping: 'init-wait', 'interval', 'missed-max', 'target-host'; arp_ping: all the ones in nsna_ping and 'source-host', 'validate-active', 'validate-incative', 'send-always'. See teamd.conf man for more details.
+    link-watchersarray of vardict[]Link watchers configuration for the connection: each link watcher is defined by a dictionary, whose keys depend upon the selected link watcher. Available link watchers are 'ethtool', 'nsna_ping' and 'arp_ping' and it is specified in the dictionary with the key 'name'. Available keys are:   ethtool: 'delay-up', 'delay-down', 'init-wait'; nsna_ping: 'init-wait', 'interval', 'missed-max', 'target-host'; arp_ping: all the ones in nsna_ping and 'source-host', 'validate-active', 'validate-inactive', 'send-always'. See teamd.conf man for more details.prioint320Corresponds to the teamd ports.PORTIFNAME.prio.queue-idint32-1Corresponds to the teamd ports.PORTIFNAME.queue_id. When set to -1 means the parameter is skipped from the json config.stickybooleanFALSECorresponds to the teamd ports.PORTIFNAME.sticky.
@@ -425,12 +425,17 @@
     tosuint320Specifies the TOS value to use in outgoing packets.ttluint320Specifies the time-to-live value to use in outgoing packets.
+  wifi-p2p settingWi-Fi P2P Settings.Key NameValue TypeDefault ValueValue Description
+    peerstringThe P2P device that should be connected to. Currently this is the only way to create or join a group.
+    wfd-iesbyte arrayThe Wi-Fi Display (WFD) Information Elements (IEs) to set. Wi-Fi Display requires a protocol specific information element to be set in certain Wi-Fi frames. These can be specified here for the purpose of establishing a connection. This setting is only useful when implementing a Wi-Fi Display client.
+    wps-methoduint320Flags indicating which mode of WPS is to be used. There's little point in changing the default setting as NetworkManager will automatically determine the best method to use.
+  wimax settingWiMax Settings.Key NameValue TypeDefault ValueValue Descriptionmac-addressbyte arrayIf specified, this connection will only apply to the WiMAX device whose MAC address matches. This property does not change the MAC address of the device (known as MAC spoofing). Deprecated: 1network-namestringNetwork Service Provider (NSP) name of the WiMAX network this connection should use. Deprecated: 1802-3-ethernet settingWired Ethernet Settings.Key NameValue TypeDefault ValueValue Description
-    assigned-mac-addressstringThe new field for the cloned MAC address. It can be either a hardware address in ASCII representation, or one of the special values "preserve", "permanent", "random" or "stable". This field replaces the deprecated "cloned-mac-address" on D-Bus, which can only contain explict hardware addresses. Note that this property only exists in D-Bus API. libnm and nmcli continue to call this property "cloned-mac-address".
+    assigned-mac-addressstringThe new field for the cloned MAC address. It can be either a hardware address in ASCII representation, or one of the special values "preserve", "permanent", "random" or "stable". This field replaces the deprecated "cloned-mac-address" on D-Bus, which can only contain explicit hardware addresses. Note that this property only exists in D-Bus API. libnm and nmcli continue to call this property "cloned-mac-address".auto-negotiatebooleanFALSEWhen TRUE, enforce auto-negotiation of speed and duplex mode. If "speed" and "duplex" properties are both specified, only that single mode will be advertised and accepted during the link auto-negotiation process: this works only for BASE-T 802.3 specifications and is useful for enforcing gigabits modes, as in these cases link negotiation is mandatory. When FALSE, "speed" and "duplex" properties should be both set or link configuration will be skipped.cloned-mac-addressbyte arrayThis D-Bus field is deprecated in favor of "assigned-mac-address" which is more flexible and allows specifying special variants like "random". For libnm and nmcli, this field is called "cloned-mac-address".duplexstringWhen a value is set, either "half" or "full", configures the device to use the specified duplex mode. If "auto-negotiate" is "yes" the specified duplex mode will be the only one advertised during link negotiation: this works only for BASE-T 802.3 specifications and is useful for enforcing gigabits modes, as in these cases link negotiation is mandatory. If the value is unset (the default), the link configuration will be either skipped (if "auto-negotiate" is "no", the default) or will be auto-negotiated (if "auto-negotiate" is "yes") and the local device will advertise all the supported duplex modes. Must be set together with the "speed" property if specified. Before specifying a duplex mode be sure your device supports it.
@@ -446,8 +451,17 @@
     wake-on-lanuint321The NMSettingWiredWakeOnLan options to enable. Not all devices support all options. May be any combination of NM_SETTING_WIRED_WAKE_ON_LAN_PHY (0x2), NM_SETTING_WIRED_WAKE_ON_LAN_UNICAST (0x4), NM_SETTING_WIRED_WAKE_ON_LAN_MULTICAST (0x8), NM_SETTING_WIRED_WAKE_ON_LAN_BROADCAST (0x10), NM_SETTING_WIRED_WAKE_ON_LAN_ARP (0x20), NM_SETTING_WIRED_WAKE_ON_LAN_MAGIC (0x40) or the special values NM_SETTING_WIRED_WAKE_ON_LAN_DEFAULT (0x1) (to use global settings) and NM_SETTING_WIRED_WAKE_ON_LAN_IGNORE (0x8000) (to disable management of Wake-on-LAN in NetworkManager).wake-on-lan-passwordstringIf specified, the password used with magic-packet-based Wake-on-LAN, represented as an Ethernet MAC address.  If NULL, no password will be required.
+  wireguard settingWireGuard Ethernet Settings.Key NameValue TypeDefault ValueValue Description
+    fwmarkuint320The use of fwmark is optional and is by default off. Setting it to 0 disables it. Otherwise it is a 32-bit fwmark for outgoing packets.
+    listen-portuint320The listen-port. If listen-port is not specified, the port will be chosen randomly when the interface comes up.
+    mtuuint320If non-zero, only transmit packets of the specified size or smaller, breaking larger packets up into multiple fragments. If zero a default MTU is used. Note that contrary to wg-quick's MTU setting, this does not take into account the current routes at the time of activation.
+    peer-routesbooleanTRUEWhether to automatically add routes for the AllowedIPs ranges of the peers. If TRUE (the default), NetworkManager will automatically add routes in the routing tables according to ipv4.route-table and ipv6.route-table. If FALSE, no such routes are added automatically. In this case, the user may want to configure static routes in ipv4.routes and ipv6.routes, respectively.
+    peersarray of 'a{sv}'Array of dictionaries for the WireGuard peers.
+    private-keystringThe 256 bit private-key in base64 encoding.
+    private-key-flagsNMSettingSecretFlags (uint32)Flags indicating how to handle the "private-key" property. (see  for flag values)
+  802-11-wireless settingWi-Fi Settings.Key NameValue TypeDefault ValueValue Description
-    assigned-mac-addressstringThe new field for the cloned MAC address. It can be either a hardware address in ASCII representation, or one of the special values "preserve", "permanent", "random" or "stable". This field replaces the deprecated "cloned-mac-address" on D-Bus, which can only contain explict hardware addresses. Note that this property only exists in D-Bus API. libnm and nmcli continue to call this property "cloned-mac-address".
+    assigned-mac-addressstringThe new field for the cloned MAC address. It can be either a hardware address in ASCII representation, or one of the special values "preserve", "permanent", "random" or "stable". This field replaces the deprecated "cloned-mac-address" on D-Bus, which can only contain explicit hardware addresses. Note that this property only exists in D-Bus API. libnm and nmcli continue to call this property "cloned-mac-address".bandstring802.11 frequency band of the network.  One of "a" for 5GHz 802.11a or "bg" for 2.4GHz 802.11.  This will lock associations to the Wi-Fi network to the specific band, i.e. if "a" is specified, the device will not associate with the same network in the 2.4GHz band even if the network's settings are compatible.  This setting depends on specific driver capability and may not work with all drivers.bssidbyte arrayIf 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.channeluint320Wireless 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 "band" property to be set.
@@ -471,14 +485,14 @@
     auth-algstringWhen 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.filsint320Indicates 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.grouparray of string[]A list of group/broadcast encryption algorithms which prevents connections to Wi-Fi networks that do not utilize one of the algorithms in the list.  For maximum compatibility leave this property empty.  Each list element may be one of "wep40", "wep104", "tkip", or "ccmp".
-    key-mgmtstringKey management used for the connection.  One of "none" (WEP), "ieee8021x" (Dynamic WEP), "wpa-none" (Ad-Hoc WPA-PSK), "wpa-psk" (infrastructure WPA-PSK), or "wpa-eap" (WPA-Enterprise).  This property must be set for any Wi-Fi connection that uses security.
+    key-mgmtstringKey management used for the connection.  One of "none" (WEP), "ieee8021x" (Dynamic WEP), "wpa-none" (Ad-Hoc WPA-PSK), "wpa-psk" (infrastructure WPA-PSK), "sae" (SAE) or "wpa-eap" (WPA-Enterprise). This property must be set for any Wi-Fi connection that uses security.leap-passwordstringThe login password for legacy LEAP connections (ie, key-mgmt = "ieee8021x" and auth-alg = "leap").leap-password-flagsNMSettingSecretFlags (uint32)Flags indicating how to handle the "leap-password" property. (see  for flag values)leap-usernamestringThe login username for legacy LEAP connections (ie, key-mgmt = "ieee8021x" and auth-alg = "leap").pairwisearray of string[]A list of pairwise encryption algorithms which prevents connections to Wi-Fi networks that do not utilize one of the algorithms in the list. For maximum compatibility leave this property empty.  Each list element may be one of "tkip" or "ccmp".pmfint320Indicates whether Protected Management Frames (802.11w) must be enabled for the connection.  One of NM_SETTING_WIRELESS_SECURITY_PMF_DEFAULT (0) (use global default value), NM_SETTING_WIRELESS_SECURITY_PMF_DISABLE (1) (disable PMF), NM_SETTING_WIRELESS_SECURITY_PMF_OPTIONAL (2) (enable PMF if the supplicant and the access point support it) or NM_SETTING_WIRELESS_SECURITY_PMF_REQUIRED (3) (enable PMF and fail if not supported).  When set to NM_SETTING_WIRELESS_SECURITY_PMF_DEFAULT (0) and no global default is set, PMF will be optionally enabled.protoarray of string[]List of strings specifying the allowed WPA protocol versions to use. Each element may be one "wpa" (allow WPA) or "rsn" (allow WPA2/RSN).  If not specified, both WPA and RSN connections are allowed.
-    pskstringPre-Shared-Key for WPA networks.  If the key is 64-characters long, it must contain only hexadecimal characters and is interpreted as a hexadecimal WPA key.  Otherwise, the key must be between 8 and 63 ASCII characters (as specified in the 802.11i standard) and is interpreted as a WPA passphrase, and is hashed to derive the actual WPA-PSK used when connecting to the Wi-Fi network.
+    pskstringPre-Shared-Key for WPA networks. For WPA-PSK, it's either an ASCII passphrase of 8 to 63 characters that is (as specified in the 802.11i standard) hashed to derive the actual key, or the key in form of 64 hexadecimal character. The WPA3-Personal networks use a passphrase of any length for SAE authentication.psk-flagsNMSettingSecretFlags (uint32)Flags indicating how to handle the "psk" property. (see  for flag values)wep-key-flagsNMSettingSecretFlags (uint32)Flags indicating how to handle the "wep-key0", "wep-key1", "wep-key2", and "wep-key3" properties. (see  for flag values)wep-key-typeNMWepKeyType (uint32)Controls the interpretation of WEP keys.  Allowed values are NM_WEP_KEY_TYPE_KEY (1), in which case the key is either a 10- or 26-character hexadecimal string, or a 5- or 13-character ASCII password; or NM_WEP_KEY_TYPE_PASSPHRASE (2), in which case the passphrase is provided as a string and will be hashed using the de-facto MD5 method to derive the actual WEP key.
@@ -490,7 +504,9 @@
     wps-methoduint320Flags indicating which mode of WPS is to be used if any. There's little point in changing the default setting as NetworkManager will automatically determine whether it's feasible to start WPS enrollment from the Access Point capabilities. WPS can be disabled by setting this property to a value of 1.wpan settingIEEE 802.15.4 (WPAN) MAC Settings.Key NameValue TypeDefault ValueValue Description
+    channelint32-1IEEE 802.15.4 channel. A positive integer or -1, meaning "do not set, use whatever the device is already set to".mac-addressstringIf specified, this connection will only apply to the IEEE 802.15.4 (WPAN) MAC layer device whose permanent MAC address matches.
+    pageint32-1IEEE 802.15.4 channel page. A positive integer or -1, meaning "do not set, use whatever the device is already set to".pan-iduint3265535IEEE 802.15.4 Personal Area Network (PAN) identifier.short-addressuint3265535Short IEEE 802.15.4 address to be used within a restricted environment.
diff --git a/man/nmcli-examples.7 b/man/nmcli-examples.7
index 0bdbc359..202d3906 100644
--- a/man/nmcli-examples.7
+++ b/man/nmcli-examples.7
@@ -2,12 +2,12 @@
 .\"     Title: nmcli-examples
 .\"    Author: 
 .\" Generator: DocBook XSL Stylesheets vsnapshot 
-.\"      Date: 02/23/2019
+.\"      Date: 03/15/2019
 .\"    Manual: Examples
-.\"    Source: NetworkManager 1.14.6
+.\"    Source: NetworkManager 1.16.0
 .\"  Language: English
 .\"
-.TH "NMCLI\-EXAMPLES" "7" "" "NetworkManager 1\&.14\&.6" "Examples"
+.TH "NMCLI\-EXAMPLES" "7" "" "NetworkManager 1\&.16\&.0" "Examples"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -200,7 +200,25 @@ The first command makes NetworkManager log in DEBUG level, and only for CORE, ET
 \fBNetworkManager.conf\fR(5)
 manual page for available logging levels and domains\&.
 .PP
-\fBExample\ \&6.\ \&Adding a bonding master and two slave connection profiles\fR
+\fBExample\ \&6.\ \&Activating a VPN connection profile requiring interactive password input\fR
+.sp
+.if n \{\
+.RS 4
+.\}
+.nf
+$ \fBnmcli \-\-ask con up my\-vpn\-con\fR
+.fi
+.if n \{\
+.RE
+.\}
+.PP
+This command activates a VPN connection profile enabling nmcli to interact with the user (\*(Aq\-\-ask\*(Aq): this will allow nmcli to prompt for the VPN password on the command line when the
+\fIpassword\-flags\fR
+are set to \*(Aq0x02\*(Aq (\*(Aqalways ask\*(Aq, see
+\fBnm-settings\fR(5)
+)\&. This is particularly useful for OTP based VPNs, as the user needs to be prompted for the password each time the connection is activated\&.
+.PP
+\fBExample\ \&7.\ \&Adding a bonding master and two slave connection profiles\fR
 .sp
 .if n \{\
 .RS 4
@@ -224,7 +242,7 @@ mode\&. The next two commands add slaves connections, both enslaved to
 interface, the second to
 \fIeth2\fR\&.
 .PP
-\fBExample\ \&7.\ \&Adding a team master and two slave connection profiles\fR
+\fBExample\ \&8.\ \&Adding a team master and two slave connection profiles\fR
 .sp
 .if n \{\
 .RS 4
@@ -266,7 +284,7 @@ will use its default configuration\&. You will activate the whole setup by activ
 .sp
 By default, the created profiles are marked for auto\-activation\&. But if another connection has been activated on the device, the new profile won\*(Aqt activate automatically and you need to activate it manually\&.
 .PP
-\fBExample\ \&8.\ \&Adding a bridge and two slave profiles\fR
+\fBExample\ \&9.\ \&Adding a bridge and two slave profiles\fR
 .sp
 .if n \{\
 .RS 4
@@ -288,7 +306,7 @@ This example demonstrates adding a bridge master connection and two slaves\&. Th
 interface, the second to
 \fIens4\fR\&. The last command will disable 802\&.1D STP for the TowerBridge profile\&.
 .PP
-\fBExample\ \&9.\ \&Adding an ethernet connection profile with manual IP configuration\fR
+\fBExample\ \&10.\ \&Adding an ethernet connection profile with manual IP configuration\fR
 .sp
 .if n \{\
 .RS 4
@@ -312,7 +330,7 @@ that is bound to interface name
 \fIcon show\fR
 command displays the profile so that all parameters can be reviewed\&.
 .PP
-\fBExample\ \&10.\ \&Convenient field values retrieval for scripting\fR
+\fBExample\ \&11.\ \&Convenient field values retrieval for scripting\fR
 .sp
 .if n \{\
 .RS 4
@@ -352,7 +370,7 @@ This example shows retrieval of ip4 connection field values via the \-\-get\-val
 \fBnmcli\fR(1)
 manual page for more customized output\&.
 .PP
-\fBExample\ \&11.\ \&Adding an Ethernet connection and configuring SR\-IOV VFs\fR
+\fBExample\ \&12.\ \&Adding an Ethernet connection and configuring SR\-IOV VFs\fR
 .sp
 .if n \{\
 .RS 4
@@ -375,7 +393,7 @@ and
 \fIspoof\-check\fR
 features respectively enabled and disabled\&. VF number 2 has a maximux transmission rate of 20Mbps\&. The kernel is instructed to not automatically instantiate a network interface for the VFs\&.
 .PP
-\fBExample\ \&12.\ \&Escaping colon characters in tabular mode\fR
+\fBExample\ \&13.\ \&Escaping colon characters in tabular mode\fR
 .sp
 .if n \{\
 .RS 4
@@ -394,7 +412,7 @@ nager/ActiveConnection/9
 .PP
 This example shows escaping colon characters in tabular mode\&. It may be useful for script processing, because \*(Aq:\*(Aq is used as a field separator\&.
 .PP
-\fBExample\ \&13.\ \&nmcli usage in a NetworkManager dispatcher script to make Ethernet and Wi\-Fi mutually exclusive\fR
+\fBExample\ \&14.\ \&nmcli usage in a NetworkManager dispatcher script to make Ethernet and Wi\-Fi mutually exclusive\fR
 .sp
 .if n \{\
 .RS 4
@@ -432,7 +450,7 @@ manual page for more information about NetworkManager dispatcher scripts\&.
 .PP
 \fBExample sessions of interactive connection editor\fR
 .PP
-\fBExample\ \&14.\ \&Adding an ethernet connection profile in interactive editor (a)\fR
+\fBExample\ \&15.\ \&Adding an ethernet connection profile in interactive editor (a)\fR
 .sp
 .if n \{\
 .RS 4
diff --git a/man/nmcli-examples.xml b/man/nmcli-examples.xml
index 8be3903a..e777c326 100644
--- a/man/nmcli-examples.xml
+++ b/man/nmcli-examples.xml
@@ -178,6 +178,19 @@ B,DISPATCH
       
     
 
+    Activating a VPN connection profile requiring interactive password input
+$ nmcli --ask con up my-vpn-con
+      
+        This command activates a VPN connection profile enabling nmcli to interact with the user
+        ('--ask'): this will allow nmcli to prompt for the VPN password on the command line when
+        the password-flags are set to '0x02' ('always ask', see
+        nm-settings5
+        ).
+        This is particularly useful for OTP based VPNs, as the user needs to be prompted for the
+        password each time the connection is activated.
+      
+    
+
     Adding a bonding master and two slave connection profiles
 $ nmcli con add type bond ifname mybond0 mode active-backup
 $ nmcli con add type ethernet ifname eth1 master mybond0
diff --git a/man/nmcli.1 b/man/nmcli.1
index 00ab979b..e16e5c16 100644
--- a/man/nmcli.1
+++ b/man/nmcli.1
@@ -2,12 +2,12 @@
 .\"     Title: nmcli
 .\"    Author: 
 .\" Generator: DocBook XSL Stylesheets vsnapshot 
-.\"      Date: 02/23/2019
+.\"      Date: 03/15/2019
 .\"    Manual: General Commands Manual
-.\"    Source: NetworkManager 1.14.6
+.\"    Source: NetworkManager 1.16.0
 .\"  Language: English
 .\"
-.TH "NMCLI" "1" "" "NetworkManager 1\&.14\&.6" "General Commands Manual"
+.TH "NMCLI" "1" "" "NetworkManager 1\&.16\&.0" "General Commands Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -39,7 +39,9 @@ is a command\-line tool for controlling NetworkManager and reporting network sta
 \fBnm\-applet\fR
 or other graphical clients\&.
 \fBnmcli\fR
-is used to create, display, edit, delete, activate, and deactivate network connections, as well as control and display network device status\&.
+is used to create, display, edit, delete, activate, and deactivate network connections, as well as control and display network device status\&. See
+\fBnmcli-examples\fR(7)
+for ready to run nmcli examples\&.
 .PP
 Typical uses include:
 .sp
@@ -74,16 +76,83 @@ can be used to control NetworkManager without a GUI, including creating, editing
 .RE
 .SH "OPTIONS"
 .PP
-\fB\-t\fR | \fB\-\-terse\fR
+\fB\-a\fR | \fB\-\-ask\fR
 .RS 4
-Output is terse\&. This mode is designed and suitable for computer (script) processing\&.
+When using this option
+\fBnmcli\fR
+will stop and ask for any missing required arguments, so do not use this option for non\-interactive purposes like scripts\&. This option controls, for example, whether you will be prompted for a password if it is required for connecting to a network\&.
 .RE
 .PP
-\fB\-p\fR | \fB\-\-pretty\fR
+\fB\-c\fR | \fB\-\-colors\fR {yes | no | auto}
 .RS 4
-Output is pretty\&. This causes
+This option controls color output (using terminal escape sequences)\&.
+yes
+enables colors,
+no
+disables them,
+auto
+only produces colors when standard output is directed to a terminal\&. The default value is
+auto\&.
+.sp
+The actual colors used are configured as described in
+\fBterminal-colors.d\fR(5)\&. Please refer to the
+COLORS
+section for a list of color names supported by
+\fBnmcli\fR\&.
+.RE
+.PP
+\fB\-\-complete\-args\fR
+.RS 4
+Instead of conducting the desired action,
 \fBnmcli\fR
-to produce easily readable outputs for humans, i\&.e\&. values are aligned, headers are printed, etc\&.
+will list possible completions for the last argument\&. This is useful to implement argument completion in shell\&.
+.sp
+The
+exit status
+will indicate success or return a code 65 to indicate the last argument is a file name\&.
+.sp
+NetworkManager ships with command completion support for GNU Bash\&.
+.RE
+.PP
+\fB\-e\fR | \fB\-\-escape\fR {yes | no}
+.RS 4
+Whether to escape
+:
+and
+\e
+characters in terse tabular mode\&. The escape character is
+\e\&.
+.sp
+If omitted, default is
+yes\&.
+.RE
+.PP
+\fB\-f\fR | \fB\-\-fields\fR {\fIfield1\fR,\fIfield2\fR... | all | common}
+.RS 4
+This option is used to specify what fields (column names) should be printed\&. Valid field names differ for specific commands\&. List available fields by providing an invalid value to the
+\fB\-\-fields\fR
+option\&.
+all
+is used to print all valid field values of the command\&.
+common
+is used to print common field values of the command\&.
+.sp
+If omitted, default is
+common\&.
+.RE
+.PP
+\fB\-g\fR | \fB\-\-get\-values\fR {\fIfield1\fR,\fIfield2\fR... | all | common}
+.RS 4
+This option is used to print values from specific fields\&. It is basically a shortcut for
+\-\-mode tabular \-\-terse \-\-fields
+and is a convenient way to retrieve values for particular fields\&. The values are printed one per line without headers\&.
+.sp
+If a section is specified instead of a field, the section name will be printed followed by colon separated values of the fields belonging to that section, all on the same line\&.
+.RE
+.PP
+\fB\-h\fR | \fB\-\-help\fR
+.RS 4
+Print help information\&.
 .RE
 .PP
 \fB\-m\fR | \fB\-\-mode\fR {tabular | multiline}
@@ -128,72 +197,30 @@ nmcli device show
 .RE
 .RE
 .PP
-\fB\-c\fR | \fB\-\-colors\fR {yes | no | auto}
-.RS 4
-This option controls color output (using terminal escape sequences)\&.
-yes
-enables colors,
-no
-disables them,
-auto
-only produces colors when standard output is directed to a terminal\&. The default value is
-auto\&.
-.sp
-The actual colors used are configured as described in
-\fBterminal-colors.d\fR(5)\&. Please refer to the
-COLORS
-section for a list of color names supported by
-\fBnmcli\fR\&.
-.RE
-.PP
-\fB\-f\fR | \fB\-\-fields\fR {\fIfield1\fR,\fIfield2\fR... | all | common}
-.RS 4
-This option is used to specify what fields (column names) should be printed\&. Valid field names differ for specific commands\&. List available fields by providing an invalid value to the
-\fB\-\-fields\fR
-option\&.
-all
-is used to print all valid field values of the command\&.
-common
-is used to print common field values of the command\&.
-.sp
-If omitted, default is
-common\&.
-.RE
-.PP
-\fB\-g\fR | \fB\-\-get\-values\fR {\fIfield1\fR,\fIfield2\fR... | all | common}
+\fB\-p\fR | \fB\-\-pretty\fR
 .RS 4
-This option is used to print values from specific fields\&. It is basically a shortcut for
-\-\-mode tabular \-\-terse \-\-fields
-and is a convenient way to retrieve values for particular fields\&. The values are printed one per line without headers\&.
-.sp
-If a section is specified instead of a field, the section name will be printed followed by colon separated values of the fields belonging to that section, all on the same line\&.
+Output is pretty\&. This causes
+\fBnmcli\fR
+to produce easily readable outputs for humans, i\&.e\&. values are aligned, headers are printed, etc\&.
 .RE
 .PP
-\fB\-e\fR | \fB\-\-escape\fR {yes | no}
+\fB\-s\fR | \fB\-\-show\-secrets\fR
 .RS 4
-Whether to escape
-:
-and
-\e
-characters in terse tabular mode\&. The escape character is
-\e\&.
-.sp
-If omitted, default is
-yes\&.
+When using this option
+\fBnmcli\fR
+will display passwords and secrets that might be present in an output of an operation\&. This option also influences echoing passwords typed by user as an input\&.
 .RE
 .PP
-\fB\-a\fR | \fB\-\-ask\fR
+\fB\-t\fR | \fB\-\-terse\fR
 .RS 4
-When using this option
-\fBnmcli\fR
-will stop and ask for any missing required arguments, so do not use this option for non\-interactive purposes like scripts\&. This option controls, for example, whether you will be prompted for a password if it is required for connecting to a network\&.
+Output is terse\&. This mode is designed and suitable for computer (script) processing\&.
 .RE
 .PP
-\fB\-s\fR | \fB\-\-show\-secrets\fR
+\fB\-v\fR | \fB\-\-version\fR
 .RS 4
-When using this option
+Show
 \fBnmcli\fR
-will display passwords and secrets that might be present in an output of an operation\&. This option also influences echoing passwords typed by user as an input\&.
+version\&.
 .RE
 .PP
 \fB\-w\fR | \fB\-\-wait\fR \fIseconds\fR
@@ -208,31 +235,6 @@ instructs
 \fBnmcli\fR
 not to wait but to exit immediately with a status of success\&. The default value depends on the executed command\&.
 .RE
-.PP
-\fB\-\-complete\-args\fR
-.RS 4
-Instead of conducting the desired action,
-\fBnmcli\fR
-will list possible completions for the last argument\&. This is useful to implement argument completion in shell\&.
-.sp
-The
-exit status
-will indicate success or return a code 65 to indicate the last argument is a file name\&.
-.sp
-NetworkManager ships with command completion support for GNU Bash\&.
-.RE
-.PP
-\fB\-v\fR | \fB\-\-version\fR
-.RS 4
-Show
-\fBnmcli\fR
-version\&.
-.RE
-.PP
-\fB\-h\fR | \fB\-\-help\fR
-.RS 4
-Print help information\&.
-.RE
 .SH "GENERAL COMMANDS"
 .HP \w'\fBnmcli\ general\fR\ 'u
 \fBnmcli general\fR {\fBstatus\fR | \fBhostname\fR | \fBpermissions\fR | \fBlogging\fR} [\fIARGUMENTS\fR...]
@@ -558,7 +560,7 @@ was not passed, NetworkManager can ask another secret agent that may be running
 .RS 4
 Deactivate a connection from a device without preventing the device from further auto\-activation\&. Multiple connections can be passed to the command\&.
 .sp
-Be aware that this command deactivates the specified active connection, but the device on which the connection was active, is still ready to connect and will perform auto\-activation by looking for a suitable connection that has the \*(Aqautoconnect\*(Aq flag set\&. This includes the just deactivated connection\&. So if the connection is set to auto\-connect, it will be automatically started on the disconnected device again\&.
+Be aware that this command deactivates the specified active connection, but the device on which the connection was active, is still ready to connect and will perform auto\-activation by looking for a suitable connection that has the \*(Aqautoconnect\*(Aq flag set\&. Note that the deactivating connection profile is internally blocked from autoconnecting again\&. Hence it will not autoconnect until reboot or until the user performs an action that unblocks autoconnect, like modifying the profile or explicitly activating it\&.
 .sp
 In most cases you may want to use
 \fBdevice disconnect\fR
@@ -1162,8 +1164,8 @@ can be used to either force or disable the scan regardless of how fresh the acce
 .PP
 \fBwifi\fR \fBconnect\fR \fI(B)SSID\fR [\fBpassword\fR\ \fIpassword\fR] [\fBwep\-key\-type\fR\ {key\ |\ phrase}] [\fBifname\fR\ \fIifname\fR] [\fBbssid\fR\ \fIBSSID\fR] [\fBname\fR\ \fIname\fR] [\fBprivate\fR\ {yes\ |\ no}] [\fBhidden\fR\ {yes\ |\ no}]
 .RS 4
-Connect to a Wi\-Fi network specified by SSID or BSSID\&. The command creates a new connection and then activates it on a device\&. This is a command\-line counterpart of clicking an SSID in a GUI client\&. The command always creates a new connection and thus it is mainly useful for connecting to new Wi\-Fi networks\&. If a connection for the network already exists, it is better to bring up (activate) the existing connection as follows:
-\fBnmcli con up id \fR\fB\fIname\fR\fR\&. Note that only open, WEP and WPA\-PSK networks are supported at the moment\&. It is also supposed that IP configuration is obtained via DHCP\&.
+Connect to a Wi\-Fi network specified by SSID or BSSID\&. The command finds a matching connection or creates one and then activates it on a device\&. This is a command\-line counterpart of clicking an SSID in a GUI client\&. If a connection for the network already exists, it is possible to bring up (activate) the existing profile as follows:
+\fBnmcli con up id \fR\fB\fIname\fR\fR\&. Note that only open, WEP and WPA\-PSK networks are supported if no previous connection exists\&. It is also assumed that IP configuration is obtained via DHCP\&.
 .sp
 If
 \fB\-\-wait\fR
@@ -2818,9 +2820,9 @@ shows all connection profile names and their auto\-connect property\&.
 shows details for "My default em1" connection profile\&.
 .RE
 .PP
-\fBnmcli \-\-show\-secrets connection show "My Home WiFi"\fR
+\fBnmcli \-\-show\-secrets connection show "My Home Wi\-Fi"\fR
 .RS 4
-shows details for "My Home WiFi" connection profile with all passwords\&. Without
+shows details for "My Home Wi\-Fi" connection profile with all passwords\&. Without
 \fB\-\-show\-secrets\fR
 option, secrets would not be displayed\&.
 .RE
diff --git a/man/nmcli.xml b/man/nmcli.xml
index 2a0765d0..3f123a57 100644
--- a/man/nmcli.xml
+++ b/man/nmcli.xml
@@ -68,7 +68,9 @@
     replacement for nm-applet or other graphical clients.
     nmcli is used to create, display, edit, delete, activate,
     and deactivate network connections, as well as control and display network
-    device status.
+    device status. See
+    nmcli-examples7
+    for ready to run nmcli examples.
 
     Typical uses include:
     
@@ -95,98 +97,73 @@
 
       
         
-          
-          
+          
+          
         
 
         
-          Output is terse. This mode is designed and suitable for computer (script)
-          processing.
+          When using this option nmcli will stop and ask for any
+          missing required arguments, so do not use this option for non-interactive
+          purposes like scripts. This option controls, for example, whether you will be
+          prompted for a password if it is required for connecting to a network.
         
       
 
       
         
-          
-          
+          
+          
+          
+            yes
+            no
+            auto
+          
         
 
         
-          Output is pretty. This causes nmcli to produce easily
-          readable outputs for humans, i.e. values are aligned, headers are printed,
-          etc.
+          This option controls color output (using terminal escape sequences).
+          yes enables colors, no disables them,
+          auto only produces colors when standard output is directed
+          to a terminal. The default value is auto.
+          The actual colors used are configured as described in
+          terminal-colors.d5.
+          Please refer to the  section for a
+          list of color names supported by nmcli.
         
       
 
       
         
-          
-          
-          
-            tabular
-            multiline
-          
+          
         
 
         
-          Switch between tabular and multiline output:
-
-          
-            
-              tabular
-              
-                Output is a table where each line describes a single entry.
-                Columns define particular properties of the entry.
-              
-            
-
-            
-              multiline
-              
-                Each entry comprises multiple lines, each property on its
-                own line. The values are prefixed with the property name.
-              
-            
-          
-
-          If omitted, default is tabular for most commands.
-          For the commands producing more structured information, that cannot be
-          displayed on a single line, default is multiline.
-          Currently, they are:
-
-          
-            
-              nmcli connection show ID
-            
+          Instead of conducting the desired action, nmcli
+          will list possible completions for the last argument. This is useful to implement
+          argument completion in shell.
 
-            
-              nmcli device show
-            
-          
+          The exit status will indicate success
+          or return a code 65 to indicate the last argument is a file name.
 
+          NetworkManager ships with command completion support for GNU Bash.
         
       
 
       
         
-          
-          
+          
+          
           
             yes
             no
-            auto
           
         
 
         
-          This option controls color output (using terminal escape sequences).
-          yes enables colors, no disables them,
-          auto only produces colors when standard output is directed
-          to a terminal. The default value is auto.
-          The actual colors used are configured as described in
-          terminal-colors.d5.
-          Please refer to the  section for a
-          list of color names supported by nmcli.
+          Whether to escape : and \ characters in terse tabular mode. The
+          escape character is \.
+
+          If omitted, default is yes.
         
       
 
@@ -238,33 +215,74 @@
 
       
         
-          
-          
+          
+          
+        
+
+        
+          Print help information.
+        
+      
+
+      
+        
+          
+          
           
-            yes
-            no
+            tabular
+            multiline
           
         
 
         
-          Whether to escape : and \ characters in terse tabular mode. The
-          escape character is \.
+          Switch between tabular and multiline output:
+
+          
+            
+              tabular
+              
+                Output is a table where each line describes a single entry.
+                Columns define particular properties of the entry.
+              
+            
+
+            
+              multiline
+              
+                Each entry comprises multiple lines, each property on its
+                own line. The values are prefixed with the property name.
+              
+            
+          
+
+          If omitted, default is tabular for most commands.
+          For the commands producing more structured information, that cannot be
+          displayed on a single line, default is multiline.
+          Currently, they are:
+
+          
+            
+              nmcli connection show ID
+            
+
+            
+              nmcli device show
+            
+          
 
-          If omitted, default is yes.
         
       
 
       
         
-          
-          
+          
+          
         
 
         
-          When using this option nmcli will stop and ask for any
-          missing required arguments, so do not use this option for non-interactive
-          purposes like scripts. This option controls, for example, whether you will be
-          prompted for a password if it is required for connecting to a network.
+          Output is pretty. This causes nmcli to produce easily
+          readable outputs for humans, i.e. values are aligned, headers are printed,
+          etc.
         
       
 
@@ -283,37 +301,13 @@
 
       
         
-          
-          
-          seconds
-        
-
-        
-          This option sets a timeout period for which nmcli will
-          wait for NetworkManager to finish operations. It is
-          especially useful for commands that may take a longer time to complete, e.g.
-          connection activation.
-
-          Specifying a value of 0 instructs
-          nmcli not to wait but to exit immediately with a status of
-          success. The default value depends on the executed command.
-        
-      
-
-      
-        
-          
+          
+          
         
 
         
-          Instead of conducting the desired action, nmcli
-          will list possible completions for the last argument. This is useful to implement
-          argument completion in shell.
-
-          The exit status will indicate success
-          or return a code 65 to indicate the last argument is a file name.
-
-          NetworkManager ships with command completion support for GNU Bash.
+          Output is terse. This mode is designed and suitable for computer (script)
+          processing.
         
       
 
@@ -330,12 +324,20 @@
 
       
         
-          
-          
-        
+          
+          
+          seconds
+        
 
         
-          Print help information.
+          This option sets a timeout period for which nmcli will
+          wait for NetworkManager to finish operations. It is
+          especially useful for commands that may take a longer time to complete, e.g.
+          connection activation.
+
+          Specifying a value of 0 instructs
+          nmcli not to wait but to exit immediately with a status of
+          success. The default value depends on the executed command.
         
       
 
@@ -831,9 +833,10 @@
           Be aware that this command deactivates the specified active connection,
           but the device on which the connection was active, is still ready to connect
           and will perform auto-activation by looking for a suitable connection that has
-          the 'autoconnect' flag set. This includes the just deactivated connection. So
-          if the connection is set to auto-connect, it will be automatically started on
-          the disconnected device again.
+          the 'autoconnect' flag set. Note that the deactivating connection profile is
+          internally blocked from autoconnecting again. Hence it will not autoconnect
+          until reboot or until the user performs an action that unblocks autoconnect,
+          like modifying the profile or explicitly activating it.
 
           In most cases you may want to use device disconnect
           command instead.
@@ -1442,14 +1445,13 @@
 
         
           Connect to a Wi-Fi network specified by SSID or BSSID. The command
-          creates a new connection and then activates it on a device. This is a
-          command-line counterpart of clicking an SSID in a GUI client. The command
-          always creates a new connection and thus it is mainly useful for connecting to
-          new Wi-Fi networks. If a connection for the network already exists, it is
-          better to bring up (activate) the existing connection as follows:
+          finds a matching connection or creates one and then activates it on a device.
+          This is a command-line counterpart of clicking an SSID in a GUI client. If
+          a connection for the network already exists, it is possible to bring up
+          (activate) the existing profile as follows:
           nmcli con up id name. Note that
-          only open, WEP and WPA-PSK networks are supported at the moment. It is also
-          supposed that IP configuration is obtained via DHCP.
+          only open, WEP and WPA-PSK networks are supported if no previous connection
+          exists. It is also assumed that IP configuration is obtained via DHCP.
 
           If  option is not specified, the default timeout will be 90
           seconds.
@@ -2537,9 +2539,9 @@ It's equivalent to the +bond.options 'option=value' syntax.
 
       
-        nmcli --show-secrets connection show "My Home WiFi"
+        nmcli --show-secrets connection show "My Home Wi-Fi"
         
-          shows details for "My Home WiFi" connection profile with all passwords.
+          shows details for "My Home Wi-Fi" connection profile with all passwords.
           Without  option, secrets would not be
           displayed.
         
diff --git a/man/nmtui.1 b/man/nmtui.1
index f87bc088..a5e9d072 100644
--- a/man/nmtui.1
+++ b/man/nmtui.1
@@ -2,12 +2,12 @@
 .\"     Title: nmtui
 .\"    Author: 
 .\" Generator: DocBook XSL Stylesheets vsnapshot 
-.\"      Date: 02/23/2019
+.\"      Date: 03/15/2019
 .\"    Manual: General Commands Manual
-.\"    Source: NetworkManager 1.14.6
+.\"    Source: NetworkManager 1.16.0
 .\"  Language: English
 .\"
-.TH "NMTUI" "1" "" "NetworkManager 1\&.14\&.6" "General Commands Manual"
+.TH "NMTUI" "1" "" "NetworkManager 1\&.16\&.0" "General Commands Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/meson.build b/meson.build
index 7627c2a9..49818791 100644
--- a/meson.build
+++ b/meson.build
@@ -4,13 +4,13 @@ project(
 #  - add corresponding NM_VERSION_x_y_z macros in
 #    "shared/nm-version-macros.h.in"
 #  - update number in configure.ac
-  version: '1.14.6',
+  version: '1.16.0',
   license: 'GPL2+',
   default_options: [
     'buildtype=debugoptimized',
-    'c_std=gnu99'
+    'c_std=gnu11',
   ],
-  meson_version: '>= 0.44.0'
+  meson_version: '>= 0.44.0',
 )
 
 nm_name = meson.project_name()
@@ -95,9 +95,11 @@ config_h = configuration_data()
 set_defines = [
   ['GETTEXT_PACKAGE', nm_name],
   ['PACKAGE_STRING', '@0@ @1@'.format(nm_name, nm_version)],
-  ['VERSION', nm_version]
+  ['VERSION', nm_version],
 ]
 
+default_test_timeout = 90
+
 foreach define: set_defines
   config_h.set_quoted(define[0], define[1])
 endforeach
@@ -115,6 +117,7 @@ config_h.set('HAVE_SECURE_GETENV', cc.has_function('secure_getenv'))
 config_h.set('HAVE___SECURE_GETENV', cc.has_function('__secure_getenv'))
 config_h.set10('HAVE_DECL_REALLOCARRAY', cc.has_function('reallocarray', prefix: '#include '))
 config_h.set10('HAVE_DECL_EXPLICIT_BZERO', cc.has_function('explicit_bzero', prefix: '#include '))
+config_h.set10('HAVE_DECL_MEMFD_CREATE', cc.has_function('memfd_create', prefix: '#include '))
 
 # types
 config_h.set('SIZEOF_DEV_T', cc.sizeof('dev_t', prefix: '#include '))
@@ -146,9 +149,17 @@ if enable_ld_gc
   common_ldflags += test_ldflags
 endif
 
+enable_lto = get_option('b_lto')
+if enable_lto
+  # meson already adds '-flto'
+  lto_flag = '-flto-partition=none'
+  assert(cc.has_argument(lto_flag), '-flto-partition=none not supported. Disable link-time optimization with -Db_lto=false.')
+  common_flags += lto_flag
+  common_ldflags += lto_flag
+endif
+
 if nm_debug
-  test_cflags = [
-    '-fno-strict-aliasing',
+  common_flags += cc.get_supported_arguments([
     '-Wdeclaration-after-statement',
     '-Wfloat-equal',
     '-Wimplicit-fallthrough',
@@ -159,7 +170,7 @@ if nm_debug
     '-Wmissing-prototypes',
     '-Wno-duplicate-decl-specifier',
     '-Wno-format-truncation',
-    '-Wno-missing-braces',
+    '-Wno-gnu-variable-sized-type-not-at-end',
     '-Wno-missing-field-initializers',
     '-Wno-pragmas',
     '-Wno-sign-compare',
@@ -170,10 +181,9 @@ if nm_debug
     '-Wstrict-prototypes',
     '-Wtypedef-redefinition',
     '-Wundef',
-    '-Wunknown-attributes'
-  ]
-
-  common_flags += cc.get_supported_arguments(test_cflags)
+    '-Wunknown-attributes',
+    '-fno-strict-aliasing',
+  ])
 endif
 
 add_project_arguments(common_flags, language: 'c')
@@ -222,11 +232,11 @@ gio_unix_dep = dependency('gio-unix-2.0', version: '>= 2.40')
 glib_dep = declare_dependency(
   dependencies: [
     gio_unix_dep,
-    dependency('gmodule-2.0')
+    dependency('gmodule-2.0'),
   ],
   compile_args: [
     '-DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_40',
-    '-DGLIB_VERSION_MAX_ALLOWED=GLIB_VERSION_2_40'
+    '-DGLIB_VERSION_MAX_ALLOWED=GLIB_VERSION_2_40',
   ]
 )
 
@@ -366,6 +376,8 @@ elif session_tracking == 'elogind'
   config_h.set10('SESSION_TRACKING_SYSTEMD', false)
   config_h.set10('SESSION_TRACKING_ELOGIND', true)
 else
+  config_h.set10('SESSION_TRACKING_SYSTEMD', false)
+  config_h.set10('SESSION_TRACKING_ELOGIND', false)
   logind_dep = dependency('', required:false)
 endif
 
@@ -423,12 +435,24 @@ if enable_selinux
 endif
 config_h.set10('HAVE_SELINUX', enable_selinux)
 
+# eBPF support
+ebpf_opt = get_option('ebpf')
+if ebpf_opt == 'false'
+  enable_ebpf = false
+else
+  enable_ebpf = true
+  if not cc.has_header('linux/bpf.h')
+    assert(ebpf_opt != 'true', 'eBPF requires kernel support')
+    enable_ebpf = false
+  endif
+endif
+
 # libaudit support
 libaudit = get_option('libaudit')
 enable_libaudit = libaudit.contains('yes')
 if enable_libaudit
   libaudit_dep = dependency('audit', required: false)
-  assert(libaudit_dep.found(), 'You must have libaudit installed to build. Use -Dlibaudit=false to disable it')
+  assert(libaudit_dep.found(), 'You must have libaudit installed to build. Use -Dlibaudit=no to disable it')
 endif
 config_default_logging_audit = (libaudit == 'yes').to_string()
 config_h.set_quoted('NM_CONFIG_DEFAULT_LOGGING_AUDIT', config_default_logging_audit)
@@ -449,17 +473,13 @@ endif
 config_h.set10('WITH_JSON_VALIDATION', enable_json_validation)
 
 # polkit
-polkit = get_option('polkit')
-enable_polkit = (polkit != 'no')
-
+enable_polkit = get_option('polkit')
 if enable_polkit
-  polkit_dir = get_option('polkit_dir')
-  if polkit_dir == ''
-    polkit_dir = dependency('polkit-gobject-1').get_pkgconfig_variable('policydir')
-  endif
+  # FIXME: policydir should be relative to `datadir`, not `prefix`. Fixed in https://gitlab.freedesktop.org/polkit/polkit/merge_requests/2
+  polkit_dir = dependency('polkit-gobject-1').get_pkgconfig_variable('policydir', define_variable: ['prefix', nm_prefix])
 endif
 
-config_default_main_auth_polkit = (polkit == 'yes').to_string()
+config_default_main_auth_polkit = enable_polkit.to_string()
 config_h.set_quoted('NM_CONFIG_DEFAULT_MAIN_AUTH_POLKIT', config_default_main_auth_polkit)
 
 enable_modify_system = get_option('modify_system')
@@ -488,17 +508,8 @@ if dbus_conf_dir == ''
   dbus_conf_dir = join_paths(dbus_dep.get_pkgconfig_variable('sysconfdir'), 'dbus-1', 'system.d')
 endif
 
-dbus_ifaces_dir = get_option('dbus_ifaces_dir')
-if dbus_ifaces_dir == ''
-  assert(dbus_dep.found(), 'D-Bus required but not found, please provide a valid interfaces dir')
-  dbus_ifaces_dir = dbus_dep.get_pkgconfig_variable('interfaces_dir')
-endif
-
-dbus_sys_dir = get_option('dbus_sys_dir')
-if dbus_sys_dir == ''
-  assert(dbus_dep.found(), 'D-Bus required but not found, please provide a valid system bus services dir')
-  dbus_sys_dir = dbus_dep.get_pkgconfig_variable('system_bus_services_dir')
-endif
+dbus_ifaces_dir = dbus_dep.get_pkgconfig_variable('interfaces_dir',  define_variable: ['datadir', nm_datadir])
+dbus_sys_dir = dbus_dep.get_pkgconfig_variable('system_bus_services_dir', define_variable: ['datadir', nm_datadir])
 
 # pppd
 enable_ppp = get_option('ppp')
@@ -573,10 +584,10 @@ foreach client : [ 'dhclient', 'dhcpcd', 'dhcpcanon' ]
   dhcp_summary += '\n'
 endforeach
 
-# OpenVSwitch integration
+# Open vSwitch integration
 enable_ovs = get_option('ovs')
 if enable_ovs
-  assert(jansson_dep.found(), 'jansson is needed for OpenVSwitch integration. Use -Dovs=false to disable it')
+  assert(jansson_dep.found(), 'jansson is needed for Open vSwitch integration. Use -Dovs=false to disable it')
 endif
 
 # DNS resolv.conf managers
@@ -761,7 +772,7 @@ test_args = [
   '',
   enable_valgrind ? valgrind.path() : '',
   enable_valgrind ? valgrind_suppressions_path : '',
-  '--launch-dbus=auto'
+  '--launch-dbus=auto',
 ]
 
 py3 = import('python3')
@@ -877,7 +888,7 @@ config = 'config.h'
 configure_file(
   input: config + '.meson',
   output: config,
-  configuration: config_h
+  configuration: config_h,
 )
 
 config_extra_h = configuration_data()
@@ -907,7 +918,7 @@ config_extra_h.set_quoted('SYSCONFDIR',        nm_sysconfdir)
 configure_file(
   input: 'config-extra.h.meson',
   output: 'config-extra.h',
-  configuration: config_extra_h
+  configuration: config_extra_h,
 )
 
 meson.add_install_script(
@@ -918,7 +929,7 @@ meson.add_install_script(
   nm_pkglibdir,
   nm_pkgstatedir,
   enable_docs ? 'install_docs' : '',
-  nm_mandir
+  nm_mandir,
 )
 
 output = '\nSystem paths:\n'
@@ -939,7 +950,7 @@ output += '  suspend/resume: ' + suspend_resume + '\n'
 output += '  policykit: ' + enable_polkit.to_string()
 if enable_polkit
   modify = (enable_modify_system ? 'permissive' : 'restrictive')
-  output += ' (' + modify + ' modify.system) (default: main.auth-polkit=' + polkit + ')'
+  output += ' (' + modify + ' modify.system) (default: main.auth-polkit=true)'
 endif
 output += '\n'
 output += '  polkit agent: ' + enable_polkit_agent.to_string() + '\n'
@@ -988,11 +999,12 @@ if enable_valgrind
 endif
 output += '\n'
 output += '  code coverage: ' + get_option('b_coverage').to_string() + '\n'
-output += '  LTO: ' + get_option('b_lto').to_string() + '\n'
+output += '  LTO: ' + enable_lto.to_string() + '\n'
 output += '  Linker garbage collection: ' + enable_ld_gc.to_string() + '\n'
 output += '  JSON validation for libnm: ' + enable_json_validation.to_string() + '\n'
 output += '  crypto: ' + crypto + ' (have-gnutls: ' + crypto_gnutls_dep.found().to_string() + ', have-nss: ' + crypto_nss_dep.found().to_string() + ')\n'
 output += '  sanitizers: ' + get_option('b_sanitize') + '\n'
 output += '  Mozilla Public Suffix List: ' + enable_libpsl.to_string() + '\n'
 output += '  vapi: ' + enable_vapi.to_string() + '\n'
+output += '  ebpf: ' + enable_ebpf.to_string() + '\n'
 message(output)
diff --git a/meson_options.txt b/meson_options.txt
index f4c8e5ee..5ea9e118 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -3,9 +3,6 @@ option('systemdsystemunitdir', type: 'string', value: '', description: 'Director
 option('system_ca_path', type: 'string', value: '/etc/ssl/certs', description: 'path to system CA certificates')
 option('udev_dir', type: 'string', value: '', description: 'Absolute path of the udev base directory. Set to \'no\' not to install the udev rule')
 option('dbus_conf_dir', type: 'string', value: '', description: 'where D-Bus system.d directory is')
-option('dbus_ifaces_dir', type: 'string', value: '', description: 'where D-Bus interfaces directory is')
-option('dbus_sys_dir', type: 'string', value: '', description: 'where D-Bus system service directory is')
-option('polkit_dir', type: 'string', value: '', description: 'where PolicyKit policy directory is')
 option('kernel_firmware_dir', type: 'string', value: '/lib/firmware', description: 'where kernel firmware directory is (default is /lib/firmware)')
 option('iptables', type: 'string', value: '', description: 'path to iptables')
 option('dnsmasq', type: 'string', value: '', description: 'path to dnsmasq')
@@ -16,7 +13,7 @@ option('dist_version', type: 'string', value: '', description: 'Define the NM\'s
 option('session_tracking_consolekit', type: 'boolean', value: true, description: 'Support consolekit session tracking')
 option('session_tracking', type: 'combo', choices: ['systemd', 'elogind', 'no'], value: 'systemd', description: 'Compatibility option to choose one session tracking module')
 option('suspend_resume', type: 'combo', choices: ['upower', 'systemd', 'elogind', 'consolekit', 'auto'], value: 'auto', description: 'Build NetworkManager with specific suspend/resume support')
-option('polkit', type: 'combo', choices: ['yes', 'no', 'disabled'], value: 'yes', description: 'set default value for auth-polkit configuration option. This value can be overwritten by NM configuration. \'disabled\' compiles NM without any support')
+option('polkit', type: 'boolean', value: true, description: 'User auth-polkit configuration option.')
 option('modify_system', type: 'boolean', value: false, description: 'Allow users to modify system connections')
 option('polkit_agent', type: 'boolean', value: false, description: 'enable polkit agent for clients')
 option('selinux', type: 'boolean', value: true, description: 'Build with SELinux')
@@ -36,11 +33,12 @@ option('modem_manager', type: 'boolean', value: true, description: 'Enable new M
 option('ofono', type: 'boolean', value: false, description: 'Enable oFono support (experimental)')
 option('concheck', type: 'boolean', value: true, description: 'enable connectivity checking support')
 option('teamdctl', type: 'boolean', value: false, description: 'enable Teamd control support')
-option('ovs', type: 'boolean', value: true, description: 'enable OpenVSwitch support')
+option('ovs', type: 'boolean', value: true, description: 'enable Open vSwitch support')
 option('libnm_glib', type: 'boolean', value: false, description: 'build legacy libraries')
 option('nmcli', type: 'boolean', value: true, description: 'Build nmcli')
 option('nmtui', type: 'boolean', value: true, description: 'Build nmtui')
 option('bluez5_dun', type: 'boolean', value: false, description: 'enable Bluez5 DUN support')
+option('ebpf', type: 'combo', choices : ['auto', 'true', 'false'], description: 'Enable eBPF support')
 
 # configuration plugins
 option('config_plugins_default', type: 'string', value: '', description: 'Default configuration option for main.plugins setting, used as fallback if the configuration option is unset')
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 942b0661..148fd546 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -56,6 +56,7 @@ libnm-core/nm-crypto-gnutls.c
 libnm-core/nm-crypto-nss.c
 libnm-core/nm-connection.c
 libnm-core/nm-dbus-utils.c
+libnm-core/nm-keyfile-utils.c
 libnm-core/nm-keyfile.c
 libnm-core/nm-setting-6lowpan.c
 libnm-core/nm-setting-8021x.c
@@ -71,30 +72,32 @@ libnm-core/nm-setting-ethtool.c
 libnm-core/nm-setting-gsm.c
 libnm-core/nm-setting-infiniband.c
 libnm-core/nm-setting-ip-config.c
+libnm-core/nm-setting-ip-tunnel.c
 libnm-core/nm-setting-ip4-config.c
 libnm-core/nm-setting-ip6-config.c
-libnm-core/nm-setting-ip-tunnel.c
 libnm-core/nm-setting-macsec.c
 libnm-core/nm-setting-macvlan.c
 libnm-core/nm-setting-olpc-mesh.c
+libnm-core/nm-setting-ovs-bridge.c
 libnm-core/nm-setting-ovs-interface.c
 libnm-core/nm-setting-ovs-patch.c
 libnm-core/nm-setting-ovs-port.c
-libnm-core/nm-setting-ovs-bridge.c
 libnm-core/nm-setting-ppp.c
 libnm-core/nm-setting-pppoe.c
 libnm-core/nm-setting-proxy.c
 libnm-core/nm-setting-sriov.c
 libnm-core/nm-setting-tc-config.c
-libnm-core/nm-setting-team.c
 libnm-core/nm-setting-team-port.c
+libnm-core/nm-setting-team.c
 libnm-core/nm-setting-tun.c
 libnm-core/nm-setting-user.c
 libnm-core/nm-setting-vlan.c
 libnm-core/nm-setting-vpn.c
 libnm-core/nm-setting-vxlan.c
+libnm-core/nm-setting-wifi-p2p.c
 libnm-core/nm-setting-wimax.c
 libnm-core/nm-setting-wired.c
+libnm-core/nm-setting-wireguard.c
 libnm-core/nm-setting-wireless-security.c
 libnm-core/nm-setting-wireless.c
 libnm-core/nm-setting-wpan.c
@@ -141,7 +144,6 @@ libnm/nm-device-bt.c
 libnm/nm-device-dummy.c
 libnm/nm-device-ethernet.c
 libnm/nm-device-generic.c
-libnm/nm-device-tun.c
 libnm/nm-device-infiniband.c
 libnm/nm-device-ip-tunnel.c
 libnm/nm-device-macvlan.c
@@ -151,8 +153,10 @@ libnm/nm-device-ovs-bridge.c
 libnm/nm-device-ovs-interface.c
 libnm/nm-device-ovs-port.c
 libnm/nm-device-team.c
+libnm/nm-device-tun.c
 libnm/nm-device-vlan.c
 libnm/nm-device-vxlan.c
+libnm/nm-device-wifi-p2p.c
 libnm/nm-device-wifi.c
 libnm/nm-device-wimax.c
 libnm/nm-device-wpan.c
diff --git a/po/ar.po b/po/ar.po
index d1438647..627b830c 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-29 17:44+0200\n"
+"POT-Creation-Date: 2019-01-08 16:44+0100\n"
 "PO-Revision-Date: 2017-04-21 05:04-0400\n"
 "Last-Translator: Copied by Zanata \n"
 "Language-Team: Arabic \n"
@@ -67,586 +67,303 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../clients/cli/agent.c:158
+#: ../clients/cli/agent.c:157
 #, c-format
 msgid "nmcli successfully registered as a NetworkManager's secret agent.\n"
 msgstr ""
 
-#: ../clients/cli/agent.c:160
+#: ../clients/cli/agent.c:159
 #, c-format
 msgid "Error: secret agent initialization failed"
 msgstr ""
 
-#: ../clients/cli/agent.c:179
+#: ../clients/cli/agent.c:178
 #, c-format
 msgid "Error: polkit agent initialization failed: %s"
 msgstr ""
 
-#: ../clients/cli/agent.c:187
+#: ../clients/cli/agent.c:186
 #, c-format
 msgid "nmcli successfully registered as a polkit agent.\n"
 msgstr ""
 
-#: ../clients/cli/common.c:149
+#: ../clients/cli/common.c:361 ../clients/cli/common.c:362
+#: ../clients/cli/common.c:393 ../clients/cli/common.c:394
+#: ../clients/cli/connections.c:1454
 msgid "GROUP"
 msgstr ""
 
-#: ../clients/cli/common.c:381
-msgid "unmanaged"
-msgstr ""
-
-#: ../clients/cli/common.c:383
-msgid "unavailable"
-msgstr ""
-
-#: ../clients/cli/common.c:385 ../clients/cli/general.c:48
-msgid "disconnected"
-msgstr ""
-
-#: ../clients/cli/common.c:387
-msgid "connecting (prepare)"
+#: ../clients/cli/common.c:621
+#, c-format
+msgid "Error: openconnect failed: %s\n"
 msgstr ""
 
-#: ../clients/cli/common.c:389
-msgid "connecting (configuring)"
+#: ../clients/cli/common.c:628
+#, c-format
+msgid "Error: openconnect failed with status %d\n"
 msgstr ""
 
-#: ../clients/cli/common.c:391
-msgid "connecting (need authentication)"
+#: ../clients/cli/common.c:630
+#, c-format
+msgid "Error: openconnect failed with signal %d\n"
 msgstr ""
 
-#: ../clients/cli/common.c:393
-msgid "connecting (getting IP configuration)"
+#: ../clients/cli/common.c:711
+#, c-format
+msgid ""
+"Warning: password for '%s' not given in 'passwd-file' and nmcli cannot ask "
+"without '--ask' option.\n"
 msgstr ""
 
-#: ../clients/cli/common.c:395
-msgid "connecting (checking IP connectivity)"
+#: ../clients/cli/common.c:1211
+#, c-format
+msgid "Error: Could not create NMClient object: %s."
 msgstr ""
 
-#: ../clients/cli/common.c:397
-msgid "connecting (starting secondary connections)"
+#: ../clients/cli/common.c:1231
+msgid "Error: NetworkManager is not running."
 msgstr ""
 
-#: ../clients/cli/common.c:399 ../clients/cli/general.c:46
-msgid "connected"
+#: ../clients/cli/common.c:1327
+#, c-format
+msgid "Error: argument '%s' not understood. Try passing --help instead."
 msgstr ""
 
-#: ../clients/cli/common.c:401 ../clients/cli/connections.c:528
-msgid "deactivating"
+#: ../clients/cli/common.c:1337
+msgid "Error: missing argument. Try passing --help."
 msgstr ""
 
-#: ../clients/cli/common.c:403
-msgid "connection failed"
+#: ../clients/cli/common.c:1390
+msgid "access denied"
 msgstr ""
 
-#: ../clients/cli/common.c:405 ../clients/cli/common.c:422
-#: ../clients/cli/connections.c:533 ../clients/cli/connections.c:556
-#: ../clients/cli/devices.c:1153 ../clients/cli/devices.c:1197
-#: ../clients/cli/devices.c:1199 ../clients/cli/general.c:41
-#: ../clients/cli/general.c:79 ../clients/cli/general.c:144
-#: ../clients/cli/general.c:149 ../clients/common/nm-meta-setting-desc.c:1368
-#: ../clients/common/nm-meta-setting-desc.c:1436
-#: ../clients/common/nm-meta-setting-desc.c:2593
-#: ../clients/common/nm-meta-setting-desc.c:2647
+#: ../clients/cli/common.c:1398 ../clients/cli/connections.c:81
+#: ../clients/cli/connections.c:90 ../clients/cli/devices.c:444
+#: ../clients/cli/devices.c:536 ../clients/cli/devices.c:543
+#: ../clients/cli/general.c:41 ../clients/cli/general.c:129
+#: ../clients/cli/general.c:134 ../clients/common/nm-client-utils.c:260
+#: ../clients/common/nm-client-utils.c:273
+#: ../clients/common/nm-client-utils.c:277
+#: ../clients/common/nm-client-utils.c:282
+#: ../clients/common/nm-meta-setting-desc.c:1567
+#: ../clients/common/nm-meta-setting-desc.c:1617
+#: ../clients/common/nm-meta-setting-desc.c:2757
+#: ../clients/common/nm-meta-setting-desc.c:2812
 msgid "unknown"
 msgstr ""
 
-#. "CAPABILITIES"
-#: ../clients/cli/common.c:414 ../clients/cli/connections.c:876
-#: ../clients/cli/connections.c:878 ../clients/cli/connections.c:880
-#: ../clients/cli/connections.c:913 ../clients/cli/connections.c:980
-#: ../clients/cli/connections.c:981 ../clients/cli/connections.c:983
-#: ../clients/cli/connections.c:4496 ../clients/cli/connections.c:6375
-#: ../clients/cli/connections.c:6376 ../clients/cli/devices.c:827
-#: ../clients/cli/devices.c:1116 ../clients/cli/devices.c:1117
-#: ../clients/cli/devices.c:1118 ../clients/cli/devices.c:1119
-#: ../clients/cli/devices.c:1120 ../clients/cli/devices.c:1157
-#: ../clients/cli/devices.c:1159 ../clients/cli/devices.c:1160
-#: ../clients/cli/devices.c:1190 ../clients/cli/devices.c:1191
-#: ../clients/cli/devices.c:1192 ../clients/cli/devices.c:1193
-#: ../clients/cli/devices.c:1194 ../clients/cli/devices.c:1195
-#: ../clients/cli/devices.c:1196 ../clients/cli/devices.c:1198
-#: ../clients/cli/devices.c:1200 ../clients/cli/general.c:150
-#: ../clients/common/nm-meta-setting-desc.c:574
-#: ../clients/common/nm-meta-setting-desc.c:2586
-msgid "yes"
-msgstr ""
-
-#: ../clients/cli/common.c:416 ../clients/cli/connections.c:876
-#: ../clients/cli/connections.c:878 ../clients/cli/connections.c:880
-#: ../clients/cli/connections.c:980 ../clients/cli/connections.c:981
-#: ../clients/cli/connections.c:983 ../clients/cli/connections.c:4495
-#: ../clients/cli/connections.c:6375 ../clients/cli/connections.c:6376
-#: ../clients/cli/devices.c:827 ../clients/cli/devices.c:1116
-#: ../clients/cli/devices.c:1117 ../clients/cli/devices.c:1118
-#: ../clients/cli/devices.c:1119 ../clients/cli/devices.c:1120
-#: ../clients/cli/devices.c:1157 ../clients/cli/devices.c:1159
-#: ../clients/cli/devices.c:1160 ../clients/cli/devices.c:1190
-#: ../clients/cli/devices.c:1191 ../clients/cli/devices.c:1192
-#: ../clients/cli/devices.c:1193 ../clients/cli/devices.c:1194
-#: ../clients/cli/devices.c:1195 ../clients/cli/devices.c:1196
-#: ../clients/cli/devices.c:1198 ../clients/cli/devices.c:1200
-#: ../clients/cli/general.c:151 ../clients/common/nm-meta-setting-desc.c:574
-#: ../clients/common/nm-meta-setting-desc.c:2589
-#, fuzzy
-msgid "no"
+#: ../clients/cli/common.c:1399
+msgid "none"
 msgstr "بلا"
 
-#: ../clients/cli/common.c:418
-msgid "yes (guessed)"
-msgstr ""
-
-#: ../clients/cli/common.c:420
-msgid "no (guessed)"
-msgstr ""
-
-#: ../clients/cli/common.c:431
-msgid "No reason given"
-msgstr ""
-
-#. We should not really come here
-#: ../clients/cli/common.c:434 ../clients/cli/connections.c:3095
-#: ../clients/cli/connections.c:3155
-#, c-format
-msgid "Unknown error"
-msgstr ""
-
-#: ../clients/cli/common.c:437
-msgid "Device is now managed"
-msgstr ""
-
-#: ../clients/cli/common.c:440
-msgid "Device is now unmanaged"
-msgstr ""
-
-#: ../clients/cli/common.c:443
-msgid "The device could not be readied for configuration"
-msgstr ""
-
-#: ../clients/cli/common.c:446
-msgid ""
-"IP configuration could not be reserved (no available address, timeout, etc.)"
-msgstr ""
-
-#: ../clients/cli/common.c:449
-msgid "The IP configuration is no longer valid"
-msgstr ""
-
-#: ../clients/cli/common.c:452
-msgid "Secrets were required, but not provided"
-msgstr ""
-
-#: ../clients/cli/common.c:455
-msgid "802.1X supplicant disconnected"
-msgstr ""
-
-#: ../clients/cli/common.c:458
-msgid "802.1X supplicant configuration failed"
-msgstr ""
-
-#: ../clients/cli/common.c:461
-msgid "802.1X supplicant failed"
-msgstr ""
+#: ../clients/cli/common.c:1400
+#, fuzzy
+msgid "portal"
+msgstr "_صدِّر"
 
-#: ../clients/cli/common.c:464
-msgid "802.1X supplicant took too long to authenticate"
+#: ../clients/cli/common.c:1401
+msgid "limited"
 msgstr ""
 
-#: ../clients/cli/common.c:467
-msgid "PPP service failed to start"
+#: ../clients/cli/common.c:1402
+msgid "full"
 msgstr ""
 
-#: ../clients/cli/common.c:470
-msgid "PPP service disconnected"
+#. define some prompts for connection editor
+#: ../clients/cli/connections.c:65
+msgid "Setting name? "
 msgstr ""
 
-#: ../clients/cli/common.c:473
-msgid "PPP failed"
+#: ../clients/cli/connections.c:66
+msgid "Property name? "
 msgstr ""
 
-#: ../clients/cli/common.c:476
-msgid "DHCP client failed to start"
+#: ../clients/cli/connections.c:67
+msgid "Enter connection type: "
 msgstr ""
 
-#: ../clients/cli/common.c:479
-msgid "DHCP client error"
-msgstr ""
+#. define some other prompts
+#: ../clients/cli/connections.c:71
+#, fuzzy
+msgid "Connection (name, UUID, or path): "
+msgstr "إتّصالات VPN"
 
-#: ../clients/cli/common.c:482
-msgid "DHCP client failed"
-msgstr ""
+#: ../clients/cli/connections.c:72
+#, fuzzy
+msgid "VPN connection (name, UUID, or path): "
+msgstr "إتّصالات VPN"
 
-#: ../clients/cli/common.c:485
-msgid "Shared connection service failed to start"
-msgstr ""
+#: ../clients/cli/connections.c:73
+#, fuzzy
+msgid "Connection(s) (name, UUID, or path): "
+msgstr "إتّصالات VPN"
 
-#: ../clients/cli/common.c:488
-msgid "Shared connection service failed"
-msgstr ""
+#: ../clients/cli/connections.c:74
+#, fuzzy
+msgid "Connection(s) (name, UUID, path or apath): "
+msgstr "إتّصالات VPN"
 
-#: ../clients/cli/common.c:491
-msgid "AutoIP service failed to start"
+#: ../clients/cli/connections.c:82
+msgid "activating"
 msgstr ""
 
-#: ../clients/cli/common.c:494
-msgid "AutoIP service error"
+#: ../clients/cli/connections.c:83
+msgid "activated"
 msgstr ""
 
-#: ../clients/cli/common.c:497
-msgid "AutoIP service failed"
+#: ../clients/cli/connections.c:84 ../clients/common/nm-client-utils.c:271
+msgid "deactivating"
 msgstr ""
 
-#: ../clients/cli/common.c:500
-msgid "The line is busy"
+#: ../clients/cli/connections.c:85
+msgid "deactivated"
 msgstr ""
 
-#: ../clients/cli/common.c:503
-msgid "No dial tone"
-msgstr ""
+#: ../clients/cli/connections.c:91
+#, fuzzy
+msgid "VPN connecting (prepare)"
+msgstr "إتّصالات VPN"
 
-#: ../clients/cli/common.c:506
-msgid "No carrier could be established"
+#: ../clients/cli/connections.c:92
+msgid "VPN connecting (need authentication)"
 msgstr ""
 
-#: ../clients/cli/common.c:509
-msgid "The dialing request timed out"
-msgstr ""
+#: ../clients/cli/connections.c:93
+#, fuzzy
+msgid "VPN connecting"
+msgstr "إتّصالات VPN"
 
-#: ../clients/cli/common.c:512
-msgid "The dialing attempt failed"
+#: ../clients/cli/connections.c:94
+msgid "VPN connecting (getting IP configuration)"
 msgstr ""
 
-#: ../clients/cli/common.c:515
-msgid "Modem initialization failed"
-msgstr ""
+#: ../clients/cli/connections.c:95
+#, fuzzy
+msgid "VPN connected"
+msgstr "إتّصالات VPN"
 
-#: ../clients/cli/common.c:518
-msgid "Failed to select the specified APN"
-msgstr ""
+#: ../clients/cli/connections.c:96
+#, fuzzy
+msgid "VPN connection failed"
+msgstr "إتّصالات VPN"
 
-#: ../clients/cli/common.c:521
-msgid "Not searching for networks"
-msgstr ""
+#: ../clients/cli/connections.c:97
+#, fuzzy
+msgid "VPN disconnected"
+msgstr "إتّصالات VPN"
 
-#: ../clients/cli/common.c:524
-msgid "Network registration denied"
+#: ../clients/cli/connections.c:518
+msgid "never"
 msgstr ""
 
-#: ../clients/cli/common.c:527
-msgid "Network registration timed out"
+#: ../clients/cli/connections.c:868
+#, c-format
+msgid ""
+"Usage: nmcli connection { COMMAND | help }\n"
+"\n"
+"COMMAND := { show | up | down | add | modify | clone | edit | delete | "
+"monitor | reload | load | import | export }\n"
+"\n"
+"  show [--active] [--order ]\n"
+"  show [--active] [id | uuid | path | apath]  ...\n"
+"\n"
+"  up [[id | uuid | path] ] [ifname ] [ap ] [passwd-file "
+"]\n"
+"\n"
+"  down [id | uuid | path | apath]  ...\n"
+"\n"
+"  add COMMON_OPTIONS TYPE_SPECIFIC_OPTIONS SLAVE_OPTIONS IP_OPTIONS [-- "
+"([+|-]. )+]\n"
+"\n"
+"  modify [--temporary] [id | uuid | path]  ([+|-]. "
+")+\n"
+"\n"
+"  clone [--temporary] [id | uuid | path ]  \n"
+"\n"
+"  edit [id | uuid | path] \n"
+"  edit [type ] [con-name ]\n"
+"\n"
+"  delete [id | uuid | path] \n"
+"\n"
+"  monitor [id | uuid | path]  ...\n"
+"\n"
+"  reload\n"
+"\n"
+"  load  [ ... ]\n"
+"\n"
+"  import [--temporary] type  file \n"
+"\n"
+"  export [id | uuid | path]  []\n"
+"\n"
 msgstr ""
 
-#: ../clients/cli/common.c:530
-msgid "Failed to register with the requested network"
+#: ../clients/cli/connections.c:890
+#, c-format
+msgid ""
+"Usage: nmcli connection show { ARGUMENTS | help }\n"
+"\n"
+"ARGUMENTS := [--active] [--order ]\n"
+"\n"
+"List in-memory and on-disk connection profiles, some of which may also be\n"
+"active if a device is using that connection profile. Without a parameter, "
+"all\n"
+"profiles are listed. When --active option is specified, only the active\n"
+"profiles are shown. --order allows custom connection ordering (see manual "
+"page).\n"
+"\n"
+"ARGUMENTS := [--active] [id | uuid | path | apath]  ...\n"
+"\n"
+"Show details for specified connections. By default, both static "
+"configuration\n"
+"and active connection data are displayed. It is possible to filter the "
+"output\n"
+"using global '--fields' option. Refer to the manual page for more "
+"information.\n"
+"When --active option is specified, only the active profiles are taken into\n"
+"account. Use global --show-secrets option to reveal associated secrets as "
+"well.\n"
 msgstr ""
 
-#: ../clients/cli/common.c:533
-msgid "PIN check failed"
+#: ../clients/cli/connections.c:911
+#, c-format
+msgid ""
+"Usage: nmcli connection up { ARGUMENTS | help }\n"
+"\n"
+"ARGUMENTS := [id | uuid | path]  [ifname ] [ap ] [nsp "
+"] [passwd-file ]\n"
+"\n"
+"Activate a connection on a device. The profile to activate is identified by "
+"its\n"
+"name, UUID or D-Bus path.\n"
+"\n"
+"ARGUMENTS := ifname  [ap ] [nsp ] [passwd-file ]\n"
+"\n"
+"Activate a device with a connection. The connection profile is selected\n"
+"automatically by NetworkManager.\n"
+"\n"
+"ifname      - specifies the device to active the connection on\n"
+"ap          - specifies AP to connect to (only valid for Wi-Fi)\n"
+"nsp         - specifies NSP to connect to (only valid for WiMAX)\n"
+"passwd-file - file with password(s) required to activate the connection\n"
+"\n"
 msgstr ""
 
-#: ../clients/cli/common.c:536
-msgid "Necessary firmware for the device may be missing"
+#: ../clients/cli/connections.c:932
+#, c-format
+msgid ""
+"Usage: nmcli connection down { ARGUMENTS | help }\n"
+"\n"
+"ARGUMENTS := [id | uuid | path | apath]  ...\n"
+"\n"
+"Deactivate a connection from a device (without preventing the device from\n"
+"further auto-activation). The profile to deactivate is identified by its "
+"name,\n"
+"UUID or D-Bus path.\n"
+"\n"
 msgstr ""
 
-#: ../clients/cli/common.c:539
-msgid "The device was removed"
-msgstr ""
-
-#: ../clients/cli/common.c:542
-msgid "NetworkManager went to sleep"
-msgstr ""
-
-#: ../clients/cli/common.c:545
-msgid "The device's active connection disappeared"
-msgstr ""
-
-#: ../clients/cli/common.c:548
-msgid "Device disconnected by user or client"
-msgstr ""
-
-#: ../clients/cli/common.c:551
-msgid "Carrier/link changed"
-msgstr ""
-
-#: ../clients/cli/common.c:554
-msgid "The device's existing connection was assumed"
-msgstr ""
-
-#: ../clients/cli/common.c:557
-msgid "The supplicant is now available"
-msgstr ""
-
-#: ../clients/cli/common.c:560
-msgid "The modem could not be found"
-msgstr ""
-
-#: ../clients/cli/common.c:563
-msgid "The Bluetooth connection failed or timed out"
-msgstr ""
-
-#: ../clients/cli/common.c:566
-msgid "GSM Modem's SIM card not inserted"
-msgstr ""
-
-#: ../clients/cli/common.c:569
-msgid "GSM Modem's SIM PIN required"
-msgstr ""
-
-#: ../clients/cli/common.c:572
-msgid "GSM Modem's SIM PUK required"
-msgstr ""
-
-#: ../clients/cli/common.c:575
-msgid "GSM Modem's SIM wrong"
-msgstr ""
-
-#: ../clients/cli/common.c:578
-msgid "InfiniBand device does not support connected mode"
-msgstr ""
-
-#: ../clients/cli/common.c:581
-msgid "A dependency of the connection failed"
-msgstr ""
-
-#: ../clients/cli/common.c:584
-msgid "A problem with the RFC 2684 Ethernet over ADSL bridge"
-msgstr ""
-
-#: ../clients/cli/common.c:587
-msgid "ModemManager is unavailable"
-msgstr ""
-
-#: ../clients/cli/common.c:590
-msgid "The Wi-Fi network could not be found"
-msgstr ""
-
-#: ../clients/cli/common.c:593
-msgid "A secondary connection of the base connection failed"
-msgstr ""
-
-#: ../clients/cli/common.c:596
-msgid "DCB or FCoE setup failed"
-msgstr ""
-
-#: ../clients/cli/common.c:599
-msgid "teamd control failed"
-msgstr ""
-
-#: ../clients/cli/common.c:602
-msgid "Modem failed or no longer available"
-msgstr ""
-
-#: ../clients/cli/common.c:605
-msgid "Modem now ready and available"
-msgstr ""
-
-#: ../clients/cli/common.c:608
-msgid "SIM PIN was incorrect"
-msgstr ""
-
-#: ../clients/cli/common.c:611
-msgid "New connection activation was enqueued"
-msgstr ""
-
-#: ../clients/cli/common.c:614
-msgid "The device's parent changed"
-msgstr ""
-
-#: ../clients/cli/common.c:617
-msgid "The device parent's management changed"
-msgstr ""
-
-#. TRANSLATORS: Unknown reason for a device state change (NMDeviceStateReason)
-#: ../clients/cli/common.c:621 ../libnm-glib/nm-device.c:1860
-#: ../libnm/nm-device.c:1560
-msgid "Unknown"
-msgstr ""
-
-#: ../clients/cli/common.c:737
-#, c-format
-msgid "Error: openconnect failed: %s\n"
-msgstr ""
-
-#: ../clients/cli/common.c:744
-#, c-format
-msgid "Error: openconnect failed with status %d\n"
-msgstr ""
-
-#: ../clients/cli/common.c:746
-#, c-format
-msgid "Error: openconnect failed with signal %d\n"
-msgstr ""
-
-#: ../clients/cli/common.c:827
-#, c-format
-msgid ""
-"Warning: password for '%s' not given in 'passwd-file' and nmcli cannot ask "
-"without '--ask' option.\n"
-msgstr ""
-
-#: ../clients/cli/common.c:1291
-#, c-format
-msgid "Error: Could not create NMClient object: %s."
-msgstr ""
-
-#: ../clients/cli/common.c:1311
-msgid "Error: NetworkManager is not running."
-msgstr ""
-
-#: ../clients/cli/common.c:1408
-#, c-format
-msgid "Error: argument '%s' not understood. Try passing --help instead."
-msgstr ""
-
-#: ../clients/cli/common.c:1418
-msgid "Error: missing argument. Try passing --help."
-msgstr ""
-
-#: ../clients/cli/common.c:1471
-msgid "access denied"
-msgstr ""
-
-#. define some prompts for connection editor
-#: ../clients/cli/connections.c:64
-msgid "Setting name? "
-msgstr ""
-
-#: ../clients/cli/connections.c:65
-msgid "Property name? "
-msgstr ""
-
-#: ../clients/cli/connections.c:66
-msgid "Enter connection type: "
-msgstr ""
-
-#. define some other prompts
-#: ../clients/cli/connections.c:70
-#, fuzzy
-msgid "Connection (name, UUID, or path)"
-msgstr "إتّصالات VPN"
-
-#: ../clients/cli/connections.c:71
-#, fuzzy
-msgid "VPN connection (name, UUID, or path)"
-msgstr "إتّصالات VPN"
-
-#: ../clients/cli/connections.c:72
-#, fuzzy
-msgid "Connection(s) (name, UUID, or path)"
-msgstr "إتّصالات VPN"
-
-#: ../clients/cli/connections.c:73
-msgid "Connection(s) (name, UUID, path or apath)"
-msgstr ""
-
-#: ../clients/cli/connections.c:190
-#, c-format
-msgid ""
-"Usage: nmcli connection { COMMAND | help }\n"
-"\n"
-"COMMAND := { show | up | down | add | modify | clone | edit | delete | "
-"monitor | reload | load | import | export }\n"
-"\n"
-"  show [--active] [--order ]\n"
-"  show [--active] [id | uuid | path | apath]  ...\n"
-"\n"
-"  up [[id | uuid | path] ] [ifname ] [ap ] [passwd-file "
-"]\n"
-"\n"
-"  down [id | uuid | path | apath]  ...\n"
-"\n"
-"  add COMMON_OPTIONS TYPE_SPECIFIC_OPTIONS SLAVE_OPTIONS IP_OPTIONS [-- "
-"([+|-]. )+]\n"
-"\n"
-"  modify [--temporary] [id | uuid | path]  ([+|-]. "
-")+\n"
-"\n"
-"  clone [--temporary] [id | uuid | path ]  \n"
-"\n"
-"  edit [id | uuid | path] \n"
-"  edit [type ] [con-name ]\n"
-"\n"
-"  delete [id | uuid | path] \n"
-"\n"
-"  monitor [id | uuid | path]  ...\n"
-"\n"
-"  reload\n"
-"\n"
-"  load  [ ... ]\n"
-"\n"
-"  import [--temporary] type  file \n"
-"\n"
-"  export [id | uuid | path]  []\n"
-"\n"
-msgstr ""
-
-#: ../clients/cli/connections.c:212
-#, c-format
-msgid ""
-"Usage: nmcli connection show { ARGUMENTS | help }\n"
-"\n"
-"ARGUMENTS := [--active] [--order ]\n"
-"\n"
-"List in-memory and on-disk connection profiles, some of which may also be\n"
-"active if a device is using that connection profile. Without a parameter, "
-"all\n"
-"profiles are listed. When --active option is specified, only the active\n"
-"profiles are shown. --order allows custom connection ordering (see manual "
-"page).\n"
-"\n"
-"ARGUMENTS := [--active] [id | uuid | path | apath]  ...\n"
-"\n"
-"Show details for specified connections. By default, both static "
-"configuration\n"
-"and active connection data are displayed. It is possible to filter the "
-"output\n"
-"using global '--fields' option. Refer to the manual page for more "
-"information.\n"
-"When --active option is specified, only the active profiles are taken into\n"
-"account. Use global --show-secrets option to reveal associated secrets as "
-"well.\n"
-msgstr ""
-
-#: ../clients/cli/connections.c:233
-#, c-format
-msgid ""
-"Usage: nmcli connection up { ARGUMENTS | help }\n"
-"\n"
-"ARGUMENTS := [id | uuid | path]  [ifname ] [ap ] [nsp "
-"] [passwd-file ]\n"
-"\n"
-"Activate a connection on a device. The profile to activate is identified by "
-"its\n"
-"name, UUID or D-Bus path.\n"
-"\n"
-"ARGUMENTS := ifname  [ap ] [nsp ] [passwd-file ]\n"
-"\n"
-"Activate a device with a connection. The connection profile is selected\n"
-"automatically by NetworkManager.\n"
-"\n"
-"ifname      - specifies the device to active the connection on\n"
-"ap          - specifies AP to connect to (only valid for Wi-Fi)\n"
-"nsp         - specifies NSP to connect to (only valid for WiMAX)\n"
-"passwd-file - file with password(s) required to activate the connection\n"
-"\n"
-msgstr ""
-
-#: ../clients/cli/connections.c:254
-#, c-format
-msgid ""
-"Usage: nmcli connection down { ARGUMENTS | help }\n"
-"\n"
-"ARGUMENTS := [id | uuid | path | apath]  ...\n"
-"\n"
-"Deactivate a connection from a device (without preventing the device from\n"
-"further auto-activation). The profile to deactivate is identified by its "
-"name,\n"
-"UUID or D-Bus path.\n"
-"\n"
-msgstr ""
-
-#: ../clients/cli/connections.c:266
+#: ../clients/cli/connections.c:944
 #, c-format
 msgid ""
 "Usage: nmcli connection add { ARGUMENTS | help }\n"
@@ -697,7 +414,7 @@ msgid ""
 "                  [p-key ]\n"
 "\n"
 "    bluetooth:    [addr ]\n"
-"                  [bt-type panu|dun-gsm|dun-cdma]\n"
+"                  [bt-type panu|nap|dun-gsm|dun-cdma]\n"
 "\n"
 "    vlan:         dev \n"
 "                  id \n"
@@ -783,7 +500,14 @@ msgid ""
 "                  [source-port-max <0-65535>]\n"
 "                  [destination-port <0-65535>]\n"
 "\n"
-"    dummy:         \n"
+"    wpan:         [short-addr <0x0000-0xffff>]\n"
+"                  [pan-id <0x0000-0xffff>]\n"
+"                  [page ]\n"
+"                  [channel ]\n"
+"                  [mac ]\n"
+"\n"
+"    6lowpan:      dev \n"
+"    dummy:\n"
 "\n"
 "  SLAVE_OPTIONS:\n"
 "    bridge:       [priority <0-63>]\n"
@@ -798,7 +522,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../clients/cli/connections.c:384
+#: ../clients/cli/connections.c:1068
 #, c-format
 msgid ""
 "Usage: nmcli connection modify { ARGUMENTS | help }\n"
@@ -823,7 +547,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../clients/cli/connections.c:407
+#: ../clients/cli/connections.c:1091
 #, c-format
 msgid ""
 "Usage: nmcli connection clone { ARGUMENTS | help }\n"
@@ -837,2725 +561,3066 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../clients/cli/connections.c:419
+#: ../clients/cli/connections.c:1103
+#, c-format
+msgid ""
+"Usage: nmcli connection edit { ARGUMENTS | help }\n"
+"\n"
+"ARGUMENTS := [id | uuid | path] \n"
+"\n"
+"Edit an existing connection profile in an interactive editor.\n"
+"The profile is identified by its name, UUID or D-Bus path\n"
+"\n"
+"ARGUMENTS := [type ] [con-name ]\n"
+"\n"
+"Add a new connection profile in an interactive editor.\n"
+"\n"
+msgstr ""
+
+#: ../clients/cli/connections.c:1118
+#, c-format
+msgid ""
+"Usage: nmcli connection delete { ARGUMENTS | help }\n"
+"\n"
+"ARGUMENTS := [id | uuid | path] \n"
+"\n"
+"Delete a connection profile.\n"
+"The profile is identified by its name, UUID or D-Bus path.\n"
+"\n"
+msgstr ""
+
+#: ../clients/cli/connections.c:1129
+#, c-format
+msgid ""
+"Usage: nmcli connection monitor { ARGUMENTS | help }\n"
+"\n"
+"ARGUMENTS := [id | uuid | path]  ...\n"
+"\n"
+"Monitor connection profile activity.\n"
+"This command prints a line whenever the specified connection changes.\n"
+"Monitors all connection profiles in case none is specified.\n"
+"\n"
+msgstr ""
+
+#: ../clients/cli/connections.c:1141
+#, c-format
+msgid ""
+"Usage: nmcli connection reload { help }\n"
+"\n"
+"Reload all connection files from disk.\n"
+"\n"
+msgstr ""
+
+#: ../clients/cli/connections.c:1149
+#, c-format
+msgid ""
+"Usage: nmcli connection load { ARGUMENTS | help }\n"
+"\n"
+"ARGUMENTS :=  [...]\n"
+"\n"
+"Load/reload one or more connection files from disk. Use this after manually\n"
+"editing a connection file to ensure that NetworkManager is aware of its "
+"latest\n"
+"state.\n"
+"\n"
+msgstr ""
+
+#: ../clients/cli/connections.c:1161
+#, c-format
+msgid ""
+"Usage: nmcli connection import { ARGUMENTS | help }\n"
+"\n"
+"ARGUMENTS := [--temporary] type  file \n"
+"\n"
+"Import an external/foreign configuration as a NetworkManager connection "
+"profile.\n"
+"The type of the input file is specified by type option.\n"
+"Only VPN configurations are supported at the moment. The configuration\n"
+"is imported by NetworkManager VPN plugins.\n"
+"\n"
+msgstr ""
+
+#: ../clients/cli/connections.c:1174
+#, c-format
+msgid ""
+"Usage: nmcli connection export { ARGUMENTS | help }\n"
+"\n"
+"ARGUMENTS := [id | uuid | path]  []\n"
+"\n"
+"Export a connection. Only VPN connections are supported at the moment.\n"
+"The data are directed to standard output or to a file if a name is given.\n"
+"\n"
+msgstr ""
+
+#: ../clients/cli/connections.c:1264
+#, c-format
+msgid "Error updating secrets for %s: %s\n"
+msgstr ""
+
+#: ../clients/cli/connections.c:1307
+msgid "Connection profile details"
+msgstr ""
+
+#: ../clients/cli/connections.c:1320 ../clients/cli/connections.c:1405
+#, fuzzy, c-format
+msgid "Error: 'connection show': %s"
+msgstr "خطأ أثناء فتح اتصال VPN '%s'"
+
+#: ../clients/cli/connections.c:1395
+msgid "Activate connection details"
+msgstr ""
+
+#: ../clients/cli/connections.c:1503 ../clients/cli/devices.c:1453
+#: ../clients/cli/devices.c:1467 ../clients/cli/devices.c:1482
+#: ../clients/cli/devices.c:1540 ../clients/cli/devices.c:1642
+msgid "NAME"
+msgstr ""
+
+#: ../clients/cli/connections.c:1591
+#, c-format
+msgid "invalid field '%s'; allowed fields: %s and %s, or %s,%s"
+msgstr ""
+
+#: ../clients/cli/connections.c:1606 ../clients/cli/connections.c:1614
+#, c-format
+msgid "'%s' has to be alone"
+msgstr ""
+
+#: ../clients/cli/connections.c:1876
+#, c-format
+msgid "incorrect string '%s' of '--order' option"
+msgstr ""
+
+#: ../clients/cli/connections.c:1901
+#, c-format
+msgid "incorrect item '%s' in '--order' option"
+msgstr ""
+
+#: ../clients/cli/connections.c:1939
+#, fuzzy
+msgid "No connection specified"
+msgstr "إتّصالات VPN"
+
+#: ../clients/cli/connections.c:1950
+#, c-format
+msgid "%s argument is missing"
+msgstr ""
+
+#: ../clients/cli/connections.c:1968
+#, fuzzy, c-format
+msgid "unknown connection '%s'"
+msgstr "خطأ أثناء فتح اتصال VPN '%s'"
+
+#: ../clients/cli/connections.c:1997
+msgid "'--order' argument is missing"
+msgstr ""
+
+#: ../clients/cli/connections.c:2057
+msgid "NetworkManager active profiles"
+msgstr ""
+
+#: ../clients/cli/connections.c:2058
+msgid "NetworkManager connection profiles"
+msgstr ""
+
+#: ../clients/cli/connections.c:2110 ../clients/cli/connections.c:2856
+#: ../clients/cli/connections.c:2868 ../clients/cli/connections.c:2880
+#: ../clients/cli/connections.c:3109 ../clients/cli/connections.c:8899
+#: ../clients/cli/connections.c:8915 ../clients/cli/devices.c:2976
+#: ../clients/cli/devices.c:2988 ../clients/cli/devices.c:3001
+#: ../clients/cli/devices.c:3195 ../clients/cli/devices.c:3206
+#: ../clients/cli/devices.c:3224 ../clients/cli/devices.c:3233
+#: ../clients/cli/devices.c:3254 ../clients/cli/devices.c:3265
+#: ../clients/cli/devices.c:3283 ../clients/cli/devices.c:3725
+#: ../clients/cli/devices.c:3735 ../clients/cli/devices.c:3743
+#: ../clients/cli/devices.c:3755 ../clients/cli/devices.c:3770
+#: ../clients/cli/devices.c:3778 ../clients/cli/devices.c:3952
+#: ../clients/cli/devices.c:3963 ../clients/cli/devices.c:4134
+#, c-format
+msgid "Error: %s argument is missing."
+msgstr ""
+
+#: ../clients/cli/connections.c:2138
+#, c-format
+msgid "Error: %s - no such connection profile."
+msgstr ""
+
+#: ../clients/cli/connections.c:2229 ../clients/cli/connections.c:2843
+#: ../clients/cli/connections.c:2907 ../clients/cli/connections.c:8419
+#: ../clients/cli/connections.c:8525 ../clients/cli/connections.c:9015
+#: ../clients/cli/devices.c:1727 ../clients/cli/devices.c:1995
+#: ../clients/cli/devices.c:2168 ../clients/cli/devices.c:2276
+#: ../clients/cli/devices.c:2468 ../clients/cli/devices.c:3915
+#: ../clients/cli/devices.c:4140 ../clients/cli/general.c:895
+#, c-format
+msgid "Error: %s."
+msgstr ""
+
+#: ../clients/cli/connections.c:2322
+#, c-format
+msgid "no active connection on device '%s'"
+msgstr ""
+
+#: ../clients/cli/connections.c:2330
+msgid "no active connection or device"
+msgstr ""
+
+#: ../clients/cli/connections.c:2350
+#, fuzzy, c-format
+msgid "device '%s' not compatible with connection '%s': "
+msgstr "خطأ أثناء فتح اتصال VPN '%s'"
+
+#: ../clients/cli/connections.c:2383
+#, c-format
+msgid "device '%s' not compatible with connection '%s'"
+msgstr ""
+
+#: ../clients/cli/connections.c:2386
+#, fuzzy, c-format
+msgid "no device found for connection '%s'"
+msgstr "خطأ أثناء فتح اتصال VPN '%s'"
+
+#: ../clients/cli/connections.c:2437
+#, c-format
+msgid "Hint: use '%s' to get more details."
+msgstr ""
+
+#: ../clients/cli/connections.c:2455
+#, c-format
+msgid "Connection successfully activated (%s) (D-Bus active path: %s)\n"
+msgstr ""
+
+#: ../clients/cli/connections.c:2459 ../clients/cli/connections.c:2609
+#: ../clients/cli/connections.c:6716
+#, c-format
+msgid "Connection successfully activated (D-Bus active path: %s)\n"
+msgstr ""
+
+#: ../clients/cli/connections.c:2466 ../clients/cli/connections.c:2588
+#, c-format
+msgid "Error: Connection activation failed: %s"
+msgstr ""
+
+#: ../clients/cli/connections.c:2503
+#, c-format
+msgid "Error: Timeout expired (%d seconds)"
+msgstr ""
+
+#: ../clients/cli/connections.c:2671
+#, c-format
+msgid "failed to read passwd-file '%s': %s"
+msgstr ""
+
+#: ../clients/cli/connections.c:2684
+#, c-format
+msgid "missing colon in 'password' entry '%s'"
+msgstr ""
+
+#: ../clients/cli/connections.c:2692
+#, c-format
+msgid "missing dot in 'password' entry '%s'"
+msgstr ""
+
+#: ../clients/cli/connections.c:2705
+#, c-format
+msgid "invalid setting name in 'password' entry '%s'"
+msgstr ""
+
+#: ../clients/cli/connections.c:2759
+#, c-format
+msgid "unknown device '%s'."
+msgstr ""
+
+#: ../clients/cli/connections.c:2764
+msgid "neither a valid connection nor device given"
+msgstr ""
+
+#: ../clients/cli/connections.c:2890 ../clients/cli/devices.c:1686
+#: ../clients/cli/devices.c:3033 ../clients/cli/devices.c:3296
+#: ../clients/cli/devices.c:3969
+#, c-format
+msgid "Unknown parameter: %s\n"
+msgstr ""
+
+#: ../clients/cli/connections.c:2915
+msgid "preparing"
+msgstr ""
+
+#: ../clients/cli/connections.c:3024
+#, c-format
+msgid "Connection '%s' (%s) successfully deleted.\n"
+msgstr ""
+
+#: ../clients/cli/connections.c:3040
+#, c-format
+msgid "Connection '%s' successfully deactivated (D-Bus active path: %s)\n"
+msgstr ""
+
+#: ../clients/cli/connections.c:3091 ../clients/cli/connections.c:8633
+#: ../clients/cli/connections.c:8664 ../clients/cli/connections.c:8822
+#, c-format
+msgid "Error: No connection specified."
+msgstr ""
+
+#: ../clients/cli/connections.c:3121
+#, c-format
+msgid "Error: '%s' is not an active connection.\n"
+msgstr ""
+
+#: ../clients/cli/connections.c:3122
+#, c-format
+msgid "Error: not all active connections found."
+msgstr ""
+
+#: ../clients/cli/connections.c:3130
+#, c-format
+msgid "Error: no active connection provided."
+msgstr ""
+
+#: ../clients/cli/connections.c:3161
+#, c-format
+msgid "Connection '%s' deactivation failed: %s\n"
+msgstr ""
+
+#: ../clients/cli/connections.c:3412 ../clients/cli/connections.c:3469
+#: ../clients/common/nm-client-utils.c:221
+#, c-format
+msgid "'%s' not among [%s]"
+msgstr ""
+
+#. We should not really come here
+#: ../clients/cli/connections.c:3432 ../clients/cli/connections.c:3492
+#: ../clients/common/nm-client-utils.c:289
+#, c-format
+msgid "Unknown error"
+msgstr ""
+
+#: ../clients/cli/connections.c:3626
+#, c-format
+msgid "Warning: master='%s' doesn't refer to any existing profile.\n"
+msgstr ""
+
+#: ../clients/cli/connections.c:3979
+#, c-format
+msgid "Error: invalid property '%s': %s."
+msgstr ""
+
+#: ../clients/cli/connections.c:3996
+#, c-format
+msgid "Error: failed to modify %s.%s: %s."
+msgstr ""
+
+#: ../clients/cli/connections.c:4016
+#, c-format
+msgid "Error: failed to remove a value from %s.%s: %s."
+msgstr ""
+
+#: ../clients/cli/connections.c:4050
+#, c-format
+msgid "Error: '%s' is mandatory."
+msgstr ""
+
+#: ../clients/cli/connections.c:4077
+#, fuzzy, c-format
+msgid "Error: invalid slave type; %s."
+msgstr "خطأ أثناء فتح اتصال VPN '%s'"
+
+#: ../clients/cli/connections.c:4085
+#, fuzzy, c-format
+msgid "Error: invalid connection type; %s."
+msgstr "خطأ أثناء فتح اتصال VPN '%s'"
+
+#: ../clients/cli/connections.c:4162
+#, fuzzy, c-format
+msgid "Error: bad connection type: %s"
+msgstr "خطأ أثناء فتح اتصال VPN '%s'"
+
+#: ../clients/cli/connections.c:4208
+#, fuzzy, c-format
+msgid "Error: '%s': %s"
+msgstr "خطأ أثناء فتح اتصال VPN '%s'"
+
+#: ../clients/cli/connections.c:4229
+msgid "Error: master is required"
+msgstr ""
+
+#: ../clients/cli/connections.c:4288
+#, fuzzy, c-format
+msgid "Error: error adding bond option '%s=%s'."
+msgstr "خطأ أثناء فتح اتصال VPN '%s'"
+
+#: ../clients/cli/connections.c:4319
+#, c-format
+msgid "Error: '%s' is not a valid monitoring mode; use '%s' or '%s'.\n"
+msgstr ""
+
+#: ../clients/cli/connections.c:4350
+#, c-format
+msgid "Error: 'bt-type': '%s' not valid; use [%s, %s, %s (%s), %s]."
+msgstr ""
+
+#: ../clients/cli/connections.c:4599
+#, c-format
+msgid "Error: value for '%s' is missing."
+msgstr ""
+
+#: ../clients/cli/connections.c:4645
+msgid "Error: . argument is missing."
+msgstr ""
+
+#: ../clients/cli/connections.c:4668
+#, c-format
+msgid "Error: invalid or not allowed setting '%s': %s."
+msgstr ""
+
+#: ../clients/cli/connections.c:4714 ../clients/cli/connections.c:4730
+#, c-format
+msgid "Error: '%s' is ambiguous (%s.%s or %s.%s)."
+msgstr ""
+
+#: ../clients/cli/connections.c:4748
+#, c-format
+msgid "Error: invalid . '%s'."
+msgstr ""
+
+#: ../clients/cli/connections.c:4792 ../clients/cli/connections.c:8465
+#, fuzzy, c-format
+msgid "Error: Failed to add '%s' connection: %s"
+msgstr "خطأ أثناء فتح اتصال VPN '%s'"
+
+#: ../clients/cli/connections.c:4810
+#, c-format
+msgid ""
+"Warning: There is another connection with the name '%1$s'. Reference the "
+"connection by its uuid '%2$s'\n"
+msgid_plural ""
+"Warning: There are %3$u other connections with the name '%1$s'. Reference "
+"the connection by its uuid '%2$s'\n"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#: ../clients/cli/connections.c:4819
+#, c-format
+msgid "Connection '%s' (%s) successfully added.\n"
+msgstr ""
+
+#: ../clients/cli/connections.c:4872 ../clients/cli/connections.c:6839
+#: ../clients/cli/connections.c:6840 ../clients/cli/devices.c:535
+#: ../clients/cli/devices.c:542 ../clients/cli/devices.c:1207
+#: ../clients/cli/general.c:136 ../clients/cli/utils.h:296
+#: ../clients/common/nm-client-utils.c:279
+#: ../clients/common/nm-meta-setting-desc.c:771
+#: ../clients/common/nm-meta-setting-desc.c:2752
+#, fuzzy
+msgid "no"
+msgstr "بلا"
+
+#: ../clients/cli/connections.c:4873 ../clients/cli/connections.c:6839
+#: ../clients/cli/connections.c:6840 ../clients/cli/devices.c:534
+#: ../clients/cli/devices.c:541 ../clients/cli/devices.c:1207
+#: ../clients/cli/general.c:135 ../clients/cli/utils.h:296
+#: ../clients/common/nm-client-utils.c:278
+#: ../clients/common/nm-meta-setting-desc.c:771
+#: ../clients/common/nm-meta-setting-desc.c:2749
+msgid "yes"
+msgstr ""
+
+#: ../clients/cli/connections.c:4959
+#, c-format
+msgid ""
+"You can specify this option more than once. Press  when you're done.\n"
+msgstr ""
+
+#. Ask for optional arguments.
+#: ../clients/cli/connections.c:5061
+#, c-format
+msgid "There is %d optional setting for %s.\n"
+msgid_plural "There are %d optional settings for %s.\n"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#: ../clients/cli/connections.c:5067
+#, c-format
+msgid "Do you want to provide it? %s"
+msgid_plural "Do you want to provide them? %s"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#: ../clients/cli/connections.c:5200 ../clients/cli/utils.c:295
+#, c-format
+msgid "Error: value for '%s' argument is required."
+msgstr ""
+
+#: ../clients/cli/connections.c:5207
+#, c-format
+msgid "Error: 'save': %s."
+msgstr ""
+
+#: ../clients/cli/connections.c:5293 ../clients/cli/connections.c:5304
+#, c-format
+msgid "Error: '%s' argument is required."
+msgstr ""
+
+#: ../clients/cli/connections.c:6269
+#, c-format
+msgid "['%s' setting values]\n"
+msgstr ""
+
+#. TRANSLATORS: do not translate command names and keywords before ::
+#. *              However, you should translate terms enclosed in <>.
+#.
+#: ../clients/cli/connections.c:6378
+#, c-format
+msgid ""
+"---[ Main menu ]---\n"
+"goto     [ | ]        :: go to a setting or property\n"
+"remove   [.] |  :: remove setting or reset property "
+"value\n"
+"set      [. ]  :: set property value\n"
+"describe [.]          :: describe property\n"
+"print    [all | [.]]  :: print the connection\n"
+"verify   [all | fix]                 :: verify the connection\n"
+"save     [persistent|temporary]      :: save the connection\n"
+"activate [] [/|]    :: activate the connection\n"
+"back                                 :: go one level up (back)\n"
+"help/?   []                 :: print this help\n"
+"nmcli            :: nmcli configuration\n"
+"quit                                 :: exit nmcli\n"
+msgstr ""
+
+#: ../clients/cli/connections.c:6405
+#, c-format
+msgid ""
+"goto [.] |   :: enter setting/property for editing\n"
+"\n"
+"This command enters into a setting or property for editing it.\n"
+"\n"
+"Examples: nmcli> goto connection\n"
+"          nmcli connection> goto secondaries\n"
+"          nmcli> goto ipv4.addresses\n"
+msgstr ""
+
+#: ../clients/cli/connections.c:6412
+#, c-format
+msgid ""
+"remove [.]  :: remove setting or reset property value\n"
+"\n"
+"This command removes an entire setting from the connection, or if a "
+"property\n"
+"is given, resets that property to the default value.\n"
+"\n"
+"Examples: nmcli> remove wifi-sec\n"
+"          nmcli> remove eth.mtu\n"
+msgstr ""
+
+#: ../clients/cli/connections.c:6419
+#, c-format
+msgid ""
+"set [. ]  :: set property value\n"
+"\n"
+"This command sets property value.\n"
+"\n"
+"Example: nmcli> set con.id My connection\n"
+msgstr ""
+
+#: ../clients/cli/connections.c:6424
+#, c-format
+msgid ""
+"describe [.]  :: describe property\n"
+"\n"
+"Shows property description. You can consult nm-settings(5) manual page to "
+"see all NM settings and properties.\n"
+msgstr ""
+
+#: ../clients/cli/connections.c:6429
+#, c-format
+msgid ""
+"print [all]  :: print setting or connection values\n"
+"\n"
+"Shows current property or the whole connection.\n"
+"\n"
+"Example: nmcli ipv4> print all\n"
+msgstr ""
+
+#: ../clients/cli/connections.c:6434
+#, c-format
+msgid ""
+"verify [all | fix]  :: verify setting or connection validity\n"
+"\n"
+"Verifies whether the setting or connection is valid and can be saved later.\n"
+"It indicates invalid values on error. Some errors may be fixed "
+"automatically\n"
+"by 'fix' option.\n"
+"\n"
+"Examples: nmcli> verify\n"
+"          nmcli> verify fix\n"
+"          nmcli bond> verify\n"
+msgstr ""
+
+#: ../clients/cli/connections.c:6443
+#, c-format
+msgid ""
+"save [persistent|temporary]  :: save the connection\n"
+"\n"
+"Sends the connection profile to NetworkManager that either will save it\n"
+"persistently, or will only keep it in memory. 'save' without an argument\n"
+"means 'save persistent'.\n"
+"Note that once you save the profile persistently those settings are saved\n"
+"across reboot or restart. Subsequent changes can also be temporary or\n"
+"persistent, but any temporary changes will not persist across reboot or\n"
+"restart. If you want to fully remove the persistent connection, the "
+"connection\n"
+"profile must be deleted.\n"
+msgstr ""
+
+#: ../clients/cli/connections.c:6454
+#, c-format
+msgid ""
+"activate [] [/|]  :: activate the connection\n"
+"\n"
+"Activates the connection.\n"
+"\n"
+"Available options:\n"
+"    - device the connection will be activated on\n"
+"/| - AP (Wi-Fi) or NSP (WiMAX) (prepend with / when  is not "
+"specified)\n"
+msgstr ""
+
+#: ../clients/cli/connections.c:6461 ../clients/cli/connections.c:6619
+#, c-format
+msgid ""
+"back  :: go to upper menu level\n"
+"\n"
+msgstr ""
+
+#: ../clients/cli/connections.c:6464
+#, c-format
+msgid ""
+"help/? []  :: help for the nmcli commands\n"
+"\n"
+msgstr ""
+
+#: ../clients/cli/connections.c:6467
+#, c-format
+msgid ""
+"nmcli [ ]  :: nmcli configuration\n"
+"\n"
+"Configures nmcli. The following options are available:\n"
+"status-line yes | no          [default: no]\n"
+"save-confirmation yes | no    [default: yes]\n"
+"show-secrets yes | no         [default: no]\n"
+"prompt-color  | <0-8>  [default: 0]\n"
+"%s\n"
+"Examples: nmcli> nmcli status-line yes\n"
+"          nmcli> nmcli save-confirmation no\n"
+"          nmcli> nmcli prompt-color 3\n"
+msgstr ""
+
+#: ../clients/cli/connections.c:6489 ../clients/cli/connections.c:6625
+#, c-format
+msgid ""
+"quit  :: exit nmcli\n"
+"\n"
+"This command exits nmcli. When the connection being edited is not saved, the "
+"user is asked to confirm the action.\n"
+msgstr ""
+
+#: ../clients/cli/connections.c:6494 ../clients/cli/connections.c:6630
+#: ../clients/cli/connections.c:7065 ../clients/cli/connections.c:8048
+#, c-format
+msgid "Unknown command: '%s'\n"
+msgstr ""
+
+#. TRANSLATORS: do not translate command names and keywords before ::
+#. *              However, you should translate terms enclosed in <>.
+#.
+#: ../clients/cli/connections.c:6559
+#, c-format
+msgid ""
+"---[ Property menu ]---\n"
+"set      []               :: set new value\n"
+"add      []               :: add new option to the property\n"
+"change                           :: change current value\n"
+"remove   [ | 

 
     
     
     
     
     
     
     
     
     
     
     
   
   
     
     
   
   
     
     
     
     
   
   
     
     
     
     
     
     
     
     
     
     
     
     
     
     
   
   
     
     
     
   

 

-      for NetworkManager 1.16.0
+      for NetworkManager 1.18.0
 
       The latest version of this documentation can be found on-line at
       https://developer.gnome.org/NetworkManager/stable/.
diff --git a/docs/api/html/ix01.html b/docs/api/html/ix01.html
index 418d2038..72020dc9 100644
--- a/docs/api/html/ix01.html
+++ b/docs/api/html/ix01.html
@@ -26,1573 +26,1579 @@
 

 
Symbols

 

-
org.freedesktop.NetworkManager.AccessPoint, org.freedesktop.NetworkManager.AccessPoint
+
org.freedesktop.NetworkManager.AccessPoint, org.freedesktop.NetworkManager.AccessPoint
 

-
org.freedesktop.NetworkManager.AccessPoint::PropertiesChanged, The "PropertiesChanged" signal
+
org.freedesktop.NetworkManager.AccessPoint::PropertiesChanged, The "PropertiesChanged" signal
 

-
org.freedesktop.NetworkManager.AccessPoint:Flags, The "Flags" property
+
org.freedesktop.NetworkManager.AccessPoint:Flags, The "Flags" property
 

-
org.freedesktop.NetworkManager.AccessPoint:Frequency, The "Frequency" property
+
org.freedesktop.NetworkManager.AccessPoint:Frequency, The "Frequency" property
 

-
org.freedesktop.NetworkManager.AccessPoint:HwAddress, The "HwAddress" property
+
org.freedesktop.NetworkManager.AccessPoint:HwAddress, The "HwAddress" property
 

-
org.freedesktop.NetworkManager.AccessPoint:LastSeen, The "LastSeen" property
+
org.freedesktop.NetworkManager.AccessPoint:LastSeen, The "LastSeen" property
 

-
org.freedesktop.NetworkManager.AccessPoint:MaxBitrate, The "MaxBitrate" property
+
org.freedesktop.NetworkManager.AccessPoint:MaxBitrate, The "MaxBitrate" property
 

-
org.freedesktop.NetworkManager.AccessPoint:Mode, The "Mode" property
+
org.freedesktop.NetworkManager.AccessPoint:Mode, The "Mode" property
 

-
org.freedesktop.NetworkManager.AccessPoint:RsnFlags, The "RsnFlags" property
+
org.freedesktop.NetworkManager.AccessPoint:RsnFlags, The "RsnFlags" property
 

-
org.freedesktop.NetworkManager.AccessPoint:Ssid, The "Ssid" property
+
org.freedesktop.NetworkManager.AccessPoint:Ssid, The "Ssid" property
 

-
org.freedesktop.NetworkManager.AccessPoint:Strength, The "Strength" property
+
org.freedesktop.NetworkManager.AccessPoint:Strength, The "Strength" property
 

-
org.freedesktop.NetworkManager.AccessPoint:WpaFlags, The "WpaFlags" property
+
org.freedesktop.NetworkManager.AccessPoint:WpaFlags, The "WpaFlags" property
 

-
org.freedesktop.NetworkManager.AgentManager, org.freedesktop.NetworkManager.AgentManager
+
org.freedesktop.NetworkManager.AgentManager, org.freedesktop.NetworkManager.AgentManager
 

-
org.freedesktop.NetworkManager.AgentManager.Register(), The Register() method
+
org.freedesktop.NetworkManager.AgentManager.Register(), The Register() method
 

-
org.freedesktop.NetworkManager.AgentManager.RegisterWithCapabilities(), The RegisterWithCapabilities() method
+
org.freedesktop.NetworkManager.AgentManager.RegisterWithCapabilities(), The RegisterWithCapabilities() method
 

-
org.freedesktop.NetworkManager.AgentManager.Unregister(), The Unregister() method
+
org.freedesktop.NetworkManager.AgentManager.Unregister(), The Unregister() method
 

-
org.freedesktop.NetworkManager.Device, org.freedesktop.NetworkManager.Device
+
org.freedesktop.NetworkManager.Device, org.freedesktop.NetworkManager.Device
 

-
org.freedesktop.NetworkManager.Device.Adsl, org.freedesktop.NetworkManager.Device.Adsl
+
org.freedesktop.NetworkManager.Device.Adsl, org.freedesktop.NetworkManager.Device.Adsl
 

-
org.freedesktop.NetworkManager.Device.Adsl::PropertiesChanged, The "PropertiesChanged" signal
+
org.freedesktop.NetworkManager.Device.Adsl::PropertiesChanged, The "PropertiesChanged" signal
 

-
org.freedesktop.NetworkManager.Device.Adsl:Carrier, The "Carrier" property
+
org.freedesktop.NetworkManager.Device.Adsl:Carrier, The "Carrier" property
 

-
org.freedesktop.NetworkManager.Device.Bluetooth, org.freedesktop.NetworkManager.Device.Bluetooth
+
org.freedesktop.NetworkManager.Device.Bluetooth, org.freedesktop.NetworkManager.Device.Bluetooth
 

-
org.freedesktop.NetworkManager.Device.Bluetooth::PropertiesChanged, The "PropertiesChanged" signal
+
org.freedesktop.NetworkManager.Device.Bluetooth::PropertiesChanged, The "PropertiesChanged" signal
 

-
org.freedesktop.NetworkManager.Device.Bluetooth:BtCapabilities, The "BtCapabilities" property
+
org.freedesktop.NetworkManager.Device.Bluetooth:BtCapabilities, The "BtCapabilities" property
 

-
org.freedesktop.NetworkManager.Device.Bluetooth:HwAddress, The "HwAddress" property
+
org.freedesktop.NetworkManager.Device.Bluetooth:HwAddress, The "HwAddress" property
 

-
org.freedesktop.NetworkManager.Device.Bluetooth:Name, The "Name" property
+
org.freedesktop.NetworkManager.Device.Bluetooth:Name, The "Name" property
 

-
org.freedesktop.NetworkManager.Device.Bond, org.freedesktop.NetworkManager.Device.Bond
+
org.freedesktop.NetworkManager.Device.Bond, org.freedesktop.NetworkManager.Device.Bond
 

-
org.freedesktop.NetworkManager.Device.Bond::PropertiesChanged, The "PropertiesChanged" signal
+
org.freedesktop.NetworkManager.Device.Bond::PropertiesChanged, The "PropertiesChanged" signal
 

-
org.freedesktop.NetworkManager.Device.Bond:Carrier, The "Carrier" property
+
org.freedesktop.NetworkManager.Device.Bond:Carrier, The "Carrier" property
 

-
org.freedesktop.NetworkManager.Device.Bond:HwAddress, The "HwAddress" property
+
org.freedesktop.NetworkManager.Device.Bond:HwAddress, The "HwAddress" property
 

-
org.freedesktop.NetworkManager.Device.Bond:Slaves, The "Slaves" property
+
org.freedesktop.NetworkManager.Device.Bond:Slaves, The "Slaves" property
 

-
org.freedesktop.NetworkManager.Device.Bridge, org.freedesktop.NetworkManager.Device.Bridge
+
org.freedesktop.NetworkManager.Device.Bridge, org.freedesktop.NetworkManager.Device.Bridge
 

-
org.freedesktop.NetworkManager.Device.Bridge::PropertiesChanged, The "PropertiesChanged" signal
+
org.freedesktop.NetworkManager.Device.Bridge::PropertiesChanged, The "PropertiesChanged" signal
 

-
org.freedesktop.NetworkManager.Device.Bridge:Carrier, The "Carrier" property
+
org.freedesktop.NetworkManager.Device.Bridge:Carrier, The "Carrier" property
 

-
org.freedesktop.NetworkManager.Device.Bridge:HwAddress, The "HwAddress" property
+
org.freedesktop.NetworkManager.Device.Bridge:HwAddress, The "HwAddress" property
 

-
org.freedesktop.NetworkManager.Device.Bridge:Slaves, The "Slaves" property
+
org.freedesktop.NetworkManager.Device.Bridge:Slaves, The "Slaves" property
 

-
org.freedesktop.NetworkManager.Device.Delete(), The Delete() method
+
org.freedesktop.NetworkManager.Device.Delete(), The Delete() method
 

-
org.freedesktop.NetworkManager.Device.Disconnect(), The Disconnect() method
+
org.freedesktop.NetworkManager.Device.Disconnect(), The Disconnect() method
 

-
org.freedesktop.NetworkManager.Device.Dummy, org.freedesktop.NetworkManager.Device.Dummy
+
org.freedesktop.NetworkManager.Device.Dummy, org.freedesktop.NetworkManager.Device.Dummy
 

-
org.freedesktop.NetworkManager.Device.Dummy::PropertiesChanged, The "PropertiesChanged" signal
+
org.freedesktop.NetworkManager.Device.Dummy::PropertiesChanged, The "PropertiesChanged" signal
 

-
org.freedesktop.NetworkManager.Device.Dummy:HwAddress, The "HwAddress" property
+
org.freedesktop.NetworkManager.Device.Dummy:HwAddress, The "HwAddress" property
 

-
org.freedesktop.NetworkManager.Device.Generic, org.freedesktop.NetworkManager.Device.Generic
+
org.freedesktop.NetworkManager.Device.Generic, org.freedesktop.NetworkManager.Device.Generic
 

-
org.freedesktop.NetworkManager.Device.Generic::PropertiesChanged, The "PropertiesChanged" signal
+
org.freedesktop.NetworkManager.Device.Generic::PropertiesChanged, The "PropertiesChanged" signal
 

-
org.freedesktop.NetworkManager.Device.Generic:HwAddress, The "HwAddress" property
+
org.freedesktop.NetworkManager.Device.Generic:HwAddress, The "HwAddress" property
 

-
org.freedesktop.NetworkManager.Device.Generic:TypeDescription, The "TypeDescription" property
+
org.freedesktop.NetworkManager.Device.Generic:TypeDescription, The "TypeDescription" property
 

-
org.freedesktop.NetworkManager.Device.GetAppliedConnection(), The GetAppliedConnection() method
+
org.freedesktop.NetworkManager.Device.GetAppliedConnection(), The GetAppliedConnection() method
 

-
org.freedesktop.NetworkManager.Device.Infiniband, org.freedesktop.NetworkManager.Device.Infiniband
+
org.freedesktop.NetworkManager.Device.Infiniband, org.freedesktop.NetworkManager.Device.Infiniband
 

-
org.freedesktop.NetworkManager.Device.Infiniband::PropertiesChanged, The "PropertiesChanged" signal
+
org.freedesktop.NetworkManager.Device.Infiniband::PropertiesChanged, The "PropertiesChanged" signal
 

-
org.freedesktop.NetworkManager.Device.Infiniband:Carrier, The "Carrier" property
+
org.freedesktop.NetworkManager.Device.Infiniband:Carrier, The "Carrier" property
 

-
org.freedesktop.NetworkManager.Device.Infiniband:HwAddress, The "HwAddress" property
+
org.freedesktop.NetworkManager.Device.Infiniband:HwAddress, The "HwAddress" property
 

-
org.freedesktop.NetworkManager.Device.IPTunnel, org.freedesktop.NetworkManager.Device.IPTunnel
+
org.freedesktop.NetworkManager.Device.IPTunnel, org.freedesktop.NetworkManager.Device.IPTunnel
 

-
org.freedesktop.NetworkManager.Device.IPTunnel::PropertiesChanged, The "PropertiesChanged" signal
+
org.freedesktop.NetworkManager.Device.IPTunnel::PropertiesChanged, The "PropertiesChanged" signal
 

-
org.freedesktop.NetworkManager.Device.IPTunnel:EncapsulationLimit, The "EncapsulationLimit" property
+
org.freedesktop.NetworkManager.Device.IPTunnel:EncapsulationLimit, The "EncapsulationLimit" property
 

-
org.freedesktop.NetworkManager.Device.IPTunnel:Flags, The "Flags" property
+
org.freedesktop.NetworkManager.Device.IPTunnel:Flags, The "Flags" property
 

-
org.freedesktop.NetworkManager.Device.IPTunnel:FlowLabel, The "FlowLabel" property
+
org.freedesktop.NetworkManager.Device.IPTunnel:FlowLabel, The "FlowLabel" property
 

-
org.freedesktop.NetworkManager.Device.IPTunnel:InputKey, The "InputKey" property
+
org.freedesktop.NetworkManager.Device.IPTunnel:InputKey, The "InputKey" property
 

-
org.freedesktop.NetworkManager.Device.IPTunnel:Local, The "Local" property
+
org.freedesktop.NetworkManager.Device.IPTunnel:Local, The "Local" property
 

-
org.freedesktop.NetworkManager.Device.IPTunnel:Mode, The "Mode" property
+
org.freedesktop.NetworkManager.Device.IPTunnel:Mode, The "Mode" property
 

-
org.freedesktop.NetworkManager.Device.IPTunnel:OutputKey, The "OutputKey" property
+
org.freedesktop.NetworkManager.Device.IPTunnel:OutputKey, The "OutputKey" property
 

-
org.freedesktop.NetworkManager.Device.IPTunnel:Parent, The "Parent" property
+
org.freedesktop.NetworkManager.Device.IPTunnel:Parent, The "Parent" property
 

-
org.freedesktop.NetworkManager.Device.IPTunnel:PathMtuDiscovery, The "PathMtuDiscovery" property
+
org.freedesktop.NetworkManager.Device.IPTunnel:PathMtuDiscovery, The "PathMtuDiscovery" property
 

-
org.freedesktop.NetworkManager.Device.IPTunnel:Remote, The "Remote" property
+
org.freedesktop.NetworkManager.Device.IPTunnel:Remote, The "Remote" property
 

-
org.freedesktop.NetworkManager.Device.IPTunnel:Tos, The "Tos" property
+
org.freedesktop.NetworkManager.Device.IPTunnel:Tos, The "Tos" property
 

-
org.freedesktop.NetworkManager.Device.IPTunnel:Ttl, The "Ttl" property
+
org.freedesktop.NetworkManager.Device.IPTunnel:Ttl, The "Ttl" property
 

-
org.freedesktop.NetworkManager.Device.Lowpan, org.freedesktop.NetworkManager.Device.Lowpan
+
org.freedesktop.NetworkManager.Device.Lowpan, org.freedesktop.NetworkManager.Device.Lowpan
 

-
org.freedesktop.NetworkManager.Device.Lowpan:HwAddress, The "HwAddress" property
+
org.freedesktop.NetworkManager.Device.Lowpan:HwAddress, The "HwAddress" property
 

-
org.freedesktop.NetworkManager.Device.Lowpan:Parent, The "Parent" property
+
org.freedesktop.NetworkManager.Device.Lowpan:Parent, The "Parent" property
 

-
org.freedesktop.NetworkManager.Device.Macsec, org.freedesktop.NetworkManager.Device.Macsec
+
org.freedesktop.NetworkManager.Device.Macsec, org.freedesktop.NetworkManager.Device.Macsec
 

-
org.freedesktop.NetworkManager.Device.Macsec::PropertiesChanged, The "PropertiesChanged" signal
+
org.freedesktop.NetworkManager.Device.Macsec::PropertiesChanged, The "PropertiesChanged" signal
 

-
org.freedesktop.NetworkManager.Device.Macsec:CipherSuite, The "CipherSuite" property
+
org.freedesktop.NetworkManager.Device.Macsec:CipherSuite, The "CipherSuite" property
 

-
org.freedesktop.NetworkManager.Device.Macsec:EncodingSa, The "EncodingSa" property
+
org.freedesktop.NetworkManager.Device.Macsec:EncodingSa, The "EncodingSa" property
 

-
org.freedesktop.NetworkManager.Device.Macsec:Encrypt, The "Encrypt" property
+
org.freedesktop.NetworkManager.Device.Macsec:Encrypt, The "Encrypt" property
 

-
org.freedesktop.NetworkManager.Device.Macsec:Es, The "Es" property
+
org.freedesktop.NetworkManager.Device.Macsec:Es, The "Es" property
 

-
org.freedesktop.NetworkManager.Device.Macsec:IcvLength, The "IcvLength" property
+
org.freedesktop.NetworkManager.Device.Macsec:IcvLength, The "IcvLength" property
 

-
org.freedesktop.NetworkManager.Device.Macsec:IncludeSci, The "IncludeSci" property
+
org.freedesktop.NetworkManager.Device.Macsec:IncludeSci, The "IncludeSci" property
 

-
org.freedesktop.NetworkManager.Device.Macsec:Parent, The "Parent" property
+
org.freedesktop.NetworkManager.Device.Macsec:Parent, The "Parent" property
 

-
org.freedesktop.NetworkManager.Device.Macsec:Protect, The "Protect" property
+
org.freedesktop.NetworkManager.Device.Macsec:Protect, The "Protect" property
 

-
org.freedesktop.NetworkManager.Device.Macsec:ReplayProtect, The "ReplayProtect" property
+
org.freedesktop.NetworkManager.Device.Macsec:ReplayProtect, The "ReplayProtect" property
 

-
org.freedesktop.NetworkManager.Device.Macsec:Scb, The "Scb" property
+
org.freedesktop.NetworkManager.Device.Macsec:Scb, The "Scb" property
 

-
org.freedesktop.NetworkManager.Device.Macsec:Sci, The "Sci" property
+
org.freedesktop.NetworkManager.Device.Macsec:Sci, The "Sci" property
 

-
org.freedesktop.NetworkManager.Device.Macsec:Validation, The "Validation" property
+
org.freedesktop.NetworkManager.Device.Macsec:Validation, The "Validation" property
 

-
org.freedesktop.NetworkManager.Device.Macsec:Window, The "Window" property
+
org.freedesktop.NetworkManager.Device.Macsec:Window, The "Window" property
 

-
org.freedesktop.NetworkManager.Device.Macvlan, org.freedesktop.NetworkManager.Device.Macvlan
+
org.freedesktop.NetworkManager.Device.Macvlan, org.freedesktop.NetworkManager.Device.Macvlan
 

-
org.freedesktop.NetworkManager.Device.Macvlan::PropertiesChanged, The "PropertiesChanged" signal
+
org.freedesktop.NetworkManager.Device.Macvlan::PropertiesChanged, The "PropertiesChanged" signal
 

-
org.freedesktop.NetworkManager.Device.Macvlan:Mode, The "Mode" property
+
org.freedesktop.NetworkManager.Device.Macvlan:Mode, The "Mode" property
 

-
org.freedesktop.NetworkManager.Device.Macvlan:NoPromisc, The "NoPromisc" property
+
org.freedesktop.NetworkManager.Device.Macvlan:NoPromisc, The "NoPromisc" property
 

-
org.freedesktop.NetworkManager.Device.Macvlan:Parent, The "Parent" property
+
org.freedesktop.NetworkManager.Device.Macvlan:Parent, The "Parent" property
 

-
org.freedesktop.NetworkManager.Device.Macvlan:Tap, The "Tap" property
+
org.freedesktop.NetworkManager.Device.Macvlan:Tap, The "Tap" property
 

-
org.freedesktop.NetworkManager.Device.Modem, org.freedesktop.NetworkManager.Device.Modem
+
org.freedesktop.NetworkManager.Device.Modem, org.freedesktop.NetworkManager.Device.Modem
 

-
org.freedesktop.NetworkManager.Device.Modem::PropertiesChanged, The "PropertiesChanged" signal
+
org.freedesktop.NetworkManager.Device.Modem::PropertiesChanged, The "PropertiesChanged" signal
 

-
org.freedesktop.NetworkManager.Device.Modem:CurrentCapabilities, The "CurrentCapabilities" property
+
org.freedesktop.NetworkManager.Device.Modem:CurrentCapabilities, The "CurrentCapabilities" property
 

-
org.freedesktop.NetworkManager.Device.Modem:ModemCapabilities, The "ModemCapabilities" property
+
org.freedesktop.NetworkManager.Device.Modem:ModemCapabilities, The "ModemCapabilities" property
 

-
org.freedesktop.NetworkManager.Device.OlpcMesh, org.freedesktop.NetworkManager.Device.OlpcMesh
+
org.freedesktop.NetworkManager.Device.OlpcMesh, org.freedesktop.NetworkManager.Device.OlpcMesh
 

-
org.freedesktop.NetworkManager.Device.OlpcMesh::PropertiesChanged, The "PropertiesChanged" signal
+
org.freedesktop.NetworkManager.Device.OlpcMesh::PropertiesChanged, The "PropertiesChanged" signal
 

-
org.freedesktop.NetworkManager.Device.OlpcMesh:ActiveChannel, The "ActiveChannel" property
+
org.freedesktop.NetworkManager.Device.OlpcMesh:ActiveChannel, The "ActiveChannel" property
 

-
org.freedesktop.NetworkManager.Device.OlpcMesh:Companion, The "Companion" property
+
org.freedesktop.NetworkManager.Device.OlpcMesh:Companion, The "Companion" property
 

-
org.freedesktop.NetworkManager.Device.OlpcMesh:HwAddress, The "HwAddress" property
+
org.freedesktop.NetworkManager.Device.OlpcMesh:HwAddress, The "HwAddress" property
 

-
org.freedesktop.NetworkManager.Device.OvsBridge, org.freedesktop.NetworkManager.Device.OvsBridge
+
org.freedesktop.NetworkManager.Device.OvsBridge, org.freedesktop.NetworkManager.Device.OvsBridge
 

-
org.freedesktop.NetworkManager.Device.OvsBridge::PropertiesChanged, The "PropertiesChanged" signal
+
org.freedesktop.NetworkManager.Device.OvsBridge::PropertiesChanged, The "PropertiesChanged" signal
 

-
org.freedesktop.NetworkManager.Device.OvsBridge:Slaves, The "Slaves" property
+
org.freedesktop.NetworkManager.Device.OvsBridge:Slaves, The "Slaves" property
 

-
org.freedesktop.NetworkManager.Device.OvsInterface, org.freedesktop.NetworkManager.Device.OvsInterface
+
org.freedesktop.NetworkManager.Device.OvsInterface, org.freedesktop.NetworkManager.Device.OvsInterface
 

-
org.freedesktop.NetworkManager.Device.OvsInterface::PropertiesChanged, The "PropertiesChanged" signal
+
org.freedesktop.NetworkManager.Device.OvsInterface::PropertiesChanged, The "PropertiesChanged" signal
 

-
org.freedesktop.NetworkManager.Device.OvsPort, org.freedesktop.NetworkManager.Device.OvsPort
+
org.freedesktop.NetworkManager.Device.OvsPort, org.freedesktop.NetworkManager.Device.OvsPort
 

-
org.freedesktop.NetworkManager.Device.OvsPort::PropertiesChanged, The "PropertiesChanged" signal
+
org.freedesktop.NetworkManager.Device.OvsPort::PropertiesChanged, The "PropertiesChanged" signal
 

-
org.freedesktop.NetworkManager.Device.OvsPort:Slaves, The "Slaves" property
+
org.freedesktop.NetworkManager.Device.OvsPort:Slaves, The "Slaves" property
 

-
org.freedesktop.NetworkManager.Device.Ppp, org.freedesktop.NetworkManager.Device.Ppp
+
org.freedesktop.NetworkManager.Device.Ppp, org.freedesktop.NetworkManager.Device.Ppp
 

-
org.freedesktop.NetworkManager.Device.Ppp::PropertiesChanged, The "PropertiesChanged" signal
+
org.freedesktop.NetworkManager.Device.Ppp::PropertiesChanged, The "PropertiesChanged" signal
 

-
org.freedesktop.NetworkManager.Device.Reapply(), The Reapply() method
+
org.freedesktop.NetworkManager.Device.Reapply(), The Reapply() method
 

-
org.freedesktop.NetworkManager.Device.Statistics, org.freedesktop.NetworkManager.Device.Statistics
+
org.freedesktop.NetworkManager.Device.Statistics, org.freedesktop.NetworkManager.Device.Statistics
 

-
org.freedesktop.NetworkManager.Device.Statistics::PropertiesChanged, The "PropertiesChanged" signal
+
org.freedesktop.NetworkManager.Device.Statistics::PropertiesChanged, The "PropertiesChanged" signal
 

-
org.freedesktop.NetworkManager.Device.Statistics:RefreshRateMs, The "RefreshRateMs" property
+
org.freedesktop.NetworkManager.Device.Statistics:RefreshRateMs, The "RefreshRateMs" property
 

-
org.freedesktop.NetworkManager.Device.Statistics:RxBytes, The "RxBytes" property
+
org.freedesktop.NetworkManager.Device.Statistics:RxBytes, The "RxBytes" property
 

-
org.freedesktop.NetworkManager.Device.Statistics:TxBytes, The "TxBytes" property
+
org.freedesktop.NetworkManager.Device.Statistics:TxBytes, The "TxBytes" property
 

-
org.freedesktop.NetworkManager.Device.Team, org.freedesktop.NetworkManager.Device.Team
+
org.freedesktop.NetworkManager.Device.Team, org.freedesktop.NetworkManager.Device.Team
 

-
org.freedesktop.NetworkManager.Device.Team::PropertiesChanged, The "PropertiesChanged" signal
+
org.freedesktop.NetworkManager.Device.Team::PropertiesChanged, The "PropertiesChanged" signal
 

-
org.freedesktop.NetworkManager.Device.Team:Carrier, The "Carrier" property
+
org.freedesktop.NetworkManager.Device.Team:Carrier, The "Carrier" property
 

-
org.freedesktop.NetworkManager.Device.Team:Config, The "Config" property
+
org.freedesktop.NetworkManager.Device.Team:Config, The "Config" property
 

-
org.freedesktop.NetworkManager.Device.Team:HwAddress, The "HwAddress" property
+
org.freedesktop.NetworkManager.Device.Team:HwAddress, The "HwAddress" property
 

-
org.freedesktop.NetworkManager.Device.Team:Slaves, The "Slaves" property
+
org.freedesktop.NetworkManager.Device.Team:Slaves, The "Slaves" property
 

-
org.freedesktop.NetworkManager.Device.Tun, org.freedesktop.NetworkManager.Device.Tun
+
org.freedesktop.NetworkManager.Device.Tun, org.freedesktop.NetworkManager.Device.Tun
 

-
org.freedesktop.NetworkManager.Device.Tun::PropertiesChanged, The "PropertiesChanged" signal
+
org.freedesktop.NetworkManager.Device.Tun::PropertiesChanged, The "PropertiesChanged" signal
 

-
org.freedesktop.NetworkManager.Device.Tun:Group, The "Group" property
+
org.freedesktop.NetworkManager.Device.Tun:Group, The "Group" property
 

-
org.freedesktop.NetworkManager.Device.Tun:HwAddress, The "HwAddress" property
+
org.freedesktop.NetworkManager.Device.Tun:HwAddress, The "HwAddress" property
 

-
org.freedesktop.NetworkManager.Device.Tun:Mode, The "Mode" property
+
org.freedesktop.NetworkManager.Device.Tun:Mode, The "Mode" property
 

-
org.freedesktop.NetworkManager.Device.Tun:MultiQueue, The "MultiQueue" property
+
org.freedesktop.NetworkManager.Device.Tun:MultiQueue, The "MultiQueue" property
 

-
org.freedesktop.NetworkManager.Device.Tun:NoPi, The "NoPi" property
+
org.freedesktop.NetworkManager.Device.Tun:NoPi, The "NoPi" property
 

-
org.freedesktop.NetworkManager.Device.Tun:Owner, The "Owner" property
+
org.freedesktop.NetworkManager.Device.Tun:Owner, The "Owner" property
 

-
org.freedesktop.NetworkManager.Device.Tun:VnetHdr, The "VnetHdr" property
+
org.freedesktop.NetworkManager.Device.Tun:VnetHdr, The "VnetHdr" property
 

-
org.freedesktop.NetworkManager.Device.Veth, org.freedesktop.NetworkManager.Device.Veth
+
org.freedesktop.NetworkManager.Device.Veth, org.freedesktop.NetworkManager.Device.Veth
 

-
org.freedesktop.NetworkManager.Device.Veth::PropertiesChanged, The "PropertiesChanged" signal
+
org.freedesktop.NetworkManager.Device.Veth::PropertiesChanged, The "PropertiesChanged" signal
 

-
org.freedesktop.NetworkManager.Device.Veth:Peer, The "Peer" property
+
org.freedesktop.NetworkManager.Device.Veth:Peer, The "Peer" property
 

-
org.freedesktop.NetworkManager.Device.Vlan, org.freedesktop.NetworkManager.Device.Vlan
+
org.freedesktop.NetworkManager.Device.Vlan, org.freedesktop.NetworkManager.Device.Vlan
 

-
org.freedesktop.NetworkManager.Device.Vlan::PropertiesChanged, The "PropertiesChanged" signal
+
org.freedesktop.NetworkManager.Device.Vlan::PropertiesChanged, The "PropertiesChanged" signal
 

-
org.freedesktop.NetworkManager.Device.Vlan:Carrier, The "Carrier" property
+
org.freedesktop.NetworkManager.Device.Vlan:Carrier, The "Carrier" property
 

-
org.freedesktop.NetworkManager.Device.Vlan:HwAddress, The "HwAddress" property
+
org.freedesktop.NetworkManager.Device.Vlan:HwAddress, The "HwAddress" property
 

-
org.freedesktop.NetworkManager.Device.Vlan:Parent, The "Parent" property
+
org.freedesktop.NetworkManager.Device.Vlan:Parent, The "Parent" property
 

-
org.freedesktop.NetworkManager.Device.Vlan:VlanId, The "VlanId" property
+
org.freedesktop.NetworkManager.Device.Vlan:VlanId, The "VlanId" property
 

-
org.freedesktop.NetworkManager.Device.Vxlan, org.freedesktop.NetworkManager.Device.Vxlan
+
org.freedesktop.NetworkManager.Device.Vxlan, org.freedesktop.NetworkManager.Device.Vxlan
 

-
org.freedesktop.NetworkManager.Device.Vxlan::PropertiesChanged, The "PropertiesChanged" signal
+
org.freedesktop.NetworkManager.Device.Vxlan::PropertiesChanged, The "PropertiesChanged" signal
 

-
org.freedesktop.NetworkManager.Device.Vxlan:Ageing, The "Ageing" property
+
org.freedesktop.NetworkManager.Device.Vxlan:Ageing, The "Ageing" property
 

-
org.freedesktop.NetworkManager.Device.Vxlan:DstPort, The "DstPort" property
+
org.freedesktop.NetworkManager.Device.Vxlan:DstPort, The "DstPort" property
 

-
org.freedesktop.NetworkManager.Device.Vxlan:Group, The "Group" property
+
org.freedesktop.NetworkManager.Device.Vxlan:Group, The "Group" property
 

-
org.freedesktop.NetworkManager.Device.Vxlan:HwAddress, The "HwAddress" property
+
org.freedesktop.NetworkManager.Device.Vxlan:HwAddress, The "HwAddress" property
 

-
org.freedesktop.NetworkManager.Device.Vxlan:Id, The "Id" property
+
org.freedesktop.NetworkManager.Device.Vxlan:Id, The "Id" property
 

-
org.freedesktop.NetworkManager.Device.Vxlan:L2miss, The "L2miss" property
+
org.freedesktop.NetworkManager.Device.Vxlan:L2miss, The "L2miss" property
 

-
org.freedesktop.NetworkManager.Device.Vxlan:L3miss, The "L3miss" property
+
org.freedesktop.NetworkManager.Device.Vxlan:L3miss, The "L3miss" property
 

-
org.freedesktop.NetworkManager.Device.Vxlan:Learning, The "Learning" property
+
org.freedesktop.NetworkManager.Device.Vxlan:Learning, The "Learning" property
 

-
org.freedesktop.NetworkManager.Device.Vxlan:Limit, The "Limit" property
+
org.freedesktop.NetworkManager.Device.Vxlan:Limit, The "Limit" property
 

-
org.freedesktop.NetworkManager.Device.Vxlan:Local, The "Local" property
+
org.freedesktop.NetworkManager.Device.Vxlan:Local, The "Local" property
 

-
org.freedesktop.NetworkManager.Device.Vxlan:Parent, The "Parent" property
+
org.freedesktop.NetworkManager.Device.Vxlan:Parent, The "Parent" property
 

-
org.freedesktop.NetworkManager.Device.Vxlan:Proxy, The "Proxy" property
+
org.freedesktop.NetworkManager.Device.Vxlan:Proxy, The "Proxy" property
 

-
org.freedesktop.NetworkManager.Device.Vxlan:Rsc, The "Rsc" property
+
org.freedesktop.NetworkManager.Device.Vxlan:Rsc, The "Rsc" property
 

-
org.freedesktop.NetworkManager.Device.Vxlan:SrcPortMax, The "SrcPortMax" property
+
org.freedesktop.NetworkManager.Device.Vxlan:SrcPortMax, The "SrcPortMax" property
 

-
org.freedesktop.NetworkManager.Device.Vxlan:SrcPortMin, The "SrcPortMin" property
+
org.freedesktop.NetworkManager.Device.Vxlan:SrcPortMin, The "SrcPortMin" property
 

-
org.freedesktop.NetworkManager.Device.Vxlan:Tos, The "Tos" property
+
org.freedesktop.NetworkManager.Device.Vxlan:Tos, The "Tos" property
 

-
org.freedesktop.NetworkManager.Device.Vxlan:Ttl, The "Ttl" property
+
org.freedesktop.NetworkManager.Device.Vxlan:Ttl, The "Ttl" property
 

-
org.freedesktop.NetworkManager.Device.WireGuard, org.freedesktop.NetworkManager.Device.WireGuard
+
org.freedesktop.NetworkManager.Device.WireGuard, org.freedesktop.NetworkManager.Device.WireGuard
 

-
org.freedesktop.NetworkManager.Device.WireGuard:FwMark, The "FwMark" property
+
org.freedesktop.NetworkManager.Device.WireGuard:FwMark, The "FwMark" property
 

-
org.freedesktop.NetworkManager.Device.WireGuard:ListenPort, The "ListenPort" property
+
org.freedesktop.NetworkManager.Device.WireGuard:ListenPort, The "ListenPort" property
 

-
org.freedesktop.NetworkManager.Device.WireGuard:PublicKey, The "PublicKey" property
+
org.freedesktop.NetworkManager.Device.WireGuard:PublicKey, The "PublicKey" property
 

-
org.freedesktop.NetworkManager.Device.Wpan, org.freedesktop.NetworkManager.Device.Wpan
+
org.freedesktop.NetworkManager.Device.Wpan, org.freedesktop.NetworkManager.Device.Wpan
 

-
org.freedesktop.NetworkManager.Device.Wpan:HwAddress, The "HwAddress" property
+
org.freedesktop.NetworkManager.Device.Wpan:HwAddress, The "HwAddress" property
 

-
org.freedesktop.NetworkManager.Device::StateChanged, The "StateChanged" signal
+
org.freedesktop.NetworkManager.Device::StateChanged, The "StateChanged" signal
 

-
org.freedesktop.NetworkManager.Device:ActiveConnection, The "ActiveConnection" property
+
org.freedesktop.NetworkManager.Device:ActiveConnection, The "ActiveConnection" property
 

-
org.freedesktop.NetworkManager.Device:Autoconnect, The "Autoconnect" property
+
org.freedesktop.NetworkManager.Device:Autoconnect, The "Autoconnect" property
 

-
org.freedesktop.NetworkManager.Device:AvailableConnections, The "AvailableConnections" property
+
org.freedesktop.NetworkManager.Device:AvailableConnections, The "AvailableConnections" property
 

-
org.freedesktop.NetworkManager.Device:Capabilities, The "Capabilities" property
+
org.freedesktop.NetworkManager.Device:Capabilities, The "Capabilities" property
 

-
org.freedesktop.NetworkManager.Device:DeviceType, The "DeviceType" property
+
org.freedesktop.NetworkManager.Device:DeviceType, The "DeviceType" property
 

-
org.freedesktop.NetworkManager.Device:Dhcp4Config, The "Dhcp4Config" property
+
org.freedesktop.NetworkManager.Device:Dhcp4Config, The "Dhcp4Config" property
 

-
org.freedesktop.NetworkManager.Device:Dhcp6Config, The "Dhcp6Config" property
+
org.freedesktop.NetworkManager.Device:Dhcp6Config, The "Dhcp6Config" property
 

-
org.freedesktop.NetworkManager.Device:Driver, The "Driver" property
+
org.freedesktop.NetworkManager.Device:Driver, The "Driver" property
 

-
org.freedesktop.NetworkManager.Device:DriverVersion, The "DriverVersion" property
+
org.freedesktop.NetworkManager.Device:DriverVersion, The "DriverVersion" property
 

-
org.freedesktop.NetworkManager.Device:FirmwareMissing, The "FirmwareMissing" property
+
org.freedesktop.NetworkManager.Device:FirmwareMissing, The "FirmwareMissing" property
 

-
org.freedesktop.NetworkManager.Device:FirmwareVersion, The "FirmwareVersion" property
+
org.freedesktop.NetworkManager.Device:FirmwareVersion, The "FirmwareVersion" property
 

-
org.freedesktop.NetworkManager.Device:Interface, The "Interface" property
+
org.freedesktop.NetworkManager.Device:Interface, The "Interface" property
 

-
org.freedesktop.NetworkManager.Device:Ip4Address, The "Ip4Address" property
+
org.freedesktop.NetworkManager.Device:Ip4Address, The "Ip4Address" property
 

-
org.freedesktop.NetworkManager.Device:Ip4Config, The "Ip4Config" property
+
org.freedesktop.NetworkManager.Device:Ip4Config, The "Ip4Config" property
 

-
org.freedesktop.NetworkManager.Device:Ip4Connectivity, The "Ip4Connectivity" property
+
org.freedesktop.NetworkManager.Device:Ip4Connectivity, The "Ip4Connectivity" property
 

-
org.freedesktop.NetworkManager.Device:Ip6Config, The "Ip6Config" property
+
org.freedesktop.NetworkManager.Device:Ip6Config, The "Ip6Config" property
 

-
org.freedesktop.NetworkManager.Device:Ip6Connectivity, The "Ip6Connectivity" property
+
org.freedesktop.NetworkManager.Device:Ip6Connectivity, The "Ip6Connectivity" property
 

-
org.freedesktop.NetworkManager.Device:IpInterface, The "IpInterface" property
+
org.freedesktop.NetworkManager.Device:IpInterface, The "IpInterface" property
 

-
org.freedesktop.NetworkManager.Device:LldpNeighbors, The "LldpNeighbors" property
+
org.freedesktop.NetworkManager.Device:LldpNeighbors, The "LldpNeighbors" property
 

-
org.freedesktop.NetworkManager.Device:Managed, The "Managed" property
+
org.freedesktop.NetworkManager.Device:Managed, The "Managed" property
 

-
org.freedesktop.NetworkManager.Device:Metered, The "Metered" property
+
org.freedesktop.NetworkManager.Device:Metered, The "Metered" property
 

-
org.freedesktop.NetworkManager.Device:Mtu, The "Mtu" property
+
org.freedesktop.NetworkManager.Device:Mtu, The "Mtu" property
 

-
org.freedesktop.NetworkManager.Device:NmPluginMissing, The "NmPluginMissing" property
+
org.freedesktop.NetworkManager.Device:NmPluginMissing, The "NmPluginMissing" property
 

-
org.freedesktop.NetworkManager.Device:PhysicalPortId, The "PhysicalPortId" property
+
org.freedesktop.NetworkManager.Device:PhysicalPortId, The "PhysicalPortId" property
 

-
org.freedesktop.NetworkManager.Device:Real, The "Real" property
+
org.freedesktop.NetworkManager.Device:Real, The "Real" property
 

-
org.freedesktop.NetworkManager.Device:State, The "State" property
+
org.freedesktop.NetworkManager.Device:State, The "State" property
 

-
org.freedesktop.NetworkManager.Device:StateReason, The "StateReason" property
+
org.freedesktop.NetworkManager.Device:StateReason, The "StateReason" property
 

-
org.freedesktop.NetworkManager.Device:Udi, The "Udi" property
+
org.freedesktop.NetworkManager.Device:Udi, The "Udi" property
 

-
org.freedesktop.NetworkManager.DnsManager, org.freedesktop.NetworkManager.DnsManager
+
org.freedesktop.NetworkManager.DnsManager, org.freedesktop.NetworkManager.DnsManager
 

-
org.freedesktop.NetworkManager.DnsManager:Configuration, The "Configuration" property
+
org.freedesktop.NetworkManager.DnsManager:Configuration, The "Configuration" property
 

-
org.freedesktop.NetworkManager.DnsManager:Mode, The "Mode" property
+
org.freedesktop.NetworkManager.DnsManager:Mode, The "Mode" property
 

-
org.freedesktop.NetworkManager.DnsManager:RcManager, The "RcManager" property
+
org.freedesktop.NetworkManager.DnsManager:RcManager, The "RcManager" property
 

-
org.freedesktop.NetworkManager.IP4Config, org.freedesktop.NetworkManager.IP4Config
+
org.freedesktop.NetworkManager.IP4Config, org.freedesktop.NetworkManager.IP4Config
 

-
org.freedesktop.NetworkManager.IP4Config::PropertiesChanged, The "PropertiesChanged" signal
+
org.freedesktop.NetworkManager.IP4Config::PropertiesChanged, The "PropertiesChanged" signal
 

-
org.freedesktop.NetworkManager.IP4Config:AddressData, The "AddressData" property
+
org.freedesktop.NetworkManager.IP4Config:AddressData, The "AddressData" property
 

-
org.freedesktop.NetworkManager.IP4Config:Addresses, The "Addresses" property
+
org.freedesktop.NetworkManager.IP4Config:Addresses, The "Addresses" property
 

-
org.freedesktop.NetworkManager.IP4Config:DnsOptions, The "DnsOptions" property
+
org.freedesktop.NetworkManager.IP4Config:DnsOptions, The "DnsOptions" property
 

-
org.freedesktop.NetworkManager.IP4Config:DnsPriority, The "DnsPriority" property
+
org.freedesktop.NetworkManager.IP4Config:DnsPriority, The "DnsPriority" property
 

-
org.freedesktop.NetworkManager.IP4Config:Domains, The "Domains" property
+
org.freedesktop.NetworkManager.IP4Config:Domains, The "Domains" property
 

-
org.freedesktop.NetworkManager.IP4Config:Gateway, The "Gateway" property
+
org.freedesktop.NetworkManager.IP4Config:Gateway, The "Gateway" property
 

-
org.freedesktop.NetworkManager.IP4Config:NameserverData, The "NameserverData" property
+
org.freedesktop.NetworkManager.IP4Config:NameserverData, The "NameserverData" property
 

-
org.freedesktop.NetworkManager.IP4Config:Nameservers, The "Nameservers" property
+
org.freedesktop.NetworkManager.IP4Config:Nameservers, The "Nameservers" property
 

-
org.freedesktop.NetworkManager.IP4Config:RouteData, The "RouteData" property
+
org.freedesktop.NetworkManager.IP4Config:RouteData, The "RouteData" property
 

-
org.freedesktop.NetworkManager.IP4Config:Routes, The "Routes" property
+
org.freedesktop.NetworkManager.IP4Config:Routes, The "Routes" property
 

-
org.freedesktop.NetworkManager.IP4Config:Searches, The "Searches" property
+
org.freedesktop.NetworkManager.IP4Config:Searches, The "Searches" property
 

-
org.freedesktop.NetworkManager.IP4Config:WinsServerData, The "WinsServerData" property
+
org.freedesktop.NetworkManager.IP4Config:WinsServerData, The "WinsServerData" property
 

-
org.freedesktop.NetworkManager.IP4Config:WinsServers, The "WinsServers" property
+
org.freedesktop.NetworkManager.IP4Config:WinsServers, The "WinsServers" property
 

-
org.freedesktop.NetworkManager.IP6Config, org.freedesktop.NetworkManager.IP6Config
+
org.freedesktop.NetworkManager.IP6Config, org.freedesktop.NetworkManager.IP6Config
 

-
org.freedesktop.NetworkManager.IP6Config::PropertiesChanged, The "PropertiesChanged" signal
+
org.freedesktop.NetworkManager.IP6Config::PropertiesChanged, The "PropertiesChanged" signal
 

-
org.freedesktop.NetworkManager.IP6Config:AddressData, The "AddressData" property
+
org.freedesktop.NetworkManager.IP6Config:AddressData, The "AddressData" property
 

-
org.freedesktop.NetworkManager.IP6Config:Addresses, The "Addresses" property
+
org.freedesktop.NetworkManager.IP6Config:Addresses, The "Addresses" property
 

-
org.freedesktop.NetworkManager.IP6Config:DnsOptions, The "DnsOptions" property
+
org.freedesktop.NetworkManager.IP6Config:DnsOptions, The "DnsOptions" property
 

-
org.freedesktop.NetworkManager.IP6Config:DnsPriority, The "DnsPriority" property
+
org.freedesktop.NetworkManager.IP6Config:DnsPriority, The "DnsPriority" property
 

-
org.freedesktop.NetworkManager.IP6Config:Domains, The "Domains" property
+
org.freedesktop.NetworkManager.IP6Config:Domains, The "Domains" property
 

-
org.freedesktop.NetworkManager.IP6Config:Gateway, The "Gateway" property
+
org.freedesktop.NetworkManager.IP6Config:Gateway, The "Gateway" property
 

-
org.freedesktop.NetworkManager.IP6Config:Nameservers, The "Nameservers" property
+
org.freedesktop.NetworkManager.IP6Config:Nameservers, The "Nameservers" property
 

-
org.freedesktop.NetworkManager.IP6Config:RouteData, The "RouteData" property
+
org.freedesktop.NetworkManager.IP6Config:RouteData, The "RouteData" property
 

-
org.freedesktop.NetworkManager.IP6Config:Routes, The "Routes" property
+
org.freedesktop.NetworkManager.IP6Config:Routes, The "Routes" property
 

-
org.freedesktop.NetworkManager.IP6Config:Searches, The "Searches" property
+
org.freedesktop.NetworkManager.IP6Config:Searches, The "Searches" property
 

-
org.freedesktop.NetworkManager.SecretAgent, org.freedesktop.NetworkManager.SecretAgent
+
org.freedesktop.NetworkManager.SecretAgent, org.freedesktop.NetworkManager.SecretAgent
 

-
org.freedesktop.NetworkManager.SecretAgent.CancelGetSecrets(), The CancelGetSecrets() method
+
org.freedesktop.NetworkManager.SecretAgent.CancelGetSecrets(), The CancelGetSecrets() method
 

-
org.freedesktop.NetworkManager.SecretAgent.DeleteSecrets(), The DeleteSecrets() method
+
org.freedesktop.NetworkManager.SecretAgent.DeleteSecrets(), The DeleteSecrets() method
 

-
org.freedesktop.NetworkManager.SecretAgent.GetSecrets(), The GetSecrets() method
+
org.freedesktop.NetworkManager.SecretAgent.GetSecrets(), The GetSecrets() method
 

-
org.freedesktop.NetworkManager.SecretAgent.SaveSecrets(), The SaveSecrets() method
+
org.freedesktop.NetworkManager.SecretAgent.SaveSecrets(), The SaveSecrets() method
 

-
org.freedesktop.NetworkManager.Settings, org.freedesktop.NetworkManager.Settings
+
org.freedesktop.NetworkManager.Settings, org.freedesktop.NetworkManager.Settings
 

-
org.freedesktop.NetworkManager.Settings.AddConnection(), The AddConnection() method
+
org.freedesktop.NetworkManager.Settings.AddConnection(), The AddConnection() method
 

-
org.freedesktop.NetworkManager.Settings.AddConnectionUnsaved(), The AddConnectionUnsaved() method
+
org.freedesktop.NetworkManager.Settings.AddConnectionUnsaved(), The AddConnectionUnsaved() method
 

-
org.freedesktop.NetworkManager.Settings.Connection, org.freedesktop.NetworkManager.Settings.Connection
+
org.freedesktop.NetworkManager.Settings.Connection, org.freedesktop.NetworkManager.Settings.Connection
 

-
org.freedesktop.NetworkManager.Settings.Connection.ClearSecrets(), The ClearSecrets() method
+
org.freedesktop.NetworkManager.Settings.Connection.ClearSecrets(), The ClearSecrets() method
 

-
org.freedesktop.NetworkManager.Settings.Connection.Delete(), The Delete() method
+
org.freedesktop.NetworkManager.Settings.Connection.Delete(), The Delete() method
 

-
org.freedesktop.NetworkManager.Settings.Connection.GetSecrets(), The GetSecrets() method
+
org.freedesktop.NetworkManager.Settings.Connection.GetSecrets(), The GetSecrets() method
 

-
org.freedesktop.NetworkManager.Settings.Connection.GetSettings(), The GetSettings() method
+
org.freedesktop.NetworkManager.Settings.Connection.GetSettings(), The GetSettings() method
 

-
org.freedesktop.NetworkManager.Settings.Connection.Save(), The Save() method
+
org.freedesktop.NetworkManager.Settings.Connection.Save(), The Save() method
 

-
org.freedesktop.NetworkManager.Settings.Connection.Update(), The Update() method
+
org.freedesktop.NetworkManager.Settings.Connection.Update(), The Update() method
 

-
org.freedesktop.NetworkManager.Settings.Connection.Update2(), The Update2() method
+
org.freedesktop.NetworkManager.Settings.Connection.Update2(), The Update2() method
 

-
org.freedesktop.NetworkManager.Settings.Connection.UpdateUnsaved(), The UpdateUnsaved() method
+
org.freedesktop.NetworkManager.Settings.Connection.UpdateUnsaved(), The UpdateUnsaved() method
 

-
org.freedesktop.NetworkManager.Settings.Connection::PropertiesChanged, The "PropertiesChanged" signal
+
org.freedesktop.NetworkManager.Settings.Connection::PropertiesChanged, The "PropertiesChanged" signal
 

-
org.freedesktop.NetworkManager.Settings.Connection::Removed, The "Removed" signal
+
org.freedesktop.NetworkManager.Settings.Connection::Removed, The "Removed" signal
 

-
org.freedesktop.NetworkManager.Settings.Connection::Updated, The "Updated" signal
+
org.freedesktop.NetworkManager.Settings.Connection::Updated, The "Updated" signal
 

-
org.freedesktop.NetworkManager.Settings.Connection:Filename, The "Filename" property
+
org.freedesktop.NetworkManager.Settings.Connection:Filename, The "Filename" property
 

-
org.freedesktop.NetworkManager.Settings.Connection:Flags, The "Flags" property
+
org.freedesktop.NetworkManager.Settings.Connection:Flags, The "Flags" property
 

-
org.freedesktop.NetworkManager.Settings.Connection:Unsaved, The "Unsaved" property
+
org.freedesktop.NetworkManager.Settings.Connection:Unsaved, The "Unsaved" property
 

-
org.freedesktop.NetworkManager.Settings.GetConnectionByUuid(), The GetConnectionByUuid() method
+
org.freedesktop.NetworkManager.Settings.GetConnectionByUuid(), The GetConnectionByUuid() method
 

-
org.freedesktop.NetworkManager.Settings.ListConnections(), The ListConnections() method
+
org.freedesktop.NetworkManager.Settings.ListConnections(), The ListConnections() method
 

-
org.freedesktop.NetworkManager.Settings.LoadConnections(), The LoadConnections() method
+
org.freedesktop.NetworkManager.Settings.LoadConnections(), The LoadConnections() method
 

-
org.freedesktop.NetworkManager.Settings.ReloadConnections(), The ReloadConnections() method
+
org.freedesktop.NetworkManager.Settings.ReloadConnections(), The ReloadConnections() method
 

-
org.freedesktop.NetworkManager.Settings.SaveHostname(), The SaveHostname() method
+
org.freedesktop.NetworkManager.Settings.SaveHostname(), The SaveHostname() method
 

-
org.freedesktop.NetworkManager.Settings::ConnectionRemoved, The "ConnectionRemoved" signal
+
org.freedesktop.NetworkManager.Settings::ConnectionRemoved, The "ConnectionRemoved" signal
 

-
org.freedesktop.NetworkManager.Settings::NewConnection, The "NewConnection" signal
+
org.freedesktop.NetworkManager.Settings::NewConnection, The "NewConnection" signal
 

-
org.freedesktop.NetworkManager.Settings::PropertiesChanged, The "PropertiesChanged" signal
+
org.freedesktop.NetworkManager.Settings::PropertiesChanged, The "PropertiesChanged" signal
 

-
org.freedesktop.NetworkManager.Settings:CanModify, The "CanModify" property
+
org.freedesktop.NetworkManager.Settings:CanModify, The "CanModify" property
 

-
org.freedesktop.NetworkManager.Settings:Connections, The "Connections" property
+
org.freedesktop.NetworkManager.Settings:Connections, The "Connections" property
 

-
org.freedesktop.NetworkManager.Settings:Hostname, The "Hostname" property
+
org.freedesktop.NetworkManager.Settings:Hostname, The "Hostname" property
 

 

 

 

 
A

 

-
org.freedesktop.NetworkManager.Connection.Active, org.freedesktop.NetworkManager.Connection.Active
+
org.freedesktop.NetworkManager.Connection.Active, org.freedesktop.NetworkManager.Connection.Active
 

-
org.freedesktop.NetworkManager.Connection.Active::PropertiesChanged, The "PropertiesChanged" signal
+
org.freedesktop.NetworkManager.Connection.Active::PropertiesChanged, The "PropertiesChanged" signal
 

-
org.freedesktop.NetworkManager.Connection.Active::StateChanged, The "StateChanged" signal
+
org.freedesktop.NetworkManager.Connection.Active::StateChanged, The "StateChanged" signal
 

-
org.freedesktop.NetworkManager.Connection.Active:Connection, The "Connection" property
+
org.freedesktop.NetworkManager.Connection.Active:Connection, The "Connection" property
 

-
org.freedesktop.NetworkManager.Connection.Active:Default, The "Default" property
+
org.freedesktop.NetworkManager.Connection.Active:Default, The "Default" property
 

-
org.freedesktop.NetworkManager.Connection.Active:Default6, The "Default6" property
+
org.freedesktop.NetworkManager.Connection.Active:Default6, The "Default6" property
 

-
org.freedesktop.NetworkManager.Connection.Active:Devices, The "Devices" property
+
org.freedesktop.NetworkManager.Connection.Active:Devices, The "Devices" property
 

-
org.freedesktop.NetworkManager.Connection.Active:Dhcp4Config, The "Dhcp4Config" property
+
org.freedesktop.NetworkManager.Connection.Active:Dhcp4Config, The "Dhcp4Config" property
 

-
org.freedesktop.NetworkManager.Connection.Active:Dhcp6Config, The "Dhcp6Config" property
+
org.freedesktop.NetworkManager.Connection.Active:Dhcp6Config, The "Dhcp6Config" property
 

-
org.freedesktop.NetworkManager.Connection.Active:Id, The "Id" property
+
org.freedesktop.NetworkManager.Connection.Active:Id, The "Id" property
 

-
org.freedesktop.NetworkManager.Connection.Active:Ip4Config, The "Ip4Config" property
+
org.freedesktop.NetworkManager.Connection.Active:Ip4Config, The "Ip4Config" property
 

-
org.freedesktop.NetworkManager.Connection.Active:Ip6Config, The "Ip6Config" property
+
org.freedesktop.NetworkManager.Connection.Active:Ip6Config, The "Ip6Config" property
 

-
org.freedesktop.NetworkManager.Connection.Active:Master, The "Master" property
+
org.freedesktop.NetworkManager.Connection.Active:Master, The "Master" property
 

-
org.freedesktop.NetworkManager.Connection.Active:SpecificObject, The "SpecificObject" property
+
org.freedesktop.NetworkManager.Connection.Active:SpecificObject, The "SpecificObject" property
 

-
org.freedesktop.NetworkManager.Connection.Active:State, The "State" property
+
org.freedesktop.NetworkManager.Connection.Active:State, The "State" property
 

-
org.freedesktop.NetworkManager.Connection.Active:StateFlags, The "StateFlags" property
+
org.freedesktop.NetworkManager.Connection.Active:StateFlags, The "StateFlags" property
 

-
org.freedesktop.NetworkManager.Connection.Active:Type, The "Type" property
+
org.freedesktop.NetworkManager.Connection.Active:Type, The "Type" property
 

-
org.freedesktop.NetworkManager.Connection.Active:Uuid, The "Uuid" property
+
org.freedesktop.NetworkManager.Connection.Active:Uuid, The "Uuid" property
 

-
org.freedesktop.NetworkManager.Connection.Active:Vpn, The "Vpn" property
+
org.freedesktop.NetworkManager.Connection.Active:Vpn, The "Vpn" property
 

-
addr-gen-mode, ipv6
+
addr-gen-mode, ipv6
 

-
address-data, ipv4, ipv6
+
address-data, ipv4, ipv6
 

-
addresses, ipv4, ipv6
+
addresses, ipv4, ipv6
 

-
ageing, vxlan
+
ageing, vxlan
 

-
ageing-time, bridge
+
ageing-time, bridge
 

-
altsubject-matches, 802-1x
+
altsubject-matches, 802-1x
 

-
anonymous-identity, 802-1x
+
anonymous-identity, 802-1x
 

-
apn, gsm
+
apn, gsm
 

-
app-fcoe-flags, dcb
+
app-fcoe-flags, dcb
 

-
app-fcoe-mode, dcb
+
app-fcoe-mode, dcb
 

-
app-fcoe-priority, dcb
+
app-fcoe-priority, dcb
 

-
app-fip-flags, dcb
+
app-fip-flags, dcb
 

-
app-fip-priority, dcb
+
app-fip-priority, dcb
 

-
app-iscsi-flags, dcb
+
app-iscsi-flags, dcb
 

-
app-iscsi-priority, dcb
+
app-iscsi-priority, dcb
 

-
assigned-mac-address, 802-3-ethernet, 802-11-wireless
+
assigned-mac-address, 802-3-ethernet, 802-11-wireless
 

-
auth-alg, 802-11-wireless-security
+
auth-alg, 802-11-wireless-security
 

-
auth-retries, connection
+
auth-retries, connection
 

-
auth-timeout, 802-1x
+
auth-timeout, 802-1x
 

-
auto-negotiate, 802-3-ethernet
+
auto-negotiate, 802-3-ethernet
 

-
autoconnect, connection
+
autoconnect, connection
 

-
autoconnect-priority, connection
+
autoconnect-priority, connection
 

-
autoconnect-retries, connection
+
autoconnect-retries, connection
 

-
autoconnect-slaves, connection
+
autoconnect-slaves, connection
 

-
autoprobe-drivers, sriov
+
autoprobe-drivers, sriov
 

 

 

 

 
B

 

-
band, 802-11-wireless
+
band, 802-11-wireless
 

-
baud, ppp, serial
+
baud, ppp, serial
 

-
bdaddr, bluetooth
+
bdaddr, bluetooth
 

-
bits, serial
+
bits, serial
 

-
bond-downdelay, ovs-port
+
bond-downdelay, ovs-port
 

-
bond-mode, ovs-port
+
bond-mode, ovs-port
 

-
bond-updelay, ovs-port
+
bond-updelay, ovs-port
 

-
browser-only, proxy
+
browser-only, proxy
 

-
bssid, 802-11-wireless
+
bssid, 802-11-wireless
 

 

 

 

 
C

 

-
ca-cert, 802-1x
+
ca-cert, 802-1x
 

-
ca-cert-password, 802-1x
+
ca-cert-password, 802-1x
 

-
ca-cert-password-flags, 802-1x
+
ca-cert-password-flags, 802-1x
 

-
ca-path, 802-1x
+
ca-path, 802-1x
 

-
channel, 802-11-olpc-mesh, 802-11-wireless, wpan
+
channel, 802-11-olpc-mesh, 802-11-wireless, wpan
 

-
org.freedesktop.NetworkManager.Checkpoint, org.freedesktop.NetworkManager.Checkpoint
+
org.freedesktop.NetworkManager.Checkpoint, org.freedesktop.NetworkManager.Checkpoint
 

-
org.freedesktop.NetworkManager.Checkpoint::PropertiesChanged, The "PropertiesChanged" signal
+
org.freedesktop.NetworkManager.Checkpoint::PropertiesChanged, The "PropertiesChanged" signal
 

-
org.freedesktop.NetworkManager.Checkpoint:Created, The "Created" property
+
org.freedesktop.NetworkManager.Checkpoint:Created, The "Created" property
 

-
org.freedesktop.NetworkManager.Checkpoint:Devices, The "Devices" property
+
org.freedesktop.NetworkManager.Checkpoint:Devices, The "Devices" property
 

-
org.freedesktop.NetworkManager.Checkpoint:RollbackTimeout, The "RollbackTimeout" property
+
org.freedesktop.NetworkManager.Checkpoint:RollbackTimeout, The "RollbackTimeout" property
 

-
client-cert, 802-1x
+
client-cert, 802-1x
 

-
client-cert-password, 802-1x
+
client-cert-password, 802-1x
 

-
client-cert-password-flags, 802-1x
+
client-cert-password-flags, 802-1x
 

-
cloned-mac-address, 802-3-ethernet, 802-11-wireless
+
cloned-mac-address, 802-3-ethernet, 802-11-wireless
 

-
config, team, team-port
+
config, team, team-port
 

-
crtscts, ppp
+
crtscts, ppp
 

 

 

 

 
D

 

-
dad-timeout, ipv4, ipv6
+
dad-timeout, ipv4, ipv6
 

-
data, user, vpn
+
data, user, vpn
 

-
destination-port, vxlan
+
destination-port, vxlan
 

-
device-id, gsm
+
device-id, gsm
 

-
org.freedesktop.NetworkManager.Device.Wired, org.freedesktop.NetworkManager.Device.Wired
+
org.freedesktop.NetworkManager.Device.Wired, org.freedesktop.NetworkManager.Device.Wired
 

-
org.freedesktop.NetworkManager.Device.Wired::PropertiesChanged, The "PropertiesChanged" signal
+
org.freedesktop.NetworkManager.Device.Wired::PropertiesChanged, The "PropertiesChanged" signal
 

-
org.freedesktop.NetworkManager.Device.Wired:Carrier, The "Carrier" property
+
org.freedesktop.NetworkManager.Device.Wired:Carrier, The "Carrier" property
 

-
org.freedesktop.NetworkManager.Device.Wired:HwAddress, The "HwAddress" property
+
org.freedesktop.NetworkManager.Device.Wired:HwAddress, The "HwAddress" property
 

-
org.freedesktop.NetworkManager.Device.Wired:PermHwAddress, The "PermHwAddress" property
+
org.freedesktop.NetworkManager.Device.Wired:PermHwAddress, The "PermHwAddress" property
 

-
org.freedesktop.NetworkManager.Device.Wired:S390Subchannels, The "S390Subchannels" property
+
org.freedesktop.NetworkManager.Device.Wired:S390Subchannels, The "S390Subchannels" property
 

-
org.freedesktop.NetworkManager.Device.Wired:Speed, The "Speed" property
+
org.freedesktop.NetworkManager.Device.Wired:Speed, The "Speed" property
 

-
org.freedesktop.NetworkManager.Device.Wireless, org.freedesktop.NetworkManager.Device.Wireless
+
org.freedesktop.NetworkManager.Device.Wireless, org.freedesktop.NetworkManager.Device.Wireless
 

-
org.freedesktop.NetworkManager.Device.Wireless.GetAccessPoints(), The GetAccessPoints() method
+
org.freedesktop.NetworkManager.Device.Wireless.GetAccessPoints(), The GetAccessPoints() method
 

-
org.freedesktop.NetworkManager.Device.Wireless.GetAllAccessPoints(), The GetAllAccessPoints() method
+
org.freedesktop.NetworkManager.Device.Wireless.GetAllAccessPoints(), The GetAllAccessPoints() method
 

-
org.freedesktop.NetworkManager.Device.Wireless.RequestScan(), The RequestScan() method
+
org.freedesktop.NetworkManager.Device.Wireless.RequestScan(), The RequestScan() method
 

-
org.freedesktop.NetworkManager.Device.Wireless::AccessPointAdded, The "AccessPointAdded" signal
+
org.freedesktop.NetworkManager.Device.Wireless::AccessPointAdded, The "AccessPointAdded" signal
 

-
org.freedesktop.NetworkManager.Device.Wireless::AccessPointRemoved, The "AccessPointRemoved" signal
+
org.freedesktop.NetworkManager.Device.Wireless::AccessPointRemoved, The "AccessPointRemoved" signal
 

-
org.freedesktop.NetworkManager.Device.Wireless::PropertiesChanged, The "PropertiesChanged" signal
+
org.freedesktop.NetworkManager.Device.Wireless::PropertiesChanged, The "PropertiesChanged" signal
 

-
org.freedesktop.NetworkManager.Device.Wireless:AccessPoints, The "AccessPoints" property
+
org.freedesktop.NetworkManager.Device.Wireless:AccessPoints, The "AccessPoints" property
 

-
org.freedesktop.NetworkManager.Device.Wireless:ActiveAccessPoint, The "ActiveAccessPoint" property
+
org.freedesktop.NetworkManager.Device.Wireless:ActiveAccessPoint, The "ActiveAccessPoint" property
 

-
org.freedesktop.NetworkManager.Device.Wireless:Bitrate, The "Bitrate" property
+
org.freedesktop.NetworkManager.Device.Wireless:Bitrate, The "Bitrate" property
 

-
org.freedesktop.NetworkManager.Device.Wireless:HwAddress, The "HwAddress" property
+
org.freedesktop.NetworkManager.Device.Wireless:HwAddress, The "HwAddress" property
 

-
org.freedesktop.NetworkManager.Device.Wireless:LastScan, The "LastScan" property
+
org.freedesktop.NetworkManager.Device.Wireless:LastScan, The "LastScan" property
 

-
org.freedesktop.NetworkManager.Device.Wireless:Mode, The "Mode" property
+
org.freedesktop.NetworkManager.Device.Wireless:Mode, The "Mode" property
 

-
org.freedesktop.NetworkManager.Device.Wireless:PermHwAddress, The "PermHwAddress" property
+
org.freedesktop.NetworkManager.Device.Wireless:PermHwAddress, The "PermHwAddress" property
 

-
org.freedesktop.NetworkManager.Device.Wireless:WirelessCapabilities, The "WirelessCapabilities" property
+
org.freedesktop.NetworkManager.Device.Wireless:WirelessCapabilities, The "WirelessCapabilities" property
 

-
org.freedesktop.NetworkManager.Device.WifiP2P, org.freedesktop.NetworkManager.Device.WifiP2P
+
org.freedesktop.NetworkManager.Device.WifiP2P, org.freedesktop.NetworkManager.Device.WifiP2P
 

-
org.freedesktop.NetworkManager.Device.WifiP2P.StartFind(), The StartFind() method
+
org.freedesktop.NetworkManager.Device.WifiP2P.StartFind(), The StartFind() method
 

-
org.freedesktop.NetworkManager.Device.WifiP2P.StopFind(), The StopFind() method
+
org.freedesktop.NetworkManager.Device.WifiP2P.StopFind(), The StopFind() method
 

-
org.freedesktop.NetworkManager.Device.WifiP2P::PeerAdded, The "PeerAdded" signal
+
org.freedesktop.NetworkManager.Device.WifiP2P::PeerAdded, The "PeerAdded" signal
 

-
org.freedesktop.NetworkManager.Device.WifiP2P::PeerRemoved, The "PeerRemoved" signal
+
org.freedesktop.NetworkManager.Device.WifiP2P::PeerRemoved, The "PeerRemoved" signal
 

-
org.freedesktop.NetworkManager.Device.WifiP2P:HwAddress, The "HwAddress" property
+
org.freedesktop.NetworkManager.Device.WifiP2P:HwAddress, The "HwAddress" property
 

-
org.freedesktop.NetworkManager.Device.WifiP2P:Peers, The "Peers" property
+
org.freedesktop.NetworkManager.Device.WifiP2P:Peers, The "Peers" property
 

-
dhcp-anycast-address, 802-11-olpc-mesh
+
dhcp-anycast-address, 802-11-olpc-mesh
 

-
dhcp-client-id, ipv4
+
dhcp-client-id, ipv4
 

-
dhcp-duid, ipv6
+
dhcp-duid, ipv6
 

-
dhcp-fqdn, ipv4
+
dhcp-fqdn, ipv4
 

-
dhcp-hostname, ipv4, ipv6
+
dhcp-hostname, ipv4, ipv6
 

-
dhcp-send-hostname, ipv4, ipv6
+
dhcp-send-hostname, ipv4, ipv6
 

-
dhcp-timeout, ipv4, ipv6
+
dhcp-timeout, ipv4, ipv6
 

-
org.freedesktop.NetworkManager.DHCP4Config, org.freedesktop.NetworkManager.DHCP4Config
+
org.freedesktop.NetworkManager.DHCP4Config, org.freedesktop.NetworkManager.DHCP4Config
 

-
org.freedesktop.NetworkManager.DHCP4Config::PropertiesChanged, The "PropertiesChanged" signal
+
org.freedesktop.NetworkManager.DHCP4Config::PropertiesChanged, The "PropertiesChanged" signal
 

-
org.freedesktop.NetworkManager.DHCP4Config:Options, The "Options" property
+
org.freedesktop.NetworkManager.DHCP4Config:Options, The "Options" property
 

-
org.freedesktop.NetworkManager.DHCP6Config, org.freedesktop.NetworkManager.DHCP6Config
+
org.freedesktop.NetworkManager.DHCP6Config, org.freedesktop.NetworkManager.DHCP6Config
 

-
org.freedesktop.NetworkManager.DHCP6Config::PropertiesChanged, The "PropertiesChanged" signal
+
org.freedesktop.NetworkManager.DHCP6Config::PropertiesChanged, The "PropertiesChanged" signal
 

-
org.freedesktop.NetworkManager.DHCP6Config:Options, The "Options" property
+
org.freedesktop.NetworkManager.DHCP6Config:Options, The "Options" property
 

-
dns, ipv4, ipv6
+
dns, ipv4, ipv6
 

-
dns-options, ipv4, ipv6
+
dns-options, ipv4, ipv6
 

-
dns-priority, ipv4, ipv6
+
dns-priority, ipv4, ipv6
 

-
dns-search, ipv4, ipv6
+
dns-search, ipv4, ipv6
 

-
domain-suffix-match, 802-1x
+
domain-suffix-match, 802-1x
 

-
duplex, 802-3-ethernet
+
duplex, 802-3-ethernet
 

 

 

 

 
E

 

-
eap, 802-1x
+
eap, 802-1x
 

-
egress-priority-map, vlan
+
egress-priority-map, vlan
 

-
encapsulation, adsl
+
encapsulation, adsl
 

-
encapsulation-limit, ip-tunnel
+
encapsulation-limit, ip-tunnel
 

-
encrypt, macsec
+
encrypt, macsec
 

 

 

 

 
F

 

-
fail-mode, ovs-bridge
+
fail-mode, ovs-bridge
 

-
fils, 802-11-wireless-security
+
fils, 802-11-wireless-security
 

-
flags, ip-tunnel, vlan
+
flags, ip-tunnel, vlan
 

-
flow-label, ip-tunnel
+
flow-label, ip-tunnel
 

-
forward-delay, bridge
+
forward-delay, bridge
 

-
fwmark, wireguard
+
fwmark, wireguard
 

 

 

 

 
G

 

-
gateway, ipv4, ipv6
+
gateway, ipv4, ipv6
 

-
gateway-ping-timeout, connection
+
gateway-ping-timeout, connection
 

-
generate-mac-address-mask, 802-3-ethernet, 802-11-wireless
+
generate-mac-address-mask, 802-3-ethernet, 802-11-wireless
 

-
group, tun, 802-11-wireless-security
+
group, tun, 802-11-wireless-security
 

-
group-forward-mask, bridge
+
group-forward-mask, bridge
 

 

 

 

 
H

 

-
hairpin-mode, bridge-port
+
hairpin-mode, bridge-port
 

-
hello-time, bridge
+
hello-time, bridge
 

-
hidden, 802-11-wireless
+
hidden, 802-11-wireless
 

-
home-only, gsm
+
home-only, gsm
 

 

 

 

 
I

 

-
id, connection, vlan, vxlan
+
id, connection, vlan, vxlan
 

-
identity, 802-1x
+
identity, 802-1x
 

-
ignore-auto-dns, ipv4, ipv6
+
ignore-auto-dns, ipv4, ipv6
 

-
ignore-auto-routes, ipv4, ipv6
+
ignore-auto-routes, ipv4, ipv6
 

-
ingress-priority-map, vlan
+
ingress-priority-map, vlan
 

-
input-key, ip-tunnel
+
input-key, ip-tunnel
 

-
interface-name, connection, bond, bridge, match, team, vlan
+
interface-name, connection, bond, bridge, match, team, vlan
 

-
ip6-privacy, ipv6
+
ip6-privacy, ipv6
 

 

 

 

 
K

-
key-mgmt, 802-11-wireless-security
+
key-mgmt, 802-11-wireless-security
 

 

 

 
L

 

-
l2-miss, vxlan
+
l2-miss, vxlan
 

-
l3-miss, vxlan
+
l3-miss, vxlan
 

-
lacp, ovs-port
+
lacp, ovs-port
 

-
lacp-key, team-port
+
lacp-key, team-port
 

-
lacp-prio, team-port
+
lacp-prio, team-port
 

-
lcp-echo-failure, ppp
+
lcp-echo-failure, ppp
 

-
lcp-echo-interval, ppp
+
lcp-echo-interval, ppp
 

-
leap-password, 802-11-wireless-security
+
leap-password, 802-11-wireless-security
 

-
leap-password-flags, 802-11-wireless-security
+
leap-password-flags, 802-11-wireless-security
 

-
leap-username, 802-11-wireless-security
+
leap-username, 802-11-wireless-security
 

-
learning, vxlan
+
learning, vxlan
 

-
limit, vxlan
+
limit, vxlan
 

-
link-watchers, team, team-port
+
link-watchers, team, team-port
 

-
listen-port, wireguard
+
listen-port, wireguard
 

-
lldp, connection
+
lldp, connection
 

-
llmnr, connection
+
llmnr, connection
 

-
local, ip-tunnel, vxlan
+
local, ip-tunnel, vxlan
 

 

 

 

 
M

 

-
mac-address, bridge, infiniband, wimax, 802-3-ethernet, 802-11-wireless, wpan
+
mac-address, bridge, infiniband, wimax, 802-3-ethernet, 802-11-wireless, wpan
 

-
mac-address-blacklist, 802-3-ethernet, 802-11-wireless
+
mac-address-blacklist, 802-3-ethernet, 802-11-wireless
 

-
mac-address-randomization, 802-11-wireless
+
mac-address-randomization, 802-11-wireless
 

-
org.freedesktop.NetworkManager, org.freedesktop.NetworkManager
+
org.freedesktop.NetworkManager, org.freedesktop.NetworkManager
 

-
org.freedesktop.NetworkManager.ActivateConnection(), The ActivateConnection() method
+
org.freedesktop.NetworkManager.ActivateConnection(), The ActivateConnection() method
 

-
org.freedesktop.NetworkManager.AddAndActivateConnection(), The AddAndActivateConnection() method
+
org.freedesktop.NetworkManager.AddAndActivateConnection(), The AddAndActivateConnection() method
 

-
org.freedesktop.NetworkManager.AddAndActivateConnection2(), The AddAndActivateConnection2() method
+
org.freedesktop.NetworkManager.AddAndActivateConnection2(), The AddAndActivateConnection2() method
 

-
org.freedesktop.NetworkManager.CheckConnectivity(), The CheckConnectivity() method
+
org.freedesktop.NetworkManager.CheckConnectivity(), The CheckConnectivity() method
 

-
org.freedesktop.NetworkManager.CheckpointAdjustRollbackTimeout(), The CheckpointAdjustRollbackTimeout() method
+
org.freedesktop.NetworkManager.CheckpointAdjustRollbackTimeout(), The CheckpointAdjustRollbackTimeout() method
 

-
org.freedesktop.NetworkManager.CheckpointCreate(), The CheckpointCreate() method
+
org.freedesktop.NetworkManager.CheckpointCreate(), The CheckpointCreate() method
 

-
org.freedesktop.NetworkManager.CheckpointDestroy(), The CheckpointDestroy() method
+
org.freedesktop.NetworkManager.CheckpointDestroy(), The CheckpointDestroy() method
 

-
org.freedesktop.NetworkManager.CheckpointRollback(), The CheckpointRollback() method
+
org.freedesktop.NetworkManager.CheckpointRollback(), The CheckpointRollback() method
 

-
org.freedesktop.NetworkManager.DeactivateConnection(), The DeactivateConnection() method
+
org.freedesktop.NetworkManager.DeactivateConnection(), The DeactivateConnection() method
 

-
org.freedesktop.NetworkManager.Enable(), The Enable() method
+
org.freedesktop.NetworkManager.Enable(), The Enable() method
 

-
org.freedesktop.NetworkManager.GetAllDevices(), The GetAllDevices() method
+
org.freedesktop.NetworkManager.GetAllDevices(), The GetAllDevices() method
 

-
org.freedesktop.NetworkManager.GetDeviceByIpIface(), The GetDeviceByIpIface() method
+
org.freedesktop.NetworkManager.GetDeviceByIpIface(), The GetDeviceByIpIface() method
 

-
org.freedesktop.NetworkManager.GetDevices(), The GetDevices() method
+
org.freedesktop.NetworkManager.GetDevices(), The GetDevices() method
 

-
org.freedesktop.NetworkManager.GetLogging(), The GetLogging() method
+
org.freedesktop.NetworkManager.GetLogging(), The GetLogging() method
 

-
org.freedesktop.NetworkManager.GetPermissions(), The GetPermissions() method
+
org.freedesktop.NetworkManager.GetPermissions(), The GetPermissions() method
 

-
org.freedesktop.NetworkManager.Reload(), The Reload() method
+
org.freedesktop.NetworkManager.Reload(), The Reload() method
 

-
org.freedesktop.NetworkManager.SetLogging(), The SetLogging() method
+
org.freedesktop.NetworkManager.SetLogging(), The SetLogging() method
 

-
org.freedesktop.NetworkManager.Sleep(), The Sleep() method
+
org.freedesktop.NetworkManager.Sleep(), The Sleep() method
 

-
org.freedesktop.NetworkManager.state(), The state() method
+
org.freedesktop.NetworkManager.state(), The state() method
 

-
org.freedesktop.NetworkManager::CheckPermissions, The "CheckPermissions" signal
+
org.freedesktop.NetworkManager::CheckPermissions, The "CheckPermissions" signal
 

-
org.freedesktop.NetworkManager::DeviceAdded, The "DeviceAdded" signal
+
org.freedesktop.NetworkManager::DeviceAdded, The "DeviceAdded" signal
 

-
org.freedesktop.NetworkManager::DeviceRemoved, The "DeviceRemoved" signal
+
org.freedesktop.NetworkManager::DeviceRemoved, The "DeviceRemoved" signal
 

-
org.freedesktop.NetworkManager::PropertiesChanged, The "PropertiesChanged" signal
+
org.freedesktop.NetworkManager::PropertiesChanged, The "PropertiesChanged" signal
 

-
org.freedesktop.NetworkManager::StateChanged, The "StateChanged" signal
+
org.freedesktop.NetworkManager::StateChanged, The "StateChanged" signal
 

-
org.freedesktop.NetworkManager:ActivatingConnection, The "ActivatingConnection" property
+
org.freedesktop.NetworkManager:ActivatingConnection, The "ActivatingConnection" property
 

-
org.freedesktop.NetworkManager:ActiveConnections, The "ActiveConnections" property
+
org.freedesktop.NetworkManager:ActiveConnections, The "ActiveConnections" property
 

-
org.freedesktop.NetworkManager:AllDevices, The "AllDevices" property
+
org.freedesktop.NetworkManager:AllDevices, The "AllDevices" property
 

-
org.freedesktop.NetworkManager:Capabilities, The "Capabilities" property
+
org.freedesktop.NetworkManager:Capabilities, The "Capabilities" property
 

-
org.freedesktop.NetworkManager:Checkpoints, The "Checkpoints" property
+
org.freedesktop.NetworkManager:Checkpoints, The "Checkpoints" property
 

-
org.freedesktop.NetworkManager:Connectivity, The "Connectivity" property
+
org.freedesktop.NetworkManager:Connectivity, The "Connectivity" property
 

-
org.freedesktop.NetworkManager:ConnectivityCheckAvailable, The "ConnectivityCheckAvailable" property
+
org.freedesktop.NetworkManager:ConnectivityCheckAvailable, The "ConnectivityCheckAvailable" property
 

-
org.freedesktop.NetworkManager:ConnectivityCheckEnabled, The "ConnectivityCheckEnabled" property
+
org.freedesktop.NetworkManager:ConnectivityCheckEnabled, The "ConnectivityCheckEnabled" property
 

-
org.freedesktop.NetworkManager:Devices, The "Devices" property
+
org.freedesktop.NetworkManager:Devices, The "Devices" property
 

-
org.freedesktop.NetworkManager:GlobalDnsConfiguration, The "GlobalDnsConfiguration" property
+
org.freedesktop.NetworkManager:GlobalDnsConfiguration, The "GlobalDnsConfiguration" property
 

-
org.freedesktop.NetworkManager:Metered, The "Metered" property
+
org.freedesktop.NetworkManager:Metered, The "Metered" property
 

-
org.freedesktop.NetworkManager:NetworkingEnabled, The "NetworkingEnabled" property
+
org.freedesktop.NetworkManager:NetworkingEnabled, The "NetworkingEnabled" property
 

-
org.freedesktop.NetworkManager:PrimaryConnection, The "PrimaryConnection" property
+
org.freedesktop.NetworkManager:PrimaryConnection, The "PrimaryConnection" property
 

-
org.freedesktop.NetworkManager:PrimaryConnectionType, The "PrimaryConnectionType" property
+
org.freedesktop.NetworkManager:PrimaryConnectionType, The "PrimaryConnectionType" property
 

-
org.freedesktop.NetworkManager:Startup, The "Startup" property
+
org.freedesktop.NetworkManager:Startup, The "Startup" property
 

-
org.freedesktop.NetworkManager:State, The "State" property
+
org.freedesktop.NetworkManager:State, The "State" property
 

-
org.freedesktop.NetworkManager:Version, The "Version" property
+
org.freedesktop.NetworkManager:Version, The "Version" property
 

-
org.freedesktop.NetworkManager:WimaxEnabled, The "WimaxEnabled" property
+
org.freedesktop.NetworkManager:WimaxEnabled, The "WimaxEnabled" property
 

-
org.freedesktop.NetworkManager:WimaxHardwareEnabled, The "WimaxHardwareEnabled" property
+
org.freedesktop.NetworkManager:WimaxHardwareEnabled, The "WimaxHardwareEnabled" property
 

-
org.freedesktop.NetworkManager:WirelessEnabled, The "WirelessEnabled" property
+
org.freedesktop.NetworkManager:WirelessEnabled, The "WirelessEnabled" property
 

-
org.freedesktop.NetworkManager:WirelessHardwareEnabled, The "WirelessHardwareEnabled" property
+
org.freedesktop.NetworkManager:WirelessHardwareEnabled, The "WirelessHardwareEnabled" property
 

-
org.freedesktop.NetworkManager:WwanEnabled, The "WwanEnabled" property
+
org.freedesktop.NetworkManager:WwanEnabled, The "WwanEnabled" property
 

-
org.freedesktop.NetworkManager:WwanHardwareEnabled, The "WwanHardwareEnabled" property
+
org.freedesktop.NetworkManager:WwanHardwareEnabled, The "WwanHardwareEnabled" property
 

-
master, connection
+
master, connection
 

-
max-age, bridge
+
max-age, bridge
 

-
may-fail, ipv4, ipv6
+
may-fail, ipv4, ipv6
 

-
mcast-rejoin-count, team
+
mcast-rejoin-count, team
 

-
mcast-rejoin-interval, team
+
mcast-rejoin-interval, team
 

-
mcast-snooping-enable, ovs-bridge
+
mcast-snooping-enable, ovs-bridge
 

-
mdns, connection
+
mdns, connection
 

-
metered, connection
+
metered, connection
 

-
method, ipv4, ipv6, proxy
+
method, ipv4, ipv6, proxy
 

-
mka-cak, macsec
+
mka-cak, macsec
 

-
mka-cak-flags, macsec
+
mka-cak-flags, macsec
 

-
mka-ckn, macsec
+
mka-ckn, macsec
 

-
mode, ip-tunnel, macsec, macvlan, tun, 802-11-wireless
+
mode, ip-tunnel, macsec, macvlan, tun, 802-11-wireless
 

-
mppe-stateful, ppp
+
mppe-stateful, ppp
 

-
mru, ppp
+
mru, ppp
 

-
mtu, cdma, gsm, infiniband, ip-tunnel, ppp, 802-3-ethernet, wireguard, 802-11-wireless
+
mtu, cdma, gsm, infiniband, ip-tunnel, ppp, 802-3-ethernet, wireguard, 802-11-wireless
 

-
multi-connect, connection
+
multi-connect, connection
 

-
multi-queue, tun
+
multi-queue, tun
 

-
multicast-snooping, bridge
+
multicast-snooping, bridge
 

 

 

 

 
N

 

-
network-id, gsm
+
network-id, gsm
 

-
network-name, wimax
+
network-name, wimax
 

-
never-default, ipv4, ipv6
+
never-default, ipv4, ipv6
 

-
NM80211ApFlags, enum NM80211ApFlags
+
NM80211ApFlags, enum NM80211ApFlags
 

-
NM80211ApSecurityFlags, enum NM80211ApSecurityFlags
+
NM80211ApSecurityFlags, enum NM80211ApSecurityFlags
 

-
NM80211Mode, enum NM80211Mode
+
NM80211Mode, enum NM80211Mode
 

-
NMActivationStateFlags, enum NMActivationStateFlags
+
NMActivationStateFlags, enum NMActivationStateFlags
 

-
NMActiveConnectionState, enum NMActiveConnectionState
+
NMActiveConnectionState, enum NMActiveConnectionState
 

-
NMActiveConnectionStateReason, enum NMActiveConnectionStateReason
+
NMActiveConnectionStateReason, enum NMActiveConnectionStateReason
 

-
NMBluetoothCapabilities, enum NMBluetoothCapabilities
+
NMBluetoothCapabilities, enum NMBluetoothCapabilities
 

-
NMCapability, enum NMCapability
+
NMCapability, enum NMCapability
 

-
NMCheckpointCreateFlags, enum NMCheckpointCreateFlags
+
NMCheckpointCreateFlags, enum NMCheckpointCreateFlags
 

-
NMConnectionMultiConnect, enum NMConnectionMultiConnect
+
NMConnectionMultiConnect, enum NMConnectionMultiConnect
 

-
NMConnectivityState, enum NMConnectivityState
+
NMConnectivityState, enum NMConnectivityState
 

-
NMDeviceCapabilities, enum NMDeviceCapabilities
+
NMDeviceCapabilities, enum NMDeviceCapabilities
 

-
NMDeviceModemCapabilities, enum NMDeviceModemCapabilities
+
NMDeviceModemCapabilities, enum NMDeviceModemCapabilities
 

-
NMDeviceState, enum NMDeviceState
+
NMDeviceState, enum NMDeviceState
 

-
NMDeviceStateReason, enum NMDeviceStateReason
+
NMDeviceStateReason, enum NMDeviceStateReason
 

-
NMDeviceType, enum NMDeviceType
+
NMDeviceType, enum NMDeviceType
 

-
NMDeviceWifiCapabilities, enum NMDeviceWifiCapabilities
+
NMDeviceWifiCapabilities, enum NMDeviceWifiCapabilities
 

-
NMIPTunnelMode, enum NMIPTunnelMode
+
NMIPTunnelMode, enum NMIPTunnelMode
 

-
NMMetered, enum NMMetered
+
NMMetered, enum NMMetered
 

-
NMRollbackResult, enum NMRollbackResult
+
NMRollbackResult, enum NMRollbackResult
 

-
NMSecretAgentCapabilities, enum NMSecretAgentCapabilities
+
NMSecretAgentCapabilities, enum NMSecretAgentCapabilities
 

-
NMSecretAgentGetSecretsFlags, enum NMSecretAgentGetSecretsFlags
+
NMSecretAgentGetSecretsFlags, enum NMSecretAgentGetSecretsFlags
 

-
NMSettingsConnectionFlags, enum NMSettingsConnectionFlags
+
NMSettingsConnectionFlags, enum NMSettingsConnectionFlags
 

-
NMSettingsUpdate2Flags, enum NMSettingsUpdate2Flags
+
NMSettingsUpdate2Flags, enum NMSettingsUpdate2Flags
 

-
NMState, enum NMState
+
NMState, enum NMState
 

-
NMTernary, enum NMTernary
+
NMTernary, enum NMTernary
 

-
NMVpnConnectionState, enum NMVpnConnectionState
+
NMVpnConnectionState, enum NMVpnConnectionState
 

-
NMVpnConnectionStateReason, enum NMVpnConnectionStateReason
+
NMVpnConnectionStateReason, enum NMVpnConnectionStateReason
 

-
NMVpnPluginFailure, enum NMVpnPluginFailure
+
NMVpnPluginFailure, enum NMVpnPluginFailure
 

-
NMVpnServiceState, enum NMVpnServiceState
+
NMVpnServiceState, enum NMVpnServiceState
 

-
NMWimaxNspNetworkType, enum NMWimaxNspNetworkType
+
NMWimaxNspNetworkType, enum NMWimaxNspNetworkType
 

-
no-vj-comp, ppp
+
no-vj-comp, ppp
 

-
noauth, ppp
+
noauth, ppp
 

-
nobsdcomp, ppp
+
nobsdcomp, ppp
 

-
nodeflate, ppp
+
nodeflate, ppp
 

-
notify-peers-count, team
+
notify-peers-count, team
 

-
notify-peers-interval, team
+
notify-peers-interval, team
 

-
number, cdma, gsm
+
number, cdma, gsm
 

 

 

 

 
O

 

-
options, bond
+
options, bond
 

-
output-key, ip-tunnel
+
output-key, ip-tunnel
 

-
owner, tun
+
owner, tun
 

 

 

 

 
P

 

-
p-key, infiniband
+
p-key, infiniband
 

-
pac-file, 802-1x
+
pac-file, 802-1x
 

-
pac-script, proxy
+
pac-script, proxy
 

-
pac-url, proxy
+
pac-url, proxy
 

-
page, wpan
+
page, wpan
 

-
pairwise, 802-11-wireless-security
+
pairwise, 802-11-wireless-security
 

-
pan-id, wpan
+
pan-id, wpan
 

-
parent, 6lowpan, infiniband, ip-tunnel, macsec, macvlan, pppoe, vlan, vxlan
+
parent, 6lowpan, infiniband, ip-tunnel, macsec, macvlan, pppoe, vlan, vxlan
 

-
parity, serial
+
parity, serial
 

-
password, 802-1x, adsl, cdma, gsm, pppoe
+
password, 802-1x, adsl, cdma, gsm, pppoe
 

-
password-flags, 802-1x, adsl, cdma, gsm, pppoe
+
password-flags, 802-1x, adsl, cdma, gsm, pppoe
 

-
password-raw, 802-1x
+
password-raw, 802-1x
 

-
password-raw-flags, 802-1x
+
password-raw-flags, 802-1x
 

-
path-cost, bridge-port
+
path-cost, bridge-port
 

-
path-mtu-discovery, ip-tunnel
+
path-mtu-discovery, ip-tunnel
 

-
peer, ovs-patch, wifi-p2p
+
peer, ovs-patch, wifi-p2p
 

-
peer-routes, wireguard
+
peer-routes, wireguard
 

-
peers, wireguard
+
peers, wireguard
 

-
permissions, connection
+
permissions, connection
 

-
persistent, vpn
+
persistent, vpn
 

-
phase1-auth-flags, 802-1x
+
phase1-auth-flags, 802-1x
 

-
phase1-fast-provisioning, 802-1x
+
phase1-fast-provisioning, 802-1x
 

-
phase1-peaplabel, 802-1x
+
phase1-peaplabel, 802-1x
 

-
phase1-peapver, 802-1x
+
phase1-peapver, 802-1x
 

-
phase2-altsubject-matches, 802-1x
+
phase2-altsubject-matches, 802-1x
 

-
phase2-auth, 802-1x
+
phase2-auth, 802-1x
 

-
phase2-autheap, 802-1x
+
phase2-autheap, 802-1x
 

-
phase2-ca-cert, 802-1x
+
phase2-ca-cert, 802-1x
 

-
phase2-ca-cert-password, 802-1x
+
phase2-ca-cert-password, 802-1x
 

-
phase2-ca-cert-password-flags, 802-1x
+
phase2-ca-cert-password-flags, 802-1x
 

-
phase2-ca-path, 802-1x
+
phase2-ca-path, 802-1x
 

-
phase2-client-cert, 802-1x
+
phase2-client-cert, 802-1x
 

-
phase2-client-cert-password, 802-1x
+
phase2-client-cert-password, 802-1x
 

-
phase2-client-cert-password-flags, 802-1x
+
phase2-client-cert-password-flags, 802-1x
 

-
phase2-domain-suffix-match, 802-1x
+
phase2-domain-suffix-match, 802-1x
 

-
phase2-private-key, 802-1x
+
phase2-private-key, 802-1x
 

-
phase2-private-key-password, 802-1x
+
phase2-private-key-password, 802-1x
 

-
phase2-private-key-password-flags, 802-1x
+
phase2-private-key-password-flags, 802-1x
 

-
phase2-subject-match, 802-1x
+
phase2-subject-match, 802-1x
 

-
pi, tun
+
pi, tun
 

-
pin, 802-1x, gsm
+
pin, 802-1x, gsm
 

-
pin-flags, 802-1x, gsm
+
pin-flags, 802-1x, gsm
 

-
pmf, 802-11-wireless-security
+
pmf, 802-11-wireless-security
 

-
port, macsec, 802-3-ethernet
+
port, macsec, 802-3-ethernet
 

-
powersave, 802-11-wireless
+
powersave, 802-11-wireless
 

-
org.freedesktop.NetworkManager.PPP, org.freedesktop.NetworkManager.PPP
+
org.freedesktop.NetworkManager.PPP, org.freedesktop.NetworkManager.PPP
 

-
org.freedesktop.NetworkManager.PPP.NeedSecrets(), The NeedSecrets() method
+
org.freedesktop.NetworkManager.PPP.NeedSecrets(), The NeedSecrets() method
 

-
org.freedesktop.NetworkManager.PPP.SetIfindex(), The SetIfindex() method
+
org.freedesktop.NetworkManager.PPP.SetIfindex(), The SetIfindex() method
 

-
org.freedesktop.NetworkManager.PPP.SetIp4Config(), The SetIp4Config() method
+
org.freedesktop.NetworkManager.PPP.SetIp4Config(), The SetIp4Config() method
 

-
org.freedesktop.NetworkManager.PPP.SetIp6Config(), The SetIp6Config() method
+
org.freedesktop.NetworkManager.PPP.SetIp6Config(), The SetIp6Config() method
 

-
org.freedesktop.NetworkManager.PPP.SetState(), The SetState() method
+
org.freedesktop.NetworkManager.PPP.SetState(), The SetState() method
 

-
prio, team-port
+
prio, team-port
 

-
priority, bridge, bridge-port
+
priority, bridge, bridge-port
 

-
priority-bandwidth, dcb
+
priority-bandwidth, dcb
 

-
priority-flow-control, dcb
+
priority-flow-control, dcb
 

-
priority-flow-control-flags, dcb
+
priority-flow-control-flags, dcb
 

-
priority-group-bandwidth, dcb
+
priority-group-bandwidth, dcb
 

-
priority-group-flags, dcb
+
priority-group-flags, dcb
 

-
priority-group-id, dcb
+
priority-group-id, dcb
 

-
priority-strict-bandwidth, dcb
+
priority-strict-bandwidth, dcb
 

-
priority-traffic-class, dcb
+
priority-traffic-class, dcb
 

-
private-key, 802-1x, wireguard
+
private-key, 802-1x, wireguard
 

-
private-key-flags, wireguard
+
private-key-flags, wireguard
 

-
private-key-password, 802-1x
+
private-key-password, 802-1x
 

-
private-key-password-flags, 802-1x
+
private-key-password-flags, 802-1x
 

-
promiscuous, macvlan
+
promiscuous, macvlan
 

-
proto, 802-11-wireless-security
+
proto, 802-11-wireless-security
 

-
protocol, adsl
+
protocol, adsl
 

-
proxy, vxlan
+
proxy, vxlan
 

-
psk, 802-11-wireless-security
+
psk, 802-11-wireless-security
 

-
psk-flags, 802-11-wireless-security
+
psk-flags, 802-11-wireless-security
 

 

 

 

 
Q

 

-
qdiscs, tc
+
qdiscs, tc
 

-
queue-id, team-port
+
queue-id, team-port
 

 

 

 

 
R

 

-
rate, 802-11-wireless
+
rate, 802-11-wireless
 

-
read-only, connection
+
read-only, connection
 

-
refuse-chap, ppp
+
refuse-chap, ppp
 

-
refuse-eap, ppp
+
refuse-eap, ppp
 

-
refuse-mschap, ppp
+
refuse-mschap, ppp
 

-
refuse-mschapv2, ppp
+
refuse-mschapv2, ppp
 

-
refuse-pap, ppp
+
refuse-pap, ppp
 

-
remote, ip-tunnel, vxlan
+
remote, ip-tunnel, vxlan
 

-
require-mppe, ppp
+
require-mppe, ppp
 

-
require-mppe-128, ppp
+
require-mppe-128, ppp
 

-
route-data, ipv4, ipv6
+
route-data, ipv4, ipv6
 

-
route-metric, ipv4, ipv6
+
route-metric, ipv4, ipv6
 

-
route-table, ipv4, ipv6
+
route-table, ipv4, ipv6
 

-
routes, ipv4, ipv6
+
routes, ipv4, ipv6
 

-
rsc, vxlan
+
rsc, vxlan
 

-
rstp-enable, ovs-bridge
+
rstp-enable, ovs-bridge
 

-
runner, team
+
runner, team
 

-
runner-active, team
+
runner-active, team
 

-
runner-agg-select-policy, team
+
runner-agg-select-policy, team
 

-
runner-fast-rate, team
+
runner-fast-rate, team
 

-
runner-hwaddr-policy, team
+
runner-hwaddr-policy, team
 

-
runner-min-ports, team
+
runner-min-ports, team
 

-
runner-sys-prio, team
+
runner-sys-prio, team
 

-
runner-tx-balancer, team
+
runner-tx-balancer, team
 

-
runner-tx-balancer-interval, team
+
runner-tx-balancer-interval, team
 

-
runner-tx-hash, team
+
runner-tx-hash, team
 

 

 

 

 
S

 

-
s390-nettype, 802-3-ethernet
+
s390-nettype, 802-3-ethernet
 

-
s390-options, 802-3-ethernet
+
s390-options, 802-3-ethernet
 

-
s390-subchannels, 802-3-ethernet
+
s390-subchannels, 802-3-ethernet
 

-
secondaries, connection
+
secondaries, connection
 

-
secrets, vpn
+
secrets, vpn
 

-
security, 802-11-wireless
+
security, 802-11-wireless
 

-
seen-bssids, 802-11-wireless
+
seen-bssids, 802-11-wireless
 

-
send-delay, serial
+
send-delay, serial
 

-
send-sci, macsec
+
send-sci, macsec
 

-
service, pppoe
+
service, pppoe
 

-
service-type, vpn
+
service-type, vpn
 

-
short-address, wpan
+
short-address, wpan
 

-
sim-id, gsm
+
sim-id, gsm
 

-
sim-operator-id, gsm
+
sim-operator-id, gsm
 

-
slave-type, connection
+
slave-type, connection
 

-
source-port-max, vxlan
+
source-port-max, vxlan
 

-
source-port-min, vxlan
+
source-port-min, vxlan
 

-
speed, 802-3-ethernet
+
speed, 802-3-ethernet
 

-
ssid, 802-11-olpc-mesh, 802-11-wireless
+
ssid, 802-11-olpc-mesh, 802-11-wireless
 

-
stable-id, connection
+
stable-id, connection
 

-
sticky, team-port
+
sticky, team-port
 

-
stopbits, serial
+
stopbits, serial
 

-
stp, bridge
+
stp, bridge
 

-
stp-enable, ovs-bridge
+
stp-enable, ovs-bridge
 

-
subject-match, 802-1x
+
subject-match, 802-1x
 

-
system-ca-certs, 802-1x
+
system-ca-certs, 802-1x
 

 

 

 

 
T

 

-
tag, ovs-port
+
tag, ovs-port
 

-
tap, macvlan
+
tap, macvlan
 

-
tfilters, tc
+
tfilters, tc
 

-
timeout, vpn
+
timeout, vpn
 

-
timestamp, connection
+
timestamp, connection
 

-
token, ipv6
+
token, ipv6
 

-
tos, ip-tunnel, vxlan
+
tos, ip-tunnel, vxlan
 

-
total-vfs, sriov
+
total-vfs, sriov
 

-
transport-mode, infiniband
+
transport-mode, infiniband
 

-
ttl, ip-tunnel, vxlan
+
ttl, ip-tunnel, vxlan
 

-
tx-power, 802-11-wireless
+
tx-power, 802-11-wireless
 

-
type, connection, bluetooth, ovs-interface
+
type, connection, bluetooth, ovs-interface
 

 

 

 

 
U

 

-
user-name, vpn
+
user-name, vpn
 

-
username, adsl, cdma, gsm, pppoe
+
username, adsl, cdma, gsm, pppoe
 

-
uuid, connection
+
uuid, connection
 

 

 

 

 
V

 

-
validation, macsec
+
validation, macsec
 

-
vci, adsl
+
vci, adsl
 

-
vfs, sriov
+
vfs, sriov
 

-
vlan-mode, ovs-port
+
vlan-default-pvid, bridge
 

-
vnet-hdr, tun
+
vlan-filtering, bridge
 

-
vpi, adsl
+
vlan-mode, ovs-port
 

-
org.freedesktop.NetworkManager.VPN.Connection, org.freedesktop.NetworkManager.VPN.Connection
+
vlans, bridge, bridge-port
 

-
org.freedesktop.NetworkManager.VPN.Connection::PropertiesChanged, The "PropertiesChanged" signal
+
vnet-hdr, tun
 

-
org.freedesktop.NetworkManager.VPN.Connection::VpnStateChanged, The "VpnStateChanged" signal
+
vpi, adsl
 

-
org.freedesktop.NetworkManager.VPN.Connection:Banner, The "Banner" property
+
org.freedesktop.NetworkManager.VPN.Connection, org.freedesktop.NetworkManager.VPN.Connection
 

-
org.freedesktop.NetworkManager.VPN.Connection:VpnState, The "VpnState" property
+
org.freedesktop.NetworkManager.VPN.Connection::PropertiesChanged, The "PropertiesChanged" signal
 

-
org.freedesktop.NetworkManager.VPN.Plugin, org.freedesktop.NetworkManager.VPN.Plugin
+
org.freedesktop.NetworkManager.VPN.Connection::VpnStateChanged, The "VpnStateChanged" signal
 

-
org.freedesktop.NetworkManager.VPN.Plugin.Connect(), The Connect() method
+
org.freedesktop.NetworkManager.VPN.Connection:Banner, The "Banner" property
 

-
org.freedesktop.NetworkManager.VPN.Plugin.ConnectInteractive(), The ConnectInteractive() method
+
org.freedesktop.NetworkManager.VPN.Connection:VpnState, The "VpnState" property
 

-
org.freedesktop.NetworkManager.VPN.Plugin.Disconnect(), The Disconnect() method
+
org.freedesktop.NetworkManager.VPN.Plugin, org.freedesktop.NetworkManager.VPN.Plugin
 

-
org.freedesktop.NetworkManager.VPN.Plugin.NeedSecrets(), The NeedSecrets() method
+
org.freedesktop.NetworkManager.VPN.Plugin.Connect(), The Connect() method
 

-
org.freedesktop.NetworkManager.VPN.Plugin.NewSecrets(), The NewSecrets() method
+
org.freedesktop.NetworkManager.VPN.Plugin.ConnectInteractive(), The ConnectInteractive() method
 

-
org.freedesktop.NetworkManager.VPN.Plugin.SetConfig(), The SetConfig() method
+
org.freedesktop.NetworkManager.VPN.Plugin.Disconnect(), The Disconnect() method
 

-
org.freedesktop.NetworkManager.VPN.Plugin.SetFailure(), The SetFailure() method
+
org.freedesktop.NetworkManager.VPN.Plugin.NeedSecrets(), The NeedSecrets() method
 

-
org.freedesktop.NetworkManager.VPN.Plugin.SetIp4Config(), The SetIp4Config() method
+
org.freedesktop.NetworkManager.VPN.Plugin.NewSecrets(), The NewSecrets() method
 

-
org.freedesktop.NetworkManager.VPN.Plugin.SetIp6Config(), The SetIp6Config() method
+
org.freedesktop.NetworkManager.VPN.Plugin.SetConfig(), The SetConfig() method
 

-
org.freedesktop.NetworkManager.VPN.Plugin::Config, The "Config" signal
+
org.freedesktop.NetworkManager.VPN.Plugin.SetFailure(), The SetFailure() method
 

-
org.freedesktop.NetworkManager.VPN.Plugin::Failure, The "Failure" signal
+
org.freedesktop.NetworkManager.VPN.Plugin.SetIp4Config(), The SetIp4Config() method
 

-
org.freedesktop.NetworkManager.VPN.Plugin::Ip4Config, The "Ip4Config" signal
+
org.freedesktop.NetworkManager.VPN.Plugin.SetIp6Config(), The SetIp6Config() method
 

-
org.freedesktop.NetworkManager.VPN.Plugin::Ip6Config, The "Ip6Config" signal
+
org.freedesktop.NetworkManager.VPN.Plugin::Config, The "Config" signal
 

-
org.freedesktop.NetworkManager.VPN.Plugin::LoginBanner, The "LoginBanner" signal
+
org.freedesktop.NetworkManager.VPN.Plugin::Failure, The "Failure" signal
 

-
org.freedesktop.NetworkManager.VPN.Plugin::SecretsRequired, The "SecretsRequired" signal
+
org.freedesktop.NetworkManager.VPN.Plugin::Ip4Config, The "Ip4Config" signal
 

-
org.freedesktop.NetworkManager.VPN.Plugin::StateChanged, The "StateChanged" signal
+
org.freedesktop.NetworkManager.VPN.Plugin::Ip6Config, The "Ip6Config" signal
 

-
org.freedesktop.NetworkManager.VPN.Plugin:State, The "State" property
+
org.freedesktop.NetworkManager.VPN.Plugin::LoginBanner, The "LoginBanner" signal
+

+
org.freedesktop.NetworkManager.VPN.Plugin::SecretsRequired, The "SecretsRequired" signal
+

+
org.freedesktop.NetworkManager.VPN.Plugin::StateChanged, The "StateChanged" signal
+

+
org.freedesktop.NetworkManager.VPN.Plugin:State, The "State" property
 

 

 

 

 
W

 

-
wake-on-lan, 802-3-ethernet
+
wake-on-lan, 802-3-ethernet
 

-
wake-on-lan-password, 802-3-ethernet
+
wake-on-lan-password, 802-3-ethernet
 

-
wake-on-wlan, 802-11-wireless
+
wake-on-wlan, 802-11-wireless
 

-
wep-key-flags, 802-11-wireless-security
+
wep-key-flags, 802-11-wireless-security
 

-
wep-key-type, 802-11-wireless-security
+
wep-key-type, 802-11-wireless-security
 

-
wep-key0, 802-11-wireless-security
+
wep-key0, 802-11-wireless-security
 

-
wep-key1, 802-11-wireless-security
+
wep-key1, 802-11-wireless-security
 

-
wep-key2, 802-11-wireless-security
+
wep-key2, 802-11-wireless-security
 

-
wep-key3, 802-11-wireless-security
+
wep-key3, 802-11-wireless-security
 

-
wep-tx-keyidx, 802-11-wireless-security
+
wep-tx-keyidx, 802-11-wireless-security
 

-
wfd-ies, wifi-p2p
+
wfd-ies, wifi-p2p
 

-
org.freedesktop.NetworkManager.WifiP2PPeer, org.freedesktop.NetworkManager.WifiP2PPeer
+
org.freedesktop.NetworkManager.WifiP2PPeer, org.freedesktop.NetworkManager.WifiP2PPeer
 

-
org.freedesktop.NetworkManager.WifiP2PPeer:Flags, The "Flags" property
+
org.freedesktop.NetworkManager.WifiP2PPeer:Flags, The "Flags" property
 

-
org.freedesktop.NetworkManager.WifiP2PPeer:HwAddress, The "HwAddress" property
+
org.freedesktop.NetworkManager.WifiP2PPeer:HwAddress, The "HwAddress" property
 

-
org.freedesktop.NetworkManager.WifiP2PPeer:LastSeen, The "LastSeen" property
+
org.freedesktop.NetworkManager.WifiP2PPeer:LastSeen, The "LastSeen" property
 

-
org.freedesktop.NetworkManager.WifiP2PPeer:Manufacturer, The "Manufacturer" property
+
org.freedesktop.NetworkManager.WifiP2PPeer:Manufacturer, The "Manufacturer" property
 

-
org.freedesktop.NetworkManager.WifiP2PPeer:Model, The "Model" property
+
org.freedesktop.NetworkManager.WifiP2PPeer:Model, The "Model" property
 

-
org.freedesktop.NetworkManager.WifiP2PPeer:ModelNumber, The "ModelNumber" property
+
org.freedesktop.NetworkManager.WifiP2PPeer:ModelNumber, The "ModelNumber" property
 

-
org.freedesktop.NetworkManager.WifiP2PPeer:Serial, The "Serial" property
+
org.freedesktop.NetworkManager.WifiP2PPeer:Serial, The "Serial" property
 

-
org.freedesktop.NetworkManager.WifiP2PPeer:Strength, The "Strength" property
+
org.freedesktop.NetworkManager.WifiP2PPeer:Strength, The "Strength" property
 

-
org.freedesktop.NetworkManager.WifiP2PPeer:WfdIEs, The "WfdIEs" property
+
org.freedesktop.NetworkManager.WifiP2PPeer:WfdIEs, The "WfdIEs" property
 

-
wps-method, wifi-p2p, 802-11-wireless-security
+
wps-method, wifi-p2p, 802-11-wireless-security
 

 

 

 

 
Z

-
zone, connection
+
zone, connection
 

 

 

diff --git a/docs/api/html/nm-settings-ifcfg-rh.html b/docs/api/html/nm-settings-ifcfg-rh.html
index e184de29..5452c021 100644
--- a/docs/api/html/nm-settings-ifcfg-rh.html
+++ b/docs/api/html/nm-settings-ifcfg-rh.html
@@ -628,6 +628,14 @@ Allowed values: 1 - 65535
 yes
 Hairpin mode of the bridge port.
 
+
+vlans
+BRIDGE_PORT_VLANS
+ 
+List of VLANs on the bridge port
+
+Example: BRIDGE_PORT_VLANS="1 pvid untagged,20,300-400 untagged"
+
 
 
 
@@ -708,6 +716,30 @@ Allowed values: 0 - 1000000
 
 Allowed values: 0 or 1
 
+
+vlan-filtering
+BRIDGING_OPTS: vlan_filtering=
+0
+VLAN filtering support.
+
+Allowed values: 0 or 1
+
+
+vlan-default-pvid
+BRIDGING_OPTS: default_pvid=
+1
+default VLAN PVID.
+
+Allowed values: 0 - 4094
+
+
+vlans
+BRIDGE_VLANS
+ 
+List of VLANs on the bridge
+
+Example: BRIDGE_VLANS="1 pvid untagged,20,300-400 untagged"
+
 
 
 
diff --git a/docs/api/html/nm-settings.html b/docs/api/html/nm-settings.html
index 57ffab77..6ee39655 100644
--- a/docs/api/html/nm-settings.html
+++ b/docs/api/html/nm-settings.html
@@ -857,6 +857,27 @@
 TRUE
 Controls whether Spanning Tree Protocol (STP) is enabled for this bridge.
 
+
+
+vlan-default-pvid
+uint32
+1
+The default PVID for the ports of the bridge, that is the VLAN id assigned to incoming untagged frames.
+
+
+
+vlan-filtering
+boolean
+FALSE
+Control whether VLAN filtering is enabled on the bridge.
+
+
+
+vlans
+array of vardict
+[]
+Array of bridge VLAN objects. In addition to the VLANs specified here, the bridge will also have the default-pvid VLAN configured  by the bridge.vlan-default-pvid property. In nmcli the VLAN list can be specified with the following syntax: $vid [pvid] [untagged] [, $vid [pvid] [untagged]]... where $vid is either a single id between 1 and 4094 or a range, represented as a couple of ids separated by a dash.
+
 
 
 
@@ -899,6 +920,13 @@
 32
 The Spanning Tree Protocol (STP) priority of this bridge port.
 
+
+
+vlans
+array of vardict
+[]
+Array of bridge VLAN objects. In addition to the VLANs specified here, the port will also have the default-pvid VLAN configured on the bridge by the bridge.vlan-default-pvid property. In nmcli the VLAN list can be specified with the following syntax: $vid [pvid] [untagged] [, $vid [pvid] [untagged]]... where $vid is either a single id between 1 and 4094 or a range, represented as a couple of ids separated by a dash.
+
 
 
 
diff --git a/docs/api/html/settings-bridge-port.html b/docs/api/html/settings-bridge-port.html
index 9de7bc09..4f4eaa45 100644
--- a/docs/api/html/settings-bridge-port.html
+++ b/docs/api/html/settings-bridge-port.html
@@ -71,6 +71,12 @@
 
32

 The Spanning Tree Protocol (STP) priority of this bridge port.
 
+
+
vlans

+
array of vardict

+
[]

+Array of bridge VLAN objects. In addition to the VLANs specified here, the port will also have the default-pvid VLAN configured on the bridge by the bridge.vlan-default-pvid property. In nmcli the VLAN list can be specified with the following syntax: $vid [pvid] [untagged] [, $vid [pvid] [untagged]]... where $vid is either a single id between 1 and 4094 or a range, represented as a couple of ids separated by a dash.
+
 
 
 
diff --git a/docs/api/html/settings-bridge.html b/docs/api/html/settings-bridge.html
index d5657511..f137d4e9 100644
--- a/docs/api/html/settings-bridge.html
+++ b/docs/api/html/settings-bridge.html
@@ -113,6 +113,24 @@
 
TRUE

 Controls whether Spanning Tree Protocol (STP) is enabled for this bridge.
 
+
+
vlan-default-pvid

+
uint32

+
1

+The default PVID for the ports of the bridge, that is the VLAN id assigned to incoming untagged frames.
+
+
+
vlan-filtering

+
boolean

+
FALSE

+Control whether VLAN filtering is enabled on the bridge.
+
+
+
vlans

+
array of vardict

+
[]

+Array of bridge VLAN objects. In addition to the VLANs specified here, the bridge will also have the default-pvid VLAN configured  by the bridge.vlan-default-pvid property. In nmcli the VLAN list can be specified with the following syntax: $vid [pvid] [untagged] [, $vid [pvid] [untagged]]... where $vid is either a single id between 1 and 4094 or a range, represented as a couple of ids separated by a dash.
+
 
 
 
diff --git a/docs/api/meson.build b/docs/api/meson.build
index 609e4ce8..6b3a0fa7 100644
--- a/docs/api/meson.build
+++ b/docs/api/meson.build
@@ -23,13 +23,13 @@ configure_file(
 content_files += join_paths(meson.source_root(), 'COPYING')
 filecopier = find_program('cp')
 foreach intro : introspection_files
-  path = intro.full_path().split('/')[-1]
+  path = intro[1].split('/')[-1]
   custom_target(path,
-                input: intro,
+                input: intro[0],
                 output: path,
-                command : [filecopier, '@INPUT@', '@OUTPUT@'],
+                command: [filecopier, intro[1], '@OUTPUT@'],
                 build_by_default: true,
-)
+  )
 endforeach
 
 custom_target('common.ent',
diff --git a/docs/api/settings-spec.xml b/docs/api/settings-spec.xml
index 2a73f041..4b4406aa 100644
--- a/docs/api/settings-spec.xml
+++ b/docs/api/settings-spec.xml
@@ -117,6 +117,9 @@
     multicast-snoopingmulticast-snoopingbooleanTRUEControls whether IGMP snooping is enabled for this bridge. Note that if snooping was automatically disabled due to hash collisions, the system may refuse to enable the feature until the collisions are resolved.
     prioritypriorityuint3232768Sets the Spanning Tree Protocol (STP) priority for this bridge.  Lower values are "better"; the lowest priority bridge will be elected the root bridge.
     stpstpbooleanTRUEControls whether Spanning Tree Protocol (STP) is enabled for this bridge.
+    vlan-default-pvidvlan-default-pviduint321The default PVID for the ports of the bridge, that is the VLAN id assigned to incoming untagged frames.
+    vlan-filteringvlan-filteringbooleanFALSEControl whether VLAN filtering is enabled on the bridge.
+    vlansvlansarray of vardict[]Array of bridge VLAN objects. In addition to the VLANs specified here, the bridge will also have the default-pvid VLAN configured  by the bridge.vlan-default-pvid property. In nmcli the VLAN list can be specified with the following syntax: $vid [pvid] [untagged] [, $vid [pvid] [untagged]]... where $vid is either a single id between 1 and 4094 or a range, represented as a couple of ids separated by a dash.
   
   bridge-portBridge Port Settings
             Properties
@@ -124,6 +127,7 @@
     <row><entry><screen>hairpin-mode<indexterm zone="settings-bridge-port"><primary sortas="hairpin-mode">hairpin-mode</primary></indexterm></screen></entry><entry><screen>boolean</screen></entry><entry><screen>FALSE</screen></entry><entry>Enables or disables "hairpin mode" for the port, which allows frames to be sent back out through the port the frame was received on.</entry></row>
     <row><entry><screen>path-cost<indexterm zone="settings-bridge-port"><primary sortas="path-cost">path-cost</primary></indexterm></screen></entry><entry><screen>uint32</screen></entry><entry><screen>100</screen></entry><entry>The Spanning Tree Protocol (STP) port cost for destinations via this port.</entry></row>
     <row><entry><screen>priority<indexterm zone="settings-bridge-port"><primary sortas="priority">priority</primary></indexterm></screen></entry><entry><screen>uint32</screen></entry><entry><screen>32</screen></entry><entry>The Spanning Tree Protocol (STP) priority of this bridge port.</entry></row>
+    <row><entry><screen>vlans<indexterm zone="settings-bridge-port"><primary sortas="vlans">vlans</primary></indexterm></screen></entry><entry><screen>array of vardict</screen></entry><entry><screen>[]</screen></entry><entry>Array of bridge VLAN objects. In addition to the VLANs specified here, the port will also have the default-pvid VLAN configured on the bridge by the bridge.vlan-default-pvid property. In nmcli the VLAN list can be specified with the following syntax: $vid [pvid] [untagged] [, $vid [pvid] [untagged]]... where $vid is either a single id between 1 and 4094 or a range, represented as a couple of ids separated by a dash.</entry></row>
   </tbody></tgroup></table></para></refsect1></refentry>
   <refentry id="settings-cdma"><refnamediv><refname>cdma</refname><refpurpose>CDMA-based Mobile Broadband Settings</refpurpose></refnamediv><refsect1 role="properties"><title id="settings-cdma.properties">
             Properties
diff --git a/docs/api/version.xml b/docs/api/version.xml
index 15b989e3..84cc5294 100644
--- a/docs/api/version.xml
+++ b/docs/api/version.xml
@@ -1 +1 @@
-1.16.0
+1.18.0
diff --git a/docs/libnm-glib/html/index.html b/docs/libnm-glib/html/index.html
index aa85345e..0405855c 100644
--- a/docs/libnm-glib/html/index.html
+++ b/docs/libnm-glib/html/index.html
@@ -15,7 +15,7 @@
 <div>
 <div><table class="navigation" id="top" width="100%" cellpadding="2" cellspacing="0"><tr><th valign="middle"><p class="title">libnm-glib Reference Manual</p></th></tr></table></div>
 <div><p class="releaseinfo">
-      for libnm-glib 1.16.0
+      for libnm-glib 1.18.0
 
       The latest version of this documentation can be found on-line at
       <a class="ulink" href="https://developer.gnome.org/libnm-glib/stable/" target="_top">https://developer.gnome.org/libnm-glib/stable/</a>.
diff --git a/docs/libnm-glib/version.xml b/docs/libnm-glib/version.xml
index 15b989e3..84cc5294 100644
--- a/docs/libnm-glib/version.xml
+++ b/docs/libnm-glib/version.xml
@@ -1 +1 @@
-1.16.0
+1.18.0
diff --git a/docs/libnm-util/html/index.html b/docs/libnm-util/html/index.html
index 90af150c..02a1bff0 100644
--- a/docs/libnm-util/html/index.html
+++ b/docs/libnm-util/html/index.html
@@ -15,7 +15,7 @@
 <div>
 <div><table class="navigation" id="top" width="100%" cellpadding="2" cellspacing="0"><tr><th valign="middle"><p class="title">libnm-util Reference Manual</p></th></tr></table></div>
 <div><p class="releaseinfo">
-      for libnm-util 1.16.0
+      for libnm-util 1.18.0
 
       The latest version of this documentation can be found on-line at
       <a class="ulink" href="https://developer.gnome.org/libnm-util/stable/" target="_top">https://developer.gnome.org/libnm-util/stable/</a>.
diff --git a/docs/libnm-util/version.xml b/docs/libnm-util/version.xml
index 15b989e3..84cc5294 100644
--- a/docs/libnm-util/version.xml
+++ b/docs/libnm-util/version.xml
@@ -1 +1 @@
-1.16.0
+1.18.0
diff --git a/docs/libnm/html/NMDevice.html b/docs/libnm/html/NMDevice.html
index 6f9f1ae6..81c800f6 100644
--- a/docs/libnm/html/NMDevice.html
+++ b/docs/libnm/html/NMDevice.html
@@ -493,6 +493,14 @@
 <a class="link" href="NMDevice.html#nm-lldp-neighbor-get-attr-type" title="nm_lldp_neighbor_get_attr_type ()">nm_lldp_neighbor_get_attr_type</a> <span class="c_punctuation">()</span>
 </td>
 </tr>
+<tr>
+<td class="function_type">
+<a href="https://developer.gnome.org/glib/unstable/glib-GVariant.html#GVariant"><span class="returnvalue">GVariant</span></a> *
+</td>
+<td class="function_name">
+<a class="link" href="NMDevice.html#nm-lldp-neighbor-get-attr-value" title="nm_lldp_neighbor_get_attr_value ()">nm_lldp_neighbor_get_attr_value</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
 </tbody>
 </table></div>
 </div>
@@ -2722,7 +2730,7 @@ nm_lldp_neighbor_get_attr_names (<em class="parameter"><code><a class="link" hre
 <pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
 nm_lldp_neighbor_get_attr_string_value
                                (<em class="parameter"><code><a class="link" href="NMDevice.html#NMLldpNeighbor"><span class="type">NMLldpNeighbor</span></a> *neighbor</code></em>,
-                                <em class="parameter"><code><span class="type">char</span> *name</code></em>,
+                                <em class="parameter"><code>const <span class="type">char</span> *name</code></em>,
                                 <em class="parameter"><code>const <span class="type">char</span> **out_value</code></em>);</pre>
 <p>Gets the string value of attribute with name <em class="parameter"><code>name</code></em>
  on <em class="parameter"><code>neighbor</code></em>
@@ -2766,7 +2774,7 @@ was found, <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macr
 <a name="nm-lldp-neighbor-get-attr-uint-value"></a><h3>nm_lldp_neighbor_get_attr_uint_value ()</h3>
 <pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
 nm_lldp_neighbor_get_attr_uint_value (<em class="parameter"><code><a class="link" href="NMDevice.html#NMLldpNeighbor"><span class="type">NMLldpNeighbor</span></a> *neighbor</code></em>,
-                                      <em class="parameter"><code><span class="type">char</span> *name</code></em>,
+                                      <em class="parameter"><code>const <span class="type">char</span> *name</code></em>,
                                       <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> *out_value</code></em>);</pre>
 <p>Gets the uint value of attribute with name <em class="parameter"><code>name</code></em>
  on <em class="parameter"><code>neighbor</code></em>
@@ -2810,7 +2818,7 @@ was found, <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macr
 <a name="nm-lldp-neighbor-get-attr-type"></a><h3>nm_lldp_neighbor_get_attr_type ()</h3>
 <pre class="programlisting">const <a href="https://developer.gnome.org/glib/unstable/glib-GVariantType.html#GVariantType"><span class="returnvalue">GVariantType</span></a> *
 nm_lldp_neighbor_get_attr_type (<em class="parameter"><code><a class="link" href="NMDevice.html#NMLldpNeighbor"><span class="type">NMLldpNeighbor</span></a> *neighbor</code></em>,
-                                <em class="parameter"><code><span class="type">char</span> *name</code></em>);</pre>
+                                <em class="parameter"><code>const <span class="type">char</span> *name</code></em>);</pre>
 <p>Get the type of an attribute.</p>
 <div class="refsect3">
 <a name="nm-lldp-neighbor-get-attr-type.parameters"></a><h4>Parameters</h4>
@@ -2841,6 +2849,46 @@ nm_lldp_neighbor_get_attr_type (<em class="parameter"><code><a class="link" href
 </div>
 <p class="since">Since: 1.2</p>
 </div>
+<hr>
+<div class="refsect2">
+<a name="nm-lldp-neighbor-get-attr-value"></a><h3>nm_lldp_neighbor_get_attr_value ()</h3>
+<pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-GVariant.html#GVariant"><span class="returnvalue">GVariant</span></a> *
+nm_lldp_neighbor_get_attr_value (<em class="parameter"><code><a class="link" href="NMDevice.html#NMLldpNeighbor"><span class="type">NMLldpNeighbor</span></a> *neighbor</code></em>,
+                                 <em class="parameter"><code>const <span class="type">char</span> *name</code></em>);</pre>
+<p>Gets the value (as a GVariant) of attribute with name <em class="parameter"><code>name</code></em>
+ on <em class="parameter"><code>neighbor</code></em>
+</p>
+<div class="refsect3">
+<a name="nm-lldp-neighbor-get-attr-value.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody>
+<tr>
+<td class="parameter_name"><p>neighbor</p></td>
+<td class="parameter_description"><p>the <a class="link" href="NMDevice.html#NMLldpNeighbor"><span class="type">NMLldpNeighbor</span></a></p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>name</p></td>
+<td class="parameter_description"><p>the attribute name</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<div class="refsect3">
+<a name="nm-lldp-neighbor-get-attr-value.returns"></a><h4>Returns</h4>
+<p>the value or <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> if the attribute with <em class="parameter"><code>name</code></em>
+was
+not found. </p>
+<p><span class="annotation">[<acronym title="Don't free data after the code is done."><span class="acronym">transfer none</span></acronym>]</span></p>
+</div>
+<p class="since">Since: 1.18</p>
+</div>
 </div>
 <div class="refsect1">
 <a name="NMDevice.other_details"></a><h2>Types and Values</h2>
diff --git a/docs/libnm/html/NMSettingBridge.html b/docs/libnm/html/NMSettingBridge.html
index 8f374b6a..a92e1abe 100644
--- a/docs/libnm/html/NMSettingBridge.html
+++ b/docs/libnm/html/NMSettingBridge.html
@@ -120,6 +120,182 @@
 <a class="link" href="NMSettingBridge.html#nm-setting-bridge-get-multicast-snooping" title="nm_setting_bridge_get_multicast_snooping ()">nm_setting_bridge_get_multicast_snooping</a> <span class="c_punctuation">()</span>
 </td>
 </tr>
+<tr>
+<td class="function_type">
+<a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
+</td>
+<td class="function_name">
+<a class="link" href="NMSettingBridge.html#nm-setting-bridge-get-vlan-filtering" title="nm_setting_bridge_get_vlan_filtering ()">nm_setting_bridge_get_vlan_filtering</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint16"><span class="returnvalue">guint16</span></a>
+</td>
+<td class="function_name">
+<a class="link" href="NMSettingBridge.html#nm-setting-bridge-get-vlan-default-pvid" title="nm_setting_bridge_get_vlan_default_pvid ()">nm_setting_bridge_get_vlan_default_pvid</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<span class="returnvalue">void</span>
+</td>
+<td class="function_name">
+<a class="link" href="NMSettingBridge.html#nm-setting-bridge-add-vlan" title="nm_setting_bridge_add_vlan ()">nm_setting_bridge_add_vlan</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint"><span class="returnvalue">guint</span></a>
+</td>
+<td class="function_name">
+<a class="link" href="NMSettingBridge.html#nm-setting-bridge-get-num-vlans" title="nm_setting_bridge_get_num_vlans ()">nm_setting_bridge_get_num_vlans</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<a class="link" href="NMSettingBridge.html#NMBridgeVlan"><span class="returnvalue">NMBridgeVlan</span></a> *
+</td>
+<td class="function_name">
+<a class="link" href="NMSettingBridge.html#nm-setting-bridge-get-vlan" title="nm_setting_bridge_get_vlan ()">nm_setting_bridge_get_vlan</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<span class="returnvalue">void</span>
+</td>
+<td class="function_name">
+<a class="link" href="NMSettingBridge.html#nm-setting-bridge-remove-vlan" title="nm_setting_bridge_remove_vlan ()">nm_setting_bridge_remove_vlan</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
+</td>
+<td class="function_name">
+<a class="link" href="NMSettingBridge.html#nm-setting-bridge-remove-vlan-by-vid" title="nm_setting_bridge_remove_vlan_by_vid ()">nm_setting_bridge_remove_vlan_by_vid</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<span class="returnvalue">void</span>
+</td>
+<td class="function_name">
+<a class="link" href="NMSettingBridge.html#nm-setting-bridge-clear-vlans" title="nm_setting_bridge_clear_vlans ()">nm_setting_bridge_clear_vlans</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<a class="link" href="NMSettingBridge.html#NMBridgeVlan"><span class="returnvalue">NMBridgeVlan</span></a> *
+</td>
+<td class="function_name">
+<a class="link" href="NMSettingBridge.html#nm-bridge-vlan-new" title="nm_bridge_vlan_new ()">nm_bridge_vlan_new</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<a class="link" href="NMSettingBridge.html#NMBridgeVlan"><span class="returnvalue">NMBridgeVlan</span></a> *
+</td>
+<td class="function_name">
+<a class="link" href="NMSettingBridge.html#nm-bridge-vlan-ref" title="nm_bridge_vlan_ref ()">nm_bridge_vlan_ref</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<span class="returnvalue">void</span>
+</td>
+<td class="function_name">
+<a class="link" href="NMSettingBridge.html#nm-bridge-vlan-unref" title="nm_bridge_vlan_unref ()">nm_bridge_vlan_unref</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<a class="link" href="NMSettingBridge.html#NMBridgeVlan"><span class="returnvalue">NMBridgeVlan</span></a> *
+</td>
+<td class="function_name">
+<a class="link" href="NMSettingBridge.html#nm-bridge-vlan-new-clone" title="nm_bridge_vlan_new_clone ()">nm_bridge_vlan_new_clone</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<span class="returnvalue">int</span>
+</td>
+<td class="function_name">
+<a class="link" href="NMSettingBridge.html#nm-bridge-vlan-cmp" title="nm_bridge_vlan_cmp ()">nm_bridge_vlan_cmp</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<span class="returnvalue">void</span>
+</td>
+<td class="function_name">
+<a class="link" href="NMSettingBridge.html#nm-bridge-vlan-seal" title="nm_bridge_vlan_seal ()">nm_bridge_vlan_seal</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
+</td>
+<td class="function_name">
+<a class="link" href="NMSettingBridge.html#nm-bridge-vlan-is-sealed" title="nm_bridge_vlan_is_sealed ()">nm_bridge_vlan_is_sealed</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<span class="returnvalue">void</span>
+</td>
+<td class="function_name">
+<a class="link" href="NMSettingBridge.html#nm-bridge-vlan-set-untagged" title="nm_bridge_vlan_set_untagged ()">nm_bridge_vlan_set_untagged</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<span class="returnvalue">void</span>
+</td>
+<td class="function_name">
+<a class="link" href="NMSettingBridge.html#nm-bridge-vlan-set-pvid" title="nm_bridge_vlan_set_pvid ()">nm_bridge_vlan_set_pvid</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
+</td>
+<td class="function_name">
+<a class="link" href="NMSettingBridge.html#nm-bridge-vlan-get-vid-range" title="nm_bridge_vlan_get_vid_range ()">nm_bridge_vlan_get_vid_range</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
+</td>
+<td class="function_name">
+<a class="link" href="NMSettingBridge.html#nm-bridge-vlan-is-untagged" title="nm_bridge_vlan_is_untagged ()">nm_bridge_vlan_is_untagged</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
+</td>
+<td class="function_name">
+<a class="link" href="NMSettingBridge.html#nm-bridge-vlan-is-pvid" title="nm_bridge_vlan_is_pvid ()">nm_bridge_vlan_is_pvid</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<span class="returnvalue">char</span> *
+</td>
+<td class="function_name">
+<a class="link" href="NMSettingBridge.html#nm-bridge-vlan-to-str" title="nm_bridge_vlan_to_str ()">nm_bridge_vlan_to_str</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<a class="link" href="NMSettingBridge.html#NMBridgeVlan"><span class="returnvalue">NMBridgeVlan</span></a> *
+</td>
+<td class="function_name">
+<a class="link" href="NMSettingBridge.html#nm-bridge-vlan-from-str" title="nm_bridge_vlan_from_str ()">nm_bridge_vlan_from_str</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
 </tbody>
 </table></div>
 </div>
@@ -178,10 +354,26 @@
 <td class="property_name"><a class="link" href="NMSettingBridge.html#NMSettingBridge--stp" title="The “stp” property">stp</a></td>
 <td class="property_flags">Read / Write / Construct</td>
 </tr>
+<tr>
+<td class="property_type"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a></td>
+<td class="property_name"><a class="link" href="NMSettingBridge.html#NMSettingBridge--vlan-default-pvid" title="The “vlan-default-pvid” property">vlan-default-pvid</a></td>
+<td class="property_flags">Read / Write / Construct</td>
+</tr>
+<tr>
+<td class="property_type"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a></td>
+<td class="property_name"><a class="link" href="NMSettingBridge.html#NMSettingBridge--vlan-filtering" title="The “vlan-filtering” property">vlan-filtering</a></td>
+<td class="property_flags">Read / Write / Construct</td>
+</tr>
+<tr>
+<td class="property_type">
+<a href="https://developer.gnome.org/glib/unstable/glib-Pointer-Arrays.html#GPtrArray"><span class="type">GPtrArray</span></a> *</td>
+<td class="property_name"><a class="link" href="NMSettingBridge.html#NMSettingBridge--vlans" title="The “vlans” property">vlans</a></td>
+<td class="property_flags">Read / Write</td>
+</tr>
 </tbody>
 </table></div>
 </div>
-<div class="refsect1">
+<a name="NMBridgeVlan"></a><div class="refsect1">
 <a name="NMSettingBridge.other"></a><h2>Types and Values</h2>
 <div class="informaltable"><table class="informaltable" width="100%" border="0">
 <colgroup>
@@ -230,6 +422,26 @@
 <td class="function_name"><a class="link" href="NMSettingBridge.html#NM-SETTING-BRIDGE-MULTICAST-SNOOPING:CAPS" title="NM_SETTING_BRIDGE_MULTICAST_SNOOPING">NM_SETTING_BRIDGE_MULTICAST_SNOOPING</a></td>
 </tr>
 <tr>
+<td class="define_keyword">#define</td>
+<td class="function_name"><a class="link" href="NMSettingBridge.html#NM-SETTING-BRIDGE-VLAN-FILTERING:CAPS" title="NM_SETTING_BRIDGE_VLAN_FILTERING">NM_SETTING_BRIDGE_VLAN_FILTERING</a></td>
+</tr>
+<tr>
+<td class="define_keyword">#define</td>
+<td class="function_name"><a class="link" href="NMSettingBridge.html#NM-SETTING-BRIDGE-VLAN-DEFAULT-PVID:CAPS" title="NM_SETTING_BRIDGE_VLAN_DEFAULT_PVID">NM_SETTING_BRIDGE_VLAN_DEFAULT_PVID</a></td>
+</tr>
+<tr>
+<td class="define_keyword">#define</td>
+<td class="function_name"><a class="link" href="NMSettingBridge.html#NM-SETTING-BRIDGE-VLANS:CAPS" title="NM_SETTING_BRIDGE_VLANS">NM_SETTING_BRIDGE_VLANS</a></td>
+</tr>
+<tr>
+<td class="define_keyword">#define</td>
+<td class="function_name"><a class="link" href="NMSettingBridge.html#NM-BRIDGE-VLAN-VID-MIN:CAPS" title="NM_BRIDGE_VLAN_VID_MIN">NM_BRIDGE_VLAN_VID_MIN</a></td>
+</tr>
+<tr>
+<td class="define_keyword">#define</td>
+<td class="function_name"><a class="link" href="NMSettingBridge.html#NM-BRIDGE-VLAN-VID-MAX:CAPS" title="NM_BRIDGE_VLAN_VID_MAX">NM_BRIDGE_VLAN_VID_MAX</a></td>
+</tr>
+<tr>
 <td class="datatype_keyword"> </td>
 <td class="function_name"><a class="link" href="NMSettingBridge.html#NMSettingBridge-struct" title="NMSettingBridge">NMSettingBridge</a></td>
 </tr>
@@ -238,7 +450,9 @@
 </div>
 <div class="refsect1">
 <a name="NMSettingBridge.object-hierarchy"></a><h2>Object Hierarchy</h2>
-<pre class="screen">    <a href="https://developer.gnome.org/gobject/unstable/gobject-The-Base-Object-Type.html#GObject-struct">GObject</a>
+<pre class="screen">    <a href="/usr/share/gtk-doc/html/gobject/gobject-Boxed-Types.html">GBoxed</a>
+    <span class="lineart">╰──</span> NMBridgeVlan
+    <a href="https://developer.gnome.org/gobject/unstable/gobject-The-Base-Object-Type.html#GObject-struct">GObject</a>
     <span class="lineart">╰──</span> <a class="link" href="NMSetting.html" title="NMSetting">NMSetting</a>
         <span class="lineart">╰──</span> NMSettingBridge
 </pre>
@@ -490,60 +704,754 @@ nm_setting_bridge_get_multicast_snooping
 </div>
 <p class="since">Since: 1.2</p>
 </div>
-</div>
-<div class="refsect1">
-<a name="NMSettingBridge.other_details"></a><h2>Types and Values</h2>
-<div class="refsect2">
-<a name="NM-SETTING-BRIDGE-SETTING-NAME:CAPS"></a><h3>NM_SETTING_BRIDGE_SETTING_NAME</h3>
-<pre class="programlisting">#define NM_SETTING_BRIDGE_SETTING_NAME "bridge"
-</pre>
-</div>
 <hr>
 <div class="refsect2">
-<a name="NM-SETTING-BRIDGE-MAC-ADDRESS:CAPS"></a><h3>NM_SETTING_BRIDGE_MAC_ADDRESS</h3>
-<pre class="programlisting">#define NM_SETTING_BRIDGE_MAC_ADDRESS    "mac-address"
-</pre>
+<a name="nm-setting-bridge-get-vlan-filtering"></a><h3>nm_setting_bridge_get_vlan_filtering ()</h3>
+<pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
+nm_setting_bridge_get_vlan_filtering (<em class="parameter"><code><a class="link" href="NMSettingBridge.html" title="NMSettingBridge"><span class="type">NMSettingBridge</span></a> *setting</code></em>);</pre>
+<div class="refsect3">
+<a name="nm-setting-bridge-get-vlan-filtering.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody><tr>
+<td class="parameter_name"><p>setting</p></td>
+<td class="parameter_description"><p>the <a class="link" href="NMSettingBridge.html" title="NMSettingBridge"><span class="type">NMSettingBridge</span></a></p></td>
+<td class="parameter_annotations"> </td>
+</tr></tbody>
+</table></div>
 </div>
-<hr>
-<div class="refsect2">
-<a name="NM-SETTING-BRIDGE-STP:CAPS"></a><h3>NM_SETTING_BRIDGE_STP</h3>
-<pre class="programlisting">#define NM_SETTING_BRIDGE_STP            "stp"
-</pre>
+<div class="refsect3">
+<a name="nm-setting-bridge-get-vlan-filtering.returns"></a><h4>Returns</h4>
+<p> the <a class="link" href="NMSettingBridge.html#NMSettingBridge--vlan-filtering" title="The “vlan-filtering” property"><span class="type">“vlan-filtering”</span></a> property of the setting</p>
 </div>
-<hr>
-<div class="refsect2">
-<a name="NM-SETTING-BRIDGE-PRIORITY:CAPS"></a><h3>NM_SETTING_BRIDGE_PRIORITY</h3>
-<pre class="programlisting">#define NM_SETTING_BRIDGE_PRIORITY       "priority"
-</pre>
+<p class="since">Since: 1.18</p>
 </div>
 <hr>
 <div class="refsect2">
-<a name="NM-SETTING-BRIDGE-FORWARD-DELAY:CAPS"></a><h3>NM_SETTING_BRIDGE_FORWARD_DELAY</h3>
-<pre class="programlisting">#define NM_SETTING_BRIDGE_FORWARD_DELAY  "forward-delay"
-</pre>
+<a name="nm-setting-bridge-get-vlan-default-pvid"></a><h3>nm_setting_bridge_get_vlan_default_pvid ()</h3>
+<pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint16"><span class="returnvalue">guint16</span></a>
+nm_setting_bridge_get_vlan_default_pvid
+                               (<em class="parameter"><code><a class="link" href="NMSettingBridge.html" title="NMSettingBridge"><span class="type">NMSettingBridge</span></a> *setting</code></em>);</pre>
+<div class="refsect3">
+<a name="nm-setting-bridge-get-vlan-default-pvid.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody><tr>
+<td class="parameter_name"><p>setting</p></td>
+<td class="parameter_description"><p>the <a class="link" href="NMSettingBridge.html" title="NMSettingBridge"><span class="type">NMSettingBridge</span></a></p></td>
+<td class="parameter_annotations"> </td>
+</tr></tbody>
+</table></div>
 </div>
-<hr>
-<div class="refsect2">
-<a name="NM-SETTING-BRIDGE-HELLO-TIME:CAPS"></a><h3>NM_SETTING_BRIDGE_HELLO_TIME</h3>
-<pre class="programlisting">#define NM_SETTING_BRIDGE_HELLO_TIME     "hello-time"
-</pre>
+<div class="refsect3">
+<a name="nm-setting-bridge-get-vlan-default-pvid.returns"></a><h4>Returns</h4>
+<p> the <a class="link" href="NMSettingBridge.html#NMSettingBridge--vlan-default-pvid" title="The “vlan-default-pvid” property"><span class="type">“vlan-default-pvid”</span></a> property of the setting</p>
 </div>
-<hr>
-<div class="refsect2">
-<a name="NM-SETTING-BRIDGE-MAX-AGE:CAPS"></a><h3>NM_SETTING_BRIDGE_MAX_AGE</h3>
-<pre class="programlisting">#define NM_SETTING_BRIDGE_MAX_AGE        "max-age"
-</pre>
+<p class="since">Since: 1.18</p>
 </div>
 <hr>
 <div class="refsect2">
-<a name="NM-SETTING-BRIDGE-AGEING-TIME:CAPS"></a><h3>NM_SETTING_BRIDGE_AGEING_TIME</h3>
-<pre class="programlisting">#define NM_SETTING_BRIDGE_AGEING_TIME    "ageing-time"
-</pre>
+<a name="nm-setting-bridge-add-vlan"></a><h3>nm_setting_bridge_add_vlan ()</h3>
+<pre class="programlisting"><span class="returnvalue">void</span>
+nm_setting_bridge_add_vlan (<em class="parameter"><code><a class="link" href="NMSettingBridge.html" title="NMSettingBridge"><span class="type">NMSettingBridge</span></a> *setting</code></em>,
+                            <em class="parameter"><code><a class="link" href="NMSettingBridge.html#NMBridgeVlan"><span class="type">NMBridgeVlan</span></a> *vlan</code></em>);</pre>
+<p>Appends a new vlan and associated information to the setting.  The
+given vlan gets sealed and a reference to it is added.</p>
+<div class="refsect3">
+<a name="nm-setting-bridge-add-vlan.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody>
+<tr>
+<td class="parameter_name"><p>setting</p></td>
+<td class="parameter_description"><p>the <a class="link" href="NMSettingBridge.html" title="NMSettingBridge"><span class="type">NMSettingBridge</span></a></p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>vlan</p></td>
+<td class="parameter_description"><p>the vlan to add</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<p class="since">Since: 1.18</p>
 </div>
 <hr>
 <div class="refsect2">
-<a name="NM-SETTING-BRIDGE-GROUP-FORWARD-MASK:CAPS"></a><h3>NM_SETTING_BRIDGE_GROUP_FORWARD_MASK</h3>
-<pre class="programlisting">#define NM_SETTING_BRIDGE_GROUP_FORWARD_MASK "group-forward-mask"
+<a name="nm-setting-bridge-get-num-vlans"></a><h3>nm_setting_bridge_get_num_vlans ()</h3>
+<pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint"><span class="returnvalue">guint</span></a>
+nm_setting_bridge_get_num_vlans (<em class="parameter"><code><a class="link" href="NMSettingBridge.html" title="NMSettingBridge"><span class="type">NMSettingBridge</span></a> *setting</code></em>);</pre>
+<div class="refsect3">
+<a name="nm-setting-bridge-get-num-vlans.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody><tr>
+<td class="parameter_name"><p>setting</p></td>
+<td class="parameter_description"><p>the <a class="link" href="NMSettingBridge.html" title="NMSettingBridge"><span class="type">NMSettingBridge</span></a></p></td>
+<td class="parameter_annotations"> </td>
+</tr></tbody>
+</table></div>
+</div>
+<div class="refsect3">
+<a name="nm-setting-bridge-get-num-vlans.returns"></a><h4>Returns</h4>
+<p> the number of VLANs</p>
+</div>
+<p class="since">Since: 1.18</p>
+</div>
+<hr>
+<div class="refsect2">
+<a name="nm-setting-bridge-get-vlan"></a><h3>nm_setting_bridge_get_vlan ()</h3>
+<pre class="programlisting"><a class="link" href="NMSettingBridge.html#NMBridgeVlan"><span class="returnvalue">NMBridgeVlan</span></a> *
+nm_setting_bridge_get_vlan (<em class="parameter"><code><a class="link" href="NMSettingBridge.html" title="NMSettingBridge"><span class="type">NMSettingBridge</span></a> *setting</code></em>,
+                            <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> idx</code></em>);</pre>
+<div class="refsect3">
+<a name="nm-setting-bridge-get-vlan.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody>
+<tr>
+<td class="parameter_name"><p>setting</p></td>
+<td class="parameter_description"><p>the <a class="link" href="NMSettingBridge.html" title="NMSettingBridge"><span class="type">NMSettingBridge</span></a></p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>idx</p></td>
+<td class="parameter_description"><p>index number of the VLAN to return</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<div class="refsect3">
+<a name="nm-setting-bridge-get-vlan.returns"></a><h4>Returns</h4>
+<p>the VLAN at index <em class="parameter"><code>idx</code></em>
+. </p>
+<p><span class="annotation">[<acronym title="Don't free data after the code is done."><span class="acronym">transfer none</span></acronym>]</span></p>
+</div>
+<p class="since">Since: 1.18</p>
+</div>
+<hr>
+<div class="refsect2">
+<a name="nm-setting-bridge-remove-vlan"></a><h3>nm_setting_bridge_remove_vlan ()</h3>
+<pre class="programlisting"><span class="returnvalue">void</span>
+nm_setting_bridge_remove_vlan (<em class="parameter"><code><a class="link" href="NMSettingBridge.html" title="NMSettingBridge"><span class="type">NMSettingBridge</span></a> *setting</code></em>,
+                               <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> idx</code></em>);</pre>
+<p>Removes the vlan at index <em class="parameter"><code>idx</code></em>
+.</p>
+<div class="refsect3">
+<a name="nm-setting-bridge-remove-vlan.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody>
+<tr>
+<td class="parameter_name"><p>setting</p></td>
+<td class="parameter_description"><p>the <a class="link" href="NMSettingBridge.html" title="NMSettingBridge"><span class="type">NMSettingBridge</span></a></p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>idx</p></td>
+<td class="parameter_description"><p>index number of the VLAN.</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<p class="since">Since: 1.18</p>
+</div>
+<hr>
+<div class="refsect2">
+<a name="nm-setting-bridge-remove-vlan-by-vid"></a><h3>nm_setting_bridge_remove_vlan_by_vid ()</h3>
+<pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
+nm_setting_bridge_remove_vlan_by_vid (<em class="parameter"><code><a class="link" href="NMSettingBridge.html" title="NMSettingBridge"><span class="type">NMSettingBridge</span></a> *setting</code></em>,
+                                      <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint16"><span class="type">guint16</span></a> vid_start</code></em>,
+                                      <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint16"><span class="type">guint16</span></a> vid_end</code></em>);</pre>
+<p>Remove the VLAN with range <em class="parameter"><code>vid_start</code></em>
+ to <em class="parameter"><code>vid_end</code></em>
+.
+If <em class="parameter"><code>vid_end</code></em>
+ is zero, it is assumed to be equal to <em class="parameter"><code>vid_start</code></em>
+
+and so the single-id VLAN with id <em class="parameter"><code>vid_start</code></em>
+ is removed.</p>
+<div class="refsect3">
+<a name="nm-setting-bridge-remove-vlan-by-vid.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody>
+<tr>
+<td class="parameter_name"><p>setting</p></td>
+<td class="parameter_description"><p>the <a class="link" href="NMSettingBridge.html" title="NMSettingBridge"><span class="type">NMSettingBridge</span></a></p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>vid_start</p></td>
+<td class="parameter_description"><p>the vlan start index</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>vid_end</p></td>
+<td class="parameter_description"><p>the vlan end index</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<div class="refsect3">
+<a name="nm-setting-bridge-remove-vlan-by-vid.returns"></a><h4>Returns</h4>
+<p> <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> if the vlan was found and removed; <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#FALSE:CAPS"><code class="literal">FALSE</code></a> otherwise</p>
+</div>
+<p class="since">Since: 1.18</p>
+</div>
+<hr>
+<div class="refsect2">
+<a name="nm-setting-bridge-clear-vlans"></a><h3>nm_setting_bridge_clear_vlans ()</h3>
+<pre class="programlisting"><span class="returnvalue">void</span>
+nm_setting_bridge_clear_vlans (<em class="parameter"><code><a class="link" href="NMSettingBridge.html" title="NMSettingBridge"><span class="type">NMSettingBridge</span></a> *setting</code></em>);</pre>
+<p>Removes all configured VLANs.</p>
+<div class="refsect3">
+<a name="nm-setting-bridge-clear-vlans.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody><tr>
+<td class="parameter_name"><p>setting</p></td>
+<td class="parameter_description"><p>the <a class="link" href="NMSettingBridge.html" title="NMSettingBridge"><span class="type">NMSettingBridge</span></a></p></td>
+<td class="parameter_annotations"> </td>
+</tr></tbody>
+</table></div>
+</div>
+<p class="since">Since: 1.18</p>
+</div>
+<hr>
+<div class="refsect2">
+<a name="nm-bridge-vlan-new"></a><h3>nm_bridge_vlan_new ()</h3>
+<pre class="programlisting"><a class="link" href="NMSettingBridge.html#NMBridgeVlan"><span class="returnvalue">NMBridgeVlan</span></a> *
+nm_bridge_vlan_new (<em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint16"><span class="type">guint16</span></a> vid_start</code></em>,
+                    <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint16"><span class="type">guint16</span></a> vid_end</code></em>);</pre>
+<p>Creates a new <a class="link" href="NMSettingBridge.html#NMBridgeVlan"><span class="type">NMBridgeVlan</span></a> object for the given VLAN id range.
+Setting <em class="parameter"><code>vid_end</code></em>
+ to 0 is equivalent to setting it to <em class="parameter"><code>vid_start</code></em>
+
+and creates a single-id VLAN.</p>
+<div class="refsect3">
+<a name="nm-bridge-vlan-new.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody>
+<tr>
+<td class="parameter_name"><p>vid_start</p></td>
+<td class="parameter_description"><p>the start VLAN id, must be between 1 and 4094.</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>vid_end</p></td>
+<td class="parameter_description"><p>the end VLAN id, must be 0 or between <em class="parameter"><code>vid_start</code></em>
+and 4094.</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<div class="refsect3">
+<a name="nm-bridge-vlan-new.returns"></a><h4>Returns</h4>
+<p>the new <a class="link" href="NMSettingBridge.html#NMBridgeVlan"><span class="type">NMBridgeVlan</span></a> object. </p>
+<p><span class="annotation">[<acronym title="Free data after the code is done."><span class="acronym">transfer full</span></acronym>]</span></p>
+</div>
+<p class="since">Since: 1.18</p>
+</div>
+<hr>
+<div class="refsect2">
+<a name="nm-bridge-vlan-ref"></a><h3>nm_bridge_vlan_ref ()</h3>
+<pre class="programlisting"><a class="link" href="NMSettingBridge.html#NMBridgeVlan"><span class="returnvalue">NMBridgeVlan</span></a> *
+nm_bridge_vlan_ref (<em class="parameter"><code><a class="link" href="NMSettingBridge.html#NMBridgeVlan"><span class="type">NMBridgeVlan</span></a> *vlan</code></em>);</pre>
+<p>Increases the reference count of the object.</p>
+<div class="refsect3">
+<a name="nm-bridge-vlan-ref.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody><tr>
+<td class="parameter_name"><p>vlan</p></td>
+<td class="parameter_description"><p>the <a class="link" href="NMSettingBridge.html#NMBridgeVlan"><span class="type">NMBridgeVlan</span></a></p></td>
+<td class="parameter_annotations"> </td>
+</tr></tbody>
+</table></div>
+</div>
+<div class="refsect3">
+<a name="nm-bridge-vlan-ref.returns"></a><h4>Returns</h4>
+<p> the input argument <em class="parameter"><code>vlan</code></em>
+object.</p>
+</div>
+<p class="since">Since: 1.18</p>
+</div>
+<hr>
+<div class="refsect2">
+<a name="nm-bridge-vlan-unref"></a><h3>nm_bridge_vlan_unref ()</h3>
+<pre class="programlisting"><span class="returnvalue">void</span>
+nm_bridge_vlan_unref (<em class="parameter"><code><a class="link" href="NMSettingBridge.html#NMBridgeVlan"><span class="type">NMBridgeVlan</span></a> *vlan</code></em>);</pre>
+<p>Decreases the reference count of the object.  If the reference count
+reaches zero the object will be destroyed.</p>
+<div class="refsect3">
+<a name="nm-bridge-vlan-unref.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody><tr>
+<td class="parameter_name"><p>vlan</p></td>
+<td class="parameter_description"><p>the <a class="link" href="NMSettingBridge.html#NMBridgeVlan"><span class="type">NMBridgeVlan</span></a></p></td>
+<td class="parameter_annotations"> </td>
+</tr></tbody>
+</table></div>
+</div>
+<p class="since">Since: 1.18</p>
+</div>
+<hr>
+<div class="refsect2">
+<a name="nm-bridge-vlan-new-clone"></a><h3>nm_bridge_vlan_new_clone ()</h3>
+<pre class="programlisting"><a class="link" href="NMSettingBridge.html#NMBridgeVlan"><span class="returnvalue">NMBridgeVlan</span></a> *
+nm_bridge_vlan_new_clone (<em class="parameter"><code>const <a class="link" href="NMSettingBridge.html#NMBridgeVlan"><span class="type">NMBridgeVlan</span></a> *vlan</code></em>);</pre>
+<div class="refsect3">
+<a name="nm-bridge-vlan-new-clone.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody><tr>
+<td class="parameter_name"><p>vlan</p></td>
+<td class="parameter_description"><p>the <a class="link" href="NMSettingBridge.html#NMBridgeVlan"><span class="type">NMBridgeVlan</span></a> instance to copy</p></td>
+<td class="parameter_annotations"> </td>
+</tr></tbody>
+</table></div>
+</div>
+<div class="refsect3">
+<a name="nm-bridge-vlan-new-clone.returns"></a><h4>Returns</h4>
+<p>a clone of <em class="parameter"><code>vlan</code></em>
+. This instance
+is always unsealed. </p>
+<p><span class="annotation">[<acronym title="Free data after the code is done."><span class="acronym">transfer full</span></acronym>]</span></p>
+</div>
+<p class="since">Since: 1.18</p>
+</div>
+<hr>
+<div class="refsect2">
+<a name="nm-bridge-vlan-cmp"></a><h3>nm_bridge_vlan_cmp ()</h3>
+<pre class="programlisting"><span class="returnvalue">int</span>
+nm_bridge_vlan_cmp (<em class="parameter"><code>const <a class="link" href="NMSettingBridge.html#NMBridgeVlan"><span class="type">NMBridgeVlan</span></a> *a</code></em>,
+                    <em class="parameter"><code>const <a class="link" href="NMSettingBridge.html#NMBridgeVlan"><span class="type">NMBridgeVlan</span></a> *b</code></em>);</pre>
+<p>Compare two bridge VLAN objects.</p>
+<div class="refsect3">
+<a name="nm-bridge-vlan-cmp.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody>
+<tr>
+<td class="parameter_name"><p>a</p></td>
+<td class="parameter_description"><p>a <a class="link" href="NMSettingBridge.html#NMBridgeVlan"><span class="type">NMBridgeVlan</span></a></p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>b</p></td>
+<td class="parameter_description"><p>another <a class="link" href="NMSettingBridge.html#NMBridgeVlan"><span class="type">NMBridgeVlan</span></a></p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<div class="refsect3">
+<a name="nm-bridge-vlan-cmp.returns"></a><h4>Returns</h4>
+<p> zero of the two instances are equivalent or
+a non-zero integer otherwise. This defines a total ordering
+over the VLANs. Whether a VLAN is sealed or not does not
+affect the comparison.</p>
+</div>
+<p class="since">Since: 1.18</p>
+</div>
+<hr>
+<div class="refsect2">
+<a name="nm-bridge-vlan-seal"></a><h3>nm_bridge_vlan_seal ()</h3>
+<pre class="programlisting"><span class="returnvalue">void</span>
+nm_bridge_vlan_seal (<em class="parameter"><code><a class="link" href="NMSettingBridge.html#NMBridgeVlan"><span class="type">NMBridgeVlan</span></a> *vlan</code></em>);</pre>
+<p>Seal the <a class="link" href="NMSettingBridge.html#NMBridgeVlan"><span class="type">NMBridgeVlan</span></a> instance. Afterwards, it is a bug
+to call all functions that modify the instance (except ref/unref).
+A sealed instance cannot be unsealed again, but you can create
+an unsealed copy with <a class="link" href="NMSettingBridge.html#nm-bridge-vlan-new-clone" title="nm_bridge_vlan_new_clone ()"><code class="function">nm_bridge_vlan_new_clone()</code></a>.</p>
+<div class="refsect3">
+<a name="nm-bridge-vlan-seal.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody><tr>
+<td class="parameter_name"><p>vlan</p></td>
+<td class="parameter_description"><p>the <a class="link" href="NMSettingBridge.html#NMBridgeVlan"><span class="type">NMBridgeVlan</span></a> instance</p></td>
+<td class="parameter_annotations"> </td>
+</tr></tbody>
+</table></div>
+</div>
+<p class="since">Since: 1.18</p>
+</div>
+<hr>
+<div class="refsect2">
+<a name="nm-bridge-vlan-is-sealed"></a><h3>nm_bridge_vlan_is_sealed ()</h3>
+<pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
+nm_bridge_vlan_is_sealed (<em class="parameter"><code>const <a class="link" href="NMSettingBridge.html#NMBridgeVlan"><span class="type">NMBridgeVlan</span></a> *vlan</code></em>);</pre>
+<div class="refsect3">
+<a name="nm-bridge-vlan-is-sealed.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody><tr>
+<td class="parameter_name"><p>vlan</p></td>
+<td class="parameter_description"><p>the <a class="link" href="NMSettingBridge.html#NMBridgeVlan"><span class="type">NMBridgeVlan</span></a> instance</p></td>
+<td class="parameter_annotations"> </td>
+</tr></tbody>
+</table></div>
+</div>
+<div class="refsect3">
+<a name="nm-bridge-vlan-is-sealed.returns"></a><h4>Returns</h4>
+<p> whether <em class="parameter"><code>self</code></em>
+is sealed or not.</p>
+</div>
+<p class="since">Since: 1.18</p>
+</div>
+<hr>
+<div class="refsect2">
+<a name="nm-bridge-vlan-set-untagged"></a><h3>nm_bridge_vlan_set_untagged ()</h3>
+<pre class="programlisting"><span class="returnvalue">void</span>
+nm_bridge_vlan_set_untagged (<em class="parameter"><code><a class="link" href="NMSettingBridge.html#NMBridgeVlan"><span class="type">NMBridgeVlan</span></a> *vlan</code></em>,
+                             <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a> value</code></em>);</pre>
+<p>Change the value of the untagged property of the VLAN.</p>
+<div class="refsect3">
+<a name="nm-bridge-vlan-set-untagged.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody>
+<tr>
+<td class="parameter_name"><p>vlan</p></td>
+<td class="parameter_description"><p>the <a class="link" href="NMSettingBridge.html#NMBridgeVlan"><span class="type">NMBridgeVlan</span></a></p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>value</p></td>
+<td class="parameter_description"><p>the new value</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<p class="since">Since: 1.18</p>
+</div>
+<hr>
+<div class="refsect2">
+<a name="nm-bridge-vlan-set-pvid"></a><h3>nm_bridge_vlan_set_pvid ()</h3>
+<pre class="programlisting"><span class="returnvalue">void</span>
+nm_bridge_vlan_set_pvid (<em class="parameter"><code><a class="link" href="NMSettingBridge.html#NMBridgeVlan"><span class="type">NMBridgeVlan</span></a> *vlan</code></em>,
+                         <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a> value</code></em>);</pre>
+<p>Change the value of the PVID property of the VLAN. It
+is invalid to set the value to <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> for non-single-id
+VLANs.</p>
+<div class="refsect3">
+<a name="nm-bridge-vlan-set-pvid.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody>
+<tr>
+<td class="parameter_name"><p>vlan</p></td>
+<td class="parameter_description"><p>the <a class="link" href="NMSettingBridge.html#NMBridgeVlan"><span class="type">NMBridgeVlan</span></a></p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>value</p></td>
+<td class="parameter_description"><p>the new value</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<p class="since">Since: 1.18</p>
+</div>
+<hr>
+<div class="refsect2">
+<a name="nm-bridge-vlan-get-vid-range"></a><h3>nm_bridge_vlan_get_vid_range ()</h3>
+<pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
+nm_bridge_vlan_get_vid_range (<em class="parameter"><code>const <a class="link" href="NMSettingBridge.html#NMBridgeVlan"><span class="type">NMBridgeVlan</span></a> *vlan</code></em>,
+                              <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint16"><span class="type">guint16</span></a> *vid_start</code></em>,
+                              <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint16"><span class="type">guint16</span></a> *vid_end</code></em>);</pre>
+<p>Gets the VLAN id range.</p>
+<div class="refsect3">
+<a name="nm-bridge-vlan-get-vid-range.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody>
+<tr>
+<td class="parameter_name"><p>vlan</p></td>
+<td class="parameter_description"><p>the <a class="link" href="NMSettingBridge.html#NMBridgeVlan"><span class="type">NMBridgeVlan</span></a></p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>vid_start</p></td>
+<td class="parameter_description"><p>location to store the VLAN id range start.</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>vid_end</p></td>
+<td class="parameter_description"><p>location to store the VLAN id range end</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<div class="refsect3">
+<a name="nm-bridge-vlan-get-vid-range.returns"></a><h4>Returns</h4>
+<p> <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> is the VLAN specifies a range, <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#FALSE:CAPS"><code class="literal">FALSE</code></a> if it is
+a single-id VLAN.</p>
+</div>
+<p class="since">Since: 1.18</p>
+</div>
+<hr>
+<div class="refsect2">
+<a name="nm-bridge-vlan-is-untagged"></a><h3>nm_bridge_vlan_is_untagged ()</h3>
+<pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
+nm_bridge_vlan_is_untagged (<em class="parameter"><code>const <a class="link" href="NMSettingBridge.html#NMBridgeVlan"><span class="type">NMBridgeVlan</span></a> *vlan</code></em>);</pre>
+<p>Returns whether the VLAN is untagged.</p>
+<div class="refsect3">
+<a name="nm-bridge-vlan-is-untagged.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody><tr>
+<td class="parameter_name"><p>vlan</p></td>
+<td class="parameter_description"><p>the <a class="link" href="NMSettingBridge.html#NMBridgeVlan"><span class="type">NMBridgeVlan</span></a></p></td>
+<td class="parameter_annotations"> </td>
+</tr></tbody>
+</table></div>
+</div>
+<div class="refsect3">
+<a name="nm-bridge-vlan-is-untagged.returns"></a><h4>Returns</h4>
+<p> <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> if the VLAN is untagged, <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#FALSE:CAPS"><code class="literal">FALSE</code></a> otherwise</p>
+</div>
+<p class="since">Since: 1.18</p>
+</div>
+<hr>
+<div class="refsect2">
+<a name="nm-bridge-vlan-is-pvid"></a><h3>nm_bridge_vlan_is_pvid ()</h3>
+<pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
+nm_bridge_vlan_is_pvid (<em class="parameter"><code>const <a class="link" href="NMSettingBridge.html#NMBridgeVlan"><span class="type">NMBridgeVlan</span></a> *vlan</code></em>);</pre>
+<p>Returns whether the VLAN is the PVID for the port.</p>
+<div class="refsect3">
+<a name="nm-bridge-vlan-is-pvid.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody><tr>
+<td class="parameter_name"><p>vlan</p></td>
+<td class="parameter_description"><p>the <a class="link" href="NMSettingBridge.html#NMBridgeVlan"><span class="type">NMBridgeVlan</span></a></p></td>
+<td class="parameter_annotations"> </td>
+</tr></tbody>
+</table></div>
+</div>
+<div class="refsect3">
+<a name="nm-bridge-vlan-is-pvid.returns"></a><h4>Returns</h4>
+<p> <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> if the VLAN is the PVID</p>
+</div>
+<p class="since">Since: 1.18</p>
+</div>
+<hr>
+<div class="refsect2">
+<a name="nm-bridge-vlan-to-str"></a><h3>nm_bridge_vlan_to_str ()</h3>
+<pre class="programlisting"><span class="returnvalue">char</span> *
+nm_bridge_vlan_to_str (<em class="parameter"><code>const <a class="link" href="NMSettingBridge.html#NMBridgeVlan"><span class="type">NMBridgeVlan</span></a> *vlan</code></em>,
+                       <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> **error</code></em>);</pre>
+<p>Convert a <a class="link" href="NMSettingBridge.html#NMBridgeVlan"><code class="literal">NMBridgeVlan</code></a> to a string.</p>
+<div class="refsect3">
+<a name="nm-bridge-vlan-to-str.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody>
+<tr>
+<td class="parameter_name"><p>vlan</p></td>
+<td class="parameter_description"><p>the <a class="link" href="NMSettingBridge.html#NMBridgeVlan"><code class="literal">NMBridgeVlan</code></a></p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>error</p></td>
+<td class="parameter_description"><p>location of the error</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<div class="refsect3">
+<a name="nm-bridge-vlan-to-str.returns"></a><h4>Returns</h4>
+<p> formatted string or <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a></p>
+</div>
+<p class="since">Since: 1.18</p>
+</div>
+<hr>
+<div class="refsect2">
+<a name="nm-bridge-vlan-from-str"></a><h3>nm_bridge_vlan_from_str ()</h3>
+<pre class="programlisting"><a class="link" href="NMSettingBridge.html#NMBridgeVlan"><span class="returnvalue">NMBridgeVlan</span></a> *
+nm_bridge_vlan_from_str (<em class="parameter"><code>const <span class="type">char</span> *str</code></em>,
+                         <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> **error</code></em>);</pre>
+<p>Parses the string representation of the queueing
+discipline to a <a class="link" href="NMSettingBridge.html#NMBridgeVlan"><code class="literal">NMBridgeVlan</code></a> instance.</p>
+<div class="refsect3">
+<a name="nm-bridge-vlan-from-str.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody>
+<tr>
+<td class="parameter_name"><p>str</p></td>
+<td class="parameter_description"><p>the string representation of a bridge VLAN</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>error</p></td>
+<td class="parameter_description"><p>location of the error</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<div class="refsect3">
+<a name="nm-bridge-vlan-from-str.returns"></a><h4>Returns</h4>
+<p> the <a class="link" href="NMSettingBridge.html#NMBridgeVlan"><code class="literal">NMBridgeVlan</code></a> or <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a></p>
+</div>
+<p class="since">Since: 1.18</p>
+</div>
+</div>
+<div class="refsect1">
+<a name="NMSettingBridge.other_details"></a><h2>Types and Values</h2>
+<div class="refsect2">
+<a name="NM-SETTING-BRIDGE-SETTING-NAME:CAPS"></a><h3>NM_SETTING_BRIDGE_SETTING_NAME</h3>
+<pre class="programlisting">#define NM_SETTING_BRIDGE_SETTING_NAME "bridge"
+</pre>
+</div>
+<hr>
+<div class="refsect2">
+<a name="NM-SETTING-BRIDGE-MAC-ADDRESS:CAPS"></a><h3>NM_SETTING_BRIDGE_MAC_ADDRESS</h3>
+<pre class="programlisting">#define NM_SETTING_BRIDGE_MAC_ADDRESS    "mac-address"
+</pre>
+</div>
+<hr>
+<div class="refsect2">
+<a name="NM-SETTING-BRIDGE-STP:CAPS"></a><h3>NM_SETTING_BRIDGE_STP</h3>
+<pre class="programlisting">#define NM_SETTING_BRIDGE_STP            "stp"
+</pre>
+</div>
+<hr>
+<div class="refsect2">
+<a name="NM-SETTING-BRIDGE-PRIORITY:CAPS"></a><h3>NM_SETTING_BRIDGE_PRIORITY</h3>
+<pre class="programlisting">#define NM_SETTING_BRIDGE_PRIORITY       "priority"
+</pre>
+</div>
+<hr>
+<div class="refsect2">
+<a name="NM-SETTING-BRIDGE-FORWARD-DELAY:CAPS"></a><h3>NM_SETTING_BRIDGE_FORWARD_DELAY</h3>
+<pre class="programlisting">#define NM_SETTING_BRIDGE_FORWARD_DELAY  "forward-delay"
+</pre>
+</div>
+<hr>
+<div class="refsect2">
+<a name="NM-SETTING-BRIDGE-HELLO-TIME:CAPS"></a><h3>NM_SETTING_BRIDGE_HELLO_TIME</h3>
+<pre class="programlisting">#define NM_SETTING_BRIDGE_HELLO_TIME     "hello-time"
+</pre>
+</div>
+<hr>
+<div class="refsect2">
+<a name="NM-SETTING-BRIDGE-MAX-AGE:CAPS"></a><h3>NM_SETTING_BRIDGE_MAX_AGE</h3>
+<pre class="programlisting">#define NM_SETTING_BRIDGE_MAX_AGE        "max-age"
+</pre>
+</div>
+<hr>
+<div class="refsect2">
+<a name="NM-SETTING-BRIDGE-AGEING-TIME:CAPS"></a><h3>NM_SETTING_BRIDGE_AGEING_TIME</h3>
+<pre class="programlisting">#define NM_SETTING_BRIDGE_AGEING_TIME    "ageing-time"
+</pre>
+</div>
+<hr>
+<div class="refsect2">
+<a name="NM-SETTING-BRIDGE-GROUP-FORWARD-MASK:CAPS"></a><h3>NM_SETTING_BRIDGE_GROUP_FORWARD_MASK</h3>
+<pre class="programlisting">#define NM_SETTING_BRIDGE_GROUP_FORWARD_MASK "group-forward-mask"
 </pre>
 </div>
 <hr>
@@ -554,6 +1462,36 @@ nm_setting_bridge_get_multicast_snooping
 </div>
 <hr>
 <div class="refsect2">
+<a name="NM-SETTING-BRIDGE-VLAN-FILTERING:CAPS"></a><h3>NM_SETTING_BRIDGE_VLAN_FILTERING</h3>
+<pre class="programlisting">#define NM_SETTING_BRIDGE_VLAN_FILTERING     "vlan-filtering"
+</pre>
+</div>
+<hr>
+<div class="refsect2">
+<a name="NM-SETTING-BRIDGE-VLAN-DEFAULT-PVID:CAPS"></a><h3>NM_SETTING_BRIDGE_VLAN_DEFAULT_PVID</h3>
+<pre class="programlisting">#define NM_SETTING_BRIDGE_VLAN_DEFAULT_PVID  "vlan-default-pvid"
+</pre>
+</div>
+<hr>
+<div class="refsect2">
+<a name="NM-SETTING-BRIDGE-VLANS:CAPS"></a><h3>NM_SETTING_BRIDGE_VLANS</h3>
+<pre class="programlisting">#define NM_SETTING_BRIDGE_VLANS              "vlans"
+</pre>
+</div>
+<hr>
+<div class="refsect2">
+<a name="NM-BRIDGE-VLAN-VID-MIN:CAPS"></a><h3>NM_BRIDGE_VLAN_VID_MIN</h3>
+<pre class="programlisting">#define NM_BRIDGE_VLAN_VID_MIN            1
+</pre>
+</div>
+<hr>
+<div class="refsect2">
+<a name="NM-BRIDGE-VLAN-VID-MAX:CAPS"></a><h3>NM_BRIDGE_VLAN_VID_MAX</h3>
+<pre class="programlisting">#define NM_BRIDGE_VLAN_VID_MAX            4094
+</pre>
+</div>
+<hr>
+<div class="refsect2">
 <a name="NMSettingBridge-struct"></a><h3>NMSettingBridge</h3>
 <pre class="programlisting">typedef struct _NMSettingBridge NMSettingBridge;</pre>
 <p>Bridging Settings</p>
@@ -660,6 +1598,42 @@ bridge.</p>
 <p>Flags: Read / Write / Construct</p>
 <p>Default value: TRUE</p>
 </div>
+<hr>
+<div class="refsect2">
+<a name="NMSettingBridge--vlan-default-pvid"></a><h3>The <code class="literal">“vlan-default-pvid”</code> property</h3>
+<pre class="programlisting">  “vlan-default-pvid”        <a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a></pre>
+<p>The default PVID for the ports of the bridge, that is the VLAN id
+assigned to incoming untagged frames.</p>
+<p>Flags: Read / Write / Construct</p>
+<p>Allowed values: <= 4094</p>
+<p>Default value: 1</p>
+<p class="since">Since: 1.18</p>
+</div>
+<hr>
+<div class="refsect2">
+<a name="NMSettingBridge--vlan-filtering"></a><h3>The <code class="literal">“vlan-filtering”</code> property</h3>
+<pre class="programlisting">  “vlan-filtering”           <a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a></pre>
+<p>Control whether VLAN filtering is enabled on the bridge.</p>
+<p>Flags: Read / Write / Construct</p>
+<p>Default value: FALSE</p>
+<p class="since">Since: 1.18</p>
+</div>
+<hr>
+<div class="refsect2">
+<a name="NMSettingBridge--vlans"></a><h3>The <code class="literal">“vlans”</code> property</h3>
+<pre class="programlisting">  “vlans”                    <a href="https://developer.gnome.org/glib/unstable/glib-Pointer-Arrays.html#GPtrArray"><span class="type">GPtrArray</span></a> *</pre>
+<p>Array of bridge VLAN objects. In addition to the VLANs
+specified here, the bridge will also have the default-pvid
+VLAN configured  by the bridge.vlan-default-pvid property.</p>
+<p>In nmcli the VLAN list can be specified with the following
+syntax:</p>
+<p> $vid pvid [, $vid pvid]...</p>
+<p>where $vid is either a single id between 1 and 4094 or a
+range, represented as a couple of ids separated by a dash.</p>
+<p><span class="annotation">[<acronym title="Override the parsed C type with given type."><span class="acronym">type</span></acronym> GPtrArray(NMBridgeVlan)]</span></p>
+<p>Flags: Read / Write</p>
+<p class="since">Since: 1.18</p>
+</div>
 </div>
 </div>
 <div class="footer">
diff --git a/docs/libnm/html/NMSettingBridgePort.html b/docs/libnm/html/NMSettingBridgePort.html
index 2aa8b1d3..cb16d0f8 100644
--- a/docs/libnm/html/NMSettingBridgePort.html
+++ b/docs/libnm/html/NMSettingBridgePort.html
@@ -73,6 +73,54 @@
 <a class="link" href="NMSettingBridgePort.html#nm-setting-bridge-port-get-hairpin-mode" title="nm_setting_bridge_port_get_hairpin_mode ()">nm_setting_bridge_port_get_hairpin_mode</a> <span class="c_punctuation">()</span>
 </td>
 </tr>
+<tr>
+<td class="function_type">
+<span class="returnvalue">void</span>
+</td>
+<td class="function_name">
+<a class="link" href="NMSettingBridgePort.html#nm-setting-bridge-port-add-vlan" title="nm_setting_bridge_port_add_vlan ()">nm_setting_bridge_port_add_vlan</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint"><span class="returnvalue">guint</span></a>
+</td>
+<td class="function_name">
+<a class="link" href="NMSettingBridgePort.html#nm-setting-bridge-port-get-num-vlans" title="nm_setting_bridge_port_get_num_vlans ()">nm_setting_bridge_port_get_num_vlans</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<a class="link" href="NMSettingBridge.html#NMBridgeVlan"><span class="returnvalue">NMBridgeVlan</span></a> *
+</td>
+<td class="function_name">
+<a class="link" href="NMSettingBridgePort.html#nm-setting-bridge-port-get-vlan" title="nm_setting_bridge_port_get_vlan ()">nm_setting_bridge_port_get_vlan</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<span class="returnvalue">void</span>
+</td>
+<td class="function_name">
+<a class="link" href="NMSettingBridgePort.html#nm-setting-bridge-port-remove-vlan" title="nm_setting_bridge_port_remove_vlan ()">nm_setting_bridge_port_remove_vlan</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
+</td>
+<td class="function_name">
+<a class="link" href="NMSettingBridgePort.html#nm-setting-bridge-port-remove-vlan-by-vid" title="nm_setting_bridge_port_remove_vlan_by_vid ()">nm_setting_bridge_port_remove_vlan_by_vid</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<span class="returnvalue">void</span>
+</td>
+<td class="function_name">
+<a class="link" href="NMSettingBridgePort.html#nm-setting-bridge-port-clear-vlans" title="nm_setting_bridge_port_clear_vlans ()">nm_setting_bridge_port_clear_vlans</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
 </tbody>
 </table></div>
 </div>
@@ -100,6 +148,12 @@
 <td class="property_name"><a class="link" href="NMSettingBridgePort.html#NMSettingBridgePort--priority" title="The “priority” property">priority</a></td>
 <td class="property_flags">Read / Write / Construct</td>
 </tr>
+<tr>
+<td class="property_type">
+<a href="https://developer.gnome.org/glib/unstable/glib-Pointer-Arrays.html#GPtrArray"><span class="type">GPtrArray</span></a> *</td>
+<td class="property_name"><a class="link" href="NMSettingBridgePort.html#NMSettingBridgePort--vlans" title="The “vlans” property">vlans</a></td>
+<td class="property_flags">Read / Write</td>
+</tr>
 </tbody>
 </table></div>
 </div>
@@ -128,6 +182,10 @@
 <td class="function_name"><a class="link" href="NMSettingBridgePort.html#NM-SETTING-BRIDGE-PORT-HAIRPIN-MODE:CAPS" title="NM_SETTING_BRIDGE_PORT_HAIRPIN_MODE">NM_SETTING_BRIDGE_PORT_HAIRPIN_MODE</a></td>
 </tr>
 <tr>
+<td class="define_keyword">#define</td>
+<td class="function_name"><a class="link" href="NMSettingBridgePort.html#NM-SETTING-BRIDGE-PORT-VLANS:CAPS" title="NM_SETTING_BRIDGE_PORT_VLANS">NM_SETTING_BRIDGE_PORT_VLANS</a></td>
+</tr>
+<tr>
 <td class="datatype_keyword"> </td>
 <td class="function_name"><a class="link" href="NMSettingBridgePort.html#NMSettingBridgePort-struct" title="NMSettingBridgePort">NMSettingBridgePort</a></td>
 </tr>
@@ -235,6 +293,204 @@ nm_setting_bridge_port_get_hairpin_mode
 <p> the <a class="link" href="NMSettingBridgePort.html#NMSettingBridgePort--hairpin-mode" title="The “hairpin-mode” property"><span class="type">“hairpin-mode”</span></a> property of the setting</p>
 </div>
 </div>
+<hr>
+<div class="refsect2">
+<a name="nm-setting-bridge-port-add-vlan"></a><h3>nm_setting_bridge_port_add_vlan ()</h3>
+<pre class="programlisting"><span class="returnvalue">void</span>
+nm_setting_bridge_port_add_vlan (<em class="parameter"><code><a class="link" href="NMSettingBridgePort.html" title="NMSettingBridgePort"><span class="type">NMSettingBridgePort</span></a> *setting</code></em>,
+                                 <em class="parameter"><code><a class="link" href="NMSettingBridge.html#NMBridgeVlan"><span class="type">NMBridgeVlan</span></a> *vlan</code></em>);</pre>
+<p>Appends a new vlan and associated information to the setting.  The
+given vlan gets sealed and a reference to it is added.</p>
+<div class="refsect3">
+<a name="nm-setting-bridge-port-add-vlan.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody>
+<tr>
+<td class="parameter_name"><p>setting</p></td>
+<td class="parameter_description"><p>the <a class="link" href="NMSettingBridgePort.html" title="NMSettingBridgePort"><span class="type">NMSettingBridgePort</span></a></p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>vlan</p></td>
+<td class="parameter_description"><p>the vlan to add</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<p class="since">Since: 1.18</p>
+</div>
+<hr>
+<div class="refsect2">
+<a name="nm-setting-bridge-port-get-num-vlans"></a><h3>nm_setting_bridge_port_get_num_vlans ()</h3>
+<pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint"><span class="returnvalue">guint</span></a>
+nm_setting_bridge_port_get_num_vlans (<em class="parameter"><code><a class="link" href="NMSettingBridgePort.html" title="NMSettingBridgePort"><span class="type">NMSettingBridgePort</span></a> *setting</code></em>);</pre>
+<div class="refsect3">
+<a name="nm-setting-bridge-port-get-num-vlans.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody><tr>
+<td class="parameter_name"><p>setting</p></td>
+<td class="parameter_description"><p>the <a class="link" href="NMSettingBridgePort.html" title="NMSettingBridgePort"><span class="type">NMSettingBridgePort</span></a></p></td>
+<td class="parameter_annotations"> </td>
+</tr></tbody>
+</table></div>
+</div>
+<div class="refsect3">
+<a name="nm-setting-bridge-port-get-num-vlans.returns"></a><h4>Returns</h4>
+<p> the number of VLANs</p>
+</div>
+<p class="since">Since: 1.18</p>
+</div>
+<hr>
+<div class="refsect2">
+<a name="nm-setting-bridge-port-get-vlan"></a><h3>nm_setting_bridge_port_get_vlan ()</h3>
+<pre class="programlisting"><a class="link" href="NMSettingBridge.html#NMBridgeVlan"><span class="returnvalue">NMBridgeVlan</span></a> *
+nm_setting_bridge_port_get_vlan (<em class="parameter"><code><a class="link" href="NMSettingBridgePort.html" title="NMSettingBridgePort"><span class="type">NMSettingBridgePort</span></a> *setting</code></em>,
+                                 <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> idx</code></em>);</pre>
+<div class="refsect3">
+<a name="nm-setting-bridge-port-get-vlan.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody>
+<tr>
+<td class="parameter_name"><p>setting</p></td>
+<td class="parameter_description"><p>the <a class="link" href="NMSettingBridgePort.html" title="NMSettingBridgePort"><span class="type">NMSettingBridgePort</span></a></p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>idx</p></td>
+<td class="parameter_description"><p>index number of the VLAN to return</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<div class="refsect3">
+<a name="nm-setting-bridge-port-get-vlan.returns"></a><h4>Returns</h4>
+<p>the VLAN at index <em class="parameter"><code>idx</code></em>
+. </p>
+<p><span class="annotation">[<acronym title="Don't free data after the code is done."><span class="acronym">transfer none</span></acronym>]</span></p>
+</div>
+<p class="since">Since: 1.18</p>
+</div>
+<hr>
+<div class="refsect2">
+<a name="nm-setting-bridge-port-remove-vlan"></a><h3>nm_setting_bridge_port_remove_vlan ()</h3>
+<pre class="programlisting"><span class="returnvalue">void</span>
+nm_setting_bridge_port_remove_vlan (<em class="parameter"><code><a class="link" href="NMSettingBridgePort.html" title="NMSettingBridgePort"><span class="type">NMSettingBridgePort</span></a> *setting</code></em>,
+                                    <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> idx</code></em>);</pre>
+<p>Removes the vlan at index <em class="parameter"><code>idx</code></em>
+.</p>
+<div class="refsect3">
+<a name="nm-setting-bridge-port-remove-vlan.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody>
+<tr>
+<td class="parameter_name"><p>setting</p></td>
+<td class="parameter_description"><p>the <a class="link" href="NMSettingBridgePort.html" title="NMSettingBridgePort"><span class="type">NMSettingBridgePort</span></a></p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>idx</p></td>
+<td class="parameter_description"><p>index number of the VLAN.</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<p class="since">Since: 1.18</p>
+</div>
+<hr>
+<div class="refsect2">
+<a name="nm-setting-bridge-port-remove-vlan-by-vid"></a><h3>nm_setting_bridge_port_remove_vlan_by_vid ()</h3>
+<pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
+nm_setting_bridge_port_remove_vlan_by_vid
+                               (<em class="parameter"><code><a class="link" href="NMSettingBridgePort.html" title="NMSettingBridgePort"><span class="type">NMSettingBridgePort</span></a> *setting</code></em>,
+                                <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint16"><span class="type">guint16</span></a> vid_start</code></em>,
+                                <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint16"><span class="type">guint16</span></a> vid_end</code></em>);</pre>
+<p>Remove the VLAN with range <em class="parameter"><code>vid_start</code></em>
+ to <em class="parameter"><code>vid_end</code></em>
+.
+If <em class="parameter"><code>vid_end</code></em>
+ is zero, it is assumed to be equal to <em class="parameter"><code>vid_start</code></em>
+
+and so the single-id VLAN with id <em class="parameter"><code>vid_start</code></em>
+ is removed.</p>
+<div class="refsect3">
+<a name="nm-setting-bridge-port-remove-vlan-by-vid.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody>
+<tr>
+<td class="parameter_name"><p>setting</p></td>
+<td class="parameter_description"><p>the <a class="link" href="NMSettingBridgePort.html" title="NMSettingBridgePort"><span class="type">NMSettingBridgePort</span></a></p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>vid_start</p></td>
+<td class="parameter_description"><p>the vlan start index</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>vid_end</p></td>
+<td class="parameter_description"><p>the vlan end index</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<div class="refsect3">
+<a name="nm-setting-bridge-port-remove-vlan-by-vid.returns"></a><h4>Returns</h4>
+<p> <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> if the vlan was found and removed; <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#FALSE:CAPS"><code class="literal">FALSE</code></a> otherwise</p>
+</div>
+<p class="since">Since: 1.18</p>
+</div>
+<hr>
+<div class="refsect2">
+<a name="nm-setting-bridge-port-clear-vlans"></a><h3>nm_setting_bridge_port_clear_vlans ()</h3>
+<pre class="programlisting"><span class="returnvalue">void</span>
+nm_setting_bridge_port_clear_vlans (<em class="parameter"><code><a class="link" href="NMSettingBridgePort.html" title="NMSettingBridgePort"><span class="type">NMSettingBridgePort</span></a> *setting</code></em>);</pre>
+<p>Removes all configured VLANs.</p>
+<div class="refsect3">
+<a name="nm-setting-bridge-port-clear-vlans.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody><tr>
+<td class="parameter_name"><p>setting</p></td>
+<td class="parameter_description"><p>the <a class="link" href="NMSettingBridgePort.html" title="NMSettingBridgePort"><span class="type">NMSettingBridgePort</span></a></p></td>
+<td class="parameter_annotations"> </td>
+</tr></tbody>
+</table></div>
+</div>
+<p class="since">Since: 1.18</p>
+</div>
 </div>
 <div class="refsect1">
 <a name="NMSettingBridgePort.other_details"></a><h2>Types and Values</h2>
@@ -263,6 +519,12 @@ nm_setting_bridge_port_get_hairpin_mode
 </div>
 <hr>
 <div class="refsect2">
+<a name="NM-SETTING-BRIDGE-PORT-VLANS:CAPS"></a><h3>NM_SETTING_BRIDGE_PORT_VLANS</h3>
+<pre class="programlisting">#define NM_SETTING_BRIDGE_PORT_VLANS        "vlans"
+</pre>
+</div>
+<hr>
+<div class="refsect2">
 <a name="NMSettingBridgePort-struct"></a><h3>NMSettingBridgePort</h3>
 <pre class="programlisting">typedef struct _NMSettingBridgePort NMSettingBridgePort;</pre>
 <p>Bridge Port Settings</p>
@@ -297,6 +559,23 @@ port.</p>
 <p>Allowed values: <= 63</p>
 <p>Default value: 32</p>
 </div>
+<hr>
+<div class="refsect2">
+<a name="NMSettingBridgePort--vlans"></a><h3>The <code class="literal">“vlans”</code> property</h3>
+<pre class="programlisting">  “vlans”                    <a href="https://developer.gnome.org/glib/unstable/glib-Pointer-Arrays.html#GPtrArray"><span class="type">GPtrArray</span></a> *</pre>
+<p>Array of bridge VLAN objects. In addition to the VLANs
+specified here, the port will also have the default-pvid
+VLAN configured on the bridge by the bridge.vlan-default-pvid
+property.</p>
+<p>In nmcli the VLAN list can be specified with the following
+syntax:</p>
+<p> $vid pvid [, $vid pvid]...</p>
+<p>where $vid is either a single id between 1 and 4094 or a
+range, represented as a couple of ids separated by a dash.</p>
+<p><span class="annotation">[<acronym title="Override the parsed C type with given type."><span class="acronym">type</span></acronym> GPtrArray(NMBridgeVlan)]</span></p>
+<p>Flags: Read / Write</p>
+<p class="since">Since: 1.18</p>
+</div>
 </div>
 </div>
 <div class="footer">
diff --git a/docs/libnm/html/NMSettingIPConfig.html b/docs/libnm/html/NMSettingIPConfig.html
index 873cdb84..18c74120 100644
--- a/docs/libnm/html/NMSettingIPConfig.html
+++ b/docs/libnm/html/NMSettingIPConfig.html
@@ -367,25 +367,35 @@
 </td>
 </tr>
 <tr>
-<td class="function_type">const <span class="returnvalue">char</span> *
+<td class="function_type">
+<a class="link" href="NMSettingIPConfig.html#NMIPRoutingRule"><span class="returnvalue">NMIPRoutingRule</span></a> *
 </td>
 <td class="function_name">
-<a class="link" href="NMSettingIPConfig.html#nm-setting-ip-config-get-method" title="nm_setting_ip_config_get_method ()">nm_setting_ip_config_get_method</a> <span class="c_punctuation">()</span>
+<a class="link" href="NMSettingIPConfig.html#nm-ip-routing-rule-new" title="nm_ip_routing_rule_new ()">nm_ip_routing_rule_new</a> <span class="c_punctuation">()</span>
 </td>
 </tr>
 <tr>
 <td class="function_type">
-<a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint"><span class="returnvalue">guint</span></a>
+<a class="link" href="NMSettingIPConfig.html#NMIPRoutingRule"><span class="returnvalue">NMIPRoutingRule</span></a> *
 </td>
 <td class="function_name">
-<a class="link" href="NMSettingIPConfig.html#nm-setting-ip-config-get-num-dns" title="nm_setting_ip_config_get_num_dns ()">nm_setting_ip_config_get_num_dns</a> <span class="c_punctuation">()</span>
+<a class="link" href="NMSettingIPConfig.html#nm-ip-routing-rule-new-clone" title="nm_ip_routing_rule_new_clone ()">nm_ip_routing_rule_new_clone</a> <span class="c_punctuation">()</span>
 </td>
 </tr>
 <tr>
-<td class="function_type">const <span class="returnvalue">char</span> *
+<td class="function_type">
+<a class="link" href="NMSettingIPConfig.html#NMIPRoutingRule"><span class="returnvalue">NMIPRoutingRule</span></a> *
 </td>
 <td class="function_name">
-<a class="link" href="NMSettingIPConfig.html#nm-setting-ip-config-get-dns" title="nm_setting_ip_config_get_dns ()">nm_setting_ip_config_get_dns</a> <span class="c_punctuation">()</span>
+<a class="link" href="NMSettingIPConfig.html#nm-ip-routing-rule-ref" title="nm_ip_routing_rule_ref ()">nm_ip_routing_rule_ref</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<span class="returnvalue">void</span>
+</td>
+<td class="function_name">
+<a class="link" href="NMSettingIPConfig.html#nm-ip-routing-rule-unref" title="nm_ip_routing_rule_unref ()">nm_ip_routing_rule_unref</a> <span class="c_punctuation">()</span>
 </td>
 </tr>
 <tr>
@@ -393,7 +403,7 @@
 <a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
 </td>
 <td class="function_name">
-<a class="link" href="NMSettingIPConfig.html#nm-setting-ip-config-add-dns" title="nm_setting_ip_config_add_dns ()">nm_setting_ip_config_add_dns</a> <span class="c_punctuation">()</span>
+<a class="link" href="NMSettingIPConfig.html#nm-ip-routing-rule-is-sealed" title="nm_ip_routing_rule_is_sealed ()">nm_ip_routing_rule_is_sealed</a> <span class="c_punctuation">()</span>
 </td>
 </tr>
 <tr>
@@ -401,7 +411,15 @@
 <span class="returnvalue">void</span>
 </td>
 <td class="function_name">
-<a class="link" href="NMSettingIPConfig.html#nm-setting-ip-config-remove-dns" title="nm_setting_ip_config_remove_dns ()">nm_setting_ip_config_remove_dns</a> <span class="c_punctuation">()</span>
+<a class="link" href="NMSettingIPConfig.html#nm-ip-routing-rule-seal" title="nm_ip_routing_rule_seal ()">nm_ip_routing_rule_seal</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<span class="returnvalue">int</span>
+</td>
+<td class="function_name">
+<a class="link" href="NMSettingIPConfig.html#nm-ip-routing-rule-get-addr-family" title="nm_ip_routing_rule_get_addr_family ()">nm_ip_routing_rule_get_addr_family</a> <span class="c_punctuation">()</span>
 </td>
 </tr>
 <tr>
@@ -409,7 +427,7 @@
 <a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
 </td>
 <td class="function_name">
-<a class="link" href="NMSettingIPConfig.html#nm-setting-ip-config-remove-dns-by-value" title="nm_setting_ip_config_remove_dns_by_value ()">nm_setting_ip_config_remove_dns_by_value</a> <span class="c_punctuation">()</span>
+<a class="link" href="NMSettingIPConfig.html#nm-ip-routing-rule-get-invert" title="nm_ip_routing_rule_get_invert ()">nm_ip_routing_rule_get_invert</a> <span class="c_punctuation">()</span>
 </td>
 </tr>
 <tr>
@@ -417,30 +435,31 @@
 <span class="returnvalue">void</span>
 </td>
 <td class="function_name">
-<a class="link" href="NMSettingIPConfig.html#nm-setting-ip-config-clear-dns" title="nm_setting_ip_config_clear_dns ()">nm_setting_ip_config_clear_dns</a> <span class="c_punctuation">()</span>
+<a class="link" href="NMSettingIPConfig.html#nm-ip-routing-rule-set-invert" title="nm_ip_routing_rule_set_invert ()">nm_ip_routing_rule_set_invert</a> <span class="c_punctuation">()</span>
 </td>
 </tr>
 <tr>
 <td class="function_type">
-<a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint"><span class="returnvalue">guint</span></a>
+<a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gint64"><span class="returnvalue">gint64</span></a>
 </td>
 <td class="function_name">
-<a class="link" href="NMSettingIPConfig.html#nm-setting-ip-config-get-num-dns-searches" title="nm_setting_ip_config_get_num_dns_searches ()">nm_setting_ip_config_get_num_dns_searches</a> <span class="c_punctuation">()</span>
+<a class="link" href="NMSettingIPConfig.html#nm-ip-routing-rule-get-priority" title="nm_ip_routing_rule_get_priority ()">nm_ip_routing_rule_get_priority</a> <span class="c_punctuation">()</span>
 </td>
 </tr>
 <tr>
-<td class="function_type">const <span class="returnvalue">char</span> *
+<td class="function_type">
+<span class="returnvalue">void</span>
 </td>
 <td class="function_name">
-<a class="link" href="NMSettingIPConfig.html#nm-setting-ip-config-get-dns-search" title="nm_setting_ip_config_get_dns_search ()">nm_setting_ip_config_get_dns_search</a> <span class="c_punctuation">()</span>
+<a class="link" href="NMSettingIPConfig.html#nm-ip-routing-rule-set-priority" title="nm_ip_routing_rule_set_priority ()">nm_ip_routing_rule_set_priority</a> <span class="c_punctuation">()</span>
 </td>
 </tr>
 <tr>
 <td class="function_type">
-<a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
+<a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint8"><span class="returnvalue">guint8</span></a>
 </td>
 <td class="function_name">
-<a class="link" href="NMSettingIPConfig.html#nm-setting-ip-config-add-dns-search" title="nm_setting_ip_config_add_dns_search ()">nm_setting_ip_config_add_dns_search</a> <span class="c_punctuation">()</span>
+<a class="link" href="NMSettingIPConfig.html#nm-ip-routing-rule-get-tos" title="nm_ip_routing_rule_get_tos ()">nm_ip_routing_rule_get_tos</a> <span class="c_punctuation">()</span>
 </td>
 </tr>
 <tr>
@@ -448,15 +467,15 @@
 <span class="returnvalue">void</span>
 </td>
 <td class="function_name">
-<a class="link" href="NMSettingIPConfig.html#nm-setting-ip-config-remove-dns-search" title="nm_setting_ip_config_remove_dns_search ()">nm_setting_ip_config_remove_dns_search</a> <span class="c_punctuation">()</span>
+<a class="link" href="NMSettingIPConfig.html#nm-ip-routing-rule-set-tos" title="nm_ip_routing_rule_set_tos ()">nm_ip_routing_rule_set_tos</a> <span class="c_punctuation">()</span>
 </td>
 </tr>
 <tr>
 <td class="function_type">
-<a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
+<a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint8"><span class="returnvalue">guint8</span></a>
 </td>
 <td class="function_name">
-<a class="link" href="NMSettingIPConfig.html#nm-setting-ip-config-remove-dns-search-by-value" title="nm_setting_ip_config_remove_dns_search_by_value ()">nm_setting_ip_config_remove_dns_search_by_value</a> <span class="c_punctuation">()</span>
+<a class="link" href="NMSettingIPConfig.html#nm-ip-routing-rule-get-ipproto" title="nm_ip_routing_rule_get_ipproto ()">nm_ip_routing_rule_get_ipproto</a> <span class="c_punctuation">()</span>
 </td>
 </tr>
 <tr>
@@ -464,46 +483,47 @@
 <span class="returnvalue">void</span>
 </td>
 <td class="function_name">
-<a class="link" href="NMSettingIPConfig.html#nm-setting-ip-config-clear-dns-searches" title="nm_setting_ip_config_clear_dns_searches ()">nm_setting_ip_config_clear_dns_searches</a> <span class="c_punctuation">()</span>
+<a class="link" href="NMSettingIPConfig.html#nm-ip-routing-rule-set-ipproto" title="nm_ip_routing_rule_set_ipproto ()">nm_ip_routing_rule_set_ipproto</a> <span class="c_punctuation">()</span>
 </td>
 </tr>
 <tr>
 <td class="function_type">
-<a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint"><span class="returnvalue">guint</span></a>
+<a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint16"><span class="returnvalue">guint16</span></a>
 </td>
 <td class="function_name">
-<a class="link" href="NMSettingIPConfig.html#nm-setting-ip-config-get-num-dns-options" title="nm_setting_ip_config_get_num_dns_options ()">nm_setting_ip_config_get_num_dns_options</a> <span class="c_punctuation">()</span>
+<a class="link" href="NMSettingIPConfig.html#nm-ip-routing-rule-get-source-port-start" title="nm_ip_routing_rule_get_source_port_start ()">nm_ip_routing_rule_get_source_port_start</a> <span class="c_punctuation">()</span>
 </td>
 </tr>
 <tr>
 <td class="function_type">
-<a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
+<a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint16"><span class="returnvalue">guint16</span></a>
 </td>
 <td class="function_name">
-<a class="link" href="NMSettingIPConfig.html#nm-setting-ip-config-has-dns-options" title="nm_setting_ip_config_has_dns_options ()">nm_setting_ip_config_has_dns_options</a> <span class="c_punctuation">()</span>
+<a class="link" href="NMSettingIPConfig.html#nm-ip-routing-rule-get-source-port-end" title="nm_ip_routing_rule_get_source_port_end ()">nm_ip_routing_rule_get_source_port_end</a> <span class="c_punctuation">()</span>
 </td>
 </tr>
 <tr>
-<td class="function_type">const <span class="returnvalue">char</span> *
+<td class="function_type">
+<span class="returnvalue">void</span>
 </td>
 <td class="function_name">
-<a class="link" href="NMSettingIPConfig.html#nm-setting-ip-config-get-dns-option" title="nm_setting_ip_config_get_dns_option ()">nm_setting_ip_config_get_dns_option</a> <span class="c_punctuation">()</span>
+<a class="link" href="NMSettingIPConfig.html#nm-ip-routing-rule-set-source-port" title="nm_ip_routing_rule_set_source_port ()">nm_ip_routing_rule_set_source_port</a> <span class="c_punctuation">()</span>
 </td>
 </tr>
 <tr>
 <td class="function_type">
-<span class="returnvalue">int</span>
+<a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint16"><span class="returnvalue">guint16</span></a>
 </td>
 <td class="function_name">
-<a class="link" href="NMSettingIPConfig.html#nm-setting-ip-config-next-valid-dns-option" title="nm_setting_ip_config_next_valid_dns_option ()">nm_setting_ip_config_next_valid_dns_option</a> <span class="c_punctuation">()</span>
+<a class="link" href="NMSettingIPConfig.html#nm-ip-routing-rule-get-destination-port-start" title="nm_ip_routing_rule_get_destination_port_start ()">nm_ip_routing_rule_get_destination_port_start</a> <span class="c_punctuation">()</span>
 </td>
 </tr>
 <tr>
 <td class="function_type">
-<a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
+<a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint16"><span class="returnvalue">guint16</span></a>
 </td>
 <td class="function_name">
-<a class="link" href="NMSettingIPConfig.html#nm-setting-ip-config-add-dns-option" title="nm_setting_ip_config_add_dns_option ()">nm_setting_ip_config_add_dns_option</a> <span class="c_punctuation">()</span>
+<a class="link" href="NMSettingIPConfig.html#nm-ip-routing-rule-get-destination-port-end" title="nm_ip_routing_rule_get_destination_port_end ()">nm_ip_routing_rule_get_destination_port_end</a> <span class="c_punctuation">()</span>
 </td>
 </tr>
 <tr>
@@ -511,71 +531,69 @@
 <span class="returnvalue">void</span>
 </td>
 <td class="function_name">
-<a class="link" href="NMSettingIPConfig.html#nm-setting-ip-config-remove-dns-option" title="nm_setting_ip_config_remove_dns_option ()">nm_setting_ip_config_remove_dns_option</a> <span class="c_punctuation">()</span>
+<a class="link" href="NMSettingIPConfig.html#nm-ip-routing-rule-set-destination-port" title="nm_ip_routing_rule_set_destination_port ()">nm_ip_routing_rule_set_destination_port</a> <span class="c_punctuation">()</span>
 </td>
 </tr>
 <tr>
 <td class="function_type">
-<a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
+<a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint32"><span class="returnvalue">guint32</span></a>
 </td>
 <td class="function_name">
-<a class="link" href="NMSettingIPConfig.html#nm-setting-ip-config-remove-dns-option-by-value" title="nm_setting_ip_config_remove_dns_option_by_value ()">nm_setting_ip_config_remove_dns_option_by_value</a> <span class="c_punctuation">()</span>
+<a class="link" href="NMSettingIPConfig.html#nm-ip-routing-rule-get-fwmark" title="nm_ip_routing_rule_get_fwmark ()">nm_ip_routing_rule_get_fwmark</a> <span class="c_punctuation">()</span>
 </td>
 </tr>
 <tr>
 <td class="function_type">
-<span class="returnvalue">void</span>
+<a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint32"><span class="returnvalue">guint32</span></a>
 </td>
 <td class="function_name">
-<a class="link" href="NMSettingIPConfig.html#nm-setting-ip-config-clear-dns-options" title="nm_setting_ip_config_clear_dns_options ()">nm_setting_ip_config_clear_dns_options</a> <span class="c_punctuation">()</span>
+<a class="link" href="NMSettingIPConfig.html#nm-ip-routing-rule-get-fwmask" title="nm_ip_routing_rule_get_fwmask ()">nm_ip_routing_rule_get_fwmask</a> <span class="c_punctuation">()</span>
 </td>
 </tr>
 <tr>
 <td class="function_type">
-<span class="returnvalue">int</span>
+<span class="returnvalue">void</span>
 </td>
 <td class="function_name">
-<a class="link" href="NMSettingIPConfig.html#nm-setting-ip-config-get-dns-priority" title="nm_setting_ip_config_get_dns_priority ()">nm_setting_ip_config_get_dns_priority</a> <span class="c_punctuation">()</span>
+<a class="link" href="NMSettingIPConfig.html#nm-ip-routing-rule-set-fwmark" title="nm_ip_routing_rule_set_fwmark ()">nm_ip_routing_rule_set_fwmark</a> <span class="c_punctuation">()</span>
 </td>
 </tr>
 <tr>
 <td class="function_type">
-<a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint"><span class="returnvalue">guint</span></a>
+<a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint8"><span class="returnvalue">guint8</span></a>
 </td>
 <td class="function_name">
-<a class="link" href="NMSettingIPConfig.html#nm-setting-ip-config-get-num-addresses" title="nm_setting_ip_config_get_num_addresses ()">nm_setting_ip_config_get_num_addresses</a> <span class="c_punctuation">()</span>
+<a class="link" href="NMSettingIPConfig.html#nm-ip-routing-rule-get-from-len" title="nm_ip_routing_rule_get_from_len ()">nm_ip_routing_rule_get_from_len</a> <span class="c_punctuation">()</span>
 </td>
 </tr>
 <tr>
-<td class="function_type">
-<a class="link" href="NMSettingIPConfig.html#NMIPAddress"><span class="returnvalue">NMIPAddress</span></a> *
+<td class="function_type">const <span class="returnvalue">char</span> *
 </td>
 <td class="function_name">
-<a class="link" href="NMSettingIPConfig.html#nm-setting-ip-config-get-address" title="nm_setting_ip_config_get_address ()">nm_setting_ip_config_get_address</a> <span class="c_punctuation">()</span>
+<a class="link" href="NMSettingIPConfig.html#nm-ip-routing-rule-get-from" title="nm_ip_routing_rule_get_from ()">nm_ip_routing_rule_get_from</a> <span class="c_punctuation">()</span>
 </td>
 </tr>
 <tr>
 <td class="function_type">
-<a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
+<span class="returnvalue">void</span>
 </td>
 <td class="function_name">
-<a class="link" href="NMSettingIPConfig.html#nm-setting-ip-config-add-address" title="nm_setting_ip_config_add_address ()">nm_setting_ip_config_add_address</a> <span class="c_punctuation">()</span>
+<a class="link" href="NMSettingIPConfig.html#nm-ip-routing-rule-set-from" title="nm_ip_routing_rule_set_from ()">nm_ip_routing_rule_set_from</a> <span class="c_punctuation">()</span>
 </td>
 </tr>
 <tr>
 <td class="function_type">
-<span class="returnvalue">void</span>
+<a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint8"><span class="returnvalue">guint8</span></a>
 </td>
 <td class="function_name">
-<a class="link" href="NMSettingIPConfig.html#nm-setting-ip-config-remove-address" title="nm_setting_ip_config_remove_address ()">nm_setting_ip_config_remove_address</a> <span class="c_punctuation">()</span>
+<a class="link" href="NMSettingIPConfig.html#nm-ip-routing-rule-get-to-len" title="nm_ip_routing_rule_get_to_len ()">nm_ip_routing_rule_get_to_len</a> <span class="c_punctuation">()</span>
 </td>
 </tr>
 <tr>
-<td class="function_type">
-<a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
+<td class="function_type">const <span class="returnvalue">char</span> *
 </td>
 <td class="function_name">
-<a class="link" href="NMSettingIPConfig.html#nm-setting-ip-config-remove-address-by-value" title="nm_setting_ip_config_remove_address_by_value ()">nm_setting_ip_config_remove_address_by_value</a> <span class="c_punctuation">()</span>
+<a class="link" href="NMSettingIPConfig.html#nm-ip-routing-rule-get-to" title="nm_ip_routing_rule_get_to ()">nm_ip_routing_rule_get_to</a> <span class="c_punctuation">()</span>
 </td>
 </tr>
 <tr>
@@ -583,38 +601,45 @@
 <span class="returnvalue">void</span>
 </td>
 <td class="function_name">
-<a class="link" href="NMSettingIPConfig.html#nm-setting-ip-config-clear-addresses" title="nm_setting_ip_config_clear_addresses ()">nm_setting_ip_config_clear_addresses</a> <span class="c_punctuation">()</span>
+<a class="link" href="NMSettingIPConfig.html#nm-ip-routing-rule-set-to" title="nm_ip_routing_rule_set_to ()">nm_ip_routing_rule_set_to</a> <span class="c_punctuation">()</span>
 </td>
 </tr>
 <tr>
 <td class="function_type">const <span class="returnvalue">char</span> *
 </td>
 <td class="function_name">
-<a class="link" href="NMSettingIPConfig.html#nm-setting-ip-config-get-gateway" title="nm_setting_ip_config_get_gateway ()">nm_setting_ip_config_get_gateway</a> <span class="c_punctuation">()</span>
+<a class="link" href="NMSettingIPConfig.html#nm-ip-routing-rule-get-iifname" title="nm_ip_routing_rule_get_iifname ()">nm_ip_routing_rule_get_iifname</a> <span class="c_punctuation">()</span>
 </td>
 </tr>
 <tr>
 <td class="function_type">
-<a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint"><span class="returnvalue">guint</span></a>
+<span class="returnvalue">void</span>
 </td>
 <td class="function_name">
-<a class="link" href="NMSettingIPConfig.html#nm-setting-ip-config-get-num-routes" title="nm_setting_ip_config_get_num_routes ()">nm_setting_ip_config_get_num_routes</a> <span class="c_punctuation">()</span>
+<a class="link" href="NMSettingIPConfig.html#nm-ip-routing-rule-set-iifname" title="nm_ip_routing_rule_set_iifname ()">nm_ip_routing_rule_set_iifname</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">const <span class="returnvalue">char</span> *
+</td>
+<td class="function_name">
+<a class="link" href="NMSettingIPConfig.html#nm-ip-routing-rule-get-oifname" title="nm_ip_routing_rule_get_oifname ()">nm_ip_routing_rule_get_oifname</a> <span class="c_punctuation">()</span>
 </td>
 </tr>
 <tr>
 <td class="function_type">
-<a class="link" href="NMSettingIPConfig.html#NMIPRoute"><span class="returnvalue">NMIPRoute</span></a> *
+<span class="returnvalue">void</span>
 </td>
 <td class="function_name">
-<a class="link" href="NMSettingIPConfig.html#nm-setting-ip-config-get-route" title="nm_setting_ip_config_get_route ()">nm_setting_ip_config_get_route</a> <span class="c_punctuation">()</span>
+<a class="link" href="NMSettingIPConfig.html#nm-ip-routing-rule-set-oifname" title="nm_ip_routing_rule_set_oifname ()">nm_ip_routing_rule_set_oifname</a> <span class="c_punctuation">()</span>
 </td>
 </tr>
 <tr>
 <td class="function_type">
-<a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
+<a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint8"><span class="returnvalue">guint8</span></a>
 </td>
 <td class="function_name">
-<a class="link" href="NMSettingIPConfig.html#nm-setting-ip-config-add-route" title="nm_setting_ip_config_add_route ()">nm_setting_ip_config_add_route</a> <span class="c_punctuation">()</span>
+<a class="link" href="NMSettingIPConfig.html#nm-ip-routing-rule-get-action" title="nm_ip_routing_rule_get_action ()">nm_ip_routing_rule_get_action</a> <span class="c_punctuation">()</span>
 </td>
 </tr>
 <tr>
@@ -622,15 +647,15 @@
 <span class="returnvalue">void</span>
 </td>
 <td class="function_name">
-<a class="link" href="NMSettingIPConfig.html#nm-setting-ip-config-remove-route" title="nm_setting_ip_config_remove_route ()">nm_setting_ip_config_remove_route</a> <span class="c_punctuation">()</span>
+<a class="link" href="NMSettingIPConfig.html#nm-ip-routing-rule-set-action" title="nm_ip_routing_rule_set_action ()">nm_ip_routing_rule_set_action</a> <span class="c_punctuation">()</span>
 </td>
 </tr>
 <tr>
 <td class="function_type">
-<a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
+<a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint32"><span class="returnvalue">guint32</span></a>
 </td>
 <td class="function_name">
-<a class="link" href="NMSettingIPConfig.html#nm-setting-ip-config-remove-route-by-value" title="nm_setting_ip_config_remove_route_by_value ()">nm_setting_ip_config_remove_route_by_value</a> <span class="c_punctuation">()</span>
+<a class="link" href="NMSettingIPConfig.html#nm-ip-routing-rule-get-table" title="nm_ip_routing_rule_get_table ()">nm_ip_routing_rule_get_table</a> <span class="c_punctuation">()</span>
 </td>
 </tr>
 <tr>
@@ -638,54 +663,61 @@
 <span class="returnvalue">void</span>
 </td>
 <td class="function_name">
-<a class="link" href="NMSettingIPConfig.html#nm-setting-ip-config-clear-routes" title="nm_setting_ip_config_clear_routes ()">nm_setting_ip_config_clear_routes</a> <span class="c_punctuation">()</span>
+<a class="link" href="NMSettingIPConfig.html#nm-ip-routing-rule-set-table" title="nm_ip_routing_rule_set_table ()">nm_ip_routing_rule_set_table</a> <span class="c_punctuation">()</span>
 </td>
 </tr>
 <tr>
 <td class="function_type">
-<a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gint64"><span class="returnvalue">gint64</span></a>
+<span class="returnvalue">int</span>
 </td>
 <td class="function_name">
-<a class="link" href="NMSettingIPConfig.html#nm-setting-ip-config-get-route-metric" title="nm_setting_ip_config_get_route_metric ()">nm_setting_ip_config_get_route_metric</a> <span class="c_punctuation">()</span>
+<a class="link" href="NMSettingIPConfig.html#nm-ip-routing-rule-cmp" title="nm_ip_routing_rule_cmp ()">nm_ip_routing_rule_cmp</a> <span class="c_punctuation">()</span>
 </td>
 </tr>
 <tr>
 <td class="function_type">
-<a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint32"><span class="returnvalue">guint32</span></a>
+<a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
 </td>
 <td class="function_name">
-<a class="link" href="NMSettingIPConfig.html#nm-setting-ip-config-get-route-table" title="nm_setting_ip_config_get_route_table ()">nm_setting_ip_config_get_route_table</a> <span class="c_punctuation">()</span>
+<a class="link" href="NMSettingIPConfig.html#nm-ip-routing-rule-validate" title="nm_ip_routing_rule_validate ()">nm_ip_routing_rule_validate</a> <span class="c_punctuation">()</span>
 </td>
 </tr>
 <tr>
 <td class="function_type">
-<a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
+<a class="link" href="NMSettingIPConfig.html#NMIPRoutingRule"><span class="returnvalue">NMIPRoutingRule</span></a> *
 </td>
 <td class="function_name">
-<a class="link" href="NMSettingIPConfig.html#nm-setting-ip-config-get-ignore-auto-routes" title="nm_setting_ip_config_get_ignore_auto_routes ()">nm_setting_ip_config_get_ignore_auto_routes</a> <span class="c_punctuation">()</span>
+<a class="link" href="NMSettingIPConfig.html#nm-ip-routing-rule-from-string" title="nm_ip_routing_rule_from_string ()">nm_ip_routing_rule_from_string</a> <span class="c_punctuation">()</span>
 </td>
 </tr>
 <tr>
 <td class="function_type">
-<a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
+<span class="returnvalue">char</span> *
 </td>
 <td class="function_name">
-<a class="link" href="NMSettingIPConfig.html#nm-setting-ip-config-get-ignore-auto-dns" title="nm_setting_ip_config_get_ignore_auto_dns ()">nm_setting_ip_config_get_ignore_auto_dns</a> <span class="c_punctuation">()</span>
+<a class="link" href="NMSettingIPConfig.html#nm-ip-routing-rule-to-string" title="nm_ip_routing_rule_to_string ()">nm_ip_routing_rule_to_string</a> <span class="c_punctuation">()</span>
 </td>
 </tr>
 <tr>
 <td class="function_type">const <span class="returnvalue">char</span> *
 </td>
 <td class="function_name">
-<a class="link" href="NMSettingIPConfig.html#nm-setting-ip-config-get-dhcp-hostname" title="nm_setting_ip_config_get_dhcp_hostname ()">nm_setting_ip_config_get_dhcp_hostname</a> <span class="c_punctuation">()</span>
+<a class="link" href="NMSettingIPConfig.html#nm-setting-ip-config-get-method" title="nm_setting_ip_config_get_method ()">nm_setting_ip_config_get_method</a> <span class="c_punctuation">()</span>
 </td>
 </tr>
 <tr>
 <td class="function_type">
-<a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
+<a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint"><span class="returnvalue">guint</span></a>
 </td>
 <td class="function_name">
-<a class="link" href="NMSettingIPConfig.html#nm-setting-ip-config-get-dhcp-send-hostname" title="nm_setting_ip_config_get_dhcp_send_hostname ()">nm_setting_ip_config_get_dhcp_send_hostname</a> <span class="c_punctuation">()</span>
+<a class="link" href="NMSettingIPConfig.html#nm-setting-ip-config-get-num-dns" title="nm_setting_ip_config_get_num_dns ()">nm_setting_ip_config_get_num_dns</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">const <span class="returnvalue">char</span> *
+</td>
+<td class="function_name">
+<a class="link" href="NMSettingIPConfig.html#nm-setting-ip-config-get-dns" title="nm_setting_ip_config_get_dns ()">nm_setting_ip_config_get_dns</a> <span class="c_punctuation">()</span>
 </td>
 </tr>
 <tr>
@@ -693,255 +725,599 @@
 <a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
 </td>
 <td class="function_name">
-<a class="link" href="NMSettingIPConfig.html#nm-setting-ip-config-get-never-default" title="nm_setting_ip_config_get_never_default ()">nm_setting_ip_config_get_never_default</a> <span class="c_punctuation">()</span>
+<a class="link" href="NMSettingIPConfig.html#nm-setting-ip-config-add-dns" title="nm_setting_ip_config_add_dns ()">nm_setting_ip_config_add_dns</a> <span class="c_punctuation">()</span>
 </td>
 </tr>
 <tr>
 <td class="function_type">
-<a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
+<span class="returnvalue">void</span>
 </td>
 <td class="function_name">
-<a class="link" href="NMSettingIPConfig.html#nm-setting-ip-config-get-may-fail" title="nm_setting_ip_config_get_may_fail ()">nm_setting_ip_config_get_may_fail</a> <span class="c_punctuation">()</span>
+<a class="link" href="NMSettingIPConfig.html#nm-setting-ip-config-remove-dns" title="nm_setting_ip_config_remove_dns ()">nm_setting_ip_config_remove_dns</a> <span class="c_punctuation">()</span>
 </td>
 </tr>
 <tr>
 <td class="function_type">
-<span class="returnvalue">int</span>
+<a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
 </td>
 <td class="function_name">
-<a class="link" href="NMSettingIPConfig.html#nm-setting-ip-config-get-dad-timeout" title="nm_setting_ip_config_get_dad_timeout ()">nm_setting_ip_config_get_dad_timeout</a> <span class="c_punctuation">()</span>
+<a class="link" href="NMSettingIPConfig.html#nm-setting-ip-config-remove-dns-by-value" title="nm_setting_ip_config_remove_dns_by_value ()">nm_setting_ip_config_remove_dns_by_value</a> <span class="c_punctuation">()</span>
 </td>
 </tr>
 <tr>
 <td class="function_type">
-<span class="returnvalue">int</span>
+<span class="returnvalue">void</span>
 </td>
 <td class="function_name">
-<a class="link" href="NMSettingIPConfig.html#nm-setting-ip-config-get-dhcp-timeout" title="nm_setting_ip_config_get_dhcp_timeout ()">nm_setting_ip_config_get_dhcp_timeout</a> <span class="c_punctuation">()</span>
+<a class="link" href="NMSettingIPConfig.html#nm-setting-ip-config-clear-dns" title="nm_setting_ip_config_clear_dns ()">nm_setting_ip_config_clear_dns</a> <span class="c_punctuation">()</span>
 </td>
 </tr>
-</tbody>
-</table></div>
-</div>
-<div class="refsect1">
-<a name="NMSettingIPConfig.properties"></a><h2>Properties</h2>
-<div class="informaltable"><table class="informaltable" border="0">
-<colgroup>
-<col width="150px" class="properties_type">
-<col width="300px" class="properties_name">
-<col width="200px" class="properties_flags">
-</colgroup>
-<tbody>
 <tr>
-<td class="property_type">
-<a href="https://developer.gnome.org/glib/unstable/glib-Pointer-Arrays.html#GPtrArray"><span class="type">GPtrArray</span></a> *</td>
-<td class="property_name"><a class="link" href="NMSettingIPConfig.html#NMSettingIPConfig--addresses" title="The “addresses” property">addresses</a></td>
-<td class="property_flags">Read / Write</td>
+<td class="function_type">
+<a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint"><span class="returnvalue">guint</span></a>
+</td>
+<td class="function_name">
+<a class="link" href="NMSettingIPConfig.html#nm-setting-ip-config-get-num-dns-searches" title="nm_setting_ip_config_get_num_dns_searches ()">nm_setting_ip_config_get_num_dns_searches</a> <span class="c_punctuation">()</span>
+</td>
 </tr>
 <tr>
-<td class="property_type"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gint"><span class="type">gint</span></a></td>
-<td class="property_name"><a class="link" href="NMSettingIPConfig.html#NMSettingIPConfig--dad-timeout" title="The “dad-timeout” property">dad-timeout</a></td>
-<td class="property_flags">Read / Write / Construct</td>
+<td class="function_type">const <span class="returnvalue">char</span> *
+</td>
+<td class="function_name">
+<a class="link" href="NMSettingIPConfig.html#nm-setting-ip-config-get-dns-search" title="nm_setting_ip_config_get_dns_search ()">nm_setting_ip_config_get_dns_search</a> <span class="c_punctuation">()</span>
+</td>
 </tr>
 <tr>
-<td class="property_type">
-<a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *</td>
-<td class="property_name"><a class="link" href="NMSettingIPConfig.html#NMSettingIPConfig--dhcp-hostname" title="The “dhcp-hostname” property">dhcp-hostname</a></td>
-<td class="property_flags">Read / Write</td>
+<td class="function_type">
+<a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
+</td>
+<td class="function_name">
+<a class="link" href="NMSettingIPConfig.html#nm-setting-ip-config-add-dns-search" title="nm_setting_ip_config_add_dns_search ()">nm_setting_ip_config_add_dns_search</a> <span class="c_punctuation">()</span>
+</td>
 </tr>
 <tr>
-<td class="property_type"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a></td>
-<td class="property_name"><a class="link" href="NMSettingIPConfig.html#NMSettingIPConfig--dhcp-send-hostname" title="The “dhcp-send-hostname” property">dhcp-send-hostname</a></td>
-<td class="property_flags">Read / Write / Construct</td>
+<td class="function_type">
+<span class="returnvalue">void</span>
+</td>
+<td class="function_name">
+<a class="link" href="NMSettingIPConfig.html#nm-setting-ip-config-remove-dns-search" title="nm_setting_ip_config_remove_dns_search ()">nm_setting_ip_config_remove_dns_search</a> <span class="c_punctuation">()</span>
+</td>
 </tr>
 <tr>
-<td class="property_type"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gint"><span class="type">gint</span></a></td>
-<td class="property_name"><a class="link" href="NMSettingIPConfig.html#NMSettingIPConfig--dhcp-timeout" title="The “dhcp-timeout” property">dhcp-timeout</a></td>
-<td class="property_flags">Read / Write</td>
+<td class="function_type">
+<a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
+</td>
+<td class="function_name">
+<a class="link" href="NMSettingIPConfig.html#nm-setting-ip-config-remove-dns-search-by-value" title="nm_setting_ip_config_remove_dns_search_by_value ()">nm_setting_ip_config_remove_dns_search_by_value</a> <span class="c_punctuation">()</span>
+</td>
 </tr>
 <tr>
-<td class="property_type"><a href="https://developer.gnome.org/glib/unstable/glib-String-Utility-Functions.html#GStrv"><span class="type">GStrv</span></a></td>
-<td class="property_name"><a class="link" href="NMSettingIPConfig.html#NMSettingIPConfig--dns" title="The “dns” property">dns</a></td>
-<td class="property_flags">Read / Write</td>
+<td class="function_type">
+<span class="returnvalue">void</span>
+</td>
+<td class="function_name">
+<a class="link" href="NMSettingIPConfig.html#nm-setting-ip-config-clear-dns-searches" title="nm_setting_ip_config_clear_dns_searches ()">nm_setting_ip_config_clear_dns_searches</a> <span class="c_punctuation">()</span>
+</td>
 </tr>
 <tr>
-<td class="property_type"><a href="https://developer.gnome.org/glib/unstable/glib-String-Utility-Functions.html#GStrv"><span class="type">GStrv</span></a></td>
-<td class="property_name"><a class="link" href="NMSettingIPConfig.html#NMSettingIPConfig--dns-options" title="The “dns-options” property">dns-options</a></td>
-<td class="property_flags">Read / Write</td>
+<td class="function_type">
+<a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint"><span class="returnvalue">guint</span></a>
+</td>
+<td class="function_name">
+<a class="link" href="NMSettingIPConfig.html#nm-setting-ip-config-get-num-dns-options" title="nm_setting_ip_config_get_num_dns_options ()">nm_setting_ip_config_get_num_dns_options</a> <span class="c_punctuation">()</span>
+</td>
 </tr>
 <tr>
-<td class="property_type"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gint"><span class="type">gint</span></a></td>
-<td class="property_name"><a class="link" href="NMSettingIPConfig.html#NMSettingIPConfig--dns-priority" title="The “dns-priority” property">dns-priority</a></td>
-<td class="property_flags">Read / Write / Construct</td>
+<td class="function_type">
+<a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
+</td>
+<td class="function_name">
+<a class="link" href="NMSettingIPConfig.html#nm-setting-ip-config-has-dns-options" title="nm_setting_ip_config_has_dns_options ()">nm_setting_ip_config_has_dns_options</a> <span class="c_punctuation">()</span>
+</td>
 </tr>
 <tr>
-<td class="property_type"><a href="https://developer.gnome.org/glib/unstable/glib-String-Utility-Functions.html#GStrv"><span class="type">GStrv</span></a></td>
-<td class="property_name"><a class="link" href="NMSettingIPConfig.html#NMSettingIPConfig--dns-search" title="The “dns-search” property">dns-search</a></td>
-<td class="property_flags">Read / Write</td>
+<td class="function_type">const <span class="returnvalue">char</span> *
+</td>
+<td class="function_name">
+<a class="link" href="NMSettingIPConfig.html#nm-setting-ip-config-get-dns-option" title="nm_setting_ip_config_get_dns_option ()">nm_setting_ip_config_get_dns_option</a> <span class="c_punctuation">()</span>
+</td>
 </tr>
 <tr>
-<td class="property_type">
-<a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *</td>
-<td class="property_name"><a class="link" href="NMSettingIPConfig.html#NMSettingIPConfig--gateway" title="The “gateway” property">gateway</a></td>
-<td class="property_flags">Read / Write</td>
+<td class="function_type">
+<span class="returnvalue">int</span>
+</td>
+<td class="function_name">
+<a class="link" href="NMSettingIPConfig.html#nm-setting-ip-config-next-valid-dns-option" title="nm_setting_ip_config_next_valid_dns_option ()">nm_setting_ip_config_next_valid_dns_option</a> <span class="c_punctuation">()</span>
+</td>
 </tr>
 <tr>
-<td class="property_type"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a></td>
-<td class="property_name"><a class="link" href="NMSettingIPConfig.html#NMSettingIPConfig--ignore-auto-dns" title="The “ignore-auto-dns” property">ignore-auto-dns</a></td>
-<td class="property_flags">Read / Write / Construct</td>
+<td class="function_type">
+<a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
+</td>
+<td class="function_name">
+<a class="link" href="NMSettingIPConfig.html#nm-setting-ip-config-add-dns-option" title="nm_setting_ip_config_add_dns_option ()">nm_setting_ip_config_add_dns_option</a> <span class="c_punctuation">()</span>
+</td>
 </tr>
 <tr>
-<td class="property_type"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a></td>
-<td class="property_name"><a class="link" href="NMSettingIPConfig.html#NMSettingIPConfig--ignore-auto-routes" title="The “ignore-auto-routes” property">ignore-auto-routes</a></td>
-<td class="property_flags">Read / Write / Construct</td>
+<td class="function_type">
+<span class="returnvalue">void</span>
+</td>
+<td class="function_name">
+<a class="link" href="NMSettingIPConfig.html#nm-setting-ip-config-remove-dns-option" title="nm_setting_ip_config_remove_dns_option ()">nm_setting_ip_config_remove_dns_option</a> <span class="c_punctuation">()</span>
+</td>
 </tr>
 <tr>
-<td class="property_type"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a></td>
-<td class="property_name"><a class="link" href="NMSettingIPConfig.html#NMSettingIPConfig--may-fail" title="The “may-fail” property">may-fail</a></td>
-<td class="property_flags">Read / Write / Construct</td>
-</tr>
-<tr>
-<td class="property_type">
-<a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *</td>
-<td class="property_name"><a class="link" href="NMSettingIPConfig.html#NMSettingIPConfig--method" title="The “method” property">method</a></td>
-<td class="property_flags">Read / Write</td>
+<td class="function_type">
+<a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
+</td>
+<td class="function_name">
+<a class="link" href="NMSettingIPConfig.html#nm-setting-ip-config-remove-dns-option-by-value" title="nm_setting_ip_config_remove_dns_option_by_value ()">nm_setting_ip_config_remove_dns_option_by_value</a> <span class="c_punctuation">()</span>
+</td>
 </tr>
 <tr>
-<td class="property_type"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a></td>
-<td class="property_name"><a class="link" href="NMSettingIPConfig.html#NMSettingIPConfig--never-default" title="The “never-default” property">never-default</a></td>
-<td class="property_flags">Read / Write / Construct</td>
+<td class="function_type">
+<span class="returnvalue">void</span>
+</td>
+<td class="function_name">
+<a class="link" href="NMSettingIPConfig.html#nm-setting-ip-config-clear-dns-options" title="nm_setting_ip_config_clear_dns_options ()">nm_setting_ip_config_clear_dns_options</a> <span class="c_punctuation">()</span>
+</td>
 </tr>
 <tr>
-<td class="property_type"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gint64"><span class="type">gint64</span></a></td>
-<td class="property_name"><a class="link" href="NMSettingIPConfig.html#NMSettingIPConfig--route-metric" title="The “route-metric” property">route-metric</a></td>
-<td class="property_flags">Read / Write / Construct</td>
+<td class="function_type">
+<span class="returnvalue">int</span>
+</td>
+<td class="function_name">
+<a class="link" href="NMSettingIPConfig.html#nm-setting-ip-config-get-dns-priority" title="nm_setting_ip_config_get_dns_priority ()">nm_setting_ip_config_get_dns_priority</a> <span class="c_punctuation">()</span>
+</td>
 </tr>
 <tr>
-<td class="property_type"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a></td>
-<td class="property_name"><a class="link" href="NMSettingIPConfig.html#NMSettingIPConfig--route-table" title="The “route-table” property">route-table</a></td>
-<td class="property_flags">Read / Write</td>
+<td class="function_type">
+<a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint"><span class="returnvalue">guint</span></a>
+</td>
+<td class="function_name">
+<a class="link" href="NMSettingIPConfig.html#nm-setting-ip-config-get-num-addresses" title="nm_setting_ip_config_get_num_addresses ()">nm_setting_ip_config_get_num_addresses</a> <span class="c_punctuation">()</span>
+</td>
 </tr>
 <tr>
-<td class="property_type">
-<a href="https://developer.gnome.org/glib/unstable/glib-Pointer-Arrays.html#GPtrArray"><span class="type">GPtrArray</span></a> *</td>
-<td class="property_name"><a class="link" href="NMSettingIPConfig.html#NMSettingIPConfig--routes" title="The “routes” property">routes</a></td>
-<td class="property_flags">Read / Write</td>
+<td class="function_type">
+<a class="link" href="NMSettingIPConfig.html#NMIPAddress"><span class="returnvalue">NMIPAddress</span></a> *
+</td>
+<td class="function_name">
+<a class="link" href="NMSettingIPConfig.html#nm-setting-ip-config-get-address" title="nm_setting_ip_config_get_address ()">nm_setting_ip_config_get_address</a> <span class="c_punctuation">()</span>
+</td>
 </tr>
-</tbody>
-</table></div>
-</div>
-<a name="NMIPAddress"></a><a name="NMIPRoute"></a><div class="refsect1">
-<a name="NMSettingIPConfig.other"></a><h2>Types and Values</h2>
-<div class="informaltable"><table class="informaltable" width="100%" border="0">
-<colgroup>
-<col width="150px" class="name">
-<col class="description">
-</colgroup>
-<tbody>
 <tr>
-<td class="define_keyword">#define</td>
-<td class="function_name"><a class="link" href="NMSettingIPConfig.html#NM-IP-ADDRESS-ATTRIBUTE-LABEL:CAPS" title="NM_IP_ADDRESS_ATTRIBUTE_LABEL">NM_IP_ADDRESS_ATTRIBUTE_LABEL</a></td>
+<td class="function_type">
+<a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
+</td>
+<td class="function_name">
+<a class="link" href="NMSettingIPConfig.html#nm-setting-ip-config-add-address" title="nm_setting_ip_config_add_address ()">nm_setting_ip_config_add_address</a> <span class="c_punctuation">()</span>
+</td>
 </tr>
 <tr>
-<td class="define_keyword">#define</td>
-<td class="function_name"><a class="link" href="NMSettingIPConfig.html#NM-IP-ROUTE-ATTRIBUTE-TABLE:CAPS" title="NM_IP_ROUTE_ATTRIBUTE_TABLE">NM_IP_ROUTE_ATTRIBUTE_TABLE</a></td>
+<td class="function_type">
+<span class="returnvalue">void</span>
+</td>
+<td class="function_name">
+<a class="link" href="NMSettingIPConfig.html#nm-setting-ip-config-remove-address" title="nm_setting_ip_config_remove_address ()">nm_setting_ip_config_remove_address</a> <span class="c_punctuation">()</span>
+</td>
 </tr>
 <tr>
-<td class="define_keyword">#define</td>
-<td class="function_name"><a class="link" href="NMSettingIPConfig.html#NM-IP-ROUTE-ATTRIBUTE-SRC:CAPS" title="NM_IP_ROUTE_ATTRIBUTE_SRC">NM_IP_ROUTE_ATTRIBUTE_SRC</a></td>
+<td class="function_type">
+<a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
+</td>
+<td class="function_name">
+<a class="link" href="NMSettingIPConfig.html#nm-setting-ip-config-remove-address-by-value" title="nm_setting_ip_config_remove_address_by_value ()">nm_setting_ip_config_remove_address_by_value</a> <span class="c_punctuation">()</span>
+</td>
 </tr>
 <tr>
-<td class="define_keyword">#define</td>
-<td class="function_name"><a class="link" href="NMSettingIPConfig.html#NM-IP-ROUTE-ATTRIBUTE-FROM:CAPS" title="NM_IP_ROUTE_ATTRIBUTE_FROM">NM_IP_ROUTE_ATTRIBUTE_FROM</a></td>
+<td class="function_type">
+<span class="returnvalue">void</span>
+</td>
+<td class="function_name">
+<a class="link" href="NMSettingIPConfig.html#nm-setting-ip-config-clear-addresses" title="nm_setting_ip_config_clear_addresses ()">nm_setting_ip_config_clear_addresses</a> <span class="c_punctuation">()</span>
+</td>
 </tr>
 <tr>
-<td class="define_keyword">#define</td>
-<td class="function_name"><a class="link" href="NMSettingIPConfig.html#NM-IP-ROUTE-ATTRIBUTE-TOS:CAPS" title="NM_IP_ROUTE_ATTRIBUTE_TOS">NM_IP_ROUTE_ATTRIBUTE_TOS</a></td>
+<td class="function_type">const <span class="returnvalue">char</span> *
+</td>
+<td class="function_name">
+<a class="link" href="NMSettingIPConfig.html#nm-setting-ip-config-get-gateway" title="nm_setting_ip_config_get_gateway ()">nm_setting_ip_config_get_gateway</a> <span class="c_punctuation">()</span>
+</td>
 </tr>
 <tr>
-<td class="define_keyword">#define</td>
-<td class="function_name"><a class="link" href="NMSettingIPConfig.html#NM-IP-ROUTE-ATTRIBUTE-ONLINK:CAPS" title="NM_IP_ROUTE_ATTRIBUTE_ONLINK">NM_IP_ROUTE_ATTRIBUTE_ONLINK</a></td>
+<td class="function_type">
+<a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint"><span class="returnvalue">guint</span></a>
+</td>
+<td class="function_name">
+<a class="link" href="NMSettingIPConfig.html#nm-setting-ip-config-get-num-routes" title="nm_setting_ip_config_get_num_routes ()">nm_setting_ip_config_get_num_routes</a> <span class="c_punctuation">()</span>
+</td>
 </tr>
 <tr>
-<td class="define_keyword">#define</td>
-<td class="function_name"><a class="link" href="NMSettingIPConfig.html#NM-IP-ROUTE-ATTRIBUTE-WINDOW:CAPS" title="NM_IP_ROUTE_ATTRIBUTE_WINDOW">NM_IP_ROUTE_ATTRIBUTE_WINDOW</a></td>
+<td class="function_type">
+<a class="link" href="NMSettingIPConfig.html#NMIPRoute"><span class="returnvalue">NMIPRoute</span></a> *
+</td>
+<td class="function_name">
+<a class="link" href="NMSettingIPConfig.html#nm-setting-ip-config-get-route" title="nm_setting_ip_config_get_route ()">nm_setting_ip_config_get_route</a> <span class="c_punctuation">()</span>
+</td>
 </tr>
 <tr>
-<td class="define_keyword">#define</td>
-<td class="function_name"><a class="link" href="NMSettingIPConfig.html#NM-IP-ROUTE-ATTRIBUTE-CWND:CAPS" title="NM_IP_ROUTE_ATTRIBUTE_CWND">NM_IP_ROUTE_ATTRIBUTE_CWND</a></td>
+<td class="function_type">
+<a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
+</td>
+<td class="function_name">
+<a class="link" href="NMSettingIPConfig.html#nm-setting-ip-config-add-route" title="nm_setting_ip_config_add_route ()">nm_setting_ip_config_add_route</a> <span class="c_punctuation">()</span>
+</td>
 </tr>
 <tr>
-<td class="define_keyword">#define</td>
-<td class="function_name"><a class="link" href="NMSettingIPConfig.html#NM-IP-ROUTE-ATTRIBUTE-INITCWND:CAPS" title="NM_IP_ROUTE_ATTRIBUTE_INITCWND">NM_IP_ROUTE_ATTRIBUTE_INITCWND</a></td>
+<td class="function_type">
+<span class="returnvalue">void</span>
+</td>
+<td class="function_name">
+<a class="link" href="NMSettingIPConfig.html#nm-setting-ip-config-remove-route" title="nm_setting_ip_config_remove_route ()">nm_setting_ip_config_remove_route</a> <span class="c_punctuation">()</span>
+</td>
 </tr>
 <tr>
-<td class="define_keyword">#define</td>
-<td class="function_name"><a class="link" href="NMSettingIPConfig.html#NM-IP-ROUTE-ATTRIBUTE-INITRWND:CAPS" title="NM_IP_ROUTE_ATTRIBUTE_INITRWND">NM_IP_ROUTE_ATTRIBUTE_INITRWND</a></td>
+<td class="function_type">
+<a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
+</td>
+<td class="function_name">
+<a class="link" href="NMSettingIPConfig.html#nm-setting-ip-config-remove-route-by-value" title="nm_setting_ip_config_remove_route_by_value ()">nm_setting_ip_config_remove_route_by_value</a> <span class="c_punctuation">()</span>
+</td>
 </tr>
 <tr>
-<td class="define_keyword">#define</td>
-<td class="function_name"><a class="link" href="NMSettingIPConfig.html#NM-IP-ROUTE-ATTRIBUTE-MTU:CAPS" title="NM_IP_ROUTE_ATTRIBUTE_MTU">NM_IP_ROUTE_ATTRIBUTE_MTU</a></td>
+<td class="function_type">
+<span class="returnvalue">void</span>
+</td>
+<td class="function_name">
+<a class="link" href="NMSettingIPConfig.html#nm-setting-ip-config-clear-routes" title="nm_setting_ip_config_clear_routes ()">nm_setting_ip_config_clear_routes</a> <span class="c_punctuation">()</span>
+</td>
 </tr>
 <tr>
-<td class="define_keyword">#define</td>
-<td class="function_name"><a class="link" href="NMSettingIPConfig.html#NM-IP-ROUTE-ATTRIBUTE-LOCK-WINDOW:CAPS" title="NM_IP_ROUTE_ATTRIBUTE_LOCK_WINDOW">NM_IP_ROUTE_ATTRIBUTE_LOCK_WINDOW</a></td>
+<td class="function_type">
+<a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gint64"><span class="returnvalue">gint64</span></a>
+</td>
+<td class="function_name">
+<a class="link" href="NMSettingIPConfig.html#nm-setting-ip-config-get-route-metric" title="nm_setting_ip_config_get_route_metric ()">nm_setting_ip_config_get_route_metric</a> <span class="c_punctuation">()</span>
+</td>
 </tr>
 <tr>
-<td class="define_keyword">#define</td>
-<td class="function_name"><a class="link" href="NMSettingIPConfig.html#NM-IP-ROUTE-ATTRIBUTE-LOCK-CWND:CAPS" title="NM_IP_ROUTE_ATTRIBUTE_LOCK_CWND">NM_IP_ROUTE_ATTRIBUTE_LOCK_CWND</a></td>
+<td class="function_type">
+<a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint32"><span class="returnvalue">guint32</span></a>
+</td>
+<td class="function_name">
+<a class="link" href="NMSettingIPConfig.html#nm-setting-ip-config-get-route-table" title="nm_setting_ip_config_get_route_table ()">nm_setting_ip_config_get_route_table</a> <span class="c_punctuation">()</span>
+</td>
 </tr>
 <tr>
-<td class="define_keyword">#define</td>
-<td class="function_name"><a class="link" href="NMSettingIPConfig.html#NM-IP-ROUTE-ATTRIBUTE-LOCK-INITCWND:CAPS" title="NM_IP_ROUTE_ATTRIBUTE_LOCK_INITCWND">NM_IP_ROUTE_ATTRIBUTE_LOCK_INITCWND</a></td>
+<td class="function_type">
+<a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint"><span class="returnvalue">guint</span></a>
+</td>
+<td class="function_name">
+<a class="link" href="NMSettingIPConfig.html#nm-setting-ip-config-get-num-routing-rules" title="nm_setting_ip_config_get_num_routing_rules ()">nm_setting_ip_config_get_num_routing_rules</a> <span class="c_punctuation">()</span>
+</td>
 </tr>
 <tr>
-<td class="define_keyword">#define</td>
-<td class="function_name"><a class="link" href="NMSettingIPConfig.html#NM-IP-ROUTE-ATTRIBUTE-LOCK-INITRWND:CAPS" title="NM_IP_ROUTE_ATTRIBUTE_LOCK_INITRWND">NM_IP_ROUTE_ATTRIBUTE_LOCK_INITRWND</a></td>
+<td class="function_type">
+<a class="link" href="NMSettingIPConfig.html#NMIPRoutingRule"><span class="returnvalue">NMIPRoutingRule</span></a> *
+</td>
+<td class="function_name">
+<a class="link" href="NMSettingIPConfig.html#nm-setting-ip-config-get-routing-rule" title="nm_setting_ip_config_get_routing_rule ()">nm_setting_ip_config_get_routing_rule</a> <span class="c_punctuation">()</span>
+</td>
 </tr>
 <tr>
-<td class="define_keyword">#define</td>
-<td class="function_name"><a class="link" href="NMSettingIPConfig.html#NM-IP-ROUTE-ATTRIBUTE-LOCK-MTU:CAPS" title="NM_IP_ROUTE_ATTRIBUTE_LOCK_MTU">NM_IP_ROUTE_ATTRIBUTE_LOCK_MTU</a></td>
+<td class="function_type">
+<span class="returnvalue">void</span>
+</td>
+<td class="function_name">
+<a class="link" href="NMSettingIPConfig.html#nm-setting-ip-config-add-routing-rule" title="nm_setting_ip_config_add_routing_rule ()">nm_setting_ip_config_add_routing_rule</a> <span class="c_punctuation">()</span>
+</td>
 </tr>
 <tr>
-<td class="define_keyword">#define</td>
-<td class="function_name"><a class="link" href="NMSettingIPConfig.html#NM-SETTING-IP-CONFIG-DAD-TIMEOUT-MAX:CAPS" title="NM_SETTING_IP_CONFIG_DAD_TIMEOUT_MAX">NM_SETTING_IP_CONFIG_DAD_TIMEOUT_MAX</a></td>
+<td class="function_type">
+<span class="returnvalue">void</span>
+</td>
+<td class="function_name">
+<a class="link" href="NMSettingIPConfig.html#nm-setting-ip-config-remove-routing-rule" title="nm_setting_ip_config_remove_routing_rule ()">nm_setting_ip_config_remove_routing_rule</a> <span class="c_punctuation">()</span>
+</td>
 </tr>
 <tr>
-<td class="define_keyword">#define</td>
-<td class="function_name"><a class="link" href="NMSettingIPConfig.html#NM-SETTING-IP-CONFIG-METHOD:CAPS" title="NM_SETTING_IP_CONFIG_METHOD">NM_SETTING_IP_CONFIG_METHOD</a></td>
+<td class="function_type">
+<span class="returnvalue">void</span>
+</td>
+<td class="function_name">
+<a class="link" href="NMSettingIPConfig.html#nm-setting-ip-config-clear-routing-rules" title="nm_setting_ip_config_clear_routing_rules ()">nm_setting_ip_config_clear_routing_rules</a> <span class="c_punctuation">()</span>
+</td>
 </tr>
 <tr>
-<td class="define_keyword">#define</td>
-<td class="function_name"><a class="link" href="NMSettingIPConfig.html#NM-SETTING-IP-CONFIG-DNS:CAPS" title="NM_SETTING_IP_CONFIG_DNS">NM_SETTING_IP_CONFIG_DNS</a></td>
+<td class="function_type">
+<a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
+</td>
+<td class="function_name">
+<a class="link" href="NMSettingIPConfig.html#nm-setting-ip-config-get-ignore-auto-routes" title="nm_setting_ip_config_get_ignore_auto_routes ()">nm_setting_ip_config_get_ignore_auto_routes</a> <span class="c_punctuation">()</span>
+</td>
 </tr>
 <tr>
-<td class="define_keyword">#define</td>
-<td class="function_name"><a class="link" href="NMSettingIPConfig.html#NM-SETTING-IP-CONFIG-DNS-SEARCH:CAPS" title="NM_SETTING_IP_CONFIG_DNS_SEARCH">NM_SETTING_IP_CONFIG_DNS_SEARCH</a></td>
+<td class="function_type">
+<a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
+</td>
+<td class="function_name">
+<a class="link" href="NMSettingIPConfig.html#nm-setting-ip-config-get-ignore-auto-dns" title="nm_setting_ip_config_get_ignore_auto_dns ()">nm_setting_ip_config_get_ignore_auto_dns</a> <span class="c_punctuation">()</span>
+</td>
 </tr>
 <tr>
-<td class="define_keyword">#define</td>
-<td class="function_name"><a class="link" href="NMSettingIPConfig.html#NM-SETTING-IP-CONFIG-DNS-OPTIONS:CAPS" title="NM_SETTING_IP_CONFIG_DNS_OPTIONS">NM_SETTING_IP_CONFIG_DNS_OPTIONS</a></td>
+<td class="function_type">const <span class="returnvalue">char</span> *
+</td>
+<td class="function_name">
+<a class="link" href="NMSettingIPConfig.html#nm-setting-ip-config-get-dhcp-hostname" title="nm_setting_ip_config_get_dhcp_hostname ()">nm_setting_ip_config_get_dhcp_hostname</a> <span class="c_punctuation">()</span>
+</td>
 </tr>
 <tr>
-<td class="define_keyword">#define</td>
-<td class="function_name"><a class="link" href="NMSettingIPConfig.html#NM-SETTING-IP-CONFIG-DNS-PRIORITY:CAPS" title="NM_SETTING_IP_CONFIG_DNS_PRIORITY">NM_SETTING_IP_CONFIG_DNS_PRIORITY</a></td>
+<td class="function_type">
+<a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
+</td>
+<td class="function_name">
+<a class="link" href="NMSettingIPConfig.html#nm-setting-ip-config-get-dhcp-send-hostname" title="nm_setting_ip_config_get_dhcp_send_hostname ()">nm_setting_ip_config_get_dhcp_send_hostname</a> <span class="c_punctuation">()</span>
+</td>
 </tr>
 <tr>
-<td class="define_keyword">#define</td>
-<td class="function_name"><a class="link" href="NMSettingIPConfig.html#NM-SETTING-IP-CONFIG-ADDRESSES:CAPS" title="NM_SETTING_IP_CONFIG_ADDRESSES">NM_SETTING_IP_CONFIG_ADDRESSES</a></td>
+<td class="function_type">
+<a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
+</td>
+<td class="function_name">
+<a class="link" href="NMSettingIPConfig.html#nm-setting-ip-config-get-never-default" title="nm_setting_ip_config_get_never_default ()">nm_setting_ip_config_get_never_default</a> <span class="c_punctuation">()</span>
+</td>
 </tr>
 <tr>
-<td class="define_keyword">#define</td>
-<td class="function_name"><a class="link" href="NMSettingIPConfig.html#NM-SETTING-IP-CONFIG-GATEWAY:CAPS" title="NM_SETTING_IP_CONFIG_GATEWAY">NM_SETTING_IP_CONFIG_GATEWAY</a></td>
+<td class="function_type">
+<a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
+</td>
+<td class="function_name">
+<a class="link" href="NMSettingIPConfig.html#nm-setting-ip-config-get-may-fail" title="nm_setting_ip_config_get_may_fail ()">nm_setting_ip_config_get_may_fail</a> <span class="c_punctuation">()</span>
+</td>
 </tr>
 <tr>
-<td class="define_keyword">#define</td>
-<td class="function_name"><a class="link" href="NMSettingIPConfig.html#NM-SETTING-IP-CONFIG-ROUTES:CAPS" title="NM_SETTING_IP_CONFIG_ROUTES">NM_SETTING_IP_CONFIG_ROUTES</a></td>
+<td class="function_type">
+<span class="returnvalue">int</span>
+</td>
+<td class="function_name">
+<a class="link" href="NMSettingIPConfig.html#nm-setting-ip-config-get-dad-timeout" title="nm_setting_ip_config_get_dad_timeout ()">nm_setting_ip_config_get_dad_timeout</a> <span class="c_punctuation">()</span>
+</td>
 </tr>
 <tr>
-<td class="define_keyword">#define</td>
-<td class="function_name"><a class="link" href="NMSettingIPConfig.html#NM-SETTING-IP-CONFIG-ROUTE-METRIC:CAPS" title="NM_SETTING_IP_CONFIG_ROUTE_METRIC">NM_SETTING_IP_CONFIG_ROUTE_METRIC</a></td>
-</tr>
+<td class="function_type">
+<span class="returnvalue">int</span>
+</td>
+<td class="function_name">
+<a class="link" href="NMSettingIPConfig.html#nm-setting-ip-config-get-dhcp-timeout" title="nm_setting_ip_config_get_dhcp_timeout ()">nm_setting_ip_config_get_dhcp_timeout</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<div class="refsect1">
+<a name="NMSettingIPConfig.properties"></a><h2>Properties</h2>
+<div class="informaltable"><table class="informaltable" border="0">
+<colgroup>
+<col width="150px" class="properties_type">
+<col width="300px" class="properties_name">
+<col width="200px" class="properties_flags">
+</colgroup>
+<tbody>
+<tr>
+<td class="property_type">
+<a href="https://developer.gnome.org/glib/unstable/glib-Pointer-Arrays.html#GPtrArray"><span class="type">GPtrArray</span></a> *</td>
+<td class="property_name"><a class="link" href="NMSettingIPConfig.html#NMSettingIPConfig--addresses" title="The “addresses” property">addresses</a></td>
+<td class="property_flags">Read / Write</td>
+</tr>
+<tr>
+<td class="property_type"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gint"><span class="type">gint</span></a></td>
+<td class="property_name"><a class="link" href="NMSettingIPConfig.html#NMSettingIPConfig--dad-timeout" title="The “dad-timeout” property">dad-timeout</a></td>
+<td class="property_flags">Read / Write / Construct</td>
+</tr>
+<tr>
+<td class="property_type">
+<a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *</td>
+<td class="property_name"><a class="link" href="NMSettingIPConfig.html#NMSettingIPConfig--dhcp-hostname" title="The “dhcp-hostname” property">dhcp-hostname</a></td>
+<td class="property_flags">Read / Write</td>
+</tr>
+<tr>
+<td class="property_type"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a></td>
+<td class="property_name"><a class="link" href="NMSettingIPConfig.html#NMSettingIPConfig--dhcp-send-hostname" title="The “dhcp-send-hostname” property">dhcp-send-hostname</a></td>
+<td class="property_flags">Read / Write / Construct</td>
+</tr>
+<tr>
+<td class="property_type"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gint"><span class="type">gint</span></a></td>
+<td class="property_name"><a class="link" href="NMSettingIPConfig.html#NMSettingIPConfig--dhcp-timeout" title="The “dhcp-timeout” property">dhcp-timeout</a></td>
+<td class="property_flags">Read / Write</td>
+</tr>
+<tr>
+<td class="property_type"><a href="https://developer.gnome.org/glib/unstable/glib-String-Utility-Functions.html#GStrv"><span class="type">GStrv</span></a></td>
+<td class="property_name"><a class="link" href="NMSettingIPConfig.html#NMSettingIPConfig--dns" title="The “dns” property">dns</a></td>
+<td class="property_flags">Read / Write</td>
+</tr>
+<tr>
+<td class="property_type"><a href="https://developer.gnome.org/glib/unstable/glib-String-Utility-Functions.html#GStrv"><span class="type">GStrv</span></a></td>
+<td class="property_name"><a class="link" href="NMSettingIPConfig.html#NMSettingIPConfig--dns-options" title="The “dns-options” property">dns-options</a></td>
+<td class="property_flags">Read / Write</td>
+</tr>
+<tr>
+<td class="property_type"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gint"><span class="type">gint</span></a></td>
+<td class="property_name"><a class="link" href="NMSettingIPConfig.html#NMSettingIPConfig--dns-priority" title="The “dns-priority” property">dns-priority</a></td>
+<td class="property_flags">Read / Write / Construct</td>
+</tr>
+<tr>
+<td class="property_type"><a href="https://developer.gnome.org/glib/unstable/glib-String-Utility-Functions.html#GStrv"><span class="type">GStrv</span></a></td>
+<td class="property_name"><a class="link" href="NMSettingIPConfig.html#NMSettingIPConfig--dns-search" title="The “dns-search” property">dns-search</a></td>
+<td class="property_flags">Read / Write</td>
+</tr>
+<tr>
+<td class="property_type">
+<a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *</td>
+<td class="property_name"><a class="link" href="NMSettingIPConfig.html#NMSettingIPConfig--gateway" title="The “gateway” property">gateway</a></td>
+<td class="property_flags">Read / Write</td>
+</tr>
+<tr>
+<td class="property_type"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a></td>
+<td class="property_name"><a class="link" href="NMSettingIPConfig.html#NMSettingIPConfig--ignore-auto-dns" title="The “ignore-auto-dns” property">ignore-auto-dns</a></td>
+<td class="property_flags">Read / Write / Construct</td>
+</tr>
+<tr>
+<td class="property_type"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a></td>
+<td class="property_name"><a class="link" href="NMSettingIPConfig.html#NMSettingIPConfig--ignore-auto-routes" title="The “ignore-auto-routes” property">ignore-auto-routes</a></td>
+<td class="property_flags">Read / Write / Construct</td>
+</tr>
+<tr>
+<td class="property_type"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a></td>
+<td class="property_name"><a class="link" href="NMSettingIPConfig.html#NMSettingIPConfig--may-fail" title="The “may-fail” property">may-fail</a></td>
+<td class="property_flags">Read / Write / Construct</td>
+</tr>
+<tr>
+<td class="property_type">
+<a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *</td>
+<td class="property_name"><a class="link" href="NMSettingIPConfig.html#NMSettingIPConfig--method" title="The “method” property">method</a></td>
+<td class="property_flags">Read / Write</td>
+</tr>
+<tr>
+<td class="property_type"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a></td>
+<td class="property_name"><a class="link" href="NMSettingIPConfig.html#NMSettingIPConfig--never-default" title="The “never-default” property">never-default</a></td>
+<td class="property_flags">Read / Write / Construct</td>
+</tr>
+<tr>
+<td class="property_type"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gint64"><span class="type">gint64</span></a></td>
+<td class="property_name"><a class="link" href="NMSettingIPConfig.html#NMSettingIPConfig--route-metric" title="The “route-metric” property">route-metric</a></td>
+<td class="property_flags">Read / Write / Construct</td>
+</tr>
+<tr>
+<td class="property_type"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a></td>
+<td class="property_name"><a class="link" href="NMSettingIPConfig.html#NMSettingIPConfig--route-table" title="The “route-table” property">route-table</a></td>
+<td class="property_flags">Read / Write</td>
+</tr>
+<tr>
+<td class="property_type">
+<a href="https://developer.gnome.org/glib/unstable/glib-Pointer-Arrays.html#GPtrArray"><span class="type">GPtrArray</span></a> *</td>
+<td class="property_name"><a class="link" href="NMSettingIPConfig.html#NMSettingIPConfig--routes" title="The “routes” property">routes</a></td>
+<td class="property_flags">Read / Write</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<a name="NMIPAddress"></a><a name="NMIPRoute"></a><a name="NMIPRoutingRule"></a><div class="refsect1">
+<a name="NMSettingIPConfig.other"></a><h2>Types and Values</h2>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="name">
+<col class="description">
+</colgroup>
+<tbody>
+<tr>
+<td class="define_keyword">#define</td>
+<td class="function_name"><a class="link" href="NMSettingIPConfig.html#NM-IP-ADDRESS-ATTRIBUTE-LABEL:CAPS" title="NM_IP_ADDRESS_ATTRIBUTE_LABEL">NM_IP_ADDRESS_ATTRIBUTE_LABEL</a></td>
+</tr>
+<tr>
+<td class="define_keyword">#define</td>
+<td class="function_name"><a class="link" href="NMSettingIPConfig.html#NM-IP-ROUTE-ATTRIBUTE-TABLE:CAPS" title="NM_IP_ROUTE_ATTRIBUTE_TABLE">NM_IP_ROUTE_ATTRIBUTE_TABLE</a></td>
+</tr>
+<tr>
+<td class="define_keyword">#define</td>
+<td class="function_name"><a class="link" href="NMSettingIPConfig.html#NM-IP-ROUTE-ATTRIBUTE-SRC:CAPS" title="NM_IP_ROUTE_ATTRIBUTE_SRC">NM_IP_ROUTE_ATTRIBUTE_SRC</a></td>
+</tr>
+<tr>
+<td class="define_keyword">#define</td>
+<td class="function_name"><a class="link" href="NMSettingIPConfig.html#NM-IP-ROUTE-ATTRIBUTE-FROM:CAPS" title="NM_IP_ROUTE_ATTRIBUTE_FROM">NM_IP_ROUTE_ATTRIBUTE_FROM</a></td>
+</tr>
+<tr>
+<td class="define_keyword">#define</td>
+<td class="function_name"><a class="link" href="NMSettingIPConfig.html#NM-IP-ROUTE-ATTRIBUTE-TOS:CAPS" title="NM_IP_ROUTE_ATTRIBUTE_TOS">NM_IP_ROUTE_ATTRIBUTE_TOS</a></td>
+</tr>
+<tr>
+<td class="define_keyword">#define</td>
+<td class="function_name"><a class="link" href="NMSettingIPConfig.html#NM-IP-ROUTE-ATTRIBUTE-ONLINK:CAPS" title="NM_IP_ROUTE_ATTRIBUTE_ONLINK">NM_IP_ROUTE_ATTRIBUTE_ONLINK</a></td>
+</tr>
+<tr>
+<td class="define_keyword">#define</td>
+<td class="function_name"><a class="link" href="NMSettingIPConfig.html#NM-IP-ROUTE-ATTRIBUTE-WINDOW:CAPS" title="NM_IP_ROUTE_ATTRIBUTE_WINDOW">NM_IP_ROUTE_ATTRIBUTE_WINDOW</a></td>
+</tr>
+<tr>
+<td class="define_keyword">#define</td>
+<td class="function_name"><a class="link" href="NMSettingIPConfig.html#NM-IP-ROUTE-ATTRIBUTE-CWND:CAPS" title="NM_IP_ROUTE_ATTRIBUTE_CWND">NM_IP_ROUTE_ATTRIBUTE_CWND</a></td>
+</tr>
+<tr>
+<td class="define_keyword">#define</td>
+<td class="function_name"><a class="link" href="NMSettingIPConfig.html#NM-IP-ROUTE-ATTRIBUTE-INITCWND:CAPS" title="NM_IP_ROUTE_ATTRIBUTE_INITCWND">NM_IP_ROUTE_ATTRIBUTE_INITCWND</a></td>
+</tr>
+<tr>
+<td class="define_keyword">#define</td>
+<td class="function_name"><a class="link" href="NMSettingIPConfig.html#NM-IP-ROUTE-ATTRIBUTE-INITRWND:CAPS" title="NM_IP_ROUTE_ATTRIBUTE_INITRWND">NM_IP_ROUTE_ATTRIBUTE_INITRWND</a></td>
+</tr>
+<tr>
+<td class="define_keyword">#define</td>
+<td class="function_name"><a class="link" href="NMSettingIPConfig.html#NM-IP-ROUTE-ATTRIBUTE-MTU:CAPS" title="NM_IP_ROUTE_ATTRIBUTE_MTU">NM_IP_ROUTE_ATTRIBUTE_MTU</a></td>
+</tr>
+<tr>
+<td class="define_keyword">#define</td>
+<td class="function_name"><a class="link" href="NMSettingIPConfig.html#NM-IP-ROUTE-ATTRIBUTE-LOCK-WINDOW:CAPS" title="NM_IP_ROUTE_ATTRIBUTE_LOCK_WINDOW">NM_IP_ROUTE_ATTRIBUTE_LOCK_WINDOW</a></td>
+</tr>
+<tr>
+<td class="define_keyword">#define</td>
+<td class="function_name"><a class="link" href="NMSettingIPConfig.html#NM-IP-ROUTE-ATTRIBUTE-LOCK-CWND:CAPS" title="NM_IP_ROUTE_ATTRIBUTE_LOCK_CWND">NM_IP_ROUTE_ATTRIBUTE_LOCK_CWND</a></td>
+</tr>
+<tr>
+<td class="define_keyword">#define</td>
+<td class="function_name"><a class="link" href="NMSettingIPConfig.html#NM-IP-ROUTE-ATTRIBUTE-LOCK-INITCWND:CAPS" title="NM_IP_ROUTE_ATTRIBUTE_LOCK_INITCWND">NM_IP_ROUTE_ATTRIBUTE_LOCK_INITCWND</a></td>
+</tr>
+<tr>
+<td class="define_keyword">#define</td>
+<td class="function_name"><a class="link" href="NMSettingIPConfig.html#NM-IP-ROUTE-ATTRIBUTE-LOCK-INITRWND:CAPS" title="NM_IP_ROUTE_ATTRIBUTE_LOCK_INITRWND">NM_IP_ROUTE_ATTRIBUTE_LOCK_INITRWND</a></td>
+</tr>
+<tr>
+<td class="define_keyword">#define</td>
+<td class="function_name"><a class="link" href="NMSettingIPConfig.html#NM-IP-ROUTE-ATTRIBUTE-LOCK-MTU:CAPS" title="NM_IP_ROUTE_ATTRIBUTE_LOCK_MTU">NM_IP_ROUTE_ATTRIBUTE_LOCK_MTU</a></td>
+</tr>
+<tr>
+<td class="datatype_keyword">enum</td>
+<td class="function_name"><a class="link" href="NMSettingIPConfig.html#NMIPRoutingRuleAsStringFlags" title="enum NMIPRoutingRuleAsStringFlags">NMIPRoutingRuleAsStringFlags</a></td>
+</tr>
+<tr>
+<td class="define_keyword">#define</td>
+<td class="function_name"><a class="link" href="NMSettingIPConfig.html#NM-SETTING-IP-CONFIG-DAD-TIMEOUT-MAX:CAPS" title="NM_SETTING_IP_CONFIG_DAD_TIMEOUT_MAX">NM_SETTING_IP_CONFIG_DAD_TIMEOUT_MAX</a></td>
+</tr>
+<tr>
+<td class="define_keyword">#define</td>
+<td class="function_name"><a class="link" href="NMSettingIPConfig.html#NM-SETTING-IP-CONFIG-METHOD:CAPS" title="NM_SETTING_IP_CONFIG_METHOD">NM_SETTING_IP_CONFIG_METHOD</a></td>
+</tr>
+<tr>
+<td class="define_keyword">#define</td>
+<td class="function_name"><a class="link" href="NMSettingIPConfig.html#NM-SETTING-IP-CONFIG-DNS:CAPS" title="NM_SETTING_IP_CONFIG_DNS">NM_SETTING_IP_CONFIG_DNS</a></td>
+</tr>
+<tr>
+<td class="define_keyword">#define</td>
+<td class="function_name"><a class="link" href="NMSettingIPConfig.html#NM-SETTING-IP-CONFIG-DNS-SEARCH:CAPS" title="NM_SETTING_IP_CONFIG_DNS_SEARCH">NM_SETTING_IP_CONFIG_DNS_SEARCH</a></td>
+</tr>
+<tr>
+<td class="define_keyword">#define</td>
+<td class="function_name"><a class="link" href="NMSettingIPConfig.html#NM-SETTING-IP-CONFIG-DNS-OPTIONS:CAPS" title="NM_SETTING_IP_CONFIG_DNS_OPTIONS">NM_SETTING_IP_CONFIG_DNS_OPTIONS</a></td>
+</tr>
+<tr>
+<td class="define_keyword">#define</td>
+<td class="function_name"><a class="link" href="NMSettingIPConfig.html#NM-SETTING-IP-CONFIG-DNS-PRIORITY:CAPS" title="NM_SETTING_IP_CONFIG_DNS_PRIORITY">NM_SETTING_IP_CONFIG_DNS_PRIORITY</a></td>
+</tr>
+<tr>
+<td class="define_keyword">#define</td>
+<td class="function_name"><a class="link" href="NMSettingIPConfig.html#NM-SETTING-IP-CONFIG-ADDRESSES:CAPS" title="NM_SETTING_IP_CONFIG_ADDRESSES">NM_SETTING_IP_CONFIG_ADDRESSES</a></td>
+</tr>
+<tr>
+<td class="define_keyword">#define</td>
+<td class="function_name"><a class="link" href="NMSettingIPConfig.html#NM-SETTING-IP-CONFIG-GATEWAY:CAPS" title="NM_SETTING_IP_CONFIG_GATEWAY">NM_SETTING_IP_CONFIG_GATEWAY</a></td>
+</tr>
+<tr>
+<td class="define_keyword">#define</td>
+<td class="function_name"><a class="link" href="NMSettingIPConfig.html#NM-SETTING-IP-CONFIG-ROUTES:CAPS" title="NM_SETTING_IP_CONFIG_ROUTES">NM_SETTING_IP_CONFIG_ROUTES</a></td>
+</tr>
+<tr>
+<td class="define_keyword">#define</td>
+<td class="function_name"><a class="link" href="NMSettingIPConfig.html#NM-SETTING-IP-CONFIG-ROUTE-METRIC:CAPS" title="NM_SETTING_IP_CONFIG_ROUTE_METRIC">NM_SETTING_IP_CONFIG_ROUTE_METRIC</a></td>
+</tr>
 <tr>
 <td class="define_keyword">#define</td>
 <td class="function_name"><a class="link" href="NMSettingIPConfig.html#NM-SETTING-IP-CONFIG-ROUTE-TABLE:CAPS" title="NM_SETTING_IP_CONFIG_ROUTE_TABLE">NM_SETTING_IP_CONFIG_ROUTE_TABLE</a></td>
@@ -980,6 +1356,10 @@
 </tr>
 <tr>
 <td class="define_keyword">#define</td>
+<td class="function_name"><a class="link" href="NMSettingIPConfig.html#NM-SETTING-IP-CONFIG-ROUTING-RULES:CAPS" title="NM_SETTING_IP_CONFIG_ROUTING_RULES">NM_SETTING_IP_CONFIG_ROUTING_RULES</a></td>
+</tr>
+<tr>
+<td class="define_keyword">#define</td>
 <td class="function_name"><a class="link" href="NMSettingIPConfig.html#NM-SETTING-DNS-OPTION-DEBUG:CAPS" title="NM_SETTING_DNS_OPTION_DEBUG">NM_SETTING_DNS_OPTION_DEBUG</a></td>
 </tr>
 <tr>
@@ -1049,7 +1429,10 @@
 <a name="NMSettingIPConfig.object-hierarchy"></a><h2>Object Hierarchy</h2>
 <pre class="screen">    <a href="/usr/share/gtk-doc/html/gobject/gobject-Boxed-Types.html">GBoxed</a>
     <span class="lineart">├──</span> NMIPAddress
-    <span class="lineart">╰──</span> NMIPRoute
+    <span class="lineart">├──</span> NMIPRoute
+    <span class="lineart">╰──</span> NMIPRoutingRule
+    <a href="/usr/share/gtk-doc/html/gobject/gobject-Enumeration-and-Flag-Types.html">GFlags</a>
+    <span class="lineart">╰──</span> NMIPRoutingRuleAsStringFlags
     <a href="https://developer.gnome.org/gobject/unstable/gobject-The-Base-Object-Type.html#GObject-struct">GObject</a>
     <span class="lineart">╰──</span> <a class="link" href="NMSetting.html" title="NMSetting">NMSetting</a>
         <span class="lineart">╰──</span> NMSettingIPConfig
@@ -1062,24 +1445,1306 @@
 <pre class="synopsis">#include <nm-setting-ip-config.h>
 </pre>
 </div>
-<div class="refsect1">
-<a name="NMSettingIPConfig.description"></a><h2>Description</h2>
-<p><a class="link" href="NMSettingIPConfig.html" title="NMSettingIPConfig"><span class="type">NMSettingIPConfig</span></a> is the abstract base class of
-<a class="link" href="NMSettingIP4Config.html" title="NMSettingIP4Config"><span class="type">NMSettingIP4Config</span></a> and <a class="link" href="NMSettingIP6Config.html" title="NMSettingIP6Config"><span class="type">NMSettingIP6Config</span></a>, providing properties
-related to IP addressing, routing, and Domain Name Service.</p>
+<div class="refsect1">
+<a name="NMSettingIPConfig.description"></a><h2>Description</h2>
+<p><a class="link" href="NMSettingIPConfig.html" title="NMSettingIPConfig"><span class="type">NMSettingIPConfig</span></a> is the abstract base class of
+<a class="link" href="NMSettingIP4Config.html" title="NMSettingIP4Config"><span class="type">NMSettingIP4Config</span></a> and <a class="link" href="NMSettingIP6Config.html" title="NMSettingIP6Config"><span class="type">NMSettingIP6Config</span></a>, providing properties
+related to IP addressing, routing, and Domain Name Service.</p>
+</div>
+<div class="refsect1">
+<a name="NMSettingIPConfig.functions_details"></a><h2>Functions</h2>
+<div class="refsect2">
+<a name="nm-ip-address-new"></a><h3>nm_ip_address_new ()</h3>
+<pre class="programlisting"><a class="link" href="NMSettingIPConfig.html#NMIPAddress"><span class="returnvalue">NMIPAddress</span></a> *
+nm_ip_address_new (<em class="parameter"><code><span class="type">int</span> family</code></em>,
+                   <em class="parameter"><code>const <span class="type">char</span> *addr</code></em>,
+                   <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> prefix</code></em>,
+                   <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> **error</code></em>);</pre>
+<p>Creates a new <a class="link" href="NMSettingIPConfig.html#NMIPAddress"><span class="type">NMIPAddress</span></a> object.</p>
+<div class="refsect3">
+<a name="nm-ip-address-new.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody>
+<tr>
+<td class="parameter_name"><p>family</p></td>
+<td class="parameter_description"><p>the IP address family (<code class="literal">AF_INET</code> or
+<code class="literal">AF_INET6</code>)</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>addr</p></td>
+<td class="parameter_description"><p>the IP address</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>prefix</p></td>
+<td class="parameter_description"><p>the address prefix length</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>error</p></td>
+<td class="parameter_description"><p>location to store error, or <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a></p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<div class="refsect3">
+<a name="nm-ip-address-new.returns"></a><h4>Returns</h4>
+<p>the new <a class="link" href="NMSettingIPConfig.html#NMIPAddress"><span class="type">NMIPAddress</span></a> object, or <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> on error. </p>
+<p><span class="annotation">[<acronym title="Free data after the code is done."><span class="acronym">transfer full</span></acronym>]</span></p>
+</div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="nm-ip-address-new-binary"></a><h3>nm_ip_address_new_binary ()</h3>
+<pre class="programlisting"><a class="link" href="NMSettingIPConfig.html#NMIPAddress"><span class="returnvalue">NMIPAddress</span></a> *
+nm_ip_address_new_binary (<em class="parameter"><code><span class="type">int</span> family</code></em>,
+                          <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gconstpointer"><span class="type">gconstpointer</span></a> addr</code></em>,
+                          <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> prefix</code></em>,
+                          <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> **error</code></em>);</pre>
+<p>Creates a new <a class="link" href="NMSettingIPConfig.html#NMIPAddress"><span class="type">NMIPAddress</span></a> object. <em class="parameter"><code>addr</code></em>
+ must point to a buffer of the
+correct size for <em class="parameter"><code>family</code></em>
+.</p>
+<div class="refsect3">
+<a name="nm-ip-address-new-binary.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody>
+<tr>
+<td class="parameter_name"><p>family</p></td>
+<td class="parameter_description"><p>the IP address family (<code class="literal">AF_INET</code> or
+<code class="literal">AF_INET6</code>)</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>addr</p></td>
+<td class="parameter_description"><p>the IP address</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>prefix</p></td>
+<td class="parameter_description"><p>the address prefix length</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>error</p></td>
+<td class="parameter_description"><p>location to store error, or <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a></p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<div class="refsect3">
+<a name="nm-ip-address-new-binary.returns"></a><h4>Returns</h4>
+<p>the new <a class="link" href="NMSettingIPConfig.html#NMIPAddress"><span class="type">NMIPAddress</span></a> object, or <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> on error. </p>
+<p><span class="annotation">[<acronym title="Free data after the code is done."><span class="acronym">transfer full</span></acronym>]</span></p>
+</div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="nm-ip-address-ref"></a><h3>nm_ip_address_ref ()</h3>
+<pre class="programlisting"><span class="returnvalue">void</span>
+nm_ip_address_ref (<em class="parameter"><code><a class="link" href="NMSettingIPConfig.html#NMIPAddress"><span class="type">NMIPAddress</span></a> *address</code></em>);</pre>
+<p>Increases the reference count of the object.</p>
+<div class="refsect3">
+<a name="nm-ip-address-ref.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody><tr>
+<td class="parameter_name"><p>address</p></td>
+<td class="parameter_description"><p>the <a class="link" href="NMSettingIPConfig.html#NMIPAddress"><span class="type">NMIPAddress</span></a></p></td>
+<td class="parameter_annotations"> </td>
+</tr></tbody>
+</table></div>
+</div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="nm-ip-address-unref"></a><h3>nm_ip_address_unref ()</h3>
+<pre class="programlisting"><span class="returnvalue">void</span>
+nm_ip_address_unref (<em class="parameter"><code><a class="link" href="NMSettingIPConfig.html#NMIPAddress"><span class="type">NMIPAddress</span></a> *address</code></em>);</pre>
+<p>Decreases the reference count of the object.  If the reference count
+reaches zero, the object will be destroyed.</p>
+<div class="refsect3">
+<a name="nm-ip-address-unref.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody><tr>
+<td class="parameter_name"><p>address</p></td>
+<td class="parameter_description"><p>the <a class="link" href="NMSettingIPConfig.html#NMIPAddress"><span class="type">NMIPAddress</span></a></p></td>
+<td class="parameter_annotations"> </td>
+</tr></tbody>
+</table></div>
+</div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="nm-ip-address-equal"></a><h3>nm_ip_address_equal ()</h3>
+<pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
+nm_ip_address_equal (<em class="parameter"><code><a class="link" href="NMSettingIPConfig.html#NMIPAddress"><span class="type">NMIPAddress</span></a> *address</code></em>,
+                     <em class="parameter"><code><a class="link" href="NMSettingIPConfig.html#NMIPAddress"><span class="type">NMIPAddress</span></a> *other</code></em>);</pre>
+<p>Determines if two <a class="link" href="NMSettingIPConfig.html#NMIPAddress"><span class="type">NMIPAddress</span></a> objects contain the same address and prefix
+(attributes are not compared).</p>
+<div class="refsect3">
+<a name="nm-ip-address-equal.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody>
+<tr>
+<td class="parameter_name"><p>address</p></td>
+<td class="parameter_description"><p>the <a class="link" href="NMSettingIPConfig.html#NMIPAddress"><span class="type">NMIPAddress</span></a></p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>other</p></td>
+<td class="parameter_description"><p>the <a class="link" href="NMSettingIPConfig.html#NMIPAddress"><span class="type">NMIPAddress</span></a> to compare <em class="parameter"><code>address</code></em>
+to.</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<div class="refsect3">
+<a name="nm-ip-address-equal.returns"></a><h4>Returns</h4>
+<p> <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> if the objects contain the same values, <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#FALSE:CAPS"><code class="literal">FALSE</code></a> if they do not.</p>
+</div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="nm-ip-address-dup"></a><h3>nm_ip_address_dup ()</h3>
+<pre class="programlisting"><a class="link" href="NMSettingIPConfig.html#NMIPAddress"><span class="returnvalue">NMIPAddress</span></a> *
+nm_ip_address_dup (<em class="parameter"><code><a class="link" href="NMSettingIPConfig.html#NMIPAddress"><span class="type">NMIPAddress</span></a> *address</code></em>);</pre>
+<p>Creates a copy of <em class="parameter"><code>address</code></em>
+</p>
+<div class="refsect3">
+<a name="nm-ip-address-dup.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody><tr>
+<td class="parameter_name"><p>address</p></td>
+<td class="parameter_description"><p>the <a class="link" href="NMSettingIPConfig.html#NMIPAddress"><span class="type">NMIPAddress</span></a></p></td>
+<td class="parameter_annotations"> </td>
+</tr></tbody>
+</table></div>
+</div>
+<div class="refsect3">
+<a name="nm-ip-address-dup.returns"></a><h4>Returns</h4>
+<p>a copy of <em class="parameter"><code>address</code></em>
+. </p>
+<p><span class="annotation">[<acronym title="Free data after the code is done."><span class="acronym">transfer full</span></acronym>]</span></p>
+</div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="nm-ip-address-get-family"></a><h3>nm_ip_address_get_family ()</h3>
+<pre class="programlisting"><span class="returnvalue">int</span>
+nm_ip_address_get_family (<em class="parameter"><code><a class="link" href="NMSettingIPConfig.html#NMIPAddress"><span class="type">NMIPAddress</span></a> *address</code></em>);</pre>
+<p>Gets the IP address family (eg, AF_INET) property of this address
+object.</p>
+<div class="refsect3">
+<a name="nm-ip-address-get-family.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody><tr>
+<td class="parameter_name"><p>address</p></td>
+<td class="parameter_description"><p>the <a class="link" href="NMSettingIPConfig.html#NMIPAddress"><span class="type">NMIPAddress</span></a></p></td>
+<td class="parameter_annotations"> </td>
+</tr></tbody>
+</table></div>
+</div>
+<div class="refsect3">
+<a name="nm-ip-address-get-family.returns"></a><h4>Returns</h4>
+<p> the IP address family</p>
+</div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="nm-ip-address-get-address"></a><h3>nm_ip_address_get_address ()</h3>
+<pre class="programlisting">const <span class="returnvalue">char</span> *
+nm_ip_address_get_address (<em class="parameter"><code><a class="link" href="NMSettingIPConfig.html#NMIPAddress"><span class="type">NMIPAddress</span></a> *address</code></em>);</pre>
+<p>Gets the IP address property of this address object.</p>
+<div class="refsect3">
+<a name="nm-ip-address-get-address.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody><tr>
+<td class="parameter_name"><p>address</p></td>
+<td class="parameter_description"><p>the <a class="link" href="NMSettingIPConfig.html#NMIPAddress"><span class="type">NMIPAddress</span></a></p></td>
+<td class="parameter_annotations"> </td>
+</tr></tbody>
+</table></div>
+</div>
+<div class="refsect3">
+<a name="nm-ip-address-get-address.returns"></a><h4>Returns</h4>
+<p> the IP address</p>
+</div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="nm-ip-address-set-address"></a><h3>nm_ip_address_set_address ()</h3>
+<pre class="programlisting"><span class="returnvalue">void</span>
+nm_ip_address_set_address (<em class="parameter"><code><a class="link" href="NMSettingIPConfig.html#NMIPAddress"><span class="type">NMIPAddress</span></a> *address</code></em>,
+                           <em class="parameter"><code>const <span class="type">char</span> *addr</code></em>);</pre>
+<p>Sets the IP address property of this address object.</p>
+<p><em class="parameter"><code>addr</code></em>
+ must be a valid address of <em class="parameter"><code>address</code></em>
+'s family. If you aren't sure you
+have a valid address, use <a class="link" href="libnm-nm-utils.html#nm-utils-ipaddr-valid" title="nm_utils_ipaddr_valid ()"><code class="function">nm_utils_ipaddr_valid()</code></a> to check it.</p>
+<div class="refsect3">
+<a name="nm-ip-address-set-address.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody>
+<tr>
+<td class="parameter_name"><p>address</p></td>
+<td class="parameter_description"><p>the <a class="link" href="NMSettingIPConfig.html#NMIPAddress"><span class="type">NMIPAddress</span></a></p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>addr</p></td>
+<td class="parameter_description"><p>the IP address, as a string</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+</tbody>
+</table></div>
+</div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="nm-ip-address-get-address-binary"></a><h3>nm_ip_address_get_address_binary ()</h3>
+<pre class="programlisting"><span class="returnvalue">void</span>
+nm_ip_address_get_address_binary (<em class="parameter"><code><a class="link" href="NMSettingIPConfig.html#NMIPAddress"><span class="type">NMIPAddress</span></a> *address</code></em>,
+                                  <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> addr</code></em>);</pre>
+<p>Gets the IP address property of this address object.</p>
+<p><em class="parameter"><code>addr</code></em>
+ must point to a buffer that is the correct size for <em class="parameter"><code>address</code></em>
+'s family.</p>
+<p><span class="annotation">[<acronym title="Exposed in C code, not necessarily available in other languages."><span class="acronym">skip</span></acronym>]</span></p>
+<div class="refsect3">
+<a name="nm-ip-address-get-address-binary.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody>
+<tr>
+<td class="parameter_name"><p>address</p></td>
+<td class="parameter_description"><p>the <a class="link" href="NMSettingIPConfig.html#NMIPAddress"><span class="type">NMIPAddress</span></a></p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>addr</p></td>
+<td class="parameter_description"><p>a buffer in which to store the address in binary format.</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+</tbody>
+</table></div>
+</div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="nm-ip-address-set-address-binary"></a><h3>nm_ip_address_set_address_binary ()</h3>
+<pre class="programlisting"><span class="returnvalue">void</span>
+nm_ip_address_set_address_binary (<em class="parameter"><code><a class="link" href="NMSettingIPConfig.html#NMIPAddress"><span class="type">NMIPAddress</span></a> *address</code></em>,
+                                  <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gconstpointer"><span class="type">gconstpointer</span></a> addr</code></em>);</pre>
+<p>Sets the IP address property of this address object.</p>
+<p><em class="parameter"><code>addr</code></em>
+ must point to a buffer that is the correct size for <em class="parameter"><code>address</code></em>
+'s family.</p>
+<p><span class="annotation">[<acronym title="Exposed in C code, not necessarily available in other languages."><span class="acronym">skip</span></acronym>]</span></p>
+<div class="refsect3">
+<a name="nm-ip-address-set-address-binary.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody>
+<tr>
+<td class="parameter_name"><p>address</p></td>
+<td class="parameter_description"><p>the <a class="link" href="NMSettingIPConfig.html#NMIPAddress"><span class="type">NMIPAddress</span></a></p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>addr</p></td>
+<td class="parameter_description"><p>the address, in binary format</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+</tbody>
+</table></div>
+</div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="nm-ip-address-get-prefix"></a><h3>nm_ip_address_get_prefix ()</h3>
+<pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint"><span class="returnvalue">guint</span></a>
+nm_ip_address_get_prefix (<em class="parameter"><code><a class="link" href="NMSettingIPConfig.html#NMIPAddress"><span class="type">NMIPAddress</span></a> *address</code></em>);</pre>
+<p>Gets the IP address prefix (ie "24" or "30" etc) property of this address
+object.</p>
+<div class="refsect3">
+<a name="nm-ip-address-get-prefix.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody><tr>
+<td class="parameter_name"><p>address</p></td>
+<td class="parameter_description"><p>the <a class="link" href="NMSettingIPConfig.html#NMIPAddress"><span class="type">NMIPAddress</span></a></p></td>
+<td class="parameter_annotations"> </td>
+</tr></tbody>
+</table></div>
+</div>
+<div class="refsect3">
+<a name="nm-ip-address-get-prefix.returns"></a><h4>Returns</h4>
+<p> the IP address prefix</p>
+</div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="nm-ip-address-set-prefix"></a><h3>nm_ip_address_set_prefix ()</h3>
+<pre class="programlisting"><span class="returnvalue">void</span>
+nm_ip_address_set_prefix (<em class="parameter"><code><a class="link" href="NMSettingIPConfig.html#NMIPAddress"><span class="type">NMIPAddress</span></a> *address</code></em>,
+                          <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> prefix</code></em>);</pre>
+<p>Sets the IP address prefix property of this address object.</p>
+<div class="refsect3">
+<a name="nm-ip-address-set-prefix.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody>
+<tr>
+<td class="parameter_name"><p>address</p></td>
+<td class="parameter_description"><p>the <a class="link" href="NMSettingIPConfig.html#NMIPAddress"><span class="type">NMIPAddress</span></a></p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>prefix</p></td>
+<td class="parameter_description"><p>the IP address prefix</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+</tbody>
+</table></div>
+</div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="nm-ip-address-get-attribute-names"></a><h3>nm_ip_address_get_attribute_names ()</h3>
+<pre class="programlisting"><span class="returnvalue">char</span> **
+nm_ip_address_get_attribute_names (<em class="parameter"><code><a class="link" href="NMSettingIPConfig.html#NMIPAddress"><span class="type">NMIPAddress</span></a> *address</code></em>);</pre>
+<p>Gets an array of attribute names defined on <em class="parameter"><code>address</code></em>
+.</p>
+<div class="refsect3">
+<a name="nm-ip-address-get-attribute-names.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody><tr>
+<td class="parameter_name"><p>address</p></td>
+<td class="parameter_description"><p>the <a class="link" href="NMSettingIPConfig.html#NMIPAddress"><span class="type">NMIPAddress</span></a></p></td>
+<td class="parameter_annotations"> </td>
+</tr></tbody>
+</table></div>
+</div>
+<div class="refsect3">
+<a name="nm-ip-address-get-attribute-names.returns"></a><h4>Returns</h4>
+<p>a <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>-terminated array of attribute names,. </p>
+<p><span class="annotation">[<acronym title="Free data after the code is done."><span class="acronym">transfer full</span></acronym>]</span></p>
+</div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="nm-ip-address-get-attribute"></a><h3>nm_ip_address_get_attribute ()</h3>
+<pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-GVariant.html#GVariant"><span class="returnvalue">GVariant</span></a> *
+nm_ip_address_get_attribute (<em class="parameter"><code><a class="link" href="NMSettingIPConfig.html#NMIPAddress"><span class="type">NMIPAddress</span></a> *address</code></em>,
+                             <em class="parameter"><code>const <span class="type">char</span> *name</code></em>);</pre>
+<p>Gets the value of the attribute with name <em class="parameter"><code>name</code></em>
+ on <em class="parameter"><code>address</code></em>
+</p>
+<div class="refsect3">
+<a name="nm-ip-address-get-attribute.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody>
+<tr>
+<td class="parameter_name"><p>address</p></td>
+<td class="parameter_description"><p>the <a class="link" href="NMSettingIPConfig.html#NMIPAddress"><span class="type">NMIPAddress</span></a></p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>name</p></td>
+<td class="parameter_description"><p>the name of an address attribute</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<div class="refsect3">
+<a name="nm-ip-address-get-attribute.returns"></a><h4>Returns</h4>
+<p>the value of the attribute with name <em class="parameter"><code>name</code></em>
+on
+<em class="parameter"><code>address</code></em>
+, or <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> if <em class="parameter"><code>address</code></em>
+has no such attribute. </p>
+<p><span class="annotation">[<acronym title="Don't free data after the code is done."><span class="acronym">transfer none</span></acronym>]</span></p>
+</div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="nm-ip-address-set-attribute"></a><h3>nm_ip_address_set_attribute ()</h3>
+<pre class="programlisting"><span class="returnvalue">void</span>
+nm_ip_address_set_attribute (<em class="parameter"><code><a class="link" href="NMSettingIPConfig.html#NMIPAddress"><span class="type">NMIPAddress</span></a> *address</code></em>,
+                             <em class="parameter"><code>const <span class="type">char</span> *name</code></em>,
+                             <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-GVariant.html#GVariant"><span class="type">GVariant</span></a> *value</code></em>);</pre>
+<p>Sets or clears the named attribute on <em class="parameter"><code>address</code></em>
+ to the given value.</p>
+<div class="refsect3">
+<a name="nm-ip-address-set-attribute.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody>
+<tr>
+<td class="parameter_name"><p>address</p></td>
+<td class="parameter_description"><p>the <a class="link" href="NMSettingIPConfig.html#NMIPAddress"><span class="type">NMIPAddress</span></a></p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>name</p></td>
+<td class="parameter_description"><p>the name of an address attribute</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>value</p></td>
+<td class="parameter_description"><p>the value. </p></td>
+<td class="parameter_annotations"><span class="annotation">[<acronym title="Don't free data after the code is done."><span class="acronym">transfer none</span></acronym>][<acronym title="NULL is OK, both for passing and for returning."><span class="acronym">allow-none</span></acronym>]</span></td>
+</tr>
+</tbody>
+</table></div>
+</div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="nm-ip-route-new"></a><h3>nm_ip_route_new ()</h3>
+<pre class="programlisting"><a class="link" href="NMSettingIPConfig.html#NMIPRoute"><span class="returnvalue">NMIPRoute</span></a> *
+nm_ip_route_new (<em class="parameter"><code><span class="type">int</span> family</code></em>,
+                 <em class="parameter"><code>const <span class="type">char</span> *dest</code></em>,
+                 <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> prefix</code></em>,
+                 <em class="parameter"><code>const <span class="type">char</span> *next_hop</code></em>,
+                 <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gint64"><span class="type">gint64</span></a> metric</code></em>,
+                 <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> **error</code></em>);</pre>
+<p>Creates a new <a class="link" href="NMSettingIPConfig.html#NMIPRoute"><span class="type">NMIPRoute</span></a> object.</p>
+<div class="refsect3">
+<a name="nm-ip-route-new.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody>
+<tr>
+<td class="parameter_name"><p>family</p></td>
+<td class="parameter_description"><p>the IP address family (<code class="literal">AF_INET</code> or
+<code class="literal">AF_INET6</code>)</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>dest</p></td>
+<td class="parameter_description"><p>the IP address of the route's destination</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>prefix</p></td>
+<td class="parameter_description"><p>the address prefix length</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>next_hop</p></td>
+<td class="parameter_description"><p>the IP address of the next hop (or <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>). </p></td>
+<td class="parameter_annotations"><span class="annotation">[<acronym title="NULL is OK, both for passing and for returning."><span class="acronym">allow-none</span></acronym>]</span></td>
+</tr>
+<tr>
+<td class="parameter_name"><p>metric</p></td>
+<td class="parameter_description"><p>the route metric (or -1 for "default")</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>error</p></td>
+<td class="parameter_description"><p>location to store error, or <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a></p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<div class="refsect3">
+<a name="nm-ip-route-new.returns"></a><h4>Returns</h4>
+<p>the new <a class="link" href="NMSettingIPConfig.html#NMIPRoute"><span class="type">NMIPRoute</span></a> object, or <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> on error. </p>
+<p><span class="annotation">[<acronym title="Free data after the code is done."><span class="acronym">transfer full</span></acronym>]</span></p>
+</div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="nm-ip-route-new-binary"></a><h3>nm_ip_route_new_binary ()</h3>
+<pre class="programlisting"><a class="link" href="NMSettingIPConfig.html#NMIPRoute"><span class="returnvalue">NMIPRoute</span></a> *
+nm_ip_route_new_binary (<em class="parameter"><code><span class="type">int</span> family</code></em>,
+                        <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gconstpointer"><span class="type">gconstpointer</span></a> dest</code></em>,
+                        <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> prefix</code></em>,
+                        <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gconstpointer"><span class="type">gconstpointer</span></a> next_hop</code></em>,
+                        <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gint64"><span class="type">gint64</span></a> metric</code></em>,
+                        <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> **error</code></em>);</pre>
+<p>Creates a new <a class="link" href="NMSettingIPConfig.html#NMIPRoute"><span class="type">NMIPRoute</span></a> object. <em class="parameter"><code>dest</code></em>
+ and <em class="parameter"><code>next_hop</code></em>
+ (if non-<a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>) must
+point to buffers of the correct size for <em class="parameter"><code>family</code></em>
+.</p>
+<div class="refsect3">
+<a name="nm-ip-route-new-binary.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody>
+<tr>
+<td class="parameter_name"><p>family</p></td>
+<td class="parameter_description"><p>the IP address family (<code class="literal">AF_INET</code> or
+<code class="literal">AF_INET6</code>)</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>dest</p></td>
+<td class="parameter_description"><p>the IP address of the route's destination</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>prefix</p></td>
+<td class="parameter_description"><p>the address prefix length</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>next_hop</p></td>
+<td class="parameter_description"><p>the IP address of the next hop (or <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>). </p></td>
+<td class="parameter_annotations"><span class="annotation">[<acronym title="NULL is OK, both for passing and for returning."><span class="acronym">allow-none</span></acronym>]</span></td>
+</tr>
+<tr>
+<td class="parameter_name"><p>metric</p></td>
+<td class="parameter_description"><p>the route metric (or -1 for "default")</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>error</p></td>
+<td class="parameter_description"><p>location to store error, or <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a></p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<div class="refsect3">
+<a name="nm-ip-route-new-binary.returns"></a><h4>Returns</h4>
+<p>the new <a class="link" href="NMSettingIPConfig.html#NMIPRoute"><span class="type">NMIPRoute</span></a> object, or <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> on error. </p>
+<p><span class="annotation">[<acronym title="Free data after the code is done."><span class="acronym">transfer full</span></acronym>]</span></p>
+</div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="nm-ip-route-ref"></a><h3>nm_ip_route_ref ()</h3>
+<pre class="programlisting"><span class="returnvalue">void</span>
+nm_ip_route_ref (<em class="parameter"><code><a class="link" href="NMSettingIPConfig.html#NMIPRoute"><span class="type">NMIPRoute</span></a> *route</code></em>);</pre>
+<p>Increases the reference count of the object.</p>
+<div class="refsect3">
+<a name="nm-ip-route-ref.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody><tr>
+<td class="parameter_name"><p>route</p></td>
+<td class="parameter_description"><p>the <a class="link" href="NMSettingIPConfig.html#NMIPRoute"><span class="type">NMIPRoute</span></a></p></td>
+<td class="parameter_annotations"> </td>
+</tr></tbody>
+</table></div>
+</div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="nm-ip-route-unref"></a><h3>nm_ip_route_unref ()</h3>
+<pre class="programlisting"><span class="returnvalue">void</span>
+nm_ip_route_unref (<em class="parameter"><code><a class="link" href="NMSettingIPConfig.html#NMIPRoute"><span class="type">NMIPRoute</span></a> *route</code></em>);</pre>
+<p>Decreases the reference count of the object.  If the reference count
+reaches zero, the object will be destroyed.</p>
+<div class="refsect3">
+<a name="nm-ip-route-unref.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody><tr>
+<td class="parameter_name"><p>route</p></td>
+<td class="parameter_description"><p>the <a class="link" href="NMSettingIPConfig.html#NMIPRoute"><span class="type">NMIPRoute</span></a></p></td>
+<td class="parameter_annotations"> </td>
+</tr></tbody>
+</table></div>
+</div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="nm-ip-route-equal"></a><h3>nm_ip_route_equal ()</h3>
+<pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
+nm_ip_route_equal (<em class="parameter"><code><a class="link" href="NMSettingIPConfig.html#NMIPRoute"><span class="type">NMIPRoute</span></a> *route</code></em>,
+                   <em class="parameter"><code><a class="link" href="NMSettingIPConfig.html#NMIPRoute"><span class="type">NMIPRoute</span></a> *other</code></em>);</pre>
+<p>Determines if two <a class="link" href="NMSettingIPConfig.html#NMIPRoute"><span class="type">NMIPRoute</span></a> objects contain the same destination, prefix,
+next hop, and metric. (Attributes are not compared.)</p>
+<div class="refsect3">
+<a name="nm-ip-route-equal.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody>
+<tr>
+<td class="parameter_name"><p>route</p></td>
+<td class="parameter_description"><p>the <a class="link" href="NMSettingIPConfig.html#NMIPRoute"><span class="type">NMIPRoute</span></a></p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>other</p></td>
+<td class="parameter_description"><p>the <a class="link" href="NMSettingIPConfig.html#NMIPRoute"><span class="type">NMIPRoute</span></a> to compare <em class="parameter"><code>route</code></em>
+to.</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<div class="refsect3">
+<a name="nm-ip-route-equal.returns"></a><h4>Returns</h4>
+<p> <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> if the objects contain the same values, <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#FALSE:CAPS"><code class="literal">FALSE</code></a> if they do not.</p>
+</div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="nm-ip-route-equal-full"></a><h3>nm_ip_route_equal_full ()</h3>
+<pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
+nm_ip_route_equal_full (<em class="parameter"><code><a class="link" href="NMSettingIPConfig.html#NMIPRoute"><span class="type">NMIPRoute</span></a> *route</code></em>,
+                        <em class="parameter"><code><a class="link" href="NMSettingIPConfig.html#NMIPRoute"><span class="type">NMIPRoute</span></a> *other</code></em>,
+                        <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> cmp_flags</code></em>);</pre>
+<p>Determines if two <a class="link" href="NMSettingIPConfig.html#NMIPRoute"><span class="type">NMIPRoute</span></a> objects contain the same destination, prefix,
+next hop, and metric.</p>
+<div class="refsect3">
+<a name="nm-ip-route-equal-full.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody>
+<tr>
+<td class="parameter_name"><p>route</p></td>
+<td class="parameter_description"><p>the <a class="link" href="NMSettingIPConfig.html#NMIPRoute"><span class="type">NMIPRoute</span></a></p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>other</p></td>
+<td class="parameter_description"><p>the <a class="link" href="NMSettingIPConfig.html#NMIPRoute"><span class="type">NMIPRoute</span></a> to compare <em class="parameter"><code>route</code></em>
+to.</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>cmp_flags</p></td>
+<td class="parameter_description"><p>tune how to compare attributes. Currently only
+NM_IP_ROUTE_EQUAL_CMP_FLAGS_NONE (0) and NM_IP_ROUTE_EQUAL_CMP_FLAGS_WITH_ATTRS (1)
+is supported.</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<div class="refsect3">
+<a name="nm-ip-route-equal-full.returns"></a><h4>Returns</h4>
+<p> <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> if the objects contain the same values, <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#FALSE:CAPS"><code class="literal">FALSE</code></a> if they do not.</p>
+</div>
+<p class="since">Since: 1.10</p>
+</div>
+<hr>
+<div class="refsect2">
+<a name="nm-ip-route-dup"></a><h3>nm_ip_route_dup ()</h3>
+<pre class="programlisting"><a class="link" href="NMSettingIPConfig.html#NMIPRoute"><span class="returnvalue">NMIPRoute</span></a> *
+nm_ip_route_dup (<em class="parameter"><code><a class="link" href="NMSettingIPConfig.html#NMIPRoute"><span class="type">NMIPRoute</span></a> *route</code></em>);</pre>
+<p>Creates a copy of <em class="parameter"><code>route</code></em>
+</p>
+<div class="refsect3">
+<a name="nm-ip-route-dup.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody><tr>
+<td class="parameter_name"><p>route</p></td>
+<td class="parameter_description"><p>the <a class="link" href="NMSettingIPConfig.html#NMIPRoute"><span class="type">NMIPRoute</span></a></p></td>
+<td class="parameter_annotations"> </td>
+</tr></tbody>
+</table></div>
+</div>
+<div class="refsect3">
+<a name="nm-ip-route-dup.returns"></a><h4>Returns</h4>
+<p>a copy of <em class="parameter"><code>route</code></em>
+. </p>
+<p><span class="annotation">[<acronym title="Free data after the code is done."><span class="acronym">transfer full</span></acronym>]</span></p>
+</div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="nm-ip-route-get-family"></a><h3>nm_ip_route_get_family ()</h3>
+<pre class="programlisting"><span class="returnvalue">int</span>
+nm_ip_route_get_family (<em class="parameter"><code><a class="link" href="NMSettingIPConfig.html#NMIPRoute"><span class="type">NMIPRoute</span></a> *route</code></em>);</pre>
+<p>Gets the IP address family (eg, AF_INET) property of this route
+object.</p>
+<div class="refsect3">
+<a name="nm-ip-route-get-family.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody><tr>
+<td class="parameter_name"><p>route</p></td>
+<td class="parameter_description"><p>the <a class="link" href="NMSettingIPConfig.html#NMIPRoute"><span class="type">NMIPRoute</span></a></p></td>
+<td class="parameter_annotations"> </td>
+</tr></tbody>
+</table></div>
+</div>
+<div class="refsect3">
+<a name="nm-ip-route-get-family.returns"></a><h4>Returns</h4>
+<p> the IP address family</p>
+</div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="nm-ip-route-get-dest"></a><h3>nm_ip_route_get_dest ()</h3>
+<pre class="programlisting">const <span class="returnvalue">char</span> *
+nm_ip_route_get_dest (<em class="parameter"><code><a class="link" href="NMSettingIPConfig.html#NMIPRoute"><span class="type">NMIPRoute</span></a> *route</code></em>);</pre>
+<p>Gets the IP destination address property of this route object.</p>
+<div class="refsect3">
+<a name="nm-ip-route-get-dest.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody><tr>
+<td class="parameter_name"><p>route</p></td>
+<td class="parameter_description"><p>the <a class="link" href="NMSettingIPConfig.html#NMIPRoute"><span class="type">NMIPRoute</span></a></p></td>
+<td class="parameter_annotations"> </td>
+</tr></tbody>
+</table></div>
+</div>
+<div class="refsect3">
+<a name="nm-ip-route-get-dest.returns"></a><h4>Returns</h4>
+<p> the IP address of the route's destination</p>
+</div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="nm-ip-route-set-dest"></a><h3>nm_ip_route_set_dest ()</h3>
+<pre class="programlisting"><span class="returnvalue">void</span>
+nm_ip_route_set_dest (<em class="parameter"><code><a class="link" href="NMSettingIPConfig.html#NMIPRoute"><span class="type">NMIPRoute</span></a> *route</code></em>,
+                      <em class="parameter"><code>const <span class="type">char</span> *dest</code></em>);</pre>
+<p>Sets the destination property of this route object.</p>
+<p><em class="parameter"><code>dest</code></em>
+ must be a valid address of <em class="parameter"><code>route</code></em>
+'s family. If you aren't sure you
+have a valid address, use <a class="link" href="libnm-nm-utils.html#nm-utils-ipaddr-valid" title="nm_utils_ipaddr_valid ()"><code class="function">nm_utils_ipaddr_valid()</code></a> to check it.</p>
+<div class="refsect3">
+<a name="nm-ip-route-set-dest.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody>
+<tr>
+<td class="parameter_name"><p>route</p></td>
+<td class="parameter_description"><p>the <a class="link" href="NMSettingIPConfig.html#NMIPRoute"><span class="type">NMIPRoute</span></a></p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>dest</p></td>
+<td class="parameter_description"><p>the route's destination, as a string</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+</tbody>
+</table></div>
+</div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="nm-ip-route-get-dest-binary"></a><h3>nm_ip_route_get_dest_binary ()</h3>
+<pre class="programlisting"><span class="returnvalue">void</span>
+nm_ip_route_get_dest_binary (<em class="parameter"><code><a class="link" href="NMSettingIPConfig.html#NMIPRoute"><span class="type">NMIPRoute</span></a> *route</code></em>,
+                             <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> dest</code></em>);</pre>
+<p>Gets the destination property of this route object.</p>
+<p><em class="parameter"><code>dest</code></em>
+ must point to a buffer that is the correct size for <em class="parameter"><code>route</code></em>
+'s family.</p>
+<p><span class="annotation">[<acronym title="Exposed in C code, not necessarily available in other languages."><span class="acronym">skip</span></acronym>]</span></p>
+<div class="refsect3">
+<a name="nm-ip-route-get-dest-binary.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody>
+<tr>
+<td class="parameter_name"><p>route</p></td>
+<td class="parameter_description"><p>the <a class="link" href="NMSettingIPConfig.html#NMIPRoute"><span class="type">NMIPRoute</span></a></p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>dest</p></td>
+<td class="parameter_description"><p>a buffer in which to store the destination in binary format.</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+</tbody>
+</table></div>
+</div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="nm-ip-route-set-dest-binary"></a><h3>nm_ip_route_set_dest_binary ()</h3>
+<pre class="programlisting"><span class="returnvalue">void</span>
+nm_ip_route_set_dest_binary (<em class="parameter"><code><a class="link" href="NMSettingIPConfig.html#NMIPRoute"><span class="type">NMIPRoute</span></a> *route</code></em>,
+                             <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gconstpointer"><span class="type">gconstpointer</span></a> dest</code></em>);</pre>
+<p>Sets the destination property of this route object.</p>
+<p><em class="parameter"><code>dest</code></em>
+ must point to a buffer that is the correct size for <em class="parameter"><code>route</code></em>
+'s family.</p>
+<p><span class="annotation">[<acronym title="Exposed in C code, not necessarily available in other languages."><span class="acronym">skip</span></acronym>]</span></p>
+<div class="refsect3">
+<a name="nm-ip-route-set-dest-binary.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody>
+<tr>
+<td class="parameter_name"><p>route</p></td>
+<td class="parameter_description"><p>the <a class="link" href="NMSettingIPConfig.html#NMIPRoute"><span class="type">NMIPRoute</span></a></p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>dest</p></td>
+<td class="parameter_description"><p>the route's destination, in binary format</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+</tbody>
+</table></div>
+</div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="nm-ip-route-get-prefix"></a><h3>nm_ip_route_get_prefix ()</h3>
+<pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint"><span class="returnvalue">guint</span></a>
+nm_ip_route_get_prefix (<em class="parameter"><code><a class="link" href="NMSettingIPConfig.html#NMIPRoute"><span class="type">NMIPRoute</span></a> *route</code></em>);</pre>
+<p>Gets the IP prefix (ie "24" or "30" etc) of this route.</p>
+<div class="refsect3">
+<a name="nm-ip-route-get-prefix.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody><tr>
+<td class="parameter_name"><p>route</p></td>
+<td class="parameter_description"><p>the <a class="link" href="NMSettingIPConfig.html#NMIPRoute"><span class="type">NMIPRoute</span></a></p></td>
+<td class="parameter_annotations"> </td>
+</tr></tbody>
+</table></div>
+</div>
+<div class="refsect3">
+<a name="nm-ip-route-get-prefix.returns"></a><h4>Returns</h4>
+<p> the IP prefix</p>
+</div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="nm-ip-route-set-prefix"></a><h3>nm_ip_route_set_prefix ()</h3>
+<pre class="programlisting"><span class="returnvalue">void</span>
+nm_ip_route_set_prefix (<em class="parameter"><code><a class="link" href="NMSettingIPConfig.html#NMIPRoute"><span class="type">NMIPRoute</span></a> *route</code></em>,
+                        <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> prefix</code></em>);</pre>
+<p>Sets the prefix property of this route object.</p>
+<div class="refsect3">
+<a name="nm-ip-route-set-prefix.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody>
+<tr>
+<td class="parameter_name"><p>route</p></td>
+<td class="parameter_description"><p>the <a class="link" href="NMSettingIPConfig.html#NMIPRoute"><span class="type">NMIPRoute</span></a></p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>prefix</p></td>
+<td class="parameter_description"><p>the route prefix</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+</tbody>
+</table></div>
+</div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="nm-ip-route-get-next-hop"></a><h3>nm_ip_route_get_next_hop ()</h3>
+<pre class="programlisting">const <span class="returnvalue">char</span> *
+nm_ip_route_get_next_hop (<em class="parameter"><code><a class="link" href="NMSettingIPConfig.html#NMIPRoute"><span class="type">NMIPRoute</span></a> *route</code></em>);</pre>
+<p>Gets the IP address of the next hop of this route; this will be <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> if the
+route has no next hop.</p>
+<div class="refsect3">
+<a name="nm-ip-route-get-next-hop.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody><tr>
+<td class="parameter_name"><p>route</p></td>
+<td class="parameter_description"><p>the <a class="link" href="NMSettingIPConfig.html#NMIPRoute"><span class="type">NMIPRoute</span></a></p></td>
+<td class="parameter_annotations"> </td>
+</tr></tbody>
+</table></div>
+</div>
+<div class="refsect3">
+<a name="nm-ip-route-get-next-hop.returns"></a><h4>Returns</h4>
+<p> the IP address of the next hop, or <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> if this is a device route.</p>
+</div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="nm-ip-route-set-next-hop"></a><h3>nm_ip_route_set_next_hop ()</h3>
+<pre class="programlisting"><span class="returnvalue">void</span>
+nm_ip_route_set_next_hop (<em class="parameter"><code><a class="link" href="NMSettingIPConfig.html#NMIPRoute"><span class="type">NMIPRoute</span></a> *route</code></em>,
+                          <em class="parameter"><code>const <span class="type">char</span> *next_hop</code></em>);</pre>
+<p>Sets the next-hop property of this route object.</p>
+<p><em class="parameter"><code>next_hop</code></em>
+ (if non-<a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>) must be a valid address of <em class="parameter"><code>route</code></em>
+'s family. If you
+aren't sure you have a valid address, use <a class="link" href="libnm-nm-utils.html#nm-utils-ipaddr-valid" title="nm_utils_ipaddr_valid ()"><code class="function">nm_utils_ipaddr_valid()</code></a> to check
+it.</p>
+<div class="refsect3">
+<a name="nm-ip-route-set-next-hop.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody>
+<tr>
+<td class="parameter_name"><p>route</p></td>
+<td class="parameter_description"><p>the <a class="link" href="NMSettingIPConfig.html#NMIPRoute"><span class="type">NMIPRoute</span></a></p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>next_hop</p></td>
+<td class="parameter_description"><p>the route's next hop, as a string. </p></td>
+<td class="parameter_annotations"><span class="annotation">[<acronym title="NULL is OK, both for passing and for returning."><span class="acronym">allow-none</span></acronym>]</span></td>
+</tr>
+</tbody>
+</table></div>
+</div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="nm-ip-route-get-next-hop-binary"></a><h3>nm_ip_route_get_next_hop_binary ()</h3>
+<pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
+nm_ip_route_get_next_hop_binary (<em class="parameter"><code><a class="link" href="NMSettingIPConfig.html#NMIPRoute"><span class="type">NMIPRoute</span></a> *route</code></em>,
+                                 <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> next_hop</code></em>);</pre>
+<p>Gets the next hop property of this route object.</p>
+<p><em class="parameter"><code>next_hop</code></em>
+ must point to a buffer that is the correct size for <em class="parameter"><code>route</code></em>
+'s family.</p>
+<p><span class="annotation">[<acronym title="Exposed in C code, not necessarily available in other languages."><span class="acronym">skip</span></acronym>]</span></p>
+<div class="refsect3">
+<a name="nm-ip-route-get-next-hop-binary.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody>
+<tr>
+<td class="parameter_name"><p>route</p></td>
+<td class="parameter_description"><p>the <a class="link" href="NMSettingIPConfig.html#NMIPRoute"><span class="type">NMIPRoute</span></a></p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>next_hop</p></td>
+<td class="parameter_description"><p>a buffer in which to store the next hop in binary format.</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<div class="refsect3">
+<a name="nm-ip-route-get-next-hop-binary.returns"></a><h4>Returns</h4>
+<p> <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> if <em class="parameter"><code>route</code></em>
+has a next hop, <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#FALSE:CAPS"><code class="literal">FALSE</code></a> if not (in which case
+<em class="parameter"><code>next_hop</code></em>
+will be zeroed out)</p>
+</div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="nm-ip-route-set-next-hop-binary"></a><h3>nm_ip_route_set_next_hop_binary ()</h3>
+<pre class="programlisting"><span class="returnvalue">void</span>
+nm_ip_route_set_next_hop_binary (<em class="parameter"><code><a class="link" href="NMSettingIPConfig.html#NMIPRoute"><span class="type">NMIPRoute</span></a> *route</code></em>,
+                                 <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gconstpointer"><span class="type">gconstpointer</span></a> next_hop</code></em>);</pre>
+<p>Sets the destination property of this route object.</p>
+<p><em class="parameter"><code>next_hop</code></em>
+ (if non-<a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>) must point to a buffer that is the correct size for
+<em class="parameter"><code>route</code></em>
+'s family.</p>
+<p><span class="annotation">[<acronym title="Exposed in C code, not necessarily available in other languages."><span class="acronym">skip</span></acronym>]</span></p>
+<div class="refsect3">
+<a name="nm-ip-route-set-next-hop-binary.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody>
+<tr>
+<td class="parameter_name"><p>route</p></td>
+<td class="parameter_description"><p>the <a class="link" href="NMSettingIPConfig.html#NMIPRoute"><span class="type">NMIPRoute</span></a></p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>next_hop</p></td>
+<td class="parameter_description"><p>the route's next hop, in binary format</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+</tbody>
+</table></div>
+</div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="nm-ip-route-get-metric"></a><h3>nm_ip_route_get_metric ()</h3>
+<pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gint64"><span class="returnvalue">gint64</span></a>
+nm_ip_route_get_metric (<em class="parameter"><code><a class="link" href="NMSettingIPConfig.html#NMIPRoute"><span class="type">NMIPRoute</span></a> *route</code></em>);</pre>
+<p>Gets the route metric property of this route object; lower values
+indicate "better" or more preferred routes; -1 indicates "default"
+(meaning NetworkManager will set it appropriately).</p>
+<div class="refsect3">
+<a name="nm-ip-route-get-metric.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody><tr>
+<td class="parameter_name"><p>route</p></td>
+<td class="parameter_description"><p>the <a class="link" href="NMSettingIPConfig.html#NMIPRoute"><span class="type">NMIPRoute</span></a></p></td>
+<td class="parameter_annotations"> </td>
+</tr></tbody>
+</table></div>
+</div>
+<div class="refsect3">
+<a name="nm-ip-route-get-metric.returns"></a><h4>Returns</h4>
+<p> the route metric</p>
+</div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="nm-ip-route-set-metric"></a><h3>nm_ip_route_set_metric ()</h3>
+<pre class="programlisting"><span class="returnvalue">void</span>
+nm_ip_route_set_metric (<em class="parameter"><code><a class="link" href="NMSettingIPConfig.html#NMIPRoute"><span class="type">NMIPRoute</span></a> *route</code></em>,
+                        <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gint64"><span class="type">gint64</span></a> metric</code></em>);</pre>
+<p>Sets the metric property of this route object.</p>
+<div class="refsect3">
+<a name="nm-ip-route-set-metric.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody>
+<tr>
+<td class="parameter_name"><p>route</p></td>
+<td class="parameter_description"><p>the <a class="link" href="NMSettingIPConfig.html#NMIPRoute"><span class="type">NMIPRoute</span></a></p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>metric</p></td>
+<td class="parameter_description"><p>the route metric (or -1 for "default")</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+</tbody>
+</table></div>
+</div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="nm-ip-route-get-attribute-names"></a><h3>nm_ip_route_get_attribute_names ()</h3>
+<pre class="programlisting"><span class="returnvalue">char</span> **
+nm_ip_route_get_attribute_names (<em class="parameter"><code><a class="link" href="NMSettingIPConfig.html#NMIPRoute"><span class="type">NMIPRoute</span></a> *route</code></em>);</pre>
+<p>Gets an array of attribute names defined on <em class="parameter"><code>route</code></em>
+.</p>
+<div class="refsect3">
+<a name="nm-ip-route-get-attribute-names.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody><tr>
+<td class="parameter_name"><p>route</p></td>
+<td class="parameter_description"><p>the <a class="link" href="NMSettingIPConfig.html#NMIPRoute"><span class="type">NMIPRoute</span></a></p></td>
+<td class="parameter_annotations"> </td>
+</tr></tbody>
+</table></div>
+</div>
+<div class="refsect3">
+<a name="nm-ip-route-get-attribute-names.returns"></a><h4>Returns</h4>
+<p>a <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>-terminated array of attribute names. </p>
+<p><span class="annotation">[<acronym title="Free data after the code is done."><span class="acronym">transfer full</span></acronym>]</span></p>
+</div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="nm-ip-route-get-attribute"></a><h3>nm_ip_route_get_attribute ()</h3>
+<pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-GVariant.html#GVariant"><span class="returnvalue">GVariant</span></a> *
+nm_ip_route_get_attribute (<em class="parameter"><code><a class="link" href="NMSettingIPConfig.html#NMIPRoute"><span class="type">NMIPRoute</span></a> *route</code></em>,
+                           <em class="parameter"><code>const <span class="type">char</span> *name</code></em>);</pre>
+<p>Gets the value of the attribute with name <em class="parameter"><code>name</code></em>
+ on <em class="parameter"><code>route</code></em>
+</p>
+<div class="refsect3">
+<a name="nm-ip-route-get-attribute.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody>
+<tr>
+<td class="parameter_name"><p>route</p></td>
+<td class="parameter_description"><p>the <a class="link" href="NMSettingIPConfig.html#NMIPRoute"><span class="type">NMIPRoute</span></a></p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>name</p></td>
+<td class="parameter_description"><p>the name of an route attribute</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<div class="refsect3">
+<a name="nm-ip-route-get-attribute.returns"></a><h4>Returns</h4>
+<p>the value of the attribute with name <em class="parameter"><code>name</code></em>
+on
+<em class="parameter"><code>route</code></em>
+, or <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> if <em class="parameter"><code>route</code></em>
+has no such attribute. </p>
+<p><span class="annotation">[<acronym title="Don't free data after the code is done."><span class="acronym">transfer none</span></acronym>]</span></p>
+</div>
 </div>
-<div class="refsect1">
-<a name="NMSettingIPConfig.functions_details"></a><h2>Functions</h2>
+<hr>
 <div class="refsect2">
-<a name="nm-ip-address-new"></a><h3>nm_ip_address_new ()</h3>
-<pre class="programlisting"><a class="link" href="NMSettingIPConfig.html#NMIPAddress"><span class="returnvalue">NMIPAddress</span></a> *
-nm_ip_address_new (<em class="parameter"><code><span class="type">int</span> family</code></em>,
-                   <em class="parameter"><code>const <span class="type">char</span> *addr</code></em>,
-                   <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> prefix</code></em>,
-                   <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> **error</code></em>);</pre>
-<p>Creates a new <a class="link" href="NMSettingIPConfig.html#NMIPAddress"><span class="type">NMIPAddress</span></a> object.</p>
+<a name="nm-ip-route-set-attribute"></a><h3>nm_ip_route_set_attribute ()</h3>
+<pre class="programlisting"><span class="returnvalue">void</span>
+nm_ip_route_set_attribute (<em class="parameter"><code><a class="link" href="NMSettingIPConfig.html#NMIPRoute"><span class="type">NMIPRoute</span></a> *route</code></em>,
+                           <em class="parameter"><code>const <span class="type">char</span> *name</code></em>,
+                           <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-GVariant.html#GVariant"><span class="type">GVariant</span></a> *value</code></em>);</pre>
+<p>Sets the named attribute on <em class="parameter"><code>route</code></em>
+ to the given value.</p>
 <div class="refsect3">
-<a name="nm-ip-address-new.parameters"></a><h4>Parameters</h4>
+<a name="nm-ip-route-set-attribute.parameters"></a><h4>Parameters</h4>
 <div class="informaltable"><table class="informaltable" width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -1088,49 +2753,49 @@ nm_ip_address_new (<em class="parameter"><code><span class="type">int</span> fam
 </colgroup>
 <tbody>
 <tr>
-<td class="parameter_name"><p>family</p></td>
-<td class="parameter_description"><p>the IP address family (<code class="literal">AF_INET</code> or
-<code class="literal">AF_INET6</code>)</p></td>
-<td class="parameter_annotations"> </td>
-</tr>
-<tr>
-<td class="parameter_name"><p>addr</p></td>
-<td class="parameter_description"><p>the IP address</p></td>
+<td class="parameter_name"><p>route</p></td>
+<td class="parameter_description"><p>the <a class="link" href="NMSettingIPConfig.html#NMIPRoute"><span class="type">NMIPRoute</span></a></p></td>
 <td class="parameter_annotations"> </td>
 </tr>
 <tr>
-<td class="parameter_name"><p>prefix</p></td>
-<td class="parameter_description"><p>the address prefix length</p></td>
+<td class="parameter_name"><p>name</p></td>
+<td class="parameter_description"><p>the name of a route attribute</p></td>
 <td class="parameter_annotations"> </td>
 </tr>
 <tr>
-<td class="parameter_name"><p>error</p></td>
-<td class="parameter_description"><p>location to store error, or <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a></p></td>
-<td class="parameter_annotations"> </td>
+<td class="parameter_name"><p>value</p></td>
+<td class="parameter_description"><p>the value. </p></td>
+<td class="parameter_annotations"><span class="annotation">[<acronym title="Don't free data after the code is done."><span class="acronym">transfer none</span></acronym>][<acronym title="NULL is OK, both for passing and for returning."><span class="acronym">allow-none</span></acronym>]</span></td>
 </tr>
 </tbody>
 </table></div>
 </div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="nm-ip-route-get-variant-attribute-spec"></a><h3>nm_ip_route_get_variant_attribute_spec ()</h3>
+<pre class="programlisting">const <a class="link" href="libnm-nm-utils.html#NMVariantAttributeSpec" title="NMVariantAttributeSpec"><span class="returnvalue">NMVariantAttributeSpec</span></a> *const *
+nm_ip_route_get_variant_attribute_spec
+                               (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
 <div class="refsect3">
-<a name="nm-ip-address-new.returns"></a><h4>Returns</h4>
-<p>the new <a class="link" href="NMSettingIPConfig.html#NMIPAddress"><span class="type">NMIPAddress</span></a> object, or <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> on error. </p>
-<p><span class="annotation">[<acronym title="Free data after the code is done."><span class="acronym">transfer full</span></acronym>]</span></p>
+<a name="nm-ip-route-get-variant-attribute-spec.returns"></a><h4>Returns</h4>
+<p> the specifiers for route attributes</p>
 </div>
+<p class="since">Since: 1.8</p>
 </div>
 <hr>
 <div class="refsect2">
-<a name="nm-ip-address-new-binary"></a><h3>nm_ip_address_new_binary ()</h3>
-<pre class="programlisting"><a class="link" href="NMSettingIPConfig.html#NMIPAddress"><span class="returnvalue">NMIPAddress</span></a> *
-nm_ip_address_new_binary (<em class="parameter"><code><span class="type">int</span> family</code></em>,
-                          <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gconstpointer"><span class="type">gconstpointer</span></a> addr</code></em>,
-                          <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> prefix</code></em>,
-                          <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> **error</code></em>);</pre>
-<p>Creates a new <a class="link" href="NMSettingIPConfig.html#NMIPAddress"><span class="type">NMIPAddress</span></a> object. <em class="parameter"><code>addr</code></em>
- must point to a buffer of the
-correct size for <em class="parameter"><code>family</code></em>
-.</p>
+<a name="nm-ip-route-attribute-validate"></a><h3>nm_ip_route_attribute_validate ()</h3>
+<pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
+nm_ip_route_attribute_validate (<em class="parameter"><code>const <span class="type">char</span> *name</code></em>,
+                                <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-GVariant.html#GVariant"><span class="type">GVariant</span></a> *value</code></em>,
+                                <em class="parameter"><code><span class="type">int</span> family</code></em>,
+                                <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a> *known</code></em>,
+                                <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> **error</code></em>);</pre>
+<p>Validates a route attribute, i.e. checks that the attribute is a known one
+and the value is of the correct type and well-formed.</p>
 <div class="refsect3">
-<a name="nm-ip-address-new-binary.parameters"></a><h4>Parameters</h4>
+<a name="nm-ip-route-attribute-validate.parameters"></a><h4>Parameters</h4>
 <div class="informaltable"><table class="informaltable" width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -1139,43 +2804,46 @@ correct size for <em class="parameter"><code>family</code></em>
 </colgroup>
 <tbody>
 <tr>
-<td class="parameter_name"><p>family</p></td>
-<td class="parameter_description"><p>the IP address family (<code class="literal">AF_INET</code> or
-<code class="literal">AF_INET6</code>)</p></td>
+<td class="parameter_name"><p>name</p></td>
+<td class="parameter_description"><p>the attribute name</p></td>
 <td class="parameter_annotations"> </td>
 </tr>
 <tr>
-<td class="parameter_name"><p>addr</p></td>
-<td class="parameter_description"><p>the IP address</p></td>
+<td class="parameter_name"><p>value</p></td>
+<td class="parameter_description"><p>the attribute value</p></td>
 <td class="parameter_annotations"> </td>
 </tr>
 <tr>
-<td class="parameter_name"><p>prefix</p></td>
-<td class="parameter_description"><p>the address prefix length</p></td>
+<td class="parameter_name"><p>family</p></td>
+<td class="parameter_description"><p>IP address family of the route</p></td>
 <td class="parameter_annotations"> </td>
 </tr>
 <tr>
+<td class="parameter_name"><p>known</p></td>
+<td class="parameter_description"><p>on return, whether the attribute name is a known one. </p></td>
+<td class="parameter_annotations"><span class="annotation">[<acronym title="Parameter for returning results. Default is transfer full."><span class="acronym">out</span></acronym>]</span></td>
+</tr>
+<tr>
 <td class="parameter_name"><p>error</p></td>
-<td class="parameter_description"><p>location to store error, or <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a></p></td>
-<td class="parameter_annotations"> </td>
+<td class="parameter_description"><p>return location for a <a href="https://developer.gnome.org/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a>, or <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>. </p></td>
+<td class="parameter_annotations"><span class="annotation">[<acronym title="NULL is OK, both for passing and for returning."><span class="acronym">allow-none</span></acronym>]</span></td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <div class="refsect3">
-<a name="nm-ip-address-new-binary.returns"></a><h4>Returns</h4>
-<p>the new <a class="link" href="NMSettingIPConfig.html#NMIPAddress"><span class="type">NMIPAddress</span></a> object, or <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> on error. </p>
-<p><span class="annotation">[<acronym title="Free data after the code is done."><span class="acronym">transfer full</span></acronym>]</span></p>
+<a name="nm-ip-route-attribute-validate.returns"></a><h4>Returns</h4>
+<p> <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> if the attribute is valid, <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#FALSE:CAPS"><code class="literal">FALSE</code></a> otherwise</p>
 </div>
+<p class="since">Since: 1.8</p>
 </div>
 <hr>
 <div class="refsect2">
-<a name="nm-ip-address-ref"></a><h3>nm_ip_address_ref ()</h3>
-<pre class="programlisting"><span class="returnvalue">void</span>
-nm_ip_address_ref (<em class="parameter"><code><a class="link" href="NMSettingIPConfig.html#NMIPAddress"><span class="type">NMIPAddress</span></a> *address</code></em>);</pre>
-<p>Increases the reference count of the object.</p>
+<a name="nm-ip-routing-rule-new"></a><h3>nm_ip_routing_rule_new ()</h3>
+<pre class="programlisting"><a class="link" href="NMSettingIPConfig.html#NMIPRoutingRule"><span class="returnvalue">NMIPRoutingRule</span></a> *
+nm_ip_routing_rule_new (<em class="parameter"><code><span class="type">int</span> addr_family</code></em>);</pre>
 <div class="refsect3">
-<a name="nm-ip-address-ref.parameters"></a><h4>Parameters</h4>
+<a name="nm-ip-routing-rule-new.parameters"></a><h4>Parameters</h4>
 <div class="informaltable"><table class="informaltable" width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -1183,22 +2851,28 @@ nm_ip_address_ref (<em class="parameter"><code><a class="link" href="NMSettingIP
 <col width="200px" class="parameters_annotations">
 </colgroup>
 <tbody><tr>
-<td class="parameter_name"><p>address</p></td>
-<td class="parameter_description"><p>the <a class="link" href="NMSettingIPConfig.html#NMIPAddress"><span class="type">NMIPAddress</span></a></p></td>
+<td class="parameter_name"><p>addr_family</p></td>
+<td class="parameter_description"><p>the address family of the routing rule. Must be either
+<code class="literal">AF_INET</code> (2) or <code class="literal">AF_INET6</code> (10).</p></td>
 <td class="parameter_annotations"> </td>
 </tr></tbody>
 </table></div>
 </div>
+<div class="refsect3">
+<a name="nm-ip-routing-rule-new.returns"></a><h4>Returns</h4>
+<p>a newly created rule instance with the
+provided address family. The instance is unsealed. </p>
+<p><span class="annotation">[<acronym title="Free data after the code is done."><span class="acronym">transfer full</span></acronym>]</span></p>
+</div>
+<p class="since">Since: 1.18</p>
 </div>
 <hr>
 <div class="refsect2">
-<a name="nm-ip-address-unref"></a><h3>nm_ip_address_unref ()</h3>
-<pre class="programlisting"><span class="returnvalue">void</span>
-nm_ip_address_unref (<em class="parameter"><code><a class="link" href="NMSettingIPConfig.html#NMIPAddress"><span class="type">NMIPAddress</span></a> *address</code></em>);</pre>
-<p>Decreases the reference count of the object.  If the reference count
-reaches zero, the object will be destroyed.</p>
+<a name="nm-ip-routing-rule-new-clone"></a><h3>nm_ip_routing_rule_new_clone ()</h3>
+<pre class="programlisting"><a class="link" href="NMSettingIPConfig.html#NMIPRoutingRule"><span class="returnvalue">NMIPRoutingRule</span></a> *
+nm_ip_routing_rule_new_clone (<em class="parameter"><code>const <a class="link" href="NMSettingIPConfig.html#NMIPRoutingRule"><span class="type">NMIPRoutingRule</span></a> *rule</code></em>);</pre>
 <div class="refsect3">
-<a name="nm-ip-address-unref.parameters"></a><h4>Parameters</h4>
+<a name="nm-ip-routing-rule-new-clone.parameters"></a><h4>Parameters</h4>
 <div class="informaltable"><table class="informaltable" width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -1206,58 +2880,63 @@ reaches zero, the object will be destroyed.</p>
 <col width="200px" class="parameters_annotations">
 </colgroup>
 <tbody><tr>
-<td class="parameter_name"><p>address</p></td>
-<td class="parameter_description"><p>the <a class="link" href="NMSettingIPConfig.html#NMIPAddress"><span class="type">NMIPAddress</span></a></p></td>
+<td class="parameter_name"><p>rule</p></td>
+<td class="parameter_description"><p>the <a class="link" href="NMSettingIPConfig.html#NMIPRoutingRule"><span class="type">NMIPRoutingRule</span></a> to clone.</p></td>
 <td class="parameter_annotations"> </td>
 </tr></tbody>
 </table></div>
 </div>
+<div class="refsect3">
+<a name="nm-ip-routing-rule-new-clone.returns"></a><h4>Returns</h4>
+<p>a newly created rule instance with
+the same settings as <em class="parameter"><code>rule</code></em>
+. Note that the instance will
+always be unsealred. </p>
+<p><span class="annotation">[<acronym title="Free data after the code is done."><span class="acronym">transfer full</span></acronym>]</span></p>
+</div>
+<p class="since">Since: 1.18</p>
 </div>
 <hr>
 <div class="refsect2">
-<a name="nm-ip-address-equal"></a><h3>nm_ip_address_equal ()</h3>
-<pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
-nm_ip_address_equal (<em class="parameter"><code><a class="link" href="NMSettingIPConfig.html#NMIPAddress"><span class="type">NMIPAddress</span></a> *address</code></em>,
-                     <em class="parameter"><code><a class="link" href="NMSettingIPConfig.html#NMIPAddress"><span class="type">NMIPAddress</span></a> *other</code></em>);</pre>
-<p>Determines if two <a class="link" href="NMSettingIPConfig.html#NMIPAddress"><span class="type">NMIPAddress</span></a> objects contain the same address and prefix
-(attributes are not compared).</p>
+<a name="nm-ip-routing-rule-ref"></a><h3>nm_ip_routing_rule_ref ()</h3>
+<pre class="programlisting"><a class="link" href="NMSettingIPConfig.html#NMIPRoutingRule"><span class="returnvalue">NMIPRoutingRule</span></a> *
+nm_ip_routing_rule_ref (<em class="parameter"><code><a class="link" href="NMSettingIPConfig.html#NMIPRoutingRule"><span class="type">NMIPRoutingRule</span></a> *self</code></em>);</pre>
+<p>Increases the reference count of the instance.
+This is not thread-safe.</p>
 <div class="refsect3">
-<a name="nm-ip-address-equal.parameters"></a><h4>Parameters</h4>
+<a name="nm-ip-routing-rule-ref.parameters"></a><h4>Parameters</h4>
 <div class="informaltable"><table class="informaltable" width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
 <col class="parameters_description">
 <col width="200px" class="parameters_annotations">
 </colgroup>
-<tbody>
-<tr>
-<td class="parameter_name"><p>address</p></td>
-<td class="parameter_description"><p>the <a class="link" href="NMSettingIPConfig.html#NMIPAddress"><span class="type">NMIPAddress</span></a></p></td>
-<td class="parameter_annotations"> </td>
-</tr>
-<tr>
-<td class="parameter_name"><p>other</p></td>
-<td class="parameter_description"><p>the <a class="link" href="NMSettingIPConfig.html#NMIPAddress"><span class="type">NMIPAddress</span></a> to compare <em class="parameter"><code>address</code></em>
-to.</p></td>
-<td class="parameter_annotations"> </td>
-</tr>
-</tbody>
+<tbody><tr>
+<td class="parameter_name"><p>self</p></td>
+<td class="parameter_description"><p>the <a class="link" href="NMSettingIPConfig.html#NMIPRoutingRule"><span class="type">NMIPRoutingRule</span></a> instance. </p></td>
+<td class="parameter_annotations"><span class="annotation">[<acronym title="NULL is OK, both for passing and for returning."><span class="acronym">allow-none</span></acronym>]</span></td>
+</tr></tbody>
 </table></div>
 </div>
 <div class="refsect3">
-<a name="nm-ip-address-equal.returns"></a><h4>Returns</h4>
-<p> <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> if the objects contain the same values, <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#FALSE:CAPS"><code class="literal">FALSE</code></a> if they do not.</p>
+<a name="nm-ip-routing-rule-ref.returns"></a><h4>Returns</h4>
+<p>the <em class="parameter"><code>self</code></em>
+argument with incremented
+reference count. </p>
+<p><span class="annotation">[<acronym title="Free data after the code is done."><span class="acronym">transfer full</span></acronym>]</span></p>
 </div>
+<p class="since">Since: 1.18</p>
 </div>
 <hr>
 <div class="refsect2">
-<a name="nm-ip-address-dup"></a><h3>nm_ip_address_dup ()</h3>
-<pre class="programlisting"><a class="link" href="NMSettingIPConfig.html#NMIPAddress"><span class="returnvalue">NMIPAddress</span></a> *
-nm_ip_address_dup (<em class="parameter"><code><a class="link" href="NMSettingIPConfig.html#NMIPAddress"><span class="type">NMIPAddress</span></a> *address</code></em>);</pre>
-<p>Creates a copy of <em class="parameter"><code>address</code></em>
-</p>
+<a name="nm-ip-routing-rule-unref"></a><h3>nm_ip_routing_rule_unref ()</h3>
+<pre class="programlisting"><span class="returnvalue">void</span>
+nm_ip_routing_rule_unref (<em class="parameter"><code><a class="link" href="NMSettingIPConfig.html#NMIPRoutingRule"><span class="type">NMIPRoutingRule</span></a> *self</code></em>);</pre>
+<p>Decreases the reference count of the instance and destroys
+the instance if the reference count reaches zero.
+This is not thread-safe.</p>
 <div class="refsect3">
-<a name="nm-ip-address-dup.parameters"></a><h4>Parameters</h4>
+<a name="nm-ip-routing-rule-unref.parameters"></a><h4>Parameters</h4>
 <div class="informaltable"><table class="informaltable" width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -1265,28 +2944,21 @@ nm_ip_address_dup (<em class="parameter"><code><a class="link" href="NMSettingIP
 <col width="200px" class="parameters_annotations">
 </colgroup>
 <tbody><tr>
-<td class="parameter_name"><p>address</p></td>
-<td class="parameter_description"><p>the <a class="link" href="NMSettingIPConfig.html#NMIPAddress"><span class="type">NMIPAddress</span></a></p></td>
-<td class="parameter_annotations"> </td>
+<td class="parameter_name"><p>self</p></td>
+<td class="parameter_description"><p>the <a class="link" href="NMSettingIPConfig.html#NMIPRoutingRule"><span class="type">NMIPRoutingRule</span></a> instance. </p></td>
+<td class="parameter_annotations"><span class="annotation">[<acronym title="NULL is OK, both for passing and for returning."><span class="acronym">allow-none</span></acronym>]</span></td>
 </tr></tbody>
 </table></div>
 </div>
-<div class="refsect3">
-<a name="nm-ip-address-dup.returns"></a><h4>Returns</h4>
-<p>a copy of <em class="parameter"><code>address</code></em>
-. </p>
-<p><span class="annotation">[<acronym title="Free data after the code is done."><span class="acronym">transfer full</span></acronym>]</span></p>
-</div>
+<p class="since">Since: 1.18</p>
 </div>
 <hr>
 <div class="refsect2">
-<a name="nm-ip-address-get-family"></a><h3>nm_ip_address_get_family ()</h3>
-<pre class="programlisting"><span class="returnvalue">int</span>
-nm_ip_address_get_family (<em class="parameter"><code><a class="link" href="NMSettingIPConfig.html#NMIPAddress"><span class="type">NMIPAddress</span></a> *address</code></em>);</pre>
-<p>Gets the IP address family (eg, AF_INET) property of this address
-object.</p>
+<a name="nm-ip-routing-rule-is-sealed"></a><h3>nm_ip_routing_rule_is_sealed ()</h3>
+<pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
+nm_ip_routing_rule_is_sealed (<em class="parameter"><code>const <a class="link" href="NMSettingIPConfig.html#NMIPRoutingRule"><span class="type">NMIPRoutingRule</span></a> *self</code></em>);</pre>
 <div class="refsect3">
-<a name="nm-ip-address-get-family.parameters"></a><h4>Parameters</h4>
+<a name="nm-ip-routing-rule-is-sealed.parameters"></a><h4>Parameters</h4>
 <div class="informaltable"><table class="informaltable" width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -1294,25 +2966,31 @@ object.</p>
 <col width="200px" class="parameters_annotations">
 </colgroup>
 <tbody><tr>
-<td class="parameter_name"><p>address</p></td>
-<td class="parameter_description"><p>the <a class="link" href="NMSettingIPConfig.html#NMIPAddress"><span class="type">NMIPAddress</span></a></p></td>
+<td class="parameter_name"><p>self</p></td>
+<td class="parameter_description"><p>the <a class="link" href="NMSettingIPConfig.html#NMIPRoutingRule"><span class="type">NMIPRoutingRule</span></a> instance</p></td>
 <td class="parameter_annotations"> </td>
 </tr></tbody>
 </table></div>
 </div>
 <div class="refsect3">
-<a name="nm-ip-address-get-family.returns"></a><h4>Returns</h4>
-<p> the IP address family</p>
+<a name="nm-ip-routing-rule-is-sealed.returns"></a><h4>Returns</h4>
+<p> whether <em class="parameter"><code>self</code></em>
+is sealed. Once sealed, an instance
+cannot be modified nor unsealed.</p>
 </div>
+<p class="since">Since: 1.18</p>
 </div>
 <hr>
 <div class="refsect2">
-<a name="nm-ip-address-get-address"></a><h3>nm_ip_address_get_address ()</h3>
-<pre class="programlisting">const <span class="returnvalue">char</span> *
-nm_ip_address_get_address (<em class="parameter"><code><a class="link" href="NMSettingIPConfig.html#NMIPAddress"><span class="type">NMIPAddress</span></a> *address</code></em>);</pre>
-<p>Gets the IP address property of this address object.</p>
+<a name="nm-ip-routing-rule-seal"></a><h3>nm_ip_routing_rule_seal ()</h3>
+<pre class="programlisting"><span class="returnvalue">void</span>
+nm_ip_routing_rule_seal (<em class="parameter"><code><a class="link" href="NMSettingIPConfig.html#NMIPRoutingRule"><span class="type">NMIPRoutingRule</span></a> *self</code></em>);</pre>
+<p>Seals the routing rule. Afterwards, the instance can no longer be
+modfied, and it is a bug to call any of the accessors that would
+modify the rule. If <em class="parameter"><code>self</code></em>
+ was already sealed, this has no effect.</p>
 <div class="refsect3">
-<a name="nm-ip-address-get-address.parameters"></a><h4>Parameters</h4>
+<a name="nm-ip-routing-rule-seal.parameters"></a><h4>Parameters</h4>
 <div class="informaltable"><table class="informaltable" width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -1320,98 +2998,74 @@ nm_ip_address_get_address (<em class="parameter"><code><a class="link" href="NMS
 <col width="200px" class="parameters_annotations">
 </colgroup>
 <tbody><tr>
-<td class="parameter_name"><p>address</p></td>
-<td class="parameter_description"><p>the <a class="link" href="NMSettingIPConfig.html#NMIPAddress"><span class="type">NMIPAddress</span></a></p></td>
+<td class="parameter_name"><p>self</p></td>
+<td class="parameter_description"><p>the <a class="link" href="NMSettingIPConfig.html#NMIPRoutingRule"><span class="type">NMIPRoutingRule</span></a> instance</p></td>
 <td class="parameter_annotations"> </td>
 </tr></tbody>
 </table></div>
 </div>
-<div class="refsect3">
-<a name="nm-ip-address-get-address.returns"></a><h4>Returns</h4>
-<p> the IP address</p>
-</div>
+<p class="since">Since: 1.18</p>
 </div>
 <hr>
 <div class="refsect2">
-<a name="nm-ip-address-set-address"></a><h3>nm_ip_address_set_address ()</h3>
-<pre class="programlisting"><span class="returnvalue">void</span>
-nm_ip_address_set_address (<em class="parameter"><code><a class="link" href="NMSettingIPConfig.html#NMIPAddress"><span class="type">NMIPAddress</span></a> *address</code></em>,
-                           <em class="parameter"><code>const <span class="type">char</span> *addr</code></em>);</pre>
-<p>Sets the IP address property of this address object.</p>
-<p><em class="parameter"><code>addr</code></em>
- must be a valid address of <em class="parameter"><code>address</code></em>
-'s family. If you aren't sure you
-have a valid address, use <a class="link" href="libnm-nm-utils.html#nm-utils-ipaddr-valid" title="nm_utils_ipaddr_valid ()"><code class="function">nm_utils_ipaddr_valid()</code></a> to check it.</p>
+<a name="nm-ip-routing-rule-get-addr-family"></a><h3>nm_ip_routing_rule_get_addr_family ()</h3>
+<pre class="programlisting"><span class="returnvalue">int</span>
+nm_ip_routing_rule_get_addr_family (<em class="parameter"><code>const <a class="link" href="NMSettingIPConfig.html#NMIPRoutingRule"><span class="type">NMIPRoutingRule</span></a> *self</code></em>);</pre>
 <div class="refsect3">
-<a name="nm-ip-address-set-address.parameters"></a><h4>Parameters</h4>
+<a name="nm-ip-routing-rule-get-addr-family.parameters"></a><h4>Parameters</h4>
 <div class="informaltable"><table class="informaltable" width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
 <col class="parameters_description">
 <col width="200px" class="parameters_annotations">
 </colgroup>
-<tbody>
-<tr>
-<td class="parameter_name"><p>address</p></td>
-<td class="parameter_description"><p>the <a class="link" href="NMSettingIPConfig.html#NMIPAddress"><span class="type">NMIPAddress</span></a></p></td>
-<td class="parameter_annotations"> </td>
-</tr>
-<tr>
-<td class="parameter_name"><p>addr</p></td>
-<td class="parameter_description"><p>the IP address, as a string</p></td>
+<tbody><tr>
+<td class="parameter_name"><p>self</p></td>
+<td class="parameter_description"><p>the <a class="link" href="NMSettingIPConfig.html#NMIPRoutingRule"><span class="type">NMIPRoutingRule</span></a> instance</p></td>
 <td class="parameter_annotations"> </td>
-</tr>
-</tbody>
+</tr></tbody>
 </table></div>
 </div>
+<div class="refsect3">
+<a name="nm-ip-routing-rule-get-addr-family.returns"></a><h4>Returns</h4>
+<p> the address family of the rule. Either <code class="literal">AF_INET</code> or <code class="literal">AF_INET6</code>.</p>
+</div>
+<p class="since">Since: 1.18</p>
 </div>
 <hr>
 <div class="refsect2">
-<a name="nm-ip-address-get-address-binary"></a><h3>nm_ip_address_get_address_binary ()</h3>
-<pre class="programlisting"><span class="returnvalue">void</span>
-nm_ip_address_get_address_binary (<em class="parameter"><code><a class="link" href="NMSettingIPConfig.html#NMIPAddress"><span class="type">NMIPAddress</span></a> *address</code></em>,
-                                  <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> addr</code></em>);</pre>
-<p>Gets the IP address property of this address object.</p>
-<p><em class="parameter"><code>addr</code></em>
- must point to a buffer that is the correct size for <em class="parameter"><code>address</code></em>
-'s family.</p>
-<p><span class="annotation">[<acronym title="Exposed in C code, not necessarily available in other languages."><span class="acronym">skip</span></acronym>]</span></p>
+<a name="nm-ip-routing-rule-get-invert"></a><h3>nm_ip_routing_rule_get_invert ()</h3>
+<pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
+nm_ip_routing_rule_get_invert (<em class="parameter"><code>const <a class="link" href="NMSettingIPConfig.html#NMIPRoutingRule"><span class="type">NMIPRoutingRule</span></a> *self</code></em>);</pre>
 <div class="refsect3">
-<a name="nm-ip-address-get-address-binary.parameters"></a><h4>Parameters</h4>
+<a name="nm-ip-routing-rule-get-invert.parameters"></a><h4>Parameters</h4>
 <div class="informaltable"><table class="informaltable" width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
 <col class="parameters_description">
 <col width="200px" class="parameters_annotations">
 </colgroup>
-<tbody>
-<tr>
-<td class="parameter_name"><p>address</p></td>
-<td class="parameter_description"><p>the <a class="link" href="NMSettingIPConfig.html#NMIPAddress"><span class="type">NMIPAddress</span></a></p></td>
-<td class="parameter_annotations"> </td>
-</tr>
-<tr>
-<td class="parameter_name"><p>addr</p></td>
-<td class="parameter_description"><p>a buffer in which to store the address in binary format.</p></td>
+<tbody><tr>
+<td class="parameter_name"><p>self</p></td>
+<td class="parameter_description"><p>the <a class="link" href="NMSettingIPConfig.html#NMIPRoutingRule"><span class="type">NMIPRoutingRule</span></a> instance</p></td>
 <td class="parameter_annotations"> </td>
-</tr>
-</tbody>
+</tr></tbody>
 </table></div>
 </div>
+<div class="refsect3">
+<a name="nm-ip-routing-rule-get-invert.returns"></a><h4>Returns</h4>
+<p> the "invert" setting of the rule.</p>
+</div>
+<p class="since">Since: 1.18</p>
 </div>
 <hr>
 <div class="refsect2">
-<a name="nm-ip-address-set-address-binary"></a><h3>nm_ip_address_set_address_binary ()</h3>
+<a name="nm-ip-routing-rule-set-invert"></a><h3>nm_ip_routing_rule_set_invert ()</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>
-nm_ip_address_set_address_binary (<em class="parameter"><code><a class="link" href="NMSettingIPConfig.html#NMIPAddress"><span class="type">NMIPAddress</span></a> *address</code></em>,
-                                  <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gconstpointer"><span class="type">gconstpointer</span></a> addr</code></em>);</pre>
-<p>Sets the IP address property of this address object.</p>
-<p><em class="parameter"><code>addr</code></em>
- must point to a buffer that is the correct size for <em class="parameter"><code>address</code></em>
-'s family.</p>
-<p><span class="annotation">[<acronym title="Exposed in C code, not necessarily available in other languages."><span class="acronym">skip</span></acronym>]</span></p>
+nm_ip_routing_rule_set_invert (<em class="parameter"><code><a class="link" href="NMSettingIPConfig.html#NMIPRoutingRule"><span class="type">NMIPRoutingRule</span></a> *self</code></em>,
+                               <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a> invert</code></em>);</pre>
 <div class="refsect3">
-<a name="nm-ip-address-set-address-binary.parameters"></a><h4>Parameters</h4>
+<a name="nm-ip-routing-rule-set-invert.parameters"></a><h4>Parameters</h4>
 <div class="informaltable"><table class="informaltable" width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -1420,28 +3074,27 @@ nm_ip_address_set_address_binary (<em class="parameter"><code><a class="link" hr
 </colgroup>
 <tbody>
 <tr>
-<td class="parameter_name"><p>address</p></td>
-<td class="parameter_description"><p>the <a class="link" href="NMSettingIPConfig.html#NMIPAddress"><span class="type">NMIPAddress</span></a></p></td>
+<td class="parameter_name"><p>self</p></td>
+<td class="parameter_description"><p>the <a class="link" href="NMSettingIPConfig.html#NMIPRoutingRule"><span class="type">NMIPRoutingRule</span></a> instance</p></td>
 <td class="parameter_annotations"> </td>
 </tr>
 <tr>
-<td class="parameter_name"><p>addr</p></td>
-<td class="parameter_description"><p>the address, in binary format</p></td>
+<td class="parameter_name"><p>invert</p></td>
+<td class="parameter_description"><p>the new value to set</p></td>
 <td class="parameter_annotations"> </td>
 </tr>
 </tbody>
 </table></div>
 </div>
+<p class="since">Since: 1.18</p>
 </div>
 <hr>
 <div class="refsect2">
-<a name="nm-ip-address-get-prefix"></a><h3>nm_ip_address_get_prefix ()</h3>
-<pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint"><span class="returnvalue">guint</span></a>
-nm_ip_address_get_prefix (<em class="parameter"><code><a class="link" href="NMSettingIPConfig.html#NMIPAddress"><span class="type">NMIPAddress</span></a> *address</code></em>);</pre>
-<p>Gets the IP address prefix (ie "24" or "30" etc) property of this address
-object.</p>
+<a name="nm-ip-routing-rule-get-priority"></a><h3>nm_ip_routing_rule_get_priority ()</h3>
+<pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gint64"><span class="returnvalue">gint64</span></a>
+nm_ip_routing_rule_get_priority (<em class="parameter"><code>const <a class="link" href="NMSettingIPConfig.html#NMIPRoutingRule"><span class="type">NMIPRoutingRule</span></a> *self</code></em>);</pre>
 <div class="refsect3">
-<a name="nm-ip-address-get-prefix.parameters"></a><h4>Parameters</h4>
+<a name="nm-ip-routing-rule-get-priority.parameters"></a><h4>Parameters</h4>
 <div class="informaltable"><table class="informaltable" width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -1449,26 +3102,30 @@ object.</p>
 <col width="200px" class="parameters_annotations">
 </colgroup>
 <tbody><tr>
-<td class="parameter_name"><p>address</p></td>
-<td class="parameter_description"><p>the <a class="link" href="NMSettingIPConfig.html#NMIPAddress"><span class="type">NMIPAddress</span></a></p></td>
+<td class="parameter_name"><p>self</p></td>
+<td class="parameter_description"><p>the <a class="link" href="NMSettingIPConfig.html#NMIPRoutingRule"><span class="type">NMIPRoutingRule</span></a> instance</p></td>
 <td class="parameter_annotations"> </td>
 </tr></tbody>
 </table></div>
 </div>
 <div class="refsect3">
-<a name="nm-ip-address-get-prefix.returns"></a><h4>Returns</h4>
-<p> the IP address prefix</p>
+<a name="nm-ip-routing-rule-get-priority.returns"></a><h4>Returns</h4>
+<p> the priority. A valid priority is in the range from
+0 to <a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#G-MAXUINT32:CAPS"><code class="literal">G_MAXUINT32</code></a>. If unset, -1 is returned.</p>
 </div>
+<p class="since">Since: 1.18</p>
 </div>
 <hr>
 <div class="refsect2">
-<a name="nm-ip-address-set-prefix"></a><h3>nm_ip_address_set_prefix ()</h3>
+<a name="nm-ip-routing-rule-set-priority"></a><h3>nm_ip_routing_rule_set_priority ()</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>
-nm_ip_address_set_prefix (<em class="parameter"><code><a class="link" href="NMSettingIPConfig.html#NMIPAddress"><span class="type">NMIPAddress</span></a> *address</code></em>,
-                          <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> prefix</code></em>);</pre>
-<p>Sets the IP address prefix property of this address object.</p>
+nm_ip_routing_rule_set_priority (<em class="parameter"><code><a class="link" href="NMSettingIPConfig.html#NMIPRoutingRule"><span class="type">NMIPRoutingRule</span></a> *self</code></em>,
+                                 <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gint64"><span class="type">gint64</span></a> priority</code></em>);</pre>
+<p>A valid priority ranges from 0 to <a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#G-MAXUINT32:CAPS"><code class="literal">G_MAXUINT32</code></a>. "-1" is also allowed
+to reset the priority. It is a bug calling this function with any
+other value.</p>
 <div class="refsect3">
-<a name="nm-ip-address-set-prefix.parameters"></a><h4>Parameters</h4>
+<a name="nm-ip-routing-rule-set-priority.parameters"></a><h4>Parameters</h4>
 <div class="informaltable"><table class="informaltable" width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -1477,28 +3134,27 @@ nm_ip_address_set_prefix (<em class="parameter"><code><a class="link" href="NMSe
 </colgroup>
 <tbody>
 <tr>
-<td class="parameter_name"><p>address</p></td>
-<td class="parameter_description"><p>the <a class="link" href="NMSettingIPConfig.html#NMIPAddress"><span class="type">NMIPAddress</span></a></p></td>
+<td class="parameter_name"><p>self</p></td>
+<td class="parameter_description"><p>the <a class="link" href="NMSettingIPConfig.html#NMIPRoutingRule"><span class="type">NMIPRoutingRule</span></a> instance</p></td>
 <td class="parameter_annotations"> </td>
 </tr>
 <tr>
-<td class="parameter_name"><p>prefix</p></td>
-<td class="parameter_description"><p>the IP address prefix</p></td>
+<td class="parameter_name"><p>priority</p></td>
+<td class="parameter_description"><p>the priority to set</p></td>
 <td class="parameter_annotations"> </td>
 </tr>
 </tbody>
 </table></div>
 </div>
+<p class="since">Since: 1.18</p>
 </div>
 <hr>
 <div class="refsect2">
-<a name="nm-ip-address-get-attribute-names"></a><h3>nm_ip_address_get_attribute_names ()</h3>
-<pre class="programlisting"><span class="returnvalue">char</span> **
-nm_ip_address_get_attribute_names (<em class="parameter"><code><a class="link" href="NMSettingIPConfig.html#NMIPAddress"><span class="type">NMIPAddress</span></a> *address</code></em>);</pre>
-<p>Gets an array of attribute names defined on <em class="parameter"><code>address</code></em>
-.</p>
+<a name="nm-ip-routing-rule-get-tos"></a><h3>nm_ip_routing_rule_get_tos ()</h3>
+<pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint8"><span class="returnvalue">guint8</span></a>
+nm_ip_routing_rule_get_tos (<em class="parameter"><code>const <a class="link" href="NMSettingIPConfig.html#NMIPRoutingRule"><span class="type">NMIPRoutingRule</span></a> *self</code></em>);</pre>
 <div class="refsect3">
-<a name="nm-ip-address-get-attribute-names.parameters"></a><h4>Parameters</h4>
+<a name="nm-ip-routing-rule-get-tos.parameters"></a><h4>Parameters</h4>
 <div class="informaltable"><table class="informaltable" width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -1506,29 +3162,26 @@ nm_ip_address_get_attribute_names (<em class="parameter"><code><a class="link" h
 <col width="200px" class="parameters_annotations">
 </colgroup>
 <tbody><tr>
-<td class="parameter_name"><p>address</p></td>
-<td class="parameter_description"><p>the <a class="link" href="NMSettingIPConfig.html#NMIPAddress"><span class="type">NMIPAddress</span></a></p></td>
+<td class="parameter_name"><p>self</p></td>
+<td class="parameter_description"><p>the <a class="link" href="NMSettingIPConfig.html#NMIPRoutingRule"><span class="type">NMIPRoutingRule</span></a> instance</p></td>
 <td class="parameter_annotations"> </td>
 </tr></tbody>
 </table></div>
 </div>
 <div class="refsect3">
-<a name="nm-ip-address-get-attribute-names.returns"></a><h4>Returns</h4>
-<p>a <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>-terminated array of attribute names,. </p>
-<p><span class="annotation">[<acronym title="Free data after the code is done."><span class="acronym">transfer full</span></acronym>]</span></p>
+<a name="nm-ip-routing-rule-get-tos.returns"></a><h4>Returns</h4>
+<p> the tos of the rule.</p>
 </div>
+<p class="since">Since: 1.18</p>
 </div>
 <hr>
 <div class="refsect2">
-<a name="nm-ip-address-get-attribute"></a><h3>nm_ip_address_get_attribute ()</h3>
-<pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-GVariant.html#GVariant"><span class="returnvalue">GVariant</span></a> *
-nm_ip_address_get_attribute (<em class="parameter"><code><a class="link" href="NMSettingIPConfig.html#NMIPAddress"><span class="type">NMIPAddress</span></a> *address</code></em>,
-                             <em class="parameter"><code>const <span class="type">char</span> *name</code></em>);</pre>
-<p>Gets the value of the attribute with name <em class="parameter"><code>name</code></em>
- on <em class="parameter"><code>address</code></em>
-</p>
+<a name="nm-ip-routing-rule-set-tos"></a><h3>nm_ip_routing_rule_set_tos ()</h3>
+<pre class="programlisting"><span class="returnvalue">void</span>
+nm_ip_routing_rule_set_tos (<em class="parameter"><code><a class="link" href="NMSettingIPConfig.html#NMIPRoutingRule"><span class="type">NMIPRoutingRule</span></a> *self</code></em>,
+                            <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint8"><span class="type">guint8</span></a> tos</code></em>);</pre>
 <div class="refsect3">
-<a name="nm-ip-address-get-attribute.parameters"></a><h4>Parameters</h4>
+<a name="nm-ip-routing-rule-set-tos.parameters"></a><h4>Parameters</h4>
 <div class="informaltable"><table class="informaltable" width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -1537,39 +3190,54 @@ nm_ip_address_get_attribute (<em class="parameter"><code><a class="link" href="N
 </colgroup>
 <tbody>
 <tr>
-<td class="parameter_name"><p>address</p></td>
-<td class="parameter_description"><p>the <a class="link" href="NMSettingIPConfig.html#NMIPAddress"><span class="type">NMIPAddress</span></a></p></td>
+<td class="parameter_name"><p>self</p></td>
+<td class="parameter_description"><p>the <a class="link" href="NMSettingIPConfig.html#NMIPRoutingRule"><span class="type">NMIPRoutingRule</span></a> instance</p></td>
 <td class="parameter_annotations"> </td>
 </tr>
 <tr>
-<td class="parameter_name"><p>name</p></td>
-<td class="parameter_description"><p>the name of an address attribute</p></td>
+<td class="parameter_name"><p>tos</p></td>
+<td class="parameter_description"><p>the tos to set</p></td>
 <td class="parameter_annotations"> </td>
 </tr>
 </tbody>
 </table></div>
 </div>
+<p class="since">Since: 1.18</p>
+</div>
+<hr>
+<div class="refsect2">
+<a name="nm-ip-routing-rule-get-ipproto"></a><h3>nm_ip_routing_rule_get_ipproto ()</h3>
+<pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint8"><span class="returnvalue">guint8</span></a>
+nm_ip_routing_rule_get_ipproto (<em class="parameter"><code>const <a class="link" href="NMSettingIPConfig.html#NMIPRoutingRule"><span class="type">NMIPRoutingRule</span></a> *self</code></em>);</pre>
 <div class="refsect3">
-<a name="nm-ip-address-get-attribute.returns"></a><h4>Returns</h4>
-<p>the value of the attribute with name <em class="parameter"><code>name</code></em>
-on
-<em class="parameter"><code>address</code></em>
-, or <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> if <em class="parameter"><code>address</code></em>
-has no such attribute. </p>
-<p><span class="annotation">[<acronym title="Don't free data after the code is done."><span class="acronym">transfer none</span></acronym>]</span></p>
+<a name="nm-ip-routing-rule-get-ipproto.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody><tr>
+<td class="parameter_name"><p>self</p></td>
+<td class="parameter_description"><p>the <a class="link" href="NMSettingIPConfig.html#NMIPRoutingRule"><span class="type">NMIPRoutingRule</span></a> instance</p></td>
+<td class="parameter_annotations"> </td>
+</tr></tbody>
+</table></div>
 </div>
+<div class="refsect3">
+<a name="nm-ip-routing-rule-get-ipproto.returns"></a><h4>Returns</h4>
+<p> the ipproto of the rule.</p>
+</div>
+<p class="since">Since: 1.18</p>
 </div>
 <hr>
 <div class="refsect2">
-<a name="nm-ip-address-set-attribute"></a><h3>nm_ip_address_set_attribute ()</h3>
+<a name="nm-ip-routing-rule-set-ipproto"></a><h3>nm_ip_routing_rule_set_ipproto ()</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>
-nm_ip_address_set_attribute (<em class="parameter"><code><a class="link" href="NMSettingIPConfig.html#NMIPAddress"><span class="type">NMIPAddress</span></a> *address</code></em>,
-                             <em class="parameter"><code>const <span class="type">char</span> *name</code></em>,
-                             <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-GVariant.html#GVariant"><span class="type">GVariant</span></a> *value</code></em>);</pre>
-<p>Sets or clears the named attribute on <em class="parameter"><code>address</code></em>
- to the given value.</p>
+nm_ip_routing_rule_set_ipproto (<em class="parameter"><code><a class="link" href="NMSettingIPConfig.html#NMIPRoutingRule"><span class="type">NMIPRoutingRule</span></a> *self</code></em>,
+                                <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint8"><span class="type">guint8</span></a> ipproto</code></em>);</pre>
 <div class="refsect3">
-<a name="nm-ip-address-set-attribute.parameters"></a><h4>Parameters</h4>
+<a name="nm-ip-routing-rule-set-ipproto.parameters"></a><h4>Parameters</h4>
 <div class="informaltable"><table class="informaltable" width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -1578,101 +3246,83 @@ nm_ip_address_set_attribute (<em class="parameter"><code><a class="link" href="N
 </colgroup>
 <tbody>
 <tr>
-<td class="parameter_name"><p>address</p></td>
-<td class="parameter_description"><p>the <a class="link" href="NMSettingIPConfig.html#NMIPAddress"><span class="type">NMIPAddress</span></a></p></td>
+<td class="parameter_name"><p>self</p></td>
+<td class="parameter_description"><p>the <a class="link" href="NMSettingIPConfig.html#NMIPRoutingRule"><span class="type">NMIPRoutingRule</span></a> instance</p></td>
 <td class="parameter_annotations"> </td>
 </tr>
 <tr>
-<td class="parameter_name"><p>name</p></td>
-<td class="parameter_description"><p>the name of an address attribute</p></td>
+<td class="parameter_name"><p>ipproto</p></td>
+<td class="parameter_description"><p>the ipproto to set</p></td>
 <td class="parameter_annotations"> </td>
 </tr>
-<tr>
-<td class="parameter_name"><p>value</p></td>
-<td class="parameter_description"><p>the value. </p></td>
-<td class="parameter_annotations"><span class="annotation">[<acronym title="Don't free data after the code is done."><span class="acronym">transfer none</span></acronym>][<acronym title="NULL is OK, both for passing and for returning."><span class="acronym">allow-none</span></acronym>]</span></td>
-</tr>
 </tbody>
 </table></div>
 </div>
+<p class="since">Since: 1.18</p>
 </div>
 <hr>
 <div class="refsect2">
-<a name="nm-ip-route-new"></a><h3>nm_ip_route_new ()</h3>
-<pre class="programlisting"><a class="link" href="NMSettingIPConfig.html#NMIPRoute"><span class="returnvalue">NMIPRoute</span></a> *
-nm_ip_route_new (<em class="parameter"><code><span class="type">int</span> family</code></em>,
-                 <em class="parameter"><code>const <span class="type">char</span> *dest</code></em>,
-                 <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> prefix</code></em>,
-                 <em class="parameter"><code>const <span class="type">char</span> *next_hop</code></em>,
-                 <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gint64"><span class="type">gint64</span></a> metric</code></em>,
-                 <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> **error</code></em>);</pre>
-<p>Creates a new <a class="link" href="NMSettingIPConfig.html#NMIPRoute"><span class="type">NMIPRoute</span></a> object.</p>
+<a name="nm-ip-routing-rule-get-source-port-start"></a><h3>nm_ip_routing_rule_get_source_port_start ()</h3>
+<pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint16"><span class="returnvalue">guint16</span></a>
+nm_ip_routing_rule_get_source_port_start
+                               (<em class="parameter"><code>const <a class="link" href="NMSettingIPConfig.html#NMIPRoutingRule"><span class="type">NMIPRoutingRule</span></a> *self</code></em>);</pre>
 <div class="refsect3">
-<a name="nm-ip-route-new.parameters"></a><h4>Parameters</h4>
+<a name="nm-ip-routing-rule-get-source-port-start.parameters"></a><h4>Parameters</h4>
 <div class="informaltable"><table class="informaltable" width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
 <col class="parameters_description">
 <col width="200px" class="parameters_annotations">
 </colgroup>
-<tbody>
-<tr>
-<td class="parameter_name"><p>family</p></td>
-<td class="parameter_description"><p>the IP address family (<code class="literal">AF_INET</code> or
-<code class="literal">AF_INET6</code>)</p></td>
-<td class="parameter_annotations"> </td>
-</tr>
-<tr>
-<td class="parameter_name"><p>dest</p></td>
-<td class="parameter_description"><p>the IP address of the route's destination</p></td>
-<td class="parameter_annotations"> </td>
-</tr>
-<tr>
-<td class="parameter_name"><p>prefix</p></td>
-<td class="parameter_description"><p>the address prefix length</p></td>
-<td class="parameter_annotations"> </td>
-</tr>
-<tr>
-<td class="parameter_name"><p>next_hop</p></td>
-<td class="parameter_description"><p>the IP address of the next hop (or <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>). </p></td>
-<td class="parameter_annotations"><span class="annotation">[<acronym title="NULL is OK, both for passing and for returning."><span class="acronym">allow-none</span></acronym>]</span></td>
-</tr>
-<tr>
-<td class="parameter_name"><p>metric</p></td>
-<td class="parameter_description"><p>the route metric (or -1 for "default")</p></td>
+<tbody><tr>
+<td class="parameter_name"><p>self</p></td>
+<td class="parameter_description"><p>the <a class="link" href="NMSettingIPConfig.html#NMIPRoutingRule"><span class="type">NMIPRoutingRule</span></a> instance</p></td>
 <td class="parameter_annotations"> </td>
-</tr>
-<tr>
-<td class="parameter_name"><p>error</p></td>
-<td class="parameter_description"><p>location to store error, or <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a></p></td>
+</tr></tbody>
+</table></div>
+</div>
+<div class="refsect3">
+<a name="nm-ip-routing-rule-get-source-port-start.returns"></a><h4>Returns</h4>
+<p> the source port start setting.</p>
+</div>
+<p class="since">Since: 1.18</p>
+</div>
+<hr>
+<div class="refsect2">
+<a name="nm-ip-routing-rule-get-source-port-end"></a><h3>nm_ip_routing_rule_get_source_port_end ()</h3>
+<pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint16"><span class="returnvalue">guint16</span></a>
+nm_ip_routing_rule_get_source_port_end
+                               (<em class="parameter"><code>const <a class="link" href="NMSettingIPConfig.html#NMIPRoutingRule"><span class="type">NMIPRoutingRule</span></a> *self</code></em>);</pre>
+<div class="refsect3">
+<a name="nm-ip-routing-rule-get-source-port-end.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody><tr>
+<td class="parameter_name"><p>self</p></td>
+<td class="parameter_description"><p>the <a class="link" href="NMSettingIPConfig.html#NMIPRoutingRule"><span class="type">NMIPRoutingRule</span></a> instance</p></td>
 <td class="parameter_annotations"> </td>
-</tr>
-</tbody>
+</tr></tbody>
 </table></div>
 </div>
 <div class="refsect3">
-<a name="nm-ip-route-new.returns"></a><h4>Returns</h4>
-<p>the new <a class="link" href="NMSettingIPConfig.html#NMIPRoute"><span class="type">NMIPRoute</span></a> object, or <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> on error. </p>
-<p><span class="annotation">[<acronym title="Free data after the code is done."><span class="acronym">transfer full</span></acronym>]</span></p>
+<a name="nm-ip-routing-rule-get-source-port-end.returns"></a><h4>Returns</h4>
+<p> the source port end setting.</p>
 </div>
+<p class="since">Since: 1.18</p>
 </div>
 <hr>
 <div class="refsect2">
-<a name="nm-ip-route-new-binary"></a><h3>nm_ip_route_new_binary ()</h3>
-<pre class="programlisting"><a class="link" href="NMSettingIPConfig.html#NMIPRoute"><span class="returnvalue">NMIPRoute</span></a> *
-nm_ip_route_new_binary (<em class="parameter"><code><span class="type">int</span> family</code></em>,
-                        <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gconstpointer"><span class="type">gconstpointer</span></a> dest</code></em>,
-                        <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> prefix</code></em>,
-                        <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gconstpointer"><span class="type">gconstpointer</span></a> next_hop</code></em>,
-                        <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gint64"><span class="type">gint64</span></a> metric</code></em>,
-                        <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> **error</code></em>);</pre>
-<p>Creates a new <a class="link" href="NMSettingIPConfig.html#NMIPRoute"><span class="type">NMIPRoute</span></a> object. <em class="parameter"><code>dest</code></em>
- and <em class="parameter"><code>next_hop</code></em>
- (if non-<a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>) must
-point to buffers of the correct size for <em class="parameter"><code>family</code></em>
-.</p>
+<a name="nm-ip-routing-rule-set-source-port"></a><h3>nm_ip_routing_rule_set_source_port ()</h3>
+<pre class="programlisting"><span class="returnvalue">void</span>
+nm_ip_routing_rule_set_source_port (<em class="parameter"><code><a class="link" href="NMSettingIPConfig.html#NMIPRoutingRule"><span class="type">NMIPRoutingRule</span></a> *self</code></em>,
+                                    <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint16"><span class="type">guint16</span></a> start</code></em>,
+                                    <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint16"><span class="type">guint16</span></a> end</code></em>);</pre>
 <div class="refsect3">
-<a name="nm-ip-route-new-binary.parameters"></a><h4>Parameters</h4>
+<a name="nm-ip-routing-rule-set-source-port.parameters"></a><h4>Parameters</h4>
 <div class="informaltable"><table class="informaltable" width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -1681,53 +3331,33 @@ point to buffers of the correct size for <em class="parameter"><code>family</cod
 </colgroup>
 <tbody>
 <tr>
-<td class="parameter_name"><p>family</p></td>
-<td class="parameter_description"><p>the IP address family (<code class="literal">AF_INET</code> or
-<code class="literal">AF_INET6</code>)</p></td>
-<td class="parameter_annotations"> </td>
-</tr>
-<tr>
-<td class="parameter_name"><p>dest</p></td>
-<td class="parameter_description"><p>the IP address of the route's destination</p></td>
-<td class="parameter_annotations"> </td>
-</tr>
-<tr>
-<td class="parameter_name"><p>prefix</p></td>
-<td class="parameter_description"><p>the address prefix length</p></td>
+<td class="parameter_name"><p>self</p></td>
+<td class="parameter_description"><p>the <a class="link" href="NMSettingIPConfig.html#NMIPRoutingRule"><span class="type">NMIPRoutingRule</span></a> instance</p></td>
 <td class="parameter_annotations"> </td>
 </tr>
 <tr>
-<td class="parameter_name"><p>next_hop</p></td>
-<td class="parameter_description"><p>the IP address of the next hop (or <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>). </p></td>
-<td class="parameter_annotations"><span class="annotation">[<acronym title="NULL is OK, both for passing and for returning."><span class="acronym">allow-none</span></acronym>]</span></td>
-</tr>
-<tr>
-<td class="parameter_name"><p>metric</p></td>
-<td class="parameter_description"><p>the route metric (or -1 for "default")</p></td>
+<td class="parameter_name"><p>start</p></td>
+<td class="parameter_description"><p>the start port to set.</p></td>
 <td class="parameter_annotations"> </td>
 </tr>
 <tr>
-<td class="parameter_name"><p>error</p></td>
-<td class="parameter_description"><p>location to store error, or <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a></p></td>
+<td class="parameter_name"><p>end</p></td>
+<td class="parameter_description"><p>the end port to set.</p></td>
 <td class="parameter_annotations"> </td>
 </tr>
 </tbody>
 </table></div>
 </div>
-<div class="refsect3">
-<a name="nm-ip-route-new-binary.returns"></a><h4>Returns</h4>
-<p>the new <a class="link" href="NMSettingIPConfig.html#NMIPRoute"><span class="type">NMIPRoute</span></a> object, or <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> on error. </p>
-<p><span class="annotation">[<acronym title="Free data after the code is done."><span class="acronym">transfer full</span></acronym>]</span></p>
-</div>
+<p class="since">Since: 1.18</p>
 </div>
 <hr>
 <div class="refsect2">
-<a name="nm-ip-route-ref"></a><h3>nm_ip_route_ref ()</h3>
-<pre class="programlisting"><span class="returnvalue">void</span>
-nm_ip_route_ref (<em class="parameter"><code><a class="link" href="NMSettingIPConfig.html#NMIPRoute"><span class="type">NMIPRoute</span></a> *route</code></em>);</pre>
-<p>Increases the reference count of the object.</p>
+<a name="nm-ip-routing-rule-get-destination-port-start"></a><h3>nm_ip_routing_rule_get_destination_port_start ()</h3>
+<pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint16"><span class="returnvalue">guint16</span></a>
+nm_ip_routing_rule_get_destination_port_start
+                               (<em class="parameter"><code>const <a class="link" href="NMSettingIPConfig.html#NMIPRoutingRule"><span class="type">NMIPRoutingRule</span></a> *self</code></em>);</pre>
 <div class="refsect3">
-<a name="nm-ip-route-ref.parameters"></a><h4>Parameters</h4>
+<a name="nm-ip-routing-rule-get-destination-port-start.parameters"></a><h4>Parameters</h4>
 <div class="informaltable"><table class="informaltable" width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -1735,22 +3365,26 @@ nm_ip_route_ref (<em class="parameter"><code><a class="link" href="NMSettingIPCo
 <col width="200px" class="parameters_annotations">
 </colgroup>
 <tbody><tr>
-<td class="parameter_name"><p>route</p></td>
-<td class="parameter_description"><p>the <a class="link" href="NMSettingIPConfig.html#NMIPRoute"><span class="type">NMIPRoute</span></a></p></td>
+<td class="parameter_name"><p>self</p></td>
+<td class="parameter_description"><p>the <a class="link" href="NMSettingIPConfig.html#NMIPRoutingRule"><span class="type">NMIPRoutingRule</span></a> instance</p></td>
 <td class="parameter_annotations"> </td>
 </tr></tbody>
 </table></div>
 </div>
+<div class="refsect3">
+<a name="nm-ip-routing-rule-get-destination-port-start.returns"></a><h4>Returns</h4>
+<p> the destination port start setting.</p>
+</div>
+<p class="since">Since: 1.18</p>
 </div>
 <hr>
 <div class="refsect2">
-<a name="nm-ip-route-unref"></a><h3>nm_ip_route_unref ()</h3>
-<pre class="programlisting"><span class="returnvalue">void</span>
-nm_ip_route_unref (<em class="parameter"><code><a class="link" href="NMSettingIPConfig.html#NMIPRoute"><span class="type">NMIPRoute</span></a> *route</code></em>);</pre>
-<p>Decreases the reference count of the object.  If the reference count
-reaches zero, the object will be destroyed.</p>
+<a name="nm-ip-routing-rule-get-destination-port-end"></a><h3>nm_ip_routing_rule_get_destination_port_end ()</h3>
+<pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint16"><span class="returnvalue">guint16</span></a>
+nm_ip_routing_rule_get_destination_port_end
+                               (<em class="parameter"><code>const <a class="link" href="NMSettingIPConfig.html#NMIPRoutingRule"><span class="type">NMIPRoutingRule</span></a> *self</code></em>);</pre>
 <div class="refsect3">
-<a name="nm-ip-route-unref.parameters"></a><h4>Parameters</h4>
+<a name="nm-ip-routing-rule-get-destination-port-end.parameters"></a><h4>Parameters</h4>
 <div class="informaltable"><table class="informaltable" width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -1758,23 +3392,28 @@ reaches zero, the object will be destroyed.</p>
 <col width="200px" class="parameters_annotations">
 </colgroup>
 <tbody><tr>
-<td class="parameter_name"><p>route</p></td>
-<td class="parameter_description"><p>the <a class="link" href="NMSettingIPConfig.html#NMIPRoute"><span class="type">NMIPRoute</span></a></p></td>
+<td class="parameter_name"><p>self</p></td>
+<td class="parameter_description"><p>the <a class="link" href="NMSettingIPConfig.html#NMIPRoutingRule"><span class="type">NMIPRoutingRule</span></a> instance</p></td>
 <td class="parameter_annotations"> </td>
 </tr></tbody>
 </table></div>
 </div>
+<div class="refsect3">
+<a name="nm-ip-routing-rule-get-destination-port-end.returns"></a><h4>Returns</h4>
+<p> the destination port end setting.</p>
+</div>
+<p class="since">Since: 1.18</p>
 </div>
 <hr>
 <div class="refsect2">
-<a name="nm-ip-route-equal"></a><h3>nm_ip_route_equal ()</h3>
-<pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
-nm_ip_route_equal (<em class="parameter"><code><a class="link" href="NMSettingIPConfig.html#NMIPRoute"><span class="type">NMIPRoute</span></a> *route</code></em>,
-                   <em class="parameter"><code><a class="link" href="NMSettingIPConfig.html#NMIPRoute"><span class="type">NMIPRoute</span></a> *other</code></em>);</pre>
-<p>Determines if two <a class="link" href="NMSettingIPConfig.html#NMIPRoute"><span class="type">NMIPRoute</span></a> objects contain the same destination, prefix,
-next hop, and metric. (Attributes are not compared.)</p>
+<a name="nm-ip-routing-rule-set-destination-port"></a><h3>nm_ip_routing_rule_set_destination_port ()</h3>
+<pre class="programlisting"><span class="returnvalue">void</span>
+nm_ip_routing_rule_set_destination_port
+                               (<em class="parameter"><code><a class="link" href="NMSettingIPConfig.html#NMIPRoutingRule"><span class="type">NMIPRoutingRule</span></a> *self</code></em>,
+                                <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint16"><span class="type">guint16</span></a> start</code></em>,
+                                <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint16"><span class="type">guint16</span></a> end</code></em>);</pre>
 <div class="refsect3">
-<a name="nm-ip-route-equal.parameters"></a><h4>Parameters</h4>
+<a name="nm-ip-routing-rule-set-destination-port.parameters"></a><h4>Parameters</h4>
 <div class="informaltable"><table class="informaltable" width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -1783,35 +3422,86 @@ next hop, and metric. (Attributes are not compared.)</p>
 </colgroup>
 <tbody>
 <tr>
-<td class="parameter_name"><p>route</p></td>
-<td class="parameter_description"><p>the <a class="link" href="NMSettingIPConfig.html#NMIPRoute"><span class="type">NMIPRoute</span></a></p></td>
+<td class="parameter_name"><p>self</p></td>
+<td class="parameter_description"><p>the <a class="link" href="NMSettingIPConfig.html#NMIPRoutingRule"><span class="type">NMIPRoutingRule</span></a> instance</p></td>
 <td class="parameter_annotations"> </td>
 </tr>
 <tr>
-<td class="parameter_name"><p>other</p></td>
-<td class="parameter_description"><p>the <a class="link" href="NMSettingIPConfig.html#NMIPRoute"><span class="type">NMIPRoute</span></a> to compare <em class="parameter"><code>route</code></em>
-to.</p></td>
+<td class="parameter_name"><p>start</p></td>
+<td class="parameter_description"><p>the start port to set.</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>end</p></td>
+<td class="parameter_description"><p>the end port to set.</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<p class="since">Since: 1.18</p>
+</div>
+<hr>
+<div class="refsect2">
+<a name="nm-ip-routing-rule-get-fwmark"></a><h3>nm_ip_routing_rule_get_fwmark ()</h3>
+<pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint32"><span class="returnvalue">guint32</span></a>
+nm_ip_routing_rule_get_fwmark (<em class="parameter"><code>const <a class="link" href="NMSettingIPConfig.html#NMIPRoutingRule"><span class="type">NMIPRoutingRule</span></a> *self</code></em>);</pre>
+<div class="refsect3">
+<a name="nm-ip-routing-rule-get-fwmark.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody><tr>
+<td class="parameter_name"><p>self</p></td>
+<td class="parameter_description"><p>the <a class="link" href="NMSettingIPConfig.html#NMIPRoutingRule"><span class="type">NMIPRoutingRule</span></a> instance</p></td>
+<td class="parameter_annotations"> </td>
+</tr></tbody>
+</table></div>
+</div>
+<div class="refsect3">
+<a name="nm-ip-routing-rule-get-fwmark.returns"></a><h4>Returns</h4>
+<p> the fwmark setting.</p>
+</div>
+<p class="since">Since: 1.18</p>
+</div>
+<hr>
+<div class="refsect2">
+<a name="nm-ip-routing-rule-get-fwmask"></a><h3>nm_ip_routing_rule_get_fwmask ()</h3>
+<pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint32"><span class="returnvalue">guint32</span></a>
+nm_ip_routing_rule_get_fwmask (<em class="parameter"><code>const <a class="link" href="NMSettingIPConfig.html#NMIPRoutingRule"><span class="type">NMIPRoutingRule</span></a> *self</code></em>);</pre>
+<div class="refsect3">
+<a name="nm-ip-routing-rule-get-fwmask.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody><tr>
+<td class="parameter_name"><p>self</p></td>
+<td class="parameter_description"><p>the <a class="link" href="NMSettingIPConfig.html#NMIPRoutingRule"><span class="type">NMIPRoutingRule</span></a> instance</p></td>
 <td class="parameter_annotations"> </td>
-</tr>
-</tbody>
+</tr></tbody>
 </table></div>
 </div>
 <div class="refsect3">
-<a name="nm-ip-route-equal.returns"></a><h4>Returns</h4>
-<p> <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> if the objects contain the same values, <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#FALSE:CAPS"><code class="literal">FALSE</code></a> if they do not.</p>
+<a name="nm-ip-routing-rule-get-fwmask.returns"></a><h4>Returns</h4>
+<p> the fwmask setting.</p>
 </div>
+<p class="since">Since: 1.18</p>
 </div>
 <hr>
 <div class="refsect2">
-<a name="nm-ip-route-equal-full"></a><h3>nm_ip_route_equal_full ()</h3>
-<pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
-nm_ip_route_equal_full (<em class="parameter"><code><a class="link" href="NMSettingIPConfig.html#NMIPRoute"><span class="type">NMIPRoute</span></a> *route</code></em>,
-                        <em class="parameter"><code><a class="link" href="NMSettingIPConfig.html#NMIPRoute"><span class="type">NMIPRoute</span></a> *other</code></em>,
-                        <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> cmp_flags</code></em>);</pre>
-<p>Determines if two <a class="link" href="NMSettingIPConfig.html#NMIPRoute"><span class="type">NMIPRoute</span></a> objects contain the same destination, prefix,
-next hop, and metric.</p>
+<a name="nm-ip-routing-rule-set-fwmark"></a><h3>nm_ip_routing_rule_set_fwmark ()</h3>
+<pre class="programlisting"><span class="returnvalue">void</span>
+nm_ip_routing_rule_set_fwmark (<em class="parameter"><code><a class="link" href="NMSettingIPConfig.html#NMIPRoutingRule"><span class="type">NMIPRoutingRule</span></a> *self</code></em>,
+                               <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> fwmark</code></em>,
+                               <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> fwmask</code></em>);</pre>
 <div class="refsect3">
-<a name="nm-ip-route-equal-full.parameters"></a><h4>Parameters</h4>
+<a name="nm-ip-routing-rule-set-fwmark.parameters"></a><h4>Parameters</h4>
 <div class="informaltable"><table class="informaltable" width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -1820,41 +3510,32 @@ next hop, and metric.</p>
 </colgroup>
 <tbody>
 <tr>
-<td class="parameter_name"><p>route</p></td>
-<td class="parameter_description"><p>the <a class="link" href="NMSettingIPConfig.html#NMIPRoute"><span class="type">NMIPRoute</span></a></p></td>
+<td class="parameter_name"><p>self</p></td>
+<td class="parameter_description"><p>the <a class="link" href="NMSettingIPConfig.html#NMIPRoutingRule"><span class="type">NMIPRoutingRule</span></a> instance</p></td>
 <td class="parameter_annotations"> </td>
 </tr>
 <tr>
-<td class="parameter_name"><p>other</p></td>
-<td class="parameter_description"><p>the <a class="link" href="NMSettingIPConfig.html#NMIPRoute"><span class="type">NMIPRoute</span></a> to compare <em class="parameter"><code>route</code></em>
-to.</p></td>
+<td class="parameter_name"><p>fwmark</p></td>
+<td class="parameter_description"><p>the fwmark</p></td>
 <td class="parameter_annotations"> </td>
 </tr>
 <tr>
-<td class="parameter_name"><p>cmp_flags</p></td>
-<td class="parameter_description"><p>tune how to compare attributes. Currently only
-NM_IP_ROUTE_EQUAL_CMP_FLAGS_NONE (0) and NM_IP_ROUTE_EQUAL_CMP_FLAGS_WITH_ATTRS (1)
-is supported.</p></td>
+<td class="parameter_name"><p>fwmask</p></td>
+<td class="parameter_description"><p>the fwmask</p></td>
 <td class="parameter_annotations"> </td>
 </tr>
 </tbody>
 </table></div>
 </div>
-<div class="refsect3">
-<a name="nm-ip-route-equal-full.returns"></a><h4>Returns</h4>
-<p> <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> if the objects contain the same values, <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#FALSE:CAPS"><code class="literal">FALSE</code></a> if they do not.</p>
-</div>
-<p class="since">Since: 1.10</p>
+<p class="since">Since: 1.18</p>
 </div>
 <hr>
 <div class="refsect2">
-<a name="nm-ip-route-dup"></a><h3>nm_ip_route_dup ()</h3>
-<pre class="programlisting"><a class="link" href="NMSettingIPConfig.html#NMIPRoute"><span class="returnvalue">NMIPRoute</span></a> *
-nm_ip_route_dup (<em class="parameter"><code><a class="link" href="NMSettingIPConfig.html#NMIPRoute"><span class="type">NMIPRoute</span></a> *route</code></em>);</pre>
-<p>Creates a copy of <em class="parameter"><code>route</code></em>
-</p>
+<a name="nm-ip-routing-rule-get-from-len"></a><h3>nm_ip_routing_rule_get_from_len ()</h3>
+<pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint8"><span class="returnvalue">guint8</span></a>
+nm_ip_routing_rule_get_from_len (<em class="parameter"><code>const <a class="link" href="NMSettingIPConfig.html#NMIPRoutingRule"><span class="type">NMIPRoutingRule</span></a> *self</code></em>);</pre>
 <div class="refsect3">
-<a name="nm-ip-route-dup.parameters"></a><h4>Parameters</h4>
+<a name="nm-ip-routing-rule-get-from-len.parameters"></a><h4>Parameters</h4>
 <div class="informaltable"><table class="informaltable" width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -1862,28 +3543,25 @@ nm_ip_route_dup (<em class="parameter"><code><a class="link" href="NMSettingIPCo
 <col width="200px" class="parameters_annotations">
 </colgroup>
 <tbody><tr>
-<td class="parameter_name"><p>route</p></td>
-<td class="parameter_description"><p>the <a class="link" href="NMSettingIPConfig.html#NMIPRoute"><span class="type">NMIPRoute</span></a></p></td>
+<td class="parameter_name"><p>self</p></td>
+<td class="parameter_description"><p>the <a class="link" href="NMSettingIPConfig.html#NMIPRoutingRule"><span class="type">NMIPRoutingRule</span></a> instance</p></td>
 <td class="parameter_annotations"> </td>
 </tr></tbody>
 </table></div>
 </div>
 <div class="refsect3">
-<a name="nm-ip-route-dup.returns"></a><h4>Returns</h4>
-<p>a copy of <em class="parameter"><code>route</code></em>
-. </p>
-<p><span class="annotation">[<acronym title="Free data after the code is done."><span class="acronym">transfer full</span></acronym>]</span></p>
+<a name="nm-ip-routing-rule-get-from-len.returns"></a><h4>Returns</h4>
+<p> the set prefix length for the from/src parameter.</p>
 </div>
+<p class="since">Since: 1.18</p>
 </div>
 <hr>
 <div class="refsect2">
-<a name="nm-ip-route-get-family"></a><h3>nm_ip_route_get_family ()</h3>
-<pre class="programlisting"><span class="returnvalue">int</span>
-nm_ip_route_get_family (<em class="parameter"><code><a class="link" href="NMSettingIPConfig.html#NMIPRoute"><span class="type">NMIPRoute</span></a> *route</code></em>);</pre>
-<p>Gets the IP address family (eg, AF_INET) property of this route
-object.</p>
+<a name="nm-ip-routing-rule-get-from"></a><h3>nm_ip_routing_rule_get_from ()</h3>
+<pre class="programlisting">const <span class="returnvalue">char</span> *
+nm_ip_routing_rule_get_from (<em class="parameter"><code>const <a class="link" href="NMSettingIPConfig.html#NMIPRoutingRule"><span class="type">NMIPRoutingRule</span></a> *self</code></em>);</pre>
 <div class="refsect3">
-<a name="nm-ip-route-get-family.parameters"></a><h4>Parameters</h4>
+<a name="nm-ip-routing-rule-get-from.parameters"></a><h4>Parameters</h4>
 <div class="informaltable"><table class="informaltable" width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -1891,124 +3569,124 @@ object.</p>
 <col width="200px" class="parameters_annotations">
 </colgroup>
 <tbody><tr>
-<td class="parameter_name"><p>route</p></td>
-<td class="parameter_description"><p>the <a class="link" href="NMSettingIPConfig.html#NMIPRoute"><span class="type">NMIPRoute</span></a></p></td>
+<td class="parameter_name"><p>self</p></td>
+<td class="parameter_description"><p>the <a class="link" href="NMSettingIPConfig.html#NMIPRoutingRule"><span class="type">NMIPRoutingRule</span></a> instance</p></td>
 <td class="parameter_annotations"> </td>
 </tr></tbody>
 </table></div>
 </div>
 <div class="refsect3">
-<a name="nm-ip-route-get-family.returns"></a><h4>Returns</h4>
-<p> the IP address family</p>
+<a name="nm-ip-routing-rule-get-from.returns"></a><h4>Returns</h4>
+<p>the set from/src parameter or
+<a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>, if no value is set. </p>
+<p><span class="annotation">[<acronym title="Don't free data after the code is done."><span class="acronym">transfer none</span></acronym>]</span></p>
 </div>
+<p class="since">Since: 1.18</p>
 </div>
 <hr>
 <div class="refsect2">
-<a name="nm-ip-route-get-dest"></a><h3>nm_ip_route_get_dest ()</h3>
-<pre class="programlisting">const <span class="returnvalue">char</span> *
-nm_ip_route_get_dest (<em class="parameter"><code><a class="link" href="NMSettingIPConfig.html#NMIPRoute"><span class="type">NMIPRoute</span></a> *route</code></em>);</pre>
-<p>Gets the IP destination address property of this route object.</p>
+<a name="nm-ip-routing-rule-set-from"></a><h3>nm_ip_routing_rule_set_from ()</h3>
+<pre class="programlisting"><span class="returnvalue">void</span>
+nm_ip_routing_rule_set_from (<em class="parameter"><code><a class="link" href="NMSettingIPConfig.html#NMIPRoutingRule"><span class="type">NMIPRoutingRule</span></a> *self</code></em>,
+                             <em class="parameter"><code>const <span class="type">char</span> *from</code></em>,
+                             <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint8"><span class="type">guint8</span></a> len</code></em>);</pre>
+<p>Setting invalid values is accepted, but will later fail
+during <a class="link" href="NMSettingIPConfig.html#nm-ip-routing-rule-validate" title="nm_ip_routing_rule_validate ()"><code class="function">nm_ip_routing_rule_validate()</code></a>.</p>
 <div class="refsect3">
-<a name="nm-ip-route-get-dest.parameters"></a><h4>Parameters</h4>
+<a name="nm-ip-routing-rule-set-from.parameters"></a><h4>Parameters</h4>
 <div class="informaltable"><table class="informaltable" width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
 <col class="parameters_description">
 <col width="200px" class="parameters_annotations">
 </colgroup>
-<tbody><tr>
-<td class="parameter_name"><p>route</p></td>
-<td class="parameter_description"><p>the <a class="link" href="NMSettingIPConfig.html#NMIPRoute"><span class="type">NMIPRoute</span></a></p></td>
+<tbody>
+<tr>
+<td class="parameter_name"><p>self</p></td>
+<td class="parameter_description"><p>the <a class="link" href="NMSettingIPConfig.html#NMIPRoutingRule"><span class="type">NMIPRoutingRule</span></a> instance</p></td>
 <td class="parameter_annotations"> </td>
-</tr></tbody>
+</tr>
+<tr>
+<td class="parameter_name"><p>from</p></td>
+<td class="parameter_description"><p>the from/src address to set.
+The address family must match. </p></td>
+<td class="parameter_annotations"><span class="annotation">[<acronym title="NULL is OK, both for passing and for returning."><span class="acronym">allow-none</span></acronym>]</span></td>
+</tr>
+<tr>
+<td class="parameter_name"><p>len</p></td>
+<td class="parameter_description"><p>the corresponding prefix length of the address.</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+</tbody>
 </table></div>
 </div>
-<div class="refsect3">
-<a name="nm-ip-route-get-dest.returns"></a><h4>Returns</h4>
-<p> the IP address of the route's destination</p>
-</div>
+<p class="since">Since: 1.18</p>
 </div>
 <hr>
 <div class="refsect2">
-<a name="nm-ip-route-set-dest"></a><h3>nm_ip_route_set_dest ()</h3>
-<pre class="programlisting"><span class="returnvalue">void</span>
-nm_ip_route_set_dest (<em class="parameter"><code><a class="link" href="NMSettingIPConfig.html#NMIPRoute"><span class="type">NMIPRoute</span></a> *route</code></em>,
-                      <em class="parameter"><code>const <span class="type">char</span> *dest</code></em>);</pre>
-<p>Sets the destination property of this route object.</p>
-<p><em class="parameter"><code>dest</code></em>
- must be a valid address of <em class="parameter"><code>route</code></em>
-'s family. If you aren't sure you
-have a valid address, use <a class="link" href="libnm-nm-utils.html#nm-utils-ipaddr-valid" title="nm_utils_ipaddr_valid ()"><code class="function">nm_utils_ipaddr_valid()</code></a> to check it.</p>
+<a name="nm-ip-routing-rule-get-to-len"></a><h3>nm_ip_routing_rule_get_to_len ()</h3>
+<pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint8"><span class="returnvalue">guint8</span></a>
+nm_ip_routing_rule_get_to_len (<em class="parameter"><code>const <a class="link" href="NMSettingIPConfig.html#NMIPRoutingRule"><span class="type">NMIPRoutingRule</span></a> *self</code></em>);</pre>
 <div class="refsect3">
-<a name="nm-ip-route-set-dest.parameters"></a><h4>Parameters</h4>
+<a name="nm-ip-routing-rule-get-to-len.parameters"></a><h4>Parameters</h4>
 <div class="informaltable"><table class="informaltable" width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
 <col class="parameters_description">
 <col width="200px" class="parameters_annotations">
 </colgroup>
-<tbody>
-<tr>
-<td class="parameter_name"><p>route</p></td>
-<td class="parameter_description"><p>the <a class="link" href="NMSettingIPConfig.html#NMIPRoute"><span class="type">NMIPRoute</span></a></p></td>
-<td class="parameter_annotations"> </td>
-</tr>
-<tr>
-<td class="parameter_name"><p>dest</p></td>
-<td class="parameter_description"><p>the route's destination, as a string</p></td>
+<tbody><tr>
+<td class="parameter_name"><p>self</p></td>
+<td class="parameter_description"><p>the <a class="link" href="NMSettingIPConfig.html#NMIPRoutingRule"><span class="type">NMIPRoutingRule</span></a> instance</p></td>
 <td class="parameter_annotations"> </td>
-</tr>
-</tbody>
+</tr></tbody>
 </table></div>
 </div>
+<div class="refsect3">
+<a name="nm-ip-routing-rule-get-to-len.returns"></a><h4>Returns</h4>
+<p> the set prefix length for the to/dst parameter.</p>
+</div>
+<p class="since">Since: 1.18</p>
 </div>
 <hr>
 <div class="refsect2">
-<a name="nm-ip-route-get-dest-binary"></a><h3>nm_ip_route_get_dest_binary ()</h3>
-<pre class="programlisting"><span class="returnvalue">void</span>
-nm_ip_route_get_dest_binary (<em class="parameter"><code><a class="link" href="NMSettingIPConfig.html#NMIPRoute"><span class="type">NMIPRoute</span></a> *route</code></em>,
-                             <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> dest</code></em>);</pre>
-<p>Gets the destination property of this route object.</p>
-<p><em class="parameter"><code>dest</code></em>
- must point to a buffer that is the correct size for <em class="parameter"><code>route</code></em>
-'s family.</p>
-<p><span class="annotation">[<acronym title="Exposed in C code, not necessarily available in other languages."><span class="acronym">skip</span></acronym>]</span></p>
+<a name="nm-ip-routing-rule-get-to"></a><h3>nm_ip_routing_rule_get_to ()</h3>
+<pre class="programlisting">const <span class="returnvalue">char</span> *
+nm_ip_routing_rule_get_to (<em class="parameter"><code>const <a class="link" href="NMSettingIPConfig.html#NMIPRoutingRule"><span class="type">NMIPRoutingRule</span></a> *self</code></em>);</pre>
 <div class="refsect3">
-<a name="nm-ip-route-get-dest-binary.parameters"></a><h4>Parameters</h4>
+<a name="nm-ip-routing-rule-get-to.parameters"></a><h4>Parameters</h4>
 <div class="informaltable"><table class="informaltable" width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
 <col class="parameters_description">
 <col width="200px" class="parameters_annotations">
 </colgroup>
-<tbody>
-<tr>
-<td class="parameter_name"><p>route</p></td>
-<td class="parameter_description"><p>the <a class="link" href="NMSettingIPConfig.html#NMIPRoute"><span class="type">NMIPRoute</span></a></p></td>
-<td class="parameter_annotations"> </td>
-</tr>
-<tr>
-<td class="parameter_name"><p>dest</p></td>
-<td class="parameter_description"><p>a buffer in which to store the destination in binary format.</p></td>
+<tbody><tr>
+<td class="parameter_name"><p>self</p></td>
+<td class="parameter_description"><p>the <a class="link" href="NMSettingIPConfig.html#NMIPRoutingRule"><span class="type">NMIPRoutingRule</span></a> instance</p></td>
 <td class="parameter_annotations"> </td>
-</tr>
-</tbody>
+</tr></tbody>
 </table></div>
 </div>
+<div class="refsect3">
+<a name="nm-ip-routing-rule-get-to.returns"></a><h4>Returns</h4>
+<p>the set to/dst parameter or
+<a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>, if no value is set. </p>
+<p><span class="annotation">[<acronym title="Don't free data after the code is done."><span class="acronym">transfer none</span></acronym>]</span></p>
+</div>
+<p class="since">Since: 1.18</p>
 </div>
 <hr>
 <div class="refsect2">
-<a name="nm-ip-route-set-dest-binary"></a><h3>nm_ip_route_set_dest_binary ()</h3>
+<a name="nm-ip-routing-rule-set-to"></a><h3>nm_ip_routing_rule_set_to ()</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>
-nm_ip_route_set_dest_binary (<em class="parameter"><code><a class="link" href="NMSettingIPConfig.html#NMIPRoute"><span class="type">NMIPRoute</span></a> *route</code></em>,
-                             <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gconstpointer"><span class="type">gconstpointer</span></a> dest</code></em>);</pre>
-<p>Sets the destination property of this route object.</p>
-<p><em class="parameter"><code>dest</code></em>
- must point to a buffer that is the correct size for <em class="parameter"><code>route</code></em>
-'s family.</p>
-<p><span class="annotation">[<acronym title="Exposed in C code, not necessarily available in other languages."><span class="acronym">skip</span></acronym>]</span></p>
+nm_ip_routing_rule_set_to (<em class="parameter"><code><a class="link" href="NMSettingIPConfig.html#NMIPRoutingRule"><span class="type">NMIPRoutingRule</span></a> *self</code></em>,
+                           <em class="parameter"><code>const <span class="type">char</span> *to</code></em>,
+                           <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint8"><span class="type">guint8</span></a> len</code></em>);</pre>
+<p>Setting invalid values is accepted, but will later fail
+during <a class="link" href="NMSettingIPConfig.html#nm-ip-routing-rule-validate" title="nm_ip_routing_rule_validate ()"><code class="function">nm_ip_routing_rule_validate()</code></a>.</p>
 <div class="refsect3">
-<a name="nm-ip-route-set-dest-binary.parameters"></a><h4>Parameters</h4>
+<a name="nm-ip-routing-rule-set-to.parameters"></a><h4>Parameters</h4>
 <div class="informaltable"><table class="informaltable" width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -2017,27 +3695,35 @@ nm_ip_route_set_dest_binary (<em class="parameter"><code><a class="link" href="N
 </colgroup>
 <tbody>
 <tr>
-<td class="parameter_name"><p>route</p></td>
-<td class="parameter_description"><p>the <a class="link" href="NMSettingIPConfig.html#NMIPRoute"><span class="type">NMIPRoute</span></a></p></td>
+<td class="parameter_name"><p>self</p></td>
+<td class="parameter_description"><p>the <a class="link" href="NMSettingIPConfig.html#NMIPRoutingRule"><span class="type">NMIPRoutingRule</span></a> instance</p></td>
 <td class="parameter_annotations"> </td>
 </tr>
 <tr>
-<td class="parameter_name"><p>dest</p></td>
-<td class="parameter_description"><p>the route's destination, in binary format</p></td>
+<td class="parameter_name"><p>to</p></td>
+<td class="parameter_description"><p>the to/dst address to set.
+The address family must match. </p></td>
+<td class="parameter_annotations"><span class="annotation">[<acronym title="NULL is OK, both for passing and for returning."><span class="acronym">allow-none</span></acronym>]</span></td>
+</tr>
+<tr>
+<td class="parameter_name"><p>len</p></td>
+<td class="parameter_description"><p>the corresponding prefix length of the address.
+If <em class="parameter"><code>to</code></em>
+is <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>, this valid is ignored.</p></td>
 <td class="parameter_annotations"> </td>
 </tr>
 </tbody>
 </table></div>
 </div>
+<p class="since">Since: 1.18</p>
 </div>
 <hr>
 <div class="refsect2">
-<a name="nm-ip-route-get-prefix"></a><h3>nm_ip_route_get_prefix ()</h3>
-<pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint"><span class="returnvalue">guint</span></a>
-nm_ip_route_get_prefix (<em class="parameter"><code><a class="link" href="NMSettingIPConfig.html#NMIPRoute"><span class="type">NMIPRoute</span></a> *route</code></em>);</pre>
-<p>Gets the IP prefix (ie "24" or "30" etc) of this route.</p>
+<a name="nm-ip-routing-rule-get-iifname"></a><h3>nm_ip_routing_rule_get_iifname ()</h3>
+<pre class="programlisting">const <span class="returnvalue">char</span> *
+nm_ip_routing_rule_get_iifname (<em class="parameter"><code>const <a class="link" href="NMSettingIPConfig.html#NMIPRoutingRule"><span class="type">NMIPRoutingRule</span></a> *self</code></em>);</pre>
 <div class="refsect3">
-<a name="nm-ip-route-get-prefix.parameters"></a><h4>Parameters</h4>
+<a name="nm-ip-routing-rule-get-iifname.parameters"></a><h4>Parameters</h4>
 <div class="informaltable"><table class="informaltable" width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -2045,26 +3731,31 @@ nm_ip_route_get_prefix (<em class="parameter"><code><a class="link" href="NMSett
 <col width="200px" class="parameters_annotations">
 </colgroup>
 <tbody><tr>
-<td class="parameter_name"><p>route</p></td>
-<td class="parameter_description"><p>the <a class="link" href="NMSettingIPConfig.html#NMIPRoute"><span class="type">NMIPRoute</span></a></p></td>
+<td class="parameter_name"><p>self</p></td>
+<td class="parameter_description"><p>the <a class="link" href="NMSettingIPConfig.html#NMIPRoutingRule"><span class="type">NMIPRoutingRule</span></a> instance.</p></td>
 <td class="parameter_annotations"> </td>
 </tr></tbody>
 </table></div>
 </div>
 <div class="refsect3">
-<a name="nm-ip-route-get-prefix.returns"></a><h4>Returns</h4>
-<p> the IP prefix</p>
+<a name="nm-ip-routing-rule-get-iifname.returns"></a><h4>Returns</h4>
+<p>the set iifname or <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> if unset. </p>
+<p><span class="annotation">[<acronym title="Don't free data after the code is done."><span class="acronym">transfer none</span></acronym>]</span></p>
 </div>
+<p class="since">Since: 1.18</p>
 </div>
 <hr>
 <div class="refsect2">
-<a name="nm-ip-route-set-prefix"></a><h3>nm_ip_route_set_prefix ()</h3>
+<a name="nm-ip-routing-rule-set-iifname"></a><h3>nm_ip_routing_rule_set_iifname ()</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>
-nm_ip_route_set_prefix (<em class="parameter"><code><a class="link" href="NMSettingIPConfig.html#NMIPRoute"><span class="type">NMIPRoute</span></a> *route</code></em>,
-                        <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> prefix</code></em>);</pre>
-<p>Sets the prefix property of this route object.</p>
-<div class="refsect3">
-<a name="nm-ip-route-set-prefix.parameters"></a><h4>Parameters</h4>
+nm_ip_routing_rule_set_iifname (<em class="parameter"><code><a class="link" href="NMSettingIPConfig.html#NMIPRoutingRule"><span class="type">NMIPRoutingRule</span></a> *self</code></em>,
+                                <em class="parameter"><code>const <span class="type">char</span> *iifname</code></em>);</pre>
+<p>The name supports C backslash escaping for non-UTF-8 characters.
+Note that <a class="link" href="NMSettingIPConfig.html#nm-ip-routing-rule-from-string" title="nm_ip_routing_rule_from_string ()"><code class="function">nm_ip_routing_rule_from_string()</code></a> too uses backslash
+escaping when tokenizing the words by whitespace. So, in string
+representation you'd get double backslashs.</p>
+<div class="refsect3">
+<a name="nm-ip-routing-rule-set-iifname.parameters"></a><h4>Parameters</h4>
 <div class="informaltable"><table class="informaltable" width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -2073,28 +3764,27 @@ nm_ip_route_set_prefix (<em class="parameter"><code><a class="link" href="NMSett
 </colgroup>
 <tbody>
 <tr>
-<td class="parameter_name"><p>route</p></td>
-<td class="parameter_description"><p>the <a class="link" href="NMSettingIPConfig.html#NMIPRoute"><span class="type">NMIPRoute</span></a></p></td>
+<td class="parameter_name"><p>self</p></td>
+<td class="parameter_description"><p>the <a class="link" href="NMSettingIPConfig.html#NMIPRoutingRule"><span class="type">NMIPRoutingRule</span></a> instance.</p></td>
 <td class="parameter_annotations"> </td>
 </tr>
 <tr>
-<td class="parameter_name"><p>prefix</p></td>
-<td class="parameter_description"><p>the route prefix</p></td>
-<td class="parameter_annotations"> </td>
+<td class="parameter_name"><p>iifname</p></td>
+<td class="parameter_description"><p>the iifname to set or <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> to unset. </p></td>
+<td class="parameter_annotations"><span class="annotation">[<acronym title="NULL is OK, both for passing and for returning."><span class="acronym">allow-none</span></acronym>]</span></td>
 </tr>
 </tbody>
 </table></div>
 </div>
+<p class="since">Since: 1.18</p>
 </div>
 <hr>
 <div class="refsect2">
-<a name="nm-ip-route-get-next-hop"></a><h3>nm_ip_route_get_next_hop ()</h3>
+<a name="nm-ip-routing-rule-get-oifname"></a><h3>nm_ip_routing_rule_get_oifname ()</h3>
 <pre class="programlisting">const <span class="returnvalue">char</span> *
-nm_ip_route_get_next_hop (<em class="parameter"><code><a class="link" href="NMSettingIPConfig.html#NMIPRoute"><span class="type">NMIPRoute</span></a> *route</code></em>);</pre>
-<p>Gets the IP address of the next hop of this route; this will be <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> if the
-route has no next hop.</p>
+nm_ip_routing_rule_get_oifname (<em class="parameter"><code>const <a class="link" href="NMSettingIPConfig.html#NMIPRoutingRule"><span class="type">NMIPRoutingRule</span></a> *self</code></em>);</pre>
 <div class="refsect3">
-<a name="nm-ip-route-get-next-hop.parameters"></a><h4>Parameters</h4>
+<a name="nm-ip-routing-rule-get-oifname.parameters"></a><h4>Parameters</h4>
 <div class="informaltable"><table class="informaltable" width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -2102,31 +3792,31 @@ route has no next hop.</p>
 <col width="200px" class="parameters_annotations">
 </colgroup>
 <tbody><tr>
-<td class="parameter_name"><p>route</p></td>
-<td class="parameter_description"><p>the <a class="link" href="NMSettingIPConfig.html#NMIPRoute"><span class="type">NMIPRoute</span></a></p></td>
+<td class="parameter_name"><p>self</p></td>
+<td class="parameter_description"><p>the <a class="link" href="NMSettingIPConfig.html#NMIPRoutingRule"><span class="type">NMIPRoutingRule</span></a> instance.</p></td>
 <td class="parameter_annotations"> </td>
 </tr></tbody>
 </table></div>
 </div>
 <div class="refsect3">
-<a name="nm-ip-route-get-next-hop.returns"></a><h4>Returns</h4>
-<p> the IP address of the next hop, or <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> if this is a device route.</p>
+<a name="nm-ip-routing-rule-get-oifname.returns"></a><h4>Returns</h4>
+<p>the set oifname or <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> if unset. </p>
+<p><span class="annotation">[<acronym title="Don't free data after the code is done."><span class="acronym">transfer none</span></acronym>]</span></p>
 </div>
+<p class="since">Since: 1.18</p>
 </div>
 <hr>
 <div class="refsect2">
-<a name="nm-ip-route-set-next-hop"></a><h3>nm_ip_route_set_next_hop ()</h3>
+<a name="nm-ip-routing-rule-set-oifname"></a><h3>nm_ip_routing_rule_set_oifname ()</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>
-nm_ip_route_set_next_hop (<em class="parameter"><code><a class="link" href="NMSettingIPConfig.html#NMIPRoute"><span class="type">NMIPRoute</span></a> *route</code></em>,
-                          <em class="parameter"><code>const <span class="type">char</span> *next_hop</code></em>);</pre>
-<p>Sets the next-hop property of this route object.</p>
-<p><em class="parameter"><code>next_hop</code></em>
- (if non-<a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>) must be a valid address of <em class="parameter"><code>route</code></em>
-'s family. If you
-aren't sure you have a valid address, use <a class="link" href="libnm-nm-utils.html#nm-utils-ipaddr-valid" title="nm_utils_ipaddr_valid ()"><code class="function">nm_utils_ipaddr_valid()</code></a> to check
-it.</p>
-<div class="refsect3">
-<a name="nm-ip-route-set-next-hop.parameters"></a><h4>Parameters</h4>
+nm_ip_routing_rule_set_oifname (<em class="parameter"><code><a class="link" href="NMSettingIPConfig.html#NMIPRoutingRule"><span class="type">NMIPRoutingRule</span></a> *self</code></em>,
+                                <em class="parameter"><code>const <span class="type">char</span> *oifname</code></em>);</pre>
+<p>The name supports C backslash escaping for non-UTF-8 characters.
+Note that <a class="link" href="NMSettingIPConfig.html#nm-ip-routing-rule-from-string" title="nm_ip_routing_rule_from_string ()"><code class="function">nm_ip_routing_rule_from_string()</code></a> too uses backslash
+escaping when tokenizing the words by whitespace. So, in string
+representation you'd get double backslashs.</p>
+<div class="refsect3">
+<a name="nm-ip-routing-rule-set-oifname.parameters"></a><h4>Parameters</h4>
 <div class="informaltable"><table class="informaltable" width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -2135,74 +3825,56 @@ it.</p>
 </colgroup>
 <tbody>
 <tr>
-<td class="parameter_name"><p>route</p></td>
-<td class="parameter_description"><p>the <a class="link" href="NMSettingIPConfig.html#NMIPRoute"><span class="type">NMIPRoute</span></a></p></td>
+<td class="parameter_name"><p>self</p></td>
+<td class="parameter_description"><p>the <a class="link" href="NMSettingIPConfig.html#NMIPRoutingRule"><span class="type">NMIPRoutingRule</span></a> instance.</p></td>
 <td class="parameter_annotations"> </td>
 </tr>
 <tr>
-<td class="parameter_name"><p>next_hop</p></td>
-<td class="parameter_description"><p>the route's next hop, as a string. </p></td>
+<td class="parameter_name"><p>oifname</p></td>
+<td class="parameter_description"><p>the oifname to set or <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> to unset. </p></td>
 <td class="parameter_annotations"><span class="annotation">[<acronym title="NULL is OK, both for passing and for returning."><span class="acronym">allow-none</span></acronym>]</span></td>
 </tr>
 </tbody>
 </table></div>
 </div>
+<p class="since">Since: 1.18</p>
 </div>
 <hr>
 <div class="refsect2">
-<a name="nm-ip-route-get-next-hop-binary"></a><h3>nm_ip_route_get_next_hop_binary ()</h3>
-<pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
-nm_ip_route_get_next_hop_binary (<em class="parameter"><code><a class="link" href="NMSettingIPConfig.html#NMIPRoute"><span class="type">NMIPRoute</span></a> *route</code></em>,
-                                 <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> next_hop</code></em>);</pre>
-<p>Gets the next hop property of this route object.</p>
-<p><em class="parameter"><code>next_hop</code></em>
- must point to a buffer that is the correct size for <em class="parameter"><code>route</code></em>
-'s family.</p>
-<p><span class="annotation">[<acronym title="Exposed in C code, not necessarily available in other languages."><span class="acronym">skip</span></acronym>]</span></p>
+<a name="nm-ip-routing-rule-get-action"></a><h3>nm_ip_routing_rule_get_action ()</h3>
+<pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint8"><span class="returnvalue">guint8</span></a>
+nm_ip_routing_rule_get_action (<em class="parameter"><code>const <a class="link" href="NMSettingIPConfig.html#NMIPRoutingRule"><span class="type">NMIPRoutingRule</span></a> *self</code></em>);</pre>
 <div class="refsect3">
-<a name="nm-ip-route-get-next-hop-binary.parameters"></a><h4>Parameters</h4>
+<a name="nm-ip-routing-rule-get-action.parameters"></a><h4>Parameters</h4>
 <div class="informaltable"><table class="informaltable" width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
 <col class="parameters_description">
 <col width="200px" class="parameters_annotations">
 </colgroup>
-<tbody>
-<tr>
-<td class="parameter_name"><p>route</p></td>
-<td class="parameter_description"><p>the <a class="link" href="NMSettingIPConfig.html#NMIPRoute"><span class="type">NMIPRoute</span></a></p></td>
-<td class="parameter_annotations"> </td>
-</tr>
-<tr>
-<td class="parameter_name"><p>next_hop</p></td>
-<td class="parameter_description"><p>a buffer in which to store the next hop in binary format.</p></td>
+<tbody><tr>
+<td class="parameter_name"><p>self</p></td>
+<td class="parameter_description"><p>the <a class="link" href="NMSettingIPConfig.html#NMIPRoutingRule"><span class="type">NMIPRoutingRule</span></a> instance</p></td>
 <td class="parameter_annotations"> </td>
-</tr>
-</tbody>
+</tr></tbody>
 </table></div>
 </div>
 <div class="refsect3">
-<a name="nm-ip-route-get-next-hop-binary.returns"></a><h4>Returns</h4>
-<p> <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> if <em class="parameter"><code>route</code></em>
-has a next hop, <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#FALSE:CAPS"><code class="literal">FALSE</code></a> if not (in which case
-<em class="parameter"><code>next_hop</code></em>
-will be zeroed out)</p>
+<a name="nm-ip-routing-rule-get-action.returns"></a><h4>Returns</h4>
+<p> the set action.</p>
 </div>
+<p class="since">Since: 1.18</p>
 </div>
 <hr>
 <div class="refsect2">
-<a name="nm-ip-route-set-next-hop-binary"></a><h3>nm_ip_route_set_next_hop_binary ()</h3>
+<a name="nm-ip-routing-rule-set-action"></a><h3>nm_ip_routing_rule_set_action ()</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>
-nm_ip_route_set_next_hop_binary (<em class="parameter"><code><a class="link" href="NMSettingIPConfig.html#NMIPRoute"><span class="type">NMIPRoute</span></a> *route</code></em>,
-                                 <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gconstpointer"><span class="type">gconstpointer</span></a> next_hop</code></em>);</pre>
-<p>Sets the destination property of this route object.</p>
-<p><em class="parameter"><code>next_hop</code></em>
- (if non-<a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>) must point to a buffer that is the correct size for
-<em class="parameter"><code>route</code></em>
-'s family.</p>
-<p><span class="annotation">[<acronym title="Exposed in C code, not necessarily available in other languages."><span class="acronym">skip</span></acronym>]</span></p>
+nm_ip_routing_rule_set_action (<em class="parameter"><code><a class="link" href="NMSettingIPConfig.html#NMIPRoutingRule"><span class="type">NMIPRoutingRule</span></a> *self</code></em>,
+                               <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint8"><span class="type">guint8</span></a> action</code></em>);</pre>
+<p>Note that currently only certain actions are allowed. <a class="link" href="NMSettingIPConfig.html#nm-ip-routing-rule-validate" title="nm_ip_routing_rule_validate ()"><code class="function">nm_ip_routing_rule_validate()</code></a>
+will reject unsupported actions as invalid.</p>
 <div class="refsect3">
-<a name="nm-ip-route-set-next-hop-binary.parameters"></a><h4>Parameters</h4>
+<a name="nm-ip-routing-rule-set-action.parameters"></a><h4>Parameters</h4>
 <div class="informaltable"><table class="informaltable" width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -2211,29 +3883,27 @@ nm_ip_route_set_next_hop_binary (<em class="parameter"><code><a class="link" hre
 </colgroup>
 <tbody>
 <tr>
-<td class="parameter_name"><p>route</p></td>
-<td class="parameter_description"><p>the <a class="link" href="NMSettingIPConfig.html#NMIPRoute"><span class="type">NMIPRoute</span></a></p></td>
+<td class="parameter_name"><p>self</p></td>
+<td class="parameter_description"><p>the <a class="link" href="NMSettingIPConfig.html#NMIPRoutingRule"><span class="type">NMIPRoutingRule</span></a> instance</p></td>
 <td class="parameter_annotations"> </td>
 </tr>
 <tr>
-<td class="parameter_name"><p>next_hop</p></td>
-<td class="parameter_description"><p>the route's next hop, in binary format</p></td>
+<td class="parameter_name"><p>action</p></td>
+<td class="parameter_description"><p>the action to set</p></td>
 <td class="parameter_annotations"> </td>
 </tr>
 </tbody>
 </table></div>
 </div>
+<p class="since">Since: 1.18</p>
 </div>
 <hr>
 <div class="refsect2">
-<a name="nm-ip-route-get-metric"></a><h3>nm_ip_route_get_metric ()</h3>
-<pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gint64"><span class="returnvalue">gint64</span></a>
-nm_ip_route_get_metric (<em class="parameter"><code><a class="link" href="NMSettingIPConfig.html#NMIPRoute"><span class="type">NMIPRoute</span></a> *route</code></em>);</pre>
-<p>Gets the route metric property of this route object; lower values
-indicate "better" or more preferred routes; -1 indicates "default"
-(meaning NetworkManager will set it appropriately).</p>
+<a name="nm-ip-routing-rule-get-table"></a><h3>nm_ip_routing_rule_get_table ()</h3>
+<pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint32"><span class="returnvalue">guint32</span></a>
+nm_ip_routing_rule_get_table (<em class="parameter"><code>const <a class="link" href="NMSettingIPConfig.html#NMIPRoutingRule"><span class="type">NMIPRoutingRule</span></a> *self</code></em>);</pre>
 <div class="refsect3">
-<a name="nm-ip-route-get-metric.parameters"></a><h4>Parameters</h4>
+<a name="nm-ip-routing-rule-get-table.parameters"></a><h4>Parameters</h4>
 <div class="informaltable"><table class="informaltable" width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -2241,26 +3911,26 @@ indicate "better" or more preferred routes; -1 indicates "default"
 <col width="200px" class="parameters_annotations">
 </colgroup>
 <tbody><tr>
-<td class="parameter_name"><p>route</p></td>
-<td class="parameter_description"><p>the <a class="link" href="NMSettingIPConfig.html#NMIPRoute"><span class="type">NMIPRoute</span></a></p></td>
+<td class="parameter_name"><p>self</p></td>
+<td class="parameter_description"><p>the <a class="link" href="NMSettingIPConfig.html#NMIPRoutingRule"><span class="type">NMIPRoutingRule</span></a> instance</p></td>
 <td class="parameter_annotations"> </td>
 </tr></tbody>
 </table></div>
 </div>
 <div class="refsect3">
-<a name="nm-ip-route-get-metric.returns"></a><h4>Returns</h4>
-<p> the route metric</p>
+<a name="nm-ip-routing-rule-get-table.returns"></a><h4>Returns</h4>
+<p> the set table.</p>
 </div>
+<p class="since">Since: 1.18</p>
 </div>
 <hr>
-<div class="refsect2">
-<a name="nm-ip-route-set-metric"></a><h3>nm_ip_route_set_metric ()</h3>
-<pre class="programlisting"><span class="returnvalue">void</span>
-nm_ip_route_set_metric (<em class="parameter"><code><a class="link" href="NMSettingIPConfig.html#NMIPRoute"><span class="type">NMIPRoute</span></a> *route</code></em>,
-                        <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gint64"><span class="type">gint64</span></a> metric</code></em>);</pre>
-<p>Sets the metric property of this route object.</p>
+<div class="refsect2">
+<a name="nm-ip-routing-rule-set-table"></a><h3>nm_ip_routing_rule_set_table ()</h3>
+<pre class="programlisting"><span class="returnvalue">void</span>
+nm_ip_routing_rule_set_table (<em class="parameter"><code><a class="link" href="NMSettingIPConfig.html#NMIPRoutingRule"><span class="type">NMIPRoutingRule</span></a> *self</code></em>,
+                              <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> table</code></em>);</pre>
 <div class="refsect3">
-<a name="nm-ip-route-set-metric.parameters"></a><h4>Parameters</h4>
+<a name="nm-ip-routing-rule-set-table.parameters"></a><h4>Parameters</h4>
 <div class="informaltable"><table class="informaltable" width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -2269,58 +3939,63 @@ nm_ip_route_set_metric (<em class="parameter"><code><a class="link" href="NMSett
 </colgroup>
 <tbody>
 <tr>
-<td class="parameter_name"><p>route</p></td>
-<td class="parameter_description"><p>the <a class="link" href="NMSettingIPConfig.html#NMIPRoute"><span class="type">NMIPRoute</span></a></p></td>
+<td class="parameter_name"><p>self</p></td>
+<td class="parameter_description"><p>the <a class="link" href="NMSettingIPConfig.html#NMIPRoutingRule"><span class="type">NMIPRoutingRule</span></a> instance</p></td>
 <td class="parameter_annotations"> </td>
 </tr>
 <tr>
-<td class="parameter_name"><p>metric</p></td>
-<td class="parameter_description"><p>the route metric (or -1 for "default")</p></td>
+<td class="parameter_name"><p>table</p></td>
+<td class="parameter_description"><p>the table to set</p></td>
 <td class="parameter_annotations"> </td>
 </tr>
 </tbody>
 </table></div>
 </div>
+<p class="since">Since: 1.18</p>
 </div>
 <hr>
 <div class="refsect2">
-<a name="nm-ip-route-get-attribute-names"></a><h3>nm_ip_route_get_attribute_names ()</h3>
-<pre class="programlisting"><span class="returnvalue">char</span> **
-nm_ip_route_get_attribute_names (<em class="parameter"><code><a class="link" href="NMSettingIPConfig.html#NMIPRoute"><span class="type">NMIPRoute</span></a> *route</code></em>);</pre>
-<p>Gets an array of attribute names defined on <em class="parameter"><code>route</code></em>
-.</p>
+<a name="nm-ip-routing-rule-cmp"></a><h3>nm_ip_routing_rule_cmp ()</h3>
+<pre class="programlisting"><span class="returnvalue">int</span>
+nm_ip_routing_rule_cmp (<em class="parameter"><code>const <a class="link" href="NMSettingIPConfig.html#NMIPRoutingRule"><span class="type">NMIPRoutingRule</span></a> *rule</code></em>,
+                        <em class="parameter"><code>const <a class="link" href="NMSettingIPConfig.html#NMIPRoutingRule"><span class="type">NMIPRoutingRule</span></a> *other</code></em>);</pre>
 <div class="refsect3">
-<a name="nm-ip-route-get-attribute-names.parameters"></a><h4>Parameters</h4>
+<a name="nm-ip-routing-rule-cmp.parameters"></a><h4>Parameters</h4>
 <div class="informaltable"><table class="informaltable" width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
 <col class="parameters_description">
 <col width="200px" class="parameters_annotations">
 </colgroup>
-<tbody><tr>
-<td class="parameter_name"><p>route</p></td>
-<td class="parameter_description"><p>the <a class="link" href="NMSettingIPConfig.html#NMIPRoute"><span class="type">NMIPRoute</span></a></p></td>
-<td class="parameter_annotations"> </td>
-</tr></tbody>
+<tbody>
+<tr>
+<td class="parameter_name"><p>rule</p></td>
+<td class="parameter_description"><p>the <a class="link" href="NMSettingIPConfig.html#NMIPRoutingRule"><span class="type">NMIPRoutingRule</span></a> instance to compare. </p></td>
+<td class="parameter_annotations"><span class="annotation">[<acronym title="NULL is OK, both for passing and for returning."><span class="acronym">allow-none</span></acronym>]</span></td>
+</tr>
+<tr>
+<td class="parameter_name"><p>other</p></td>
+<td class="parameter_description"><p>the other <a class="link" href="NMSettingIPConfig.html#NMIPRoutingRule"><span class="type">NMIPRoutingRule</span></a> instance to compare. </p></td>
+<td class="parameter_annotations"><span class="annotation">[<acronym title="NULL is OK, both for passing and for returning."><span class="acronym">allow-none</span></acronym>]</span></td>
+</tr>
+</tbody>
 </table></div>
 </div>
 <div class="refsect3">
-<a name="nm-ip-route-get-attribute-names.returns"></a><h4>Returns</h4>
-<p>a <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>-terminated array of attribute names. </p>
-<p><span class="annotation">[<acronym title="Free data after the code is done."><span class="acronym">transfer full</span></acronym>]</span></p>
+<a name="nm-ip-routing-rule-cmp.returns"></a><h4>Returns</h4>
+<p> zero, a positive, or a negative integer to indicate
+equality or how the arguments compare.</p>
 </div>
+<p class="since">Since: 1.18</p>
 </div>
 <hr>
 <div class="refsect2">
-<a name="nm-ip-route-get-attribute"></a><h3>nm_ip_route_get_attribute ()</h3>
-<pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-GVariant.html#GVariant"><span class="returnvalue">GVariant</span></a> *
-nm_ip_route_get_attribute (<em class="parameter"><code><a class="link" href="NMSettingIPConfig.html#NMIPRoute"><span class="type">NMIPRoute</span></a> *route</code></em>,
-                           <em class="parameter"><code>const <span class="type">char</span> *name</code></em>);</pre>
-<p>Gets the value of the attribute with name <em class="parameter"><code>name</code></em>
- on <em class="parameter"><code>route</code></em>
-</p>
+<a name="nm-ip-routing-rule-validate"></a><h3>nm_ip_routing_rule_validate ()</h3>
+<pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
+nm_ip_routing_rule_validate (<em class="parameter"><code>const <a class="link" href="NMSettingIPConfig.html#NMIPRoutingRule"><span class="type">NMIPRoutingRule</span></a> *self</code></em>,
+                             <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> **error</code></em>);</pre>
 <div class="refsect3">
-<a name="nm-ip-route-get-attribute.parameters"></a><h4>Parameters</h4>
+<a name="nm-ip-routing-rule-validate.parameters"></a><h4>Parameters</h4>
 <div class="informaltable"><table class="informaltable" width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -2329,39 +4004,34 @@ nm_ip_route_get_attribute (<em class="parameter"><code><a class="link" href="NMS
 </colgroup>
 <tbody>
 <tr>
-<td class="parameter_name"><p>route</p></td>
-<td class="parameter_description"><p>the <a class="link" href="NMSettingIPConfig.html#NMIPRoute"><span class="type">NMIPRoute</span></a></p></td>
+<td class="parameter_name"><p>self</p></td>
+<td class="parameter_description"><p>the <a class="link" href="NMSettingIPConfig.html#NMIPRoutingRule"><span class="type">NMIPRoutingRule</span></a> instance to validate</p></td>
 <td class="parameter_annotations"> </td>
 </tr>
 <tr>
-<td class="parameter_name"><p>name</p></td>
-<td class="parameter_description"><p>the name of an route attribute</p></td>
-<td class="parameter_annotations"> </td>
+<td class="parameter_name"><p>error</p></td>
+<td class="parameter_description"><p>the error result if validation fails. </p></td>
+<td class="parameter_annotations"><span class="annotation">[<acronym title="NULL is OK, both for passing and for returning."><span class="acronym">allow-none</span></acronym>][<acronym title="Parameter for returning results. Default is transfer full."><span class="acronym">out</span></acronym>]</span></td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <div class="refsect3">
-<a name="nm-ip-route-get-attribute.returns"></a><h4>Returns</h4>
-<p>the value of the attribute with name <em class="parameter"><code>name</code></em>
-on
-<em class="parameter"><code>route</code></em>
-, or <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> if <em class="parameter"><code>route</code></em>
-has no such attribute. </p>
-<p><span class="annotation">[<acronym title="Don't free data after the code is done."><span class="acronym">transfer none</span></acronym>]</span></p>
+<a name="nm-ip-routing-rule-validate.returns"></a><h4>Returns</h4>
+<p> <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> if the rule validates.</p>
 </div>
+<p class="since">Since: 1.18</p>
 </div>
 <hr>
 <div class="refsect2">
-<a name="nm-ip-route-set-attribute"></a><h3>nm_ip_route_set_attribute ()</h3>
-<pre class="programlisting"><span class="returnvalue">void</span>
-nm_ip_route_set_attribute (<em class="parameter"><code><a class="link" href="NMSettingIPConfig.html#NMIPRoute"><span class="type">NMIPRoute</span></a> *route</code></em>,
-                           <em class="parameter"><code>const <span class="type">char</span> *name</code></em>,
-                           <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-GVariant.html#GVariant"><span class="type">GVariant</span></a> *value</code></em>);</pre>
-<p>Sets the named attribute on <em class="parameter"><code>route</code></em>
- to the given value.</p>
+<a name="nm-ip-routing-rule-from-string"></a><h3>nm_ip_routing_rule_from_string ()</h3>
+<pre class="programlisting"><a class="link" href="NMSettingIPConfig.html#NMIPRoutingRule"><span class="returnvalue">NMIPRoutingRule</span></a> *
+nm_ip_routing_rule_from_string (<em class="parameter"><code>const <span class="type">char</span> *str</code></em>,
+                                <em class="parameter"><code><a class="link" href="NMSettingIPConfig.html#NMIPRoutingRuleAsStringFlags" title="enum NMIPRoutingRuleAsStringFlags"><span class="type">NMIPRoutingRuleAsStringFlags</span></a> to_string_flags</code></em>,
+                                <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Hash-Tables.html#GHashTable"><span class="type">GHashTable</span></a> *extra_args</code></em>,
+                                <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> **error</code></em>);</pre>
 <div class="refsect3">
-<a name="nm-ip-route-set-attribute.parameters"></a><h4>Parameters</h4>
+<a name="nm-ip-routing-rule-from-string.parameters"></a><h4>Parameters</h4>
 <div class="informaltable"><table class="informaltable" width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -2370,49 +4040,47 @@ nm_ip_route_set_attribute (<em class="parameter"><code><a class="link" href="NMS
 </colgroup>
 <tbody>
 <tr>
-<td class="parameter_name"><p>route</p></td>
-<td class="parameter_description"><p>the <a class="link" href="NMSettingIPConfig.html#NMIPRoute"><span class="type">NMIPRoute</span></a></p></td>
+<td class="parameter_name"><p>str</p></td>
+<td class="parameter_description"><p>the string representation to convert to an <a class="link" href="NMSettingIPConfig.html#NMIPRoutingRule"><span class="type">NMIPRoutingRule</span></a></p></td>
 <td class="parameter_annotations"> </td>
 </tr>
 <tr>
-<td class="parameter_name"><p>name</p></td>
-<td class="parameter_description"><p>the name of a route attribute</p></td>
+<td class="parameter_name"><p>to_string_flags</p></td>
+<td class="parameter_description"><p><a class="link" href="NMSettingIPConfig.html#NMIPRoutingRuleAsStringFlags" title="enum NMIPRoutingRuleAsStringFlags"><span class="type">NMIPRoutingRuleAsStringFlags</span></a> for controlling the
+string conversion.</p></td>
 <td class="parameter_annotations"> </td>
 </tr>
 <tr>
-<td class="parameter_name"><p>value</p></td>
-<td class="parameter_description"><p>the value. </p></td>
-<td class="parameter_annotations"><span class="annotation">[<acronym title="Don't free data after the code is done."><span class="acronym">transfer none</span></acronym>][<acronym title="NULL is OK, both for passing and for returning."><span class="acronym">allow-none</span></acronym>]</span></td>
+<td class="parameter_name"><p>extra_args</p></td>
+<td class="parameter_description"><p>extra arguments for controlling the string
+conversion. Currently not extra arguments are supported. </p></td>
+<td class="parameter_annotations"><span class="annotation">[<acronym title="NULL is OK, both for passing and for returning."><span class="acronym">allow-none</span></acronym>]</span></td>
+</tr>
+<tr>
+<td class="parameter_name"><p>error</p></td>
+<td class="parameter_description"><p>the error reason. </p></td>
+<td class="parameter_annotations"><span class="annotation">[<acronym title="NULL is OK, both for passing and for returning."><span class="acronym">allow-none</span></acronym>][<acronym title="Parameter for returning results. Default is transfer full."><span class="acronym">out</span></acronym>]</span></td>
 </tr>
 </tbody>
 </table></div>
 </div>
-</div>
-<hr>
-<div class="refsect2">
-<a name="nm-ip-route-get-variant-attribute-spec"></a><h3>nm_ip_route_get_variant_attribute_spec ()</h3>
-<pre class="programlisting">const <a class="link" href="libnm-nm-utils.html#NMVariantAttributeSpec" title="NMVariantAttributeSpec"><span class="returnvalue">NMVariantAttributeSpec</span></a> *const *
-nm_ip_route_get_variant_attribute_spec
-                               (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
 <div class="refsect3">
-<a name="nm-ip-route-get-variant-attribute-spec.returns"></a><h4>Returns</h4>
-<p> the specifiers for route attributes</p>
+<a name="nm-ip-routing-rule-from-string.returns"></a><h4>Returns</h4>
+<p>the new <a class="link" href="NMSettingIPConfig.html#NMIPRoutingRule"><span class="type">NMIPRoutingRule</span></a> or <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> on error. </p>
+<p><span class="annotation">[<acronym title="Free data after the code is done."><span class="acronym">transfer full</span></acronym>]</span></p>
 </div>
-<p class="since">Since: 1.8</p>
+<p class="since">Since: 1.18</p>
 </div>
 <hr>
 <div class="refsect2">
-<a name="nm-ip-route-attribute-validate"></a><h3>nm_ip_route_attribute_validate ()</h3>
-<pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
-nm_ip_route_attribute_validate (<em class="parameter"><code>const <span class="type">char</span> *name</code></em>,
-                                <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-GVariant.html#GVariant"><span class="type">GVariant</span></a> *value</code></em>,
-                                <em class="parameter"><code><span class="type">int</span> family</code></em>,
-                                <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a> *known</code></em>,
-                                <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> **error</code></em>);</pre>
-<p>Validates a route attribute, i.e. checks that the attribute is a known one
-and the value is of the correct type and well-formed.</p>
+<a name="nm-ip-routing-rule-to-string"></a><h3>nm_ip_routing_rule_to_string ()</h3>
+<pre class="programlisting"><span class="returnvalue">char</span> *
+nm_ip_routing_rule_to_string (<em class="parameter"><code>const <a class="link" href="NMSettingIPConfig.html#NMIPRoutingRule"><span class="type">NMIPRoutingRule</span></a> *self</code></em>,
+                              <em class="parameter"><code><a class="link" href="NMSettingIPConfig.html#NMIPRoutingRuleAsStringFlags" title="enum NMIPRoutingRuleAsStringFlags"><span class="type">NMIPRoutingRuleAsStringFlags</span></a> to_string_flags</code></em>,
+                              <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Hash-Tables.html#GHashTable"><span class="type">GHashTable</span></a> *extra_args</code></em>,
+                              <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> **error</code></em>);</pre>
 <div class="refsect3">
-<a name="nm-ip-route-attribute-validate.parameters"></a><h4>Parameters</h4>
+<a name="nm-ip-routing-rule-to-string.parameters"></a><h4>Parameters</h4>
 <div class="informaltable"><table class="informaltable" width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -2421,38 +4089,36 @@ and the value is of the correct type and well-formed.</p>
 </colgroup>
 <tbody>
 <tr>
-<td class="parameter_name"><p>name</p></td>
-<td class="parameter_description"><p>the attribute name</p></td>
-<td class="parameter_annotations"> </td>
-</tr>
-<tr>
-<td class="parameter_name"><p>value</p></td>
-<td class="parameter_description"><p>the attribute value</p></td>
+<td class="parameter_name"><p>self</p></td>
+<td class="parameter_description"><p>the <a class="link" href="NMSettingIPConfig.html#NMIPRoutingRule"><span class="type">NMIPRoutingRule</span></a> instance to convert to string.</p></td>
 <td class="parameter_annotations"> </td>
 </tr>
 <tr>
-<td class="parameter_name"><p>family</p></td>
-<td class="parameter_description"><p>IP address family of the route</p></td>
+<td class="parameter_name"><p>to_string_flags</p></td>
+<td class="parameter_description"><p><a class="link" href="NMSettingIPConfig.html#NMIPRoutingRuleAsStringFlags" title="enum NMIPRoutingRuleAsStringFlags"><span class="type">NMIPRoutingRuleAsStringFlags</span></a> for controlling the
+string conversion.</p></td>
 <td class="parameter_annotations"> </td>
 </tr>
 <tr>
-<td class="parameter_name"><p>known</p></td>
-<td class="parameter_description"><p>on return, whether the attribute name is a known one. </p></td>
-<td class="parameter_annotations"><span class="annotation">[<acronym title="Parameter for returning results. Default is transfer full."><span class="acronym">out</span></acronym>]</span></td>
+<td class="parameter_name"><p>extra_args</p></td>
+<td class="parameter_description"><p>extra arguments for controlling the string
+conversion. Currently not extra arguments are supported. </p></td>
+<td class="parameter_annotations"><span class="annotation">[<acronym title="NULL is OK, both for passing and for returning."><span class="acronym">allow-none</span></acronym>]</span></td>
 </tr>
 <tr>
 <td class="parameter_name"><p>error</p></td>
-<td class="parameter_description"><p>return location for a <a href="https://developer.gnome.org/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a>, or <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>. </p></td>
-<td class="parameter_annotations"><span class="annotation">[<acronym title="NULL is OK, both for passing and for returning."><span class="acronym">allow-none</span></acronym>]</span></td>
+<td class="parameter_description"><p>the error reason. </p></td>
+<td class="parameter_annotations"><span class="annotation">[<acronym title="NULL is OK, both for passing and for returning."><span class="acronym">allow-none</span></acronym>][<acronym title="Parameter for returning results. Default is transfer full."><span class="acronym">out</span></acronym>]</span></td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <div class="refsect3">
-<a name="nm-ip-route-attribute-validate.returns"></a><h4>Returns</h4>
-<p> <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> if the attribute is valid, <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#FALSE:CAPS"><code class="literal">FALSE</code></a> otherwise</p>
+<a name="nm-ip-routing-rule-to-string.returns"></a><h4>Returns</h4>
+<p>the string representation or <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> on error. </p>
+<p><span class="annotation">[<acronym title="Free data after the code is done."><span class="acronym">transfer full</span></acronym>]</span></p>
 </div>
-<p class="since">Since: 1.8</p>
+<p class="since">Since: 1.18</p>
 </div>
 <hr>
 <div class="refsect2">
@@ -3605,6 +5271,161 @@ property.</p>
 </div>
 <hr>
 <div class="refsect2">
+<a name="nm-setting-ip-config-get-num-routing-rules"></a><h3>nm_setting_ip_config_get_num_routing_rules ()</h3>
+<pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint"><span class="returnvalue">guint</span></a>
+nm_setting_ip_config_get_num_routing_rules
+                               (<em class="parameter"><code><a class="link" href="NMSettingIPConfig.html" title="NMSettingIPConfig"><span class="type">NMSettingIPConfig</span></a> *setting</code></em>);</pre>
+<div class="refsect3">
+<a name="nm-setting-ip-config-get-num-routing-rules.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody><tr>
+<td class="parameter_name"><p>setting</p></td>
+<td class="parameter_description"><p>the <a class="link" href="NMSettingIPConfig.html" title="NMSettingIPConfig"><span class="type">NMSettingIPConfig</span></a></p></td>
+<td class="parameter_annotations"> </td>
+</tr></tbody>
+</table></div>
+</div>
+<div class="refsect3">
+<a name="nm-setting-ip-config-get-num-routing-rules.returns"></a><h4>Returns</h4>
+<p> the number of configured routing rules</p>
+</div>
+<p class="since">Since: 1.18</p>
+</div>
+<hr>
+<div class="refsect2">
+<a name="nm-setting-ip-config-get-routing-rule"></a><h3>nm_setting_ip_config_get_routing_rule ()</h3>
+<pre class="programlisting"><a class="link" href="NMSettingIPConfig.html#NMIPRoutingRule"><span class="returnvalue">NMIPRoutingRule</span></a> *
+nm_setting_ip_config_get_routing_rule (<em class="parameter"><code><a class="link" href="NMSettingIPConfig.html" title="NMSettingIPConfig"><span class="type">NMSettingIPConfig</span></a> *setting</code></em>,
+                                       <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> idx</code></em>);</pre>
+<div class="refsect3">
+<a name="nm-setting-ip-config-get-routing-rule.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody>
+<tr>
+<td class="parameter_name"><p>setting</p></td>
+<td class="parameter_description"><p>the <a class="link" href="NMSettingIPConfig.html" title="NMSettingIPConfig"><span class="type">NMSettingIPConfig</span></a></p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>idx</p></td>
+<td class="parameter_description"><p>index number of the routing_rule to return</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<div class="refsect3">
+<a name="nm-setting-ip-config-get-routing-rule.returns"></a><h4>Returns</h4>
+<p>the routing rule at index <em class="parameter"><code>idx</code></em>
+. </p>
+<p><span class="annotation">[<acronym title="Don't free data after the code is done."><span class="acronym">transfer none</span></acronym>]</span></p>
+</div>
+<p class="since">Since: 1.18</p>
+</div>
+<hr>
+<div class="refsect2">
+<a name="nm-setting-ip-config-add-routing-rule"></a><h3>nm_setting_ip_config_add_routing_rule ()</h3>
+<pre class="programlisting"><span class="returnvalue">void</span>
+nm_setting_ip_config_add_routing_rule (<em class="parameter"><code><a class="link" href="NMSettingIPConfig.html" title="NMSettingIPConfig"><span class="type">NMSettingIPConfig</span></a> *setting</code></em>,
+                                       <em class="parameter"><code><a class="link" href="NMSettingIPConfig.html#NMIPRoutingRule"><span class="type">NMIPRoutingRule</span></a> *routing_rule</code></em>);</pre>
+<p>Appends a new routing-rule and associated information to the setting. The
+given routing rules gets sealed and the reference count is incremented.
+The function does not check whether an identical rule already exists
+and always appends the rule to the end of the list.</p>
+<div class="refsect3">
+<a name="nm-setting-ip-config-add-routing-rule.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody>
+<tr>
+<td class="parameter_name"><p>setting</p></td>
+<td class="parameter_description"><p>the <a class="link" href="NMSettingIPConfig.html" title="NMSettingIPConfig"><span class="type">NMSettingIPConfig</span></a></p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>routing_rule</p></td>
+<td class="parameter_description"><p>the <a class="link" href="NMSettingIPConfig.html#NMIPRoutingRule"><span class="type">NMIPRoutingRule</span></a> to add. The address family
+of the added rule must be compatible with the setting.</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<p class="since">Since: 1.18</p>
+</div>
+<hr>
+<div class="refsect2">
+<a name="nm-setting-ip-config-remove-routing-rule"></a><h3>nm_setting_ip_config_remove_routing_rule ()</h3>
+<pre class="programlisting"><span class="returnvalue">void</span>
+nm_setting_ip_config_remove_routing_rule
+                               (<em class="parameter"><code><a class="link" href="NMSettingIPConfig.html" title="NMSettingIPConfig"><span class="type">NMSettingIPConfig</span></a> *setting</code></em>,
+                                <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> idx</code></em>);</pre>
+<p>Removes the routing_rule at index <em class="parameter"><code>idx</code></em>
+.</p>
+<div class="refsect3">
+<a name="nm-setting-ip-config-remove-routing-rule.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody>
+<tr>
+<td class="parameter_name"><p>setting</p></td>
+<td class="parameter_description"><p>the <a class="link" href="NMSettingIPConfig.html" title="NMSettingIPConfig"><span class="type">NMSettingIPConfig</span></a></p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>idx</p></td>
+<td class="parameter_description"><p>index number of the routing_rule</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<p class="since">Since: 1.18</p>
+</div>
+<hr>
+<div class="refsect2">
+<a name="nm-setting-ip-config-clear-routing-rules"></a><h3>nm_setting_ip_config_clear_routing_rules ()</h3>
+<pre class="programlisting"><span class="returnvalue">void</span>
+nm_setting_ip_config_clear_routing_rules
+                               (<em class="parameter"><code><a class="link" href="NMSettingIPConfig.html" title="NMSettingIPConfig"><span class="type">NMSettingIPConfig</span></a> *setting</code></em>);</pre>
+<p>Removes all configured routing rules.</p>
+<div class="refsect3">
+<a name="nm-setting-ip-config-clear-routing-rules.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody><tr>
+<td class="parameter_name"><p>setting</p></td>
+<td class="parameter_description"><p>the <a class="link" href="NMSettingIPConfig.html" title="NMSettingIPConfig"><span class="type">NMSettingIPConfig</span></a></p></td>
+<td class="parameter_annotations"> </td>
+</tr></tbody>
+</table></div>
+</div>
+<p class="since">Since: 1.18</p>
+</div>
+<hr>
+<div class="refsect2">
 <a name="nm-setting-ip-config-get-ignore-auto-routes"></a><h3>nm_setting_ip_config_get_ignore_auto_routes ()</h3>
 <pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
 nm_setting_ip_config_get_ignore_auto_routes
@@ -3931,6 +5752,58 @@ the particular kind of device.</p>
 </div>
 <hr>
 <div class="refsect2">
+<a name="NMIPRoutingRuleAsStringFlags"></a><h3>enum NMIPRoutingRuleAsStringFlags</h3>
+<div class="refsect3">
+<a name="NMIPRoutingRuleAsStringFlags.members"></a><h4>Members</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="300px" class="enum_members_name">
+<col class="enum_members_description">
+<col width="200px" class="enum_members_annotations">
+</colgroup>
+<tbody>
+<tr>
+<td class="enum_member_name"><p><a name="NM-IP-ROUTING-RULE-AS-STRING-FLAGS-NONE:CAPS"></a>NM_IP_ROUTING_RULE_AS_STRING_FLAGS_NONE</p></td>
+<td class="enum_member_description">
+<p>no flags selected.</p>
+</td>
+<td class="enum_member_annotations"> </td>
+</tr>
+<tr>
+<td class="enum_member_name"><p><a name="NM-IP-ROUTING-RULE-AS-STRING-FLAGS-AF-INET:CAPS"></a>NM_IP_ROUTING_RULE_AS_STRING_FLAGS_AF_INET</p></td>
+<td class="enum_member_description">
+<p>whether to allow parsing
+  IPv4 addresses.</p>
+</td>
+<td class="enum_member_annotations"> </td>
+</tr>
+<tr>
+<td class="enum_member_name"><p><a name="NM-IP-ROUTING-RULE-AS-STRING-FLAGS-AF-INET6:CAPS"></a>NM_IP_ROUTING_RULE_AS_STRING_FLAGS_AF_INET6</p></td>
+<td class="enum_member_description">
+<p>whether to allow parsing
+  IPv6 addresses. If both <em class="parameter"><code>NM_IP_ROUTING_RULE_AS_STRING_FLAGS_AF_INET</code></em>
+ and
+  <em class="parameter"><code>NM_IP_ROUTING_RULE_AS_STRING_FLAGS_AF_INET6</code></em>
+ are unset, it's the same
+  as setting them both.</p>
+</td>
+<td class="enum_member_annotations"> </td>
+</tr>
+<tr>
+<td class="enum_member_name"><p><a name="NM-IP-ROUTING-RULE-AS-STRING-FLAGS-VALIDATE:CAPS"></a>NM_IP_ROUTING_RULE_AS_STRING_FLAGS_VALIDATE</p></td>
+<td class="enum_member_description">
+<p>if set, ensure that the
+  rule verfies or fail.</p>
+</td>
+<td class="enum_member_annotations"> </td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<p class="since">Since: 1.18</p>
+</div>
+<hr>
+<div class="refsect2">
 <a name="NM-SETTING-IP-CONFIG-DAD-TIMEOUT-MAX:CAPS"></a><h3>NM_SETTING_IP_CONFIG_DAD_TIMEOUT_MAX</h3>
 <pre class="programlisting">#define NM_SETTING_IP_CONFIG_DAD_TIMEOUT_MAX     30000
 </pre>
@@ -4045,6 +5918,12 @@ the particular kind of device.</p>
 </div>
 <hr>
 <div class="refsect2">
+<a name="NM-SETTING-IP-CONFIG-ROUTING-RULES:CAPS"></a><h3>NM_SETTING_IP_CONFIG_ROUTING_RULES</h3>
+<pre class="programlisting">#define NM_SETTING_IP_CONFIG_ROUTING_RULES      "routing-rules"
+</pre>
+</div>
+<hr>
+<div class="refsect2">
 <a name="NM-SETTING-DNS-OPTION-DEBUG:CAPS"></a><h3>NM_SETTING_DNS_OPTION_DEBUG</h3>
 <pre class="programlisting">#define NM_SETTING_DNS_OPTION_DEBUG                     "debug"
 </pre>
diff --git a/docs/libnm/html/NMSettingSriov.html b/docs/libnm/html/NMSettingSriov.html
index c77a2123..4aa3448b 100644
--- a/docs/libnm/html/NMSettingSriov.html
+++ b/docs/libnm/html/NMSettingSriov.html
@@ -800,6 +800,28 @@ nm_sriov_vf_get_vlan_protocol (<em class="parameter"><code>const <a class="link"
 <a name="nm-sriov-vf-new"></a><h3>nm_sriov_vf_new ()</h3>
 <pre class="programlisting"><a class="link" href="NMSettingSriov.html#NMSriovVF"><span class="returnvalue">NMSriovVF</span></a> *
 nm_sriov_vf_new (<em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> index</code></em>);</pre>
+<p>Creates a new <a class="link" href="NMSettingSriov.html#NMSriovVF"><span class="type">NMSriovVF</span></a> object.</p>
+<div class="refsect3">
+<a name="nm-sriov-vf-new.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody><tr>
+<td class="parameter_name"><p>index</p></td>
+<td class="parameter_description"><p>the VF index</p></td>
+<td class="parameter_annotations"> </td>
+</tr></tbody>
+</table></div>
+</div>
+<div class="refsect3">
+<a name="nm-sriov-vf-new.returns"></a><h4>Returns</h4>
+<p>the new <a class="link" href="NMSettingSriov.html#NMSriovVF"><span class="type">NMSriovVF</span></a> object. </p>
+<p><span class="annotation">[<acronym title="Free data after the code is done."><span class="acronym">transfer full</span></acronym>]</span></p>
+</div>
+<p class="since">Since: 1.14</p>
 </div>
 <hr>
 <div class="refsect2">
diff --git a/docs/libnm/html/NMSettingTCConfig.html b/docs/libnm/html/NMSettingTCConfig.html
index 52cad487..3411c448 100644
--- a/docs/libnm/html/NMSettingTCConfig.html
+++ b/docs/libnm/html/NMSettingTCConfig.html
@@ -112,6 +112,29 @@
 </td>
 </tr>
 <tr>
+<td class="function_type">const <span class="returnvalue">char</span> **
+</td>
+<td class="function_name">
+<a class="link" href="NMSettingTCConfig.html#nm-tc-qdisc-get-attribute-names" title="nm_tc_qdisc_get_attribute_names ()">nm_tc_qdisc_get_attribute_names</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<a href="https://developer.gnome.org/glib/unstable/glib-GVariant.html#GVariant"><span class="returnvalue">GVariant</span></a> *
+</td>
+<td class="function_name">
+<a class="link" href="NMSettingTCConfig.html#nm-tc-qdisc-get-attribute" title="nm_tc_qdisc_get_attribute ()">nm_tc_qdisc_get_attribute</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<span class="returnvalue">void</span>
+</td>
+<td class="function_name">
+<a class="link" href="NMSettingTCConfig.html#nm-tc-qdisc-set-attribute" title="nm_tc_qdisc_set_attribute ()">nm_tc_qdisc_set_attribute</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
 <td class="function_type">
 <a class="link" href="NMSettingTCConfig.html#NMTCAction"><span class="returnvalue">NMTCAction</span></a> *
 </td>
@@ -679,6 +702,116 @@ nm_tc_qdisc_get_parent (<em class="parameter"><code><a class="link" href="NMSett
 </div>
 <hr>
 <div class="refsect2">
+<a name="nm-tc-qdisc-get-attribute-names"></a><h3>nm_tc_qdisc_get_attribute_names ()</h3>
+<pre class="programlisting">const <span class="returnvalue">char</span> **
+nm_tc_qdisc_get_attribute_names (<em class="parameter"><code><a class="link" href="NMSettingTCConfig.html#NMTCQdisc"><span class="type">NMTCQdisc</span></a> *qdisc</code></em>);</pre>
+<p>Gets an array of attribute names defined on <em class="parameter"><code>qdisc</code></em>
+.</p>
+<div class="refsect3">
+<a name="nm-tc-qdisc-get-attribute-names.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody><tr>
+<td class="parameter_name"><p>qdisc</p></td>
+<td class="parameter_description"><p>the <a class="link" href="NMSettingTCConfig.html#NMTCQdisc"><span class="type">NMTCQdisc</span></a></p></td>
+<td class="parameter_annotations"> </td>
+</tr></tbody>
+</table></div>
+</div>
+<div class="refsect3">
+<a name="nm-tc-qdisc-get-attribute-names.returns"></a><h4>Returns</h4>
+<p>a <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>-terminated array of attribute names
+or <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> if no attributes are set. </p>
+<p><span class="annotation">[<acronym title="Free data container after the code is done."><span class="acronym">transfer container</span></acronym>]</span></p>
+</div>
+<p class="since">Since: 1.18</p>
+</div>
+<hr>
+<div class="refsect2">
+<a name="nm-tc-qdisc-get-attribute"></a><h3>nm_tc_qdisc_get_attribute ()</h3>
+<pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-GVariant.html#GVariant"><span class="returnvalue">GVariant</span></a> *
+nm_tc_qdisc_get_attribute (<em class="parameter"><code><a class="link" href="NMSettingTCConfig.html#NMTCQdisc"><span class="type">NMTCQdisc</span></a> *qdisc</code></em>,
+                           <em class="parameter"><code>const <span class="type">char</span> *name</code></em>);</pre>
+<p>Gets the value of the attribute with name <em class="parameter"><code>name</code></em>
+ on <em class="parameter"><code>qdisc</code></em>
+</p>
+<div class="refsect3">
+<a name="nm-tc-qdisc-get-attribute.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody>
+<tr>
+<td class="parameter_name"><p>qdisc</p></td>
+<td class="parameter_description"><p>the <a class="link" href="NMSettingTCConfig.html#NMTCQdisc"><span class="type">NMTCQdisc</span></a></p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>name</p></td>
+<td class="parameter_description"><p>the name of an qdisc attribute</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<div class="refsect3">
+<a name="nm-tc-qdisc-get-attribute.returns"></a><h4>Returns</h4>
+<p>the value of the attribute with name <em class="parameter"><code>name</code></em>
+on
+<em class="parameter"><code>qdisc</code></em>
+, or <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> if <em class="parameter"><code>qdisc</code></em>
+has no such attribute. </p>
+<p><span class="annotation">[<acronym title="Don't free data after the code is done."><span class="acronym">transfer none</span></acronym>]</span></p>
+</div>
+<p class="since">Since: 1.18</p>
+</div>
+<hr>
+<div class="refsect2">
+<a name="nm-tc-qdisc-set-attribute"></a><h3>nm_tc_qdisc_set_attribute ()</h3>
+<pre class="programlisting"><span class="returnvalue">void</span>
+nm_tc_qdisc_set_attribute (<em class="parameter"><code><a class="link" href="NMSettingTCConfig.html#NMTCQdisc"><span class="type">NMTCQdisc</span></a> *qdisc</code></em>,
+                           <em class="parameter"><code>const <span class="type">char</span> *name</code></em>,
+                           <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-GVariant.html#GVariant"><span class="type">GVariant</span></a> *value</code></em>);</pre>
+<p>Sets or clears the named attribute on <em class="parameter"><code>qdisc</code></em>
+ to the given value.</p>
+<div class="refsect3">
+<a name="nm-tc-qdisc-set-attribute.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody>
+<tr>
+<td class="parameter_name"><p>qdisc</p></td>
+<td class="parameter_description"><p>the <a class="link" href="NMSettingTCConfig.html#NMTCQdisc"><span class="type">NMTCQdisc</span></a></p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>name</p></td>
+<td class="parameter_description"><p>the name of an qdisc attribute</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>value</p></td>
+<td class="parameter_description"><p>the value. </p></td>
+<td class="parameter_annotations"><span class="annotation">[<acronym title="Don't free data after the code is done."><span class="acronym">transfer none</span></acronym>][<acronym title="NULL is OK, both for passing and for returning."><span class="acronym">allow-none</span></acronym>]</span></td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<p class="since">Since: 1.18</p>
+</div>
+<hr>
+<div class="refsect2">
 <a name="nm-tc-action-new"></a><h3>nm_tc_action_new ()</h3>
 <pre class="programlisting"><a class="link" href="NMSettingTCConfig.html#NMTCAction"><span class="returnvalue">NMTCAction</span></a> *
 nm_tc_action_new (<em class="parameter"><code>const <span class="type">char</span> *kind</code></em>,
diff --git a/docs/libnm/html/api-index-full.html b/docs/libnm/html/api-index-full.html
index f8b8487c..61c995b7 100644
--- a/docs/libnm/html/api-index-full.html
+++ b/docs/libnm/html/api-index-full.html
@@ -1285,6 +1285,10 @@ NMDeviceWpan:hw-address, object property in NMDeviceOvs
 </dt>
 <dd></dd>
 <dt>
+<a class="link" href="NMSettingIPConfig.html#NMIPRoutingRuleAsStringFlags" title="enum NMIPRoutingRuleAsStringFlags">NMIPRoutingRuleAsStringFlags</a>, enum in <a class="link" href="NMSettingIPConfig.html" title="NMSettingIPConfig">NMSettingIPConfig</a>
+</dt>
+<dd></dd>
+<dt>
 <a class="link" href="NMSettingIPTunnel.html#NMIPTunnelFlags" title="enum NMIPTunnelFlags">NMIPTunnelFlags</a>, enum in <a class="link" href="NMSettingIPTunnel.html" title="NMSettingIPTunnel">NMSettingIPTunnel</a>
 </dt>
 <dd></dd>
@@ -1689,6 +1693,18 @@ NMSetting6Lowpan:parent, object property in NMSettingOvs
 </dt>
 <dd></dd>
 <dt>
+<a class="link" href="NMSettingBridge.html#NMSettingBridge--vlan-default-pvid" title="The “vlan-default-pvid” property">NMSettingBridge:vlan-default-pvid</a>, object property in <a class="link" href="NMSettingBridge.html" title="NMSettingBridge">NMSettingBridge</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMSettingBridge.html#NMSettingBridge--vlan-filtering" title="The “vlan-filtering” property">NMSettingBridge:vlan-filtering</a>, object property in <a class="link" href="NMSettingBridge.html" title="NMSettingBridge">NMSettingBridge</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMSettingBridge.html#NMSettingBridge--vlans" title="The “vlans” property">NMSettingBridge:vlans</a>, object property in <a class="link" href="NMSettingBridge.html" title="NMSettingBridge">NMSettingBridge</a>
+</dt>
+<dd></dd>
+<dt>
 <a class="link" href="NMSettingBridgePort.html#NMSettingBridgePort-struct" title="NMSettingBridgePort">NMSettingBridgePort</a>, struct in <a class="link" href="NMSettingBridgePort.html" title="NMSettingBridgePort">NMSettingBridgePort</a>
 </dt>
 <dd></dd>
@@ -1705,6 +1721,10 @@ NMSetting6Lowpan:parent, object property in NMSettingOvs
 </dt>
 <dd></dd>
 <dt>
+<a class="link" href="NMSettingBridgePort.html#NMSettingBridgePort--vlans" title="The “vlans” property">NMSettingBridgePort:vlans</a>, object property in <a class="link" href="NMSettingBridgePort.html" title="NMSettingBridgePort">NMSettingBridgePort</a>
+</dt>
+<dd></dd>
+<dt>
 <a class="link" href="NMSettingCdma.html#NMSettingCdma-struct" title="NMSettingCdma">NMSettingCdma</a>, struct in <a class="link" href="NMSettingCdma.html" title="NMSettingCdma">NMSettingCdma</a>
 </dt>
 <dd></dd>
@@ -3581,6 +3601,10 @@ NMWifiP2PPeer:wfd-ies, object property in NMDeviceOvs
 </dt>
 <dd></dd>
 <dt>
+<a class="link" href="libnm-nm-version.html#NM-AVAILABLE-IN-1-18:CAPS" title="NM_AVAILABLE_IN_1_18">NM_AVAILABLE_IN_1_18</a>, macro in <a class="link" href="libnm-nm-version.html" title="nm-version">nm-version</a>
+</dt>
+<dd></dd>
+<dt>
 <a class="link" href="libnm-nm-dbus-interface.html#NM-AVAILABLE-IN-1-2:CAPS" title="NM_AVAILABLE_IN_1_2">NM_AVAILABLE_IN_1_2</a>, macro in <a class="link" href="libnm-nm-version.html" title="nm-version">nm-version</a>
 </dt>
 <dd></dd>
@@ -3597,6 +3621,70 @@ NMWifiP2PPeer:wfd-ies, object property in NMDeviceOvs
 </dt>
 <dd></dd>
 <dt>
+<a class="link" href="NMSettingBridge.html#nm-bridge-vlan-cmp" title="nm_bridge_vlan_cmp ()">nm_bridge_vlan_cmp</a>, function in <a class="link" href="NMSettingBridge.html" title="NMSettingBridge">NMSettingBridge</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMSettingBridge.html#nm-bridge-vlan-from-str" title="nm_bridge_vlan_from_str ()">nm_bridge_vlan_from_str</a>, function in <a class="link" href="NMSettingBridge.html" title="NMSettingBridge">NMSettingBridge</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMSettingBridge.html#nm-bridge-vlan-get-vid-range" title="nm_bridge_vlan_get_vid_range ()">nm_bridge_vlan_get_vid_range</a>, function in <a class="link" href="NMSettingBridge.html" title="NMSettingBridge">NMSettingBridge</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMSettingBridge.html#nm-bridge-vlan-is-pvid" title="nm_bridge_vlan_is_pvid ()">nm_bridge_vlan_is_pvid</a>, function in <a class="link" href="NMSettingBridge.html" title="NMSettingBridge">NMSettingBridge</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMSettingBridge.html#nm-bridge-vlan-is-sealed" title="nm_bridge_vlan_is_sealed ()">nm_bridge_vlan_is_sealed</a>, function in <a class="link" href="NMSettingBridge.html" title="NMSettingBridge">NMSettingBridge</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMSettingBridge.html#nm-bridge-vlan-is-untagged" title="nm_bridge_vlan_is_untagged ()">nm_bridge_vlan_is_untagged</a>, function in <a class="link" href="NMSettingBridge.html" title="NMSettingBridge">NMSettingBridge</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMSettingBridge.html#nm-bridge-vlan-new" title="nm_bridge_vlan_new ()">nm_bridge_vlan_new</a>, function in <a class="link" href="NMSettingBridge.html" title="NMSettingBridge">NMSettingBridge</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMSettingBridge.html#nm-bridge-vlan-new-clone" title="nm_bridge_vlan_new_clone ()">nm_bridge_vlan_new_clone</a>, function in <a class="link" href="NMSettingBridge.html" title="NMSettingBridge">NMSettingBridge</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMSettingBridge.html#nm-bridge-vlan-ref" title="nm_bridge_vlan_ref ()">nm_bridge_vlan_ref</a>, function in <a class="link" href="NMSettingBridge.html" title="NMSettingBridge">NMSettingBridge</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMSettingBridge.html#nm-bridge-vlan-seal" title="nm_bridge_vlan_seal ()">nm_bridge_vlan_seal</a>, function in <a class="link" href="NMSettingBridge.html" title="NMSettingBridge">NMSettingBridge</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMSettingBridge.html#nm-bridge-vlan-set-pvid" title="nm_bridge_vlan_set_pvid ()">nm_bridge_vlan_set_pvid</a>, function in <a class="link" href="NMSettingBridge.html" title="NMSettingBridge">NMSettingBridge</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMSettingBridge.html#nm-bridge-vlan-set-untagged" title="nm_bridge_vlan_set_untagged ()">nm_bridge_vlan_set_untagged</a>, function in <a class="link" href="NMSettingBridge.html" title="NMSettingBridge">NMSettingBridge</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMSettingBridge.html#nm-bridge-vlan-to-str" title="nm_bridge_vlan_to_str ()">nm_bridge_vlan_to_str</a>, function in <a class="link" href="NMSettingBridge.html" title="NMSettingBridge">NMSettingBridge</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMSettingBridge.html#nm-bridge-vlan-unref" title="nm_bridge_vlan_unref ()">nm_bridge_vlan_unref</a>, function in <a class="link" href="NMSettingBridge.html" title="NMSettingBridge">NMSettingBridge</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMSettingBridge.html#NM-BRIDGE-VLAN-VID-MAX:CAPS" title="NM_BRIDGE_VLAN_VID_MAX">NM_BRIDGE_VLAN_VID_MAX</a>, macro in <a class="link" href="NMSettingBridge.html" title="NMSettingBridge">NMSettingBridge</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMSettingBridge.html#NM-BRIDGE-VLAN-VID-MIN:CAPS" title="NM_BRIDGE_VLAN_VID_MIN">NM_BRIDGE_VLAN_VID_MIN</a>, macro in <a class="link" href="NMSettingBridge.html" title="NMSettingBridge">NMSettingBridge</a>
+</dt>
+<dd></dd>
+<dt>
 <a class="link" href="NMCheckpoint.html#NM-CHECKPOINT-CREATED:CAPS" title="NM_CHECKPOINT_CREATED">NM_CHECKPOINT_CREATED</a>, macro in <a class="link" href="NMCheckpoint.html" title="NMCheckpoint">NMCheckpoint</a>
 </dt>
 <dd></dd>
@@ -4721,6 +4809,14 @@ NMWifiP2PPeer:wfd-ies, object property in NMDeviceOvs
 </dt>
 <dd></dd>
 <dt>
+<a class="link" href="libnm-nm-version.html#NM-DEPRECATED-IN-1-18:CAPS" title="NM_DEPRECATED_IN_1_18">NM_DEPRECATED_IN_1_18</a>, macro in <a class="link" href="libnm-nm-version.html" title="nm-version">nm-version</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="libnm-nm-version.html#NM-DEPRECATED-IN-1-18-FOR:CAPS" title="NM_DEPRECATED_IN_1_18_FOR()">NM_DEPRECATED_IN_1_18_FOR</a>, macro in <a class="link" href="libnm-nm-version.html" title="nm-version">nm-version</a>
+</dt>
+<dd></dd>
+<dt>
 <a class="link" href="libnm-nm-version.html#NM-DEPRECATED-IN-1-2:CAPS" title="NM_DEPRECATED_IN_1_2">NM_DEPRECATED_IN_1_2</a>, macro in <a class="link" href="libnm-nm-version.html" title="nm-version">nm-version</a>
 </dt>
 <dd></dd>
@@ -6597,6 +6693,174 @@ NMWifiP2PPeer:wfd-ies, object property in NMDeviceOvs
 </dt>
 <dd></dd>
 <dt>
+<a class="link" href="NMSettingIPConfig.html#nm-ip-routing-rule-cmp" title="nm_ip_routing_rule_cmp ()">nm_ip_routing_rule_cmp</a>, function in <a class="link" href="NMSettingIPConfig.html" title="NMSettingIPConfig">NMSettingIPConfig</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMSettingIPConfig.html#nm-ip-routing-rule-from-string" title="nm_ip_routing_rule_from_string ()">nm_ip_routing_rule_from_string</a>, function in <a class="link" href="NMSettingIPConfig.html" title="NMSettingIPConfig">NMSettingIPConfig</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMSettingIPConfig.html#nm-ip-routing-rule-get-action" title="nm_ip_routing_rule_get_action ()">nm_ip_routing_rule_get_action</a>, function in <a class="link" href="NMSettingIPConfig.html" title="NMSettingIPConfig">NMSettingIPConfig</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMSettingIPConfig.html#nm-ip-routing-rule-get-addr-family" title="nm_ip_routing_rule_get_addr_family ()">nm_ip_routing_rule_get_addr_family</a>, function in <a class="link" href="NMSettingIPConfig.html" title="NMSettingIPConfig">NMSettingIPConfig</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMSettingIPConfig.html#nm-ip-routing-rule-get-destination-port-end" title="nm_ip_routing_rule_get_destination_port_end ()">nm_ip_routing_rule_get_destination_port_end</a>, function in <a class="link" href="NMSettingIPConfig.html" title="NMSettingIPConfig">NMSettingIPConfig</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMSettingIPConfig.html#nm-ip-routing-rule-get-destination-port-start" title="nm_ip_routing_rule_get_destination_port_start ()">nm_ip_routing_rule_get_destination_port_start</a>, function in <a class="link" href="NMSettingIPConfig.html" title="NMSettingIPConfig">NMSettingIPConfig</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMSettingIPConfig.html#nm-ip-routing-rule-get-from" title="nm_ip_routing_rule_get_from ()">nm_ip_routing_rule_get_from</a>, function in <a class="link" href="NMSettingIPConfig.html" title="NMSettingIPConfig">NMSettingIPConfig</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMSettingIPConfig.html#nm-ip-routing-rule-get-from-len" title="nm_ip_routing_rule_get_from_len ()">nm_ip_routing_rule_get_from_len</a>, function in <a class="link" href="NMSettingIPConfig.html" title="NMSettingIPConfig">NMSettingIPConfig</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMSettingIPConfig.html#nm-ip-routing-rule-get-fwmark" title="nm_ip_routing_rule_get_fwmark ()">nm_ip_routing_rule_get_fwmark</a>, function in <a class="link" href="NMSettingIPConfig.html" title="NMSettingIPConfig">NMSettingIPConfig</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMSettingIPConfig.html#nm-ip-routing-rule-get-fwmask" title="nm_ip_routing_rule_get_fwmask ()">nm_ip_routing_rule_get_fwmask</a>, function in <a class="link" href="NMSettingIPConfig.html" title="NMSettingIPConfig">NMSettingIPConfig</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMSettingIPConfig.html#nm-ip-routing-rule-get-iifname" title="nm_ip_routing_rule_get_iifname ()">nm_ip_routing_rule_get_iifname</a>, function in <a class="link" href="NMSettingIPConfig.html" title="NMSettingIPConfig">NMSettingIPConfig</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMSettingIPConfig.html#nm-ip-routing-rule-get-invert" title="nm_ip_routing_rule_get_invert ()">nm_ip_routing_rule_get_invert</a>, function in <a class="link" href="NMSettingIPConfig.html" title="NMSettingIPConfig">NMSettingIPConfig</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMSettingIPConfig.html#nm-ip-routing-rule-get-ipproto" title="nm_ip_routing_rule_get_ipproto ()">nm_ip_routing_rule_get_ipproto</a>, function in <a class="link" href="NMSettingIPConfig.html" title="NMSettingIPConfig">NMSettingIPConfig</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMSettingIPConfig.html#nm-ip-routing-rule-get-oifname" title="nm_ip_routing_rule_get_oifname ()">nm_ip_routing_rule_get_oifname</a>, function in <a class="link" href="NMSettingIPConfig.html" title="NMSettingIPConfig">NMSettingIPConfig</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMSettingIPConfig.html#nm-ip-routing-rule-get-priority" title="nm_ip_routing_rule_get_priority ()">nm_ip_routing_rule_get_priority</a>, function in <a class="link" href="NMSettingIPConfig.html" title="NMSettingIPConfig">NMSettingIPConfig</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMSettingIPConfig.html#nm-ip-routing-rule-get-source-port-end" title="nm_ip_routing_rule_get_source_port_end ()">nm_ip_routing_rule_get_source_port_end</a>, function in <a class="link" href="NMSettingIPConfig.html" title="NMSettingIPConfig">NMSettingIPConfig</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMSettingIPConfig.html#nm-ip-routing-rule-get-source-port-start" title="nm_ip_routing_rule_get_source_port_start ()">nm_ip_routing_rule_get_source_port_start</a>, function in <a class="link" href="NMSettingIPConfig.html" title="NMSettingIPConfig">NMSettingIPConfig</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMSettingIPConfig.html#nm-ip-routing-rule-get-table" title="nm_ip_routing_rule_get_table ()">nm_ip_routing_rule_get_table</a>, function in <a class="link" href="NMSettingIPConfig.html" title="NMSettingIPConfig">NMSettingIPConfig</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMSettingIPConfig.html#nm-ip-routing-rule-get-to" title="nm_ip_routing_rule_get_to ()">nm_ip_routing_rule_get_to</a>, function in <a class="link" href="NMSettingIPConfig.html" title="NMSettingIPConfig">NMSettingIPConfig</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMSettingIPConfig.html#nm-ip-routing-rule-get-tos" title="nm_ip_routing_rule_get_tos ()">nm_ip_routing_rule_get_tos</a>, function in <a class="link" href="NMSettingIPConfig.html" title="NMSettingIPConfig">NMSettingIPConfig</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMSettingIPConfig.html#nm-ip-routing-rule-get-to-len" title="nm_ip_routing_rule_get_to_len ()">nm_ip_routing_rule_get_to_len</a>, function in <a class="link" href="NMSettingIPConfig.html" title="NMSettingIPConfig">NMSettingIPConfig</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMSettingIPConfig.html#nm-ip-routing-rule-is-sealed" title="nm_ip_routing_rule_is_sealed ()">nm_ip_routing_rule_is_sealed</a>, function in <a class="link" href="NMSettingIPConfig.html" title="NMSettingIPConfig">NMSettingIPConfig</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMSettingIPConfig.html#nm-ip-routing-rule-new" title="nm_ip_routing_rule_new ()">nm_ip_routing_rule_new</a>, function in <a class="link" href="NMSettingIPConfig.html" title="NMSettingIPConfig">NMSettingIPConfig</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMSettingIPConfig.html#nm-ip-routing-rule-new-clone" title="nm_ip_routing_rule_new_clone ()">nm_ip_routing_rule_new_clone</a>, function in <a class="link" href="NMSettingIPConfig.html" title="NMSettingIPConfig">NMSettingIPConfig</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMSettingIPConfig.html#nm-ip-routing-rule-ref" title="nm_ip_routing_rule_ref ()">nm_ip_routing_rule_ref</a>, function in <a class="link" href="NMSettingIPConfig.html" title="NMSettingIPConfig">NMSettingIPConfig</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMSettingIPConfig.html#nm-ip-routing-rule-seal" title="nm_ip_routing_rule_seal ()">nm_ip_routing_rule_seal</a>, function in <a class="link" href="NMSettingIPConfig.html" title="NMSettingIPConfig">NMSettingIPConfig</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMSettingIPConfig.html#nm-ip-routing-rule-set-action" title="nm_ip_routing_rule_set_action ()">nm_ip_routing_rule_set_action</a>, function in <a class="link" href="NMSettingIPConfig.html" title="NMSettingIPConfig">NMSettingIPConfig</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMSettingIPConfig.html#nm-ip-routing-rule-set-destination-port" title="nm_ip_routing_rule_set_destination_port ()">nm_ip_routing_rule_set_destination_port</a>, function in <a class="link" href="NMSettingIPConfig.html" title="NMSettingIPConfig">NMSettingIPConfig</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMSettingIPConfig.html#nm-ip-routing-rule-set-from" title="nm_ip_routing_rule_set_from ()">nm_ip_routing_rule_set_from</a>, function in <a class="link" href="NMSettingIPConfig.html" title="NMSettingIPConfig">NMSettingIPConfig</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMSettingIPConfig.html#nm-ip-routing-rule-set-fwmark" title="nm_ip_routing_rule_set_fwmark ()">nm_ip_routing_rule_set_fwmark</a>, function in <a class="link" href="NMSettingIPConfig.html" title="NMSettingIPConfig">NMSettingIPConfig</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMSettingIPConfig.html#nm-ip-routing-rule-set-iifname" title="nm_ip_routing_rule_set_iifname ()">nm_ip_routing_rule_set_iifname</a>, function in <a class="link" href="NMSettingIPConfig.html" title="NMSettingIPConfig">NMSettingIPConfig</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMSettingIPConfig.html#nm-ip-routing-rule-set-invert" title="nm_ip_routing_rule_set_invert ()">nm_ip_routing_rule_set_invert</a>, function in <a class="link" href="NMSettingIPConfig.html" title="NMSettingIPConfig">NMSettingIPConfig</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMSettingIPConfig.html#nm-ip-routing-rule-set-ipproto" title="nm_ip_routing_rule_set_ipproto ()">nm_ip_routing_rule_set_ipproto</a>, function in <a class="link" href="NMSettingIPConfig.html" title="NMSettingIPConfig">NMSettingIPConfig</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMSettingIPConfig.html#nm-ip-routing-rule-set-oifname" title="nm_ip_routing_rule_set_oifname ()">nm_ip_routing_rule_set_oifname</a>, function in <a class="link" href="NMSettingIPConfig.html" title="NMSettingIPConfig">NMSettingIPConfig</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMSettingIPConfig.html#nm-ip-routing-rule-set-priority" title="nm_ip_routing_rule_set_priority ()">nm_ip_routing_rule_set_priority</a>, function in <a class="link" href="NMSettingIPConfig.html" title="NMSettingIPConfig">NMSettingIPConfig</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMSettingIPConfig.html#nm-ip-routing-rule-set-source-port" title="nm_ip_routing_rule_set_source_port ()">nm_ip_routing_rule_set_source_port</a>, function in <a class="link" href="NMSettingIPConfig.html" title="NMSettingIPConfig">NMSettingIPConfig</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMSettingIPConfig.html#nm-ip-routing-rule-set-table" title="nm_ip_routing_rule_set_table ()">nm_ip_routing_rule_set_table</a>, function in <a class="link" href="NMSettingIPConfig.html" title="NMSettingIPConfig">NMSettingIPConfig</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMSettingIPConfig.html#nm-ip-routing-rule-set-to" title="nm_ip_routing_rule_set_to ()">nm_ip_routing_rule_set_to</a>, function in <a class="link" href="NMSettingIPConfig.html" title="NMSettingIPConfig">NMSettingIPConfig</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMSettingIPConfig.html#nm-ip-routing-rule-set-tos" title="nm_ip_routing_rule_set_tos ()">nm_ip_routing_rule_set_tos</a>, function in <a class="link" href="NMSettingIPConfig.html" title="NMSettingIPConfig">NMSettingIPConfig</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMSettingIPConfig.html#nm-ip-routing-rule-to-string" title="nm_ip_routing_rule_to_string ()">nm_ip_routing_rule_to_string</a>, function in <a class="link" href="NMSettingIPConfig.html" title="NMSettingIPConfig">NMSettingIPConfig</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMSettingIPConfig.html#nm-ip-routing-rule-unref" title="nm_ip_routing_rule_unref ()">nm_ip_routing_rule_unref</a>, function in <a class="link" href="NMSettingIPConfig.html" title="NMSettingIPConfig">NMSettingIPConfig</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMSettingIPConfig.html#nm-ip-routing-rule-validate" title="nm_ip_routing_rule_validate ()">nm_ip_routing_rule_validate</a>, function in <a class="link" href="NMSettingIPConfig.html" title="NMSettingIPConfig">NMSettingIPConfig</a>
+</dt>
+<dd></dd>
+<dt>
 nm_jansson_load, function in nm-json
 </dt>
 <dd></dd>
@@ -6617,6 +6881,10 @@ nm_jansson_load, function in nm-json
 </dt>
 <dd></dd>
 <dt>
+<a class="link" href="libnm-nm-dbus-interface.html#NM-LLDP-ATTR-IEEE-802-1-PPVIDS:CAPS" title="NM_LLDP_ATTR_IEEE_802_1_PPVIDS">NM_LLDP_ATTR_IEEE_802_1_PPVIDS</a>, macro in <a class="link" href="libnm-nm-dbus-interface.html" title="nm-dbus-interface">nm-dbus-interface</a>
+</dt>
+<dd></dd>
+<dt>
 <a class="link" href="libnm-nm-dbus-interface.html#NM-LLDP-ATTR-IEEE-802-1-PPVID-FLAGS:CAPS" title="NM_LLDP_ATTR_IEEE_802_1_PPVID_FLAGS">NM_LLDP_ATTR_IEEE_802_1_PPVID_FLAGS</a>, macro in <a class="link" href="libnm-nm-dbus-interface.html" title="nm-dbus-interface">nm-dbus-interface</a>
 </dt>
 <dd></dd>
@@ -6629,10 +6897,30 @@ nm_jansson_load, function in nm-json
 </dt>
 <dd></dd>
 <dt>
+<a class="link" href="libnm-nm-dbus-interface.html#NM-LLDP-ATTR-IEEE-802-1-VLANS:CAPS" title="NM_LLDP_ATTR_IEEE_802_1_VLANS">NM_LLDP_ATTR_IEEE_802_1_VLANS</a>, macro in <a class="link" href="libnm-nm-dbus-interface.html" title="nm-dbus-interface">nm-dbus-interface</a>
+</dt>
+<dd></dd>
+<dt>
 <a class="link" href="libnm-nm-dbus-interface.html#NM-LLDP-ATTR-IEEE-802-1-VLAN-NAME:CAPS" title="NM_LLDP_ATTR_IEEE_802_1_VLAN_NAME">NM_LLDP_ATTR_IEEE_802_1_VLAN_NAME</a>, macro in <a class="link" href="libnm-nm-dbus-interface.html" title="nm-dbus-interface">nm-dbus-interface</a>
 </dt>
 <dd></dd>
 <dt>
+<a class="link" href="libnm-nm-dbus-interface.html#NM-LLDP-ATTR-IEEE-802-3-MAC-PHY-CONF:CAPS" title="NM_LLDP_ATTR_IEEE_802_3_MAC_PHY_CONF">NM_LLDP_ATTR_IEEE_802_3_MAC_PHY_CONF</a>, macro in <a class="link" href="libnm-nm-dbus-interface.html" title="nm-dbus-interface">nm-dbus-interface</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="libnm-nm-dbus-interface.html#NM-LLDP-ATTR-IEEE-802-3-MAX-FRAME-SIZE:CAPS" title="NM_LLDP_ATTR_IEEE_802_3_MAX_FRAME_SIZE">NM_LLDP_ATTR_IEEE_802_3_MAX_FRAME_SIZE</a>, macro in <a class="link" href="libnm-nm-dbus-interface.html" title="nm-dbus-interface">nm-dbus-interface</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="libnm-nm-dbus-interface.html#NM-LLDP-ATTR-IEEE-802-3-POWER-VIA-MDI:CAPS" title="NM_LLDP_ATTR_IEEE_802_3_POWER_VIA_MDI">NM_LLDP_ATTR_IEEE_802_3_POWER_VIA_MDI</a>, macro in <a class="link" href="libnm-nm-dbus-interface.html" title="nm-dbus-interface">nm-dbus-interface</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="libnm-nm-dbus-interface.html#NM-LLDP-ATTR-MANAGEMENT-ADDRESSES:CAPS" title="NM_LLDP_ATTR_MANAGEMENT_ADDRESSES">NM_LLDP_ATTR_MANAGEMENT_ADDRESSES</a>, macro in <a class="link" href="libnm-nm-dbus-interface.html" title="nm-dbus-interface">nm-dbus-interface</a>
+</dt>
+<dd></dd>
+<dt>
 <a class="link" href="libnm-nm-dbus-interface.html#NM-LLDP-ATTR-PORT-DESCRIPTION:CAPS" title="NM_LLDP_ATTR_PORT_DESCRIPTION">NM_LLDP_ATTR_PORT_DESCRIPTION</a>, macro in <a class="link" href="libnm-nm-dbus-interface.html" title="nm-dbus-interface">nm-dbus-interface</a>
 </dt>
 <dd></dd>
@@ -6685,6 +6973,10 @@ nm_jansson_load, function in nm-json
 </dt>
 <dd></dd>
 <dt>
+<a class="link" href="NMDevice.html#nm-lldp-neighbor-get-attr-value" title="nm_lldp_neighbor_get_attr_value ()">nm_lldp_neighbor_get_attr_value</a>, function in <a class="link" href="NMDevice.html" title="NMDevice">NMDevice</a>
+</dt>
+<dd></dd>
+<dt>
 <a class="link" href="NMDevice.html#nm-lldp-neighbor-new" title="nm_lldp_neighbor_new ()">nm_lldp_neighbor_new</a>, function in <a class="link" href="NMDevice.html" title="NMDevice">NMDevice</a>
 </dt>
 <dd></dd>
@@ -7713,10 +8005,18 @@ nm_jansson_load, function in nm-json
 </dt>
 <dd></dd>
 <dt>
+<a class="link" href="NMSettingBridge.html#nm-setting-bridge-add-vlan" title="nm_setting_bridge_add_vlan ()">nm_setting_bridge_add_vlan</a>, function in <a class="link" href="NMSettingBridge.html" title="NMSettingBridge">NMSettingBridge</a>
+</dt>
+<dd></dd>
+<dt>
 <a class="link" href="NMSettingBridge.html#NM-SETTING-BRIDGE-AGEING-TIME:CAPS" title="NM_SETTING_BRIDGE_AGEING_TIME">NM_SETTING_BRIDGE_AGEING_TIME</a>, macro in <a class="link" href="NMSettingBridge.html" title="NMSettingBridge">NMSettingBridge</a>
 </dt>
 <dd></dd>
 <dt>
+<a class="link" href="NMSettingBridge.html#nm-setting-bridge-clear-vlans" title="nm_setting_bridge_clear_vlans ()">nm_setting_bridge_clear_vlans</a>, function in <a class="link" href="NMSettingBridge.html" title="NMSettingBridge">NMSettingBridge</a>
+</dt>
+<dd></dd>
+<dt>
 <a class="link" href="NMSettingBridge.html#NM-SETTING-BRIDGE-FORWARD-DELAY:CAPS" title="NM_SETTING_BRIDGE_FORWARD_DELAY">NM_SETTING_BRIDGE_FORWARD_DELAY</a>, macro in <a class="link" href="NMSettingBridge.html" title="NMSettingBridge">NMSettingBridge</a>
 </dt>
 <dd></dd>
@@ -7749,6 +8049,10 @@ nm_jansson_load, function in nm-json
 </dt>
 <dd></dd>
 <dt>
+<a class="link" href="NMSettingBridge.html#nm-setting-bridge-get-num-vlans" title="nm_setting_bridge_get_num_vlans ()">nm_setting_bridge_get_num_vlans</a>, function in <a class="link" href="NMSettingBridge.html" title="NMSettingBridge">NMSettingBridge</a>
+</dt>
+<dd></dd>
+<dt>
 <a class="link" href="NMSettingBridge.html#nm-setting-bridge-get-priority" title="nm_setting_bridge_get_priority ()">nm_setting_bridge_get_priority</a>, function in <a class="link" href="NMSettingBridge.html" title="NMSettingBridge">NMSettingBridge</a>
 </dt>
 <dd></dd>
@@ -7757,6 +8061,18 @@ nm_jansson_load, function in nm-json
 </dt>
 <dd></dd>
 <dt>
+<a class="link" href="NMSettingBridge.html#nm-setting-bridge-get-vlan" title="nm_setting_bridge_get_vlan ()">nm_setting_bridge_get_vlan</a>, function in <a class="link" href="NMSettingBridge.html" title="NMSettingBridge">NMSettingBridge</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMSettingBridge.html#nm-setting-bridge-get-vlan-default-pvid" title="nm_setting_bridge_get_vlan_default_pvid ()">nm_setting_bridge_get_vlan_default_pvid</a>, function in <a class="link" href="NMSettingBridge.html" title="NMSettingBridge">NMSettingBridge</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMSettingBridge.html#nm-setting-bridge-get-vlan-filtering" title="nm_setting_bridge_get_vlan_filtering ()">nm_setting_bridge_get_vlan_filtering</a>, function in <a class="link" href="NMSettingBridge.html" title="NMSettingBridge">NMSettingBridge</a>
+</dt>
+<dd></dd>
+<dt>
 <a class="link" href="NMSettingBridge.html#NM-SETTING-BRIDGE-GROUP-FORWARD-MASK:CAPS" title="NM_SETTING_BRIDGE_GROUP_FORWARD_MASK">NM_SETTING_BRIDGE_GROUP_FORWARD_MASK</a>, macro in <a class="link" href="NMSettingBridge.html" title="NMSettingBridge">NMSettingBridge</a>
 </dt>
 <dd></dd>
@@ -7781,10 +8097,22 @@ nm_jansson_load, function in nm-json
 </dt>
 <dd></dd>
 <dt>
+<a class="link" href="NMSettingBridgePort.html#nm-setting-bridge-port-add-vlan" title="nm_setting_bridge_port_add_vlan ()">nm_setting_bridge_port_add_vlan</a>, function in <a class="link" href="NMSettingBridgePort.html" title="NMSettingBridgePort">NMSettingBridgePort</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMSettingBridgePort.html#nm-setting-bridge-port-clear-vlans" title="nm_setting_bridge_port_clear_vlans ()">nm_setting_bridge_port_clear_vlans</a>, function in <a class="link" href="NMSettingBridgePort.html" title="NMSettingBridgePort">NMSettingBridgePort</a>
+</dt>
+<dd></dd>
+<dt>
 <a class="link" href="NMSettingBridgePort.html#nm-setting-bridge-port-get-hairpin-mode" title="nm_setting_bridge_port_get_hairpin_mode ()">nm_setting_bridge_port_get_hairpin_mode</a>, function in <a class="link" href="NMSettingBridgePort.html" title="NMSettingBridgePort">NMSettingBridgePort</a>
 </dt>
 <dd></dd>
 <dt>
+<a class="link" href="NMSettingBridgePort.html#nm-setting-bridge-port-get-num-vlans" title="nm_setting_bridge_port_get_num_vlans ()">nm_setting_bridge_port_get_num_vlans</a>, function in <a class="link" href="NMSettingBridgePort.html" title="NMSettingBridgePort">NMSettingBridgePort</a>
+</dt>
+<dd></dd>
+<dt>
 <a class="link" href="NMSettingBridgePort.html#nm-setting-bridge-port-get-path-cost" title="nm_setting_bridge_port_get_path_cost ()">nm_setting_bridge_port_get_path_cost</a>, function in <a class="link" href="NMSettingBridgePort.html" title="NMSettingBridgePort">NMSettingBridgePort</a>
 </dt>
 <dd></dd>
@@ -7793,6 +8121,10 @@ nm_jansson_load, function in nm-json
 </dt>
 <dd></dd>
 <dt>
+<a class="link" href="NMSettingBridgePort.html#nm-setting-bridge-port-get-vlan" title="nm_setting_bridge_port_get_vlan ()">nm_setting_bridge_port_get_vlan</a>, function in <a class="link" href="NMSettingBridgePort.html" title="NMSettingBridgePort">NMSettingBridgePort</a>
+</dt>
+<dd></dd>
+<dt>
 <a class="link" href="NMSettingBridgePort.html#NM-SETTING-BRIDGE-PORT-HAIRPIN-MODE:CAPS" title="NM_SETTING_BRIDGE_PORT_HAIRPIN_MODE">NM_SETTING_BRIDGE_PORT_HAIRPIN_MODE</a>, macro in <a class="link" href="NMSettingBridgePort.html" title="NMSettingBridgePort">NMSettingBridgePort</a>
 </dt>
 <dd></dd>
@@ -7809,14 +8141,34 @@ nm_jansson_load, function in nm-json
 </dt>
 <dd></dd>
 <dt>
+<a class="link" href="NMSettingBridgePort.html#nm-setting-bridge-port-remove-vlan" title="nm_setting_bridge_port_remove_vlan ()">nm_setting_bridge_port_remove_vlan</a>, function in <a class="link" href="NMSettingBridgePort.html" title="NMSettingBridgePort">NMSettingBridgePort</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMSettingBridgePort.html#nm-setting-bridge-port-remove-vlan-by-vid" title="nm_setting_bridge_port_remove_vlan_by_vid ()">nm_setting_bridge_port_remove_vlan_by_vid</a>, function in <a class="link" href="NMSettingBridgePort.html" title="NMSettingBridgePort">NMSettingBridgePort</a>
+</dt>
+<dd></dd>
+<dt>
 <a class="link" href="NMSettingBridgePort.html#NM-SETTING-BRIDGE-PORT-SETTING-NAME:CAPS" title="NM_SETTING_BRIDGE_PORT_SETTING_NAME">NM_SETTING_BRIDGE_PORT_SETTING_NAME</a>, macro in <a class="link" href="NMSettingBridgePort.html" title="NMSettingBridgePort">NMSettingBridgePort</a>
 </dt>
 <dd></dd>
 <dt>
+<a class="link" href="NMSettingBridgePort.html#NM-SETTING-BRIDGE-PORT-VLANS:CAPS" title="NM_SETTING_BRIDGE_PORT_VLANS">NM_SETTING_BRIDGE_PORT_VLANS</a>, macro in <a class="link" href="NMSettingBridgePort.html" title="NMSettingBridgePort">NMSettingBridgePort</a>
+</dt>
+<dd></dd>
+<dt>
 <a class="link" href="NMSettingBridge.html#NM-SETTING-BRIDGE-PRIORITY:CAPS" title="NM_SETTING_BRIDGE_PRIORITY">NM_SETTING_BRIDGE_PRIORITY</a>, macro in <a class="link" href="NMSettingBridge.html" title="NMSettingBridge">NMSettingBridge</a>
 </dt>
 <dd></dd>
 <dt>
+<a class="link" href="NMSettingBridge.html#nm-setting-bridge-remove-vlan" title="nm_setting_bridge_remove_vlan ()">nm_setting_bridge_remove_vlan</a>, function in <a class="link" href="NMSettingBridge.html" title="NMSettingBridge">NMSettingBridge</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMSettingBridge.html#nm-setting-bridge-remove-vlan-by-vid" title="nm_setting_bridge_remove_vlan_by_vid ()">nm_setting_bridge_remove_vlan_by_vid</a>, function in <a class="link" href="NMSettingBridge.html" title="NMSettingBridge">NMSettingBridge</a>
+</dt>
+<dd></dd>
+<dt>
 <a class="link" href="NMSettingBridge.html#NM-SETTING-BRIDGE-SETTING-NAME:CAPS" title="NM_SETTING_BRIDGE_SETTING_NAME">NM_SETTING_BRIDGE_SETTING_NAME</a>, macro in <a class="link" href="NMSettingBridge.html" title="NMSettingBridge">NMSettingBridge</a>
 </dt>
 <dd></dd>
@@ -7825,6 +8177,18 @@ nm_jansson_load, function in nm-json
 </dt>
 <dd></dd>
 <dt>
+<a class="link" href="NMSettingBridge.html#NM-SETTING-BRIDGE-VLANS:CAPS" title="NM_SETTING_BRIDGE_VLANS">NM_SETTING_BRIDGE_VLANS</a>, macro in <a class="link" href="NMSettingBridge.html" title="NMSettingBridge">NMSettingBridge</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMSettingBridge.html#NM-SETTING-BRIDGE-VLAN-DEFAULT-PVID:CAPS" title="NM_SETTING_BRIDGE_VLAN_DEFAULT_PVID">NM_SETTING_BRIDGE_VLAN_DEFAULT_PVID</a>, macro in <a class="link" href="NMSettingBridge.html" title="NMSettingBridge">NMSettingBridge</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMSettingBridge.html#NM-SETTING-BRIDGE-VLAN-FILTERING:CAPS" title="NM_SETTING_BRIDGE_VLAN_FILTERING">NM_SETTING_BRIDGE_VLAN_FILTERING</a>, macro in <a class="link" href="NMSettingBridge.html" title="NMSettingBridge">NMSettingBridge</a>
+</dt>
+<dd></dd>
+<dt>
 <a class="link" href="NMSettingCdma.html#nm-setting-cdma-get-mtu" title="nm_setting_cdma_get_mtu ()">nm_setting_cdma_get_mtu</a>, function in <a class="link" href="NMSettingCdma.html" title="NMSettingCdma">NMSettingCdma</a>
 </dt>
 <dd></dd>
@@ -8697,6 +9061,10 @@ nm_jansson_load, function in nm-json
 </dt>
 <dd></dd>
 <dt>
+<a class="link" href="NMSettingIPConfig.html#nm-setting-ip-config-add-routing-rule" title="nm_setting_ip_config_add_routing_rule ()">nm_setting_ip_config_add_routing_rule</a>, function in <a class="link" href="NMSettingIPConfig.html" title="NMSettingIPConfig">NMSettingIPConfig</a>
+</dt>
+<dd></dd>
+<dt>
 <a class="link" href="NMSettingIPConfig.html#nm-setting-ip-config-clear-addresses" title="nm_setting_ip_config_clear_addresses ()">nm_setting_ip_config_clear_addresses</a>, function in <a class="link" href="NMSettingIPConfig.html" title="NMSettingIPConfig">NMSettingIPConfig</a>
 </dt>
 <dd></dd>
@@ -8717,6 +9085,10 @@ nm_jansson_load, function in nm-json
 </dt>
 <dd></dd>
 <dt>
+<a class="link" href="NMSettingIPConfig.html#nm-setting-ip-config-clear-routing-rules" title="nm_setting_ip_config_clear_routing_rules ()">nm_setting_ip_config_clear_routing_rules</a>, function in <a class="link" href="NMSettingIPConfig.html" title="NMSettingIPConfig">NMSettingIPConfig</a>
+</dt>
+<dd></dd>
+<dt>
 <a class="link" href="NMSettingIPConfig.html#NM-SETTING-IP-CONFIG-DAD-TIMEOUT:CAPS" title="NM_SETTING_IP_CONFIG_DAD_TIMEOUT">NM_SETTING_IP_CONFIG_DAD_TIMEOUT</a>, macro in <a class="link" href="NMSettingIPConfig.html" title="NMSettingIPConfig">NMSettingIPConfig</a>
 </dt>
 <dd></dd>
@@ -8837,6 +9209,10 @@ nm_jansson_load, function in nm-json
 </dt>
 <dd></dd>
 <dt>
+<a class="link" href="NMSettingIPConfig.html#nm-setting-ip-config-get-num-routing-rules" title="nm_setting_ip_config_get_num_routing_rules ()">nm_setting_ip_config_get_num_routing_rules</a>, function in <a class="link" href="NMSettingIPConfig.html" title="NMSettingIPConfig">NMSettingIPConfig</a>
+</dt>
+<dd></dd>
+<dt>
 <a class="link" href="NMSettingIPConfig.html#nm-setting-ip-config-get-route" title="nm_setting_ip_config_get_route ()">nm_setting_ip_config_get_route</a>, function in <a class="link" href="NMSettingIPConfig.html" title="NMSettingIPConfig">NMSettingIPConfig</a>
 </dt>
 <dd></dd>
@@ -8849,6 +9225,10 @@ nm_jansson_load, function in nm-json
 </dt>
 <dd></dd>
 <dt>
+<a class="link" href="NMSettingIPConfig.html#nm-setting-ip-config-get-routing-rule" title="nm_setting_ip_config_get_routing_rule ()">nm_setting_ip_config_get_routing_rule</a>, function in <a class="link" href="NMSettingIPConfig.html" title="NMSettingIPConfig">NMSettingIPConfig</a>
+</dt>
+<dd></dd>
+<dt>
 <a class="link" href="NMSettingIPConfig.html#nm-setting-ip-config-has-dns-options" title="nm_setting_ip_config_has_dns_options ()">nm_setting_ip_config_has_dns_options</a>, function in <a class="link" href="NMSettingIPConfig.html" title="NMSettingIPConfig">NMSettingIPConfig</a>
 </dt>
 <dd></dd>
@@ -8917,6 +9297,10 @@ nm_jansson_load, function in nm-json
 </dt>
 <dd></dd>
 <dt>
+<a class="link" href="NMSettingIPConfig.html#nm-setting-ip-config-remove-routing-rule" title="nm_setting_ip_config_remove_routing_rule ()">nm_setting_ip_config_remove_routing_rule</a>, function in <a class="link" href="NMSettingIPConfig.html" title="NMSettingIPConfig">NMSettingIPConfig</a>
+</dt>
+<dd></dd>
+<dt>
 <a class="link" href="NMSettingIPConfig.html#NM-SETTING-IP-CONFIG-ROUTES:CAPS" title="NM_SETTING_IP_CONFIG_ROUTES">NM_SETTING_IP_CONFIG_ROUTES</a>, macro in <a class="link" href="NMSettingIPConfig.html" title="NMSettingIPConfig">NMSettingIPConfig</a>
 </dt>
 <dd></dd>
@@ -8929,6 +9313,10 @@ nm_jansson_load, function in nm-json
 </dt>
 <dd></dd>
 <dt>
+<a class="link" href="NMSettingIPConfig.html#NM-SETTING-IP-CONFIG-ROUTING-RULES:CAPS" title="NM_SETTING_IP_CONFIG_ROUTING_RULES">NM_SETTING_IP_CONFIG_ROUTING_RULES</a>, macro in <a class="link" href="NMSettingIPConfig.html" title="NMSettingIPConfig">NMSettingIPConfig</a>
+</dt>
+<dd></dd>
+<dt>
 <a class="link" href="NMSettingIPTunnel.html#NM-SETTING-IP-TUNNEL-ENCAPSULATION-LIMIT:CAPS" title="NM_SETTING_IP_TUNNEL_ENCAPSULATION_LIMIT">NM_SETTING_IP_TUNNEL_ENCAPSULATION_LIMIT</a>, macro in <a class="link" href="NMSettingIPTunnel.html" title="NMSettingIPTunnel">NMSettingIPTunnel</a>
 </dt>
 <dd></dd>
@@ -11469,6 +11857,14 @@ nm_jansson_load, function in nm-json
 </dt>
 <dd></dd>
 <dt>
+<a class="link" href="NMSettingTCConfig.html#nm-tc-qdisc-get-attribute" title="nm_tc_qdisc_get_attribute ()">nm_tc_qdisc_get_attribute</a>, function in <a class="link" href="NMSettingTCConfig.html" title="NMSettingTCConfig">NMSettingTCConfig</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMSettingTCConfig.html#nm-tc-qdisc-get-attribute-names" title="nm_tc_qdisc_get_attribute_names ()">nm_tc_qdisc_get_attribute_names</a>, function in <a class="link" href="NMSettingTCConfig.html" title="NMSettingTCConfig">NMSettingTCConfig</a>
+</dt>
+<dd></dd>
+<dt>
 <a class="link" href="NMSettingTCConfig.html#nm-tc-qdisc-get-handle" title="nm_tc_qdisc_get_handle ()">nm_tc_qdisc_get_handle</a>, function in <a class="link" href="NMSettingTCConfig.html" title="NMSettingTCConfig">NMSettingTCConfig</a>
 </dt>
 <dd></dd>
@@ -11489,6 +11885,10 @@ nm_jansson_load, function in nm-json
 </dt>
 <dd></dd>
 <dt>
+<a class="link" href="NMSettingTCConfig.html#nm-tc-qdisc-set-attribute" title="nm_tc_qdisc_set_attribute ()">nm_tc_qdisc_set_attribute</a>, function in <a class="link" href="NMSettingTCConfig.html" title="NMSettingTCConfig">NMSettingTCConfig</a>
+</dt>
+<dd></dd>
+<dt>
 <a class="link" href="NMSettingTCConfig.html#nm-tc-qdisc-set-handle" title="nm_tc_qdisc_set_handle ()">nm_tc_qdisc_set_handle</a>, function in <a class="link" href="NMSettingTCConfig.html" title="NMSettingTCConfig">NMSettingTCConfig</a>
 </dt>
 <dd></dd>
diff --git a/docs/libnm/html/index.html b/docs/libnm/html/index.html
index 0523598b..1112cd36 100644
--- a/docs/libnm/html/index.html
+++ b/docs/libnm/html/index.html
@@ -15,7 +15,7 @@
 <div>
 <div><table class="navigation" id="top" width="100%" cellpadding="2" cellspacing="0"><tr><th valign="middle"><p class="title">libnm Reference Manual</p></th></tr></table></div>
 <div><p class="releaseinfo">
-      for libnm 1.16.0
+      for libnm 1.18.0
 
       The latest version of this documentation can be found on-line at
       <a class="ulink" href="https://developer.gnome.org/libnm/stable/" target="_top">https://developer.gnome.org/libnm/stable/</a>.
diff --git a/docs/libnm/html/libnm-nm-dbus-interface.html b/docs/libnm/html/libnm-nm-dbus-interface.html
index 73ae64b8..17617b95 100644
--- a/docs/libnm/html/libnm-nm-dbus-interface.html
+++ b/docs/libnm/html/libnm-nm-dbus-interface.html
@@ -394,15 +394,31 @@
 </tr>
 <tr>
 <td class="define_keyword">#define</td>
+<td class="function_name"><a class="link" href="libnm-nm-dbus-interface.html#NM-LLDP-ATTR-MANAGEMENT-ADDRESSES:CAPS" title="NM_LLDP_ATTR_MANAGEMENT_ADDRESSES">NM_LLDP_ATTR_MANAGEMENT_ADDRESSES</a></td>
+</tr>
+<tr>
+<td class="define_keyword">#define</td>
 <td class="function_name"><a class="link" href="libnm-nm-dbus-interface.html#NM-LLDP-ATTR-IEEE-802-1-PVID:CAPS" title="NM_LLDP_ATTR_IEEE_802_1_PVID">NM_LLDP_ATTR_IEEE_802_1_PVID</a></td>
 </tr>
 <tr>
 <td class="define_keyword">#define</td>
-<td class="function_name"><a class="link" href="libnm-nm-dbus-interface.html#NM-LLDP-ATTR-IEEE-802-1-PPVID:CAPS" title="NM_LLDP_ATTR_IEEE_802_1_PPVID">NM_LLDP_ATTR_IEEE_802_1_PPVID</a></td>
+<td class="function_name"><a class="link" href="libnm-nm-dbus-interface.html#NM-LLDP-ATTR-IEEE-802-1-VLANS:CAPS" title="NM_LLDP_ATTR_IEEE_802_1_VLANS">NM_LLDP_ATTR_IEEE_802_1_VLANS</a></td>
 </tr>
 <tr>
 <td class="define_keyword">#define</td>
-<td class="function_name"><a class="link" href="libnm-nm-dbus-interface.html#NM-LLDP-ATTR-IEEE-802-1-PPVID-FLAGS:CAPS" title="NM_LLDP_ATTR_IEEE_802_1_PPVID_FLAGS">NM_LLDP_ATTR_IEEE_802_1_PPVID_FLAGS</a></td>
+<td class="function_name"><a class="link" href="libnm-nm-dbus-interface.html#NM-LLDP-ATTR-IEEE-802-1-PPVIDS:CAPS" title="NM_LLDP_ATTR_IEEE_802_1_PPVIDS">NM_LLDP_ATTR_IEEE_802_1_PPVIDS</a></td>
+</tr>
+<tr>
+<td class="define_keyword">#define</td>
+<td class="function_name"><a class="link" href="libnm-nm-dbus-interface.html#NM-LLDP-ATTR-IEEE-802-3-MAC-PHY-CONF:CAPS" title="NM_LLDP_ATTR_IEEE_802_3_MAC_PHY_CONF">NM_LLDP_ATTR_IEEE_802_3_MAC_PHY_CONF</a></td>
+</tr>
+<tr>
+<td class="define_keyword">#define</td>
+<td class="function_name"><a class="link" href="libnm-nm-dbus-interface.html#NM-LLDP-ATTR-IEEE-802-3-POWER-VIA-MDI:CAPS" title="NM_LLDP_ATTR_IEEE_802_3_POWER_VIA_MDI">NM_LLDP_ATTR_IEEE_802_3_POWER_VIA_MDI</a></td>
+</tr>
+<tr>
+<td class="define_keyword">#define</td>
+<td class="function_name"><a class="link" href="libnm-nm-dbus-interface.html#NM-LLDP-ATTR-IEEE-802-3-MAX-FRAME-SIZE:CAPS" title="NM_LLDP_ATTR_IEEE_802_3_MAX_FRAME_SIZE">NM_LLDP_ATTR_IEEE_802_3_MAX_FRAME_SIZE</a></td>
 </tr>
 <tr>
 <td class="define_keyword">#define</td>
@@ -414,6 +430,14 @@
 </tr>
 <tr>
 <td class="define_keyword">#define</td>
+<td class="function_name"><a class="link" href="libnm-nm-dbus-interface.html#NM-LLDP-ATTR-IEEE-802-1-PPVID:CAPS" title="NM_LLDP_ATTR_IEEE_802_1_PPVID">NM_LLDP_ATTR_IEEE_802_1_PPVID</a></td>
+</tr>
+<tr>
+<td class="define_keyword">#define</td>
+<td class="function_name"><a class="link" href="libnm-nm-dbus-interface.html#NM-LLDP-ATTR-IEEE-802-1-PPVID-FLAGS:CAPS" title="NM_LLDP_ATTR_IEEE_802_1_PPVID_FLAGS">NM_LLDP_ATTR_IEEE_802_1_PPVID_FLAGS</a></td>
+</tr>
+<tr>
+<td class="define_keyword">#define</td>
 <td class="function_name"><a class="link" href="libnm-nm-dbus-interface.html#NM-LLDP-DEST-NEAREST-BRIDGE:CAPS" title="NM_LLDP_DEST_NEAREST_BRIDGE">NM_LLDP_DEST_NEAREST_BRIDGE</a></td>
 </tr>
 <tr>
@@ -2873,20 +2897,44 @@ VPN plugin authentication dialogs.</p>
 </div>
 <hr>
 <div class="refsect2">
+<a name="NM-LLDP-ATTR-MANAGEMENT-ADDRESSES:CAPS"></a><h3>NM_LLDP_ATTR_MANAGEMENT_ADDRESSES</h3>
+<pre class="programlisting">#define NM_LLDP_ATTR_MANAGEMENT_ADDRESSES    "management-addresses"
+</pre>
+</div>
+<hr>
+<div class="refsect2">
 <a name="NM-LLDP-ATTR-IEEE-802-1-PVID:CAPS"></a><h3>NM_LLDP_ATTR_IEEE_802_1_PVID</h3>
 <pre class="programlisting">#define NM_LLDP_ATTR_IEEE_802_1_PVID         "ieee-802-1-pvid"
 </pre>
 </div>
 <hr>
 <div class="refsect2">
-<a name="NM-LLDP-ATTR-IEEE-802-1-PPVID:CAPS"></a><h3>NM_LLDP_ATTR_IEEE_802_1_PPVID</h3>
-<pre class="programlisting">#define NM_LLDP_ATTR_IEEE_802_1_PPVID        "ieee-802-1-ppvid"
+<a name="NM-LLDP-ATTR-IEEE-802-1-VLANS:CAPS"></a><h3>NM_LLDP_ATTR_IEEE_802_1_VLANS</h3>
+<pre class="programlisting">#define NM_LLDP_ATTR_IEEE_802_1_VLANS        "ieee-802-1-vlans"
 </pre>
 </div>
 <hr>
 <div class="refsect2">
-<a name="NM-LLDP-ATTR-IEEE-802-1-PPVID-FLAGS:CAPS"></a><h3>NM_LLDP_ATTR_IEEE_802_1_PPVID_FLAGS</h3>
-<pre class="programlisting">#define NM_LLDP_ATTR_IEEE_802_1_PPVID_FLAGS  "ieee-802-1-ppvid-flags"
+<a name="NM-LLDP-ATTR-IEEE-802-1-PPVIDS:CAPS"></a><h3>NM_LLDP_ATTR_IEEE_802_1_PPVIDS</h3>
+<pre class="programlisting">#define NM_LLDP_ATTR_IEEE_802_1_PPVIDS       "ieee-802-1-ppvids"
+</pre>
+</div>
+<hr>
+<div class="refsect2">
+<a name="NM-LLDP-ATTR-IEEE-802-3-MAC-PHY-CONF:CAPS"></a><h3>NM_LLDP_ATTR_IEEE_802_3_MAC_PHY_CONF</h3>
+<pre class="programlisting">#define NM_LLDP_ATTR_IEEE_802_3_MAC_PHY_CONF    "ieee-802-3-mac-phy-conf"
+</pre>
+</div>
+<hr>
+<div class="refsect2">
+<a name="NM-LLDP-ATTR-IEEE-802-3-POWER-VIA-MDI:CAPS"></a><h3>NM_LLDP_ATTR_IEEE_802_3_POWER_VIA_MDI</h3>
+<pre class="programlisting">#define NM_LLDP_ATTR_IEEE_802_3_POWER_VIA_MDI   "ieee-802-3-power-via-mdi"
+</pre>
+</div>
+<hr>
+<div class="refsect2">
+<a name="NM-LLDP-ATTR-IEEE-802-3-MAX-FRAME-SIZE:CAPS"></a><h3>NM_LLDP_ATTR_IEEE_802_3_MAX_FRAME_SIZE</h3>
+<pre class="programlisting">#define NM_LLDP_ATTR_IEEE_802_3_MAX_FRAME_SIZE  "ieee-802-3-max-frame-size"
 </pre>
 </div>
 <hr>
@@ -2903,6 +2951,18 @@ VPN plugin authentication dialogs.</p>
 </div>
 <hr>
 <div class="refsect2">
+<a name="NM-LLDP-ATTR-IEEE-802-1-PPVID:CAPS"></a><h3>NM_LLDP_ATTR_IEEE_802_1_PPVID</h3>
+<pre class="programlisting">#define NM_LLDP_ATTR_IEEE_802_1_PPVID        "ieee-802-1-ppvid"
+</pre>
+</div>
+<hr>
+<div class="refsect2">
+<a name="NM-LLDP-ATTR-IEEE-802-1-PPVID-FLAGS:CAPS"></a><h3>NM_LLDP_ATTR_IEEE_802_1_PPVID_FLAGS</h3>
+<pre class="programlisting">#define NM_LLDP_ATTR_IEEE_802_1_PPVID_FLAGS  "ieee-802-1-ppvid-flags"
+</pre>
+</div>
+<hr>
+<div class="refsect2">
 <a name="NM-LLDP-DEST-NEAREST-BRIDGE:CAPS"></a><h3>NM_LLDP_DEST_NEAREST_BRIDGE</h3>
 <pre class="programlisting">#define NM_LLDP_DEST_NEAREST_BRIDGE          "nearest-bridge"
 </pre>
diff --git a/docs/libnm/html/libnm-nm-utils.html b/docs/libnm/html/libnm-nm-utils.html
index 3528aac9..b61e57ab 100644
--- a/docs/libnm/html/libnm-nm-utils.html
+++ b/docs/libnm/html/libnm-nm-utils.html
@@ -3071,7 +3071,7 @@ nm_utils_format_variant_attributes (<em class="parameter"><code><a href="https:/
 <pre class="programlisting"><a class="link" href="NMSettingTCConfig.html#NMTCQdisc"><span class="returnvalue">NMTCQdisc</span></a> *
 nm_utils_tc_qdisc_from_str (<em class="parameter"><code>const <span class="type">char</span> *str</code></em>,
                             <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> **error</code></em>);</pre>
-<p>Parces the tc style string qdisc representation of the queueing
+<p>Parses the tc style string qdisc representation of the queueing
 discipline to a <a class="link" href="NMSettingTCConfig.html#NMTCQdisc"><code class="literal">NMTCQdisc</code></a> instance. Supports a subset of the tc language.</p>
 <div class="refsect3">
 <a name="nm-utils-tc-qdisc-from-str.parameters"></a><h4>Parameters</h4>
@@ -3143,7 +3143,7 @@ discipline.</p>
 <pre class="programlisting"><a class="link" href="NMSettingTCConfig.html#NMTCAction"><span class="returnvalue">NMTCAction</span></a> *
 nm_utils_tc_action_from_str (<em class="parameter"><code>const <span class="type">char</span> *str</code></em>,
                              <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> **error</code></em>);</pre>
-<p>Parces the tc style string action representation of the queueing
+<p>Parses the tc style string action representation of the queueing
 discipline to a <a class="link" href="NMSettingTCConfig.html#NMTCAction"><code class="literal">NMTCAction</code></a> instance. Supports a subset of the tc language.</p>
 <div class="refsect3">
 <a name="nm-utils-tc-action-from-str.parameters"></a><h4>Parameters</h4>
@@ -3215,7 +3215,7 @@ discipline.</p>
 <pre class="programlisting"><a class="link" href="NMSettingTCConfig.html#NMTCTfilter"><span class="returnvalue">NMTCTfilter</span></a> *
 nm_utils_tc_tfilter_from_str (<em class="parameter"><code>const <span class="type">char</span> *str</code></em>,
                               <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> **error</code></em>);</pre>
-<p>Parces the tc style string tfilter representation of the queueing
+<p>Parses the tc style string tfilter representation of the queueing
 discipline to a <a class="link" href="NMSettingTCConfig.html#NMTCTfilter"><code class="literal">NMTCTfilter</code></a> instance. Supports a subset of the tc language.</p>
 <div class="refsect3">
 <a name="nm-utils-tc-tfilter-from-str.parameters"></a><h4>Parameters</h4>
diff --git a/docs/libnm/html/libnm-nm-version.html b/docs/libnm/html/libnm-nm-version.html
index 596c4ea0..104af6f2 100644
--- a/docs/libnm/html/libnm-nm-version.html
+++ b/docs/libnm/html/libnm-nm-version.html
@@ -99,6 +99,12 @@
 <a class="link" href="libnm-nm-version.html#NM-DEPRECATED-IN-1-16-FOR:CAPS" title="NM_DEPRECATED_IN_1_16_FOR()">NM_DEPRECATED_IN_1_16_FOR</a><span class="c_punctuation">()</span>
 </td>
 </tr>
+<tr>
+<td class="define_keyword">#define</td>
+<td class="function_name">
+<a class="link" href="libnm-nm-version.html#NM-DEPRECATED-IN-1-18-FOR:CAPS" title="NM_DEPRECATED_IN_1_18_FOR()">NM_DEPRECATED_IN_1_18_FOR</a><span class="c_punctuation">()</span>
+</td>
+</tr>
 </tbody>
 </table></div>
 </div>
@@ -198,6 +204,14 @@
 <td class="define_keyword">#define</td>
 <td class="function_name"><a class="link" href="libnm-nm-version.html#NM-AVAILABLE-IN-1-16:CAPS" title="NM_AVAILABLE_IN_1_16">NM_AVAILABLE_IN_1_16</a></td>
 </tr>
+<tr>
+<td class="define_keyword">#define</td>
+<td class="function_name"><a class="link" href="libnm-nm-version.html#NM-DEPRECATED-IN-1-18:CAPS" title="NM_DEPRECATED_IN_1_18">NM_DEPRECATED_IN_1_18</a></td>
+</tr>
+<tr>
+<td class="define_keyword">#define</td>
+<td class="function_name"><a class="link" href="libnm-nm-version.html#NM-AVAILABLE-IN-1-18:CAPS" title="NM_AVAILABLE_IN_1_18">NM_AVAILABLE_IN_1_18</a></td>
+</tr>
 </tbody>
 </table></div>
 </div>
@@ -264,6 +278,12 @@
 <pre class="programlisting"># define NM_DEPRECATED_IN_1_16_FOR(f)    G_DEPRECATED_FOR(f)
 </pre>
 </div>
+<hr>
+<div class="refsect2">
+<a name="NM-DEPRECATED-IN-1-18-FOR:CAPS"></a><h3>NM_DEPRECATED_IN_1_18_FOR()</h3>
+<pre class="programlisting"># define NM_DEPRECATED_IN_1_18_FOR(f)    G_DEPRECATED_FOR(f)
+</pre>
+</div>
 </div>
 <div class="refsect1">
 <a name="libnm-nm-version.other_details"></a><h2>Types and Values</h2>
@@ -396,6 +416,18 @@
 <pre class="programlisting"># define NM_AVAILABLE_IN_1_16            G_UNAVAILABLE(1,16)
 </pre>
 </div>
+<hr>
+<div class="refsect2">
+<a name="NM-DEPRECATED-IN-1-18:CAPS"></a><h3>NM_DEPRECATED_IN_1_18</h3>
+<pre class="programlisting"># define NM_DEPRECATED_IN_1_18           G_DEPRECATED
+</pre>
+</div>
+<hr>
+<div class="refsect2">
+<a name="NM-AVAILABLE-IN-1-18:CAPS"></a><h3>NM_AVAILABLE_IN_1_18</h3>
+<pre class="programlisting"># define NM_AVAILABLE_IN_1_18            G_UNAVAILABLE(1,18)
+</pre>
+</div>
 </div>
 </div>
 <div class="footer">
diff --git a/docs/libnm/html/libnm.devhelp2 b/docs/libnm/html/libnm.devhelp2
index 847ecd84..ff36a307 100644
--- a/docs/libnm/html/libnm.devhelp2
+++ b/docs/libnm/html/libnm.devhelp2
@@ -416,11 +416,17 @@
     <keyword type="macro" name="NM_LLDP_ATTR_SYSTEM_NAME" link="libnm-nm-dbus-interface.html#NM-LLDP-ATTR-SYSTEM-NAME:CAPS"/>
     <keyword type="macro" name="NM_LLDP_ATTR_SYSTEM_DESCRIPTION" link="libnm-nm-dbus-interface.html#NM-LLDP-ATTR-SYSTEM-DESCRIPTION:CAPS"/>
     <keyword type="macro" name="NM_LLDP_ATTR_SYSTEM_CAPABILITIES" link="libnm-nm-dbus-interface.html#NM-LLDP-ATTR-SYSTEM-CAPABILITIES:CAPS"/>
+    <keyword type="macro" name="NM_LLDP_ATTR_MANAGEMENT_ADDRESSES" link="libnm-nm-dbus-interface.html#NM-LLDP-ATTR-MANAGEMENT-ADDRESSES:CAPS"/>
     <keyword type="macro" name="NM_LLDP_ATTR_IEEE_802_1_PVID" link="libnm-nm-dbus-interface.html#NM-LLDP-ATTR-IEEE-802-1-PVID:CAPS"/>
-    <keyword type="macro" name="NM_LLDP_ATTR_IEEE_802_1_PPVID" link="libnm-nm-dbus-interface.html#NM-LLDP-ATTR-IEEE-802-1-PPVID:CAPS"/>
-    <keyword type="macro" name="NM_LLDP_ATTR_IEEE_802_1_PPVID_FLAGS" link="libnm-nm-dbus-interface.html#NM-LLDP-ATTR-IEEE-802-1-PPVID-FLAGS:CAPS"/>
+    <keyword type="macro" name="NM_LLDP_ATTR_IEEE_802_1_VLANS" link="libnm-nm-dbus-interface.html#NM-LLDP-ATTR-IEEE-802-1-VLANS:CAPS"/>
+    <keyword type="macro" name="NM_LLDP_ATTR_IEEE_802_1_PPVIDS" link="libnm-nm-dbus-interface.html#NM-LLDP-ATTR-IEEE-802-1-PPVIDS:CAPS"/>
+    <keyword type="macro" name="NM_LLDP_ATTR_IEEE_802_3_MAC_PHY_CONF" link="libnm-nm-dbus-interface.html#NM-LLDP-ATTR-IEEE-802-3-MAC-PHY-CONF:CAPS"/>
+    <keyword type="macro" name="NM_LLDP_ATTR_IEEE_802_3_POWER_VIA_MDI" link="libnm-nm-dbus-interface.html#NM-LLDP-ATTR-IEEE-802-3-POWER-VIA-MDI:CAPS"/>
+    <keyword type="macro" name="NM_LLDP_ATTR_IEEE_802_3_MAX_FRAME_SIZE" link="libnm-nm-dbus-interface.html#NM-LLDP-ATTR-IEEE-802-3-MAX-FRAME-SIZE:CAPS"/>
     <keyword type="macro" name="NM_LLDP_ATTR_IEEE_802_1_VID" link="libnm-nm-dbus-interface.html#NM-LLDP-ATTR-IEEE-802-1-VID:CAPS"/>
     <keyword type="macro" name="NM_LLDP_ATTR_IEEE_802_1_VLAN_NAME" link="libnm-nm-dbus-interface.html#NM-LLDP-ATTR-IEEE-802-1-VLAN-NAME:CAPS"/>
+    <keyword type="macro" name="NM_LLDP_ATTR_IEEE_802_1_PPVID" link="libnm-nm-dbus-interface.html#NM-LLDP-ATTR-IEEE-802-1-PPVID:CAPS"/>
+    <keyword type="macro" name="NM_LLDP_ATTR_IEEE_802_1_PPVID_FLAGS" link="libnm-nm-dbus-interface.html#NM-LLDP-ATTR-IEEE-802-1-PPVID-FLAGS:CAPS"/>
     <keyword type="macro" name="NM_LLDP_DEST_NEAREST_BRIDGE" link="libnm-nm-dbus-interface.html#NM-LLDP-DEST-NEAREST-BRIDGE:CAPS"/>
     <keyword type="macro" name="NM_LLDP_DEST_NEAREST_NON_TPMR_BRIDGE" link="libnm-nm-dbus-interface.html#NM-LLDP-DEST-NEAREST-NON-TPMR-BRIDGE:CAPS"/>
     <keyword type="macro" name="NM_LLDP_DEST_NEAREST_CUSTOMER_BRIDGE" link="libnm-nm-dbus-interface.html#NM-LLDP-DEST-NEAREST-CUSTOMER-BRIDGE:CAPS"/>
@@ -923,14 +929,22 @@
     <keyword type="function" name="nm_setting_bridge_port_get_priority ()" link="NMSettingBridgePort.html#nm-setting-bridge-port-get-priority"/>
     <keyword type="function" name="nm_setting_bridge_port_get_path_cost ()" link="NMSettingBridgePort.html#nm-setting-bridge-port-get-path-cost"/>
     <keyword type="function" name="nm_setting_bridge_port_get_hairpin_mode ()" link="NMSettingBridgePort.html#nm-setting-bridge-port-get-hairpin-mode"/>
+    <keyword type="function" name="nm_setting_bridge_port_add_vlan ()" link="NMSettingBridgePort.html#nm-setting-bridge-port-add-vlan" since="1.18"/>
+    <keyword type="function" name="nm_setting_bridge_port_get_num_vlans ()" link="NMSettingBridgePort.html#nm-setting-bridge-port-get-num-vlans" since="1.18"/>
+    <keyword type="function" name="nm_setting_bridge_port_get_vlan ()" link="NMSettingBridgePort.html#nm-setting-bridge-port-get-vlan" since="1.18"/>
+    <keyword type="function" name="nm_setting_bridge_port_remove_vlan ()" link="NMSettingBridgePort.html#nm-setting-bridge-port-remove-vlan" since="1.18"/>
+    <keyword type="function" name="nm_setting_bridge_port_remove_vlan_by_vid ()" link="NMSettingBridgePort.html#nm-setting-bridge-port-remove-vlan-by-vid" since="1.18"/>
+    <keyword type="function" name="nm_setting_bridge_port_clear_vlans ()" link="NMSettingBridgePort.html#nm-setting-bridge-port-clear-vlans" since="1.18"/>
     <keyword type="macro" name="NM_SETTING_BRIDGE_PORT_SETTING_NAME" link="NMSettingBridgePort.html#NM-SETTING-BRIDGE-PORT-SETTING-NAME:CAPS"/>
     <keyword type="macro" name="NM_SETTING_BRIDGE_PORT_PRIORITY" link="NMSettingBridgePort.html#NM-SETTING-BRIDGE-PORT-PRIORITY:CAPS"/>
     <keyword type="macro" name="NM_SETTING_BRIDGE_PORT_PATH_COST" link="NMSettingBridgePort.html#NM-SETTING-BRIDGE-PORT-PATH-COST:CAPS"/>
     <keyword type="macro" name="NM_SETTING_BRIDGE_PORT_HAIRPIN_MODE" link="NMSettingBridgePort.html#NM-SETTING-BRIDGE-PORT-HAIRPIN-MODE:CAPS"/>
+    <keyword type="macro" name="NM_SETTING_BRIDGE_PORT_VLANS" link="NMSettingBridgePort.html#NM-SETTING-BRIDGE-PORT-VLANS:CAPS"/>
     <keyword type="struct" name="NMSettingBridgePort" link="NMSettingBridgePort.html#NMSettingBridgePort-struct"/>
     <keyword type="property" name="The “hairpin-mode” property" link="NMSettingBridgePort.html#NMSettingBridgePort--hairpin-mode"/>
     <keyword type="property" name="The “path-cost” property" link="NMSettingBridgePort.html#NMSettingBridgePort--path-cost"/>
     <keyword type="property" name="The “priority” property" link="NMSettingBridgePort.html#NMSettingBridgePort--priority"/>
+    <keyword type="property" name="The “vlans” property" link="NMSettingBridgePort.html#NMSettingBridgePort--vlans"/>
     <keyword type="function" name="nm_setting_bridge_new ()" link="NMSettingBridge.html#nm-setting-bridge-new"/>
     <keyword type="function" name="nm_setting_bridge_get_mac_address ()" link="NMSettingBridge.html#nm-setting-bridge-get-mac-address"/>
     <keyword type="function" name="nm_setting_bridge_get_stp ()" link="NMSettingBridge.html#nm-setting-bridge-get-stp"/>
@@ -941,6 +955,28 @@
     <keyword type="function" name="nm_setting_bridge_get_ageing_time ()" link="NMSettingBridge.html#nm-setting-bridge-get-ageing-time"/>
     <keyword type="function" name="nm_setting_bridge_get_group_forward_mask ()" link="NMSettingBridge.html#nm-setting-bridge-get-group-forward-mask" since="1.10"/>
     <keyword type="function" name="nm_setting_bridge_get_multicast_snooping ()" link="NMSettingBridge.html#nm-setting-bridge-get-multicast-snooping" since="1.2"/>
+    <keyword type="function" name="nm_setting_bridge_get_vlan_filtering ()" link="NMSettingBridge.html#nm-setting-bridge-get-vlan-filtering" since="1.18"/>
+    <keyword type="function" name="nm_setting_bridge_get_vlan_default_pvid ()" link="NMSettingBridge.html#nm-setting-bridge-get-vlan-default-pvid" since="1.18"/>
+    <keyword type="function" name="nm_setting_bridge_add_vlan ()" link="NMSettingBridge.html#nm-setting-bridge-add-vlan" since="1.18"/>
+    <keyword type="function" name="nm_setting_bridge_get_num_vlans ()" link="NMSettingBridge.html#nm-setting-bridge-get-num-vlans" since="1.18"/>
+    <keyword type="function" name="nm_setting_bridge_get_vlan ()" link="NMSettingBridge.html#nm-setting-bridge-get-vlan" since="1.18"/>
+    <keyword type="function" name="nm_setting_bridge_remove_vlan ()" link="NMSettingBridge.html#nm-setting-bridge-remove-vlan" since="1.18"/>
+    <keyword type="function" name="nm_setting_bridge_remove_vlan_by_vid ()" link="NMSettingBridge.html#nm-setting-bridge-remove-vlan-by-vid" since="1.18"/>
+    <keyword type="function" name="nm_setting_bridge_clear_vlans ()" link="NMSettingBridge.html#nm-setting-bridge-clear-vlans" since="1.18"/>
+    <keyword type="function" name="nm_bridge_vlan_new ()" link="NMSettingBridge.html#nm-bridge-vlan-new" since="1.18"/>
+    <keyword type="function" name="nm_bridge_vlan_ref ()" link="NMSettingBridge.html#nm-bridge-vlan-ref" since="1.18"/>
+    <keyword type="function" name="nm_bridge_vlan_unref ()" link="NMSettingBridge.html#nm-bridge-vlan-unref" since="1.18"/>
+    <keyword type="function" name="nm_bridge_vlan_new_clone ()" link="NMSettingBridge.html#nm-bridge-vlan-new-clone" since="1.18"/>
+    <keyword type="function" name="nm_bridge_vlan_cmp ()" link="NMSettingBridge.html#nm-bridge-vlan-cmp" since="1.18"/>
+    <keyword type="function" name="nm_bridge_vlan_seal ()" link="NMSettingBridge.html#nm-bridge-vlan-seal" since="1.18"/>
+    <keyword type="function" name="nm_bridge_vlan_is_sealed ()" link="NMSettingBridge.html#nm-bridge-vlan-is-sealed" since="1.18"/>
+    <keyword type="function" name="nm_bridge_vlan_set_untagged ()" link="NMSettingBridge.html#nm-bridge-vlan-set-untagged" since="1.18"/>
+    <keyword type="function" name="nm_bridge_vlan_set_pvid ()" link="NMSettingBridge.html#nm-bridge-vlan-set-pvid" since="1.18"/>
+    <keyword type="function" name="nm_bridge_vlan_get_vid_range ()" link="NMSettingBridge.html#nm-bridge-vlan-get-vid-range" since="1.18"/>
+    <keyword type="function" name="nm_bridge_vlan_is_untagged ()" link="NMSettingBridge.html#nm-bridge-vlan-is-untagged" since="1.18"/>
+    <keyword type="function" name="nm_bridge_vlan_is_pvid ()" link="NMSettingBridge.html#nm-bridge-vlan-is-pvid" since="1.18"/>
+    <keyword type="function" name="nm_bridge_vlan_to_str ()" link="NMSettingBridge.html#nm-bridge-vlan-to-str" since="1.18"/>
+    <keyword type="function" name="nm_bridge_vlan_from_str ()" link="NMSettingBridge.html#nm-bridge-vlan-from-str" since="1.18"/>
     <keyword type="macro" name="NM_SETTING_BRIDGE_SETTING_NAME" link="NMSettingBridge.html#NM-SETTING-BRIDGE-SETTING-NAME:CAPS"/>
     <keyword type="macro" name="NM_SETTING_BRIDGE_MAC_ADDRESS" link="NMSettingBridge.html#NM-SETTING-BRIDGE-MAC-ADDRESS:CAPS"/>
     <keyword type="macro" name="NM_SETTING_BRIDGE_STP" link="NMSettingBridge.html#NM-SETTING-BRIDGE-STP:CAPS"/>
@@ -951,6 +987,11 @@
     <keyword type="macro" name="NM_SETTING_BRIDGE_AGEING_TIME" link="NMSettingBridge.html#NM-SETTING-BRIDGE-AGEING-TIME:CAPS"/>
     <keyword type="macro" name="NM_SETTING_BRIDGE_GROUP_FORWARD_MASK" link="NMSettingBridge.html#NM-SETTING-BRIDGE-GROUP-FORWARD-MASK:CAPS"/>
     <keyword type="macro" name="NM_SETTING_BRIDGE_MULTICAST_SNOOPING" link="NMSettingBridge.html#NM-SETTING-BRIDGE-MULTICAST-SNOOPING:CAPS"/>
+    <keyword type="macro" name="NM_SETTING_BRIDGE_VLAN_FILTERING" link="NMSettingBridge.html#NM-SETTING-BRIDGE-VLAN-FILTERING:CAPS"/>
+    <keyword type="macro" name="NM_SETTING_BRIDGE_VLAN_DEFAULT_PVID" link="NMSettingBridge.html#NM-SETTING-BRIDGE-VLAN-DEFAULT-PVID:CAPS"/>
+    <keyword type="macro" name="NM_SETTING_BRIDGE_VLANS" link="NMSettingBridge.html#NM-SETTING-BRIDGE-VLANS:CAPS"/>
+    <keyword type="macro" name="NM_BRIDGE_VLAN_VID_MIN" link="NMSettingBridge.html#NM-BRIDGE-VLAN-VID-MIN:CAPS"/>
+    <keyword type="macro" name="NM_BRIDGE_VLAN_VID_MAX" link="NMSettingBridge.html#NM-BRIDGE-VLAN-VID-MAX:CAPS"/>
     <keyword type="struct" name="NMSettingBridge" link="NMSettingBridge.html#NMSettingBridge-struct"/>
     <keyword type="property" name="The “ageing-time” property" link="NMSettingBridge.html#NMSettingBridge--ageing-time"/>
     <keyword type="property" name="The “forward-delay” property" link="NMSettingBridge.html#NMSettingBridge--forward-delay"/>
@@ -961,6 +1002,9 @@
     <keyword type="property" name="The “multicast-snooping” property" link="NMSettingBridge.html#NMSettingBridge--multicast-snooping"/>
     <keyword type="property" name="The “priority” property" link="NMSettingBridge.html#NMSettingBridge--priority"/>
     <keyword type="property" name="The “stp” property" link="NMSettingBridge.html#NMSettingBridge--stp"/>
+    <keyword type="property" name="The “vlan-default-pvid” property" link="NMSettingBridge.html#NMSettingBridge--vlan-default-pvid"/>
+    <keyword type="property" name="The “vlan-filtering” property" link="NMSettingBridge.html#NMSettingBridge--vlan-filtering"/>
+    <keyword type="property" name="The “vlans” property" link="NMSettingBridge.html#NMSettingBridge--vlans"/>
     <keyword type="function" name="nm_setting_cdma_new ()" link="NMSettingCdma.html#nm-setting-cdma-new"/>
     <keyword type="function" name="nm_setting_cdma_get_number ()" link="NMSettingCdma.html#nm-setting-cdma-get-number"/>
     <keyword type="function" name="nm_setting_cdma_get_username ()" link="NMSettingCdma.html#nm-setting-cdma-get-username"/>
@@ -1239,6 +1283,48 @@
     <keyword type="function" name="nm_ip_route_set_attribute ()" link="NMSettingIPConfig.html#nm-ip-route-set-attribute"/>
     <keyword type="function" name="nm_ip_route_get_variant_attribute_spec ()" link="NMSettingIPConfig.html#nm-ip-route-get-variant-attribute-spec" since="1.8"/>
     <keyword type="function" name="nm_ip_route_attribute_validate ()" link="NMSettingIPConfig.html#nm-ip-route-attribute-validate" since="1.8"/>
+    <keyword type="function" name="nm_ip_routing_rule_new ()" link="NMSettingIPConfig.html#nm-ip-routing-rule-new" since="1.18"/>
+    <keyword type="function" name="nm_ip_routing_rule_new_clone ()" link="NMSettingIPConfig.html#nm-ip-routing-rule-new-clone" since="1.18"/>
+    <keyword type="function" name="nm_ip_routing_rule_ref ()" link="NMSettingIPConfig.html#nm-ip-routing-rule-ref" since="1.18"/>
+    <keyword type="function" name="nm_ip_routing_rule_unref ()" link="NMSettingIPConfig.html#nm-ip-routing-rule-unref" since="1.18"/>
+    <keyword type="function" name="nm_ip_routing_rule_is_sealed ()" link="NMSettingIPConfig.html#nm-ip-routing-rule-is-sealed" since="1.18"/>
+    <keyword type="function" name="nm_ip_routing_rule_seal ()" link="NMSettingIPConfig.html#nm-ip-routing-rule-seal" since="1.18"/>
+    <keyword type="function" name="nm_ip_routing_rule_get_addr_family ()" link="NMSettingIPConfig.html#nm-ip-routing-rule-get-addr-family" since="1.18"/>
+    <keyword type="function" name="nm_ip_routing_rule_get_invert ()" link="NMSettingIPConfig.html#nm-ip-routing-rule-get-invert" since="1.18"/>
+    <keyword type="function" name="nm_ip_routing_rule_set_invert ()" link="NMSettingIPConfig.html#nm-ip-routing-rule-set-invert" since="1.18"/>
+    <keyword type="function" name="nm_ip_routing_rule_get_priority ()" link="NMSettingIPConfig.html#nm-ip-routing-rule-get-priority" since="1.18"/>
+    <keyword type="function" name="nm_ip_routing_rule_set_priority ()" link="NMSettingIPConfig.html#nm-ip-routing-rule-set-priority" since="1.18"/>
+    <keyword type="function" name="nm_ip_routing_rule_get_tos ()" link="NMSettingIPConfig.html#nm-ip-routing-rule-get-tos" since="1.18"/>
+    <keyword type="function" name="nm_ip_routing_rule_set_tos ()" link="NMSettingIPConfig.html#nm-ip-routing-rule-set-tos" since="1.18"/>
+    <keyword type="function" name="nm_ip_routing_rule_get_ipproto ()" link="NMSettingIPConfig.html#nm-ip-routing-rule-get-ipproto" since="1.18"/>
+    <keyword type="function" name="nm_ip_routing_rule_set_ipproto ()" link="NMSettingIPConfig.html#nm-ip-routing-rule-set-ipproto" since="1.18"/>
+    <keyword type="function" name="nm_ip_routing_rule_get_source_port_start ()" link="NMSettingIPConfig.html#nm-ip-routing-rule-get-source-port-start" since="1.18"/>
+    <keyword type="function" name="nm_ip_routing_rule_get_source_port_end ()" link="NMSettingIPConfig.html#nm-ip-routing-rule-get-source-port-end" since="1.18"/>
+    <keyword type="function" name="nm_ip_routing_rule_set_source_port ()" link="NMSettingIPConfig.html#nm-ip-routing-rule-set-source-port" since="1.18"/>
+    <keyword type="function" name="nm_ip_routing_rule_get_destination_port_start ()" link="NMSettingIPConfig.html#nm-ip-routing-rule-get-destination-port-start" since="1.18"/>
+    <keyword type="function" name="nm_ip_routing_rule_get_destination_port_end ()" link="NMSettingIPConfig.html#nm-ip-routing-rule-get-destination-port-end" since="1.18"/>
+    <keyword type="function" name="nm_ip_routing_rule_set_destination_port ()" link="NMSettingIPConfig.html#nm-ip-routing-rule-set-destination-port" since="1.18"/>
+    <keyword type="function" name="nm_ip_routing_rule_get_fwmark ()" link="NMSettingIPConfig.html#nm-ip-routing-rule-get-fwmark" since="1.18"/>
+    <keyword type="function" name="nm_ip_routing_rule_get_fwmask ()" link="NMSettingIPConfig.html#nm-ip-routing-rule-get-fwmask" since="1.18"/>
+    <keyword type="function" name="nm_ip_routing_rule_set_fwmark ()" link="NMSettingIPConfig.html#nm-ip-routing-rule-set-fwmark" since="1.18"/>
+    <keyword type="function" name="nm_ip_routing_rule_get_from_len ()" link="NMSettingIPConfig.html#nm-ip-routing-rule-get-from-len" since="1.18"/>
+    <keyword type="function" name="nm_ip_routing_rule_get_from ()" link="NMSettingIPConfig.html#nm-ip-routing-rule-get-from" since="1.18"/>
+    <keyword type="function" name="nm_ip_routing_rule_set_from ()" link="NMSettingIPConfig.html#nm-ip-routing-rule-set-from" since="1.18"/>
+    <keyword type="function" name="nm_ip_routing_rule_get_to_len ()" link="NMSettingIPConfig.html#nm-ip-routing-rule-get-to-len" since="1.18"/>
+    <keyword type="function" name="nm_ip_routing_rule_get_to ()" link="NMSettingIPConfig.html#nm-ip-routing-rule-get-to" since="1.18"/>
+    <keyword type="function" name="nm_ip_routing_rule_set_to ()" link="NMSettingIPConfig.html#nm-ip-routing-rule-set-to" since="1.18"/>
+    <keyword type="function" name="nm_ip_routing_rule_get_iifname ()" link="NMSettingIPConfig.html#nm-ip-routing-rule-get-iifname" since="1.18"/>
+    <keyword type="function" name="nm_ip_routing_rule_set_iifname ()" link="NMSettingIPConfig.html#nm-ip-routing-rule-set-iifname" since="1.18"/>
+    <keyword type="function" name="nm_ip_routing_rule_get_oifname ()" link="NMSettingIPConfig.html#nm-ip-routing-rule-get-oifname" since="1.18"/>
+    <keyword type="function" name="nm_ip_routing_rule_set_oifname ()" link="NMSettingIPConfig.html#nm-ip-routing-rule-set-oifname" since="1.18"/>
+    <keyword type="function" name="nm_ip_routing_rule_get_action ()" link="NMSettingIPConfig.html#nm-ip-routing-rule-get-action" since="1.18"/>
+    <keyword type="function" name="nm_ip_routing_rule_set_action ()" link="NMSettingIPConfig.html#nm-ip-routing-rule-set-action" since="1.18"/>
+    <keyword type="function" name="nm_ip_routing_rule_get_table ()" link="NMSettingIPConfig.html#nm-ip-routing-rule-get-table" since="1.18"/>
+    <keyword type="function" name="nm_ip_routing_rule_set_table ()" link="NMSettingIPConfig.html#nm-ip-routing-rule-set-table" since="1.18"/>
+    <keyword type="function" name="nm_ip_routing_rule_cmp ()" link="NMSettingIPConfig.html#nm-ip-routing-rule-cmp" since="1.18"/>
+    <keyword type="function" name="nm_ip_routing_rule_validate ()" link="NMSettingIPConfig.html#nm-ip-routing-rule-validate" since="1.18"/>
+    <keyword type="function" name="nm_ip_routing_rule_from_string ()" link="NMSettingIPConfig.html#nm-ip-routing-rule-from-string" since="1.18"/>
+    <keyword type="function" name="nm_ip_routing_rule_to_string ()" link="NMSettingIPConfig.html#nm-ip-routing-rule-to-string" since="1.18"/>
     <keyword type="function" name="nm_setting_ip_config_get_method ()" link="NMSettingIPConfig.html#nm-setting-ip-config-get-method"/>
     <keyword type="function" name="nm_setting_ip_config_get_num_dns ()" link="NMSettingIPConfig.html#nm-setting-ip-config-get-num-dns"/>
     <keyword type="function" name="nm_setting_ip_config_get_dns ()" link="NMSettingIPConfig.html#nm-setting-ip-config-get-dns"/>
@@ -1276,6 +1362,11 @@
     <keyword type="function" name="nm_setting_ip_config_clear_routes ()" link="NMSettingIPConfig.html#nm-setting-ip-config-clear-routes"/>
     <keyword type="function" name="nm_setting_ip_config_get_route_metric ()" link="NMSettingIPConfig.html#nm-setting-ip-config-get-route-metric"/>
     <keyword type="function" name="nm_setting_ip_config_get_route_table ()" link="NMSettingIPConfig.html#nm-setting-ip-config-get-route-table" since="1.10"/>
+    <keyword type="function" name="nm_setting_ip_config_get_num_routing_rules ()" link="NMSettingIPConfig.html#nm-setting-ip-config-get-num-routing-rules" since="1.18"/>
+    <keyword type="function" name="nm_setting_ip_config_get_routing_rule ()" link="NMSettingIPConfig.html#nm-setting-ip-config-get-routing-rule" since="1.18"/>
+    <keyword type="function" name="nm_setting_ip_config_add_routing_rule ()" link="NMSettingIPConfig.html#nm-setting-ip-config-add-routing-rule" since="1.18"/>
+    <keyword type="function" name="nm_setting_ip_config_remove_routing_rule ()" link="NMSettingIPConfig.html#nm-setting-ip-config-remove-routing-rule" since="1.18"/>
+    <keyword type="function" name="nm_setting_ip_config_clear_routing_rules ()" link="NMSettingIPConfig.html#nm-setting-ip-config-clear-routing-rules" since="1.18"/>
     <keyword type="function" name="nm_setting_ip_config_get_ignore_auto_routes ()" link="NMSettingIPConfig.html#nm-setting-ip-config-get-ignore-auto-routes"/>
     <keyword type="function" name="nm_setting_ip_config_get_ignore_auto_dns ()" link="NMSettingIPConfig.html#nm-setting-ip-config-get-ignore-auto-dns"/>
     <keyword type="function" name="nm_setting_ip_config_get_dhcp_hostname ()" link="NMSettingIPConfig.html#nm-setting-ip-config-get-dhcp-hostname"/>
@@ -1300,6 +1391,7 @@
     <keyword type="macro" name="NM_IP_ROUTE_ATTRIBUTE_LOCK_INITCWND" link="NMSettingIPConfig.html#NM-IP-ROUTE-ATTRIBUTE-LOCK-INITCWND:CAPS"/>
     <keyword type="macro" name="NM_IP_ROUTE_ATTRIBUTE_LOCK_INITRWND" link="NMSettingIPConfig.html#NM-IP-ROUTE-ATTRIBUTE-LOCK-INITRWND:CAPS"/>
     <keyword type="macro" name="NM_IP_ROUTE_ATTRIBUTE_LOCK_MTU" link="NMSettingIPConfig.html#NM-IP-ROUTE-ATTRIBUTE-LOCK-MTU:CAPS"/>
+    <keyword type="enum" name="enum NMIPRoutingRuleAsStringFlags" link="NMSettingIPConfig.html#NMIPRoutingRuleAsStringFlags" since="1.18"/>
     <keyword type="macro" name="NM_SETTING_IP_CONFIG_DAD_TIMEOUT_MAX" link="NMSettingIPConfig.html#NM-SETTING-IP-CONFIG-DAD-TIMEOUT-MAX:CAPS"/>
     <keyword type="macro" name="NM_SETTING_IP_CONFIG_METHOD" link="NMSettingIPConfig.html#NM-SETTING-IP-CONFIG-METHOD:CAPS"/>
     <keyword type="macro" name="NM_SETTING_IP_CONFIG_DNS" link="NMSettingIPConfig.html#NM-SETTING-IP-CONFIG-DNS:CAPS"/>
@@ -1319,6 +1411,7 @@
     <keyword type="macro" name="NM_SETTING_IP_CONFIG_MAY_FAIL" link="NMSettingIPConfig.html#NM-SETTING-IP-CONFIG-MAY-FAIL:CAPS"/>
     <keyword type="macro" name="NM_SETTING_IP_CONFIG_DAD_TIMEOUT" link="NMSettingIPConfig.html#NM-SETTING-IP-CONFIG-DAD-TIMEOUT:CAPS"/>
     <keyword type="macro" name="NM_SETTING_IP_CONFIG_DHCP_TIMEOUT" link="NMSettingIPConfig.html#NM-SETTING-IP-CONFIG-DHCP-TIMEOUT:CAPS"/>
+    <keyword type="macro" name="NM_SETTING_IP_CONFIG_ROUTING_RULES" link="NMSettingIPConfig.html#NM-SETTING-IP-CONFIG-ROUTING-RULES:CAPS"/>
     <keyword type="macro" name="NM_SETTING_DNS_OPTION_DEBUG" link="NMSettingIPConfig.html#NM-SETTING-DNS-OPTION-DEBUG:CAPS"/>
     <keyword type="macro" name="NM_SETTING_DNS_OPTION_NDOTS" link="NMSettingIPConfig.html#NM-SETTING-DNS-OPTION-NDOTS:CAPS"/>
     <keyword type="macro" name="NM_SETTING_DNS_OPTION_TIMEOUT" link="NMSettingIPConfig.html#NM-SETTING-DNS-OPTION-TIMEOUT:CAPS"/>
@@ -1626,7 +1719,7 @@
     <keyword type="function" name="nm_sriov_vf_set_vlan_protocol ()" link="NMSettingSriov.html#nm-sriov-vf-set-vlan-protocol" since="1.14"/>
     <keyword type="function" name="nm_sriov_vf_get_vlan_qos ()" link="NMSettingSriov.html#nm-sriov-vf-get-vlan-qos" since="1.14"/>
     <keyword type="function" name="nm_sriov_vf_get_vlan_protocol ()" link="NMSettingSriov.html#nm-sriov-vf-get-vlan-protocol"/>
-    <keyword type="function" name="nm_sriov_vf_new ()" link="NMSettingSriov.html#nm-sriov-vf-new"/>
+    <keyword type="function" name="nm_sriov_vf_new ()" link="NMSettingSriov.html#nm-sriov-vf-new" since="1.14"/>
     <keyword type="function" name="nm_sriov_vf_ref ()" link="NMSettingSriov.html#nm-sriov-vf-ref" since="1.14"/>
     <keyword type="function" name="nm_sriov_vf_unref ()" link="NMSettingSriov.html#nm-sriov-vf-unref" since="1.14"/>
     <keyword type="function" name="nm_sriov_vf_equal ()" link="NMSettingSriov.html#nm-sriov-vf-equal" since="1.14"/>
@@ -1655,6 +1748,9 @@
     <keyword type="function" name="nm_tc_qdisc_get_handle ()" link="NMSettingTCConfig.html#nm-tc-qdisc-get-handle" since="1.12"/>
     <keyword type="function" name="nm_tc_qdisc_set_handle ()" link="NMSettingTCConfig.html#nm-tc-qdisc-set-handle" since="1.12"/>
     <keyword type="function" name="nm_tc_qdisc_get_parent ()" link="NMSettingTCConfig.html#nm-tc-qdisc-get-parent" since="1.12"/>
+    <keyword type="function" name="nm_tc_qdisc_get_attribute_names ()" link="NMSettingTCConfig.html#nm-tc-qdisc-get-attribute-names" since="1.18"/>
+    <keyword type="function" name="nm_tc_qdisc_get_attribute ()" link="NMSettingTCConfig.html#nm-tc-qdisc-get-attribute" since="1.18"/>
+    <keyword type="function" name="nm_tc_qdisc_set_attribute ()" link="NMSettingTCConfig.html#nm-tc-qdisc-set-attribute" since="1.18"/>
     <keyword type="function" name="nm_tc_action_new ()" link="NMSettingTCConfig.html#nm-tc-action-new" since="1.12"/>
     <keyword type="function" name="nm_tc_action_ref ()" link="NMSettingTCConfig.html#nm-tc-action-ref" since="1.12"/>
     <keyword type="function" name="nm_tc_action_unref ()" link="NMSettingTCConfig.html#nm-tc-action-unref" since="1.12"/>
@@ -2312,6 +2408,7 @@
     <keyword type="function" name="nm_lldp_neighbor_get_attr_string_value ()" link="NMDevice.html#nm-lldp-neighbor-get-attr-string-value" since="1.2"/>
     <keyword type="function" name="nm_lldp_neighbor_get_attr_uint_value ()" link="NMDevice.html#nm-lldp-neighbor-get-attr-uint-value" since="1.2"/>
     <keyword type="function" name="nm_lldp_neighbor_get_attr_type ()" link="NMDevice.html#nm-lldp-neighbor-get-attr-type" since="1.2"/>
+    <keyword type="function" name="nm_lldp_neighbor_get_attr_value ()" link="NMDevice.html#nm-lldp-neighbor-get-attr-value" since="1.18"/>
     <keyword type="macro" name="NM_DEVICE_DEVICE_TYPE" link="NMDevice.html#NM-DEVICE-DEVICE-TYPE:CAPS"/>
     <keyword type="macro" name="NM_DEVICE_UDI" link="NMDevice.html#NM-DEVICE-UDI:CAPS"/>
     <keyword type="macro" name="NM_DEVICE_INTERFACE" link="NMDevice.html#NM-DEVICE-INTERFACE:CAPS"/>
@@ -3000,6 +3097,7 @@
     <keyword type="macro" name="NM_DEPRECATED_IN_1_12_FOR()" link="libnm-nm-version.html#NM-DEPRECATED-IN-1-12-FOR:CAPS"/>
     <keyword type="macro" name="NM_DEPRECATED_IN_1_14_FOR()" link="libnm-nm-version.html#NM-DEPRECATED-IN-1-14-FOR:CAPS"/>
     <keyword type="macro" name="NM_DEPRECATED_IN_1_16_FOR()" link="libnm-nm-version.html#NM-DEPRECATED-IN-1-16-FOR:CAPS"/>
+    <keyword type="macro" name="NM_DEPRECATED_IN_1_18_FOR()" link="libnm-nm-version.html#NM-DEPRECATED-IN-1-18-FOR:CAPS"/>
     <keyword type="macro" name="NM_VERSION_MIN_REQUIRED" link="libnm-nm-version.html#NM-VERSION-MIN-REQUIRED:CAPS"/>
     <keyword type="macro" name="NM_VERSION_MAX_ALLOWED" link="libnm-nm-version.html#NM-VERSION-MAX-ALLOWED:CAPS"/>
     <keyword type="macro" name="NM_DEPRECATED_IN_0_9_10" link="libnm-nm-version.html#NM-DEPRECATED-IN-0-9-10:CAPS"/>
@@ -3022,6 +3120,8 @@
     <keyword type="macro" name="NM_AVAILABLE_IN_1_14" link="libnm-nm-version.html#NM-AVAILABLE-IN-1-14:CAPS"/>
     <keyword type="macro" name="NM_DEPRECATED_IN_1_16" link="libnm-nm-version.html#NM-DEPRECATED-IN-1-16:CAPS"/>
     <keyword type="macro" name="NM_AVAILABLE_IN_1_16" link="libnm-nm-version.html#NM-AVAILABLE-IN-1-16:CAPS"/>
+    <keyword type="macro" name="NM_DEPRECATED_IN_1_18" link="libnm-nm-version.html#NM-DEPRECATED-IN-1-18:CAPS"/>
+    <keyword type="macro" name="NM_AVAILABLE_IN_1_18" link="libnm-nm-version.html#NM-AVAILABLE-IN-1-18:CAPS"/>
     <keyword type="macro" name="NM_VPN_SERVICE_PLUGIN_DBUS_SERVICE_NAME" link="libnm-nm-vpn-service-plugin.html#NM-VPN-SERVICE-PLUGIN-DBUS-SERVICE-NAME:CAPS"/>
     <keyword type="macro" name="NM_VPN_SERVICE_PLUGIN_DBUS_WATCH_PEER" link="libnm-nm-vpn-service-plugin.html#NM-VPN-SERVICE-PLUGIN-DBUS-WATCH-PEER:CAPS"/>
     <keyword type="macro" name="NM_VPN_SERVICE_PLUGIN_STATE" link="libnm-nm-vpn-service-plugin.html#NM-VPN-SERVICE-PLUGIN-STATE:CAPS"/>
@@ -3475,6 +3575,10 @@
     <keyword type="constant" name="NM_SETTING_IP6_CONFIG_PRIVACY_PREFER_TEMP_ADDR" link="NMSettingIP6Config.html#NM-SETTING-IP6-CONFIG-PRIVACY-PREFER-TEMP-ADDR:CAPS"/>
     <keyword type="constant" name="NM_SETTING_IP6_CONFIG_ADDR_GEN_MODE_EUI64" link="NMSettingIP6Config.html#NM-SETTING-IP6-CONFIG-ADDR-GEN-MODE-EUI64:CAPS"/>
     <keyword type="constant" name="NM_SETTING_IP6_CONFIG_ADDR_GEN_MODE_STABLE_PRIVACY" link="NMSettingIP6Config.html#NM-SETTING-IP6-CONFIG-ADDR-GEN-MODE-STABLE-PRIVACY:CAPS"/>
+    <keyword type="constant" name="NM_IP_ROUTING_RULE_AS_STRING_FLAGS_NONE" link="NMSettingIPConfig.html#NM-IP-ROUTING-RULE-AS-STRING-FLAGS-NONE:CAPS"/>
+    <keyword type="constant" name="NM_IP_ROUTING_RULE_AS_STRING_FLAGS_AF_INET" link="NMSettingIPConfig.html#NM-IP-ROUTING-RULE-AS-STRING-FLAGS-AF-INET:CAPS"/>
+    <keyword type="constant" name="NM_IP_ROUTING_RULE_AS_STRING_FLAGS_AF_INET6" link="NMSettingIPConfig.html#NM-IP-ROUTING-RULE-AS-STRING-FLAGS-AF-INET6:CAPS"/>
+    <keyword type="constant" name="NM_IP_ROUTING_RULE_AS_STRING_FLAGS_VALIDATE" link="NMSettingIPConfig.html#NM-IP-ROUTING-RULE-AS-STRING-FLAGS-VALIDATE:CAPS"/>
     <keyword type="constant" name="NM_IP_TUNNEL_FLAG_NONE" link="NMSettingIPTunnel.html#NM-IP-TUNNEL-FLAG-NONE:CAPS"/>
     <keyword type="constant" name="NM_IP_TUNNEL_FLAG_IP6_IGN_ENCAP_LIMIT" link="NMSettingIPTunnel.html#NM-IP-TUNNEL-FLAG-IP6-IGN-ENCAP-LIMIT:CAPS"/>
     <keyword type="constant" name="NM_IP_TUNNEL_FLAG_IP6_USE_ORIG_TCLASS" link="NMSettingIPTunnel.html#NM-IP-TUNNEL-FLAG-IP6-USE-ORIG-TCLASS:CAPS"/>
diff --git a/docs/libnm/html/object-tree.html b/docs/libnm/html/object-tree.html
index d9093705..31c7a48b 100644
--- a/docs/libnm/html/object-tree.html
+++ b/docs/libnm/html/object-tree.html
@@ -127,6 +127,7 @@
     <span class="lineart">├──</span> <a class="link" href="libnm-nm-dbus-interface.html#NMDeviceCapabilities" title="enum NMDeviceCapabilities">NMDeviceCapabilities</a>
     <span class="lineart">├──</span> <a class="link" href="libnm-nm-dbus-interface.html#NMDeviceModemCapabilities" title="enum NMDeviceModemCapabilities">NMDeviceModemCapabilities</a>
     <span class="lineart">├──</span> <a class="link" href="libnm-nm-dbus-interface.html#NMDeviceWifiCapabilities" title="enum NMDeviceWifiCapabilities">NMDeviceWifiCapabilities</a>
+    <span class="lineart">├──</span> <a class="link" href="NMSettingIPConfig.html#NMIPRoutingRuleAsStringFlags" title="enum NMIPRoutingRuleAsStringFlags">NMIPRoutingRuleAsStringFlags</a>
     <span class="lineart">├──</span> <a class="link" href="NMSettingIPTunnel.html#NMIPTunnelFlags" title="enum NMIPTunnelFlags">NMIPTunnelFlags</a>
     <span class="lineart">├──</span> <a class="link" href="libnm-nm-dbus-interface.html#NMSecretAgentCapabilities" title="enum NMSecretAgentCapabilities">NMSecretAgentCapabilities</a>
     <span class="lineart">├──</span> <a class="link" href="libnm-nm-dbus-interface.html#NMSecretAgentGetSecretsFlags" title="enum NMSecretAgentGetSecretsFlags">NMSecretAgentGetSecretsFlags</a>
@@ -196,9 +197,11 @@
     <span class="lineart">├──</span> <a class="link" href="NMSettingWirelessSecurity.html#NMWepKeyType" title="enum NMWepKeyType">NMWepKeyType</a>
     <span class="lineart">╰──</span> <a class="link" href="libnm-nm-dbus-interface.html#NMWimaxNspNetworkType" title="enum NMWimaxNspNetworkType">NMWimaxNspNetworkType</a>
     <a href="/usr/share/gtk-doc/html/gobject/gobject-Boxed-Types.html">GBoxed</a>
+    <span class="lineart">├──</span> <a class="link" href="NMSettingBridge.html#NMBridgeVlan">NMBridgeVlan</a>
     <span class="lineart">├──</span> <a class="link" href="NMClient.html#NMDnsEntry">NMDnsEntry</a>
     <span class="lineart">├──</span> <a class="link" href="NMSettingIPConfig.html#NMIPAddress">NMIPAddress</a>
     <span class="lineart">├──</span> <a class="link" href="NMSettingIPConfig.html#NMIPRoute">NMIPRoute</a>
+    <span class="lineart">├──</span> <a class="link" href="NMSettingIPConfig.html#NMIPRoutingRule">NMIPRoutingRule</a>
     <span class="lineart">├──</span> <a class="link" href="NMDevice.html#NMLldpNeighbor">NMLldpNeighbor</a>
     <span class="lineart">├──</span> <a class="link" href="NMSettingSriov.html#NMSriovVF">NMSriovVF</a>
     <span class="lineart">├──</span> <a class="link" href="NMSettingTCConfig.html#NMTCAction">NMTCAction</a>
diff --git a/docs/libnm/html/usage.html b/docs/libnm/html/usage.html
index 9b8caf5d..207db4b8 100644
--- a/docs/libnm/html/usage.html
+++ b/docs/libnm/html/usage.html
@@ -96,7 +96,7 @@
         </p>
 <pre class="screen"><code class="prompt">$ </code><strong class="userinput"><code>cc $(pkg-config --libs --cflags libnm) -o hello-nm hello-nm.c</code></strong>
   <code class="prompt">$ </code><strong class="userinput"><code>./hello-nm</code></strong>
-  NetworkManager version: 1.16.0
+  NetworkManager version: 1.18.0
 
   <code class="prompt">$ </code></pre>
 <p>
diff --git a/docs/libnm/libnm-sections.txt b/docs/libnm/libnm-sections.txt
index 93814a85..a0e03bb0 100644
--- a/docs/libnm/libnm-sections.txt
+++ b/docs/libnm/libnm-sections.txt
@@ -357,6 +357,7 @@ NM_TYPE_DEVICE_MODEM_CAPABILITIES
 NM_TYPE_DEVICE_STATE_REASON
 NM_TYPE_DEVICE_TYPE
 NM_TYPE_DEVICE_WIFI_CAPABILITIES
+NM_TYPE_IP_ROUTING_RULE_AS_STRING_FLAGS
 NM_TYPE_IP_TUNNEL_FLAGS
 NM_TYPE_IP_TUNNEL_MODE
 NM_TYPE_MANAGER_ERROR
@@ -425,6 +426,7 @@ nm_device_modem_capabilities_get_type
 nm_device_state_reason_get_type
 nm_device_type_get_type
 nm_device_wifi_capabilities_get_type
+nm_ip_routing_rule_as_string_flags_get_type
 nm_ip_tunnel_flags_get_type
 nm_ip_tunnel_mode_get_type
 nm_manager_error_get_type
@@ -620,11 +622,17 @@ NM_LLDP_ATTR_PORT_DESCRIPTION
 NM_LLDP_ATTR_SYSTEM_NAME
 NM_LLDP_ATTR_SYSTEM_DESCRIPTION
 NM_LLDP_ATTR_SYSTEM_CAPABILITIES
+NM_LLDP_ATTR_MANAGEMENT_ADDRESSES
 NM_LLDP_ATTR_IEEE_802_1_PVID
-NM_LLDP_ATTR_IEEE_802_1_PPVID
-NM_LLDP_ATTR_IEEE_802_1_PPVID_FLAGS
+NM_LLDP_ATTR_IEEE_802_1_VLANS
+NM_LLDP_ATTR_IEEE_802_1_PPVIDS
+NM_LLDP_ATTR_IEEE_802_3_MAC_PHY_CONF
+NM_LLDP_ATTR_IEEE_802_3_POWER_VIA_MDI
+NM_LLDP_ATTR_IEEE_802_3_MAX_FRAME_SIZE
 NM_LLDP_ATTR_IEEE_802_1_VID
 NM_LLDP_ATTR_IEEE_802_1_VLAN_NAME
+NM_LLDP_ATTR_IEEE_802_1_PPVID
+NM_LLDP_ATTR_IEEE_802_1_PPVID_FLAGS
 NM_LLDP_DEST_NEAREST_BRIDGE
 NM_LLDP_DEST_NEAREST_NON_TPMR_BRIDGE
 NM_LLDP_DEST_NEAREST_CUSTOMER_BRIDGE
@@ -728,6 +736,7 @@ nm_lldp_neighbor_get_attr_names
 nm_lldp_neighbor_get_attr_string_value
 nm_lldp_neighbor_get_attr_uint_value
 nm_lldp_neighbor_get_attr_type
+nm_lldp_neighbor_get_attr_value
 <SUBSECTION Standard>
 NMDeviceClass
 NMLldpNeighbor
@@ -1884,6 +1893,11 @@ NM_SETTING_BRIDGE_MAX_AGE
 NM_SETTING_BRIDGE_AGEING_TIME
 NM_SETTING_BRIDGE_GROUP_FORWARD_MASK
 NM_SETTING_BRIDGE_MULTICAST_SNOOPING
+NM_SETTING_BRIDGE_VLAN_FILTERING
+NM_SETTING_BRIDGE_VLAN_DEFAULT_PVID
+NM_SETTING_BRIDGE_VLANS
+NM_BRIDGE_VLAN_VID_MIN
+NM_BRIDGE_VLAN_VID_MAX
 NMSettingBridge
 nm_setting_bridge_new
 nm_setting_bridge_get_mac_address
@@ -1895,13 +1909,37 @@ nm_setting_bridge_get_max_age
 nm_setting_bridge_get_ageing_time
 nm_setting_bridge_get_group_forward_mask
 nm_setting_bridge_get_multicast_snooping
+nm_setting_bridge_get_vlan_filtering
+nm_setting_bridge_get_vlan_default_pvid
+nm_setting_bridge_add_vlan
+nm_setting_bridge_get_num_vlans
+nm_setting_bridge_get_vlan
+nm_setting_bridge_remove_vlan
+nm_setting_bridge_remove_vlan_by_vid
+nm_setting_bridge_clear_vlans
+nm_bridge_vlan_new
+nm_bridge_vlan_ref
+nm_bridge_vlan_unref
+nm_bridge_vlan_new_clone
+nm_bridge_vlan_cmp
+nm_bridge_vlan_seal
+nm_bridge_vlan_is_sealed
+nm_bridge_vlan_set_untagged
+nm_bridge_vlan_set_pvid
+nm_bridge_vlan_get_vid_range
+nm_bridge_vlan_is_untagged
+nm_bridge_vlan_is_pvid
+nm_bridge_vlan_to_str
+nm_bridge_vlan_from_str
 <SUBSECTION Standard>
+NMBridgeVlan
 NMSettingBridgeClass
 NM_IS_SETTING_BRIDGE
 NM_SETTING_BRIDGE
 NM_SETTING_BRIDGE_CLASS
 NM_SETTING_BRIDGE_GET_CLASS
 NM_TYPE_SETTING_BRIDGE
+nm_bridge_vlan_get_type
 nm_setting_bridge_get_type
 </SECTION>
 
@@ -1912,11 +1950,18 @@ NM_SETTING_BRIDGE_PORT_SETTING_NAME
 NM_SETTING_BRIDGE_PORT_PRIORITY
 NM_SETTING_BRIDGE_PORT_PATH_COST
 NM_SETTING_BRIDGE_PORT_HAIRPIN_MODE
+NM_SETTING_BRIDGE_PORT_VLANS
 NMSettingBridgePort
 nm_setting_bridge_port_new
 nm_setting_bridge_port_get_priority
 nm_setting_bridge_port_get_path_cost
 nm_setting_bridge_port_get_hairpin_mode
+nm_setting_bridge_port_add_vlan
+nm_setting_bridge_port_get_num_vlans
+nm_setting_bridge_port_get_vlan
+nm_setting_bridge_port_remove_vlan
+nm_setting_bridge_port_remove_vlan_by_vid
+nm_setting_bridge_port_clear_vlans
 <SUBSECTION Standard>
 NMSettingBridgePortClass
 NM_IS_SETTING_BRIDGE_PORT
@@ -2319,6 +2364,49 @@ NM_IP_ROUTE_ATTRIBUTE_LOCK_CWND
 NM_IP_ROUTE_ATTRIBUTE_LOCK_INITCWND
 NM_IP_ROUTE_ATTRIBUTE_LOCK_INITRWND
 NM_IP_ROUTE_ATTRIBUTE_LOCK_MTU
+nm_ip_routing_rule_new
+nm_ip_routing_rule_new_clone
+nm_ip_routing_rule_ref
+nm_ip_routing_rule_unref
+nm_ip_routing_rule_is_sealed
+nm_ip_routing_rule_seal
+nm_ip_routing_rule_get_addr_family
+nm_ip_routing_rule_get_invert
+nm_ip_routing_rule_set_invert
+nm_ip_routing_rule_get_priority
+nm_ip_routing_rule_set_priority
+nm_ip_routing_rule_get_tos
+nm_ip_routing_rule_set_tos
+nm_ip_routing_rule_get_ipproto
+nm_ip_routing_rule_set_ipproto
+nm_ip_routing_rule_get_source_port_start
+nm_ip_routing_rule_get_source_port_end
+nm_ip_routing_rule_set_source_port
+nm_ip_routing_rule_get_destination_port_start
+nm_ip_routing_rule_get_destination_port_end
+nm_ip_routing_rule_set_destination_port
+nm_ip_routing_rule_get_fwmark
+nm_ip_routing_rule_get_fwmask
+nm_ip_routing_rule_set_fwmark
+nm_ip_routing_rule_get_from_len
+nm_ip_routing_rule_get_from
+nm_ip_routing_rule_set_from
+nm_ip_routing_rule_get_to_len
+nm_ip_routing_rule_get_to
+nm_ip_routing_rule_set_to
+nm_ip_routing_rule_get_iifname
+nm_ip_routing_rule_set_iifname
+nm_ip_routing_rule_get_oifname
+nm_ip_routing_rule_set_oifname
+nm_ip_routing_rule_get_action
+nm_ip_routing_rule_set_action
+nm_ip_routing_rule_get_table
+nm_ip_routing_rule_set_table
+nm_ip_routing_rule_cmp
+nm_ip_routing_rule_validate
+NMIPRoutingRuleAsStringFlags
+nm_ip_routing_rule_from_string
+nm_ip_routing_rule_to_string
 NM_SETTING_IP_CONFIG_DAD_TIMEOUT_MAX
 NM_SETTING_IP_CONFIG_METHOD
 NM_SETTING_IP_CONFIG_DNS
@@ -2338,6 +2426,7 @@ NM_SETTING_IP_CONFIG_NEVER_DEFAULT
 NM_SETTING_IP_CONFIG_MAY_FAIL
 NM_SETTING_IP_CONFIG_DAD_TIMEOUT
 NM_SETTING_IP_CONFIG_DHCP_TIMEOUT
+NM_SETTING_IP_CONFIG_ROUTING_RULES
 NM_SETTING_DNS_OPTION_DEBUG
 NM_SETTING_DNS_OPTION_NDOTS
 NM_SETTING_DNS_OPTION_TIMEOUT
@@ -2391,6 +2480,11 @@ nm_setting_ip_config_remove_route_by_value
 nm_setting_ip_config_clear_routes
 nm_setting_ip_config_get_route_metric
 nm_setting_ip_config_get_route_table
+nm_setting_ip_config_get_num_routing_rules
+nm_setting_ip_config_get_routing_rule
+nm_setting_ip_config_add_routing_rule
+nm_setting_ip_config_remove_routing_rule
+nm_setting_ip_config_clear_routing_rules
 nm_setting_ip_config_get_ignore_auto_routes
 nm_setting_ip_config_get_ignore_auto_dns
 nm_setting_ip_config_get_dhcp_hostname
@@ -2402,6 +2496,7 @@ nm_setting_ip_config_get_dhcp_timeout
 <SUBSECTION Standard>
 NMIPAddress
 NMIPRoute
+NMIPRoutingRule
 NMSettingIPConfigClass
 NM_IS_SETTING_IP_CONFIG
 NM_SETTING_IP_CONFIG
@@ -2410,6 +2505,7 @@ NM_SETTING_IP_CONFIG_GET_CLASS
 NM_TYPE_SETTING_IP_CONFIG
 nm_ip_address_get_type
 nm_ip_route_get_type
+nm_ip_routing_rule_get_type
 nm_setting_ip_config_get_type
 </SECTION>
 
@@ -2898,6 +2994,9 @@ nm_tc_qdisc_get_kind
 nm_tc_qdisc_get_handle
 nm_tc_qdisc_set_handle
 nm_tc_qdisc_get_parent
+nm_tc_qdisc_get_attribute_names
+nm_tc_qdisc_get_attribute
+nm_tc_qdisc_set_attribute
 nm_tc_action_new
 nm_tc_action_ref
 nm_tc_action_unref
@@ -3770,6 +3869,9 @@ NM_AVAILABLE_IN_1_14
 NM_DEPRECATED_IN_1_16
 NM_DEPRECATED_IN_1_16_FOR
 NM_AVAILABLE_IN_1_16
+NM_DEPRECATED_IN_1_18
+NM_DEPRECATED_IN_1_18_FOR
+NM_AVAILABLE_IN_1_18
 </SECTION>
 
 <SECTION>
diff --git a/docs/libnm/libnm.types b/docs/libnm/libnm.types
index ebddb57b..86441dea 100644
--- a/docs/libnm/libnm.types
+++ b/docs/libnm/libnm.types
@@ -8,6 +8,7 @@ nm_active_connection_state_get_type
 nm_active_connection_state_reason_get_type
 nm_agent_manager_error_get_type
 nm_bluetooth_capabilities_get_type
+nm_bridge_vlan_get_type
 nm_capability_get_type
 nm_checkpoint_create_flags_get_type
 nm_checkpoint_get_type
@@ -61,6 +62,8 @@ nm_dns_entry_get_type
 nm_ip_address_get_type
 nm_ip_config_get_type
 nm_ip_route_get_type
+nm_ip_routing_rule_as_string_flags_get_type
+nm_ip_routing_rule_get_type
 nm_ip_tunnel_flags_get_type
 nm_ip_tunnel_mode_get_type
 nm_lldp_neighbor_get_type
diff --git a/docs/libnm/version.xml b/docs/libnm/version.xml
index 15b989e3..84cc5294 100644
--- a/docs/libnm/version.xml
+++ b/docs/libnm/version.xml
@@ -1 +1 @@
-1.16.0
+1.18.0
diff --git a/examples/C/glib/meson.build b/examples/C/glib/meson.build
index 1c817163..47d64bdd 100644
--- a/examples/C/glib/meson.build
+++ b/examples/C/glib/meson.build
@@ -14,6 +14,6 @@ foreach example: examples
     example[0],
     [example[0] + '.c'] + example[1],
     include_directories: example[2],
-    dependencies: [nm_core_dep] + example[3],
+    dependencies: [libnm_core_dep] + example[3],
   )
 endforeach
diff --git a/examples/nm-conf.d/31-mac-addr-change.conf b/examples/nm-conf.d/31-mac-addr-change.conf
index 554b698f..f32507a1 100644
--- a/examples/nm-conf.d/31-mac-addr-change.conf
+++ b/examples/nm-conf.d/31-mac-addr-change.conf
@@ -5,12 +5,15 @@
 #
 # https://bugzilla.gnome.org/show_bug.cgi?id=777523
 [device-31-mac-addr-change]
-match-device=driver:rtl8723bs,driver:rtl8189es,driver:r8188eu,driver:eagle_sdio
+match-device=driver:eagle_sdio,driver:wl
 wifi.scan-rand-mac-address=no
 
 [connection-31-mac-addr-change]
-match-device=driver:rtl8723bs,driver:rtl8189es,driver:r8188eu,driver:eagle_sdio
-# these are per-profile properties. Here we overwrite the default
-# value, but explicitly configuring it in the profile takes precedence.
+# These are defaults for the connection profile. Here we set only the default
+# value. Note that the default value already should be "preserve", so this has
+# no actual effect.
+#
+# Also note that this is only the default. Per-profile settings still take
+# precedence.
+match-device=driver:eagle_sdio,driver:wl
 wifi.cloned-mac-address=preserve
-ethernet.cloned-mac-address=preserve
diff --git a/introspection/meson.build b/introspection/meson.build
index e442ac85..631432a7 100644
--- a/introspection/meson.build
+++ b/introspection/meson.build
@@ -73,13 +73,20 @@ foreach iface: ifaces
 
   sources += res
 
-  content_files += join_paths(meson.current_build_dir(), 'dbus-' + iface_xml)
+  if gio_unix_dep.version().version_compare('>= 2.51.3')
+    dbus_iface_xml_path = join_paths(meson.current_build_dir(), 'dbus-' + iface_xml)
+  else
+    dbus_iface_xml_path = join_paths(meson.build_root(), 'dbus-' + iface_xml)
+  endif
+
+  content_files += dbus_iface_xml_path
 
   # res is an array only since 0.46. Documentation won't work with
   # older versions
   if meson.version().version_compare('>= 0.46.0')
-    introspection_files += res[2]
+    introspection_files += [ [res[2], dbus_iface_xml_path] ]
   endif
+
 endforeach
 
 install_data(
diff --git a/libnm-core/meson.build b/libnm-core/meson.build
index d10dd1c5..bc2d087a 100644
--- a/libnm-core/meson.build
+++ b/libnm-core/meson.build
@@ -139,14 +139,57 @@ libnm_core_enum = gnome.mkenums(
   install_dir: libnm_pkgincludedir,
 )
 
+libnm_core_enum_dep = declare_dependency(
+  sources: libnm_core_enum[1],
+)
+
+###############################################################################
+
+shared_nm_libnm_core_intern = static_library(
+    'nm-libnm-core-intern',
+    sources: files('../shared/nm-libnm-core-intern/nm-ethtool-utils.c',
+                   '../shared/nm-libnm-core-intern/nm-libnm-core-utils.c'),
+    c_args: [
+        '-DG_LOG_DOMAIN="@0@"'.format(libnm_name),
+        '-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIBNM_CORE',
+    ],
+    include_directories: [
+        top_inc,
+        shared_inc,
+        libnm_core_inc,
+    ],
+    dependencies: [
+        glib_dep,
+        shared_c_siphash_dep,
+        shared_nm_glib_aux_dep,
+        libnm_core_enum_dep,
+    ],
+)
+
+shared_nm_libnm_core_intern_dep = declare_dependency(
+    link_with: shared_nm_libnm_core_intern,
+    include_directories: [
+        top_inc,
+        shared_inc,
+    ],
+    dependencies: [
+        glib_dep,
+        shared_nm_glib_aux_dep,
+        libnm_systemd_shared_dep,
+    ],
+)
+
+###############################################################################
+
 deps = [
   dl_dep,
   libudev_dep,
   uuid_dep,
   glib_dep,
   shared_c_siphash_dep,
-  shared_nm_utils_base_dep,
-  shared_nm_utils_udev_dep,
+  shared_nm_glib_aux_dep,
+  shared_nm_udev_aux_dep,
+  shared_nm_libnm_core_intern_dep,
 ]
 
 cflags = [
@@ -188,7 +231,6 @@ endif
 libnm_core_sources_all =  libnm_core_sources
 libnm_core_sources_all += libnm_core_enum
 libnm_core_sources_all += shared_nm_meta_setting_c
-libnm_core_sources_all += shared_nm_ethtool_utils_c
 libnm_core_sources_all += [version_header]
 
 libnm_core = static_library(
@@ -199,16 +241,54 @@ libnm_core = static_library(
   c_args: cflags,
 )
 
-nm_core_dep = declare_dependency(
+libnm_core_dep = declare_dependency(
   sources: libnm_core_enum[1],
   include_directories: libnm_core_inc,
   dependencies: [
-    shared_nm_utils_base_dep,
+    shared_nm_libnm_core_intern_dep,
+    shared_nm_glib_aux_dep,
     shared_c_siphash_dep,
     libnm_systemd_shared_dep,
   ],
 )
 
+###############################################################################
+
+shared_nm_libnm_core_aux = static_library(
+    'nm-libnm-core-aux',
+    sources: files('../shared/nm-libnm-core-aux/nm-dispatcher-api.h'),
+    c_args: [
+        '-DG_LOG_DOMAIN="@0@"'.format(libnm_name),
+        '-DNETWORKMANAGER_COMPILATION=(NM_NETWORKMANAGER_COMPILATION_WITH_GLIB|NM_NETWORKMANAGER_COMPILATION_WITH_GLIB_I18N_LIB)',
+    ],
+    include_directories: [
+        top_inc,
+        shared_inc,
+        libnm_core_inc,
+    ],
+    dependencies: [
+        glib_dep,
+        shared_c_siphash_dep,
+        shared_nm_glib_aux_dep,
+    ],
+)
+
+shared_nm_libnm_core_aux_dep = declare_dependency(
+    link_with: shared_nm_libnm_core_aux,
+    include_directories: [
+        top_inc,
+        shared_inc,
+    ],
+    dependencies: [
+        libnm_core_dep,
+        glib_dep,
+        shared_nm_glib_aux_dep,
+        libnm_systemd_shared_dep,
+    ],
+)
+
+###############################################################################
+
 enums_to_docbook = join_paths(meson.source_root(), 'tools', 'enums-to-docbook.pl')
 
 docbooks = [
@@ -233,6 +313,8 @@ foreach docbook: docbooks
   content_files += xml.full_path()
 endforeach
 
+###############################################################################
+
 if enable_tests
   subdir('tests')
 endif
diff --git a/libnm-core/nm-connection.c b/libnm-core/nm-connection.c
index ea7730bf..3182e346 100644
--- a/libnm-core/nm-connection.c
+++ b/libnm-core/nm-connection.c
@@ -1059,23 +1059,14 @@ _normalize_infiniband_mtu (NMConnection *self, GHashTable *parameters)
 {
 	NMSettingInfiniband *s_infini = nm_connection_get_setting_infiniband (self);
 
-	if (s_infini) {
-		const char *transport_mode = nm_setting_infiniband_get_transport_mode (s_infini);
-		guint32 max_mtu = 0;
-
-		if (transport_mode) {
-			if (!strcmp (transport_mode, "datagram"))
-				max_mtu = 2044;
-			else if (!strcmp (transport_mode, "connected"))
-				max_mtu = 65520;
-
-			if (max_mtu && nm_setting_infiniband_get_mtu (s_infini) > max_mtu) {
-				g_object_set (s_infini, NM_SETTING_INFINIBAND_MTU, (guint) max_mtu, NULL);
-				return TRUE;
-			}
-		}
-	}
-	return FALSE;
+	if (   !s_infini
+	    || nm_setting_infiniband_get_mtu (s_infini) <= NM_INFINIBAND_MAX_MTU
+	    || !NM_IN_STRSET (nm_setting_infiniband_get_transport_mode (s_infini), "datagram",
+	                                                                           "connected"))
+		return FALSE;
+
+	g_object_set (s_infini, NM_SETTING_INFINIBAND_MTU, (guint) NM_INFINIBAND_MAX_MTU, NULL);
+	return TRUE;
 }
 
 static gboolean
@@ -1297,6 +1288,30 @@ _normalize_sriov_vf_order (NMConnection *self, GHashTable *parameters)
 	return _nm_setting_sriov_sort_vfs (s_sriov);
 }
 
+static gboolean
+_normalize_bridge_vlan_order (NMConnection *self, GHashTable *parameters)
+{
+	NMSettingBridge *s_bridge;
+
+	s_bridge = nm_connection_get_setting_bridge (self);
+	if (!s_bridge)
+		return FALSE;
+
+	return _nm_setting_bridge_sort_vlans (s_bridge);
+}
+
+static gboolean
+_normalize_bridge_port_vlan_order (NMConnection *self, GHashTable *parameters)
+{
+	NMSettingBridgePort *s_port;
+
+	s_port = nm_connection_get_setting_bridge_port (self);
+	if (!s_port)
+		return FALSE;
+
+	return _nm_setting_bridge_port_sort_vlans (s_port);
+}
+
 static gboolean
 _normalize_required_settings (NMConnection *self, GHashTable *parameters)
 {
@@ -1645,6 +1660,8 @@ nm_connection_normalize (NMConnection *connection,
 	was_modified |= _normalize_ovs_interface_type (connection, parameters);
 	was_modified |= _normalize_ip_tunnel_wired_setting (connection, parameters);
 	was_modified |= _normalize_sriov_vf_order (connection, parameters);
+	was_modified |= _normalize_bridge_vlan_order (connection, parameters);
+	was_modified |= _normalize_bridge_port_vlan_order (connection, parameters);
 
 	/* Verify anew. */
 	success = _nm_connection_verify (connection, error);
diff --git a/libnm-core/nm-core-internal.h b/libnm-core/nm-core-internal.h
index f2332f76..3e33dd93 100644
--- a/libnm-core/nm-core-internal.h
+++ b/libnm-core/nm-core-internal.h
@@ -88,6 +88,7 @@
 #include "nm-utils.h"
 #include "nm-vpn-dbus-interface.h"
 #include "nm-vpn-editor-plugin.h"
+#include "nm-libnm-core-intern/nm-libnm-core-utils.h"
 
 /* IEEE 802.1D-1998 timer values */
 #define NM_BR_MIN_HELLO_TIME    1
@@ -249,6 +250,8 @@ guint nm_setting_ethtool_init_features (NMSettingEthtool *setting,
 guint8 *_nm_utils_hwaddr_aton (const char *asc, gpointer buffer, gsize buffer_length, gsize *out_length);
 const char *nm_utils_hwaddr_ntoa_buf (gconstpointer addr, gsize addr_len, gboolean upper_case, char *buf, gsize buf_len);
 
+gboolean nm_utils_is_valid_iface_name_utf8safe (const char *utf8safe_name);
+
 GSList *    _nm_utils_hash_values_to_slist (GHashTable *hash);
 
 GHashTable *_nm_utils_copy_strdict (GHashTable *strdict);
@@ -259,19 +262,11 @@ const char **_nm_ip_address_get_attribute_names (const NMIPAddress *addr, gboole
 
 gboolean _nm_ip_route_attribute_validate_all (const NMIPRoute *route);
 const char **_nm_ip_route_get_attribute_names (const NMIPRoute *route, gboolean sorted, guint *out_length);
-GHashTable *_nm_ip_route_get_attributes_direct (NMIPRoute *route);
+GHashTable *_nm_ip_route_get_attributes (NMIPRoute *route);
 
 NMSriovVF *_nm_utils_sriov_vf_from_strparts (const char *index, const char *detail, gboolean ignore_unknown, GError **error);
 gboolean _nm_sriov_vf_attribute_validate_all (const NMSriovVF *vf, GError **error);
 
-static inline void
-_nm_auto_ip_route_unref (NMIPRoute **v)
-{
-	if (*v)
-		nm_ip_route_unref (*v);
-}
-#define nm_auto_ip_route_unref nm_auto (_nm_auto_ip_route_unref)
-
 GPtrArray *_nm_utils_copy_array (const GPtrArray *array,
                                  NMUtilsCopyFunc copy_func,
                                  GDestroyNotify free_func);
@@ -284,7 +279,6 @@ char **     _nm_utils_slist_to_strv (GSList *slist, gboolean deep_copy);
 
 GPtrArray * _nm_utils_strv_to_ptrarray (char **strv);
 char **     _nm_utils_ptrarray_to_strv (GPtrArray *ptrarray);
-gboolean    _nm_utils_strv_equal (char **strv1, char **strv2);
 
 gboolean _nm_utils_check_file (const char *filename,
                                gint64 check_owner,
@@ -538,6 +532,8 @@ gboolean _nm_utils_inet6_is_token (const struct in6_addr *in6addr);
 
 /*****************************************************************************/
 
+gboolean _nm_team_link_watchers_equal (GPtrArray *a, GPtrArray *b, gboolean ignore_order);
+
 gboolean _nm_utils_team_config_equal (const char *conf1, const char *conf2, gboolean port);
 GValue *_nm_utils_team_config_get (const char *conf,
                                    const char *key,
@@ -553,18 +549,6 @@ gboolean _nm_utils_team_config_set (char **conf,
 
 /*****************************************************************************/
 
-static inline int
-nm_setting_ip_config_get_addr_family (NMSettingIPConfig *s_ip)
-{
-	if (NM_IS_SETTING_IP4_CONFIG (s_ip))
-		return AF_INET;
-	if (NM_IS_SETTING_IP6_CONFIG (s_ip))
-		return AF_INET6;
-	g_return_val_if_reached (AF_UNSPEC);
-}
-
-/*****************************************************************************/
-
 guint32 _nm_utils_parse_tc_handle                (const char *str,
                                                   GError **error);
 void _nm_utils_string_append_tc_parent           (GString *string,
@@ -576,6 +560,9 @@ gboolean _nm_utils_string_append_tc_tfilter_rest (GString *string,
                                                   NMTCTfilter *tfilter,
                                                   GError **error);
 
+GHashTable *_nm_tc_qdisc_get_attributes (NMTCQdisc *qdisc);
+GHashTable *_nm_tc_action_get_attributes (NMTCAction *action);
+
 /*****************************************************************************/
 
 static inline gboolean
@@ -596,6 +583,8 @@ gboolean _nm_utils_dhcp_duid_valid (const char *duid, GBytes **out_duid_bin);
 /*****************************************************************************/
 
 gboolean _nm_setting_sriov_sort_vfs (NMSettingSriov *setting);
+gboolean _nm_setting_bridge_port_sort_vlans (NMSettingBridgePort *setting);
+gboolean _nm_setting_bridge_sort_vlans (NMSettingBridge *setting);
 
 /*****************************************************************************/
 
@@ -627,6 +616,47 @@ void _nm_wireguard_peer_set_public_key_bin (NMWireGuardPeer *self,
 
 /*****************************************************************************/
 
+const NMIPAddr *nm_ip_routing_rule_get_from_bin (const NMIPRoutingRule *self);
+void nm_ip_routing_rule_set_from_bin (NMIPRoutingRule *self,
+                                      gconstpointer from,
+                                      guint8 len);
+
+const NMIPAddr *nm_ip_routing_rule_get_to_bin (const NMIPRoutingRule *self);
+void nm_ip_routing_rule_set_to_bin (NMIPRoutingRule *self,
+                                    gconstpointer to,
+                                    guint8 len);
+
+gboolean nm_ip_routing_rule_get_xifname_bin (const NMIPRoutingRule *self,
+                                             gboolean iif /* or else oif */,
+                                             char out_xifname[static 16]);
+
+#define NM_IP_ROUTING_RULE_ATTR_ACTION      "action"
+#define NM_IP_ROUTING_RULE_ATTR_DPORT_END   "dport-end"
+#define NM_IP_ROUTING_RULE_ATTR_DPORT_START "dport-start"
+#define NM_IP_ROUTING_RULE_ATTR_FAMILY      "family"
+#define NM_IP_ROUTING_RULE_ATTR_FROM        "from"
+#define NM_IP_ROUTING_RULE_ATTR_FROM_LEN    "from-len"
+#define NM_IP_ROUTING_RULE_ATTR_FWMARK      "fwmark"
+#define NM_IP_ROUTING_RULE_ATTR_FWMASK      "fwmask"
+#define NM_IP_ROUTING_RULE_ATTR_IIFNAME     "iifname"
+#define NM_IP_ROUTING_RULE_ATTR_INVERT      "invert"
+#define NM_IP_ROUTING_RULE_ATTR_IPPROTO     "ipproto"
+#define NM_IP_ROUTING_RULE_ATTR_OIFNAME     "oifname"
+#define NM_IP_ROUTING_RULE_ATTR_PRIORITY    "priority"
+#define NM_IP_ROUTING_RULE_ATTR_SPORT_END   "sport-end"
+#define NM_IP_ROUTING_RULE_ATTR_SPORT_START "sport-start"
+#define NM_IP_ROUTING_RULE_ATTR_TABLE       "table"
+#define NM_IP_ROUTING_RULE_ATTR_TO          "to"
+#define NM_IP_ROUTING_RULE_ATTR_TOS         "tos"
+#define NM_IP_ROUTING_RULE_ATTR_TO_LEN      "to-len"
+
+NMIPRoutingRule *nm_ip_routing_rule_from_dbus (GVariant *variant,
+                                               gboolean strict,
+                                               GError **error);
+GVariant *nm_ip_routing_rule_to_dbus (const NMIPRoutingRule *self);
+
+/*****************************************************************************/
+
 typedef struct _NMSettInfoSetting  NMSettInfoSetting;
 typedef struct _NMSettInfoProperty NMSettInfoProperty;
 
@@ -762,13 +792,14 @@ gboolean _nm_connection_find_secret (NMConnection *self,
 
 /*****************************************************************************/
 
-#define nm_auto_unref_wgpeer nm_auto(_nm_auto_unref_wgpeer)
-NM_AUTO_DEFINE_FCN0 (NMWireGuardPeer *, _nm_auto_unref_wgpeer, nm_wireguard_peer_unref)
-
 gboolean nm_utils_base64secret_normalize (const char *base64_key,
                                           gsize required_key_len,
                                           char **out_base64_key_norm);
 
 /*****************************************************************************/
 
+void _nm_bridge_vlan_str_append_rest (const NMBridgeVlan *vlan,
+                                      GString *string,
+                                      gboolean leading_space);
+
 #endif
diff --git a/libnm-core/nm-crypto-gnutls.c b/libnm-core/nm-crypto-gnutls.c
index 6c897e6d..6b2f7587 100644
--- a/libnm-core/nm-crypto-gnutls.c
+++ b/libnm-core/nm-crypto-gnutls.c
@@ -30,7 +30,7 @@
 #include <gnutls/x509.h>
 #include <gnutls/pkcs12.h>
 
-#include "nm-utils/nm-secret-utils.h"
+#include "nm-glib-aux/nm-secret-utils.h"
 #include "nm-errors.h"
 
 /*****************************************************************************/
diff --git a/libnm-core/nm-crypto-nss.c b/libnm-core/nm-crypto-nss.c
index 711dde4b..25cc7777 100644
--- a/libnm-core/nm-crypto-nss.c
+++ b/libnm-core/nm-crypto-nss.c
@@ -35,7 +35,7 @@
 #include <ciferfam.h>
 #include <p12plcy.h>
 
-#include "nm-utils/nm-secret-utils.h"
+#include "nm-glib-aux/nm-secret-utils.h"
 #include "nm-errors.h"
 
 /*****************************************************************************/
diff --git a/libnm-core/nm-crypto.c b/libnm-core/nm-crypto.c
index 67f206c4..c7142216 100644
--- a/libnm-core/nm-crypto.c
+++ b/libnm-core/nm-crypto.c
@@ -29,8 +29,8 @@
 #include <unistd.h>
 #include <stdlib.h>
 
-#include "nm-utils/nm-secret-utils.h"
-#include "nm-utils/nm-io-utils.h"
+#include "nm-glib-aux/nm-secret-utils.h"
+#include "nm-glib-aux/nm-io-utils.h"
 
 #include "nm-crypto-impl.h"
 #include "nm-utils.h"
diff --git a/libnm-core/nm-dbus-interface.h b/libnm-core/nm-dbus-interface.h
index 038d2c9e..2e127c40 100644
--- a/libnm-core/nm-dbus-interface.h
+++ b/libnm-core/nm-dbus-interface.h
@@ -837,12 +837,26 @@ typedef enum /*< flags >*/ {
 #define NM_LLDP_ATTR_SYSTEM_NAME             "system-name"
 #define NM_LLDP_ATTR_SYSTEM_DESCRIPTION      "system-description"
 #define NM_LLDP_ATTR_SYSTEM_CAPABILITIES     "system-capabilities"
+#define NM_LLDP_ATTR_MANAGEMENT_ADDRESSES    "management-addresses"
+
 #define NM_LLDP_ATTR_IEEE_802_1_PVID         "ieee-802-1-pvid"
-#define NM_LLDP_ATTR_IEEE_802_1_PPVID        "ieee-802-1-ppvid"
-#define NM_LLDP_ATTR_IEEE_802_1_PPVID_FLAGS  "ieee-802-1-ppvid-flags"
+#define NM_LLDP_ATTR_IEEE_802_1_VLANS        "ieee-802-1-vlans"
+#define NM_LLDP_ATTR_IEEE_802_1_PPVIDS       "ieee-802-1-ppvids"
+
+#define NM_LLDP_ATTR_IEEE_802_3_MAC_PHY_CONF    "ieee-802-3-mac-phy-conf"
+#define NM_LLDP_ATTR_IEEE_802_3_POWER_VIA_MDI   "ieee-802-3-power-via-mdi"
+#define NM_LLDP_ATTR_IEEE_802_3_MAX_FRAME_SIZE  "ieee-802-3-max-frame-size"
+
+/* These are deprecated in favor of NM_LLDP_ATTR_IEEE_802_1_VLANS,
+ * which can report multiple VLANs */
 #define NM_LLDP_ATTR_IEEE_802_1_VID          "ieee-802-1-vid"
 #define NM_LLDP_ATTR_IEEE_802_1_VLAN_NAME    "ieee-802-1-vlan-name"
 
+/* These are deprecated in favor of NM_LLDP_ATTR_IEEE_802_1_PPVIDS,
+ * which can report multiple PPVIDs */
+#define NM_LLDP_ATTR_IEEE_802_1_PPVID        "ieee-802-1-ppvid"
+#define NM_LLDP_ATTR_IEEE_802_1_PPVID_FLAGS  "ieee-802-1-ppvid-flags"
+
 #define NM_LLDP_DEST_NEAREST_BRIDGE          "nearest-bridge"
 #define NM_LLDP_DEST_NEAREST_NON_TPMR_BRIDGE "nearest-non-tpmr-bridge"
 #define NM_LLDP_DEST_NEAREST_CUSTOMER_BRIDGE "nearest-customer-bridge"
diff --git a/libnm-core/nm-json.h b/libnm-core/nm-json.h
index 560b827a..b75a4f8e 100644
--- a/libnm-core/nm-json.h
+++ b/libnm-core/nm-json.h
@@ -45,7 +45,7 @@ gboolean nm_jansson_load (void);
 #define json_integer_value      (*_nm_jansson_json_integer_value)
 #define json_string_value       (*_nm_jansson_json_string_value)
 
-#include "nm-utils/nm-jansson.h"
+#include "nm-glib-aux/nm-jansson.h"
 #endif
 
 #endif /* __NM_JSON_H__ */
diff --git a/libnm-core/nm-keyfile.c b/libnm-core/nm-keyfile.c
index 05c6bf97..bf8d2193 100644
--- a/libnm-core/nm-keyfile.c
+++ b/libnm-core/nm-keyfile.c
@@ -31,9 +31,9 @@
 #include <arpa/inet.h>
 #include <linux/pkt_sched.h>
 
-#include "nm-utils/nm-secret-utils.h"
+#include "nm-glib-aux/nm-secret-utils.h"
 #include "systemd/nm-sd-utils-shared.h"
-#include "nm-common-macros.h"
+#include "nm-libnm-core-intern/nm-common-macros.h"
 #include "nm-core-internal.h"
 #include "nm-keyfile-utils.h"
 
@@ -41,6 +41,8 @@
 
 /*****************************************************************************/
 
+typedef struct _ParseInfoProperty ParseInfoProperty;
+
 typedef struct {
 	NMConnection *connection;
 	GKeyFile *keyfile;
@@ -534,13 +536,19 @@ typedef struct {
 	const char *s_key;
 	gint32 key_idx;
 	gint8 key_type;
-} IPAddrRouteBuildListData;
+} BuildListData;
+
+typedef enum {
+	BUILD_LIST_TYPE_ADDRESSES,
+	BUILD_LIST_TYPE_ROUTES,
+	BUILD_LIST_TYPE_ROUTING_RULES,
+} BuildListType;
 
 static int
-_ip_addrroute_build_lst_data_cmp (gconstpointer p_a, gconstpointer p_b, gpointer user_data)
+_build_list_data_cmp (gconstpointer p_a, gconstpointer p_b, gpointer user_data)
 {
-	const IPAddrRouteBuildListData *a = p_a;
-	const IPAddrRouteBuildListData *b = p_b;
+	const BuildListData *a = p_a;
+	const BuildListData *b = p_b;
 
 	NM_CMP_FIELD (a, b, key_idx);
 	NM_CMP_FIELD (a, b, key_type);
@@ -549,10 +557,25 @@ _ip_addrroute_build_lst_data_cmp (gconstpointer p_a, gconstpointer p_b, gpointer
 }
 
 static gboolean
-ip_addrroute_match_key_w_name_ (const char *key,
-                                const char *base_name,
-                                gsize base_name_l,
-                                gint32 *out_key_idx)
+_build_list_data_is_shadowed (const BuildListData *build_list,
+                              gsize build_list_len,
+                              gsize idx)
+{
+	/* the keyfile contains duplicate keys, which are both returned
+	 * by g_key_file_get_keys() (WHY??).
+	 *
+	 * Skip the earlier one. */
+	return    idx + 1 < build_list_len
+	       && build_list[idx].key_idx == build_list[idx + 1].key_idx
+	       && build_list[idx].key_type == build_list[idx + 1].key_type
+	       && nm_streq (build_list[idx].s_key, build_list[idx + 1].s_key);
+}
+
+static gboolean
+_build_list_match_key_w_name_impl (const char *key,
+                                   const char *base_name,
+                                   gsize base_name_l,
+                                   gint32 *out_key_idx)
 {
 	gint64 v;
 
@@ -595,100 +618,125 @@ ip_addrroute_match_key_w_name_ (const char *key,
 	return TRUE;
 }
 
-static gboolean
-ip_addrroute_match_key (const char *key,
-                        gboolean is_routes,
-                        gint32 *out_key_idx,
-                        gint8 *out_key_type)
-{
-#define ip_addrroute_match_key_w_name(key, base_name, out_key_idx) \
-	ip_addrroute_match_key_w_name_ (key, base_name, NM_STRLEN (base_name), out_key_idx)
-
-	if (is_routes) {
-		if (ip_addrroute_match_key_w_name (key, "route", out_key_idx))
-			NM_SET_OUT (out_key_type, 0);
-		else if (ip_addrroute_match_key_w_name (key, "routes", out_key_idx))
-			NM_SET_OUT (out_key_type, 1);
-		else
-			return FALSE;
-	} else {
-		if (ip_addrroute_match_key_w_name (key, "address", out_key_idx))
-			NM_SET_OUT (out_key_type, 0);
-		else if (ip_addrroute_match_key_w_name (key, "addresses", out_key_idx))
-			NM_SET_OUT (out_key_type, 1);
-		else
-			return FALSE;
-	}
-	return TRUE;
-}
+#define _build_list_match_key_w_name(key, base_name, out_key_idx) \
+	_build_list_match_key_w_name_impl (key, base_name, NM_STRLEN (base_name), out_key_idx)
 
-static void
-ip_address_or_route_parser (KeyfileReaderInfo *info, NMSetting *setting, const char *setting_key)
+static BuildListData *
+_build_list_create (GKeyFile *keyfile,
+                    const char *group_name,
+                    BuildListType build_list_type,
+                    gsize *out_build_list_len,
+                    char ***out_keys_strv)
 {
-	const char *setting_name = nm_setting_get_name (setting);
-	gboolean is_ipv6 = nm_streq (setting_name, "ipv6");
-	gboolean is_routes = nm_streq (setting_key, "routes");
-	gs_free char *gateway = NULL;
-	gs_unref_ptrarray GPtrArray *list = NULL;
 	gs_strfreev char **keys = NULL;
 	gsize i_keys, n_keys;
-	gs_free IPAddrRouteBuildListData *build_list = NULL;
-	gsize i_build_list, build_list_len = 0;
+	gs_free BuildListData *build_list = NULL;
+	gsize build_list_len = 0;
 
-	keys = nm_keyfile_plugin_kf_get_keys (info->keyfile, setting_name, &n_keys, NULL);
+	nm_assert (out_build_list_len && *out_build_list_len == 0);
+	nm_assert (out_keys_strv && !*out_keys_strv);
+
+	keys = nm_keyfile_plugin_kf_get_keys (keyfile, group_name, &n_keys, NULL);
 	if (n_keys == 0)
-		return;
+		return NULL;
 
-	/* first create a list of all relevant keys, and sort them. */
 	for (i_keys = 0; i_keys < n_keys; i_keys++) {
 		const char *s_key = keys[i_keys];
 		gint32 key_idx;
-		gint8 key_type;
-
-		if (!ip_addrroute_match_key (s_key, is_routes, &key_idx, &key_type))
-			continue;
+		gint8 key_type = 0;
+
+		switch (build_list_type) {
+		case BUILD_LIST_TYPE_ROUTES:
+			if (_build_list_match_key_w_name (s_key, "route", &key_idx))
+				key_type = 0;
+			else if (_build_list_match_key_w_name (s_key, "routes", &key_idx))
+				key_type = 1;
+			else
+				continue;
+			break;
+		case BUILD_LIST_TYPE_ADDRESSES:
+			if (_build_list_match_key_w_name (s_key, "address", &key_idx))
+				key_type = 0;
+			else if (_build_list_match_key_w_name (s_key, "addresses", &key_idx))
+				key_type = 1;
+			else
+				continue;
+			break;
+		case BUILD_LIST_TYPE_ROUTING_RULES:
+			if (_build_list_match_key_w_name (s_key, "routing-rule", &key_idx))
+				key_type = 0;
+			else
+				continue;
+			break;
+		default:
+			nm_assert_not_reached ();
+			break;
+		}
 
 		if (G_UNLIKELY (!build_list))
-			build_list = g_new (IPAddrRouteBuildListData, n_keys - i_keys);
+			build_list = g_new (BuildListData, n_keys - i_keys);
 
-		build_list[build_list_len].s_key = s_key;
-		build_list[build_list_len].key_idx = key_idx;
-		build_list[build_list_len].key_type = key_type;
-		build_list_len++;
+		build_list[build_list_len++] = (BuildListData) {
+			.s_key    = s_key,
+			.key_idx  = key_idx,
+			.key_type = key_type,
+		};
 	}
 
 	if (build_list_len == 0)
-		return;
+		return NULL;
+
+	if (build_list_len > 1) {
+		g_qsort_with_data (build_list,
+		                   build_list_len,
+		                   sizeof (BuildListData),
+		                   _build_list_data_cmp,
+		                   NULL);
+	}
+
+	*out_build_list_len = build_list_len;
+	*out_keys_strv = g_steal_pointer (&keys);
+	return g_steal_pointer (&build_list);
+}
+
+static void
+ip_address_or_route_parser (KeyfileReaderInfo *info, NMSetting *setting, const char *setting_key)
+{
+	const char *setting_name = nm_setting_get_name (setting);
+	gboolean is_ipv6 = nm_streq (setting_name, "ipv6");
+	gboolean is_routes = nm_streq (setting_key, "routes");
+	gs_free char *gateway = NULL;
+	gs_unref_ptrarray GPtrArray *list = NULL;
+	gs_strfreev char **keys = NULL;
+	gs_free BuildListData *build_list = NULL;
+	gsize i_build_list, build_list_len = 0;
 
-	g_qsort_with_data (build_list,
-	                   build_list_len,
-	                   sizeof (IPAddrRouteBuildListData),
-	                   _ip_addrroute_build_lst_data_cmp,
-	                   NULL);
+	build_list = _build_list_create (info->keyfile,
+	                                 setting_name,
+	                                   is_routes
+	                                 ? BUILD_LIST_TYPE_ROUTES
+	                                 : BUILD_LIST_TYPE_ADDRESSES,
+	                                 &build_list_len,
+	                                 &keys);
+	if (!build_list)
+		return;
 
 	list = g_ptr_array_new_with_free_func (is_routes
 	                                       ? (GDestroyNotify) nm_ip_route_unref
 	                                       : (GDestroyNotify) nm_ip_address_unref);
 
 	for (i_build_list = 0; i_build_list < build_list_len; i_build_list++) {
-		const IPAddrRouteBuildListData *build_data = &build_list[i_build_list];
+		const char *s_key;
 		gpointer item;
 
-		if (   i_build_list + 1 < build_list_len
-		    && build_data->key_idx == build_data[1].key_idx
-		    && build_data->key_type == build_data[1].key_type
-		    && nm_streq (build_data->s_key, build_data[1].s_key)) {
-			/* the keyfile contains duplicate keys, which are both returned
-			 * by g_key_file_get_keys() (WHY??).
-			 *
-			 * Skip the earlier one. */
+		if (_build_list_data_is_shadowed (build_list, build_list_len, i_build_list))
 			continue;
-		}
 
+		s_key = build_list[i_build_list].s_key;
 		item = read_one_ip_address_or_route (info,
 		                                     setting_key,
 		                                     setting_name,
-		                                     build_data->s_key,
+		                                     s_key,
 		                                     is_ipv6,
 		                                     is_routes,
 		                                     gateway ? NULL : &gateway,
@@ -696,7 +744,7 @@ ip_address_or_route_parser (KeyfileReaderInfo *info, NMSetting *setting, const c
 		if (item && is_routes) {
 			char options_key[128];
 
-			nm_sprintf_buf (options_key, "%s_options", build_data->s_key);
+			nm_sprintf_buf (options_key, "%s_options", s_key);
 			fill_route_attributes (info->keyfile,
 			                       item,
 			                       setting_name,
@@ -718,6 +766,63 @@ ip_address_or_route_parser (KeyfileReaderInfo *info, NMSetting *setting, const c
 		g_object_set (setting, "gateway", gateway, NULL);
 }
 
+static void
+ip_routing_rule_parser_full (KeyfileReaderInfo *info,
+                             const NMMetaSettingInfo *setting_info,
+                             const NMSettInfoProperty *property_info,
+                             const ParseInfoProperty *pip,
+                             NMSetting *setting)
+{
+	const char *setting_name = nm_setting_get_name (setting);
+	gboolean is_ipv6 = nm_streq (setting_name, "ipv6");
+	gs_strfreev char **keys = NULL;
+	gs_free BuildListData *build_list = NULL;
+	gsize i_build_list, build_list_len = 0;
+
+	build_list = _build_list_create (info->keyfile,
+	                                 setting_name,
+	                                 BUILD_LIST_TYPE_ROUTING_RULES,
+	                                 &build_list_len,
+	                                 &keys);
+	if (!build_list)
+		return;
+
+	for (i_build_list = 0; i_build_list < build_list_len; i_build_list++) {
+		nm_auto_unref_ip_routing_rule NMIPRoutingRule *rule = NULL;
+		gs_free char *value = NULL;
+		gs_free_error GError *local = NULL;
+
+		if (_build_list_data_is_shadowed (build_list, build_list_len, i_build_list))
+			continue;
+
+		value = nm_keyfile_plugin_kf_get_string (info->keyfile,
+		                                         setting_name,
+		                                         build_list[i_build_list].s_key,
+		                                         NULL);
+		if (!value)
+			continue;
+
+		rule = nm_ip_routing_rule_from_string (value,
+		                                       (  NM_IP_ROUTING_RULE_AS_STRING_FLAGS_VALIDATE
+		                                        | (  is_ipv6
+		                                           ? NM_IP_ROUTING_RULE_AS_STRING_FLAGS_AF_INET6
+		                                           : NM_IP_ROUTING_RULE_AS_STRING_FLAGS_AF_INET)),
+		                                       NULL,
+		                                       &local);
+		if (!rule) {
+			handle_warn (info, property_info->name, NM_KEYFILE_WARN_SEVERITY_WARN,
+			             _("invalid value for \"%s\": %s"),
+			             build_list[i_build_list].s_key,
+			             local->message);
+			if (info->error)
+				return;
+			continue;
+		}
+
+		nm_setting_ip_config_add_routing_rule (NM_SETTING_IP_CONFIG (setting), rule);
+	}
+}
+
 static void
 ip_dns_parser (KeyfileReaderInfo *info, NMSetting *setting, const char *key)
 {
@@ -1518,21 +1623,58 @@ team_config_parser (KeyfileReaderInfo *info, NMSetting *setting, const char *key
 	g_object_set (G_OBJECT (setting), key, conf, NULL);
 }
 
+static void
+bridge_vlan_parser (KeyfileReaderInfo *info, NMSetting *setting, const char *key)
+{
+	gs_unref_ptrarray GPtrArray *vlans = NULL;
+	gs_free char *value = NULL;
+	gs_free const char **strv = NULL;
+	const char *const *iter;
+	GError *local = NULL;
+	NMBridgeVlan *vlan;
+
+	value = nm_keyfile_plugin_kf_get_string (info->keyfile,
+	                                         nm_setting_get_name (setting),
+	                                         key,
+	                                         NULL);
+	if (!value || !value[0])
+		return;
+
+	vlans = g_ptr_array_new_with_free_func ((GDestroyNotify) nm_bridge_vlan_unref);
+
+	strv = nm_utils_escaped_tokens_split (value, ",");
+	if (strv) {
+		for (iter = strv; *iter; iter++) {
+			vlan = nm_bridge_vlan_from_str (*iter, &local);
+			if (!vlan) {
+				handle_warn (info, key, NM_KEYFILE_WARN_SEVERITY_WARN,
+				             "invalid bridge VLAN: %s", local->message);
+				g_clear_error (&local);
+				continue;
+			}
+			g_ptr_array_add (vlans, vlan);
+		}
+	}
+
+	if (vlans->len > 0)
+		g_object_set (setting, key, vlans, NULL);
+}
+
 static void
 qdisc_parser (KeyfileReaderInfo *info, NMSetting *setting, const char *key)
 {
 	const char *setting_name = nm_setting_get_name (setting);
-	GPtrArray *qdiscs;
+	gs_unref_ptrarray GPtrArray *qdiscs = NULL;
 	gs_strfreev char **keys = NULL;
 	gsize n_keys = 0;
 	int i;
 
-	qdiscs = g_ptr_array_new_with_free_func ((GDestroyNotify) nm_tc_qdisc_unref);
-
 	keys = nm_keyfile_plugin_kf_get_keys (info->keyfile, setting_name, &n_keys, NULL);
 	if (n_keys == 0)
 		return;
 
+	qdiscs = g_ptr_array_new_with_free_func ((GDestroyNotify) nm_tc_qdisc_unref);
+
 	for (i = 0; i < n_keys; i++) {
 		NMTCQdisc *qdisc;
 		const char *qdisc_parent;
@@ -1562,25 +1704,23 @@ qdisc_parser (KeyfileReaderInfo *info, NMSetting *setting, const char *key)
 
 	if (qdiscs->len >= 1)
 		g_object_set (setting, key, qdiscs, NULL);
-
-	g_ptr_array_unref (qdiscs);
 }
 
 static void
 tfilter_parser (KeyfileReaderInfo *info, NMSetting *setting, const char *key)
 {
 	const char *setting_name = nm_setting_get_name (setting);
-	GPtrArray *tfilters;
+	gs_unref_ptrarray GPtrArray *tfilters = NULL;
 	gs_strfreev char **keys = NULL;
 	gsize n_keys = 0;
 	int i;
 
-	tfilters = g_ptr_array_new_with_free_func ((GDestroyNotify) nm_tc_tfilter_unref);
-
 	keys = nm_keyfile_plugin_kf_get_keys (info->keyfile, setting_name, &n_keys, NULL);
 	if (n_keys == 0)
 		return;
 
+	tfilters = g_ptr_array_new_with_free_func ((GDestroyNotify) nm_tc_tfilter_unref);
+
 	for (i = 0; i < n_keys; i++) {
 		NMTCTfilter *tfilter;
 		const char *tfilter_parent;
@@ -1610,8 +1750,6 @@ tfilter_parser (KeyfileReaderInfo *info, NMSetting *setting, const char *key)
 
 	if (tfilters->len >= 1)
 		g_object_set (setting, key, tfilters, NULL);
-
-	g_ptr_array_unref (tfilters);
 }
 
 /*****************************************************************************/
@@ -1805,10 +1943,9 @@ write_ip_values (GKeyFile *file,
 
 		if (is_route) {
 			gs_free char *attributes = NULL;
-			GHashTable *hash;
 
-			hash = _nm_ip_route_get_attributes_direct (array->pdata[i]);
-			attributes = nm_utils_format_variant_attributes (hash, ',', '=');
+			attributes = nm_utils_format_variant_attributes (_nm_ip_route_get_attributes (array->pdata[i]),
+			                                                 ',', '=');
 			if (attributes) {
 				g_strlcat (key_name, "_options", sizeof (key_name));
 				nm_keyfile_plugin_kf_set_string (file, setting_name, key_name, attributes);
@@ -1846,6 +1983,76 @@ route_writer (KeyfileWriterInfo *info,
 		write_ip_values (info->keyfile, setting_name, array, NULL, TRUE);
 }
 
+static void
+bridge_vlan_writer (KeyfileWriterInfo *info,
+                    NMSetting *setting,
+                    const char *key,
+                    const GValue *value)
+{
+	NMBridgeVlan *vlan;
+	GPtrArray *vlans;
+	GString *string;
+	guint i;
+
+	vlans = (GPtrArray *) g_value_get_boxed (value);
+	if (!vlans || !vlans->len)
+		return;
+
+	string = g_string_new ("");
+	for (i = 0; i < vlans->len; i++) {
+		gs_free char *vlan_str = NULL;
+
+		vlan = vlans->pdata[i];
+		vlan_str = nm_bridge_vlan_to_str (vlan, NULL);
+		if (!vlan_str)
+			continue;
+		if (string->len > 0)
+			g_string_append (string, ",");
+		nm_utils_escaped_tokens_escape_gstr_assert (vlan_str, ",", string);
+	}
+
+	nm_keyfile_plugin_kf_set_string (info->keyfile,
+	                                 nm_setting_get_name (setting),
+	                                 "vlans",
+	                                 string->str);
+
+	g_string_free (string, TRUE);
+}
+
+static void
+ip_routing_rule_writer_full (KeyfileWriterInfo *info,
+                             const NMMetaSettingInfo *setting_info,
+                             const NMSettInfoProperty *property_info,
+                             const ParseInfoProperty *pip,
+                             NMSetting *setting)
+{
+	const char *setting_name = nm_setting_get_name (setting);
+	NMSettingIPConfig *s_ip = NM_SETTING_IP_CONFIG (setting);
+	guint i, j, n;
+	char key_name_full[100] = "routing-rule";
+	char *key_name_num = &key_name_full[NM_STRLEN ("routing-rule")];
+
+	n = nm_setting_ip_config_get_num_routing_rules (s_ip);
+	j = 0;
+	for (i = 0; i < n; i++) {
+		NMIPRoutingRule *rule = nm_setting_ip_config_get_routing_rule (s_ip, i);
+		gs_free char *str = NULL;
+
+		str = nm_ip_routing_rule_to_string (rule,
+		                                    NM_IP_ROUTING_RULE_AS_STRING_FLAGS_NONE,
+		                                    NULL,
+		                                    NULL);
+		if (!str)
+			continue;
+
+		sprintf (key_name_num, "%u", ++j);
+		nm_keyfile_plugin_kf_set_string (info->keyfile,
+		                                 setting_name,
+		                                 key_name_full,
+		                                 str);
+	}
+}
+
 static void
 qdisc_writer (KeyfileWriterInfo *info,
               NMSetting *setting,
@@ -2157,24 +2364,40 @@ cert_writer (KeyfileWriterInfo *info,
 
 /*****************************************************************************/
 
-typedef struct {
+struct _ParseInfoProperty {
 	const char *property_name;
-	void (*parser) (KeyfileReaderInfo *info,
-	                NMSetting *setting,
-	                const char *key);
-	void (*writer) (KeyfileWriterInfo *info,
-	                NMSetting *setting,
-	                const char *key,
-	                const GValue *value);
+	union {
+		void (*parser) (KeyfileReaderInfo *info,
+		                NMSetting *setting,
+		                const char *key);
+		void (*parser_full) (KeyfileReaderInfo *info,
+		                     const NMMetaSettingInfo *setting_info,
+		                     const NMSettInfoProperty *property_info,
+		                     const ParseInfoProperty *pip,
+		                     NMSetting *setting);
+	};
+	union {
+		void (*writer) (KeyfileWriterInfo *info,
+		                NMSetting *setting,
+		                const char *key,
+		                const GValue *value);
+		void (*writer_full) (KeyfileWriterInfo *info,
+		                     const NMMetaSettingInfo *setting_info,
+		                     const NMSettInfoProperty *property_info,
+		                     const ParseInfoProperty *pip,
+		                     NMSetting *setting);
+	};
 	bool parser_skip;
 	bool parser_no_check_key:1;
 	bool writer_skip:1;
+	bool has_writer_full:1;
+	bool has_parser_full:1;
 
 	/* usually, we skip to write values that have their
 	 * default value. By setting this flag to TRUE, also
 	 * default values are written. */
 	bool writer_persist_default:1;
-} ParseInfoProperty;
+};
 
 #define PARSE_INFO_PROPERTY(_property_name, ...) \
 	(&((const ParseInfoProperty) { \
@@ -2276,6 +2499,20 @@ static const ParseInfoSetting *const parse_infos[_NM_META_SETTING_TYPE_NUM] = {
 			PARSE_INFO_PROPERTY (NM_SETTING_BRIDGE_MAC_ADDRESS,
 				.parser        = mac_address_parser_ETHER,
 			),
+			PARSE_INFO_PROPERTY (NM_SETTING_BRIDGE_VLANS,
+				.parser_no_check_key = TRUE,
+				.parser        = bridge_vlan_parser,
+				.writer        = bridge_vlan_writer,
+			),
+		),
+	),
+	PARSE_INFO_SETTING (NM_META_SETTING_TYPE_BRIDGE_PORT,
+		PARSE_INFO_PROPERTIES (
+			PARSE_INFO_PROPERTY (NM_SETTING_BRIDGE_PORT_VLANS,
+				.parser_no_check_key = TRUE,
+				.parser        = bridge_vlan_parser,
+				.writer        = bridge_vlan_writer,
+			),
 		),
 	),
 	PARSE_INFO_SETTING (NM_META_SETTING_TYPE_CONNECTION,
@@ -2317,6 +2554,13 @@ static const ParseInfoSetting *const parse_infos[_NM_META_SETTING_TYPE_NUM] = {
 				.parser        = ip_address_or_route_parser,
 				.writer        = route_writer,
 			),
+			PARSE_INFO_PROPERTY (NM_SETTING_IP_CONFIG_ROUTING_RULES,
+				.parser_no_check_key = TRUE,
+				.parser_full   = ip_routing_rule_parser_full,
+				.writer_full   = ip_routing_rule_writer_full,
+				.has_parser_full = TRUE,
+				.has_writer_full = TRUE,
+			),
 		),
 	),
 	PARSE_INFO_SETTING (NM_META_SETTING_TYPE_IP6_CONFIG,
@@ -2345,6 +2589,13 @@ static const ParseInfoSetting *const parse_infos[_NM_META_SETTING_TYPE_NUM] = {
 				.parser        = ip_address_or_route_parser,
 				.writer        = route_writer,
 			),
+			PARSE_INFO_PROPERTY (NM_SETTING_IP_CONFIG_ROUTING_RULES,
+				.parser_no_check_key = TRUE,
+				.parser_full   = ip_routing_rule_parser_full,
+				.writer_full   = ip_routing_rule_writer_full,
+				.has_parser_full = TRUE,
+				.has_writer_full = TRUE,
+			),
 		),
 	),
 	PARSE_INFO_SETTING (NM_META_SETTING_TYPE_SERIAL,
@@ -2523,7 +2774,7 @@ static const ParseInfoSetting *const parse_infos[_NM_META_SETTING_TYPE_NUM] = {
 static const ParseInfoProperty *
 _parse_info_find (NMSetting *setting,
                   const char *property_name,
-                  const char **out_setting_name)
+                  const NMMetaSettingInfo **out_setting_info)
 {
 	const NMMetaSettingInfo *setting_info;
 	const ParseInfoSetting *pis;
@@ -2562,11 +2813,13 @@ _parse_info_find (NMSetting *setting,
 	if (   !NM_IS_SETTING (setting)
 	    || !(setting_info = NM_SETTING_GET_CLASS (setting)->setting_info)) {
 		/* handle invalid setting objects gracefully. */
-		*out_setting_name = NULL;
+		*out_setting_info = NULL;
 		return NULL;
 	}
 
-	*out_setting_name = setting_info->setting_name;
+	nm_assert (setting_info->setting_name);
+
+	*out_setting_info = setting_info;
 
 	if ((pis = parse_infos[setting_info->meta_type])) {
 		G_STATIC_ASSERT_EXPR (G_STRUCT_OFFSET (ParseInfoProperty, property_name) == 0);
@@ -2593,32 +2846,42 @@ read_one_setting_value (KeyfileReaderInfo *info,
 {
 	GKeyFile *keyfile = info->keyfile;
 	gs_free_error GError *err = NULL;
+	const NMMetaSettingInfo *setting_info;
 	const ParseInfoProperty *pip;
 	gs_free char *tmp_str = NULL;
-	const char *setting_name;
 	const char *key;
 	GType type;
 	guint64 u64;
 	gint64 i64;
 
 	nm_assert (!info->error);
-	nm_assert (property_info->param_spec);
+	nm_assert (   !property_info->param_spec
+	           || nm_streq (property_info->param_spec->name, property_info->name));
 
-	if ((property_info->param_spec->flags & (G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY)) != G_PARAM_WRITABLE)
-		return;
+	key = property_info->name;
 
-	key = property_info->param_spec->name;
+	pip = _parse_info_find (setting, key, &setting_info);
 
-	pip = _parse_info_find (setting, key, &setting_name);
+	nm_assert (setting_info);
 
-	nm_assert (setting_name);
-
-	if (   !pip
-	    && nm_streq (key, NM_SETTING_NAME))
-		return;
+	if (!pip) {
+		if (nm_streq (key, NM_SETTING_NAME))
+			return;
+		if (!property_info->param_spec)
+			return;
+		if ((property_info->param_spec->flags & (G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY)) != G_PARAM_WRITABLE)
+			return;
+	} else {
+		if (pip->parser_skip)
+			return;
+		if (pip->has_parser_full) {
+			pip->parser_full (info, setting_info, property_info, pip, setting);
+			return;
+		}
+	}
 
-	if (pip && pip->parser_skip)
-		return;
+	nm_assert (property_info->param_spec);
+	nm_assert ((property_info->param_spec->flags & (G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY)) == G_PARAM_WRITABLE);
 
 	/* Check for the exact key in the GKeyFile if required.  Most setting
 	 * properties map 1:1 to a key in the GKeyFile, but for those properties
@@ -2626,7 +2889,7 @@ read_one_setting_value (KeyfileReaderInfo *info,
 	 * encoded by the setting property, this won't be true.
 	 */
 	if (   (!pip || !pip->parser_no_check_key)
-	    && !nm_keyfile_plugin_kf_has_key (keyfile, setting_name, key, &err)) {
+	    && !nm_keyfile_plugin_kf_has_key (keyfile, setting_info->setting_name, key, &err)) {
 		/* Key doesn't exist or an error occurred, thus nothing to do. */
 		if (err) {
 			if (!handle_warn (info, key, NM_KEYFILE_WARN_SEVERITY_WARN,
@@ -2637,7 +2900,8 @@ read_one_setting_value (KeyfileReaderInfo *info,
 		return;
 	}
 
-	if (pip && pip->parser) {
+	if (   pip
+	    && pip->parser) {
 		pip->parser (info, setting, key);
 		return;
 	}
@@ -2647,11 +2911,11 @@ read_one_setting_value (KeyfileReaderInfo *info,
 	if (type == G_TYPE_STRING) {
 		gs_free char *str_val = NULL;
 
-		str_val = nm_keyfile_plugin_kf_get_string (keyfile, setting_name, key, &err);
+		str_val = nm_keyfile_plugin_kf_get_string (keyfile, setting_info->setting_name, key, &err);
 		if (!err)
 			nm_g_object_set_property_string_take (G_OBJECT (setting), key, g_steal_pointer (&str_val), &err);
 	} else if (type == G_TYPE_UINT) {
-		tmp_str = nm_keyfile_plugin_kf_get_value (keyfile, setting_name, key, &err);
+		tmp_str = nm_keyfile_plugin_kf_get_value (keyfile, setting_info->setting_name, key, &err);
 		if (!err) {
 			u64 = _nm_utils_ascii_str_to_uint64 (tmp_str, 0, 0, G_MAXUINT, G_MAXUINT64);
 			if (   u64 == G_MAXUINT64
@@ -2662,7 +2926,7 @@ read_one_setting_value (KeyfileReaderInfo *info,
 				nm_g_object_set_property_uint (G_OBJECT (setting), key, u64, &err);
 		}
 	} else if (type == G_TYPE_INT) {
-		tmp_str = nm_keyfile_plugin_kf_get_value (keyfile, setting_name, key, &err);
+		tmp_str = nm_keyfile_plugin_kf_get_value (keyfile, setting_info->setting_name, key, &err);
 		if (!err) {
 			i64 = _nm_utils_ascii_str_to_int64 (tmp_str, 0, G_MININT, G_MAXINT, G_MININT64);
 			if (   i64 == G_MININT64
@@ -2675,11 +2939,11 @@ read_one_setting_value (KeyfileReaderInfo *info,
 	} else if (type == G_TYPE_BOOLEAN) {
 		gboolean bool_val;
 
-		bool_val = nm_keyfile_plugin_kf_get_boolean (keyfile, setting_name, key, &err);
+		bool_val = nm_keyfile_plugin_kf_get_boolean (keyfile, setting_info->setting_name, key, &err);
 		if (!err)
 			nm_g_object_set_property_boolean (G_OBJECT (setting), key, bool_val, &err);
 	} else if (type == G_TYPE_CHAR) {
-		tmp_str = nm_keyfile_plugin_kf_get_value (keyfile, setting_name, key, &err);
+		tmp_str = nm_keyfile_plugin_kf_get_value (keyfile, setting_info->setting_name, key, &err);
 		if (!err) {
 			/* As documented by glib, G_TYPE_CHAR is really a (signed!) gint8. */
 			i64 = _nm_utils_ascii_str_to_int64 (tmp_str, 0, G_MININT8, G_MAXINT8, G_MININT64);
@@ -2691,7 +2955,7 @@ read_one_setting_value (KeyfileReaderInfo *info,
 				nm_g_object_set_property_char (G_OBJECT (setting), key, i64, &err);
 		}
 	} else if (type == G_TYPE_UINT64) {
-		tmp_str = nm_keyfile_plugin_kf_get_value (keyfile, setting_name, key, &err);
+		tmp_str = nm_keyfile_plugin_kf_get_value (keyfile, setting_info->setting_name, key, &err);
 		if (!err) {
 			u64 = _nm_utils_ascii_str_to_uint64 (tmp_str, 0, 0, G_MAXUINT64, G_MAXUINT64);
 			if (   u64 == G_MAXUINT64
@@ -2702,7 +2966,7 @@ read_one_setting_value (KeyfileReaderInfo *info,
 				nm_g_object_set_property_uint64 (G_OBJECT (setting), key, u64, &err);
 		}
 	} else if (type == G_TYPE_INT64) {
-		tmp_str = nm_keyfile_plugin_kf_get_value (keyfile, setting_name, key, &err);
+		tmp_str = nm_keyfile_plugin_kf_get_value (keyfile, setting_info->setting_name, key, &err);
 		if (!err) {
 			i64 = _nm_utils_ascii_str_to_int64 (tmp_str, 0, G_MININT64, G_MAXINT64, G_MAXINT64);
 			if (   i64 == G_MAXINT64
@@ -2720,7 +2984,7 @@ read_one_setting_value (KeyfileReaderInfo *info,
 		int i;
 		gboolean already_warned = FALSE;
 
-		tmp = nm_keyfile_plugin_kf_get_integer_list (keyfile, setting_name, key, &length, NULL);
+		tmp = nm_keyfile_plugin_kf_get_integer_list (keyfile, setting_info->setting_name, key, &length, NULL);
 
 		array = g_byte_array_sized_new (length);
 		for (i = 0; i < length; i++) {
@@ -2747,14 +3011,14 @@ read_one_setting_value (KeyfileReaderInfo *info,
 		gs_strfreev char **sa = NULL;
 		gsize length;
 
-		sa = nm_keyfile_plugin_kf_get_string_list (keyfile, setting_name, key, &length, NULL);
+		sa = nm_keyfile_plugin_kf_get_string_list (keyfile, setting_info->setting_name, key, &length, NULL);
 		g_object_set (setting, key, sa, NULL);
 	} else if (type == G_TYPE_HASH_TABLE) {
 		read_hash_of_string (keyfile, setting, key);
 	} else if (type == G_TYPE_ARRAY) {
 		read_array_of_uint (keyfile, setting, key);
 	} else if (G_TYPE_IS_FLAGS (type)) {
-		tmp_str = nm_keyfile_plugin_kf_get_value (keyfile, setting_name, key, &err);
+		tmp_str = nm_keyfile_plugin_kf_get_value (keyfile, setting_info->setting_name, key, &err);
 		if (!err) {
 			u64 = _nm_utils_ascii_str_to_uint64 (tmp_str, 0, 0, G_MAXUINT, G_MAXUINT64);
 			if (   u64 == G_MAXUINT64
@@ -2765,7 +3029,7 @@ read_one_setting_value (KeyfileReaderInfo *info,
 				nm_g_object_set_property_flags (G_OBJECT (setting), key, type, u64, &err);
 		}
 	} else if (G_TYPE_IS_ENUM (type)) {
-		tmp_str = nm_keyfile_plugin_kf_get_value (keyfile, setting_name, key, &err);
+		tmp_str = nm_keyfile_plugin_kf_get_value (keyfile, setting_info->setting_name, key, &err);
 		if (!err) {
 			i64 = _nm_utils_ascii_str_to_int64 (tmp_str, 0, G_MININT, G_MAXINT, G_MAXINT64);
 			if (   i64 == G_MAXINT64
@@ -2887,13 +3151,11 @@ _read_setting (KeyfileReaderInfo *info)
 	}
 
 	for (i = 0; i < sett_info->property_infos_len; i++) {
-		const NMSettInfoProperty *property_info = &sett_info->property_infos[i];
-
-		if (property_info->param_spec) {
-			read_one_setting_value (info, setting, property_info);
-			if (info->error)
-				goto out;
-		}
+		read_one_setting_value (info,
+		                        setting,
+		                        &sett_info->property_infos[i]);
+		if (info->error)
+			goto out;
 	}
 
 out:
@@ -2937,7 +3199,7 @@ _read_setting_wireguard_peer (KeyfileReaderInfo *info)
 	if (str) {
 		if (!nm_wireguard_peer_set_preshared_key (peer, str, FALSE)) {
 			if (!handle_warn (info, key, NM_KEYFILE_WARN_SEVERITY_WARN,
-			                  _("key '%s.%s' is not not a valid 256 bit key in base64 encoding"),
+			                  _("key '%s.%s' is not a valid 256 bit key in base64 encoding"),
 			                  info->group, key))
 				return;
 		}
@@ -2950,7 +3212,7 @@ _read_setting_wireguard_peer (KeyfileReaderInfo *info)
 		if (   i64 == -1
 		    || !_nm_setting_secret_flags_valid (i64)) {
 			if (!handle_warn (info, key, NM_KEYFILE_WARN_SEVERITY_WARN,
-			                  _("key '%s.%s' is not not a valid secret flag"),
+			                  _("key '%s.%s' is not a valid secret flag"),
 			                  info->group, key))
 				return;
 		} else
@@ -2962,7 +3224,7 @@ _read_setting_wireguard_peer (KeyfileReaderInfo *info)
 	if (errno != ENODATA) {
 		if (i64 == -1) {
 			if (!handle_warn (info, key, NM_KEYFILE_WARN_SEVERITY_WARN,
-			                  _("key '%s.%s' is not not a integer in range 0 to 2^32"),
+			                  _("key '%s.%s' is not a integer in range 0 to 2^32"),
 			                  info->group, key))
 				return;
 		} else
@@ -2974,7 +3236,7 @@ _read_setting_wireguard_peer (KeyfileReaderInfo *info)
 	if (str && str[0]) {
 		if (!nm_wireguard_peer_set_endpoint (peer, str, FALSE)) {
 			if (!handle_warn (info, key, NM_KEYFILE_WARN_SEVERITY_WARN,
-			                  _("key '%s.%s' is not not a valid endpoint"),
+			                  _("key '%s.%s' is not a valid endpoint"),
 			                  info->group, key))
 				return;
 		}
@@ -3202,40 +3464,47 @@ write_setting_value (KeyfileWriterInfo *info,
                      NMSetting *setting,
                      const NMSettInfoProperty *property_info)
 {
+	const NMMetaSettingInfo *setting_info;
 	const ParseInfoProperty *pip;
-	const char *setting_name;
 	const char *key;
 	char numstr[64];
 	GValue value;
 	GType type;
 
 	nm_assert (!info->error);
+	nm_assert (   !property_info->param_spec
+	           || nm_streq (property_info->param_spec->name, property_info->name));
 
-	if (!property_info->param_spec)
-		return;
-
-	key = property_info->param_spec->name;
+	key = property_info->name;
 
-	pip = _parse_info_find (setting, key, &setting_name);
+	pip = _parse_info_find (setting, key, &setting_info);
 
-	if (!setting_name) {
-		/* the setting type is unknown. That is highly unexpected
-		 * (and as this is currently only called from NetworkManager
-		 * daemon, not possible).
-		 *
-		 * Still, handle it gracefully, because later keyfile writer will become
-		 * public API of libnm, where @setting is (untrusted) user input.
-		 *
-		 * Gracefully here just means: ignore the setting. */
-		return;
+	if (!pip) {
+		if (!setting_info) {
+			/* the setting type is unknown. That is highly unexpected
+			 * (and as this is currently only called from NetworkManager
+			 * daemon, not possible).
+			 *
+			 * Still, handle it gracefully, because later keyfile writer will become
+			 * public API of libnm, where @setting is (untrusted) user input.
+			 *
+			 * Gracefully here just means: ignore the setting. */
+			return;
+		}
+		if (!property_info->param_spec)
+			return;
+		if (nm_streq (key, NM_SETTING_NAME))
+			return;
+	} else {
+		if (pip->has_writer_full) {
+			pip->writer_full (info, setting_info, property_info, pip, setting);
+			return;
+		}
+		if (pip->writer_skip)
+			return;
 	}
 
-	if (   !pip
-	    && nm_streq (key, NM_SETTING_NAME))
-		return;
-
-	if (pip && pip->writer_skip)
-		return;
+	nm_assert (property_info->param_spec);
 
 	/* Don't write secrets that are owned by user secret agents or aren't
 	 * supposed to be saved.  VPN secrets are handled specially though since
@@ -3259,11 +3528,12 @@ write_setting_value (KeyfileWriterInfo *info,
 
 	if (   (!pip || !pip->writer_persist_default)
 	    && g_param_value_defaults (property_info->param_spec, &value)) {
-		nm_assert (!g_key_file_has_key (info->keyfile, setting_name, key, NULL));
+		nm_assert (!g_key_file_has_key (info->keyfile, setting_info->setting_name, key, NULL));
 		goto out_unset_value;
 	}
 
-	if (pip && pip->writer) {
+	if (   pip
+	    && pip->writer) {
 		pip->writer (info, setting, key, &value);
 		goto out_unset_value;
 	}
@@ -3274,27 +3544,27 @@ write_setting_value (KeyfileWriterInfo *info,
 
 		str = g_value_get_string (&value);
 		if (str)
-			nm_keyfile_plugin_kf_set_string (info->keyfile, setting_name, key, str);
+			nm_keyfile_plugin_kf_set_string (info->keyfile, setting_info->setting_name, key, str);
 	} else if (type == G_TYPE_UINT) {
 		nm_sprintf_buf (numstr, "%u", g_value_get_uint (&value));
-		nm_keyfile_plugin_kf_set_value (info->keyfile, setting_name, key, numstr);
+		nm_keyfile_plugin_kf_set_value (info->keyfile, setting_info->setting_name, key, numstr);
 	} else if (type == G_TYPE_INT) {
 		nm_sprintf_buf (numstr, "%d", g_value_get_int (&value));
-		nm_keyfile_plugin_kf_set_value (info->keyfile, setting_name, key, numstr);
+		nm_keyfile_plugin_kf_set_value (info->keyfile, setting_info->setting_name, key, numstr);
 	} else if (type == G_TYPE_UINT64) {
 		nm_sprintf_buf (numstr, "%" G_GUINT64_FORMAT, g_value_get_uint64 (&value));
-		nm_keyfile_plugin_kf_set_value (info->keyfile, setting_name, key, numstr);
+		nm_keyfile_plugin_kf_set_value (info->keyfile, setting_info->setting_name, key, numstr);
 	} else if (type == G_TYPE_INT64) {
 		nm_sprintf_buf (numstr, "%" G_GINT64_FORMAT, g_value_get_int64 (&value));
-		nm_keyfile_plugin_kf_set_value (info->keyfile, setting_name, key, numstr);
+		nm_keyfile_plugin_kf_set_value (info->keyfile, setting_info->setting_name, key, numstr);
 	} else if (type == G_TYPE_BOOLEAN) {
-		nm_keyfile_plugin_kf_set_value (info->keyfile, setting_name, key,
+		nm_keyfile_plugin_kf_set_value (info->keyfile, setting_info->setting_name, key,
 		                                  g_value_get_boolean (&value)
 		                                ? "true"
 		                                : "false");
 	} else if (type == G_TYPE_CHAR) {
 		nm_sprintf_buf (numstr, "%d", (int) g_value_get_schar (&value));
-		nm_keyfile_plugin_kf_set_value (info->keyfile, setting_name, key, numstr);
+		nm_keyfile_plugin_kf_set_value (info->keyfile, setting_info->setting_name, key, numstr);
 	} else if (type == G_TYPE_BYTES) {
 		GBytes *bytes;
 		const guint8 *data;
@@ -3304,22 +3574,22 @@ write_setting_value (KeyfileWriterInfo *info,
 		data = bytes ? g_bytes_get_data (bytes, &len) : NULL;
 
 		if (data != NULL && len > 0)
-			nm_keyfile_plugin_kf_set_integer_list_uint8 (info->keyfile, setting_name, key, data, len);
+			nm_keyfile_plugin_kf_set_integer_list_uint8 (info->keyfile, setting_info->setting_name, key, data, len);
 	} else if (type == G_TYPE_STRV) {
 		char **array;
 
 		array = (char **) g_value_get_boxed (&value);
-		nm_keyfile_plugin_kf_set_string_list (info->keyfile, setting_name, key, (const char **const) array, g_strv_length (array));
+		nm_keyfile_plugin_kf_set_string_list (info->keyfile, setting_info->setting_name, key, (const char **const) array, g_strv_length (array));
 	} else if (type == G_TYPE_HASH_TABLE) {
 		write_hash_of_string (info->keyfile, setting, key, &value);
 	} else if (type == G_TYPE_ARRAY) {
 		write_array_of_uint (info->keyfile, setting, key, &value);
 	} else if (G_VALUE_HOLDS_FLAGS (&value)) {
 		nm_sprintf_buf (numstr, "%u", g_value_get_flags (&value));
-		nm_keyfile_plugin_kf_set_value (info->keyfile, setting_name, key, numstr);
+		nm_keyfile_plugin_kf_set_value (info->keyfile, setting_info->setting_name, key, numstr);
 	} else if (G_VALUE_HOLDS_ENUM (&value)) {
 		nm_sprintf_buf (numstr, "%d", g_value_get_enum (&value));
-		nm_keyfile_plugin_kf_set_value (info->keyfile, setting_name, key, numstr);
+		nm_keyfile_plugin_kf_set_value (info->keyfile, setting_info->setting_name, key, numstr);
 	} else
 		g_return_if_reached ();
 
diff --git a/libnm-core/nm-setting-8021x.c b/libnm-core/nm-setting-8021x.c
index 8a23fb34..5114ff74 100644
--- a/libnm-core/nm-setting-8021x.c
+++ b/libnm-core/nm-setting-8021x.c
@@ -24,7 +24,7 @@
 
 #include "nm-setting-8021x.h"
 
-#include "nm-utils/nm-secret-utils.h"
+#include "nm-glib-aux/nm-secret-utils.h"
 #include "nm-utils.h"
 #include "nm-crypto.h"
 #include "nm-utils-private.h"
diff --git a/libnm-core/nm-setting-bridge-port.c b/libnm-core/nm-setting-bridge-port.c
index 614c883c..7a8b345f 100644
--- a/libnm-core/nm-setting-bridge-port.c
+++ b/libnm-core/nm-setting-bridge-port.c
@@ -42,22 +42,60 @@
 
 /*****************************************************************************/
 
-NM_GOBJECT_PROPERTIES_DEFINE_BASE (
+NM_GOBJECT_PROPERTIES_DEFINE (NMSettingBridgePort,
 	PROP_PRIORITY,
 	PROP_PATH_COST,
 	PROP_HAIRPIN_MODE,
+	PROP_VLANS,
 );
 
 typedef struct {
 	guint16 priority;
 	guint16 path_cost;
 	gboolean hairpin_mode;
+	GPtrArray *vlans;
 } NMSettingBridgePortPrivate;
 
 G_DEFINE_TYPE (NMSettingBridgePort, nm_setting_bridge_port, NM_TYPE_SETTING)
 
 #define NM_SETTING_BRIDGE_PORT_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_SETTING_BRIDGE_PORT, NMSettingBridgePortPrivate))
 
+static int
+vlan_ptr_cmp (gconstpointer a, gconstpointer b)
+{
+	const NMBridgeVlan *vlan_a = *(const NMBridgeVlan **) a;
+	const NMBridgeVlan *vlan_b = *(const NMBridgeVlan **) b;
+
+	return nm_bridge_vlan_cmp (vlan_a, vlan_b);
+}
+
+gboolean
+_nm_setting_bridge_port_sort_vlans (NMSettingBridgePort *setting)
+{
+	NMSettingBridgePortPrivate *priv;
+	gboolean need_sort = FALSE;
+	guint i;
+
+	priv = NM_SETTING_BRIDGE_PORT_GET_PRIVATE (setting);
+
+	for (i = 1; i < priv->vlans->len; i++) {
+		NMBridgeVlan *vlan_prev = priv->vlans->pdata[i - 1];
+		NMBridgeVlan *vlan = priv->vlans->pdata[i];
+
+		if (nm_bridge_vlan_cmp (vlan_prev, vlan) > 0) {
+			need_sort = TRUE;
+			break;
+		}
+	}
+
+	if (need_sort) {
+		g_ptr_array_sort (priv->vlans, vlan_ptr_cmp);
+		_notify (setting, PROP_VLANS);
+	}
+
+	return need_sort;
+}
+
 /*****************************************************************************/
 
 /**
@@ -102,11 +140,171 @@ nm_setting_bridge_port_get_hairpin_mode (NMSettingBridgePort *setting)
 	return NM_SETTING_BRIDGE_PORT_GET_PRIVATE (setting)->hairpin_mode;
 }
 
+/**
+ * nm_setting_bridge_port_add_vlan:
+ * @setting: the #NMSettingBridgePort
+ * @vlan: the vlan to add
+ *
+ * Appends a new vlan and associated information to the setting.  The
+ * given vlan gets sealed and a reference to it is added.
+ *
+ * Since: 1.18
+ **/
+void
+nm_setting_bridge_port_add_vlan (NMSettingBridgePort *setting,
+                                 NMBridgeVlan *vlan)
+{
+	NMSettingBridgePortPrivate *priv;
+
+	g_return_if_fail (NM_IS_SETTING_BRIDGE_PORT (setting));
+	g_return_if_fail (vlan);
+
+	priv = NM_SETTING_BRIDGE_PORT_GET_PRIVATE (setting);
+
+	nm_bridge_vlan_seal (vlan);
+	nm_bridge_vlan_ref (vlan);
+
+	g_ptr_array_add (priv->vlans, vlan);
+	_notify (setting, PROP_VLANS);
+}
+
+/**
+ * nm_setting_bridge_port_get_num_vlans:
+ * @setting: the #NMSettingBridgePort
+ *
+ * Returns: the number of VLANs
+ *
+ * Since: 1.18
+ **/
+guint
+nm_setting_bridge_port_get_num_vlans (NMSettingBridgePort *setting)
+{
+	NMSettingBridgePortPrivate *priv;
+
+	g_return_val_if_fail (NM_IS_SETTING_BRIDGE_PORT (setting), 0);
+	priv = NM_SETTING_BRIDGE_PORT_GET_PRIVATE (setting);
+
+	return priv->vlans->len;
+}
+
+/**
+ * nm_setting_bridge_port_get_vlan:
+ * @setting: the #NMSettingBridgePort
+ * @idx: index number of the VLAN to return
+ *
+ * Returns: (transfer none): the VLAN at index @idx
+ *
+ * Since: 1.18
+ **/
+NMBridgeVlan *
+nm_setting_bridge_port_get_vlan (NMSettingBridgePort *setting, guint idx)
+{
+	NMSettingBridgePortPrivate *priv;
+
+	g_return_val_if_fail (NM_IS_SETTING_BRIDGE_PORT (setting), NULL);
+	priv = NM_SETTING_BRIDGE_PORT_GET_PRIVATE (setting);
+
+	g_return_val_if_fail (idx < priv->vlans->len, NULL);
+
+	return priv->vlans->pdata[idx];
+}
+
+/**
+ * nm_setting_bridge_port_remove_vlan:
+ * @setting: the #NMSettingBridgePort
+ * @idx: index number of the VLAN.
+ *
+ * Removes the vlan at index @idx.
+ *
+ * Since: 1.18
+ **/
+void
+nm_setting_bridge_port_remove_vlan (NMSettingBridgePort *setting, guint idx)
+{
+	NMSettingBridgePortPrivate *priv;
+
+	g_return_if_fail (NM_IS_SETTING_BRIDGE_PORT (setting));
+	priv = NM_SETTING_BRIDGE_PORT_GET_PRIVATE (setting);
+
+	g_return_if_fail (idx < priv->vlans->len);
+
+	g_ptr_array_remove_index (priv->vlans, idx);
+	_notify (setting, PROP_VLANS);
+}
+
+/**
+ * nm_setting_bridge_port_remove_vlan_by_vid:
+ * @setting: the #NMSettingBridgePort
+ * @vid_start: the vlan start index
+ * @vid_end: the vlan end index
+ *
+ * Remove the VLAN with range @vid_start to @vid_end.
+ * If @vid_end is zero, it is assumed to be equal to @vid_start
+ * and so the single-id VLAN with id @vid_start is removed.
+ *
+ * Returns: %TRUE if the vlan was found and removed; %FALSE otherwise
+ *
+ * Since: 1.18
+ **/
+gboolean
+nm_setting_bridge_port_remove_vlan_by_vid (NMSettingBridgePort *setting,
+                                           guint16 vid_start,
+                                           guint16 vid_end)
+{
+	NMSettingBridgePortPrivate *priv;
+	guint16 v_start, v_end;
+	NMBridgeVlan *vlan;
+	guint i;
+
+	if (vid_end == 0)
+		vid_end = vid_start;
+
+	g_return_val_if_fail (NM_IS_SETTING_BRIDGE_PORT (setting), FALSE);
+	priv = NM_SETTING_BRIDGE_PORT_GET_PRIVATE (setting);
+
+	for (i = 0; i < priv->vlans->len; i++) {
+		vlan = (NMBridgeVlan *) priv->vlans->pdata[i];
+		nm_bridge_vlan_get_vid_range (vlan, &v_start, &v_end);
+		if (v_start == vid_start && v_end == vid_end) {
+			g_ptr_array_remove_index (priv->vlans, i);
+			_notify (setting, PROP_VLANS);
+			return TRUE;
+		}
+	}
+	return FALSE;
+}
+
+/**
+ * nm_setting_bridge_port_clear_vlans:
+ * @setting: the #NMSettingBridgePort
+ *
+ * Removes all configured VLANs.
+ *
+ * Since: 1.18
+ **/
+void
+nm_setting_bridge_port_clear_vlans (NMSettingBridgePort *setting)
+{
+	NMSettingBridgePortPrivate *priv;
+
+	g_return_if_fail (NM_IS_SETTING_BRIDGE_PORT (setting));
+	priv = NM_SETTING_BRIDGE_PORT_GET_PRIVATE (setting);
+
+	if (priv->vlans->len != 0) {
+		g_ptr_array_set_size (priv->vlans, 0);
+		_notify (setting, PROP_VLANS);
+	}
+}
+
 /*****************************************************************************/
 
 static gboolean
 verify (NMSetting *setting, NMConnection *connection, GError **error)
 {
+	NMSettingBridgePortPrivate *priv;
+
+	priv = NM_SETTING_BRIDGE_PORT_GET_PRIVATE (setting);
+
 	if (connection) {
 		NMSettingConnection *s_con;
 		const char *slave_type;
@@ -136,9 +334,58 @@ verify (NMSetting *setting, NMConnection *connection, GError **error)
 		}
 	}
 
+	if (!_nm_utils_bridge_vlan_verify_list (priv->vlans,
+	                                        FALSE,
+	                                        error,
+	                                        NM_SETTING_BRIDGE_PORT_SETTING_NAME,
+	                                        NM_SETTING_BRIDGE_PORT_VLANS))
+		return FALSE;
+
+	/* Failures from here on are NORMALIZABLE... */
+
+	if (!_nm_utils_bridge_vlan_verify_list (priv->vlans,
+	                                        TRUE,
+	                                        error,
+	                                        NM_SETTING_BRIDGE_PORT_SETTING_NAME,
+	                                        NM_SETTING_BRIDGE_PORT_VLANS))
+		return NM_SETTING_VERIFY_NORMALIZABLE;
+
 	return TRUE;
 }
 
+static NMTernary
+compare_property (const NMSettInfoSetting *sett_info,
+                  guint property_idx,
+                  NMSetting *setting,
+                  NMSetting *other,
+                  NMSettingCompareFlags flags)
+{
+	NMSettingBridgePortPrivate *priv_a;
+	NMSettingBridgePortPrivate *priv_b;
+	guint i;
+
+	if (nm_streq (sett_info->property_infos[property_idx].name, NM_SETTING_BRIDGE_PORT_VLANS)) {
+		if (other) {
+			priv_a = NM_SETTING_BRIDGE_PORT_GET_PRIVATE (setting);
+			priv_b = NM_SETTING_BRIDGE_PORT_GET_PRIVATE (other);
+
+			if (priv_a->vlans->len != priv_b->vlans->len)
+				return FALSE;
+			for (i = 0; i < priv_a->vlans->len; i++) {
+				if (nm_bridge_vlan_cmp (priv_a->vlans->pdata[i], priv_b->vlans->pdata[i]))
+					return FALSE;
+			}
+		}
+		return TRUE;
+	}
+
+	return NM_SETTING_CLASS (nm_setting_bridge_port_parent_class)->compare_property (sett_info,
+	                                                                                 property_idx,
+	                                                                                 setting,
+	                                                                                 other,
+	                                                                                 flags);
+}
+
 /*****************************************************************************/
 
 static void
@@ -157,6 +404,11 @@ get_property (GObject *object, guint prop_id,
 	case PROP_HAIRPIN_MODE:
 		g_value_set_boolean (value, priv->hairpin_mode);
 		break;
+	case PROP_VLANS:
+		g_value_take_boxed (value, _nm_utils_copy_array (priv->vlans,
+		                                                 (NMUtilsCopyFunc) nm_bridge_vlan_ref,
+		                                                 (GDestroyNotify) nm_bridge_vlan_unref));
+		break;
 	default:
 		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
 		break;
@@ -179,6 +431,12 @@ set_property (GObject *object, guint prop_id,
 	case PROP_HAIRPIN_MODE:
 		priv->hairpin_mode = g_value_get_boolean (value);
 		break;
+	case PROP_VLANS:
+		g_ptr_array_unref (priv->vlans);
+		priv->vlans = _nm_utils_copy_array (g_value_get_boxed (value),
+		                                    (NMUtilsCopyFunc) _nm_bridge_vlan_dup_and_seal,
+		                                    (GDestroyNotify) nm_bridge_vlan_unref);
+		break;
 	default:
 		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
 		break;
@@ -190,6 +448,9 @@ set_property (GObject *object, guint prop_id,
 static void
 nm_setting_bridge_port_init (NMSettingBridgePort *setting)
 {
+	NMSettingBridgePortPrivate *priv = NM_SETTING_BRIDGE_PORT_GET_PRIVATE (setting);
+
+	priv->vlans = g_ptr_array_new_with_free_func ((GDestroyNotify) nm_bridge_vlan_unref);
 }
 
 /**
@@ -205,17 +466,30 @@ nm_setting_bridge_port_new (void)
 	return (NMSetting *) g_object_new (NM_TYPE_SETTING_BRIDGE_PORT, NULL);
 }
 
+static void
+finalize (GObject *object)
+{
+	NMSettingBridgePortPrivate *priv = NM_SETTING_BRIDGE_PORT_GET_PRIVATE (object);
+
+	g_ptr_array_unref (priv->vlans);
+
+	G_OBJECT_CLASS (nm_setting_bridge_port_parent_class)->finalize (object);
+}
+
 static void
 nm_setting_bridge_port_class_init (NMSettingBridgePortClass *klass)
 {
 	GObjectClass *object_class = G_OBJECT_CLASS (klass);
 	NMSettingClass *setting_class = NM_SETTING_CLASS (klass);
+	GArray *properties_override = _nm_sett_info_property_override_create_array ();
 
 	g_type_class_add_private (klass, sizeof (NMSettingBridgePortPrivate));
 
+	object_class->finalize = finalize;
 	object_class->get_property = get_property;
 	object_class->set_property = set_property;
 
+	setting_class->compare_property = compare_property;
 	setting_class->verify = verify;
 
 	/**
@@ -280,7 +554,48 @@ nm_setting_bridge_port_class_init (NMSettingBridgePortClass *klass)
 	                          NM_SETTING_PARAM_INFERRABLE |
 	                          G_PARAM_STATIC_STRINGS);
 
+	/**
+	 * NMSettingBridgePort:vlans: (type GPtrArray(NMBridgeVlan))
+	 *
+	 * Array of bridge VLAN objects. In addition to the VLANs
+	 * specified here, the port will also have the default-pvid
+	 * VLAN configured on the bridge by the bridge.vlan-default-pvid
+	 * property.
+	 *
+	 * In nmcli the VLAN list can be specified with the following
+	 * syntax:
+	 *
+	 *  $vid [pvid] [untagged] [, $vid [pvid] [untagged]]...
+	 *
+	 * where $vid is either a single id between 1 and 4094 or a
+	 * range, represented as a couple of ids separated by a dash.
+	 *
+	 * Since: 1.18
+	 **/
+	/* ---ifcfg-rh---
+	 * property: vlans
+	 * variable: BRIDGE_PORT_VLANS
+	 * description: List of VLANs on the bridge port
+	 * example: BRIDGE_PORT_VLANS="1 pvid untagged,20,300-400 untagged"
+	 * ---end---
+	 */
+	obj_properties[PROP_VLANS] =
+	    g_param_spec_boxed (NM_SETTING_BRIDGE_PORT_VLANS, "", "",
+	                        G_TYPE_PTR_ARRAY,
+	                        G_PARAM_READWRITE |
+	                        NM_SETTING_PARAM_INFERRABLE |
+	                        G_PARAM_STATIC_STRINGS);
+
+	_properties_override_add_override (properties_override,
+	                                   obj_properties[PROP_VLANS],
+	                                   G_VARIANT_TYPE ("aa{sv}"),
+	                                   _nm_utils_bridge_vlans_to_dbus,
+	                                   _nm_utils_bridge_vlans_from_dbus,
+	                                   NULL);
+
 	g_object_class_install_properties (object_class, _PROPERTY_ENUMS_LAST, obj_properties);
 
-	_nm_setting_class_commit (setting_class, NM_META_SETTING_TYPE_BRIDGE_PORT);
+	_nm_setting_class_commit_full (setting_class, NM_META_SETTING_TYPE_BRIDGE_PORT,
+	                               NULL, properties_override);
+
 }
diff --git a/libnm-core/nm-setting-bridge-port.h b/libnm-core/nm-setting-bridge-port.h
index 0ff6d9f1..5b75c1ec 100644
--- a/libnm-core/nm-setting-bridge-port.h
+++ b/libnm-core/nm-setting-bridge-port.h
@@ -27,6 +27,7 @@
 #endif
 
 #include "nm-setting.h"
+#include "nm-setting-bridge.h"
 
 G_BEGIN_DECLS
 
@@ -42,6 +43,7 @@ G_BEGIN_DECLS
 #define NM_SETTING_BRIDGE_PORT_PRIORITY     "priority"
 #define NM_SETTING_BRIDGE_PORT_PATH_COST    "path-cost"
 #define NM_SETTING_BRIDGE_PORT_HAIRPIN_MODE "hairpin-mode"
+#define NM_SETTING_BRIDGE_PORT_VLANS        "vlans"
 
 /**
  * NMSettingBridgePort:
@@ -69,6 +71,22 @@ guint16     nm_setting_bridge_port_get_path_cost    (NMSettingBridgePort *settin
 
 gboolean    nm_setting_bridge_port_get_hairpin_mode (NMSettingBridgePort *setting);
 
+NM_AVAILABLE_IN_1_18
+void          nm_setting_bridge_port_add_vlan (NMSettingBridgePort *setting,
+                                               NMBridgeVlan *vlan);
+NM_AVAILABLE_IN_1_18
+guint         nm_setting_bridge_port_get_num_vlans (NMSettingBridgePort *setting);
+NM_AVAILABLE_IN_1_18
+NMBridgeVlan *nm_setting_bridge_port_get_vlan (NMSettingBridgePort *setting, guint idx);
+NM_AVAILABLE_IN_1_18
+void          nm_setting_bridge_port_remove_vlan (NMSettingBridgePort *setting, guint idx);
+NM_AVAILABLE_IN_1_18
+gboolean      nm_setting_bridge_port_remove_vlan_by_vid (NMSettingBridgePort *setting,
+                                                         guint16 vid_start,
+                                                         guint16 vid_end);
+NM_AVAILABLE_IN_1_18
+void          nm_setting_bridge_port_clear_vlans (NMSettingBridgePort *setting);
+
 G_END_DECLS
 
 #endif /* __NM_SETTING_BRIDGE_PORT_H__ */
diff --git a/libnm-core/nm-setting-bridge.c b/libnm-core/nm-setting-bridge.c
index e418013c..c6aca021 100644
--- a/libnm-core/nm-setting-bridge.c
+++ b/libnm-core/nm-setting-bridge.c
@@ -40,7 +40,7 @@
 
 /*****************************************************************************/
 
-NM_GOBJECT_PROPERTIES_DEFINE_BASE (
+NM_GOBJECT_PROPERTIES_DEFINE (NMSettingBridge,
 	PROP_MAC_ADDRESS,
 	PROP_STP,
 	PROP_PRIORITY,
@@ -50,6 +50,9 @@ NM_GOBJECT_PROPERTIES_DEFINE_BASE (
 	PROP_AGEING_TIME,
 	PROP_GROUP_FORWARD_MASK,
 	PROP_MULTICAST_SNOOPING,
+	PROP_VLAN_FILTERING,
+	PROP_VLAN_DEFAULT_PVID,
+	PROP_VLANS,
 );
 
 typedef struct {
@@ -62,6 +65,9 @@ typedef struct {
 	guint32  ageing_time;
 	guint16  group_forward_mask;
 	gboolean multicast_snooping;
+	gboolean vlan_filtering;
+	guint16  vlan_default_pvid;
+	GPtrArray *vlans;
 } NMSettingBridgePrivate;
 
 G_DEFINE_TYPE (NMSettingBridge, nm_setting_bridge, NM_TYPE_SETTING)
@@ -70,6 +76,506 @@ G_DEFINE_TYPE (NMSettingBridge, nm_setting_bridge, NM_TYPE_SETTING)
 
 /*****************************************************************************/
 
+G_DEFINE_BOXED_TYPE (NMBridgeVlan, nm_bridge_vlan, _nm_bridge_vlan_dup, nm_bridge_vlan_unref)
+
+struct _NMBridgeVlan {
+	guint refcount;
+	guint16 vid_start;
+	guint16 vid_end;
+	bool untagged:1;
+	bool pvid:1;
+	bool sealed:1;
+};
+
+static gboolean
+NM_IS_BRIDGE_VLAN (const NMBridgeVlan *self, gboolean also_sealed)
+{
+	return    self
+	       && self->refcount > 0
+	       && (also_sealed || !self->sealed);
+}
+
+/**
+ * nm_bridge_vlan_new:
+ * @vid_start: the start VLAN id, must be between 1 and 4094.
+ * @vid_end: the end VLAN id, must be 0 or between @vid_start and 4094.
+ *
+ * Creates a new #NMBridgeVlan object for the given VLAN id range.
+ * Setting @vid_end to 0 is equivalent to setting it to @vid_start
+ * and creates a single-id VLAN.
+ *
+ * Returns: (transfer full): the new #NMBridgeVlan object.
+ *
+ * Since: 1.18
+ **/
+NMBridgeVlan *
+nm_bridge_vlan_new (guint16 vid_start, guint16 vid_end)
+{
+	NMBridgeVlan *vlan;
+
+	if (vid_end == 0)
+		vid_end = vid_start;
+
+	g_return_val_if_fail (vid_start >= NM_BRIDGE_VLAN_VID_MIN, NULL);
+	g_return_val_if_fail (vid_end <= NM_BRIDGE_VLAN_VID_MAX, NULL);
+	g_return_val_if_fail (vid_start <= vid_end, NULL);
+
+	vlan = g_slice_new0 (NMBridgeVlan);
+	vlan->refcount = 1;
+	vlan->vid_start = vid_start;
+	vlan->vid_end = vid_end;
+
+	return vlan;
+}
+
+/**
+ * nm_bridge_vlan_ref:
+ * @vlan: the #NMBridgeVlan
+ *
+ * Increases the reference count of the object.
+ *
+ * Returns: the input argument @vlan object.
+ *
+ * Since: 1.18
+ **/
+NMBridgeVlan *
+nm_bridge_vlan_ref (NMBridgeVlan *vlan)
+{
+	g_return_val_if_fail (NM_IS_BRIDGE_VLAN (vlan, TRUE), NULL);
+
+	nm_assert (vlan->refcount < G_MAXUINT);
+
+	vlan->refcount++;
+	return vlan;
+}
+
+/**
+ * nm_bridge_vlan_unref:
+ * @vlan: the #NMBridgeVlan
+ *
+ * Decreases the reference count of the object.  If the reference count
+ * reaches zero the object will be destroyed.
+ *
+ * Since: 1.18
+ **/
+void
+nm_bridge_vlan_unref (NMBridgeVlan *vlan)
+{
+	g_return_if_fail (NM_IS_BRIDGE_VLAN (vlan, TRUE));
+
+	if (--vlan->refcount == 0)
+		g_slice_free (NMBridgeVlan, vlan);
+}
+
+/**
+ * nm_bridge_vlan_cmp:
+ * @a: a #NMBridgeVlan
+ * @b: another #NMBridgeVlan
+ *
+ * Compare two bridge VLAN objects.
+ *
+ * Returns: zero of the two instances are equivalent or
+ *   a non-zero integer otherwise. This defines a total ordering
+ *   over the VLANs. Whether a VLAN is sealed or not does not
+ *   affect the comparison.
+ *
+ * Since: 1.18
+ **/
+int
+nm_bridge_vlan_cmp (const NMBridgeVlan *a, const NMBridgeVlan *b)
+{
+	g_return_val_if_fail (NM_IS_BRIDGE_VLAN (a, TRUE), 0);
+	g_return_val_if_fail (NM_IS_BRIDGE_VLAN (b, TRUE), 0);
+
+	NM_CMP_SELF (a, b);
+	NM_CMP_FIELD (a, b, vid_start);
+	NM_CMP_FIELD (a, b, vid_end);
+	NM_CMP_FIELD_BOOL (a, b, untagged);
+	NM_CMP_FIELD_BOOL (a, b, pvid);
+
+	return 0;
+}
+
+NMBridgeVlan *
+_nm_bridge_vlan_dup (const NMBridgeVlan *vlan)
+{
+	g_return_val_if_fail (NM_IS_BRIDGE_VLAN (vlan, TRUE), NULL);
+
+	if (vlan->sealed) {
+		nm_bridge_vlan_ref ((NMBridgeVlan *) vlan);
+		return (NMBridgeVlan *) vlan;
+	}
+
+	return nm_bridge_vlan_new_clone (vlan);
+}
+
+NMBridgeVlan *
+_nm_bridge_vlan_dup_and_seal (const NMBridgeVlan *vlan)
+{
+	NMBridgeVlan *new;
+
+	g_return_val_if_fail (NM_IS_BRIDGE_VLAN (vlan, TRUE), NULL);
+
+	new = _nm_bridge_vlan_dup (vlan);
+	nm_bridge_vlan_seal (new);
+
+	return new;
+}
+
+/**
+ * nm_bridge_vlan_get_vid_range:
+ * @vlan: the #NMBridgeVlan
+ * @vid_start: location to store the VLAN id range start.
+ * @vid_end: location to store the VLAN id range end
+ *
+ * Gets the VLAN id range.
+ *
+ * Returns: %TRUE is the VLAN specifies a range, %FALSE if it is
+ * a single-id VLAN.
+ *
+ * Since: 1.18
+ **/
+gboolean
+nm_bridge_vlan_get_vid_range (const NMBridgeVlan *vlan,
+                              guint16 *vid_start,
+                              guint16 *vid_end)
+{
+	g_return_val_if_fail (NM_IS_BRIDGE_VLAN (vlan, TRUE), 0);
+
+	NM_SET_OUT (vid_start, vlan->vid_start);
+	NM_SET_OUT (vid_end, vlan->vid_end);
+
+	return vlan->vid_start != vlan->vid_end;
+}
+
+/**
+ * nm_bridge_vlan_is_untagged:
+ * @vlan: the #NMBridgeVlan
+ *
+ * Returns whether the VLAN is untagged.
+ *
+ * Returns: %TRUE if the VLAN is untagged, %FALSE otherwise
+ *
+ * Since: 1.18
+ **/
+gboolean
+nm_bridge_vlan_is_untagged (const NMBridgeVlan *vlan)
+{
+	g_return_val_if_fail (NM_IS_BRIDGE_VLAN (vlan, TRUE), FALSE);
+
+	return vlan->untagged;
+}
+
+/**
+ * nm_bridge_vlan_is_pvid:
+ * @vlan: the #NMBridgeVlan
+ *
+ * Returns whether the VLAN is the PVID for the port.
+ *
+ * Returns: %TRUE if the VLAN is the PVID
+ *
+ * Since: 1.18
+ **/
+gboolean
+nm_bridge_vlan_is_pvid (const NMBridgeVlan *vlan)
+{
+	g_return_val_if_fail (NM_IS_BRIDGE_VLAN (vlan, TRUE), FALSE);
+
+	return vlan->pvid;
+}
+
+/**
+ * nm_bridge_vlan_set_untagged:
+ * @vlan: the #NMBridgeVlan
+ * @value: the new value
+ *
+ * Change the value of the untagged property of the VLAN.
+ *
+ * Since: 1.18
+ **/
+void
+nm_bridge_vlan_set_untagged (NMBridgeVlan *vlan, gboolean value)
+{
+	g_return_if_fail (NM_IS_BRIDGE_VLAN (vlan, FALSE));
+
+	vlan->untagged = value;
+}
+
+/**
+ * nm_bridge_vlan_set_pvid:
+ * @vlan: the #NMBridgeVlan
+ * @value: the new value
+ *
+ * Change the value of the PVID property of the VLAN. It
+ * is invalid to set the value to %TRUE for non-single-id
+ * VLANs.
+ *
+ * Since: 1.18
+ **/
+void
+nm_bridge_vlan_set_pvid (NMBridgeVlan *vlan, gboolean value)
+{
+	g_return_if_fail (NM_IS_BRIDGE_VLAN (vlan, FALSE));
+	g_return_if_fail (!value || vlan->vid_start == vlan->vid_end);
+
+	vlan->pvid = value;
+}
+
+/**
+ * nm_bridge_vlan_is_sealed:
+ * @vlan: the #NMBridgeVlan instance
+ *
+ * Returns: whether @self is sealed or not.
+ *
+ * Since: 1.18
+ */
+gboolean
+nm_bridge_vlan_is_sealed (const NMBridgeVlan *vlan)
+{
+	g_return_val_if_fail (NM_IS_BRIDGE_VLAN (vlan, TRUE), FALSE);
+
+	return vlan->sealed;
+}
+
+/**
+ * nm_bridge_vlan_seal:
+ * @vlan: the #NMBridgeVlan instance
+ *
+ * Seal the #NMBridgeVlan instance. Afterwards, it is a bug
+ * to call all functions that modify the instance (except ref/unref).
+ * A sealed instance cannot be unsealed again, but you can create
+ * an unsealed copy with nm_bridge_vlan_new_clone().
+ *
+ * Since: 1.18
+ */
+void
+nm_bridge_vlan_seal (NMBridgeVlan *vlan)
+{
+	g_return_if_fail (NM_IS_BRIDGE_VLAN (vlan, TRUE));
+
+	vlan->sealed = TRUE;
+}
+
+/**
+ * nm_bridge_vlan_new_clone:
+ * @vlan: the #NMBridgeVlan instance to copy
+ *
+ * Returns: (transfer full): a clone of @vlan. This instance
+ *   is always unsealed.
+ *
+ * Since: 1.18
+ */
+NMBridgeVlan *
+nm_bridge_vlan_new_clone (const NMBridgeVlan *vlan)
+{
+	NMBridgeVlan *copy;
+
+	g_return_val_if_fail (NM_IS_BRIDGE_VLAN (vlan, TRUE), NULL);
+
+	copy = nm_bridge_vlan_new (vlan->vid_start, vlan->vid_end);
+	copy->untagged = vlan->untagged;
+	copy->pvid = vlan->pvid;
+
+	return copy;
+}
+
+void
+_nm_bridge_vlan_str_append_rest (const NMBridgeVlan *vlan,
+                                 GString *string,
+                                 gboolean leading_space)
+{
+	if (nm_bridge_vlan_is_pvid (vlan)) {
+		if (leading_space)
+			g_string_append_c (string, ' ');
+		g_string_append (string, "pvid");
+		leading_space = TRUE;
+	}
+	if (nm_bridge_vlan_is_untagged (vlan)) {
+		if (leading_space)
+			g_string_append_c (string, ' ');
+		g_string_append (string, "untagged");
+		leading_space = TRUE;
+	}
+}
+
+/**
+ * nm_bridge_vlan_to_str:
+ * @vlan: the %NMBridgeVlan
+ * @error: location of the error
+ *
+ * Convert a %NMBridgeVlan to a string.
+ *
+ * Returns: formatted string or %NULL
+ *
+ * Since: 1.18
+ */
+char *
+nm_bridge_vlan_to_str (const NMBridgeVlan *vlan, GError **error)
+{
+	GString *string;
+
+	g_return_val_if_fail (vlan, NULL);
+	g_return_val_if_fail (!error || !*error, NULL);
+
+	/* The function never fails at the moment, but it might in the
+	 * future if more parameters are added to the object that could
+	 * make it invalid. */
+
+	string = g_string_sized_new (28);
+
+	if (vlan->vid_start == vlan->vid_end)
+		g_string_append_printf (string, "%u", vlan->vid_start);
+	else
+		g_string_append_printf (string, "%u-%u", vlan->vid_start, vlan->vid_end);
+
+	_nm_bridge_vlan_str_append_rest (vlan, string, TRUE);
+
+	return g_string_free (string, FALSE);
+}
+
+/**
+ * nm_bridge_vlan_from_str:
+ * @str: the string representation of a bridge VLAN
+ * @error: location of the error
+ *
+ * Parses the string representation of the queueing
+ * discipline to a %NMBridgeVlan instance.
+ *
+ * Returns: the %NMBridgeVlan or %NULL
+ *
+ * Since: 1.18
+ */
+NMBridgeVlan *
+nm_bridge_vlan_from_str (const char *str, GError **error)
+{
+	NMBridgeVlan *vlan = NULL;
+	gs_free const char **tokens = NULL;
+	guint i, vid_start, vid_end = 0;
+	gboolean pvid = FALSE;
+	gboolean untagged = FALSE;
+	char *c;
+
+	g_return_val_if_fail (str, NULL);
+	g_return_val_if_fail (!error || !*error, NULL);
+
+	tokens = nm_utils_escaped_tokens_split (str, NM_ASCII_SPACES);
+	if (!tokens || !tokens[0]) {
+		g_set_error_literal (error,
+		                     NM_CONNECTION_ERROR,
+		                     NM_CONNECTION_ERROR_FAILED,
+		                     "missing VLAN id");
+		return NULL;
+	}
+
+	c = strchr (tokens[0], '-');
+	if (c)
+		*c = '\0';
+
+	vid_start = _nm_utils_ascii_str_to_uint64 (tokens[0],
+	                                           10,
+	                                           NM_BRIDGE_VLAN_VID_MIN,
+	                                           NM_BRIDGE_VLAN_VID_MAX,
+	                                           G_MAXUINT);
+	if (vid_start == G_MAXUINT) {
+		g_set_error (error,
+		             NM_CONNECTION_ERROR,
+		             NM_CONNECTION_ERROR_FAILED,
+		             "invalid VLAN id range start '%s', must be in [1,4094]", tokens[0]);
+		return NULL;
+	}
+
+	if (c) {
+		vid_end = _nm_utils_ascii_str_to_uint64 (c + 1,
+		                                         10,
+		                                         NM_BRIDGE_VLAN_VID_MIN,
+		                                         NM_BRIDGE_VLAN_VID_MAX,
+		                                         G_MAXUINT);
+		if (vid_end == G_MAXUINT) {
+			g_set_error (error,
+			             NM_CONNECTION_ERROR,
+			             NM_CONNECTION_ERROR_FAILED,
+			             "invalid VLAN id range end '%s', must be in [1,4094]", c + 1);
+			return NULL;
+		}
+		if (vid_end < vid_start) {
+			g_set_error (error,
+			             NM_CONNECTION_ERROR,
+			             NM_CONNECTION_ERROR_FAILED,
+			             "invalid VLAN id range %u-%u, start VLAN id must be less than end VLAN id",
+			             vid_start, vid_end);
+			return NULL;
+		}
+	} else
+		vid_end = vid_start;
+
+	for (i = 1; tokens[i]; i++) {
+		if (nm_streq (tokens[i], "pvid")) {
+			if (vid_start != vid_end) {
+				g_set_error_literal (error,
+				                     NM_CONNECTION_ERROR,
+				                     NM_CONNECTION_ERROR_FAILED,
+				                     "a VLAN range can't be a PVID");
+				return NULL;
+			}
+			pvid = TRUE;
+		} else if (nm_streq (tokens[i], "untagged"))
+			untagged = TRUE;
+		else {
+			g_set_error (error,
+			             NM_CONNECTION_ERROR,
+			             NM_CONNECTION_ERROR_FAILED,
+			             "invalid option '%s'", tokens[i]);
+			return NULL;
+		}
+	}
+
+	vlan = nm_bridge_vlan_new (vid_start, vid_end);
+	nm_bridge_vlan_set_pvid (vlan, pvid);
+	nm_bridge_vlan_set_untagged (vlan, untagged);
+
+	return vlan;
+}
+
+/*****************************************************************************/
+
+static int
+vlan_ptr_cmp (gconstpointer a, gconstpointer b)
+{
+	const NMBridgeVlan *vlan_a = *(const NMBridgeVlan **) a;
+	const NMBridgeVlan *vlan_b = *(const NMBridgeVlan **) b;
+
+	return nm_bridge_vlan_cmp (vlan_a, vlan_b);
+}
+
+gboolean
+_nm_setting_bridge_sort_vlans (NMSettingBridge *setting)
+{
+	NMSettingBridgePrivate *priv;
+	gboolean need_sort = FALSE;
+	guint i;
+
+	priv = NM_SETTING_BRIDGE_GET_PRIVATE (setting);
+
+	for (i = 1; i < priv->vlans->len; i++) {
+		NMBridgeVlan *vlan_prev = priv->vlans->pdata[i - 1];
+		NMBridgeVlan *vlan = priv->vlans->pdata[i];
+
+		if (nm_bridge_vlan_cmp (vlan_prev, vlan) > 0) {
+			need_sort = TRUE;
+			break;
+		}
+	}
+
+	if (need_sort) {
+		g_ptr_array_sort (priv->vlans, vlan_ptr_cmp);
+		_notify (setting, PROP_VLANS);
+	}
+
+	return need_sort;
+}
+
+/*****************************************************************************/
+
 /**
  * nm_setting_bridge_get_mac_address:
  * @setting: the #NMSettingBridge
@@ -200,6 +706,194 @@ nm_setting_bridge_get_multicast_snooping (NMSettingBridge *setting)
 	return NM_SETTING_BRIDGE_GET_PRIVATE (setting)->multicast_snooping;
 }
 
+/**
+ * nm_setting_bridge_get_vlan_filtering:
+ * @setting: the #NMSettingBridge
+ *
+ * Returns: the #NMSettingBridge:vlan-filtering property of the setting
+ *
+ * Since: 1.18
+ **/
+gboolean
+nm_setting_bridge_get_vlan_filtering (NMSettingBridge *setting)
+{
+	g_return_val_if_fail (NM_IS_SETTING_BRIDGE (setting), FALSE);
+
+	return NM_SETTING_BRIDGE_GET_PRIVATE (setting)->vlan_filtering;
+}
+
+/**
+ * nm_setting_bridge_get_vlan_default_pvid:
+ * @setting: the #NMSettingBridge
+ *
+ * Returns: the #NMSettingBridge:vlan-default-pvid property of the setting
+ *
+ * Since: 1.18
+ **/
+guint16
+nm_setting_bridge_get_vlan_default_pvid (NMSettingBridge *setting)
+{
+	g_return_val_if_fail (NM_IS_SETTING_BRIDGE (setting), 1);
+
+	return NM_SETTING_BRIDGE_GET_PRIVATE (setting)->vlan_default_pvid;
+}
+
+/**
+ * nm_setting_bridge_add_vlan:
+ * @setting: the #NMSettingBridge
+ * @vlan: the vlan to add
+ *
+ * Appends a new vlan and associated information to the setting.  The
+ * given vlan gets sealed and a reference to it is added.
+ *
+ * Since: 1.18
+ **/
+void
+nm_setting_bridge_add_vlan (NMSettingBridge *setting,
+                            NMBridgeVlan *vlan)
+{
+	NMSettingBridgePrivate *priv;
+
+	g_return_if_fail (NM_IS_SETTING_BRIDGE (setting));
+	g_return_if_fail (vlan);
+
+	priv = NM_SETTING_BRIDGE_GET_PRIVATE (setting);
+
+	nm_bridge_vlan_seal (vlan);
+	nm_bridge_vlan_ref (vlan);
+
+	g_ptr_array_add (priv->vlans, vlan);
+	_notify (setting, PROP_VLANS);
+}
+
+/**
+ * nm_setting_bridge_get_num_vlans:
+ * @setting: the #NMSettingBridge
+ *
+ * Returns: the number of VLANs
+ *
+ * Since: 1.18
+ **/
+guint
+nm_setting_bridge_get_num_vlans (NMSettingBridge *setting)
+{
+	NMSettingBridgePrivate *priv;
+
+	g_return_val_if_fail (NM_IS_SETTING_BRIDGE (setting), 0);
+	priv = NM_SETTING_BRIDGE_GET_PRIVATE (setting);
+
+	return priv->vlans->len;
+}
+
+/**
+ * nm_setting_bridge_get_vlan:
+ * @setting: the #NMSettingBridge
+ * @idx: index number of the VLAN to return
+ *
+ * Returns: (transfer none): the VLAN at index @idx
+ *
+ * Since: 1.18
+ **/
+NMBridgeVlan *
+nm_setting_bridge_get_vlan (NMSettingBridge *setting, guint idx)
+{
+	NMSettingBridgePrivate *priv;
+
+	g_return_val_if_fail (NM_IS_SETTING_BRIDGE (setting), NULL);
+	priv = NM_SETTING_BRIDGE_GET_PRIVATE (setting);
+
+	g_return_val_if_fail (idx < priv->vlans->len, NULL);
+
+	return priv->vlans->pdata[idx];
+}
+
+/**
+ * nm_setting_bridge_remove_vlan:
+ * @setting: the #NMSettingBridge
+ * @idx: index number of the VLAN.
+ *
+ * Removes the vlan at index @idx.
+ *
+ * Since: 1.18
+ **/
+void
+nm_setting_bridge_remove_vlan (NMSettingBridge *setting, guint idx)
+{
+	NMSettingBridgePrivate *priv;
+
+	g_return_if_fail (NM_IS_SETTING_BRIDGE (setting));
+	priv = NM_SETTING_BRIDGE_GET_PRIVATE (setting);
+
+	g_return_if_fail (idx < priv->vlans->len);
+
+	g_ptr_array_remove_index (priv->vlans, idx);
+	_notify (setting, PROP_VLANS);
+}
+
+/**
+ * nm_setting_bridge_remove_vlan_by_vid:
+ * @setting: the #NMSettingBridge
+ * @vid_start: the vlan start index
+ * @vid_end: the vlan end index
+ *
+ * Remove the VLAN with range @vid_start to @vid_end.
+ * If @vid_end is zero, it is assumed to be equal to @vid_start
+ * and so the single-id VLAN with id @vid_start is removed.
+ *
+ * Returns: %TRUE if the vlan was found and removed; %FALSE otherwise
+ *
+ * Since: 1.18
+ **/
+gboolean
+nm_setting_bridge_remove_vlan_by_vid (NMSettingBridge *setting,
+                                      guint16 vid_start,
+                                      guint16 vid_end)
+{
+	NMSettingBridgePrivate *priv;
+	NMBridgeVlan *vlan;
+	guint i;
+
+	g_return_val_if_fail (NM_IS_SETTING_BRIDGE (setting), FALSE);
+	priv = NM_SETTING_BRIDGE_GET_PRIVATE (setting);
+
+	if (vid_end == 0)
+		vid_end = vid_start;
+
+	for (i = 0; i < priv->vlans->len; i++) {
+		vlan = (NMBridgeVlan *) priv->vlans->pdata[i];
+		if (vlan->vid_start == vid_start && vlan->vid_end == vid_end) {
+			g_ptr_array_remove_index (priv->vlans, i);
+			_notify (setting, PROP_VLANS);
+			return TRUE;
+		}
+	}
+	return FALSE;
+}
+
+/**
+ * nm_setting_bridge_clear_vlans:
+ * @setting: the #NMSettingBridge
+ *
+ * Removes all configured VLANs.
+ *
+ * Since: 1.18
+ **/
+void
+nm_setting_bridge_clear_vlans (NMSettingBridge *setting)
+{
+	NMSettingBridgePrivate *priv;
+
+	g_return_if_fail (NM_IS_SETTING_BRIDGE (setting));
+	priv = NM_SETTING_BRIDGE_GET_PRIVATE (setting);
+
+	if (priv->vlans->len != 0) {
+		g_ptr_array_set_size (priv->vlans, 0);
+		_notify (setting, PROP_VLANS);
+	}
+}
+
+/*****************************************************************************/
+
 static gboolean
 check_range (guint32 val,
              guint32 min,
@@ -278,7 +972,59 @@ verify (NMSetting *setting, NMConnection *connection, GError **error)
 		return FALSE;
 	}
 
-	return _nm_connection_verify_required_interface_name (connection, error);
+	if (!_nm_connection_verify_required_interface_name (connection, error))
+		return FALSE;
+
+	if (!_nm_utils_bridge_vlan_verify_list (priv->vlans,
+	                                        FALSE,
+	                                        error,
+	                                        NM_SETTING_BRIDGE_SETTING_NAME,
+	                                        NM_SETTING_BRIDGE_VLANS))
+		return FALSE;
+
+	/* Failures from here on are NORMALIZABLE... */
+
+	if (!_nm_utils_bridge_vlan_verify_list (priv->vlans,
+	                                        TRUE,
+	                                        error,
+	                                        NM_SETTING_BRIDGE_SETTING_NAME,
+	                                        NM_SETTING_BRIDGE_VLANS))
+		return NM_SETTING_VERIFY_NORMALIZABLE;
+
+	return TRUE;
+}
+
+static NMTernary
+compare_property (const NMSettInfoSetting *sett_info,
+                  guint property_idx,
+                  NMSetting *setting,
+                  NMSetting *other,
+                  NMSettingCompareFlags flags)
+{
+	NMSettingBridgePrivate *priv_a;
+	NMSettingBridgePrivate *priv_b;
+	guint i;
+
+	if (nm_streq (sett_info->property_infos[property_idx].name, NM_SETTING_BRIDGE_VLANS)) {
+		if (other) {
+			priv_a = NM_SETTING_BRIDGE_GET_PRIVATE (setting);
+			priv_b = NM_SETTING_BRIDGE_GET_PRIVATE (other);
+
+			if (priv_a->vlans->len != priv_b->vlans->len)
+				return FALSE;
+			for (i = 0; i < priv_a->vlans->len; i++) {
+				if (nm_bridge_vlan_cmp (priv_a->vlans->pdata[i], priv_b->vlans->pdata[i]))
+					return FALSE;
+			}
+		}
+		return TRUE;
+	}
+
+	return NM_SETTING_CLASS (nm_setting_bridge_parent_class)->compare_property (sett_info,
+	                                                                            property_idx,
+	                                                                            setting,
+	                                                                            other,
+	                                                                            flags);
 }
 
 /*****************************************************************************/
@@ -318,6 +1064,17 @@ get_property (GObject *object, guint prop_id,
 	case PROP_MULTICAST_SNOOPING:
 		g_value_set_boolean (value, priv->multicast_snooping);
 		break;
+	case PROP_VLAN_FILTERING:
+		g_value_set_boolean (value, priv->vlan_filtering);
+		break;
+	case PROP_VLAN_DEFAULT_PVID:
+		g_value_set_uint (value, priv->vlan_default_pvid);
+		break;
+	case PROP_VLANS:
+		g_value_take_boxed (value, _nm_utils_copy_array (priv->vlans,
+		                                                 (NMUtilsCopyFunc) nm_bridge_vlan_ref,
+		                                                 (GDestroyNotify) nm_bridge_vlan_unref));
+		break;
 	default:
 		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
 		break;
@@ -360,6 +1117,18 @@ set_property (GObject *object, guint prop_id,
 	case PROP_MULTICAST_SNOOPING:
 		priv->multicast_snooping = g_value_get_boolean (value);
 		break;
+	case PROP_VLAN_FILTERING:
+		priv->vlan_filtering = g_value_get_boolean (value);
+		break;
+	case PROP_VLAN_DEFAULT_PVID:
+		priv->vlan_default_pvid = g_value_get_uint (value);
+		break;
+	case PROP_VLANS:
+		g_ptr_array_unref (priv->vlans);
+		priv->vlans = _nm_utils_copy_array (g_value_get_boxed (value),
+		                                    (NMUtilsCopyFunc) _nm_bridge_vlan_dup_and_seal,
+		                                    (GDestroyNotify) nm_bridge_vlan_unref);
+		break;
 	default:
 		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
 		break;
@@ -371,6 +1140,9 @@ set_property (GObject *object, guint prop_id,
 static void
 nm_setting_bridge_init (NMSettingBridge *setting)
 {
+	NMSettingBridgePrivate *priv = NM_SETTING_BRIDGE_GET_PRIVATE (setting);
+
+	priv->vlans = g_ptr_array_new_with_free_func ((GDestroyNotify) nm_bridge_vlan_unref);
 }
 
 /**
@@ -392,6 +1164,7 @@ finalize (GObject *object)
 	NMSettingBridgePrivate *priv = NM_SETTING_BRIDGE_GET_PRIVATE (object);
 
 	g_free (priv->mac_address);
+	g_ptr_array_unref (priv->vlans);
 
 	G_OBJECT_CLASS (nm_setting_bridge_parent_class)->finalize (object);
 }
@@ -409,6 +1182,7 @@ nm_setting_bridge_class_init (NMSettingBridgeClass *klass)
 	object_class->set_property = set_property;
 	object_class->finalize     = finalize;
 
+	setting_class->compare_property = compare_property;
 	setting_class->verify = verify;
 
 	/**
@@ -627,6 +1401,91 @@ nm_setting_bridge_class_init (NMSettingBridgeClass *klass)
 	                          NM_SETTING_PARAM_INFERRABLE |
 	                          G_PARAM_STATIC_STRINGS);
 
+	/**
+	 * NMSettingBridge:vlan-filtering:
+	 *
+	 * Control whether VLAN filtering is enabled on the bridge.
+	 *
+	 * Since: 1.18
+	 **/
+	/* ---ifcfg-rh---
+	 * property: vlan-filtering
+	 * variable: BRIDGING_OPTS: vlan_filtering=
+	 * values: 0 or 1
+	 * default: 0
+	 * description: VLAN filtering support.
+	 * ---end---
+	 */
+	obj_properties[PROP_VLAN_FILTERING] =
+	    g_param_spec_boolean (NM_SETTING_BRIDGE_VLAN_FILTERING, "", "",
+	                          FALSE,
+	                          G_PARAM_READWRITE |
+	                          G_PARAM_CONSTRUCT |
+	                          NM_SETTING_PARAM_INFERRABLE |
+	                          G_PARAM_STATIC_STRINGS);
+
+	/**
+	 * NMSettingBridge:vlan-default-pvid:
+	 *
+	 * The default PVID for the ports of the bridge, that is the VLAN id
+	 * assigned to incoming untagged frames.
+	 *
+	 * Since: 1.18
+	 **/
+	/* ---ifcfg-rh---
+	 * property: vlan-default-pvid
+	 * variable: BRIDGING_OPTS: default_pvid=
+	 * values: 0 - 4094
+	 * default: 1
+	 * description: default VLAN PVID.
+	 * ---end---
+	 */
+	obj_properties[PROP_VLAN_DEFAULT_PVID] =
+	    g_param_spec_uint (NM_SETTING_BRIDGE_VLAN_DEFAULT_PVID, "", "",
+	                       0, NM_BRIDGE_VLAN_VID_MAX, 1,
+	                       G_PARAM_READWRITE |
+	                       G_PARAM_CONSTRUCT |
+	                       NM_SETTING_PARAM_INFERRABLE |
+	                       G_PARAM_STATIC_STRINGS);
+
+	/**
+	 * NMSettingBridge:vlans: (type GPtrArray(NMBridgeVlan))
+	 *
+	 * Array of bridge VLAN objects. In addition to the VLANs
+	 * specified here, the bridge will also have the default-pvid
+	 * VLAN configured  by the bridge.vlan-default-pvid property.
+	 *
+	 * In nmcli the VLAN list can be specified with the following
+	 * syntax:
+	 *
+	 *  $vid [pvid] [untagged] [, $vid [pvid] [untagged]]...
+	 *
+	 * where $vid is either a single id between 1 and 4094 or a
+	 * range, represented as a couple of ids separated by a dash.
+	 *
+	 * Since: 1.18
+	 **/
+	/* ---ifcfg-rh---
+	 * property: vlans
+	 * variable: BRIDGE_VLANS
+	 * description: List of VLANs on the bridge
+	 * example: BRIDGE_VLANS="1 pvid untagged,20,300-400 untagged"
+	 * ---end---
+	 */
+	obj_properties[PROP_VLANS] =
+	    g_param_spec_boxed (NM_SETTING_BRIDGE_VLANS, "", "",
+	                        G_TYPE_PTR_ARRAY,
+	                        G_PARAM_READWRITE |
+	                        NM_SETTING_PARAM_INFERRABLE |
+	                        G_PARAM_STATIC_STRINGS);
+
+	_properties_override_add_override (properties_override,
+	                                   obj_properties[PROP_VLANS],
+	                                   G_VARIANT_TYPE ("aa{sv}"),
+	                                   _nm_utils_bridge_vlans_to_dbus,
+	                                   _nm_utils_bridge_vlans_from_dbus,
+	                                   NULL);
+
 	/* ---dbus---
 	 * property: interface-name
 	 * format: string
diff --git a/libnm-core/nm-setting-bridge.h b/libnm-core/nm-setting-bridge.h
index d640dde3..c01ab35c 100644
--- a/libnm-core/nm-setting-bridge.h
+++ b/libnm-core/nm-setting-bridge.h
@@ -48,6 +48,12 @@ G_BEGIN_DECLS
 #define NM_SETTING_BRIDGE_AGEING_TIME    "ageing-time"
 #define NM_SETTING_BRIDGE_GROUP_FORWARD_MASK "group-forward-mask"
 #define NM_SETTING_BRIDGE_MULTICAST_SNOOPING "multicast-snooping"
+#define NM_SETTING_BRIDGE_VLAN_FILTERING     "vlan-filtering"
+#define NM_SETTING_BRIDGE_VLAN_DEFAULT_PVID  "vlan-default-pvid"
+#define NM_SETTING_BRIDGE_VLANS              "vlans"
+
+#define NM_BRIDGE_VLAN_VID_MIN            1
+#define NM_BRIDGE_VLAN_VID_MAX            4094
 
 /**
  * NMSettingBridge:
@@ -65,6 +71,8 @@ typedef struct {
 	gpointer padding[4];
 } NMSettingBridgeClass;
 
+typedef struct _NMBridgeVlan NMBridgeVlan;
+
 GType nm_setting_bridge_get_type (void);
 
 NMSetting *  nm_setting_bridge_new                (void);
@@ -86,6 +94,57 @@ NM_AVAILABLE_IN_1_10
 guint16      nm_setting_bridge_get_group_forward_mask (NMSettingBridge *setting);
 
 gboolean     nm_setting_bridge_get_multicast_snooping (NMSettingBridge *setting);
+NM_AVAILABLE_IN_1_18
+gboolean     nm_setting_bridge_get_vlan_filtering (NMSettingBridge *setting);
+NM_AVAILABLE_IN_1_18
+guint16      nm_setting_bridge_get_vlan_default_pvid (NMSettingBridge *setting);
+NM_AVAILABLE_IN_1_18
+void          nm_setting_bridge_add_vlan (NMSettingBridge *setting,
+                                          NMBridgeVlan *vlan);
+NM_AVAILABLE_IN_1_18
+guint         nm_setting_bridge_get_num_vlans (NMSettingBridge *setting);
+NM_AVAILABLE_IN_1_18
+NMBridgeVlan *nm_setting_bridge_get_vlan (NMSettingBridge *setting, guint idx);
+NM_AVAILABLE_IN_1_18
+void          nm_setting_bridge_remove_vlan (NMSettingBridge *setting, guint idx);
+NM_AVAILABLE_IN_1_18
+gboolean      nm_setting_bridge_remove_vlan_by_vid (NMSettingBridge *setting,
+                                                    guint16 vid_start,
+                                                    guint16 vid_end);
+NM_AVAILABLE_IN_1_18
+void          nm_setting_bridge_clear_vlans (NMSettingBridge *setting);
+
+NM_AVAILABLE_IN_1_18
+GType          nm_bridge_vlan_get_type (void);
+NM_AVAILABLE_IN_1_18
+NMBridgeVlan * nm_bridge_vlan_new (guint16 vid_start, guint16 vid_end);
+NM_AVAILABLE_IN_1_18
+NMBridgeVlan * nm_bridge_vlan_ref (NMBridgeVlan *vlan);
+NM_AVAILABLE_IN_1_18
+void           nm_bridge_vlan_unref (NMBridgeVlan *vlan);
+NM_AVAILABLE_IN_1_18
+NMBridgeVlan * nm_bridge_vlan_new_clone (const NMBridgeVlan *vlan);
+NM_AVAILABLE_IN_1_18
+int            nm_bridge_vlan_cmp (const NMBridgeVlan *a, const NMBridgeVlan *b);
+NM_AVAILABLE_IN_1_18
+void           nm_bridge_vlan_seal (NMBridgeVlan *vlan);
+NM_AVAILABLE_IN_1_18
+gboolean       nm_bridge_vlan_is_sealed (const NMBridgeVlan *vlan);
+NM_AVAILABLE_IN_1_18
+void           nm_bridge_vlan_set_untagged (NMBridgeVlan *vlan, gboolean value);
+NM_AVAILABLE_IN_1_18
+void           nm_bridge_vlan_set_pvid (NMBridgeVlan *vlan, gboolean value);
+NM_AVAILABLE_IN_1_18
+gboolean       nm_bridge_vlan_get_vid_range (const NMBridgeVlan *vlan, guint16 *vid_start, guint16 *vid_end);
+NM_AVAILABLE_IN_1_18
+gboolean       nm_bridge_vlan_is_untagged (const NMBridgeVlan *vlan);
+NM_AVAILABLE_IN_1_18
+gboolean       nm_bridge_vlan_is_pvid (const NMBridgeVlan *vlan);
+
+NM_AVAILABLE_IN_1_18
+char         * nm_bridge_vlan_to_str (const NMBridgeVlan *vlan, GError **error);
+NM_AVAILABLE_IN_1_18
+NMBridgeVlan * nm_bridge_vlan_from_str (const char *str, GError **error);
 
 G_END_DECLS
 
diff --git a/libnm-core/nm-setting-connection.c b/libnm-core/nm-setting-connection.c
index e8d008e3..e4fb70c2 100644
--- a/libnm-core/nm-setting-connection.c
+++ b/libnm-core/nm-setting-connection.c
@@ -397,8 +397,7 @@ nm_setting_connection_add_permission (NMSettingConnection *setting,
 	GSList *iter;
 
 	g_return_val_if_fail (NM_IS_SETTING_CONNECTION (setting), FALSE);
-	g_return_val_if_fail (ptype, FALSE);
-	g_return_val_if_fail (strlen (ptype) > 0, FALSE);
+	g_return_val_if_fail (ptype && ptype[0], FALSE);
 	g_return_val_if_fail (detail == NULL, FALSE);
 
 	/* Only "user" for now... */
@@ -470,9 +469,9 @@ nm_setting_connection_remove_permission_by_value (NMSettingConnection *setting,
 	GSList *iter;
 
 	g_return_val_if_fail (NM_IS_SETTING_CONNECTION (setting), FALSE);
-	g_return_val_if_fail (ptype, FALSE);
-	g_return_val_if_fail (strlen (ptype) > 0, FALSE);
+	g_return_val_if_fail (ptype && ptype[0], FALSE);
 	g_return_val_if_fail (detail == NULL, FALSE);
+	g_return_val_if_fail (pitem != NULL, FALSE);
 
 	/* Only "user" for now... */
 	g_return_val_if_fail (strcmp (ptype, "user") == 0, FALSE);
diff --git a/libnm-core/nm-setting-ethtool.c b/libnm-core/nm-setting-ethtool.c
index 7bdbcb1a..827e3a62 100644
--- a/libnm-core/nm-setting-ethtool.c
+++ b/libnm-core/nm-setting-ethtool.c
@@ -24,7 +24,7 @@
 #include "nm-setting-ethtool.h"
 
 #include "nm-setting-private.h"
-#include "nm-ethtool-utils.h"
+#include "nm-libnm-core-intern/nm-ethtool-utils.h"
 
 /*****************************************************************************/
 
diff --git a/libnm-core/nm-setting-infiniband.c b/libnm-core/nm-setting-infiniband.c
index 9348fa2b..bde7eda9 100644
--- a/libnm-core/nm-setting-infiniband.c
+++ b/libnm-core/nm-setting-infiniband.c
@@ -170,7 +170,6 @@ verify (NMSetting *setting, NMConnection *connection, GError **error)
 {
 	NMSettingConnection *s_con = NULL;
 	NMSettingInfinibandPrivate *priv = NM_SETTING_INFINIBAND_GET_PRIVATE (setting);
-	guint32 normerr_max_mtu = 0;
 
 	if (priv->mac_address && !nm_utils_hwaddr_valid (priv->mac_address, INFINIBAND_ALEN)) {
 		g_set_error_literal (error,
@@ -181,13 +180,8 @@ verify (NMSetting *setting, NMConnection *connection, GError **error)
 		return FALSE;
 	}
 
-	if (!g_strcmp0 (priv->transport_mode, "datagram")) {
-		if (priv->mtu > 2044)
-			normerr_max_mtu = 2044;
-	} else if (!g_strcmp0 (priv->transport_mode, "connected")) {
-		if (priv->mtu > 65520)
-			normerr_max_mtu = 65520;
-	} else {
+	if (!NM_IN_STRSET (priv->transport_mode, "datagram",
+	                                         "connected")) {
 		g_set_error_literal (error,
 		                     NM_CONNECTION_ERROR,
 		                     NM_CONNECTION_ERROR_INVALID_PROPERTY,
@@ -271,12 +265,21 @@ verify (NMSetting *setting, NMConnection *connection, GError **error)
 
 	/* *** errors above here should be always fatal, below NORMALIZABLE_ERROR *** */
 
-	if (normerr_max_mtu > 0) {
+	if (priv->mtu > NM_INFINIBAND_MAX_MTU) {
+		/* Traditionally, MTU for "datagram" mode was limited to 2044
+		 * and for "connected" mode it was 65520.
+		 *
+		 * This is no longer the case, and both transport modes use the same
+		 * maximum of 65520 (NM_INFINIBAND_MAX_MTU).
+		 *
+		 * Note that this is the MTU in the connection profile. Whether
+		 * we will be able to configure large MTUs later (during activation)
+		 * is unknown at this point. */
 		g_set_error (error,
 		             NM_CONNECTION_ERROR,
 		             NM_CONNECTION_ERROR_INVALID_PROPERTY,
-		             _("mtu for transport mode '%s' can be at most %d but it is %d"),
-		             priv->transport_mode, normerr_max_mtu, priv->mtu);
+		             _("mtu can be at most %u but it is %u"),
+		             NM_INFINIBAND_MAX_MTU, priv->mtu);
 		g_prefix_error (error, "%s.%s: ", NM_SETTING_INFINIBAND_SETTING_NAME, NM_SETTING_INFINIBAND_MTU);
 		return NM_SETTING_VERIFY_NORMALIZABLE_ERROR;
 	}
diff --git a/libnm-core/nm-setting-ip-config.c b/libnm-core/nm-setting-ip-config.c
index 5250ae43..f362945f 100644
--- a/libnm-core/nm-setting-ip-config.c
+++ b/libnm-core/nm-setting-ip-config.c
@@ -25,6 +25,7 @@
 #include "nm-setting-ip-config.h"
 
 #include <arpa/inet.h>
+#include <linux/fib_rules.h>
 
 #include "nm-setting-ip4-config.h"
 #include "nm-setting-ip6-config.h"
@@ -204,7 +205,8 @@ struct NMIPAddress {
  **/
 NMIPAddress *
 nm_ip_address_new (int family,
-                   const char *addr, guint prefix,
+                   const char *addr,
+                   guint prefix,
                    GError **error)
 {
 	NMIPAddress *address;
@@ -242,7 +244,8 @@ nm_ip_address_new (int family,
  **/
 NMIPAddress *
 nm_ip_address_new_binary (int family,
-                          gconstpointer addr, guint prefix,
+                          gconstpointer addr,
+                          guint prefix,
                           GError **error)
 {
 	NMIPAddress *address;
@@ -1113,7 +1116,7 @@ nm_ip_route_set_metric (NMIPRoute *route,
 }
 
 GHashTable *
-_nm_ip_route_get_attributes_direct (NMIPRoute *route)
+_nm_ip_route_get_attributes (NMIPRoute *route)
 {
 	nm_assert (route);
 
@@ -1217,7 +1220,7 @@ static const NMVariantAttributeSpec * const ip_route_attribute_spec[] = {
 	ATTR_SPEC_PTR (NM_IP_ROUTE_ATTRIBUTE_SRC,             G_VARIANT_TYPE_STRING,   TRUE,  TRUE, 'a'),
 	ATTR_SPEC_PTR (NM_IP_ROUTE_ATTRIBUTE_FROM,            G_VARIANT_TYPE_STRING,   FALSE, TRUE, 'p'),
 	ATTR_SPEC_PTR (NM_IP_ROUTE_ATTRIBUTE_TOS,             G_VARIANT_TYPE_BYTE,     TRUE,  FALSE, 0 ),
-	ATTR_SPEC_PTR (NM_IP_ROUTE_ATTRIBUTE_ONLINK,          G_VARIANT_TYPE_BOOLEAN,  TRUE,  FALSE, 0 ),
+	ATTR_SPEC_PTR (NM_IP_ROUTE_ATTRIBUTE_ONLINK,          G_VARIANT_TYPE_BOOLEAN,  TRUE,  TRUE,  0 ),
 	ATTR_SPEC_PTR (NM_IP_ROUTE_ATTRIBUTE_WINDOW,          G_VARIANT_TYPE_UINT32,   TRUE,  TRUE,  0 ),
 	ATTR_SPEC_PTR (NM_IP_ROUTE_ATTRIBUTE_CWND,            G_VARIANT_TYPE_UINT32,   TRUE,  TRUE,  0 ),
 	ATTR_SPEC_PTR (NM_IP_ROUTE_ATTRIBUTE_INITCWND,        G_VARIANT_TYPE_UINT32,   TRUE,  TRUE,  0 ),
@@ -1384,6 +1387,2109 @@ _nm_ip_route_attribute_validate_all (const NMIPRoute *route)
 
 /*****************************************************************************/
 
+struct NMIPRoutingRule {
+	NMIPAddr from_bin;
+	NMIPAddr to_bin;
+	char *from_str;
+	char *to_str;
+	char *iifname;
+	char *oifname;
+	guint ref_count;
+	guint32 priority;
+	guint32 table;
+	guint32 fwmark;
+	guint32 fwmask;
+	guint16 sport_start;
+	guint16 sport_end;
+	guint16 dport_start;
+	guint16 dport_end;
+	guint8 action;
+	guint8 from_len;
+	guint8 to_len;
+	guint8 tos;
+	guint8 ipproto;
+	bool is_v4:1;
+	bool sealed:1;
+	bool priority_has:1;
+	bool from_has:1;
+	bool from_valid:1;
+	bool to_has:1;
+	bool to_valid:1;
+	bool invert:1;
+};
+
+static NMIPRoutingRule *_ip_routing_rule_dup (const NMIPRoutingRule *rule);
+
+G_DEFINE_BOXED_TYPE (NMIPRoutingRule, nm_ip_routing_rule, _ip_routing_rule_dup, nm_ip_routing_rule_unref)
+
+static gboolean
+NM_IS_IP_ROUTING_RULE (const NMIPRoutingRule *self,
+                       gboolean also_sealed)
+{
+	return    self
+	       && self->ref_count > 0
+	       && (   also_sealed
+	           || !self->sealed);
+}
+
+static int
+_ip_routing_rule_get_addr_family (const NMIPRoutingRule *self)
+{
+	nm_assert (NM_IS_IP_ROUTING_RULE (self, TRUE));
+
+	return self->is_v4 ? AF_INET : AF_INET6;
+}
+
+static int
+_ip_routing_rule_get_addr_size (const NMIPRoutingRule *self)
+{
+	nm_assert (NM_IS_IP_ROUTING_RULE (self, TRUE));
+
+	return self->is_v4 ? sizeof (struct in_addr) : sizeof (struct in6_addr);
+}
+
+static NMIPRoutingRule *
+_ip_routing_rule_dup (const NMIPRoutingRule *rule)
+{
+	g_return_val_if_fail (NM_IS_IP_ROUTING_RULE (rule, TRUE), NULL);
+
+	if (rule->sealed)
+		return nm_ip_routing_rule_ref ((NMIPRoutingRule *) rule);
+	return nm_ip_routing_rule_new_clone (rule);
+}
+
+/**
+ * nm_ip_routing_rule_new:
+ * @addr_family: the address family of the routing rule. Must be either
+ *   %AF_INET (2) or %AF_INET6 (10).
+ *
+ * Returns: (transfer full): a newly created rule instance with the
+ *   provided address family. The instance is unsealed.
+ *
+ * Since: 1.18
+ */
+NMIPRoutingRule *
+nm_ip_routing_rule_new (int addr_family)
+{
+	NMIPRoutingRule *self;
+
+	g_return_val_if_fail (NM_IN_SET (addr_family, AF_INET, AF_INET6), NULL);
+
+	self = g_slice_new (NMIPRoutingRule);
+	*self = (NMIPRoutingRule) {
+		.ref_count    = 1,
+		.is_v4        = (addr_family == AF_INET),
+		.action       = FR_ACT_TO_TBL,
+		.table        = RT_TABLE_MAIN,
+	};
+	return self;
+}
+
+/**
+ * nm_ip_routing_rule_new_clone:
+ * @rule: the #NMIPRoutingRule to clone.
+ *
+ * Returns: (transfer full): a newly created rule instance with
+ *   the same settings as @rule. Note that the instance will
+ *   always be unsealred.
+ *
+ * Since: 1.18
+ */
+NMIPRoutingRule *
+nm_ip_routing_rule_new_clone (const NMIPRoutingRule *rule)
+{
+	NMIPRoutingRule *self;
+
+	g_return_val_if_fail (NM_IS_IP_ROUTING_RULE (rule, TRUE), NULL);
+
+	self = g_slice_new (NMIPRoutingRule);
+	*self = (NMIPRoutingRule) {
+		.ref_count    = 1,
+		.sealed       = FALSE,
+		.is_v4        = rule->is_v4,
+
+		.priority     = rule->priority,
+		.priority_has = rule->priority_has,
+
+		.invert       = rule->invert,
+
+		.tos          = rule->tos,
+
+		.fwmark       = rule->fwmark,
+		.fwmask       = rule->fwmask,
+
+		.sport_start  = rule->sport_start,
+		.sport_end    = rule->sport_end,
+		.dport_start  = rule->dport_start,
+		.dport_end    = rule->dport_end,
+
+		.ipproto      = rule->ipproto,
+
+		.from_len     = rule->from_len,
+		.from_bin     = rule->from_bin,
+		.from_str     =   (   rule->from_has
+		                   && !rule->from_valid)
+		                ? g_strdup (rule->from_str)
+		                : NULL,
+		.from_has     = rule->from_has,
+		.from_valid   = rule->from_valid,
+
+		.to_len       = rule->to_len,
+		.to_bin       = rule->to_bin,
+		.to_str       =   (   rule->to_has
+		                   && !rule->to_valid)
+		                ? g_strdup (rule->to_str)
+		                : NULL,
+		.to_has       = rule->to_has,
+		.to_valid     = rule->to_valid,
+
+		.iifname      = g_strdup (rule->iifname),
+		.oifname      = g_strdup (rule->oifname),
+
+		.action       = rule->action,
+		.table        = rule->table,
+	};
+	return self;
+}
+
+/**
+ * nm_ip_routing_rule_ref:
+ * @self: (allow-none): the #NMIPRoutingRule instance
+ *
+ * Increases the reference count of the instance.
+ * This is not thread-safe.
+ *
+ * Returns: (transfer full): the @self argument with incremented
+ *  reference count.
+ *
+ * Since: 1.18
+ */
+NMIPRoutingRule *
+nm_ip_routing_rule_ref (NMIPRoutingRule *self)
+{
+	if (!self)
+		return NULL;
+
+	g_return_val_if_fail (NM_IS_IP_ROUTING_RULE (self, TRUE), NULL);
+
+	nm_assert (self->ref_count < G_MAXUINT);
+	self->ref_count++;
+	return self;
+}
+
+/**
+ * nm_ip_routing_rule_unref:
+ * @self: (allow-none): the #NMIPRoutingRule instance
+ *
+ * Decreases the reference count of the instance and destroys
+ * the instance if the reference count reaches zero.
+ * This is not thread-safe.
+ *
+ * Since: 1.18
+ */
+void
+nm_ip_routing_rule_unref (NMIPRoutingRule *self)
+{
+	if (!self)
+		return;
+
+	g_return_if_fail (NM_IS_IP_ROUTING_RULE (self, TRUE));
+
+	if (--self->ref_count > 0)
+		return;
+
+	g_free (self->from_str);
+	g_free (self->to_str);
+	g_free (self->iifname);
+	g_free (self->oifname);
+
+	g_slice_free (NMIPRoutingRule, self);
+}
+
+/**
+ * nm_ip_routing_rule_is_sealed:
+ * @self: the #NMIPRoutingRule instance
+ *
+ * Returns: whether @self is sealed. Once sealed, an instance
+ *   cannot be modified nor unsealed.
+ *
+ * Since: 1.18
+ */
+gboolean
+nm_ip_routing_rule_is_sealed (const NMIPRoutingRule *self)
+{
+	g_return_val_if_fail (NM_IS_IP_ROUTING_RULE (self, TRUE), FALSE);
+
+	return self->sealed;
+}
+
+/**
+ * nm_ip_routing_rule_seal:
+ * @self: the #NMIPRoutingRule instance
+ *
+ * Seals the routing rule. Afterwards, the instance can no longer be
+ * modfied, and it is a bug to call any of the accessors that would
+ * modify the rule. If @self was already sealed, this has no effect.
+ *
+ * Since: 1.18
+ */
+void
+nm_ip_routing_rule_seal (NMIPRoutingRule *self)
+{
+	g_return_if_fail (NM_IS_IP_ROUTING_RULE (self, TRUE));
+
+	self->sealed = TRUE;
+}
+
+/**
+ * nm_ip_routing_rule_get_addr_family:
+ * @self: the #NMIPRoutingRule instance
+ *
+ * Returns: the address family of the rule. Either %AF_INET or %AF_INET6.
+ *
+ * Since: 1.18
+ */
+int
+nm_ip_routing_rule_get_addr_family (const NMIPRoutingRule *self)
+{
+	g_return_val_if_fail (NM_IS_IP_ROUTING_RULE (self, TRUE), AF_UNSPEC);
+
+	return _ip_routing_rule_get_addr_family (self);
+}
+
+/**
+ * nm_ip_routing_rule_get_priority:
+ * @self: the #NMIPRoutingRule instance
+ *
+ * Returns: the priority. A valid priority is in the range from
+ *   0 to %G_MAXUINT32. If unset, -1 is returned.
+ *
+ * Since: 1.18
+ */
+gint64
+nm_ip_routing_rule_get_priority (const NMIPRoutingRule *self)
+{
+	g_return_val_if_fail (NM_IS_IP_ROUTING_RULE (self, TRUE), -1);
+
+	return   self->priority_has
+	       ? (gint64) self->priority
+	       : (gint64) -1;
+}
+
+/**
+ * nm_ip_routing_rule_set_priority:
+ * @self: the #NMIPRoutingRule instance
+ * @priority: the priority to set
+ *
+ * A valid priority ranges from 0 to %G_MAXUINT32. "-1" is also allowed
+ * to reset the priority. It is a bug calling this function with any
+ * other value.
+ *
+ * Since: 1.18
+ */
+void
+nm_ip_routing_rule_set_priority (NMIPRoutingRule *self, gint64 priority)
+{
+	g_return_if_fail (NM_IS_IP_ROUTING_RULE (self, FALSE));
+
+	if (   priority >= 0
+	    && priority <= (gint64) G_MAXUINT32) {
+		self->priority = (guint32) priority;
+		self->priority_has = TRUE;
+	} else {
+		g_return_if_fail (priority == -1);
+		self->priority = 0;
+		self->priority_has = FALSE;
+	}
+}
+
+/**
+ * nm_ip_routing_rule_get_invert:
+ * @self: the #NMIPRoutingRule instance
+ *
+ * Returns: the "invert" setting of the rule.
+ *
+ * Since: 1.18
+ */
+gboolean
+nm_ip_routing_rule_get_invert (const NMIPRoutingRule *self)
+{
+	g_return_val_if_fail (NM_IS_IP_ROUTING_RULE (self, TRUE), FALSE);
+
+	return self->invert;
+}
+
+/**
+ * nm_ip_routing_rule_set_invert:
+ * @self: the #NMIPRoutingRule instance
+ * @invert: the new value to set
+ *
+ * Since: 1.18
+ */
+void
+nm_ip_routing_rule_set_invert (NMIPRoutingRule *self, gboolean invert)
+{
+	g_return_if_fail (NM_IS_IP_ROUTING_RULE (self, FALSE));
+
+	self->invert = invert;
+}
+
+/**
+ * nm_ip_routing_rule_get_from_len:
+ * @self: the #NMIPRoutingRule instance
+ *
+ * Returns: the set prefix length for the from/src parameter.
+ *
+ * Since: 1.18
+ */
+guint8
+nm_ip_routing_rule_get_from_len (const NMIPRoutingRule *self)
+{
+	g_return_val_if_fail (NM_IS_IP_ROUTING_RULE (self, TRUE), 0);
+
+	return self->from_len;
+}
+
+/**
+ * nm_ip_routing_rule_get_from:
+ * @self: the #NMIPRoutingRule instance
+ *
+ * Returns: (transfer none): the set from/src parameter or
+ *   %NULL, if no value is set.
+ *
+ * Since: 1.18
+ */
+const char *
+nm_ip_routing_rule_get_from (const NMIPRoutingRule *self)
+{
+	g_return_val_if_fail (NM_IS_IP_ROUTING_RULE (self, TRUE), NULL);
+
+	if (!self->from_has)
+		return NULL;
+	if (!self->from_str) {
+		nm_assert (self->from_valid);
+		((NMIPRoutingRule *) self)->from_str = nm_utils_inet_ntop_dup (_ip_routing_rule_get_addr_family (self),
+		                                                               &self->from_bin);
+	}
+	return self->from_str;
+}
+
+const NMIPAddr *
+nm_ip_routing_rule_get_from_bin (const NMIPRoutingRule *self)
+{
+	g_return_val_if_fail (NM_IS_IP_ROUTING_RULE (self, TRUE), NULL);
+
+	return   (   self->from_has
+	          && self->from_valid)
+	       ? &self->from_bin
+	       : NULL;
+}
+
+void
+nm_ip_routing_rule_set_from_bin (NMIPRoutingRule *self,
+                                 gconstpointer from,
+                                 guint8 len)
+{
+	g_return_if_fail (NM_IS_IP_ROUTING_RULE (self, FALSE));
+
+	nm_clear_g_free (&self->from_str);
+
+	if (!from) {
+		self->from_has = FALSE;
+		self->from_len = len;
+		return;
+	}
+
+	self->from_has = TRUE;
+	self->from_len = len;
+	self->from_valid = TRUE;
+	nm_ip_addr_set (_ip_routing_rule_get_addr_family (self),
+	                &self->from_bin,
+	                from);
+}
+
+/**
+ * nm_ip_routing_rule_set_from:
+ * @self: the #NMIPRoutingRule instance
+ * @from: (allow-none): the from/src address to set.
+ *   The address family must match.
+ * @len: the corresponding prefix length of the address.
+ *
+ * Setting invalid values is accepted, but will later fail
+ * during nm_ip_routing_rule_validate().
+ *
+ * Since: 1.18
+ */
+void
+nm_ip_routing_rule_set_from (NMIPRoutingRule *self,
+                             const char *from,
+                             guint8 len)
+{
+	g_return_if_fail (NM_IS_IP_ROUTING_RULE (self, FALSE));
+
+	if (!from) {
+		nm_clear_g_free (&self->from_str);
+		self->from_has = FALSE;
+		self->from_len = len;
+		return;
+	}
+
+	nm_clear_g_free (&self->from_str);
+	self->from_has = TRUE;
+	self->from_len = len;
+	self->from_valid = nm_utils_parse_inaddr_bin (_ip_routing_rule_get_addr_family (self),
+	                                              from,
+	                                              NULL,
+	                                              &self->from_bin);
+	if (!self->from_valid)
+		self->from_str = g_strdup (from);
+}
+
+/**
+ * nm_ip_routing_rule_get_to_len:
+ * @self: the #NMIPRoutingRule instance
+ *
+ * Returns: the set prefix length for the to/dst parameter.
+ *
+ * Since: 1.18
+ */
+guint8
+nm_ip_routing_rule_get_to_len (const NMIPRoutingRule *self)
+{
+	g_return_val_if_fail (NM_IS_IP_ROUTING_RULE (self, TRUE), 0);
+
+	return self->to_len;
+}
+
+/**
+ * nm_ip_routing_rule_get_to:
+ * @self: the #NMIPRoutingRule instance
+ *
+ * Returns: (transfer none): the set to/dst parameter or
+ *   %NULL, if no value is set.
+ *
+ * Since: 1.18
+ */
+const char *
+nm_ip_routing_rule_get_to (const NMIPRoutingRule *self)
+{
+	g_return_val_if_fail (NM_IS_IP_ROUTING_RULE (self, TRUE), NULL);
+
+	if (!self->to_has)
+		return NULL;
+	if (!self->to_str) {
+		nm_assert (self->to_valid);
+		((NMIPRoutingRule *) self)->to_str = nm_utils_inet_ntop_dup (_ip_routing_rule_get_addr_family (self),
+		                                                             &self->to_bin);
+	}
+	return self->to_str;
+}
+
+const NMIPAddr *
+nm_ip_routing_rule_get_to_bin (const NMIPRoutingRule *self)
+{
+	g_return_val_if_fail (NM_IS_IP_ROUTING_RULE (self, TRUE), NULL);
+
+	return   (   self->to_has
+	          && self->to_valid)
+	       ? &self->to_bin
+	       : NULL;
+}
+
+void
+nm_ip_routing_rule_set_to_bin (NMIPRoutingRule *self,
+                               gconstpointer to,
+                               guint8 len)
+{
+	g_return_if_fail (NM_IS_IP_ROUTING_RULE (self, FALSE));
+
+	nm_clear_g_free (&self->to_str);
+
+	if (!to) {
+		self->to_has = FALSE;
+		self->to_len = len;
+		return;
+	}
+
+	self->to_has = TRUE;
+	self->to_len = len;
+	self->to_valid = TRUE;
+	nm_ip_addr_set (_ip_routing_rule_get_addr_family (self),
+	                &self->to_bin,
+	                to);
+}
+
+/**
+ * nm_ip_routing_rule_set_to:
+ * @self: the #NMIPRoutingRule instance
+ * @to: (allow-none): the to/dst address to set.
+ *   The address family must match.
+ * @len: the corresponding prefix length of the address.
+ *   If @to is %NULL, this valid is ignored.
+ *
+ * Setting invalid values is accepted, but will later fail
+ * during nm_ip_routing_rule_validate().
+ *
+ * Since: 1.18
+ */
+void
+nm_ip_routing_rule_set_to (NMIPRoutingRule *self,
+                           const char *to,
+                           guint8 len)
+{
+	g_return_if_fail (NM_IS_IP_ROUTING_RULE (self, FALSE));
+
+	if (!to) {
+		nm_clear_g_free (&self->to_str);
+		self->to_has = FALSE;
+		self->to_len = len;
+		return;
+	}
+
+	nm_clear_g_free (&self->to_str);
+	self->to_has = TRUE;
+	self->to_len = len;
+	self->to_valid = nm_utils_parse_inaddr_bin (_ip_routing_rule_get_addr_family (self),
+	                                            to,
+	                                            NULL,
+	                                            &self->to_bin);
+	if (!self->to_valid)
+		self->to_str = g_strdup (to);
+}
+
+/**
+ * nm_ip_routing_rule_get_tos:
+ * @self: the #NMIPRoutingRule instance
+ *
+ * Returns: the tos of the rule.
+ *
+ * Since: 1.18
+ */
+guint8
+nm_ip_routing_rule_get_tos (const NMIPRoutingRule *self)
+{
+	g_return_val_if_fail (NM_IS_IP_ROUTING_RULE (self, TRUE), 0);
+
+	return self->tos;
+}
+
+/**
+ * nm_ip_routing_rule_set_tos:
+ * @self: the #NMIPRoutingRule instance
+ * @tos: the tos to set
+ *
+ * Since: 1.18
+ */
+void
+nm_ip_routing_rule_set_tos (NMIPRoutingRule *self, guint8 tos)
+{
+	g_return_if_fail (NM_IS_IP_ROUTING_RULE (self, FALSE));
+
+	self->tos = tos;
+}
+
+/**
+ * nm_ip_routing_rule_get_ipproto:
+ * @self: the #NMIPRoutingRule instance
+ *
+ * Returns: the ipproto of the rule.
+ *
+ * Since: 1.18
+ */
+guint8
+nm_ip_routing_rule_get_ipproto (const NMIPRoutingRule *self)
+{
+	g_return_val_if_fail (NM_IS_IP_ROUTING_RULE (self, TRUE), 0);
+
+	return self->ipproto;
+}
+
+/**
+ * nm_ip_routing_rule_set_ipproto:
+ * @self: the #NMIPRoutingRule instance
+ * @ipproto: the ipproto to set
+ *
+ * Since: 1.18
+ */
+void
+nm_ip_routing_rule_set_ipproto (NMIPRoutingRule *self, guint8 ipproto)
+{
+	g_return_if_fail (NM_IS_IP_ROUTING_RULE (self, FALSE));
+
+	self->ipproto = ipproto;
+}
+
+/**
+ * nm_ip_routing_rule_get_source_port_start:
+ * @self: the #NMIPRoutingRule instance
+ *
+ * Returns: the source port start setting.
+ *
+ * Since: 1.18
+ */
+guint16
+nm_ip_routing_rule_get_source_port_start (const NMIPRoutingRule *self)
+{
+	g_return_val_if_fail (NM_IS_IP_ROUTING_RULE (self, TRUE), 0);
+
+	return self->sport_start;
+}
+
+/**
+ * nm_ip_routing_rule_get_source_port_end:
+ * @self: the #NMIPRoutingRule instance
+ *
+ * Returns: the source port end setting.
+ *
+ * Since: 1.18
+ */
+guint16
+nm_ip_routing_rule_get_source_port_end (const NMIPRoutingRule *self)
+{
+	g_return_val_if_fail (NM_IS_IP_ROUTING_RULE (self, TRUE), 0);
+
+	return self->sport_end;
+}
+
+/**
+ * nm_ip_routing_rule_set_source_port:
+ * @self: the #NMIPRoutingRule instance
+ * @start: the start port to set.
+ * @end: the end port to set.
+ *
+ * Since: 1.18
+ */
+void
+nm_ip_routing_rule_set_source_port (NMIPRoutingRule *self, guint16 start, guint16 end)
+{
+	g_return_if_fail (NM_IS_IP_ROUTING_RULE (self, FALSE));
+
+	self->sport_start = start;
+	self->sport_end   = end;
+}
+
+/**
+ * nm_ip_routing_rule_get_destination_port_start:
+ * @self: the #NMIPRoutingRule instance
+ *
+ * Returns: the destination port start setting.
+ *
+ * Since: 1.18
+ */
+guint16
+nm_ip_routing_rule_get_destination_port_start (const NMIPRoutingRule *self)
+{
+	g_return_val_if_fail (NM_IS_IP_ROUTING_RULE (self, TRUE), 0);
+
+	return self->dport_start;
+}
+
+/**
+ * nm_ip_routing_rule_get_destination_port_end:
+ * @self: the #NMIPRoutingRule instance
+ *
+ * Returns: the destination port end setting.
+ *
+ * Since: 1.18
+ */
+guint16
+nm_ip_routing_rule_get_destination_port_end (const NMIPRoutingRule *self)
+{
+	g_return_val_if_fail (NM_IS_IP_ROUTING_RULE (self, TRUE), 0);
+
+	return self->dport_end;
+}
+
+/**
+ * nm_ip_routing_rule_set_destination_port:
+ * @self: the #NMIPRoutingRule instance
+ * @start: the start port to set.
+ * @end: the end port to set.
+ *
+ * Since: 1.18
+ */
+void
+nm_ip_routing_rule_set_destination_port (NMIPRoutingRule *self, guint16 start, guint16 end)
+{
+	g_return_if_fail (NM_IS_IP_ROUTING_RULE (self, FALSE));
+
+	self->dport_start = start;
+	self->dport_end   = end;
+}
+
+/**
+ * nm_ip_routing_rule_get_fwmark:
+ * @self: the #NMIPRoutingRule instance
+ *
+ * Returns: the fwmark setting.
+ *
+ * Since: 1.18
+ */
+guint32
+nm_ip_routing_rule_get_fwmark (const NMIPRoutingRule *self)
+{
+	g_return_val_if_fail (NM_IS_IP_ROUTING_RULE (self, TRUE), 0);
+
+	return self->fwmark;
+}
+
+/**
+ * nm_ip_routing_rule_get_fwmask:
+ * @self: the #NMIPRoutingRule instance
+ *
+ * Returns: the fwmask setting.
+ *
+ * Since: 1.18
+ */
+guint32
+nm_ip_routing_rule_get_fwmask (const NMIPRoutingRule *self)
+{
+	g_return_val_if_fail (NM_IS_IP_ROUTING_RULE (self, TRUE), 0);
+
+	return self->fwmask;
+}
+
+/**
+ * nm_ip_routing_rule_set_fwmark:
+ * @self: the #NMIPRoutingRule instance
+ * @fwmark: the fwmark
+ * @fwmask: the fwmask
+ *
+ * Since: 1.18
+ */
+void
+nm_ip_routing_rule_set_fwmark (NMIPRoutingRule *self, guint32 fwmark, guint32 fwmask)
+{
+	g_return_if_fail (NM_IS_IP_ROUTING_RULE (self, FALSE));
+
+	self->fwmark = fwmark;
+	self->fwmask = fwmask;
+}
+
+/**
+ * nm_ip_routing_rule_get_iifname:
+ * @self: the #NMIPRoutingRule instance.
+ *
+ * Returns: (transfer none): the set iifname or %NULL if unset.
+ *
+ * Since: 1.18
+ */
+const char *
+nm_ip_routing_rule_get_iifname (const NMIPRoutingRule *self)
+{
+	g_return_val_if_fail (NM_IS_IP_ROUTING_RULE (self, TRUE), NULL);
+
+	return self->iifname;
+}
+
+gboolean
+nm_ip_routing_rule_get_xifname_bin (const NMIPRoutingRule *self,
+                                    gboolean iif /* or else oif */,
+                                    char out_xifname[static 16 /* IFNAMSIZ */])
+{
+	gs_free gpointer bin_to_free = NULL;
+	const char *xifname;
+	gconstpointer bin;
+	gsize len;
+
+	nm_assert (NM_IS_IP_ROUTING_RULE (self, TRUE));
+	nm_assert (out_xifname);
+
+	xifname = iif ? self->iifname : self->oifname;
+
+	if (!xifname)
+		return FALSE;
+
+	bin = nm_utils_buf_utf8safe_unescape (xifname, &len, &bin_to_free);
+
+	strncpy (out_xifname, bin, 16 /* IFNAMSIZ */);
+	out_xifname[15] = '\0';
+	return TRUE;
+}
+
+/**
+ * nm_ip_routing_rule_set_iifname:
+ * @self: the #NMIPRoutingRule instance.
+ * @iifname: (allow-none): the iifname to set or %NULL to unset.
+ *
+ * The name supports C backslash escaping for non-UTF-8 characters.
+ * Note that nm_ip_routing_rule_from_string() too uses backslash
+ * escaping when tokenizing the words by whitespace. So, in string
+ * representation you'd get double backslashs.
+ *
+ * Since: 1.18
+ */
+void
+nm_ip_routing_rule_set_iifname (NMIPRoutingRule *self, const char *iifname)
+{
+	g_return_if_fail (NM_IS_IP_ROUTING_RULE (self, FALSE));
+
+	g_free (self->iifname);
+	self->iifname = g_strdup (iifname);
+}
+
+/**
+ * nm_ip_routing_rule_get_oifname:
+ * @self: the #NMIPRoutingRule instance.
+ *
+ * Returns: (transfer none): the set oifname or %NULL if unset.
+ *
+ * Since: 1.18
+ */
+const char *
+nm_ip_routing_rule_get_oifname (const NMIPRoutingRule *self)
+{
+	g_return_val_if_fail (NM_IS_IP_ROUTING_RULE (self, TRUE), NULL);
+
+	return self->oifname;
+}
+
+/**
+ * nm_ip_routing_rule_set_oifname:
+ * @self: the #NMIPRoutingRule instance.
+ * @oifname: (allow-none): the oifname to set or %NULL to unset.
+ *
+ * The name supports C backslash escaping for non-UTF-8 characters.
+ * Note that nm_ip_routing_rule_from_string() too uses backslash
+ * escaping when tokenizing the words by whitespace. So, in string
+ * representation you'd get double backslashs.
+ *
+ * Since: 1.18
+ */
+void
+nm_ip_routing_rule_set_oifname (NMIPRoutingRule *self, const char *oifname)
+{
+	g_return_if_fail (NM_IS_IP_ROUTING_RULE (self, FALSE));
+
+	g_free (self->oifname);
+	self->oifname = g_strdup (oifname);
+}
+
+/**
+ * nm_ip_routing_rule_get_action:
+ * @self: the #NMIPRoutingRule instance
+ *
+ * Returns: the set action.
+ *
+ * Since: 1.18
+ */
+guint8
+nm_ip_routing_rule_get_action (const NMIPRoutingRule *self)
+{
+	g_return_val_if_fail (NM_IS_IP_ROUTING_RULE (self, TRUE), 0);
+
+	return self->action;
+}
+
+/**
+ * nm_ip_routing_rule_set_action:
+ * @self: the #NMIPRoutingRule instance
+ * @action: the action to set
+ *
+ * Note that currently only certain actions are allowed. nm_ip_routing_rule_validate()
+ * will reject unsupported actions as invalid.
+ *
+ * Since: 1.18
+ */
+void
+nm_ip_routing_rule_set_action (NMIPRoutingRule *self, guint8 action)
+{
+	g_return_if_fail (NM_IS_IP_ROUTING_RULE (self, FALSE));
+
+	self->action = action;
+}
+
+/**
+ * nm_ip_routing_rule_get_table:
+ * @self: the #NMIPRoutingRule instance
+ *
+ * Returns: the set table.
+ *
+ * Since: 1.18
+ */
+guint32
+nm_ip_routing_rule_get_table (const NMIPRoutingRule *self)
+{
+	g_return_val_if_fail (NM_IS_IP_ROUTING_RULE (self, TRUE), 0);
+
+	return self->table;
+}
+
+/**
+ * nm_ip_routing_rule_set_table:
+ * @self: the #NMIPRoutingRule instance
+ * @table: the table to set
+ *
+ * Since: 1.18
+ */
+void
+nm_ip_routing_rule_set_table (NMIPRoutingRule *self, guint32 table)
+{
+	g_return_if_fail (NM_IS_IP_ROUTING_RULE (self, FALSE));
+
+	self->table = table;
+}
+
+/**
+ * nm_ip_routing_rule_cmp:
+ * @rule: (allow-none): the #NMIPRoutingRule instance to compare
+ * @other: (allow-none): the other #NMIPRoutingRule instance to compare
+ *
+ * Returns: zero, a positive, or a negative integer to indicate
+ *   equality or how the arguments compare.
+ *
+ * Since: 1.18
+ */
+int
+nm_ip_routing_rule_cmp (const NMIPRoutingRule *rule,
+                        const NMIPRoutingRule *other)
+{
+	NM_CMP_SELF (rule, other);
+
+	g_return_val_if_fail (NM_IS_IP_ROUTING_RULE (rule, TRUE), 0);
+	g_return_val_if_fail (NM_IS_IP_ROUTING_RULE (other, TRUE), 0);
+
+	NM_CMP_FIELD_UNSAFE (rule, other, priority_has);
+	if (rule->priority_has)
+		NM_CMP_FIELD (rule, other, priority);
+
+	NM_CMP_FIELD_UNSAFE (rule, other, is_v4);
+
+	NM_CMP_FIELD_UNSAFE (rule, other, invert);
+
+	NM_CMP_FIELD (rule, other, tos);
+
+	NM_CMP_FIELD (rule, other, fwmark);
+	NM_CMP_FIELD (rule, other, fwmask);
+
+	NM_CMP_FIELD (rule, other, action);
+
+	NM_CMP_FIELD (rule, other, table);
+
+	NM_CMP_FIELD (rule, other, sport_start);
+	NM_CMP_FIELD (rule, other, sport_end);
+	NM_CMP_FIELD (rule, other, dport_start);
+	NM_CMP_FIELD (rule, other, dport_end);
+
+	NM_CMP_FIELD (rule, other, ipproto);
+
+	/* We compare the plain strings, not the binary values after utf8safe unescaping.
+	 *
+	 * The reason is, that the rules differ already when the direct strings differ, not
+	 * only when the unescaped names differ. */
+	NM_CMP_FIELD_STR0 (rule, other, iifname);
+	NM_CMP_FIELD_STR0 (rule, other, oifname);
+
+	NM_CMP_FIELD (rule, other, from_len);
+
+	NM_CMP_FIELD_UNSAFE (rule, other, from_has);
+	if (rule->from_has) {
+		NM_CMP_FIELD_UNSAFE (rule, other, from_valid);
+		if (rule->from_valid) {
+			NM_CMP_RETURN (memcmp (&rule->from_bin,
+			                       &other->from_bin,
+			                       _ip_routing_rule_get_addr_size (rule)));
+		} else
+			NM_CMP_FIELD_STR (rule, other, from_str);
+	}
+
+	NM_CMP_FIELD (rule, other, to_len);
+
+	NM_CMP_FIELD_UNSAFE (rule, other, to_has);
+	if (rule->to_has) {
+		NM_CMP_FIELD_UNSAFE (rule, other, to_valid);
+		if (rule->to_valid) {
+			NM_CMP_RETURN (memcmp (&rule->to_bin,
+			                       &other->to_bin,
+			                       _ip_routing_rule_get_addr_size (rule)));
+		} else
+			NM_CMP_FIELD_STR (rule, other, to_str);
+	}
+
+	return 0;
+}
+
+static gboolean
+_rr_xport_range_valid (guint16 xport_start, guint16 xport_end)
+{
+	if (xport_start == 0)
+		return (xport_end == 0);
+
+	return    xport_start <= xport_end
+	       && xport_end < 0xFFFFu;
+}
+
+static gboolean
+_rr_xport_range_parse (char *str, gint64 *out_start, guint16 *out_end)
+{
+	guint16 start, end;
+	gint64 i64;
+	char *s;
+
+	s = strchr (str, '-');
+	if (s)
+		*(s++) = '\0';
+
+	i64 = _nm_utils_ascii_str_to_int64 (str, 10, 0, 0xFFFF, -1);
+	if (i64 == -1)
+		return FALSE;
+
+	start = i64;
+	if (s) {
+		i64 = _nm_utils_ascii_str_to_int64 (s, 10, 0, 0xFFFF, -1);
+		if (i64 == -1)
+			return FALSE;
+		end = i64;
+	} else
+		end = start;
+
+	*out_start = start;
+	*out_end = end;
+	return TRUE;
+}
+
+/**
+ * nm_ip_routing_rule_validate:
+ * @self: the #NMIPRoutingRule instance to validate
+ * @error: (allow-none) (out): the error result if validation fails.
+ *
+ * Returns: %TRUE if the rule validates.
+ *
+ * Since: 1.18
+ */
+gboolean
+nm_ip_routing_rule_validate (const NMIPRoutingRule *self,
+                             GError **error)
+{
+	g_return_val_if_fail (NM_IS_IP_ROUTING_RULE (self, TRUE), FALSE);
+	g_return_val_if_fail (!error || !*error, FALSE);
+
+	/* Kernel may be more flexible about validating. We do a strict validation
+	 * here and reject certain settings eagerly. We can always relax it later. */
+
+	if (!self->priority_has) {
+		/* iproute2 accepts not specifying the priority, in which case kernel will select
+		 * an unused priority. We don't allow for that, and will always require the user to
+		 * select a priority.
+		 *
+		 * Note that if the user selects priority 0 or a non-unique priority, this is problematic
+		 * due to kernel bugs rh#1685816 and rh#1685816. It may result in NetworkManager wrongly being
+		 * unable to add a rule or deleting the wrong rule.
+		 * This problem is not at all specific to the priority, it affects all rules that
+		 * have default values which confuse kernel. But setting a unique priority avoids
+		 * this problem nicely. */
+		g_set_error_literal (error, NM_CONNECTION_ERROR, NM_CONNECTION_ERROR_INVALID_PROPERTY,
+		                     _("invalid priority"));
+		return FALSE;
+	}
+
+	if (NM_IN_SET (self->action, FR_ACT_TO_TBL)) {
+		if (self->table == 0) {
+			/* with IPv4, kernel allows a table (in RTM_NEWRULE) of zero to automatically select
+			 * an unused table. We don't. The user needs to specify the table.
+			 *
+			 * For IPv6, kernel doesn't allow a table of zero, so we are consistent here. */
+			g_set_error_literal (error, NM_CONNECTION_ERROR, NM_CONNECTION_ERROR_INVALID_PROPERTY,
+			                     _("missing table"));
+			return FALSE;
+		}
+	} else {
+		/* whitelist the actions that we currently. */
+		g_set_error_literal (error, NM_CONNECTION_ERROR, NM_CONNECTION_ERROR_INVALID_PROPERTY,
+		                     _("invalid action"));
+		return FALSE;
+	}
+
+	if (self->from_len == 0) {
+		if (self->from_has) {
+			g_set_error_literal (error, NM_CONNECTION_ERROR, NM_CONNECTION_ERROR_INVALID_PROPERTY,
+			                     _("has from/src but the prefix-length is zero"));
+			return FALSE;
+		}
+	} else if (   self->from_len > 0
+	           && self->from_len <= 8 * _ip_routing_rule_get_addr_size (self)) {
+		if (!self->from_has) {
+			g_set_error_literal (error, NM_CONNECTION_ERROR, NM_CONNECTION_ERROR_INVALID_PROPERTY,
+			                     _("missing from/src for a non zero prefix-length"));
+			return FALSE;
+		}
+		if (!self->from_valid) {
+			g_set_error_literal (error, NM_CONNECTION_ERROR, NM_CONNECTION_ERROR_INVALID_PROPERTY,
+			                     _("invalid from/src"));
+			return FALSE;
+		}
+	} else {
+		g_set_error_literal (error, NM_CONNECTION_ERROR, NM_CONNECTION_ERROR_INVALID_PROPERTY,
+		                     _("invalid prefix length for from/src"));
+		return FALSE;
+	}
+
+	if (self->to_len == 0) {
+		if (self->to_has) {
+			g_set_error_literal (error, NM_CONNECTION_ERROR, NM_CONNECTION_ERROR_INVALID_PROPERTY,
+			                     _("has to/dst but the prefix-length is zero"));
+			return FALSE;
+		}
+	} else if (   self->to_len > 0
+	           && self->to_len <= 8 * _ip_routing_rule_get_addr_size (self)) {
+		if (!self->to_has) {
+			g_set_error_literal (error, NM_CONNECTION_ERROR, NM_CONNECTION_ERROR_INVALID_PROPERTY,
+			                     _("missing to/dst for a non zero prefix-length"));
+			return FALSE;
+		}
+		if (!self->to_valid) {
+			g_set_error_literal (error, NM_CONNECTION_ERROR, NM_CONNECTION_ERROR_INVALID_PROPERTY,
+			                     _("invalid to/dst"));
+			return FALSE;
+		}
+	} else {
+		g_set_error_literal (error, NM_CONNECTION_ERROR, NM_CONNECTION_ERROR_INVALID_PROPERTY,
+		                     _("invalid prefix length for to/dst"));
+		return FALSE;
+	}
+
+	if (   self->iifname
+	    && (   !g_utf8_validate (self->iifname, -1, NULL)
+	        || !nm_utils_is_valid_iface_name_utf8safe (self->iifname))) {
+		g_set_error_literal (error, NM_CONNECTION_ERROR, NM_CONNECTION_ERROR_INVALID_PROPERTY,
+		                     _("invalid iifname"));
+		return FALSE;
+	}
+
+	if (   self->oifname
+	    && (   !g_utf8_validate (self->oifname, -1, NULL)
+	        || !nm_utils_is_valid_iface_name_utf8safe (self->oifname))) {
+		g_set_error_literal (error, NM_CONNECTION_ERROR, NM_CONNECTION_ERROR_INVALID_PROPERTY,
+		                     _("invalid oifname"));
+		return FALSE;
+	}
+
+	if (!_rr_xport_range_valid (self->sport_start, self->sport_end)) {
+		g_set_error_literal (error, NM_CONNECTION_ERROR, NM_CONNECTION_ERROR_INVALID_PROPERTY,
+		                     _("invalid source port range"));
+		return FALSE;
+	}
+
+	if (!_rr_xport_range_valid (self->dport_start, self->dport_end)) {
+		g_set_error_literal (error, NM_CONNECTION_ERROR, NM_CONNECTION_ERROR_INVALID_PROPERTY,
+		                     _("invalid destination port range"));
+		return FALSE;
+	}
+
+	return TRUE;
+}
+
+/*****************************************************************************/
+
+typedef enum {
+	RR_DBUS_ATTR_ACTION,
+	RR_DBUS_ATTR_DPORT_END,
+	RR_DBUS_ATTR_DPORT_START,
+	RR_DBUS_ATTR_FAMILY,
+	RR_DBUS_ATTR_FROM,
+	RR_DBUS_ATTR_FROM_LEN,
+	RR_DBUS_ATTR_FWMARK,
+	RR_DBUS_ATTR_FWMASK,
+	RR_DBUS_ATTR_IIFNAME,
+	RR_DBUS_ATTR_INVERT,
+	RR_DBUS_ATTR_IPPROTO,
+	RR_DBUS_ATTR_OIFNAME,
+	RR_DBUS_ATTR_PRIORITY,
+	RR_DBUS_ATTR_SPORT_END,
+	RR_DBUS_ATTR_SPORT_START,
+	RR_DBUS_ATTR_TABLE,
+	RR_DBUS_ATTR_TO,
+	RR_DBUS_ATTR_TOS,
+	RR_DBUS_ATTR_TO_LEN,
+
+	_RR_DBUS_ATTR_NUM,
+} RRDbusAttr;
+
+typedef struct {
+	const char *name;
+	const GVariantType *dbus_type;
+} RRDbusData;
+
+static const RRDbusData rr_dbus_data[_RR_DBUS_ATTR_NUM] = {
+#define _D(attr, _name, type) [attr] = { .name = _name, .dbus_type = type, }
+	_D (RR_DBUS_ATTR_ACTION,      NM_IP_ROUTING_RULE_ATTR_ACTION,      G_VARIANT_TYPE_BYTE),
+	_D (RR_DBUS_ATTR_DPORT_END,   NM_IP_ROUTING_RULE_ATTR_DPORT_END,   G_VARIANT_TYPE_UINT16),
+	_D (RR_DBUS_ATTR_DPORT_START, NM_IP_ROUTING_RULE_ATTR_DPORT_START, G_VARIANT_TYPE_UINT16),
+	_D (RR_DBUS_ATTR_FAMILY,      NM_IP_ROUTING_RULE_ATTR_FAMILY,      G_VARIANT_TYPE_INT32),
+	_D (RR_DBUS_ATTR_FROM,        NM_IP_ROUTING_RULE_ATTR_FROM,        G_VARIANT_TYPE_STRING),
+	_D (RR_DBUS_ATTR_FROM_LEN,    NM_IP_ROUTING_RULE_ATTR_FROM_LEN,    G_VARIANT_TYPE_BYTE),
+	_D (RR_DBUS_ATTR_FWMARK,      NM_IP_ROUTING_RULE_ATTR_FWMARK,      G_VARIANT_TYPE_UINT32),
+	_D (RR_DBUS_ATTR_FWMASK,      NM_IP_ROUTING_RULE_ATTR_FWMASK,      G_VARIANT_TYPE_UINT32),
+	_D (RR_DBUS_ATTR_IIFNAME,     NM_IP_ROUTING_RULE_ATTR_IIFNAME,     G_VARIANT_TYPE_STRING),
+	_D (RR_DBUS_ATTR_INVERT,      NM_IP_ROUTING_RULE_ATTR_INVERT,      G_VARIANT_TYPE_BOOLEAN),
+	_D (RR_DBUS_ATTR_IPPROTO,     NM_IP_ROUTING_RULE_ATTR_IPPROTO,     G_VARIANT_TYPE_BYTE),
+	_D (RR_DBUS_ATTR_OIFNAME,     NM_IP_ROUTING_RULE_ATTR_OIFNAME,     G_VARIANT_TYPE_STRING),
+	_D (RR_DBUS_ATTR_PRIORITY,    NM_IP_ROUTING_RULE_ATTR_PRIORITY,    G_VARIANT_TYPE_UINT32),
+	_D (RR_DBUS_ATTR_SPORT_END,   NM_IP_ROUTING_RULE_ATTR_SPORT_END,   G_VARIANT_TYPE_UINT16),
+	_D (RR_DBUS_ATTR_SPORT_START, NM_IP_ROUTING_RULE_ATTR_SPORT_START, G_VARIANT_TYPE_UINT16),
+	_D (RR_DBUS_ATTR_TABLE,       NM_IP_ROUTING_RULE_ATTR_TABLE,       G_VARIANT_TYPE_UINT32),
+	_D (RR_DBUS_ATTR_TO,          NM_IP_ROUTING_RULE_ATTR_TO,          G_VARIANT_TYPE_STRING),
+	_D (RR_DBUS_ATTR_TOS,         NM_IP_ROUTING_RULE_ATTR_TOS,         G_VARIANT_TYPE_BYTE),
+	_D (RR_DBUS_ATTR_TO_LEN,      NM_IP_ROUTING_RULE_ATTR_TO_LEN,      G_VARIANT_TYPE_BYTE),
+#undef _D
+};
+
+static void
+_rr_variants_free (GVariant *(*p_variants)[])
+{
+	int i;
+
+	for (i = 0; i < _RR_DBUS_ATTR_NUM; i++) {
+		if ((*p_variants)[i])
+			g_variant_unref ((*p_variants)[i]);
+	}
+}
+
+NMIPRoutingRule *
+nm_ip_routing_rule_from_dbus (GVariant *variant,
+                              gboolean strict,
+                              GError **error)
+{
+	nm_auto (_rr_variants_free) GVariant *variants[_RR_DBUS_ATTR_NUM] = { };
+	nm_auto_unref_ip_routing_rule NMIPRoutingRule *self = NULL;
+	RRDbusAttr attr;
+	GVariantIter iter;
+	const char *iter_key;
+	GVariant *iter_val;
+	int addr_family;
+	int i;
+
+	g_variant_iter_init (&iter, variant);
+
+#if NM_MORE_ASSERTS > 10
+	for (attr = 0; attr < _RR_DBUS_ATTR_NUM; attr++) {
+		nm_assert (rr_dbus_data[attr].name);
+		nm_assert (g_variant_type_string_is_valid ((const char *) rr_dbus_data[attr].dbus_type));
+	}
+#endif
+
+	while (g_variant_iter_next (&iter, "{&sv}", &iter_key, &iter_val)) {
+		gs_unref_variant GVariant *iter_val2 = iter_val;
+
+		for (attr = 0; attr < _RR_DBUS_ATTR_NUM; attr++) {
+			if (nm_streq (iter_key, rr_dbus_data[attr].name)) {
+				if (variants[attr]) {
+					if (strict) {
+						g_set_error (error, NM_CONNECTION_ERROR, NM_CONNECTION_ERROR_FAILED,
+						             _("duplicate key %s"),
+						             iter_key);
+						return NULL;
+					}
+					g_variant_unref (variants[attr]);
+				}
+				variants[attr] = g_steal_pointer (&iter_val2);
+				break;
+			}
+		}
+
+		if (   attr >= _RR_DBUS_ATTR_NUM
+		    && strict) {
+			g_set_error (error, NM_CONNECTION_ERROR, NM_CONNECTION_ERROR_INVALID_PROPERTY,
+			             _("invalid key \"%s\""),
+			             iter_key);
+			return NULL;
+		}
+	}
+
+	for (attr = 0; attr < _RR_DBUS_ATTR_NUM; attr++) {
+		if (!variants[attr])
+			continue;
+		if (!g_variant_is_of_type (variants[attr], rr_dbus_data[attr].dbus_type)) {
+			g_set_error (error,
+			             NM_CONNECTION_ERROR,
+			             NM_CONNECTION_ERROR_INVALID_PROPERTY,
+			             _("invalid variant type '%s' for \"%s\""),
+			             (const char *) rr_dbus_data[attr].dbus_type,
+			             rr_dbus_data[attr].name);
+			return NULL;
+		}
+	}
+
+	if (!variants[RR_DBUS_ATTR_FAMILY]) {
+		g_set_error_literal (error, NM_CONNECTION_ERROR, NM_CONNECTION_ERROR_INVALID_PROPERTY,
+		                     _("missing \""NM_IP_ROUTING_RULE_ATTR_FAMILY"\""));
+		return NULL;
+	}
+	addr_family = g_variant_get_int32 (variants[RR_DBUS_ATTR_FAMILY]);
+	if (!NM_IN_SET (addr_family, AF_INET, AF_INET6)) {
+		g_set_error_literal (error, NM_CONNECTION_ERROR, NM_CONNECTION_ERROR_INVALID_PROPERTY,
+		                     _("invalid \""NM_IP_ROUTING_RULE_ATTR_FAMILY"\""));
+		return NULL;
+	}
+
+	self = nm_ip_routing_rule_new (addr_family);
+
+	if (variants[RR_DBUS_ATTR_PRIORITY])
+		nm_ip_routing_rule_set_priority (self, g_variant_get_uint32 (variants[RR_DBUS_ATTR_PRIORITY]));
+
+	if (variants[RR_DBUS_ATTR_INVERT])
+		nm_ip_routing_rule_set_invert (self, g_variant_get_boolean (variants[RR_DBUS_ATTR_INVERT]));
+
+	if (variants[RR_DBUS_ATTR_TOS])
+		nm_ip_routing_rule_set_tos (self, g_variant_get_byte (variants[RR_DBUS_ATTR_TOS]));
+
+	if (variants[RR_DBUS_ATTR_IPPROTO])
+		nm_ip_routing_rule_set_ipproto (self, g_variant_get_byte (variants[RR_DBUS_ATTR_IPPROTO]));
+
+	for (i = 0; i < 2; i++) {
+		GVariant *v_start = variants[i ? RR_DBUS_ATTR_SPORT_START : RR_DBUS_ATTR_DPORT_START];
+		GVariant *v_end   = variants[i ? RR_DBUS_ATTR_SPORT_END   : RR_DBUS_ATTR_DPORT_END];
+		guint16 start, end;
+
+		if (!v_start && !v_end)
+			continue;
+
+		/* if start or end is missing, it defaults to the other parameter, respectively. */
+		if (v_start)
+			start = g_variant_get_uint16 (v_start);
+		else
+			start = g_variant_get_uint16 (v_end);
+		if (v_end)
+			end = g_variant_get_uint16 (v_end);
+		else
+			end = g_variant_get_uint16 (v_start);
+
+		if (i)
+			nm_ip_routing_rule_set_source_port (self, start, end);
+		else
+			nm_ip_routing_rule_set_destination_port (self, start, end);
+	}
+
+	if (   variants[RR_DBUS_ATTR_FWMARK]
+	    || variants[RR_DBUS_ATTR_FWMASK]) {
+		nm_ip_routing_rule_set_fwmark (self,
+		                               variants[RR_DBUS_ATTR_FWMARK] ? g_variant_get_uint32 (variants[RR_DBUS_ATTR_FWMARK]) : 0u,
+		                               variants[RR_DBUS_ATTR_FWMASK] ? g_variant_get_uint32 (variants[RR_DBUS_ATTR_FWMASK]) : 0u);
+	}
+
+	if (   variants[RR_DBUS_ATTR_FROM]
+	    || variants[RR_DBUS_ATTR_FROM_LEN]) {
+		nm_ip_routing_rule_set_from (self,
+		                             variants[RR_DBUS_ATTR_FROM]     ? g_variant_get_string (variants[RR_DBUS_ATTR_FROM], NULL) : NULL,
+		                             variants[RR_DBUS_ATTR_FROM_LEN] ? g_variant_get_byte   (variants[RR_DBUS_ATTR_FROM_LEN])   : 0u);
+	}
+
+	if (   variants[RR_DBUS_ATTR_TO]
+	    || variants[RR_DBUS_ATTR_TO_LEN]) {
+		nm_ip_routing_rule_set_to (self,
+		                           variants[RR_DBUS_ATTR_TO]     ? g_variant_get_string (variants[RR_DBUS_ATTR_TO], NULL) : NULL,
+		                           variants[RR_DBUS_ATTR_TO_LEN] ? g_variant_get_byte   (variants[RR_DBUS_ATTR_TO_LEN])   : 0u);
+	}
+
+	if (variants[RR_DBUS_ATTR_IIFNAME])
+		nm_ip_routing_rule_set_iifname (self, g_variant_get_string (variants[RR_DBUS_ATTR_IIFNAME], NULL));
+
+	if (variants[RR_DBUS_ATTR_OIFNAME])
+		nm_ip_routing_rule_set_oifname (self, g_variant_get_string (variants[RR_DBUS_ATTR_OIFNAME], NULL));
+
+	if (variants[RR_DBUS_ATTR_ACTION])
+		nm_ip_routing_rule_set_action (self, g_variant_get_byte (variants[RR_DBUS_ATTR_ACTION]));
+
+	if (variants[RR_DBUS_ATTR_TABLE])
+		nm_ip_routing_rule_set_table (self, g_variant_get_uint32 (variants[RR_DBUS_ATTR_TABLE]));
+
+	if (   strict
+	    && !nm_ip_routing_rule_validate (self, error))
+		return NULL;
+
+	return g_steal_pointer (&self);
+}
+
+static void
+_rr_to_dbus_add (GVariantBuilder *builder,
+                 RRDbusAttr attr,
+                 GVariant *value)
+{
+	nm_assert (builder);
+	nm_assert (value);
+	nm_assert (g_variant_is_floating (value));
+	nm_assert (g_variant_is_of_type (value, rr_dbus_data[attr].dbus_type));
+
+	g_variant_builder_add (builder,
+	                       "{sv}",
+	                       rr_dbus_data[attr].name,
+	                       value);
+}
+
+GVariant *
+nm_ip_routing_rule_to_dbus (const NMIPRoutingRule *self)
+{
+	GVariantBuilder builder;
+	char addr_str[NM_UTILS_INET_ADDRSTRLEN];
+
+	g_return_val_if_fail (NM_IS_IP_ROUTING_RULE (self, TRUE), NULL);
+
+	g_variant_builder_init (&builder, G_VARIANT_TYPE_VARDICT);
+
+	_rr_to_dbus_add (&builder, RR_DBUS_ATTR_FAMILY, g_variant_new_int32 (_ip_routing_rule_get_addr_family (self)));
+
+	if (self->invert)
+		_rr_to_dbus_add (&builder, RR_DBUS_ATTR_INVERT, g_variant_new_boolean (TRUE));
+
+	if (self->priority_has)
+		_rr_to_dbus_add (&builder, RR_DBUS_ATTR_PRIORITY, g_variant_new_uint32 (self->priority));
+
+	if (self->tos != 0)
+		_rr_to_dbus_add (&builder, RR_DBUS_ATTR_TOS, g_variant_new_byte (self->tos));
+
+	if (self->ipproto != 0)
+		_rr_to_dbus_add (&builder, RR_DBUS_ATTR_IPPROTO, g_variant_new_byte (self->ipproto));
+
+	if (self->fwmark != 0)
+		_rr_to_dbus_add (&builder, RR_DBUS_ATTR_FWMARK, g_variant_new_uint32 (self->fwmark));
+
+	if (self->fwmask != 0)
+		_rr_to_dbus_add (&builder, RR_DBUS_ATTR_FWMASK, g_variant_new_uint32 (self->fwmask));
+
+	if (   self->sport_start != 0
+	    || self->sport_end != 0) {
+		_rr_to_dbus_add (&builder, RR_DBUS_ATTR_SPORT_START, g_variant_new_uint16 (self->sport_start));
+		if (self->sport_start != self->sport_end)
+			_rr_to_dbus_add (&builder, RR_DBUS_ATTR_SPORT_END, g_variant_new_uint16 (self->sport_end));
+	}
+
+	if (   self->dport_start != 0
+	    || self->dport_end != 0) {
+		_rr_to_dbus_add (&builder, RR_DBUS_ATTR_DPORT_START, g_variant_new_uint16 (self->dport_start));
+		if (self->dport_start != self->dport_end)
+			_rr_to_dbus_add (&builder, RR_DBUS_ATTR_DPORT_END, g_variant_new_uint16 (self->dport_end));
+	}
+
+	if (   self->from_has
+	    || self->from_len != 0) {
+		_rr_to_dbus_add (&builder,
+		                 RR_DBUS_ATTR_FROM,
+		                 g_variant_new_string (   self->from_str
+		                                       ?: nm_utils_inet_ntop (_ip_routing_rule_get_addr_family (self),
+		                                                              &self->from_bin,
+		                                                              addr_str)));
+		_rr_to_dbus_add (&builder, RR_DBUS_ATTR_FROM_LEN, g_variant_new_byte (self->from_len));
+	}
+
+	if (   self->to_has
+	    || self->to_len != 0) {
+		_rr_to_dbus_add (&builder,
+		                 RR_DBUS_ATTR_TO,
+		                 g_variant_new_string (   self->to_str
+		                                       ?: nm_utils_inet_ntop (_ip_routing_rule_get_addr_family (self),
+		                                                              &self->to_bin,
+		                                                              addr_str)));
+		_rr_to_dbus_add (&builder, RR_DBUS_ATTR_TO_LEN, g_variant_new_byte (self->to_len));
+	}
+
+	if (self->iifname)
+		_rr_to_dbus_add (&builder, RR_DBUS_ATTR_IIFNAME, g_variant_new_string (self->iifname));
+
+	if (self->oifname)
+		_rr_to_dbus_add (&builder, RR_DBUS_ATTR_OIFNAME, g_variant_new_string (self->oifname));
+
+	if (self->action != FR_ACT_TO_TBL)
+		_rr_to_dbus_add (&builder, RR_DBUS_ATTR_ACTION, g_variant_new_byte (self->action));
+
+	if (self->table != 0)
+		_rr_to_dbus_add (&builder, RR_DBUS_ATTR_TABLE, g_variant_new_uint32 (self->table));
+
+	return g_variant_builder_end (&builder);;
+}
+
+/*****************************************************************************/
+
+static gboolean
+_rr_string_validate (gboolean for_from /* or else to-string */,
+                     NMIPRoutingRuleAsStringFlags to_string_flags,
+                     GHashTable *extra_args,
+                     GError **error)
+{
+	if (NM_FLAGS_ANY (to_string_flags, ~(  NM_IP_ROUTING_RULE_AS_STRING_FLAGS_AF_INET
+	                                     | NM_IP_ROUTING_RULE_AS_STRING_FLAGS_AF_INET6
+	                                     | NM_IP_ROUTING_RULE_AS_STRING_FLAGS_VALIDATE))) {
+		g_set_error_literal (error, NM_CONNECTION_ERROR, NM_CONNECTION_ERROR_FAILED,
+		                     _("Unsupported to-string-flags argument"));
+		return FALSE;
+	}
+
+	if (   extra_args
+	    && g_hash_table_size (extra_args) > 0) {
+		g_set_error_literal (error, NM_CONNECTION_ERROR, NM_CONNECTION_ERROR_FAILED,
+		                     _("Unsupported extra-argument"));
+		return FALSE;
+	}
+
+	return TRUE;
+}
+
+static int
+_rr_string_addr_family_from_flags (NMIPRoutingRuleAsStringFlags to_string_flags)
+{
+	if (NM_FLAGS_HAS (to_string_flags, NM_IP_ROUTING_RULE_AS_STRING_FLAGS_AF_INET)) {
+		if (!NM_FLAGS_HAS (to_string_flags, NM_IP_ROUTING_RULE_AS_STRING_FLAGS_AF_INET6))
+			return AF_INET;
+	} else if (NM_FLAGS_HAS (to_string_flags, NM_IP_ROUTING_RULE_AS_STRING_FLAGS_AF_INET6))
+		return AF_INET6;
+	return AF_UNSPEC;
+}
+
+/**
+ * nm_ip_routing_rule_from_string:
+ * @str: the string representation to convert to an #NMIPRoutingRule
+ * @to_string_flags: #NMIPRoutingRuleAsStringFlags for controlling the
+ *   string conversion.
+ * @extra_args: (allow-none): extra arguments for controlling the string
+ *   conversion. Currently not extra arguments are supported.
+ * @error: (allow-none) (out): the error reason.
+ *
+ * Returns: (transfer full): the new #NMIPRoutingRule or %NULL on error.
+ *
+ * Since: 1.18
+ */
+NMIPRoutingRule *
+nm_ip_routing_rule_from_string (const char *str,
+                                NMIPRoutingRuleAsStringFlags to_string_flags,
+                                GHashTable *extra_args,
+                                GError **error)
+{
+	nm_auto_unref_ip_routing_rule NMIPRoutingRule *self = NULL;
+	gs_free const char **tokens = NULL;
+	gsize i_token;
+	gboolean any_words = FALSE;
+	char *word0 = NULL;
+	char *word1 = NULL;
+	char *word_from = NULL;
+	char *word_to = NULL;
+	char *word_iifname = NULL;
+	char *word_oifname = NULL;
+	gint64 i64_priority = -1;
+	gint64 i64_table = -1;
+	gint64 i64_tos = -1;
+	gint64 i64_fwmark = -1;
+	gint64 i64_fwmask = -1;
+	gint64 i64_sport_start = -1;
+	gint64 i64_ipproto = -1;
+	guint16 sport_end = 0;
+	gint64 i64_dport_start = -1;
+	guint16 dport_end = 0;
+	gboolean val_invert = FALSE;
+	int addr_family = AF_UNSPEC;
+	NMIPAddr val_from = { };
+	NMIPAddr val_to = { };
+	int val_from_len = -1;
+	int val_to_len = -1;
+	char *s;
+
+	g_return_val_if_fail (str, NULL);
+
+	if (!_rr_string_validate (TRUE, to_string_flags, extra_args, error))
+		return NULL;
+
+	/* NM_IP_ROUTING_RULE_TO_STRING_TYPE_IPROUTE gives a string representation that is
+	 * partly compatibly with iproute2. That is, the part after `ip -[46] rule add $ARGS`.
+	 * There are differences though:
+	 *
+	 * - trying to convert an invalid rule to string may not be possible. The reason is for
+	 *   example that an invalid rule can have nm_ip_routing_rule_get_from() like "bogus",
+	 *   but we don't write that as "from bogus". In general, if you try to convert an invalid
+	 *   rule to string, the operation may fail or the result may itself not be parsable.
+	 *   Of course, valid rules can be converted to string and read back the same (round-trip).
+	 *
+	 * - iproute2 in may regards is flexible about the command lines. For example
+	 *   - for tables it accepts table names from /etc/iproute2/rt_tables
+	 *   - key names like "preference" can be abbreviated to "prefe", we don't do that.
+	 *   - the "preference"/"priority" may be unspecified, in which kernel automatically
+	 *     chooses an unused priority (during `ip rule add`). We don't allow for that, the
+	 *     priority must be explicitly set.
+	 *
+	 * - iproute2 does not support any escaping. Well, it's the shell that supports quoting
+	 *   and escaping and splits the command line. We need to split the command line ourself,
+	 *   but we don't support full shell quotation.
+	 *   from-string tokenizes words at (ASCII) whitespaces (removing the whitespaces).
+	 *   It also supports backslash escaping (e.g. to contain whitespace), but it does
+	 *   not support special escape sequences. Values are taken literally, meaning
+	 *   "\n\ \111" gives results in "n 111".
+	 *   The strings really shouldn't contain any special characters that require escaping,
+	 *   but that's the rule.
+	 *   This also goes together with the @allow_escaping parameter of nm_utils_strsplit_set().
+	 *   If you concatenate multiple rule expressions with a delimiter, the delimiter inside
+	 *   each word can be backslash escaped, and nm_utils_strsplit_set(allow_escaping=TRUE) will
+	 *   properly split the words, preserving the backslashes, which then will be removed by
+	 *   nm_ip_routing_rule_from_string().
+	 */
+
+	addr_family = _rr_string_addr_family_from_flags (to_string_flags);
+
+	tokens = nm_utils_escaped_tokens_split (str, NM_ASCII_SPACES);
+	for (i_token = 0; tokens && tokens[i_token]; i_token++) {
+		char *str_word = (char *) tokens[i_token];
+
+		any_words = TRUE;
+		if (!word0)
+			word0 = str_word;
+		else {
+			nm_assert (!word1);
+			word1 = str_word;
+		}
+
+		/* iproute2 matches keywords with any partial prefix. We don't allow
+		 * for that flexiblity. */
+
+		if (NM_IN_STRSET (word0, "from")) {
+			if (!word1)
+				continue;
+			if (word_from)
+				goto next_fail_word0_duplicate_key;
+			word_from = word1;
+			goto next_words_consumed;
+		}
+		if (NM_IN_STRSET (word0, "to")) {
+			if (!word1)
+				continue;
+			if (word_to)
+				goto next_fail_word0_duplicate_key;
+			word_to = word1;
+			goto next_words_consumed;
+		}
+		if (NM_IN_STRSET (word0, "not")) {
+			/* we accept multiple "not" specifiers. */
+			val_invert = TRUE;
+			goto next_words_consumed;
+		}
+		if (NM_IN_STRSET (word0, "priority",
+		                         "order",
+		                         "pref",
+		                         "preference")) {
+			if (!word1)
+				continue;
+			if (i64_priority != -1)
+				goto next_fail_word0_duplicate_key;
+			i64_priority = _nm_utils_ascii_str_to_int64 (word1, 0, 0, G_MAXUINT32, -1);
+			if (i64_priority == -1)
+				goto next_fail_word1_invalid_value;
+			goto next_words_consumed;
+		}
+		if (NM_IN_STRSET (word0, "table",
+		                         "lookup")) {
+			if (!word1)
+				continue;
+			if (i64_table != -1)
+				goto next_fail_word0_duplicate_key;
+			i64_table = _nm_utils_ascii_str_to_int64 (word1, 0, 1, G_MAXUINT32, -1);
+			if (i64_table == -1)
+				goto next_fail_word1_invalid_value;
+			goto next_words_consumed;
+		}
+		if (NM_IN_STRSET (word0, "tos",
+		                         "dsfield")) {
+			if (!word1)
+				continue;
+			if (i64_tos != -1)
+				goto next_fail_word0_duplicate_key;
+			i64_tos = _nm_utils_ascii_str_to_int64 (word1, 16, 0, G_MAXUINT8, -1);
+			if (i64_tos == -1)
+				goto next_fail_word1_invalid_value;
+			goto next_words_consumed;
+		}
+		if (NM_IN_STRSET (word0, "ipproto")) {
+			if (!word1)
+				continue;
+			if (i64_ipproto != -1)
+				goto next_fail_word0_duplicate_key;
+			i64_ipproto = _nm_utils_ascii_str_to_int64 (word1, 10, 0, G_MAXUINT8, -1);
+			if (i64_ipproto == -1)
+				goto next_fail_word1_invalid_value;
+			goto next_words_consumed;
+		}
+		if (NM_IN_STRSET (word0, "sport")) {
+			if (!word1)
+				continue;
+			if (i64_sport_start != -1)
+				goto next_fail_word0_duplicate_key;
+			if (!_rr_xport_range_parse (word1, &i64_sport_start, &sport_end))
+				goto next_fail_word1_invalid_value;
+			goto next_words_consumed;
+		}
+		if (NM_IN_STRSET (word0, "dport")) {
+			if (!word1)
+				continue;
+			if (i64_dport_start != -1)
+				goto next_fail_word0_duplicate_key;
+			if (!_rr_xport_range_parse (word1, &i64_dport_start, &dport_end))
+				goto next_fail_word1_invalid_value;
+			goto next_words_consumed;
+		}
+		if (NM_IN_STRSET (word0, "fwmark")) {
+			if (!word1)
+				continue;
+			if (i64_fwmark != -1)
+				goto next_fail_word0_duplicate_key;
+			s = strchr (word1, '/');
+			if (s)
+				*(s++) = '\0';
+			i64_fwmark = _nm_utils_ascii_str_to_int64 (word1, 0, 0, G_MAXUINT32, -1);
+			if (i64_fwmark == -1)
+				goto next_fail_word1_invalid_value;
+			if (s) {
+				i64_fwmask = _nm_utils_ascii_str_to_int64 (s, 0, 0, G_MAXUINT32, -1);
+				if (i64_fwmask == -1)
+					goto next_fail_word1_invalid_value;
+			} else
+				i64_fwmask = 0xFFFFFFFFu;
+			goto next_words_consumed;
+		}
+		if (NM_IN_STRSET (word0, "iif",
+		                         "dev")) {
+			if (!word1)
+				continue;
+			if (word_iifname)
+				goto next_fail_word0_duplicate_key;
+			word_iifname = word1;
+			goto next_words_consumed;
+		}
+		if (NM_IN_STRSET (word0, "oif")) {
+			if (!word1)
+				continue;
+			if (word_oifname)
+				goto next_fail_word0_duplicate_key;
+			word_oifname = word1;
+			goto next_words_consumed;
+		}
+
+		/* also the action is still unsupported. For the moment, we only support
+		 * FR_ACT_TO_TBL, which is the default (by not expressing it on the command
+		 * line). */
+		g_set_error (error, NM_CONNECTION_ERROR, NM_CONNECTION_ERROR_FAILED,
+		             _("unsupported key \"%s\""),
+		             word0);
+		return FALSE;
+next_fail_word0_duplicate_key:
+		g_set_error (error, NM_CONNECTION_ERROR, NM_CONNECTION_ERROR_FAILED,
+		             _("duplicate key \"%s\""),
+		             word0);
+		return FALSE;
+next_fail_word1_invalid_value:
+		g_set_error (error, NM_CONNECTION_ERROR, NM_CONNECTION_ERROR_FAILED,
+		             _("invalid value for \"%s\""),
+		             word0);
+		return FALSE;
+next_words_consumed:
+		word0 = NULL;
+		word1 = NULL;
+	}
+
+	if (!any_words) {
+		g_set_error_literal (error, NM_CONNECTION_ERROR, NM_CONNECTION_ERROR_FAILED,
+		                     _("empty text does not describe a rule"));
+		return FALSE;
+	}
+
+	if (word0) {
+		g_set_error (error, NM_CONNECTION_ERROR, NM_CONNECTION_ERROR_FAILED,
+		             _("missing argument for \"%s\""),
+		             word0);
+		return FALSE;
+	}
+
+	if (!NM_IN_STRSET (word_from, NULL, "all")) {
+		if (!nm_utils_parse_inaddr_prefix_bin (addr_family,
+		                                       word_from,
+		                                       &addr_family,
+		                                       &val_from,
+		                                       &val_from_len)) {
+			g_set_error_literal (error, NM_CONNECTION_ERROR, NM_CONNECTION_ERROR_FAILED,
+			                     _("invalid \"from\" part"));
+			return FALSE;
+		}
+		if (val_from_len == -1)
+			val_from_len = nm_utils_addr_family_to_size (addr_family) * 8;
+	}
+
+	if (!NM_IN_STRSET (word_to, NULL, "all")) {
+		if (!nm_utils_parse_inaddr_prefix_bin (addr_family,
+		                                       word_to,
+		                                       &addr_family,
+		                                       &val_to,
+		                                       &val_to_len)) {
+			g_set_error_literal (error, NM_CONNECTION_ERROR, NM_CONNECTION_ERROR_FAILED,
+			                     _("invalid \"to\" part"));
+			return FALSE;
+		}
+		if (val_to_len == -1)
+			val_to_len = nm_utils_addr_family_to_size (addr_family) * 8;
+	}
+
+	if (!NM_IN_SET (addr_family, AF_INET, AF_INET6)) {
+		g_set_error (error, NM_CONNECTION_ERROR, NM_CONNECTION_ERROR_FAILED,
+		             _("cannot detect address family for rule"));
+		return FALSE;
+	}
+
+	self = nm_ip_routing_rule_new (addr_family);
+
+	if (val_invert)
+		self->invert = TRUE;
+
+	if (i64_priority != -1)
+		nm_ip_routing_rule_set_priority (self, i64_priority);
+
+	if (i64_tos != -1)
+		nm_ip_routing_rule_set_tos (self, i64_tos);
+
+	if (i64_ipproto != -1)
+		nm_ip_routing_rule_set_ipproto (self, i64_ipproto);
+
+	if (i64_fwmark != -1)
+		nm_ip_routing_rule_set_fwmark (self, i64_fwmark, i64_fwmask);
+
+	if (i64_sport_start != -1)
+		nm_ip_routing_rule_set_source_port (self, i64_sport_start, sport_end);
+
+	if (i64_dport_start != -1)
+		nm_ip_routing_rule_set_destination_port (self, i64_dport_start, dport_end);
+
+	if (   val_from_len > 0
+	    || (   val_from_len == 0
+	        && !nm_ip_addr_is_null (addr_family, &val_from))) {
+		nm_ip_routing_rule_set_from_bin (self,
+		                                 &val_from,
+		                                 val_from_len);
+	}
+
+	if (   val_to_len > 0
+	    || (   val_to_len == 0
+	        && !nm_ip_addr_is_null (addr_family, &val_to))) {
+		nm_ip_routing_rule_set_to_bin (self,
+		                               &val_to,
+		                               val_to_len);
+	}
+
+	if (word_iifname)
+		nm_ip_routing_rule_set_iifname (self, word_iifname);
+
+	if (word_oifname)
+		nm_ip_routing_rule_set_oifname (self, word_oifname);
+
+	if (i64_table != -1)
+		nm_ip_routing_rule_set_table (self, i64_table);
+
+	if (NM_FLAGS_HAS (to_string_flags, NM_IP_ROUTING_RULE_AS_STRING_FLAGS_VALIDATE)) {
+		gs_free_error GError *local = NULL;
+
+		if (!nm_ip_routing_rule_validate (self, &local)) {
+			g_set_error (error, NM_CONNECTION_ERROR, NM_CONNECTION_ERROR_FAILED,
+			             _("rule is invalid: %s"),
+			             local->message);
+			return NULL;
+		}
+	}
+
+	return g_steal_pointer (&self);
+}
+
+static void
+_rr_string_append_inet_addr (GString *str,
+                             gboolean is_from /* or else is-to */,
+                             gboolean required,
+                             int addr_family,
+                             const NMIPAddr *addr_bin,
+                             guint8 addr_len)
+{
+	char addr_str[NM_UTILS_INET_ADDRSTRLEN];
+
+	if (addr_len == 0) {
+		if (required) {
+			g_string_append_printf (nm_gstring_add_space_delimiter (str),
+			                        "%s %s/0",
+			                        is_from ? "from" : "to",
+			                          (addr_family == AF_INET)
+			                        ? "0.0.0.0"
+			                        : "::");
+		}
+		return;
+	}
+
+	g_string_append_printf (nm_gstring_add_space_delimiter (str),
+	                        "%s %s",
+	                        is_from ? "from" : "to",
+	                        nm_utils_inet_ntop (addr_family,
+	                                            addr_bin,
+	                                            addr_str));
+	if (addr_len != nm_utils_addr_family_to_size (addr_family) * 8) {
+		g_string_append_printf (str,
+		                        "/%u",
+		                        addr_len);
+	}
+}
+
+/**
+ * nm_ip_routing_rule_to_string:
+ * @self: the #NMIPRoutingRule instance to convert to string.
+ * @to_string_flags: #NMIPRoutingRuleAsStringFlags for controlling the
+ *   string conversion.
+ * @extra_args: (allow-none): extra arguments for controlling the string
+ *   conversion. Currently not extra arguments are supported.
+ * @error: (allow-none) (out): the error reason.
+ *
+ * Returns: (transfer full): the string representation or %NULL on error.
+ *
+ * Since: 1.18
+ */
+char *
+nm_ip_routing_rule_to_string (const NMIPRoutingRule *self,
+                              NMIPRoutingRuleAsStringFlags to_string_flags,
+                              GHashTable *extra_args,
+                              GError **error)
+{
+	nm_auto_free_gstring GString *str = NULL;
+	int addr_family;
+
+	g_return_val_if_fail (NM_IS_IP_ROUTING_RULE (self, TRUE), NULL);
+
+	if (!_rr_string_validate (FALSE, to_string_flags, extra_args, error))
+		return NULL;
+
+	addr_family = nm_ip_routing_rule_get_addr_family (self);
+
+	if (!NM_IN_SET (_rr_string_addr_family_from_flags (to_string_flags),
+	                AF_UNSPEC,
+	                addr_family)) {
+		g_set_error_literal (error, NM_CONNECTION_ERROR, NM_CONNECTION_ERROR_FAILED,
+		                     _("invalid address family"));
+		return NULL;
+	}
+
+	/* It is only guaranteed that valid rules can be expressed as string.
+	 *
+	 * Still, unless requested proceed to convert to string without validating and
+	 * hope for the best.
+	 *
+	 * That is, because self->from_str might contain an invalid IP address (indicated
+	 * by self->from_valid). But we don't support serializing such arbitrary strings
+	 * as "from %s". */
+	if (NM_FLAGS_HAS (to_string_flags, NM_IP_ROUTING_RULE_AS_STRING_FLAGS_VALIDATE)) {
+		gs_free_error GError *local = NULL;
+
+		if (!nm_ip_routing_rule_validate (self, &local)) {
+			g_set_error (error, NM_CONNECTION_ERROR, NM_CONNECTION_ERROR_FAILED,
+			             _("rule is invalid: %s"),
+			             local->message);
+			return NULL;
+		}
+	}
+
+	str = g_string_sized_new (30);
+
+	if (self->invert)
+		g_string_append (str, "not");
+
+	if (self->priority_has) {
+		g_string_append_printf (nm_gstring_add_space_delimiter (str),
+		                        "priority %u",
+		                        (guint) self->priority);
+	}
+
+	_rr_string_append_inet_addr (str,
+	                             TRUE,
+	                             (   !self->to_has
+	                              || !self->to_valid),
+	                             addr_family,
+	                             &self->from_bin,
+	                               (self->from_has && self->from_valid)
+	                             ? self->from_len
+	                             : 0);
+
+	_rr_string_append_inet_addr (str,
+	                             FALSE,
+	                             FALSE,
+	                             addr_family,
+	                             &self->to_bin,
+	                               (self->to_has && self->to_valid)
+	                             ? self->to_len
+	                             : 0);
+
+	if (self->tos != 0) {
+		g_string_append_printf (nm_gstring_add_space_delimiter (str),
+		                        "tos 0x%02x",
+		                        (guint) self->tos);
+	}
+
+	if (self->ipproto != 0) {
+		g_string_append_printf (nm_gstring_add_space_delimiter (str),
+		                        "ipproto %u",
+		                        (guint) self->ipproto);
+	}
+
+	if (   self->fwmark != 0
+	    || self->fwmask != 0) {
+		if (self->fwmark != 0) {
+			g_string_append_printf (nm_gstring_add_space_delimiter (str),
+			                        "fwmark 0x%x",
+			                        self->fwmark);
+		} else {
+			g_string_append_printf (nm_gstring_add_space_delimiter (str),
+			                        "fwmark 0");
+		}
+		if (self->fwmask != 0xFFFFFFFFu) {
+			if (self->fwmask != 0)
+				g_string_append_printf (str, "/0x%x", self->fwmask);
+			else
+				g_string_append_printf (str, "/0");
+		}
+	}
+
+	if (   self->sport_start != 0
+	    || self->sport_end != 0) {
+		g_string_append_printf (nm_gstring_add_space_delimiter (str),
+		                        "sport %u",
+		                        self->sport_start);
+		if (self->sport_start != self->sport_end) {
+			g_string_append_printf (str,
+			                        "-%u",
+			                        self->sport_end);
+		}
+	}
+
+	if (   self->dport_start != 0
+	    || self->dport_end != 0) {
+		g_string_append_printf (nm_gstring_add_space_delimiter (str),
+		                        "dport %u",
+		                        self->dport_start);
+		if (self->dport_start != self->dport_end) {
+			g_string_append_printf (str,
+			                        "-%u",
+			                        self->dport_end);
+		}
+	}
+
+	if (self->iifname) {
+		g_string_append (nm_gstring_add_space_delimiter (str),
+		                 "iif ");
+		nm_utils_escaped_tokens_escape_gstr (self->iifname,
+		                                     NM_ASCII_SPACES,
+		                                     str);
+	}
+
+	if (self->oifname) {
+		g_string_append (nm_gstring_add_space_delimiter (str),
+		                 "oif ");
+		nm_utils_escaped_tokens_escape_gstr (self->oifname,
+		                                     NM_ASCII_SPACES,
+		                                     str);
+	}
+
+	if (self->table != 0) {
+		g_string_append_printf (nm_gstring_add_space_delimiter (str),
+		                        "table %u",
+		                        (guint) self->table);
+	}
+
+	return g_string_free (g_steal_pointer (&str), FALSE);
+}
+
+/*****************************************************************************/
+
 NM_GOBJECT_PROPERTIES_DEFINE (NMSettingIPConfig,
 	PROP_METHOD,
 	PROP_DNS,
@@ -1413,6 +3519,7 @@ typedef struct {
 	int dns_priority;
 	GPtrArray *addresses;  /* array of NMIPAddress */
 	GPtrArray *routes;     /* array of NMIPRoute */
+	GPtrArray *routing_rules;
 	gint64 route_metric;
 	guint32 route_table;
 	char *gateway;
@@ -2314,6 +4421,225 @@ nm_setting_ip_config_get_route_table (NMSettingIPConfig *setting)
 	return NM_SETTING_IP_CONFIG_GET_PRIVATE (setting)->route_table;
 }
 
+/*****************************************************************************/
+
+static void
+_routing_rules_notify (NMSettingIPConfig *setting)
+{
+	_nm_setting_emit_property_changed (NM_SETTING (setting));
+}
+
+/**
+ * nm_setting_ip_config_get_num_routing_rules:
+ * @setting: the #NMSettingIPConfig
+ *
+ * Returns: the number of configured routing rules
+ *
+ * Since: 1.18
+ **/
+guint
+nm_setting_ip_config_get_num_routing_rules (NMSettingIPConfig *setting)
+{
+	NMSettingIPConfigPrivate *priv;
+
+	g_return_val_if_fail (NM_IS_SETTING_IP_CONFIG (setting), 0);
+
+	priv = NM_SETTING_IP_CONFIG_GET_PRIVATE (setting);
+	return priv->routing_rules ? priv->routing_rules->len : 0u;
+}
+
+/**
+ * nm_setting_ip_config_get_routing_rule:
+ * @setting: the #NMSettingIPConfig
+ * @idx: index number of the routing_rule to return
+ *
+ * Returns: (transfer none): the routing rule at index @idx
+ *
+ * Since: 1.18
+ **/
+NMIPRoutingRule *
+nm_setting_ip_config_get_routing_rule (NMSettingIPConfig *setting, guint idx)
+{
+	NMSettingIPConfigPrivate *priv;
+
+	g_return_val_if_fail (NM_IS_SETTING_IP_CONFIG (setting), NULL);
+
+	priv = NM_SETTING_IP_CONFIG_GET_PRIVATE (setting);
+
+	g_return_val_if_fail (priv->routing_rules && idx < priv->routing_rules->len, NULL);
+
+	return priv->routing_rules->pdata[idx];
+}
+
+/**
+ * nm_setting_ip_config_add_routing_rule:
+ * @setting: the #NMSettingIPConfig
+ * @routing_rule: the #NMIPRoutingRule to add. The address family
+ *   of the added rule must be compatible with the setting.
+ *
+ * Appends a new routing-rule and associated information to the setting. The
+ * given routing rules gets sealed and the reference count is incremented.
+ * The function does not check whether an identical rule already exists
+ * and always appends the rule to the end of the list.
+ *
+ * Since: 1.18
+ **/
+void
+nm_setting_ip_config_add_routing_rule (NMSettingIPConfig *setting,
+                                       NMIPRoutingRule *routing_rule)
+{
+	NMSettingIPConfigPrivate *priv;
+
+	g_return_if_fail (NM_IS_SETTING_IP_CONFIG (setting));
+	g_return_if_fail (NM_IS_IP_ROUTING_RULE (routing_rule, TRUE));
+	g_return_if_fail (_ip_routing_rule_get_addr_family (routing_rule) == NM_SETTING_IP_CONFIG_GET_FAMILY (setting));
+
+	priv = NM_SETTING_IP_CONFIG_GET_PRIVATE (setting);
+
+	if (!priv->routing_rules)
+		priv->routing_rules = g_ptr_array_new_with_free_func ((GDestroyNotify) nm_ip_routing_rule_unref);
+
+	nm_ip_routing_rule_seal (routing_rule);
+	g_ptr_array_add (priv->routing_rules, nm_ip_routing_rule_ref (routing_rule));
+	_routing_rules_notify (setting);
+}
+
+/**
+ * nm_setting_ip_config_remove_routing_rule:
+ * @setting: the #NMSettingIPConfig
+ * @idx: index number of the routing_rule
+ *
+ * Removes the routing_rule at index @idx.
+ *
+ * Since: 1.18
+ **/
+void
+nm_setting_ip_config_remove_routing_rule (NMSettingIPConfig *setting,
+                                          guint idx)
+{
+	NMSettingIPConfigPrivate *priv;
+
+	g_return_if_fail (NM_IS_SETTING_IP_CONFIG (setting));
+
+	priv = NM_SETTING_IP_CONFIG_GET_PRIVATE (setting);
+	g_return_if_fail (priv->routing_rules && idx < priv->routing_rules->len);
+
+	g_ptr_array_remove_index (priv->routing_rules, idx);
+	_routing_rules_notify (setting);
+}
+
+/**
+ * nm_setting_ip_config_clear_routing_rules:
+ * @setting: the #NMSettingIPConfig
+ *
+ * Removes all configured routing rules.
+ *
+ * Since: 1.18
+ **/
+void
+nm_setting_ip_config_clear_routing_rules (NMSettingIPConfig *setting)
+{
+	NMSettingIPConfigPrivate *priv = NM_SETTING_IP_CONFIG_GET_PRIVATE (setting);
+
+	g_return_if_fail (NM_IS_SETTING_IP_CONFIG (setting));
+
+	if (   priv->routing_rules
+	    && priv->routing_rules->len > 0) {
+		g_ptr_array_set_size (priv->routing_rules, 0);
+		_routing_rules_notify (setting);
+	}
+}
+
+static GVariant *
+_routing_rules_dbus_only_synth (const NMSettInfoSetting *sett_info,
+                                guint property_idx,
+                                NMConnection *connection,
+                                NMSetting *setting,
+                                NMConnectionSerializationFlags flags)
+{
+	NMSettingIPConfig *self = NM_SETTING_IP_CONFIG (setting);
+	NMSettingIPConfigPrivate *priv;
+	GVariantBuilder builder;
+	gboolean any = FALSE;
+	guint i;
+
+	priv = NM_SETTING_IP_CONFIG_GET_PRIVATE (self);
+
+	if (   !priv->routing_rules
+	    || priv->routing_rules->len == 0)
+		return NULL;
+
+	for (i = 0; i < priv->routing_rules->len; i++) {
+		GVariant *variant;
+
+		variant = nm_ip_routing_rule_to_dbus (priv->routing_rules->pdata[i]);
+		if (!variant)
+			continue;
+
+		if (!any) {
+			any = TRUE;
+			g_variant_builder_init (&builder, G_VARIANT_TYPE ("aa{sv}"));
+		}
+		g_variant_builder_add (&builder, "@a{sv}", variant);
+	}
+
+	return any ? g_variant_builder_end (&builder) : NULL;
+}
+
+static gboolean
+_routing_rules_dbus_only_set (NMSetting     *setting,
+                              GVariant      *connection_dict,
+                              const char    *property,
+                              GVariant      *value,
+                              NMSettingParseFlags parse_flags,
+                              GError       **error)
+{
+	GVariantIter iter_rules;
+	GVariant *rule_var;
+	guint i_rule;
+	gboolean success = FALSE;
+	gboolean rules_changed = FALSE;
+
+	nm_assert (g_variant_is_of_type (value, G_VARIANT_TYPE ("aa{sv}")));
+
+	g_variant_iter_init (&iter_rules, value);
+
+	i_rule = 0;
+	while (g_variant_iter_next (&iter_rules, "@a{sv}", &rule_var)) {
+		_nm_unused gs_unref_variant GVariant *rule_var_unref = rule_var;
+		nm_auto_unref_ip_routing_rule NMIPRoutingRule *rule = NULL;
+		gs_free_error GError *local = NULL;
+
+		i_rule++;
+
+		rule = nm_ip_routing_rule_from_dbus (rule_var,
+		                                     NM_FLAGS_HAS (parse_flags, NM_SETTING_PARSE_FLAGS_STRICT),
+		                                     &local);
+		if (!rule) {
+			if (NM_FLAGS_HAS (parse_flags, NM_SETTING_PARSE_FLAGS_STRICT)) {
+				g_set_error (error, NM_CONNECTION_ERROR, NM_CONNECTION_ERROR_MISSING_PROPERTY,
+				             _("rule #%u is invalid: %s"),
+				             i_rule,
+				             local->message);
+				goto out;
+			}
+			continue;
+		}
+
+		nm_setting_ip_config_add_routing_rule (NM_SETTING_IP_CONFIG (setting), rule);
+		rules_changed = TRUE;
+	}
+
+	success = TRUE;
+
+out:
+	if (rules_changed)
+		_routing_rules_notify (NM_SETTING_IP_CONFIG (setting));
+	return success;
+}
+
+/*****************************************************************************/
+
 /**
  * nm_setting_ip_config_get_ignore_auto_routes:
  * @setting: the #NMSettingIPConfig
@@ -2600,6 +4926,33 @@ verify (NMSetting *setting, NMConnection *connection, GError **error)
 		}
 	}
 
+	if (priv->routing_rules) {
+		for (i = 0; i < priv->routing_rules->len; i++) {
+			NMIPRoutingRule *rule = priv->routing_rules->pdata[i];
+			gs_free_error GError *local = NULL;
+
+			if (_ip_routing_rule_get_addr_family (rule) != NM_SETTING_IP_CONFIG_GET_FAMILY (setting)) {
+				g_set_error (error,
+				             NM_CONNECTION_ERROR,
+				             NM_CONNECTION_ERROR_INVALID_PROPERTY,
+				             _("%u. rule has wrong address-family"),
+				             i + 1);
+				g_prefix_error (error, "%s.%s: ", nm_setting_get_name (setting), NM_SETTING_IP_CONFIG_ROUTING_RULES);
+				return FALSE;
+			}
+			if (!nm_ip_routing_rule_validate (rule, &local)) {
+				g_set_error (error,
+				             NM_CONNECTION_ERROR,
+				             NM_CONNECTION_ERROR_INVALID_PROPERTY,
+				             _("%u. rule is invalid: %s"),
+				             i + 1,
+				             local->message);
+				g_prefix_error (error, "%s.%s: ", nm_setting_get_name (setting), NM_SETTING_IP_CONFIG_ROUTES);
+				return FALSE;
+			}
+		}
+	}
+
 	if (priv->gateway && priv->never_default) {
 		g_set_error (error,
 		             NM_CONNECTION_ERROR,
@@ -2654,6 +5007,24 @@ compare_property (const NMSettInfoSetting *sett_info,
 		return TRUE;
 	}
 
+	if (nm_streq (sett_info->property_infos[property_idx].name, NM_SETTING_IP_CONFIG_ROUTING_RULES)) {
+		if (other) {
+			guint n;
+
+			a_priv = NM_SETTING_IP_CONFIG_GET_PRIVATE (setting);
+			b_priv = NM_SETTING_IP_CONFIG_GET_PRIVATE (other);
+
+			n = (a_priv->routing_rules) ? a_priv->routing_rules->len : 0u;
+			if (n != (b_priv->routing_rules ? b_priv->routing_rules->len : 0u))
+				return FALSE;
+			for (i = 0; i < n; i++) {
+				if (nm_ip_routing_rule_cmp (a_priv->routing_rules->pdata[i], b_priv->routing_rules->pdata[i]) != 0)
+					return FALSE;
+			}
+		}
+		return TRUE;
+	}
+
 	return NM_SETTING_CLASS (nm_setting_ip_config_parent_class)->compare_property (sett_info,
 	                                                                               property_idx,
 	                                                                               setting,
@@ -2661,6 +5032,72 @@ compare_property (const NMSettInfoSetting *sett_info,
 	                                                                               flags);
 }
 
+static void
+duplicate_copy_properties (const NMSettInfoSetting *sett_info,
+                           NMSetting *src,
+                           NMSetting *dst)
+{
+	NMSettingIPConfigPrivate *priv_src = NM_SETTING_IP_CONFIG_GET_PRIVATE (src);
+	NMSettingIPConfigPrivate *priv_dst = NM_SETTING_IP_CONFIG_GET_PRIVATE (dst);
+	guint i;
+	gboolean changed = FALSE;
+
+	NM_SETTING_CLASS (nm_setting_ip_config_parent_class)->duplicate_copy_properties (sett_info,
+	                                                                                 src,
+	                                                                                 dst);
+
+	if (   priv_dst->routing_rules
+	    && priv_dst->routing_rules->len > 0) {
+		changed = TRUE;
+		g_ptr_array_set_size (priv_dst->routing_rules, 0);
+	}
+	if (   priv_src->routing_rules
+	    && priv_src->routing_rules->len > 0) {
+		changed = TRUE;
+		if (!priv_dst->routing_rules)
+			priv_dst->routing_rules = g_ptr_array_new_with_free_func ((GDestroyNotify) nm_ip_routing_rule_unref);
+		for (i = 0; i < priv_src->routing_rules->len; i++) {
+			g_ptr_array_add (priv_dst->routing_rules,
+			                 nm_ip_routing_rule_ref (priv_src->routing_rules->pdata[i]));
+		}
+	}
+	if (changed)
+		_routing_rules_notify (NM_SETTING_IP_CONFIG (dst));
+}
+
+static void
+enumerate_values (const NMSettInfoProperty *property_info,
+                  NMSetting *setting,
+                  NMSettingValueIterFn func,
+                  gpointer user_data)
+{
+	if (nm_streq (property_info->name, NM_SETTING_IP_CONFIG_ROUTING_RULES)) {
+		NMSettingIPConfigPrivate *priv = NM_SETTING_IP_CONFIG_GET_PRIVATE (setting);
+		nm_auto_unset_gvalue GValue value = G_VALUE_INIT;
+		GPtrArray *ptr = NULL;
+		guint i;
+
+		if (priv->routing_rules && priv->routing_rules->len > 0) {
+			ptr = g_ptr_array_new_with_free_func ((GDestroyNotify) nm_ip_routing_rule_unref);
+			for (i = 0; i < priv->routing_rules->len; i++)
+				g_ptr_array_add (ptr, nm_ip_routing_rule_ref (priv->routing_rules->pdata[i]));
+		}
+		g_value_init (&value, G_TYPE_PTR_ARRAY);
+		g_value_take_boxed (&value, ptr);
+		func (setting,
+		      property_info->name,
+		      &value,
+		      0,
+		      user_data);
+		return;
+	}
+
+	NM_SETTING_CLASS (nm_setting_ip_config_parent_class)->enumerate_values (property_info,
+	                                                                        setting,
+	                                                                        func,
+	                                                                        user_data);
+}
+
 /*****************************************************************************/
 
 static gboolean
@@ -2693,6 +5130,18 @@ _nm_sett_info_property_override_create_array_ip_config (void)
 	                                   ip_gateway_set,
 	                                   NULL);
 
+	/* ---dbus---
+	 * property: routing-rules
+	 * format: array of 'a{sv}'
+	 * description: Array of dictionaries for routing rules.
+	 * ---end---
+	 */
+	_properties_override_add_dbus_only (properties_override,
+	                                    NM_SETTING_IP_CONFIG_ROUTING_RULES,
+	                                    G_VARIANT_TYPE ("aa{sv}"),
+	                                    _routing_rules_dbus_only_synth,
+	                                    _routing_rules_dbus_only_set);
+
 	return properties_override;
 }
 
@@ -2900,6 +5349,8 @@ finalize (GObject *object)
 		g_ptr_array_unref (priv->dns_options);
 	g_ptr_array_unref (priv->addresses);
 	g_ptr_array_unref (priv->routes);
+	if (priv->routing_rules)
+		g_ptr_array_unref (priv->routing_rules);
 
 	G_OBJECT_CLASS (nm_setting_ip_config_parent_class)->finalize (object);
 }
@@ -2916,8 +5367,10 @@ nm_setting_ip_config_class_init (NMSettingIPConfigClass *klass)
 	object_class->set_property = set_property;
 	object_class->finalize     = finalize;
 
-	setting_class->verify           = verify;
-	setting_class->compare_property = compare_property;
+	setting_class->verify                    = verify;
+	setting_class->compare_property          = compare_property;
+	setting_class->duplicate_copy_properties = duplicate_copy_properties;
+	setting_class->enumerate_values          = enumerate_values;
 
 	/**
 	 * NMSettingIPConfig:method:
diff --git a/libnm-core/nm-setting-ip-config.h b/libnm-core/nm-setting-ip-config.h
index 39cb36a4..76a94914 100644
--- a/libnm-core/nm-setting-ip-config.h
+++ b/libnm-core/nm-setting-ip-config.h
@@ -159,6 +159,155 @@ gboolean     nm_ip_route_attribute_validate  (const char *name,
 #define NM_IP_ROUTE_ATTRIBUTE_LOCK_INITRWND  "lock-initrwnd"
 #define NM_IP_ROUTE_ATTRIBUTE_LOCK_MTU       "lock-mtu"
 
+/*****************************************************************************/
+
+typedef struct NMIPRoutingRule NMIPRoutingRule;
+
+NM_AVAILABLE_IN_1_18
+GType nm_ip_routing_rule_get_type (void);
+
+NM_AVAILABLE_IN_1_18
+NMIPRoutingRule *nm_ip_routing_rule_new (int addr_family);
+
+NM_AVAILABLE_IN_1_18
+NMIPRoutingRule *nm_ip_routing_rule_new_clone (const NMIPRoutingRule *rule);
+
+NM_AVAILABLE_IN_1_18
+NMIPRoutingRule *nm_ip_routing_rule_ref (NMIPRoutingRule *self);
+NM_AVAILABLE_IN_1_18
+void nm_ip_routing_rule_unref (NMIPRoutingRule *self);
+
+NM_AVAILABLE_IN_1_18
+gboolean nm_ip_routing_rule_is_sealed (const NMIPRoutingRule *self);
+NM_AVAILABLE_IN_1_18
+void nm_ip_routing_rule_seal (NMIPRoutingRule *self);
+
+NM_AVAILABLE_IN_1_18
+int nm_ip_routing_rule_get_addr_family (const NMIPRoutingRule *self);
+
+NM_AVAILABLE_IN_1_18
+gboolean nm_ip_routing_rule_get_invert (const NMIPRoutingRule *self);
+NM_AVAILABLE_IN_1_18
+void nm_ip_routing_rule_set_invert (NMIPRoutingRule *self, gboolean invert);
+
+NM_AVAILABLE_IN_1_18
+gint64 nm_ip_routing_rule_get_priority (const NMIPRoutingRule *self);
+NM_AVAILABLE_IN_1_18
+void nm_ip_routing_rule_set_priority (NMIPRoutingRule *self, gint64 priority);
+
+NM_AVAILABLE_IN_1_18
+guint8 nm_ip_routing_rule_get_tos (const NMIPRoutingRule *self);
+NM_AVAILABLE_IN_1_18
+void nm_ip_routing_rule_set_tos (NMIPRoutingRule *self, guint8 tos);
+
+NM_AVAILABLE_IN_1_18
+guint8 nm_ip_routing_rule_get_ipproto (const NMIPRoutingRule *self);
+NM_AVAILABLE_IN_1_18
+void nm_ip_routing_rule_set_ipproto (NMIPRoutingRule *self, guint8 ipproto);
+
+NM_AVAILABLE_IN_1_18
+guint16 nm_ip_routing_rule_get_source_port_start (const NMIPRoutingRule *self);
+NM_AVAILABLE_IN_1_18
+guint16 nm_ip_routing_rule_get_source_port_end (const NMIPRoutingRule *self);
+NM_AVAILABLE_IN_1_18
+void nm_ip_routing_rule_set_source_port (NMIPRoutingRule *self, guint16 start, guint16 end);
+
+NM_AVAILABLE_IN_1_18
+guint16 nm_ip_routing_rule_get_destination_port_start (const NMIPRoutingRule *self);
+NM_AVAILABLE_IN_1_18
+guint16 nm_ip_routing_rule_get_destination_port_end (const NMIPRoutingRule *self);
+NM_AVAILABLE_IN_1_18
+void nm_ip_routing_rule_set_destination_port (NMIPRoutingRule *self, guint16 start, guint16 end);
+
+NM_AVAILABLE_IN_1_18
+guint32 nm_ip_routing_rule_get_fwmark (const NMIPRoutingRule *self);
+NM_AVAILABLE_IN_1_18
+guint32 nm_ip_routing_rule_get_fwmask (const NMIPRoutingRule *self);
+NM_AVAILABLE_IN_1_18
+void nm_ip_routing_rule_set_fwmark (NMIPRoutingRule *self, guint32 fwmark, guint32 fwmask);
+
+NM_AVAILABLE_IN_1_18
+guint8 nm_ip_routing_rule_get_from_len (const NMIPRoutingRule *self);
+NM_AVAILABLE_IN_1_18
+const char *nm_ip_routing_rule_get_from (const NMIPRoutingRule *self);
+NM_AVAILABLE_IN_1_18
+void nm_ip_routing_rule_set_from (NMIPRoutingRule *self,
+                                  const char *from,
+                                  guint8 len);
+
+NM_AVAILABLE_IN_1_18
+guint8 nm_ip_routing_rule_get_to_len (const NMIPRoutingRule *self);
+NM_AVAILABLE_IN_1_18
+const char *nm_ip_routing_rule_get_to (const NMIPRoutingRule *self);
+NM_AVAILABLE_IN_1_18
+void nm_ip_routing_rule_set_to (NMIPRoutingRule *self,
+                                const char *to,
+                                guint8 len);
+
+NM_AVAILABLE_IN_1_18
+const char *nm_ip_routing_rule_get_iifname (const NMIPRoutingRule *self);
+NM_AVAILABLE_IN_1_18
+void nm_ip_routing_rule_set_iifname (NMIPRoutingRule *self, const char *iifname);
+
+NM_AVAILABLE_IN_1_18
+const char *nm_ip_routing_rule_get_oifname (const NMIPRoutingRule *self);
+NM_AVAILABLE_IN_1_18
+void nm_ip_routing_rule_set_oifname (NMIPRoutingRule *self, const char *oifname);
+
+NM_AVAILABLE_IN_1_18
+guint8 nm_ip_routing_rule_get_action (const NMIPRoutingRule *self);
+NM_AVAILABLE_IN_1_18
+void nm_ip_routing_rule_set_action (NMIPRoutingRule *self, guint8 action);
+
+NM_AVAILABLE_IN_1_18
+guint32 nm_ip_routing_rule_get_table (const NMIPRoutingRule *self);
+NM_AVAILABLE_IN_1_18
+void nm_ip_routing_rule_set_table (NMIPRoutingRule *self, guint32 table);
+
+NM_AVAILABLE_IN_1_18
+int nm_ip_routing_rule_cmp (const NMIPRoutingRule *rule,
+                            const NMIPRoutingRule *other);
+
+NM_AVAILABLE_IN_1_18
+gboolean nm_ip_routing_rule_validate (const NMIPRoutingRule *self,
+                                      GError **error);
+
+/**
+ * NMIPRoutingRuleAsStringFlags:
+ * @NM_IP_ROUTING_RULE_AS_STRING_FLAGS_NONE: no flags selected.
+ * @NM_IP_ROUTING_RULE_AS_STRING_FLAGS_AF_INET: whether to allow parsing
+ *   IPv4 addresses.
+ * @NM_IP_ROUTING_RULE_AS_STRING_FLAGS_AF_INET6: whether to allow parsing
+ *   IPv6 addresses. If both @NM_IP_ROUTING_RULE_AS_STRING_FLAGS_AF_INET and
+ *   @NM_IP_ROUTING_RULE_AS_STRING_FLAGS_AF_INET6 are unset, it's the same
+ *   as setting them both.
+ * @NM_IP_ROUTING_RULE_AS_STRING_FLAGS_VALIDATE: if set, ensure that the
+ *   rule verfies or fail.
+ *
+ * Since: 1.18
+ */
+typedef enum { /*< flags >*/
+	NM_IP_ROUTING_RULE_AS_STRING_FLAGS_NONE     = 0,
+
+	NM_IP_ROUTING_RULE_AS_STRING_FLAGS_AF_INET  = 0x1,
+	NM_IP_ROUTING_RULE_AS_STRING_FLAGS_AF_INET6 = 0x2,
+	NM_IP_ROUTING_RULE_AS_STRING_FLAGS_VALIDATE = 0x4,
+} NMIPRoutingRuleAsStringFlags;
+
+NM_AVAILABLE_IN_1_18
+NMIPRoutingRule *nm_ip_routing_rule_from_string (const char *str,
+                                                 NMIPRoutingRuleAsStringFlags to_string_flags,
+                                                 GHashTable *extra_args,
+                                                 GError **error);
+
+NM_AVAILABLE_IN_1_18
+char *nm_ip_routing_rule_to_string (const NMIPRoutingRule *self,
+                                    NMIPRoutingRuleAsStringFlags to_string_flags,
+                                    GHashTable *extra_args,
+                                    GError **error);
+
+/*****************************************************************************/
+
 #define NM_TYPE_SETTING_IP_CONFIG            (nm_setting_ip_config_get_type ())
 #define NM_SETTING_IP_CONFIG(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_SETTING_IP_CONFIG, NMSettingIPConfig))
 #define NM_SETTING_IP_CONFIG_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_SETTING_IPCONFIG, NMSettingIPConfigClass))
@@ -187,6 +336,9 @@ gboolean     nm_ip_route_attribute_validate  (const char *name,
 #define NM_SETTING_IP_CONFIG_DAD_TIMEOUT        "dad-timeout"
 #define NM_SETTING_IP_CONFIG_DHCP_TIMEOUT       "dhcp-timeout"
 
+/* these are not real GObject properties. */
+#define NM_SETTING_IP_CONFIG_ROUTING_RULES      "routing-rules"
+
 #define NM_SETTING_DNS_OPTION_DEBUG                     "debug"
 #define NM_SETTING_DNS_OPTION_NDOTS                     "ndots"
 #define NM_SETTING_DNS_OPTION_TIMEOUT                   "timeout"
@@ -289,6 +441,20 @@ gint64        nm_setting_ip_config_get_route_metric           (NMSettingIPConfig
 NM_AVAILABLE_IN_1_10
 guint32       nm_setting_ip_config_get_route_table            (NMSettingIPConfig *setting);
 
+NM_AVAILABLE_IN_1_18
+guint         nm_setting_ip_config_get_num_routing_rules      (NMSettingIPConfig *setting);
+NM_AVAILABLE_IN_1_18
+NMIPRoutingRule *nm_setting_ip_config_get_routing_rule        (NMSettingIPConfig *setting,
+                                                               guint              idx);
+NM_AVAILABLE_IN_1_18
+void          nm_setting_ip_config_add_routing_rule           (NMSettingIPConfig *setting,
+                                                               NMIPRoutingRule   *routing_rule);
+NM_AVAILABLE_IN_1_18
+void          nm_setting_ip_config_remove_routing_rule        (NMSettingIPConfig *setting,
+                                                               guint              idx);
+NM_AVAILABLE_IN_1_18
+void          nm_setting_ip_config_clear_routing_rules        (NMSettingIPConfig *setting);
+
 gboolean      nm_setting_ip_config_get_ignore_auto_routes     (NMSettingIPConfig *setting);
 gboolean      nm_setting_ip_config_get_ignore_auto_dns        (NMSettingIPConfig *setting);
 
diff --git a/libnm-core/nm-setting-ip-tunnel.c b/libnm-core/nm-setting-ip-tunnel.c
index 9fdb5481..42c44c1c 100644
--- a/libnm-core/nm-setting-ip-tunnel.c
+++ b/libnm-core/nm-setting-ip-tunnel.c
@@ -60,7 +60,7 @@ typedef struct {
 	char *output_key;
 	guint encapsulation_limit;
 	guint flow_label;
-	guint mtu;
+	guint32 mtu;
 	guint32 flags;
 } NMSettingIPTunnelPrivate;
 
@@ -819,7 +819,7 @@ nm_setting_ip_tunnel_class_init (NMSettingIPTunnelClass *klass)
 	 **/
 	obj_properties[PROP_MTU] =
 	    g_param_spec_uint (NM_SETTING_IP_TUNNEL_MTU, "", "",
-	                       0, G_MAXUINT, 0,
+	                       0, G_MAXUINT32, 0,
 	                       G_PARAM_READWRITE |
 	                       G_PARAM_CONSTRUCT |
 	                       NM_SETTING_PARAM_FUZZY_IGNORE |
diff --git a/libnm-core/nm-setting-macsec.c b/libnm-core/nm-setting-macsec.c
index 040aa17d..19d1989e 100644
--- a/libnm-core/nm-setting-macsec.c
+++ b/libnm-core/nm-setting-macsec.c
@@ -24,7 +24,7 @@
 
 #include <stdlib.h>
 
-#include "nm-utils/nm-secret-utils.h"
+#include "nm-glib-aux/nm-secret-utils.h"
 
 #include "nm-utils.h"
 #include "nm-core-types-internal.h"
diff --git a/libnm-core/nm-setting-private.h b/libnm-core/nm-setting-private.h
index 2af74ec4..b423eb5c 100644
--- a/libnm-core/nm-setting-private.h
+++ b/libnm-core/nm-setting-private.h
@@ -26,6 +26,7 @@
 #endif
 
 #include "nm-setting.h"
+#include "nm-setting-bridge.h"
 #include "nm-connection.h"
 #include "nm-core-enum-types.h"
 
@@ -204,6 +205,9 @@ gboolean _nm_setting_should_compare_secret_property (NMSetting *setting,
                                                      const char *secret_name,
                                                      NMSettingCompareFlags flags);
 
+NMBridgeVlan *_nm_bridge_vlan_dup (const NMBridgeVlan *vlan);
+NMBridgeVlan *_nm_bridge_vlan_dup_and_seal (const NMBridgeVlan *vlan);
+
 /*****************************************************************************/
 
 #endif  /* NM_SETTING_PRIVATE_H */
diff --git a/libnm-core/nm-setting-sriov.c b/libnm-core/nm-setting-sriov.c
index 9c7306e0..b662ca2c 100644
--- a/libnm-core/nm-setting-sriov.c
+++ b/libnm-core/nm-setting-sriov.c
@@ -94,7 +94,7 @@ _vf_vlan_create_hash (void)
 }
 
 /**
- * nm_srio_vf_new:
+ * nm_sriov_vf_new:
  * @index: the VF index
  *
  * Creates a new #NMSriovVF object.
@@ -894,8 +894,10 @@ _nm_setting_sriov_sort_vfs (NMSettingSriov *setting)
 		}
 	}
 
-	if (need_sort)
+	if (need_sort) {
 		g_ptr_array_sort (setting->vfs, vf_index_compare);
+		_notify (setting, PROP_VFS);
+	}
 
 	return need_sort;
 }
diff --git a/libnm-core/nm-setting-tc-config.c b/libnm-core/nm-setting-tc-config.c
index 7425ae73..dc2f4f64 100644
--- a/libnm-core/nm-setting-tc-config.c
+++ b/libnm-core/nm-setting-tc-config.c
@@ -41,6 +41,7 @@ struct NMTCQdisc {
 	char *kind;
 	guint32 handle;
 	guint32 parent;
+	GHashTable *attributes;
 };
 
 /**
@@ -62,7 +63,15 @@ nm_tc_qdisc_new (const char *kind,
 {
 	NMTCQdisc *qdisc;
 
-	if (!kind || !*kind || strchr (kind, ' ') || strchr (kind, '\t')) {
+	if (!kind || !*kind) {
+		g_set_error (error,
+		             NM_CONNECTION_ERROR,
+		             NM_CONNECTION_ERROR_INVALID_PROPERTY,
+		             _("kind is missing"));
+		return NULL;
+	}
+
+	if (strchr (kind, ' ') || strchr (kind, '\t')) {
 		g_set_error (error,
 		             NM_CONNECTION_ERROR,
 		             NM_CONNECTION_ERROR_INVALID_PROPERTY,
@@ -122,6 +131,8 @@ nm_tc_qdisc_unref (NMTCQdisc *qdisc)
 	qdisc->refcount--;
 	if (qdisc->refcount == 0) {
 		g_free (qdisc->kind);
+		if (qdisc->attributes)
+			g_hash_table_unref (qdisc->attributes);
 		g_slice_free (NMTCQdisc, qdisc);
 	}
 }
@@ -141,6 +152,11 @@ nm_tc_qdisc_unref (NMTCQdisc *qdisc)
 gboolean
 nm_tc_qdisc_equal (NMTCQdisc *qdisc, NMTCQdisc *other)
 {
+	GHashTableIter iter;
+	const char *key;
+	GVariant *value, *value2;
+	guint n;
+
 	g_return_val_if_fail (qdisc != NULL, FALSE);
 	g_return_val_if_fail (qdisc->refcount > 0, FALSE);
 
@@ -152,19 +168,53 @@ nm_tc_qdisc_equal (NMTCQdisc *qdisc, NMTCQdisc *other)
 	    || g_strcmp0 (qdisc->kind, other->kind) != 0)
 		return FALSE;
 
+	n = qdisc->attributes ? g_hash_table_size (qdisc->attributes) : 0;
+	if (n != (other->attributes ? g_hash_table_size (other->attributes) : 0))
+		return FALSE;
+	if (n) {
+		g_hash_table_iter_init (&iter, qdisc->attributes);
+		while (g_hash_table_iter_next (&iter, (gpointer *) &key, (gpointer *) &value)) {
+			value2 = g_hash_table_lookup (other->attributes, key);
+			if (!value2)
+				return FALSE;
+			if (!g_variant_equal (value, value2))
+				return FALSE;
+		}
+	}
+
 	return TRUE;
 }
 
 static guint
 _nm_tc_qdisc_hash (NMTCQdisc *qdisc)
 {
+	gs_free const char **names = NULL;
+	GVariant *variant;
 	NMHashState h;
+	guint length;
+	guint i;
+
+	names = nm_utils_strdict_get_keys (qdisc->attributes, TRUE, &length);
 
 	nm_hash_init (&h, 43869703);
 	nm_hash_update_vals (&h,
 	                     qdisc->handle,
-	                     qdisc->parent);
+	                     qdisc->parent,
+	                     length);
 	nm_hash_update_str0 (&h, qdisc->kind);
+	for (i = 0; i < length; i++) {
+		const GVariantType *vtype;
+
+		variant = g_hash_table_lookup (qdisc->attributes, names[i]);
+
+		vtype = g_variant_get_type (variant);
+
+		nm_hash_update_str (&h, names[i]);
+		nm_hash_update_str (&h, (const char *) vtype);
+		if (g_variant_type_is_basic (vtype))
+			nm_hash_update_val (&h, g_variant_hash (variant));
+	}
+
 	return nm_hash_complete (&h);
 }
 
@@ -189,6 +239,16 @@ nm_tc_qdisc_dup (NMTCQdisc *qdisc)
 	copy = nm_tc_qdisc_new (qdisc->kind, qdisc->parent, NULL);
 	nm_tc_qdisc_set_handle (copy, qdisc->handle);
 
+	if (qdisc->attributes) {
+		GHashTableIter iter;
+		const char *key;
+		GVariant *value;
+
+		g_hash_table_iter_init (&iter, qdisc->attributes);
+		while (g_hash_table_iter_next (&iter, (gpointer *) &key, (gpointer *) &value))
+			nm_tc_qdisc_set_attribute (copy, key, value);
+	}
+
 	return copy;
 }
 
@@ -261,6 +321,85 @@ nm_tc_qdisc_get_parent (NMTCQdisc *qdisc)
 	return qdisc->parent;
 }
 
+/**
+ * nm_tc_qdisc_get_attribute_names:
+ * @qdisc: the #NMTCQdisc
+ *
+ * Gets an array of attribute names defined on @qdisc.
+ *
+ * Returns: (transfer container): a %NULL-terminated array of attribute names
+ *   or %NULL if no attributes are set.
+ *
+ * Since: 1.18
+ **/
+const char **
+nm_tc_qdisc_get_attribute_names (NMTCQdisc *qdisc)
+{
+	g_return_val_if_fail (qdisc, NULL);
+
+	return nm_utils_strdict_get_keys (qdisc->attributes, TRUE, NULL);
+}
+
+GHashTable *
+_nm_tc_qdisc_get_attributes (NMTCQdisc *qdisc)
+{
+	nm_assert (qdisc);
+
+	return qdisc->attributes;
+}
+
+/**
+ * nm_tc_qdisc_get_attribute:
+ * @qdisc: the #NMTCQdisc
+ * @name: the name of an qdisc attribute
+ *
+ * Gets the value of the attribute with name @name on @qdisc
+ *
+ * Returns: (transfer none): the value of the attribute with name @name on
+ *   @qdisc, or %NULL if @qdisc has no such attribute.
+ *
+ * Since: 1.18
+ **/
+GVariant *
+nm_tc_qdisc_get_attribute (NMTCQdisc *qdisc, const char *name)
+{
+	g_return_val_if_fail (qdisc != NULL, NULL);
+	g_return_val_if_fail (name != NULL && *name != '\0', NULL);
+
+	if (qdisc->attributes)
+		return g_hash_table_lookup (qdisc->attributes, name);
+	else
+		return NULL;
+}
+
+/**
+ * nm_tc_qdisc_set_attribute:
+ * @qdisc: the #NMTCQdisc
+ * @name: the name of an qdisc attribute
+ * @value: (transfer none) (allow-none): the value
+ *
+ * Sets or clears the named attribute on @qdisc to the given value.
+ *
+ * Since: 1.18
+ **/
+void
+nm_tc_qdisc_set_attribute (NMTCQdisc *qdisc, const char *name, GVariant *value)
+{
+	g_return_if_fail (qdisc != NULL);
+	g_return_if_fail (name != NULL && *name != '\0');
+	g_return_if_fail (strcmp (name, "kind") != 0);
+
+	if (!qdisc->attributes) {
+		qdisc->attributes = g_hash_table_new_full (nm_str_hash, g_str_equal,
+		                                           g_free, (GDestroyNotify) g_variant_unref);
+	}
+
+	if (value)
+		g_hash_table_insert (qdisc->attributes, g_strdup (name), g_variant_ref_sink (value));
+	else
+		g_hash_table_remove (qdisc->attributes, name);
+}
+
 /*****************************************************************************/
 
 G_DEFINE_BOXED_TYPE (NMTCAction, nm_tc_action, nm_tc_action_dup, nm_tc_action_unref)
@@ -290,7 +429,15 @@ nm_tc_action_new (const char *kind,
 {
 	NMTCAction *action;
 
-	if (!kind || !*kind || strchr (kind, ' ') || strchr (kind, '\t')) {
+	if (!kind || !*kind) {
+		g_set_error (error,
+		             NM_CONNECTION_ERROR,
+		             NM_CONNECTION_ERROR_INVALID_PROPERTY,
+		             _("kind is missing"));
+		return NULL;
+	}
+
+	if (strchr (kind, ' ') || strchr (kind, '\t')) {
 		g_set_error (error,
 		             NM_CONNECTION_ERROR,
 		             NM_CONNECTION_ERROR_INVALID_PROPERTY,
@@ -464,6 +611,14 @@ nm_tc_action_get_attribute_names (NMTCAction *action)
 	return nm_utils_strv_make_deep_copied_nonnull (names);
 }
 
+GHashTable *
+_nm_tc_action_get_attributes (NMTCAction *action)
+{
+	nm_assert (action);
+
+	return action->attributes;
+}
+
 /**
  * nm_tc_action_get_attribute:
  * @action: the #NMTCAction
@@ -544,7 +699,15 @@ nm_tc_tfilter_new (const char *kind,
 {
 	NMTCTfilter *tfilter;
 
-	if (!kind || !*kind || strchr (kind, ' ') || strchr (kind, '\t')) {
+	if (!kind || !*kind) {
+		g_set_error (error,
+		             NM_CONNECTION_ERROR,
+		             NM_CONNECTION_ERROR_INVALID_PROPERTY,
+		             _("kind is missing"));
+		return NULL;
+	}
+
+	if (strchr (kind, ' ') || strchr (kind, '\t')) {
 		g_set_error (error,
 		             NM_CONNECTION_ERROR,
 		             NM_CONNECTION_ERROR_INVALID_PROPERTY,
@@ -1222,7 +1385,10 @@ _qdiscs_to_variant (GPtrArray *qdiscs)
 	if (qdiscs) {
 		for (i = 0; i < qdiscs->len; i++) {
 			NMTCQdisc *qdisc = qdiscs->pdata[i];
+			guint length;
+			gs_free const char **attrs = nm_utils_strdict_get_keys (qdisc->attributes, TRUE, &length);
 			GVariantBuilder qdisc_builder;
+			guint y;
 
 			g_variant_builder_init (&qdisc_builder, G_VARIANT_TYPE_VARDICT);
 
@@ -1235,6 +1401,11 @@ _qdiscs_to_variant (GPtrArray *qdiscs)
 			g_variant_builder_add (&qdisc_builder, "{sv}", "parent",
 			                       g_variant_new_uint32 (nm_tc_qdisc_get_parent (qdisc)));
 
+			for (y = 0; y < length; y++) {
+				g_variant_builder_add (&qdisc_builder, "{sv}", attrs[y],
+				                       g_hash_table_lookup (qdisc->attributes, attrs[y]));
+			}
+
 			g_variant_builder_add (&builder, "a{sv}", &qdisc_builder);
 		}
 	}
@@ -1267,9 +1438,11 @@ _qdiscs_from_variant (GVariant *value)
 
 	while (g_variant_iter_next (&iter, "@a{sv}", &qdisc_var)) {
 		const char *kind;
-		guint32 handle;
 		guint32 parent;
 		NMTCQdisc *qdisc;
+		GVariantIter qdisc_iter;
+		const char *key;
+		GVariant *attr_value;
 
 		if (   !g_variant_lookup (qdisc_var, "kind", "&s", &kind)
 		    || !g_variant_lookup (qdisc_var, "parent", "u", &parent)) {
@@ -1284,8 +1457,18 @@ _qdiscs_from_variant (GVariant *value)
 			goto next;
 		}
 
-		if (g_variant_lookup (qdisc_var, "handle", "u", &handle))
-			nm_tc_qdisc_set_handle (qdisc, handle);
+		g_variant_iter_init (&qdisc_iter, qdisc_var);
+		while (g_variant_iter_next (&qdisc_iter, "{&sv}", &key, &attr_value)) {
+			if (   strcmp (key, "kind") == 0
+			    || strcmp (key, "parent") == 0) {
+				/* Already processed above */
+			} else if (strcmp (key, "handle") == 0) {
+				nm_tc_qdisc_set_handle (qdisc, g_variant_get_uint32 (attr_value));
+			} else {
+				nm_tc_qdisc_set_attribute (qdisc, key, attr_value);
+			}
+			g_variant_unref (attr_value);
+		}
 
 		g_ptr_array_add (qdiscs, qdisc);
 next:
diff --git a/libnm-core/nm-setting-tc-config.h b/libnm-core/nm-setting-tc-config.h
index 6296b1ab..ab99e3cc 100644
--- a/libnm-core/nm-setting-tc-config.h
+++ b/libnm-core/nm-setting-tc-config.h
@@ -59,6 +59,16 @@ void        nm_tc_qdisc_set_handle           (NMTCQdisc *qdisc,
 NM_AVAILABLE_IN_1_12
 guint32     nm_tc_qdisc_get_parent           (NMTCQdisc *qdisc);
 
+NM_AVAILABLE_IN_1_18
+const char **nm_tc_qdisc_get_attribute_names (NMTCQdisc *qdisc);
+NM_AVAILABLE_IN_1_18
+GVariant   *nm_tc_qdisc_get_attribute        (NMTCQdisc *qdisc,
+                                              const char *name);
+NM_AVAILABLE_IN_1_18
+void        nm_tc_qdisc_set_attribute        (NMTCQdisc *qdisc,
+                                              const char *name,
+                                              GVariant *value);
+
 typedef struct NMTCAction NMTCAction;
 
 NM_AVAILABLE_IN_1_12
diff --git a/libnm-core/nm-setting-team-port.c b/libnm-core/nm-setting-team-port.c
index 1db8f22a..b2c57ffa 100644
--- a/libnm-core/nm-setting-team-port.c
+++ b/libnm-core/nm-setting-team-port.c
@@ -396,31 +396,18 @@ compare_property (const NMSettInfoSetting *sett_info,
 {
 	NMSettingTeamPortPrivate *a_priv;
 	NMSettingTeamPortPrivate *b_priv;
-	guint i, j;
 
 	if (nm_streq (sett_info->property_infos[property_idx].name, NM_SETTING_TEAM_PORT_LINK_WATCHERS)) {
 
 		if (NM_FLAGS_HAS (flags, NM_SETTING_COMPARE_FLAG_INFERRABLE))
 			return NM_TERNARY_DEFAULT;
-
-		if (other) {
-			a_priv = NM_SETTING_TEAM_PORT_GET_PRIVATE (setting);
-			b_priv = NM_SETTING_TEAM_PORT_GET_PRIVATE (other);
-
-			if (a_priv->link_watchers->len != b_priv->link_watchers->len)
-				return FALSE;
-			for (i = 0; i < a_priv->link_watchers->len; i++) {
-				for (j = 0; j < b_priv->link_watchers->len; j++) {
-					if (nm_team_link_watcher_equal (a_priv->link_watchers->pdata[i],
-					                                b_priv->link_watchers->pdata[j])) {
-						break;
-					}
-				}
-				if (j == b_priv->link_watchers->len)
-					return FALSE;
-			}
-		}
-		return TRUE;
+		if (!other)
+			return TRUE;
+		a_priv = NM_SETTING_TEAM_PORT_GET_PRIVATE (setting);
+		b_priv = NM_SETTING_TEAM_PORT_GET_PRIVATE (other);
+		return _nm_team_link_watchers_equal (a_priv->link_watchers,
+		                                     b_priv->link_watchers,
+		                                     TRUE);
 	}
 
 	if (nm_streq (sett_info->property_infos[property_idx].name, NM_SETTING_TEAM_PORT_CONFIG)) {
diff --git a/libnm-core/nm-setting-team.c b/libnm-core/nm-setting-team.c
index 42ee3eec..9fd070c1 100644
--- a/libnm-core/nm-setting-team.c
+++ b/libnm-core/nm-setting-team.c
@@ -396,6 +396,34 @@ nm_team_link_watcher_equal (NMTeamLinkWatcher *watcher, NMTeamLinkWatcher *other
 	return TRUE;
 }
 
+gboolean
+_nm_team_link_watchers_equal (GPtrArray *a, GPtrArray *b, gboolean ignore_order)
+{
+	guint i, j;
+
+	if (a->len != b->len)
+		return FALSE;
+	if (ignore_order) {
+		/* FIXME: comparing this way is O(n^2). Don't do that, instead
+		 *        add nm_team_link_watcher_cmp(), sort both lists, and
+		 *        compare step by step. */
+		for (i = 0; i < a->len; i++) {
+			for (j = 0; j < b->len; j++) {
+				if (nm_team_link_watcher_equal (a->pdata[i], b->pdata[j]))
+					break;
+			}
+			if (j == b->len)
+				return FALSE;
+		}
+	} else {
+		for (i = 0; i < a->len; i++) {
+			if (!nm_team_link_watcher_equal (a->pdata[i], b->pdata[i]))
+				return FALSE;
+		}
+	}
+	return TRUE;
+}
+
 /**
  * nm_team_link_watcher_dup:
  * @watcher: the #NMTeamLinkWatcher
@@ -929,13 +957,14 @@ nm_setting_team_remove_runner_tx_hash_by_value (NMSettingTeam *setting,
 
 	g_return_val_if_fail (NM_IS_SETTING_TEAM (setting), FALSE);
 	g_return_val_if_fail (txhash != NULL, FALSE);
-	g_return_val_if_fail (txhash[0] != '\0', FALSE);
 
-	for (i = 0; i < priv->runner_tx_hash->len; i++) {
-		if (nm_streq (txhash, priv->runner_tx_hash->pdata[i])) {
-			g_ptr_array_remove_index (priv->runner_tx_hash, i);
-			_notify (setting, PROP_RUNNER_TX_HASH);
-			return TRUE;
+	if (priv->runner_tx_hash) {
+		for (i = 0; i < priv->runner_tx_hash->len; i++) {
+			if (nm_streq (txhash, priv->runner_tx_hash->pdata[i])) {
+				g_ptr_array_remove_index (priv->runner_tx_hash, i);
+				_notify (setting, PROP_RUNNER_TX_HASH);
+				return TRUE;
+			}
 		}
 	}
 	return FALSE;
@@ -974,6 +1003,7 @@ nm_setting_team_get_runner_tx_hash (NMSettingTeam *setting, guint idx)
 	NMSettingTeamPrivate *priv = NM_SETTING_TEAM_GET_PRIVATE (setting);
 
 	g_return_val_if_fail (NM_IS_SETTING_TEAM (setting), NULL);
+	g_return_val_if_fail (priv->runner_tx_hash, NULL);
 	g_return_val_if_fail (idx < priv->runner_tx_hash->len, NULL);
 
 	return priv->runner_tx_hash->pdata[idx];
@@ -994,6 +1024,7 @@ nm_setting_team_remove_runner_tx_hash (NMSettingTeam *setting, guint idx)
 	NMSettingTeamPrivate *priv = NM_SETTING_TEAM_GET_PRIVATE (setting);
 
 	g_return_if_fail (NM_IS_SETTING_TEAM (setting));
+	g_return_if_fail (priv->runner_tx_hash);
 	g_return_if_fail (idx < priv->runner_tx_hash->len);
 
 	g_ptr_array_remove_index (priv->runner_tx_hash, idx);
@@ -1239,9 +1270,9 @@ verify (NMSetting *setting, NMConnection *connection, GError **error)
 
 		if (!name) {
 			g_set_error (error, NM_CONNECTION_ERROR, NM_CONNECTION_ERROR_MISSING_SETTING,
-				     _("missing link watcher name"));
+			             _("missing link watcher name"));
 			g_prefix_error (error, "%s.%s: ", nm_setting_get_name (setting),
-					NM_SETTING_TEAM_LINK_WATCHERS);
+			                NM_SETTING_TEAM_LINK_WATCHERS);
 			return FALSE;
 		}
 		if (!NM_IN_STRSET (name,
@@ -1249,9 +1280,9 @@ verify (NMSetting *setting, NMConnection *connection, GError **error)
 		                   NM_TEAM_LINK_WATCHER_ARP_PING,
 		                   NM_TEAM_LINK_WATCHER_NSNA_PING)) {
 			g_set_error (error, NM_CONNECTION_ERROR, NM_CONNECTION_ERROR_INVALID_SETTING,
-				     _("unknown link watcher \"%s\""), name);
+			             _("unknown link watcher \"%s\""), name);
 			g_prefix_error (error, "%s.%s: ", nm_setting_get_name (setting),
-					NM_SETTING_TEAM_LINK_WATCHERS);
+			                NM_SETTING_TEAM_LINK_WATCHERS);
 			return FALSE;
 		}
 
@@ -1260,17 +1291,17 @@ verify (NMSetting *setting, NMConnection *connection, GError **error)
 		                  NM_TEAM_LINK_WATCHER_NSNA_PING)
 		    && !nm_team_link_watcher_get_target_host (link_watcher)) {
 			g_set_error (error, NM_CONNECTION_ERROR, NM_CONNECTION_ERROR_MISSING_SETTING,
-				     _("missing target host"));
+			             _("missing target host"));
 			g_prefix_error (error, "%s.%s: ", nm_setting_get_name (setting),
-					NM_SETTING_TEAM_LINK_WATCHERS);
+			                NM_SETTING_TEAM_LINK_WATCHERS);
 			return FALSE;
 		}
 		if (nm_streq (name, NM_TEAM_LINK_WATCHER_ARP_PING)
 		    && !nm_team_link_watcher_get_source_host (link_watcher)) {
 			g_set_error (error, NM_CONNECTION_ERROR, NM_CONNECTION_ERROR_MISSING_SETTING,
-				     _("missing source address"));
+			             _("missing source address"));
 			g_prefix_error (error, "%s.%s: ", nm_setting_get_name (setting),
-					NM_SETTING_TEAM_LINK_WATCHERS);
+			                NM_SETTING_TEAM_LINK_WATCHERS);
 			return FALSE;
 		}
 	}
@@ -1288,31 +1319,17 @@ compare_property (const NMSettInfoSetting *sett_info,
                   NMSettingCompareFlags flags)
 {
 	NMSettingTeamPrivate *a_priv, *b_priv;
-	guint i, j;
 
 	if (nm_streq (sett_info->property_infos[property_idx].name, NM_SETTING_TEAM_LINK_WATCHERS)) {
-
 		if (NM_FLAGS_HAS (flags, NM_SETTING_COMPARE_FLAG_INFERRABLE))
 			return NM_TERNARY_DEFAULT;
-
-		if (other) {
-			a_priv = NM_SETTING_TEAM_GET_PRIVATE (setting);
-			b_priv = NM_SETTING_TEAM_GET_PRIVATE (other);
-
-			if (a_priv->link_watchers->len != b_priv->link_watchers->len)
-				return FALSE;
-			for (i = 0; i < a_priv->link_watchers->len; i++) {
-				for (j = 0; j < b_priv->link_watchers->len; j++) {
-					if (nm_team_link_watcher_equal (a_priv->link_watchers->pdata[i],
-					                                b_priv->link_watchers->pdata[j])) {
-						break;
-					}
-				}
-				if (j == b_priv->link_watchers->len)
-					return FALSE;
-			}
-		}
-		return TRUE;
+		if (!other)
+			return TRUE;
+		a_priv = NM_SETTING_TEAM_GET_PRIVATE (setting);
+		b_priv = NM_SETTING_TEAM_GET_PRIVATE (other);
+		return _nm_team_link_watchers_equal (a_priv->link_watchers,
+		                                     b_priv->link_watchers,
+		                                     TRUE);
 	}
 
 	if (nm_streq (sett_info->property_infos[property_idx].name, NM_SETTING_TEAM_CONFIG)) {
@@ -1350,7 +1367,7 @@ _align_team_properties (NMSettingTeam *setting)
 {
 	NMSettingTeamPrivate *priv = NM_SETTING_TEAM_GET_PRIVATE (setting);
 	char **strv;
-	int i;
+	gsize i;
 
 	priv->notify_peers_count =          JSON_TO_VAL (int, PROP_NOTIFY_PEERS_COUNT);
 	priv->notify_peers_interval =       JSON_TO_VAL (int, PROP_NOTIFY_PEERS_INTERVAL);
@@ -1372,16 +1389,24 @@ _align_team_properties (NMSettingTeam *setting)
 	priv->runner_tx_balancer =       JSON_TO_VAL (string, PROP_RUNNER_TX_BALANCER);
 	priv->runner_agg_select_policy = JSON_TO_VAL (string, PROP_RUNNER_AGG_SELECT_POLICY);
 
-	if (priv->runner_tx_hash) {
-		g_ptr_array_unref (priv->runner_tx_hash);
-		priv->runner_tx_hash = NULL;
-	}
 	strv = JSON_TO_VAL (strv, PROP_RUNNER_TX_HASH);
-	if (strv) {
-		for (i = 0; strv[i]; i++)
-			nm_setting_team_add_runner_tx_hash (setting, strv[i]);
-		g_strfreev (strv);
+	if (_nm_utils_strv_cmp_n ((  priv->runner_tx_hash
+	                           ? (const char *const*) priv->runner_tx_hash->pdata
+	                           : NULL),
+	                          (  priv->runner_tx_hash
+	                           ? (gssize) priv->runner_tx_hash->len
+	                           : (gssize) -1),
+	                          NM_CAST_STRV_CC (strv),
+	                          -1) != 0) {
+		nm_clear_pointer (&priv->runner_tx_hash, g_ptr_array_unref);
+		if (strv) {
+			priv->runner_tx_hash = g_ptr_array_new_full (NM_PTRARRAY_LEN (strv), g_free);
+			for (i = 0; strv[i]; i++)
+				g_ptr_array_add (priv->runner_tx_hash, strv[i]);
+			nm_clear_g_free (&strv);
+		}
 	}
+	nm_clear_pointer (&strv, g_strfreev);
 
 	g_ptr_array_unref (priv->link_watchers);
 	priv->link_watchers = JSON_TO_VAL (ptr_array, PROP_LINK_WATCHERS);
@@ -1419,8 +1444,10 @@ get_property (GObject *object, guint prop_id,
 		g_value_set_string (value, nm_setting_team_get_runner_hwaddr_policy (setting));
 		break;
 	case PROP_RUNNER_TX_HASH:
-		g_value_take_boxed (value, priv->runner_tx_hash ?
-		                    _nm_utils_ptrarray_to_strv (priv->runner_tx_hash): NULL);
+		g_value_take_boxed (value,
+		                      priv->runner_tx_hash
+		                    ? _nm_utils_ptrarray_to_strv (priv->runner_tx_hash)
+		                    : NULL);
 		break;
 	case PROP_RUNNER_TX_BALANCER:
 		g_value_set_string (value, nm_setting_team_get_runner_tx_balancer (setting));
@@ -1772,9 +1799,9 @@ nm_setting_team_class_init (NMSettingTeamClass *klass)
 	obj_properties[PROP_RUNNER_TX_HASH] =
 	    g_param_spec_boxed (NM_SETTING_TEAM_RUNNER_TX_HASH, "", "",
 	                        G_TYPE_STRV,
-	                             G_PARAM_READWRITE |
+	                        G_PARAM_READWRITE |
 	                        NM_SETTING_PARAM_INFERRABLE |
-	                             G_PARAM_STATIC_STRINGS);
+	                        G_PARAM_STATIC_STRINGS);
 
 	/**
 	 * NMSettingTeam:runner-tx-balancer:
diff --git a/libnm-core/nm-setting-vlan.c b/libnm-core/nm-setting-vlan.c
index 5b8a49d4..8a220ad8 100644
--- a/libnm-core/nm-setting-vlan.c
+++ b/libnm-core/nm-setting-vlan.c
@@ -25,6 +25,7 @@
 
 #include <stdlib.h>
 
+#include "nm-libnm-core-intern/nm-libnm-core-utils.h"
 #include "nm-utils.h"
 #include "nm-core-types-internal.h"
 #include "nm-setting-connection.h"
@@ -106,48 +107,33 @@ nm_setting_vlan_get_flags (NMSettingVlan *setting)
 	return NM_SETTING_VLAN_GET_PRIVATE (setting)->flags;
 }
 
-static guint32
-get_max_prio (NMVlanPriorityMap map, gboolean from)
+static NMVlanQosMapping *
+priority_map_new (guint32 from, guint32 to)
 {
-	if (map == NM_VLAN_INGRESS_MAP)
-		return from ? MAX_8021P_PRIO : MAX_SKB_PRIO;
-	else if (map == NM_VLAN_EGRESS_MAP)
-		return from ? MAX_SKB_PRIO : MAX_8021P_PRIO;
-	g_assert_not_reached ();
+	NMVlanQosMapping *mapping;
+
+	mapping = g_new (NMVlanQosMapping, 1);
+	*mapping = (NMVlanQosMapping) {
+		.from = from,
+		.to   = to,
+	};
+	return mapping;
 }
 
 static NMVlanQosMapping *
 priority_map_new_from_str (NMVlanPriorityMap map, const char *str)
 {
-	NMVlanQosMapping *p = NULL;
-	char **t = NULL;
-	guint32 len;
-	guint64 from, to;
+	guint32 from, to;
 
-	g_return_val_if_fail (str && str[0], NULL);
-
-	t = g_strsplit (str, ":", 0);
-	len = g_strv_length (t);
-	if (len == 2) {
-		from = g_ascii_strtoull (t[0], NULL, 10);
-		to = g_ascii_strtoull (t[1], NULL, 10);
-
-		if ((from <= get_max_prio (map, TRUE)) && (to <= get_max_prio (map, FALSE))) {
-			G_STATIC_ASSERT (sizeof (*p) == sizeof (p->from) + sizeof (p->to));
-			p = g_malloc (sizeof (NMVlanQosMapping));
-			p->from = from;
-			p->to = to;
-		}
-	}
-
-	g_strfreev (t);
-	return p;
+	if (!nm_utils_vlan_priority_map_parse_str (map, str, FALSE, &from, &to, NULL))
+		return NULL;
+	return priority_map_new (from, to);
 }
 
 static void
 priority_map_free (NMVlanQosMapping *map)
 {
-	g_return_if_fail (map != NULL);
+	nm_assert (map);
 	g_free (map);
 }
 
@@ -158,7 +144,7 @@ get_map (NMSettingVlan *self, NMVlanPriorityMap map)
 		return NM_SETTING_VLAN_GET_PRIVATE (self)->ingress_priority_map;
 	else if (map == NM_VLAN_EGRESS_MAP)
 		return NM_SETTING_VLAN_GET_PRIVATE (self)->egress_priority_map;
-	g_assert_not_reached ();
+	nm_assert_not_reached ();
 	return NULL;
 }
 
@@ -207,7 +193,7 @@ set_map (NMSettingVlan *self, NMVlanPriorityMap map, GSList *list)
 		NM_SETTING_VLAN_GET_PRIVATE (self)->egress_priority_map = list;
 		_notify (self, PROP_EGRESS_PRIORITY_MAP);
 	} else
-		g_assert_not_reached ();
+		nm_assert_not_reached ();
 }
 
 static gboolean
@@ -489,6 +475,36 @@ nm_setting_vlan_remove_priority (NMSettingVlan *setting,
 	set_map (setting, map, g_slist_delete_link (list, item));
 }
 
+static gboolean
+priority_map_remove_by_value (NMSettingVlan *setting,
+                              NMVlanPriorityMap map,
+                              guint32 from,
+                              guint32 to,
+                              gboolean wildcard_to)
+{
+	GSList *list = NULL, *iter = NULL;
+	NMVlanQosMapping *item;
+
+	nm_assert (NM_IS_SETTING_VLAN (setting));
+	nm_assert (NM_IN_SET (map, NM_VLAN_INGRESS_MAP, NM_VLAN_EGRESS_MAP));
+
+	list = get_map (setting, map);
+	for (iter = list; iter; iter = g_slist_next (iter)) {
+		item = iter->data;
+
+		if (item->from != from)
+			continue;
+		if (   !wildcard_to
+		    && item->to != to)
+			continue;
+
+		priority_map_free ((NMVlanQosMapping *) (iter->data));
+		set_map (setting, map, g_slist_delete_link (list, iter));
+		return TRUE;
+	}
+	return FALSE;
+}
+
 /**
  * nm_setting_vlan_remove_priority_by_value:
  * @setting: the #NMSettingVlan
@@ -508,22 +524,10 @@ nm_setting_vlan_remove_priority_by_value (NMSettingVlan *setting,
                                           guint32 from,
                                           guint32 to)
 {
-	GSList *list = NULL, *iter = NULL;
-	NMVlanQosMapping *item;
-
 	g_return_val_if_fail (NM_IS_SETTING_VLAN (setting), FALSE);
 	g_return_val_if_fail (map == NM_VLAN_INGRESS_MAP || map == NM_VLAN_EGRESS_MAP, FALSE);
 
-	list = get_map (setting, map);
-	for (iter = list; iter; iter = g_slist_next (iter)) {
-		item = iter->data;
-		if (item->from == from && item->to == to) {
-			priority_map_free ((NMVlanQosMapping *) (iter->data));
-			set_map (setting, map, g_slist_delete_link (list, iter));
-			return TRUE;
-		}
-	}
-	return FALSE;
+	return priority_map_remove_by_value (setting, map, from, to, FALSE);
 }
 
 /**
@@ -543,19 +547,15 @@ nm_setting_vlan_remove_priority_str_by_value (NMSettingVlan *setting,
                                               NMVlanPriorityMap map,
                                               const char *str)
 {
-	NMVlanQosMapping *item;
-	gboolean found;
+	gboolean is_wildcard_to;
+	guint32 from, to;
 
 	g_return_val_if_fail (NM_IS_SETTING_VLAN (setting), FALSE);
 	g_return_val_if_fail (map == NM_VLAN_INGRESS_MAP || map == NM_VLAN_EGRESS_MAP, FALSE);
 
-	item = priority_map_new_from_str (map, str);
-	if (!item)
+	if (!nm_utils_vlan_priority_map_parse_str (map, str, TRUE, &from, &to, &is_wildcard_to))
 		return FALSE;
-
-	found = nm_setting_vlan_remove_priority_by_value (setting, map, item->from, item->to);
-	g_free (item);
-	return found;
+	return priority_map_remove_by_value (setting, map, from, to, is_wildcard_to);
 }
 
 /**
@@ -703,18 +703,16 @@ static GSList *
 priority_strv_to_maplist (NMVlanPriorityMap map, char **strv)
 {
 	GSList *list = NULL;
-	int i;
+	gsize i;
 
 	for (i = 0; strv && strv[i]; i++) {
-		NMVlanQosMapping *item;
+		guint32 from, to;
 
-		item = priority_map_new_from_str (map, strv[i]);
-		if (item) {
-			if (!check_replace_duplicate_priority (list, item->from, item->to))
-				list = g_slist_prepend (list, item);
-			else
-				g_free (item);
-		}
+		if (!nm_utils_vlan_priority_map_parse_str (map, strv[i], FALSE, &from, &to, NULL))
+			continue;
+		if (check_replace_duplicate_priority (list, from, to))
+			continue;
+		list = g_slist_prepend (list, priority_map_new (from, to));
 	}
 	return g_slist_sort (list, prio_map_compare);
 }
diff --git a/libnm-core/nm-setting-vpn.c b/libnm-core/nm-setting-vpn.c
index 20a0ae14..606b9d7f 100644
--- a/libnm-core/nm-setting-vpn.c
+++ b/libnm-core/nm-setting-vpn.c
@@ -25,7 +25,7 @@
 
 #include <stdlib.h>
 
-#include "nm-utils/nm-secret-utils.h"
+#include "nm-glib-aux/nm-secret-utils.h"
 #include "nm-utils.h"
 #include "nm-utils-private.h"
 #include "nm-setting-private.h"
@@ -173,10 +173,8 @@ nm_setting_vpn_add_data_item (NMSettingVpn *setting,
                               const char *item)
 {
 	g_return_if_fail (NM_IS_SETTING_VPN (setting));
-	g_return_if_fail (key != NULL);
-	g_return_if_fail (strlen (key) > 0);
-	g_return_if_fail (item != NULL);
-	g_return_if_fail (strlen (item) > 0);
+	g_return_if_fail (key && key[0]);
+	g_return_if_fail (item && item[0]);
 
 	g_hash_table_insert (NM_SETTING_VPN_GET_PRIVATE (setting)->data,
 	                     g_strdup (key), g_strdup (item));
@@ -242,6 +240,7 @@ nm_setting_vpn_remove_data_item (NMSettingVpn *setting, const char *key)
 	gboolean found;
 
 	g_return_val_if_fail (NM_IS_SETTING_VPN (setting), FALSE);
+	g_return_val_if_fail (key, FALSE);
 
 	found = g_hash_table_remove (NM_SETTING_VPN_GET_PRIVATE (setting)->data, key);
 	if (found)
@@ -350,10 +349,8 @@ nm_setting_vpn_add_secret (NMSettingVpn *setting,
                            const char *secret)
 {
 	g_return_if_fail (NM_IS_SETTING_VPN (setting));
-	g_return_if_fail (key != NULL);
-	g_return_if_fail (strlen (key) > 0);
-	g_return_if_fail (secret != NULL);
-	g_return_if_fail (strlen (secret) > 0);
+	g_return_if_fail (key && key[0]);
+	g_return_if_fail (secret && secret[0]);
 
 	g_hash_table_insert (NM_SETTING_VPN_GET_PRIVATE (setting)->secrets,
 	                     g_strdup (key), g_strdup (secret));
@@ -419,6 +416,7 @@ nm_setting_vpn_remove_secret (NMSettingVpn *setting, const char *key)
 	gboolean found;
 
 	g_return_val_if_fail (NM_IS_SETTING_VPN (setting), FALSE);
+	g_return_val_if_fail (key, FALSE);
 
 	found = g_hash_table_remove (NM_SETTING_VPN_GET_PRIVATE (setting)->secrets, key);
 	if (found)
diff --git a/libnm-core/nm-setting-wifi-p2p.c b/libnm-core/nm-setting-wifi-p2p.c
index da978720..490c2ef9 100644
--- a/libnm-core/nm-setting-wifi-p2p.c
+++ b/libnm-core/nm-setting-wifi-p2p.c
@@ -24,7 +24,7 @@
 #include <net/ethernet.h>
 
 #include "nm-utils.h"
-#include "nm-common-macros.h"
+#include "nm-libnm-core-intern/nm-common-macros.h"
 #include "nm-utils-private.h"
 #include "nm-setting-private.h"
 
diff --git a/libnm-core/nm-setting-wired.c b/libnm-core/nm-setting-wired.c
index ef23294f..182e7193 100644
--- a/libnm-core/nm-setting-wired.c
+++ b/libnm-core/nm-setting-wired.c
@@ -27,7 +27,7 @@
 #include <net/ethernet.h>
 
 #include "nm-utils.h"
-#include "nm-common-macros.h"
+#include "nm-libnm-core-intern/nm-common-macros.h"
 #include "nm-utils-private.h"
 #include "nm-setting-private.h"
 
@@ -483,8 +483,7 @@ nm_setting_wired_get_s390_option_by_key (NMSettingWired *setting,
                                          const char *key)
 {
 	g_return_val_if_fail (NM_IS_SETTING_WIRED (setting), NULL);
-	g_return_val_if_fail (key != NULL, NULL);
-	g_return_val_if_fail (strlen (key), NULL);
+	g_return_val_if_fail (key && key[0], NULL);
 
 	return g_hash_table_lookup (NM_SETTING_WIRED_GET_PRIVATE (setting)->s390_options, key);
 }
@@ -508,17 +507,11 @@ nm_setting_wired_add_s390_option (NMSettingWired *setting,
                                   const char *key,
                                   const char *value)
 {
-	size_t value_len;
-
 	g_return_val_if_fail (NM_IS_SETTING_WIRED (setting), FALSE);
-	g_return_val_if_fail (key != NULL, FALSE);
-	g_return_val_if_fail (strlen (key), FALSE);
+	g_return_val_if_fail (key && key[0], FALSE);
 	g_return_val_if_fail (g_strv_contains (valid_s390_opts, key), FALSE);
 	g_return_val_if_fail (value != NULL, FALSE);
 
-	value_len = strlen (value);
-	g_return_val_if_fail (value_len > 0 && value_len < 200, FALSE);
-
 	g_hash_table_insert (NM_SETTING_WIRED_GET_PRIVATE (setting)->s390_options,
 	                     g_strdup (key),
 	                     g_strdup (value));
@@ -544,8 +537,7 @@ nm_setting_wired_remove_s390_option (NMSettingWired *setting,
 	gboolean found;
 
 	g_return_val_if_fail (NM_IS_SETTING_WIRED (setting), FALSE);
-	g_return_val_if_fail (key != NULL, FALSE);
-	g_return_val_if_fail (strlen (key), FALSE);
+	g_return_val_if_fail (key && key[0], FALSE);
 
 	found = g_hash_table_remove (NM_SETTING_WIRED_GET_PRIVATE (setting)->s390_options, key);
 	if (found)
@@ -683,7 +675,7 @@ verify (NMSetting *setting, NMConnection *connection, GError **error)
 	g_hash_table_iter_init (&iter, priv->s390_options);
 	while (g_hash_table_iter_next (&iter, (gpointer) &key, (gpointer) &value)) {
 		if (   !g_strv_contains (valid_s390_opts, key)
-		    || !strlen (value)
+		    || value[0] == '\0'
 		    || (strlen (value) > 200)) {
 			g_set_error (error,
 			             NM_CONNECTION_ERROR,
diff --git a/libnm-core/nm-setting-wireguard.c b/libnm-core/nm-setting-wireguard.c
index 8c5b25a5..861b2abd 100644
--- a/libnm-core/nm-setting-wireguard.c
+++ b/libnm-core/nm-setting-wireguard.c
@@ -24,7 +24,7 @@
 #include "nm-setting-private.h"
 #include "nm-utils-private.h"
 #include "nm-connection-private.h"
-#include "nm-utils/nm-secret-utils.h"
+#include "nm-glib-aux/nm-secret-utils.h"
 
 /*****************************************************************************/
 
diff --git a/libnm-core/nm-setting-wireless.c b/libnm-core/nm-setting-wireless.c
index b4cb1056..d8056c6c 100644
--- a/libnm-core/nm-setting-wireless.c
+++ b/libnm-core/nm-setting-wireless.c
@@ -27,7 +27,7 @@
 #include <net/ethernet.h>
 
 #include "nm-utils.h"
-#include "nm-common-macros.h"
+#include "nm-libnm-core-intern/nm-common-macros.h"
 #include "nm-utils-private.h"
 #include "nm-setting-private.h"
 
diff --git a/libnm-core/nm-utils-private.h b/libnm-core/nm-utils-private.h
index 46af26ed..a1a1369a 100644
--- a/libnm-core/nm-utils-private.h
+++ b/libnm-core/nm-utils-private.h
@@ -103,8 +103,31 @@ void        _nm_utils_format_variant_attributes_full (GString *str,
                                                       char key_value_separator);
 gboolean    _nm_sriov_vf_parse_vlans (NMSriovVF *vf, const char *str, GError **error);
 
+GVariant *  _nm_utils_bridge_vlans_to_dbus (NMSetting *setting, const char *property);
+gboolean    _nm_utils_bridge_vlans_from_dbus (NMSetting *setting,
+                                              GVariant *connection_dict,
+                                              const char *property,
+                                              GVariant *value,
+                                              NMSettingParseFlags parse_flags,
+                                              GError **error);
+gboolean    _nm_utils_bridge_vlan_verify_list (GPtrArray *vlans,
+                                               gboolean check_normalizable,
+                                               GError **error,
+                                               const char *setting,
+                                               const char *property);
+
 /* JSON to GValue conversion macros */
 
+static inline void
+_nm_auto_unset_and_free_gvalue (GValue **ptr)
+{
+	if (*ptr) {
+		g_value_unset (*ptr);
+		g_free (*ptr);
+	}
+}
+#define nm_auto_unset_and_free_gvalue nm_auto(_nm_auto_unset_and_free_gvalue)
+
 typedef struct {
 	const char *key1;
 	const char *key2;
@@ -121,16 +144,13 @@ _nm_utils_json_extract_int (char *conf,
                             _NMUtilsTeamPropertyKeys key,
                             gboolean is_port)
 {
-	gs_free GValue *t_value = NULL;
-	int ret;
+	nm_auto_unset_and_free_gvalue GValue *t_value = NULL;
 
 	t_value = _nm_utils_team_config_get (conf, key.key1, key.key2, key.key3, is_port);
-	if (!t_value)
+	if (   !t_value
+	    || !G_VALUE_HOLDS_INT (t_value))
 		return key.default_int;
-
-	ret = g_value_get_int (t_value);
-	g_value_unset (t_value);
-	return ret;
+	return g_value_get_int (t_value);
 }
 
 static inline gboolean
@@ -138,16 +158,13 @@ _nm_utils_json_extract_boolean (char *conf,
                                 _NMUtilsTeamPropertyKeys key,
                                 gboolean is_port)
 {
-	gs_free GValue *t_value = NULL;
-	gboolean ret;
+	nm_auto_unset_and_free_gvalue GValue *t_value = NULL;
 
 	t_value = _nm_utils_team_config_get (conf, key.key1, key.key2, key.key3, is_port);
-	if (!t_value)
+	if (   !t_value
+	    || !G_VALUE_HOLDS_BOOLEAN (t_value))
 		return key.default_bool;
-
-	ret = g_value_get_boolean (t_value);
-	g_value_unset (t_value);
-	return ret;
+	return g_value_get_boolean (t_value);
 }
 
 static inline char *
@@ -155,16 +172,13 @@ _nm_utils_json_extract_string (char *conf,
                                _NMUtilsTeamPropertyKeys key,
                                gboolean is_port)
 {
-	gs_free GValue *t_value = NULL;
-	char *ret;
+	nm_auto_unset_and_free_gvalue GValue *t_value = NULL;
 
 	t_value = _nm_utils_team_config_get (conf, key.key1, key.key2, key.key3, is_port);
-	if (!t_value)
+	if (   !t_value
+	    || !G_VALUE_HOLDS_STRING (t_value))
 		return g_strdup (key.default_str);
-
-	ret = g_value_dup_string (t_value);
-	g_value_unset (t_value);
-	return ret;
+	return g_value_dup_string (t_value);
 }
 
 static inline char **
@@ -172,39 +186,37 @@ _nm_utils_json_extract_strv (char *conf,
                              _NMUtilsTeamPropertyKeys key,
                              gboolean is_port)
 {
-	gs_free GValue *t_value = NULL;
-	char **ret;
+	nm_auto_unset_and_free_gvalue GValue *t_value = NULL;
 
 	t_value = _nm_utils_team_config_get (conf, key.key1, key.key2, key.key3, is_port);
-	if (!t_value)
+	if (   !t_value
+	    || !G_TYPE_CHECK_VALUE_TYPE (t_value, G_TYPE_STRV))
 		return NULL;
-
-	ret = g_strdupv (g_value_get_boxed (t_value));
-	g_value_unset (t_value);
-	return ret;
+	return    g_strdupv (g_value_get_boxed (t_value))
+	       ?: g_new0 (char *, 1);
 }
 
 static inline GPtrArray *
 _nm_utils_json_extract_ptr_array (char *conf,
-                             _NMUtilsTeamPropertyKeys key,
-                             gboolean is_port)
+                                  _NMUtilsTeamPropertyKeys key,
+                                  gboolean is_port)
 {
-	gs_free GValue *t_value = NULL;
+	nm_auto_unset_and_free_gvalue GValue *t_value = NULL;
 	GPtrArray *data, *ret;
 	guint i;
 
 	ret = g_ptr_array_new_with_free_func ((GDestroyNotify) nm_team_link_watcher_unref);
+
 	t_value = _nm_utils_team_config_get (conf, key.key1, key.key2, key.key3, is_port);
-	if (!t_value)
+	if (   !t_value
+	    || !G_TYPE_CHECK_VALUE_TYPE (t_value, G_TYPE_PTR_ARRAY))
 		return ret;
 
 	data = g_value_get_boxed (t_value);
 	if (!data)
 		return ret;
-
 	for (i = 0; i < data->len; i++)
 		g_ptr_array_add (ret, nm_team_link_watcher_dup (data->pdata[i]));
-	g_value_unset (t_value);
 	return ret;
 }
 
diff --git a/libnm-core/nm-utils.c b/libnm-core/nm-utils.c
index d276cfe6..04d5b1b5 100644
--- a/libnm-core/nm-utils.c
+++ b/libnm-core/nm-utils.c
@@ -37,15 +37,16 @@
 #include "nm-json.h"
 #endif
 
-#include "nm-utils/nm-enum-utils.h"
-#include "nm-utils/nm-secret-utils.h"
+#include "nm-glib-aux/nm-enum-utils.h"
+#include "nm-glib-aux/nm-secret-utils.h"
 #include "systemd/nm-sd-utils-shared.h"
-#include "nm-common-macros.h"
+#include "nm-libnm-core-intern/nm-common-macros.h"
 #include "nm-utils-private.h"
 #include "nm-setting-private.h"
 #include "nm-crypto.h"
 #include "nm-setting-bond.h"
 #include "nm-setting-bridge.h"
+#include "nm-setting-bridge-port.h"
 #include "nm-setting-infiniband.h"
 #include "nm-setting-ip6-config.h"
 #include "nm-setting-team.h"
@@ -1034,30 +1035,6 @@ _nm_utils_ptrarray_to_strv (GPtrArray *ptrarray)
 	return strv;
 }
 
-/**
- * _nm_utils_strv_equal:
- * @strv1: a string array
- * @strv2: a string array
- *
- * Compare NULL-terminated string arrays for equality.
- *
- * Returns: %TRUE if the arrays are equal, %FALSE otherwise.
- **/
-gboolean
-_nm_utils_strv_equal (char **strv1, char **strv2)
-{
-	if (strv1 == strv2)
-		return TRUE;
-
-	if (!strv1 || !strv2)
-		return FALSE;
-
-	for ( ; *strv1 && *strv2 && !strcmp (*strv1, *strv2); strv1++, strv2++)
-		;
-
-	return !*strv1 && !*strv2;
-}
-
 static gboolean
 device_supports_ap_ciphers (guint32 dev_caps,
                             guint32 ap_flags,
@@ -2332,6 +2309,15 @@ static const NMVariantAttributeSpec * const tc_object_attribute_spec[] = {
 	NULL,
 };
 
+typedef struct {
+	const char *kind;
+	const NMVariantAttributeSpec * const *attrs;
+} NMQdiscAttributeSpec;
+
+static const NMQdiscAttributeSpec *const tc_qdisc_attribute_spec[] = {
+	NULL,
+};
+
 /*****************************************************************************/
 
 /**
@@ -2348,6 +2334,7 @@ _nm_utils_string_append_tc_qdisc_rest (GString *string, NMTCQdisc *qdisc)
 {
 	guint32 handle = nm_tc_qdisc_get_handle (qdisc);
 	const char *kind = nm_tc_qdisc_get_kind (qdisc);
+	gs_free char *str = NULL;
 
 	if (handle != TC_H_UNSPEC && strcmp (kind, "ingress") != 0) {
 		g_string_append (string, "handle ");
@@ -2356,6 +2343,13 @@ _nm_utils_string_append_tc_qdisc_rest (GString *string, NMTCQdisc *qdisc)
 	}
 
 	g_string_append (string, kind);
+
+	str = nm_utils_format_variant_attributes (_nm_tc_qdisc_get_attributes (qdisc),
+	                                          ' ', ' ');
+	if (str) {
+		g_string_append_c (string, ' ');
+		g_string_append (string, str);
+	}
 }
 
 /**
@@ -2463,7 +2457,7 @@ _tc_read_common_opts (const char *str,
  * @str: the string representation of a qdisc
  * @error: location of the error
  *
- * Parces the tc style string qdisc representation of the queueing
+ * Parses the tc style string qdisc representation of the queueing
  * discipline to a %NMTCQdisc instance. Supports a subset of the tc language.
  *
  * Returns: the %NMTCQdisc or %NULL
@@ -2478,21 +2472,36 @@ nm_utils_tc_qdisc_from_str (const char *str, GError **error)
 	gs_free char *kind = NULL;
 	gs_free char *rest = NULL;
 	NMTCQdisc *qdisc = NULL;
-	gs_unref_hashtable GHashTable *ht = NULL;
+	gs_unref_hashtable GHashTable *options = NULL;
+	GHashTableIter iter;
+	gpointer key, value;
+	guint i;
 
 	nm_assert (str);
 	nm_assert (!error || !*error);
 
-	ht = nm_utils_parse_variant_attributes (str,
-	                                        ' ', ' ', FALSE,
-	                                        tc_object_attribute_spec,
-	                                        error);
-	if (!ht)
-		return NULL;
-
 	if (!_tc_read_common_opts (str, &handle, &parent, &kind, &rest, error))
 		return NULL;
 
+	for (i = 0; rest && tc_qdisc_attribute_spec[i]; i++) {
+		if (strcmp (tc_qdisc_attribute_spec[i]->kind, kind) == 0) {
+			options = nm_utils_parse_variant_attributes (rest,
+			                                             ' ', ' ', FALSE,
+			                                             tc_qdisc_attribute_spec[i]->attrs,
+			                                             error);
+			if (!options)
+				return NULL;
+			break;
+		}
+	}
+	nm_clear_pointer (&rest, g_free);
+
+	if (options) {
+		value = g_hash_table_lookup (options, "");
+		if (value)
+			rest = g_variant_dup_string (value, NULL);
+	}
+
 	if (rest) {
 		g_set_error (error, 1, 0, _("unsupported qdisc option: '%s'."), rest);
 		return NULL;
@@ -2504,8 +2513,15 @@ nm_utils_tc_qdisc_from_str (const char *str, GError **error)
 
 	nm_tc_qdisc_set_handle (qdisc, handle);
 
+	if (options) {
+		g_hash_table_iter_init (&iter, options);
+		while (g_hash_table_iter_next (&iter, &key, &value))
+			nm_tc_qdisc_set_attribute (qdisc, key, g_variant_ref_sink (value));
+	}
+
 	return qdisc;
 }
+
 /*****************************************************************************/
 
 static const NMVariantAttributeSpec * const tc_action_simple_attribute_spec[] = {
@@ -2522,24 +2538,14 @@ static const NMVariantAttributeSpec * const tc_action_attribute_spec[] = {
 static gboolean
 _string_append_tc_action (GString *string, NMTCAction *action, GError **error)
 {
-	gs_unref_hashtable GHashTable *ht = NULL;
 	const char *kind = nm_tc_action_get_kind (action);
-	gs_strfreev char **attr_names = NULL;
 	gs_free char *str = NULL;
-	int i;
-
-	ht = g_hash_table_new_full (nm_str_hash, g_str_equal, NULL, NULL);
 
 	g_string_append (string, kind);
 
-	attr_names = nm_tc_action_get_attribute_names (action);
-	for (i = 0; attr_names[i]; i++) {
-		g_hash_table_insert (ht, attr_names[i],
-		                     nm_tc_action_get_attribute (action, attr_names[i]));
-	}
-
-	if (i) {
-		str = nm_utils_format_variant_attributes (ht, ' ', ' ');
+	str = nm_utils_format_variant_attributes (_nm_tc_action_get_attributes (action),
+	                                          ' ', ' ');
+	if (str) {
 		g_string_append_c (string, ' ');
 		g_string_append (string, str);
 	}
@@ -2578,7 +2584,7 @@ nm_utils_tc_action_to_str (NMTCAction *action, GError **error)
  * @str: the string representation of a action
  * @error: location of the error
  *
- * Parces the tc style string action representation of the queueing
+ * Parses the tc style string action representation of the queueing
  * discipline to a %NMTCAction instance. Supports a subset of the tc language.
  *
  * Returns: the %NMTCAction or %NULL
@@ -2731,7 +2737,7 @@ static const NMVariantAttributeSpec * const tc_tfilter_attribute_spec[] = {
  * @str: the string representation of a tfilter
  * @error: location of the error
  *
- * Parces the tc style string tfilter representation of the queueing
+ * Parses the tc style string tfilter representation of the queueing
  * discipline to a %NMTCTfilter instance. Supports a subset of the tc language.
  *
  * Returns: the %NMTCTfilter or %NULL
@@ -2872,7 +2878,7 @@ _nm_sriov_vf_parse_vlans (NMSriovVF *vf, const char *str, GError **error)
 	gs_free const char **vlans = NULL;
 	guint i;
 
-	vlans = nm_utils_strsplit_set (str, ";", FALSE);
+	vlans = nm_utils_strsplit_set (str, ";");
 	if (!vlans) {
 		g_set_error_literal (error,
 		                     NM_CONNECTION_ERROR,
@@ -2986,8 +2992,7 @@ nm_utils_sriov_vf_from_str (const char *str, GError **error)
 
 	detail = strchr (str, ' ');
 	if (detail) {
-		index_free = g_strndup (str, detail - str);
-		str = index_free;
+		str = nm_strndup_a (200, str, detail - str, &index_free);
 		detail++;
 	}
 
@@ -4565,6 +4570,29 @@ _nm_utils_generate_mac_address_mask_parse (const char *value,
 
 /*****************************************************************************/
 
+gboolean
+nm_utils_is_valid_iface_name_utf8safe (const char *utf8safe_name)
+{
+	gs_free gpointer bin_to_free = NULL;
+	gconstpointer bin;
+	gsize len;
+
+	g_return_val_if_fail (utf8safe_name, FALSE);
+
+	bin = nm_utils_buf_utf8safe_unescape (utf8safe_name, &len, &bin_to_free);
+
+	if (bin_to_free) {
+		/* some unescaping happened... */
+
+		if (len != strlen (bin)) {
+			/* there are embedded NUL chars. Invalid. */
+			return FALSE;
+		}
+	}
+
+	return nm_utils_is_valid_iface_name (bin, NULL);
+}
+
 /**
  * nm_utils_is_valid_iface_name:
  * @name: Name of interface
@@ -5430,11 +5458,11 @@ _json_team_add_defaults (json_t *json,
 
 	if (nm_streq (runner, NM_SETTING_TEAM_RUNNER_ACTIVEBACKUP)) {
 		_json_add_object (json, "notify_peers", "count", NULL,
-				  json_integer (NM_SETTING_TEAM_NOTIFY_PEERS_COUNT_ACTIVEBACKUP_DEFAULT));
+		                  json_integer (NM_SETTING_TEAM_NOTIFY_PEERS_COUNT_ACTIVEBACKUP_DEFAULT));
 		_json_add_object (json, "mcast_rejoin", "count", NULL,
-				  json_integer (NM_SETTING_TEAM_NOTIFY_MCAST_COUNT_ACTIVEBACKUP_DEFAULT));
+		                  json_integer (NM_SETTING_TEAM_NOTIFY_MCAST_COUNT_ACTIVEBACKUP_DEFAULT));
 	} else if (   nm_streq (runner, NM_SETTING_TEAM_RUNNER_LOADBALANCE)
-		   || nm_streq (runner, NM_SETTING_TEAM_RUNNER_LACP)) {
+	           || nm_streq (runner, NM_SETTING_TEAM_RUNNER_LACP)) {
 		json_element = json_array ();
 		json_array_append_new (json_element, json_string ("eth"));
 		json_array_append_new (json_element, json_string ("ipv4"));
@@ -5538,6 +5566,7 @@ _json_team_normalize_defaults (json_t *json, gboolean reset)
 {
 	json_t *json_element;
 	const char *runner = NM_SETTING_TEAM_RUNNER_DEFAULT;
+	gs_free char *runner_free = NULL;
 	int notify_peers_count = 0, notify_peers_interval = 0;
 	int mcast_rejoin_count = 0, mcast_rejoin_interval = 0;
 	int runner_tx_balancer_interval = -1;
@@ -5546,7 +5575,8 @@ _json_team_normalize_defaults (json_t *json, gboolean reset)
 
 	json_element = _json_find_object (json, "runner", "name", NULL);
 	if (json_element) {
-		runner = json_string_value (json_element);
+		runner_free = g_strdup (json_string_value (json_element));
+		runner = runner_free;
 		_json_delete_object_on_string_match (json, "runner", "name", NULL,
 		                                     NM_SETTING_TEAM_RUNNER_DEFAULT);
 	}
@@ -5922,11 +5952,9 @@ _nm_utils_team_config_get (const char *conf,
 				if (json_is_string (str_element))
 					g_ptr_array_add (data, g_strdup (json_string_value (str_element)));
 			}
-			if (data->len) {
-				g_value_init (value, G_TYPE_STRV);
-				g_value_take_boxed (value, _nm_utils_ptrarray_to_strv (data));
-			}
-			g_ptr_array_free (data, TRUE);
+			g_ptr_array_add (data, NULL);
+			g_value_init (value, G_TYPE_STRV);
+			g_value_take_boxed (value, g_ptr_array_free (data, FALSE));
 		} else {
 			g_assert_not_reached ();
 			g_free (value);
@@ -5948,14 +5976,13 @@ _nm_utils_team_config_set (char **conf,
                            const char *key3,
                            const GValue *value)
 {
-	json_t *json, *json_element, *json_link, *json_value = NULL;
+	nm_auto_decref_json json_t *json = NULL;
+	nm_auto_decref_json json_t *json_value = NULL;
+	json_t *json_element;
+	json_t *json_link;
 	json_error_t jerror;
-	gboolean updated = FALSE;
-	char **strv;
-	GPtrArray *array;
 	const char *iter_key = key;
-	int i;
-	NMTeamLinkWatcher *watcher;
+	gs_free char *conf_new = NULL;
 
 	g_return_val_if_fail (key, FALSE);
 
@@ -5966,14 +5993,12 @@ _nm_utils_team_config_set (char **conf,
 	if (!json)
 		return FALSE;
 
-	/* no new value? delete element */
 	if (!value) {
-		updated = _json_del_object (json, key, key2, key3);
+		if (!_json_del_object (json, key, key2, key3))
+			return FALSE;
 		goto done;
 	}
 
-	/* insert new value */
-	updated = TRUE;
 	if (G_VALUE_HOLDS_STRING (value))
 		json_value = json_string (g_value_get_string (value));
 	else if (G_VALUE_HOLDS_INT (value))
@@ -5982,53 +6007,56 @@ _nm_utils_team_config_set (char **conf,
 		json_value = json_boolean (g_value_get_boolean (value));
 	else if (G_VALUE_HOLDS_BOXED (value)) {
 		if (nm_streq (key, "link_watch")) {
+			gboolean has_array = FALSE;
+			GPtrArray *array;
+			guint i;
+
 			array = g_value_get_boxed (value);
-			if (!array || !array->len) {
-				updated = FALSE;
-				goto done;
-			}
+			if (!array || !array->len)
+				return FALSE;
 
-			/*
-			 * json_value:   will hold the final link_watcher json (array) object
-			 * json_element: is the next link_watcher to append to json_value
-			 * json_link:    used to transit the json_value from a single link_watcher
-			 *               object to an array of link watcher objects
-			 */
-			json_value = NULL;
 			for (i = 0; i < array->len; i++) {
-				watcher = array->pdata[i];
-				json_element = _nm_utils_team_link_watcher_to_json (watcher);
-				if (!json_element)
+				json_t *el;
+
+				el = _nm_utils_team_link_watcher_to_json (array->pdata[i]);
+				if (!el)
 					continue;
+				/* if there is only one watcher, it is added as-is. If there
+				 * are multiple watchers, they are added in an array. */
 				if (!json_value) {
-					json_value = json_element;
+					json_value = el;
 					continue;
 				}
-				if (!json_is_array (json_value)) {
-					json_link = json_value;
-					json_value = json_array ();
-					json_array_append_new (json_value, json_link);
+				if (!has_array) {
+					json_t *el_arr;
+
+					has_array = TRUE;
+					el_arr = json_array();
+					json_array_append_new (el_arr, json_value);
+					json_value = el_arr;
 				}
-				json_array_append_new (json_value, json_element);
+				json_array_append_new (json_value, el);
 			}
 		} else if (   nm_streq (key, "runner")
 		           && nm_streq0 (key2, "tx_hash")) {
+			const char *const*strv;
+			gsize i;
+
 			strv = g_value_get_boxed (value);
-			if (!strv) {
-				updated = FALSE;
-				goto done;
-			}
+			if (!strv)
+				return FALSE;
+
 			json_value = json_array ();
 			for (i = 0; strv[i]; i++)
 				json_array_append_new (json_value, json_string (strv[i]));
 		} else {
-			updated = FALSE;
-			goto done;
+			nm_assert_not_reached ();
+			return FALSE;
 		}
+
 	} else {  /* G_VALUE_HOLDS_? */
-		g_assert_not_reached ();
-		updated = FALSE;
-		goto done;
+		nm_assert_not_reached ();
+		return FALSE;
 	}
 
 	/* Simplest case: first level key only */
@@ -6054,22 +6082,19 @@ _nm_utils_team_config_set (char **conf,
 		iter_key = key3;
 	}
 
-	json_object_set_new (json_element, iter_key, json_value);
+	json_object_set_new (json_element, iter_key, g_steal_pointer (&json_value));
 
 done:
-	if (updated) {
-		_json_team_normalize_defaults (json, (   nm_streq0 (key, "runner")
-		                                      && nm_streq0 (key2, "name")));
-		g_free (*conf);
-		*conf = json_dumps (json, JSON_PRESERVE_ORDER);
-		/* Don't save an empty config */
-		if (nm_streq0 (*conf, "{}")) {
-			g_free (*conf);
-			*conf = NULL;
-		}
-	}
-	json_decref (json);
-	return updated;
+	_json_team_normalize_defaults (json, (   nm_streq0 (key, "runner")
+	                                      && nm_streq0 (key2, "name")));
+	conf_new = json_dumps (json, JSON_PRESERVE_ORDER);
+	if (nm_streq0 (conf_new, "{}"))
+		nm_clear_g_free (&conf_new);
+	if (nm_streq0 (conf_new, *conf))
+		return FALSE;
+	g_free (*conf);
+	*conf = g_steal_pointer (&conf_new);
+	return TRUE;
 }
 
 #else /* !WITH_JSON_VALIDATION */
@@ -6701,7 +6726,7 @@ nm_utils_base64secret_decode (const char *base64_key,
 
 	base64_key_len = strlen (base64_key);
 
-	r = nm_sd_utils_unbase64mem (base64_key, base64_key_len, &bin_arr, &bin_len);
+	r = nm_sd_utils_unbase64mem (base64_key, base64_key_len, TRUE, &bin_arr, &bin_len);
 	if (r < 0)
 		return FALSE;
 	if (bin_len != required_key_len) {
@@ -6740,3 +6765,166 @@ nm_utils_base64secret_normalize (const char *base64_key,
 	nm_explicit_bzero (buf, required_key_len);
 	return TRUE;
 }
+
+GVariant *
+_nm_utils_bridge_vlans_to_dbus (NMSetting *setting, const char *property)
+{
+	gs_unref_ptrarray GPtrArray *vlans = NULL;
+	GVariantBuilder builder;
+	guint i;
+
+	g_object_get (setting, property, &vlans, NULL);
+	g_variant_builder_init (&builder, G_VARIANT_TYPE ("aa{sv}"));
+
+	if (vlans) {
+		for (i = 0; i < vlans->len; i++) {
+			NMBridgeVlan *vlan = vlans->pdata[i];
+			GVariantBuilder vlan_builder;
+			guint16 vid_start, vid_end;
+
+			nm_bridge_vlan_get_vid_range (vlan, &vid_start, &vid_end);
+
+			g_variant_builder_init (&vlan_builder, G_VARIANT_TYPE_VARDICT);
+			g_variant_builder_add (&vlan_builder, "{sv}", "vid-start",
+			                       g_variant_new_uint16 (vid_start));
+			g_variant_builder_add (&vlan_builder, "{sv}", "vid-end",
+			                       g_variant_new_uint16 (vid_end));
+			g_variant_builder_add (&vlan_builder, "{sv}", "pvid",
+			                       g_variant_new_boolean (nm_bridge_vlan_is_pvid (vlan)));
+			g_variant_builder_add (&vlan_builder, "{sv}", "untagged",
+			                       g_variant_new_boolean (nm_bridge_vlan_is_untagged (vlan)));
+			g_variant_builder_add (&builder, "a{sv}", &vlan_builder);
+		}
+	}
+
+	return g_variant_builder_end (&builder);
+}
+
+gboolean
+_nm_utils_bridge_vlans_from_dbus (NMSetting *setting,
+                                  GVariant *connection_dict,
+                                  const char *property,
+                                  GVariant *value,
+                                  NMSettingParseFlags parse_flags,
+                                  GError **error)
+{
+	gs_unref_ptrarray GPtrArray *vlans = NULL;
+	GVariantIter vlan_iter;
+	GVariant *vlan_var;
+
+	g_return_val_if_fail (g_variant_is_of_type (value, G_VARIANT_TYPE ("aa{sv}")), FALSE);
+
+	vlans = g_ptr_array_new_with_free_func ((GDestroyNotify) nm_bridge_vlan_unref);
+	g_variant_iter_init (&vlan_iter, value);
+	while (g_variant_iter_next (&vlan_iter, "@a{sv}", &vlan_var)) {
+		_nm_unused gs_unref_variant GVariant *var_unref = vlan_var;
+		NMBridgeVlan *vlan;
+		guint16 vid_start, vid_end;
+		gboolean pvid = FALSE, untagged = FALSE;
+
+		if (!g_variant_lookup (vlan_var, "vid-start", "q", &vid_start))
+			continue;
+		if (   vid_start < NM_BRIDGE_VLAN_VID_MIN
+		    || vid_start > NM_BRIDGE_VLAN_VID_MAX)
+			continue;
+
+		if (!g_variant_lookup (vlan_var, "vid-end", "q", &vid_end))
+			continue;
+		if (   vid_end < NM_BRIDGE_VLAN_VID_MIN
+		    || vid_end > NM_BRIDGE_VLAN_VID_MAX)
+			continue;
+		if (vid_start > vid_end)
+			continue;
+
+		g_variant_lookup (vlan_var, "pvid", "b", &pvid);
+		if (pvid && vid_start != vid_end)
+			continue;
+		g_variant_lookup (vlan_var, "untagged", "b", &untagged);
+
+		vlan = nm_bridge_vlan_new (vid_start, vid_end);
+		nm_bridge_vlan_set_untagged (vlan, untagged);
+		nm_bridge_vlan_set_pvid (vlan, pvid);
+		g_ptr_array_add (vlans, vlan);
+	}
+
+	g_object_set (setting, property, vlans, NULL);
+
+	return TRUE;
+}
+
+gboolean
+_nm_utils_bridge_vlan_verify_list (GPtrArray *vlans,
+                                   gboolean check_normalizable,
+                                   GError **error,
+                                   const char *setting,
+                                   const char *property)
+{
+	guint i;
+	gs_unref_hashtable GHashTable *h = NULL;
+	gboolean pvid_found = FALSE;
+
+	if (   !vlans
+	    || vlans->len <= 1)
+		return TRUE;
+
+	if (check_normalizable) {
+		guint16 vid_prev_end, vid_start, vid_end;
+
+		nm_assert (_nm_utils_bridge_vlan_verify_list (vlans, FALSE, NULL, setting, property));
+
+		nm_bridge_vlan_get_vid_range (vlans->pdata[0], NULL, &vid_prev_end);
+		for (i = 1; i < vlans->len; i++) {
+			const NMBridgeVlan *vlan = vlans->pdata[i];
+
+			nm_bridge_vlan_get_vid_range (vlan, &vid_start, &vid_end);
+
+			if (vid_prev_end > vid_start) {
+				g_set_error (error,
+				             NM_CONNECTION_ERROR,
+				             NM_CONNECTION_ERROR_INVALID_PROPERTY,
+				             _("Bridge VLANs %d and %d are not sorted by ascending vid"),
+				             vid_prev_end,
+				             vid_start);
+				g_prefix_error (error, "%s.%s: ", setting, property);
+				return FALSE;
+			}
+
+			vid_prev_end = vid_end;
+		}
+		return TRUE;
+	}
+
+	h = g_hash_table_new (nm_direct_hash, NULL);
+	for (i = 0; i < vlans->len; i++) {
+		NMBridgeVlan *vlan = vlans->pdata[i];
+		guint16 v, vid_start, vid_end;
+
+		nm_bridge_vlan_get_vid_range (vlan, &vid_start, &vid_end);
+
+		for (v = vid_start; v <= vid_end; v++) {
+			if (!nm_g_hash_table_add (h, GUINT_TO_POINTER (v))) {
+				g_set_error (error,
+				             NM_CONNECTION_ERROR,
+				             NM_CONNECTION_ERROR_INVALID_PROPERTY,
+				             _("duplicate bridge VLAN vid %u"), v);
+				g_prefix_error (error, "%s.%s: ", setting, property);
+				return FALSE;
+			}
+		}
+
+		if (nm_bridge_vlan_is_pvid (vlan)) {
+			if (   vid_start != vid_end
+			    || pvid_found) {
+				g_set_error_literal (error,
+				                     NM_CONNECTION_ERROR,
+				                     NM_CONNECTION_ERROR_INVALID_PROPERTY,
+				                     _("only one VLAN can be the PVID"));
+				g_prefix_error (error, "%s.%s: ", setting, property);
+				return FALSE;
+			}
+			pvid_found = TRUE;
+		}
+	}
+
+	return TRUE;
+}
diff --git a/libnm-core/nm-version.h b/libnm-core/nm-version.h
index 7fe2e45b..0ac2955b 100644
--- a/libnm-core/nm-version.h
+++ b/libnm-core/nm-version.h
@@ -188,4 +188,18 @@
 # define NM_AVAILABLE_IN_1_16
 #endif
 
+#if NM_VERSION_MIN_REQUIRED >= NM_VERSION_1_18
+# define NM_DEPRECATED_IN_1_18           G_DEPRECATED
+# define NM_DEPRECATED_IN_1_18_FOR(f)    G_DEPRECATED_FOR(f)
+#else
+# define NM_DEPRECATED_IN_1_18
+# define NM_DEPRECATED_IN_1_18_FOR(f)
+#endif
+
+#if NM_VERSION_MAX_ALLOWED < NM_VERSION_1_18
+# define NM_AVAILABLE_IN_1_18            G_UNAVAILABLE(1,18)
+#else
+# define NM_AVAILABLE_IN_1_18
+#endif
+
 #endif  /* NM_VERSION_H */
diff --git a/libnm-core/tests/meson.build b/libnm-core/tests/meson.build
index 7d772c80..1afb9c4b 100644
--- a/libnm-core/tests/meson.build
+++ b/libnm-core/tests/meson.build
@@ -34,7 +34,7 @@ foreach test_unit: test_units
     'libnm-core-' + test_unit,
     [test_unit + '.c'] + enum,
     dependencies: [
-      nm_core_dep,
+      libnm_core_dep,
       libnm_systemd_shared_no_logging_dep,
     ],
     c_args: [
diff --git a/libnm-core/tests/test-general.c b/libnm-core/tests/test-general.c
index 7d97296a..a6abf391 100644
--- a/libnm-core/tests/test-general.c
+++ b/libnm-core/tests/test-general.c
@@ -23,8 +23,8 @@
 
 #include "nm-default.h"
 
-#include "nm-utils/c-list-util.h"
-#include "nm-utils/nm-enum-utils.h"
+#include "nm-std-aux/c-list-util.h"
+#include "nm-glib-aux/nm-enum-utils.h"
 
 #include "nm-utils.h"
 #include "nm-setting-private.h"
@@ -63,8 +63,8 @@
 #include "nm-setting-wpan.h"
 #include "nm-simple-connection.h"
 #include "nm-keyfile-internal.h"
-#include "nm-utils/nm-dedup-multi.h"
-#include "nm-ethtool-utils.h"
+#include "nm-glib-aux/nm-dedup-multi.h"
+#include "nm-libnm-core-intern/nm-ethtool-utils.h"
 
 #include "test-general-enums.h"
 
@@ -80,6 +80,29 @@ G_STATIC_ASSERT (sizeof (bool) <= sizeof (int));
 
 /*****************************************************************************/
 
+static void
+test_nm_ascii_spaces (void)
+{
+	int i;
+	const char *const S = NM_ASCII_SPACES;
+
+	for (i = 0; S[i]; i++)
+		g_assert (!strchr (&S[i + 1], S[i]));
+
+	for (i = 0; S[i] != '\0'; i++)
+		g_assert (g_ascii_isspace (S[i]));
+
+	g_assert (!g_ascii_isspace ((char) 0));
+	for (i = 1; i < 0x100; i++) {
+		if (g_ascii_isspace ((char) i))
+			g_assert (strchr (S, (char) i));
+		else
+			g_assert (!strchr (S, (char) i));
+	}
+}
+
+/*****************************************************************************/
+
 typedef struct _nm_packed {
 	int v0;
 	char v1;
@@ -236,51 +259,324 @@ test_nm_g_slice_free_fcn (void)
 /*****************************************************************************/
 
 static void
-_do_test_nm_utils_strsplit_set (gboolean escape, const char *str, ...)
+_do_test_nm_utils_strsplit_set_f_one (NMUtilsStrsplitSetFlags flags,
+                                      const char *str,
+                                      gsize words_len,
+                                      const char *const*exp_words)
 {
-	gs_unref_ptrarray GPtrArray *args_array = g_ptr_array_new ();
-	const char *const*args;
+#define DELIMITERS           " \n"
+#define DELIMITERS_C         ' ', '\n'
+
 	gs_free const char **words = NULL;
-	const char *arg;
-	gsize i;
-	va_list ap;
+	gsize i, j, k;
+	const gboolean f_allow_escaping = NM_FLAGS_HAS (flags, NM_UTILS_STRSPLIT_SET_FLAGS_ALLOW_ESCAPING);
+	const gboolean f_preserve_empty = NM_FLAGS_HAS (flags, NM_UTILS_STRSPLIT_SET_FLAGS_PRESERVE_EMPTY);
+	const char *s1;
+	gsize initial_offset;
+	gs_strfreev char **words_g = NULL;
+
+	g_assert (!NM_FLAGS_ANY (flags, ~(  NM_UTILS_STRSPLIT_SET_FLAGS_ALLOW_ESCAPING
+	                                  | NM_UTILS_STRSPLIT_SET_FLAGS_PRESERVE_EMPTY)));
+
+	/* assert that the epected words are valid (and don't contain unescaped delimiters). */
+	for (i = 0; i < words_len; i++) {
+		const char *w = exp_words[i];
+
+		g_assert (w);
+		if (!f_preserve_empty)
+			g_assert (w[0]);
+		for (k = 0; w[k]; ) {
+			if (   f_allow_escaping
+			    && w[k] == '\\') {
+				k++;
+				if (w[k] == '\0')
+					break;
+				k++;
+				continue;
+			}
+			g_assert (!NM_IN_SET (w[k], DELIMITERS_C));
+			k++;
+		}
+		if (!f_allow_escaping)
+			g_assert (!NM_STRCHAR_ANY (w, ch, NM_IN_SET (ch, DELIMITERS_C)));
+	}
 
-	va_start (ap, str);
-	while ((arg = va_arg (ap, const char *)))
-		g_ptr_array_add (args_array, (gpointer) arg);
-	va_end (ap);
-	g_ptr_array_add (args_array, NULL);
+	initial_offset = (f_preserve_empty || !str)
+	                 ? 0u
+	                 : strspn (str, DELIMITERS);
+
+	/* first compare our expected values with what g_strsplit_set() would
+	 * do. */
+	words_g = str ? g_strsplit_set (str, DELIMITERS, -1) : NULL;
+	if (str == NULL) {
+		g_assert_cmpint (words_len, ==, 0);
+		g_assert (!words_g);
+	} else if (nm_streq0 (str, "")) {
+		g_assert_cmpint (words_len, ==, 0);
+		g_assert (words_g);
+		g_assert (!words_g[0]);
+	} else {
+		g_assert (words_g);
+		g_assert (words_g[0]);
+		if (!f_allow_escaping) {
+			if (!f_preserve_empty) {
+				for (i = 0, j = 0; words_g[i]; i++) {
+					if (words_g[i][0] == '\0')
+						g_free (words_g[i]);
+					else
+						words_g[j++] = words_g[i];
+				}
+				words_g[j] = NULL;
+			}
+			if (f_preserve_empty)
+				g_assert_cmpint (words_len, >, 0);
+			for (i = 0; i < words_len; i++) {
+				g_assert (exp_words[i]);
+				g_assert_cmpstr (exp_words[i], ==, words_g[i]);
+			}
+			g_assert (words_g[words_len] == NULL);
+			g_assert_cmpint (NM_PTRARRAY_LEN (words_g), ==, words_len);
+			g_assert (_nm_utils_strv_cmp_n (exp_words, words_len, NM_CAST_STRV_CC (words_g), -1) == 0);
+		}
+	}
 
-	args = (const char *const*) args_array->pdata;
+	if (   flags == NM_UTILS_STRSPLIT_SET_FLAGS_NONE
+	    && nmtst_get_rand_bool ())
+		words = nm_utils_strsplit_set (str, DELIMITERS);
+	else if (   flags == NM_UTILS_STRSPLIT_SET_FLAGS_PRESERVE_EMPTY
+	         && nmtst_get_rand_bool ())
+		words = nm_utils_strsplit_set_with_empty (str, DELIMITERS);
+	else
+		words = nm_utils_strsplit_set_full (str, DELIMITERS, flags);
 
-	words = nm_utils_strsplit_set (str, " \t\n", escape);
+	g_assert_cmpint (NM_PTRARRAY_LEN (words), ==, words_len);
 
-	if (!args[0]) {
+	if (words_len == 0) {
 		g_assert (!words);
 		g_assert (   !str
-		          || NM_STRCHAR_ALL (str, ch, NM_IN_SET (ch, ' ', '\t', '\n')));
+		          || NM_STRCHAR_ALL (str, ch, NM_IN_SET (ch, DELIMITERS_C)));
 		return;
 	}
+
 	g_assert (words);
-	for (i = 0; args[i] || words[i]; i++) {
-		g_assert (args[i]);
-		g_assert (words[i]);
-		g_assert (args[i][0]);
-		g_assert (escape || NM_STRCHAR_ALL (args[i], ch, !NM_IN_SET (ch, ' ', '\t', '\n')));
-		g_assert_cmpstr (args[i], ==, words[i]);
+	for (i = 0; i < words_len; i++)
+		g_assert_cmpstr (exp_words[i], ==, words[i]);
+	g_assert (words[words_len] == NULL);
+
+	g_assert (_nm_utils_strv_cmp_n (exp_words, words_len, words, -1) == 0);
+
+	s1 = words[0];
+	g_assert (s1 >= (char *) &words[words_len + 1]);
+	s1 = &s1[strlen (str)];
+	for (i = 1; i < words_len; i++) {
+		g_assert (&(words[i - 1])[strlen (words[i - 1])] < words[i]);
+		g_assert (words[i] <= s1);
+	}
+
+	/* while strsplit removes all delimiters, we can relatively easily find them
+	 * in the original string. Assert that the original string and the pointer offsets
+	 * of words correspond. In particular, find idx_delim_after and idx_delim_before
+	 * to determine which delimiter was after/before a word. */
+	{
+		gsize idx_word_start;
+		gsize idx_delim_after_old = G_MAXSIZE;
+
+		idx_word_start = initial_offset;
+		for (i = 0; i < words_len; i++) {
+			const gsize l_i = strlen (words[i]);
+			gsize idx_delim_after;
+			gsize idx_delim_before;
+
+			/* find the delimiter *after* words[i]. We can do that by looking at the next
+			 * word and calculating the pointer difference.
+			 *
+			 * The delimiter after the very last word is '\0' and requires strlen() to find. */
+			idx_delim_after = initial_offset + ((words[i] - words[0]) + l_i);
+			if (idx_delim_after != idx_word_start + l_i) {
+				g_assert (!f_preserve_empty);
+				g_assert_cmpint (idx_word_start + l_i, <, idx_delim_after);
+				idx_word_start = idx_delim_after - l_i;
+			}
+			if (i + 1 < words_len) {
+				gsize x = initial_offset + ((words[i + 1] - words[0]) - 1);
+
+				if (idx_delim_after != x) {
+					g_assert (!f_preserve_empty);
+					g_assert_cmpint (idx_delim_after, <, x);
+					for (k = idx_delim_after; k <= x; k++)
+						g_assert (NM_IN_SET (str[k], DELIMITERS_C));
+				}
+				g_assert (NM_IN_SET (str[idx_delim_after], DELIMITERS_C));
+			} else {
+				if (f_preserve_empty)
+					g_assert (NM_IN_SET (str[idx_delim_after], '\0'));
+				else
+					g_assert (NM_IN_SET (str[idx_delim_after], '\0', DELIMITERS_C));
+			}
+
+			/* find the delimiter *before* words[i]. */
+			if (i == 0) {
+				/* there is only a delimiter *before*, with !f_preserve_empty and leading
+				 * delimiters. */
+				idx_delim_before = G_MAXSIZE;
+				if (initial_offset > 0) {
+					g_assert (!f_preserve_empty);
+					idx_delim_before = initial_offset - 1;
+				}
+			} else
+				idx_delim_before = initial_offset + (words[i] - words[0]) - 1;
+			if (idx_delim_before != G_MAXSIZE)
+				g_assert (NM_IN_SET (str[idx_delim_before], DELIMITERS_C));
+			if (idx_delim_after_old != idx_delim_before) {
+				g_assert (!f_preserve_empty);
+				if (i == 0) {
+					g_assert_cmpint (initial_offset, >, 0);
+					g_assert_cmpint (idx_delim_before, !=, G_MAXSIZE);
+					g_assert_cmpint (idx_delim_before, ==, initial_offset - 1);
+				} else {
+					g_assert_cmpint (idx_delim_after_old, !=, G_MAXSIZE);
+					g_assert_cmpint (idx_delim_before, !=, G_MAXSIZE);
+					g_assert_cmpint (idx_delim_after_old, <, idx_delim_before);
+					for (k = idx_delim_after_old; k <= idx_delim_before; k++)
+						g_assert (NM_IN_SET (str[k], DELIMITERS_C));
+				}
+			}
+
+			for (k = 0; k < l_i; ) {
+				if (   f_allow_escaping
+				    && str[idx_word_start + k] == '\\') {
+					k++;
+					if (k >= l_i)
+						break;
+					k++;
+					continue;
+				}
+				g_assert (!NM_IN_SET (str[idx_word_start + k], DELIMITERS_C));
+				k++;
+			}
+			g_assert (strncmp (words[i], &str[idx_word_start], l_i) == 0);
+
+			if (i > 0) {
+				const char *s = &(words[i - 1])[strlen (words[i - 1]) + 1];
+
+				if (s != words[i]) {
+					g_assert (!f_preserve_empty);
+					g_assert (s < words[i]);
+				}
+			}
+
+			idx_word_start += l_i + 1;
+			idx_delim_after_old = idx_delim_after;
+		}
 	}
 }
 
-#define do_test_nm_utils_strsplit_set(str, ...) \
-	_do_test_nm_utils_strsplit_set (str, ##__VA_ARGS__, NULL)
+static void
+_do_test_nm_utils_strsplit_set_f (NMUtilsStrsplitSetFlags flags,
+                                  const char *str,
+                                  gsize words_len,
+                                  const char *const*exp_words)
+{
+	_do_test_nm_utils_strsplit_set_f_one (flags, str, words_len, exp_words);
+
+	if (NM_FLAGS_HAS (flags, NM_UTILS_STRSPLIT_SET_FLAGS_PRESERVE_EMPTY)) {
+		gs_unref_ptrarray GPtrArray *exp_words2 = NULL;
+		gsize k;
+
+		exp_words2 = g_ptr_array_new ();
+		for (k = 0; k < words_len; k++) {
+			if (exp_words[k][0] != '\0')
+				g_ptr_array_add (exp_words2, (gpointer) exp_words[k]);
+		}
+
+		_do_test_nm_utils_strsplit_set_f_one (flags & (~NM_UTILS_STRSPLIT_SET_FLAGS_PRESERVE_EMPTY),
+		                                      str,
+		                                      exp_words2->len,
+		                                      (const char *const*) exp_words2->pdata);
+	}
+}
+
+#define do_test_nm_utils_strsplit_set_f(flags, str, ...) \
+	_do_test_nm_utils_strsplit_set_f (flags, \
+	                                  str, \
+	                                  NM_NARG (__VA_ARGS__), \
+	                                  NM_MAKE_STRV (__VA_ARGS__))
+
+#define do_test_nm_utils_strsplit_set(allow_escaping, str, ...) \
+	do_test_nm_utils_strsplit_set_f (  (allow_escaping) \
+	                                 ? NM_UTILS_STRSPLIT_SET_FLAGS_ALLOW_ESCAPING \
+	                                 : NM_UTILS_STRSPLIT_SET_FLAGS_NONE, \
+	                                 str, \
+	                                 ##__VA_ARGS__)
+
+static void
+_do_test_nm_utils_strsplit_set_simple (NMUtilsStrsplitSetFlags flags,
+                                       const char *str,
+                                       gsize words_len,
+                                       const char *const*exp_words)
+{
+	gs_free const char **tokens = NULL;
+	gsize n_tokens;
+
+	tokens = nm_utils_strsplit_set_full (str, DELIMITERS, flags);
+
+	if (!tokens) {
+		g_assert_cmpint (words_len, ==, 0);
+		return;
+	}
+
+	g_assert (str && str[0]);
+	g_assert_cmpint (words_len, >, 0);
+	n_tokens = NM_PTRARRAY_LEN (tokens);
+
+	if (_nm_utils_strv_cmp_n (exp_words, words_len, tokens, -1) != 0) {
+		gsize i;
+
+		g_print (">>> split \"%s\" (flags %x) got %zu tokens (%zu expected)\n", str, (guint) flags, n_tokens, words_len);
+		for (i = 0; i < NM_MAX (n_tokens, words_len); i++) {
+			const char *s1 = i < n_tokens  ? tokens[i]    : NULL;
+			const char *s2 = i < words_len ? exp_words[i] : NULL;
+
+			g_print (">>> [%zu]: %s - %s%s%s vs. %s%s%s\n",
+			         i,
+			         nm_streq0 (s1, s2) ? "same" : "diff",
+			         NM_PRINT_FMT_QUOTE_STRING (s1),
+			         NM_PRINT_FMT_QUOTE_STRING (s2));
+		}
+		g_assert_not_reached ();
+	}
+	g_assert_cmpint (words_len, ==, NM_PTRARRAY_LEN (tokens));
+}
+#define do_test_nm_utils_strsplit_set_simple(flags, str, ...) \
+	_do_test_nm_utils_strsplit_set_simple ((flags), (str), NM_NARG (__VA_ARGS__), NM_MAKE_STRV (__VA_ARGS__))
 
 static void
 test_nm_utils_strsplit_set (void)
 {
+	gs_unref_ptrarray GPtrArray *words_exp = NULL;
+	guint test_run;
+
+	do_test_nm_utils_strsplit_set_f (NM_UTILS_STRSPLIT_SET_FLAGS_NONE, NULL);
+	do_test_nm_utils_strsplit_set_f (NM_UTILS_STRSPLIT_SET_FLAGS_NONE, "");
+	do_test_nm_utils_strsplit_set_f (NM_UTILS_STRSPLIT_SET_FLAGS_NONE, " ");
+	do_test_nm_utils_strsplit_set_f (NM_UTILS_STRSPLIT_SET_FLAGS_NONE, "a  b", "a", "b");
+
+	do_test_nm_utils_strsplit_set_f (NM_UTILS_STRSPLIT_SET_FLAGS_PRESERVE_EMPTY, NULL);
+	do_test_nm_utils_strsplit_set_f (NM_UTILS_STRSPLIT_SET_FLAGS_PRESERVE_EMPTY, "");
+	do_test_nm_utils_strsplit_set_f (NM_UTILS_STRSPLIT_SET_FLAGS_PRESERVE_EMPTY, " ", "", "");
+	do_test_nm_utils_strsplit_set_f (NM_UTILS_STRSPLIT_SET_FLAGS_PRESERVE_EMPTY, "  ", "", "", "");
+	do_test_nm_utils_strsplit_set_f (NM_UTILS_STRSPLIT_SET_FLAGS_PRESERVE_EMPTY, "a  ", "a", "", "");
+	do_test_nm_utils_strsplit_set_f (NM_UTILS_STRSPLIT_SET_FLAGS_PRESERVE_EMPTY, "a  b", "a", "", "b");
+	do_test_nm_utils_strsplit_set_f (NM_UTILS_STRSPLIT_SET_FLAGS_PRESERVE_EMPTY, " ab  b", "", "ab", "", "b");
+	do_test_nm_utils_strsplit_set_f (NM_UTILS_STRSPLIT_SET_FLAGS_PRESERVE_EMPTY, "ab  b", "ab", "", "b");
+	do_test_nm_utils_strsplit_set_f (NM_UTILS_STRSPLIT_SET_FLAGS_PRESERVE_EMPTY, "abb", "abb");
+	do_test_nm_utils_strsplit_set_f (NM_UTILS_STRSPLIT_SET_FLAGS_PRESERVE_EMPTY, "abb  bb ", "abb", "", "bb", "");
+	do_test_nm_utils_strsplit_set_f (NM_UTILS_STRSPLIT_SET_FLAGS_PRESERVE_EMPTY, "abb bcb ", "abb", "bcb", "");
+
 	do_test_nm_utils_strsplit_set (FALSE, NULL);
 	do_test_nm_utils_strsplit_set (FALSE, "");
-	do_test_nm_utils_strsplit_set (FALSE, "\t");
-	do_test_nm_utils_strsplit_set (FALSE, " \t\n");
+	do_test_nm_utils_strsplit_set (FALSE, "\n");
+	do_test_nm_utils_strsplit_set (TRUE, " \t\n", "\t");
 	do_test_nm_utils_strsplit_set (FALSE, "a", "a");
 	do_test_nm_utils_strsplit_set (FALSE, "a b", "a", "b");
 	do_test_nm_utils_strsplit_set (FALSE, "a\rb", "a\rb");
@@ -300,6 +596,76 @@ test_nm_utils_strsplit_set (void)
 	do_test_nm_utils_strsplit_set (TRUE, "foo\\", "foo\\");
 	do_test_nm_utils_strsplit_set (TRUE, "bar foo\\", "bar", "foo\\");
 	do_test_nm_utils_strsplit_set (TRUE, "\\ a b\\ \\  c", "\\ a", "b\\ \\ ", "c");
+
+	words_exp = g_ptr_array_new_with_free_func (g_free);
+	for (test_run = 0; test_run < 100; test_run++) {
+		gboolean f_allow_escaping = nmtst_get_rand_bool ();
+		guint words_len = nmtst_get_rand_int () % 100;
+		gs_free char *str = NULL;
+		guint i;
+
+		g_ptr_array_set_size (words_exp, 0);
+		for (i = 0; i < words_len; i++) {
+			guint word_len;
+			char *word;
+			guint j;
+
+			word_len = nmtst_get_rand_int ();
+			if ((word_len % 100) < 30)
+				word_len = 0;
+			else
+				word_len = (word_len >> 10) % 100;
+			word = g_new (char, word_len + 3);
+			for (j = 0; j < word_len; ) {
+				guint32 p = nmtst_get_rand_int ();
+				static const char delimiters_arr[] = { DELIMITERS_C };
+				static const char regular_chars[] = "abcdefghijklmnopqrstuvwxyz";
+
+				if (   !f_allow_escaping
+				    || (p % 1000) < 700) {
+					if (((p >> 20) % 100) < 20)
+						word[j++] = '\\';
+					word[j++] = regular_chars[(p >> 11) % (G_N_ELEMENTS (regular_chars) - 1)];
+					continue;
+				}
+				word[j++] = '\\';
+				word[j++] = delimiters_arr[(p >> 11) % G_N_ELEMENTS (delimiters_arr)];
+			}
+			word[j] = '\0';
+			g_ptr_array_add (words_exp, word);
+		}
+		g_ptr_array_add (words_exp, NULL);
+
+		str = g_strjoinv (" ", (char **) words_exp->pdata);
+
+		if (   str[0] == '\0'
+		    && words_len > 0) {
+			g_assert (words_len == 1);
+			g_assert_cmpstr (words_exp->pdata[0], ==, "");
+			words_len = 0;
+		}
+
+		_do_test_nm_utils_strsplit_set_f (  (f_allow_escaping ? NM_UTILS_STRSPLIT_SET_FLAGS_ALLOW_ESCAPING : NM_UTILS_STRSPLIT_SET_FLAGS_NONE)
+		                                  | NM_UTILS_STRSPLIT_SET_FLAGS_PRESERVE_EMPTY,
+		                                  str,
+		                                  words_len,
+		                                  (const char *const*) words_exp->pdata);
+	}
+
+	do_test_nm_utils_strsplit_set_simple (NM_UTILS_STRSPLIT_SET_FLAGS_ESCAPED, "\t", "\t");
+	do_test_nm_utils_strsplit_set_simple (NM_UTILS_STRSPLIT_SET_FLAGS_ESCAPED | NM_UTILS_STRSPLIT_SET_FLAGS_STRSTRIP, "\t");
+	do_test_nm_utils_strsplit_set_simple (NM_UTILS_STRSPLIT_SET_FLAGS_ESCAPED | NM_UTILS_STRSPLIT_SET_FLAGS_STRSTRIP | NM_UTILS_STRSPLIT_SET_FLAGS_PRESERVE_EMPTY,
+	                                      "\t", "");
+	do_test_nm_utils_strsplit_set_simple (NM_UTILS_STRSPLIT_SET_FLAGS_ESCAPED | NM_UTILS_STRSPLIT_SET_FLAGS_STRSTRIP | NM_UTILS_STRSPLIT_SET_FLAGS_PRESERVE_EMPTY,
+	                                      "\t\\\t\t\t\\\t", "\t\t\t\t");
+
+	do_test_nm_utils_strsplit_set_simple (NM_UTILS_STRSPLIT_SET_FLAGS_ESCAPED, "\ta", "\ta");
+	do_test_nm_utils_strsplit_set_simple (NM_UTILS_STRSPLIT_SET_FLAGS_ESCAPED | NM_UTILS_STRSPLIT_SET_FLAGS_STRSTRIP, "\ta", "a");
+	do_test_nm_utils_strsplit_set_simple (NM_UTILS_STRSPLIT_SET_FLAGS_ESCAPED, "\ta\\ b\t\\ ", "\ta b\t ");
+	do_test_nm_utils_strsplit_set_simple (NM_UTILS_STRSPLIT_SET_FLAGS_ESCAPED | NM_UTILS_STRSPLIT_SET_FLAGS_STRSTRIP, "\ta\\ b\t\\ \t", "a b\t ");
+	do_test_nm_utils_strsplit_set_simple (NM_UTILS_STRSPLIT_SET_FLAGS_ESCAPED, "a\\  b", "a ", "b");
+	do_test_nm_utils_strsplit_set_simple (NM_UTILS_STRSPLIT_SET_FLAGS_ESCAPED, "\ta\\  b", "\ta ", "b");
+	do_test_nm_utils_strsplit_set_simple (NM_UTILS_STRSPLIT_SET_FLAGS_ESCAPED | NM_UTILS_STRSPLIT_SET_FLAGS_STRSTRIP, "\ta\\  b", "a ", "b");
 }
 
 /*****************************************************************************/
@@ -809,54 +1175,54 @@ test_setting_vpn_items (void)
 	nm_setting_vpn_remove_data_item (s_vpn, "foobar4-flags");
 
 	/* Try to add some blank values and make sure they are rejected */
-	NMTST_EXPECT_LIBNM_CRITICAL (NMTST_G_RETURN_MSG (key != NULL));
+	NMTST_EXPECT_LIBNM_CRITICAL (NMTST_G_RETURN_MSG (key && key[0]));
 	nm_setting_vpn_add_data_item (s_vpn, NULL, NULL);
 	g_test_assert_expected_messages ();
 
-	NMTST_EXPECT_LIBNM_CRITICAL (NMTST_G_RETURN_MSG (strlen (key) > 0));
+	NMTST_EXPECT_LIBNM_CRITICAL (NMTST_G_RETURN_MSG (key && key[0]));
 	nm_setting_vpn_add_data_item (s_vpn, "", "");
 	g_test_assert_expected_messages ();
 
-	NMTST_EXPECT_LIBNM_CRITICAL (NMTST_G_RETURN_MSG (item != NULL));
+	NMTST_EXPECT_LIBNM_CRITICAL (NMTST_G_RETURN_MSG (item && item[0]));
 	nm_setting_vpn_add_data_item (s_vpn, "foobar1", NULL);
 	g_test_assert_expected_messages ();
 
-	NMTST_EXPECT_LIBNM_CRITICAL (NMTST_G_RETURN_MSG (strlen (item) > 0));
+	NMTST_EXPECT_LIBNM_CRITICAL (NMTST_G_RETURN_MSG (item && item[0]));
 	nm_setting_vpn_add_data_item (s_vpn, "foobar1", "");
 	g_test_assert_expected_messages ();
 
-	NMTST_EXPECT_LIBNM_CRITICAL (NMTST_G_RETURN_MSG (key != NULL));
+	NMTST_EXPECT_LIBNM_CRITICAL (NMTST_G_RETURN_MSG (key && key[0]));
 	nm_setting_vpn_add_data_item (s_vpn, NULL, "blahblah1");
 	g_test_assert_expected_messages ();
 
-	NMTST_EXPECT_LIBNM_CRITICAL (NMTST_G_RETURN_MSG (strlen (key) > 0));
+	NMTST_EXPECT_LIBNM_CRITICAL (NMTST_G_RETURN_MSG (key && key[0]));
 	nm_setting_vpn_add_data_item (s_vpn, "", "blahblah1");
 	g_test_assert_expected_messages ();
 
 	nm_setting_vpn_foreach_data_item (s_vpn, vpn_check_empty_func, NULL);
 
 	/* Try to add some blank secrets and make sure they are rejected */
-	NMTST_EXPECT_LIBNM_CRITICAL (NMTST_G_RETURN_MSG (key != NULL));
+	NMTST_EXPECT_LIBNM_CRITICAL (NMTST_G_RETURN_MSG (key && key[0]));
 	nm_setting_vpn_add_secret (s_vpn, NULL, NULL);
 	g_test_assert_expected_messages ();
 
-	NMTST_EXPECT_LIBNM_CRITICAL (NMTST_G_RETURN_MSG (strlen (key) > 0));
+	NMTST_EXPECT_LIBNM_CRITICAL (NMTST_G_RETURN_MSG (key && key[0]));
 	nm_setting_vpn_add_secret (s_vpn, "", "");
 	g_test_assert_expected_messages ();
 
-	NMTST_EXPECT_LIBNM_CRITICAL (NMTST_G_RETURN_MSG (secret != NULL));
+	NMTST_EXPECT_LIBNM_CRITICAL (NMTST_G_RETURN_MSG (secret && secret[0]));
 	nm_setting_vpn_add_secret (s_vpn, "foobar1", NULL);
 	g_test_assert_expected_messages ();
 
-	NMTST_EXPECT_LIBNM_CRITICAL (NMTST_G_RETURN_MSG (strlen (secret) > 0));
+	NMTST_EXPECT_LIBNM_CRITICAL (NMTST_G_RETURN_MSG (secret && secret[0]));
 	nm_setting_vpn_add_secret (s_vpn, "foobar1", "");
 	g_test_assert_expected_messages ();
 
-	NMTST_EXPECT_LIBNM_CRITICAL (NMTST_G_RETURN_MSG (key != NULL));
+	NMTST_EXPECT_LIBNM_CRITICAL (NMTST_G_RETURN_MSG (key && key[0]));
 	nm_setting_vpn_add_secret (s_vpn, NULL, "blahblah1");
 	g_test_assert_expected_messages ();
 
-	NMTST_EXPECT_LIBNM_CRITICAL (NMTST_G_RETURN_MSG (strlen (key) > 0));
+	NMTST_EXPECT_LIBNM_CRITICAL (NMTST_G_RETURN_MSG (key && key[0]));
 	nm_setting_vpn_add_secret (s_vpn, "", "blahblah1");
 	g_test_assert_expected_messages ();
 
@@ -2347,7 +2713,7 @@ test_setting_connection_permissions_helpers (void)
 	g_assert (!success);
 
 	/* Ensure a bad [type] is rejected */
-	NMTST_EXPECT_LIBNM_CRITICAL (NMTST_G_RETURN_MSG (ptype));
+	NMTST_EXPECT_LIBNM_CRITICAL (NMTST_G_RETURN_MSG (ptype && ptype[0]));
 	success = nm_setting_connection_add_permission (s_con, NULL, "blah", NULL);
 	g_test_assert_expected_messages ();
 	g_assert (!success);
@@ -2687,6 +3053,7 @@ test_connection_diff_a_only (void)
 			{ NM_SETTING_IP_CONFIG_ROUTES,             NM_SETTING_DIFF_RESULT_IN_A },
 			{ NM_SETTING_IP_CONFIG_ROUTE_METRIC,       NM_SETTING_DIFF_RESULT_IN_A },
 			{ NM_SETTING_IP_CONFIG_ROUTE_TABLE,        NM_SETTING_DIFF_RESULT_IN_A },
+			{ NM_SETTING_IP_CONFIG_ROUTING_RULES,      NM_SETTING_DIFF_RESULT_IN_A },
 			{ NM_SETTING_IP_CONFIG_IGNORE_AUTO_ROUTES, NM_SETTING_DIFF_RESULT_IN_A },
 			{ NM_SETTING_IP_CONFIG_IGNORE_AUTO_DNS,    NM_SETTING_DIFF_RESULT_IN_A },
 			{ NM_SETTING_IP4_CONFIG_DHCP_CLIENT_ID,    NM_SETTING_DIFF_RESULT_IN_A },
@@ -4713,6 +5080,7 @@ test_connection_normalize_infiniband_mtu (void)
 {
 	gs_unref_object NMConnection *con = NULL;
 	NMSettingInfiniband *s_infini;
+	guint mtu_regular = nmtst_rand_select (2044, 2045, 65520);
 
 	con = nmtst_create_minimal_connection ("test_connection_normalize_infiniband_mtu", NULL,
 	                                       NM_SETTING_INFINIBAND_SETTING_NAME, NULL);
@@ -4725,26 +5093,26 @@ test_connection_normalize_infiniband_mtu (void)
 
 	g_object_set (s_infini,
 	              NM_SETTING_INFINIBAND_TRANSPORT_MODE, "datagram",
-	              NM_SETTING_INFINIBAND_MTU, (guint) 2044,
+	              NM_SETTING_INFINIBAND_MTU, (guint) mtu_regular,
 	              NULL);
 	nmtst_assert_connection_verifies_and_normalizable (con);
 	nmtst_connection_normalize (con);
-	g_assert_cmpint (2044, ==, nm_setting_infiniband_get_mtu (s_infini));
+	g_assert_cmpint (mtu_regular, ==, nm_setting_infiniband_get_mtu (s_infini));
 
 	g_object_set (s_infini,
 	              NM_SETTING_INFINIBAND_TRANSPORT_MODE, "datagram",
-	              NM_SETTING_INFINIBAND_MTU, (guint) 2045,
+	              NM_SETTING_INFINIBAND_MTU, (guint) 65521,
 	              NULL);
 	nmtst_assert_connection_verifies_after_normalization (con, NM_CONNECTION_ERROR, NM_CONNECTION_ERROR_INVALID_PROPERTY);
 	nmtst_connection_normalize (con);
-	g_assert_cmpint (2044, ==, nm_setting_infiniband_get_mtu (s_infini));
+	g_assert_cmpint (65520, ==, nm_setting_infiniband_get_mtu (s_infini));
 
 	g_object_set (s_infini,
 	              NM_SETTING_INFINIBAND_TRANSPORT_MODE, "connected",
-	              NM_SETTING_INFINIBAND_MTU, (guint) 65520,
+	              NM_SETTING_INFINIBAND_MTU, (guint) mtu_regular,
 	              NULL);
 	nmtst_assert_connection_verifies_without_normalization (con);
-	g_assert_cmpint (65520, ==, nm_setting_infiniband_get_mtu (s_infini));
+	g_assert_cmpint (mtu_regular, ==, nm_setting_infiniband_get_mtu (s_infini));
 
 	g_object_set (s_infini,
 	              NM_SETTING_INFINIBAND_TRANSPORT_MODE, "connected",
@@ -5540,7 +5908,7 @@ _sock_addr_endpoint (const char *endpoint,
 	SockAddrUnion sockaddr = { };
 
 	g_assert (endpoint);
-	g_assert (!host == (port == -1));
+	g_assert ((!host) == (port == -1));
 	g_assert (port >= -1 && port <= G_MAXUINT16);
 
 	ep = nm_sock_addr_endpoint_new (endpoint);
@@ -7706,53 +8074,6 @@ test_ethtool_offload (void)
 	g_assert_cmpstr (d->optname, ==, NM_ETHTOOL_OPTNAME_FEATURE_RXHASH);
 }
 
-static void
-test_nm_utils_escape_spaces (void)
-{
-	char *to_free;
-
-	g_assert_cmpstr (_nm_utils_escape_spaces (NULL, &to_free), ==, NULL);
-	g_free (to_free);
-
-	g_assert_cmpstr (_nm_utils_escape_spaces ("", &to_free), ==, "");
-	g_free (to_free);
-
-	g_assert_cmpstr (_nm_utils_escape_spaces (" ", &to_free), ==, "\\ ");
-	g_free (to_free);
-
-	g_assert_cmpstr (_nm_utils_escape_spaces ("\t ", &to_free), ==, "\\\t\\ ");
-	g_free (to_free);
-
-	g_assert_cmpstr (_nm_utils_escape_spaces ("abc", &to_free), ==, "abc");
-	g_free (to_free);
-
-	g_assert_cmpstr (_nm_utils_escape_spaces ("abc def", &to_free), ==, "abc\\ def");
-	g_free (to_free);
-
-	g_assert_cmpstr (_nm_utils_escape_spaces ("abc\tdef", &to_free), ==, "abc\\\tdef");
-	g_free (to_free);
-}
-
-static void
-test_nm_utils_unescape_spaces (void)
-{
-#define CHECK_STR(in, out) \
-	G_STMT_START { \
-		gs_free char *str = g_strdup (in); \
-		\
-		g_assert_cmpstr (_nm_utils_unescape_spaces (str), ==, out); \
-	} G_STMT_END
-
-	CHECK_STR ("\\a", "\\a");
-	CHECK_STR ("foobar", "foobar");
-	CHECK_STR ("foo bar", "foo bar");
-	CHECK_STR ("foo\\ bar", "foo bar");
-	CHECK_STR ("foo\\", "foo\\");
-	CHECK_STR ("\\\\\t", "\\\t");
-
-#undef CHECK_STR
-}
-
 /*****************************************************************************/
 
 NMTST_DEFINE ();
@@ -7761,6 +8082,7 @@ int main (int argc, char **argv)
 {
 	nmtst_init (&argc, &argv, TRUE);
 
+	g_test_add_func ("/core/general/test_nm_ascii_spaces", test_nm_ascii_spaces);
 	g_test_add_func ("/core/general/test_nm_hash", test_nm_hash);
 	g_test_add_func ("/core/general/test_nm_g_slice_free_fcn", test_nm_g_slice_free_fcn);
 	g_test_add_func ("/core/general/test_c_list_sort", test_c_list_sort);
@@ -7905,8 +8227,6 @@ int main (int argc, char **argv)
 	g_test_add_func ("/core/general/_nm_utils_dns_option_find_idx", test_nm_utils_dns_option_find_idx);
 	g_test_add_func ("/core/general/_nm_utils_validate_json", test_nm_utils_check_valid_json);
 	g_test_add_func ("/core/general/_nm_utils_team_config_equal", test_nm_utils_team_config_equal);
-	g_test_add_func ("/core/general/_nm_utils_escape_spaces", test_nm_utils_escape_spaces);
-	g_test_add_func ("/core/general/_nm_utils_unescape_spaces", test_nm_utils_unescape_spaces);
 	g_test_add_func ("/core/general/test_nm_utils_enum", test_nm_utils_enum);
 	g_test_add_func ("/core/general/nm-set-out", test_nm_set_out);
 	g_test_add_func ("/core/general/route_attributes/parse", test_route_attributes_parse);
diff --git a/libnm-core/tests/test-keyfile.c b/libnm-core/tests/test-keyfile.c
index 9b9d1c04..157e8f18 100644
--- a/libnm-core/tests/test-keyfile.c
+++ b/libnm-core/tests/test-keyfile.c
@@ -744,6 +744,102 @@ test_vpn_1 (void)
 
 /*****************************************************************************/
 
+static void
+test_bridge_vlans (void)
+{
+	gs_unref_keyfile GKeyFile *keyfile = NULL;
+	gs_unref_object NMConnection *con = NULL;
+	NMSettingBridge *s_bridge;
+	NMBridgeVlan *vlan;
+	guint16 vid, vid_end;
+
+	con = nmtst_create_connection_from_keyfile (
+	      "[connection]\n"
+	      "id=t\n"
+	      "type=bridge\n"
+	      "interface-name=br4\n"
+	      "\n"
+	      "[bridge]\n"
+	      "vlans=900 ,  1 pvid  untagged, 100-123 untagged\n"
+	      "",
+	      "/test_bridge_port/vlans");
+	s_bridge = NM_SETTING_BRIDGE (nm_connection_get_setting (con, NM_TYPE_SETTING_BRIDGE));
+	g_assert (s_bridge);
+	g_assert_cmpuint (nm_setting_bridge_get_num_vlans (s_bridge), ==, 3);
+
+	vlan = nm_setting_bridge_get_vlan (s_bridge, 0);
+	g_assert (vlan);
+	nm_bridge_vlan_get_vid_range (vlan, &vid, &vid_end);
+	g_assert_cmpuint (vid, ==, 1);
+	g_assert_cmpuint (vid_end, ==, 1);
+	g_assert_cmpint  (nm_bridge_vlan_is_pvid (vlan), ==, TRUE);
+	g_assert_cmpint  (nm_bridge_vlan_is_untagged (vlan), ==, TRUE);
+
+	vlan = nm_setting_bridge_get_vlan (s_bridge, 1);
+	g_assert (vlan);
+	nm_bridge_vlan_get_vid_range (vlan, &vid, &vid_end);
+	g_assert_cmpuint (vid, ==, 100);
+	g_assert_cmpuint (vid_end, ==, 123);
+	g_assert_cmpint  (nm_bridge_vlan_is_pvid (vlan), ==, FALSE);
+	g_assert_cmpint  (nm_bridge_vlan_is_untagged (vlan), ==, TRUE);
+
+	vlan = nm_setting_bridge_get_vlan (s_bridge, 2);
+	g_assert (vlan);
+	nm_bridge_vlan_get_vid_range (vlan, &vid, &vid_end);
+	g_assert_cmpuint (vid, ==, 900);
+	g_assert_cmpuint (vid_end, ==, 900);
+	g_assert_cmpint  (nm_bridge_vlan_is_pvid (vlan), ==, FALSE);
+	g_assert_cmpint  (nm_bridge_vlan_is_untagged (vlan), ==, FALSE);
+
+	CLEAR (&con, &keyfile);
+}
+
+static void
+test_bridge_port_vlans (void)
+{
+	gs_unref_keyfile GKeyFile *keyfile = NULL;
+	gs_unref_object NMConnection *con = NULL;
+	NMSettingBridgePort *s_port;
+	NMBridgeVlan *vlan;
+	guint16 vid_start, vid_end;
+
+	con = nmtst_create_connection_from_keyfile (
+	      "[connection]\n"
+	      "id=t\n"
+	      "type=dummy\n"
+	      "interface-name=dummy1\n"
+	      "master=br0\n"
+	      "slave-type=bridge\n"
+	      "\n"
+	      "[bridge-port]\n"
+	      "vlans=4094 pvid , 10-20 untagged\n"
+	      "",
+	      "/test_bridge_port/vlans");
+	s_port = NM_SETTING_BRIDGE_PORT (nm_connection_get_setting (con, NM_TYPE_SETTING_BRIDGE_PORT));
+	g_assert (s_port);
+	g_assert_cmpuint (nm_setting_bridge_port_get_num_vlans (s_port), ==, 2);
+
+	vlan = nm_setting_bridge_port_get_vlan (s_port, 0);
+	g_assert (vlan);
+	nm_bridge_vlan_get_vid_range (vlan, &vid_start, &vid_end);
+	g_assert_cmpuint (vid_start, ==, 10);
+	g_assert_cmpuint (vid_end, ==, 20);
+	g_assert_cmpint  (nm_bridge_vlan_is_pvid (vlan), ==, FALSE);
+	g_assert_cmpint  (nm_bridge_vlan_is_untagged (vlan), ==, TRUE);
+
+	vlan = nm_setting_bridge_port_get_vlan (s_port, 1);
+	g_assert (vlan);
+	nm_bridge_vlan_get_vid_range (vlan, &vid_start, &vid_end);
+	g_assert_cmpuint (vid_start, ==, 4094);
+	g_assert_cmpuint (vid_end, ==, 4094);
+	g_assert_cmpint  (nm_bridge_vlan_is_pvid (vlan), ==, TRUE);
+	g_assert_cmpint  (nm_bridge_vlan_is_untagged (vlan), ==, FALSE);
+
+	CLEAR (&con, &keyfile);
+}
+
+/*****************************************************************************/
+
 NMTST_DEFINE ();
 
 int main (int argc, char **argv)
@@ -757,6 +853,8 @@ int main (int argc, char **argv)
 	g_test_add_func ("/core/keyfile/test_team_conf_read/invalid", test_team_conf_read_invalid);
 	g_test_add_func ("/core/keyfile/test_user/1", test_user_1);
 	g_test_add_func ("/core/keyfile/test_vpn/1", test_vpn_1);
+	g_test_add_func ("/core/keyfile/bridge/vlans", test_bridge_vlans);
+	g_test_add_func ("/core/keyfile/bridge-port/vlans", test_bridge_port_vlans);
 
 	return g_test_run ();
 }
diff --git a/libnm-core/tests/test-setting.c b/libnm-core/tests/test-setting.c
index 2011273a..03100a03 100644
--- a/libnm-core/tests/test-setting.c
+++ b/libnm-core/tests/test-setting.c
@@ -20,6 +20,7 @@
 #include "nm-default.h"
 
 #include <linux/pkt_sched.h>
+#include <net/if.h>
 
 #include "nm-utils.h"
 #include "nm-utils-private.h"
@@ -1658,6 +1659,76 @@ test_sriov_parse_vlans (void)
 	test_sriov_parse_vlan_one ("1.2.ad;2.0.q;5;3", TRUE, {1, 2, 1}, {2, 0, 0}, {3, 0, 0}, {5, 0, 0});
 }
 
+static void
+test_bridge_vlans (void)
+{
+	NMBridgeVlan *v1, *v2;
+	GError *error = NULL;
+	guint16 vid_start, vid_end;
+	char *str;
+
+	v1 = nm_bridge_vlan_from_str ("1 foobar", &error);
+	nmtst_assert_no_success (v1, error);
+	g_clear_error (&error);
+
+	v1 = nm_bridge_vlan_from_str ("4095", &error);
+	nmtst_assert_no_success (v1, error);
+	g_clear_error (&error);
+
+	/* test ranges */
+	v1 = nm_bridge_vlan_from_str ("2-1000 untagged", &error);
+	nmtst_assert_success (v1, error);
+	g_assert_cmpint (nm_bridge_vlan_get_vid_range (v1, &vid_start, &vid_end), ==, TRUE);
+	g_assert_cmpuint (vid_start, ==, 2);
+	g_assert_cmpuint (vid_end, ==, 1000);
+	g_assert_cmpint (nm_bridge_vlan_is_pvid (v1), ==, FALSE);
+	g_assert_cmpint (nm_bridge_vlan_is_untagged (v1), ==, TRUE);
+	nm_bridge_vlan_unref (v1);
+
+	/* test comparison (1) */
+	v1 = nm_bridge_vlan_from_str ("10 untagged", &error);
+	nmtst_assert_success (v1, error);
+
+	g_assert_cmpint (nm_bridge_vlan_get_vid_range (v1, &vid_start, &vid_end), ==, FALSE);
+	g_assert_cmpuint (vid_start, ==, 10);
+	g_assert_cmpuint (vid_end, ==, 10);
+	g_assert_cmpint (nm_bridge_vlan_is_sealed (v1), ==, FALSE);
+	g_assert_cmpint (nm_bridge_vlan_is_pvid (v1), ==, FALSE);
+	g_assert_cmpint (nm_bridge_vlan_is_untagged (v1), ==, TRUE);
+
+	nm_bridge_vlan_set_pvid (v1, TRUE);
+	nm_bridge_vlan_set_untagged (v1, FALSE);
+	nm_bridge_vlan_seal (v1);
+
+	g_assert_cmpint (nm_bridge_vlan_is_sealed (v1), ==, TRUE);
+	g_assert_cmpint (nm_bridge_vlan_is_pvid (v1), ==, TRUE);
+	g_assert_cmpint (nm_bridge_vlan_is_untagged (v1), ==, FALSE);
+
+	str = nm_bridge_vlan_to_str (v1, &error);
+	nmtst_assert_success (str, error);
+	g_assert_cmpstr (str, ==, "10 pvid");
+	g_clear_pointer (&str, g_free);
+
+	v2 = nm_bridge_vlan_from_str ("  10  pvid  ", &error);
+	nmtst_assert_success (v2, error);
+
+	g_assert_cmpint (nm_bridge_vlan_cmp (v1, v2), ==, 0);
+
+	nm_bridge_vlan_unref (v1);
+	nm_bridge_vlan_unref (v2);
+
+	/* test comparison (2) */
+	v1 = nm_bridge_vlan_from_str ("10", &error);
+	nmtst_assert_success (v1, error);
+	v2 = nm_bridge_vlan_from_str ("20", &error);
+	nmtst_assert_success (v2, error);
+
+	g_assert_cmpint (nm_bridge_vlan_cmp (v1, v2), <, 0);
+
+	nm_bridge_vlan_unref (v1);
+	nm_bridge_vlan_unref (v2);
+}
+
 /*****************************************************************************/
 
 static void
@@ -2304,7 +2375,16 @@ test_roundtrip_conversion (gconstpointer test_data)
 	NMSettingConnection *s_con = NULL;
 	NMSettingWired *s_eth = NULL;
 	NMSettingWireGuard *s_wg = NULL;
+	union {
+		struct {
+			NMSettingIPConfig  *s_6;
+			NMSettingIPConfig  *s_4;
+		};
+		NMSettingIPConfig *s_x[2];
+	} s_ip;
+	int is_ipv4;
 	guint i;
+	gboolean success;
 
 	switch (MODE) {
 	case 0:
@@ -2491,6 +2571,89 @@ test_roundtrip_conversion (gconstpointer test_data)
 		_rndt_wg_peers_assert_equal (s_wg, wg_peers, TRUE, TRUE, FALSE);
 		break;
 
+	case 3:
+		con = nmtst_create_minimal_connection (ID, UUID, NM_SETTING_WIRED_SETTING_NAME, &s_con);
+		g_object_set (s_con,
+		              NM_SETTING_CONNECTION_INTERFACE_NAME,
+		              INTERFACE_NAME,
+		              NULL);
+		nmtst_connection_normalize (con);
+
+		s_eth = NM_SETTING_WIRED (nm_connection_get_setting (con, NM_TYPE_SETTING_WIRED));
+		g_assert (NM_IS_SETTING_WIRED (s_eth));
+
+		g_object_set (s_eth,
+		              NM_SETTING_WIRED_MTU,
+		              ETH_MTU,
+		              NULL);
+
+		s_ip.s_4 = NM_SETTING_IP_CONFIG (nm_connection_get_setting (con, NM_TYPE_SETTING_IP4_CONFIG));
+		g_assert (NM_IS_SETTING_IP4_CONFIG (s_ip.s_4));
+
+		s_ip.s_6 = NM_SETTING_IP_CONFIG (nm_connection_get_setting (con, NM_TYPE_SETTING_IP6_CONFIG));
+		g_assert (NM_IS_SETTING_IP6_CONFIG (s_ip.s_6));
+
+		for (is_ipv4 = 0; is_ipv4 < 2; is_ipv4++) {
+			g_assert (NM_IS_SETTING_IP_CONFIG (s_ip.s_x[is_ipv4]));
+			for (i = 0; i < 3; i++) {
+				char addrstr[NM_UTILS_INET_ADDRSTRLEN];
+
+				nm_auto_unref_ip_routing_rule NMIPRoutingRule *rr = NULL;
+
+				rr = nm_ip_routing_rule_new (is_ipv4 ? AF_INET : AF_INET6);
+				nm_ip_routing_rule_set_priority (rr, i + 1);
+				if (i > 0) {
+					if (is_ipv4)
+						nm_sprintf_buf (addrstr, "192.168.%u.0", i);
+					else
+						nm_sprintf_buf (addrstr, "1:2:3:%x::", 10 + i);
+					nm_ip_routing_rule_set_from (rr, addrstr, is_ipv4 ? 24 + i : 64 + i);
+				}
+				nm_ip_routing_rule_set_table (rr, 1000 + i);
+
+				success = nm_ip_routing_rule_validate (rr, &error);
+				nmtst_assert_success (success, error);
+
+				nm_setting_ip_config_add_routing_rule (s_ip.s_x[is_ipv4], rr);
+			}
+		}
+
+		g_ptr_array_add (kf_data_arr,
+		    g_strdup_printf ("[connection]\n"
+		                     "id=%s\n"
+		                     "uuid=%s\n"
+		                     "type=ethernet\n"
+		                     "interface-name=%s\n"
+		                     "permissions=\n"
+		                     "\n"
+		                     "[ethernet]\n"
+		                     "mac-address-blacklist=\n"
+		                     "%s" /* mtu */
+		                     "\n"
+		                     "[ipv4]\n"
+		                     "dns-search=\n"
+		                     "method=auto\n"
+		                     "routing-rule1=priority 1 from 0.0.0.0/0 table 1000\n"
+		                     "routing-rule2=priority 2 from 192.168.1.0/25 table 1001\n"
+		                     "routing-rule3=priority 3 from 192.168.2.0/26 table 1002\n"
+		                     "\n"
+		                     "[ipv6]\n"
+		                     "addr-gen-mode=stable-privacy\n"
+		                     "dns-search=\n"
+		                     "method=auto\n"
+		                     "routing-rule1=priority 1 from ::/0 table 1000\n"
+		                     "routing-rule2=priority 2 from 1:2:3:b::/65 table 1001\n"
+		                     "routing-rule3=priority 3 from 1:2:3:c::/66 table 1002\n"
+		                     "",
+		                     ID,
+		                     UUID,
+		                     INTERFACE_NAME,
+		                       (ETH_MTU != 0)
+		                     ? nm_sprintf_bufa (100, "mtu=%u\n", ETH_MTU)
+		                     : ""));
+
+		break;
+
 	default:
 		g_assert_not_reached ();
 	}
@@ -2618,6 +2781,204 @@ test_roundtrip_conversion (gconstpointer test_data)
 
 /*****************************************************************************/
 
+static NMIPRoutingRule *
+_rr_from_str_get_impl (const char *str, const char *const*aliases)
+{
+	nm_auto_unref_ip_routing_rule NMIPRoutingRule *rr = NULL;
+	gs_free_error GError *error = NULL;
+	gboolean vbool;
+	int addr_family;
+	int i;
+	NMIPRoutingRuleAsStringFlags to_string_flags;
+
+	rr = nm_ip_routing_rule_from_string (str,
+	                                     NM_IP_ROUTING_RULE_AS_STRING_FLAGS_VALIDATE,
+	                                     NULL,
+	                                     &error);
+	nmtst_assert_success (rr, error);
+
+	addr_family = nm_ip_routing_rule_get_addr_family (rr);
+	g_assert (NM_IN_SET (addr_family, AF_INET, AF_INET6));
+
+	if (addr_family == AF_INET)
+		to_string_flags = NM_IP_ROUTING_RULE_AS_STRING_FLAGS_AF_INET;
+	else
+		to_string_flags = NM_IP_ROUTING_RULE_AS_STRING_FLAGS_AF_INET6;
+
+	for (i = 0; TRUE; i++) {
+		nm_auto_unref_ip_routing_rule NMIPRoutingRule *rr2 = NULL;
+		gs_free char *str1 = NULL;
+		gs_unref_variant GVariant *variant1 = NULL;
+		const char *cstr1;
+
+		switch (i) {
+		case 0:
+			rr2 = nm_ip_routing_rule_ref (rr);
+			break;
+
+		case 1:
+			rr2 = nm_ip_routing_rule_from_string (str,
+			                                        NM_IP_ROUTING_RULE_AS_STRING_FLAGS_VALIDATE
+			                                      | (nmtst_get_rand_bool () ? to_string_flags : NM_IP_ROUTING_RULE_AS_STRING_FLAGS_NONE),
+			                                      NULL,
+			                                      &error);
+			nmtst_assert_success (rr, error);
+			break;
+
+		case 2:
+			str1 = nm_ip_routing_rule_to_string (rr,
+			                                       NM_IP_ROUTING_RULE_AS_STRING_FLAGS_VALIDATE
+			                                      | (nmtst_get_rand_bool () ? to_string_flags : NM_IP_ROUTING_RULE_AS_STRING_FLAGS_NONE),
+			                                     NULL,
+			                                     &error);
+			nmtst_assert_success (str1 && str1[0], error);
+
+			g_assert_cmpstr (str, ==, str1);
+
+			rr2 = nm_ip_routing_rule_from_string (str1,
+			                                        NM_IP_ROUTING_RULE_AS_STRING_FLAGS_VALIDATE
+			                                      | (nmtst_get_rand_bool () ? to_string_flags : NM_IP_ROUTING_RULE_AS_STRING_FLAGS_NONE),
+			                                      NULL,
+			                                      &error);
+			nmtst_assert_success (rr, error);
+			break;
+
+		case 3:
+			variant1 = nm_ip_routing_rule_to_dbus (rr);
+			g_assert (variant1);
+			g_assert (g_variant_is_floating (variant1));
+			g_assert (g_variant_is_of_type (variant1, G_VARIANT_TYPE_VARDICT));
+
+			rr2 = nm_ip_routing_rule_from_dbus (variant1,
+			                                    TRUE,
+			                                    &error);
+			nmtst_assert_success (rr, error);
+			break;
+
+		default:
+			if (!aliases || !aliases[0])
+				goto done;
+			cstr1 = (aliases++)[0];
+			rr2 = nm_ip_routing_rule_from_string (cstr1,
+			                                        NM_IP_ROUTING_RULE_AS_STRING_FLAGS_VALIDATE
+			                                      | (nmtst_get_rand_bool () ? to_string_flags : NM_IP_ROUTING_RULE_AS_STRING_FLAGS_NONE),
+			                                      NULL,
+			                                      &error);
+			nmtst_assert_success (rr, error);
+			break;
+		}
+
+		g_assert (rr2);
+		vbool = nm_ip_routing_rule_validate (rr, &error);
+		nmtst_assert_success (vbool, error);
+		vbool = nm_ip_routing_rule_validate (rr2, &error);
+		nmtst_assert_success (vbool, error);
+
+		g_assert_cmpint (nm_ip_routing_rule_cmp (rr, rr2), ==, 0);
+		g_assert_cmpint (nm_ip_routing_rule_cmp (rr2, rr), ==, 0);
+	}
+
+done:
+	return g_steal_pointer (&rr);
+}
+#define _rr_from_str_get(a, ...) _rr_from_str_get_impl (a, &(NM_MAKE_STRV (NULL, ##__VA_ARGS__))[1])
+
+#define _rr_from_str(...) \
+	G_STMT_START { \
+		nm_auto_unref_ip_routing_rule NMIPRoutingRule *_rr = NULL; \
+		\
+		_rr = _rr_from_str_get (__VA_ARGS__); \
+		g_assert (_rr); \
+	} G_STMT_END
+
+static void
+test_routing_rule (gconstpointer test_data)
+{
+	nm_auto_unref_ip_routing_rule NMIPRoutingRule *rr1 = NULL;
+	gboolean success;
+	char ifname_buf[16];
+
+	_rr_from_str ("priority 5 from 0.0.0.0 table 1",
+	              "  from 0.0.0.0  priority  5 lookup 1 ");
+	_rr_from_str ("priority 5 from 0.0.0.0/0 table 4");
+	_rr_from_str ("priority 5 to 0.0.0.0 table 6");
+	_rr_from_str ("priority 5 to 0.0.0.0 table 254",
+	              "priority 5 to 0.0.0.0/32");
+	_rr_from_str ("priority 5 from 1.2.3.4 table 15",
+	              "priority 5 from 1.2.3.4/32 table  0xF ",
+	              "priority 5 from 1.2.3.4/32 to 0.0.0.0/0 lookup 15 ");
+	_rr_from_str ("priority 5 from 1.2.3.4 to 0.0.0.0 table 8");
+	_rr_from_str ("priority 5 to a:b:c:: tos 0x16 table 25",
+	              "priority 5 to a:b:c::/128 table 0x19 tos 16",
+	              "priority 5 to a:b:c::/128 lookup 0x19 dsfield 16",
+	              "priority 5 to a:b:c::/128 lookup 0x19 dsfield 16 fwmark 0/0x00",
+	              "priority 5 to a:b:c:: from all lookup 0x19 dsfield 16 fwmark 0x0/0");
+	_rr_from_str ("priority 5 from :: fwmark 0 table 25",
+	              "priority 5 from ::/128 to all table 0x19 fwmark 0/0xFFFFFFFF",
+	              "priority 5 from :: to ::/0 table 0x19 fwmark 0x00/4294967295");
+	_rr_from_str ("priority 5 from :: iif aab table 25");
+	_rr_from_str ("priority 5 from :: iif aab oif er table 25",
+	              "priority 5 from :: table 0x19 dev aab oif er");
+	_rr_from_str ("priority 5 from :: iif a\\\\303b table 25");
+	_rr_from_str ("priority 5 to 0.0.0.0 sport 10 table 6",
+	              "priority 5 to 0.0.0.0 sport 10-10 table 6");
+	_rr_from_str ("not priority 5 to 0.0.0.0 dport 10-133 table 6",
+	              "priority 5 to 0.0.0.0 not dport 10-133 not table 6",
+	              "priority 5 to 0.0.0.0 not dport 10-\\ 133 not table 6");
+	_rr_from_str ("priority 5 to 0.0.0.0 ipproto 10 sport 10 table 6");
+
+	rr1 = _rr_from_str_get ("priority 5 from :: iif aab table 25");
+	g_assert_cmpstr (nm_ip_routing_rule_get_iifname (rr1), ==, "aab");
+	success = nm_ip_routing_rule_get_xifname_bin (rr1, FALSE, ifname_buf);
+	g_assert (!success);
+	success = nm_ip_routing_rule_get_xifname_bin (rr1, TRUE, ifname_buf);
+	g_assert_cmpstr (ifname_buf, ==, "aab");
+	g_assert (success);
+	nm_clear_pointer (&rr1, nm_ip_routing_rule_unref);
+
+	rr1 = _rr_from_str_get ("priority 5 from :: iif a\\\\303\\\\261xb table 254");
+	g_assert_cmpstr (nm_ip_routing_rule_get_iifname (rr1), ==, "a\\303\\261xb");
+	success = nm_ip_routing_rule_get_xifname_bin (rr1, FALSE, ifname_buf);
+	g_assert (!success);
+	success = nm_ip_routing_rule_get_xifname_bin (rr1, TRUE, ifname_buf);
+	g_assert_cmpstr (ifname_buf, ==, "a\303\261xb");
+	g_assert (success);
+	nm_clear_pointer (&rr1, nm_ip_routing_rule_unref);
+
+	rr1 = _rr_from_str_get ("priority 5 from :: oif \\\\101=\\\\303\\\\261xb table 7");
+	g_assert_cmpstr (nm_ip_routing_rule_get_oifname (rr1), ==, "\\101=\\303\\261xb");
+	success = nm_ip_routing_rule_get_xifname_bin (rr1, FALSE, ifname_buf);
+	g_assert_cmpstr (ifname_buf, ==, "A=\303\261xb");
+	g_assert (success);
+	success = nm_ip_routing_rule_get_xifname_bin (rr1, TRUE, ifname_buf);
+	g_assert (!success);
+	nm_clear_pointer (&rr1, nm_ip_routing_rule_unref);
+
+	rr1 = _rr_from_str_get ("priority 5 to 0.0.0.0 tos 0x10 table 7");
+	g_assert_cmpstr (NULL, ==, nm_ip_routing_rule_get_from (rr1));
+	g_assert (!nm_ip_routing_rule_get_from_bin (rr1));
+	g_assert_cmpint (0, ==, nm_ip_routing_rule_get_from_len (rr1));
+	g_assert_cmpstr ("0.0.0.0", ==, nm_ip_routing_rule_get_to (rr1));
+	g_assert (nm_ip_addr_is_null (AF_INET, nm_ip_routing_rule_get_to_bin (rr1)));
+	g_assert_cmpint (32, ==, nm_ip_routing_rule_get_to_len (rr1));
+	g_assert_cmpint (7, ==, nm_ip_routing_rule_get_table (rr1));
+	g_assert_cmpint (0x10, ==, nm_ip_routing_rule_get_tos (rr1));
+	nm_clear_pointer (&rr1, nm_ip_routing_rule_unref);
+
+	rr1 = _rr_from_str_get ("priority 5 from :: iif a\\\\303\\\\261,x;b table 254",
+	                        "priority 5 from :: iif a\\\\303\\\\261,x;b table 254");
+	g_assert_cmpstr (nm_ip_routing_rule_get_iifname (rr1), ==, "a\\303\\261,x;b");
+	success = nm_ip_routing_rule_get_xifname_bin (rr1, FALSE, ifname_buf);
+	g_assert (!success);
+	success = nm_ip_routing_rule_get_xifname_bin (rr1, TRUE, ifname_buf);
+	g_assert_cmpstr (ifname_buf, ==, "a\303\261,x;b");
+	g_assert (success);
+	nm_clear_pointer (&rr1, nm_ip_routing_rule_unref);
+
+}
+
+/*****************************************************************************/
+
 NMTST_DEFINE ();
 
 int
@@ -2663,6 +3024,8 @@ main (int argc, char **argv)
 	g_test_add_func ("/libnm/settings/tc_config/setting/duplicates", test_tc_config_setting_duplicates);
 	g_test_add_func ("/libnm/settings/tc_config/dbus", test_tc_config_dbus);
 
+	g_test_add_func ("/libnm/settings/bridge/vlans", test_bridge_vlans);
+
 #if WITH_JSON_VALIDATION
 	g_test_add_func ("/libnm/settings/team/sync_runner_from_config_roundrobin",
 	                 test_runner_roundrobin_sync_from_config);
@@ -2694,9 +3057,12 @@ main (int argc, char **argv)
 	g_test_add_func ("/libnm/settings/team-port/sycn_from_config_full", test_team_port_full_config);
 #endif
 
-	g_test_add_data_func ("/libnm/settings/roundtrip-conversion/general/0", GINT_TO_POINTER (0), test_roundtrip_conversion);
+	g_test_add_data_func ("/libnm/settings/roundtrip-conversion/general/0",   GINT_TO_POINTER (0), test_roundtrip_conversion);
 	g_test_add_data_func ("/libnm/settings/roundtrip-conversion/wireguard/1", GINT_TO_POINTER (1), test_roundtrip_conversion);
 	g_test_add_data_func ("/libnm/settings/roundtrip-conversion/wireguard/2", GINT_TO_POINTER (2), test_roundtrip_conversion);
+	g_test_add_data_func ("/libnm/settings/roundtrip-conversion/general/3",   GINT_TO_POINTER (3), test_roundtrip_conversion);
+
+	g_test_add_data_func ("/libnm/settings/routing-rule/1", GINT_TO_POINTER (0), test_routing_rule);
 
 	return g_test_run ();
 }
diff --git a/libnm-glib/meson.build b/libnm-glib/meson.build
index 3882d59a..5f08141e 100644
--- a/libnm-glib/meson.build
+++ b/libnm-glib/meson.build
@@ -5,7 +5,7 @@ dbus_binding_tool = find_program('dbus-binding-tool')
 common_deps = [
   dbus_dep,
   dbus_glib_dep,
-  shared_nm_utils_base_dep,
+  shared_nm_glib_aux_dep,
 ]
 
 common_cflags = [
@@ -196,7 +196,7 @@ libnm_glib = shared_library(
   dependencies: common_deps + [
     libnm_util_dep,
     libudev_dep,
-    shared_nm_utils_udev_dep,
+    shared_nm_udev_aux_dep,
   ],
   c_args: cflags,
   link_whole: libdeprecated_nm_glib,
diff --git a/libnm-glib/nm-client.c b/libnm-glib/nm-client.c
index 16fee714..8f1524e3 100644
--- a/libnm-glib/nm-client.c
+++ b/libnm-glib/nm-client.c
@@ -27,7 +27,7 @@
 #include <string.h>
 
 #include "nm-utils.h"
-#include "nm-common-macros.h"
+#include "nm-libnm-core-intern/nm-common-macros.h"
 
 #include "nm-device-ethernet.h"
 #include "nm-device-wifi.h"
diff --git a/libnm-glib/nm-device.c b/libnm-glib/nm-device.c
index 6179b757..e9b3b30f 100644
--- a/libnm-glib/nm-device.c
+++ b/libnm-glib/nm-device.c
@@ -26,7 +26,7 @@
 
 #include "NetworkManager.h"
 
-#include "nm-utils/nm-udev-utils.h"
+#include "nm-udev-aux/nm-udev-utils.h"
 #include "nm-device-ethernet.h"
 #include "nm-device-adsl.h"
 #include "nm-device-wifi.h"
diff --git a/libnm-glib/tests/meson.build b/libnm-glib/tests/meson.build
index 7d6007cb..de74f3b2 100644
--- a/libnm-glib/tests/meson.build
+++ b/libnm-glib/tests/meson.build
@@ -3,7 +3,7 @@ deps = [
   dbus_glib_dep,
   libnm_glib_dep,
   libnm_util_dep,
-  shared_nm_utils_base_dep,
+  shared_nm_glib_aux_dep,
 ]
 
 test_units = [
diff --git a/libnm-util/meson.build b/libnm-util/meson.build
index 468064c1..e561cb81 100644
--- a/libnm-util/meson.build
+++ b/libnm-util/meson.build
@@ -93,7 +93,7 @@ sources = files(
 deps = [
   dbus_dep,
   dbus_glib_dep,
-  shared_nm_utils_base_dep,
+  shared_nm_glib_aux_dep,
   uuid_dep,
 ]
 
@@ -201,7 +201,7 @@ sources = files(
 )
 
 deps = [
-  shared_nm_utils_base_dep,
+  shared_nm_glib_aux_dep,
 ]
 
 libtest_crypto = static_library(
diff --git a/libnm-util/tests/meson.build b/libnm-util/tests/meson.build
index 5e8b84fa..09642f31 100644
--- a/libnm-util/tests/meson.build
+++ b/libnm-util/tests/meson.build
@@ -2,7 +2,7 @@ deps = [
   dbus_dep,
   dbus_glib_dep,
   libnm_util_dep,
-  shared_nm_utils_base_dep,
+  shared_nm_glib_aux_dep,
 ]
 
 cflags = common_cflags + [
diff --git a/libnm/libnm.ver b/libnm/libnm.ver
index ece9686e..8100f3b6 100644
--- a/libnm/libnm.ver
+++ b/libnm/libnm.ver
@@ -1518,3 +1518,89 @@ global:
 	nm_wireguard_peer_set_public_key;
 	nm_wireguard_peer_unref;
 } libnm_1_14_0;
+
+libnm_1_18_0 {
+global:
+	nm_bridge_vlan_cmp;
+	nm_bridge_vlan_from_str;
+	nm_bridge_vlan_get_type;
+	nm_bridge_vlan_get_vid_range;
+	nm_bridge_vlan_is_pvid;
+	nm_bridge_vlan_is_sealed;
+	nm_bridge_vlan_is_untagged;
+	nm_bridge_vlan_new;
+	nm_bridge_vlan_new_clone;
+	nm_bridge_vlan_ref;
+	nm_bridge_vlan_seal;
+	nm_bridge_vlan_set_pvid;
+	nm_bridge_vlan_set_untagged;
+	nm_bridge_vlan_to_str;
+	nm_bridge_vlan_unref;
+	nm_ip_routing_rule_as_string_flags_get_type;
+	nm_ip_routing_rule_cmp;
+	nm_ip_routing_rule_from_string;
+	nm_ip_routing_rule_get_action;
+	nm_ip_routing_rule_get_addr_family;
+	nm_ip_routing_rule_get_destination_port_end;
+	nm_ip_routing_rule_get_destination_port_start;
+	nm_ip_routing_rule_get_from;
+	nm_ip_routing_rule_get_from_len;
+	nm_ip_routing_rule_get_fwmark;
+	nm_ip_routing_rule_get_fwmask;
+	nm_ip_routing_rule_get_iifname;
+	nm_ip_routing_rule_get_invert;
+	nm_ip_routing_rule_get_ipproto;
+	nm_ip_routing_rule_get_oifname;
+	nm_ip_routing_rule_get_priority;
+	nm_ip_routing_rule_get_source_port_end;
+	nm_ip_routing_rule_get_source_port_start;
+	nm_ip_routing_rule_get_table;
+	nm_ip_routing_rule_get_to;
+	nm_ip_routing_rule_get_to_len;
+	nm_ip_routing_rule_get_tos;
+	nm_ip_routing_rule_get_type;
+	nm_ip_routing_rule_is_sealed;
+	nm_ip_routing_rule_new;
+	nm_ip_routing_rule_new_clone;
+	nm_ip_routing_rule_ref;
+	nm_ip_routing_rule_seal;
+	nm_ip_routing_rule_set_action;
+	nm_ip_routing_rule_set_destination_port;
+	nm_ip_routing_rule_set_from;
+	nm_ip_routing_rule_set_fwmark;
+	nm_ip_routing_rule_set_iifname;
+	nm_ip_routing_rule_set_invert;
+	nm_ip_routing_rule_set_ipproto;
+	nm_ip_routing_rule_set_oifname;
+	nm_ip_routing_rule_set_priority;
+	nm_ip_routing_rule_set_source_port;
+	nm_ip_routing_rule_set_table;
+	nm_ip_routing_rule_set_to;
+	nm_ip_routing_rule_set_tos;
+	nm_ip_routing_rule_to_string;
+	nm_ip_routing_rule_unref;
+	nm_ip_routing_rule_validate;
+	nm_lldp_neighbor_get_attr_value;
+	nm_setting_bridge_add_vlan;
+	nm_setting_bridge_clear_vlans;
+	nm_setting_bridge_get_num_vlans;
+	nm_setting_bridge_get_vlan;
+	nm_setting_bridge_get_vlan_default_pvid;
+	nm_setting_bridge_get_vlan_filtering;
+	nm_setting_bridge_port_add_vlan;
+	nm_setting_bridge_port_clear_vlans;
+	nm_setting_bridge_port_get_num_vlans;
+	nm_setting_bridge_port_get_vlan;
+	nm_setting_bridge_port_remove_vlan;
+	nm_setting_bridge_port_remove_vlan_by_vid;
+	nm_setting_bridge_remove_vlan;
+	nm_setting_bridge_remove_vlan_by_vid;
+	nm_setting_ip_config_add_routing_rule;
+	nm_setting_ip_config_clear_routing_rules;
+	nm_setting_ip_config_get_num_routing_rules;
+	nm_setting_ip_config_get_routing_rule;
+	nm_setting_ip_config_remove_routing_rule;
+	nm_tc_qdisc_get_attribute;
+	nm_tc_qdisc_get_attribute_names;
+	nm_tc_qdisc_set_attribute;
+} libnm_1_16_0;
diff --git a/libnm/meson.build b/libnm/meson.build
index 558a587b..4b3df97f 100644
--- a/libnm/meson.build
+++ b/libnm/meson.build
@@ -9,8 +9,8 @@ libnm_utils_sources = files('nm-libnm-utils.c')
 
 deps = [
   libnmdbus_dep,
-  shared_nm_utils_base_dep,
-  nm_core_dep,
+  shared_nm_glib_aux_dep,
+  libnm_core_dep,
 ]
 
 if have_fake_typelibs
@@ -158,8 +158,8 @@ libnm = shared_library(
   dependencies: [
     dl_dep,
     libudev_dep,
-    shared_nm_utils_base_dep,
-    nm_core_dep,
+    shared_nm_glib_aux_dep,
+    libnm_core_dep,
     uuid_dep,
     libnm_systemd_shared_no_logging_dep,
   ],
diff --git a/libnm/nm-dbus-helpers.h b/libnm/nm-dbus-helpers.h
index 0f2cabe8..eb5394f0 100644
--- a/libnm/nm-dbus-helpers.h
+++ b/libnm/nm-dbus-helpers.h
@@ -25,7 +25,7 @@
 #error Cannot use this header.
 #endif
 
-#include "nm-dbus-compat.h"
+#include "nm-std-aux/nm-dbus-compat.h"
 
 GBusType _nm_dbus_bus_type (void);
 
diff --git a/libnm/nm-device.c b/libnm/nm-device.c
index 5965cb3b..aba4e5c4 100644
--- a/libnm/nm-device.c
+++ b/libnm/nm-device.c
@@ -40,7 +40,7 @@
 #include "nm-dbus-helpers.h"
 #include "nm-device-tun.h"
 #include "nm-setting-connection.h"
-#include "shared/nm-utils/nm-udev-utils.h"
+#include "nm-udev-aux/nm-udev-utils.h"
 
 #include "introspection/org.freedesktop.NetworkManager.Device.h"
 
@@ -2649,6 +2649,18 @@ nm_device_get_setting_type (NMDevice *device)
 	return NM_DEVICE_GET_CLASS (device)->get_setting_type (device);
 }
 
+/*****************************************************************************/
+
+static gboolean
+NM_IS_LLDP_NEIGHBOR (const NMLldpNeighbor *self)
+{
+	nm_assert (   !self
+	           || (   self->refcount > 0
+	               && self->attrs));
+	return    self
+	       && self->refcount > 0;
+}
+
 /**
  * nm_lldp_neighbor_new:
  *
@@ -2675,9 +2687,15 @@ static NMLldpNeighbor *
 nm_lldp_neighbor_dup (NMLldpNeighbor *neighbor)
 {
 	NMLldpNeighbor *copy;
+	GHashTableIter iter;
+	const char *key;
+	GVariant *value;
 
 	copy = nm_lldp_neighbor_new ();
-	copy->attrs = g_hash_table_ref (neighbor->attrs);
+
+	g_hash_table_iter_init (&iter, neighbor->attrs);
+	while (g_hash_table_iter_next (&iter, (gpointer *) &key, (gpointer *) &value))
+		g_hash_table_insert (copy->attrs, g_strdup (key), g_variant_ref (value));
 
 	return copy;
 }
@@ -2693,8 +2711,7 @@ nm_lldp_neighbor_dup (NMLldpNeighbor *neighbor)
 void
 nm_lldp_neighbor_ref (NMLldpNeighbor *neighbor)
 {
-	g_return_if_fail (neighbor);
-	g_return_if_fail (neighbor->refcount > 0);
+	g_return_if_fail (NM_IS_LLDP_NEIGHBOR (neighbor));
 
 	neighbor->refcount++;
 }
@@ -2711,11 +2728,9 @@ nm_lldp_neighbor_ref (NMLldpNeighbor *neighbor)
 void
 nm_lldp_neighbor_unref (NMLldpNeighbor *neighbor)
 {
-	g_return_if_fail (neighbor);
-	g_return_if_fail (neighbor->refcount > 0);
+	g_return_if_fail (NM_IS_LLDP_NEIGHBOR (neighbor));
 
 	if (--neighbor->refcount == 0) {
-		g_return_if_fail (neighbor->attrs);
 		g_hash_table_unref (neighbor->attrs);
 		g_free (neighbor);
 	}
@@ -2738,8 +2753,7 @@ nm_lldp_neighbor_get_attr_names (NMLldpNeighbor *neighbor)
 	const char *key;
 	GPtrArray *names;
 
-	g_return_val_if_fail (neighbor, NULL);
-	g_return_val_if_fail (neighbor->attrs, NULL);
+	g_return_val_if_fail (NM_IS_LLDP_NEIGHBOR (neighbor), NULL);
 
 	names = g_ptr_array_new ();
 
@@ -2765,12 +2779,12 @@ nm_lldp_neighbor_get_attr_names (NMLldpNeighbor *neighbor)
  * Since: 1.2
  **/
 gboolean
-nm_lldp_neighbor_get_attr_string_value (NMLldpNeighbor *neighbor, char *name,
+nm_lldp_neighbor_get_attr_string_value (NMLldpNeighbor *neighbor, const char *name,
                                         const char **out_value)
 {
 	GVariant *variant;
 
-	g_return_val_if_fail (neighbor, FALSE);
+	g_return_val_if_fail (NM_IS_LLDP_NEIGHBOR (neighbor), FALSE);
 	g_return_val_if_fail (name && name[0], FALSE);
 
 	variant = g_hash_table_lookup (neighbor->attrs, name);
@@ -2795,12 +2809,12 @@ nm_lldp_neighbor_get_attr_string_value (NMLldpNeighbor *neighbor, char *name,
  * Since: 1.2
  **/
 gboolean
-nm_lldp_neighbor_get_attr_uint_value (NMLldpNeighbor *neighbor, char *name,
+nm_lldp_neighbor_get_attr_uint_value (NMLldpNeighbor *neighbor, const char *name,
                                       guint *out_value)
 {
 	GVariant *variant;
 
-	g_return_val_if_fail (neighbor, FALSE);
+	g_return_val_if_fail (NM_IS_LLDP_NEIGHBOR (neighbor), FALSE);
 	g_return_val_if_fail (name && name[0], FALSE);
 
 	variant = g_hash_table_lookup (neighbor->attrs, name);
@@ -2812,6 +2826,27 @@ nm_lldp_neighbor_get_attr_uint_value (NMLldpNeighbor *neighbor, char *name,
 		return FALSE;
 }
 
+/**
+ * nm_lldp_neighbor_get_attr_value:
+ * @neighbor: the #NMLldpNeighbor
+ * @name: the attribute name
+ *
+ * Gets the value (as a GVariant) of attribute with name @name on @neighbor
+ *
+ * Returns: (transfer none): the value or %NULL if the attribute with @name was
+ * not found.
+ *
+ * Since: 1.18
+ **/
+GVariant *
+nm_lldp_neighbor_get_attr_value (NMLldpNeighbor *neighbor, const char *name)
+{
+	g_return_val_if_fail (NM_IS_LLDP_NEIGHBOR (neighbor), FALSE);
+	g_return_val_if_fail (name && name[0], FALSE);
+
+	return g_hash_table_lookup (neighbor->attrs, name);
+}
+
 /**
  * nm_lldp_neighbor_get_attr_type:
  * @neighbor: the #NMLldpNeighbor
@@ -2824,11 +2859,11 @@ nm_lldp_neighbor_get_attr_uint_value (NMLldpNeighbor *neighbor, char *name,
  * Since: 1.2
  **/
 const GVariantType *
-nm_lldp_neighbor_get_attr_type (NMLldpNeighbor *neighbor, char *name)
+nm_lldp_neighbor_get_attr_type (NMLldpNeighbor *neighbor, const char *name)
 {
 	GVariant *variant;
 
-	g_return_val_if_fail (neighbor, NULL);
+	g_return_val_if_fail (NM_IS_LLDP_NEIGHBOR (neighbor), NULL);
 	g_return_val_if_fail (name && name[0], NULL);
 
 	variant = g_hash_table_lookup (neighbor->attrs, name);
@@ -2836,5 +2871,4 @@ nm_lldp_neighbor_get_attr_type (NMLldpNeighbor *neighbor, char *name)
 		return g_variant_get_type (variant);
 	else
 		return NULL;
-
 }
diff --git a/libnm/nm-device.h b/libnm/nm-device.h
index fcda93ab..62272297 100644
--- a/libnm/nm-device.h
+++ b/libnm/nm-device.h
@@ -227,13 +227,15 @@ void nm_lldp_neighbor_unref (NMLldpNeighbor *neighbor);
 NM_AVAILABLE_IN_1_2
 char **nm_lldp_neighbor_get_attr_names (NMLldpNeighbor *neighbor);
 NM_AVAILABLE_IN_1_2
-gboolean nm_lldp_neighbor_get_attr_string_value (NMLldpNeighbor *neighbor, char *name,
+gboolean nm_lldp_neighbor_get_attr_string_value (NMLldpNeighbor *neighbor, const char *name,
                                                  const char **out_value);
 NM_AVAILABLE_IN_1_2
-gboolean nm_lldp_neighbor_get_attr_uint_value (NMLldpNeighbor *neighbor, char *name,
+gboolean nm_lldp_neighbor_get_attr_uint_value (NMLldpNeighbor *neighbor, const char *name,
                                                guint *out_value);
 NM_AVAILABLE_IN_1_2
-const GVariantType *nm_lldp_neighbor_get_attr_type (NMLldpNeighbor *neighbor, char *name);
+const GVariantType *nm_lldp_neighbor_get_attr_type (NMLldpNeighbor *neighbor, const char *name);
+NM_AVAILABLE_IN_1_18
+GVariant *nm_lldp_neighbor_get_attr_value (NMLldpNeighbor *neighbor, const char *name);
 
 G_END_DECLS
 
diff --git a/libnm/nm-manager.c b/libnm/nm-manager.c
index 7a169863..509586e0 100644
--- a/libnm/nm-manager.c
+++ b/libnm/nm-manager.c
@@ -25,7 +25,7 @@
 
 #include "nm-utils.h"
 #include "nm-checkpoint.h"
-#include "nm-common-macros.h"
+#include "nm-libnm-core-intern/nm-common-macros.h"
 #include "nm-device-ethernet.h"
 #include "nm-device-wifi.h"
 #include "nm-core-internal.h"
diff --git a/libnm/nm-property-docs.xml b/libnm/nm-property-docs.xml
index 6344f784..f73ff6da 100644
--- a/libnm/nm-property-docs.xml
+++ b/libnm/nm-property-docs.xml
@@ -103,11 +103,15 @@
     <property name="multicast-snooping" name_upper="MULTICAST_SNOOPING" type="boolean" default="TRUE" description="Controls whether IGMP snooping is enabled for this bridge. Note that if snooping was automatically disabled due to hash collisions, the system may refuse to enable the feature until the collisions are resolved." />
     <property name="priority" name_upper="PRIORITY" type="uint32" default="32768" description="Sets the Spanning Tree Protocol (STP) priority for this bridge.  Lower values are "better"; the lowest priority bridge will be elected the root bridge." />
     <property name="stp" name_upper="STP" type="boolean" default="TRUE" description="Controls whether Spanning Tree Protocol (STP) is enabled for this bridge." />
+    <property name="vlan-default-pvid" name_upper="VLAN_DEFAULT_PVID" type="uint32" default="1" description="The default PVID for the ports of the bridge, that is the VLAN id assigned to incoming untagged frames." />
+    <property name="vlan-filtering" name_upper="VLAN_FILTERING" type="boolean" default="FALSE" description="Control whether VLAN filtering is enabled on the bridge." />
+    <property name="vlans" name_upper="VLANS" type="array of vardict" default="[]" description="Array of bridge VLAN objects. In addition to the VLANs specified here, the bridge will also have the default-pvid VLAN configured  by the bridge.vlan-default-pvid property. In nmcli the VLAN list can be specified with the following syntax: $vid [pvid] [untagged] [, $vid [pvid] [untagged]]... where $vid is either a single id between 1 and 4094 or a range, represented as a couple of ids separated by a dash." />
   </setting>
   <setting name="bridge-port" description="Bridge Port Settings" name_upper="BRIDGE_PORT" >
     <property name="hairpin-mode" name_upper="HAIRPIN_MODE" type="boolean" default="FALSE" description="Enables or disables "hairpin mode" for the port, which allows frames to be sent back out through the port the frame was received on." />
     <property name="path-cost" name_upper="PATH_COST" type="uint32" default="100" description="The Spanning Tree Protocol (STP) port cost for destinations via this port." />
     <property name="priority" name_upper="PRIORITY" type="uint32" default="32" description="The Spanning Tree Protocol (STP) priority of this bridge port." />
+    <property name="vlans" name_upper="VLANS" type="array of vardict" default="[]" description="Array of bridge VLAN objects. In addition to the VLANs specified here, the port will also have the default-pvid VLAN configured on the bridge by the bridge.vlan-default-pvid property. In nmcli the VLAN list can be specified with the following syntax: $vid [pvid] [untagged] [, $vid [pvid] [untagged]]... where $vid is either a single id between 1 and 4094 or a range, represented as a couple of ids separated by a dash." />
   </setting>
   <setting name="cdma" description="CDMA-based Mobile Broadband Settings" name_upper="CDMA" >
     <property name="mtu" name_upper="MTU" type="uint32" default="0" description="If non-zero, only transmit packets of the specified size or smaller, breaking larger packets up into multiple frames." />
diff --git a/libnm/nm-secret-agent-old.c b/libnm/nm-secret-agent-old.c
index 56a88b00..40485ab6 100644
--- a/libnm/nm-secret-agent-old.c
+++ b/libnm/nm-secret-agent-old.c
@@ -892,8 +892,7 @@ nm_secret_agent_old_get_secrets (NMSecretAgentOld *self,
 	g_return_if_fail (NM_IS_SECRET_AGENT_OLD (self));
 	g_return_if_fail (NM_IS_CONNECTION (connection));
 	g_return_if_fail (nm_connection_get_path (connection));
-	g_return_if_fail (setting_name != NULL);
-	g_return_if_fail (strlen (setting_name) > 0);
+	g_return_if_fail (setting_name && setting_name[0]);
 	g_return_if_fail (!(flags & NM_SECRET_AGENT_GET_SECRETS_FLAG_ONLY_SYSTEM));
 	g_return_if_fail (!(flags & NM_SECRET_AGENT_GET_SECRETS_FLAG_NO_ERRORS));
 	g_return_if_fail (callback != NULL);
diff --git a/libnm/nm-settings-docs.xml b/libnm/nm-settings-docs.xml
index ee5f3641..0f1d8c97 100644
--- a/libnm/nm-settings-docs.xml
+++ b/libnm/nm-settings-docs.xml
@@ -105,11 +105,15 @@
     <property name="multicast-snooping" name_upper="MULTICAST_SNOOPING" type="boolean" default="TRUE" description="Controls whether IGMP snooping is enabled for this bridge. Note that if snooping was automatically disabled due to hash collisions, the system may refuse to enable the feature until the collisions are resolved." />
     <property name="priority" name_upper="PRIORITY" type="uint32" default="32768" description="Sets the Spanning Tree Protocol (STP) priority for this bridge.  Lower values are "better"; the lowest priority bridge will be elected the root bridge." />
     <property name="stp" name_upper="STP" type="boolean" default="TRUE" description="Controls whether Spanning Tree Protocol (STP) is enabled for this bridge." />
+    <property name="vlan-default-pvid" name_upper="VLAN_DEFAULT_PVID" type="uint32" default="1" description="The default PVID for the ports of the bridge, that is the VLAN id assigned to incoming untagged frames." />
+    <property name="vlan-filtering" name_upper="VLAN_FILTERING" type="boolean" default="FALSE" description="Control whether VLAN filtering is enabled on the bridge." />
+    <property name="vlans" name_upper="VLANS" type="array of vardict" default="[]" description="Array of bridge VLAN objects. In addition to the VLANs specified here, the bridge will also have the default-pvid VLAN configured  by the bridge.vlan-default-pvid property. In nmcli the VLAN list can be specified with the following syntax: $vid [pvid] [untagged] [, $vid [pvid] [untagged]]... where $vid is either a single id between 1 and 4094 or a range, represented as a couple of ids separated by a dash." />
   </setting>
   <setting name="bridge-port" description="Bridge Port Settings" name_upper="BRIDGE_PORT" >
     <property name="hairpin-mode" name_upper="HAIRPIN_MODE" type="boolean" default="FALSE" description="Enables or disables "hairpin mode" for the port, which allows frames to be sent back out through the port the frame was received on." />
     <property name="path-cost" name_upper="PATH_COST" type="uint32" default="100" description="The Spanning Tree Protocol (STP) port cost for destinations via this port." />
     <property name="priority" name_upper="PRIORITY" type="uint32" default="32" description="The Spanning Tree Protocol (STP) priority of this bridge port." />
+    <property name="vlans" name_upper="VLANS" type="array of vardict" default="[]" description="Array of bridge VLAN objects. In addition to the VLANs specified here, the port will also have the default-pvid VLAN configured on the bridge by the bridge.vlan-default-pvid property. In nmcli the VLAN list can be specified with the following syntax: $vid [pvid] [untagged] [, $vid [pvid] [untagged]]... where $vid is either a single id between 1 and 4094 or a range, represented as a couple of ids separated by a dash." />
   </setting>
   <setting name="cdma" description="CDMA-based Mobile Broadband Settings" name_upper="CDMA" >
     <property name="mtu" name_upper="MTU" type="uint32" default="0" description="If non-zero, only transmit packets of the specified size or smaller, breaking larger packets up into multiple frames." />
diff --git a/libnm/nm-settings-ifcfg-rh-docs.xml b/libnm/nm-settings-ifcfg-rh-docs.xml
index cec2d527..ca5a8449 100644
--- a/libnm/nm-settings-ifcfg-rh-docs.xml
+++ b/libnm/nm-settings-ifcfg-rh-docs.xml
@@ -58,6 +58,7 @@ lookaside file, or it can be owned by a secret agent."/>
 <property name="priority" variable="BRIDGING_OPTS: priority=" format="" values="0 - 63" default="32" example="" description="STP priority."/>
 <property name="path-cost" variable="BRIDGING_OPTS: path_cost=" format="" values="1 - 65535" default="100" example="" description="STP cost."/>
 <property name="hairpin-mode" variable="BRIDGING_OPTS: hairpin_mode=" format="" values="" default="yes" example="" description="Hairpin mode of the bridge port."/>
+<property name="vlans" variable="BRIDGE_PORT_VLANS" format="" values="" default="" example="BRIDGE_PORT_VLANS="1 pvid untagged,20,300-400 untagged"" description="List of VLANs on the bridge port"/>
 </setting>
 <setting name="bridge">
 <property name="mac-address" variable="BRIDGE_MACADDR(+)" format="" values="" default="" example="" description="MAC address of the bridge. Note that this requires a recent
@@ -70,6 +71,9 @@ BRIDGE_MACADDR for bridges is an NM extension."/>
 <property name="max-age" variable="BRIDGING_OPTS: max_age=" format="" values="6 - 40" default="20" example="" description="STP maximum message age."/>
 <property name="ageing-time" variable="BRIDGING_OPTS: ageing_time=" format="" values="0 - 1000000" default="300" example="" description="Ethernet MAC ageing time."/>
 <property name="multicast-snooping" variable="BRIDGING_OPTS: multicast_snooping=" format="" values="0 or 1" default="1" example="" description="IGMP snooping support."/>
+<property name="vlan-filtering" variable="BRIDGING_OPTS: vlan_filtering=" format="" values="0 or 1" default="0" example="" description="VLAN filtering support."/>
+<property name="vlan-default-pvid" variable="BRIDGING_OPTS: default_pvid=" format="" values="0 - 4094" default="1" example="" description="default VLAN PVID."/>
+<property name="vlans" variable="BRIDGE_VLANS" format="" values="" default="" example="BRIDGE_VLANS="1 pvid untagged,20,300-400 untagged"" description="List of VLANs on the bridge"/>
 </setting>
 <setting name="cdma">
 </setting>
diff --git a/libnm/nm-vpn-service-plugin.c b/libnm/nm-vpn-service-plugin.c
index a2728342..abd02f18 100644
--- a/libnm/nm-vpn-service-plugin.c
+++ b/libnm/nm-vpn-service-plugin.c
@@ -26,7 +26,7 @@
 #include <signal.h>
 #include <stdlib.h>
 
-#include "nm-utils/nm-secret-utils.h"
+#include "nm-glib-aux/nm-secret-utils.h"
 #include "nm-enum-types.h"
 #include "nm-utils.h"
 #include "nm-connection.h"
diff --git a/libnm/tests/meson.build b/libnm/tests/meson.build
index d0a2dd30..d76b9f5f 100644
--- a/libnm/tests/meson.build
+++ b/libnm/tests/meson.build
@@ -19,7 +19,7 @@ foreach test_unit: test_units
     ],
     dependencies: [
       libnm_dep,
-      nm_core_dep,
+      libnm_core_dep,
       libnm_systemd_shared_no_logging_dep,
     ],
     c_args: cflags,
@@ -39,6 +39,6 @@ libnm_vpn_plugin_utils_test = static_library(
   'nm-vpn-plugin-utils-test',
   sources: shared_nm_utils_nm_vpn_plugin_utils_c + [libnm_enum[1]],
   include_directories: libnm_inc,
-  dependencies: nm_core_dep,
+  dependencies: libnm_core_dep,
   c_args: cflags,
 )
diff --git a/man/NetworkManager.8 b/man/NetworkManager.8
index 98a62766..8f0503b8 100644
--- a/man/NetworkManager.8
+++ b/man/NetworkManager.8
@@ -2,12 +2,12 @@
 .\"     Title: NetworkManager
 .\"    Author: 
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 03/15/2019
+.\"      Date: 04/21/2019
 .\"    Manual: Network management daemons
-.\"    Source: NetworkManager 1.16.0
+.\"    Source: NetworkManager 1.18.0
 .\"  Language: English
 .\"
-.TH "NETWORKMANAGER" "8" "" "NetworkManager 1\&.16\&.0" "Network management daemons"
+.TH "NETWORKMANAGER" "8" "" "NetworkManager 1\&.18\&.0" "Network management daemons"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/NetworkManager.conf.5 b/man/NetworkManager.conf.5
index 63e8dea2..2bbd2092 100644
--- a/man/NetworkManager.conf.5
+++ b/man/NetworkManager.conf.5
@@ -2,12 +2,12 @@
 .\"     Title: NetworkManager.conf
 .\"    Author: 
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 03/15/2019
+.\"      Date: 04/21/2019
 .\"    Manual: Configuration
-.\"    Source: NetworkManager 1.16.0
+.\"    Source: NetworkManager 1.18.0
 .\"  Language: English
 .\"
-.TH "NETWORKMANAGER\&.CONF" "5" "" "NetworkManager 1\&.16\&.0" "Configuration"
+.TH "NETWORKMANAGER\&.CONF" "5" "" "NetworkManager 1\&.18\&.0" "Configuration"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/nm-initrd-generator.8 b/man/nm-initrd-generator.8
index 016e172c..43bbc842 100644
--- a/man/nm-initrd-generator.8
+++ b/man/nm-initrd-generator.8
@@ -2,12 +2,12 @@
 .\"     Title: nm-initrd-generator
 .\"    Author: 
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 03/15/2019
+.\"      Date: 04/21/2019
 .\"    Manual: System Administration
-.\"    Source: NetworkManager 1.16.0
+.\"    Source: NetworkManager 1.18.0
 .\"  Language: English
 .\"
-.TH "NM\-INITRD\-GENERATOR" "8" "" "NetworkManager 1\&.16\&.0" "System Administration"
+.TH "NM\-INITRD\-GENERATOR" "8" "" "NetworkManager 1\&.18\&.0" "System Administration"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/nm-online.1 b/man/nm-online.1
index 4ad7cdbf..8b1089c6 100644
--- a/man/nm-online.1
+++ b/man/nm-online.1
@@ -2,12 +2,12 @@
 .\"     Title: nm-online
 .\"    Author: 
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 03/15/2019
+.\"      Date: 04/21/2019
 .\"    Manual: General Commands Manual
-.\"    Source: NetworkManager 1.16.0
+.\"    Source: NetworkManager 1.18.0
 .\"  Language: English
 .\"
-.TH "NM\-ONLINE" "1" "" "NetworkManager 1\&.16\&.0" "General Commands Manual"
+.TH "NM\-ONLINE" "1" "" "NetworkManager 1\&.18\&.0" "General Commands Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/nm-openvswitch.7 b/man/nm-openvswitch.7
index 9109071e..f7e8c118 100644
--- a/man/nm-openvswitch.7
+++ b/man/nm-openvswitch.7
@@ -2,12 +2,12 @@
 .\"     Title: nm-openvswitch
 .\"    Author: 
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 03/15/2019
+.\"      Date: 04/21/2019
 .\"    Manual: Open vSwitch support overview
-.\"    Source: NetworkManager 1.16.0
+.\"    Source: NetworkManager 1.18.0
 .\"  Language: English
 .\"
-.TH "NM\-OPENVSWITCH" "7" "" "NetworkManager 1\&.16\&.0" "Open vSwitch support overview"
+.TH "NM\-OPENVSWITCH" "7" "" "NetworkManager 1\&.18\&.0" "Open vSwitch support overview"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/nm-settings-ifcfg-rh.5 b/man/nm-settings-ifcfg-rh.5
index 97953009..c50bd629 100644
--- a/man/nm-settings-ifcfg-rh.5
+++ b/man/nm-settings-ifcfg-rh.5
@@ -2,12 +2,12 @@
 .\"     Title: nm-settings-ifcfg-rh
 .\"    Author: 
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 03/15/2019
+.\"      Date: 04/21/2019
 .\"    Manual: Configuration
-.\"    Source: NetworkManager 1.16.0
+.\"    Source: NetworkManager 1.18.0
 .\"  Language: English
 .\"
-.TH "NM\-SETTINGS\-IFCFG\-RH" "5" "" "NetworkManager 1\&.16\&.0" "Configuration"
+.TH "NM\-SETTINGS\-IFCFG\-RH" "5" "" "NetworkManager 1\&.18\&.0" "Configuration"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -812,6 +812,7 @@ T}
 .T&
 l l l l
 l l l l
+l l l l
 l l l l.
 T{
 priority
@@ -844,6 +845,17 @@ yes
 T}:T{
 Hairpin mode of the bridge port\&.
 T}
+T{
+vlans
+T}:T{
+BRIDGE_PORT_VLANS
+T}:T{
+\ \&
+T}:T{
+List of VLANs on the bridge port\fB
+
+Example: \fRBRIDGE_PORT_VLANS="1 pvid untagged,20,300\-400 untagged"
+T}
 .TE
 .sp 1
 .sp
@@ -872,6 +884,9 @@ l l l l
 l l l l
 l l l l
 l l l l
+l l l l
+l l l l
+l l l l
 l l l l.
 T{
 mac\-address
@@ -957,6 +972,39 @@ IGMP snooping support\&.\fB
 
 Allowed values: \fR0 or 1
 T}
+T{
+vlan\-filtering
+T}:T{
+BRIDGING_OPTS: vlan_filtering=
+T}:T{
+0
+T}:T{
+VLAN filtering support\&.\fB
+
+Allowed values: \fR0 or 1
+T}
+T{
+vlan\-default\-pvid
+T}:T{
+BRIDGING_OPTS: default_pvid=
+T}:T{
+1
+T}:T{
+default VLAN PVID\&.\fB
+
+Allowed values: \fR0 \- 4094
+T}
+T{
+vlans
+T}:T{
+BRIDGE_VLANS
+T}:T{
+\ \&
+T}:T{
+List of VLANs on the bridge\fB
+
+Example: \fRBRIDGE_VLANS="1 pvid untagged,20,300\-400 untagged"
+T}
 .TE
 .sp 1
 .sp
diff --git a/man/nm-settings-ifcfg-rh.xml b/man/nm-settings-ifcfg-rh.xml
index c0f834a1..c1dee669 100644
--- a/man/nm-settings-ifcfg-rh.xml
+++ b/man/nm-settings-ifcfg-rh.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd">
-<refentry id="nm-settings-ifcfg-rh"><refentryinfo><title>nm-settings-ifcfg-rhNetworkManager developersnm-settings-ifcfg-rh5NetworkManagerConfiguration1.16.0nm-settings-ifcfg-rhDescription of ifcfg-rh settings pluginDescription
+nm-settings-ifcfg-rhNetworkManager developersnm-settings-ifcfg-rh5NetworkManagerConfiguration1.18.0nm-settings-ifcfg-rhDescription of ifcfg-rh settings pluginDescription
           NetworkManager is based on the concept of connection profiles that contain
           network configuration (see nm-settings5 for details). The profiles can be
           stored in various formats. NetworkManager uses plugins for reading and writing
@@ -219,7 +219,9 @@ Example: BONDING_OPTS="miimon=100 mode=broadcast"0 - 63path-costBRIDGING_OPTS: path_cost=100STP cost.
 
-Allowed values: 1 - 65535hairpin-modeBRIDGING_OPTS: hairpin_mode=yesHairpin mode of the bridge port.bridge settingPropertyIfcfg-rh VariableDefaultDescriptionmac-addressBRIDGE_MACADDR(+)MAC address of the bridge. Note that this requires a recent kernel support, originally introduced in 3.15 upstream kernel) BRIDGE_MACADDR for bridges is an NM extension.stpSTPnoSpan tree protocol participation.priorityBRIDGING_OPTS: priority=32768STP priority.
+Allowed values: 1 - 65535hairpin-modeBRIDGING_OPTS: hairpin_mode=yesHairpin mode of the bridge port.vlansBRIDGE_PORT_VLANSList of VLANs on the bridge port
+
+Example: BRIDGE_PORT_VLANS="1 pvid untagged,20,300-400 untagged"
bridge settingPropertyIfcfg-rh VariableDefaultDescriptionmac-addressBRIDGE_MACADDR(+)MAC address of the bridge. Note that this requires a recent kernel support, originally introduced in 3.15 upstream kernel) BRIDGE_MACADDR for bridges is an NM extension.stpSTPnoSpan tree protocol participation.priorityBRIDGING_OPTS: priority=32768STP priority.
 
 Allowed values: 0 - 32768forward-delayDELAY15STP forwarding delay.
 
@@ -231,7 +233,13 @@ Allowed values: 6 - 40ageing-t
 
 Allowed values: 0 - 1000000multicast-snoopingBRIDGING_OPTS: multicast_snooping=1IGMP snooping support.
 
-Allowed values: 0 or 1
connection settingPropertyIfcfg-rh VariableDefaultDescriptionidNAME(+)User friendly name for the connection profile.uuidUUID(+)UUID for the connection profile. When missing, NetworkManager creates the UUID itself (by hashing the filename).stable-idSTABLE_ID(+)Token to generate stable IDs.interface-nameDEVICEInterface name of the device this profile is bound to. The variable can be left out when the profile should apply for more devices. Note that DEVICE can be required for some connection types.typeTYPE (DEVICETYPE, DEVICE)Base type of the connection. DEVICETYPE is used for teaming connections.
+Allowed values: 0 or 1vlan-filteringBRIDGING_OPTS: vlan_filtering=0VLAN filtering support.
+
+Allowed values: 0 or 1vlan-default-pvidBRIDGING_OPTS: default_pvid=1default VLAN PVID.
+
+Allowed values: 0 - 4094vlansBRIDGE_VLANSList of VLANs on the bridge
+
+Example: BRIDGE_VLANS="1 pvid untagged,20,300-400 untagged"
connection settingPropertyIfcfg-rh VariableDefaultDescriptionidNAME(+)User friendly name for the connection profile.uuidUUID(+)UUID for the connection profile. When missing, NetworkManager creates the UUID itself (by hashing the filename).stable-idSTABLE_ID(+)Token to generate stable IDs.interface-nameDEVICEInterface name of the device this profile is bound to. The variable can be left out when the profile should apply for more devices. Note that DEVICE can be required for some connection types.typeTYPE (DEVICETYPE, DEVICE)Base type of the connection. DEVICETYPE is used for teaming connections.
 
 Example: TYPE=Ethernet; TYPE=Bond; TYPE=Bridge; DEVICETYPE=TeamPort
 
diff --git a/man/nm-settings-keyfile.5 b/man/nm-settings-keyfile.5
index dd7995de..b0e02e5e 100644
--- a/man/nm-settings-keyfile.5
+++ b/man/nm-settings-keyfile.5
@@ -2,12 +2,12 @@
 .\"     Title: nm-settings-keyfile
 .\"    Author: 
 .\" Generator: DocBook XSL Stylesheets vsnapshot 
-.\"      Date: 03/15/2019
+.\"      Date: 04/21/2019
 .\"    Manual: Configuration
-.\"    Source: NetworkManager 1.16.0
+.\"    Source: NetworkManager 1.18.0
 .\"  Language: English
 .\"
-.TH "NM\-SETTINGS\-KEYFILE" "5" "" "NetworkManager 1\&.16\&.0" "Configuration"
+.TH "NM\-SETTINGS\-KEYFILE" "5" "" "NetworkManager 1\&.18\&.0" "Configuration"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/nm-settings-keyfile.xml b/man/nm-settings-keyfile.xml
index 3281f887..e8fbfcee 100644
--- a/man/nm-settings-keyfile.xml
+++ b/man/nm-settings-keyfile.xml
@@ -1,6 +1,6 @@
 
 
-nm-settings-keyfileNetworkManager developersnm-settings-keyfile5NetworkManagerConfiguration1.16.0nm-settings-keyfileDescription of keyfile settings pluginDescription
+nm-settings-keyfileNetworkManager developersnm-settings-keyfile5NetworkManagerConfiguration1.18.0nm-settings-keyfileDescription of keyfile settings pluginDescription
           NetworkManager is based on the concept of connection profiles that contain
           network configuration (see nm-settings5 for details). The profiles can be
           stored in various formats. NetworkManager uses plugins for reading and writing
diff --git a/man/nm-settings.5 b/man/nm-settings.5
index aa08919a..364be468 100644
--- a/man/nm-settings.5
+++ b/man/nm-settings.5
@@ -2,12 +2,12 @@
 .\"     Title: nm-settings
 .\"    Author: 
 .\" Generator: DocBook XSL Stylesheets vsnapshot 
-.\"      Date: 03/15/2019
+.\"      Date: 04/21/2019
 .\"    Manual: Configuration
-.\"    Source: NetworkManager 1.16.0
+.\"    Source: NetworkManager 1.18.0
 .\"  Language: English
 .\"
-.TH "NM\-SETTINGS" "5" "" "NetworkManager 1\&.16\&.0" "Configuration"
+.TH "NM\-SETTINGS" "5" "" "NetworkManager 1\&.18\&.0" "Configuration"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -981,6 +981,9 @@ l l l l
 l l l l
 l l l l
 l l l l
+l l l l
+l l l l
+l l l l
 l l l l.
 T{
 ageing\-time
@@ -1072,6 +1075,33 @@ TRUE
 T}:T{
 Controls whether Spanning Tree Protocol (STP) is enabled for this bridge\&.
 T}
+T{
+vlan\-default\-pvid
+T}:T{
+uint32
+T}:T{
+1
+T}:T{
+The default PVID for the ports of the bridge, that is the VLAN id assigned to incoming untagged frames\&.
+T}
+T{
+vlan\-filtering
+T}:T{
+boolean
+T}:T{
+FALSE
+T}:T{
+Control whether VLAN filtering is enabled on the bridge\&.
+T}
+T{
+vlans
+T}:T{
+array of vardict
+T}:T{
+[]
+T}:T{
+Array of bridge VLAN objects\&. In addition to the VLANs specified here, the bridge will also have the default\-pvid VLAN configured  by the bridge\&.vlan\-default\-pvid property\&. In nmcli the VLAN list can be specified with the following syntax: $vid [pvid] [untagged] [, $vid [pvid] [untagged]]\&.\&.\&. where $vid is either a single id between 1 and 4094 or a range, represented as a couple of ids separated by a dash\&.
+T}
 .TE
 .sp 1
 .SS "bridge\-port setting"
@@ -1092,6 +1122,7 @@ T}
 .T&
 l l l l
 l l l l
+l l l l
 l l l l.
 T{
 hairpin\-mode
@@ -1120,6 +1151,15 @@ T}:T{
 T}:T{
 The Spanning Tree Protocol (STP) priority of this bridge port\&.
 T}
+T{
+vlans
+T}:T{
+array of vardict
+T}:T{
+[]
+T}:T{
+Array of bridge VLAN objects\&. In addition to the VLANs specified here, the port will also have the default\-pvid VLAN configured on the bridge by the bridge\&.vlan\-default\-pvid property\&. In nmcli the VLAN list can be specified with the following syntax: $vid [pvid] [untagged] [, $vid [pvid] [untagged]]\&.\&.\&. where $vid is either a single id between 1 and 4094 or a range, represented as a couple of ids separated by a dash\&.
+T}
 .TE
 .sp 1
 .SS "cdma setting"
diff --git a/man/nm-settings.xml b/man/nm-settings.xml
index 50e573dc..ff71550e 100644
--- a/man/nm-settings.xml
+++ b/man/nm-settings.xml
@@ -1,6 +1,6 @@
 
 
-nm-settingsNetworkManager developersnm-settings5NetworkManagerConfiguration1.16.0nm-settingsDescription of settings and properties of NetworkManager connection profilesDescription
+nm-settingsNetworkManager developersnm-settings5NetworkManagerConfiguration1.18.0nm-settingsDescription of settings and properties of NetworkManager connection profilesDescription
           NetworkManager is based on a concept of connection profiles, sometimes referred to as
           connections only. These connection profiles contain a network configuration. When
           NetworkManager activates a connection profile on a network device the configuration will
@@ -135,11 +135,15 @@
     multicast-snoopingbooleanTRUEControls whether IGMP snooping is enabled for this bridge. Note that if snooping was automatically disabled due to hash collisions, the system may refuse to enable the feature until the collisions are resolved.
     priorityuint3232768Sets the Spanning Tree Protocol (STP) priority for this bridge.  Lower values are "better"; the lowest priority bridge will be elected the root bridge.
     stpbooleanTRUEControls whether Spanning Tree Protocol (STP) is enabled for this bridge.
+    vlan-default-pviduint321The default PVID for the ports of the bridge, that is the VLAN id assigned to incoming untagged frames.
+    vlan-filteringbooleanFALSEControl whether VLAN filtering is enabled on the bridge.
+    vlansarray of vardict[]Array of bridge VLAN objects. In addition to the VLANs specified here, the bridge will also have the default-pvid VLAN configured  by the bridge.vlan-default-pvid property. In nmcli the VLAN list can be specified with the following syntax: $vid [pvid] [untagged] [, $vid [pvid] [untagged]]... where $vid is either a single id between 1 and 4094 or a range, represented as a couple of ids separated by a dash.
   bridge-port settingBridge Port Settings.Key NameValue TypeDefault ValueValue Descriptionhairpin-modebooleanFALSEEnables or disables "hairpin mode" for the port, which allows frames to be sent back out through the port the frame was received on.path-costuint32100The Spanning Tree Protocol (STP) port cost for destinations via this port.priorityuint3232The Spanning Tree Protocol (STP) priority of this bridge port.
+    vlansarray of vardict[]Array of bridge VLAN objects. In addition to the VLANs specified here, the port will also have the default-pvid VLAN configured on the bridge by the bridge.vlan-default-pvid property. In nmcli the VLAN list can be specified with the following syntax: $vid [pvid] [untagged] [, $vid [pvid] [untagged]]... where $vid is either a single id between 1 and 4094 or a range, represented as a couple of ids separated by a dash.cdma settingCDMA-based Mobile Broadband Settings.Key NameValue TypeDefault ValueValue Descriptionmtuuint320If non-zero, only transmit packets of the specified size or smaller, breaking larger packets up into multiple frames.
diff --git a/man/nmcli-examples.7 b/man/nmcli-examples.7
index 202d3906..415f99f7 100644
--- a/man/nmcli-examples.7
+++ b/man/nmcli-examples.7
@@ -2,12 +2,12 @@
 .\"     Title: nmcli-examples
 .\"    Author: 
 .\" Generator: DocBook XSL Stylesheets vsnapshot 
-.\"      Date: 03/15/2019
+.\"      Date: 04/21/2019
 .\"    Manual: Examples
-.\"    Source: NetworkManager 1.16.0
+.\"    Source: NetworkManager 1.18.0
 .\"  Language: English
 .\"
-.TH "NMCLI\-EXAMPLES" "7" "" "NetworkManager 1\&.16\&.0" "Examples"
+.TH "NMCLI\-EXAMPLES" "7" "" "NetworkManager 1\&.18\&.0" "Examples"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/nmcli.1 b/man/nmcli.1
index e16e5c16..0b0156ce 100644
--- a/man/nmcli.1
+++ b/man/nmcli.1
@@ -2,12 +2,12 @@
 .\"     Title: nmcli
 .\"    Author: 
 .\" Generator: DocBook XSL Stylesheets vsnapshot 
-.\"      Date: 03/15/2019
+.\"      Date: 04/21/2019
 .\"    Manual: General Commands Manual
-.\"    Source: NetworkManager 1.16.0
+.\"    Source: NetworkManager 1.18.0
 .\"  Language: English
 .\"
-.TH "NMCLI" "1" "" "NetworkManager 1\&.16\&.0" "General Commands Manual"
+.TH "NMCLI" "1" "" "NetworkManager 1\&.18\&.0" "General Commands Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/nmtui.1 b/man/nmtui.1
index a5e9d072..0b3bce99 100644
--- a/man/nmtui.1
+++ b/man/nmtui.1
@@ -2,12 +2,12 @@
 .\"     Title: nmtui
 .\"    Author: 
 .\" Generator: DocBook XSL Stylesheets vsnapshot 
-.\"      Date: 03/15/2019
+.\"      Date: 04/21/2019
 .\"    Manual: General Commands Manual
-.\"    Source: NetworkManager 1.16.0
+.\"    Source: NetworkManager 1.18.0
 .\"  Language: English
 .\"
-.TH "NMTUI" "1" "" "NetworkManager 1\&.16\&.0" "General Commands Manual"
+.TH "NMTUI" "1" "" "NetworkManager 1\&.18\&.0" "General Commands Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/meson.build b/meson.build
index 49818791..27bcd033 100644
--- a/meson.build
+++ b/meson.build
@@ -4,7 +4,7 @@ project(
 #  - add corresponding NM_VERSION_x_y_z macros in
 #    "shared/nm-version-macros.h.in"
 #  - update number in configure.ac
-  version: '1.16.0',
+  version: '1.18.0',
   license: 'GPL2+',
   default_options: [
     'buildtype=debugoptimized',
@@ -327,6 +327,11 @@ if enable_libnm_glib
 endif
 # FIXME: do this better!!!
 have_fake_typelibs = enable_libnm_glib and enable_introspection
+if have_fake_typelibs and gio_unix_dep.version().version_compare('< 2.51.1')
+  warning('cannot build fake typelibs for libnm because glib is too old')
+  have_fake_typelibs=false
+endif
+
 config_h.set10('WITH_FAKE_TYPELIBS', have_fake_typelibs)
 
 udev_dir = get_option('udev_dir')
@@ -437,7 +442,8 @@ config_h.set10('HAVE_SELINUX', enable_selinux)
 
 # eBPF support
 ebpf_opt = get_option('ebpf')
-if ebpf_opt == 'false'
+# 'auto' means 'false', because there are still issues.
+if ebpf_opt != 'true'
   enable_ebpf = false
 else
   enable_ebpf = true
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 148fd546..1edddb7f 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -168,7 +168,7 @@ libnm/nm-remote-settings.c
 libnm/nm-vpn-plugin-old.c
 libnm/nm-vpn-service-plugin.c
 data/org.freedesktop.NetworkManager.policy.in.in
-shared/nm-utils/nm-shared-utils.c
+shared/nm-glib-aux/nm-shared-utils.c
 src/NetworkManagerUtils.c
 src/main.c
 src/main-utils.c
diff --git a/po/ar.po b/po/ar.po
index 627b830c..e939ecbb 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -2917,7 +2917,7 @@ msgid ""
 "and\n"
 "\"nmcli connection show\" to get an overview on active connection profiles.\n"
 "\n"
-"Consult nmcli(1) and nmcli-examples(5) manual pages for complete usage "
+"Consult nmcli(1) and nmcli-examples(7) manual pages for complete usage "
 "details.\n"
 msgstr ""
 
diff --git a/po/as.po b/po/as.po
index 096be586..8e008a97 100644
--- a/po/as.po
+++ b/po/as.po
@@ -3435,7 +3435,7 @@ msgid ""
 "and\n"
 "\"nmcli connection show\" to get an overview on active connection profiles.\n"
 "\n"
-"Consult nmcli(1) and nmcli-examples(5) manual pages for complete usage "
+"Consult nmcli(1) and nmcli-examples(7) manual pages for complete usage "
 "details.\n"
 msgstr ""
 
diff --git a/po/be@latin.po b/po/be@latin.po
index aefee869..df0556a7 100644
--- a/po/be@latin.po
+++ b/po/be@latin.po
@@ -2883,7 +2883,7 @@ msgid ""
 "and\n"
 "\"nmcli connection show\" to get an overview on active connection profiles.\n"
 "\n"
-"Consult nmcli(1) and nmcli-examples(5) manual pages for complete usage "
+"Consult nmcli(1) and nmcli-examples(7) manual pages for complete usage "
 "details.\n"
 msgstr ""
 
diff --git a/po/bg.po b/po/bg.po
index 7ed9ba4a..f2519777 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -2952,7 +2952,7 @@ msgid ""
 "and\n"
 "\"nmcli connection show\" to get an overview on active connection profiles.\n"
 "\n"
-"Consult nmcli(1) and nmcli-examples(5) manual pages for complete usage "
+"Consult nmcli(1) and nmcli-examples(7) manual pages for complete usage "
 "details.\n"
 msgstr ""
 
diff --git a/po/bn_IN.po b/po/bn_IN.po
index 189d6a88..ba9639ea 100644
--- a/po/bn_IN.po
+++ b/po/bn_IN.po
@@ -3437,7 +3437,7 @@ msgid ""
 "and\n"
 "\"nmcli connection show\" to get an overview on active connection profiles.\n"
 "\n"
-"Consult nmcli(1) and nmcli-examples(5) manual pages for complete usage "
+"Consult nmcli(1) and nmcli-examples(7) manual pages for complete usage "
 "details.\n"
 msgstr ""
 
diff --git a/po/bs.po b/po/bs.po
index 7b83730f..6342a842 100644
--- a/po/bs.po
+++ b/po/bs.po
@@ -2903,7 +2903,7 @@ msgid ""
 "and\n"
 "\"nmcli connection show\" to get an overview on active connection profiles.\n"
 "\n"
-"Consult nmcli(1) and nmcli-examples(5) manual pages for complete usage "
+"Consult nmcli(1) and nmcli-examples(7) manual pages for complete usage "
 "details.\n"
 msgstr ""
 
diff --git a/po/ca.po b/po/ca.po
index 1b9ce5de..9f3b3d13 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -3580,7 +3580,7 @@ msgid ""
 "and\n"
 "\"nmcli connection show\" to get an overview on active connection profiles.\n"
 "\n"
-"Consult nmcli(1) and nmcli-examples(5) manual pages for complete usage "
+"Consult nmcli(1) and nmcli-examples(7) manual pages for complete usage "
 "details.\n"
 msgstr ""
 
diff --git a/po/cs.po b/po/cs.po
index 6390235c..5b54b500 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -2925,7 +2925,7 @@ msgid ""
 "and\n"
 "\"nmcli connection show\" to get an overview on active connection profiles.\n"
 "\n"
-"Consult nmcli(1) and nmcli-examples(5) manual pages for complete usage "
+"Consult nmcli(1) and nmcli-examples(7) manual pages for complete usage "
 "details.\n"
 msgstr ""
 
diff --git a/po/da.po b/po/da.po
index a5f114a0..64139f9a 100644
--- a/po/da.po
+++ b/po/da.po
@@ -3506,7 +3506,7 @@ msgid ""
 "and\n"
 "\"nmcli connection show\" to get an overview on active connection profiles.\n"
 "\n"
-"Consult nmcli(1) and nmcli-examples(5) manual pages for complete usage "
+"Consult nmcli(1) and nmcli-examples(7) manual pages for complete usage "
 "details.\n"
 msgstr ""
 
diff --git a/po/de.po b/po/de.po
index 2769ff78..2d8d6d90 100644
--- a/po/de.po
+++ b/po/de.po
@@ -3771,7 +3771,7 @@ msgid ""
 "and\n"
 "\"nmcli connection show\" to get an overview on active connection profiles.\n"
 "\n"
-"Consult nmcli(1) and nmcli-examples(5) manual pages for complete usage "
+"Consult nmcli(1) and nmcli-examples(7) manual pages for complete usage "
 "details.\n"
 msgstr ""
 "Rufen Sie »nmcli device show« auf, um vollständige Informationen über "
@@ -3780,7 +3780,7 @@ msgstr ""
 "Verbindungsprofile.\n"
 "\n"
 "\n"
-"Die Hilfeseiten nmcli(1) und nmcli-examples(5) geben vollständige "
+"Die Hilfeseiten nmcli(1) und nmcli-examples(7) geben vollständige "
 "Aufrufbeschreibungen.\n"
 
 #: ../clients/cli/general.c:1370
diff --git a/po/dz.po b/po/dz.po
index e7555ca3..ca613aff 100644
--- a/po/dz.po
+++ b/po/dz.po
@@ -2908,7 +2908,7 @@ msgid ""
 "and\n"
 "\"nmcli connection show\" to get an overview on active connection profiles.\n"
 "\n"
-"Consult nmcli(1) and nmcli-examples(5) manual pages for complete usage "
+"Consult nmcli(1) and nmcli-examples(7) manual pages for complete usage "
 "details.\n"
 msgstr ""
 
diff --git a/po/el.po b/po/el.po
index 6c638ba2..aa2a7f83 100644
--- a/po/el.po
+++ b/po/el.po
@@ -3506,7 +3506,7 @@ msgid ""
 "and\n"
 "\"nmcli connection show\" to get an overview on active connection profiles.\n"
 "\n"
-"Consult nmcli(1) and nmcli-examples(5) manual pages for complete usage "
+"Consult nmcli(1) and nmcli-examples(7) manual pages for complete usage "
 "details.\n"
 msgstr ""
 
diff --git a/po/en_CA.po b/po/en_CA.po
index 50312ce6..0f7e93af 100644
--- a/po/en_CA.po
+++ b/po/en_CA.po
@@ -2925,7 +2925,7 @@ msgid ""
 "and\n"
 "\"nmcli connection show\" to get an overview on active connection profiles.\n"
 "\n"
-"Consult nmcli(1) and nmcli-examples(5) manual pages for complete usage "
+"Consult nmcli(1) and nmcli-examples(7) manual pages for complete usage "
 "details.\n"
 msgstr ""
 
diff --git a/po/en_GB.po b/po/en_GB.po
index 65bceca5..c890a05e 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -2945,7 +2945,7 @@ msgid ""
 "and\n"
 "\"nmcli connection show\" to get an overview on active connection profiles.\n"
 "\n"
-"Consult nmcli(1) and nmcli-examples(5) manual pages for complete usage "
+"Consult nmcli(1) and nmcli-examples(7) manual pages for complete usage "
 "details.\n"
 msgstr ""
 
diff --git a/po/eo.po b/po/eo.po
index 27382955..78d4b884 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -2896,7 +2896,7 @@ msgid ""
 "and\n"
 "\"nmcli connection show\" to get an overview on active connection profiles.\n"
 "\n"
-"Consult nmcli(1) and nmcli-examples(5) manual pages for complete usage "
+"Consult nmcli(1) and nmcli-examples(7) manual pages for complete usage "
 "details.\n"
 msgstr ""
 
diff --git a/po/es.po b/po/es.po
index ad6004bf..ad9a17ab 100644
--- a/po/es.po
+++ b/po/es.po
@@ -17,19 +17,21 @@
 # lrintel , 2018. #zanata
 # tchuang , 2018. #zanata
 # trh01 , 2018. #zanata
+# Rodrigo Lledó , 2019.
+#
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
+"Project-Id-Version: master\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2019-01-08 18:22+0100\n"
-"PO-Revision-Date: 2017-11-07 06:49+0000\n"
-"Last-Translator: Copied by Zanata \n"
+"PO-Revision-Date: 2019-04-17 14:46+0200\n"
+"Last-Translator: Rodrigo Lledó \n"
 "Language-Team: Español \n"
 "Language: es\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Zanata 4.6.2\n"
+"X-Generator: Gtranslator 3.30.1\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: ../clients/cli/agent.c:40
@@ -40,7 +42,7 @@ msgid ""
 "COMMAND := { secret | polkit | all }\n"
 "\n"
 msgstr ""
-"Modo de uso: nmcli agent { COMMAND | help }\n"
+"Uso: nmcli agent { COMANDO | help }\n"
 "\n"
 "COMANDO := { secret | polkit | all }\n"
 "\n"
@@ -59,9 +61,11 @@ msgstr ""
 "Uso: nmcli agent secret { help }\n"
 "\n"
 "Ejecuta nmcli como el agente secreto de NetworkManager. Cuando "
-"NetworkManager requiere una contraseña, la pide a los agentes registrados. "
-"Este comando mantiene a nmcli en ejecución y si se requiere  la contraseña "
-"se la solicita al usuario.\n"
+"NetworkManager\n"
+"requiere una contraseña, la pide a los agentes registrados. Este comando "
+"mantiene\n"
+"a nmcli en ejecución y si se necesita una contraseña se la solicita al "
+"usuario.\n"
 "\n"
 
 #: ../clients/cli/agent.c:58
@@ -76,9 +80,11 @@ msgid ""
 "\n"
 msgstr ""
 "Uso: nmcli agent polkit { help }\n"
-"Registra a nmcli como una acción polkit para la sesión de usuario. Cuando un "
-"demonio polkit requiere una autorización, nmcli le pregunta al usuario y le "
-"responde a polkit.\n"
+"\n"
+"Registra a nmcli como una acción polkit para la sesión de usuario.\n"
+"Cuando un demonio polkit requiere una autorización, nmcli le pregunta al "
+"usuario\n"
+"y le da esta respuesta a polkit.\n"
 "\n"
 
 #: ../clients/cli/agent.c:68
@@ -90,6 +96,7 @@ msgid ""
 "\n"
 msgstr ""
 "Uso: nmcli agent all { help }\n"
+"\n"
 "Ejecuta nmcli como secreto de NetworkManager y como agente polkit.\n"
 "\n"
 
@@ -97,23 +104,23 @@ msgstr ""
 #, c-format
 msgid "nmcli successfully registered as a NetworkManager's secret agent.\n"
 msgstr ""
-"nmcli se ha registrado con acierto como un agente secreto de "
+"nmcli se ha registrado correctamente como un agente secreto de "
 "NetworkManager.\n"
 
 #: ../clients/cli/agent.c:159
 #, c-format
 msgid "Error: secret agent initialization failed"
-msgstr "Error: No se pudo inicializar el agente secreto"
+msgstr "Error: no se pudo inicializar el agente secreto"
 
 #: ../clients/cli/agent.c:178
 #, c-format
 msgid "Error: polkit agent initialization failed: %s"
-msgstr "Error: No se pudo inicializar el agente polkit: %s"
+msgstr "Error: no se pudo inicializar el agente polkit: %s"
 
 #: ../clients/cli/agent.c:186
 #, c-format
 msgid "nmcli successfully registered as a polkit agent.\n"
-msgstr "nmcli se ha registrado con acierto como un agente polkit. \n"
+msgstr "nmcli se ha registrado correctamente como un agente polkit.\n"
 
 # auto translated by TM merge from project: gnome-search-tool, version: 3.4.0, DocId: gnome-search-tool
 #: ../clients/cli/common.c:361 ../clients/cli/common.c:362
@@ -130,7 +137,7 @@ msgstr "Error: falló openconnect: %s\n"
 #: ../clients/cli/common.c:628
 #, c-format
 msgid "Error: openconnect failed with status %d\n"
-msgstr "Error: falló openconnect con estado: %d\n"
+msgstr "Error: falló openconnect con estado %d\n"
 
 #: ../clients/cli/common.c:630
 #, c-format
@@ -143,13 +150,13 @@ msgid ""
 "Warning: password for '%s' not given in 'passwd-file' and nmcli cannot ask "
 "without '--ask' option.\n"
 msgstr ""
-"Advertencia: la contraseña para '%s' no se indica en 'passwd-file' y nmcli "
-"no la puede pedir sin la opción '--ask'.\n"
+"Advertencia: la contraseña para «%s» no se indica en «passwd-file» y nmcli "
+"no la puede pedir sin la opción «--ask».\n"
 
 #: ../clients/cli/common.c:1211
 #, c-format
 msgid "Error: Could not create NMClient object: %s."
-msgstr "Error: No se pudo crear objeto NMClient: %s."
+msgstr "Error: no se pudo crear el objeto NMClient: %s."
 
 #: ../clients/cli/common.c:1231
 msgid "Error: NetworkManager is not running."
@@ -158,11 +165,12 @@ msgstr "Error: NetworkManager no se está ejecutando."
 #: ../clients/cli/common.c:1327
 #, c-format
 msgid "Error: argument '%s' not understood. Try passing --help instead."
-msgstr "Error: argumento%s' no se entiende. Intenta pasar --ayuda en su lugar."
+msgstr ""
+"Error: el argumento «%s» no se entiende. Pruebe con --help en su lugar."
 
 #: ../clients/cli/common.c:1337
 msgid "Error: missing argument. Try passing --help."
-msgstr "Error: falta argumento. Intenta pasar --ayudar."
+msgstr "Error: falta el argumento. Pruebe con --help."
 
 #: ../clients/cli/common.c:1390
 msgid "access denied"
@@ -202,7 +210,7 @@ msgstr "total"
 #. define some prompts for connection editor
 #: ../clients/cli/connections.c:65
 msgid "Setting name? "
-msgstr "¿Establecimiento de permisos?"
+msgstr "¿Nombre de configuración? "
 
 #: ../clients/cli/connections.c:66
 msgid "Property name? "
@@ -210,28 +218,24 @@ msgstr "¿Nombre de propiedad? "
 
 #: ../clients/cli/connections.c:67
 msgid "Enter connection type: "
-msgstr "Ingrese el tipo de conexión:"
+msgstr "Ingrese el tipo de conexión: "
 
 #. define some other prompts
 #: ../clients/cli/connections.c:71
-#, fuzzy
 msgid "Connection (name, UUID, or path): "
 msgstr "Conexión (nombre, UUID, o ruta): "
 
 #: ../clients/cli/connections.c:72
-#, fuzzy
 msgid "VPN connection (name, UUID, or path): "
-msgstr "Conexión (nombre, UUID, o ruta): "
+msgstr "Conexión VPN (nombre, UUID, o ruta): "
 
 #: ../clients/cli/connections.c:73
-#, fuzzy
 msgid "Connection(s) (name, UUID, or path): "
-msgstr "Conexión (nombre, UUID, o ruta): "
+msgstr "Conexión(es) (nombre, UUID, o ruta): "
 
 #: ../clients/cli/connections.c:74
-#, fuzzy
 msgid "Connection(s) (name, UUID, path or apath): "
-msgstr "Conexión (nombre, UUID, o ruta): "
+msgstr "Conexion(es) (nombre, UUID, ruta o apath): "
 
 #: ../clients/cli/connections.c:82
 msgid "activating"
@@ -248,7 +252,7 @@ msgstr "desactivando"
 # auto translated by TM merge from project: firewalld, version: 0.3.4, DocId: firewalld
 #: ../clients/cli/connections.c:85
 msgid "deactivated"
-msgstr "desactivado"
+msgstr "desactivada"
 
 #: ../clients/cli/connections.c:91
 msgid "VPN connecting (prepare)"
@@ -322,20 +326,41 @@ msgid ""
 "  export [id | uuid | path]  []\n"
 "\n"
 msgstr ""
-"Uso: conexión nmcli {COMANDO | ayuda} COMANDO: = {show | arriba | abajo | "
-"añadir | modificar | clonar editar | eliminar | monitorear recargar | carga "
-"| importar exportar} mostrar [--activo] [- orden ] show [--"
-"active] [id | uuid camino un camino]  ... arriba [[id | uuid camino] "
-"] [ifname ] [ap ] [archivo de contraseña ] abajo [id | uuid camino un camino]  ... agregar "
-"COMMON_OPTIONS TYPE_SPECIFIC_OPTIONS SLAVE_OPTIONS IP_OPTIONS [- ([+ | "
-"-]. ) +] modificar [--temporary] [id | uuid "
-"camino]  ([+ | -]. ) + clone [--temporary] [id "
-"| uuid camino ]  editar [id | uuid camino] editar [tipo "
-"] [con-nombre ] eliminar [id | uuid camino] "
-"monitor [id | uuid camino]  ... recargar carga  El "
-"...] importar [--temporary] tipo  expediente exportar [id | uuid camino]  El]\n"
+"Uso: nmcli connection { COMANDO | help }\n"
+"\n"
+"COMANDO := { show | up | down | add | modify | clone | edit | delete | "
+"monitor | reload | load | import | export }\n"
+"\n"
+"  show [--active] [--order ]\n"
+"  show [--active] [id | uuid | path | apath]  ...\n"
+"\n"
+"  up [[id | uuid | path] ] [ifname ] [ap ] [passwd-file "
+"]\n"
+"\n"
+"  down [id | uuid | path | apath]  ...\n"
+"\n"
+"  add COMMON_OPTIONS TYPE_SPECIFIC_OPTIONS SLAVE_OPTIONS IP_OPTIONS [-- "
+"([+|-]. )+]\n"
+"\n"
+"  modify [--temporary] [id | uuid | path]  ([+|-]. "
+")+\n"
+"\n"
+"  clone [--temporary] [id | uuid | path ]  \n"
+"\n"
+"  edit [id | uuid | path] \n"
+"  edit [type ] [con-name ]\n"
+"\n"
+"  delete [id | uuid | path] \n"
+"\n"
+"  monitor [id | uuid | path]  ...\n"
+"\n"
+"  reload\n"
+"\n"
+"  load  [ ... ]\n"
+"\n"
+"  import [--temporary] type  file \n"
+"\n"
+"  export [id | uuid | path]  []\n"
 "\n"
 
 #: ../clients/cli/connections.c:890
@@ -364,26 +389,31 @@ msgid ""
 "account. Use global --show-secrets option to reveal associated secrets as "
 "well.\n"
 msgstr ""
-"Uso: nmcli connection show { ARGUMENTS | help }\n"
+"Uso: nmcli connection show { ARGUMENTOS | help }\n"
 "\n"
-"ARGUMENTOS := [--active] [--order ]\n"
+"ARGUMENTOS := [--active] [--order ]\n"
 "\n"
 "Lista los perfiles de conexión in-memory y on-disk, algunos de los cuales "
-"pueden estar activos si un dispositivo está utilizando ese perfil de "
-"conexión. Sin un parámetro, todos los perfiles se listarán. Cuando se "
-"especifique la opción --active, únicamente se muestran los perfiles activos. "
-"--order permite la orden de conexión personalizada (vea la página de "
-"manual).\n"
+"pueden\n"
+"estar activos si un dispositivo está utilizando ese perfil de conexión. Sin "
+"un\n"
+"parámetro, todos los perfiles se listarán. Cuando se especifique la opción\n"
+"--active, únicamente se muestran los perfiles activos. --order permite un "
+"orden\n"
+"de conexión personalizado (vea la página del manual).\n"
 "\n"
 "ARGUMENTOS := [--active] [id | uuid | path | apath]  ...\n"
 "\n"
-"Muestra información para conexiones especificas. Tanto los datos de conexión "
-"de configuración estática como de conexión activa se muestran de forma "
-"predeterminada. Es posible filtrar la salida mediante la opción '--fields'. "
+"Muestra detalles para las conexiones especificadas. Tanto los datos de "
+"conexión\n"
+"de configuración estática como de conexión activa se muestran de forma\n"
+"predeterminada. Es posible filtrar la salida mediante la opción global «--"
+"fields».\n"
 "Consulte la página de manual para obtener más información.\n"
-"Cuando la opción --active es especificada, únicamente los perfiles activos "
-"se tienen en cuenta. Use la opción global --show-secrets para revelar "
-"también los secretos asociados.\n"
+"Cuando se especifica la opción --active, se tienen en cuenta únicamente los\n"
+"perfiles activos. Use la opción global --show-secrets para revelar también "
+"los\n"
+"secretos asociados.\n"
 
 #: ../clients/cli/connections.c:911
 #, c-format
@@ -409,31 +439,32 @@ msgid ""
 "passwd-file - file with password(s) required to activate the connection\n"
 "\n"
 msgstr ""
-"Uso: nmcli connection up { ARGUMENTS | help }\n"
+"Uso: nmcli connection up { ARGUMENTOS | help }\n"
 "\n"
 "ARGUMENTOS := [id | uuid | path]  [ifname ] [ap ] [nsp "
-"] [passwd-file ]\n"
+"] [passwd-file ]\n"
 "\n"
 "Activar una conexión en un dispositivo. El perfil a activar es identificado "
 "por su \n"
 "nombre, UUID o ruta D-Bus.\n"
 "\n"
-"ARGUMENTOS := ifname  [ap ] [nsp ] [passwd-file ]\n"
+"ARGUMENTOS := ifname  [ap ] [nsp ] [passwd-file "
+"]\n"
 "\n"
 "Activar un dispositivo con una conexión. El perfil de la conexión es "
-"seleccionada automáticamente por NetworkManager.\n"
+"seleccionado\n"
+"automáticamente por NetworkManager.\n"
 "\n"
-"ifname      - especifica el dispositivo para activar la conexión\n"
-"ap          - especifica  AP para conectarse (únicamente válida parar Wi-"
-"Fi)\n"
-"nsp         - especifica NSP para conectarse (únicamente válida para WiMAX)\n"
-"passwd-file - archivo con contraseña(s) se requiere para activar la "
-"conexión\n"
+"ifname      - especifica el dispositivo en el cual activar la conexión\n"
+"ap          - especifica el AP al cual conectarse (únicamente válido para "
+"WiFi)\n"
+"nsp         - especifica el NSP al cual conectarse (únicamente válido para "
+"WiMAX)\n"
+"passwd-file - archivo con contraseña(s) necesario para activar la conexión\n"
 "\n"
 
 #: ../clients/cli/connections.c:932
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Usage: nmcli connection down { ARGUMENTS | help }\n"
 "\n"
@@ -445,14 +476,14 @@ msgid ""
 "UUID or D-Bus path.\n"
 "\n"
 msgstr ""
-"Uso: nmcli connection down { ARGUMENTS | help }\n"
+"Uso: nmcli connection down { ARGUMENTOS | help }\n"
 "\n"
-"ARGUMENTOS := [id | uuid | path | apath] \n"
+"ARGUMENTOS := [id | uuid | path | apath]  ...\n"
 "\n"
-"Desactivar una conexión de un dispositivo (sin evitar que el dispositivo se "
-"active\n"
-"más adelante). El perfil para desactivar es identificado por su nombre,\n"
-"UUID o ruta D-Bus.\n"
+"Desactiva una conexión de un dispositivo (sin impedir posteriores\n"
+"auto-activaciones del dispositivo). El perfil a desactivar es identificado "
+"por\n"
+"su nombre, UUID o ruta D-BUS.\n"
 "\n"
 
 #: ../clients/cli/connections.c:944
@@ -613,49 +644,163 @@ msgid ""
 "                  [ip6 ] [gw6 ]\n"
 "\n"
 msgstr ""
-"Uso: conexión nmcli agregar {ARGUMENTOS | ayuda} ARGUMENTOS: = "
-"COMMON_OPTIONS TYPE_SPECIFIC_OPTIONS SLAVE_OPTIONS IP_OPTIONS [- ([+ | "
-"-]. ) +] COMMON_OPTIONS: tipo nombre de "
-"usuario  | \"*\" [con-name ] [autoconectar "
-"sí | no] [guardar sí | no] [maestro ] [tipo esclavo ] TYPE_SPECIFIC_OPTIONS: "
-"ethernet: [mac ] [clonado-mac ] [mtu ] "
-"wifi: ssid [Mac ] [clonado-mac ] [mtu "
-"] [infraestructura de modo | ap | adhoc] wimax: [mac ] "
-"[nsp ] pppoe: nombre de usuario [contraseña ] [Servicio ] [mtu ] [Mac ] "
-"gsm: apn [usuario ] [contraseña ] cdma: [usuario "
-"] [contraseña ] infiniband: [mac ] [mtu "
-"] [datagrama en modo transporte | conectado] [padre ] [tecla p "
-"] bluetooth: [addr ] [bt-type panu | nap | "
-"dun-gsm | dun-cdma] vlan: dev carné de identidad [banderas ] [ingreso ] [egreso ] [mtu ] enlace: "
-"[modo balance-rr (0) | copia de seguridad activa (1) | balance-xor (2) | "
-"emisión (3) | 802.3ad (4) | balance-tlb (5) | balance-alb (6)] [primario "
-"] [miimon ] [downdelay ] [updelay ] [intervalo de arp "
-"] [arp-ip-target ] [lacp-rate slow (0) | rápido (1)] bond-slave: "
-"master equipo: [config |"
-"] equipo-esclavo: maestro [config |] puente: [stp yes | no] [prioridad "
-"] [retardo hacia adelante <2-30>] [hola tiempo <1-10>] [edad máxima "
-"<6-40>] [tiempo de envejecimiento <0-1000000>] [espionaje de multidifusión "
-"sí | no] [mac ] puente-esclavo: maestro [prioridad <0-63>] [costo de trayecto <1-65535>] "
-"[horquilla sí | no] vpn: vpn-type vpnc | openvpn | pptp | openconnect | "
-"openswan | libreswan | ssh | l2tp | iodine | ... [usuario ] olpc-"
-"mesh: ssid [canal <1-13>] [dhcp-anycast ] adsl: nombre de "
-"usuario protocolo pppoa | pppoe | ipoatm [contraseña ] "
-"[encapsulation vcmux | llc] tun: mode tun | tap [owner ] [grupo ] "
-"[pi sí | no] [vnet-hdr sí | no] [cola múltiple sí | no] ip-tunnel: modo ipip "
-"| gre | sit | isatap | vti | ip6ip6 | ipip6 | ip6gre | vti6 remote [local ] [dev ] macsec: dev modo [cak  ckn ] [cifrar sí | no] [puerto 1-65534] "
-"macvlan: dev mode vepa | "
-"bridge | private | passthru | source [toque sí | no] vxlan: id remoto [local ] [dev "
-"]\n"
+"Uso: nmcli connection add { ARGUMENTOS | help }\n"
+"\n"
+"ARGUMENTOS := OPCIONES_COMUNES OPCIONES_TIPO_ESPECIFICO OPCIONES_ESCLAVO "
+"OPCIONES_IP [-- ([+|-]. )+]\n"
+"\n"
+"  OPCIONES_COMUNES:\n"
+"                  type \n"
+"                  ifname  | \"*\"\n"
+"                  [con-name ]\n"
+"                  [autoconnect yes|no]\n"
+"                  [save yes|no]\n"
+"                  [master ]\n"
+"                  [slave-type ]\n"
+"\n"
+"  OPCIONES_TIPO_ESPECIFICO:\n"
+"    ethernet:     [mac ]\n"
+"                  [cloned-mac ]\n"
+"                  [mtu ]\n"
+"\n"
+"    wifi:         ssid \n"
+"                  [mac ]\n"
+"                  [cloned-mac ]\n"
+"                  [mtu ]\n"
+"                  [mode infrastructure|ap|adhoc]\n"
+"\n"
+"    wimax:        [mac ]\n"
+"                  [nsp ]\n"
+"\n"
+"    pppoe:        username \n"
+"                  [password ]\n"
+"                  [service ]\n"
+"                  [mtu ]\n"
+"                  [mac ]\n"
+"\n"
+"    gsm:          apn \n"
+"                  [user ]\n"
+"                  [password ]\n"
+"\n"
+"    cdma:         [user ]\n"
+"                  [password ]\n"
+"\n"
+"    infiniband:   [mac ]\n"
+"                  [mtu ]\n"
+"                  [transport-mode datagram | connected]\n"
+"                  [parent ]\n"
+"                  [p-key ]\n"
+"\n"
+"    bluetooth:    [addr ]\n"
+"                  [bt-type panu|nap|dun-gsm|dun-cdma]\n"
+"\n"
+"    vlan:         dev \n"
+"                  id \n"
+"                  [flags ]\n"
+"                  [ingress ]\n"
+"                  [egress ]\n"
+"                  [mtu ]\n"
+"\n"
+"    bond:         [mode balance-rr (0) | active-backup (1) | balance-xor (2) "
+"| broadcast (3) |\n"
+"                        802.3ad    (4) | balance-tlb   (5) | balance-alb "
+"(6)]\n"
+"                  [primary ]\n"
+"                  [miimon ]\n"
+"                  [downdelay ]\n"
+"                  [updelay ]\n"
+"                  [arp-interval ]\n"
+"                  [arp-ip-target ]\n"
+"                  [lacp-rate slow (0) | fast (1)]\n"
+"\n"
+"    bond-slave:   master \n"
+"\n"
+"    team:         [config |]\n"
+"\n"
+"    team-slave:   master \n"
+"                  [config |]\n"
+"\n"
+"    bridge:       [stp yes|no]\n"
+"                  [priority ]\n"
+"                  [forward-delay <2-30>]\n"
+"                  [hello-time <1-10>]\n"
+"                  [max-age <6-40>]\n"
+"                  [ageing-time <0-1000000>]\n"
+"                  [multicast-snooping yes|no]\n"
+"                  [mac ]\n"
+"\n"
+"    bridge-slave: master \n"
+"                  [priority <0-63>]\n"
+"                  [path-cost <1-65535>]\n"
+"                  [hairpin yes|no]\n"
+"\n"
+"    vpn:          vpn-type vpnc|openvpn|pptp|openconnect|openswan|libreswan|"
+"ssh|l2tp|iodine|...\n"
+"                  [user ]\n"
+"\n"
+"    olpc-mesh:    ssid \n"
+"                  [channel <1-13>]\n"
+"                  [dhcp-anycast ]\n"
+"\n"
+"    adsl:         username \n"
+"                  protocol pppoa|pppoe|ipoatm\n"
+"                  [password ]\n"
+"                  [encapsulation vcmux|llc]\n"
+"\n"
+"    tun:          mode tun|tap\n"
+"                  [owner ]\n"
+"                  [group ]\n"
+"                  [pi yes|no]\n"
+"                  [vnet-hdr yes|no]\n"
+"                  [multi-queue yes|no]\n"
+"\n"
+"    ip-tunnel:    mode ipip|gre|sit|isatap|vti|ip6ip6|ipip6|ip6gre|vti6\n"
+"                  remote \n"
+"                  [local ]\n"
+"                  [dev ]\n"
+"\n"
+"    macsec:       dev \n"
+"                  mode \n"
+"                  [cak  ckn ]\n"
+"                  [encrypt yes|no]\n"
+"                  [port 1-65534]\n"
+"\n"
+"\n"
+"    macvlan:      dev \n"
+"                  mode vepa|bridge|private|passthru|source\n"
+"                  [tap yes|no]\n"
+"\n"
+"    vxlan:        id \n"
+"                  remote \n"
+"                  [local ]\n"
+"                  [dev ]\n"
+"                  [source-port-min <0-65535>]\n"
+"                  [source-port-max <0-65535>]\n"
+"                  [destination-port <0-65535>]\n"
+"\n"
+"    wpan:         [short-addr <0x0000-0xffff>]\n"
+"                  [pan-id <0x0000-0xffff>]\n"
+"                  [page ]\n"
+"                  [channel ]\n"
+"                  [mac ]\n"
+"\n"
+"    6lowpan:      dev \n"
+"    dummy:\n"
+"\n"
+"  OPCIONES_ESCLAVO:\n"
+"    bridge:       [priority <0-63>]\n"
+"                  [path-cost <1-65535>]\n"
+"                  [hairpin yes|no]\n"
+"\n"
+"    team:         [config |]\n"
+"\n"
+"  OPCIONES_IP:\n"
+"                  [ip4 ] [gw4 ]\n"
+"                  [ip6 ] [gw6 ]\n"
 "\n"
 
 #: ../clients/cli/connections.c:1068
@@ -682,18 +827,19 @@ msgid ""
 "nmcli con mod bond0 -bond.options downdelay\n"
 "\n"
 msgstr ""
-"Uso: nmcli connection modify { ARGUMENTS | help }\n"
+"Uso: nmcli connection modify { ARGUMENTOS | help }\n"
 "\n"
-"ARGUMENTOS := [id | uuid | path]  ([+|-]. )+\n"
+"ARGUMENTOS := [id | uuid | path]  ([+|-]. "
+")+\n"
 "\n"
 "Modifique una o más propiedades del perfil de conexiones.\n"
-"El perfil es identificado por el nombre, UUID o ruta D-Bus. Para propiedades "
-"con múltiples valores puede utilizar el prefijo opcional '+' o '-' al nombre "
-"de propiedad.\n"
-"El signo '+' le permite agregar ítemes en lugar de sobrescribir el valor "
-"total.\n"
-"El signo '-' le permite retirar los ítemes seleccionados en lugar del valor "
+"El perfil se identifica por su nombre, UUID o ruta D-Bus. Para propiedades\n"
+"con múltiples valores puede utilizar el prefijo opcional «+» o «-» en el\n"
+"nombre de propiedad.\n"
+"El signo «+» le permite agregar elementos en lugar de sobrescribir el valor "
 "total.\n"
+"El signo «-» le permite quitar los elementos seleccionados en lugar del "
+"valor total.\n"
 "\n"
 "Ejemplos:\n"
 "nmcli con mod home-wifi wifi.ssid rakosnicek\n"
@@ -719,13 +865,13 @@ msgid ""
 "id (provided as  argument).\n"
 "\n"
 msgstr ""
-"Uso: nmcli connection clone { ARGUMENTS | help }\n"
+"Uso: nmcli connection clone { ARGUMENTOS | help }\n"
 "\n"
-"ARGUMENTOS := [--temporary] [id | uuid | path]  \n"
+"ARGUMENTOS := [--temporary] [id | uuid | path]  \n"
 "\n"
-"Clone un perfil de conexión existente. La conexión recién creada será \n"
-"la copia exacta de , excepto la propiedad de uuid (será generada) y el "
-"ID (provisto como argumento ).\n"
+"Clona un perfil de conexión existente. La conexión recién creada será la\n"
+"copia exacta del , excepto la propiedad uuid (que será generada) y el\n"
+"ID (provisto como argumento de ).\n"
 "\n"
 
 #: ../clients/cli/connections.c:1103
@@ -743,16 +889,17 @@ msgid ""
 "Add a new connection profile in an interactive editor.\n"
 "\n"
 msgstr ""
-"Uso: nmcli connection edit { ARGUMENTS | help }\n"
+"Uso: nmcli connection edit { ARGUMENTOS | help }\n"
 "\n"
 "ARGUMENTOS := [id | uuid | path] \n"
 "\n"
-"Modificar un perfil de conexión existente en un editor interactivo.\n"
+"Modifica un perfil de conexión existente en un editor interactivo.\n"
 "El perfil es identificado por su nombre, UUID o ruta D-Bus\n"
 "\n"
-"ARGUMENTOS := [type ] [con-name ]\n"
+"ARGUMENTOS := [type ] [con-name ]\n"
 "\n"
-"Añadir un nuevo perfil de conexión en un editor interactivo.\n"
+"Añade un nuevo perfil de conexión en un editor interactivo.\n"
 "\n"
 
 #: ../clients/cli/connections.c:1118
@@ -766,12 +913,12 @@ msgid ""
 "The profile is identified by its name, UUID or D-Bus path.\n"
 "\n"
 msgstr ""
-"Uso: nmcli connection delete { ARGUMENTS | help }\n"
+"Uso: nmcli connection delete { ARGUMENTOS | help }\n"
 "\n"
 "ARGUMENTOS := [id | uuid | path] \n"
 "\n"
-"Borrar un perfil de conexión.\n"
-"El perfil es identificado por su nombre, UUID o ruta  D-Bus.\n"
+"Borra un perfil de conexión.\n"
+"El perfil es identificado por su nombre, UUID o ruta D-Bus.\n"
 "\n"
 
 #: ../clients/cli/connections.c:1129
@@ -786,11 +933,11 @@ msgid ""
 "Monitors all connection profiles in case none is specified.\n"
 "\n"
 msgstr ""
-"Uso: nmcli connection monitor { ARGUMENTS | help }\n"
+"Uso: nmcli connection monitor { ARGUMENTOS | help }\n"
 "\n"
 "ARGUMENTOS := [id | uuid | path]  ...\n"
 "\n"
-"Monitorizar la actividad del perfil de conexiones.\n"
+"Monitoriza la actividad del perfil de conexiones.\n"
 "Este comando imprime una línea cada vez que cambia la conexión "
 "especificada.\n"
 "Monitoriza todos los perfiles de conexiones en caso de que no se especifique "
@@ -807,7 +954,7 @@ msgid ""
 msgstr ""
 "Uso: nmcli connection reload { help }\n"
 "\n"
-"Recargar todos los archivos de conexión desde el disco.\n"
+"Recarga todos los archivos de conexión desde el disco.\n"
 "\n"
 
 #: ../clients/cli/connections.c:1149
@@ -823,14 +970,13 @@ msgid ""
 "state.\n"
 "\n"
 msgstr ""
-"Uso: nmcli connection load { ARGUMENTS | help }\n"
+"Uso: nmcli connection load { ARGUMENTOS | help }\n"
 "\n"
-"ARGUMENTOS :=  [...]\n"
+"ARGUMENTOS :=  [...]\n"
 "\n"
-"Cargar o Recargar uno o más archivos de conexión del disco. Úselo después de "
-"modificar de forma manual \n"
-"un archivo de conexión para garantizar que NetworkManager está al tanto del "
-"estado más reciente.\n"
+"Carga o recarga uno o más archivos de conexión del disco. Úselo después de\n"
+"modificar de forma manual un archivo de conexión para garantizar que\n"
+"NetworkManager está al tanto del estado más reciente.\n"
 "\n"
 
 #: ../clients/cli/connections.c:1161
@@ -847,15 +993,16 @@ msgid ""
 "is imported by NetworkManager VPN plugins.\n"
 "\n"
 msgstr ""
-"Uso: nmcli connection import { ARGUMENTS | help }\n"
+"Uso: nmcli connection import { ARGUMENTOS | help }\n"
 "\n"
-"ARGUMENTOS := [--temporary] type  file \n"
+"ARGUMENTOS := [--temporary] type  file \n"
 "\n"
-"Importa una configuración externa o foránea como el perfil de conexiones "
-"NetworkManager.\n"
-"El tipo de la salida es especificada por la opción type.\n"
+"Importa una configuración externa o extranjera como un perfil de conexiones "
+"de NetworkManager.\n"
+"El tipo de archivo de entrada es especificado por la opción type.\n"
 "Únicamente las configuraciones VPN son compatibles en este momento. La "
-"configuración es importada por los complementos VPN de NetworkManager.\n"
+"configuración\n"
+"es importada por los complementos VPN de NetworkManager.\n"
 "\n"
 
 #: ../clients/cli/connections.c:1174
@@ -869,11 +1016,11 @@ msgid ""
 "The data are directed to standard output or to a file if a name is given.\n"
 "\n"
 msgstr ""
-"Uso: nmcli connection export { ARGUMENTS | help }\n"
+"Uso: nmcli connection export { ARGUMENTOS | help }\n"
 "\n"
-"ARGUMENTOS := [id | uuid | path]  []\n"
+"ARGUMENTOS := [id | uuid | path]  []\n"
 "\n"
-"Exporta una conexión. Únicamente las conexiones VPN reciben soporte en el "
+"Exporta una conexión. Únicamente las conexiones VPN reciben soporte por el "
 "momento.\n"
 "Los datos se dirigen a la salida estándar o a un archivo si se da un "
 "nombre.\n"
@@ -882,22 +1029,21 @@ msgstr ""
 #: ../clients/cli/connections.c:1264
 #, c-format
 msgid "Error updating secrets for %s: %s\n"
-msgstr "Error al actualizar secretos para %s: %s \n"
+msgstr "Error al actualizar secretos para %s: %s\n"
 
 #: ../clients/cli/connections.c:1307
 msgid "Connection profile details"
-msgstr "Detalles de perfil de conexiones"
+msgstr "Detalles del perfil de conexiones"
 
 #: ../clients/cli/connections.c:1320 ../clients/cli/connections.c:1405
 #, c-format
 msgid "Error: 'connection show': %s"
-msgstr "Error: 'connection show': %s"
+msgstr "Error: «connection show»: %s"
 
 # auto translated by TM merge from project: NetworkManager, version: 0.9.8.2, DocId: NetworkManager
 #: ../clients/cli/connections.c:1395
-#, fuzzy
 msgid "Activate connection details"
-msgstr "Activar detalles de la conexión"
+msgstr "Activar detalles de conexión"
 
 #: ../clients/cli/connections.c:1503 ../clients/cli/devices.c:1453
 #: ../clients/cli/devices.c:1467 ../clients/cli/devices.c:1482
@@ -908,40 +1054,40 @@ msgstr "NOMBRE"
 #: ../clients/cli/connections.c:1591
 #, c-format
 msgid "invalid field '%s'; allowed fields: %s and %s, or %s,%s"
-msgstr "Campo inválido '%s'; campos permitidos: %s and %s, or %s,%s"
+msgstr "campo «%s» no válido; campos permitidos: %s y %s, o %s,%s"
 
 #: ../clients/cli/connections.c:1606 ../clients/cli/connections.c:1614
-#, fuzzy, c-format
+#, c-format
 msgid "'%s' has to be alone"
-msgstr "el campo «%s» tiene que estar solo"
+msgstr "«%s» tiene que estar solo"
 
 #: ../clients/cli/connections.c:1876
 #, c-format
 msgid "incorrect string '%s' of '--order' option"
-msgstr "cadena incorrecta '%s' de la opción '--order'"
+msgstr "cadena incorrecta «%s» de la opción «--order»"
 
 #: ../clients/cli/connections.c:1901
 #, c-format
 msgid "incorrect item '%s' in '--order' option"
-msgstr "ítem incorrecto '%s' en la opción '--order'"
+msgstr "elemento incorrecto «%s» en la opción «--order»"
 
 #: ../clients/cli/connections.c:1939
 msgid "No connection specified"
-msgstr "Sin conexión especificada"
+msgstr "No se especificó ninguna conexión"
 
 #: ../clients/cli/connections.c:1950
 #, c-format
 msgid "%s argument is missing"
-msgstr "%s falta el argumento"
+msgstr "Falta el argumento %s"
 
 #: ../clients/cli/connections.c:1968
 #, c-format
 msgid "unknown connection '%s'"
-msgstr "conexión desconocida%s'"
+msgstr "conexión «%s» desconocida"
 
 #: ../clients/cli/connections.c:1997
 msgid "'--order' argument is missing"
-msgstr "Falta el argumento '--order'"
+msgstr "Falta el argumento «--order»"
 
 #: ../clients/cli/connections.c:2057
 msgid "NetworkManager active profiles"
@@ -949,7 +1095,7 @@ msgstr "Perfiles activos de NetworkManager"
 
 #: ../clients/cli/connections.c:2058
 msgid "NetworkManager connection profiles"
-msgstr "Perfiles de conexiones NetworkManager "
+msgstr "Perfiles de conexiones de NetworkManager"
 
 #: ../clients/cli/connections.c:2110 ../clients/cli/connections.c:2856
 #: ../clients/cli/connections.c:2868 ../clients/cli/connections.c:2880
@@ -969,9 +1115,9 @@ msgid "Error: %s argument is missing."
 msgstr "Error: falta el argumento %s."
 
 #: ../clients/cli/connections.c:2138
-#, fuzzy, c-format
+#, c-format
 msgid "Error: %s - no such connection profile."
-msgstr "Error: %s - no hay tal conexión."
+msgstr "Error: %s - no existe dicho perfil de conexión."
 
 #: ../clients/cli/connections.c:2229 ../clients/cli/connections.c:2843
 #: ../clients/cli/connections.c:2907 ../clients/cli/connections.c:8419
@@ -994,36 +1140,32 @@ msgid "no active connection or device"
 msgstr "conexión o dispositivo no activo"
 
 #: ../clients/cli/connections.c:2350
-#, fuzzy, c-format
+#, c-format
 msgid "device '%s' not compatible with connection '%s': "
-msgstr "dispositivo «%s» incompatible con conexión «%s»"
+msgstr "el dispositivo «%s» no es compatible con la conexión «%s»: "
 
 #: ../clients/cli/connections.c:2383
 #, c-format
 msgid "device '%s' not compatible with connection '%s'"
-msgstr "dispositivo «%s» incompatible con conexión «%s»"
+msgstr "el dispositivo «%s» es incompatible con conexión «%s»"
 
 #: ../clients/cli/connections.c:2386
 #, c-format
 msgid "no device found for connection '%s'"
 msgstr "no se encontró dispositivo para conexión «%s»"
 
-#: ../clients/cli/connections.c:2437
-#, c-format
-msgid "Hint: use '%s' to get more details."
-msgstr ""
-
 #: ../clients/cli/connections.c:2455
 #, c-format
 msgid "Connection successfully activated (%s) (D-Bus active path: %s)\n"
-msgstr "Conexión activada con éxito (%s) (D-Bus ruta activa: %s)\n"
+msgstr ""
+"La conexión se ha activado correctamente (%s) (ruta activa D-Bus: %s)\n"
 
 # auto translated by TM merge from project: NetworkManager, version: 0.9.8.2, DocId: NetworkManager
 #: ../clients/cli/connections.c:2459 ../clients/cli/connections.c:2609
 #: ../clients/cli/connections.c:6716
 #, c-format
 msgid "Connection successfully activated (D-Bus active path: %s)\n"
-msgstr "Conexión activada con éxito (D-Bus active path: %s)\n"
+msgstr "Conexión activada con éxito (ruta activa D-Bus: %s)\n"
 
 #: ../clients/cli/connections.c:2466 ../clients/cli/connections.c:2588
 #, c-format
@@ -1033,36 +1175,36 @@ msgstr "Error: falló la activación de la conexión: %s"
 #: ../clients/cli/connections.c:2503
 #, c-format
 msgid "Error: Timeout expired (%d seconds)"
-msgstr "Error: el tiempo de espera expiró (%d segundos)"
+msgstr "Error: tiempo de espera agotado (%d segundos)"
 
 #: ../clients/cli/connections.c:2671
 #, c-format
 msgid "failed to read passwd-file '%s': %s"
-msgstr "Error: No se pudo leer passwd-file '%s': %s"
+msgstr "no se pudo leer passwd-file «%s»: %s"
 
 #: ../clients/cli/connections.c:2684
 #, c-format
 msgid "missing colon in 'password' entry '%s'"
-msgstr "Faltan los dos puntos en la entrada 'password' '%s' "
+msgstr "Faltan los dos puntos en la entrada «password» «%s»"
 
 #: ../clients/cli/connections.c:2692
 #, c-format
 msgid "missing dot in 'password' entry '%s'"
-msgstr "Falta el punto en la entrada 'password' '%s' "
+msgstr "Falta un punto en la entrada «password» «%s»"
 
 #: ../clients/cli/connections.c:2705
 #, c-format
 msgid "invalid setting name in 'password' entry '%s'"
-msgstr "El nombre de parámetro en la entrada 'password' '%s' no es válido "
+msgstr "el nombre de opción en la entrada «password» «%s» no es válido"
 
 #: ../clients/cli/connections.c:2759
 #, c-format
 msgid "unknown device '%s'."
-msgstr "Dispositivo desconocido '%s'."
+msgstr "dispositivo desconocido «%s»."
 
 #: ../clients/cli/connections.c:2764
 msgid "neither a valid connection nor device given"
-msgstr "Ni es una conexión válida ni es un dispositivo determinado."
+msgstr "no es ni una conexión válida ni un dispositivo determinado"
 
 #: ../clients/cli/connections.c:2890 ../clients/cli/devices.c:1686
 #: ../clients/cli/devices.c:3033 ../clients/cli/devices.c:3296
@@ -1074,19 +1216,18 @@ msgstr "Parámetro desconocido: %s\n"
 # auto translated by TM merge from project: gtk3, version: 3.8.2, DocId: gtk30
 #: ../clients/cli/connections.c:2915
 msgid "preparing"
-msgstr "Preparando"
+msgstr "preparando"
 
 #: ../clients/cli/connections.c:3024
 #, c-format
 msgid "Connection '%s' (%s) successfully deleted.\n"
-msgstr "Conexión '%s' (%s) borrada correctamente.\n"
+msgstr "La conexión «%s» (%s) se ha borrado correctamente.\n"
 
 # auto translated by TM merge from project: NetworkManager, version: 0.9.8.2, DocId: NetworkManager
 #: ../clients/cli/connections.c:3040
 #, c-format
 msgid "Connection '%s' successfully deactivated (D-Bus active path: %s)\n"
-msgstr ""
-"La conexión '%s' fue desactivada correctamente (ruta activa D-Bus: %s)\n"
+msgstr "La conexión «%s» se desactivó correctamente (ruta activa D-Bus: %s)\n"
 
 #: ../clients/cli/connections.c:3091 ../clients/cli/connections.c:8633
 #: ../clients/cli/connections.c:8664 ../clients/cli/connections.c:8822
@@ -1098,9 +1239,7 @@ msgstr "Error: no se especificó una conexión."
 #: ../clients/cli/connections.c:3121
 #, c-format
 msgid "Error: '%s' is not an active connection.\n"
-msgstr ""
-"Error: '%s' no se una conexión activa. .\n"
-"\n"
+msgstr "Error: «%s» no es una conexión activa.\n"
 
 # auto translated by TM merge from project: NetworkManager, version: 0.9.8.2, DocId: NetworkManager
 #: ../clients/cli/connections.c:3122
@@ -1114,15 +1253,15 @@ msgid "Error: no active connection provided."
 msgstr "Error: no se proporcionó una conexión activa."
 
 #: ../clients/cli/connections.c:3161
-#, fuzzy, c-format
+#, c-format
 msgid "Connection '%s' deactivation failed: %s\n"
-msgstr "Error: falló la activación de la conexión: %s"
+msgstr "No se pudo desactivar la conexión «%s»: %s\n"
 
 #: ../clients/cli/connections.c:3412 ../clients/cli/connections.c:3469
 #: ../clients/common/nm-client-utils.c:221
 #, c-format
 msgid "'%s' not among [%s]"
-msgstr "'%s' no está entre [%s]"
+msgstr "«%s» no está entre [%s]"
 
 # auto translated by TM merge from project: evolution-mapi, version: el6, DocId: evolution-mapi
 #. We should not really come here
@@ -1135,97 +1274,97 @@ msgstr "Error desconocido"
 #: ../clients/cli/connections.c:3626
 #, c-format
 msgid "Warning: master='%s' doesn't refer to any existing profile.\n"
-msgstr "Advertencia: maestro='%s' no se refiere a ningún perfil existente.\n"
+msgstr ""
+"Advertencia: El maestro=«%s» no se refiere a ningún perfil existente.\n"
 
 #: ../clients/cli/connections.c:3979
 #, c-format
 msgid "Error: invalid property '%s': %s."
-msgstr "Error: propiedad inválida '%s': %s."
+msgstr "Error: propiedad «%s» no válida: %s."
 
 #: ../clients/cli/connections.c:3996
 #, c-format
 msgid "Error: failed to modify %s.%s: %s."
-msgstr "Error: No se pudo modificar %s.%s: %s."
+msgstr "Error: no se pudo modificar %s.%s: %s."
 
 #: ../clients/cli/connections.c:4016
 #, c-format
 msgid "Error: failed to remove a value from %s.%s: %s."
-msgstr "Error: No se pudo retirar el valor de  %s.%s: %s."
+msgstr "Error: no se pudo quitar el valor de %s.%s: %s."
 
 #: ../clients/cli/connections.c:4050
-#, fuzzy, c-format
+#, c-format
 msgid "Error: '%s' is mandatory."
-msgstr "Error: '%s' parámetro no está presente\n"
+msgstr "Error: «%s» es obligatorio."
 
 #: ../clients/cli/connections.c:4077
-#, fuzzy, c-format
+#, c-format
 msgid "Error: invalid slave type; %s."
-msgstr "Error: tipo de conexión inválido; %s."
+msgstr "Error: tipo de esclavo no válido; %s."
 
 #: ../clients/cli/connections.c:4085
 #, c-format
 msgid "Error: invalid connection type; %s."
-msgstr "Error: tipo de conexión inválido; %s."
+msgstr "Error: tipo de conexión no válido; %s."
 
 #: ../clients/cli/connections.c:4162
-#, fuzzy, c-format
+#, c-format
 msgid "Error: bad connection type: %s"
-msgstr "Error: tipo de conexión inválido; %s."
+msgstr "Error: tipo de conexión incorrecto: %s"
 
 #: ../clients/cli/connections.c:4208
 #, c-format
 msgid "Error: '%s': %s"
-msgstr "Error: '%s': %s"
+msgstr "Error: «%s»: %s"
 
 #: ../clients/cli/connections.c:4229
-#, fuzzy
 msgid "Error: master is required"
-msgstr "Error: se requiere 'master'."
+msgstr "Error: se necesita maestro"
 
 #: ../clients/cli/connections.c:4288
-#, fuzzy, c-format
+#, c-format
 msgid "Error: error adding bond option '%s=%s'."
-msgstr "Error: Conexión desconocida '%s'."
+msgstr "Error: error añadiendo la opción de enlace «%s=%s»."
 
 #: ../clients/cli/connections.c:4319
 #, c-format
 msgid "Error: '%s' is not a valid monitoring mode; use '%s' or '%s'.\n"
 msgstr ""
-"Error: '%s' modo de monitorización no es válido; utilice '%s' o '%s'.\n"
+"Error: «%s» no es un modo de monitorización válido; utilice «%s» o «%s».\n"
 
 #: ../clients/cli/connections.c:4350
 #, c-format
 msgid "Error: 'bt-type': '%s' not valid; use [%s, %s, %s (%s), %s]."
-msgstr "Error: 'bt-type': '%s' no es válido; utilizar [%s, %s, %s (%s), %s]."
+msgstr "Error: «bt-type»: «%s» no válido; use [%s, %s, %s (%s), %s]."
 
 #: ../clients/cli/connections.c:4599
 #, c-format
 msgid "Error: value for '%s' is missing."
-msgstr "Error: falta el valor para '%s'."
+msgstr "Error: falta el valor para «%s»."
 
 #: ../clients/cli/connections.c:4645
 msgid "Error: . argument is missing."
-msgstr "Error: . falta el argumento."
+msgstr "Error: falta el argumento .."
 
 #: ../clients/cli/connections.c:4668
 #, c-format
 msgid "Error: invalid or not allowed setting '%s': %s."
-msgstr "Error: parámetro inválido o no permitido '%s': %s."
+msgstr "Error: parámetro no válido o no permitido «%s»: %s."
 
 #: ../clients/cli/connections.c:4714 ../clients/cli/connections.c:4730
-#, fuzzy, c-format
+#, c-format
 msgid "Error: '%s' is ambiguous (%s.%s or %s.%s)."
-msgstr "'%s' es ambiguo (%s x %s)"
+msgstr "Error: «%s» es ambiguo (%s.%s o %s.%s)."
 
 #: ../clients/cli/connections.c:4748
 #, c-format
 msgid "Error: invalid . '%s'."
-msgstr "Error: inválido . '%s'."
+msgstr "Error: . «%s» no válido."
 
 #: ../clients/cli/connections.c:4792 ../clients/cli/connections.c:8465
 #, c-format
 msgid "Error: Failed to add '%s' connection: %s"
-msgstr "Error: No se pudo agregar conexión'%s': %s"
+msgstr "Error: no se pudo agregar la conexión «%s»: %s"
 
 #: ../clients/cli/connections.c:4810
 #, c-format
@@ -1236,16 +1375,16 @@ msgid_plural ""
 "Warning: There are %3$u other connections with the name '%1$s'. Reference "
 "the connection by its uuid '%2$s'\n"
 msgstr[0] ""
-"Advertencia: hay otra conexión con el nombre '%1$s'. Referencia la conexión "
-"por su uuid '%2$s'\n"
+"Aviso: hay otra conexión con el nombre «%1$s». Haga referencia a la conexión "
+"por su uuid «%2$s»\n"
 msgstr[1] ""
-"Advertencia: hay %3$u otras conexiones con el nombre '%1$s'. Referencia la "
-"conexión por su uuid '%2$s'\n"
+"Aviso: hay otras %3$u conexiones con el nombre «%1$s». Haga referencia a la "
+"conexión por su uuid «%2$s»\n"
 
 #: ../clients/cli/connections.c:4819
 #, c-format
 msgid "Connection '%s' (%s) successfully added.\n"
-msgstr "Conexión '%s' (%s) agregada con éxito.\n"
+msgstr "Conexión «%s» (%s) añadida con éxito.\n"
 
 #: ../clients/cli/connections.c:4872 ../clients/cli/connections.c:6839
 #: ../clients/cli/connections.c:6840 ../clients/cli/devices.c:535
@@ -1272,43 +1411,43 @@ msgstr "sí"
 msgid ""
 "You can specify this option more than once. Press  when you're done.\n"
 msgstr ""
-"Puede especificar esta opción más de una vez. prensa  cuando "
-"termines.\n"
+"Puede especificar esta opción más de una vez. Presione  cuando haya "
+"terminado.\n"
 
 #. Ask for optional arguments.
 #: ../clients/cli/connections.c:5061
-#, fuzzy, c-format
+#, c-format
 msgid "There is %d optional setting for %s.\n"
 msgid_plural "There are %d optional settings for %s.\n"
-msgstr[0] "Hay 1 argumento opcional para tipo de conexión '%s'\n"
-msgstr[1] "Hay 1 argumento opcional para tipo de conexión '%s'\n"
+msgstr[0] "Hay %d configuración opcional para %s.\n"
+msgstr[1] "Hay %d configuraciones opcionales para %s.\n"
 
 #: ../clients/cli/connections.c:5067
 #, c-format
 msgid "Do you want to provide it? %s"
 msgid_plural "Do you want to provide them? %s"
-msgstr[0] "¿Desea proporcionarlo? %s"
-msgstr[1] "¿Desea proporcionarlos? %s"
+msgstr[0] "¿Quiere proporcionarla? %s"
+msgstr[1] "¿Quiere proporcionarlas? %s"
 
 #: ../clients/cli/connections.c:5200 ../clients/cli/utils.c:295
 #, c-format
 msgid "Error: value for '%s' argument is required."
-msgstr "Error: se requiere valor para argumento '%s'."
+msgstr "Error: se necesita un valor para el argumento «%s»."
 
 #: ../clients/cli/connections.c:5207
 #, c-format
 msgid "Error: 'save': %s."
-msgstr "Error: 'save': %s."
+msgstr "Error: «save»: %s."
 
 #: ../clients/cli/connections.c:5293 ../clients/cli/connections.c:5304
-#, fuzzy, c-format
+#, c-format
 msgid "Error: '%s' argument is required."
-msgstr "Error: se requiere argumento 'type'."
+msgstr "Error: se necesita el argumento «%s»."
 
 #: ../clients/cli/connections.c:6269
 #, c-format
 msgid "['%s' setting values]\n"
-msgstr "['%s' setting values]\n"
+msgstr "[«%s» valores de parámetro]\n"
 
 #. TRANSLATORS: do not translate command names and keywords before ::
 #. *              However, you should translate terms enclosed in <>.
@@ -1332,19 +1471,19 @@ msgid ""
 "quit                                 :: exit nmcli\n"
 msgstr ""
 "---[ Menú principal ]---\n"
-"goto     [ | ]        :: ir a parámetro o propiedad\n"
-"remove   [.] |  :: retirar parámetro o restablecer "
+"goto     [ | ]         :: ir a parámetro o propiedad\n"
+"remove   [.] |   :: retirar parámetro o restablecer "
 "valor de propiedad\n"
-"set      [. ]  :: establecer valor de propiedad\n"
-"describe [.]          :: describir propiedad\n"
-"print    [all | [.]]  :: imprimir la conexión\n"
-"verify   [all | fix]                 :: verificar la conexión\n"
-"save     [persistent|temporary]      :: guardar la conexión\n"
-"activate [] [/|]    :: activar la conexión\n"
-"back                                 :: ir a un nivel superior (back)\n"
-"help/?   []                 :: imprimir esta ayuda\n"
-"nmcli            :: configuración nmcli \n"
-"quit                                 :: salir de nmcli\n"
+"set      [. ]   :: establecer valor de propiedad\n"
+"describe [.]           :: describir propiedad\n"
+"print    [all | [.]]   :: imprimir la conexión\n"
+"verify   [all | fix]                    :: verificar la conexión\n"
+"save     [persistent|temporary]         :: guardar la conexión\n"
+"activate [] [/|]       :: activar la conexión\n"
+"back                                    :: ir a un nivel superior (atrás)\n"
+"help/?   []                    :: imprimir esta ayuda\n"
+"nmcli               :: configuración nmcli \n"
+"quit                                    :: salir de nmcli\n"
 
 #: ../clients/cli/connections.c:6405
 #, c-format
@@ -1357,10 +1496,10 @@ msgid ""
 "          nmcli connection> goto secondaries\n"
 "          nmcli> goto ipv4.addresses\n"
 msgstr ""
-"goto [.] |   :: ingresar parámetro o propiedad para "
+"goto [.] |   :: ingresar parámetro o propiedad para "
 "modificar\n"
 "\n"
-"Este comando ingresa un parámetro o propiedad para modificarlo.\n"
+"Este comando ingresa en un parámetro o propiedad para modificarlo.\n"
 "\n"
 "Ejemplos: nmcli> goto connection\n"
 "          nmcli connection> goto secondaries\n"
@@ -1378,12 +1517,12 @@ msgid ""
 "Examples: nmcli> remove wifi-sec\n"
 "          nmcli> remove eth.mtu\n"
 msgstr ""
-"remove [.]  :: retirar parámetro o restablecer valor de "
+"remove [.]  :: quitar parámetro o restablecer valor de la "
 "propiedad\n"
 "\n"
-"Este comando retira una configuración completa de la conexión o si se ha "
-"proporcionado una propiedad\n"
-"se restablece dicha propiedad al valor predeterminado.\n"
+"Este comando retira un ajuste completo de la conexión o si se ha\n"
+"proporcionado una propiedad, restablece dicha propiedad al valor "
+"predeterminado.\n"
 "\n"
 "Ejemplos: nmcli> remove wifi-sec\n"
 "          nmcli> remove eth.mtu\n"
@@ -1397,7 +1536,7 @@ msgid ""
 "\n"
 "Example: nmcli> set con.id My connection\n"
 msgstr ""
-"set [. ]  :: establecer el valor de propiedad\n"
+"set [. ]  :: establecer el valor de propiedad\n"
 "\n"
 "Este comando establece el valor de la propiedad.\n"
 "\n"
@@ -1411,10 +1550,10 @@ msgid ""
 "Shows property description. You can consult nm-settings(5) manual page to "
 "see all NM settings and properties.\n"
 msgstr ""
-"describe [.]  :: describir propiedad\n"
+"describe [.]  :: describe una propiedad\n"
 "\n"
 "Muestra la descripción de la propiedad. Puede consultar la página de manual "
-"nm-settings(5) para ver todos los parámetros y propiedades NM.\n"
+"nm-settings(5) para ver todos los ajustes y propiedades de NM.\n"
 
 #: ../clients/cli/connections.c:6429
 #, c-format
@@ -1445,15 +1584,15 @@ msgid ""
 "          nmcli> verify fix\n"
 "          nmcli bond> verify\n"
 msgstr ""
-"verify [all]  :: verifica parámetros o validez de conexión\n"
+"verify [all | fix]  :: verifica parámetros o la validez de conexión\n"
 "\n"
-"Verifica si los parámetros o la conexión son válidos y si pueden guardarse "
-"más adelante. Indica valores inválidos en error. Algunos errores pueden "
-"corregirse de forma automática.\n"
+"Verifica si los parámetros o la conexión son válidos y si pueden guardarse\n"
+"más adelante. Indica valores no válidos en un error. Algunos errores pueden\n"
+"corregirse de forma automática con la opción «fix».\n"
 "\n"
 "Ejemplos: nmcli> verify\n"
-"           nmcli> verify fix        \n"
-"           nmcli bond> verify          \n"
+"          nmcli> verify fix        \n"
+"          nmcli bond> verify\n"
 
 #: ../clients/cli/connections.c:6443
 #, c-format
@@ -1470,17 +1609,19 @@ msgid ""
 "connection\n"
 "profile must be deleted.\n"
 msgstr ""
-"save [persistent|temporary]  :: save the connection\n"
+"save [persistent|temporary]  :: guarda la conexión\n"
 "\n"
-"Envía el perfil de conexión a NetworkManager que lo guardará de forma "
-"persistente o lo mantendrá en memoria. 'save' sin un argumento significa\n"
-"'save persistent'.\n"
-"Observe que una vez que haya guardado el perfil de forma persistente dichos "
-"parámetros se guardan a través del reinicio o rearranque. Los cambios "
-"subsiguientes pueden también ser temporales o persistentes,  pero los "
-"cambios temporales no serán persistentes a través del reinicio arranque. Si "
-"desea retirar completamente la conexión persistente, el perfil de conexión "
-"debe ser borrado.\n"
+"Envía el perfil de conexión a NetworkManager que lo guardará de forma\n"
+"persistente o lo mantendrá en memoria. «save» sin un argumento significa\n"
+"«save persistent».\n"
+"Observe que una vez que haya guardado el perfil de forma persistente dichos\n"
+"parámetros se mantienen después del reinicio o rearranque. Los cambios\n"
+"subsiguientes pueden ser también temporales o persistentes,  pero los "
+"cambios\n"
+"temporales no serán persistentes después del reinicio o rearranque. Si "
+"desea\n"
+"retirar completamente la conexión persistente, se debe borrar el perfil de\n"
+"conexión.\n"
 
 #: ../clients/cli/connections.c:6454
 #, c-format
@@ -1499,9 +1640,9 @@ msgstr ""
 "Activa la conexión.\n"
 "\n"
 "Opciones disponibles:\n"
-"    - device the connection will be activated on\n"
-"/| - AP (Wi-Fi) or NSP (WiMAX) (prepend with / when  is not "
-"specified)\n"
+"    - dispositivo en el cual se activará la conexión\n"
+"/| - AP (WiFi) o NSP (WiMAX) (anteponer con / cuando  no "
+"está especificado)\n"
 
 #: ../clients/cli/connections.c:6461 ../clients/cli/connections.c:6619
 #, c-format
@@ -1509,7 +1650,7 @@ msgid ""
 "back  :: go to upper menu level\n"
 "\n"
 msgstr ""
-"back  :: va a un nivel superior del menú\n"
+"back  :: ir a un nivel superior del menú\n"
 "\n"
 
 #: ../clients/cli/connections.c:6464
@@ -1518,7 +1659,7 @@ msgid ""
 "help/? []  :: help for the nmcli commands\n"
 "\n"
 msgstr ""
-"help/? []  :: ayuda para los comandos nmcli\n"
+"help/? []  :: ayuda para los comandos de nmcli\n"
 "\n"
 
 #: ../clients/cli/connections.c:6467
@@ -1536,15 +1677,15 @@ msgid ""
 "          nmcli> nmcli save-confirmation no\n"
 "          nmcli> nmcli prompt-color 3\n"
 msgstr ""
-"nmcli [ ]  :: configuración nmcli \n"
+"nmcli [ ]  :: configuración de nmcli \n"
 "\n"
 "Configura nmcli. Las siguientes opciones están disponibles:\n"
-"status-line yes | no          [default: no]\n"
-"save-confirmation yes | no    [default: yes]\n"
-"show-secrets yes | no         [default: no]\n"
-"prompt-color  | <0-8>  [default: 0]\n"
+"status-line yes | no          [predeterminado: no]\n"
+"save-confirmation yes | no    [predeterminado: yes]\n"
+"show-secrets yes | no         [predeterminado: no]\n"
+"prompt-color  | <0-8>  [predeterminado: 0]\n"
 "%s\n"
-"Examples: nmcli> nmcli status-line yes\n"
+"Ejemplos: nmcli> nmcli status-line yes\n"
 "          nmcli> nmcli save-confirmation no\n"
 "          nmcli> nmcli prompt-color 3\n"
 
@@ -1558,14 +1699,14 @@ msgid ""
 msgstr ""
 "quit  :: sale de nmcli\n"
 "\n"
-"Este comando sale de nmcli. Cuando la conexión es editada no se guarda, se "
-"le pide al usuario que confirme la acción.\n"
+"Este comando sale de nmcli. Cuando la conexión editada no se guarda, se le "
+"pide al usuario que confirme la acción.\n"
 
 #: ../clients/cli/connections.c:6494 ../clients/cli/connections.c:6630
 #: ../clients/cli/connections.c:7065 ../clients/cli/connections.c:8048
 #, c-format
 msgid "Unknown command: '%s'\n"
-msgstr "Comando desconocido: '%s'\n"
+msgstr "Comando desconocido: «%s»\n"
 
 #. TRANSLATORS: do not translate command names and keywords before ::
 #. *              However, you should translate terms enclosed in <>.
@@ -1585,17 +1726,17 @@ msgid ""
 "help/?   []             :: print this help or command description\n"
 "quit                             :: exit nmcli\n"
 msgstr ""
-"---[ Property menu ]---\n"
-"set      []               :: establece nuevo valor\n"
-"add      []               :: añade nueva opción a la propiedad\n"
+"---[ Menú de propiedades ]---\n"
+"set      []               :: establece un valor nuevo\n"
+"add      []               :: añade opción nueva a la propiedad\n"
 "change                           :: cambia el valor actual\n"
-"remove   [ |