From bbae86d3d2997a853ca0365e8eb7a3ca7489ee09 Mon Sep 17 00:00:00 2001 From: Sebastien Bacher Date: Fri, 25 Jan 2019 11:24:41 +0100 Subject: New upstream version 1.15.2 --- Makefile.am | 646 +- Makefile.in | 3188 ++--- NEWS | 59 +- README | 20 +- TODO | 14 +- clients/cli/agent.c | 18 +- clients/cli/common.c | 60 +- clients/cli/common.h | 11 +- clients/cli/connections.c | 479 +- clients/cli/connections.h | 2 + clients/cli/devices.c | 543 +- clients/cli/general.c | 46 +- clients/cli/meson.build | 8 +- clients/cli/nmcli.c | 34 +- clients/cli/nmcli.h | 2 + clients/cli/polkit-agent.c | 15 +- clients/cli/settings.c | 17 +- clients/cli/settings.h | 3 +- clients/cli/utils.c | 33 +- clients/cli/utils.h | 6 +- clients/common/meson.build | 30 +- clients/common/nm-client-utils.c | 2 +- clients/common/nm-meta-setting-desc.c | 298 +- clients/common/nm-meta-setting-desc.h | 2 +- clients/common/nm-polkit-listener.c | 2 +- clients/common/nm-polkit-listener.h | 4 +- clients/common/nm-secret-agent-simple.c | 318 +- clients/common/settings-docs.h | 22 +- clients/common/settings-docs.h.in | 22 +- clients/common/tests/meson.build | 4 +- clients/meson.build | 4 +- clients/nm-online.c | 4 +- .../test-client.check-on-disk/test_001.expected | 88 +- .../test-client.check-on-disk/test_002.expected | 80 +- .../test-client.check-on-disk/test_003.expected | 2050 ++-- .../test-client.check-on-disk/test_004.expected | 11826 ++++++++++--------- clients/tests/test-client.py | 10 +- clients/tui/meson.build | 8 +- clients/tui/newt/meson.build | 6 +- clients/tui/newt/nmt-newt-listbox.c | 2 +- clients/tui/nm-editor-bindings.c | 2 +- clients/tui/nmt-slave-list.c | 2 +- config.h.in | 4 + config.h.meson | 4 + configure | 137 +- 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 | 12 +- data/org.freedesktop.NetworkManager.service.in | 11 - dispatcher/meson.build | 12 +- dispatcher/tests/meson.build | 6 +- docs/api/Makefile.in | 1 + ....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 | 103 +- docs/api/html/NetworkManager.devhelp2 | 4 + docs/api/html/NetworkManager.html | 27 +- 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 | 6 +- ...org.freedesktop.NetworkManager.Device.Wpan.html | 4 +- ...dbus-org.freedesktop.NetworkManager.Device.html | 34 +- ...-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 | 81 +- docs/api/html/index.html | 8 +- docs/api/html/ix01.html | 1414 +-- docs/api/html/license.html | 4 +- docs/api/html/manpages.html | 6 +- docs/api/html/nm-dbus-types.html | 29 +- docs/api/html/nm-initrd-generator.html | 4 +- docs/api/html/nm-online.html | 28 +- docs/api/html/nm-openvswitch.html | 26 +- docs/api/html/nm-settings-ifcfg-rh.html | 6 +- docs/api/html/nm-settings-keyfile.html | 4 +- docs/api/html/nm-settings.html | 42 +- docs/api/html/nm-vpn-dbus-types.html | 4 +- docs/api/html/nmcli-examples.html | 55 +- docs/api/html/nmcli.html | 170 +- 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 | 6 +- docs/api/html/settings-802-1x.html | 4 +- docs/api/html/settings-802-3-ethernet.html | 6 +- 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 | 6 +- docs/api/html/settings-infiniband.html | 4 +- docs/api/html/settings-ip-tunnel.html | 4 +- docs/api/html/settings-ipv4.html | 8 +- docs/api/html/settings-ipv6.html | 8 +- 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 | 6 +- docs/api/html/settings-team.html | 6 +- 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 | 16 +- docs/api/html/spec.html | 4 +- docs/api/html/vpn-plugins.html | 4 +- docs/api/meson.build | 6 +- docs/api/network-manager-docs.xml | 9 - docs/api/settings-spec.xml | 26 +- docs/api/version.xml | 2 +- docs/libnm-glib/Makefile.in | 1 + docs/libnm-glib/html/NMAccessPoint.html | 4 +- docs/libnm-glib/html/NMActiveConnection.html | 4 +- docs/libnm-glib/html/NMClient.html | 4 +- docs/libnm-glib/html/NMDHCP4Config.html | 4 +- docs/libnm-glib/html/NMDHCP6Config.html | 4 +- docs/libnm-glib/html/NMDevice.html | 4 +- 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 | 4 +- 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 | 4 +- 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 | 4 +- docs/libnm-glib/html/NMDeviceWimax.html | 4 +- docs/libnm-glib/html/NMIP4Config.html | 4 +- docs/libnm-glib/html/NMIP6Config.html | 4 +- docs/libnm-glib/html/NMObject.html | 8 +- docs/libnm-glib/html/NMRemoteConnection.html | 4 +- docs/libnm-glib/html/NMRemoteSettings.html | 4 +- docs/libnm-glib/html/NMSecretAgent.html | 6 +- docs/libnm-glib/html/NMVPNConnection.html | 4 +- docs/libnm-glib/html/NMWimaxNsp.html | 4 +- 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 | 4 +- .../html/libnm-glib-NMVpnPluginUiWidget.html | 4 +- docs/libnm-glib/html/libnm-glib-nm-types.html | 4 +- .../html/libnm-glib-nm-vpn-plugin-utils.html | 4 +- docs/libnm-glib/html/object-tree.html | 4 +- docs/libnm-glib/html/ref-overview.html | 4 +- docs/libnm-glib/meson.build | 8 +- docs/libnm-glib/version.xml | 2 +- docs/libnm-util/Makefile.in | 1 + docs/libnm-util/html/NMConnection.html | 4 +- docs/libnm-util/html/NMSetting.html | 6 +- 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 | 8 +- 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 | 10 +- 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 | 10 +- .../html/libnm-util-NetworkManagerVPN.html | 4 +- docs/libnm-util/html/libnm-util-nm-utils.html | 14 +- docs/libnm-util/html/object-tree.html | 4 +- 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 | 42 +- docs/libnm/html/NMCheckpoint.html | 4 +- docs/libnm/html/NMClient.html | 175 +- docs/libnm/html/NMConnection.html | 10 +- docs/libnm/html/NMDevice.html | 99 +- 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 | 6 +- docs/libnm/html/NMDeviceWifi.html | 8 +- 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 | 6 +- 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 | 12 +- docs/libnm/html/NMSettingDcb.html | 4 +- docs/libnm/html/NMSettingDummy.html | 4 +- docs/libnm/html/NMSettingEthtool.html | 4 +- docs/libnm/html/NMSettingGeneric.html | 4 +- docs/libnm/html/NMSettingGsm.html | 102 +- docs/libnm/html/NMSettingIP4Config.html | 14 +- docs/libnm/html/NMSettingIP6Config.html | 7 +- docs/libnm/html/NMSettingIPConfig.html | 9 +- 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 | 123 +- docs/libnm/html/NMSettingTeamPort.html | 6 +- 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 | 6 +- docs/libnm/html/NMSettingWirelessSecurity.html | 15 +- docs/libnm/html/NMSettingWpan.html | 112 +- docs/libnm/html/NMSimpleConnection.html | 4 +- docs/libnm/html/NMVpnConnection.html | 4 +- docs/libnm/html/NMVpnEditor.html | 6 +- docs/libnm/html/NMVpnEditorPlugin.html | 12 +- docs/libnm/html/NMWimaxNsp.html | 4 +- docs/libnm/html/annotation-glossary.html | 4 +- docs/libnm/html/api-index-full.html | 86 +- 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 | 24 +- 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 | 4 +- docs/libnm/html/libnm-nm-utils.html | 14 +- docs/libnm/html/libnm-nm-version.html | 36 +- 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/libnm.devhelp2 | 23 +- docs/libnm/html/object-tree.html | 6 +- docs/libnm/html/ref-overview.html | 6 +- docs/libnm/html/usage.html | 6 +- docs/libnm/libnm-docs.xml | 9 +- docs/libnm/libnm-sections.txt | 20 +- 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/nm-conf.d/31-mac-addr-change.conf | 7 +- 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/shell/nm-logging.sh | 2 +- introspection/meson.build | 10 +- ....freedesktop.NetworkManager.Device.Wireless.xml | 2 +- .../org.freedesktop.NetworkManager.Device.xml | 24 +- introspection/org.freedesktop.NetworkManager.xml | 40 +- libnm-core/meson.build | 19 +- libnm-core/nm-connection.c | 281 +- libnm-core/nm-connection.h | 4 +- libnm-core/nm-core-internal.h | 172 +- libnm-core/nm-crypto.c | 15 +- libnm-core/nm-dbus-interface.h | 29 +- libnm-core/nm-dbus-types.xml | 15 +- libnm-core/nm-dbus-utils.c | 89 +- libnm-core/nm-keyfile-internal.h | 15 + libnm-core/nm-keyfile-utils.c | 57 +- libnm-core/nm-keyfile-utils.h | 12 +- libnm-core/nm-keyfile.c | 902 +- libnm-core/nm-setting-6lowpan.c | 80 +- libnm-core/nm-setting-8021x.c | 6 +- libnm-core/nm-setting-adsl.c | 225 +- libnm-core/nm-setting-bluetooth.c | 127 +- libnm-core/nm-setting-bond.c | 87 +- libnm-core/nm-setting-bridge-port.c | 131 +- libnm-core/nm-setting-bridge.c | 281 +- libnm-core/nm-setting-cdma.c | 189 +- libnm-core/nm-setting-connection.c | 652 +- libnm-core/nm-setting-dcb.c | 428 +- 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 | 615 +- libnm-core/nm-setting-ip-tunnel.c | 336 +- libnm-core/nm-setting-ip4-config.c | 240 +- libnm-core/nm-setting-ip6-config.c | 182 +- libnm-core/nm-setting-macsec.c | 159 +- libnm-core/nm-setting-macvlan.c | 157 +- 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 | 30 +- libnm-core/nm-setting-proxy.c | 136 +- libnm-core/nm-setting-serial.c | 170 +- libnm-core/nm-setting-sriov.c | 210 +- libnm-core/nm-setting-tc-config.c | 267 +- libnm-core/nm-setting-team-port.c | 320 +- libnm-core/nm-setting-team.c | 621 +- libnm-core/nm-setting-team.h | 11 + libnm-core/nm-setting-tun.c | 191 +- libnm-core/nm-setting-user.c | 46 +- libnm-core/nm-setting-vlan.c | 220 +- libnm-core/nm-setting-vpn.c | 484 +- libnm-core/nm-setting-vxlan.c | 416 +- libnm-core/nm-setting-wimax.c | 129 +- libnm-core/nm-setting-wired.c | 453 +- libnm-core/nm-setting-wireless-security.c | 626 +- libnm-core/nm-setting-wireless-security.h | 9 +- libnm-core/nm-setting-wireless.c | 509 +- libnm-core/nm-setting-wireless.h | 2 +- libnm-core/nm-setting-wpan.c | 191 +- libnm-core/nm-setting-wpan.h | 9 + libnm-core/nm-setting.c | 1069 +- libnm-core/nm-setting.h | 41 +- libnm-core/nm-simple-connection.c | 5 + libnm-core/nm-utils-private.h | 6 +- libnm-core/nm-utils.c | 477 +- libnm-core/nm-version.h | 14 + libnm-core/nm-vpn-editor-plugin.c | 36 +- libnm-core/nm-vpn-plugin-info.c | 162 +- libnm-core/tests/meson.build | 13 +- libnm-core/tests/test-general.c | 453 +- libnm-core/tests/test-keyfile.c | 4 +- libnm-core/tests/test-setting.c | 262 +- libnm-glib/meson.build | 46 +- 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/tests/meson.build | 6 +- libnm-util/NetworkManager.h | 6 +- libnm-util/meson.build | 34 +- 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-connection.c | 4 +- libnm-util/nm-setting-wireless-security.c | 2 +- libnm-util/nm-setting-wireless-security.h | 4 +- libnm-util/nm-setting.c | 2 +- libnm-util/nm-setting.h | 2 +- libnm-util/nm-utils.c | 12 +- libnm-util/tests/meson.build | 10 +- libnm-util/tests/test-general.c | 4 +- libnm/fake-typelib/meson.build | 6 +- libnm/generate-plugin-docs.pl | 2 +- libnm/libnm.ver | 9 + libnm/meson.build | 37 +- libnm/nm-active-connection.c | 7 +- libnm/nm-client.c | 151 +- libnm/nm-client.h | 15 + libnm/nm-dbus-helpers.c | 2 +- libnm/nm-device-vxlan.c | 2 +- libnm/nm-device-wifi.c | 4 +- libnm/nm-device.c | 76 +- libnm/nm-device.h | 4 + libnm/nm-libnm-utils.c | 2 +- libnm/nm-manager.c | 144 +- libnm/nm-manager.h | 17 + libnm/nm-object.c | 2 +- libnm/nm-object.h | 2 +- libnm/nm-property-docs.xml | 22 +- libnm/nm-settings-docs-overrides.xml | 4 +- libnm/nm-settings-docs.xml | 26 +- libnm/nm-settings-ifcfg-rh-docs.xml | 2 +- libnm/nm-vpn-service-plugin.c | 80 +- libnm/tests/meson.build | 7 +- libnm/tests/test-general.c | 274 + m4/compiler_options.m4 | 10 +- man/NetworkManager.8 | 19 +- man/NetworkManager.conf.5 | 104 +- man/NetworkManager.conf.xml | 84 +- 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 | 8 +- man/nm-settings-ifcfg-rh.xml | 4 +- man/nm-settings-keyfile.5 | 6 +- man/nm-settings-keyfile.xml | 2 +- man/nm-settings.5 | 50 +- man/nm-settings.xml | 28 +- man/nmcli-examples.7 | 63 +- man/nmcli-examples.xml | 30 + man/nmcli.1 | 190 +- man/nmcli.xml | 236 +- man/nmtui.1 | 6 +- meson.build | 75 +- meson_options.txt | 9 +- po/POTFILES.in | 1 + 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 | 7884 +++++++------ po/de.po | 3760 +++--- po/dz.po | 8759 ++++++++------ po/el.po | 8021 +++++++------ po/en_CA.po | 8936 ++++++++------ po/en_GB.po | 9462 ++++++++------- po/eo.po | 7396 +++++++----- 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 | 2566 ++-- po/ka.po | 7383 +++++++----- po/kn.po | 7917 +++++++------ po/ko.po | 4347 ++++--- 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 | 6135 +++++++--- po/pt.po | 8743 ++++++++------ po/pt_BR.po | 3542 +++--- po/ru.po | 4364 ++++--- 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 | 5150 ++++---- po/vi.po | 7399 +++++++----- po/wa.po | 8115 +++++++------ po/zh_CN.po | 3764 +++--- po/zh_HK.po | 7385 +++++++----- po/zh_TW.po | 4557 ++++--- 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 | 160 +- 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-default.h | 10 +- shared/nm-utils/nm-dedup-multi.c | 6 +- shared/nm-utils/nm-dedup-multi.h | 8 +- shared/nm-utils/nm-errno.c | 65 + shared/nm-utils/nm-errno.h | 135 + shared/nm-utils/nm-glib.h | 24 + shared/nm-utils/nm-hash-utils.c | 57 +- shared/nm-utils/nm-hash-utils.h | 62 +- shared/nm-utils/nm-io-utils.c | 6 +- shared/nm-utils/nm-logging-fwd.h | 111 + shared/nm-utils/nm-macros-internal.h | 119 +- shared/nm-utils/nm-random-utils.c | 2 +- shared/nm-utils/nm-secret-utils.h | 2 +- shared/nm-utils/nm-shared-utils.c | 356 +- shared/nm-utils/nm-shared-utils.h | 270 +- shared/nm-utils/nm-test-utils.h | 175 +- shared/nm-utils/nm-time-utils.c | 273 + shared/nm-utils/nm-time-utils.h | 45 + shared/nm-utils/nm-udev-utils.c | 31 +- shared/nm-utils/nm-vpn-plugin-utils.c | 46 +- shared/nm-utils/tests/test-shared-general.c | 221 + shared/nm-utils/unaligned.h | 24 +- shared/nm-version-macros.h | 7 +- shared/nm-version-macros.h.in | 3 +- shared/systemd/nm-logging-stub.c | 45 + 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 | 3 + 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 | 133 + 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 | 147 + shared/systemd/src/basic/async.h | 7 + shared/systemd/src/basic/env-file.c | 578 + shared/systemd/src/basic/env-file.h | 17 + shared/systemd/src/basic/env-util.c | 760 ++ 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 | 960 ++ shared/systemd/src/basic/fd-util.h | 110 + shared/systemd/src/basic/fileio.c | 834 ++ 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 | 1909 +++ shared/systemd/src/basic/hashmap.h | 430 + shared/systemd/src/basic/hexdecoct.c | 827 ++ 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 | 627 + shared/systemd/src/basic/in-addr-util.h | 72 + shared/systemd/src/basic/io-util.c | 256 + shared/systemd/src/basic/io-util.h | 73 + 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_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 | 303 + shared/systemd/src/basic/prioq.h | 26 + shared/systemd/src/basic/process-util.c | 1588 +++ 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 | 425 + shared/systemd/src/basic/stat-util.h | 87 + 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 | 265 + shared/systemd/src/basic/strv.c | 893 ++ shared/systemd/src/basic/strv.h | 197 + shared/systemd/src/basic/time-util.c | 1479 +++ shared/systemd/src/basic/time-util.h | 179 + shared/systemd/src/basic/tmpfile-util.c | 335 + 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 | 244 + src/NetworkManagerUtils.c | 173 +- src/NetworkManagerUtils.h | 12 +- src/devices/adsl/meson.build | 6 +- src/devices/adsl/nm-device-adsl.c | 15 +- src/devices/bluetooth/meson.build | 6 +- src/devices/bluetooth/nm-bluez-device.c | 180 +- src/devices/bluetooth/nm-bluez-device.h | 15 +- src/devices/bluetooth/nm-bluez5-dun.c | 7 +- src/devices/bluetooth/nm-bluez5-dun.h | 3 +- src/devices/bluetooth/nm-device-bt.c | 69 +- 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 | 16 +- src/devices/nm-device-bridge.c | 117 +- src/devices/nm-device-dummy.c | 8 +- src/devices/nm-device-ethernet.c | 52 +- src/devices/nm-device-infiniband.c | 20 +- src/devices/nm-device-ip-tunnel.c | 41 +- src/devices/nm-device-macsec.c | 25 +- src/devices/nm-device-macvlan.c | 9 +- src/devices/nm-device-ppp.c | 8 +- src/devices/nm-device-private.h | 13 +- src/devices/nm-device-tun.c | 19 +- src/devices/nm-device-vlan.c | 20 +- src/devices/nm-device-vxlan.c | 26 +- src/devices/nm-device-wpan.c | 19 +- src/devices/nm-device.c | 1760 +-- src/devices/nm-device.h | 49 +- src/devices/nm-lldp-listener.c | 2 +- src/devices/ovs/meson.build | 6 +- src/devices/ovs/nm-device-ovs-interface.c | 7 +- src/devices/ovs/nm-ovsdb.c | 2 +- src/devices/team/meson.build | 6 +- src/devices/team/nm-device-team.c | 34 +- src/devices/tests/meson.build | 6 +- src/devices/tests/test-acd.c | 88 +- src/devices/wifi/meson.build | 8 +- src/devices/wifi/nm-device-iwd.c | 1131 +- src/devices/wifi/nm-device-iwd.h | 2 +- src/devices/wifi/nm-device-olpc-mesh.c | 28 +- src/devices/wifi/nm-device-wifi.c | 89 +- src/devices/wifi/nm-iwd-manager.c | 125 +- src/devices/wifi/nm-wifi-factory.c | 46 +- src/devices/wifi/tests/meson.build | 4 +- src/devices/wwan/libnm-wwan.ver | 1 - src/devices/wwan/meson.build | 14 +- src/devices/wwan/nm-device-modem.c | 88 +- src/devices/wwan/nm-modem-broadband.c | 100 +- src/devices/wwan/nm-modem-ofono.c | 99 +- src/devices/wwan/nm-modem.c | 219 +- src/devices/wwan/nm-modem.h | 22 +- src/dhcp/meson.build | 2 +- src/dhcp/nm-dhcp-client.c | 96 +- src/dhcp/nm-dhcp-client.h | 14 +- src/dhcp/nm-dhcp-dhclient-utils.c | 38 +- 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-helper.c | 2 +- src/dhcp/nm-dhcp-manager.c | 90 +- src/dhcp/nm-dhcp-manager.h | 2 + src/dhcp/nm-dhcp-systemd.c | 856 +- src/dhcp/nm-dhcp-utils.c | 15 +- src/dhcp/tests/meson.build | 4 +- src/dhcp/tests/test-dhcp-dhclient.c | 69 +- src/dns/nm-dns-dnsmasq.c | 13 +- src/dns/nm-dns-manager.c | 314 +- src/dns/nm-dns-manager.h | 8 + src/dnsmasq/nm-dnsmasq-manager.c | 171 +- src/dnsmasq/nm-dnsmasq-manager.h | 1 + src/dnsmasq/tests/meson.build | 2 +- src/initrd/meson.build | 32 + src/initrd/nm-initrd-generator.c | 58 +- src/initrd/nmi-cmdline-reader.c | 68 +- src/initrd/tests/meson.build | 23 + src/initrd/tests/test-cmdline-reader.c | 12 + src/main.c | 8 +- src/meson.build | 49 +- src/ndisc/nm-lndp-ndisc.c | 20 +- src/ndisc/nm-ndisc.c | 7 +- src/ndisc/nm-ndisc.h | 1 + src/ndisc/tests/meson.build | 2 +- src/nm-act-request.c | 5 +- src/nm-act-request.h | 1 + src/nm-active-connection.c | 94 +- src/nm-active-connection.h | 9 + src/nm-audit-manager.c | 2 +- src/nm-auth-utils.c | 2 +- src/nm-checkpoint.c | 6 + src/nm-config-data.c | 113 +- src/nm-config-data.h | 25 + src/nm-config.c | 285 +- src/nm-config.h | 49 +- src/nm-connectivity.c | 547 +- src/nm-connectivity.h | 17 + src/nm-core-utils.c | 1264 +- src/nm-core-utils.h | 104 +- src/nm-dbus-manager.c | 10 +- src/nm-dbus-manager.h | 2 + src/nm-iface-helper.c | 27 +- src/nm-ip4-config.c | 52 +- src/nm-ip6-config.c | 47 +- src/nm-keep-alive.c | 528 + src/nm-keep-alive.h | 59 + src/nm-logging.c | 62 +- src/nm-logging.h | 86 +- src/nm-manager.c | 474 +- src/nm-manager.h | 29 + src/nm-pacrunner-manager.c | 12 +- src/nm-policy.c | 95 +- src/nm-rfkill-manager.c | 2 +- src/nm-test-utils-core.h | 4 +- src/nm-types.h | 2 +- src/platform/nm-fake-platform.c | 33 +- src/platform/nm-linux-platform.c | 644 +- src/platform/nm-netlink.c | 262 +- src/platform/nm-netlink.h | 83 +- src/platform/nm-platform-utils.c | 12 +- src/platform/nm-platform.c | 1130 +- src/platform/nm-platform.h | 333 +- src/platform/nmp-object.c | 253 +- src/platform/nmp-object.h | 48 +- src/platform/tests/meson.build | 2 +- src/platform/tests/test-address.c | 2 +- src/platform/tests/test-cleanup.c | 5 +- src/platform/tests/test-common.c | 115 +- src/platform/tests/test-common.h | 18 +- src/platform/tests/test-link.c | 354 +- src/platform/tests/test-route.c | 14 +- src/platform/wifi/nm-wifi-utils-nl80211.c | 197 +- src/platform/wifi/nm-wifi-utils-wext.c | 6 +- src/platform/wifi/nm-wifi-utils.h | 2 +- src/platform/wpan/nm-wpan-utils.c | 71 +- src/platform/wpan/nm-wpan-utils.h | 2 + src/ppp/meson.build | 8 +- src/ppp/nm-ppp-manager-call.c | 3 +- src/ppp/nm-ppp-manager-call.h | 1 + src/ppp/nm-ppp-manager.c | 278 +- src/ppp/nm-ppp-plugin-api.h | 1 + src/ppp/nm-pppd-plugin.c | 2 +- src/settings/nm-agent-manager.c | 46 +- src/settings/nm-settings-connection.c | 60 +- src/settings/nm-settings.c | 37 +- src/settings/nm-settings.h | 2 +- src/settings/plugins/ibft/meson.build | 6 +- .../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 + src/settings/plugins/ibft/tests/meson.build | 4 +- src/settings/plugins/ifcfg-rh/meson.build | 12 +- .../plugins/ifcfg-rh/nms-ifcfg-rh-plugin.c | 9 +- .../plugins/ifcfg-rh/nms-ifcfg-rh-reader.c | 48 +- .../plugins/ifcfg-rh/nms-ifcfg-rh-writer.c | 9 +- src/settings/plugins/ifcfg-rh/shvar.c | 6 +- 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 +- .../network-scripts/ifcfg-test-write-unknown-4 | 2 +- .../ifcfg-test-write-unknown-4.expected | 2 +- .../network-test-wired-never-default | 2 +- .../plugins/ifcfg-rh/tests/test-ifcfg-rh.c | 12 +- src/settings/plugins/ifupdown/meson.build | 10 +- src/settings/plugins/ifupdown/tests/meson.build | 4 +- src/settings/plugins/keyfile/nms-keyfile-plugin.c | 69 +- src/settings/plugins/keyfile/nms-keyfile-reader.c | 9 +- src/settings/plugins/keyfile/nms-keyfile-utils.c | 327 +- src/settings/plugins/keyfile/nms-keyfile-utils.h | 43 +- src/settings/plugins/keyfile/nms-keyfile-writer.c | 6 +- src/settings/plugins/keyfile/tests/meson.build | 2 +- src/settings/plugins/keyfile/tests/test-keyfile.c | 121 +- src/supplicant/nm-supplicant-config.c | 118 +- src/supplicant/nm-supplicant-interface.c | 962 +- src/supplicant/nm-supplicant-interface.h | 42 +- src/supplicant/nm-supplicant-manager.c | 89 +- src/supplicant/nm-supplicant-manager.h | 2 + src/supplicant/tests/meson.build | 2 +- src/supplicant/tests/test-supplicant-config.c | 4 +- src/systemd/meson.build | 116 +- src/systemd/nm-sd-utils-core.c | 40 + src/systemd/nm-sd-utils-core.h | 30 + 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/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 | 1062 -- 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 | 62 +- .../src/libsystemd-network/dhcp-identifier.h | 4 +- src/systemd/src/libsystemd-network/dhcp-network.c | 30 +- src/systemd/src/libsystemd-network/dhcp-option.c | 2 +- src/systemd/src/libsystemd-network/dhcp-packet.c | 84 +- .../src/libsystemd-network/dhcp6-internal.h | 6 +- .../src/libsystemd-network/dhcp6-lease-internal.h | 2 +- src/systemd/src/libsystemd-network/dhcp6-network.c | 16 +- src/systemd/src/libsystemd-network/dhcp6-option.c | 146 +- 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 | 41 +- .../src/libsystemd-network/network-internal.h | 1 - .../src/libsystemd-network/sd-dhcp-client.c | 316 +- src/systemd/src/libsystemd-network/sd-dhcp-lease.c | 45 +- .../src/libsystemd-network/sd-dhcp6-client.c | 382 +- .../src/libsystemd-network/sd-dhcp6-lease.c | 58 +- src/systemd/src/libsystemd-network/sd-ipv4acd.c | 61 +- src/systemd/src/libsystemd-network/sd-ipv4ll.c | 25 +- 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 | 101 + src/systemd/src/libsystemd/sd-event/event-util.h | 13 + src/systemd/src/libsystemd/sd-event/sd-event.c | 481 +- src/systemd/src/libsystemd/sd-id128/id128-util.c | 13 +- src/systemd/src/libsystemd/sd-id128/id128-util.h | 4 +- src/systemd/src/libsystemd/sd-id128/sd-id128.c | 46 +- src/systemd/src/shared/dns-domain.c | 115 +- src/systemd/src/shared/dns-domain.h | 32 +- 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 | 1 + 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 | 4 +- src/tests/config/test-config.c | 96 +- src/tests/meson.build | 13 +- src/tests/test-general.c | 437 +- src/tests/test-ip6-config.c | 3 +- src/tests/test-systemd.c | 149 + src/tests/test-utils.c | 12 +- src/vpn/nm-vpn-connection.c | 56 +- src/vpn/nm-vpn-connection.h | 1 + tools/check-config-options.sh | 72 + tools/check-docs.sh | 79 +- tools/check-settings-docs.sh | 19 + tools/create-exports-NetworkManager.sh | 2 +- tools/meson-post-install.sh | 2 +- tools/run-nm-test.sh | 9 +- tools/test-networkmanager-service.py | 19 +- vapi/meson.build | 8 +- 1106 files changed, 356608 insertions(+), 267894 deletions(-) delete mode 100644 data/org.freedesktop.NetworkManager.service.in 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_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/initrd/meson.build create mode 100644 src/initrd/tests/meson.build create mode 100644 src/nm-keep-alive.c create mode 100644 src/nm-keep-alive.h 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-core.c create mode 100644 src/systemd/nm-sd-utils-core.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/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 create mode 100755 tools/check-settings-docs.sh diff --git a/Makefile.am b/Makefile.am index 1e100f60..c8a5ed06 100644 --- a/Makefile.am +++ b/Makefile.am @@ -105,7 +105,7 @@ endif endif -dflt_cppflags = -std=gnu99 +dflt_cppflags = -std=gnu11 ############################################################################### @@ -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'. ***" @@ -204,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 @@ -427,7 +604,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 @@ -494,15 +671,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 \ @@ -563,15 +731,6 @@ libnm_core_lib_c_settings_real = \ 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 \ @@ -664,7 +823,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 = \ @@ -782,7 +940,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) @@ -988,10 +1148,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) @@ -1032,10 +1193,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" \ @@ -1197,6 +1361,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 = \ @@ -1330,164 +1496,199 @@ 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_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/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/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 \ @@ -1517,6 +1718,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 \ @@ -1535,9 +1739,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 @@ -1615,8 +1819,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) \ @@ -1638,12 +1843,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 \ @@ -1800,6 +2005,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 \ @@ -1808,7 +2015,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) \ @@ -1881,7 +2089,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) \ @@ -1918,7 +2127,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" \ @@ -1939,9 +2151,13 @@ 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 \ + 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 \ @@ -2151,7 +2367,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) @@ -2392,6 +2610,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 +2626,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 @@ -2807,13 +3023,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) @@ -3382,6 +3599,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 \ @@ -3449,14 +3667,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) @@ -3660,15 +3877,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 \ @@ -3683,7 +3891,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) @@ -3697,16 +3905,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 @@ -4080,6 +4279,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' \ @@ -4110,11 +4310,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 @@ -4136,7 +4331,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 \ @@ -4147,7 +4341,6 @@ CLEANFILES += \ data/NetworkManager.service \ data/NetworkManager-wait-online.service \ data/NetworkManager-dispatcher.service \ - data/org.freedesktop.NetworkManager.service \ data/server.conf ############################################################################### @@ -4209,7 +4402,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 \ @@ -4224,7 +4416,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 \ @@ -4282,6 +4473,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) @@ -4523,7 +4715,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 \ @@ -4550,7 +4741,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 \ @@ -4605,9 +4795,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 += \ @@ -5022,32 +5215,21 @@ 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 \ tools/create-exports-NetworkManager.sh \ tools/debug-helper.py \ tools/meson-post-install.sh \ diff --git a/Makefile.in b/Makefile.in index 5da627b4..ee75a634 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,129 +189,117 @@ 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 = \ -@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_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_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_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_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_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_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_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_33 = 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_34 = 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_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_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_38 = 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_39 = \ +@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_40 = \ +@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_41 = 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_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_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_44 = $(BLUEZ5_LIBS) +@WITH_BLUEZ5_DUN_TRUE@@WITH_MODEM_MANAGER_1_TRUE@am__append_45 = $(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_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_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_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_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_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_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_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_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_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_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_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 @@ -506,7 +496,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) \ @@ -675,11 +666,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 @@ -759,7 +747,7 @@ 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 \ @@ -797,14 +785,7 @@ am__libnm_core_libnm_core_la_SOURCES_DIST = \ 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 \ @@ -842,19 +823,13 @@ am__libnm_core_libnm_core_la_SOURCES_DIST = \ libnm-core/nm-setting-wired.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) @@ -905,15 +880,6 @@ am__objects_4 = libnm-core/libnm_core_la-nm-setting-6lowpan.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 \ @@ -941,8 +907,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) @@ -1010,11 +975,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 \ @@ -1044,13 +1009,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 \ @@ -1097,14 +1060,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 \ @@ -1145,15 +1107,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 \ @@ -1218,15 +1179,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 \ @@ -1295,17 +1258,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 \ @@ -1339,7 +1393,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 \ @@ -1347,7 +1401,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) \ @@ -1418,7 +1472,7 @@ am__src_devices_wifi_libnm_device_plugin_wifi_la_SOURCES_DIST = \ 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@ src/devices/wifi/libnm_device_plugin_wifi_la-nm-device-wifi.lo \ @@ -1426,7 +1480,7 @@ am__src_devices_wifi_libnm_device_plugin_wifi_la_SOURCES_DIST = \ @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@ $(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) \ @@ -1466,11 +1520,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 \ @@ -1486,17 +1540,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 \ @@ -1568,13 +1624,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 \ @@ -1605,7 +1662,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 \ @@ -1629,7 +1686,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 \ @@ -1643,61 +1700,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/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 = \ @@ -1830,7 +1862,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) \ @@ -1841,7 +1873,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 \ @@ -1971,8 +2003,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) @@ -2065,8 +2097,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) \ @@ -2235,7 +2270,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 \ @@ -2271,6 +2309,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 @@ -2356,7 +2399,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) \ @@ -2366,7 +2411,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) \ @@ -2378,7 +2424,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) \ @@ -2408,7 +2455,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 \ @@ -2555,7 +2603,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) \ @@ -2631,11 +2680,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) @@ -3026,25 +3076,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 \ @@ -3072,6 +3156,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 \ @@ -3229,57 +3314,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.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 \ @@ -3350,7 +3409,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) \ @@ -3362,7 +3426,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) \ @@ -3410,6 +3474,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) \ @@ -3441,7 +3506,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) \ @@ -3457,7 +3522,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) \ @@ -3469,7 +3540,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) \ @@ -3514,6 +3585,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) \ @@ -3545,7 +3617,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 \ @@ -3895,6 +3967,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@ @@ -4201,18 +4274,25 @@ 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_28) \ - $(am__append_36) dispatcher/libnm-dispatcher-core.la \ + 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_64) -noinst_DATA = $(am__append_14) -dist_libexec_SCRIPTS = $(am__append_32) +noinst_LIBRARIES = $(am__append_65) +noinst_DATA = $(am__append_16) +dist_libexec_SCRIPTS = $(am__append_33) ############################################################################### lib_LTLIBRARIES = libnm/libnm.la $(am__append_69) @@ -4221,28 +4301,27 @@ 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) +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_29) \ + $(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 \ + 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_115) DISTCLEANFILES = config-extra.h intltool-extract intltool-merge \ intltool-update $(polkit_policy_DATA) libnm/libnm.pc \ - $(am__append_52) $(am__append_84) + $(am__append_53) $(am__append_84) # test-cert.p12 created with: # @@ -4291,12 +4370,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/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 \ @@ -4532,7 +4611,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 \ @@ -4768,6 +4856,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 \ @@ -4801,7 +4890,6 @@ 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_77) libnm-glib/tests/meson.build \ @@ -4821,23 +4909,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 \ + 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 \ @@ -4895,16 +4976,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_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_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_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_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) \ @@ -4921,6 +5002,8 @@ man_pages_autogen = man/nm-settings-keyfile.5 man/nm-settings.5 \ ############################################################################### +############################################################################### + ############################################################################### # src/settings/plugins/keyfile/tests ############################################################################### @@ -4940,19 +5023,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_31) $(am__append_38) \ - $(am__append_48) 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 \ @@ -4971,9 +5054,9 @@ 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_57) $(am__append_58) $(am__append_88) \ $(am__append_93) -check_programs_norun = $(am__append_17) src/platform/tests/monitor \ +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 \ @@ -4989,21 +5072,22 @@ check_programs_norun = $(am__append_17) src/platform/tests/monitor \ # 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_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) + $(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_34) dispatcher/nm-dispatcher.conf \ +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_85) +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,7 +5101,7 @@ nodist_libnminclude_HEADERS = $(libnm_core_lib_h_pub_mkenums) \ pkgconfigdir = $(libdir)/pkgconfig 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_108) examplesdir = $(docdir)/examples @@ -5031,7 +5115,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 = \ @@ -5057,7 +5141,9 @@ DISTCHECK_CONFIGURE_FLAGS = \ --with-wext=no \ --enable-ifcfg-rh \ --enable-ifupdown \ - --disable-dependency-tracking + --enable-config-plugin-ibft \ + --disable-dependency-tracking \ + $(NULL) ############################################################################### @@ -5066,6 +5152,149 @@ 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 \ @@ -5320,14 +5549,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 \ @@ -5335,7 +5557,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 \ @@ -5384,20 +5606,14 @@ libnm_core_lib_c_settings_real = \ 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 @@ -5420,7 +5636,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) \ @@ -5433,7 +5649,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 = \ @@ -5495,7 +5710,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) @@ -5653,10 +5870,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) \ @@ -5683,10 +5901,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" \ @@ -5694,7 +5915,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 @@ -5743,6 +5964,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 = \ @@ -5835,153 +6058,189 @@ 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_systemd_libnm_systemd_logging_stub_la_SOURCES = \ + shared/systemd/nm-logging-stub.c \ $(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_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_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/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/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 \ @@ -6011,6 +6270,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 \ @@ -6029,8 +6291,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) @@ -6061,11 +6323,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) \ @@ -6081,12 +6344,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 \ @@ -6243,6 +6506,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 \ @@ -6251,7 +6516,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) \ @@ -6303,7 +6569,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) \ @@ -6332,7 +6599,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" \ @@ -6351,7 +6621,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 \ @@ -6366,7 +6638,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) \ @@ -6573,13 +6847,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 \ @@ -6609,7 +6884,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_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 \ @@ -6651,17 +6926,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_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_42) +@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_44) +@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-wifi.c \ @@ -6674,7 +6949,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_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 \ @@ -6894,16 +7169,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 = \ @@ -7013,15 +7286,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 \ @@ -7036,7 +7300,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) @@ -7092,15 +7356,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_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_59) +@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_61) +@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) @@ -7271,6 +7535,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' \ @@ -7341,7 +7606,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 \ @@ -7356,7 +7620,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 \ @@ -7404,7 +7667,7 @@ 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_73) \ @WITH_LEGACY_LIBRARIES_TRUE@ $(am__append_76) @@ -7560,7 +7823,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 \ @@ -7589,7 +7851,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 \ @@ -7645,9 +7906,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) @@ -8294,24 +8557,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) @@ -8646,33 +8891,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: \ @@ -8753,9 +8971,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: \ @@ -8844,9 +9059,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) @@ -9089,6 +9301,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) @@ -9098,6 +9316,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) @@ -9119,9 +9349,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) @@ -9303,13 +9704,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: \ @@ -9537,6 +9938,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) @@ -9650,162 +10053,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/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): @@ -9814,7 +10131,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): @@ -9823,10 +10143,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): @@ -9835,12 +10155,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) @@ -10415,6 +10735,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) @@ -10832,12 +11165,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) @@ -10899,10 +11241,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) @@ -11275,25 +11615,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 @@ -11321,6 +11695,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 @@ -11478,57 +11853,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.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 @@ -11852,34 +12201,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 @@ -12566,69 +12887,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 @@ -12790,13 +13048,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 @@ -13014,13 +13265,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 @@ -13658,6 +13902,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 @@ -13672,6 +13923,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 @@ -13917,12 +14497,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 @@ -13931,12 +14511,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 @@ -14435,6 +15015,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 @@ -14631,362 +15218,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@ +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.lo `test -f 'src/systemd/nm-sd.c' || echo '$(srcdir)/'`src/systemd/nm-sd.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 @@ -16381,6 +16786,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 @@ -17074,9 +17493,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 @@ -17113,8 +17537,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 @@ -18004,6 +18427,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'; \ @@ -18670,12 +19100,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) @@ -18748,10 +19188,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) @@ -19138,25 +19576,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 @@ -19184,6 +19656,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 @@ -19341,57 +19814,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.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 @@ -19825,25 +20272,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 @@ -19871,6 +20352,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 @@ -20028,57 +20510,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.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 @@ -20280,7 +20736,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 @@ -20385,7 +20841,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) @@ -20562,16 +21021,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: @@ -20632,9 +21082,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) $< >$@ @@ -20658,6 +21105,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 e625c3a7..2d014d2f 100644 --- a/NEWS +++ b/NEWS @@ -1,24 +1,17 @@ -=============================================== -NetworkManager-1.14.4 -Overview of changes since NetworkManager-1.14.2 -=============================================== - -This is a new stable release of NetworkManager. Notable changes include: - -* 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. -* Fix a memory leak in dhclient DHCP plugin. -* Fix line editing in nmcli password prompts. -* Fix a RPATH in bluetooth and wwan plugin when built with Meson (otherwise - they wouldn't find libnm-wwan.so). - ============================================= -NetworkManager-1.14.2 +NetworkManager-1.16 Overview of changes since NetworkManager-1.14 ============================================= -This is a new stable release of NetworkManager. Notable changes include: +This is a snapshot of NetworkManager 1.16 development series. +The API is subject to change and not guaranteed to be compatible +with the later release. +USE AT YOUR OWN RISK. NOT RECOMMENDED FOR PRODUCTION USE! + +* Check connectivity per address family. + +The following changes were backported to 1.14.x releases between 1.14.0 +and 1.14.2 are also present in NetworkManager-1.14: * Fix a bug that could cause NetworkManager to crash after checking connectivity status. @@ -147,8 +140,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 @@ -493,7 +486,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 @@ -637,7 +630,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 @@ -694,16 +687,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 @@ -714,7 +707,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 ============================================== @@ -727,12 +720,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 @@ -750,12 +743,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 @@ -780,7 +773,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 ============================================== @@ -899,8 +892,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..05cc5dca 100644 --- a/clients/cli/agent.c +++ b/clients/cli/agent.c @@ -85,7 +85,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 +105,7 @@ 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); + pwd = nmc_readline (nmc_config, "%s (%s): ", secret->pretty_name, secret->entry_id); /* No password provided, cancel the secrets. */ if (!pwd) @@ -123,17 +124,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 diff --git a/clients/cli/common.c b/clients/cli/common.c index d3f5f865..85b5005e 100644 --- a/clients/cli/common.c +++ b/clients/cli/common.c @@ -661,12 +661,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) { @@ -698,8 +698,9 @@ get_secrets_from_user (const char *request_id, } if (msg) g_print ("%s\n", msg); - pwd = nmc_readline_echo (secret->is_secret - ? echo_on + pwd = nmc_readline_echo (nmc_config, + secret->is_secret + ? nmc_config->show_secrets : TRUE, "%s (%s): ", secret->pretty_name, secret->entry_id); if (!pwd) @@ -763,8 +764,14 @@ 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 { @@ -847,7 +854,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 +892,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 +934,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 +981,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 +1005,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) { @@ -1384,3 +1391,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..71734acc 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); @@ -93,4 +98,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 bcd257ac..446424ba 100644 --- a/clients/cli/connections.c +++ b/clients/cli/connections.c @@ -30,6 +30,7 @@ #include #include #include +#include #include "nm-client-utils.h" #include "nm-vpn-helpers.h" @@ -140,15 +141,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; } @@ -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; @@ -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 { @@ -2726,14 +2825,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 +3005,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 +3080,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) { @@ -3850,9 +3952,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 +3991,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 +4043,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 +4091,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 +4165,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 +4182,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 +4211,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 +4234,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 +4354,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 +4373,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 +4393,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 +4679,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 +4959,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 +5051,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 +5139,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 +5171,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; @@ -6534,6 +6646,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 +6697,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 +6731,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 @@ -6648,6 +6768,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); } @@ -6741,20 +6865,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)); } /* @@ -6789,7 +6909,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. " @@ -6802,10 +6922,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: @@ -6826,7 +6949,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); @@ -6838,7 +6963,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); @@ -6854,12 +6979,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); @@ -6871,19 +6998,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, @@ -6926,7 +7054,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; @@ -6987,7 +7115,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) @@ -6998,12 +7127,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, @@ -7017,7 +7146,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) { @@ -7027,9 +7157,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); @@ -7056,7 +7186,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; @@ -7074,16 +7206,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; } @@ -7127,6 +7258,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) { @@ -7178,9 +7319,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. " @@ -7190,7 +7333,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) { @@ -7204,7 +7349,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) @@ -7218,10 +7364,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); } @@ -7276,11 +7424,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); @@ -7299,7 +7449,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); @@ -7345,7 +7496,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) @@ -7368,7 +7520,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) @@ -7462,7 +7615,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) @@ -7646,6 +7800,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) { @@ -7660,9 +7818,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 */ @@ -7674,23 +7835,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 +7895,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; @@ -7779,7 +7962,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) { @@ -7853,7 +8037,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 */ @@ -8041,7 +8225,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 = ". "; @@ -8129,8 +8313,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); @@ -8323,14 +8508,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; } @@ -8346,9 +8531,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); } @@ -8433,14 +8619,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) { @@ -8689,10 +8875,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); @@ -8809,14 +8998,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; } @@ -8839,8 +9028,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) { @@ -8864,7 +9055,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; @@ -9016,7 +9207,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 ff980342..44573fb6 100644 --- a/clients/cli/devices.c +++ b/clients/cli/devices.c @@ -116,6 +116,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 +143,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 +163,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 +203,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 +265,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 +703,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 +838,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 +902,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 +971,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 +1030,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, @@ -1869,6 +1838,7 @@ typedef struct { NmCli *nmc; NMDevice *device; gboolean hotspot; + gboolean create; } AddAndActivateInfo; static void @@ -1879,47 +1849,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 +1879,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 +1924,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,14 +1953,8 @@ 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 { @@ -2020,6 +1968,9 @@ connect_device_cb (GObject *client, GAsyncResult *result, gpointer user_data) 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 +2469,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 +2668,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 +2685,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 +2714,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; @@ -2804,7 +2760,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); @@ -2879,28 +2835,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); } @@ -2908,9 +2874,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 @@ -2954,49 +2926,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) @@ -3026,12 +2955,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); @@ -3119,7 +3051,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) { @@ -3133,13 +3066,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]); } } @@ -3157,7 +3129,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; @@ -3173,6 +3144,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) @@ -3195,7 +3170,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); } @@ -3377,14 +3352,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; @@ -3402,45 +3377,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; + } + + 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; + } + } - /* 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 (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 (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 (!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); + } } } @@ -3453,15 +3458,37 @@ 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)) { + /* 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 */ @@ -3477,7 +3504,7 @@ do_device_wifi_connect_network (NmCli *nmc, int argc, char **argv) } } } - // 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 @@ -3495,14 +3522,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..d9128c76 100644 --- a/clients/cli/general.c +++ b/clients/cli/general.c @@ -37,7 +37,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 +49,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 +72,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) { @@ -151,7 +130,7 @@ permission_to_string (NMClientPermission perm) } } -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 +171,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 +181,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 +200,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 +265,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 +540,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 +976,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 +1092,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 +1107,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 +1264,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..7e8477cc 100644 --- a/clients/cli/nmcli.c +++ b/clients/cli/nmcli.c @@ -245,19 +245,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 how program version\n" + " -w, --wait set timeout waiting for finishing operations\n" "\n" "OBJECT\n" " g[eneral] NetworkManager's general status and operations\n" @@ -998,6 +998,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) { diff --git a/clients/cli/nmcli.h b/clients/cli/nmcli.h index 28616855..0ccf1653 100644 --- a/clients/cli/nmcli.h +++ b/clients/cli/nmcli.h @@ -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..b895599b 100644 --- a/clients/cli/polkit-agent.c +++ b/clients/cli/polkit-agent.c @@ -40,24 +40,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 e21c108d..1b940467 100644 --- a/clients/cli/utils.c +++ b/clients/cli/utils.c @@ -36,6 +36,7 @@ #include "nm-meta-setting-access.h" #include "common.h" +#include "nmcli.h" #include "settings.h" #define ML_HEADER_WIDTH 79 @@ -919,6 +920,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); } /*****************************************************************************/ @@ -1098,7 +1101,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 @@ -1273,7 +1276,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; @@ -1355,7 +1358,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; @@ -1445,38 +1448,38 @@ 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]; - 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; + return 0; } parent_pid = getpid (); - nm_cli.pager_pid = fork (); - if (nm_cli.pager_pid == -1) { + pager_pid = fork (); + if (pager_pid == -1) { g_printerr (_("Failed to fork pager: %s\n"), strerror (errno)); 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]); @@ -1521,6 +1524,7 @@ nmc_terminal_spawn_pager (const NmcConfig *nmc_config) nm_close (fd[0]); nm_close (fd[1]); + return pager_pid; } /*****************************************************************************/ @@ -1587,8 +1591,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 @@ -1728,7 +1731,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 0db2868e..af54cec0 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 + [ @@ -19,12 +19,12 @@ libnmc_base = static_library( '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,23 +34,19 @@ 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@'], ) - # 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', output: settings_docs, - configuration: configuration_data() + configuration: configuration_data(), ) endif @@ -58,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..8ba2453e 100644 --- a/clients/common/nm-client-utils.c +++ b/clients/common/nm-client-utils.c @@ -348,7 +348,7 @@ 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")), diff --git a/clients/common/nm-meta-setting-desc.c b/clients/common/nm-meta-setting-desc.c index cb23841e..4befce25 100644 --- a/clients/common/nm-meta-setting-desc.c +++ b/clients/common/nm-meta-setting-desc.c @@ -285,13 +285,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 +314,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 +359,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 +385,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 +397,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"); @@ -1953,9 +1961,8 @@ nmc_property_set_bytes (NMSetting *setting, const char *prop, const char *value, gs_free char *val_strip = NULL; gs_free const char **strv = NULL; const char **iter; - GBytes *bytes; - GByteArray *array = NULL; - gboolean success = TRUE; + gs_unref_bytes GBytes *bytes = NULL; + GByteArray *array; nm_assert (!error || !*error); @@ -1977,8 +1984,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 +1992,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, prop, bytes, NULL); + return TRUE; } /*****************************************************************************/ @@ -3349,7 +3350,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 +3369,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 +3382,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 +3422,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 +3596,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) { @@ -5194,8 +5122,6 @@ 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 } })) @@ -5254,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, @@ -5321,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, @@ -5348,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, @@ -5516,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, @@ -5528,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, @@ -5557,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 @@ -5812,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, @@ -5851,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, @@ -5904,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), ), ), @@ -6134,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, @@ -6183,15 +6109,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 +6272,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), @@ -6734,7 +6660,7 @@ 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, @@ -6755,7 +6681,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 @@ -6776,7 +6702,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, @@ -6785,13 +6711,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, @@ -6987,20 +6913,20 @@ static const NMMetaPropertyInfo *const property_infos_TEAM[] = { 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, @@ -7013,7 +6939,7 @@ 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, @@ -7058,11 +6984,11 @@ static const NMMetaPropertyInfo *const property_infos_TEAM[] = { 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, @@ -7473,7 +7399,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, @@ -7525,7 +7451,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, @@ -7587,15 +7513,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, @@ -7697,7 +7623,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"), ), ), PROPERTY_INFO_WITH_DESC (NM_SETTING_WIRELESS_SECURITY_WEP_TX_KEYIDX, @@ -7706,7 +7632,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, @@ -7873,6 +7799,34 @@ static const NMMetaPropertyInfo *const property_infos_WPAN[] = { ), ), ), + PROPERTY_INFO_WITH_DESC (NM_SETTING_WPAN_PAGE, + .is_cli_option = TRUE, + .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 = 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 = NM_SETTING_WPAN_CHANNEL_DEFAULT, + .nick = "default", + } + ), + ), + ), NULL }; @@ -7917,9 +7871,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); } } @@ -8031,10 +7985,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") diff --git a/clients/common/nm-meta-setting-desc.h b/clients/common/nm-meta-setting-desc.h index 163dcf2e..7129870a 100644 --- a/clients/common/nm-meta-setting-desc.h +++ b/clients/common/nm-meta-setting-desc.h @@ -412,7 +412,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..dccf1d38 100644 --- a/clients/common/nm-polkit-listener.c +++ b/clients/common/nm-polkit-listener.c @@ -198,7 +198,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..9fcf4200 100644 --- a/clients/common/nm-secret-agent-simple.c +++ b/clients/common/nm-secret-agent-simple.c @@ -31,6 +31,8 @@ #include "nm-default.h" +#include +#include #include #include "nm-vpn-service-plugin.h" @@ -58,6 +60,8 @@ typedef struct { char **hints; NMSecretAgentOldGetSecretsFunc callback; gpointer callback_data; + GCancellable *cancellable; + NMSecretAgentGetSecretsFlags flags; } NMSecretAgentSimpleRequest; typedef struct { @@ -73,6 +77,7 @@ nm_secret_agent_simple_request_free (gpointer data) { NMSecretAgentSimpleRequest *request = data; + g_clear_object (&request->cancellable); g_object_unref (request->self); g_object_unref (request->connection); g_strfreev (request->hints); @@ -80,6 +85,17 @@ nm_secret_agent_simple_request_free (gpointer data) g_slice_free (NMSecretAgentSimpleRequest, request); } +static void +nm_secret_agent_simple_request_cancel (NMSecretAgentSimpleRequest *request, + GError *error) +{ + NMSecretAgentSimplePrivate *priv = NM_SECRET_AGENT_SIMPLE_GET_PRIVATE (request->self); + + request->callback (NM_SECRET_AGENT_OLD (request->self), request->connection, + NULL, error, request->callback_data); + g_hash_table_remove (priv->requests, request->request_id); +} + static void nm_secret_agent_simple_init (NMSecretAgentSimple *agent) { @@ -443,6 +459,293 @@ add_vpn_secrets (NMSecretAgentSimpleRequest *request, return TRUE; } +typedef struct { + GPid auth_dialog_pid; + char read_buf[5]; + GString *auth_dialog_response; + NMSecretAgentSimpleRequest *request; + GPtrArray *secrets; + guint child_watch_id; + gulong cancellable_id; +} AuthDialogData; + +static void +_auth_dialog_data_free (AuthDialogData *data) +{ + g_ptr_array_unref (data->secrets); + g_spawn_close_pid (data->auth_dialog_pid); + g_string_free (data->auth_dialog_response, TRUE); + g_slice_free (AuthDialogData, data); +} + +static void +_auth_dialog_exited (GPid pid, int status, gpointer user_data) +{ + AuthDialogData *data = user_data; + NMSecretAgentSimpleRequest *request = data->request; + GPtrArray *secrets = data->secrets; + NMSettingVpn *s_vpn = nm_connection_get_setting_vpn (request->connection); + 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; + + g_cancellable_disconnect (request->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 (g_strcmp0 (groups[0], "VPN Plugin UI") != 0) { + 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++) { + if (!g_key_file_get_boolean (keyfile, groups[i], "IsSecret", NULL)) + continue; + if (!g_key_file_get_boolean (keyfile, groups[i], "ShouldAsk", NULL)) + continue; + + g_ptr_array_add (secrets, + nm_secret_agent_simple_secret_new (NM_SECRET_AGENT_SECRET_TYPE_VPN_SECRET, + g_key_file_get_string (keyfile, groups[i], "Label", NULL), + 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) { + nm_secret_agent_simple_request_cancel (request, error); + } else { + g_signal_emit (request->self, signals[REQUEST_SECRETS], 0, + request->request_id, title, message, secrets); + } + + g_clear_pointer (&keyfile, g_key_file_unref); + _auth_dialog_data_free (data); +} + +static void +_request_cancelled (GObject *object, gpointer user_data) +{ + AuthDialogData *data = user_data; + + g_source_remove (data->child_watch_id); + _auth_dialog_data_free (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)) + nm_secret_agent_simple_request_cancel (data->request, error); + _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_id = g_cancellable_connect (data->request->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); + GString *auth_dialog_request = 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_string_free (auth_dialog_request, TRUE); + 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 (NMSecretAgentSimpleRequest *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; + 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"); + + data = g_slice_alloc0 (sizeof (AuthDialogData)); + data->auth_dialog_response = g_string_new_len (NULL, sizeof (data->read_buf)); + data->auth_dialog_pid = auth_dialog_pid; + data->request = request; + data->secrets = secrets; + + 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); + + 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 (NMSecretAgentSimpleRequest *request) { @@ -463,9 +766,7 @@ request_secrets_from_ui (NMSecretAgentSimpleRequest *request) 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); + nm_secret_agent_simple_request_cancel (request, error); return; } @@ -581,6 +882,11 @@ request_secrets_from_ui (NMSecretAgentSimpleRequest *request) title = _("VPN password required"); msg = NULL; + if (try_spawn_vpn_auth_helper (request, secrets)) { + /* This will emit REQUEST_SECRETS when ready */ + return; + } + ok = add_vpn_secrets (request, secrets, &msg); if (!msg) msg = g_strdup_printf (_("A password is required to connect to '%s'."), @@ -595,9 +901,7 @@ request_secrets_from_ui (NMSecretAgentSimpleRequest *request) "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); + nm_secret_agent_simple_request_cancel (request, error); g_ptr_array_unref (secrets); return; } @@ -648,6 +952,8 @@ nm_secret_agent_simple_get_secrets (NMSecretAgentOld *agent, request->callback = callback; request->callback_data = callback_data; request->request_id = request_id; + request->flags = flags; + request->cancellable = g_cancellable_new (); g_hash_table_replace (priv->requests, request->request_id, request); if (priv->enabled) diff --git a/clients/common/settings-docs.h b/clients/common/settings-docs.h index f07769c0..462ba364 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 \"-\").") @@ -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.") @@ -197,14 +197,14 @@ #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.") #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.") @@ -218,13 +218,13 @@ #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.") #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.") @@ -296,12 +296,12 @@ #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.") -#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.") @@ -359,6 +359,8 @@ #define DESCRIBE_DOC_NM_SETTING_VXLAN_TTL N_("Specifies the time-to-live value to use in outgoing packets.") #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_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 f07769c0..462ba364 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 \"-\").") @@ -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.") @@ -197,14 +197,14 @@ #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.") #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.") @@ -218,13 +218,13 @@ #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.") #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.") @@ -296,12 +296,12 @@ #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.") -#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.") @@ -359,6 +359,8 @@ #define DESCRIBE_DOC_NM_SETTING_VXLAN_TTL N_("Specifies the time-to-live value to use in outgoing packets.") #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_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/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..c2e11e89 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:829: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:829: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:831: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:831: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:833: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:833: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:835: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:835:test_001()/8 cmd: $NMCLI bogus s lang: pl_PL.UTF-8 returncode: 2 @@ -93,7 +93,7 @@ Błąd: nie zrozumiano parametru „bogus”. Można użyć „--help” zamiast <<< size: 1413 -location: clients/tests/test-client.py:836:test_001()/9 +location: clients/tests/test-client.py:838:test_001()/9 cmd: $NMCLI general permissions lang: C returncode: 0 @@ -119,7 +119,7 @@ org.freedesktop.NetworkManager.enable-disable-connectivity-check unknown <<< size: 1441 -location: clients/tests/test-client.py:836:test_001()/10 +location: clients/tests/test-client.py:838:test_001()/10 cmd: $NMCLI general permissions lang: pl_PL.UTF-8 returncode: 0 @@ -145,7 +145,7 @@ org.freedesktop.NetworkManager.enable-disable-connectivity-check nieznane <<< size: 1543 -location: clients/tests/test-client.py:836:test_001()/11 +location: clients/tests/test-client.py:838:test_001()/11 cmd: $NMCLI --color yes general permissions lang: C returncode: 0 @@ -171,7 +171,7 @@ org.freedesktop.NetworkManager.enable-disable-connectivity-check unknown <<< size: 1570 -location: clients/tests/test-client.py:836:test_001()/12 +location: clients/tests/test-client.py:838:test_001()/12 cmd: $NMCLI --color yes general permissions lang: pl_PL.UTF-8 returncode: 0 @@ -197,7 +197,7 @@ org.freedesktop.NetworkManager.enable-disable-connectivity-check nieznane <<< size: 1620 -location: clients/tests/test-client.py:836:test_001()/13 +location: clients/tests/test-client.py:838:test_001()/13 cmd: $NMCLI --pretty general permissions lang: C returncode: 0 @@ -227,7 +227,7 @@ org.freedesktop.NetworkManager.enable-disable-connectivity-check unknown <<< size: 1677 -location: clients/tests/test-client.py:836:test_001()/14 +location: clients/tests/test-client.py:838:test_001()/14 cmd: $NMCLI --pretty general permissions lang: pl_PL.UTF-8 returncode: 0 @@ -257,7 +257,7 @@ org.freedesktop.NetworkManager.enable-disable-connectivity-check nieznane <<< size: 1749 -location: clients/tests/test-client.py:836:test_001()/15 +location: clients/tests/test-client.py:838:test_001()/15 cmd: $NMCLI --pretty --color yes general permissions lang: C returncode: 0 @@ -287,7 +287,7 @@ org.freedesktop.NetworkManager.enable-disable-connectivity-check unknown <<< size: 1806 -location: clients/tests/test-client.py:836:test_001()/16 +location: clients/tests/test-client.py:838:test_001()/16 cmd: $NMCLI --pretty --color yes general permissions lang: pl_PL.UTF-8 returncode: 0 @@ -317,7 +317,7 @@ org.freedesktop.NetworkManager.enable-disable-connectivity-check nieznane <<< size: 1045 -location: clients/tests/test-client.py:836:test_001()/17 +location: clients/tests/test-client.py:838:test_001()/17 cmd: $NMCLI --terse general permissions lang: C returncode: 0 @@ -342,7 +342,7 @@ org.freedesktop.NetworkManager.enable-disable-connectivity-check:unknown <<< size: 1055 -location: clients/tests/test-client.py:836:test_001()/18 +location: clients/tests/test-client.py:838:test_001()/18 cmd: $NMCLI --terse general permissions lang: pl_PL.UTF-8 returncode: 0 @@ -367,7 +367,7 @@ org.freedesktop.NetworkManager.enable-disable-connectivity-check:unknown <<< size: 1175 -location: clients/tests/test-client.py:836:test_001()/19 +location: clients/tests/test-client.py:838:test_001()/19 cmd: $NMCLI --terse --color yes general permissions lang: C returncode: 0 @@ -392,7 +392,7 @@ org.freedesktop.NetworkManager.enable-disable-connectivity-check:unknown <<< size: 1185 -location: clients/tests/test-client.py:836:test_001()/20 +location: clients/tests/test-client.py:838:test_001()/20 cmd: $NMCLI --terse --color yes general permissions lang: pl_PL.UTF-8 returncode: 0 @@ -417,7 +417,7 @@ org.freedesktop.NetworkManager.enable-disable-connectivity-check:unknown <<< size: 1429 -location: clients/tests/test-client.py:836:test_001()/21 +location: clients/tests/test-client.py:838:test_001()/21 cmd: $NMCLI --mode tabular general permissions lang: C returncode: 0 @@ -443,7 +443,7 @@ org.freedesktop.NetworkManager.enable-disable-connectivity-check unknown <<< size: 1456 -location: clients/tests/test-client.py:836:test_001()/22 +location: clients/tests/test-client.py:838:test_001()/22 cmd: $NMCLI --mode tabular general permissions lang: pl_PL.UTF-8 returncode: 0 @@ -469,7 +469,7 @@ org.freedesktop.NetworkManager.enable-disable-connectivity-check nieznane <<< size: 1558 -location: clients/tests/test-client.py:836:test_001()/23 +location: clients/tests/test-client.py:838:test_001()/23 cmd: $NMCLI --mode tabular --color yes general permissions lang: C returncode: 0 @@ -495,7 +495,7 @@ org.freedesktop.NetworkManager.enable-disable-connectivity-check unknown <<< size: 1585 -location: clients/tests/test-client.py:836:test_001()/24 +location: clients/tests/test-client.py:838:test_001()/24 cmd: $NMCLI --mode tabular --color yes general permissions lang: pl_PL.UTF-8 returncode: 0 @@ -521,7 +521,7 @@ org.freedesktop.NetworkManager.enable-disable-connectivity-check nieznane <<< size: 1635 -location: clients/tests/test-client.py:836:test_001()/25 +location: clients/tests/test-client.py:838:test_001()/25 cmd: $NMCLI --mode tabular --pretty general permissions lang: C returncode: 0 @@ -551,7 +551,7 @@ org.freedesktop.NetworkManager.enable-disable-connectivity-check unknown <<< size: 1692 -location: clients/tests/test-client.py:836:test_001()/26 +location: clients/tests/test-client.py:838:test_001()/26 cmd: $NMCLI --mode tabular --pretty general permissions lang: pl_PL.UTF-8 returncode: 0 @@ -581,7 +581,7 @@ org.freedesktop.NetworkManager.enable-disable-connectivity-check nieznane <<< size: 1764 -location: clients/tests/test-client.py:836:test_001()/27 +location: clients/tests/test-client.py:838:test_001()/27 cmd: $NMCLI --mode tabular --pretty --color yes general permissions lang: C returncode: 0 @@ -611,7 +611,7 @@ org.freedesktop.NetworkManager.enable-disable-connectivity-check unknown <<< size: 1821 -location: clients/tests/test-client.py:836:test_001()/28 +location: clients/tests/test-client.py:838:test_001()/28 cmd: $NMCLI --mode tabular --pretty --color yes general permissions lang: pl_PL.UTF-8 returncode: 0 @@ -641,7 +641,7 @@ org.freedesktop.NetworkManager.enable-disable-connectivity-check nieznane <<< size: 1060 -location: clients/tests/test-client.py:836:test_001()/29 +location: clients/tests/test-client.py:838:test_001()/29 cmd: $NMCLI --mode tabular --terse general permissions lang: C returncode: 0 @@ -666,7 +666,7 @@ org.freedesktop.NetworkManager.enable-disable-connectivity-check:unknown <<< size: 1070 -location: clients/tests/test-client.py:836:test_001()/30 +location: clients/tests/test-client.py:838:test_001()/30 cmd: $NMCLI --mode tabular --terse general permissions lang: pl_PL.UTF-8 returncode: 0 @@ -691,7 +691,7 @@ org.freedesktop.NetworkManager.enable-disable-connectivity-check:unknown <<< size: 1190 -location: clients/tests/test-client.py:836:test_001()/31 +location: clients/tests/test-client.py:838:test_001()/31 cmd: $NMCLI --mode tabular --terse --color yes general permissions lang: C returncode: 0 @@ -716,7 +716,7 @@ org.freedesktop.NetworkManager.enable-disable-connectivity-check:unknown <<< size: 1200 -location: clients/tests/test-client.py:836:test_001()/32 +location: clients/tests/test-client.py:838:test_001()/32 cmd: $NMCLI --mode tabular --terse --color yes general permissions lang: pl_PL.UTF-8 returncode: 0 @@ -741,7 +741,7 @@ org.freedesktop.NetworkManager.enable-disable-connectivity-check:unknown <<< size: 2335 -location: clients/tests/test-client.py:836:test_001()/33 +location: clients/tests/test-client.py:838:test_001()/33 cmd: $NMCLI --mode multiline general permissions lang: C returncode: 0 @@ -782,7 +782,7 @@ VALUE: unknown <<< size: 2351 -location: clients/tests/test-client.py:836:test_001()/34 +location: clients/tests/test-client.py:838:test_001()/34 cmd: $NMCLI --mode multiline general permissions lang: pl_PL.UTF-8 returncode: 0 @@ -823,7 +823,7 @@ VALUE: nieznane <<< size: 2464 -location: clients/tests/test-client.py:836:test_001()/35 +location: clients/tests/test-client.py:838:test_001()/35 cmd: $NMCLI --mode multiline --color yes general permissions lang: C returncode: 0 @@ -864,7 +864,7 @@ VALUE: unknown <<< size: 2480 -location: clients/tests/test-client.py:836:test_001()/36 +location: clients/tests/test-client.py:838:test_001()/36 cmd: $NMCLI --mode multiline --color yes general permissions lang: pl_PL.UTF-8 returncode: 0 @@ -905,7 +905,7 @@ VALUE: nieznane <<< size: 3837 -location: clients/tests/test-client.py:836:test_001()/37 +location: clients/tests/test-client.py:838:test_001()/37 cmd: $NMCLI --mode multiline --pretty general permissions lang: C returncode: 0 @@ -965,7 +965,7 @@ VALUE: unknown <<< size: 3858 -location: clients/tests/test-client.py:836:test_001()/38 +location: clients/tests/test-client.py:838:test_001()/38 cmd: $NMCLI --mode multiline --pretty general permissions lang: pl_PL.UTF-8 returncode: 0 @@ -1025,7 +1025,7 @@ VALUE: nieznane <<< size: 3966 -location: clients/tests/test-client.py:836:test_001()/39 +location: clients/tests/test-client.py:838:test_001()/39 cmd: $NMCLI --mode multiline --pretty --color yes general permissions lang: C returncode: 0 @@ -1085,7 +1085,7 @@ VALUE: unknown <<< size: 3987 -location: clients/tests/test-client.py:836:test_001()/40 +location: clients/tests/test-client.py:838:test_001()/40 cmd: $NMCLI --mode multiline --pretty --color yes general permissions lang: pl_PL.UTF-8 returncode: 0 @@ -1145,7 +1145,7 @@ VALUE: nieznane <<< size: 1335 -location: clients/tests/test-client.py:836:test_001()/41 +location: clients/tests/test-client.py:838:test_001()/41 cmd: $NMCLI --mode multiline --terse general permissions lang: C returncode: 0 @@ -1186,7 +1186,7 @@ VALUE:unknown <<< size: 1345 -location: clients/tests/test-client.py:836:test_001()/42 +location: clients/tests/test-client.py:838:test_001()/42 cmd: $NMCLI --mode multiline --terse general permissions lang: pl_PL.UTF-8 returncode: 0 @@ -1227,7 +1227,7 @@ VALUE:unknown <<< size: 1464 -location: clients/tests/test-client.py:836:test_001()/43 +location: clients/tests/test-client.py:838:test_001()/43 cmd: $NMCLI --mode multiline --terse --color yes general permissions lang: C returncode: 0 @@ -1268,7 +1268,7 @@ VALUE:unknown <<< size: 1474 -location: clients/tests/test-client.py:836:test_001()/44 +location: clients/tests/test-client.py:838:test_001()/44 cmd: $NMCLI --mode multiline --terse --color yes general permissions lang: pl_PL.UTF-8 returncode: 0 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..76b3ab58 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:844: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:844: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:846: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:846: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:848: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:848:test_002()/6 cmd: $NMCLI lang: pl_PL.UTF-8 returncode: 0 @@ -133,7 +133,7 @@ o użyciu. <<< size: 1260 -location: clients/tests/test-client.py:848:test_002()/7 +location: clients/tests/test-client.py:850:test_002()/7 cmd: $NMCLI -f AP -mode multiline d show wlan0 lang: C returncode: 0 @@ -166,7 +166,7 @@ AP[3].SECURITY: WPA1 WPA2 <<< size: 1297 -location: clients/tests/test-client.py:848:test_002()/8 +location: clients/tests/test-client.py:850:test_002()/8 cmd: $NMCLI -f AP -mode multiline d show wlan0 lang: pl_PL.UTF-8 returncode: 0 @@ -199,7 +199,7 @@ AP[3].SECURITY: WPA1 WPA2 <<< size: 1714 -location: clients/tests/test-client.py:849:test_002()/9 +location: clients/tests/test-client.py:851:test_002()/9 cmd: $NMCLI -f AP -mode multiline -p d show wlan0 lang: C returncode: 0 @@ -238,7 +238,7 @@ AP[3].SECURITY: WPA1 WPA2 <<< size: 1759 -location: clients/tests/test-client.py:849:test_002()/10 +location: clients/tests/test-client.py:851:test_002()/10 cmd: $NMCLI -f AP -mode multiline -p d show wlan0 lang: pl_PL.UTF-8 returncode: 0 @@ -277,7 +277,7 @@ AP[3].SECURITY: WPA1 WPA2 <<< size: 591 -location: clients/tests/test-client.py:850:test_002()/11 +location: clients/tests/test-client.py:852:test_002()/11 cmd: $NMCLI -f AP -mode multiline -t d show wlan0 lang: C returncode: 0 @@ -310,7 +310,7 @@ AP[3].SECURITY:WPA1 WPA2 <<< size: 628 -location: clients/tests/test-client.py:850:test_002()/12 +location: clients/tests/test-client.py:852:test_002()/12 cmd: $NMCLI -f AP -mode multiline -t d show wlan0 lang: pl_PL.UTF-8 returncode: 0 @@ -343,7 +343,7 @@ AP[3].SECURITY:WPA1 WPA2 <<< size: 455 -location: clients/tests/test-client.py:851:test_002()/13 +location: clients/tests/test-client.py:853:test_002()/13 cmd: $NMCLI -f AP -mode tabular d show wlan0 lang: C returncode: 0 @@ -356,7 +356,7 @@ 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:853:test_002()/14 cmd: $NMCLI -f AP -mode tabular d show wlan0 lang: pl_PL.UTF-8 returncode: 0 @@ -369,7 +369,7 @@ AP[3] wlan0-ap-2 Infrastruktura 1 54 Mb/s 34 ** WPA1 W <<< size: 614 -location: clients/tests/test-client.py:852:test_002()/15 +location: clients/tests/test-client.py:854:test_002()/15 cmd: $NMCLI -f AP -mode tabular -p d show wlan0 lang: C returncode: 0 @@ -386,7 +386,7 @@ 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:854:test_002()/16 cmd: $NMCLI -f AP -mode tabular -p d show wlan0 lang: pl_PL.UTF-8 returncode: 0 @@ -403,7 +403,7 @@ AP[3] wlan0-ap-2 Infrastruktura 1 54 Mb/s 34 ** WPA1 W <<< size: 319 -location: clients/tests/test-client.py:853:test_002()/17 +location: clients/tests/test-client.py:855:test_002()/17 cmd: $NMCLI -f AP -mode tabular -t d show wlan0 lang: C returncode: 0 @@ -415,7 +415,7 @@ 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 +location: clients/tests/test-client.py:855:test_002()/18 cmd: $NMCLI -f AP -mode tabular -t d show wlan0 lang: pl_PL.UTF-8 returncode: 0 @@ -427,7 +427,7 @@ 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:857:test_002()/19 cmd: $NMCLI -f ALL d wifi lang: C returncode: 0 @@ -445,7 +445,7 @@ 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:857:test_002()/20 cmd: $NMCLI -f ALL d wifi lang: pl_PL.UTF-8 returncode: 0 @@ -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:859: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:859: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:861: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:861: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..2ee10a52 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:872: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:875: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:875: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:880: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:885: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:888: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:888: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:891: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:891: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:895: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:895: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:898: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:898: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:911: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:914: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:914: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:917: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:917: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:920: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:920: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:923: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:923: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:926: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:926: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:929: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:929: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:932: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:932: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:935: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:935: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:938: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:938: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:941: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:941: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:944: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:944: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:911: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:914: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:914: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:917: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:917: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:920: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:920: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:923: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:923: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:926: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:926: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:929: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:929: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:932: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:932: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:935: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:935: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:938: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:938: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:941: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:941: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:944: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:944: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:959: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:959: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:962: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:962: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:965: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:965: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:968: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:968: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:971: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:971: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:959: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:959: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:962: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:962: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:965: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:965: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:968: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:968: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:971: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:971: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:959: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:959: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:962: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:962: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:965: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:965: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:968: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:968: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:971: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:971: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:959: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:959: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:962: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:962: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:965: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:965: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:968: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:968: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:971: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:971: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:959: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:959: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:962: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:962: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:965: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:965: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:968: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:968: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:971: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:971: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:959: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:959: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:962: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:962: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:965: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:965: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:968: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:968: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:971: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:971: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:959: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:959: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:962: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:962: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:965: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:965: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:968: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:968: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:971: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:971: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:959: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:959: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:962: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:962: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:965: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:965: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:968: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:968: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:971: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:971: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:959: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:959: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:962: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:962: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:965: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:965: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:968: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:968: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:971: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:971: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:959: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:959: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:962: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:962: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:965: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:965: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:968: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:968: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:971: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:971: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:959: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:959: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:962: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:962: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:965: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:965: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:968: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:968: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:971: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:971: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:959: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:959: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:962: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:962: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:965: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:965: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:968: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:968: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:971: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:971: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:959: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:959: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:962: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:962: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:965: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:965: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:968: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:968: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:971: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:971: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:959: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:959: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:962: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:962: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:965: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:965: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:968: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:968: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:971: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:971: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:959: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:959: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:962: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:962: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:965: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:965: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:968: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:968: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:971: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:971: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:959: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:959: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:962: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:962: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:965: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:965: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:968: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:968: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:971: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:971: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:959: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:959: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:962: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:962: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:965: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:965: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:968: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:968: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:971: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:971: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:959: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:959: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:962: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:962: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:965: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:965: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:968: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:968: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:971: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:971: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:959: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:959: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:962: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:962: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:965: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:965: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:968: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:968: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:971: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: 3550 +location: clients/tests/test-client.py:971:test_003()/249 cmd: $NMCLI -f all dev show eth0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 3293 bytes +stdout: 3399 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 @@ -12431,37 +12499,37 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[3]: | /org/freedesktop/NetworkMa <<< size: 2351 -location: clients/tests/test-client.py:957:test_003()/250 +location: clients/tests/test-client.py:959: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:959: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:962: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:962: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:965: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:965: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:968: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:968: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:971: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: 3562 +location: clients/tests/test-client.py:971:test_003()/259 cmd: $NMCLI --color yes -f all dev show eth0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 3293 bytes +stdout: 3399 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 @@ -12677,7 +12749,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[3]: | /org/freedesktop/NetworkMa <<< size: 2555 -location: clients/tests/test-client.py:957:test_003()/260 +location: clients/tests/test-client.py:959: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:959: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:962: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:962: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:965: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:965: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:968: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:968: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:971: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: 4416 +location: clients/tests/test-client.py:971:test_003()/269 cmd: $NMCLI --pretty -f all dev show eth0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 4150 bytes +stdout: 4256 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 @@ -12975,7 +13051,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[3]: | /org/freedesktop/NetworkMa <<< size: 2837 -location: clients/tests/test-client.py:957:test_003()/270 +location: clients/tests/test-client.py:959: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:959: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:962: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:962: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:965: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:965: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:968: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:968: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:971: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: 4428 +location: clients/tests/test-client.py:971:test_003()/279 cmd: $NMCLI --pretty --color yes -f all dev show eth0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 4150 bytes +stdout: 4256 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 @@ -13273,35 +13353,35 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[3]: | /org/freedesktop/NetworkMa <<< size: 1161 -location: clients/tests/test-client.py:957:test_003()/280 +location: clients/tests/test-client.py:959: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:959: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:962: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:962: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:965: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:965: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:968: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:968: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:971: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:971: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:959: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:959: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:962: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:962: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:965: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:965: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:968: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:968: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:971: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:971: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:959: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:959: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:962: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:962: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:965: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:965: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:968: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:968: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:971: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: 3042 +location: clients/tests/test-client.py:971:test_003()/309 cmd: $NMCLI --mode tabular -f all dev show eth0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 2804 bytes +stdout: 2876 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 @@ -13921,37 +14009,37 @@ CONNECTIONS /org/freedesktop/NetworkManager/Settings/Connection/{1,2,4} 5fcfd6 <<< size: 2366 -location: clients/tests/test-client.py:957:test_003()/310 +location: clients/tests/test-client.py:959: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:959: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 [32mtak 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:962: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:962: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:965: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:965: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:968: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:968: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:971: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: 3054 +location: clients/tests/test-client.py:971: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: 2876 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 @@ -14085,7 +14173,7 @@ CONNECTIONS /org/freedesktop/NetworkManager/Settings/Connection/{1,2,4} 5fcfd6 <<< size: 2570 -location: clients/tests/test-client.py:957:test_003()/320 +location: clients/tests/test-client.py:959: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:959: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:962: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:962: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:965: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:965: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:968: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:968: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:971: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: 4596 +location: clients/tests/test-client.py:971:test_003()/329 cmd: $NMCLI --mode tabular --pretty -f all dev show eth0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 4313 bytes +stdout: 4421 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 ------------------------------------------------------------ @@ -14301,7 +14389,7 @@ CONNECTIONS /org/freedesktop/NetworkManager/Settings/Connection/{1,2,4} 5fcfd6 <<< size: 2852 -location: clients/tests/test-client.py:957:test_003()/330 +location: clients/tests/test-client.py:959: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:959: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:962: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:962: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:965: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:965: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:968: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:968: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:971: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: 4608 +location: clients/tests/test-client.py:971: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: 4421 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 ------------------------------------------------------------ @@ -14517,35 +14605,35 @@ CONNECTIONS /org/freedesktop/NetworkManager/Settings/Connection/{1,2,4} 5fcfd6 <<< size: 1176 -location: clients/tests/test-client.py:957:test_003()/340 +location: clients/tests/test-client.py:959: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:959: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:962: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:962: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:965: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:965: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:968: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:968: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:971: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:971: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:959: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:959: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:962: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:962: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:965: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:965: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:968: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:968: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:971: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:971: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:959: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:959: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:962: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:962: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:965: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:965: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:968: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:968: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:971: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: 3567 +location: clients/tests/test-client.py:971:test_003()/369 cmd: $NMCLI --mode multiline -f all dev show eth0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 3293 bytes +stdout: 3399 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 @@ -15157,27 +15249,12 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[3]: | /org/freedesktop/NetworkMa <<< size: 4476 -location: clients/tests/test-client.py:957:test_003()/370 +location: clients/tests/test-client.py:959: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:959: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:962: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:962: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:965: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:965: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:968: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:968: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:971: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: 3579 +location: clients/tests/test-client.py:971: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: 3399 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 @@ -15545,7 +15641,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[3]: | /org/freedesktop/NetworkMa <<< size: 4820 -location: clients/tests/test-client.py:957:test_003()/380 +location: clients/tests/test-client.py:959: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:959: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:962: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:962: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:965: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:965: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:968: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:968: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:971: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: 4433 +location: clients/tests/test-client.py:971:test_003()/389 cmd: $NMCLI --mode multiline --pretty -f all dev show eth0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 4150 bytes +stdout: 4256 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 @@ -15997,7 +16097,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[3]: | /org/freedesktop/NetworkMa <<< size: 5102 -location: clients/tests/test-client.py:957:test_003()/390 +location: clients/tests/test-client.py:959: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:959: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:962: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:962: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:965: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:965: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:968: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:968: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:971: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: 4445 +location: clients/tests/test-client.py:971: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: 4256 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 @@ -16449,7 +16553,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[3]: | /org/freedesktop/NetworkMa <<< size: 1873 -location: clients/tests/test-client.py:957:test_003()/400 +location: clients/tests/test-client.py:959: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:959: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:962: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:962: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:965: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:965: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:968: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:968: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:971: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:971: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:959: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:959: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:962: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:962: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:965: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:965: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:968: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:968: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:971: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:971: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..386946cd 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:982: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:984: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:985: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:986: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:987:test_004()/5 cmd: $NMCLI connection mod con-xx1 802.abc '' lang: C returncode: 2 @@ -49,17 +49,17 @@ Error: invalid or not allowed setting '802': '802' is ambiguous: 802-11-wireless <<< size: 136 -location: clients/tests/test-client.py:986:test_004()/6 +location: clients/tests/test-client.py:988: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 +location: clients/tests/test-client.py:989: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 +location: clients/tests/test-client.py:991:test_004()/8 cmd: $NMCLI con s con-xx1 lang: C returncode: 0 @@ -152,7 +152,7 @@ proxy.pac-script: -- <<< size: 4075 -location: clients/tests/test-client.py:989:test_004()/9 +location: clients/tests/test-client.py:991:test_004()/9 cmd: $NMCLI con s con-xx1 lang: pl_PL.UTF-8 returncode: 0 @@ -245,7 +245,7 @@ proxy.pac-script: -- <<< size: 320 -location: clients/tests/test-client.py:996:test_004()/10 +location: clients/tests/test-client.py:998: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:1001: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:1001: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:1003: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:1003: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:1005: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:1007: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:1007: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:1009: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:1011: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:1011: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:1013:test_004()/21 cmd: $NMCLI con s con-vpn-1 lang: C returncode: 0 @@ -619,7 +619,7 @@ VPN.CFG[3]: key3 = val3 <<< size: 4621 -location: clients/tests/test-client.py:1011:test_004()/22 +location: clients/tests/test-client.py:1013:test_004()/22 cmd: $NMCLI con s con-vpn-1 lang: pl_PL.UTF-8 returncode: 0 @@ -721,7 +721,7 @@ VPN.CFG[3]: key3 = val3 <<< size: 4603 -location: clients/tests/test-client.py:1022:test_004()/23 +location: clients/tests/test-client.py:1024:test_004()/23 cmd: $NMCLI con s con-vpn-1 lang: C returncode: 0 @@ -823,7 +823,7 @@ VPN.CFG[3]: key3 = val3 <<< size: 4631 -location: clients/tests/test-client.py:1022:test_004()/24 +location: clients/tests/test-client.py:1024:test_004()/24 cmd: $NMCLI con s con-vpn-1 lang: pl_PL.UTF-8 returncode: 0 @@ -925,7 +925,7 @@ VPN.CFG[3]: key3 = val3 <<< size: 4603 -location: clients/tests/test-client.py:1024:test_004()/25 +location: clients/tests/test-client.py:1026:test_004()/25 cmd: $NMCLI con s con-vpn-1 lang: C returncode: 0 @@ -1027,7 +1027,7 @@ VPN.CFG[3]: key3 = val3 <<< size: 4631 -location: clients/tests/test-client.py:1024:test_004()/26 +location: clients/tests/test-client.py:1026:test_004()/26 cmd: $NMCLI con s con-vpn-1 lang: pl_PL.UTF-8 returncode: 0 @@ -1129,7 +1129,7 @@ VPN.CFG[3]: key3 = val3 <<< size: 3522 -location: clients/tests/test-client.py:1027:test_004()/27 +location: clients/tests/test-client.py:1029: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:1029: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:1035: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:1035: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:1038: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:1038: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:1041: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:1041: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:1044: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:1044: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:1047: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:1047: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: 20670 +location: clients/tests/test-client.py:1050:test_004()/39 +cmd: $NMCLI -f all dev show +lang: C +returncode: 0 +stdout: 20533 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 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 @@ -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: 20820 +location: clients/tests/test-client.py:1050:test_004()/40 +cmd: $NMCLI -f all dev show +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 20673 bytes +>>> GENERAL.DEVICE: wlan0 GENERAL.TYPE: wifi GENERAL.NM-TYPE: NMDeviceWifi @@ -2014,54 +2122,56 @@ 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[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 @@ -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:1053: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:1053: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: 4857 +location: clients/tests/test-client.py:1056:test_004()/43 cmd: $NMCLI -f all dev show wlan0 lang: C returncode: 0 -stdout: 4611 bytes +stdout: 4715 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 @@ -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: 4912 +location: clients/tests/test-client.py:1056:test_004()/44 cmd: $NMCLI -f all dev show wlan0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 4654 bytes +stdout: 4760 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 @@ -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:1059: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:1059: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:1062: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:1062: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:1065: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:1065: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:1068: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] 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 +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 + <<< size: 2052 -location: clients/tests/test-client.py:1066:test_004()/52 +location: clients/tests/test-client.py:1068: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] 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 +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 + <<< size: 618 -location: clients/tests/test-client.py:1068:test_004()/53 +location: clients/tests/test-client.py:1070: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 - 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 +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 + <<< size: 678 -location: clients/tests/test-client.py:1068:test_004()/54 +location: clients/tests/test-client.py:1070: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 - 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 +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 + <<< size: 2097 -location: clients/tests/test-client.py:1071:test_004()/55 +location: clients/tests/test-client.py:1073: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] 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 +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 + <<< size: 2165 -location: clients/tests/test-client.py:1071:test_004()/56 +location: clients/tests/test-client.py:1073: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] 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 +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 + <<< -size: 735 -location: clients/tests/test-client.py:1073:test_004()/57 +size: 737 +location: clients/tests/test-client.py:1075: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:1075: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:1077: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:1077: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:1080: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:1080: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: 4860 +location: clients/tests/test-client.py:1082:test_004()/63 cmd: $NMCLI -f ALL device show wlan0 lang: C returncode: 0 -stdout: 4611 bytes +stdout: 4715 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 @@ -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: 4915 +location: clients/tests/test-client.py:1082:test_004()/64 cmd: $NMCLI -f ALL device show wlan0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 4654 bytes +stdout: 4760 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 @@ -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:1084: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:1084: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: 4998 +location: clients/tests/test-client.py:1086: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: 4715 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 @@ -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: 5053 +location: clients/tests/test-client.py:1086: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: 4760 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 @@ -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:1024:test_004()/69 cmd: $NMCLI --color yes con s con-vpn-1 lang: C returncode: 0 @@ -3673,7 +3725,7 @@ VPN.CFG[3]: key3 = val3 <<< size: 4643 -location: clients/tests/test-client.py:1022:test_004()/70 +location: clients/tests/test-client.py:1024:test_004()/70 cmd: $NMCLI --color yes con s con-vpn-1 lang: pl_PL.UTF-8 returncode: 0 @@ -3775,7 +3827,7 @@ VPN.CFG[3]: key3 = val3 <<< size: 4615 -location: clients/tests/test-client.py:1024:test_004()/71 +location: clients/tests/test-client.py:1026:test_004()/71 cmd: $NMCLI --color yes con s con-vpn-1 lang: C returncode: 0 @@ -3877,7 +3929,7 @@ VPN.CFG[3]: key3 = val3 <<< size: 4643 -location: clients/tests/test-client.py:1024:test_004()/72 +location: clients/tests/test-client.py:1026:test_004()/72 cmd: $NMCLI --color yes con s con-vpn-1 lang: pl_PL.UTF-8 returncode: 0 @@ -3979,7 +4031,7 @@ VPN.CFG[3]: key3 = val3 <<< size: 3534 -location: clients/tests/test-client.py:1027:test_004()/73 +location: clients/tests/test-client.py:1029: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:1029: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:1035: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:1035: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:1038: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:1038: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:1041: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:1041: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:1044: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:1044: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:1047: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:1047: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: 20970 +location: clients/tests/test-client.py:1050:test_004()/85 +cmd: $NMCLI --color yes -f all dev show +lang: C +returncode: 0 +stdout: 20821 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 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 @@ -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: 21120 +location: clients/tests/test-client.py:1050:test_004()/86 +cmd: $NMCLI --color yes -f all dev show +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 20961 bytes +>>> GENERAL.DEVICE: wlan0 GENERAL.TYPE: wifi GENERAL.NM-TYPE: NMDeviceWifi @@ -4864,54 +5024,56 @@ 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[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 @@ -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:1053: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:1053: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: 5085 +location: clients/tests/test-client.py:1056:test_004()/89 cmd: $NMCLI --color yes -f all dev show wlan0 lang: C returncode: 0 -stdout: 4827 bytes +stdout: 4931 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 @@ -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: 5140 +location: clients/tests/test-client.py:1056:test_004()/90 cmd: $NMCLI --color yes -f all dev show wlan0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 4870 bytes +stdout: 4976 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 @@ -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:1059: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:1059: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:1062: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:1062: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:1065: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:1065: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:1068: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] 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 +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 + <<< size: 2676 -location: clients/tests/test-client.py:1066:test_004()/98 +location: clients/tests/test-client.py:1068: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] 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 +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 + <<< size: 918 -location: clients/tests/test-client.py:1068:test_004()/99 +location: clients/tests/test-client.py:1070: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 -  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 +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 + <<< size: 979 -location: clients/tests/test-client.py:1068:test_004()/100 +location: clients/tests/test-client.py:1070: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 -  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 +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 + <<< size: 2722 -location: clients/tests/test-client.py:1071:test_004()/101 +location: clients/tests/test-client.py:1073: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] 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 +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 + <<< size: 2790 -location: clients/tests/test-client.py:1071:test_004()/102 +location: clients/tests/test-client.py:1073: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] 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 +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 + <<< -size: 901 -location: clients/tests/test-client.py:1073:test_004()/103 +size: 903 +location: clients/tests/test-client.py:1075: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:1075: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:1077: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:1077: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:1080: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:1080: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: 5089 +location: clients/tests/test-client.py:1082:test_004()/109 cmd: $NMCLI --color yes -f ALL device show wlan0 lang: C returncode: 0 -stdout: 4827 bytes +stdout: 4931 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 @@ -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: 5144 +location: clients/tests/test-client.py:1082:test_004()/110 cmd: $NMCLI --color yes -f ALL device show wlan0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 4870 bytes +stdout: 4976 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 @@ -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:1084: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:1084: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: 5227 +location: clients/tests/test-client.py:1086: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: 4931 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 @@ -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: 5282 +location: clients/tests/test-client.py:1086: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: 4976 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 @@ -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:1024:test_004()/115 cmd: $NMCLI --pretty con s con-vpn-1 lang: C returncode: 0 @@ -6536,7 +6640,7 @@ VPN.CFG[3]: key3 = val3 <<< size: 5665 -location: clients/tests/test-client.py:1022:test_004()/116 +location: clients/tests/test-client.py:1024:test_004()/116 cmd: $NMCLI --pretty con s con-vpn-1 lang: pl_PL.UTF-8 returncode: 0 @@ -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:1026:test_004()/117 cmd: $NMCLI --pretty con s con-vpn-1 lang: C returncode: 0 @@ -6766,7 +6870,7 @@ VPN.CFG[3]: key3 = val3 <<< size: 5665 -location: clients/tests/test-client.py:1024:test_004()/118 +location: clients/tests/test-client.py:1026:test_004()/118 cmd: $NMCLI --pretty con s con-vpn-1 lang: pl_PL.UTF-8 returncode: 0 @@ -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:1029: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:1029: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:1035: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:1035: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:1038: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:1038: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:1041: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:1041: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:1044: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:1044: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:1047: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:1047: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: 25255 +location: clients/tests/test-client.py:1050:test_004()/131 +cmd: $NMCLI --pretty -f all dev show +lang: C +returncode: 0 +stdout: 25108 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 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 @@ -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: 25438 +location: clients/tests/test-client.py:1050:test_004()/132 +cmd: $NMCLI --pretty -f all dev show +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 25281 bytes +>>> =============================================================================== - Device details (wlan0) + Informacje o urządzeniu (wlan0) =============================================================================== GENERAL.DEVICE: wlan0 GENERAL.TYPE: wifi @@ -7986,59 +8212,61 @@ 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[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 @@ -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:1053: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:1053: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: 5958 +location: clients/tests/test-client.py:1056:test_004()/135 +cmd: $NMCLI --pretty -f all dev show wlan0 +lang: C +returncode: 0 +stdout: 5806 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 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: 6020 +location: clients/tests/test-client.py:1056:test_004()/136 +cmd: $NMCLI --pretty -f all dev show wlan0 +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 5858 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 @@ -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:1059: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:1059: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:1062: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:1062: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:1065: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:1065: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:1068: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 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 + =========================== 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:1068: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 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 + ======================================== 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:1070: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 WPA2 + wlan0-ap-3 Infra 1 54 Mbit/s 55 ** WPA1 WPA2 + =========================== 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:1070: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 WPA2 + wlan0-ap-3 Infrastruktura 1 54 Mb/s 55 ** WPA1 WPA2 + ======================================== 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:1073: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 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 + =========================== 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:1073: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 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 + ======================================== 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:1075: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:1075: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:1077: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:1077: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:1080: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:1080: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: 5961 +location: clients/tests/test-client.py:1082:test_004()/155 cmd: $NMCLI --pretty -f ALL device show wlan0 lang: C returncode: 0 -stdout: 5702 bytes +stdout: 5806 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 @@ -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: 6023 +location: clients/tests/test-client.py:1082:test_004()/156 cmd: $NMCLI --pretty -f ALL device show wlan0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 5752 bytes +stdout: 5858 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 @@ -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:1084: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:1084: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: 6099 +location: clients/tests/test-client.py:1086: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: 5806 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 @@ -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: 6161 +location: clients/tests/test-client.py:1086: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: 5858 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 @@ -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:1024:test_004()/161 cmd: $NMCLI --pretty --color yes con s con-vpn-1 lang: C returncode: 0 @@ -9988,7 +10144,7 @@ VPN.CFG[3]: key3 = val3 <<< size: 5677 -location: clients/tests/test-client.py:1022:test_004()/162 +location: clients/tests/test-client.py:1024:test_004()/162 cmd: $NMCLI --pretty --color yes con s con-vpn-1 lang: pl_PL.UTF-8 returncode: 0 @@ -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:1026:test_004()/163 cmd: $NMCLI --pretty --color yes con s con-vpn-1 lang: C returncode: 0 @@ -10218,7 +10374,7 @@ VPN.CFG[3]: key3 = val3 <<< size: 5677 -location: clients/tests/test-client.py:1024:test_004()/164 +location: clients/tests/test-client.py:1026:test_004()/164 cmd: $NMCLI --pretty --color yes con s con-vpn-1 lang: pl_PL.UTF-8 returncode: 0 @@ -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:1029: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:1029: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:1035: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:1035: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:1038: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:1038: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:1041: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:1041: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:1044: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:1044: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:1047: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:1047: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: 25555 +location: clients/tests/test-client.py:1050:test_004()/177 +cmd: $NMCLI --pretty --color yes -f all dev show +lang: C +returncode: 0 +stdout: 25396 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 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 @@ -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: 25738 +location: clients/tests/test-client.py:1050:test_004()/178 +cmd: $NMCLI --pretty --color yes -f all dev show +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 25569 bytes +>>> =============================================================================== - Device details (wlan0) + Informacje o urządzeniu (wlan0) =============================================================================== GENERAL.DEVICE: wlan0 GENERAL.TYPE: wifi @@ -11438,59 +11716,61 @@ 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[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 @@ -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:1053: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:1053: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: 6186 +location: clients/tests/test-client.py:1056:test_004()/181 cmd: $NMCLI --pretty --color yes -f all dev show wlan0 lang: C returncode: 0 -stdout: 5918 bytes +stdout: 6022 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 @@ -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: 6248 +location: clients/tests/test-client.py:1056:test_004()/182 cmd: $NMCLI --pretty --color yes -f all dev show wlan0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 5968 bytes +stdout: 6074 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 @@ -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:1059: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:1059: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:1062: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:1062: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:1065: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:1065: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:1068: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 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 + =========================== 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:1068: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 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 + ======================================== 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:1070: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 WPA2 +  wlan0-ap-3 Infra 1 54 Mbit/s 55 **  WPA1 WPA2 + =========================== 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:1070: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 WPA2 +  wlan0-ap-3 Infrastruktura 1 54 Mb/s 55 **  WPA1 WPA2 + ======================================== 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:1073: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 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 + =========================== 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:1073: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 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 + ======================================== 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:1075: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:1075: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:1077: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:1077: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:1080: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:1080: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: 6189 +location: clients/tests/test-client.py:1082:test_004()/201 cmd: $NMCLI --pretty --color yes -f ALL device show wlan0 lang: C returncode: 0 -stdout: 5918 bytes +stdout: 6022 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 @@ -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: 6251 +location: clients/tests/test-client.py:1082:test_004()/202 cmd: $NMCLI --pretty --color yes -f ALL device show wlan0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 5968 bytes +stdout: 6074 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 @@ -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:1084: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:1084: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: 6327 +location: clients/tests/test-client.py:1086: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: 6022 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 @@ -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: 6389 +location: clients/tests/test-client.py:1086: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: 6074 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 @@ -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:1024: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:1024: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:1026: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:1026: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:1029: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:1029: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:1035: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:1035: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:1038: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:1038: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:1041: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:1041: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:1044: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:1044: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:1047: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:1047: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: 11937 +location: clients/tests/test-client.py:1050:test_004()/223 +cmd: $NMCLI --terse -f all dev show +lang: C +returncode: 0 +stdout: 11791 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 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 @@ -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: 11983 +location: clients/tests/test-client.py:1050:test_004()/224 +cmd: $NMCLI --terse -f all dev show +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 11827 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,25 +14961,25 @@ 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[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 @@ -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:1053: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:1053: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: 2703 +location: clients/tests/test-client.py:1056:test_004()/227 cmd: $NMCLI --terse -f all dev show wlan0 lang: C returncode: 0 -stdout: 2478 bytes +stdout: 2552 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 @@ -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: 2740 +location: clients/tests/test-client.py:1056:test_004()/228 cmd: $NMCLI --terse -f all dev show wlan0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 2505 bytes +stdout: 2579 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 @@ -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:1059: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:1059: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:1062: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:1062: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:1065: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:1065: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 +location: clients/tests/test-client.py:1068:test_004()/235 cmd: $NMCLI --terse -f ALL device wifi list lang: C returncode: 0 stdout: 1022 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 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 +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 + + <<< size: 1233 -location: clients/tests/test-client.py:1066:test_004()/236 +location: clients/tests/test-client.py:1068:test_004()/236 cmd: $NMCLI --terse -f ALL device wifi list lang: pl_PL.UTF-8 returncode: 0 stdout: 1070 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 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 +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 + + <<< size: 353 -location: clients/tests/test-client.py:1068:test_004()/237 +location: clients/tests/test-client.py:1070:test_004()/237 cmd: $NMCLI --terse -f COMMON device wifi list lang: C returncode: 0 stdout: 198 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 WPA2 :wlan0-ap-3:Infra:1:54 Mbit/s:55:** :WPA1 WPA2 + :wlan1-ap-4:Infra:1:54 Mbit/s:48:** :WPA1 WPA2 + + <<< size: 399 -location: clients/tests/test-client.py:1068:test_004()/238 +location: clients/tests/test-client.py:1070:test_004()/238 cmd: $NMCLI --terse -f COMMON device wifi list lang: pl_PL.UTF-8 returncode: 0 stdout: 234 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 WPA2 :wlan0-ap-3:Infrastruktura:1:54 Mb/s:55:** :WPA1 WPA2 + :wlan1-ap-4:Infrastruktura:1:54 Mb/s:48:** :WPA1 WPA2 + + <<< size: 1288 -location: clients/tests/test-client.py:1071:test_004()/239 +location: clients/tests/test-client.py:1073: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 >>> -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 +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 + + <<< size: 1346 -location: clients/tests/test-client.py:1071:test_004()/240 +location: clients/tests/test-client.py:1073: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 >>> -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 +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 + + <<< -size: 431 -location: clients/tests/test-client.py:1073:test_004()/241 +size: 433 +location: clients/tests/test-client.py:1075: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:1075: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:1077: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:1077: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:1080: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:1080: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: 2706 +location: clients/tests/test-client.py:1082:test_004()/247 cmd: $NMCLI --terse -f ALL device show wlan0 lang: C returncode: 0 -stdout: 2478 bytes +stdout: 2552 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 @@ -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: 2743 +location: clients/tests/test-client.py:1082:test_004()/248 cmd: $NMCLI --terse -f ALL device show wlan0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 2505 bytes +stdout: 2579 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 @@ -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:1084: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:1084: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: 2844 +location: clients/tests/test-client.py:1086: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: 2552 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 @@ -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: 2881 +location: clients/tests/test-client.py:1086: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: 2579 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 @@ -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:1024: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:1024: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:1026: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:1026: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:1029: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:1029: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:1035: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:1035: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:1038: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:1038: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:1041: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:1041: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:1044: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:1044: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:1047: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:1047: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: 12237 +location: clients/tests/test-client.py:1050:test_004()/269 +cmd: $NMCLI --terse --color yes -f all dev show +lang: C +returncode: 0 +stdout: 12079 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 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 @@ -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: 12283 +location: clients/tests/test-client.py:1050:test_004()/270 +cmd: $NMCLI --terse --color yes -f all dev show +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 12115 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,25 +17833,25 @@ 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[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 @@ -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:1053: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:1053: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: 2931 +location: clients/tests/test-client.py:1056:test_004()/273 cmd: $NMCLI --terse --color yes -f all dev show wlan0 lang: C returncode: 0 -stdout: 2694 bytes +stdout: 2768 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 @@ -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: 2968 +location: clients/tests/test-client.py:1056:test_004()/274 cmd: $NMCLI --terse --color yes -f all dev show wlan0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 2721 bytes +stdout: 2795 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 @@ -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:1059: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:1059: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:1062: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:1062: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:1065: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:1065: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 +location: clients/tests/test-client.py:1068:test_004()/281 cmd: $NMCLI --terse --color yes -f ALL device wifi list lang: C returncode: 0 stdout: 1634 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 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 +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 + + <<< size: 1857 -location: clients/tests/test-client.py:1066:test_004()/282 +location: clients/tests/test-client.py:1068:test_004()/282 cmd: $NMCLI --terse --color yes -f ALL device wifi list lang: pl_PL.UTF-8 returncode: 0 stdout: 1682 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 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 +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 + + <<< size: 653 -location: clients/tests/test-client.py:1068:test_004()/283 +location: clients/tests/test-client.py:1070:test_004()/283 cmd: $NMCLI --terse --color yes -f COMMON device wifi list lang: C returncode: 0 stdout: 486 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 WPA2  :wlan0-ap-3:Infra:1:54 Mbit/s:55:** :WPA1 WPA2 + :wlan1-ap-4:Infra:1:54 Mbit/s:48:** :WPA1 WPA2 + + <<< size: 699 -location: clients/tests/test-client.py:1068:test_004()/284 +location: clients/tests/test-client.py:1070:test_004()/284 cmd: $NMCLI --terse --color yes -f COMMON device wifi list lang: pl_PL.UTF-8 returncode: 0 stdout: 522 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 WPA2  :wlan0-ap-3:Infrastruktura:1:54 Mb/s:55:** :WPA1 WPA2 + :wlan1-ap-4:Infrastruktura:1:54 Mb/s:48:** :WPA1 WPA2 + + <<< size: 1912 -location: clients/tests/test-client.py:1071:test_004()/285 +location: clients/tests/test-client.py:1073: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 >>> -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 +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 + + <<< size: 1970 -location: clients/tests/test-client.py:1071:test_004()/286 +location: clients/tests/test-client.py:1073: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 >>> -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 +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 + + <<< -size: 596 -location: clients/tests/test-client.py:1073:test_004()/287 +size: 598 +location: clients/tests/test-client.py:1075: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:1075: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:1077: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:1077: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:1080: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:1080: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: 2934 +location: clients/tests/test-client.py:1082:test_004()/293 cmd: $NMCLI --terse --color yes -f ALL device show wlan0 lang: C returncode: 0 -stdout: 2694 bytes +stdout: 2768 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 @@ -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: 2971 +location: clients/tests/test-client.py:1082:test_004()/294 cmd: $NMCLI --terse --color yes -f ALL device show wlan0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 2721 bytes +stdout: 2795 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 @@ -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:1084: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:1084: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: 3072 +location: clients/tests/test-client.py:1086: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: 2768 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 @@ -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: 3109 +location: clients/tests/test-client.py:1086: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: 2795 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 @@ -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:1024:test_004()/299 cmd: $NMCLI --mode tabular con s con-vpn-1 lang: C returncode: 0 @@ -18994,7 +19306,7 @@ VPN openvpn -- -- *** VPN connection con-vpn-1 *** 5 - VPN conn <<< size: 2999 -location: clients/tests/test-client.py:1022:test_004()/300 +location: clients/tests/test-client.py:1024:test_004()/300 cmd: $NMCLI --mode tabular con s con-vpn-1 lang: pl_PL.UTF-8 returncode: 0 @@ -19023,7 +19335,7 @@ VPN openvpn -- -- *** VPN connection con-vpn-1 *** 5 - Połącz <<< size: 2978 -location: clients/tests/test-client.py:1024:test_004()/301 +location: clients/tests/test-client.py:1026:test_004()/301 cmd: $NMCLI --mode tabular con s con-vpn-1 lang: C returncode: 0 @@ -19052,7 +19364,7 @@ VPN openvpn -- -- *** VPN connection con-vpn-1 *** 5 - VPN conn <<< size: 2999 -location: clients/tests/test-client.py:1024:test_004()/302 +location: clients/tests/test-client.py:1026:test_004()/302 cmd: $NMCLI --mode tabular con s con-vpn-1 lang: pl_PL.UTF-8 returncode: 0 @@ -19081,7 +19393,7 @@ VPN openvpn -- -- *** VPN connection con-vpn-1 *** 5 - Połącz <<< size: 2246 -location: clients/tests/test-client.py:1027:test_004()/303 +location: clients/tests/test-client.py:1029: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:1029: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:1035: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:1035: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:1038: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:1038: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:1041: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:1041: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:1044: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:1044: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:1047: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:1047: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:1050: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 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 -<<< -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:1050: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 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 @@ -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:1053: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:1053: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:1056: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 @@ -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:1056: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 @@ -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:1059: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:1059: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:1062: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:1062: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:1065: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:1065: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:1068: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] 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 +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 + <<< size: 2068 -location: clients/tests/test-client.py:1066:test_004()/328 +location: clients/tests/test-client.py:1068: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] 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 +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 + <<< size: 634 -location: clients/tests/test-client.py:1068:test_004()/329 +location: clients/tests/test-client.py:1070: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 - 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 +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 + <<< size: 694 -location: clients/tests/test-client.py:1068:test_004()/330 +location: clients/tests/test-client.py:1070: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 - 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 +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 + <<< size: 2113 -location: clients/tests/test-client.py:1071:test_004()/331 +location: clients/tests/test-client.py:1073: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] 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 +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 + <<< size: 2181 -location: clients/tests/test-client.py:1071:test_004()/332 +location: clients/tests/test-client.py:1073: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] 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 +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 + <<< -size: 751 -location: clients/tests/test-client.py:1073:test_004()/333 +size: 753 +location: clients/tests/test-client.py:1075: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:1075: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:1077: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:1077: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:1080: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:1080: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:1082: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 @@ -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:1082: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 @@ -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:1084: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:1084: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:1086: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 @@ -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:1086: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 @@ -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:1024:test_004()/345 cmd: $NMCLI --mode tabular --color yes con s con-vpn-1 lang: C returncode: 0 @@ -20470,7 +20794,7 @@ VPN openvpn -- -- *** VPN connection con-vpn-1 *** 5 - VPN conn <<< size: 3011 -location: clients/tests/test-client.py:1022:test_004()/346 +location: clients/tests/test-client.py:1024:test_004()/346 cmd: $NMCLI --mode tabular --color yes con s con-vpn-1 lang: pl_PL.UTF-8 returncode: 0 @@ -20499,7 +20823,7 @@ VPN openvpn -- -- *** VPN connection con-vpn-1 *** 5 - Połącz <<< size: 2990 -location: clients/tests/test-client.py:1024:test_004()/347 +location: clients/tests/test-client.py:1026:test_004()/347 cmd: $NMCLI --mode tabular --color yes con s con-vpn-1 lang: C returncode: 0 @@ -20528,7 +20852,7 @@ VPN openvpn -- -- *** VPN connection con-vpn-1 *** 5 - VPN conn <<< size: 3011 -location: clients/tests/test-client.py:1024:test_004()/348 +location: clients/tests/test-client.py:1026:test_004()/348 cmd: $NMCLI --mode tabular --color yes con s con-vpn-1 lang: pl_PL.UTF-8 returncode: 0 @@ -20557,7 +20881,7 @@ VPN openvpn -- -- *** VPN connection con-vpn-1 *** 5 - Połącz <<< size: 2258 -location: clients/tests/test-client.py:1027:test_004()/349 +location: clients/tests/test-client.py:1029: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:1029: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:1035: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:1035: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:1038: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:1038:test_004()/354 cmd: $NMCLI --mode tabular --color yes -f GENERAL con s con-vpn-1 lang: pl_PL.UTF-8 returncode: 0 @@ -20649,72 +20973,99 @@ 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:1041: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:1041: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:1044: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:1044: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:1047:test_004()/359 cmd: $NMCLI --mode tabular --color yes 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 @@ -20829,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:1047:test_004()/360 +cmd: $NMCLI --mode tabular --color yes dev show +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 6233 bytes +>>> DEVICE wlan0 @@ -20842,7 +21201,7 @@ MTU 0 STATE -20 (unavailable) +20 (niedostępne) CONNECTION con-vpn-1 @@ -20856,14 +21215,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 @@ -20978,43 +21329,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: 15197 +location: clients/tests/test-client.py:1050:test_004()/361 +cmd: $NMCLI --mode tabular --color yes -f all dev show +lang: C +returncode: 0 +stdout: 15032 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 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 -<<< -size: 14837 -location: clients/tests/test-client.py:1048:test_004()/361 -cmd: $NMCLI --mode tabular --color yes -f all dev show -lang: C -returncode: 0 -stdout: 14672 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 @@ -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:1050: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 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 @@ -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:1053: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:1053: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:1056: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 @@ -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:1056: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 @@ -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:1059: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:1059: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:1062: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:1062: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:1065: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:1065: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:1068: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] 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 +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 + <<< size: 2692 -location: clients/tests/test-client.py:1066:test_004()/374 +location: clients/tests/test-client.py:1068: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] 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 +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 + <<< size: 934 -location: clients/tests/test-client.py:1068:test_004()/375 +location: clients/tests/test-client.py:1070: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 -  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 +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 + <<< size: 994 -location: clients/tests/test-client.py:1068:test_004()/376 +location: clients/tests/test-client.py:1070: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 -  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 +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 + <<< size: 2737 -location: clients/tests/test-client.py:1071:test_004()/377 +location: clients/tests/test-client.py:1073: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] 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 +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 + <<< size: 2805 -location: clients/tests/test-client.py:1071:test_004()/378 +location: clients/tests/test-client.py:1073: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] 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 +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 + <<< -size: 916 -location: clients/tests/test-client.py:1073:test_004()/379 +size: 918 +location: clients/tests/test-client.py:1075: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:1075: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:1077: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:1077: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:1080: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:1080: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:1082: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 @@ -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:1082: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 @@ -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:1084: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:1084: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:1086: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 @@ -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:1086: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 @@ -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:1024:test_004()/391 cmd: $NMCLI --mode tabular --pretty con s con-vpn-1 lang: C returncode: 0 @@ -21959,7 +22295,7 @@ VPN openvpn -- -- *** VPN connection con-vpn-1 *** 5 - VPN conn <<< size: 4796 -location: clients/tests/test-client.py:1022:test_004()/392 +location: clients/tests/test-client.py:1024:test_004()/392 cmd: $NMCLI --mode tabular --pretty con s con-vpn-1 lang: pl_PL.UTF-8 returncode: 0 @@ -22001,7 +22337,7 @@ VPN openvpn -- -- *** VPN connection con-vpn-1 *** 5 - Połącz <<< size: 4742 -location: clients/tests/test-client.py:1024:test_004()/393 +location: clients/tests/test-client.py:1026:test_004()/393 cmd: $NMCLI --mode tabular --pretty con s con-vpn-1 lang: C returncode: 0 @@ -22043,7 +22379,7 @@ VPN openvpn -- -- *** VPN connection con-vpn-1 *** 5 - VPN conn <<< size: 4796 -location: clients/tests/test-client.py:1024:test_004()/394 +location: clients/tests/test-client.py:1026:test_004()/394 cmd: $NMCLI --mode tabular --pretty con s con-vpn-1 lang: pl_PL.UTF-8 returncode: 0 @@ -22085,7 +22421,7 @@ VPN openvpn -- -- *** VPN connection con-vpn-1 *** 5 - Połącz <<< size: 3428 -location: clients/tests/test-client.py:1027:test_004()/395 +location: clients/tests/test-client.py:1029: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:1029: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:1035: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:1035: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:1038: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:1038: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:1041: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:1041: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:1044: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:1044: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:1047: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:1047: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:1050: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 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 -<<< -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:1050: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 WPA2 +AP[3] wlan0-ap-3 Infrastruktura 1 54 Mb/s 55 ** WPA1 WPA2 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:1053: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:1053: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:1056: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 ----------------------------------------------------------- @@ -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:1056: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 ------------------------------------------------------------ @@ -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:1059: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:1059: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:1062: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:1062: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:1065: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:1065: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:1068: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 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 + =========================== 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:1068: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 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 + ======================================== 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:1070: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 WPA2 + wlan0-ap-3 Infra 1 54 Mbit/s 55 ** WPA1 WPA2 + =========================== 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:1070: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 WPA2 + wlan0-ap-3 Infrastruktura 1 54 Mb/s 55 ** WPA1 WPA2 + ======================================== 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:1073: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 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 + =========================== 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:1073: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 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 + ======================================== 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:1075: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:1075: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:1077: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:1077: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:1080: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:1080: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:1082: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 ----------------------------------------------------------- @@ -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:1082: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 ------------------------------------------------------------ @@ -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:1084: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:1084: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:1086: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 ----------------------------------------------------------- @@ -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:1086: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 ------------------------------------------------------------ @@ -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:1024:test_004()/437 cmd: $NMCLI --mode tabular --pretty --color yes con s con-vpn-1 lang: C returncode: 0 @@ -24023,7 +24371,7 @@ VPN openvpn -- -- *** VPN connection con-vpn-1 *** 5 - VPN conn <<< size: 4808 -location: clients/tests/test-client.py:1022:test_004()/438 +location: clients/tests/test-client.py:1024:test_004()/438 cmd: $NMCLI --mode tabular --pretty --color yes con s con-vpn-1 lang: pl_PL.UTF-8 returncode: 0 @@ -24065,7 +24413,7 @@ VPN openvpn -- -- *** VPN connection con-vpn-1 *** 5 - Połącz <<< size: 4754 -location: clients/tests/test-client.py:1024:test_004()/439 +location: clients/tests/test-client.py:1026:test_004()/439 cmd: $NMCLI --mode tabular --pretty --color yes con s con-vpn-1 lang: C returncode: 0 @@ -24107,7 +24455,7 @@ VPN openvpn -- -- *** VPN connection con-vpn-1 *** 5 - VPN conn <<< size: 4808 -location: clients/tests/test-client.py:1024:test_004()/440 +location: clients/tests/test-client.py:1026:test_004()/440 cmd: $NMCLI --mode tabular --pretty --color yes con s con-vpn-1 lang: pl_PL.UTF-8 returncode: 0 @@ -24149,7 +24497,7 @@ VPN openvpn -- -- *** VPN connection con-vpn-1 *** 5 - Połącz <<< size: 3440 -location: clients/tests/test-client.py:1027:test_004()/441 +location: clients/tests/test-client.py:1029: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:1029: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:1035: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:1035: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:1038: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:1038: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:1041: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:1041: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:1044: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:1044: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:1047: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:1047: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:1050: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 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 -<<< -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,26 +25313,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: 23287 +location: clients/tests/test-client.py:1050:test_004()/454 +cmd: $NMCLI --mode tabular --pretty --color yes -f all dev show +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 23103 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 WPA2 +AP[3]   wlan0-ap-3 Infrastruktura 1 54 Mb/s 55 **  WPA1 WPA2 GROUP ADDRESS GATEWAY ROUTE DNS DOMAIN WINS ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------- @@ -24965,20 +25362,12 @@ NAME AVAILABLE-CONNECTION-PATHS AVAILABLE- ---------------------------------------------------------------------------------------------------------------------- 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 -cmd: $NMCLI --mode tabular --pretty --color yes -f all dev show -lang: pl_PL.UTF-8 -returncode: 0 -stdout: 22563 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 ------------------------------------------------------------ @@ -25011,9 +25400,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 ------------------------------------------------------------ @@ -25046,9 +25435,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 ------------------------------------------------------------ @@ -25085,9 +25474,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 ------------------------------------------------------------ @@ -25120,50 +25509,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: 1726 -location: clients/tests/test-client.py:1051:test_004()/455 +location: clients/tests/test-client.py:1053: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:1053: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:1056: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 ----------------------------------------------------------- @@ -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:1056: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 ------------------------------------------------------------ @@ -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:1059: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:1059: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:1062: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:1062: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:1065: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:1065: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:1068: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 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 + =========================== 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:1068: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 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 + ======================================== 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:1070: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 WPA2 +  wlan0-ap-3 Infra 1 54 Mbit/s 55 **  WPA1 WPA2 + =========================== 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:1070: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 WPA2 +  wlan0-ap-3 Infrastruktura 1 54 Mb/s 55 **  WPA1 WPA2 + ======================================== 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:1073: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 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 + =========================== 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:1073: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 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 + ======================================== 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:1075: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:1075: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:1077: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:1077: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:1080: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:1080: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:1082: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 ----------------------------------------------------------- @@ -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:1082: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 ------------------------------------------------------------ @@ -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:1084: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:1084: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:1086: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 ----------------------------------------------------------- @@ -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:1086: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 ------------------------------------------------------------ @@ -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:1024: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:1024: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:1026: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:1026: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:1029: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:1029: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:1035: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:1035: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:1038: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:1038: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:1041: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:1041: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:1044: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:1044: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:1047: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:1047: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: 6325 +location: clients/tests/test-client.py:1050:test_004()/499 cmd: $NMCLI --mode tabular --terse -f all dev show lang: C returncode: 0 -stdout: 6045 bytes +stdout: 6165 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 WPA2 +AP[3]: :wlan0-ap-3:Infra:1:54 Mbit/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 + +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: 6371 +location: clients/tests/test-client.py:1050:test_004()/500 +cmd: $NMCLI --mode tabular --terse -f all dev show +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 6201 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 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: 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:1053: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:1053:test_004()/502 cmd: $NMCLI --mode tabular --terse dev show wlan0 lang: pl_PL.UTF-8 returncode: 0 @@ -26502,14 +26862,14 @@ 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: 1365 +location: clients/tests/test-client.py:1056:test_004()/503 cmd: $NMCLI --mode tabular --terse -f all dev show wlan0 lang: C returncode: 0 -stdout: 1175 bytes +stdout: 1199 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 @@ -26522,14 +26882,14 @@ 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: 1402 +location: clients/tests/test-client.py:1056:test_004()/504 cmd: $NMCLI --mode tabular --terse -f all dev show wlan0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 1202 bytes +stdout: 1226 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 @@ -26542,240 +26902,252 @@ 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:1059: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:1059: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:1062: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:1062: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:1065: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:1065: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 +location: clients/tests/test-client.py:1068:test_004()/511 cmd: $NMCLI --mode tabular --terse -f ALL device wifi list lang: C returncode: 0 stdout: 1022 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 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 +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 + + <<< size: 1248 -location: clients/tests/test-client.py:1066:test_004()/512 +location: clients/tests/test-client.py:1068:test_004()/512 cmd: $NMCLI --mode tabular --terse -f ALL device wifi list lang: pl_PL.UTF-8 returncode: 0 stdout: 1070 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 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 +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 + + <<< size: 368 -location: clients/tests/test-client.py:1068:test_004()/513 +location: clients/tests/test-client.py:1070:test_004()/513 cmd: $NMCLI --mode tabular --terse -f COMMON device wifi list lang: C returncode: 0 stdout: 198 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 WPA2 :wlan0-ap-3:Infra:1:54 Mbit/s:55:** :WPA1 WPA2 + :wlan1-ap-4:Infra:1:54 Mbit/s:48:** :WPA1 WPA2 + + <<< size: 414 -location: clients/tests/test-client.py:1068:test_004()/514 +location: clients/tests/test-client.py:1070:test_004()/514 cmd: $NMCLI --mode tabular --terse -f COMMON device wifi list lang: pl_PL.UTF-8 returncode: 0 stdout: 234 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 WPA2 :wlan0-ap-3:Infrastruktura:1:54 Mb/s:55:** :WPA1 WPA2 + :wlan1-ap-4:Infrastruktura:1:54 Mb/s:48:** :WPA1 WPA2 + + <<< size: 1303 -location: clients/tests/test-client.py:1071:test_004()/515 +location: clients/tests/test-client.py:1073: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 >>> -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 +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 + + <<< size: 1361 -location: clients/tests/test-client.py:1071:test_004()/516 +location: clients/tests/test-client.py:1073: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 >>> -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 +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 + + <<< -size: 446 -location: clients/tests/test-client.py:1073:test_004()/517 +size: 448 +location: clients/tests/test-client.py:1075: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:1075: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:1077: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:1077: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:1080: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:1080: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: 1368 +location: clients/tests/test-client.py:1082:test_004()/523 cmd: $NMCLI --mode tabular --terse -f ALL device show wlan0 lang: C returncode: 0 -stdout: 1175 bytes +stdout: 1199 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 @@ -26788,14 +27160,14 @@ 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: 1405 +location: clients/tests/test-client.py:1082:test_004()/524 cmd: $NMCLI --mode tabular --terse -f ALL device show wlan0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 1202 bytes +stdout: 1226 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 @@ -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:1084: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:1084:test_004()/526 cmd: $NMCLI --mode tabular --terse -f COMMON device show wlan0 lang: pl_PL.UTF-8 returncode: 0 @@ -26844,14 +27216,14 @@ 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: 1506 +location: clients/tests/test-client.py:1086: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: 1199 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 @@ -26864,14 +27236,14 @@ 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: 1543 +location: clients/tests/test-client.py:1086: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: 1226 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 @@ -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:1024: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:1024: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:1026: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:1026: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:1029: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:1029: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:1035: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:1035: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:1038: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:1038: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:1041: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:1041: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:1044: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:1044: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:1047: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:1047: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: 6661 +location: clients/tests/test-client.py:1050:test_004()/545 cmd: $NMCLI --mode tabular --terse --color yes -f all dev show lang: C returncode: 0 -stdout: 6369 bytes +stdout: 6489 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 WPA2 +AP[3]: :wlan0-ap-3:Infra:1:54 Mbit/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 + +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: 6707 +location: clients/tests/test-client.py:1050:test_004()/546 +cmd: $NMCLI --mode tabular --terse --color yes -f all dev show +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 6525 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 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: 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:1053: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:1053:test_004()/548 cmd: $NMCLI --mode tabular --terse --color yes dev show wlan0 lang: pl_PL.UTF-8 returncode: 0 @@ -27342,14 +27714,14 @@ 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: 1620 +location: clients/tests/test-client.py:1056:test_004()/549 cmd: $NMCLI --mode tabular --terse --color yes -f all dev show wlan0 lang: C returncode: 0 -stdout: 1418 bytes +stdout: 1442 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 @@ -27362,14 +27734,14 @@ 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: 1657 +location: clients/tests/test-client.py:1056: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: 1469 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 @@ -27382,240 +27754,252 @@ 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:1059: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:1059: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:1062: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:1062: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:1065: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:1065: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 +location: clients/tests/test-client.py:1068:test_004()/557 cmd: $NMCLI --mode tabular --terse --color yes -f ALL device wifi list lang: C returncode: 0 stdout: 1634 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 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 +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 + + <<< size: 1872 -location: clients/tests/test-client.py:1066:test_004()/558 +location: clients/tests/test-client.py:1068: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 >>> -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 +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 + + <<< size: 668 -location: clients/tests/test-client.py:1068:test_004()/559 +location: clients/tests/test-client.py:1070:test_004()/559 cmd: $NMCLI --mode tabular --terse --color yes -f COMMON device wifi list lang: C returncode: 0 stdout: 486 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 WPA2  :wlan0-ap-3:Infra:1:54 Mbit/s:55:** :WPA1 WPA2 + :wlan1-ap-4:Infra:1:54 Mbit/s:48:** :WPA1 WPA2 + + <<< size: 714 -location: clients/tests/test-client.py:1068:test_004()/560 +location: clients/tests/test-client.py:1070: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 >>> - :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 + :wlan1-ap-4:Infrastruktura:1:54 Mb/s:48:** :WPA1 WPA2 + + <<< size: 1927 -location: clients/tests/test-client.py:1071:test_004()/561 +location: clients/tests/test-client.py:1073: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 >>> -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 +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 + + <<< size: 1985 -location: clients/tests/test-client.py:1071:test_004()/562 +location: clients/tests/test-client.py:1073: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 >>> -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 +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 + + <<< -size: 611 -location: clients/tests/test-client.py:1073:test_004()/563 +size: 613 +location: clients/tests/test-client.py:1075: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:1075: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:1077: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:1077: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:1080: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:1080: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: 1623 +location: clients/tests/test-client.py:1082:test_004()/569 cmd: $NMCLI --mode tabular --terse --color yes -f ALL device show wlan0 lang: C returncode: 0 -stdout: 1418 bytes +stdout: 1442 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 @@ -27628,14 +28012,14 @@ 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: 1660 +location: clients/tests/test-client.py:1082: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: 1469 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 @@ -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:1084: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:1084:test_004()/572 cmd: $NMCLI --mode tabular --terse --color yes -f COMMON device show wlan0 lang: pl_PL.UTF-8 returncode: 0 @@ -27684,14 +28068,14 @@ 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: 1761 +location: clients/tests/test-client.py:1086: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: 1442 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 @@ -27704,14 +28088,14 @@ 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: 1798 +location: clients/tests/test-client.py:1086: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: 1469 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 @@ -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:1024:test_004()/575 cmd: $NMCLI --mode multiline con s con-vpn-1 lang: C returncode: 0 @@ -27827,7 +28211,7 @@ VPN.CFG[3]: key3 = val3 <<< size: 4649 -location: clients/tests/test-client.py:1022:test_004()/576 +location: clients/tests/test-client.py:1024:test_004()/576 cmd: $NMCLI --mode multiline con s con-vpn-1 lang: pl_PL.UTF-8 returncode: 0 @@ -27929,7 +28313,7 @@ VPN.CFG[3]: key3 = val3 <<< size: 4621 -location: clients/tests/test-client.py:1024:test_004()/577 +location: clients/tests/test-client.py:1026:test_004()/577 cmd: $NMCLI --mode multiline con s con-vpn-1 lang: C returncode: 0 @@ -28031,7 +28415,7 @@ VPN.CFG[3]: key3 = val3 <<< size: 4649 -location: clients/tests/test-client.py:1024:test_004()/578 +location: clients/tests/test-client.py:1026:test_004()/578 cmd: $NMCLI --mode multiline con s con-vpn-1 lang: pl_PL.UTF-8 returncode: 0 @@ -28133,7 +28517,7 @@ VPN.CFG[3]: key3 = val3 <<< size: 3540 -location: clients/tests/test-client.py:1027:test_004()/579 +location: clients/tests/test-client.py:1029: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:1029: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:1035: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:1035: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:1038: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:1038: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:1041: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:1041: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:1044: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:1044: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:1047: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:1047: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: 20688 +location: clients/tests/test-client.py:1050:test_004()/591 +cmd: $NMCLI --mode multiline -f all dev show +lang: C +returncode: 0 +stdout: 20533 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 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 @@ -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: 20838 +location: clients/tests/test-client.py:1050:test_004()/592 +cmd: $NMCLI --mode multiline -f all dev show +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 20673 bytes +>>> GENERAL.DEVICE: wlan0 GENERAL.TYPE: wifi GENERAL.NM-TYPE: NMDeviceWifi @@ -29104,54 +29616,56 @@ 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[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 @@ -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:1053: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:1053: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: 4875 +location: clients/tests/test-client.py:1056:test_004()/595 cmd: $NMCLI --mode multiline -f all dev show wlan0 lang: C returncode: 0 -stdout: 4611 bytes +stdout: 4715 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 @@ -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: 4930 +location: clients/tests/test-client.py:1056:test_004()/596 cmd: $NMCLI --mode multiline -f all dev show wlan0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 4654 bytes +stdout: 4760 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 @@ -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:1059: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:1059: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:1062: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:1062: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:1065: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:1065: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 +location: clients/tests/test-client.py:1068:test_004()/603 cmd: $NMCLI --mode multiline -f ALL device wifi list lang: C returncode: 0 stdout: 3722 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 @@ -30124,33 +30541,33 @@ 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: 3942 +location: clients/tests/test-client.py:1068: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: wlan0-ap-2 SSID-HEX: 776C616E302D61702D32 @@ -30203,24 +30620,33 @@ 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: 1643 +location: clients/tests/test-client.py:1070:test_004()/605 +cmd: $NMCLI --mode multiline -f COMMON device wifi list +lang: C +returncode: 0 +stdout: 1478 bytes +>>> IN-USE: SSID: wlan0-ap-2 MODE: Infra @@ -30246,24 +30672,24 @@ SIGNAL: 55 BARS: ** SECURITY: WPA1 WPA2 -<<< -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: 1689 +location: clients/tests/test-client.py:1070: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: wlan0-ap-2 MODE: Infrastruktura @@ -30289,33 +30715,24 @@ SIGNAL: 55 BARS: ** SECURITY: WPA1 WPA2 -<<< -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: 3997 +location: clients/tests/test-client.py:1073: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] SSID: wlan0-ap-2 SSID-HEX: 776C616E302D61702D32 @@ -30368,33 +30785,33 @@ 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: 4055 +location: clients/tests/test-client.py:1073: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: wlan0-ap-2 SSID-HEX: 776C616E302D61702D32 @@ -30447,13 +30864,32 @@ 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: wlan1 +ACTIVE: nie +IN-USE: +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:1075: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:1075: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:1077: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:1077: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:1080: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:1080: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: 4878 +location: clients/tests/test-client.py:1082:test_004()/615 cmd: $NMCLI --mode multiline -f ALL device show wlan0 lang: C returncode: 0 -stdout: 4611 bytes +stdout: 4715 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 @@ -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: 4933 +location: clients/tests/test-client.py:1082:test_004()/616 cmd: $NMCLI --mode multiline -f ALL device show wlan0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 4654 bytes +stdout: 4760 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 @@ -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:1084: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:1084: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: 5016 +location: clients/tests/test-client.py:1086: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: 4715 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 @@ -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: 5071 +location: clients/tests/test-client.py:1086: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: 4760 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 @@ -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:1024:test_004()/621 cmd: $NMCLI --mode multiline --color yes con s con-vpn-1 lang: C returncode: 0 @@ -31147,7 +31603,7 @@ VPN.CFG[3]: key3 = val3 <<< size: 4661 -location: clients/tests/test-client.py:1022:test_004()/622 +location: clients/tests/test-client.py:1024:test_004()/622 cmd: $NMCLI --mode multiline --color yes con s con-vpn-1 lang: pl_PL.UTF-8 returncode: 0 @@ -31249,7 +31705,7 @@ VPN.CFG[3]: key3 = val3 <<< size: 4633 -location: clients/tests/test-client.py:1024:test_004()/623 +location: clients/tests/test-client.py:1026:test_004()/623 cmd: $NMCLI --mode multiline --color yes con s con-vpn-1 lang: C returncode: 0 @@ -31351,7 +31807,7 @@ VPN.CFG[3]: key3 = val3 <<< size: 4661 -location: clients/tests/test-client.py:1024:test_004()/624 +location: clients/tests/test-client.py:1026:test_004()/624 cmd: $NMCLI --mode multiline --color yes con s con-vpn-1 lang: pl_PL.UTF-8 returncode: 0 @@ -31453,7 +31909,7 @@ VPN.CFG[3]: key3 = val3 <<< size: 3552 -location: clients/tests/test-client.py:1027:test_004()/625 +location: clients/tests/test-client.py:1029: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:1029: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:1035: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:1035: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:1038: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:1038: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:1041: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:1041: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:1044: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:1044: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:1047: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:1047: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: 20988 +location: clients/tests/test-client.py:1050:test_004()/637 +cmd: $NMCLI --mode multiline --color yes -f all dev show +lang: C +returncode: 0 +stdout: 20821 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 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 @@ -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: 21138 +location: clients/tests/test-client.py:1050:test_004()/638 +cmd: $NMCLI --mode multiline --color yes -f all dev show +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 20961 bytes +>>> GENERAL.DEVICE: wlan0 GENERAL.TYPE: wifi GENERAL.NM-TYPE: NMDeviceWifi @@ -32424,54 +33008,56 @@ 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[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 @@ -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:1053: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:1053: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: 5103 +location: clients/tests/test-client.py:1056:test_004()/641 cmd: $NMCLI --mode multiline --color yes -f all dev show wlan0 lang: C returncode: 0 -stdout: 4827 bytes +stdout: 4931 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 @@ -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: 5158 +location: clients/tests/test-client.py:1056: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: 4976 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 @@ -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:1059: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:1059: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:1062: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:1062: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:1065: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:1065: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 +location: clients/tests/test-client.py:1068:test_004()/649 cmd: $NMCLI --mode multiline --color yes -f ALL device wifi list lang: C returncode: 0 stdout: 4334 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 @@ -33444,33 +33933,33 @@ 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: 4566 +location: clients/tests/test-client.py:1068: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: wlan0-ap-2 SSID-HEX: 776C616E302D61702D32 @@ -33523,24 +34012,33 @@ 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: 1943 +location: clients/tests/test-client.py:1070:test_004()/651 +cmd: $NMCLI --mode multiline --color yes -f COMMON device wifi list +lang: C +returncode: 0 +stdout: 1766 bytes +>>> IN-USE:   SSID: wlan0-ap-2 MODE: Infra @@ -33566,24 +34064,24 @@ SIGNAL: 55 BARS: **  SECURITY: WPA1 WPA2 -<<< -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: 1989 +location: clients/tests/test-client.py:1070: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: wlan0-ap-2 MODE: Infrastruktura @@ -33609,33 +34107,24 @@ SIGNAL: 55 BARS: **  SECURITY: WPA1 WPA2 -<<< -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: 4621 +location: clients/tests/test-client.py:1073: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] SSID: wlan0-ap-2 SSID-HEX: 776C616E302D61702D32 @@ -33688,33 +34177,33 @@ 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: 4679 +location: clients/tests/test-client.py:1073: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: wlan0-ap-2 SSID-HEX: 776C616E302D61702D32 @@ -33767,13 +34256,32 @@ 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: wlan1 +ACTIVE: nie +IN-USE:   +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:1075: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:1075: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:1077: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:1077: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:1080: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:1080: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: 5106 +location: clients/tests/test-client.py:1082:test_004()/661 cmd: $NMCLI --mode multiline --color yes -f ALL device show wlan0 lang: C returncode: 0 -stdout: 4827 bytes +stdout: 4931 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 @@ -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: 5161 +location: clients/tests/test-client.py:1082: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: 4976 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 @@ -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:1084: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:1084: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: 5244 +location: clients/tests/test-client.py:1086: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: 4931 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 @@ -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: 5299 +location: clients/tests/test-client.py:1086: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: 4976 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 @@ -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:1024:test_004()/667 cmd: $NMCLI --mode multiline --pretty con s con-vpn-1 lang: C returncode: 0 @@ -34480,7 +35008,7 @@ VPN.CFG[3]: key3 = val3 <<< size: 5682 -location: clients/tests/test-client.py:1022:test_004()/668 +location: clients/tests/test-client.py:1024:test_004()/668 cmd: $NMCLI --mode multiline --pretty con s con-vpn-1 lang: pl_PL.UTF-8 returncode: 0 @@ -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:1026:test_004()/669 cmd: $NMCLI --mode multiline --pretty con s con-vpn-1 lang: C returncode: 0 @@ -34710,7 +35238,7 @@ VPN.CFG[3]: key3 = val3 <<< size: 5682 -location: clients/tests/test-client.py:1024:test_004()/670 +location: clients/tests/test-client.py:1026:test_004()/670 cmd: $NMCLI --mode multiline --pretty con s con-vpn-1 lang: pl_PL.UTF-8 returncode: 0 @@ -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:1029: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:1029: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:1035: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:1035: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:1038: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:1038: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:1041: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:1041: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:1044: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:1044: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:1047: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:1047: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: 25272 +location: clients/tests/test-client.py:1050:test_004()/683 +cmd: $NMCLI --mode multiline --pretty -f all dev show +lang: C +returncode: 0 +stdout: 25108 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 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 @@ -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: 25455 +location: clients/tests/test-client.py:1050:test_004()/684 +cmd: $NMCLI --mode multiline --pretty -f all dev show +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 25281 bytes +>>> =============================================================================== - Device details (wlan0) + Informacje o urządzeniu (wlan0) =============================================================================== GENERAL.DEVICE: wlan0 GENERAL.TYPE: wifi @@ -36032,59 +36702,61 @@ 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[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 @@ -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:1053: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:1053: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: 5975 +location: clients/tests/test-client.py:1056:test_004()/687 cmd: $NMCLI --mode multiline --pretty -f all dev show wlan0 lang: C returncode: 0 -stdout: 5702 bytes +stdout: 5806 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 @@ -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: 6037 +location: clients/tests/test-client.py:1056:test_004()/688 cmd: $NMCLI --mode multiline --pretty -f all dev show wlan0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 5752 bytes +stdout: 5858 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 @@ -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:1059: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:1059: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:1062: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:1062: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:1065: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:1065: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 +location: clients/tests/test-client.py:1068:test_004()/695 cmd: $NMCLI --mode multiline --pretty -f ALL device wifi list lang: C returncode: 0 stdout: 4678 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) =============================================================================== @@ -37227,40 +37781,40 @@ 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: 4925 +location: clients/tests/test-client.py:1068: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 (wlan0) =============================================================================== @@ -37319,31 +37873,40 @@ 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: 2608 +location: clients/tests/test-client.py:1070:test_004()/697 +cmd: $NMCLI --mode multiline --pretty -f COMMON device wifi list +lang: C +returncode: 0 +stdout: 2434 bytes +>>> =============================================================================== Wi-Fi scan list (wlan0) =============================================================================== @@ -37375,31 +37938,31 @@ BARS: ** SECURITY: WPA1 WPA2 ------------------------------------------------------------------------------- -<<< -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: 2672 +location: clients/tests/test-client.py:1070: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 (wlan0) =============================================================================== @@ -37431,40 +37994,31 @@ BARS: ** SECURITY: WPA1 WPA2 ------------------------------------------------------------------------------- -<<< -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: 4962 +location: clients/tests/test-client.py:1073: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 (wlan0) =============================================================================== @@ -37523,40 +38077,40 @@ 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: 5038 +location: clients/tests/test-client.py:1073: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 (wlan0) =============================================================================== @@ -37615,13 +38169,39 @@ 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: wlan1 +ACTIVE: nie +IN-USE: +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:1075: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:1075: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:1077: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:1077: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:1080: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:1080: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: 5978 +location: clients/tests/test-client.py:1082:test_004()/707 cmd: $NMCLI --mode multiline --pretty -f ALL device show wlan0 lang: C returncode: 0 -stdout: 5702 bytes +stdout: 5806 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 @@ -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: 6040 +location: clients/tests/test-client.py:1082:test_004()/708 cmd: $NMCLI --mode multiline --pretty -f ALL device show wlan0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 5752 bytes +stdout: 5858 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 @@ -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:1084: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:1084: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: 6116 +location: clients/tests/test-client.py:1086: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: 5806 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 @@ -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: 6178 +location: clients/tests/test-client.py:1086: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: 5858 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 @@ -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:1024:test_004()/713 cmd: $NMCLI --mode multiline --pretty --color yes con s con-vpn-1 lang: C returncode: 0 @@ -38432,7 +39032,7 @@ VPN.CFG[3]: key3 = val3 <<< size: 5694 -location: clients/tests/test-client.py:1022:test_004()/714 +location: clients/tests/test-client.py:1024:test_004()/714 cmd: $NMCLI --mode multiline --pretty --color yes con s con-vpn-1 lang: pl_PL.UTF-8 returncode: 0 @@ -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:1026:test_004()/715 cmd: $NMCLI --mode multiline --pretty --color yes con s con-vpn-1 lang: C returncode: 0 @@ -38662,7 +39262,7 @@ VPN.CFG[3]: key3 = val3 <<< size: 5694 -location: clients/tests/test-client.py:1024:test_004()/716 +location: clients/tests/test-client.py:1026:test_004()/716 cmd: $NMCLI --mode multiline --pretty --color yes con s con-vpn-1 lang: pl_PL.UTF-8 returncode: 0 @@ -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:1029: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:1029: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:1035: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:1035: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:1038: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:1038: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:1041: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:1041: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:1044: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:1044: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:1047: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:1047: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: 25572 +location: clients/tests/test-client.py:1050:test_004()/729 +cmd: $NMCLI --mode multiline --pretty --color yes -f all dev show +lang: C +returncode: 0 +stdout: 25396 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 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 @@ -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: 25755 +location: clients/tests/test-client.py:1050:test_004()/730 +cmd: $NMCLI --mode multiline --pretty --color yes -f all dev show +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 25569 bytes +>>> =============================================================================== - Device details (wlan0) + Informacje o urządzeniu (wlan0) =============================================================================== GENERAL.DEVICE: wlan0 GENERAL.TYPE: wifi @@ -39984,59 +40726,61 @@ 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[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 @@ -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 @@ -40347,6 +41089,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 @@ -40409,113 +41153,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: 2468 -location: clients/tests/test-client.py:1051:test_004()/731 +location: clients/tests/test-client.py:1053: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:1053: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: 6203 +location: clients/tests/test-client.py:1056:test_004()/733 cmd: $NMCLI --mode multiline --pretty --color yes -f all dev show wlan0 lang: C returncode: 0 -stdout: 5918 bytes +stdout: 6022 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 @@ -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: 6265 +location: clients/tests/test-client.py:1056: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: 6074 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 @@ -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:1059: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:1059: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:1062: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:1062: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:1065: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:1065: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,45 +41738,15 @@ 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 +location: clients/tests/test-client.py:1068:test_004()/741 cmd: $NMCLI --mode multiline --pretty --color yes -f ALL device wifi list lang: C returncode: 0 stdout: 5290 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) =============================================================================== @@ -41179,40 +41805,40 @@ 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) + 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: 5549 +location: clients/tests/test-client.py:1068: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 (wlan0) =============================================================================== @@ -41271,31 +41897,40 @@ IN-USE:   DBUS-PATH: /org/freedesktop/NetworkManager/AccessPoint/3 ------------------------------------------------------------------------------- -<<< -size: 2908 -location: clients/tests/test-client.py:1068:test_004()/743 -cmd: $NMCLI --mode multiline --pretty --color yes -f COMMON device wifi list -lang: C -returncode: 0 -stdout: 2722 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: 2908 +location: clients/tests/test-client.py:1070:test_004()/743 +cmd: $NMCLI --mode multiline --pretty --color yes -f COMMON device wifi list +lang: C +returncode: 0 +stdout: 2722 bytes +>>> =============================================================================== Wi-Fi scan list (wlan0) =============================================================================== @@ -41327,31 +41962,31 @@ BARS: **  SECURITY: WPA1 WPA2 ------------------------------------------------------------------------------- -<<< -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: 2972 +location: clients/tests/test-client.py:1070: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 (wlan0) =============================================================================== @@ -41383,40 +42018,31 @@ BARS: **  SECURITY: WPA1 WPA2 ------------------------------------------------------------------------------- -<<< -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: 5586 +location: clients/tests/test-client.py:1073: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 (wlan0) =============================================================================== @@ -41475,40 +42101,40 @@ 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: 5662 +location: clients/tests/test-client.py:1073: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 (wlan0) =============================================================================== @@ -41567,13 +42193,39 @@ 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: wlan1 +ACTIVE: nie +IN-USE:   +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:1075: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:1075: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:1077: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:1077: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:1080: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:1080: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: 6206 +location: clients/tests/test-client.py:1082:test_004()/753 cmd: $NMCLI --mode multiline --pretty --color yes -f ALL device show wlan0 lang: C returncode: 0 -stdout: 5918 bytes +stdout: 6022 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 @@ -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: 6268 +location: clients/tests/test-client.py:1082: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: 6074 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 @@ -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:1084: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:1084: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: 6344 +location: clients/tests/test-client.py:1086: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: 6022 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 @@ -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: 6406 +location: clients/tests/test-client.py:1086: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: 6074 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 @@ -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:1024: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:1024: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:1026: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:1026: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:1029: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:1029: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:1035: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:1035: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:1038: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:1038: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:1041: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:1041: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:1044: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:1044: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:1047: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:1047: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: 11954 +location: clients/tests/test-client.py:1050:test_004()/775 +cmd: $NMCLI --mode multiline --terse -f all dev show +lang: C +returncode: 0 +stdout: 11791 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 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 @@ -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: 12000 +location: clients/tests/test-client.py:1050:test_004()/776 +cmd: $NMCLI --mode multiline --terse -f all dev show +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 11827 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,25 +44479,25 @@ 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[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 @@ -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:1053: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:1053: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: 2720 +location: clients/tests/test-client.py:1056:test_004()/779 cmd: $NMCLI --mode multiline --terse -f all dev show wlan0 lang: C returncode: 0 -stdout: 2478 bytes +stdout: 2552 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 @@ -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: 2757 +location: clients/tests/test-client.py:1056:test_004()/780 cmd: $NMCLI --mode multiline --terse -f all dev show wlan0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 2505 bytes +stdout: 2579 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 @@ -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:1059: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:1059: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:1062: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:1062: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:1065: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:1065: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 +location: clients/tests/test-client.py:1068:test_004()/787 cmd: $NMCLI --mode multiline --terse -f ALL device wifi list lang: C returncode: 0 stdout: 1470 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 @@ -44668,33 +45373,33 @@ 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: 1698 +location: clients/tests/test-client.py:1068: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:wlan0-ap-2 SSID-HEX:776C616E302D61702D32 @@ -44747,24 +45452,33 @@ 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: 562 +location: clients/tests/test-client.py:1070:test_004()/789 +cmd: $NMCLI --mode multiline --terse -f COMMON device wifi list +lang: C +returncode: 0 +stdout: 390 bytes +>>> IN-USE: SSID:wlan0-ap-2 MODE:Infra @@ -44790,24 +45504,24 @@ SIGNAL:55 BARS:** SECURITY:WPA1 WPA2 -<<< -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: 608 +location: clients/tests/test-client.py:1070: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:wlan0-ap-2 MODE:Infrastruktura @@ -44833,33 +45547,24 @@ SIGNAL:55 BARS:** SECURITY:WPA1 WPA2 -<<< -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: 1753 +location: clients/tests/test-client.py:1073: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] SSID:wlan0-ap-2 SSID-HEX:776C616E302D61702D32 @@ -44912,33 +45617,33 @@ 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: 1811 +location: clients/tests/test-client.py:1073: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:wlan0-ap-2 SSID-HEX:776C616E302D61702D32 @@ -44991,13 +45696,32 @@ 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:wlan1 +ACTIVE:nie +IN-USE: +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:1075: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:1075: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:1077: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:1077: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:1080: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:1080: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: 2723 +location: clients/tests/test-client.py:1082:test_004()/799 cmd: $NMCLI --mode multiline --terse -f ALL device show wlan0 lang: C returncode: 0 -stdout: 2478 bytes +stdout: 2552 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 @@ -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: 2760 +location: clients/tests/test-client.py:1082:test_004()/800 cmd: $NMCLI --mode multiline --terse -f ALL device show wlan0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 2505 bytes +stdout: 2579 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 @@ -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:1084: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:1084: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: 2861 +location: clients/tests/test-client.py:1086: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: 2552 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 @@ -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: 2898 +location: clients/tests/test-client.py:1086: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: 2579 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 @@ -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:1024: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:1024: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:1026: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:1026: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:1029: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:1029: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:1035: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:1035: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:1038: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:1038: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:1041: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:1041: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:1044: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:1044: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:1047: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:1047: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: 12254 +location: clients/tests/test-client.py:1050:test_004()/821 +cmd: $NMCLI --mode multiline --terse --color yes -f all dev show +lang: C +returncode: 0 +stdout: 12079 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 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 @@ -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: 12300 +location: clients/tests/test-client.py:1050:test_004()/822 +cmd: $NMCLI --mode multiline --terse --color yes -f all dev show +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 12115 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,25 +47871,25 @@ 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[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 @@ -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:1053: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:1053: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: 2948 +location: clients/tests/test-client.py:1056:test_004()/825 cmd: $NMCLI --mode multiline --terse --color yes -f all dev show wlan0 lang: C returncode: 0 -stdout: 2694 bytes +stdout: 2768 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 @@ -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: 2985 +location: clients/tests/test-client.py:1056: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: 2795 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 @@ -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:1059: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:1059: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:1062: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:1062: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:1065: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:1065: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,18 +48704,67 @@ 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 +location: clients/tests/test-client.py:1068:test_004()/833 cmd: $NMCLI --mode multiline --terse --color yes -f ALL device wifi list lang: C returncode: 0 stdout: 2082 bytes >>> +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 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/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: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/3 + NAME:AP[1] SSID:wlan1-ap-4 SSID-HEX:776C616E312D61702D34 @@ -47936,6 +48784,179 @@ IN-USE:  DBUS-PATH:/org/freedesktop/NetworkManager/AccessPoint/4 +<<< +size: 2322 +location: clients/tests/test-client.py:1068: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: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 + +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:wlan1 +ACTIVE:nie +IN-USE:  +DBUS-PATH:/org/freedesktop/NetworkManager/AccessPoint/4 + + +<<< +size: 862 +location: clients/tests/test-client.py:1070:test_004()/835 +cmd: $NMCLI --mode multiline --terse --color yes -f COMMON device wifi list +lang: C +returncode: 0 +stdout: 678 bytes +>>> +IN-USE:  +SSID:wlan0-ap-2 +MODE:Infra +CHAN:1 +RATE:54 Mbit/s +SIGNAL:92 +BARS:**** +SECURITY:WPA1 WPA2 +IN-USE:  +SSID:wlan0-ap-1 +MODE:Infra +CHAN:1 +RATE:54 Mbit/s +SIGNAL:81 +BARS:**** +SECURITY:WPA1 WPA2 +IN-USE:  +SSID:wlan0-ap-3 +MODE:Infra +CHAN:1 +RATE:54 Mbit/s +SIGNAL:55 +BARS:**  +SECURITY:WPA1 WPA2 + +IN-USE:  +SSID:wlan1-ap-4 +MODE:Infra +CHAN:1 +RATE:54 Mbit/s +SIGNAL:48 +BARS:**  +SECURITY:WPA1 WPA2 + + +<<< +size: 908 +location: clients/tests/test-client.py:1070: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:wlan0-ap-2 +MODE:Infrastruktura +CHAN:1 +RATE:54 Mb/s +SIGNAL:92 +BARS:**** +SECURITY:WPA1 WPA2 +IN-USE:  +SSID:wlan0-ap-1 +MODE:Infrastruktura +CHAN:1 +RATE:54 Mb/s +SIGNAL:81 +BARS:**** +SECURITY:WPA1 WPA2 +IN-USE:  +SSID:wlan0-ap-3 +MODE:Infrastruktura +CHAN:1 +RATE:54 Mb/s +SIGNAL:55 +BARS:**  +SECURITY:WPA1 WPA2 + +IN-USE:  +SSID:wlan1-ap-4 +MODE:Infrastruktura +CHAN:1 +RATE:54 Mb/s +SIGNAL:48 +BARS:**  +SECURITY:WPA1 WPA2 + + +<<< +size: 2377 +location: clients/tests/test-client.py:1073: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] SSID:wlan0-ap-2 SSID-HEX:776C616E302D61702D32 @@ -47988,33 +49009,33 @@ 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: 2435 +location: clients/tests/test-client.py:1073: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:wlan0-ap-2 SSID-HEX:776C616E302D61702D32 @@ -48067,179 +49088,6 @@ 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:  -SSID:wlan1-ap-4 -MODE:Infra -CHAN:1 -RATE:54 Mbit/s -SIGNAL:48 -BARS:**  -SECURITY:WPA1 WPA2 - - -IN-USE:  -SSID:wlan0-ap-2 -MODE:Infra -CHAN:1 -RATE:54 Mbit/s -SIGNAL:92 -BARS:**** -SECURITY:WPA1 WPA2 -IN-USE:  -SSID:wlan0-ap-1 -MODE:Infra -CHAN:1 -RATE:54 Mbit/s -SIGNAL:81 -BARS:**** -SECURITY:WPA1 WPA2 -IN-USE:  -SSID:wlan0-ap-3 -MODE:Infra -CHAN:1 -RATE:54 Mbit/s -SIGNAL:55 -BARS:**  -SECURITY:WPA1 WPA2 - -<<< -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 -CHAN:1 -RATE:54 Mb/s -SIGNAL:48 -BARS:**  -SECURITY:WPA1 WPA2 - - -IN-USE:  -SSID:wlan0-ap-2 -MODE:Infrastruktura -CHAN:1 -RATE:54 Mb/s -SIGNAL:92 -BARS:**** -SECURITY:WPA1 WPA2 -IN-USE:  -SSID:wlan0-ap-1 -MODE:Infrastruktura -CHAN:1 -RATE:54 Mb/s -SIGNAL:81 -BARS:**** -SECURITY:WPA1 WPA2 -IN-USE:  -SSID:wlan0-ap-3 -MODE:Infrastruktura -CHAN:1 -RATE:54 Mb/s -SIGNAL:55 -BARS:**  -SECURITY:WPA1 WPA2 - -<<< -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] -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 -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 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/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: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/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 @@ -48259,65 +49107,13 @@ IN-USE:  DBUS-PATH:/org/freedesktop/NetworkManager/AccessPoint/4 -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: 725 -location: clients/tests/test-client.py:1073:test_004()/839 +size: 727 +location: clients/tests/test-client.py:1075: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:1075: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:1077: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:1077: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:1080: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:1080: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: 2951 +location: clients/tests/test-client.py:1082:test_004()/845 cmd: $NMCLI --mode multiline --terse --color yes -f ALL device show wlan0 lang: C returncode: 0 -stdout: 2694 bytes +stdout: 2768 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 @@ -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: 2988 +location: clients/tests/test-client.py:1082: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: 2795 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 @@ -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:1084: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:1084: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: 3089 +location: clients/tests/test-client.py:1086: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: 2768 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 @@ -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: 3126 +location: clients/tests/test-client.py:1086: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: 2795 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 diff --git a/clients/tests/test-client.py b/clients/tests/test-client.py index e8f1f7f2..fee874ba 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. @@ -744,10 +744,11 @@ 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())) + 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: 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-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/nm-editor-bindings.c b/clients/tui/nm-editor-bindings.c index 8df741f5..16ea60d3 100644 --- a/clients/tui/nm-editor-bindings.c +++ b/clients/tui/nm-editor-bindings.c @@ -516,7 +516,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-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/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 59fcebd8..15bfa85a 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.15.2. # # 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.15.2' +PACKAGE_STRING='NetworkManager 1.15.2' 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.4 to adapt to many kinds of systems. +\`configure' configures NetworkManager 1.15.2 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.4:";; + short | recursive ) echo "Configuration of NetworkManager 1.15.2:";; 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.4 +NetworkManager configure 1.15.2 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.4, which was +It was created by NetworkManager $as_me 1.15.2, 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.4' + VERSION='1.15.2' 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=4 -NM_VERSION=1.14.4 +NM_MINOR_VERSION=15 +NM_MICRO_VERSION=2 +NM_VERSION=1.15.2 @@ -17972,7 +17977,7 @@ NM_VERSION=1.14.4 -NM_GIT_SHA=66cad942f2404a5bac0df1a623fb5d72ab8f4d20 +NM_GIT_SHA=862721d269418854ab55a77bc91c5299a214bc9b 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,14 +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'" + eval "AM_CFLAGS='$AM_CFLAGS -Wno-unused-value'" fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext @@ -26655,14 +26706,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 -Wmissing-braces'" + eval "AM_CFLAGS='$AM_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-missing-braces'" fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext @@ -26706,14 +26757,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 +26780,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 +26871,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 : @@ -28217,6 +28268,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 +28476,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 +28985,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.15.2, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -28995,7 +29051,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.15.2 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" @@ -31189,4 +31245,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 f101594f..efd5770f 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], [4]) +m4_define([nm_minor_version], [15]) +m4_define([nm_micro_version], [2]) 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..d1460c2c 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 @@ -75,8 +75,8 @@ - <_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 +84,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/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/docs/api/Makefile.in b/docs/api/Makefile.in index b6a1e260..4792783d 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@ 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 0e6bec04..12e0a54b 100644 --- a/docs/api/html/NetworkManager.conf.html +++ b/docs/api/html/NetworkManager.conf.html @@ -8,7 +8,7 @@ - + @@ -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. + +

@@ -603,6 +641,14 @@ ipv6.ip6-privacy=0 + + + + + + + + @@ -644,6 +690,10 @@ ipv6.ip6-privacy=0 + + + + @@ -665,6 +715,11 @@ ipv6.ip6-privacy=0 the interface type is used.

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

+ + + + + + + +

802-1x.auth-timeout

cdma.mtu

connection.auth-retries

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

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.

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. @@ -742,9 +802,15 @@ ipv6.ip6-privacy=0

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

wifi.wake-on-wlan

+ +

@@ -1164,6 +1230,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 +1419,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 +1480,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.devhelp2 b/docs/api/html/NetworkManager.devhelp2
index d4450730..bafd8cab 100644
--- a/docs/api/html/NetworkManager.devhelp2
+++ b/docs/api/html/NetworkManager.devhelp2
@@ -159,6 +159,7 @@
     
     
     
+    
     
     
     
@@ -263,6 +264,8 @@
     
     
     
+    
+    
     
     
     
@@ -764,6 +767,7 @@
     
     
     
+    
     
     
     
diff --git a/docs/api/html/NetworkManager.html b/docs/api/html/NetworkManager.html
index 0b0a254e..c30db5e4 100644
--- a/docs/api/html/NetworkManager.html
+++ b/docs/api/html/NetworkManager.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -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.
+        

 
 
 
@@ -552,6 +545,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..e25f2d9a 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 @@
 
 
 
-
+
 
 
 
@@ -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.
 

 
@@ -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..14c79f0b 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 @@
 
-
+
@@ -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,9 +535,35 @@ 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
+

+

-
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..c28fafe6 100644
--- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.html
+++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.html
@@ -8,7 +8,7 @@
 
-
+
@@ -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,
 
-
+
@@ -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 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:

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




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.

@@ -957,6 +1028,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..4aa2521a 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.15.2 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
@@ -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..52907f9b 100644 --- a/docs/api/html/ix01.html +++ b/docs/api/html/ix01.html @@ -8,7 +8,7 @@ - + @@ -26,1524 +26,1532 @@

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 +
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.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, 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-file, 802-1x +
pac-script, proxy
-
pac-script, proxy +
pac-url, proxy
-
pac-url, proxy +
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 +
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..4f34155c 100644 --- a/docs/api/html/manpages.html +++ b/docs/api/html/manpages.html @@ -8,7 +8,7 @@ - + @@ -56,12 +56,12 @@ nm-initrd-generator — early boot NetworkManager configuration generator
-nm-openvswitch — overview of NetworkManager OpenVSwitch support +nm-openvswitch — overview of NetworkManager Open vSwitch support
-
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..f0b43b58 100644 --- a/docs/api/html/nm-dbus-types.html +++ b/docs/api/html/nm-dbus-types.html @@ -8,7 +8,7 @@ - + @@ -253,7 +253,7 @@

-

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 @@

-

an 802.11 WiFi device

+

an 802.11 Wi-Fi device

  @@ -1747,7 +1747,7 @@

-

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 +2681,7 @@

-

The WiFi network could not be found

+

The Wi-Fi network could not be found

  @@ -4146,6 +4146,21 @@   + + +

NM_ACTIVATION_STATE_FLAG_LIFETIME_BOUND_TO_PROFILE_VISIBILITY

+

+ + +

= (1LL

+

+ + +

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

+

+ +  + @@ -4265,7 +4280,7 @@

-

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.

  @@ -4341,6 +4356,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..bc91ee24 100644 --- a/docs/api/html/nm-online.html +++ b/docs/api/html/nm-online.html @@ -8,7 +8,7 @@ - + @@ -55,16 +55,8 @@ -

- -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

@@ -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.

+ @@ -115,6 +119,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..abd868ad 100644 --- a/docs/api/html/nm-openvswitch.html +++ b/docs/api/html/nm-openvswitch.html @@ -8,7 +8,7 @@ - + @@ -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 14. 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 15. 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 16. 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 17. 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.

 

@@ -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..facbca6f 100644 --- a/docs/api/html/nm-settings-ifcfg-rh.html +++ b/docs/api/html/nm-settings-ifcfg-rh.html @@ -8,7 +8,7 @@ - + @@ -1032,7 +1032,7 @@ Example: DCB_PG_STRICT=01101110 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 @@ -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..4b7a4346 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. @@ -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 @@ -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. @@ -1405,7 +1405,7 @@ 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. @@ -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. @@ -1580,7 +1580,7 @@ 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. @@ -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. @@ -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. @@ -3154,7 +3154,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". @@ -3280,7 +3280,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". @@ -3592,6 +3592,13 @@ +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   @@ -3599,6 +3606,13 @@ +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 @@ -3652,6 +3666,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..e9d8154c 100644 --- a/docs/api/html/nmcli-examples.html +++ b/docs/api/html/nmcli-examples.html @@ -8,7 +8,7 @@ - + @@ -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,27 @@ IP4:192.168.1.12/24:192.168.1.1::192.168.1.1::

-

Example 11. Escaping colon characters in tabular mode

+

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
+$ 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 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:
@@ -294,7 +329,7 @@ nager/ActiveConnection/9

-

Example 12. 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
@@ -332,7 +367,7 @@ fi

Example sessions of interactive connection editor

-

Example 13. 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
 
@@ -583,6 +618,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..08962bd7 100644 --- a/docs/api/html/nmcli.html +++ b/docs/api/html/nmcli.html @@ -8,7 +8,7 @@ - + @@ -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 @@ -

    -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 }

    @@ -119,6 +85,25 @@ +

    --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

    @@ -164,6 +176,15 @@ also influences echoing passwords typed by user as an input.

    +

    -t | --terse

    +

    Output is terse. This mode is designed and suitable for computer (script) + processing.

    + + +

    -v | --version

    +

    Show nmcli version.

    + +

    -w | --wait seconds

    @@ -177,25 +198,6 @@ success. The default value depends on the executed command.

    - -

    --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 connnection 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.

@@ -2545,6 +2547,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..ef7b839c 100644 --- a/docs/api/html/settings-802-11-wireless.html +++ b/docs/api/html/settings-802-11-wireless.html @@ -8,7 +8,7 @@ - + @@ -57,7 +57,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".
 
 
 
band

@@ -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..5ed375fa 100644
--- a/docs/api/html/settings-802-3-ethernet.html
+++ b/docs/api/html/settings-802-3-ethernet.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -57,7 +57,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".
 
 
 
auto-negotiate

@@ -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..c31309bc 100644
--- a/docs/api/html/settings-gsm.html
+++ b/docs/api/html/settings-gsm.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -87,7 +87,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
 
 
 
password

@@ -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..9754669d 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

@@ -117,7 +117,7 @@
 
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

@@ -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..5f32cd2e 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

@@ -117,7 +117,7 @@
 
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

@@ -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..33837903 100644
--- a/docs/api/html/settings-team-port.html
+++ b/docs/api/html/settings-team-port.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -75,7 +75,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.
 
 
 
prio

@@ -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..858eec7f 100644
--- a/docs/api/html/settings-team.html
+++ b/docs/api/html/settings-team.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -69,7 +69,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.
 
 
 
mcast-rejoin-count

@@ -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..dce5a434 100644
--- a/docs/api/html/settings-wpan.html
+++ b/docs/api/html/settings-wpan.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -54,12 +54,24 @@
 
 
 
+
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

@@ -78,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/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/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 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..4811d4a3 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 "-").
@@ -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.
@@ -197,14 +197,14 @@
     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.
     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.
@@ -224,13 +224,13 @@
     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.
     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.
@@ -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
@@ -389,7 +389,7 @@
         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.
@@ -480,7 +480,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.
@@ -499,7 +499,7 @@
   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.
@@ -546,7 +546,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 4e00d0ac..42cf0675 100644
--- a/docs/api/version.xml
+++ b/docs/api/version.xml
@@ -1 +1 @@
-1.14.4
+1.15.2
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/NMAccessPoint.html b/docs/libnm-glib/html/NMAccessPoint.html
index eb0dee41..63e1bf70 100644
--- a/docs/libnm-glib/html/NMAccessPoint.html
+++ b/docs/libnm-glib/html/NMAccessPoint.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -880,6 +880,6 @@ coordinator of the wireless network allowing clients to connect) or
 
 
 

-
Generated by GTK-Doc V1.29.1

+
Generated by GTK-Doc V1.29
 
 
\ No newline at end of file
diff --git a/docs/libnm-glib/html/NMActiveConnection.html b/docs/libnm-glib/html/NMActiveConnection.html
index e597dc86..6355c7df 100644
--- a/docs/libnm-glib/html/NMActiveConnection.html
+++ b/docs/libnm-glib/html/NMActiveConnection.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -1026,6 +1026,6 @@ nm_active_connection_get_vpn (
-
Generated by GTK-Doc V1.29.1
+
Generated by GTK-Doc V1.29
 
 
\ No newline at end of file
diff --git a/docs/libnm-glib/html/NMClient.html b/docs/libnm-glib/html/NMClient.html
index 168910d1..b2bff455 100644
--- a/docs/libnm-glib/html/NMClient.html
+++ b/docs/libnm-glib/html/NMClient.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -2562,6 +2562,6 @@ user_function (
 
 

-
Generated by GTK-Doc V1.29.1

+
Generated by GTK-Doc V1.29
 
 
\ 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 @@
 
 
 
-
+
 
 
 
@@ -224,6 +224,6 @@ configuration, and must not be modified.

 
 
 

-
Generated by GTK-Doc V1.29.1

+
Generated by GTK-Doc V1.29
 
 
\ 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 @@
 
 
 
-
+
 
 
 
@@ -224,6 +224,6 @@ configuration, and must not be modified.

 
 
 

-
Generated by GTK-Doc V1.29.1

+
Generated by GTK-Doc V1.29
 
 
\ No newline at end of file
diff --git a/docs/libnm-glib/html/NMDevice.html b/docs/libnm-glib/html/NMDevice.html
index d8785659..82dc9625 100644
--- a/docs/libnm-glib/html/NMDevice.html
+++ b/docs/libnm-glib/html/NMDevice.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -2316,6 +2316,6 @@ user_function (
 
 

-
Generated by GTK-Doc V1.29.1

+
Generated by GTK-Doc V1.29
 
 
\ 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 @@
 
 
 
-
+
 
 
 
@@ -254,6 +254,6 @@ nm_device_adsl_get_carrier (
-
Generated by GTK-Doc V1.29.1
+
Generated by GTK-Doc V1.29
 
 
\ 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 @@
 
 
 
-
+
 
 
 
@@ -384,6 +384,6 @@ copy used by the device, and must not be modified. 

 
 
 

-
Generated by GTK-Doc V1.29.1

+
Generated by GTK-Doc V1.29
 
 
\ 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 @@
 
 
 
-
+
 
 
 
@@ -391,6 +391,6 @@ copy used by the device, and must not be modified. 

 
 
 

-
Generated by GTK-Doc V1.29.1

+
Generated by GTK-Doc V1.29
 
 
\ No newline at end of file
diff --git a/docs/libnm-glib/html/NMDeviceBt.html b/docs/libnm-glib/html/NMDeviceBt.html
index 1ba9f49d..3b1cd239 100644
--- a/docs/libnm-glib/html/NMDeviceBt.html
+++ b/docs/libnm-glib/html/NMDeviceBt.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -392,6 +392,6 @@ nm_device_bt_get_capabilities (
 
 

-
Generated by GTK-Doc V1.29.1

+
Generated by GTK-Doc V1.29
 
 
\ 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 @@
 
 
 
-
+
 
 
 
@@ -444,6 +444,6 @@ nm_device_ethernet_get_carrier (
 
 

-
Generated by GTK-Doc V1.29.1

+
Generated by GTK-Doc V1.29
 
 
\ 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 @@
 
 
 
-
+
 
 
 
@@ -285,6 +285,6 @@ if not known.

 
 
 

-
Generated by GTK-Doc V1.29.1

+
Generated by GTK-Doc V1.29
 
 
\ 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 @@
 
 
 
-
+
 
 
 
@@ -328,6 +328,6 @@ nm_device_infiniband_get_carrier (
 
 

-
Generated by GTK-Doc V1.29.1

+
Generated by GTK-Doc V1.29
 
 
\ No newline at end of file
diff --git a/docs/libnm-glib/html/NMDeviceModem.html b/docs/libnm-glib/html/NMDeviceModem.html
index f2d288f6..0b71876b 100644
--- a/docs/libnm-glib/html/NMDeviceModem.html
+++ b/docs/libnm-glib/html/NMDeviceModem.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -288,6 +288,6 @@ CDMA/EVDO and GSM/UMTS.

 
 
 

-
Generated by GTK-Doc V1.29.1

+
Generated by GTK-Doc V1.29
 
 
\ 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 @@
 
 
 
-
+
 
 
 
@@ -373,6 +373,6 @@ nm_device_olpc_mesh_get_active_channel
 
 
 

-
Generated by GTK-Doc V1.29.1

+
Generated by GTK-Doc V1.29
 
 
\ 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 @@
 
 
 
-
+
 
 
 
@@ -387,6 +387,6 @@ copy used by the device, and must not be modified. 

 
 
 

-
Generated by GTK-Doc V1.29.1

+
Generated by GTK-Doc V1.29
 
 
\ 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 @@
 
 
 
-
+
 
 
 
@@ -451,6 +451,6 @@ nm_device_vlan_get_vlan_id (
-
Generated by GTK-Doc V1.29.1
+
Generated by GTK-Doc V1.29
 
 
\ No newline at end of file
diff --git a/docs/libnm-glib/html/NMDeviceWifi.html b/docs/libnm-glib/html/NMDeviceWifi.html
index 096d6e78..d2bd93fd 100644
--- a/docs/libnm-glib/html/NMDeviceWifi.html
+++ b/docs/libnm-glib/html/NMDeviceWifi.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -843,6 +843,6 @@ user_function (
 
 

-
Generated by GTK-Doc V1.29.1

+
Generated by GTK-Doc V1.29
 
 
\ 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 @@
 
 
 
-
+
 
 
 
@@ -919,6 +919,6 @@ user_function (<
 
 
 

-
Generated by GTK-Doc V1.29.1

+
Generated by GTK-Doc V1.29
 
 
\ 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 @@
 
 
 
-
+
 
 
 
@@ -538,6 +538,6 @@ modified. 

 
 
 

-
Generated by GTK-Doc V1.29.1

+
Generated by GTK-Doc V1.29
 
 
\ No newline at end of file
diff --git a/docs/libnm-glib/html/NMIP6Config.html b/docs/libnm-glib/html/NMIP6Config.html
index f2c77b3b..f86ffe1c 100644
--- a/docs/libnm-glib/html/NMIP6Config.html
+++ b/docs/libnm-glib/html/NMIP6Config.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -567,6 +567,6 @@ contain the addresses of nameservers of the configuration.

 
 
 

-
Generated by GTK-Doc V1.29.1

+
Generated by GTK-Doc V1.29
 
 
\ No newline at end of file
diff --git a/docs/libnm-glib/html/NMObject.html b/docs/libnm-glib/html/NMObject.html
index 0c85c095..7feea85e 100644
--- a/docs/libnm-glib/html/NMObject.html
+++ b/docs/libnm-glib/html/NMObject.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -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

  
 
 
@@ -336,6 +336,6 @@ during property handling of master_object
 
 

-
Generated by GTK-Doc V1.29.1

+
Generated by GTK-Doc V1.29
 
 
\ No newline at end of file
diff --git a/docs/libnm-glib/html/NMRemoteConnection.html b/docs/libnm-glib/html/NMRemoteConnection.html
index d8e0404f..68d73ac6 100644
--- a/docs/libnm-glib/html/NMRemoteConnection.html
+++ b/docs/libnm-glib/html/NMRemoteConnection.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -773,6 +773,6 @@ user_function (
-
Generated by GTK-Doc V1.29.1
+
Generated by GTK-Doc V1.29
 
 
\ No newline at end of file
diff --git a/docs/libnm-glib/html/NMRemoteSettings.html b/docs/libnm-glib/html/NMRemoteSettings.html
index a69f46c5..ba083c5d 100644
--- a/docs/libnm-glib/html/NMRemoteSettings.html
+++ b/docs/libnm-glib/html/NMRemoteSettings.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -1133,6 +1133,6 @@ user_function (
-
Generated by GTK-Doc V1.29.1
+
Generated by GTK-Doc V1.29
 
 
\ No newline at end of file
diff --git a/docs/libnm-glib/html/NMSecretAgent.html b/docs/libnm-glib/html/NMSecretAgent.html
index c4340fc1..4880c485 100644
--- a/docs/libnm-glib/html/NMSecretAgent.html
+++ b/docs/libnm-glib/html/NMSecretAgent.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -823,7 +823,7 @@ request was successful.

 
 
 
error

-
the error, if any, that occured while registering

+
the error, if any, that occurred while registering

  
 
 
@@ -839,6 +839,6 @@ request was successful.

 
 
 

-
Generated by GTK-Doc V1.29.1

+
Generated by GTK-Doc V1.29
 
 
\ No newline at end of file
diff --git a/docs/libnm-glib/html/NMVPNConnection.html b/docs/libnm-glib/html/NMVPNConnection.html
index 2b9f6af5..65774557 100644
--- a/docs/libnm-glib/html/NMVPNConnection.html
+++ b/docs/libnm-glib/html/NMVPNConnection.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -273,6 +273,6 @@ user_function (
-
Generated by GTK-Doc V1.29.1
+
Generated by GTK-Doc V1.29
 
 
\ No newline at end of file
diff --git a/docs/libnm-glib/html/NMWimaxNsp.html b/docs/libnm-glib/html/NMWimaxNsp.html
index 08127602..f9ac6b7a 100644
--- a/docs/libnm-glib/html/NMWimaxNsp.html
+++ b/docs/libnm-glib/html/NMWimaxNsp.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -449,6 +449,6 @@ against

 
 
 

-
Generated by GTK-Doc V1.29.1

+
Generated by GTK-Doc V1.29
 
 
\ 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 @@
 
 
 
-
+
 
 
 
@@ -61,6 +61,6 @@
 
Override the parsed C type with given type.

 
 

-
Generated by GTK-Doc V1.29.1

+
Generated by GTK-Doc V1.29
 
 
\ 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 @@
 
 
 
-
+
 
 
 
@@ -2696,6 +2696,6 @@
 

 
 

-
Generated by GTK-Doc V1.29.1

+
Generated by GTK-Doc V1.29
 
 
\ 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 @@
 
 
 
-
+
 
 
 
@@ -119,6 +119,6 @@
 
 
 

-
Generated by GTK-Doc V1.29.1

+
Generated by GTK-Doc V1.29
 
 
\ No newline at end of file
diff --git a/docs/libnm-glib/html/index.html b/docs/libnm-glib/html/index.html
index 296f4837..9057a00c 100644
--- a/docs/libnm-glib/html/index.html
+++ b/docs/libnm-glib/html/index.html
@@ -6,7 +6,7 @@
 
 
 
-
+
 
 
 
@@ -15,7 +15,7 @@
 
 

-
Generated by GTK-Doc V1.29.1

+
Generated by GTK-Doc V1.29
 
 
\ 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..fa1dac26 100644
--- a/docs/libnm-glib/html/libnm-glib-NMVPNPlugin.html
+++ b/docs/libnm-glib/html/libnm-glib-NMVPNPlugin.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -381,6 +381,6 @@ nm_vpn_plugin_disconnect (NMVPNPl
 
 
 

-
Generated by GTK-Doc V1.29.1

+
Generated by GTK-Doc V1.29
 
 
\ 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..f974a0dc 100644
--- a/docs/libnm-glib/html/libnm-glib-NMVpnPluginUiWidget.html
+++ b/docs/libnm-glib/html/libnm-glib-NMVpnPluginUiWidget.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -547,6 +547,6 @@ plugin's VPN service daemon

 
 
 

-
Generated by GTK-Doc V1.29.1

+
Generated by GTK-Doc V1.29
 
 
\ 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 @@
 
 
 
-
+
 
 
 
@@ -43,6 +43,6 @@
 
 
 

-
Generated by GTK-Doc V1.29.1

+
Generated by GTK-Doc V1.29
 
 
\ 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..8b94487f 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 @@
 
 
 
-
+
 
 
 
@@ -156,6 +156,6 @@ to flags, 
-
Generated by GTK-Doc V1.29.1
+
Generated by GTK-Doc V1.29
 
 
\ 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..09442356 100644
--- a/docs/libnm-glib/html/object-tree.html
+++ b/docs/libnm-glib/html/object-tree.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -55,6 +55,6 @@
 
 
 

-
Generated by GTK-Doc V1.29.1

+
Generated by GTK-Doc V1.29
 
 
\ 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 @@
 
 
 
-
+
 
 
 
@@ -41,6 +41,6 @@
     

 
 

-
Generated by GTK-Doc V1.29.1

+
Generated by GTK-Doc V1.29
 
 
\ No newline at end of file
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 4e00d0ac..42cf0675 100644
--- a/docs/libnm-glib/version.xml
+++ b/docs/libnm-glib/version.xml
@@ -1 +1 @@
-1.14.4
+1.15.2
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/NMConnection.html b/docs/libnm-util/html/NMConnection.html
index ee6e48de..d3f0e51f 100644
--- a/docs/libnm-util/html/NMConnection.html
+++ b/docs/libnm-util/html/NMConnection.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -2691,6 +2691,6 @@ updated

 
 
 

-
Generated by GTK-Doc V1.29.1

+
Generated by GTK-Doc V1.29
 
 
\ No newline at end of file
diff --git a/docs/libnm-util/html/NMSetting.html b/docs/libnm-util/html/NMSetting.html
index cd2e8e8e..1d8f1402 100644
--- a/docs/libnm-util/html/NMSetting.html
+++ b/docs/libnm-util/html/NMSetting.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -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

 
  
@@ -1399,6 +1399,6 @@ example "ppp" or "wireless" or "wired".

 
 
 

-
Generated by GTK-Doc V1.29.1

+
Generated by GTK-Doc V1.29
 
 
\ 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 @@
 
 
 
-
+
 
 
 
@@ -3963,6 +3963,6 @@ addition to any certificates specified by the 
-
Generated by GTK-Doc V1.29.1
+
Generated by GTK-Doc V1.29
 
 
\ 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 @@
 
 
 
-
+
 
 
 
@@ -639,6 +639,6 @@ required

 
 
 

-
Generated by GTK-Doc V1.29.1

+
Generated by GTK-Doc V1.29
 
 
\ 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 @@
 
 
 
-
+
 
 
 
@@ -348,6 +348,6 @@ Area Networking connections to devices supporting the NAP profile.

 
 
 

-
Generated by GTK-Doc V1.29.1

+
Generated by GTK-Doc V1.29
 
 
\ 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 @@
 
 
 
-
+
 
 
 
@@ -807,6 +807,6 @@ must be strings. Option names must contain only alphanumeric characters
 
 
 

-
Generated by GTK-Doc V1.29.1

+
Generated by GTK-Doc V1.29
 
 
\ 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 @@
 
 
 
-
+
 
 
 
@@ -670,6 +670,6 @@ bridge.

 
 
 

-
Generated by GTK-Doc V1.29.1

+
Generated by GTK-Doc V1.29
 
 
\ 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 @@
 
 
 
-
+
 
 
 
@@ -377,6 +377,6 @@ port.

 
 
 

-
Generated by GTK-Doc V1.29.1

+
Generated by GTK-Doc V1.29
 
 
\ 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 @@
 
 
 
-
+
 
 
 
@@ -434,6 +434,6 @@ username is required, it is specified here.

 
 
 

-
Generated by GTK-Doc V1.29.1

+
Generated by GTK-Doc V1.29
 
 
\ No newline at end of file
diff --git a/docs/libnm-util/html/NMSettingConnection.html b/docs/libnm-util/html/NMSettingConnection.html
index e1374639..12635583 100644
--- a/docs/libnm-util/html/NMSettingConnection.html
+++ b/docs/libnm-util/html/NMSettingConnection.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -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

 

@@ -1517,6 +1517,6 @@ firewall.

-
Generated by GTK-Doc V1.29.1

+
Generated by GTK-Doc V1.29
\ 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 @@
 
-
+
@@ -1517,6 +1517,6 @@ which the priority is mapped.

-
Generated by GTK-Doc V1.29.1

+
Generated by GTK-Doc V1.29
\ 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 @@
 
-
+
@@ -186,6 +186,6 @@ is required

-
Generated by GTK-Doc V1.29.1

+
Generated by GTK-Doc V1.29
\ 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 @@
 
-
+
@@ -1100,6 +1100,6 @@ username is required, it is specified here.

-
Generated by GTK-Doc V1.29.1

+
Generated by GTK-Doc V1.29
\ 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 @@
 
-
+
@@ -2779,6 +2779,6 @@ methods because there is no upstream network.

-
Generated by GTK-Doc V1.29.1

+
Generated by GTK-Doc V1.29
\ 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 @@
 
-
+
@@ -2723,6 +2723,6 @@ automatic configuration.  Routes cannot be used with the "shared" or
 

-
Generated by GTK-Doc V1.29.1

+
Generated by GTK-Doc V1.29
\ 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 @@
 
-
+
@@ -492,6 +492,6 @@ specify the base device by setting either this property or
 

-
Generated by GTK-Doc V1.29.1

+
Generated by GTK-Doc V1.29
\ 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 @@
 
-
+
@@ -294,6 +294,6 @@ answers the request.

-
Generated by GTK-Doc V1.29.1

+
Generated by GTK-Doc V1.29
\ 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 @@
 
-
+
@@ -1235,6 +1235,6 @@ be set to 
-
Generated by GTK-Doc V1.29.1
+
Generated by GTK-Doc V1.29
 
 
\ 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 @@
 
 
 
-
+
 
 
 
@@ -432,6 +432,6 @@ access concentrators or a specific service is known to be required.

 
 
 

-
Generated by GTK-Doc V1.29.1

+
Generated by GTK-Doc V1.29
 
 
\ 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 @@
 
 
 
-
+
 
 
 
@@ -492,6 +492,6 @@ The 1 in "8n1" for example.

 
 
 

-
Generated by GTK-Doc V1.29.1

+
Generated by GTK-Doc V1.29
 
 
\ 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 @@
 
 
 
-
+
 
 
 
@@ -314,6 +314,6 @@ configuration is used.  See man teamd.conf for the format details.

 
 
 

-
Generated by GTK-Doc V1.29.1

+
Generated by GTK-Doc V1.29
 
 
\ 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 @@
 
 
 
-
+
 
 
 
@@ -255,6 +255,6 @@ used. See man teamd.conf for the format details.

 
 
 

-
Generated by GTK-Doc V1.29.1

+
Generated by GTK-Doc V1.29
 
 
\ 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 @@
 
 
 
-
+
 
 
 
@@ -904,6 +904,6 @@ VPN connection.

 
 
 

-
Generated by GTK-Doc V1.29.1

+
Generated by GTK-Doc V1.29
 
 
\ 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 @@
 
 
 
-
+
 
 
 
@@ -1023,6 +1023,6 @@ with a 
 
 

-
Generated by GTK-Doc V1.29.1

+
Generated by GTK-Doc V1.29
 
 
\ 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 @@
 
 
 
-
+
 
 
 
@@ -339,6 +339,6 @@ should use.

 
 
 

-
Generated by GTK-Doc V1.29.1

+
Generated by GTK-Doc V1.29
 
 
\ 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 @@
 
 
 
-
+
 
 
 
@@ -1328,6 +1328,6 @@ Mbit/s, ie 100 == 100Mbit/s.

 
 
 

-
Generated by GTK-Doc V1.29.1

+
Generated by GTK-Doc V1.29
 
 
\ 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 @@
 
 
 
-
+
 
 
 
@@ -1543,6 +1543,6 @@ devices support setting a static transmit power.

 
 
 

-
Generated by GTK-Doc V1.29.1

+
Generated by GTK-Doc V1.29
 
 
\ No newline at end of file
diff --git a/docs/libnm-util/html/NMSettingWirelessSecurity.html b/docs/libnm-util/html/NMSettingWirelessSecurity.html
index d080e83b..76b0781b 100644
--- a/docs/libnm-util/html/NMSettingWirelessSecurity.html
+++ b/docs/libnm-util/html/NMSettingWirelessSecurity.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -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
@@ -1898,6 +1898,6 @@ Linksys WRT54G) number the keys 1 - 4.

 

-
Generated by GTK-Doc V1.29.1

+
Generated by GTK-Doc V1.29
\ 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 @@
 
-
+
@@ -64,6 +64,6 @@
 
Don't free data after the code is done.

-
Generated by GTK-Doc V1.29.1

+
Generated by GTK-Doc V1.29
\ 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 @@
 
-
+
@@ -5335,6 +5335,6 @@ DBUS_TYPE_NM_IP_ROUTES, macro in nm-dbus-glib-types
 

-
Generated by GTK-Doc V1.29.1

+
Generated by GTK-Doc V1.29
\ 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 @@
 
-
+
@@ -122,6 +122,6 @@ that require PPP to deliver IP capability

-
Generated by GTK-Doc V1.29.1

+
Generated by GTK-Doc V1.29
\ No newline at end of file
diff --git a/docs/libnm-util/html/index.html b/docs/libnm-util/html/index.html
index 206b7525..49155dbb 100644
--- a/docs/libnm-util/html/index.html
+++ b/docs/libnm-util/html/index.html
@@ -6,7 +6,7 @@
 
-
+
@@ -15,7 +15,7 @@
 

 

 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 

 

-      for libnm-util 1.14.4
+      for libnm-util 1.15.2
 
       The latest version of this documentation can be found on-line at
       https://developer.gnome.org/libnm-util/stable/.
@@ -152,6 +152,6 @@ that require PPP to deliver IP capability
 

 

 

-
Generated by GTK-Doc V1.29.1

+
Generated by GTK-Doc V1.29
 
 
\ 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..c5ab858e 100644
--- a/docs/libnm-util/html/libnm-util-NetworkManager.html
+++ b/docs/libnm-util/html/libnm-util-NetworkManager.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -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

 
  
 
@@ -1886,6 +1886,6 @@ network.

 
 
 

-
Generated by GTK-Doc V1.29.1

+
Generated by GTK-Doc V1.29
 
 
\ 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 @@
 
 
 
-
+
 
 
 
@@ -944,6 +944,6 @@
 
 
 

-
Generated by GTK-Doc V1.29.1

+
Generated by GTK-Doc V1.29
 
 
\ 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..f3607399 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 @@
 
 
 
-
+
 
 
 
@@ -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

  
 
@@ -2498,6 +2498,6 @@ for both 
 
 

-
Generated by GTK-Doc V1.29.1

+
Generated by GTK-Doc V1.29
 
 
\ 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 @@
 
 
 
-
+
 
 
 
@@ -103,6 +103,6 @@
 
 
 

-
Generated by GTK-Doc V1.29.1

+
Generated by GTK-Doc V1.29
 
 
\ No newline at end of file
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 4e00d0ac..42cf0675 100644
--- a/docs/libnm-util/version.xml
+++ b/docs/libnm-util/version.xml
@@ -1 +1 @@
-1.14.4
+1.15.2
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 6df74b49..bc1c0941 100644
--- a/docs/libnm/html/NMAccessPoint.html
+++ b/docs/libnm/html/NMAccessPoint.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -814,6 +814,6 @@ coordinator of the wireless network allowing clients to connect) or
 
 
 

-
Generated by GTK-Doc V1.29.1

+
Generated by GTK-Doc V1.29
 
 
\ No newline at end of file
diff --git a/docs/libnm/html/NMActiveConnection.html b/docs/libnm/html/NMActiveConnection.html
index ae4f7e32..5689ae2f 100644
--- a/docs/libnm/html/NMActiveConnection.html
+++ b/docs/libnm/html/NMActiveConnection.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -1103,15 +1103,47 @@ 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

 
 
 
 

-
Generated by GTK-Doc V1.29.1

+
Generated by GTK-Doc V1.29
 
 
\ 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 @@
 
 
 
-
+
 
 
 
@@ -199,6 +199,6 @@ nm_checkpoint_get_rollback_timeout (
 
 

-
Generated by GTK-Doc V1.29.1

+
Generated by GTK-Doc V1.29
 
 
\ No newline at end of file
diff --git a/docs/libnm/html/NMClient.html b/docs/libnm/html/NMClient.html
index cae0449c..f05ae51c 100644
--- a/docs/libnm/html/NMClient.html
+++ b/docs/libnm/html/NMClient.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -430,6 +430,22 @@
 
 
 
+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
(transfer full): the output result
+of type "a{sv}" returned by D-Bus' AddAndActivate2 call. Currently no
+output is implemented yet. 
[allow-none]

+

+

+
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,
@@ -5032,6 +5203,6 @@ user_function (
 

 

-
Generated by GTK-Doc V1.29.1

+
Generated by GTK-Doc V1.29
 
 
\ No newline at end of file
diff --git a/docs/libnm/html/NMConnection.html b/docs/libnm/html/NMConnection.html
index 9a6eb203..367491ba 100644
--- a/docs/libnm/html/NMConnection.html
+++ b/docs/libnm/html/NMConnection.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -1238,8 +1238,8 @@ nm_connection_clear_secrets_with_flags
 
 
 
func

-
function to be called to determine whether a
-specific secret should be cleared or not. 

+
(allow-none): function to be called to determine whether a
+specific secret should be cleared or not. If NULL, all secrets are cleared. 

 [scope call]
 
 
@@ -2781,7 +2781,7 @@ nm_connection_get_setting_vxlan (
 
 
GTypeInterface parent;

-
the parent interace struct

+
the parent interface struct

  
 
 
@@ -2854,6 +2854,6 @@ calling 
-
Generated by GTK-Doc V1.29.1
+
Generated by GTK-Doc V1.29
 
 
\ No newline at end of file
diff --git a/docs/libnm/html/NMDevice.html b/docs/libnm/html/NMDevice.html
index cad779b9..915fe645 100644
--- a/docs/libnm/html/NMDevice.html
+++ b/docs/libnm/html/NMDevice.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -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
 
@@ -1396,6 +1422,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);

@@ -2313,7 +2376,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 +3006,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 +3134,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 +3150,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.

@@ -3225,6 +3318,6 @@ user_function (
 

 

-
Generated by GTK-Doc V1.29.1

+
Generated by GTK-Doc V1.29

 
 
\ 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 @@
 
 
 
-
+
 
 
 
@@ -155,6 +155,6 @@ nm_device_adsl_get_carrier (
-
Generated by GTK-Doc V1.29.1
+
Generated by GTK-Doc V1.29
 
 
\ 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 @@
 
 
 
-
+
 
 
 
@@ -279,6 +279,6 @@ copy used by the device, and must not be modified. 

 
 
 

-
Generated by GTK-Doc V1.29.1

+
Generated by GTK-Doc V1.29
 
 
\ 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 @@
 
 
 
-
+
 
 
 
@@ -279,6 +279,6 @@ copy used by the device, and must not be modified. 

 
 
 

-
Generated by GTK-Doc V1.29.1

+
Generated by GTK-Doc V1.29
 
 
\ 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 @@
 
 
 
-
+
 
 
 
@@ -273,6 +273,6 @@ nm_device_bt_get_capabilities (
 
 

-
Generated by GTK-Doc V1.29.1

+
Generated by GTK-Doc V1.29
 
 
\ 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 @@
 
 
 
-
+
 
 
 
@@ -158,6 +158,6 @@ device, and must not be modified.

 
 
 

-
Generated by GTK-Doc V1.29.1

+
Generated by GTK-Doc V1.29
 
 
\ 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 @@
 
 
 
-
+
 
 
 
@@ -394,6 +394,6 @@ communication with z/VM or s390 host.

 
 
 

-
Generated by GTK-Doc V1.29.1

+
Generated by GTK-Doc V1.29
 
 
\ 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 @@
 
 
 
-
+
 
 
 
@@ -183,6 +183,6 @@ if not known.

 
 
 

-
Generated by GTK-Doc V1.29.1

+
Generated by GTK-Doc V1.29
 
 
\ 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 @@
 
 
 
-
+
 
 
 
@@ -808,6 +808,6 @@ tunneled packets.

 
 
 

-
Generated by GTK-Doc V1.29.1

+
Generated by GTK-Doc V1.29
 
 
\ 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 @@
 
 
 
-
+
 
 
 
@@ -217,6 +217,6 @@ nm_device_infiniband_get_carrier (
 
 

-
Generated by GTK-Doc V1.29.1

+
Generated by GTK-Doc V1.29
 
 
\ 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 @@
 
 
 
-
+
 
 
 
@@ -939,6 +939,6 @@ disabled).

 
 
 

-
Generated by GTK-Doc V1.29.1

+
Generated by GTK-Doc V1.29
 
 
\ 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 @@
 
 
 
-
+
 
 
 
@@ -399,6 +399,6 @@ device, and must not be modified.

 
 
 

-
Generated by GTK-Doc V1.29.1

+
Generated by GTK-Doc V1.29
 
 
\ 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 @@
 
 
 
-
+
 
 
 
@@ -225,6 +225,6 @@ CDMA/EVDO and GSM/UMTS.

 
 
 

-
Generated by GTK-Doc V1.29.1

+
Generated by GTK-Doc V1.29
 
 
\ 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 @@
 
 
 
-
+
 
 
 
@@ -276,6 +276,6 @@ nm_device_olpc_mesh_get_active_channel
 
 
 

-
Generated by GTK-Doc V1.29.1

+
Generated by GTK-Doc V1.29
 
 
\ 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 @@
 
 
 
-
+
 
 
 
@@ -107,6 +107,6 @@ copy used by the device, and must not be modified. 

 
 
 

-
Generated by GTK-Doc V1.29.1

+
Generated by GTK-Doc V1.29
 
 
\ 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 @@
 
 
 
-
+
 
 
 
@@ -43,6 +43,6 @@
 
 
 

-
Generated by GTK-Doc V1.29.1

+
Generated by GTK-Doc V1.29
 
 
\ 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 @@
 
 
 
-
+
 
 
 
@@ -107,6 +107,6 @@ copy used by the device, and must not be modified. 

 
 
 

-
Generated by GTK-Doc V1.29.1

+
Generated by GTK-Doc V1.29
 
 
\ 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 @@
 
 
 
-
+
 
 
 
@@ -43,6 +43,6 @@
 
 
 

-
Generated by GTK-Doc V1.29.1

+
Generated by GTK-Doc V1.29
 
 
\ 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 @@
 
 
 
-
+
 
 
 
@@ -339,6 +339,6 @@ device, and must not be modified.

 
 
 

-
Generated by GTK-Doc V1.29.1

+
Generated by GTK-Doc V1.29
 
 
\ 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 @@
 
 
 
-
+
 
 
 
@@ -501,6 +501,6 @@ include a virtio network header.

 
 
 

-
Generated by GTK-Doc V1.29.1

+
Generated by GTK-Doc V1.29
 
 
\ 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 @@
 
 
 
-
+
 
 
 
@@ -331,6 +331,6 @@ nm_device_vlan_get_vlan_id (
-
Generated by GTK-Doc V1.29.1
+
Generated by GTK-Doc V1.29
 
 
\ No newline at end of file
diff --git a/docs/libnm/html/NMDeviceVxlan.html b/docs/libnm/html/NMDeviceVxlan.html
index 506d3593..52d0394d 100644
--- a/docs/libnm/html/NMDeviceVxlan.html
+++ b/docs/libnm/html/NMDeviceVxlan.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -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

 
@@ -1162,6 +1162,6 @@ tunnel endpoint.

 
 
 

-
Generated by GTK-Doc V1.29.1

+
Generated by GTK-Doc V1.29
 
 
\ No newline at end of file
diff --git a/docs/libnm/html/NMDeviceWifi.html b/docs/libnm/html/NMDeviceWifi.html
index b64c0608..0cc5e19a 100644
--- a/docs/libnm/html/NMDeviceWifi.html
+++ b/docs/libnm/html/NMDeviceWifi.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -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

@@ -1009,6 +1009,6 @@ user_function (
 

 

-
Generated by GTK-Doc V1.29.1

+
Generated by GTK-Doc V1.29

 
 
\ 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 @@
 
 
 
-
+
 
 
 
@@ -796,6 +796,6 @@ user_function (<
 
 
 

-
Generated by GTK-Doc V1.29.1

+
Generated by GTK-Doc V1.29
 
 
\ 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 @@
 
 
 
-
+
 
 
 
@@ -200,6 +200,6 @@ See: ip-rule(8)

 
 
 

-
Generated by GTK-Doc V1.29.1

+
Generated by GTK-Doc V1.29
 
 
\ 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 @@
 
 
 
-
+
 
 
 
@@ -262,6 +262,6 @@ configuration, and must not be modified.

 
 
 

-
Generated by GTK-Doc V1.29.1

+
Generated by GTK-Doc V1.29
 
 
\ 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 @@
 
 
 
-
+
 
 
 
@@ -570,6 +570,6 @@ nm_ip_config_get_wins_servers (
 
 

-
Generated by GTK-Doc V1.29.1

+
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 72578230..dacf1197 100644
--- a/docs/libnm/html/NMObject.html
+++ b/docs/libnm/html/NMObject.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -226,6 +226,6 @@ object, and must not be modified.

 
 
 

-
Generated by GTK-Doc V1.29.1

+
Generated by GTK-Doc V1.29
 
 
\ 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 @@
 
 
 
-
+
 
 
 
@@ -1129,6 +1129,6 @@ after you already have a reference to it.)

 
 
 

-
Generated by GTK-Doc V1.29.1

+
Generated by GTK-Doc V1.29
 
 
\ 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 @@
 
 
 
-
+
 
 
 
@@ -827,6 +827,6 @@ of 3 characters.  An example valid identifier is 'org.gnome.nm-applet'
 
 
 

-
Generated by GTK-Doc V1.29.1

+
Generated by GTK-Doc V1.29
 
 
\ No newline at end of file
diff --git a/docs/libnm/html/NMSetting.html b/docs/libnm/html/NMSetting.html
index 045d0177..cb6b7305 100644
--- a/docs/libnm/html/NMSetting.html
+++ b/docs/libnm/html/NMSetting.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -932,7 +932,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

 
  
@@ -1165,6 +1165,6 @@ example "ppp" or "802-11-wireless" or "802-3-ethernet".

 
 
 

-
Generated by GTK-Doc V1.29.1

+
Generated by GTK-Doc V1.29
 
 
\ 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 @@
 
 
 
-
+
 
 
 
@@ -138,6 +138,6 @@ nm_setting_6lowpan_get_parent (
 
 

-
Generated by GTK-Doc V1.29.1

+
Generated by GTK-Doc V1.29
 
 
\ 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 @@
 
 
 
-
+
 
 
 
@@ -5036,6 +5036,6 @@ properties instead (sets ca_cert/ca_cert2 options for wpa_supplicant).

 
 
 

-
Generated by GTK-Doc V1.29.1

+
Generated by GTK-Doc V1.29
 
 
\ 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 @@
 
 
 
-
+
 
 
 
@@ -569,6 +569,6 @@ nm_setting_adsl_get_password_flags (
 
 

-
Generated by GTK-Doc V1.29.1

+
Generated by GTK-Doc V1.29
 
 
\ 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 @@
 
 
 
-
+
 
 
 
@@ -284,6 +284,6 @@ Area Networking connections to devices supporting the NAP profile.

 
 
 

-
Generated by GTK-Doc V1.29.1

+
Generated by GTK-Doc V1.29
 
 
\ 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 @@
 
 
 
-
+
 
 
 
@@ -787,6 +787,6 @@ the 
-
Generated by GTK-Doc V1.29.1
+
Generated by GTK-Doc V1.29
 
 
\ 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 @@
 
 
 
-
+
 
 
 
@@ -663,6 +663,6 @@ bridge.

 
 
 

-
Generated by GTK-Doc V1.29.1

+
Generated by GTK-Doc V1.29
 
 
\ 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 @@
 
 
 
-
+
 
 
 
@@ -300,6 +300,6 @@ port.

 
 
 

-
Generated by GTK-Doc V1.29.1

+
Generated by GTK-Doc V1.29
 
 
\ 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 @@
 
 
 
-
+
 
 
 
@@ -415,6 +415,6 @@ username is required, it is specified here.

 
 
 

-
Generated by GTK-Doc V1.29.1

+
Generated by GTK-Doc V1.29
 
 
\ No newline at end of file
diff --git a/docs/libnm/html/NMSettingConnection.html b/docs/libnm/html/NMSettingConnection.html
index 08f7ac46..867d132c 100644
--- a/docs/libnm/html/NMSettingConnection.html
+++ b/docs/libnm/html/NMSettingConnection.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -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

 

@@ -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.
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 "$$".
@@ -2291,6 +2291,6 @@ the change takes effect immediately.

-
Generated by GTK-Doc V1.29.1

+
Generated by GTK-Doc V1.29
\ 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 @@
 
-
+
@@ -1403,6 +1403,6 @@ which the priority is mapped.

-
Generated by GTK-Doc V1.29.1

+
Generated by GTK-Doc V1.29
\ 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 @@
 
-
+
@@ -111,6 +111,6 @@ nm_setting_dummy_new (void
 
 
 

-
Generated by GTK-Doc V1.29.1

+
Generated by GTK-Doc V1.29
 
 
\ 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 @@
 
 
 
-
+
 
 
 
@@ -771,6 +771,6 @@ nm_setting_ethtool_clear_features (
 
 

-
Generated by GTK-Doc V1.29.1

+
Generated by GTK-Doc V1.29
 
 
\ No newline at end of file
diff --git a/docs/libnm/html/NMSettingGeneric.html b/docs/libnm/html/NMSettingGeneric.html
index cdf607e7..5ac78763 100644
--- a/docs/libnm/html/NMSettingGeneric.html
+++ b/docs/libnm/html/NMSettingGeneric.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -113,6 +113,6 @@ nm_setting_generic_new (void
 
 

-
Generated by GTK-Doc V1.29.1

+
Generated by GTK-Doc V1.29
 
 
\ No newline at end of file
diff --git a/docs/libnm/html/NMSettingGsm.html b/docs/libnm/html/NMSettingGsm.html
index 4fd18cc3..9cf1103c 100644
--- a/docs/libnm/html/NMSettingGsm.html
+++ b/docs/libnm/html/NMSettingGsm.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -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

 

@@ -891,6 +897,6 @@ username is required, it is specified here.

 

 

 

-
Generated by GTK-Doc V1.29.1

+
Generated by GTK-Doc V1.29

 
 
\ 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 @@
 
 
 
-
+
 
 
 
@@ -323,10 +323,14 @@ non-hardware-address client ID and the 'type' field is set to 0.

 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 unset, a globally configured default is used. If still unset, the
-client-id from the last lease is reused.

+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.

 
Flags: Read / Write

 
Default value: NULL

 
@@ -345,6 +349,6 @@ cannot be set at the same time.

 
 
 

-
Generated by GTK-Doc V1.29.1

+
Generated by GTK-Doc V1.29
 
 
\ 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 @@
 
 
 
-
+
 
 
 
@@ -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.

 
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.

 
 
 

-
Generated by GTK-Doc V1.29.1

+
Generated by GTK-Doc V1.29
 
 
\ No newline at end of file
diff --git a/docs/libnm/html/NMSettingIPConfig.html b/docs/libnm/html/NMSettingIPConfig.html
index 16d8cb2c..873cdb84 100644
--- a/docs/libnm/html/NMSettingIPConfig.html
+++ b/docs/libnm/html/NMSettingIPConfig.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -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.

@@ -4386,6 +4387,6 @@ of NetworkManager.

 
 
 

-
Generated by GTK-Doc V1.29.1

+
Generated by GTK-Doc V1.29
 
 
\ 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 @@
 
 
 
-
+
 
 
 
@@ -951,6 +951,6 @@ packets inherit the TTL value.

 
 
 

-
Generated by GTK-Doc V1.29.1

+
Generated by GTK-Doc V1.29
 
 
\ 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 @@
 
 
 
-
+
 
 
 
@@ -461,6 +461,6 @@ specify the base device by setting either this property or
 
 
 

-
Generated by GTK-Doc V1.29.1

+
Generated by GTK-Doc V1.29
 
 
\ 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 @@
 
 
 
-
+
 
 
 
@@ -764,6 +764,6 @@ in every packet.

 
 
 

-
Generated by GTK-Doc V1.29.1

+
Generated by GTK-Doc V1.29
 
 
\ 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 @@
 
 
 
-
+
 
 
 
@@ -438,6 +438,6 @@ with a 
 
 

-
Generated by GTK-Doc V1.29.1

+
Generated by GTK-Doc V1.29
 
 
\ 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 @@
 
 
 
-
+
 
 
 
@@ -378,6 +378,6 @@ nm_setting_match_get_interface_names (
-
Generated by GTK-Doc V1.29.1
+
Generated by GTK-Doc V1.29
 
 
\ 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 @@
 
 
 
-
+
 
 
 
@@ -260,6 +260,6 @@ answers the request.

 
 
 

-
Generated by GTK-Doc V1.29.1

+
Generated by GTK-Doc V1.29
 
 
\ 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 @@
 
 
 
-
+
 
 
 
@@ -271,6 +271,6 @@ nm_setting_ovs_bridge_get_stp_enable (
-
Generated by GTK-Doc V1.29.1
+
Generated by GTK-Doc V1.29
 
 
\ 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 @@
 
 
 
-
+
 
 
 
@@ -139,6 +139,6 @@ nm_setting_ovs_interface_get_interface_type
 
 
 

-
Generated by GTK-Doc V1.29.1

+
Generated by GTK-Doc V1.29
 
 
\ 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 @@
 
 
 
-
+
 
 
 
@@ -138,6 +138,6 @@ nm_setting_ovs_patch_get_peer (
 
 

-
Generated by GTK-Doc V1.29.1

+
Generated by GTK-Doc V1.29
 
 
\ 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 @@
 
 
 
-
+
 
 
 
@@ -357,6 +357,6 @@ nm_setting_ovs_port_get_bond_downdelay
 
 
 

-
Generated by GTK-Doc V1.29.1

+
Generated by GTK-Doc V1.29
 
 
\ 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 @@
 
 
 
-
+
 
 
 
@@ -1159,6 +1159,6 @@ be set to 
-
Generated by GTK-Doc V1.29.1
+
Generated by GTK-Doc V1.29
 
 
\ 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 @@
 
 
 
-
+
 
 
 
@@ -415,6 +415,6 @@ access concentrators or a specific service is known to be required.

 
 
 

-
Generated by GTK-Doc V1.29.1

+
Generated by GTK-Doc V1.29
 
 
\ 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 @@
 
 
 
-
+
 
 
 
@@ -406,6 +406,6 @@ nm_setting_proxy_get_pac_script (
 
 

-
Generated by GTK-Doc V1.29.1

+
Generated by GTK-Doc V1.29
 
 
\ 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 @@
 
 
 
-
+
 
 
 
@@ -458,6 +458,6 @@ The 1 in "8n1" for example.

 
 
 

-
Generated by GTK-Doc V1.29.1

+
Generated by GTK-Doc V1.29
 
 
\ 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 @@
 
 
 
-
+
 
 
 
@@ -1191,6 +1191,6 @@ the value is of the correct type and well-formed.

 
 
 

-
Generated by GTK-Doc V1.29.1

+
Generated by GTK-Doc V1.29
 
 
\ 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 @@
 
 
 
-
+
 
 
 
@@ -1693,6 +1693,6 @@ nm_setting_tc_config_clear_tfilters (
 
 

-
Generated by GTK-Doc V1.29.1

+
Generated by GTK-Doc V1.29
 
 
\ No newline at end of file
diff --git a/docs/libnm/html/NMSettingTeam.html b/docs/libnm/html/NMSettingTeam.html
index 0df3712b..02a1f409 100644
--- a/docs/libnm/html/NMSettingTeam.html
+++ b/docs/libnm/html/NMSettingTeam.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -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

@@ -2364,6 +2477,6 @@ a default value).

 

 
 

-
Generated by GTK-Doc V1.29.1

+
Generated by GTK-Doc V1.29
 
 
\ No newline at end of file
diff --git a/docs/libnm/html/NMSettingTeamPort.html b/docs/libnm/html/NMSettingTeamPort.html
index 28eaa762..403a0373 100644
--- a/docs/libnm/html/NMSettingTeamPort.html
+++ b/docs/libnm/html/NMSettingTeamPort.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -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

@@ -768,6 +768,6 @@ When set to -1 means the parameter is skipped from the json config.

 
 
 

-
Generated by GTK-Doc V1.29.1

+
Generated by GTK-Doc V1.29
 
 
\ 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 @@
 
 
 
-
+
 
 
 
@@ -530,6 +530,6 @@ network header.

 
 
 

-
Generated by GTK-Doc V1.29.1

+
Generated by GTK-Doc V1.29
 
 
\ 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 @@
 
 
 
-
+
 
 
 
@@ -342,6 +342,6 @@ is a valid user data value.

 
 
 

-
Generated by GTK-Doc V1.29.1

+
Generated by GTK-Doc V1.29
 
 
\ 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 @@
 
 
 
-
+
 
 
 
@@ -889,6 +889,6 @@ with a 
 
 

-
Generated by GTK-Doc V1.29.1

+
Generated by GTK-Doc V1.29
 
 
\ 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 @@
 
 
 
-
+
 
 
 
@@ -988,6 +988,6 @@ VPN connection.

 
 
 

-
Generated by GTK-Doc V1.29.1

+
Generated by GTK-Doc V1.29
 
 
\ 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 @@
 
 
 
-
+
 
 
 
@@ -1070,6 +1070,6 @@ tunnel endpoint.

 
 
 

-
Generated by GTK-Doc V1.29.1

+
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 4ac21b44..519d0a9c 100644
--- a/docs/libnm/html/NMSettingWimax.html
+++ b/docs/libnm/html/NMSettingWimax.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -268,6 +268,6 @@ should use.

 
 
 

-
Generated by GTK-Doc V1.29.1

+
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 0b20755d..8850803b 100644
--- a/docs/libnm/html/NMSettingWired.html
+++ b/docs/libnm/html/NMSettingWired.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -1612,6 +1612,6 @@ no password will be required.

 
 
 

-
Generated by GTK-Doc V1.29.1

+
Generated by GTK-Doc V1.29
 
 
\ No newline at end of file
diff --git a/docs/libnm/html/NMSettingWireless.html b/docs/libnm/html/NMSettingWireless.html
index 40b975d9..bfda01ff 100644
--- a/docs/libnm/html/NMSettingWireless.html
+++ b/docs/libnm/html/NMSettingWireless.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -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

 
  
 
@@ -1811,6 +1811,6 @@ NetworkManager).

 
 
 

-
Generated by GTK-Doc V1.29.1

+
Generated by GTK-Doc V1.29
 
 
\ No newline at end of file
diff --git a/docs/libnm/html/NMSettingWirelessSecurity.html b/docs/libnm/html/NMSettingWirelessSecurity.html
index fb43d8bd..e55c5a74 100644
--- a/docs/libnm/html/NMSettingWirelessSecurity.html
+++ b/docs/libnm/html/NMSettingWirelessSecurity.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -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
+altough, with the same numeric values.

 

 
Members

 

@@ -2120,6 +2123,6 @@ the Access Point capabilities.

-
Generated by GTK-Doc V1.29.1

+
Generated by GTK-Doc V1.29
\ No newline at end of file
diff --git a/docs/libnm/html/NMSettingWpan.html b/docs/libnm/html/NMSettingWpan.html
index e28d4119..777bc6f6 100644
--- a/docs/libnm/html/NMSettingWpan.html
+++ b/docs/libnm/html/NMSettingWpan.html
@@ -8,7 +8,7 @@
 
-
+
@@ -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,9 +307,33 @@ 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
+

+

 
 
 

-
Generated by GTK-Doc V1.29.1

+
Generated by GTK-Doc V1.29
 
 
\ 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 @@
 
 
 
-
+
 
 
 
@@ -188,6 +188,6 @@ and properties as the source 
-
Generated by GTK-Doc V1.29.1
+
Generated by GTK-Doc V1.29
 
 
\ 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 @@
 
 
 
-
+
 
 
 
@@ -245,6 +245,6 @@ user_function (
-
Generated by GTK-Doc V1.29.1
+
Generated by GTK-Doc V1.29
 
 
\ 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 @@
 
 
 
-
+
 
 
 
@@ -140,7 +140,7 @@ nm_vpn_editor_update_connection (
 
 
get_widget ()

-
return the GtkWidget for the VPN editor's UI

+
return the GtkWidget for the VPN editor's UI

  
 
 
@@ -175,6 +175,6 @@ to write values to the connection.

 
 
 

-
Generated by GTK-Doc V1.29.1

+
Generated by GTK-Doc V1.29
 
 
\ No newline at end of file
diff --git a/docs/libnm/html/NMVpnEditorPlugin.html b/docs/libnm/html/NMVpnEditorPlugin.html
index 4cff61e5..4085af30 100644
--- a/docs/libnm/html/NMVpnEditorPlugin.html
+++ b/docs/libnm/html/NMVpnEditorPlugin.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -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
@@ -821,6 +821,6 @@ user_function (
 
 

-
Generated by GTK-Doc V1.29.1

+
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 521283b5..49a3f7c5 100644
--- a/docs/libnm/html/NMWimaxNsp.html
+++ b/docs/libnm/html/NMWimaxNsp.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -371,6 +371,6 @@ against

 
 
 

-
Generated by GTK-Doc V1.29.1

+
Generated by GTK-Doc V1.29
 
 
\ 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 @@
 
 
 
-
+
 
 
 
@@ -73,6 +73,6 @@
 
Override the parsed C type with given type.

 
 

-
Generated by GTK-Doc V1.29.1

+
Generated by GTK-Doc V1.29
 
 
\ 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..34c773df 100644
--- a/docs/libnm/html/api-index-full.html
+++ b/docs/libnm/html/api-index-full.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -457,6 +457,10 @@
 
 

 

+NM_AVAILABLE_IN_1_16, macro in nm-version
+

+

+

 NM_AVAILABLE_IN_1_2, macro in nm-version
 

 

@@ -711,6 +715,14 @@ NMCheckpoint:rollback-timeout, object property in NMDeviceOvs
 
 

 

+nm_client_add_and_activate_connection2, function in NMClient
+

+

+

+nm_client_add_and_activate_connection2_finish, function in NMClient
+

+

+

 nm_client_add_and_activate_connection_async, function in NMClient
 

 

@@ -1800,6 +1812,14 @@ NM_DBUS_VPN_WRONG_STATE, macro in nm-vpn-dbus-interface
 
 

 

+NM_DEPRECATED_IN_1_16, macro in nm-version
+

+

+

+NM_DEPRECATED_IN_1_16_FOR, macro in nm-version
+

+

+

 NM_DEPRECATED_IN_1_2, macro in nm-version
 

 

@@ -1908,10 +1928,18 @@ NMDevice6Lowpan:parent, object property in NMDeviceOvs
 
 

 

+NMDevice:ip4-connectivity, object property in NMDeviceOvs
+

+

+

 NMDevice:ip6-config, object property in NMDeviceOvs
 

 

 

+NMDevice:ip6-connectivity, object property in NMDeviceOvs
+

+

+

 NMDevice:lldp-neighbors, object property in NMDeviceOvs
 

 

@@ -2816,6 +2844,10 @@ NMDeviceWpan:hw-address, object property in NMDeviceOvs
 
 

 

+nm_device_get_connectivity, function in NMDevice
+

+

+

 nm_device_get_description, function in NMDevice
 

 

@@ -2944,10 +2976,18 @@ NMDeviceWpan:hw-address, object property in NMDeviceOvs
 
 

 

+NM_DEVICE_IP4_CONNECTIVITY, macro in NMDevice
+

+

+

 NM_DEVICE_IP6_CONFIG, macro in NMDevice
 

 

 

+NM_DEVICE_IP6_CONNECTIVITY, macro in NMDevice
+

+

+

 NM_DEVICE_IP_INTERFACE, macro in NMDevice
 

 

@@ -4455,7 +4495,7 @@ json_object_iter_key, macro in nm-json
 
 

 

-json_object_iter_next, macro in nm-json
+json_object_iter_next, macro in nm-json
 

 

 

@@ -6552,10 +6592,18 @@ NMSettingWpan, struct in NMSettingOvs
 

 

 

+NMSettingWpan:channel, object property in NMSettingOvs
+

+

+

 NMSettingWpan:mac-address, object property in NMSettingOvs
 

 

 

+NMSettingWpan:page, object property in NMSettingOvs
+

+

+

 NMSettingWpan:pan-id, object property in NMSettingOvs
 

 

@@ -10824,10 +10872,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,6 +10908,14 @@ NMSettingWpan:short-address, object property in NMSettingOvs
 
 

 

+NM_SETTING_WPAN_PAGE, macro in NMSettingWpan
+

+

+

+NM_SETTING_WPAN_PAGE_DEFAULT, macro in NMSettingWpan
+

+

+

 NM_SETTING_WPAN_PAN_ID, macro in NMSettingWpan
 

 

@@ -11145,10 +11217,18 @@ NMSettingWpan:short-address, object property in NMSettingOvs
 
 

 

+nm_team_link_watcher_get_vlanid, function in NMSettingTeam
+

+

+

 nm_team_link_watcher_new_arp_ping, function in NMSettingTeam
 

 

 

+nm_team_link_watcher_new_arp_ping2, function in NMSettingTeam
+

+

+

 nm_team_link_watcher_new_ethtool, function in NMSettingTeam
 

 

@@ -11949,6 +12029,6 @@ NM_VPN_PLUGIN_IP6_CONFIG_ROUTES, macro in nm-vpn-dbus-interface
 

 
 

-
Generated by GTK-Doc V1.29.1

+
Generated by GTK-Doc V1.29
 
 
\ 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 @@
 
 
 
-
+
 
 
 
@@ -41,6 +41,6 @@
 
 
 

-
Generated by GTK-Doc V1.29.1

+
Generated by GTK-Doc V1.29
 
 
\ 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 @@
 
 
 
-
+
 
 
 
@@ -177,6 +177,6 @@ use WEP, LEAP, WPA or WPA2/RSN security
 
 
 

-
Generated by GTK-Doc V1.29.1

+
Generated by GTK-Doc V1.29
 
 
\ 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 @@
 
 
 
-
+
 
 
 
@@ -128,6 +128,6 @@
 
 
 

-
Generated by GTK-Doc V1.29.1

+
Generated by GTK-Doc V1.29
 
 
\ 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 @@
 
 
 
-
+
 
 
 
@@ -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/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 @@
 
 
 
-
+
 
 
 
@@ -41,6 +41,6 @@
 
 
 

-
Generated by GTK-Doc V1.29.1

+
Generated by GTK-Doc V1.29
 
 
\ No newline at end of file
diff --git a/docs/libnm/html/index.html b/docs/libnm/html/index.html
index f76a50a5..ea2007f8 100644
--- a/docs/libnm/html/index.html
+++ b/docs/libnm/html/index.html
@@ -6,7 +6,7 @@
 
 
 
-
+
 
 
 
@@ -15,7 +15,7 @@
 

 

 

-      for libnm 1.14.4
+      for libnm 1.15.2
 
       The latest version of this documentation can be found on-line at
       https://developer.gnome.org/libnm/stable/.
@@ -362,6 +362,6 @@ use WEP, LEAP, WPA or WPA2/RSN security
 

 

 

-
Generated by GTK-Doc V1.29.1

+
Generated by GTK-Doc V1.29
 
 
\ 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..d192e249 100644
--- a/docs/libnm/html/libnm-nm-dbus-interface.html
+++ b/docs/libnm/html/libnm-nm-dbus-interface.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -973,7 +973,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 +1031,7 @@ device object.

 
 
NM_DEVICE_TYPE_WIFI

 
-
an 802.11 WiFi device

+
an 802.11 Wi-Fi device

 
  
 
@@ -1790,7 +1790,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 +2247,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

 
  
 
@@ -3201,6 +3201,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 +3295,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.

 
@@ -3338,6 +3348,6 @@ VPN plugin authentication dialogs.

 
 
 

-
Generated by GTK-Doc V1.29.1

+
Generated by GTK-Doc V1.29
 
 
\ 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 @@
 
 
 
-
+
 
 
 
@@ -152,6 +152,6 @@ device, and must not be modified.

 
 
 

-
Generated by GTK-Doc V1.29.1

+
Generated by GTK-Doc V1.29
 
 
\ 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 @@
 
 
 
-
+
 
 
 
@@ -102,6 +102,6 @@ device, and must not be modified.

 
 
 

-
Generated by GTK-Doc V1.29.1

+
Generated by GTK-Doc V1.29
 
 
\ 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..24ed306f 100644
--- a/docs/libnm/html/libnm-nm-errors.html
+++ b/docs/libnm/html/libnm-nm-errors.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -991,6 +991,6 @@ to errors in the "org.freedesktop.NetworkManager.VPN.Error" namespace.

 
 
 

-
Generated by GTK-Doc V1.29.1

+
Generated by GTK-Doc V1.29
 
 
\ 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..099fb063 100644
--- a/docs/libnm/html/libnm-nm-utils.html
+++ b/docs/libnm/html/libnm-nm-utils.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -895,7 +895,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 +925,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 +940,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 +965,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

  
 
@@ -3472,6 +3472,6 @@ for both 
-
Generated by GTK-Doc V1.29.1
+
Generated by GTK-Doc V1.29
 
 
\ 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..596c4ea0 100644
--- a/docs/libnm/html/libnm-nm-version.html
+++ b/docs/libnm/html/libnm-nm-version.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -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,9 +384,21 @@
 
# 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)
+

+

 
 
 

-
Generated by GTK-Doc V1.29.1

+
Generated by GTK-Doc V1.29
 
 
\ 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 @@
 
 
 
-
+
 
 
 
@@ -126,6 +126,6 @@
 
 
 

-
Generated by GTK-Doc V1.29.1

+
Generated by GTK-Doc V1.29
 
 
\ 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 @@
 
 
 
-
+
 
 
 
@@ -73,6 +73,6 @@
 
 
 

-
Generated by GTK-Doc V1.29.1

+
Generated by GTK-Doc V1.29
 
 
\ 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 @@
 
 
 
-
+
 
 
 
@@ -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/libnm/html/libnm.devhelp2 b/docs/libnm/html/libnm.devhelp2
index e056858b..7ad47bb1 100644
--- a/docs/libnm/html/libnm.devhelp2
+++ b/docs/libnm/html/libnm.devhelp2
@@ -164,6 +164,8 @@
     
     
     
+    
+    
     
     
     
@@ -1091,7 +1093,6 @@
     
     
     
-    
     
     
     
@@ -1102,10 +1103,10 @@
     
     
     
+    
     
     
     
-    
     
     
     
@@ -1118,6 +1119,7 @@
     
     
     
+    
     
     
     
@@ -1715,6 +1717,7 @@
     
     
     
+    
     
     
     
@@ -1728,6 +1731,7 @@
     
     
     
+    
     
     
     
@@ -2171,10 +2175,16 @@
     
     
     
+    
+    
     
     
     
     
+    
+    
+    
+    
     
     
     
@@ -2195,6 +2205,7 @@
     
     
     
+    
     
     
     
@@ -2259,6 +2270,8 @@
     
     
     
+    
+    
     
     
     
@@ -2274,7 +2287,9 @@
     
     
     
+    
     
+    
     
     
     
@@ -2882,6 +2897,7 @@
     
     
     
+    
     
     
     
@@ -2902,6 +2918,8 @@
     
     
     
+    
+    
     
     
     
@@ -3278,6 +3296,7 @@
     
     
     
+    
     
     
     
diff --git a/docs/libnm/html/object-tree.html b/docs/libnm/html/object-tree.html
index d863f8c7..b255f829 100644
--- a/docs/libnm/html/object-tree.html
+++ b/docs/libnm/html/object-tree.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -130,6 +130,7 @@
     ├── NMSettingDcbFlags
     ├── NMSettingSecretFlags
     ├── NMSettingWiredWakeOnLan
+    ├── NMSettingWirelessSecurityWpsMethod
     ├── NMSettingWirelessWakeOnWLan
     ├── NMSettingsConnectionFlags
     ├── NMSettingsUpdate2Flags
@@ -179,7 +180,6 @@
     ├── NMSettingWirelessPowersave
     ├── NMSettingWirelessSecurityFils
     ├── NMSettingWirelessSecurityPmf
-    ├── NMSettingWirelessSecurityWpsMethod
     ├── NMSriovVFVlanProtocol
     ├── NMState
     ├── NMTernary
@@ -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/libnm/html/ref-overview.html b/docs/libnm/html/ref-overview.html
index 0c083992..0486f3a9 100644
--- a/docs/libnm/html/ref-overview.html
+++ b/docs/libnm/html/ref-overview.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -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.
       

 

@@ -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/libnm/html/usage.html b/docs/libnm/html/usage.html
index 19b42b6f..7ad5b27c 100644
--- a/docs/libnm/html/usage.html
+++ b/docs/libnm/html/usage.html
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -96,7 +96,7 @@
         

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

 

@@ -161,6 +161,6 @@
 
 
 

-
Generated by GTK-Doc V1.29.1

+
Generated by GTK-Doc V1.29
 
 
\ No newline at end of file
diff --git a/docs/libnm/libnm-docs.xml b/docs/libnm/libnm-docs.xml
index a0f87bfb..eb4f6cf5 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.
       
       
@@ -294,13 +294,6 @@ print ("NetworkManager version " + client.get_version())]]>
   
 
-  
-
   
     Object Hierarchy
      
diff --git a/docs/libnm/libnm-sections.txt b/docs/libnm/libnm-sections.txt
index 02d31ad7..eafd12b6 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
@@ -660,6 +662,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 +685,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
@@ -2160,7 +2165,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 +2177,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 +2190,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 +2931,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 +2945,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
@@ -3445,10 +3452,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
@@ -3633,6 +3646,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
 
 
 

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 4e00d0ac..42cf0675 100644
--- a/docs/libnm/version.xml
+++ b/docs/libnm/version.xml
@@ -1 +1 @@
-1.14.4
+1.15.2
diff --git a/docs/meson.build b/docs/meson.build
index 1fb21fb4..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()]
+  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/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/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/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..ef2ad9c1 100644
--- a/introspection/meson.build
+++ b/introspection/meson.build
@@ -48,7 +48,7 @@ ifaces = [
   'org.freedesktop.NetworkManager.Settings',
   'org.freedesktop.NetworkManager.VPN.Connection',
   'org.freedesktop.NetworkManager.VPN.Plugin',
-  'org.freedesktop.NetworkManager.WiMax.Nsp'
+  'org.freedesktop.NetworkManager.WiMax.Nsp',
 ]
 
 ifaces_xmls = []
@@ -66,7 +66,7 @@ foreach iface: ifaces
     iface_xml,
     interface_prefix: 'org.freedesktop.NetworkManager',
     namespace: 'NMDBus',
-    docbook: 'dbus'
+    docbook: 'dbus',
   )
 
   sources += res
@@ -82,14 +82,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 +97,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.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 @@
     -->
     
 
+    
+    
+
+    
+    
+
     
     
       
@@ -109,6 +111,38 @@
       
     
 
+    
+    
+      
+      
+      
+      
+      
+      
+      
+    
+
     
     
       
diff --git a/libnm-core/meson.build b/libnm-core/meson.build
index ac13a1be..812f12bb 100644
--- a/libnm-core/meson.build
+++ b/libnm-core/meson.build
@@ -56,7 +56,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(
@@ -104,7 +104,7 @@ libnm_core_settings_sources = files(
   'nm-setting-wired.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 +119,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,7 +132,7 @@ 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 = [
@@ -158,7 +158,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 +167,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
 
@@ -191,7 +191,7 @@ 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(
@@ -200,6 +200,7 @@ nm_core_dep = declare_dependency(
   dependencies: [
     shared_dep,
     shared_c_siphash_dep,
+    libnm_systemd_shared_dep,
   ],
 )
 
@@ -207,7 +208,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 +222,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 172f9c99..724e8557 100644
--- a/libnm-core/nm-connection.c
+++ b/libnm-core/nm-connection.c
@@ -22,10 +22,11 @@
 
 #include "nm-default.h"
 
+#include "nm-connection.h"
+
 #include 
 #include 
 
-#include "nm-connection.h"
 #include "nm-connection-private.h"
 #include "nm-utils.h"
 #include "nm-setting-private.h"
@@ -50,6 +51,17 @@
  *
  */
 
+/*****************************************************************************/
+
+enum {
+	SECRETS_UPDATED,
+	SECRETS_CLEARED,
+	CHANGED,
+	LAST_SIGNAL
+};
+
+static guint signals[LAST_SIGNAL] = { 0 };
+
 typedef struct {
 	NMConnection *self;
 
@@ -59,19 +71,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 +102,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 +119,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 +161,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 +193,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
@@ -388,7 +416,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 +501,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 +530,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);
 	}
 }
@@ -1124,6 +1152,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 +1615,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);
@@ -1787,26 +1839,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.
@@ -1824,7 +1864,7 @@ 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);
 	}
 
@@ -1850,7 +1890,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);
@@ -1860,7 +1900,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);
@@ -1991,6 +2031,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
@@ -2005,14 +2112,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);
@@ -2197,23 +2303,23 @@ 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))
 		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);
@@ -2862,7 +2968,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);
 
@@ -2886,7 +2992,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;
@@ -2895,8 +3004,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
@@ -2907,14 +3014,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:
@@ -2924,13 +3031,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:
@@ -2941,11 +3048,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 802f68ba..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
diff --git a/libnm-core/nm-core-internal.h b/libnm-core/nm-core-internal.h
index f0d4e40f..6af293a0 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
@@ -121,11 +126,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)
+	((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_FLAGS_ALL);
+}
+
+/*****************************************************************************/
 
 typedef enum { /*< skip >*/
 	NM_SETTING_PARSE_FLAGS_NONE                     = 0,
@@ -146,6 +161,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
@@ -212,15 +247,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 +280,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 +318,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);
 
@@ -294,6 +357,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,
@@ -318,6 +385,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);
 
@@ -452,6 +524,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, const struct in6_addr *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);
 
 /*****************************************************************************/
@@ -521,9 +617,11 @@ typedef struct _NMSettInfoSetting NMSettInfoSetting;
 
 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,
@@ -576,15 +674,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]);
 
-const NMSettInfoProperty *_nm_sett_info_property_get (NMSettingClass *setting_class,
-                                                      const char *property_name);
+	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 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);
+}
 
 /*****************************************************************************/
 
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-dbus-interface.h b/libnm-core/nm-dbus-interface.h
index 4e12dc63..aac4d7ea 100644
--- a/libnm-core/nm-dbus-interface.h
+++ b/libnm-core/nm-dbus-interface.h
@@ -168,7 +168,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 +190,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
@@ -456,7 +456,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 +549,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
@@ -960,20 +960,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                            = (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_LIFETIME_BOUND_TO_PROFILE_VISIBILITY = (1LL <<  6),
 } NMActivationStateFlags;
 
 /**
@@ -1004,7 +1009,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.
  *
diff --git a/libnm-core/nm-dbus-types.xml b/libnm-core/nm-dbus-types.xml
index e3e9fca9..b824f78a 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
@@ -760,7 +760,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 +1085,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
@@ -1722,6 +1722,11 @@
               = (1LL
               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
+              = (1LL
+              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
+            
           
         
       
@@ -1775,7 +1780,7 @@
             
               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.
+              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..69f4bb2f 100644
--- a/libnm-core/nm-dbus-utils.c
+++ b/libnm-core/nm-dbus-utils.c
@@ -174,23 +174,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 +227,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 +269,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-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..9543ebde 100644
--- a/libnm-core/nm-keyfile-utils.c
+++ b/libnm-core/nm-keyfile-utils.c
@@ -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..0467230e 100644
--- a/libnm-core/nm-keyfile-utils.h
+++ b/libnm-core/nm-keyfile-utils.h
@@ -67,12 +67,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 +97,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 e4ed1899..e2068130 100644
--- a/libnm-core/nm-keyfile.c
+++ b/libnm-core/nm-keyfile.c
@@ -96,6 +96,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 +115,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 +139,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);
@@ -152,7 +162,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);
 	}
@@ -372,7 +382,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 +632,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 +650,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 +795,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 +827,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 +888,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 +912,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 +1384,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 +1507,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 +1531,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 +1579,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 +1739,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 +1774,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 +1789,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 +1816,6 @@ write_ip_values (GKeyFile *file,
 			}
 		}
 	}
-	g_string_free (output, TRUE);
 }
 
 static void
@@ -1843,7 +1926,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 +1936,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 +1948,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 +2057,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 +2070,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 +2081,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 +2105,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 +2130,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 +2588,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 +2628,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 +2643,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 +2725,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 +2734,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 +2744,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 +2808,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 +2882,49 @@ 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);
+	}
 
-	info->setting = NULL;
+	for (i = 0; i < sett_info->property_infos_len; i++) {
+		const NMSettInfoProperty *property_info = &sett_info->property_infos[i];
 
-	if (info->error)
-		return NULL;
-	return g_steal_pointer (&setting);
+		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_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 +2992,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 +3004,33 @@ 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, &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;
-		}
+	groups = g_key_file_get_groups (keyfile, &n_groups);
+	if (!groups)
+		n_groups = 0;
+
+	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
+			_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 +3043,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 +3115,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 +3181,23 @@ 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);
 }
 
 GKeyFile *
@@ -3082,9 +3206,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 +3217,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 +3267,169 @@ 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;
+		}
+
+		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;
+	}
+
+	/* 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]);
 	}
 
-	return info.keyfile;
+	/* 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-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..19741fdf 100644
--- a/libnm-core/nm-setting-8021x.c
+++ b/libnm-core/nm-setting-8021x.c
@@ -246,7 +246,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 +3369,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 +3414,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-adsl.c b/libnm-core/nm-setting-adsl.c
index 9ffff927..b7f7d746 100644
--- a/libnm-core/nm-setting-adsl.c
+++ b/libnm-core/nm-setting-adsl.c
@@ -21,9 +21,10 @@
 
 #include "nm-default.h"
 
+#include "nm-setting-adsl.h"
+
 #include 
 
-#include "nm-setting-adsl.h"
 #include "nm-setting-ppp.h"
 #include "nm-setting-private.h"
 #include "nm-utils.h"
@@ -37,9 +38,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 +60,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 +239,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 +316,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 +357,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 +370,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..a3192840 100644
--- a/libnm-core/nm-setting-bluetooth.c
+++ b/libnm-core/nm-setting-bluetooth.c
@@ -22,11 +22,12 @@
 
 #include "nm-default.h"
 
+#include "nm-setting-bluetooth.h"
+
 #include 
 #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 +44,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 +214,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 +256,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 +295,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 +306,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 +325,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..fa55c06f 100644
--- a/libnm-core/nm-setting-bond.c
+++ b/libnm-core/nm-setting-bond.c
@@ -21,13 +21,14 @@
 
 #include "nm-default.h"
 
+#include "nm-setting-bond.h"
+
 #include 
 #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 +47,9 @@
 
 /*****************************************************************************/
 
-enum {
-	PROP_0,
+NM_GOBJECT_PROPERTIES_DEFINE (NMSettingBond,
 	PROP_OPTIONS,
-	LAST_PROP
-};
+);
 
 typedef struct {
 	GHashTable *options;
@@ -365,7 +364,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 +397,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 +810,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 +840,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 +851,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 +961,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 +982,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 +1009,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 4104f8c5..b8670afd 100644
--- a/libnm-core/nm-setting-bridge-port.c
+++ b/libnm-core/nm-setting-bridge-port.c
@@ -21,11 +21,12 @@
 
 #include "nm-default.h"
 
+#include "nm-setting-bridge-port.h"
+
 #include 
 #include 
 #include 
 
-#include "nm-setting-bridge-port.h"
 #include "nm-utils.h"
 #include "nm-utils-private.h"
 #include "nm-connection-private.h"
@@ -40,9 +41,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 +55,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))
 
 /*****************************************************************************/
 
@@ -104,12 +105,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)
 {
@@ -147,39 +142,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);
@@ -188,20 +165,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);
@@ -209,6 +186,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)
 {
@@ -217,8 +214,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;
 
@@ -235,14 +232,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, BR_MAX_PORT_PRIORITY, BR_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:
@@ -258,14 +254,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, BR_MAX_PATH_COST, 100,
-		                    G_PARAM_READWRITE |
-		                    G_PARAM_CONSTRUCT |
-		                    NM_SETTING_PARAM_INFERRABLE |
-		                    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:
@@ -280,13 +274,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..328c1fd3 100644
--- a/libnm-core/nm-setting-bridge.c
+++ b/libnm-core/nm-setting-bridge.c
@@ -21,11 +21,12 @@
 
 #include "nm-default.h"
 
+#include "nm-setting-bridge.h"
+
 #include 
 #include 
 #include 
 
-#include "nm-setting-bridge.h"
 #include "nm-connection-private.h"
 #include "nm-utils.h"
 #include "nm-utils-private.h"
@@ -38,9 +39,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 +65,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:
@@ -292,56 +282,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 +326,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 +367,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 +406,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 +442,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 +467,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 +490,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 +511,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 +532,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 +553,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 +574,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 +594,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 +620,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 +642,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..1e5cd81e 100644
--- a/libnm-core/nm-setting-cdma.c
+++ b/libnm-core/nm-setting-cdma.c
@@ -21,9 +21,10 @@
 
 #include "nm-default.h"
 
+#include "nm-setting-cdma.h"
+
 #include 
 
-#include "nm-setting-cdma.h"
 #include "nm-utils.h"
 #include "nm-setting-private.h"
 #include "nm-core-enum-types.h"
@@ -37,9 +38,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 +56,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 +195,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 +256,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 +296,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 +311,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 +324,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 +337,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 +364,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 50240bc9..a32044d2 100644
--- a/libnm-core/nm-setting-connection.c
+++ b/libnm-core/nm-setting-connection.c
@@ -45,9 +45,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 +56,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 +108,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 +195,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 +299,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 +418,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 +445,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 +485,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 +735,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 +758,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 +783,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 +810,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 +1268,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 +1310,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 +1409,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 +1501,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 +1552,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 +1571,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 +1601,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:
@@ -1626,11 +1630,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 "$$".
@@ -1650,13 +1654,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 +1684,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 +1716,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 +1748,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 +1773,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 +1798,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 +1806,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 +1826,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 +1850,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 +1868,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 +1883,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 +1910,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 +1933,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 +1958,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 +1989,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 +2012,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 +2034,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 +2059,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 +2083,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 +2109,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 +2140,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 +2173,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..42c7d247 100644
--- a/libnm-core/nm-setting-dcb.c
+++ b/libnm-core/nm-setting-dcb.c
@@ -21,9 +21,10 @@
 
 #include "nm-default.h"
 
+#include "nm-setting-dcb.h"
+
 #include 
 
-#include "nm-setting-dcb.h"
 #include "nm-utils.h"
 #include "nm-utils-private.h"
 #include "nm-setting-private.h"
@@ -40,9 +41,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 +90,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 +248,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 +308,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 +353,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 +399,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 +445,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 +490,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,11 +714,6 @@ 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
@@ -776,58 +761,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 +823,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 +881,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 +920,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 +941,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 +962,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 +983,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 +1004,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 +1025,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 +1046,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 +1067,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 +1088,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 +1110,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 +1136,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 +1158,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 +1185,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 +1214,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 +1241,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 +1263,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..68d29032 100644
--- a/libnm-core/nm-setting-gsm.c
+++ b/libnm-core/nm-setting-gsm.c
@@ -22,9 +22,10 @@
 
 #include "nm-default.h"
 
+#include "nm-setting-gsm.h"
+
 #include 
 
-#include "nm-setting-gsm.h"
 #include "nm-utils.h"
 #include "nm-setting-private.h"
 #include "nm-core-enum-types.h"
@@ -38,9 +39,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 +78,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 +449,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 +571,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 +618,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 +629,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 +647,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 +660,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 +690,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 +705,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 +718,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 +743,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 +758,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 +774,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 +791,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 +805,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 +826,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..8fff030e 100644
--- a/libnm-core/nm-setting-ip-config.c
+++ b/libnm-core/nm-setting-ip-config.c
@@ -22,10 +22,11 @@
 
 #include "nm-default.h"
 
+#include "nm-setting-ip-config.h"
+
 #include 
 #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 +45,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 },
@@ -1382,9 +1385,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 +1427,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 +1517,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 +1539,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 +1568,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 +1594,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 +1660,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 +1682,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 +1709,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 +1733,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 +1865,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 +1890,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 +1922,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 +1961,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 +2044,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 +2067,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 +2093,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 +2115,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 +2202,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 +2224,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 +2252,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 +2274,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 +2614,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 +2871,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 +2913,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 +2943,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 +2969,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 +2986,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 +2998,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 +3027,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 +3057,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 +3092,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 +3120,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 +3133,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 +3149,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 +3164,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 +3179,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 +3193,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 +3211,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 +3232,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-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 19f1cc8d..59529bc2 100644
--- a/libnm-core/nm-setting-ip4-config.c
+++ b/libnm-core/nm-setting-ip4-config.c
@@ -21,9 +21,10 @@
 
 #include "nm-default.h"
 
+#include "nm-setting-ip4-config.h"
+
 #include 
 
-#include "nm-setting-ip4-config.h"
 #include "nm-setting-private.h"
 
 /**
@@ -50,35 +51,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 +241,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 +309,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 +321,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 +352,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 +425,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 +462,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 +544,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;
@@ -721,11 +734,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
@@ -735,12 +753,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
@@ -779,12 +796,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 */
 
@@ -890,6 +906,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 a55fd801..bf3acf96 100644
--- a/libnm-core/nm-setting-ip6-config.c
+++ b/libnm-core/nm-setting-ip6-config.c
@@ -52,9 +52,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 +68,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 +300,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 +357,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 +430,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 +467,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 +495,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 +521,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 +562,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 +754,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 +803,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 +826,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:
@@ -852,7 +856,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
@@ -873,12 +878,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 */
 
@@ -973,6 +977,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 2c7cff23..3d93ac5a 100644
--- a/libnm-core/nm-setting-macsec.c
+++ b/libnm-core/nm-setting-macsec.c
@@ -25,6 +25,8 @@
 #include 
 #include 
 
+#include "nm-utils/nm-secret-utils.h"
+
 #include "nm-utils.h"
 #include "nm-core-types-internal.h"
 #include "nm-setting-connection.h"
@@ -40,9 +42,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 +68,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:
@@ -243,6 +234,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 +251,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 +337,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 +351,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,51 +370,56 @@ 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;
 }
 
-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);
@@ -415,39 +428,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);
@@ -455,6 +471,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)
 {
@@ -462,10 +500,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);
@@ -479,8 +514,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..a25e1055 100644
--- a/libnm-core/nm-setting-macvlan.c
+++ b/libnm-core/nm-setting-macvlan.c
@@ -21,10 +21,11 @@
 
 #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 +40,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 +56,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 +124,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 +176,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 +205,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 +231,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 +272,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 +288,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 +304,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 +319,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 +334,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..eb87e1ff 100644
--- a/libnm-core/nm-setting-olpc-mesh.c
+++ b/libnm-core/nm-setting-olpc-mesh.c
@@ -22,9 +22,10 @@
 
 #include "nm-default.h"
 
+#include "nm-setting-olpc-mesh.h"
+
 #include 
 
-#include "nm-setting-olpc-mesh.h"
 #include "nm-utils.h"
 #include "nm-utils-private.h"
 #include "nm-setting-private.h"
@@ -37,11 +38,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 +52,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 +135,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 +184,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 +224,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 +235,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 +262,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..e3166888 100644
--- a/libnm-core/nm-setting-pppoe.c
+++ b/libnm-core/nm-setting-pppoe.c
@@ -22,9 +22,10 @@
 
 #include "nm-default.h"
 
+#include "nm-setting-pppoe.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 +39,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 +57,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 +196,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 +227,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 +258,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 +299,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 +316,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 +332,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..8f61b0ff 100644
--- a/libnm-core/nm-setting-private.h
+++ b/libnm-core/nm-setting-private.h
@@ -48,10 +48,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 +81,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 +96,13 @@ 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_vpn_aggregate (NMSettingVpn *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 +115,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 +200,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..8b8bb76d 100644
--- a/libnm-core/nm-setting-serial.c
+++ b/libnm-core/nm-setting-serial.c
@@ -22,9 +22,10 @@
 
 #include "nm-default.h"
 
+#include "nm-setting-serial.h"
+
 #include 
 
-#include "nm-setting-serial.h"
 #include "nm-setting-private.h"
 
 /**
@@ -37,9 +38,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 +56,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 +132,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 +163,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 +194,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 +221,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 +250,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 +260,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 +299,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 +319,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 7228fb0c..068d2185 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);
 	}
 }
 
@@ -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)
 {
@@ -1248,6 +1260,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---
@@ -1257,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))
@@ -1283,7 +1299,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 +1311,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---
@@ -1300,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,
@@ -1342,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..5277e9c0 100644
--- a/libnm-core/nm-setting-team-port.c
+++ b/libnm-core/nm-setting-team-port.c
@@ -21,11 +21,12 @@
 
 #include "nm-default.h"
 
+#include "nm-setting-team-port.h"
+
 #include 
 #include 
 #include 
 
-#include "nm-setting-team-port.h"
 #include "nm-utils.h"
 #include "nm-utils-private.h"
 #include "nm-connection-private.h"
@@ -39,23 +40,10 @@
  * 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))
-
-typedef struct {
-	char *config;
-	int queue_id;
-	int prio;
-	gboolean sticky;
-	int lacp_prio;
-	int lacp_key;
-	GPtrArray *link_watchers; /* Array of NMTeamLinkWatcher */
-} NMSettingTeamPortPrivate;
+/*****************************************************************************/
 
 /* Keep aligned with _prop_to_keys[] */
-enum {
-	PROP_0,
+NM_GOBJECT_PROPERTIES_DEFINE (NMSettingTeamPort,
 	PROP_CONFIG,
 	PROP_QUEUE_ID,
 	PROP_PRIO,
@@ -63,12 +51,10 @@ enum {
 	PROP_LACP_PRIO,
 	PROP_LACP_KEY,
 	PROP_LINK_WATCHERS,
-	LAST_PROP
-};
+);
 
 /* Keep aligned with team-port properties enum */
-static const _NMUtilsTeamPropertyKeys _prop_to_keys[LAST_PROP] = {
-	[PROP_0] =             { NULL, NULL, NULL, 0 },
+static const _NMUtilsTeamPropertyKeys _prop_to_keys[_PROPERTY_ENUMS_LAST] = {
 	[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 },
@@ -78,18 +64,21 @@ static const _NMUtilsTeamPropertyKeys _prop_to_keys[LAST_PROP] = {
 	[PROP_LINK_WATCHERS] = { "link_watch", NULL, NULL, 0 }
 };
 
-/**
- * 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);
-}
+typedef struct {
+	char *config;
+	int queue_id;
+	int prio;
+	gboolean sticky;
+	int lacp_prio;
+	int lacp_key;
+	GPtrArray *link_watchers; /* Array of NMTeamLinkWatcher */
+} NMSettingTeamPortPrivate;
+
+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_setting_team_port_get_config:
@@ -251,7 +240,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 +262,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 +288,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 +312,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 +390,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 +501,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 +574,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 +619,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 +640,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 +655,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 +668,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 +681,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 +694,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 +707,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 +723,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..3161c05f 100644
--- a/libnm-core/nm-setting-team.c
+++ b/libnm-core/nm-setting-team.c
@@ -21,10 +21,11 @@
 
 #include "nm-default.h"
 
+#include "nm-setting-team.h"
+
 #include 
 #include 
 
-#include "nm-setting-team.h"
 #include "nm-utils.h"
 #include "nm-utils-private.h"
 #include "nm-connection-private.h"
@@ -83,6 +84,7 @@ struct NMTeamLinkWatcher {
 			int init_wait;
 			int interval;
 			int missed_max;
+			int vlanid;
 			char *target_host;
 			char *source_host;
 			NMTeamLinkWatcherArpPingFlags flags;
@@ -232,6 +234,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 +296,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 +308,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 +324,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 +390,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 +426,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 +461,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 +480,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 +556,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,32 +625,8 @@ 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))
-
-typedef struct {
-	char *config;
-	int notify_peers_count;
-	int notify_peers_interval;
-	int mcast_rejoin_count;
-	int mcast_rejoin_interval;
-	char *runner;
-	char *runner_hwaddr_policy;
-	GPtrArray *runner_tx_hash;
-	char *runner_tx_balancer;
-	int runner_tx_balancer_interval;
-	gboolean runner_active;
-	gboolean runner_fast_rate;
-	int runner_sys_prio;
-	int runner_min_ports;
-	char *runner_agg_select_policy;
-	GPtrArray *link_watchers; /* Array of NMTeamLinkWatcher */
-} NMSettingTeamPrivate;
-
 /* Keep aligned with _prop_to_keys[] */
-enum {
-	PROP_0,
+NM_GOBJECT_PROPERTIES_DEFINE (NMSettingTeam,
 	PROP_CONFIG,
 	PROP_NOTIFY_PEERS_COUNT,
 	PROP_NOTIFY_PEERS_INTERVAL,
@@ -599,12 +643,10 @@ enum {
 	PROP_RUNNER_MIN_PORTS,
 	PROP_RUNNER_AGG_SELECT_POLICY,
 	PROP_LINK_WATCHERS,
-	LAST_PROP
-};
+);
 
 /* Keep aligned with team properties enum */
-static const _NMUtilsTeamPropertyKeys _prop_to_keys[LAST_PROP] = {
-	[PROP_0] =                           { NULL, NULL, NULL, 0 },
+static const _NMUtilsTeamPropertyKeys _prop_to_keys[_PROPERTY_ENUMS_LAST] = {
 	[PROP_CONFIG] =                      { NULL, NULL, NULL, 0 },
 	[PROP_NOTIFY_PEERS_COUNT] =          { "notify_peers", "count", NULL, 0 },
 	[PROP_NOTIFY_PEERS_INTERVAL] =       { "notify_peers", "interval", NULL, 0 },
@@ -624,18 +666,30 @@ static const _NMUtilsTeamPropertyKeys _prop_to_keys[LAST_PROP] = {
 	[PROP_LINK_WATCHERS] =               { "link_watch", NULL, NULL, 0 }
 };
 
-/**
- * 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);
-}
+typedef struct {
+	char *config;
+	int notify_peers_count;
+	int notify_peers_interval;
+	int mcast_rejoin_count;
+	int mcast_rejoin_interval;
+	char *runner;
+	char *runner_hwaddr_policy;
+	GPtrArray *runner_tx_hash;
+	char *runner_tx_balancer;
+	int runner_tx_balancer_interval;
+	gboolean runner_active;
+	gboolean runner_fast_rate;
+	int runner_sys_prio;
+	int runner_min_ports;
+	char *runner_agg_select_policy;
+	GPtrArray *link_watchers; /* Array of NMTeamLinkWatcher */
+} NMSettingTeamPrivate;
+
+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_setting_team_get_config:
@@ -884,7 +938,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 +1001,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 +1034,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 +1104,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 +1126,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 +1152,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 +1175,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 +1284,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 +1319,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 +1391,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 +1601,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 +1654,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 +1675,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 +1689,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 +1702,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 +1715,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 +1728,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 +1747,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 +1760,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 +1773,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 +1787,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 +1800,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 +1813,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 +1826,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 +1839,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 +1852,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 +1865,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 +1881,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 +1911,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..5819feca 100644
--- a/libnm-core/nm-setting-team.h
+++ b/libnm-core/nm-setting-team.h
@@ -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..348c9fc1 100644
--- a/libnm-core/nm-setting-tun.c
+++ b/libnm-core/nm-setting-tun.c
@@ -21,10 +21,11 @@
 
 #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 +39,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 +59,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 +155,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 +195,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 +304,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 +320,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 +336,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 +351,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 +366,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 +381,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 +398,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..4eba1626 100644
--- a/libnm-core/nm-setting-vlan.c
+++ b/libnm-core/nm-setting-vlan.c
@@ -41,9 +41,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 +59,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 +203,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 +262,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 +366,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 +582,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 +720,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 +738,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 +769,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 +843,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 +863,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 +883,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 +913,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 +943,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 +964,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 +993,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..1371140e 100644
--- a/libnm-core/nm-setting-vpn.c
+++ b/libnm-core/nm-setting-vpn.c
@@ -21,13 +21,13 @@
 
 #include "nm-default.h"
 
+#include "nm-setting-vpn.h"
+
 #include 
 #include 
 #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 +45,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 +92,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 +182,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);
 }
 
 /**
@@ -259,7 +247,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 +359,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);
 }
 
 /**
@@ -436,7 +424,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 +449,66 @@ nm_setting_vpn_foreach_secret (NMSettingVpn *setting,
 	foreach_item_helper (setting, TRUE, func, user_data);
 }
 
+gboolean
+_nm_setting_vpn_aggregate (NMSettingVpn *setting,
+                           NMConnectionAggregateType type,
+                           gpointer arg)
+{
+	NMSettingVpnPrivate *priv;
+	NMSettingSecretFlags secret_flags;
+	const char *key_name;
+	GHashTableIter iter;
+
+	g_return_val_if_fail (NM_IS_SETTING_VPN (setting), FALSE);
+
+	priv = NM_SETTING_VPN_GET_PRIVATE (setting);
+
+	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,7 +682,7 @@ 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;
 }
@@ -642,48 +690,59 @@ update_one_secret (NMSetting *setting, const char *key, GVariant *value, GError
 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;
 	}
 
-	if (out_flags)
-		*out_flags = flags;
+	i64 = _nm_utils_ascii_str_to_int64 (flags_val, 10, 0, NM_SETTING_SECRET_FLAGS_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;
+	}
+
+	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 +753,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 +927,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 +973,17 @@ 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->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;
 
 	/**
 	 * NMSettingVpn:service-type:
@@ -916,12 +992,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 +1008,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 +1021,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 +1041,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 +1067,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 +1091,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..0c21be27 100644
--- a/libnm-core/nm-setting-vxlan.c
+++ b/libnm-core/nm-setting-vxlan.c
@@ -21,10 +21,11 @@
 
 #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 +37,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 +79,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 +327,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 +404,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 +469,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 +533,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 +576,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 +589,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 +604,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 +619,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 +636,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 +652,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 +668,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 +684,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 +699,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 +715,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 +730,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 +745,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 +760,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 +776,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 +790,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 +804,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 +819,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-wimax.c b/libnm-core/nm-setting-wimax.c
index 4c1a572e..aa574a56 100644
--- a/libnm-core/nm-setting-wimax.c
+++ b/libnm-core/nm-setting-wimax.c
@@ -22,10 +22,11 @@
 
 #include "nm-default.h"
 
+#include "nm-setting-wimax.h"
+
 #include 
 #include 
 
-#include "nm-setting-wimax.h"
 #include "nm-setting-private.h"
 #include "nm-utils.h"
 #include "nm-utils-private.h"
@@ -42,37 +43,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 +134,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 +177,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 +219,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 +233,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 +248,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..ef994255 100644
--- a/libnm-core/nm-setting-wired.c
+++ b/libnm-core/nm-setting-wired.c
@@ -40,9 +40,24 @@
  * 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))
+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 +76,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 +92,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 +276,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 +298,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 +326,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 +345,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 +518,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 +545,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 +763,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 +798,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 +933,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 +993,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 +1014,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 +1044,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 +1074,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 +1100,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 +1138,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 +1194,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 +1215,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 +1265,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 +1294,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 +1313,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 +1339,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 +1360,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 +1382,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 +1409,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 +1425,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-wireless-security.c b/libnm-core/nm-setting-wireless-security.c
index d1527821..fe339d9e 100644
--- a/libnm-core/nm-setting-wireless-security.c
+++ b/libnm-core/nm-setting-wireless-security.c
@@ -22,9 +22,10 @@
 
 #include "nm-default.h"
 
+#include "nm-setting-wireless-security.h"
+
 #include 
 
-#include "nm-setting-wireless-security.h"
 #include "nm-setting-8021x.h"
 #include "nm-utils.h"
 #include "nm-utils-private.h"
@@ -53,9 +54,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 +112,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 +198,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 +223,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 +249,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 +273,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 +342,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 +368,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 +379,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 +395,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 +419,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 +489,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 +515,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 +543,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 +567,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 +710,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 ();
@@ -1177,83 +1166,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 +1227,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 +1304,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 +1392,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 +1444,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;
@@ -1462,13 +1469,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 +1492,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 +1515,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 +1536,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 +1558,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 +1580,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 +1608,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 +1628,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 +1646,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 +1665,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 +1684,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 +1703,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,13 +1724,12 @@ 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:
@@ -1753,13 +1747,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 +1768,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 +1788,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 +1808,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 +1835,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 +1870,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 +1900,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..2f4b4084 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
+ * altough, 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..5d3f8fe8 100644
--- a/libnm-core/nm-setting-wireless.c
+++ b/libnm-core/nm-setting-wireless.c
@@ -40,9 +40,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 +82,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 +285,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 +511,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 +533,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 +561,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 +580,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 +683,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 +917,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 +982,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 +1101,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 +1144,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 +1223,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 +1242,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 +1267,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 +1290,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 +1312,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 +1338,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 +1359,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 +1391,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 +1445,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 +1466,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 +1516,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 +1543,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 +1566,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 +1585,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 +1617,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 +1642,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 +1669,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 +1713,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..4611f94b 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
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 6b9681b5..976f7f00 100644
--- a/libnm-core/nm-setting.c
+++ b/libnm-core/nm-setting.c
@@ -67,12 +67,9 @@ typedef struct {
 	NMSettingPriority priority;
 } SettingInfo;
 
-enum {
-	PROP_0,
+NM_GOBJECT_PROPERTIES_DEFINE_BASE (
 	PROP_NAME,
-
-	PROP_LAST
-};
+);
 
 typedef struct {
 	GenData *gendata;
@@ -354,6 +351,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 +455,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 +499,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 +536,21 @@ _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;
+}
+
 /*****************************************************************************/
 
 gboolean
@@ -654,7 +733,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 +741,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;
 
@@ -686,9 +768,10 @@ _nm_setting_to_dbus (NMSetting *setting, NMConnection *connection, NMConnectionS
 		}
 
 		if (property->synth_func)
-			dbus_value = property->synth_func (setting, connection, property->name);
+			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. */
 			g_variant_take_ref (dbus_value);
@@ -775,7 +858,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;
@@ -797,89 +880,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;
 			}
 		}
@@ -921,7 +1009,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)
@@ -934,13 +1022,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;
@@ -958,26 +1046,84 @@ _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)
+{
+	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 ((flags & (G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY)) == G_PARAM_WRITABLE)
-		g_object_set_property (G_OBJECT (user_data), name, value);
+	if (sett_info->detail.gendata_info) {
+		GenData *gendata = _gendata_hash (src, 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));
+	}
 }
 
 /**
@@ -993,37 +1139,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);
-
-	sett_info = _nm_sett_info_setting_get (NM_SETTING_GET_CLASS (setting));
+	klass = NM_SETTING_GET_CLASS (setting);
+	nm_assert (NM_IS_SETTING_CLASS (klass));
+	nm_assert (klass->duplicate_copy_properties);
 
-	if (sett_info->detail.gendata_info) {
-		GenData *gendata = _gendata_hash (setting, FALSE);
+	dst = g_object_new (G_TYPE_FROM_CLASS (klass), NULL);
 
-		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;
+	sett_info = _nm_setting_class_get_sett_info (klass);
+	nm_assert (sett_info);
 
-			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;
 }
 
 /**
@@ -1131,58 +1262,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 asymetric). */
+	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;
 
-	property = _nm_sett_info_property_get (NM_SETTING_GET_CLASS (setting), prop_spec->name);
-	g_return_val_if_fail (property != NULL, FALSE);
+	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;
 
-	value1 = get_property_for_dbus (setting, property, TRUE);
-	value2 = get_property_for_dbus (other, property, TRUE);
+	if (other) {
+		gs_unref_variant GVariant *value1  = NULL;
+		gs_unref_variant GVariant *value2  = NULL;
 
-	cmp = nm_property_compare (value1, value2);
+		value1 = get_property_for_dbus (setting, property_info, TRUE);
+		value2 = get_property_for_dbus (other, property_info, TRUE);
+
+		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;
 }
 
 /**
@@ -1203,9 +1424,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);
@@ -1215,7 +1433,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);
@@ -1227,88 +1445,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;
 }
 
@@ -1399,7 +1540,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;
@@ -1442,71 +1583,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 symetric 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);
 			}
 		}
 	}
@@ -1535,33 +1698,6 @@ 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 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;
-}
-#undef CMP_AND_RETURN
-
 /**
  * nm_setting_enumerate_values:
  * @setting: the #NMSetting
@@ -1577,18 +1713,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
@@ -1618,100 +1752,135 @@ 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];
+	for (i = 0; i < sett_info->property_infos_len; i++) {
+		GParamSpec *prop_spec = _nm_sett_info_property_info_get_sorted (sett_info, i)->param_spec;
 		GValue value = G_VALUE_INIT;
 
+		if (!prop_spec)
+			continue;
+
 		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);
 	}
-
-	g_free (property_specs);
 }
 
 /**
- * _nm_setting_clear_secrets:
- * @setting: the #NMSetting
+ * _nm_setting_aggregate:
+ * @setting: the #NMSetting to aggregate.
+ * @type: the #NMConnectionAggregateType aggregate type.
+ * @arg: the in/out arguments for aggregation. They depend on @type.
  *
- * 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.
+ * 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 the setting changed at all
- **/
+ * 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_clear_secrets (NMSetting *setting)
+_nm_setting_aggregate (NMSetting *setting,
+                       NMConnectionAggregateType type,
+                       gpointer arg)
 {
-	gs_free GParamSpec **property_specs = NULL;
-	guint n_property_specs;
+	const NMSettInfoSetting *sett_info;
 	guint i;
-	gboolean changed = FALSE;
 
 	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);
 
-	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];
+	if (NM_IS_SETTING_VPN (setting))
+		return _nm_setting_vpn_aggregate (NM_SETTING_VPN (setting), type, arg);
+
+	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;
+		}
+
+		/* for the moment, all aggregate types only care about secrets. */
+		nm_assert (nm_setting_get_secret_flags (setting, property_info->name, NULL, NULL));
 
-		if (prop_spec->flags & NM_SETTING_PARAM_SECRET) {
-			GValue value = G_VALUE_INIT;
+		switch (type) {
 
-			g_value_init (&value, prop_spec->value_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;
 }
 
 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 (setting, pspec->name, flags, user_data) == TRUE) {
-		GValue value = G_VALUE_INIT;
+	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));
 
-		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);
+	{
+		nm_auto_unset_gvalue GValue value = G_VALUE_INIT;
+
+		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
@@ -1722,27 +1891,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;
 }
@@ -1781,7 +1953,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,
@@ -1867,52 +2039,72 @@ _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
+_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);
+}
+
+gboolean
+_nm_setting_property_is_regular_secret (NMSetting *setting,
+                                        const char *secret_name)
 {
 	const NMSettInfoProperty *property;
-	GParamSpec *pspec;
 
-	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;
-	}
+	nm_assert (NM_IS_SETTING (setting));
+	nm_assert (secret_name);
 
-	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;
-	}
+	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);
+}
 
-	return TRUE;
+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);
@@ -1941,25 +2133,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;
 }
 
@@ -1984,9 +2185,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);
 }
 
 /**
@@ -2031,9 +2232,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;
 
@@ -2300,11 +2503,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)
@@ -2321,6 +2519,13 @@ get_property (GObject *object, guint prop_id,
 	}
 }
 
+/*****************************************************************************/
+
+static void
+nm_setting_init (NMSetting *setting)
+{
+}
+
 static void
 finalize (GObject *object)
 {
@@ -2361,11 +2566,12 @@ 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->duplicate_copy_properties = duplicate_copy_properties;
 
 	/**
 	 * NMSetting:name:
@@ -2374,10 +2580,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..0f0ac8f3 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,7 @@ typedef gboolean (*NMSettingClearSecretsWithFlagsFn) (NMSetting *setting,
                                                       gpointer user_data);
 
 struct _NMMetaSettingInfo;
+struct _NMSettInfoSetting;
 
 typedef struct {
 	GObjectClass parent;
@@ -191,32 +192,44 @@ 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;
 
 	/*< private >*/
-	gpointer padding[6];
+	gpointer padding[5];
 } NMSettingClass;
 
 /**
@@ -272,7 +285,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..58822cde 100644
--- a/libnm-core/nm-utils-private.h
+++ b/libnm-core/nm-utils-private.h
@@ -56,9 +56,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 0f524e11..47099712 100644
--- a/libnm-core/nm-utils.c
+++ b/libnm-core/nm-utils.c
@@ -67,7 +67,7 @@ struct IsoLangToEncodings
 	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 +112,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 +836,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 +872,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 +891,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 +1173,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 +1271,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 +1389,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 +1493,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 +1612,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 +2000,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
@@ -2737,11 +2720,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 +2747,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 +2776,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 +2836,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 +2857,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 +2869,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 +2979,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 +2993,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 +3604,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 +3674,7 @@ _nm_utils_str2bin_full (const char *asc,
 				}
 				if (!delimiter) {
 					if (delimiter_required)
-						return NULL;
+						goto fail;
 					delimiter_has = FALSE;
 					continue;
 				}
@@ -3598,11 +3683,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 +3759,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 +3862,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 +3918,7 @@ _nm_utils_bin2str_full (gconstpointer addr, gsize length, const char delimiter,
 	}
 
 	*out = 0;
+	return out0;
 }
 
 /**
@@ -3779,7 +3944,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 +3966,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 +3981,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);
 }
 
 /**
@@ -4096,13 +4234,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",
@@ -4123,7 +4266,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
@@ -4362,10 +4507,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;
@@ -4391,6 +4537,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);
 }
@@ -4416,6 +4567,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);
@@ -4510,7 +4666,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)) {
@@ -5280,7 +5436,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);
@@ -5301,6 +5457,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;
@@ -5318,8 +5476,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;
 }
@@ -5369,6 +5527,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;
@@ -5870,6 +6031,12 @@ _nm_utils_team_link_watchers_to_variant (GPtrArray *link_watchers)
 		}
 
 		/* 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)));
@@ -5920,7 +6087,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;
@@ -5951,6 +6118,8 @@ _nm_utils_team_link_watchers_from_variant (GVariant *value)
 			if (!g_variant_lookup (watcher_var, "missed-max", "i", &val3))
 				val3 = 3;
 			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))
@@ -5965,9 +6134,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);
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..275a9dd5 100644
--- a/libnm-core/nm-vpn-plugin-info.c
+++ b/libnm-core/nm-vpn-plugin-info.c
@@ -1095,60 +1095,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 +1206,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 +1298,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 +1338,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 +1358,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..b9411074 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,19 @@ 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()],
   )
 endforeach
diff --git a/libnm-core/tests/test-general.c b/libnm-core/tests/test-general.c
index 5a954270..0806e7b9 100644
--- a/libnm-core/tests/test-general.c
+++ b/libnm-core/tests/test-general.c
@@ -755,10 +755,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 +774,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 +791,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 +1377,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 +1406,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 +1658,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 +2987,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 +3306,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 +3423,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 +3640,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 +3682,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 +3712,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 +3726,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 +5256,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 +5298,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 +5405,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);
@@ -5439,8 +5641,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 +5667,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 +5688,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 +5872,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 +5889,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");
@@ -7390,4 +7766,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-setting.c b/libnm-core/tests/test-setting.c
index 4e010feb..d8784d31 100644
--- a/libnm-core/tests/test-setting.c
+++ b/libnm-core/tests/test-setting.c
@@ -45,6 +45,77 @@
 
 /*****************************************************************************/
 
+/* 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 void
 compare_blob_data (const char *test,
                    const char *key_path,
@@ -421,20 +492,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 +2014,184 @@ test_tc_config_dbus (void)
 
 /*****************************************************************************/
 
+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 ());
+	gs_unref_ptrarray GPtrArray *kf_data_arr = g_ptr_array_new_with_free_func (g_free);
+	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;
+	guint kf_data_idx;
+	NMSettingConnection *s_con = NULL;
+	NMSettingWired *s_eth = NULL;
+
+	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;
+
+	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;
+		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;
+		}
+
+		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;
+
+		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);
+			}
+		}
+	}
+}
+
+/*****************************************************************************/
+
 NMTST_DEFINE ();
 
 int
@@ -2022,5 +2268,7 @@ 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);
+
 	return g_test_run ();
 }
diff --git a/libnm-glib/meson.build b/libnm-glib/meson.build
index 016aa638..5c7db73e 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_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,7 +88,7 @@ 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]
@@ -116,12 +116,12 @@ libnm_glib_vpn = shared_library(
     '-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,7 +132,7 @@ 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(
@@ -165,7 +165,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 +174,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,12 +186,12 @@ 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
+  libudev_dep,
 ]
 
 linker_script = join_paths(meson.current_source_dir(), 'libnm-glib.ver')
@@ -207,12 +207,12 @@ libnm_glib = shared_library(
     '-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,7 +223,7 @@ 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
@@ -232,12 +232,12 @@ if enable_introspection
   deps = [
     dbus_glib_dep,
     libnm_glib_dep,
-    libnm_util_gir_dep
+    libnm_util_gir_dep,
   ]
 
   gir_includes = [
     'DBusGLib-1.0',
-    'Gio-2.0'
+    'Gio-2.0',
   ]
 
   libnm_glib_gir = gnome.generate_gir(
@@ -253,7 +253,7 @@ if enable_introspection
     extra_args: cflags + [
       '--include-uninstalled=' + libnm_util_gir[0].full_path(),
     ],
-    install: true
+    install: true,
   )
 endif
 
@@ -266,7 +266,7 @@ executable(
   name + '.c',
   dependencies: deps,
   c_args: cflags,
-  link_with: libnm_glib
+  link_with: libnm_glib,
 )
 
 test(
@@ -290,6 +290,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/tests/meson.build b/libnm-glib/tests/meson.build
index 3fd37c4f..6ed0438f 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_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..e9e263a8 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,7 +87,7 @@ 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
 
@@ -95,7 +95,7 @@ deps = [
   dbus_dep,
   dbus_glib_dep,
   shared_dep,
-  uuid_dep
+  uuid_dep,
 ]
 
 common_cflags = [
@@ -103,7 +103,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 +111,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 +120,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 +145,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 +162,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 +170,7 @@ if enable_introspection
 
   gir_includes = [
     'DBusGLib-1.0',
-    'GObject-2.0'
+    'GObject-2.0',
   ]
 
   libnm_util_gir = gnome.generate_gir(
@@ -182,12 +182,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 +202,7 @@ sources = files(
 )
 
 deps = [
-  shared_dep
+  shared_dep,
 ]
 
 libtest_crypto = static_library(
@@ -210,7 +210,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-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-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..dfff2fe5 100644
--- a/libnm-util/nm-setting.c
+++ b/libnm-util/nm-setting.c
@@ -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..e2a4bfb0 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
diff --git a/libnm-util/tests/meson.build b/libnm-util/tests/meson.build
index 49c35a51..048ec3bb 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_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/fake-typelib/meson.build b/libnm/fake-typelib/meson.build
index c0a779a2..cafe013a 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,7 +14,7 @@ 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
 
@@ -26,5 +26,5 @@ sources += gnome.compile_resources(
   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..652e01eb 100644
--- a/libnm/libnm.ver
+++ b/libnm/libnm.ver
@@ -1444,3 +1444,12 @@ 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_team_link_watcher_get_vlanid;
+	nm_team_link_watcher_new_arp_ping2;
+} libnm_1_14_0;
diff --git a/libnm/meson.build b/libnm/meson.build
index 62e3e9d7..2e44a6a4 100644
--- a/libnm/meson.build
+++ b/libnm/meson.build
@@ -4,7 +4,7 @@ sources = files('nm-libnm-utils.c')
 
 deps = [
   libnmdbus_dep,
-  shared_dep
+  shared_dep,
 ]
 
 cflags = [
@@ -22,7 +22,7 @@ libnm_utils = static_library(
   sources: sources,
   include_directories: libnm_core_inc,
   dependencies: deps,
-  c_args: cflags
+  c_args: cflags,
 )
 
 libnm_headers = files(
@@ -69,12 +69,12 @@ libnm_headers = files(
   'nm-vpn-editor.h',
   'nm-vpn-plugin-old.h',
   'nm-vpn-service-plugin.h',
-  'nm-wimax-nsp.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 +87,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(
@@ -139,14 +139,15 @@ libnm_sources = files(
   'nm-vpn-plugin-old.c',
   'nm-vpn-editor.c',
   'nm-vpn-service-plugin.c',
-  'nm-wimax-nsp.c'
+  'nm-wimax-nsp.c',
 )
 
 deps = [
   dl_dep,
   libudev_dep,
   shared_dep,
-  uuid_dep
+  uuid_dep,
+  libnm_systemd_shared_no_logging_dep,
 ]
 
 linker_script = join_paths(meson.current_source_dir(), 'libnm.ver')
@@ -165,13 +166,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 +185,8 @@ pkg.generate(
   requires: 'gio-2.0',
   variables: [
     'exec_prefix=${prefix}',
-    'vpnservicedir=' + join_paths(nm_pkglibdir, 'VPN')
-  ]
+    'vpnservicedir=' + join_paths('${prefix}', 'lib', nm_name, 'VPN'),
+  ],
 )
 
 test(
@@ -208,7 +209,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 +219,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 +227,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 +236,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 +257,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 +266,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 +275,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-active-connection.c b/libnm/nm-active-connection.c
index 0314667f..5b238b3b 100644
--- a/libnm/nm-active-connection.c
+++ b/libnm/nm-active-connection.c
@@ -795,7 +795,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-client.c b/libnm/nm-client.c
index 1da22540..e2522229 100644
--- a/libnm/nm-client.c
+++ b/libnm/nm-client.c
@@ -1163,18 +1163,20 @@ add_activate_cb (GObject *object,
                  GAsyncResult *result,
                  gpointer user_data)
 {
-	GSimpleAsyncResult *simple = user_data;
+	gs_unref_object GSimpleAsyncResult *simple = user_data;
+	gs_unref_variant GVariant *result_data = NULL;
 	NMActiveConnection *ac;
 	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 +1235,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 +1265,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 +1273,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 +2599,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. */
diff --git a/libnm/nm-client.h b/libnm/nm-client.h
index 6259b122..97363ef7 100644
--- a/libnm/nm-client.h
+++ b/libnm/nm-client.h
@@ -339,6 +339,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..44eed0c8 100644
--- a/libnm/nm-dbus-helpers.c
+++ b/libnm/nm-dbus-helpers.c
@@ -105,7 +105,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-vxlan.c b/libnm/nm-device-vxlan.c
index 27b9c981..9a87ad13 100644
--- a/libnm/nm-device-vxlan.c
+++ b/libnm/nm-device-vxlan.c
@@ -361,7 +361,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.c b/libnm/nm-device-wifi.c
index 848e297c..9fb1eebf 100644
--- a/libnm/nm-device-wifi.c
+++ b/libnm/nm-device-wifi.c
@@ -370,7 +370,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 +487,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.c b/libnm/nm-device.c
index 3f1cc636..4bcd7c6c 100644
--- a/libnm/nm-device.c
+++ b/libnm/nm-device.c
@@ -74,6 +74,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 +122,8 @@ enum {
 	PROP_MTU,
 	PROP_METERED,
 	PROP_LLDP_NEIGHBORS,
+	PROP_IP4_CONNECTIVITY,
+	PROP_IP6_CONNECTIVITY,
 
 	LAST_PROP
 };
@@ -144,6 +148,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 +222,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 },
@@ -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:
 	 *
@@ -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
@@ -2392,7 +2466,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-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 a5425127..3254d4a0 100644
--- a/libnm/nm-manager.c
+++ b/libnm/nm-manager.c
@@ -870,16 +870,49 @@ 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,
@@ -889,12 +922,17 @@ activate_info_complete (ActivateInfo *info,
 
 	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 +1073,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 +1097,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 +1115,35 @@ 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;
+
+	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 +1151,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 +1160,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 +1183,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..d2ae25aa 100644
--- a/libnm/nm-object.c
+++ b/libnm/nm-object.c
@@ -612,7 +612,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 22aed0ea..31bceefb 100644
--- a/libnm/nm-property-docs.xml
+++ b/libnm/nm-property-docs.xml
@@ -22,7 +22,7 @@
     
     
     
-    
+    
     
     
     
@@ -145,7 +145,7 @@
     
     
     
-    
+    
     
     
     
@@ -164,14 +164,14 @@
   
     
     
-    
+    
     
     
     
     
     
     
-    
+    
     
     
     
@@ -187,13 +187,13 @@
     
     
     
-    
+    
     
     
     
     
     
-    
+    
     
     
     
@@ -309,8 +309,8 @@
   
   
     
-    
-    
+    
+    
   
   
     
@@ -318,7 +318,7 @@
   
   
     
-    
+    
     
     
     
@@ -338,7 +338,7 @@
     
     
     
-    
+    
     
     
     
@@ -449,7 +449,9 @@
     
   
   
+    
     
+    
     
     
   
diff --git a/libnm/nm-settings-docs-overrides.xml b/libnm/nm-settings-docs-overrides.xml
index 276253c6..54d85107 100644
--- a/libnm/nm-settings-docs-overrides.xml
+++ b/libnm/nm-settings-docs-overrides.xml
@@ -172,7 +172,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"."/>
 
@@ -186,7 +186,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 @@
     
     
     
-    
+    
     
     
     
@@ -167,14 +167,14 @@
     
     
     
-    
+    
     
     
     
     
     
     
-    
+    
     
     
     
@@ -192,13 +192,13 @@
     
     
     
-    
+    
     
     
     
     
     
-    
+    
     
     
     
@@ -315,8 +315,8 @@
   
   
     
-    
-    
+    
+    
   
   
     
@@ -325,7 +325,7 @@
   
     
     
-    
+    
     
     
     
@@ -345,7 +345,7 @@
     
     
     
-    
+    
     
     
     
@@ -400,7 +400,7 @@
     
   
   
-    
+    
     
     
     
@@ -417,7 +417,7 @@
     
   
   
-    
+    
     
     
     
@@ -460,7 +460,9 @@
     
   
   
+    
     
+    
     
     
   
diff --git a/libnm/nm-settings-ifcfg-rh-docs.xml b/libnm/nm-settings-ifcfg-rh-docs.xml
index 11f3115d..d1913062 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."/>
 
-
+
 
 
 
diff --git a/libnm/nm-vpn-service-plugin.c b/libnm/nm-vpn-service-plugin.c
index 2213824e..ed9da7f7 100644
--- a/libnm/nm-vpn-service-plugin.c
+++ b/libnm/nm-vpn-service-plugin.c
@@ -787,10 +787,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 +807,80 @@ 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 +1359,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/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/m4/compiler_options.m4 b/m4/compiler_options.m4
index 0683e44e..1f283db6 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"
diff --git a/man/NetworkManager.8 b/man/NetworkManager.8
index 5cf80c19..1992f827 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: 01/22/2019
 .\"    Manual: Network management daemons
-.\"    Source: NetworkManager 1.14.4
+.\"    Source: NetworkManager 1.15.2
 .\"  Language: English
 .\"
-.TH "NETWORKMANAGER" "8" "" "NetworkManager 1\&.14\&.4" "Network management daemons"
+.TH "NETWORKMANAGER" "8" "" "NetworkManager 1\&.15\&.2" "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 a27b8c3e..54c912ec 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: 01/22/2019
 .\"    Manual: Configuration
-.\"    Source: NetworkManager 1.14.4
+.\"    Source: NetworkManager 1.15.2
 .\"  Language: English
 .\"
-.TH "NETWORKMANAGER\&.CONF" "5" "" "NetworkManager 1\&.14\&.4" "Configuration"
+.TH "NETWORKMANAGER\&.CONF" "5" "" "NetworkManager 1\&.15\&.2" "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,16 @@ 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
+.RE
+.PP
+\fIcdma\&.mtu\fR
+.RS 4
+.RE
 .PP
 \fIconnection\&.auth\-retries\fR
 .RS 4
@@ -627,6 +684,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\&.
@@ -650,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
@@ -669,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
@@ -729,6 +800,11 @@ 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 +1080,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 +1237,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..e22aa20a 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,7 +674,15 @@ 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
+        
+        
+          cdma.mtu
+        
         
           connection.auth-retries
           If left unspecified, the default value is 3 tries before failing the connection.
@@ -676,6 +717,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.
@@ -695,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
         
@@ -714,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
@@ -770,7 +824,12 @@ ipv6.ip6-privacy=0
           If left unspecified, the default value
           "optional" will be used.
         
+        
+          wifi.wake-on-wlan
+        
       
+      
+      
     
     
 
@@ -1158,6 +1217,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 +1404,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/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 0f53f770..3df0447b 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: 01/22/2019
 .\"    Manual: System Administration
-.\"    Source: NetworkManager 1.14.4
+.\"    Source: NetworkManager 1.15.2
 .\"  Language: English
 .\"
-.TH "NM\-INITRD\-GENERATOR" "8" "" "NetworkManager 1\&.14\&.4" "System Administration"
+.TH "NM\-INITRD\-GENERATOR" "8" "" "NetworkManager 1\&.15\&.2" "System Administration"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/nm-online.1 b/man/nm-online.1
index 9e2f23e9..0155f816 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: 01/22/2019
 .\"    Manual: General Commands Manual
-.\"    Source: NetworkManager 1.14.4
+.\"    Source: NetworkManager 1.15.2
 .\"  Language: English
 .\"
-.TH "NM\-ONLINE" "1" "" "NetworkManager 1\&.14\&.4" "General Commands Manual"
+.TH "NM\-ONLINE" "1" "" "NetworkManager 1\&.15\&.2" "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 4b6c23b9..87156e51 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
-.\"    Manual: OpenVSwitch support overview
-.\"    Source: NetworkManager 1.14.4
+.\"      Date: 01/22/2019
+.\"    Manual: Open vSwitch support overview
+.\"    Source: NetworkManager 1.15.2
 .\"  Language: English
 .\"
-.TH "NM\-OPENVSWITCH" "7" "" "NetworkManager 1\&.14\&.4" "OpenVSwitch support overview"
+.TH "NM\-OPENVSWITCH" "7" "" "NetworkManager 1\&.15\&.2" "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 99434ecc..d11336f1 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: 01/22/2019
 .\"    Manual: Configuration
-.\"    Source: NetworkManager 1.14.4
+.\"    Source: NetworkManager 1.15.2
 .\"  Language: English
 .\"
-.TH "NM\-SETTINGS\-IFCFG\-RH" "5" "" "NetworkManager 1\&.14\&.4" "Configuration"
+.TH "NM\-SETTINGS\-IFCFG\-RH" "5" "" "NetworkManager 1\&.15\&.2" "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}
diff --git a/man/nm-settings-ifcfg-rh.xml b/man/nm-settings-ifcfg-rh.xml
index 3739fb28..ee867e12 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.15.2nm-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
diff --git a/man/nm-settings-keyfile.5 b/man/nm-settings-keyfile.5
index 09f40a7a..c32fc672 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: 01/22/2019
 .\"    Manual: Configuration
-.\"    Source: NetworkManager 1.14.4
+.\"    Source: NetworkManager 1.15.2
 .\"  Language: English
 .\"
-.TH "NM\-SETTINGS\-KEYFILE" "5" "" "NetworkManager 1\&.14\&.4" "Configuration"
+.TH "NM\-SETTINGS\-KEYFILE" "5" "" "NetworkManager 1\&.15\&.2" "Configuration"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/nm-settings-keyfile.xml b/man/nm-settings-keyfile.xml
index 9731f684..68ae20e4 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.15.2nm-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..215f4633 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: 01/22/2019
 .\"    Manual: Configuration
-.\"    Source: NetworkManager 1.14.4
+.\"    Source: NetworkManager 1.15.2
 .\"  Language: English
 .\"
-.TH "NM\-SETTINGS" "5" "" "NetworkManager 1\&.14\&.4" "Configuration"
+.TH "NM\-SETTINGS" "5" "" "NetworkManager 1\&.15\&.2" "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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -3979,7 +3979,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
@@ -4151,7 +4151,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
@@ -4553,8 +4553,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 +4575,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 bd255cb1..30895be0 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.15.2nm-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 "-").
@@ -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.
@@ -197,14 +197,14 @@
     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.
     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.
@@ -222,13 +222,13 @@
     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.
     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.
@@ -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.
@@ -355,7 +355,7 @@
   team settingTeaming Settings.Key NameValue TypeDefault ValueValue Description
     configstringThe 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.
@@ -430,7 +430,7 @@
     network-namestringNetwork Service Provider (NSP) name of the WiMAX network this connection should use. Deprecated: 1
   
   802-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.
@@ -447,7 +447,7 @@
     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.
   
   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.
@@ -490,7 +490,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 b5a5e7d3..08018e68 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: 01/22/2019
 .\"    Manual: Examples
-.\"    Source: NetworkManager 1.14.4
+.\"    Source: NetworkManager 1.15.2
 .\"  Language: English
 .\"
-.TH "NMCLI\-EXAMPLES" "7" "" "NetworkManager 1\&.14\&.4" "Examples"
+.TH "NMCLI\-EXAMPLES" "7" "" "NetworkManager 1\&.15\&.2" "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,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\ \&12.\ \&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\ \&13.\ \&Escaping colon characters in tabular mode\fR
 .sp
 .if n \{\
 .RS 4
@@ -371,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\ \&12.\ \&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
@@ -409,7 +450,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\ \&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 0b15f112..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
@@ -272,6 +285,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..86a546c7 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: 01/22/2019
 .\"    Manual: General Commands Manual
-.\"    Source: NetworkManager 1.14.4
+.\"    Source: NetworkManager 1.15.2
 .\"  Language: English
 .\"
-.TH "NMCLI" "1" "" "NetworkManager 1\&.14\&.4" "General Commands Manual"
+.TH "NMCLI" "1" "" "NetworkManager 1\&.15\&.2" "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 connnection 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..f092a2e4 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 connnection 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 7a27832b..f9fa109e 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: 01/22/2019
 .\"    Manual: General Commands Manual
-.\"    Source: NetworkManager 1.14.4
+.\"    Source: NetworkManager 1.15.2
 .\"  Language: English
 .\"
-.TH "NMTUI" "1" "" "NetworkManager 1\&.14\&.4" "General Commands Manual"
+.TH "NMTUI" "1" "" "NetworkManager 1\&.15\&.2" "General Commands Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/meson.build b/meson.build
index eebc7232..c9307a6c 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.4',
+  version: '1.15.2',
   license: 'GPL2+',
   default_options: [
     'buildtype=debugoptimized',
-    'c_std=gnu99'
+    'c_std=gnu99',
   ],
-  meson_version: '>= 0.44.0'
+  meson_version: '>= 0.44.0',
 )
 
 nm_name = meson.project_name()
@@ -95,7 +95,7 @@ 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],
 ]
 
 foreach define: set_defines
@@ -115,6 +115,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 '))
@@ -147,7 +148,7 @@ if enable_ld_gc
 endif
 
 if nm_debug
-  test_cflags = [
+  common_flags += cc.get_supported_arguments([
     '-fno-strict-aliasing',
     '-Wdeclaration-after-statement',
     '-Wfloat-equal',
@@ -170,10 +171,8 @@ if nm_debug
     '-Wstrict-prototypes',
     '-Wtypedef-redefinition',
     '-Wundef',
-    '-Wunknown-attributes'
-  ]
-
-  common_flags += cc.get_supported_arguments(test_cflags)
+    '-Wunknown-attributes',
+  ])
 endif
 
 add_project_arguments(common_flags, language: 'c')
@@ -222,11 +221,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',
   ]
 )
 
@@ -423,12 +422,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 +460,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 +495,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 +571,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 +759,7 @@ test_args = [
   '',
   enable_valgrind ? valgrind.path() : '',
   enable_valgrind ? valgrind_suppressions_path : '',
-  '--launch-dbus=auto'
+  '--launch-dbus=auto',
 ]
 
 py3 = import('python3')
@@ -877,7 +875,7 @@ config = 'config.h'
 configure_file(
   input: config + '.meson',
   output: config,
-  configuration: config_h
+  configuration: config_h,
 )
 
 config_extra_h = configuration_data()
@@ -907,7 +905,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 +916,7 @@ meson.add_install_script(
   nm_pkglibdir,
   nm_pkgstatedir,
   enable_docs ? 'install_docs' : '',
-  nm_mandir
+  nm_mandir,
 )
 
 output = '\nSystem paths:\n'
@@ -939,7 +937,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'
@@ -995,4 +993,5 @@ output += '  crypto: ' + crypto + ' (have-gnutls: ' + crypto_gnutls_dep.found().
 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 0f93d77f..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')
@@ -73,4 +71,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/po/POTFILES.in b/po/POTFILES.in
index 942b0661..33192b1d 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
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   [ |