From afcd268ea7b1149fbfb66bce4eca659b675da0a2 Mon Sep 17 00:00:00 2001
From: Michael Biebl
Date: Tue, 12 Dec 2017 15:53:07 +0100
Subject: New upstream version 1.10.2
---
INSTALL | 320 ++-
Makefile.am | 24 +-
Makefile.examples | 1 +
Makefile.in | 204 +-
NEWS | 16 +
aclocal.m4 | 53 +-
build-aux/compile | 9 +-
build-aux/config.guess | 38 +-
build-aux/config.sub | 27 +-
build-aux/depcomp | 6 +-
build-aux/install-sh | 4 +-
build-aux/missing | 6 +-
build-aux/tap-driver.sh | 4 +-
build-aux/test-driver | 6 +-
clients/cli/connections.c | 11 +-
clients/cli/general.c | 2 +-
clients/cli/settings.c | 4 +
clients/cli/utils.c | 12 +-
clients/common/nm-meta-setting-desc.c | 747 ++++++-
clients/common/settings-docs.c | 24 +
clients/common/settings-docs.c.in | 24 +
clients/tui/newt/nmt-newt-utils.c | 2 +-
clients/tui/nm-editor-bindings.c | 3 -
clients/tui/nmt-page-wifi.c | 30 +-
config.h.in | 6 +
configure | 82 +-
configure.ac | 18 +-
docs/api/Makefile.in | 84 +-
docs/api/NetworkManager.types | 0
...edesktop.NetworkManager.Settings.Connection.xml | 57 +
docs/api/html/NetworkManager.conf.html | 20 +-
docs/api/html/NetworkManager.devhelp2 | 10 +
docs/api/html/NetworkManager.html | 4 +-
docs/api/html/ch01.html | 7 +-
docs/api/html/dbus-secret-agent.html | 4 +-
docs/api/html/dbus-types.html | 4 +-
docs/api/html/dbus-vpn-types.html | 4 +-
...org.freedesktop.NetworkManager.AccessPoint.html | 4 +-
...rg.freedesktop.NetworkManager.AgentManager.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.Macsec.html | 4 +-
....freedesktop.NetworkManager.Device.Macvlan.html | 4 +-
...rg.freedesktop.NetworkManager.Device.Modem.html | 4 +-
...freedesktop.NetworkManager.Device.OlpcMesh.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 +-
...rg.freedesktop.NetworkManager.Device.WiMax.html | 4 +-
...rg.freedesktop.NetworkManager.Device.Wired.html | 4 +-
...freedesktop.NetworkManager.Device.Wireless.html | 4 +-
...dbus-org.freedesktop.NetworkManager.Device.html | 4 +-
...-org.freedesktop.NetworkManager.DnsManager.html | 4 +-
...s-org.freedesktop.NetworkManager.IP4Config.html | 4 +-
...s-org.freedesktop.NetworkManager.IP6Config.html | 4 +-
.../gdbus-org.freedesktop.NetworkManager.PPP.html | 4 +-
...org.freedesktop.NetworkManager.SecretAgent.html | 4 +-
...desktop.NetworkManager.Settings.Connection.html | 70 +-
...us-org.freedesktop.NetworkManager.Settings.html | 4 +-
....freedesktop.NetworkManager.VPN.Connection.html | 4 +-
...-org.freedesktop.NetworkManager.VPN.Plugin.html | 4 +-
.../html/gdbus-org.freedesktop.NetworkManager.html | 4 +-
docs/api/html/index.html | 9 +-
docs/api/html/ix01.html | 1343 ++++++------
docs/api/html/license.html | 4 +-
docs/api/html/manpages.html | 4 +-
docs/api/html/nm-dbus-types.html | 128 +-
docs/api/html/nm-online.html | 4 +-
docs/api/html/nm-openvswitch.html | 4 +-
docs/api/html/nm-settings-ifcfg-rh.html | 81 +-
docs/api/html/nm-settings-keyfile.html | 4 +-
docs/api/html/nm-settings.html | 215 +-
docs/api/html/nm-vpn-dbus-types.html | 4 +-
docs/api/html/nmcli-examples.html | 4 +-
docs/api/html/nmcli.html | 4 +-
docs/api/html/nmtui.html | 4 +-
docs/api/html/ref-dbus-access-points.html | 4 +-
docs/api/html/ref-dbus-active-connections.html | 4 +-
docs/api/html/ref-dbus-agent-manager.html | 4 +-
docs/api/html/ref-dbus-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 | 7 +-
docs/api/html/secret-agents.html | 4 +-
docs/api/html/secrets-flags.html | 4 +-
docs/api/html/settings-802-11-olpc-mesh.html | 6 +-
.../html/settings-802-11-wireless-security.html | 8 +-
docs/api/html/settings-802-11-wireless.html | 8 +-
docs/api/html/settings-802-1x.html | 6 +-
docs/api/html/settings-802-3-ethernet.html | 8 +-
docs/api/html/settings-adsl.html | 6 +-
docs/api/html/settings-bluetooth.html | 6 +-
docs/api/html/settings-bond.html | 6 +-
docs/api/html/settings-bridge-port.html | 6 +-
docs/api/html/settings-bridge.html | 6 +-
docs/api/html/settings-cdma.html | 6 +-
docs/api/html/settings-connection.html | 6 +-
docs/api/html/settings-dcb.html | 6 +-
docs/api/html/settings-dummy.html | 6 +-
docs/api/html/settings-generic.html | 6 +-
docs/api/html/settings-gsm.html | 6 +-
docs/api/html/settings-infiniband.html | 6 +-
docs/api/html/settings-ip-tunnel.html | 6 +-
docs/api/html/settings-ipv4.html | 6 +-
docs/api/html/settings-ipv6.html | 6 +-
docs/api/html/settings-macsec.html | 6 +-
docs/api/html/settings-macvlan.html | 6 +-
docs/api/html/settings-ovs-bridge.html | 6 +-
docs/api/html/settings-ovs-interface.html | 6 +-
docs/api/html/settings-ovs-patch.html | 6 +-
docs/api/html/settings-ovs-port.html | 6 +-
docs/api/html/settings-ppp.html | 6 +-
docs/api/html/settings-pppoe.html | 6 +-
docs/api/html/settings-proxy.html | 6 +-
docs/api/html/settings-serial.html | 10 +-
docs/api/html/settings-tc.html | 83 +
docs/api/html/settings-team-port.html | 44 +-
docs/api/html/settings-team.html | 102 +-
docs/api/html/settings-tun.html | 8 +-
docs/api/html/settings-user.html | 8 +-
docs/api/html/settings-vlan.html | 8 +-
docs/api/html/settings-vpn.html | 8 +-
docs/api/html/settings-vxlan.html | 8 +-
docs/api/html/settings-wimax.html | 8 +-
docs/api/html/spec.html | 4 +-
docs/api/html/vpn-plugins.html | 4 +-
docs/api/settings-spec.xml | 28 +
docs/api/version.xml | 2 +-
docs/libnm-glib/Makefile.in | 84 +-
docs/libnm-glib/html/NMAccessPoint.html | 122 +-
docs/libnm-glib/html/NMActiveConnection.html | 118 +-
docs/libnm-glib/html/NMClient.html | 348 +--
docs/libnm-glib/html/NMDHCP4Config.html | 28 +-
docs/libnm-glib/html/NMDHCP6Config.html | 28 +-
docs/libnm-glib/html/NMDevice.html | 264 +--
docs/libnm-glib/html/NMDeviceAdsl.html | 30 +-
docs/libnm-glib/html/NMDeviceBond.html | 42 +-
docs/libnm-glib/html/NMDeviceBridge.html | 42 +-
docs/libnm-glib/html/NMDeviceBt.html | 40 +-
docs/libnm-glib/html/NMDeviceEthernet.html | 46 +-
docs/libnm-glib/html/NMDeviceGeneric.html | 30 +-
docs/libnm-glib/html/NMDeviceInfiniband.html | 34 +-
docs/libnm-glib/html/NMDeviceModem.html | 26 +-
docs/libnm-glib/html/NMDeviceOlpcMesh.html | 34 +-
docs/libnm-glib/html/NMDeviceTeam.html | 42 +-
docs/libnm-glib/html/NMDeviceVlan.html | 44 +-
docs/libnm-glib/html/NMDeviceWifi.html | 90 +-
docs/libnm-glib/html/NMDeviceWimax.html | 90 +-
docs/libnm-glib/html/NMIP4Config.html | 76 +-
docs/libnm-glib/html/NMIP6Config.html | 72 +-
docs/libnm-glib/html/NMObject.html | 34 +-
docs/libnm-glib/html/NMRemoteConnection.html | 122 +-
docs/libnm-glib/html/NMRemoteSettings.html | 216 +-
docs/libnm-glib/html/NMSecretAgent.html | 144 +-
docs/libnm-glib/html/NMVPNConnection.html | 38 +-
docs/libnm-glib/html/NMWimaxNsp.html | 60 +-
docs/libnm-glib/html/annotation-glossary.html | 4 +-
docs/libnm-glib/html/api-index-full.html | 12 +-
docs/libnm-glib/html/ch02.html | 4 +-
docs/libnm-glib/html/index.html | 6 +-
docs/libnm-glib/html/libnm-glib-NMVPNPlugin.html | 32 +-
.../html/libnm-glib-NMVpnPluginUiWidget.html | 82 +-
docs/libnm-glib/html/libnm-glib-nm-types.html | 4 +-
.../html/libnm-glib-nm-vpn-plugin-utils.html | 34 +-
docs/libnm-glib/html/libnm-glib.devhelp2 | 2 -
docs/libnm-glib/html/object-tree.html | 8 +-
docs/libnm-glib/html/ref-overview.html | 4 +-
docs/libnm-glib/libnm-glib-sections.txt | 40 +-
docs/libnm-glib/version.xml | 2 +-
docs/libnm-util/Makefile.in | 84 +-
docs/libnm-util/html/NMConnection.html | 288 +--
docs/libnm-util/html/NMSetting.html | 144 +-
docs/libnm-util/html/NMSetting8021x.html | 282 +--
docs/libnm-util/html/NMSettingAdsl.html | 48 +-
docs/libnm-util/html/NMSettingBluetooth.html | 22 +-
docs/libnm-util/html/NMSettingBond.html | 66 +-
docs/libnm-util/html/NMSettingBridge.html | 70 +-
docs/libnm-util/html/NMSettingBridgePort.html | 38 +-
docs/libnm-util/html/NMSettingCdma.html | 28 +-
docs/libnm-util/html/NMSettingConnection.html | 154 +-
docs/libnm-util/html/NMSettingDcb.html | 136 +-
docs/libnm-util/html/NMSettingGeneric.html | 14 +-
docs/libnm-util/html/NMSettingGsm.html | 66 +-
docs/libnm-util/html/NMSettingIP4Config.html | 256 +--
docs/libnm-util/html/NMSettingIP6Config.html | 214 +-
docs/libnm-util/html/NMSettingInfiniband.html | 40 +-
docs/libnm-util/html/NMSettingOlpcMesh.html | 28 +-
docs/libnm-util/html/NMSettingPPP.html | 192 +-
docs/libnm-util/html/NMSettingPPPOE.html | 30 +-
docs/libnm-util/html/NMSettingSerial.html | 50 +-
docs/libnm-util/html/NMSettingTeam.html | 22 +-
docs/libnm-util/html/NMSettingTeamPort.html | 18 +-
docs/libnm-util/html/NMSettingVPN.html | 76 +-
docs/libnm-util/html/NMSettingVlan.html | 96 +-
docs/libnm-util/html/NMSettingWimax.html | 20 +-
docs/libnm-util/html/NMSettingWired.html | 132 +-
docs/libnm-util/html/NMSettingWireless.html | 146 +-
.../libnm-util/html/NMSettingWirelessSecurity.html | 140 +-
docs/libnm-util/html/annotation-glossary.html | 4 +-
docs/libnm-util/html/api-index-full.html | 1084 +++++-----
docs/libnm-util/html/ch01.html | 4 +-
docs/libnm-util/html/index.html | 6 +-
.../libnm-util/html/libnm-util-NetworkManager.html | 6 +-
.../html/libnm-util-NetworkManagerVPN.html | 4 +-
docs/libnm-util/html/libnm-util-nm-utils.html | 454 ++--
docs/libnm-util/html/libnm-util.devhelp2 | 1 -
docs/libnm-util/html/object-tree.html | 10 +-
docs/libnm-util/libnm-util-sections.txt | 30 -
docs/libnm-util/version.xml | 2 +-
docs/libnm/Makefile.in | 84 +-
docs/libnm/html/NMAccessPoint.html | 82 +-
docs/libnm/html/NMActiveConnection.html | 90 +-
docs/libnm/html/NMClient.html | 678 +++---
docs/libnm/html/NMConnection.html | 294 +--
docs/libnm/html/NMDevice.html | 416 ++--
docs/libnm/html/NMDeviceAdsl.html | 18 +-
docs/libnm/html/NMDeviceBond.html | 32 +-
docs/libnm/html/NMDeviceBridge.html | 32 +-
docs/libnm/html/NMDeviceBt.html | 16 +-
docs/libnm/html/NMDeviceDummy.html | 12 +-
docs/libnm/html/NMDeviceEthernet.html | 40 +-
docs/libnm/html/NMDeviceGeneric.html | 18 +-
docs/libnm/html/NMDeviceIPTunnel.html | 70 +-
docs/libnm/html/NMDeviceInfiniband.html | 22 +-
docs/libnm/html/NMDeviceMacsec.html | 106 +-
docs/libnm/html/NMDeviceMacvlan.html | 36 +-
docs/libnm/html/NMDeviceModem.html | 8 +-
docs/libnm/html/NMDeviceOlpcMesh.html | 22 +-
docs/libnm/html/NMDeviceTeam.html | 36 +-
docs/libnm/html/NMDeviceTun.html | 60 +-
docs/libnm/html/NMDeviceVlan.html | 32 +-
docs/libnm/html/NMDeviceVxlan.html | 136 +-
docs/libnm/html/NMDeviceWifi.html | 120 +-
docs/libnm/html/NMDeviceWimax.html | 80 +-
docs/libnm/html/NMDhcpConfig.html | 24 +-
docs/libnm/html/NMIPConfig.html | 72 +-
docs/libnm/html/NMObject.html | 30 +-
docs/libnm/html/NMRemoteConnection.html | 317 ++-
docs/libnm/html/NMSecretAgentOld.html | 162 +-
docs/libnm/html/NMSetting.html | 127 +-
docs/libnm/html/NMSetting8021x.html | 360 ++--
docs/libnm/html/NMSettingAdsl.html | 38 +-
docs/libnm/html/NMSettingBluetooth.html | 16 +-
docs/libnm/html/NMSettingBond.html | 64 +-
docs/libnm/html/NMSettingBridge.html | 76 +-
docs/libnm/html/NMSettingBridgePort.html | 32 +-
docs/libnm/html/NMSettingCdma.html | 26 +-
docs/libnm/html/NMSettingConnection.html | 192 +-
docs/libnm/html/NMSettingDcb.html | 136 +-
docs/libnm/html/NMSettingDummy.html | 8 +-
docs/libnm/html/NMSettingGeneric.html | 10 +-
docs/libnm/html/NMSettingGsm.html | 60 +-
docs/libnm/html/NMSettingIP4Config.html | 18 +-
docs/libnm/html/NMSettingIP6Config.html | 18 +-
docs/libnm/html/NMSettingIPConfig.html | 428 ++--
docs/libnm/html/NMSettingIPTunnel.html | 80 +-
docs/libnm/html/NMSettingInfiniband.html | 38 +-
docs/libnm/html/NMSettingMacsec.html | 42 +-
docs/libnm/html/NMSettingMacvlan.html | 34 +-
docs/libnm/html/NMSettingOlpcMesh.html | 26 +-
docs/libnm/html/NMSettingPpp.html | 186 +-
docs/libnm/html/NMSettingPppoe.html | 24 +-
docs/libnm/html/NMSettingSerial.html | 42 +-
docs/libnm/html/NMSettingTeam.html | 2240 +++++++++++++++++++-
docs/libnm/html/NMSettingTeamPort.html | 602 +++++-
docs/libnm/html/NMSettingTun.html | 56 +-
docs/libnm/html/NMSettingVlan.html | 94 +-
docs/libnm/html/NMSettingVpn.html | 76 +-
docs/libnm/html/NMSettingVxlan.html | 124 +-
docs/libnm/html/NMSettingWimax.html | 14 +-
docs/libnm/html/NMSettingWired.html | 154 +-
docs/libnm/html/NMSettingWireless.html | 154 +-
docs/libnm/html/NMSettingWirelessSecurity.html | 140 +-
docs/libnm/html/NMSimpleConnection.html | 20 +-
docs/libnm/html/NMVpnConnection.html | 22 +-
docs/libnm/html/NMVpnEditorPlugin.html | 88 +-
docs/libnm/html/NMWimaxNsp.html | 42 +-
docs/libnm/html/annotation-glossary.html | 4 +-
docs/libnm/html/api-index-full.html | 997 +++++++--
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 | 105 +-
docs/libnm/html/libnm-nm-errors.html | 49 +-
docs/libnm/html/libnm-nm-utils.html | 900 +++++---
docs/libnm/html/libnm-nm-version.html | 14 +-
docs/libnm/html/libnm-nm-vpn-dbus-interface.html | 6 +-
docs/libnm/html/libnm.devhelp2 | 143 ++
docs/libnm/html/object-tree.html | 23 +-
docs/libnm/html/ref-overview.html | 4 +-
docs/libnm/html/usage.html | 10 +-
docs/libnm/libnm-sections.txt | 280 ++-
docs/libnm/libnm.types | 7 +
docs/libnm/version.xml | 2 +-
.../python/gi/nm-connection-update-stable-id.py | 116 +
gtk-doc.make | 81 +-
...edesktop.NetworkManager.Settings.Connection.xml | 38 +
libnm-core/nm-connection.c | 18 +-
libnm-core/nm-connection.h | 4 +-
libnm-core/nm-core-internal.h | 50 +-
libnm-core/nm-core-types.h | 3 +-
libnm-core/nm-dbus-interface.h | 44 +
libnm-core/nm-dbus-types.xml | 55 +
libnm-core/nm-errors.h | 2 +
libnm-core/nm-keyfile-reader.c | 122 +-
libnm-core/nm-keyfile-utils.c | 2 +-
libnm-core/nm-keyfile-writer.c | 146 +-
libnm-core/nm-property-compare.c | 34 +
libnm-core/nm-setting-bond.c | 150 +-
libnm-core/nm-setting-bridge.c | 42 +-
libnm-core/nm-setting-ip-config.c | 7 +-
libnm-core/nm-setting-ip-config.h | 1 +
libnm-core/nm-setting-ip4-config.c | 8 +
libnm-core/nm-setting-ip6-config.c | 10 +-
libnm-core/nm-setting-tc-config.c | 1576 ++++++++++++++
libnm-core/nm-setting-tc-config.h | 191 ++
libnm-core/nm-setting-team-port.c | 471 +++-
libnm-core/nm-setting-team-port.h | 41 +-
libnm-core/nm-setting-team.c | 1635 +++++++++++++-
libnm-core/nm-setting-team.h | 167 +-
libnm-core/nm-setting-wireless-security.c | 5 +-
libnm-core/nm-utils-private.h | 120 +-
libnm-core/nm-utils.c | 2035 +++++++++++++++---
libnm-core/nm-utils.h | 20 +-
libnm-core/nm-version.h | 6 +
libnm-core/tests/test-general.c | 2 +-
libnm-core/tests/test-keyfile.c | 5 +
libnm-core/tests/test-setting-8021x.c | 404 ----
libnm-core/tests/test-setting-bond.c | 247 ---
libnm-core/tests/test-setting-dcb.c | 321 ---
libnm-core/tests/test-setting.c | 1632 ++++++++++++++
libnm-glib/nm-remote-connection.c | 15 +-
libnm/NetworkManager.h | 3 +-
libnm/generate-setting-docs.py | 4 +-
libnm/libnm.ver | 110 +
libnm/nm-manager.c | 2 +-
libnm/nm-object.c | 6 +-
libnm/nm-property-docs.xml | 26 +
libnm/nm-remote-connection.c | 170 +-
libnm/nm-remote-connection.h | 13 +
libnm/nm-settings-docs-overrides.xml | 2 +
libnm/nm-settings-docs.xml | 26 +
libnm/nm-settings-ifcfg-rh-docs.xml | 17 +-
libnm/nm-settings-keyfile-docs.xml | 2 +
man/NetworkManager.8 | 6 +-
man/NetworkManager.conf.5 | 11 +-
man/NetworkManager.conf.xml | 18 +
man/nm-online.1 | 6 +-
man/nm-openvswitch.7 | 6 +-
man/nm-settings-ifcfg-rh.5 | 99 +-
man/nm-settings-ifcfg-rh.xml | 22 +-
man/nm-settings-keyfile.5 | 6 +-
man/nm-settings-keyfile.xml | 3 +-
man/nm-settings.5 | 264 ++-
man/nm-settings.xml | 28 +-
man/nmcli-examples.7 | 6 +-
man/nmcli.1 | 6 +-
man/nmtui.1 | 6 +-
po/POTFILES.in | 1 +
po/uk.po | 1219 ++++++-----
shared/nm-meta-setting.c | 6 +
shared/nm-meta-setting.h | 1 +
shared/nm-test-utils-impl.c | 2 +-
shared/nm-utils/c-list.h | 14 +-
shared/nm-utils/nm-dedup-multi.c | 20 +-
shared/nm-utils/nm-glib.h | 5 +
shared/nm-utils/nm-macros-internal.h | 182 +-
shared/nm-utils/nm-random-utils.c | 2 +-
shared/nm-utils/nm-shared-utils.c | 30 +-
shared/nm-utils/nm-shared-utils.h | 77 +-
shared/nm-version-macros.h | 7 +-
shared/nm-version-macros.h.in | 5 +-
src/NetworkManagerUtils.c | 24 +-
src/NetworkManagerUtils.h | 1 +
src/devices/bluetooth/nm-bluez-device.c | 3 +-
src/devices/bluetooth/nm-bluez5-manager.c | 2 +-
src/devices/nm-device-ethernet.c | 4 +-
src/devices/nm-device-macsec.c | 4 +-
src/devices/nm-device-vlan.c | 6 +-
src/devices/nm-device.c | 261 ++-
src/devices/nm-device.h | 3 +-
src/devices/tests/test-lldp.c | 2 +-
src/devices/wifi/nm-device-wifi.c | 8 +-
src/devices/wwan/nm-modem.c | 4 +-
src/dns/nm-dns-dnsmasq.c | 6 +-
src/dns/nm-dns-manager.c | 350 +--
src/dns/nm-dns-manager.h | 19 +-
src/dns/nm-dns-systemd-resolved.c | 5 +-
src/main-utils.c | 2 +-
src/nm-act-request.c | 109 +-
src/nm-act-request.h | 20 +-
src/nm-active-connection.c | 66 +-
src/nm-active-connection.h | 14 +-
src/nm-checkpoint.c | 26 +-
src/nm-config-data.c | 24 +-
src/nm-config-data.h | 2 +
src/nm-config.h | 2 +
src/nm-core-utils.c | 10 +-
src/nm-firewall-manager.c | 8 +-
src/nm-ip4-config.c | 134 +-
src/nm-ip4-config.h | 137 ++
src/nm-ip6-config.c | 80 +-
src/nm-manager.c | 520 +++--
src/nm-manager.h | 15 +-
src/nm-pacrunner-manager.c | 6 +-
src/nm-policy.c | 556 ++---
src/nm-sleep-monitor.c | 2 +-
src/nm-types.h | 7 +-
src/platform/nm-fake-platform.c | 28 +-
src/platform/nm-linux-platform.c | 460 +++-
src/platform/nm-platform.c | 383 +++-
src/platform/nm-platform.h | 114 +-
src/platform/nmp-netns.c | 5 +
src/platform/nmp-object.c | 103 +-
src/platform/nmp-object.h | 85 +-
src/platform/tests/test-common.c | 54 +-
src/platform/tests/test-common.h | 20 +-
src/platform/tests/test-link.c | 15 +-
src/platform/tests/test-nmp-object.c | 91 +-
src/platform/tests/test-route.c | 208 +-
src/ppp/nm-ppp-manager.c | 4 +-
src/settings/nm-agent-manager.c | 32 +-
src/settings/nm-agent-manager.h | 6 +-
src/settings/nm-inotify-helper.c | 214 --
src/settings/nm-inotify-helper.h | 46 -
src/settings/nm-secret-agent.c | 68 +-
src/settings/nm-secret-agent.h | 33 +-
src/settings/nm-settings-connection.c | 1042 +++++----
src/settings/nm-settings-connection.h | 122 +-
src/settings/nm-settings.c | 143 +-
src/settings/nm-settings.h | 10 +-
src/settings/plugins/ibft/nms-ibft-connection.c | 11 +-
src/settings/plugins/ibft/nms-ibft-plugin.c | 2 +-
src/settings/plugins/ifcfg-rh/nm-inotify-helper.c | 214 ++
src/settings/plugins/ifcfg-rh/nm-inotify-helper.h | 59 +
.../plugins/ifcfg-rh/nms-ifcfg-rh-connection.c | 78 +-
.../plugins/ifcfg-rh/nms-ifcfg-rh-plugin.c | 13 +-
.../plugins/ifcfg-rh/nms-ifcfg-rh-reader.c | 652 +++---
src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-utils.c | 8 +-
src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-utils.h | 3 +-
.../plugins/ifcfg-rh/nms-ifcfg-rh-writer.c | 201 +-
src/settings/plugins/ifcfg-rh/shvar.c | 12 +-
src/settings/plugins/ifcfg-rh/shvar.h | 3 +-
.../ifcfg-Test_Write_Bond_Main.cexpected | 2 +-
...ifcfg-Test_Write_Team_Infiniband_Port.cexpected | 2 +-
.../ifcfg-Test_Write_Team_Port.cexpected | 2 +-
.../ifcfg-Test_Write_Wired_Static_Routes.cexpected | 20 +
.../tests/network-scripts/ifcfg-test-dns-options | 3 +-
.../tests/network-scripts/ifcfg-test-team-master-1 | 2 +-
.../tests/network-scripts/ifcfg-test-team-master-2 | 2 +-
.../tests/network-scripts/ifcfg-test-team-port-1 | 2 +-
.../tests/network-scripts/ifcfg-test-team-port-2 | 2 +-
.../network-scripts/ifcfg-test-wired-ipv6-only | 2 +-
.../tests/network-scripts/ifcfg-test-wired-static | 1 +
.../network-scripts/route-test-wired-static-routes | 6 +
.../plugins/ifcfg-rh/tests/test-ifcfg-rh.c | 148 +-
src/settings/plugins/ifnet/nms-ifnet-connection.c | 17 +-
src/settings/plugins/ifnet/nms-ifnet-plugin.c | 13 +-
.../plugins/ifupdown/nms-ifupdown-plugin.c | 12 +-
.../plugins/keyfile/nms-keyfile-connection.c | 15 +-
src/settings/plugins/keyfile/nms-keyfile-plugin.c | 11 +-
.../plugins/keyfile/tests/keyfiles/Test_TC_Config | 11 +
src/settings/plugins/keyfile/tests/test-keyfile.c | 125 +-
src/tests/config/test-config.c | 6 +-
src/tests/test-general-with-expect.c | 8 +-
src/tests/test-general.c | 2 +-
src/tests/test-ip4-config.c | 2 +
src/vpn/nm-vpn-connection.c | 56 +-
valgrind.suppressions | 2 +-
490 files changed, 29223 insertions(+), 13676 deletions(-)
delete mode 100644 docs/api/NetworkManager.types
create mode 100644 docs/api/html/settings-tc.html
create mode 100755 examples/python/gi/nm-connection-update-stable-id.py
create mode 100644 libnm-core/nm-setting-tc-config.c
create mode 100644 libnm-core/nm-setting-tc-config.h
delete mode 100644 libnm-core/tests/test-setting-8021x.c
delete mode 100644 libnm-core/tests/test-setting-bond.c
delete mode 100644 libnm-core/tests/test-setting-dcb.c
create mode 100644 libnm-core/tests/test-setting.c
delete mode 100644 src/settings/nm-inotify-helper.c
delete mode 100644 src/settings/nm-inotify-helper.h
create mode 100644 src/settings/plugins/ifcfg-rh/nm-inotify-helper.c
create mode 100644 src/settings/plugins/ifcfg-rh/nm-inotify-helper.h
create mode 100644 src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Wired_Static_Routes.cexpected
create mode 100644 src/settings/plugins/keyfile/tests/keyfiles/Test_TC_Config
diff --git a/INSTALL b/INSTALL
index 20998407..8865734f 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,8 +1,8 @@
Installation Instructions
*************************
-Copyright (C) 1994-1996, 1999-2002, 2004-2013 Free Software Foundation,
-Inc.
+ Copyright (C) 1994-1996, 1999-2002, 2004-2016 Free Software
+Foundation, Inc.
Copying and distribution of this file, with or without modification,
are permitted in any medium without royalty provided the copyright
@@ -12,97 +12,96 @@ without warranty of any kind.
Basic Installation
==================
- Briefly, the shell command `./configure && make && make install'
+ Briefly, the shell command './configure && make && make install'
should configure, build, and install this package. The following
-more-detailed instructions are generic; see the `README' file for
+more-detailed instructions are generic; see the 'README' file for
instructions specific to this package. Some packages provide this
-`INSTALL' file but do not implement all of the features documented
+'INSTALL' file but do not implement all of the features documented
below. The lack of an optional feature in a given package is not
necessarily a bug. More recommendations for GNU packages can be found
in *note Makefile Conventions: (standards)Makefile Conventions.
- The `configure' shell script attempts to guess correct values for
+ The 'configure' shell script attempts to guess correct values for
various system-dependent variables used during compilation. It uses
-those values to create a `Makefile' in each directory of the package.
-It may also create one or more `.h' files containing system-dependent
-definitions. Finally, it creates a shell script `config.status' that
+those values to create a 'Makefile' in each directory of the package.
+It may also create one or more '.h' files containing system-dependent
+definitions. Finally, it creates a shell script 'config.status' that
you can run in the future to recreate the current configuration, and a
-file `config.log' containing compiler output (useful mainly for
-debugging `configure').
+file 'config.log' containing compiler output (useful mainly for
+debugging 'configure').
- It can also use an optional file (typically called `config.cache'
-and enabled with `--cache-file=config.cache' or simply `-C') that saves
-the results of its tests to speed up reconfiguring. Caching is
-disabled by default to prevent problems with accidental use of stale
-cache files.
+ It can also use an optional file (typically called 'config.cache' and
+enabled with '--cache-file=config.cache' or simply '-C') that saves the
+results of its tests to speed up reconfiguring. Caching is disabled by
+default to prevent problems with accidental use of stale cache files.
If you need to do unusual things to compile the package, please try
-to figure out how `configure' could check whether to do them, and mail
-diffs or instructions to the address given in the `README' so they can
+to figure out how 'configure' could check whether to do them, and mail
+diffs or instructions to the address given in the 'README' so they can
be considered for the next release. If you are using the cache, and at
-some point `config.cache' contains results you don't want to keep, you
+some point 'config.cache' contains results you don't want to keep, you
may remove or edit it.
- The file `configure.ac' (or `configure.in') is used to create
-`configure' by a program called `autoconf'. You need `configure.ac' if
-you want to change it or regenerate `configure' using a newer version
-of `autoconf'.
+ The file 'configure.ac' (or 'configure.in') is used to create
+'configure' by a program called 'autoconf'. You need 'configure.ac' if
+you want to change it or regenerate 'configure' using a newer version of
+'autoconf'.
The simplest way to compile this package is:
- 1. `cd' to the directory containing the package's source code and type
- `./configure' to configure the package for your system.
+ 1. 'cd' to the directory containing the package's source code and type
+ './configure' to configure the package for your system.
- Running `configure' might take a while. While running, it prints
+ Running 'configure' might take a while. While running, it prints
some messages telling which features it is checking for.
- 2. Type `make' to compile the package.
+ 2. Type 'make' to compile the package.
- 3. Optionally, type `make check' to run any self-tests that come with
+ 3. Optionally, type 'make check' to run any self-tests that come with
the package, generally using the just-built uninstalled binaries.
- 4. Type `make install' to install the programs and any data files and
+ 4. Type 'make install' to install the programs and any data files and
documentation. When installing into a prefix owned by root, it is
recommended that the package be configured and built as a regular
- user, and only the `make install' phase executed with root
+ user, and only the 'make install' phase executed with root
privileges.
- 5. Optionally, type `make installcheck' to repeat any self-tests, but
+ 5. Optionally, type 'make installcheck' to repeat any self-tests, but
this time using the binaries in their final installed location.
This target does not install anything. Running this target as a
- regular user, particularly if the prior `make install' required
+ regular user, particularly if the prior 'make install' required
root privileges, verifies that the installation completed
correctly.
6. You can remove the program binaries and object files from the
- source code directory by typing `make clean'. To also remove the
- files that `configure' created (so you can compile the package for
- a different kind of computer), type `make distclean'. There is
- also a `make maintainer-clean' target, but that is intended mainly
+ source code directory by typing 'make clean'. To also remove the
+ files that 'configure' created (so you can compile the package for
+ a different kind of computer), type 'make distclean'. There is
+ also a 'make maintainer-clean' target, but that is intended mainly
for the package's developers. If you use it, you may have to get
all sorts of other programs in order to regenerate files that came
with the distribution.
- 7. Often, you can also type `make uninstall' to remove the installed
+ 7. Often, you can also type 'make uninstall' to remove the installed
files again. In practice, not all packages have tested that
uninstallation works correctly, even though it is required by the
GNU Coding Standards.
- 8. Some packages, particularly those that use Automake, provide `make
+ 8. Some packages, particularly those that use Automake, provide 'make
distcheck', which can by used by developers to test that all other
- targets like `make install' and `make uninstall' work correctly.
+ targets like 'make install' and 'make uninstall' work correctly.
This target is generally not run by end users.
Compilers and Options
=====================
Some systems require unusual options for compilation or linking that
-the `configure' script does not know about. Run `./configure --help'
+the 'configure' script does not know about. Run './configure --help'
for details on some of the pertinent environment variables.
- You can give `configure' initial values for configuration parameters
-by setting variables in the command line or in the environment. Here
-is an example:
+ You can give 'configure' initial values for configuration parameters
+by setting variables in the command line or in the environment. Here is
+an example:
./configure CC=c99 CFLAGS=-g LIBS=-lposix
@@ -113,21 +112,21 @@ Compiling For Multiple Architectures
You can compile the package for more than one kind of computer at the
same time, by placing the object files for each architecture in their
-own directory. To do this, you can use GNU `make'. `cd' to the
+own directory. To do this, you can use GNU 'make'. 'cd' to the
directory where you want the object files and executables to go and run
-the `configure' script. `configure' automatically checks for the
-source code in the directory that `configure' is in and in `..'. This
-is known as a "VPATH" build.
+the 'configure' script. 'configure' automatically checks for the source
+code in the directory that 'configure' is in and in '..'. This is known
+as a "VPATH" build.
- With a non-GNU `make', it is safer to compile the package for one
+ With a non-GNU 'make', it is safer to compile the package for one
architecture at a time in the source code directory. After you have
-installed the package for one architecture, use `make distclean' before
+installed the package for one architecture, use 'make distclean' before
reconfiguring for another architecture.
On MacOS X 10.5 and later systems, you can create libraries and
executables that work on multiple system types--known as "fat" or
-"universal" binaries--by specifying multiple `-arch' options to the
-compiler but only a single `-arch' option to the preprocessor. Like
+"universal" binaries--by specifying multiple '-arch' options to the
+compiler but only a single '-arch' option to the preprocessor. Like
this:
./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
@@ -136,105 +135,104 @@ this:
This is not guaranteed to produce working output in all cases, you
may have to build one architecture at a time and combine the results
-using the `lipo' tool if you have problems.
+using the 'lipo' tool if you have problems.
Installation Names
==================
- By default, `make install' installs the package's commands under
-`/usr/local/bin', include files under `/usr/local/include', etc. You
-can specify an installation prefix other than `/usr/local' by giving
-`configure' the option `--prefix=PREFIX', where PREFIX must be an
+ By default, 'make install' installs the package's commands under
+'/usr/local/bin', include files under '/usr/local/include', etc. You
+can specify an installation prefix other than '/usr/local' by giving
+'configure' the option '--prefix=PREFIX', where PREFIX must be an
absolute file name.
You can specify separate installation prefixes for
architecture-specific files and architecture-independent files. If you
-pass the option `--exec-prefix=PREFIX' to `configure', the package uses
+pass the option '--exec-prefix=PREFIX' to 'configure', the package uses
PREFIX as the prefix for installing programs and libraries.
Documentation and other data files still use the regular prefix.
In addition, if you use an unusual directory layout you can give
-options like `--bindir=DIR' to specify different values for particular
-kinds of files. Run `configure --help' for a list of the directories
-you can set and what kinds of files go in them. In general, the
-default for these options is expressed in terms of `${prefix}', so that
-specifying just `--prefix' will affect all of the other directory
+options like '--bindir=DIR' to specify different values for particular
+kinds of files. Run 'configure --help' for a list of the directories
+you can set and what kinds of files go in them. In general, the default
+for these options is expressed in terms of '${prefix}', so that
+specifying just '--prefix' will affect all of the other directory
specifications that were not explicitly provided.
The most portable way to affect installation locations is to pass the
-correct locations to `configure'; however, many packages provide one or
+correct locations to 'configure'; however, many packages provide one or
both of the following shortcuts of passing variable assignments to the
-`make install' command line to change installation locations without
+'make install' command line to change installation locations without
having to reconfigure or recompile.
The first method involves providing an override variable for each
-affected directory. For example, `make install
+affected directory. For example, 'make install
prefix=/alternate/directory' will choose an alternate location for all
directory configuration variables that were expressed in terms of
-`${prefix}'. Any directories that were specified during `configure',
-but not in terms of `${prefix}', must each be overridden at install
-time for the entire installation to be relocated. The approach of
-makefile variable overrides for each directory variable is required by
-the GNU Coding Standards, and ideally causes no recompilation.
-However, some platforms have known limitations with the semantics of
-shared libraries that end up requiring recompilation when using this
-method, particularly noticeable in packages that use GNU Libtool.
-
- The second method involves providing the `DESTDIR' variable. For
-example, `make install DESTDIR=/alternate/directory' will prepend
-`/alternate/directory' before all installation names. The approach of
-`DESTDIR' overrides is not required by the GNU Coding Standards, and
+'${prefix}'. Any directories that were specified during 'configure',
+but not in terms of '${prefix}', must each be overridden at install time
+for the entire installation to be relocated. The approach of makefile
+variable overrides for each directory variable is required by the GNU
+Coding Standards, and ideally causes no recompilation. However, some
+platforms have known limitations with the semantics of shared libraries
+that end up requiring recompilation when using this method, particularly
+noticeable in packages that use GNU Libtool.
+
+ The second method involves providing the 'DESTDIR' variable. For
+example, 'make install DESTDIR=/alternate/directory' will prepend
+'/alternate/directory' before all installation names. The approach of
+'DESTDIR' overrides is not required by the GNU Coding Standards, and
does not work on platforms that have drive letters. On the other hand,
it does better at avoiding recompilation issues, and works well even
-when some directory options were not specified in terms of `${prefix}'
-at `configure' time.
+when some directory options were not specified in terms of '${prefix}'
+at 'configure' time.
Optional Features
=================
If the package supports it, you can cause programs to be installed
-with an extra prefix or suffix on their names by giving `configure' the
-option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
-
- Some packages pay attention to `--enable-FEATURE' options to
-`configure', where FEATURE indicates an optional part of the package.
-They may also pay attention to `--with-PACKAGE' options, where PACKAGE
-is something like `gnu-as' or `x' (for the X Window System). The
-`README' should mention any `--enable-' and `--with-' options that the
+with an extra prefix or suffix on their names by giving 'configure' the
+option '--program-prefix=PREFIX' or '--program-suffix=SUFFIX'.
+
+ Some packages pay attention to '--enable-FEATURE' options to
+'configure', where FEATURE indicates an optional part of the package.
+They may also pay attention to '--with-PACKAGE' options, where PACKAGE
+is something like 'gnu-as' or 'x' (for the X Window System). The
+'README' should mention any '--enable-' and '--with-' options that the
package recognizes.
- For packages that use the X Window System, `configure' can usually
+ For packages that use the X Window System, 'configure' can usually
find the X include and library files automatically, but if it doesn't,
-you can use the `configure' options `--x-includes=DIR' and
-`--x-libraries=DIR' to specify their locations.
+you can use the 'configure' options '--x-includes=DIR' and
+'--x-libraries=DIR' to specify their locations.
Some packages offer the ability to configure how verbose the
-execution of `make' will be. For these packages, running `./configure
+execution of 'make' will be. For these packages, running './configure
--enable-silent-rules' sets the default to minimal output, which can be
-overridden with `make V=1'; while running `./configure
+overridden with 'make V=1'; while running './configure
--disable-silent-rules' sets the default to verbose, which can be
-overridden with `make V=0'.
+overridden with 'make V=0'.
Particular systems
==================
- On HP-UX, the default C compiler is not ANSI C compatible. If GNU
-CC is not installed, it is recommended to use the following options in
+ On HP-UX, the default C compiler is not ANSI C compatible. If GNU CC
+is not installed, it is recommended to use the following options in
order to use an ANSI C compiler:
./configure CC="cc -Ae -D_XOPEN_SOURCE=500"
and if that doesn't work, install pre-built binaries of GCC for HP-UX.
- HP-UX `make' updates targets which have the same time stamps as
-their prerequisites, which makes it generally unusable when shipped
-generated files such as `configure' are involved. Use GNU `make'
-instead.
+ HP-UX 'make' updates targets which have the same time stamps as their
+prerequisites, which makes it generally unusable when shipped generated
+files such as 'configure' are involved. Use GNU 'make' instead.
On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot
-parse its `' header file. The option `-nodtk' can be used as
-a workaround. If GNU CC is not installed, it is therefore recommended
-to try
+parse its '' header file. The option '-nodtk' can be used as a
+workaround. If GNU CC is not installed, it is therefore recommended to
+try
./configure CC="cc"
@@ -242,26 +240,26 @@ and if that doesn't work, try
./configure CC="cc -nodtk"
- On Solaris, don't put `/usr/ucb' early in your `PATH'. This
+ On Solaris, don't put '/usr/ucb' early in your 'PATH'. This
directory contains several dysfunctional programs; working variants of
-these programs are available in `/usr/bin'. So, if you need `/usr/ucb'
-in your `PATH', put it _after_ `/usr/bin'.
+these programs are available in '/usr/bin'. So, if you need '/usr/ucb'
+in your 'PATH', put it _after_ '/usr/bin'.
- On Haiku, software installed for all users goes in `/boot/common',
-not `/usr/local'. It is recommended to use the following options:
+ On Haiku, software installed for all users goes in '/boot/common',
+not '/usr/local'. It is recommended to use the following options:
./configure --prefix=/boot/common
Specifying the System Type
==========================
- There may be some features `configure' cannot figure out
+ There may be some features 'configure' cannot figure out
automatically, but needs to determine by the type of machine the package
will run on. Usually, assuming the package is built to be run on the
-_same_ architectures, `configure' can figure that out, but if it prints
+_same_ architectures, 'configure' can figure that out, but if it prints
a message saying it cannot guess the machine type, give it the
-`--build=TYPE' option. TYPE can either be a short name for the system
-type, such as `sun4', or a canonical name which has the form:
+'--build=TYPE' option. TYPE can either be a short name for the system
+type, such as 'sun4', or a canonical name which has the form:
CPU-COMPANY-SYSTEM
@@ -270,101 +268,101 @@ where SYSTEM can have one of these forms:
OS
KERNEL-OS
- See the file `config.sub' for the possible values of each field. If
-`config.sub' isn't included in this package, then this package doesn't
+ See the file 'config.sub' for the possible values of each field. If
+'config.sub' isn't included in this package, then this package doesn't
need to know the machine type.
If you are _building_ compiler tools for cross-compiling, you should
-use the option `--target=TYPE' to select the type of system they will
+use the option '--target=TYPE' to select the type of system they will
produce code for.
If you want to _use_ a cross compiler, that generates code for a
platform different from the build platform, you should specify the
"host" platform (i.e., that on which the generated programs will
-eventually be run) with `--host=TYPE'.
+eventually be run) with '--host=TYPE'.
Sharing Defaults
================
- If you want to set default values for `configure' scripts to share,
-you can create a site shell script called `config.site' that gives
-default values for variables like `CC', `cache_file', and `prefix'.
-`configure' looks for `PREFIX/share/config.site' if it exists, then
-`PREFIX/etc/config.site' if it exists. Or, you can set the
-`CONFIG_SITE' environment variable to the location of the site script.
-A warning: not all `configure' scripts look for a site script.
+ If you want to set default values for 'configure' scripts to share,
+you can create a site shell script called 'config.site' that gives
+default values for variables like 'CC', 'cache_file', and 'prefix'.
+'configure' looks for 'PREFIX/share/config.site' if it exists, then
+'PREFIX/etc/config.site' if it exists. Or, you can set the
+'CONFIG_SITE' environment variable to the location of the site script.
+A warning: not all 'configure' scripts look for a site script.
Defining Variables
==================
Variables not defined in a site shell script can be set in the
-environment passed to `configure'. However, some packages may run
+environment passed to 'configure'. However, some packages may run
configure again during the build, and the customized values of these
variables may be lost. In order to avoid this problem, you should set
-them in the `configure' command line, using `VAR=value'. For example:
+them in the 'configure' command line, using 'VAR=value'. For example:
./configure CC=/usr/local2/bin/gcc
-causes the specified `gcc' to be used as the C compiler (unless it is
+causes the specified 'gcc' to be used as the C compiler (unless it is
overridden in the site shell script).
-Unfortunately, this technique does not work for `CONFIG_SHELL' due to
-an Autoconf limitation. Until the limitation is lifted, you can use
-this workaround:
+Unfortunately, this technique does not work for 'CONFIG_SHELL' due to an
+Autoconf limitation. Until the limitation is lifted, you can use this
+workaround:
CONFIG_SHELL=/bin/bash ./configure CONFIG_SHELL=/bin/bash
-`configure' Invocation
+'configure' Invocation
======================
- `configure' recognizes the following options to control how it
+ 'configure' recognizes the following options to control how it
operates.
-`--help'
-`-h'
- Print a summary of all of the options to `configure', and exit.
+'--help'
+'-h'
+ Print a summary of all of the options to 'configure', and exit.
-`--help=short'
-`--help=recursive'
+'--help=short'
+'--help=recursive'
Print a summary of the options unique to this package's
- `configure', and exit. The `short' variant lists options used
- only in the top level, while the `recursive' variant lists options
- also present in any nested packages.
+ 'configure', and exit. The 'short' variant lists options used only
+ in the top level, while the 'recursive' variant lists options also
+ present in any nested packages.
-`--version'
-`-V'
- Print the version of Autoconf used to generate the `configure'
+'--version'
+'-V'
+ Print the version of Autoconf used to generate the 'configure'
script, and exit.
-`--cache-file=FILE'
+'--cache-file=FILE'
Enable the cache: use and save the results of the tests in FILE,
- traditionally `config.cache'. FILE defaults to `/dev/null' to
+ traditionally 'config.cache'. FILE defaults to '/dev/null' to
disable caching.
-`--config-cache'
-`-C'
- Alias for `--cache-file=config.cache'.
+'--config-cache'
+'-C'
+ Alias for '--cache-file=config.cache'.
-`--quiet'
-`--silent'
-`-q'
+'--quiet'
+'--silent'
+'-q'
Do not print messages saying which checks are being made. To
- suppress all normal output, redirect it to `/dev/null' (any error
+ suppress all normal output, redirect it to '/dev/null' (any error
messages will still be shown).
-`--srcdir=DIR'
+'--srcdir=DIR'
Look for the package's source code in directory DIR. Usually
- `configure' can determine that directory automatically.
+ 'configure' can determine that directory automatically.
-`--prefix=DIR'
- Use DIR as the installation prefix. *note Installation Names::
- for more details, including other options available for fine-tuning
- the installation locations.
+'--prefix=DIR'
+ Use DIR as the installation prefix. *note Installation Names:: for
+ more details, including other options available for fine-tuning the
+ installation locations.
-`--no-create'
-`-n'
+'--no-create'
+'-n'
Run the configure checks, but stop before creating any output
files.
-`configure' also accepts some other, not widely useful, options. Run
-`configure --help' for more details.
+'configure' also accepts some other, not widely useful, options. Run
+'configure --help' for more details.
diff --git a/Makefile.am b/Makefile.am
index 0cc4d7f1..941c1a25 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -413,6 +413,7 @@ libnm_core_lib_h_pub_real = \
libnm-core/nm-setting-pppoe.h \
libnm-core/nm-setting-proxy.h \
libnm-core/nm-setting-serial.h \
+ libnm-core/nm-setting-tc-config.h \
libnm-core/nm-setting-team-port.h \
libnm-core/nm-setting-team.h \
libnm-core/nm-setting-tun.h \
@@ -498,6 +499,7 @@ libnm_core_lib_c_real = \
libnm-core/nm-setting-pppoe.c \
libnm-core/nm-setting-proxy.c \
libnm-core/nm-setting-serial.c \
+ libnm-core/nm-setting-tc-config.c \
libnm-core/nm-setting-team-port.c \
libnm-core/nm-setting-team.c \
libnm-core/nm-setting-tun.c \
@@ -639,9 +641,7 @@ check_programs += \
libnm-core/tests/test-general \
libnm-core/tests/test-keyfile \
libnm-core/tests/test-secrets \
- libnm-core/tests/test-setting-8021x \
- libnm-core/tests/test-setting-bond \
- libnm-core/tests/test-setting-dcb \
+ libnm-core/tests/test-setting \
libnm-core/tests/test-settings-defaults
GLIB_GENERATED += \
@@ -665,9 +665,7 @@ libnm_core_tests_test_crypto_CPPFLAGS = $(libnm_core_tests_cppflags)
libnm_core_tests_test_general_CPPFLAGS = $(libnm_core_tests_cppflags)
libnm_core_tests_test_keyfile_CPPFLAGS = $(libnm_core_tests_cppflags)
libnm_core_tests_test_secrets_CPPFLAGS = $(libnm_core_tests_cppflags)
-libnm_core_tests_test_setting_8021x_CPPFLAGS = $(libnm_core_tests_cppflags)
-libnm_core_tests_test_setting_bond_CPPFLAGS = $(libnm_core_tests_cppflags)
-libnm_core_tests_test_setting_dcb_CPPFLAGS = $(libnm_core_tests_cppflags)
+libnm_core_tests_test_setting_CPPFLAGS = $(libnm_core_tests_cppflags)
libnm_core_tests_test_settings_defaults_CPPFLAGS = $(libnm_core_tests_cppflags)
libnm_core_tests_test_general_SOURCES = \
@@ -687,9 +685,7 @@ libnm_core_tests_test_crypto_LDADD = $(libnm_core_tests_ldadd)
libnm_core_tests_test_general_LDADD = $(libnm_core_tests_ldadd)
libnm_core_tests_test_keyfile_LDADD = $(libnm_core_tests_ldadd)
libnm_core_tests_test_secrets_LDADD = $(libnm_core_tests_ldadd)
-libnm_core_tests_test_setting_8021x_LDADD = $(libnm_core_tests_ldadd)
-libnm_core_tests_test_setting_bond_LDADD = $(libnm_core_tests_ldadd)
-libnm_core_tests_test_setting_dcb_LDADD = $(libnm_core_tests_ldadd)
+libnm_core_tests_test_setting_LDADD = $(libnm_core_tests_ldadd)
libnm_core_tests_test_settings_defaults_LDADD = $(libnm_core_tests_ldadd)
$(libnm_core_tests_test_compare_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
@@ -697,9 +693,7 @@ $(libnm_core_tests_test_crypto_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
$(libnm_core_tests_test_general_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
$(libnm_core_tests_test_keyfile_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
$(libnm_core_tests_test_secrets_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
-$(libnm_core_tests_test_setting_8021x_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
-$(libnm_core_tests_test_setting_bond_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
-$(libnm_core_tests_test_setting_dcb_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
+$(libnm_core_tests_test_setting_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
$(libnm_core_tests_test_settings_defaults_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
# test-cert.p12 created with:
@@ -1473,8 +1467,6 @@ src_libNetworkManager_la_SOURCES = \
\
src/settings/nm-agent-manager.c \
src/settings/nm-agent-manager.h \
- src/settings/nm-inotify-helper.c \
- src/settings/nm-inotify-helper.h \
src/settings/nm-secret-agent.c \
src/settings/nm-secret-agent.h \
src/settings/nm-settings-connection.c \
@@ -1844,6 +1836,7 @@ EXTRA_DIST += \
src/settings/plugins/keyfile/tests/keyfiles/Test_Enum_Property \
src/settings/plugins/keyfile/tests/keyfiles/Test_Flags_Property \
src/settings/plugins/keyfile/tests/keyfiles/Test_dcb_connection \
+ src/settings/plugins/keyfile/tests/keyfiles/Test_TC_Config \
\
src/settings/plugins/keyfile/tests/keyfiles/test-ca-cert.pem \
src/settings/plugins/keyfile/tests/keyfiles/test-key-and-cert.pem
@@ -1991,6 +1984,8 @@ src_settings_plugins_ifcfg_rh_libnms_ifcfg_rh_core_la_SOURCES = \
src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-common.h \
src/settings/plugins/ifcfg-rh/shvar.c \
src/settings/plugins/ifcfg-rh/shvar.h \
+ src/settings/plugins/ifcfg-rh/nm-inotify-helper.c \
+ src/settings/plugins/ifcfg-rh/nm-inotify-helper.h \
src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-utils.c \
src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-utils.h \
src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c \
@@ -2075,6 +2070,7 @@ EXTRA_DIST += \
src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Wifi_LEAP.cexpected \
src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Wifi_WEP_104_ASCII.cexpected \
src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Wired_Auto-Negotiate.cexpected \
+ src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Wired_Static_Routes.cexpected \
src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Wired_Wake-on-LAN.cexpected \
src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Vlan_test-vlan-interface.cexpected \
src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-dcb-test.cexpected \
diff --git a/Makefile.examples b/Makefile.examples
index 63370e2c..0326f7a2 100644
--- a/Makefile.examples
+++ b/Makefile.examples
@@ -171,6 +171,7 @@ EXTRA_DIST += \
examples/python/gi/get-active-connections.py \
examples/python/gi/get_ips.py \
examples/python/gi/list-connections.py \
+ examples/python/gi/nm-connection-update-stable-id.py \
examples/python/gi/setting-user-data.py \
examples/python/gi/show-wifi-networks.py \
examples/python/gi/update-ip4-method.py \
diff --git a/Makefile.in b/Makefile.in
index 7bfa978c..53b8e1a9 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.15 from Makefile.am.
+# Makefile.in generated by automake 1.15.1 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+# Copyright (C) 1994-2017 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -672,6 +672,7 @@ am__libnm_core_libnm_core_la_SOURCES_DIST = \
libnm-core/nm-setting-ovs-port.h libnm-core/nm-setting-ppp.h \
libnm-core/nm-setting-pppoe.h libnm-core/nm-setting-proxy.h \
libnm-core/nm-setting-serial.h \
+ libnm-core/nm-setting-tc-config.h \
libnm-core/nm-setting-team-port.h libnm-core/nm-setting-team.h \
libnm-core/nm-setting-tun.h libnm-core/nm-setting-user.h \
libnm-core/nm-setting-vlan.h libnm-core/nm-setting-vpn.h \
@@ -726,6 +727,7 @@ am__libnm_core_libnm_core_la_SOURCES_DIST = \
libnm-core/nm-setting-ovs-port.c libnm-core/nm-setting-ppp.c \
libnm-core/nm-setting-pppoe.c libnm-core/nm-setting-proxy.c \
libnm-core/nm-setting-serial.c \
+ libnm-core/nm-setting-tc-config.c \
libnm-core/nm-setting-team-port.c libnm-core/nm-setting-team.c \
libnm-core/nm-setting-tun.c libnm-core/nm-setting-user.c \
libnm-core/nm-setting-vlan.c libnm-core/nm-setting-vpn.c \
@@ -786,6 +788,7 @@ am__objects_5 = \
libnm-core/libnm_core_libnm_core_la-nm-setting-pppoe.lo \
libnm-core/libnm_core_libnm_core_la-nm-setting-proxy.lo \
libnm-core/libnm_core_libnm_core_la-nm-setting-serial.lo \
+ libnm-core/libnm_core_libnm_core_la-nm-setting-tc-config.lo \
libnm-core/libnm_core_libnm_core_la-nm-setting-team-port.lo \
libnm-core/libnm_core_libnm_core_la-nm-setting-team.lo \
libnm-core/libnm_core_libnm_core_la-nm-setting-tun.lo \
@@ -1356,10 +1359,8 @@ am__src_libNetworkManager_la_SOURCES_DIST = \
src/ppp/nm-ppp-manager.h src/ppp/nm-ppp-status.h \
src/nm-hostname-manager.c src/nm-hostname-manager.h \
src/settings/nm-agent-manager.c \
- src/settings/nm-agent-manager.h \
- src/settings/nm-inotify-helper.c \
- src/settings/nm-inotify-helper.h \
- src/settings/nm-secret-agent.c src/settings/nm-secret-agent.h \
+ src/settings/nm-agent-manager.h src/settings/nm-secret-agent.c \
+ src/settings/nm-secret-agent.h \
src/settings/nm-settings-connection.c \
src/settings/nm-settings-connection.h \
src/settings/nm-settings-plugin.c \
@@ -1444,7 +1445,6 @@ am_src_libNetworkManager_la_OBJECTS = \
src/ppp/src_libNetworkManager_la-nm-ppp-manager-call.lo \
src/src_libNetworkManager_la-nm-hostname-manager.lo \
src/settings/src_libNetworkManager_la-nm-agent-manager.lo \
- src/settings/src_libNetworkManager_la-nm-inotify-helper.lo \
src/settings/src_libNetworkManager_la-nm-secret-agent.lo \
src/settings/src_libNetworkManager_la-nm-settings-connection.lo \
src/settings/src_libNetworkManager_la-nm-settings-plugin.lo \
@@ -1682,6 +1682,8 @@ am__src_settings_plugins_ifcfg_rh_libnms_ifcfg_rh_core_la_SOURCES_DIST = \
src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-common.h \
src/settings/plugins/ifcfg-rh/shvar.c \
src/settings/plugins/ifcfg-rh/shvar.h \
+ src/settings/plugins/ifcfg-rh/nm-inotify-helper.c \
+ src/settings/plugins/ifcfg-rh/nm-inotify-helper.h \
src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-utils.c \
src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-utils.h \
src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c \
@@ -1689,6 +1691,7 @@ am__src_settings_plugins_ifcfg_rh_libnms_ifcfg_rh_core_la_SOURCES_DIST = \
src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.c \
src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.h
@CONFIG_PLUGIN_IFCFG_RH_TRUE@am_src_settings_plugins_ifcfg_rh_libnms_ifcfg_rh_core_la_OBJECTS = src/settings/plugins/ifcfg-rh/src_settings_plugins_ifcfg_rh_libnms_ifcfg_rh_core_la-shvar.lo \
+@CONFIG_PLUGIN_IFCFG_RH_TRUE@ src/settings/plugins/ifcfg-rh/src_settings_plugins_ifcfg_rh_libnms_ifcfg_rh_core_la-nm-inotify-helper.lo \
@CONFIG_PLUGIN_IFCFG_RH_TRUE@ src/settings/plugins/ifcfg-rh/src_settings_plugins_ifcfg_rh_libnms_ifcfg_rh_core_la-nms-ifcfg-rh-utils.lo \
@CONFIG_PLUGIN_IFCFG_RH_TRUE@ src/settings/plugins/ifcfg-rh/src_settings_plugins_ifcfg_rh_libnms_ifcfg_rh_core_la-nms-ifcfg-rh-reader.lo \
@CONFIG_PLUGIN_IFCFG_RH_TRUE@ src/settings/plugins/ifcfg-rh/src_settings_plugins_ifcfg_rh_libnms_ifcfg_rh_core_la-nms-ifcfg-rh-writer.lo
@@ -1782,9 +1785,7 @@ am__EXEEXT_12 = libnm-core/tests/test-compare$(EXEEXT) \
libnm-core/tests/test-general$(EXEEXT) \
libnm-core/tests/test-keyfile$(EXEEXT) \
libnm-core/tests/test-secrets$(EXEEXT) \
- libnm-core/tests/test-setting-8021x$(EXEEXT) \
- libnm-core/tests/test-setting-bond$(EXEEXT) \
- libnm-core/tests/test-setting-dcb$(EXEEXT) \
+ libnm-core/tests/test-setting$(EXEEXT) \
libnm-core/tests/test-settings-defaults$(EXEEXT) \
$(am__EXEEXT_3) src/dhcp/tests/test-dhcp-dhclient$(EXEEXT) \
src/dhcp/tests/test-dhcp-utils$(EXEEXT) \
@@ -2091,21 +2092,10 @@ libnm_core_tests_test_secrets_SOURCES = \
libnm-core/tests/test-secrets.c
libnm_core_tests_test_secrets_OBJECTS = libnm-core/tests/libnm_core_tests_test_secrets-test-secrets.$(OBJEXT)
libnm_core_tests_test_secrets_DEPENDENCIES = $(am__DEPENDENCIES_10)
-libnm_core_tests_test_setting_8021x_SOURCES = \
- libnm-core/tests/test-setting-8021x.c
-libnm_core_tests_test_setting_8021x_OBJECTS = libnm-core/tests/libnm_core_tests_test_setting_8021x-test-setting-8021x.$(OBJEXT)
-libnm_core_tests_test_setting_8021x_DEPENDENCIES = \
- $(am__DEPENDENCIES_10)
-libnm_core_tests_test_setting_bond_SOURCES = \
- libnm-core/tests/test-setting-bond.c
-libnm_core_tests_test_setting_bond_OBJECTS = libnm-core/tests/libnm_core_tests_test_setting_bond-test-setting-bond.$(OBJEXT)
-libnm_core_tests_test_setting_bond_DEPENDENCIES = \
- $(am__DEPENDENCIES_10)
-libnm_core_tests_test_setting_dcb_SOURCES = \
- libnm-core/tests/test-setting-dcb.c
-libnm_core_tests_test_setting_dcb_OBJECTS = libnm-core/tests/libnm_core_tests_test_setting_dcb-test-setting-dcb.$(OBJEXT)
-libnm_core_tests_test_setting_dcb_DEPENDENCIES = \
- $(am__DEPENDENCIES_10)
+libnm_core_tests_test_setting_SOURCES = \
+ libnm-core/tests/test-setting.c
+libnm_core_tests_test_setting_OBJECTS = libnm-core/tests/libnm_core_tests_test_setting-test-setting.$(OBJEXT)
+libnm_core_tests_test_setting_DEPENDENCIES = $(am__DEPENDENCIES_10)
libnm_core_tests_test_settings_defaults_SOURCES = \
libnm-core/tests/test-settings-defaults.c
libnm_core_tests_test_settings_defaults_OBJECTS = libnm-core/tests/libnm_core_tests_test_settings_defaults-test-settings-defaults.$(OBJEXT)
@@ -2647,9 +2637,7 @@ SOURCES = $(clients_tui_newt_libnmt_newt_a_SOURCES) \
$(nodist_libnm_core_tests_test_general_SOURCES) \
libnm-core/tests/test-keyfile.c \
libnm-core/tests/test-secrets.c \
- libnm-core/tests/test-setting-8021x.c \
- libnm-core/tests/test-setting-bond.c \
- libnm-core/tests/test-setting-dcb.c \
+ libnm-core/tests/test-setting.c \
libnm-core/tests/test-settings-defaults.c \
libnm-glib/libnm-glib-test.c \
$(libnm_glib_tests_test_nm_client_SOURCES) \
@@ -2750,9 +2738,7 @@ DIST_SOURCES = $(am__clients_tui_newt_libnmt_newt_a_SOURCES_DIST) \
$(libnm_core_tests_test_general_SOURCES) \
libnm-core/tests/test-keyfile.c \
libnm-core/tests/test-secrets.c \
- libnm-core/tests/test-setting-8021x.c \
- libnm-core/tests/test-setting-bond.c \
- libnm-core/tests/test-setting-dcb.c \
+ libnm-core/tests/test-setting.c \
libnm-core/tests/test-settings-defaults.c \
libnm-glib/libnm-glib-test.c \
$(am__libnm_glib_tests_test_nm_client_SOURCES_DIST) \
@@ -3562,6 +3548,7 @@ EXTRA_DIST = $(dbusinterfaces_DATA) libnm-core/crypto_gnutls.c \
src/settings/plugins/keyfile/tests/keyfiles/Test_Enum_Property \
src/settings/plugins/keyfile/tests/keyfiles/Test_Flags_Property \
src/settings/plugins/keyfile/tests/keyfiles/Test_dcb_connection \
+ src/settings/plugins/keyfile/tests/keyfiles/Test_TC_Config \
src/settings/plugins/keyfile/tests/keyfiles/test-ca-cert.pem \
src/settings/plugins/keyfile/tests/keyfiles/test-key-and-cert.pem \
$(am__append_24) \
@@ -3585,6 +3572,7 @@ EXTRA_DIST = $(dbusinterfaces_DATA) libnm-core/crypto_gnutls.c \
src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Wifi_LEAP.cexpected \
src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Wifi_WEP_104_ASCII.cexpected \
src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Wired_Auto-Negotiate.cexpected \
+ src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Wired_Static_Routes.cexpected \
src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Wired_Wake-on-LAN.cexpected \
src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Vlan_test-vlan-interface.cexpected \
src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-dcb-test.cexpected \
@@ -3883,6 +3871,7 @@ EXTRA_DIST = $(dbusinterfaces_DATA) libnm-core/crypto_gnutls.c \
examples/python/gi/get-active-connections.py \
examples/python/gi/get_ips.py \
examples/python/gi/list-connections.py \
+ examples/python/gi/nm-connection-update-stable-id.py \
examples/python/gi/setting-user-data.py \
examples/python/gi/show-wifi-networks.py \
examples/python/gi/update-ip4-method.py \
@@ -3941,9 +3930,7 @@ man_pages_autogen = man/nm-settings-keyfile.5 man/nm-settings.5 \
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-8021x \
- libnm-core/tests/test-setting-bond \
- libnm-core/tests/test-setting-dcb \
+ libnm-core/tests/test-setting \
libnm-core/tests/test-settings-defaults \
$(libnm_tests_programs) src/dhcp/tests/test-dhcp-dhclient \
src/dhcp/tests/test-dhcp-utils \
@@ -4282,6 +4269,7 @@ libnm_core_lib_h_pub_real = \
libnm-core/nm-setting-pppoe.h \
libnm-core/nm-setting-proxy.h \
libnm-core/nm-setting-serial.h \
+ libnm-core/nm-setting-tc-config.h \
libnm-core/nm-setting-team-port.h \
libnm-core/nm-setting-team.h \
libnm-core/nm-setting-tun.h \
@@ -4355,6 +4343,7 @@ libnm_core_lib_c_real = shared/nm-utils/c-list-util.c \
libnm-core/nm-setting-ovs-port.c libnm-core/nm-setting-ppp.c \
libnm-core/nm-setting-pppoe.c libnm-core/nm-setting-proxy.c \
libnm-core/nm-setting-serial.c \
+ libnm-core/nm-setting-tc-config.c \
libnm-core/nm-setting-team-port.c libnm-core/nm-setting-team.c \
libnm-core/nm-setting-tun.c libnm-core/nm-setting-user.c \
libnm-core/nm-setting-vlan.c libnm-core/nm-setting-vpn.c \
@@ -4414,9 +4403,7 @@ libnm_core_tests_test_crypto_CPPFLAGS = $(libnm_core_tests_cppflags)
libnm_core_tests_test_general_CPPFLAGS = $(libnm_core_tests_cppflags)
libnm_core_tests_test_keyfile_CPPFLAGS = $(libnm_core_tests_cppflags)
libnm_core_tests_test_secrets_CPPFLAGS = $(libnm_core_tests_cppflags)
-libnm_core_tests_test_setting_8021x_CPPFLAGS = $(libnm_core_tests_cppflags)
-libnm_core_tests_test_setting_bond_CPPFLAGS = $(libnm_core_tests_cppflags)
-libnm_core_tests_test_setting_dcb_CPPFLAGS = $(libnm_core_tests_cppflags)
+libnm_core_tests_test_setting_CPPFLAGS = $(libnm_core_tests_cppflags)
libnm_core_tests_test_settings_defaults_CPPFLAGS = $(libnm_core_tests_cppflags)
libnm_core_tests_test_general_SOURCES = \
libnm-core/tests/test-general-enums.h \
@@ -4435,9 +4422,7 @@ libnm_core_tests_test_crypto_LDADD = $(libnm_core_tests_ldadd)
libnm_core_tests_test_general_LDADD = $(libnm_core_tests_ldadd)
libnm_core_tests_test_keyfile_LDADD = $(libnm_core_tests_ldadd)
libnm_core_tests_test_secrets_LDADD = $(libnm_core_tests_ldadd)
-libnm_core_tests_test_setting_8021x_LDADD = $(libnm_core_tests_ldadd)
-libnm_core_tests_test_setting_bond_LDADD = $(libnm_core_tests_ldadd)
-libnm_core_tests_test_setting_dcb_LDADD = $(libnm_core_tests_ldadd)
+libnm_core_tests_test_setting_LDADD = $(libnm_core_tests_ldadd)
libnm_core_tests_test_settings_defaults_LDADD = $(libnm_core_tests_ldadd)
###############################################################################
@@ -4987,10 +4972,8 @@ src_libNetworkManager_la_SOURCES = src/nm-checkpoint-manager.c \
src/ppp/nm-ppp-manager.h src/ppp/nm-ppp-status.h \
src/nm-hostname-manager.c src/nm-hostname-manager.h \
src/settings/nm-agent-manager.c \
- src/settings/nm-agent-manager.h \
- src/settings/nm-inotify-helper.c \
- src/settings/nm-inotify-helper.h \
- src/settings/nm-secret-agent.c src/settings/nm-secret-agent.h \
+ src/settings/nm-agent-manager.h src/settings/nm-secret-agent.c \
+ src/settings/nm-secret-agent.h \
src/settings/nm-settings-connection.c \
src/settings/nm-settings-connection.h \
src/settings/nm-settings-plugin.c \
@@ -5278,6 +5261,8 @@ src_settings_plugins_keyfile_tests_test_keyfile_LDADD = \
@CONFIG_PLUGIN_IFCFG_RH_TRUE@ src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-common.h \
@CONFIG_PLUGIN_IFCFG_RH_TRUE@ src/settings/plugins/ifcfg-rh/shvar.c \
@CONFIG_PLUGIN_IFCFG_RH_TRUE@ src/settings/plugins/ifcfg-rh/shvar.h \
+@CONFIG_PLUGIN_IFCFG_RH_TRUE@ src/settings/plugins/ifcfg-rh/nm-inotify-helper.c \
+@CONFIG_PLUGIN_IFCFG_RH_TRUE@ src/settings/plugins/ifcfg-rh/nm-inotify-helper.h \
@CONFIG_PLUGIN_IFCFG_RH_TRUE@ src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-utils.c \
@CONFIG_PLUGIN_IFCFG_RH_TRUE@ src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-utils.h \
@CONFIG_PLUGIN_IFCFG_RH_TRUE@ src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c \
@@ -7366,6 +7351,9 @@ libnm-core/libnm_core_libnm_core_la-nm-setting-proxy.lo: \
libnm-core/libnm_core_libnm_core_la-nm-setting-serial.lo: \
libnm-core/$(am__dirstamp) \
libnm-core/$(DEPDIR)/$(am__dirstamp)
+libnm-core/libnm_core_libnm_core_la-nm-setting-tc-config.lo: \
+ libnm-core/$(am__dirstamp) \
+ libnm-core/$(DEPDIR)/$(am__dirstamp)
libnm-core/libnm_core_libnm_core_la-nm-setting-team-port.lo: \
libnm-core/$(am__dirstamp) \
libnm-core/$(DEPDIR)/$(am__dirstamp)
@@ -8073,9 +8061,6 @@ src/settings/$(DEPDIR)/$(am__dirstamp):
src/settings/src_libNetworkManager_la-nm-agent-manager.lo: \
src/settings/$(am__dirstamp) \
src/settings/$(DEPDIR)/$(am__dirstamp)
-src/settings/src_libNetworkManager_la-nm-inotify-helper.lo: \
- src/settings/$(am__dirstamp) \
- src/settings/$(DEPDIR)/$(am__dirstamp)
src/settings/src_libNetworkManager_la-nm-secret-agent.lo: \
src/settings/$(am__dirstamp) \
src/settings/$(DEPDIR)/$(am__dirstamp)
@@ -8521,6 +8506,9 @@ src/settings/plugins/ifcfg-rh/libnmdbus-ifcfg-rh.la: $(src_settings_plugins_ifcf
src/settings/plugins/ifcfg-rh/src_settings_plugins_ifcfg_rh_libnms_ifcfg_rh_core_la-shvar.lo: \
src/settings/plugins/ifcfg-rh/$(am__dirstamp) \
src/settings/plugins/ifcfg-rh/$(DEPDIR)/$(am__dirstamp)
+src/settings/plugins/ifcfg-rh/src_settings_plugins_ifcfg_rh_libnms_ifcfg_rh_core_la-nm-inotify-helper.lo: \
+ src/settings/plugins/ifcfg-rh/$(am__dirstamp) \
+ src/settings/plugins/ifcfg-rh/$(DEPDIR)/$(am__dirstamp)
src/settings/plugins/ifcfg-rh/src_settings_plugins_ifcfg_rh_libnms_ifcfg_rh_core_la-nms-ifcfg-rh-utils.lo: \
src/settings/plugins/ifcfg-rh/$(am__dirstamp) \
src/settings/plugins/ifcfg-rh/$(DEPDIR)/$(am__dirstamp)
@@ -9110,27 +9098,13 @@ libnm-core/tests/libnm_core_tests_test_secrets-test-secrets.$(OBJEXT): \
libnm-core/tests/test-secrets$(EXEEXT): $(libnm_core_tests_test_secrets_OBJECTS) $(libnm_core_tests_test_secrets_DEPENDENCIES) $(EXTRA_libnm_core_tests_test_secrets_DEPENDENCIES) libnm-core/tests/$(am__dirstamp)
@rm -f libnm-core/tests/test-secrets$(EXEEXT)
$(AM_V_CCLD)$(LINK) $(libnm_core_tests_test_secrets_OBJECTS) $(libnm_core_tests_test_secrets_LDADD) $(LIBS)
-libnm-core/tests/libnm_core_tests_test_setting_8021x-test-setting-8021x.$(OBJEXT): \
+libnm-core/tests/libnm_core_tests_test_setting-test-setting.$(OBJEXT): \
libnm-core/tests/$(am__dirstamp) \
libnm-core/tests/$(DEPDIR)/$(am__dirstamp)
-libnm-core/tests/test-setting-8021x$(EXEEXT): $(libnm_core_tests_test_setting_8021x_OBJECTS) $(libnm_core_tests_test_setting_8021x_DEPENDENCIES) $(EXTRA_libnm_core_tests_test_setting_8021x_DEPENDENCIES) libnm-core/tests/$(am__dirstamp)
- @rm -f libnm-core/tests/test-setting-8021x$(EXEEXT)
- $(AM_V_CCLD)$(LINK) $(libnm_core_tests_test_setting_8021x_OBJECTS) $(libnm_core_tests_test_setting_8021x_LDADD) $(LIBS)
-libnm-core/tests/libnm_core_tests_test_setting_bond-test-setting-bond.$(OBJEXT): \
- libnm-core/tests/$(am__dirstamp) \
- libnm-core/tests/$(DEPDIR)/$(am__dirstamp)
-
-libnm-core/tests/test-setting-bond$(EXEEXT): $(libnm_core_tests_test_setting_bond_OBJECTS) $(libnm_core_tests_test_setting_bond_DEPENDENCIES) $(EXTRA_libnm_core_tests_test_setting_bond_DEPENDENCIES) libnm-core/tests/$(am__dirstamp)
- @rm -f libnm-core/tests/test-setting-bond$(EXEEXT)
- $(AM_V_CCLD)$(LINK) $(libnm_core_tests_test_setting_bond_OBJECTS) $(libnm_core_tests_test_setting_bond_LDADD) $(LIBS)
-libnm-core/tests/libnm_core_tests_test_setting_dcb-test-setting-dcb.$(OBJEXT): \
- libnm-core/tests/$(am__dirstamp) \
- libnm-core/tests/$(DEPDIR)/$(am__dirstamp)
-
-libnm-core/tests/test-setting-dcb$(EXEEXT): $(libnm_core_tests_test_setting_dcb_OBJECTS) $(libnm_core_tests_test_setting_dcb_DEPENDENCIES) $(EXTRA_libnm_core_tests_test_setting_dcb_DEPENDENCIES) libnm-core/tests/$(am__dirstamp)
- @rm -f libnm-core/tests/test-setting-dcb$(EXEEXT)
- $(AM_V_CCLD)$(LINK) $(libnm_core_tests_test_setting_dcb_OBJECTS) $(libnm_core_tests_test_setting_dcb_LDADD) $(LIBS)
+libnm-core/tests/test-setting$(EXEEXT): $(libnm_core_tests_test_setting_OBJECTS) $(libnm_core_tests_test_setting_DEPENDENCIES) $(EXTRA_libnm_core_tests_test_setting_DEPENDENCIES) libnm-core/tests/$(am__dirstamp)
+ @rm -f libnm-core/tests/test-setting$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(libnm_core_tests_test_setting_OBJECTS) $(libnm_core_tests_test_setting_LDADD) $(LIBS)
libnm-core/tests/libnm_core_tests_test_settings_defaults-test-settings-defaults.$(OBJEXT): \
libnm-core/tests/$(am__dirstamp) \
libnm-core/tests/$(DEPDIR)/$(am__dirstamp)
@@ -9891,6 +9865,7 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-setting-pppoe.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-setting-proxy.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-setting-serial.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-setting-tc-config.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-setting-team-port.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-setting-team.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-setting-tun.Plo@am__quote@
@@ -9913,9 +9888,7 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@libnm-core/tests/$(DEPDIR)/libnm_core_tests_test_general-test-general.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@libnm-core/tests/$(DEPDIR)/libnm_core_tests_test_keyfile-test-keyfile.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@libnm-core/tests/$(DEPDIR)/libnm_core_tests_test_secrets-test-secrets.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@libnm-core/tests/$(DEPDIR)/libnm_core_tests_test_setting_8021x-test-setting-8021x.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@libnm-core/tests/$(DEPDIR)/libnm_core_tests_test_setting_bond-test-setting-bond.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@libnm-core/tests/$(DEPDIR)/libnm_core_tests_test_setting_dcb-test-setting-dcb.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@libnm-core/tests/$(DEPDIR)/libnm_core_tests_test_setting-test-setting.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@libnm-core/tests/$(DEPDIR)/libnm_core_tests_test_settings_defaults-test-settings-defaults.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@libnm-glib/$(DEPDIR)/libnm_glib_libdeprecated_nm_glib_la-libnm_glib.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@libnm-glib/$(DEPDIR)/libnm_glib_libnm_glib_la-nm-access-point.Plo@am__quote@
@@ -10213,7 +10186,6 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@src/ppp/$(DEPDIR)/src_ppp_libnm_ppp_plugin_la-nm-ppp-manager.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@src/ppp/$(DEPDIR)/src_ppp_nm_pppd_plugin_la-nm-pppd-plugin.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@src/settings/$(DEPDIR)/src_libNetworkManager_la-nm-agent-manager.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/settings/$(DEPDIR)/src_libNetworkManager_la-nm-inotify-helper.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@src/settings/$(DEPDIR)/src_libNetworkManager_la-nm-secret-agent.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@src/settings/$(DEPDIR)/src_libNetworkManager_la-nm-settings-connection.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@src/settings/$(DEPDIR)/src_libNetworkManager_la-nm-settings-plugin.Plo@am__quote@
@@ -10225,6 +10197,7 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@src/settings/plugins/ifcfg-rh/$(DEPDIR)/src_settings_plugins_ifcfg_rh_libnm_settings_plugin_ifcfg_rh_la-nms-ifcfg-rh-connection.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@src/settings/plugins/ifcfg-rh/$(DEPDIR)/src_settings_plugins_ifcfg_rh_libnm_settings_plugin_ifcfg_rh_la-nms-ifcfg-rh-plugin.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@src/settings/plugins/ifcfg-rh/$(DEPDIR)/src_settings_plugins_ifcfg_rh_libnmdbus_ifcfg_rh_la-nmdbus-ifcfg-rh.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/settings/plugins/ifcfg-rh/$(DEPDIR)/src_settings_plugins_ifcfg_rh_libnms_ifcfg_rh_core_la-nm-inotify-helper.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@src/settings/plugins/ifcfg-rh/$(DEPDIR)/src_settings_plugins_ifcfg_rh_libnms_ifcfg_rh_core_la-nms-ifcfg-rh-reader.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@src/settings/plugins/ifcfg-rh/$(DEPDIR)/src_settings_plugins_ifcfg_rh_libnms_ifcfg_rh_core_la-nms-ifcfg-rh-utils.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@src/settings/plugins/ifcfg-rh/$(DEPDIR)/src_settings_plugins_ifcfg_rh_libnms_ifcfg_rh_core_la-nms-ifcfg-rh-writer.Plo@am__quote@
@@ -11313,6 +11286,13 @@ libnm-core/libnm_core_libnm_core_la-nm-setting-serial.lo: libnm-core/nm-setting-
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@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_libnm_core_la-nm-setting-serial.lo `test -f 'libnm-core/nm-setting-serial.c' || echo '$(srcdir)/'`libnm-core/nm-setting-serial.c
+libnm-core/libnm_core_libnm_core_la-nm-setting-tc-config.lo: libnm-core/nm-setting-tc-config.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm-core/libnm_core_libnm_core_la-nm-setting-tc-config.lo -MD -MP -MF libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-setting-tc-config.Tpo -c -o libnm-core/libnm_core_libnm_core_la-nm-setting-tc-config.lo `test -f 'libnm-core/nm-setting-tc-config.c' || echo '$(srcdir)/'`libnm-core/nm-setting-tc-config.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-setting-tc-config.Tpo libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-setting-tc-config.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='libnm-core/nm-setting-tc-config.c' object='libnm-core/libnm_core_libnm_core_la-nm-setting-tc-config.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@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_libnm_core_la-nm-setting-tc-config.lo `test -f 'libnm-core/nm-setting-tc-config.c' || echo '$(srcdir)/'`libnm-core/nm-setting-tc-config.c
+
libnm-core/libnm_core_libnm_core_la-nm-setting-team-port.lo: libnm-core/nm-setting-team-port.c
@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm-core/libnm_core_libnm_core_la-nm-setting-team-port.lo -MD -MP -MF libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-setting-team-port.Tpo -c -o libnm-core/libnm_core_libnm_core_la-nm-setting-team-port.lo `test -f 'libnm-core/nm-setting-team-port.c' || echo '$(srcdir)/'`libnm-core/nm-setting-team-port.c
@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-setting-team-port.Tpo libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-setting-team-port.Plo
@@ -12762,13 +12742,6 @@ src/settings/src_libNetworkManager_la-nm-agent-manager.lo: src/settings/nm-agent
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@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/settings/src_libNetworkManager_la-nm-agent-manager.lo `test -f 'src/settings/nm-agent-manager.c' || echo '$(srcdir)/'`src/settings/nm-agent-manager.c
-src/settings/src_libNetworkManager_la-nm-inotify-helper.lo: src/settings/nm-inotify-helper.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/settings/src_libNetworkManager_la-nm-inotify-helper.lo -MD -MP -MF src/settings/$(DEPDIR)/src_libNetworkManager_la-nm-inotify-helper.Tpo -c -o src/settings/src_libNetworkManager_la-nm-inotify-helper.lo `test -f 'src/settings/nm-inotify-helper.c' || echo '$(srcdir)/'`src/settings/nm-inotify-helper.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) src/settings/$(DEPDIR)/src_libNetworkManager_la-nm-inotify-helper.Tpo src/settings/$(DEPDIR)/src_libNetworkManager_la-nm-inotify-helper.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='src/settings/nm-inotify-helper.c' object='src/settings/src_libNetworkManager_la-nm-inotify-helper.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@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/settings/src_libNetworkManager_la-nm-inotify-helper.lo `test -f 'src/settings/nm-inotify-helper.c' || echo '$(srcdir)/'`src/settings/nm-inotify-helper.c
-
src/settings/src_libNetworkManager_la-nm-secret-agent.lo: src/settings/nm-secret-agent.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/settings/src_libNetworkManager_la-nm-secret-agent.lo -MD -MP -MF src/settings/$(DEPDIR)/src_libNetworkManager_la-nm-secret-agent.Tpo -c -o src/settings/src_libNetworkManager_la-nm-secret-agent.lo `test -f 'src/settings/nm-secret-agent.c' || echo '$(srcdir)/'`src/settings/nm-secret-agent.c
@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) src/settings/$(DEPDIR)/src_libNetworkManager_la-nm-secret-agent.Tpo src/settings/$(DEPDIR)/src_libNetworkManager_la-nm-secret-agent.Plo
@@ -13609,6 +13582,13 @@ src/settings/plugins/ifcfg-rh/src_settings_plugins_ifcfg_rh_libnms_ifcfg_rh_core
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@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_settings_plugins_ifcfg_rh_libnms_ifcfg_rh_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/settings/plugins/ifcfg-rh/src_settings_plugins_ifcfg_rh_libnms_ifcfg_rh_core_la-shvar.lo `test -f 'src/settings/plugins/ifcfg-rh/shvar.c' || echo '$(srcdir)/'`src/settings/plugins/ifcfg-rh/shvar.c
+src/settings/plugins/ifcfg-rh/src_settings_plugins_ifcfg_rh_libnms_ifcfg_rh_core_la-nm-inotify-helper.lo: src/settings/plugins/ifcfg-rh/nm-inotify-helper.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_settings_plugins_ifcfg_rh_libnms_ifcfg_rh_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/settings/plugins/ifcfg-rh/src_settings_plugins_ifcfg_rh_libnms_ifcfg_rh_core_la-nm-inotify-helper.lo -MD -MP -MF src/settings/plugins/ifcfg-rh/$(DEPDIR)/src_settings_plugins_ifcfg_rh_libnms_ifcfg_rh_core_la-nm-inotify-helper.Tpo -c -o src/settings/plugins/ifcfg-rh/src_settings_plugins_ifcfg_rh_libnms_ifcfg_rh_core_la-nm-inotify-helper.lo `test -f 'src/settings/plugins/ifcfg-rh/nm-inotify-helper.c' || echo '$(srcdir)/'`src/settings/plugins/ifcfg-rh/nm-inotify-helper.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) src/settings/plugins/ifcfg-rh/$(DEPDIR)/src_settings_plugins_ifcfg_rh_libnms_ifcfg_rh_core_la-nm-inotify-helper.Tpo src/settings/plugins/ifcfg-rh/$(DEPDIR)/src_settings_plugins_ifcfg_rh_libnms_ifcfg_rh_core_la-nm-inotify-helper.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='src/settings/plugins/ifcfg-rh/nm-inotify-helper.c' object='src/settings/plugins/ifcfg-rh/src_settings_plugins_ifcfg_rh_libnms_ifcfg_rh_core_la-nm-inotify-helper.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@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_settings_plugins_ifcfg_rh_libnms_ifcfg_rh_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/settings/plugins/ifcfg-rh/src_settings_plugins_ifcfg_rh_libnms_ifcfg_rh_core_la-nm-inotify-helper.lo `test -f 'src/settings/plugins/ifcfg-rh/nm-inotify-helper.c' || echo '$(srcdir)/'`src/settings/plugins/ifcfg-rh/nm-inotify-helper.c
+
src/settings/plugins/ifcfg-rh/src_settings_plugins_ifcfg_rh_libnms_ifcfg_rh_core_la-nms-ifcfg-rh-utils.lo: src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-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_settings_plugins_ifcfg_rh_libnms_ifcfg_rh_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/settings/plugins/ifcfg-rh/src_settings_plugins_ifcfg_rh_libnms_ifcfg_rh_core_la-nms-ifcfg-rh-utils.lo -MD -MP -MF src/settings/plugins/ifcfg-rh/$(DEPDIR)/src_settings_plugins_ifcfg_rh_libnms_ifcfg_rh_core_la-nms-ifcfg-rh-utils.Tpo -c -o src/settings/plugins/ifcfg-rh/src_settings_plugins_ifcfg_rh_libnms_ifcfg_rh_core_la-nms-ifcfg-rh-utils.lo `test -f 'src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-utils.c' || echo '$(srcdir)/'`src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-utils.c
@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) src/settings/plugins/ifcfg-rh/$(DEPDIR)/src_settings_plugins_ifcfg_rh_libnms_ifcfg_rh_core_la-nms-ifcfg-rh-utils.Tpo src/settings/plugins/ifcfg-rh/$(DEPDIR)/src_settings_plugins_ifcfg_rh_libnms_ifcfg_rh_core_la-nms-ifcfg-rh-utils.Plo
@@ -14666,47 +14646,19 @@ libnm-core/tests/libnm_core_tests_test_secrets-test-secrets.obj: libnm-core/test
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_tests_test_secrets_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm-core/tests/libnm_core_tests_test_secrets-test-secrets.obj `if test -f 'libnm-core/tests/test-secrets.c'; then $(CYGPATH_W) 'libnm-core/tests/test-secrets.c'; else $(CYGPATH_W) '$(srcdir)/libnm-core/tests/test-secrets.c'; fi`
-libnm-core/tests/libnm_core_tests_test_setting_8021x-test-setting-8021x.o: libnm-core/tests/test-setting-8021x.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_tests_test_setting_8021x_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm-core/tests/libnm_core_tests_test_setting_8021x-test-setting-8021x.o -MD -MP -MF libnm-core/tests/$(DEPDIR)/libnm_core_tests_test_setting_8021x-test-setting-8021x.Tpo -c -o libnm-core/tests/libnm_core_tests_test_setting_8021x-test-setting-8021x.o `test -f 'libnm-core/tests/test-setting-8021x.c' || echo '$(srcdir)/'`libnm-core/tests/test-setting-8021x.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) libnm-core/tests/$(DEPDIR)/libnm_core_tests_test_setting_8021x-test-setting-8021x.Tpo libnm-core/tests/$(DEPDIR)/libnm_core_tests_test_setting_8021x-test-setting-8021x.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='libnm-core/tests/test-setting-8021x.c' object='libnm-core/tests/libnm_core_tests_test_setting_8021x-test-setting-8021x.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) $(libnm_core_tests_test_setting_8021x_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm-core/tests/libnm_core_tests_test_setting_8021x-test-setting-8021x.o `test -f 'libnm-core/tests/test-setting-8021x.c' || echo '$(srcdir)/'`libnm-core/tests/test-setting-8021x.c
-
-libnm-core/tests/libnm_core_tests_test_setting_8021x-test-setting-8021x.obj: libnm-core/tests/test-setting-8021x.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_tests_test_setting_8021x_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm-core/tests/libnm_core_tests_test_setting_8021x-test-setting-8021x.obj -MD -MP -MF libnm-core/tests/$(DEPDIR)/libnm_core_tests_test_setting_8021x-test-setting-8021x.Tpo -c -o libnm-core/tests/libnm_core_tests_test_setting_8021x-test-setting-8021x.obj `if test -f 'libnm-core/tests/test-setting-8021x.c'; then $(CYGPATH_W) 'libnm-core/tests/test-setting-8021x.c'; else $(CYGPATH_W) '$(srcdir)/libnm-core/tests/test-setting-8021x.c'; fi`
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) libnm-core/tests/$(DEPDIR)/libnm_core_tests_test_setting_8021x-test-setting-8021x.Tpo libnm-core/tests/$(DEPDIR)/libnm_core_tests_test_setting_8021x-test-setting-8021x.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='libnm-core/tests/test-setting-8021x.c' object='libnm-core/tests/libnm_core_tests_test_setting_8021x-test-setting-8021x.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) $(libnm_core_tests_test_setting_8021x_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm-core/tests/libnm_core_tests_test_setting_8021x-test-setting-8021x.obj `if test -f 'libnm-core/tests/test-setting-8021x.c'; then $(CYGPATH_W) 'libnm-core/tests/test-setting-8021x.c'; else $(CYGPATH_W) '$(srcdir)/libnm-core/tests/test-setting-8021x.c'; fi`
-
-libnm-core/tests/libnm_core_tests_test_setting_bond-test-setting-bond.o: libnm-core/tests/test-setting-bond.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_tests_test_setting_bond_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm-core/tests/libnm_core_tests_test_setting_bond-test-setting-bond.o -MD -MP -MF libnm-core/tests/$(DEPDIR)/libnm_core_tests_test_setting_bond-test-setting-bond.Tpo -c -o libnm-core/tests/libnm_core_tests_test_setting_bond-test-setting-bond.o `test -f 'libnm-core/tests/test-setting-bond.c' || echo '$(srcdir)/'`libnm-core/tests/test-setting-bond.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) libnm-core/tests/$(DEPDIR)/libnm_core_tests_test_setting_bond-test-setting-bond.Tpo libnm-core/tests/$(DEPDIR)/libnm_core_tests_test_setting_bond-test-setting-bond.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='libnm-core/tests/test-setting-bond.c' object='libnm-core/tests/libnm_core_tests_test_setting_bond-test-setting-bond.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) $(libnm_core_tests_test_setting_bond_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm-core/tests/libnm_core_tests_test_setting_bond-test-setting-bond.o `test -f 'libnm-core/tests/test-setting-bond.c' || echo '$(srcdir)/'`libnm-core/tests/test-setting-bond.c
-
-libnm-core/tests/libnm_core_tests_test_setting_bond-test-setting-bond.obj: libnm-core/tests/test-setting-bond.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_tests_test_setting_bond_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm-core/tests/libnm_core_tests_test_setting_bond-test-setting-bond.obj -MD -MP -MF libnm-core/tests/$(DEPDIR)/libnm_core_tests_test_setting_bond-test-setting-bond.Tpo -c -o libnm-core/tests/libnm_core_tests_test_setting_bond-test-setting-bond.obj `if test -f 'libnm-core/tests/test-setting-bond.c'; then $(CYGPATH_W) 'libnm-core/tests/test-setting-bond.c'; else $(CYGPATH_W) '$(srcdir)/libnm-core/tests/test-setting-bond.c'; fi`
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) libnm-core/tests/$(DEPDIR)/libnm_core_tests_test_setting_bond-test-setting-bond.Tpo libnm-core/tests/$(DEPDIR)/libnm_core_tests_test_setting_bond-test-setting-bond.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='libnm-core/tests/test-setting-bond.c' object='libnm-core/tests/libnm_core_tests_test_setting_bond-test-setting-bond.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) $(libnm_core_tests_test_setting_bond_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm-core/tests/libnm_core_tests_test_setting_bond-test-setting-bond.obj `if test -f 'libnm-core/tests/test-setting-bond.c'; then $(CYGPATH_W) 'libnm-core/tests/test-setting-bond.c'; else $(CYGPATH_W) '$(srcdir)/libnm-core/tests/test-setting-bond.c'; fi`
-
-libnm-core/tests/libnm_core_tests_test_setting_dcb-test-setting-dcb.o: libnm-core/tests/test-setting-dcb.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_tests_test_setting_dcb_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm-core/tests/libnm_core_tests_test_setting_dcb-test-setting-dcb.o -MD -MP -MF libnm-core/tests/$(DEPDIR)/libnm_core_tests_test_setting_dcb-test-setting-dcb.Tpo -c -o libnm-core/tests/libnm_core_tests_test_setting_dcb-test-setting-dcb.o `test -f 'libnm-core/tests/test-setting-dcb.c' || echo '$(srcdir)/'`libnm-core/tests/test-setting-dcb.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) libnm-core/tests/$(DEPDIR)/libnm_core_tests_test_setting_dcb-test-setting-dcb.Tpo libnm-core/tests/$(DEPDIR)/libnm_core_tests_test_setting_dcb-test-setting-dcb.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='libnm-core/tests/test-setting-dcb.c' object='libnm-core/tests/libnm_core_tests_test_setting_dcb-test-setting-dcb.o' libtool=no @AMDEPBACKSLASH@
+libnm-core/tests/libnm_core_tests_test_setting-test-setting.o: libnm-core/tests/test-setting.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_tests_test_setting_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm-core/tests/libnm_core_tests_test_setting-test-setting.o -MD -MP -MF libnm-core/tests/$(DEPDIR)/libnm_core_tests_test_setting-test-setting.Tpo -c -o libnm-core/tests/libnm_core_tests_test_setting-test-setting.o `test -f 'libnm-core/tests/test-setting.c' || echo '$(srcdir)/'`libnm-core/tests/test-setting.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) libnm-core/tests/$(DEPDIR)/libnm_core_tests_test_setting-test-setting.Tpo libnm-core/tests/$(DEPDIR)/libnm_core_tests_test_setting-test-setting.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='libnm-core/tests/test-setting.c' object='libnm-core/tests/libnm_core_tests_test_setting-test-setting.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) $(libnm_core_tests_test_setting_dcb_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm-core/tests/libnm_core_tests_test_setting_dcb-test-setting-dcb.o `test -f 'libnm-core/tests/test-setting-dcb.c' || echo '$(srcdir)/'`libnm-core/tests/test-setting-dcb.c
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_tests_test_setting_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm-core/tests/libnm_core_tests_test_setting-test-setting.o `test -f 'libnm-core/tests/test-setting.c' || echo '$(srcdir)/'`libnm-core/tests/test-setting.c
-libnm-core/tests/libnm_core_tests_test_setting_dcb-test-setting-dcb.obj: libnm-core/tests/test-setting-dcb.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_tests_test_setting_dcb_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm-core/tests/libnm_core_tests_test_setting_dcb-test-setting-dcb.obj -MD -MP -MF libnm-core/tests/$(DEPDIR)/libnm_core_tests_test_setting_dcb-test-setting-dcb.Tpo -c -o libnm-core/tests/libnm_core_tests_test_setting_dcb-test-setting-dcb.obj `if test -f 'libnm-core/tests/test-setting-dcb.c'; then $(CYGPATH_W) 'libnm-core/tests/test-setting-dcb.c'; else $(CYGPATH_W) '$(srcdir)/libnm-core/tests/test-setting-dcb.c'; fi`
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) libnm-core/tests/$(DEPDIR)/libnm_core_tests_test_setting_dcb-test-setting-dcb.Tpo libnm-core/tests/$(DEPDIR)/libnm_core_tests_test_setting_dcb-test-setting-dcb.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='libnm-core/tests/test-setting-dcb.c' object='libnm-core/tests/libnm_core_tests_test_setting_dcb-test-setting-dcb.obj' libtool=no @AMDEPBACKSLASH@
+libnm-core/tests/libnm_core_tests_test_setting-test-setting.obj: libnm-core/tests/test-setting.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_tests_test_setting_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm-core/tests/libnm_core_tests_test_setting-test-setting.obj -MD -MP -MF libnm-core/tests/$(DEPDIR)/libnm_core_tests_test_setting-test-setting.Tpo -c -o libnm-core/tests/libnm_core_tests_test_setting-test-setting.obj `if test -f 'libnm-core/tests/test-setting.c'; then $(CYGPATH_W) 'libnm-core/tests/test-setting.c'; else $(CYGPATH_W) '$(srcdir)/libnm-core/tests/test-setting.c'; fi`
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) libnm-core/tests/$(DEPDIR)/libnm_core_tests_test_setting-test-setting.Tpo libnm-core/tests/$(DEPDIR)/libnm_core_tests_test_setting-test-setting.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='libnm-core/tests/test-setting.c' object='libnm-core/tests/libnm_core_tests_test_setting-test-setting.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) $(libnm_core_tests_test_setting_dcb_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm-core/tests/libnm_core_tests_test_setting_dcb-test-setting-dcb.obj `if test -f 'libnm-core/tests/test-setting-dcb.c'; then $(CYGPATH_W) 'libnm-core/tests/test-setting-dcb.c'; else $(CYGPATH_W) '$(srcdir)/libnm-core/tests/test-setting-dcb.c'; fi`
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_tests_test_setting_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm-core/tests/libnm_core_tests_test_setting-test-setting.obj `if test -f 'libnm-core/tests/test-setting.c'; then $(CYGPATH_W) 'libnm-core/tests/test-setting.c'; else $(CYGPATH_W) '$(srcdir)/libnm-core/tests/test-setting.c'; fi`
libnm-core/tests/libnm_core_tests_test_settings_defaults-test-settings-defaults.o: libnm-core/tests/test-settings-defaults.c
@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_tests_test_settings_defaults_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm-core/tests/libnm_core_tests_test_settings_defaults-test-settings-defaults.o -MD -MP -MF libnm-core/tests/$(DEPDIR)/libnm_core_tests_test_settings_defaults-test-settings-defaults.Tpo -c -o libnm-core/tests/libnm_core_tests_test_settings_defaults-test-settings-defaults.o `test -f 'libnm-core/tests/test-settings-defaults.c' || echo '$(srcdir)/'`libnm-core/tests/test-settings-defaults.c
@@ -16642,23 +16594,9 @@ libnm-core/tests/test-secrets.log: libnm-core/tests/test-secrets$(EXEEXT)
--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-setting-8021x.log: libnm-core/tests/test-setting-8021x$(EXEEXT)
- @p='libnm-core/tests/test-setting-8021x$(EXEEXT)'; \
- b='libnm-core/tests/test-setting-8021x'; \
- $(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-setting-bond.log: libnm-core/tests/test-setting-bond$(EXEEXT)
- @p='libnm-core/tests/test-setting-bond$(EXEEXT)'; \
- b='libnm-core/tests/test-setting-bond'; \
- $(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-setting-dcb.log: libnm-core/tests/test-setting-dcb$(EXEEXT)
- @p='libnm-core/tests/test-setting-dcb$(EXEEXT)'; \
- b='libnm-core/tests/test-setting-dcb'; \
+libnm-core/tests/test-setting.log: libnm-core/tests/test-setting$(EXEEXT)
+ @p='libnm-core/tests/test-setting$(EXEEXT)'; \
+ b='libnm-core/tests/test-setting'; \
$(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) \
@@ -17650,9 +17588,7 @@ $(libnm_core_tests_test_crypto_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
$(libnm_core_tests_test_general_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
$(libnm_core_tests_test_keyfile_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
$(libnm_core_tests_test_secrets_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
-$(libnm_core_tests_test_setting_8021x_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
-$(libnm_core_tests_test_setting_bond_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
-$(libnm_core_tests_test_setting_dcb_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
+$(libnm_core_tests_test_setting_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
$(libnm_core_tests_test_settings_defaults_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
$(libnm_libnm_utils_la_OBJECTS) : $(libnm_lib_h_pub_mkenums)
diff --git a/NEWS b/NEWS
index b0506065..adea9f06 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,19 @@
+===============================================
+NetworkManager-1.10.2
+Overview of changes since NetworkManager-1.10.0
+===============================================
+
+This is a new stable release of NetworkManager. Notable changes include:
+
+* Added support for 'onlink' IPv4 routes attribute.
+* Wait longer for the carrier to come up after a MTU change.
+* Implemented abstraction for team connections that exposes team
+ configuration items as distinct properties.
+* Added basic support for tc queueing disciplines and filters.
+* Introduced an Update2() D-Bus method to update connection settings
+ with more flexibility.
+* Many bug fixes and improvements.
+
============================================
NetworkManager-1.10
Overview of changes since NetworkManager-1.8
diff --git a/aclocal.m4 b/aclocal.m4
index de23d0ad..e335be19 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,6 +1,6 @@
-# generated automatically by aclocal 1.15 -*- Autoconf -*-
+# generated automatically by aclocal 1.15.1 -*- Autoconf -*-
-# Copyright (C) 1996-2014 Free Software Foundation, Inc.
+# Copyright (C) 1996-2017 Free Software Foundation, Inc.
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -364,7 +364,7 @@ AS_IF([test "$AS_TR_SH([with_]m4_tolower([$1]))" = "yes"],
[AC_DEFINE([HAVE_][$1], 1, [Enable ]m4_tolower([$1])[ support])])
])dnl PKG_HAVE_DEFINE_WITH_MODULES
-# Copyright (C) 2002-2014 Free Software Foundation, Inc.
+# Copyright (C) 2002-2017 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -379,7 +379,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION],
[am__api_version='1.15'
dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
dnl require some minimum version. Point them to the right macro.
-m4_if([$1], [1.15], [],
+m4_if([$1], [1.15.1], [],
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
])
@@ -395,14 +395,14 @@ m4_define([_AM_AUTOCONF_VERSION], [])
# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.15])dnl
+[AM_AUTOMAKE_VERSION([1.15.1])dnl
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
# AM_AUX_DIR_EXPAND -*- Autoconf -*-
-# Copyright (C) 2001-2014 Free Software Foundation, Inc.
+# Copyright (C) 2001-2017 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -454,7 +454,7 @@ am_aux_dir=`cd "$ac_aux_dir" && pwd`
# AM_CONDITIONAL -*- Autoconf -*-
-# Copyright (C) 1997-2014 Free Software Foundation, Inc.
+# Copyright (C) 1997-2017 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -485,7 +485,7 @@ AC_CONFIG_COMMANDS_PRE(
Usually this means the macro was only invoked conditionally.]])
fi])])
-# Copyright (C) 1999-2014 Free Software Foundation, Inc.
+# Copyright (C) 1999-2017 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -676,7 +676,7 @@ _AM_SUBST_NOTMAKE([am__nodep])dnl
# Generate code to set up dependency tracking. -*- Autoconf -*-
-# Copyright (C) 1999-2014 Free Software Foundation, Inc.
+# Copyright (C) 1999-2017 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -752,7 +752,7 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
# Do all the work for Automake. -*- Autoconf -*-
-# Copyright (C) 1996-2014 Free Software Foundation, Inc.
+# Copyright (C) 1996-2017 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -949,7 +949,7 @@ for _am_header in $config_headers :; do
done
echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
-# Copyright (C) 2001-2014 Free Software Foundation, Inc.
+# Copyright (C) 2001-2017 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -970,7 +970,7 @@ if test x"${install_sh+set}" != xset; then
fi
AC_SUBST([install_sh])])
-# Copyright (C) 2003-2014 Free Software Foundation, Inc.
+# Copyright (C) 2003-2017 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -992,7 +992,7 @@ AC_SUBST([am__leading_dot])])
# Add --enable-maintainer-mode option to configure. -*- Autoconf -*-
# From Jim Meyering
-# Copyright (C) 1996-2014 Free Software Foundation, Inc.
+# Copyright (C) 1996-2017 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -1027,7 +1027,7 @@ AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
# Check to see how 'make' treats includes. -*- Autoconf -*-
-# Copyright (C) 2001-2014 Free Software Foundation, Inc.
+# Copyright (C) 2001-2017 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -1077,7 +1077,7 @@ rm -f confinc confmf
# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-
-# Copyright (C) 1997-2014 Free Software Foundation, Inc.
+# Copyright (C) 1997-2017 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -1114,7 +1114,7 @@ else
fi
])
-# Copyright (C) 2003-2014 Free Software Foundation, Inc.
+# Copyright (C) 2003-2017 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -1148,7 +1148,7 @@ esac
# Helper functions for option handling. -*- Autoconf -*-
-# Copyright (C) 2001-2014 Free Software Foundation, Inc.
+# Copyright (C) 2001-2017 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -1177,7 +1177,7 @@ AC_DEFUN([_AM_SET_OPTIONS],
AC_DEFUN([_AM_IF_OPTION],
[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
-# Copyright (C) 1999-2014 Free Software Foundation, Inc.
+# Copyright (C) 1999-2017 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -1224,7 +1224,7 @@ AC_LANG_POP([C])])
# For backward compatibility.
AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])])
-# Copyright (C) 1999-2014 Free Software Foundation, Inc.
+# Copyright (C) 1999-2017 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -1257,8 +1257,9 @@ AC_DEFUN([AM_PATH_PYTHON],
[
dnl Find a Python interpreter. Python versions prior to 2.0 are not
dnl supported. (2.0 was released on October 16, 2000).
+ dnl FIXME: Remove the need to hard-code Python versions here.
m4_define_default([_AM_PYTHON_INTERPRETER_LIST],
-[python python2 python3 python3.3 python3.2 python3.1 python3.0 python2.7 dnl
+[python python2 python3 python3.5 python3.4 python3.3 python3.2 python3.1 python3.0 python2.7 dnl
python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0])
AC_ARG_VAR([PYTHON], [the Python interpreter])
@@ -1459,7 +1460,7 @@ for i in list(range(0, 4)): minverhex = (minverhex << 8) + minver[[i]]
sys.exit(sys.hexversion < minverhex)"
AS_IF([AM_RUN_LOG([$1 -c "$prog"])], [$3], [$4])])
-# Copyright (C) 2001-2014 Free Software Foundation, Inc.
+# Copyright (C) 2001-2017 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -1478,7 +1479,7 @@ AC_DEFUN([AM_RUN_LOG],
# Check to make sure that the build environment is sane. -*- Autoconf -*-
-# Copyright (C) 1996-2014 Free Software Foundation, Inc.
+# Copyright (C) 1996-2017 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -1559,7 +1560,7 @@ AC_CONFIG_COMMANDS_PRE(
rm -f conftest.file
])
-# Copyright (C) 2009-2014 Free Software Foundation, Inc.
+# Copyright (C) 2009-2017 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -1619,7 +1620,7 @@ AC_SUBST([AM_BACKSLASH])dnl
_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl
])
-# Copyright (C) 2001-2014 Free Software Foundation, Inc.
+# Copyright (C) 2001-2017 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -1647,7 +1648,7 @@ fi
INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
AC_SUBST([INSTALL_STRIP_PROGRAM])])
-# Copyright (C) 2006-2014 Free Software Foundation, Inc.
+# Copyright (C) 2006-2017 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -1666,7 +1667,7 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
# Check how to create a tarball. -*- Autoconf -*-
-# Copyright (C) 2004-2014 Free Software Foundation, Inc.
+# Copyright (C) 2004-2017 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
diff --git a/build-aux/compile b/build-aux/compile
index a85b723c..2ab71e4e 100755
--- a/build-aux/compile
+++ b/build-aux/compile
@@ -1,9 +1,9 @@
#! /bin/sh
# Wrapper for compilers which do not understand '-c -o'.
-scriptversion=2012-10-14.11; # UTC
+scriptversion=2016-01-11.22; # UTC
-# Copyright (C) 1999-2014 Free Software Foundation, Inc.
+# Copyright (C) 1999-2017 Free Software Foundation, Inc.
# Written by Tom Tromey .
#
# This program is free software; you can redistribute it and/or modify
@@ -255,7 +255,8 @@ EOF
echo "compile $scriptversion"
exit $?
;;
- cl | *[/\\]cl | cl.exe | *[/\\]cl.exe )
+ cl | *[/\\]cl | cl.exe | *[/\\]cl.exe | \
+ icl | *[/\\]icl | icl.exe | *[/\\]icl.exe )
func_cl_wrapper "$@" # Doesn't return...
;;
esac
@@ -342,6 +343,6 @@ exit $ret
# eval: (add-hook 'write-file-hooks 'time-stamp)
# time-stamp-start: "scriptversion="
# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC"
+# time-stamp-time-zone: "UTC0"
# time-stamp-end: "; # UTC"
# End:
diff --git a/build-aux/config.guess b/build-aux/config.guess
index 2e9ad7fe..a7448442 100755
--- a/build-aux/config.guess
+++ b/build-aux/config.guess
@@ -1,8 +1,8 @@
#! /bin/sh
# Attempt to guess a canonical system name.
-# Copyright 1992-2016 Free Software Foundation, Inc.
+# Copyright 1992-2017 Free Software Foundation, Inc.
-timestamp='2016-10-02'
+timestamp='2017-08-08'
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
@@ -50,7 +50,7 @@ version="\
GNU config.guess ($timestamp)
Originally written by Per Bothner.
-Copyright 1992-2016 Free Software Foundation, Inc.
+Copyright 1992-2017 Free Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -259,6 +259,9 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
*:Sortix:*:*)
echo ${UNAME_MACHINE}-unknown-sortix
exit ;;
+ *:Redox:*:*)
+ echo ${UNAME_MACHINE}-unknown-redox
+ exit ;;
alpha:OSF1:*:*)
case $UNAME_RELEASE in
*4.0)
@@ -837,10 +840,11 @@ EOF
UNAME_PROCESSOR=`/usr/bin/uname -p`
case ${UNAME_PROCESSOR} in
amd64)
- echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
- *)
- echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+ UNAME_PROCESSOR=x86_64 ;;
+ i386)
+ UNAME_PROCESSOR=i586 ;;
esac
+ echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
exit ;;
i*:CYGWIN*:*)
echo ${UNAME_MACHINE}-pc-cygwin
@@ -1303,14 +1307,21 @@ EOF
if test `echo "$UNAME_RELEASE" | sed -e 's/\..*//'` -le 10 ; then
if [ "$CC_FOR_BUILD" != no_compiler_found ]; then
if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
- (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
- grep IS_64BIT_ARCH >/dev/null
+ (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
+ grep IS_64BIT_ARCH >/dev/null
then
case $UNAME_PROCESSOR in
i386) UNAME_PROCESSOR=x86_64 ;;
powerpc) UNAME_PROCESSOR=powerpc64 ;;
esac
fi
+ # On 10.4-10.6 one might compile for PowerPC via gcc -arch ppc
+ if (echo '#ifdef __POWERPC__'; echo IS_PPC; echo '#endif') | \
+ (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
+ grep IS_PPC >/dev/null
+ then
+ UNAME_PROCESSOR=powerpc
+ fi
fi
elif test "$UNAME_PROCESSOR" = i386 ; then
# Avoid executing cc on OS X 10.9, as it ships with a stub
@@ -1334,15 +1345,18 @@ EOF
*:QNX:*:4*)
echo i386-pc-qnx
exit ;;
- NEO-?:NONSTOP_KERNEL:*:*)
+ NEO-*:NONSTOP_KERNEL:*:*)
echo neo-tandem-nsk${UNAME_RELEASE}
exit ;;
NSE-*:NONSTOP_KERNEL:*:*)
echo nse-tandem-nsk${UNAME_RELEASE}
exit ;;
- NSR-?:NONSTOP_KERNEL:*:*)
+ NSR-*:NONSTOP_KERNEL:*:*)
echo nsr-tandem-nsk${UNAME_RELEASE}
exit ;;
+ NSX-*:NONSTOP_KERNEL:*:*)
+ echo nsx-tandem-nsk${UNAME_RELEASE}
+ exit ;;
*:NonStop-UX:*:*)
echo mips-compaq-nonstopux
exit ;;
@@ -1418,8 +1432,8 @@ cat >&2 <."
version="\
GNU config.sub ($timestamp)
-Copyright 1992-2016 Free Software Foundation, Inc.
+Copyright 1992-2017 Free Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -263,7 +263,7 @@ case $basic_machine in
| fido | fr30 | frv | ft32 \
| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
| hexagon \
- | i370 | i860 | i960 | ia64 \
+ | i370 | i860 | i960 | ia16 | ia64 \
| ip2k | iq2000 \
| k1om \
| le32 | le64 \
@@ -301,6 +301,7 @@ case $basic_machine in
| open8 | or1k | or1knd | or32 \
| pdp10 | pdp11 | pj | pjl \
| powerpc | powerpc64 | powerpc64le | powerpcle \
+ | pru \
| pyramid \
| riscv32 | riscv64 \
| rl78 | rx \
@@ -314,6 +315,7 @@ case $basic_machine in
| ubicom32 \
| v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \
| visium \
+ | wasm32 \
| we32k \
| x86 | xc16x | xstormy16 | xtensa \
| z8k | z80)
@@ -387,7 +389,7 @@ case $basic_machine in
| h8300-* | h8500-* \
| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
| hexagon-* \
- | i*86-* | i860-* | i960-* | ia64-* \
+ | i*86-* | i860-* | i960-* | ia16-* | ia64-* \
| ip2k-* | iq2000-* \
| k1om-* \
| le32-* | le64-* \
@@ -428,6 +430,7 @@ case $basic_machine in
| orion-* \
| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
+ | pru-* \
| pyramid-* \
| riscv32-* | riscv64-* \
| rl78-* | romp-* | rs6000-* | rx-* \
@@ -444,6 +447,7 @@ case $basic_machine in
| v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \
| vax-* \
| visium-* \
+ | wasm32-* \
| we32k-* \
| x86-* | x86_64-* | xc16x-* | xps100-* \
| xstormy16-* | xtensa*-* \
@@ -946,6 +950,9 @@ case $basic_machine in
nsr-tandem)
basic_machine=nsr-tandem
;;
+ nsx-tandem)
+ basic_machine=nsx-tandem
+ ;;
op50n-* | op60c-*)
basic_machine=hppa1.1-oki
os=-proelf
@@ -1241,6 +1248,9 @@ case $basic_machine in
basic_machine=a29k-wrs
os=-vxworks
;;
+ wasm32)
+ basic_machine=wasm32-unknown
+ ;;
w65*)
basic_machine=w65-wdc
os=-none
@@ -1395,7 +1405,7 @@ case $os in
| -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
| -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
| -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
- | -chorusos* | -chorusrdb* | -cegcc* \
+ | -chorusos* | -chorusrdb* | -cegcc* | -glidix* \
| -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
| -midipix* | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
| -linux-newlib* | -linux-musl* | -linux-uclibc* \
@@ -1407,7 +1417,7 @@ case $os in
| -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
| -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
| -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* \
- | -onefs* | -tirtos* | -phoenix*)
+ | -onefs* | -tirtos* | -phoenix* | -fuchsia* | -redox*)
# Remember, each alternative MUST END IN *, to match a version number.
;;
-qnx*)
@@ -1636,6 +1646,9 @@ case $basic_machine in
sparc-* | *-sun)
os=-sunos4.1.1
;;
+ pru-*)
+ os=-elf
+ ;;
*-be)
os=-beos
;;
diff --git a/build-aux/depcomp b/build-aux/depcomp
index fc98710e..b39f98f9 100755
--- a/build-aux/depcomp
+++ b/build-aux/depcomp
@@ -1,9 +1,9 @@
#! /bin/sh
# depcomp - compile a program generating dependencies as side-effects
-scriptversion=2013-05-30.07; # UTC
+scriptversion=2016-01-11.22; # UTC
-# Copyright (C) 1999-2014 Free Software Foundation, Inc.
+# Copyright (C) 1999-2017 Free Software Foundation, Inc.
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -786,6 +786,6 @@ exit 0
# eval: (add-hook 'write-file-hooks 'time-stamp)
# time-stamp-start: "scriptversion="
# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC"
+# time-stamp-time-zone: "UTC0"
# time-stamp-end: "; # UTC"
# End:
diff --git a/build-aux/install-sh b/build-aux/install-sh
index 0b0fdcbb..0360b79e 100755
--- a/build-aux/install-sh
+++ b/build-aux/install-sh
@@ -1,7 +1,7 @@
#!/bin/sh
# install - install a program, script, or datafile
-scriptversion=2013-12-25.23; # UTC
+scriptversion=2016-01-11.22; # UTC
# This originates from X11R5 (mit/util/scripts/install.sh), which was
# later released in X11R6 (xc/config/util/install.sh) with the
@@ -496,6 +496,6 @@ done
# eval: (add-hook 'write-file-hooks 'time-stamp)
# time-stamp-start: "scriptversion="
# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC"
+# time-stamp-time-zone: "UTC0"
# time-stamp-end: "; # UTC"
# End:
diff --git a/build-aux/missing b/build-aux/missing
index f62bbae3..c6e37958 100755
--- a/build-aux/missing
+++ b/build-aux/missing
@@ -1,9 +1,9 @@
#! /bin/sh
# Common wrapper for a few potentially missing GNU programs.
-scriptversion=2013-10-28.13; # UTC
+scriptversion=2016-01-11.22; # UTC
-# Copyright (C) 1996-2014 Free Software Foundation, Inc.
+# Copyright (C) 1996-2017 Free Software Foundation, Inc.
# Originally written by Fran,cois Pinard , 1996.
# This program is free software; you can redistribute it and/or modify
@@ -210,6 +210,6 @@ exit $st
# eval: (add-hook 'write-file-hooks 'time-stamp)
# time-stamp-start: "scriptversion="
# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC"
+# time-stamp-time-zone: "UTC0"
# time-stamp-end: "; # UTC"
# End:
diff --git a/build-aux/tap-driver.sh b/build-aux/tap-driver.sh
index 4254e2b3..82efa96c 100755
--- a/build-aux/tap-driver.sh
+++ b/build-aux/tap-driver.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2014 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -646,6 +646,6 @@ test $? -eq 0 || fatal "I/O or internal error"
# eval: (add-hook 'write-file-hooks 'time-stamp)
# time-stamp-start: "scriptversion="
# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC"
+# time-stamp-time-zone: "UTC0"
# time-stamp-end: "; # UTC"
# End:
diff --git a/build-aux/test-driver b/build-aux/test-driver
index 8e575b01..0218a01f 100755
--- a/build-aux/test-driver
+++ b/build-aux/test-driver
@@ -1,9 +1,9 @@
#! /bin/sh
# test-driver - basic testsuite driver script.
-scriptversion=2013-07-13.22; # UTC
+scriptversion=2016-01-11.22; # UTC
-# Copyright (C) 2011-2014 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -143,6 +143,6 @@ echo ":copy-in-global-log: $gcopy" >> $trs_file
# eval: (add-hook 'write-file-hooks 'time-stamp)
# time-stamp-start: "scriptversion="
# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC"
+# time-stamp-time-zone: "UTC0"
# time-stamp-end: "; # UTC"
# End:
diff --git a/clients/cli/connections.c b/clients/cli/connections.c
index c05a9e82..83b1f28a 100644
--- a/clients/cli/connections.c
+++ b/clients/cli/connections.c
@@ -14,7 +14,7 @@
* with this program; if not, write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*
- * Copyright 2010 - 2015 Red Hat, Inc.
+ * Copyright 2010 - 2017 Red Hat, Inc.
*/
#include "nm-default.h"
@@ -146,7 +146,8 @@ const NmcMetaGenericInfo *const nmc_fields_con_active_details_general[] = {
NM_SETTING_MACSEC_SETTING_NAME"," \
NM_SETTING_MACVLAN_SETTING_NAME"," \
NM_SETTING_VXLAN_SETTING_NAME"," \
- NM_SETTING_PROXY_SETTING_NAME
+ NM_SETTING_PROXY_SETTING_NAME"," \
+ NM_SETTING_TC_CONFIG_SETTING_NAME
// NM_SETTING_DUMMY_SETTING_NAME
// NM_SETTING_WIMAX_SETTING_NAME
@@ -2656,7 +2657,7 @@ do_connection_down (NmCli *nmc, int argc, char **argv)
const GPtrArray *connections;
const char *selector = NULL;
- if (arg_num == 1)
+ if (arg_num == 1 && nmc->complete)
nmc_complete_strings (*arg_ptr, "id", "uuid", "path", "apath", NULL);
if ( strcmp (*arg_ptr, "id") == 0
@@ -7569,6 +7570,8 @@ editor_menu_main (NmCli *nmc, NMConnection *connection, const char *connection_t
g_free (menu_ctx.valid_props_str);
g_weak_ref_clear (&weak);
+ quit ();
+
/* Save history file */
save_history_cmds (nm_connection_get_uuid (connection));
@@ -8605,7 +8608,7 @@ do_connection_export (NmCli *nmc, int argc, char **argv)
nmc->return_value = NMC_RESULT_ERROR_UNKNOWN;
goto finish;
}
- close (fd);
+ nm_close (fd);
path = tmpfile;
}
diff --git a/clients/cli/general.c b/clients/cli/general.c
index 5ae31e1b..7ac6b22c 100644
--- a/clients/cli/general.c
+++ b/clients/cli/general.c
@@ -743,7 +743,7 @@ do_general_logging (NmCli *nmc, int argc, char **argv)
"AGENTS", "SETTINGS", "SUSPEND", "CORE", "DEVICE", "OLPC",
"INFINIBAND", "FIREWALL", "ADSL", "BOND", "VLAN", "BRIDGE",
"DBUS_PROPS", "TEAM", "CONCHECK", "DCB", "DISPATCH", "AUDIT",
- "SYSTEMD", "VPN_PLUGIN", "PROXY", NULL);
+ "SYSTEMD", "VPN_PLUGIN", "PROXY", "TC", NULL);
}
domains = *argv;
} else {
diff --git a/clients/cli/settings.c b/clients/cli/settings.c
index e0db1b5b..69275aad 100644
--- a/clients/cli/settings.c
+++ b/clients/cli/settings.c
@@ -371,8 +371,12 @@ _env_warn_fcn_handle (const NMMetaEnvironment *environment,
const char *fmt_l10n, /* the untranslated format string, but it is marked for translation using N_(). */
va_list ap)
{
+ NmCli *nmc = environment_user_data;
gs_free char *m = NULL;
+ if (nmc->complete)
+ return;
+
NM_PRAGMA_WARNING_DISABLE("-Wformat-nonliteral")
m = g_strdup_vprintf (_(fmt_l10n), ap);
NM_PRAGMA_WARNING_REENABLE
diff --git a/clients/cli/utils.c b/clients/cli/utils.c
index 570bfb98..f20e24ce 100644
--- a/clients/cli/utils.c
+++ b/clients/cli/utils.c
@@ -1504,16 +1504,16 @@ nmc_terminal_spawn_pager (const NmcConfig *nmc_config)
nm_cli.pager_pid = fork ();
if (nm_cli.pager_pid == -1) {
g_printerr (_("Failed to fork pager: %s\n"), strerror (errno));
- close (fd[0]);
- close (fd[1]);
+ nm_close (fd[0]);
+ nm_close (fd[1]);
return;
}
/* In the child start the pager */
if (nm_cli.pager_pid == 0) {
dup2 (fd[0], STDIN_FILENO);
- close (fd[0]);
- close (fd[1]);
+ nm_close (fd[0]);
+ nm_close (fd[1]);
setenv ("LESS", "FRSXMK", 1);
setenv ("LESSCHARSET", "utf-8", 1);
@@ -1553,8 +1553,8 @@ nmc_terminal_spawn_pager (const NmcConfig *nmc_config)
if (dup2 (fd[1], STDERR_FILENO) < 0)
g_printerr (_("Failed to duplicate pager pipe: %s\n"), strerror (errno));
- close (fd[0]);
- close (fd[1]);
+ nm_close (fd[0]);
+ nm_close (fd[1]);
}
/*****************************************************************************/
diff --git a/clients/common/nm-meta-setting-desc.c b/clients/common/nm-meta-setting-desc.c
index 1ed6b433..9d0ac906 100644
--- a/clients/common/nm-meta-setting-desc.c
+++ b/clients/common/nm-meta-setting-desc.c
@@ -241,6 +241,150 @@ _parse_ip_route (int family,
return route;
}
+static char *
+_dump_team_link_watcher (NMTeamLinkWatcher *watcher)
+{
+ const char *name;
+ NMTeamLinkWatcherArpPingFlags flags;
+ GString *w_dump;
+
+ if (!watcher)
+ return NULL;
+
+ w_dump = g_string_new (NULL);
+ name = nm_team_link_watcher_get_name (watcher);
+ g_string_append_printf (w_dump, "name=%s", name);
+
+#define DUMP_WATCHER_INT(str, watcher, name, key) \
+ G_STMT_START { \
+ int _val = nm_team_link_watcher_get_##key (watcher); \
+ \
+ if (_val) \
+ g_string_append_printf (str, " %s=%d", name, _val); \
+ } G_STMT_END;
+
+ if (nm_streq (name, NM_TEAM_LINK_WATCHER_ETHTOOL)) {
+ DUMP_WATCHER_INT (w_dump, watcher, "delay-up", delay_up);
+ DUMP_WATCHER_INT (w_dump, watcher, "delay-down", delay_down);
+ return g_string_free (w_dump, FALSE);
+ }
+ /* NM_TEAM_LINK_WATCHER_NSNA_PING and NM_TEAM_LINK_WATCHER_ARP_PING */
+ DUMP_WATCHER_INT (w_dump, watcher, "init-wait", init_wait);
+ DUMP_WATCHER_INT (w_dump, watcher, "initerval", interval);
+ DUMP_WATCHER_INT (w_dump, watcher, "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);
+
+ 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);
+ if (flags & NM_TEAM_LINK_WATCHER_ARP_PING_FLAG_VALIDATE_ACTIVE)
+ g_string_append_printf (w_dump, " validate-active=true");
+ if (flags & NM_TEAM_LINK_WATCHER_ARP_PING_FLAG_VALIDATE_INACTIVE)
+ g_string_append_printf (w_dump, " validate-inactive=true");
+ if (flags & NM_TEAM_LINK_WATCHER_ARP_PING_FLAG_SEND_ALWAYS)
+ g_string_append_printf (w_dump, "send-always=true");
+
+ return g_string_free (w_dump, FALSE);
+}
+
+static NMTeamLinkWatcher *
+_parse_team_link_watcher (const char *str,
+ GError **error)
+{
+ gs_strfreev char **watcherv = NULL;
+ gs_free char *str_clean = NULL;
+ guint i;
+ gs_free const char *name = NULL;
+ int val1 = 0, val2 = 0, val3 = 3;
+ gs_free const char *target_host = NULL;
+ gs_free const char *source_host = NULL;
+ NMTeamLinkWatcherArpPingFlags flags = 0;
+
+ nm_assert (str);
+ nm_assert (!error || !*error);
+
+ str_clean = g_strstrip (g_strdup (str));
+ watcherv = nmc_strsplit_set (str_clean, " \t", 0);
+ if (!watcherv || !watcherv[0]) {
+ g_set_error (error, 1, 0, "'%s' is not valid", str);
+ return NULL;
+ }
+
+ for (i = 0; watcherv[i]; i++) {
+ gs_strfreev char **pair = NULL;
+
+ pair = nmc_strsplit_set (watcherv[i], "=", 0);
+ if (!pair[0]) {
+ g_set_error (error, 1, 0, "'%s' is not valid: %s", watcherv[i],
+ "properties should be specified as 'key=value'");
+ return NULL;
+ }
+ if (!pair[1]) {
+ g_set_error (error, 1, 0, "'%s' is not valid: %s", watcherv[i],
+ "missing key value");
+ return NULL;
+ }
+ if (pair[2]) {
+ g_set_error (error, 1, 0, "'%s' is not valid: %s", watcherv[i],
+ "properties should be specified as 'key=value'");
+ return NULL;
+ }
+
+ if (nm_streq (pair[0], "name"))
+ name = g_strdup (pair[1]);
+ else if ( nm_streq (pair[0], "delay-up")
+ || nm_streq (pair[0], "init-wait"))
+ val1 = _nm_utils_ascii_str_to_int64 (pair[1], 10, 0, G_MAXINT32, -1);
+ else if ( nm_streq (pair[0], "delay-down")
+ || nm_streq (pair[0], "interval"))
+ 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], "target-host"))
+ target_host = g_strdup (pair[1]);
+ else if (nm_streq (pair[0], "source-host"))
+ source_host = g_strdup (pair[1]);
+ else if (nm_streq (pair[0], "validate-active")) {
+ if (nm_streq (pair[1], "true"))
+ flags |= NM_TEAM_LINK_WATCHER_ARP_PING_FLAG_VALIDATE_ACTIVE;
+ } else if (nm_streq (pair[0], "validate-inactive")) {
+ if (nm_streq (pair[1], "true"))
+ flags |= NM_TEAM_LINK_WATCHER_ARP_PING_FLAG_VALIDATE_INACTIVE;
+ } else if (nm_streq (pair[0], "send-always")) {
+ if (nm_streq (pair[1], "true"))
+ flags |= NM_TEAM_LINK_WATCHER_ARP_PING_FLAG_SEND_ALWAYS;
+ } else {
+ g_set_error (error, 1, 0, "'%s' is not valid: %s", watcherv[i],
+ "unknown key");
+ return NULL;
+ }
+
+ if ((val1 < 0) || (val2 < 0) || (val3 < 0)) {
+ g_set_error (error, 1, 0, "'%s' is not valid: %s", watcherv[i],
+ "value is not a valid number [0, MAXINT]");
+ return NULL;
+ }
+ }
+
+ if (nm_streq0 (name, NM_TEAM_LINK_WATCHER_ETHTOOL))
+ return nm_team_link_watcher_new_ethtool (val1, val2, error);
+ 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);
+
+ if (!name)
+ g_set_error (error, 1, 0, "link watcher name missing");
+ else
+ g_set_error (error, 1, 0, "unknown link watcher name: '%s'", name);
+ return NULL;
+}
+
/* Max priority values from libnm-core/nm-setting-vlan.c */
#define MAX_SKB_PRIO G_MAXUINT32
#define MAX_8021P_PRIO 7 /* Max 802.1p priority */
@@ -461,6 +605,7 @@ _get_text_hidden (NMMetaAccessorGetType get_type)
return NM_META_TEXT_HIDDEN;
}
+
/*****************************************************************************/
G_GNUC_PRINTF (4, 5)
@@ -2310,6 +2455,9 @@ _complete_fcn_connection_type (ARGS_COMPLETE_FCN)
const NMMetaSettingInfoEditor *setting_info = &nm_meta_setting_infos_editor[i];
const char *v;
+ if (!setting_info->valid_parts)
+ continue;
+
v = setting_info->alias;
if (v) {
if (!text || strncmp (text, v, text_len) == 0)
@@ -2448,7 +2596,7 @@ _complete_fcn_connection_master (ARGS_COMPLETE_FCN)
expected_type = nm_setting_connection_get_slave_type (s_con);
}
- text_len = strlen (text);
+ text_len = text ? strlen (text) : 0;
result = g_new (char *, (2 * len) + 1);
for (i = 0, j = 0; i < len; i++) {
@@ -2974,14 +3122,14 @@ _get_fcn_ip_config_addresses (ARGS_GET_FCN)
{
NMSettingIPConfig *s_ip = NM_SETTING_IP_CONFIG (setting);
GString *printable;
- guint32 num_addresses, i;
+ guint num_addresses, i;
NMIPAddress *addr;
RETURN_UNSUPPORTED_GET_TYPE ();
printable = g_string_new (NULL);
- num_addresses = nm_setting_ip_config_get_num_addresses (s_ip);
+ num_addresses = NM_MIN ((guint) G_MAXINT, nm_setting_ip_config_get_num_addresses (s_ip));
for (i = 0; i < num_addresses; i++) {
addr = nm_setting_ip_config_get_address (s_ip, i);
@@ -3001,14 +3149,14 @@ _get_fcn_ip_config_routes (ARGS_GET_FCN)
{
NMSettingIPConfig *s_ip = NM_SETTING_IP_CONFIG (setting);
GString *printable;
- guint32 num_routes, i;
+ guint num_routes, i;
NMIPRoute *route;
RETURN_UNSUPPORTED_GET_TYPE ();
printable = g_string_new (NULL);
- num_routes = nm_setting_ip_config_get_num_routes (s_ip);
+ num_routes = NM_MIN ((guint) G_MAXINT, nm_setting_ip_config_get_num_routes (s_ip));
for (i = 0; i < num_routes; i++) {
gs_free char *attr_str = NULL;
gs_strfreev char **attr_names = NULL;
@@ -3464,6 +3612,13 @@ DEFINE_REMOVER_INDEX_OR_VALUE (_remove_fcn_ipv6_config_dns_options,
nm_setting_ip_config_remove_dns_option,
_validate_and_remove_ipv6_dns_option)
+static gboolean
+_dns_options_is_default (NMSettingIPConfig *setting)
+{
+ return nm_setting_ip_config_has_dns_options (setting)
+ && !nm_setting_ip_config_get_num_dns_options (setting);
+}
+
static gboolean
_set_fcn_ip6_config_addresses (ARGS_SET_FCN)
{
@@ -3632,6 +3787,158 @@ _validate_fcn_proxy_pac_script (const char *value, char **out_to_free, GError **
RETURN_STR_TO_FREE (script);
}
+static gconstpointer
+_get_fcn_tc_config_qdiscs (ARGS_GET_FCN)
+{
+ NMSettingTCConfig *s_tc = NM_SETTING_TC_CONFIG (setting);
+ GString *printable;
+ guint num_qdiscs, i;
+ NMTCQdisc *qdisc;
+ char *str;
+
+ RETURN_UNSUPPORTED_GET_TYPE ();
+
+ printable = g_string_new (NULL);
+
+ num_qdiscs = nm_setting_tc_config_get_num_qdiscs (s_tc);
+ for (i = 0; i < num_qdiscs; i++) {
+ qdisc = nm_setting_tc_config_get_qdisc (s_tc, i);
+
+ if (printable->len > 0)
+ g_string_append (printable, ", ");
+
+ str = nm_utils_tc_qdisc_to_str (qdisc, NULL);
+ if (str) {
+ g_string_append (printable, str);
+ g_free (str);
+ }
+ }
+
+ RETURN_STR_TO_FREE (g_string_free (printable, FALSE));
+}
+
+static gboolean
+_set_fcn_tc_config_qdiscs (ARGS_SET_FCN)
+{
+ gs_free const char **strv = NULL;
+ const char *const*iter;
+ NMTCQdisc *tc_qdisc;
+ GError *local = NULL;
+
+ strv = nm_utils_strsplit_set (value, ",");
+ for (iter = strv; strv && *iter; iter++) {
+ tc_qdisc = nm_utils_tc_qdisc_from_str (*iter, &local);
+ if (!tc_qdisc) {
+ g_set_error (error, 1, 0, "%s %s", local->message,
+ _("The valid syntax is: '[root | parent ] [handle ] '"));
+ return FALSE;
+ }
+ nm_setting_tc_config_add_qdisc (NM_SETTING_TC_CONFIG (setting), tc_qdisc);
+ nm_tc_qdisc_unref (tc_qdisc);
+ }
+ return TRUE;
+}
+
+static gboolean
+_validate_and_remove_tc_qdisc (NMSettingTCConfig *setting,
+ const char *value,
+ GError **error)
+{
+ NMTCQdisc *qdisc;
+ gboolean ret;
+
+ qdisc = nm_utils_tc_qdisc_from_str (value, error);
+ if (!qdisc)
+ return FALSE;
+
+ ret = nm_setting_tc_config_remove_qdisc_by_value (setting, qdisc);
+ if (!ret)
+ g_set_error (error, 1, 0, _("the property doesn't contain qdisc '%s'"), value);
+ nm_tc_qdisc_unref (qdisc);
+ return ret;
+}
+DEFINE_REMOVER_INDEX_OR_VALUE (_remove_fcn_tc_config_qdiscs,
+ NM_SETTING_TC_CONFIG,
+ nm_setting_tc_config_get_num_qdiscs,
+ nm_setting_tc_config_remove_qdisc,
+ _validate_and_remove_tc_qdisc)
+
+static gconstpointer
+_get_fcn_tc_config_tfilters (ARGS_GET_FCN)
+{
+ NMSettingTCConfig *s_tc = NM_SETTING_TC_CONFIG (setting);
+ GString *printable;
+ guint num_tfilters, i;
+ NMTCTfilter *tfilter;
+ char *str;
+
+ RETURN_UNSUPPORTED_GET_TYPE ();
+
+ printable = g_string_new (NULL);
+
+ num_tfilters = nm_setting_tc_config_get_num_tfilters (s_tc);
+ for (i = 0; i < num_tfilters; i++) {
+ tfilter = nm_setting_tc_config_get_tfilter (s_tc, i);
+
+ if (printable->len > 0)
+ g_string_append (printable, ", ");
+
+ str = nm_utils_tc_tfilter_to_str (tfilter, NULL);
+ if (str) {
+ g_string_append (printable, str);
+ g_free (str);
+ }
+ }
+
+ RETURN_STR_TO_FREE (g_string_free (printable, FALSE));
+}
+
+static gboolean
+_set_fcn_tc_config_tfilters (ARGS_SET_FCN)
+{
+ gs_free const char **strv = NULL;
+ const char *const*iter;
+ NMTCTfilter *tc_tfilter;
+ GError *local = NULL;
+
+ strv = nm_utils_strsplit_set (value, ",");
+ for (iter = strv; strv && *iter; iter++) {
+ tc_tfilter = nm_utils_tc_tfilter_from_str (*iter, &local);
+ if (!tc_tfilter) {
+ g_set_error (error, 1, 0, "%s %s", local->message,
+ _("The valid syntax is: '[root | parent ] [handle ] '"));
+ return FALSE;
+ }
+ nm_setting_tc_config_add_tfilter (NM_SETTING_TC_CONFIG (setting), tc_tfilter);
+ nm_tc_tfilter_unref (tc_tfilter);
+ }
+ return TRUE;
+}
+
+static gboolean
+_validate_and_remove_tc_tfilter (NMSettingTCConfig *setting,
+ const char *value,
+ GError **error)
+{
+ NMTCTfilter *tfilter;
+ gboolean ret;
+
+ tfilter = nm_utils_tc_tfilter_from_str (value, error);
+ if (!tfilter)
+ return FALSE;
+
+ ret = nm_setting_tc_config_remove_tfilter_by_value (setting, tfilter);
+ if (!ret)
+ g_set_error (error, 1, 0, _("the property doesn't contain tfilter '%s'"), value);
+ nm_tc_tfilter_unref (tfilter);
+ return ret;
+}
+DEFINE_REMOVER_INDEX_OR_VALUE (_remove_fcn_tc_config_tfilters,
+ NM_SETTING_TC_CONFIG,
+ nm_setting_tc_config_get_num_tfilters,
+ nm_setting_tc_config_remove_tfilter,
+ _validate_and_remove_tc_tfilter)
+
static const char *
_validate_fcn_team_config (const char *value, char **out_to_free, GError **error)
{
@@ -3642,6 +3949,204 @@ _validate_fcn_team_config (const char *value, char **out_to_free, GError **error
RETURN_STR_TO_FREE (json);
}
+static gboolean
+_is_valid_team_runner_tx_hash_element (const char *tx_hash_element)
+{
+ const char *valid_tx_hashes[] = { "eth", "vlan", "ipv4", "ipv6", "ip",
+ "l3", "tcp", "udp", "sctp", "l4", NULL };
+ if (nmc_string_is_valid (tx_hash_element, valid_tx_hashes, NULL))
+ return TRUE;
+ return FALSE;
+}
+
+static gboolean
+_set_fcn_team_runner_tx_hash (ARGS_SET_FCN)
+{
+ char **strv = NULL;
+ guint i = 0;
+
+ g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
+
+ strv = _nm_utils_strv_cleanup (g_strsplit_set (value, " \t,", 0),
+ TRUE, TRUE, TRUE);
+ if (!verify_string_list (strv, property_info->property_name,
+ _is_valid_team_runner_tx_hash_element,
+ error)) {
+ g_strfreev (strv);
+ return FALSE;
+ }
+
+ while (strv && strv[i])
+ nm_setting_team_add_runner_tx_hash (NM_SETTING_TEAM (setting), strv[i++]);
+ g_strfreev (strv);
+
+ return TRUE;
+}
+
+static gboolean
+_validate_and_remove_team_runner_tx_hash (NMSettingTeam *setting,
+ const char *tx_hash,
+ GError **error)
+{
+ if (!nm_setting_team_remove_runner_tx_hash_by_value (setting, tx_hash)) {
+ g_set_error (error, 1, 0,
+ _("the property doesn't contain string '%s'"),
+ tx_hash);
+ return FALSE;
+ }
+
+ return TRUE;
+}
+DEFINE_REMOVER_INDEX_OR_VALUE (_remove_fcn_team_runner_tx_hash,
+ NM_SETTING_TEAM,
+ nm_setting_team_get_num_runner_tx_hash,
+ nm_setting_team_remove_runner_tx_hash,
+ _validate_and_remove_team_runner_tx_hash)
+
+static gconstpointer
+_get_fcn_team_link_watchers (ARGS_GET_FCN)
+{
+ NMSettingTeam *s_team = NM_SETTING_TEAM (setting);
+ GString *printable;
+ guint num_watchers, i;
+ NMTeamLinkWatcher *watcher;
+ char *watcher_str;
+
+ RETURN_UNSUPPORTED_GET_TYPE ();
+
+ printable = g_string_new (NULL);
+
+ num_watchers = nm_setting_team_get_num_link_watchers (s_team);
+ for (i = 0; i < num_watchers; i++) {
+ watcher = nm_setting_team_get_link_watcher (s_team, i);
+ watcher_str = _dump_team_link_watcher (watcher);
+ if (watcher_str) {
+ if (printable->len > 0)
+ g_string_append (printable, ", ");
+ g_string_append (printable, watcher_str);
+ g_free (watcher_str);
+ }
+ }
+
+ RETURN_STR_TO_FREE (g_string_free (printable, FALSE));
+}
+
+static gboolean
+_set_fcn_team_link_watchers (ARGS_SET_FCN)
+{
+ gs_strfreev char **strv = NULL;
+ const char *const*iter;
+ NMTeamLinkWatcher *watcher;
+
+ strv = nmc_strsplit_set (value, ",", 0);
+ for (iter = (const char *const*) strv; *iter; iter++) {
+ watcher = _parse_team_link_watcher (*iter, error);
+ if (!watcher)
+ return FALSE;
+ nm_setting_team_add_link_watcher (NM_SETTING_TEAM (setting), watcher);
+ nm_team_link_watcher_unref (watcher);
+ }
+ return TRUE;
+}
+
+static gboolean
+_validate_and_remove_team_link_watcher (NMSettingTeam *setting,
+ const char *watcher_str,
+ GError **error)
+{
+ NMTeamLinkWatcher *watcher;
+ gboolean ret;
+
+ watcher = _parse_team_link_watcher (watcher_str, error);
+ if (!watcher)
+ return FALSE;
+
+ ret = nm_setting_team_remove_link_watcher_by_value (setting, watcher);
+ if (!ret) {
+ g_set_error (error, 1, 0, _("the property doesn't contain link watcher '%s'"),
+ watcher_str);
+ }
+ nm_team_link_watcher_unref (watcher);
+ return ret;
+}
+DEFINE_REMOVER_INDEX_OR_VALUE (_remove_fcn_team_link_watchers,
+ NM_SETTING_TEAM,
+ nm_setting_team_get_num_link_watchers,
+ nm_setting_team_remove_link_watcher,
+ _validate_and_remove_team_link_watcher)
+
+static gconstpointer
+_get_fcn_team_port_link_watchers (ARGS_GET_FCN)
+{
+ NMSettingTeamPort *s_team_port = NM_SETTING_TEAM_PORT (setting);
+ GString *printable;
+ guint num_watchers, i;
+ NMTeamLinkWatcher *watcher;
+ char *watcher_str;
+
+ RETURN_UNSUPPORTED_GET_TYPE ();
+
+ printable = g_string_new (NULL);
+
+ num_watchers = nm_setting_team_port_get_num_link_watchers (s_team_port);
+ for (i = 0; i < num_watchers; i++) {
+ watcher = nm_setting_team_port_get_link_watcher (s_team_port, i);
+ watcher_str = _dump_team_link_watcher (watcher);
+ if (watcher_str) {
+ if (printable->len > 0)
+ g_string_append (printable, ", ");
+ g_string_append (printable, watcher_str);
+ g_free (watcher_str);
+ }
+ }
+
+ RETURN_STR_TO_FREE (g_string_free (printable, FALSE));
+}
+
+static gboolean
+_set_fcn_team_port_link_watchers (ARGS_SET_FCN)
+{
+ gs_strfreev char **strv = NULL;
+ const char *const*iter;
+ NMTeamLinkWatcher *watcher;
+
+ strv = nmc_strsplit_set (value, ",", 0);
+ for (iter = (const char *const*) strv; *iter; iter++) {
+ watcher = _parse_team_link_watcher (*iter, error);
+ if (!watcher)
+ return FALSE;
+ nm_setting_team_port_add_link_watcher (NM_SETTING_TEAM_PORT (setting), watcher);
+ nm_team_link_watcher_unref (watcher);
+ }
+ return TRUE;
+}
+
+static gboolean
+_validate_and_remove_team_port_link_watcher (NMSettingTeamPort *setting,
+ const char *watcher_str,
+ GError **error)
+{
+ NMTeamLinkWatcher *watcher;
+ gboolean ret;
+
+ watcher = _parse_team_link_watcher (watcher_str, error);
+ if (!watcher)
+ return FALSE;
+
+ ret = nm_setting_team_port_remove_link_watcher_by_value (setting, watcher);
+ if (!ret) {
+ g_set_error (error, 1, 0, _("the property doesn't contain link watcher '%s'"),
+ watcher_str);
+ }
+ nm_team_link_watcher_unref (watcher);
+ return ret;
+}
+DEFINE_REMOVER_INDEX_OR_VALUE (_remove_fcn_team_port_link_watchers,
+ NM_SETTING_TEAM_PORT,
+ nm_setting_team_port_get_num_link_watchers,
+ nm_setting_team_port_remove_link_watcher,
+ _validate_and_remove_team_port_link_watcher)
+
static gconstpointer
_get_fcn_vlan_flags (ARGS_GET_FCN)
{
@@ -4440,6 +4945,24 @@ static const NMMetaPropertyType _pt_gobject_devices = {
"{ \"device\": \"team0\", \"runner\": {\"name\": \"roundrobin\"}, \"ports\": {\"eth1\": {}, \"eth2\": {}} }\n" \
" set team.config /etc/my-team.conf\n")
+#define TEAM_LINK_WATCHERS_DESCRIBE_MESSAGE \
+ N_("Enter a list of link watchers formatted as dictionaries where the keys " \
+ "are teamd properties. Dictionary pairs are in the form: key=value and pairs " \
+ "are separated by ' '. Dictionaries are separated with ','.\n" \
+ "The keys allowed/required in the dictionary change on the basis of the link " \
+ "watcher type, while the only property common to all the link watchers is " \
+ " 'name'*, which defines the link watcher to be specified.\n\n" \
+ "Properties available for the 'ethtool' link watcher:\n" \
+ " 'delay-up', 'delay-down'\n\n" \
+ "Properties available for the 'nsna_ping' link watcher:\n" \
+ " 'init-wait', 'interval', 'missed-max', 'target-host'*\n\n" \
+ "Properties available for the 'arp_ping' include all the ones for 'nsna_ping' and:\n" \
+ " 'source-host', 'validate-active', 'validate-inactive', 'send-always'.\n\n" \
+ "Properties flagged with a '*' are mandatory.\n\n" \
+ "Example:\n" \
+ " name=arp_ping,source-host=172.16.1.1,target-host=172.16.1.254; name=ethtool,delay-up=3\n")
+
+
#define DEFINE_DCB_PROPRITY_PROPERTY_TYPE \
.property_type = &_pt_gobject_int, \
.property_typ_data = DEFINE_PROPERTY_TYP_DATA_SUBTYPE (gobject_int, \
@@ -5310,7 +5833,7 @@ static const NMMetaPropertyInfo *const property_infos_IP4_CONFIG[] = {
.remove_fcn = _remove_fcn_ipv4_config_dns_options,
),
.property_typ_data = DEFINE_PROPERTY_TYP_DATA_SUBTYPE (get_with_default,
- .fcn = GET_FCN_WITH_DEFAULT (NMSettingIPConfig, nm_setting_ip_config_has_dns_options),
+ .fcn = GET_FCN_WITH_DEFAULT (NMSettingIPConfig, _dns_options_is_default),
),
),
PROPERTY_INFO (NM_SETTING_IP_CONFIG_DNS_PRIORITY, DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_DNS_PRIORITY,
@@ -5473,7 +5996,7 @@ static const NMMetaPropertyInfo *const property_infos_IP6_CONFIG[] = {
.remove_fcn = _remove_fcn_ipv6_config_dns_options,
),
.property_typ_data = DEFINE_PROPERTY_TYP_DATA_SUBTYPE (get_with_default,
- .fcn = GET_FCN_WITH_DEFAULT (NMSettingIPConfig, nm_setting_ip_config_has_dns_options),
+ .fcn = GET_FCN_WITH_DEFAULT (NMSettingIPConfig, _dns_options_is_default),
),
),
PROPERTY_INFO (NM_SETTING_IP_CONFIG_DNS_PRIORITY, DESCRIBE_DOC_NM_SETTING_IP6_CONFIG_DNS_PRIORITY,
@@ -5987,6 +6510,26 @@ static const NMMetaPropertyInfo *const property_infos_PROXY[] = {
NULL
};
+#undef _CURRENT_NM_META_SETTING_TYPE
+#define _CURRENT_NM_META_SETTING_TYPE NM_META_SETTING_TYPE_TC_CONFIG
+static const NMMetaPropertyInfo *const property_infos_TC_CONFIG[] = {
+ PROPERTY_INFO (NM_SETTING_TC_CONFIG_QDISCS, DESCRIBE_DOC_NM_SETTING_TC_CONFIG_QDISCS,
+ .property_type = DEFINE_PROPERTY_TYPE (
+ .get_fcn = _get_fcn_tc_config_qdiscs,
+ .set_fcn = _set_fcn_tc_config_qdiscs,
+ .remove_fcn = _remove_fcn_tc_config_qdiscs,
+ ),
+ ),
+ PROPERTY_INFO (NM_SETTING_TC_CONFIG_TFILTERS, DESCRIBE_DOC_NM_SETTING_TC_CONFIG_TFILTERS,
+ .property_type = DEFINE_PROPERTY_TYPE (
+ .get_fcn = _get_fcn_tc_config_tfilters,
+ .set_fcn = _set_fcn_tc_config_tfilters,
+ .remove_fcn = _remove_fcn_tc_config_tfilters,
+ ),
+ ),
+ NULL
+};
+
#undef _CURRENT_NM_META_SETTING_TYPE
#define _CURRENT_NM_META_SETTING_TYPE NM_META_SETTING_TYPE_TEAM
static const NMMetaPropertyInfo *const property_infos_TEAM[] = {
@@ -6000,6 +6543,138 @@ static const NMMetaPropertyInfo *const property_infos_TEAM[] = {
.validate_fcn = _validate_fcn_team_config,
),
),
+ PROPERTY_INFO_WITH_DESC (NM_SETTING_TEAM_NOTIFY_PEERS_COUNT,
+ .property_type = &_pt_gobject_int,
+ .property_typ_data = DEFINE_PROPERTY_TYP_DATA_SUBTYPE (gobject_int,
+ .value_infos = INT_VALUE_INFOS (
+ {
+ .value = 0,
+ .nick = "disabled",
+ }
+ ),
+ ),
+ ),
+ PROPERTY_INFO_WITH_DESC (NM_SETTING_TEAM_NOTIFY_PEERS_INTERVAL,
+ .property_type = &_pt_gobject_int,
+ .property_typ_data = DEFINE_PROPERTY_TYP_DATA_SUBTYPE (gobject_int,
+ .value_infos = INT_VALUE_INFOS (
+ {
+ .value = 0,
+ .nick = "default",
+ }
+ ),
+ ),
+ ),
+ PROPERTY_INFO_WITH_DESC (NM_SETTING_TEAM_MCAST_REJOIN_COUNT,
+ .property_type = &_pt_gobject_int,
+ .property_typ_data = DEFINE_PROPERTY_TYP_DATA_SUBTYPE (gobject_int,
+ .value_infos = INT_VALUE_INFOS (
+ {
+ .value = 0,
+ .nick = "disabled",
+ }
+ ),
+ ),
+ ),
+ PROPERTY_INFO_WITH_DESC (NM_SETTING_TEAM_MCAST_REJOIN_INTERVAL,
+ .property_type = &_pt_gobject_int,
+ .property_typ_data = DEFINE_PROPERTY_TYP_DATA_SUBTYPE (gobject_int,
+ .value_infos = INT_VALUE_INFOS (
+ {
+ .value = 0,
+ .nick = "default",
+ }
+ ),
+ ),
+ ),
+ PROPERTY_INFO_WITH_DESC (NM_SETTING_TEAM_RUNNER,
+ .property_type = &_pt_gobject_string,
+ .property_typ_data = DEFINE_PROPERTY_TYP_DATA (
+ .values_static = VALUES_STATIC (NM_SETTING_TEAM_RUNNER_BROADCAST,
+ NM_SETTING_TEAM_RUNNER_ROUNDROBIN,
+ NM_SETTING_TEAM_RUNNER_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),
+ ),
+ ),
+ PROPERTY_INFO_WITH_DESC (NM_SETTING_TEAM_RUNNER_TX_HASH,
+ .property_type = DEFINE_PROPERTY_TYPE (
+ .get_fcn = _get_fcn_gobject,
+ .set_fcn = _set_fcn_team_runner_tx_hash,
+ .remove_fcn = _remove_fcn_team_runner_tx_hash,
+ ),
+ ),
+ 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"),
+ ),
+ ),
+ PROPERTY_INFO_WITH_DESC (NM_SETTING_TEAM_RUNNER_TX_BALANCER_INTERVAL,
+ .property_type = &_pt_gobject_int,
+ .property_typ_data = DEFINE_PROPERTY_TYP_DATA_SUBTYPE (gobject_int,
+ .value_infos = INT_VALUE_INFOS (
+ {
+ .value = 50,
+ .nick = "default",
+ }
+ ),
+ ),
+ ),
+ PROPERTY_INFO_WITH_DESC (NM_SETTING_TEAM_RUNNER_ACTIVE,
+ .property_type = & _pt_gobject_bool,
+ ),
+ PROPERTY_INFO_WITH_DESC (NM_SETTING_TEAM_RUNNER_FAST_RATE,
+ .property_type = & _pt_gobject_bool,
+ ),
+ PROPERTY_INFO_WITH_DESC (NM_SETTING_TEAM_RUNNER_SYS_PRIO,
+ .property_type = &_pt_gobject_int,
+ .property_typ_data = DEFINE_PROPERTY_TYP_DATA_SUBTYPE (gobject_int,
+ .value_infos = INT_VALUE_INFOS (
+ {
+ .value = 255,
+ .nick = "default",
+ }
+ ),
+ ),
+ ),
+ PROPERTY_INFO_WITH_DESC (NM_SETTING_TEAM_RUNNER_MIN_PORTS,
+ .property_type = &_pt_gobject_int,
+ .property_typ_data = DEFINE_PROPERTY_TYP_DATA_SUBTYPE (gobject_int,
+ .value_infos = INT_VALUE_INFOS (
+ {
+ .value = 0,
+ .nick = "default",
+ }
+ ),
+ ),
+ ),
+ PROPERTY_INFO_WITH_DESC (NM_SETTING_TEAM_RUNNER_AGG_SELECT_POLICY,
+ .property_type = &_pt_gobject_string,
+ .property_typ_data = DEFINE_PROPERTY_TYP_DATA (
+ .values_static = VALUES_STATIC (NM_SETTING_TEAM_RUNNER_AGG_SELECT_POLICY_LACP_PRIO,
+ NM_SETTING_TEAM_RUNNER_AGG_SELECT_POLICY_LACP_PRIO_STABLE,
+ NM_SETTING_TEAM_RUNNER_AGG_SELECT_POLICY_BANDWIDTH,
+ NM_SETTING_TEAM_RUNNER_AGG_SELECT_POLICY_COUNT,
+ NM_SETTING_TEAM_RUNNER_AGG_SELECT_POLICY_PORT_CONFIG),
+ ),
+ ),
+ PROPERTY_INFO_WITH_DESC (NM_SETTING_TEAM_LINK_WATCHERS,
+ .describe_message = TEAM_LINK_WATCHERS_DESCRIBE_MESSAGE,
+ .property_type = DEFINE_PROPERTY_TYPE (
+ .get_fcn = _get_fcn_team_link_watchers,
+ .set_fcn = _set_fcn_team_link_watchers,
+ .remove_fcn = _remove_fcn_team_link_watchers,
+ ),
+ ),
NULL
};
@@ -6016,6 +6691,61 @@ static const NMMetaPropertyInfo *const property_infos_TEAM_PORT[] = {
.validate_fcn = _validate_fcn_team_config,
),
),
+ PROPERTY_INFO_WITH_DESC (NM_SETTING_TEAM_PORT_QUEUE_ID,
+ .property_type = &_pt_gobject_int,
+ .property_typ_data = DEFINE_PROPERTY_TYP_DATA_SUBTYPE (gobject_int,
+ .value_infos = INT_VALUE_INFOS (
+ {
+ .value = -1,
+ .nick = "default",
+ }
+ ),
+ ),
+ ),
+ PROPERTY_INFO_WITH_DESC (NM_SETTING_TEAM_PORT_PRIO,
+ .property_type = &_pt_gobject_int,
+ .property_typ_data = DEFINE_PROPERTY_TYP_DATA_SUBTYPE (gobject_int,
+ .value_infos = INT_VALUE_INFOS (
+ {
+ .value = 0,
+ .nick = "default",
+ }
+ ),
+ ),
+ ),
+ PROPERTY_INFO_WITH_DESC (NM_SETTING_TEAM_PORT_STICKY,
+ .property_type = &_pt_gobject_bool,
+ ),
+ PROPERTY_INFO_WITH_DESC (NM_SETTING_TEAM_PORT_LACP_PRIO,
+ .property_type = &_pt_gobject_int,
+ .property_typ_data = DEFINE_PROPERTY_TYP_DATA_SUBTYPE (gobject_int,
+ .value_infos = INT_VALUE_INFOS (
+ {
+ .value = 255,
+ .nick = "default",
+ }
+ ),
+ ),
+ ),
+ PROPERTY_INFO_WITH_DESC (NM_SETTING_TEAM_PORT_LACP_KEY,
+ .property_type = &_pt_gobject_int,
+ .property_typ_data = DEFINE_PROPERTY_TYP_DATA_SUBTYPE (gobject_int,
+ .value_infos = INT_VALUE_INFOS (
+ {
+ .value = 0,
+ .nick = "default",
+ }
+ ),
+ ),
+ ),
+ PROPERTY_INFO_WITH_DESC (NM_SETTING_TEAM_PORT_LINK_WATCHERS,
+ .describe_message = TEAM_LINK_WATCHERS_DESCRIBE_MESSAGE,
+ .property_type = DEFINE_PROPERTY_TYPE (
+ .get_fcn = _get_fcn_team_port_link_watchers,
+ .set_fcn = _set_fcn_team_port_link_watchers,
+ .remove_fcn = _remove_fcn_team_port_link_watchers,
+ ),
+ ),
NULL
};
@@ -6810,6 +7540,7 @@ _setting_init_fcn_wireless (ARGS_SETTING_INIT_FCN)
#define SETTING_PRETTY_NAME_PPPOE N_("PPPoE")
#define SETTING_PRETTY_NAME_PROXY N_("Proxy")
#define SETTING_PRETTY_NAME_SERIAL N_("Serial settings")
+#define SETTING_PRETTY_NAME_TC_CONFIG N_("Traffic controls")
#define SETTING_PRETTY_NAME_TEAM N_("Team device")
#define SETTING_PRETTY_NAME_TEAM_PORT N_("Team port")
#define SETTING_PRETTY_NAME_TUN N_("Tun device")
@@ -6995,6 +7726,7 @@ const NMMetaSettingInfoEditor nm_meta_setting_infos_editor[] = {
.setting_init_fcn = _setting_init_fcn_proxy,
),
SETTING_INFO (SERIAL),
+ SETTING_INFO (TC_CONFIG),
SETTING_INFO (TEAM,
.valid_parts = NM_META_SETTING_VALID_PARTS (
NM_META_SETTING_VALID_PART_ITEM (CONNECTION, TRUE),
@@ -7075,6 +7807,7 @@ const NMMetaSettingValidPartItem *const nm_meta_setting_info_valid_parts_default
static const NMMetaSettingValidPartItem *const valid_settings_noslave[] = {
NM_META_SETTING_VALID_PART_ITEM (IP4_CONFIG, FALSE),
NM_META_SETTING_VALID_PART_ITEM (IP6_CONFIG, FALSE),
+ NM_META_SETTING_VALID_PART_ITEM (TC_CONFIG, FALSE),
NM_META_SETTING_VALID_PART_ITEM (PROXY, FALSE),
NULL,
};
diff --git a/clients/common/settings-docs.c b/clients/common/settings-docs.c
index 3547c833..bf544ab6 100644
--- a/clients/common/settings-docs.c
+++ b/clients/common/settings-docs.c
@@ -315,10 +315,34 @@
#define DESCRIBE_DOC_NM_SETTING_SERIAL_PARITY N_("Parity setting of the serial port.")
#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_TC_CONFIG_NAME N_("The setting's name, which uniquely identifies the setting within the connection. Each setting type has a name unique to that type, for example \"ppp\" or \"wireless\" or \"wired\".")
+#define DESCRIBE_DOC_NM_SETTING_TC_CONFIG_QDISCS N_("Array of TC queuening 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_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_NAME N_("The setting's name, which uniquely identifies the setting within the connection. Each setting type has a name unique to that type, for example \"ppp\" or \"wireless\" or \"wired\".")
+#define DESCRIBE_DOC_NM_SETTING_TEAM_NOTIFY_PEERS_COUNT N_("Corresponds to the teamd notify_peers.count.")
+#define DESCRIBE_DOC_NM_SETTING_TEAM_NOTIFY_PEERS_INTERVAL N_("Corresponds to the teamd notify_peers.interval.")
+#define DESCRIBE_DOC_NM_SETTING_TEAM_RUNNER N_("Corresponds to the teamd runner.name. Permitted values are: \"roundrobin\", \"broadcast\", \"activebackup\", \"loadbalance\", \"lacp\".")
+#define DESCRIBE_DOC_NM_SETTING_TEAM_RUNNER_ACTIVE N_("Corresponds to the teamd runner.active.")
+#define DESCRIBE_DOC_NM_SETTING_TEAM_RUNNER_AGG_SELECT_POLICY N_("Corresponds to the teamd runner.agg_select_policy.")
+#define DESCRIBE_DOC_NM_SETTING_TEAM_RUNNER_FAST_RATE N_("Corresponds to the teamd runner.fast_rate.")
+#define DESCRIBE_DOC_NM_SETTING_TEAM_RUNNER_HWADDR_POLICY N_("Corresponds to the teamd runner.hwaddr_policy.")
+#define DESCRIBE_DOC_NM_SETTING_TEAM_RUNNER_MIN_PORTS N_("Corresponds to the teamd runner.min_ports.")
+#define DESCRIBE_DOC_NM_SETTING_TEAM_RUNNER_SYS_PRIO N_("Corresponds to the teamd runner.sys_prio.")
+#define DESCRIBE_DOC_NM_SETTING_TEAM_RUNNER_TX_BALANCER N_("Corresponds to the teamd runner.tx_balancer.name.")
+#define DESCRIBE_DOC_NM_SETTING_TEAM_RUNNER_TX_BALANCER_INTERVAL N_("Corresponds to the teamd runner.tx_balancer.interval.")
+#define DESCRIBE_DOC_NM_SETTING_TEAM_RUNNER_TX_HASH N_("Corresponds to the teamd runner.tx_hash.")
#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_NAME N_("The setting's name, which uniquely identifies the setting within the connection. Each setting type has a name unique to that type, for example \"ppp\" or \"wireless\" or \"wired\".")
+#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.")
#define DESCRIBE_DOC_NM_SETTING_TUN_GROUP N_("The group ID which will own the device. If set to NULL everyone will be able to use the device.")
#define DESCRIBE_DOC_NM_SETTING_TUN_MODE N_("The operating mode of the virtual device. Allowed values are NM_SETTING_TUN_MODE_TUN (1) to create a layer 3 device and NM_SETTING_TUN_MODE_TAP (2) to create an Ethernet-like layer 2 one.")
#define DESCRIBE_DOC_NM_SETTING_TUN_MULTI_QUEUE N_("If the property is set to TRUE, the interface will support multiple file descriptors (queues) to parallelize packet sending or receiving. Otherwise, the interface will only support a single queue.")
diff --git a/clients/common/settings-docs.c.in b/clients/common/settings-docs.c.in
index 3547c833..bf544ab6 100644
--- a/clients/common/settings-docs.c.in
+++ b/clients/common/settings-docs.c.in
@@ -315,10 +315,34 @@
#define DESCRIBE_DOC_NM_SETTING_SERIAL_PARITY N_("Parity setting of the serial port.")
#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_TC_CONFIG_NAME N_("The setting's name, which uniquely identifies the setting within the connection. Each setting type has a name unique to that type, for example \"ppp\" or \"wireless\" or \"wired\".")
+#define DESCRIBE_DOC_NM_SETTING_TC_CONFIG_QDISCS N_("Array of TC queuening 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_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_NAME N_("The setting's name, which uniquely identifies the setting within the connection. Each setting type has a name unique to that type, for example \"ppp\" or \"wireless\" or \"wired\".")
+#define DESCRIBE_DOC_NM_SETTING_TEAM_NOTIFY_PEERS_COUNT N_("Corresponds to the teamd notify_peers.count.")
+#define DESCRIBE_DOC_NM_SETTING_TEAM_NOTIFY_PEERS_INTERVAL N_("Corresponds to the teamd notify_peers.interval.")
+#define DESCRIBE_DOC_NM_SETTING_TEAM_RUNNER N_("Corresponds to the teamd runner.name. Permitted values are: \"roundrobin\", \"broadcast\", \"activebackup\", \"loadbalance\", \"lacp\".")
+#define DESCRIBE_DOC_NM_SETTING_TEAM_RUNNER_ACTIVE N_("Corresponds to the teamd runner.active.")
+#define DESCRIBE_DOC_NM_SETTING_TEAM_RUNNER_AGG_SELECT_POLICY N_("Corresponds to the teamd runner.agg_select_policy.")
+#define DESCRIBE_DOC_NM_SETTING_TEAM_RUNNER_FAST_RATE N_("Corresponds to the teamd runner.fast_rate.")
+#define DESCRIBE_DOC_NM_SETTING_TEAM_RUNNER_HWADDR_POLICY N_("Corresponds to the teamd runner.hwaddr_policy.")
+#define DESCRIBE_DOC_NM_SETTING_TEAM_RUNNER_MIN_PORTS N_("Corresponds to the teamd runner.min_ports.")
+#define DESCRIBE_DOC_NM_SETTING_TEAM_RUNNER_SYS_PRIO N_("Corresponds to the teamd runner.sys_prio.")
+#define DESCRIBE_DOC_NM_SETTING_TEAM_RUNNER_TX_BALANCER N_("Corresponds to the teamd runner.tx_balancer.name.")
+#define DESCRIBE_DOC_NM_SETTING_TEAM_RUNNER_TX_BALANCER_INTERVAL N_("Corresponds to the teamd runner.tx_balancer.interval.")
+#define DESCRIBE_DOC_NM_SETTING_TEAM_RUNNER_TX_HASH N_("Corresponds to the teamd runner.tx_hash.")
#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_NAME N_("The setting's name, which uniquely identifies the setting within the connection. Each setting type has a name unique to that type, for example \"ppp\" or \"wireless\" or \"wired\".")
+#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.")
#define DESCRIBE_DOC_NM_SETTING_TUN_GROUP N_("The group ID which will own the device. If set to NULL everyone will be able to use the device.")
#define DESCRIBE_DOC_NM_SETTING_TUN_MODE N_("The operating mode of the virtual device. Allowed values are NM_SETTING_TUN_MODE_TUN (1) to create a layer 3 device and NM_SETTING_TUN_MODE_TAP (2) to create an Ethernet-like layer 2 one.")
#define DESCRIBE_DOC_NM_SETTING_TUN_MULTI_QUEUE N_("If the property is set to TRUE, the interface will support multiple file descriptors (queues) to parallelize packet sending or receiving. Otherwise, the interface will only support a single queue.")
diff --git a/clients/tui/newt/nmt-newt-utils.c b/clients/tui/newt/nmt-newt-utils.c
index a8541829..f37a851e 100644
--- a/clients/tui/newt/nmt-newt-utils.c
+++ b/clients/tui/newt/nmt-newt-utils.c
@@ -336,7 +336,7 @@ nmt_newt_edit_string (const char *data)
len -= nwrote;
data += nwrote;
}
- close (fd);
+ nm_close (fd);
argv[0] = (char *) g_getenv ("VISUAL");
if (!argv[0])
diff --git a/clients/tui/nm-editor-bindings.c b/clients/tui/nm-editor-bindings.c
index 647ac8df..24803868 100644
--- a/clients/tui/nm-editor-bindings.c
+++ b/clients/tui/nm-editor-bindings.c
@@ -585,9 +585,6 @@ get_security_type (NMEditorWirelessSecurityMethodBinding *binding)
return "none";
key_mgmt = nm_setting_wireless_security_get_key_mgmt (binding->s_wsec);
- if (!key_mgmt)
- return "none";
-
auth_alg = nm_setting_wireless_security_get_auth_alg (binding->s_wsec);
/* No IEEE 802.1x */
diff --git a/clients/tui/nmt-page-wifi.c b/clients/tui/nmt-page-wifi.c
index f846345c..35625fe4 100644
--- a/clients/tui/nmt-page-wifi.c
+++ b/clients/tui/nmt-page-wifi.c
@@ -38,6 +38,13 @@
G_DEFINE_TYPE (NmtPageWifi, nmt_page_wifi, NMT_TYPE_EDITOR_PAGE_DEVICE)
+#define NMT_PAGE_WIFI_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NMT_TYPE_PAGE_WIFI, NmtPageWifiPrivate))
+
+typedef struct {
+ NMSettingWirelessSecurity *s_wsec;
+
+} NmtPageWifiPrivate;
+
NmtEditorPage *
nmt_page_wifi_new (NMConnection *conn,
NmtDeviceEntry *deventry)
@@ -170,6 +177,7 @@ ssid_transform_from_entry (GBinding *binding,
static void
nmt_page_wifi_constructed (GObject *object)
{
+ NmtPageWifiPrivate *priv = NMT_PAGE_WIFI_GET_PRIVATE (object);
NmtPageWifi *wifi = NMT_PAGE_WIFI (object);
NmtDeviceEntry *deventry;
NmtEditorSection *section;
@@ -190,9 +198,13 @@ nmt_page_wifi_constructed (GObject *object)
s_wsec = nm_connection_get_setting_wireless_security (conn);
if (!s_wsec) {
- nm_connection_add_setting (conn, nm_setting_wireless_security_new ());
- s_wsec = nm_connection_get_setting_wireless_security (conn);
+ /* It makes things simpler if we always have a
+ * NMSettingWirelessSecurity; we'll hold a ref on one, and add
+ * it to and remove it from the connection as needed.
+ */
+ s_wsec = NM_SETTING_WIRELESS_SECURITY (nm_setting_wireless_security_new ());
}
+ priv->s_wsec = g_object_ref_sink (s_wsec);
deventry = nmt_editor_page_device_get_device_entry (NMT_EDITOR_PAGE_DEVICE (object));
g_object_bind_property (s_wireless, NM_SETTING_WIRELESS_MAC_ADDRESS,
@@ -362,10 +374,24 @@ nmt_page_wifi_constructed (GObject *object)
G_OBJECT_CLASS (nmt_page_wifi_parent_class)->constructed (object);
}
+static void
+nmt_page_wifi_finalize (GObject *object)
+{
+ NmtPageWifiPrivate *priv = NMT_PAGE_WIFI_GET_PRIVATE (object);
+
+ g_clear_object (&priv->s_wsec);
+
+ G_OBJECT_CLASS (nmt_page_wifi_parent_class)->finalize (object);
+}
+
+
static void
nmt_page_wifi_class_init (NmtPageWifiClass *wifi_class)
{
GObjectClass *object_class = G_OBJECT_CLASS (wifi_class);
+ g_type_class_add_private (wifi_class, sizeof (NmtPageWifiPrivate));
+
object_class->constructed = nmt_page_wifi_constructed;
+ object_class->finalize = nmt_page_wifi_finalize;
}
diff --git a/config.h.in b/config.h.in
index 98c7506f..9abedb55 100644
--- a/config.h.in
+++ b/config.h.in
@@ -341,6 +341,12 @@
/* Define to 1 if on MINIX. */
#undef _MINIX
+/* Define whether the compiler support gcc __auto_type */
+#undef _NM_CC_SUPPORT_AUTO_TYPE
+
+/* Define whether the compiler supports C11 _Generic() */
+#undef _NM_CC_SUPPORT_GENERIC
+
/* Define to 2 if the system does not provide POSIX.1 features except with
this defined. */
#undef _POSIX_1_SOURCE
diff --git a/configure b/configure
index 57c45e1c..c081c15f 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.10.0.
+# Generated by GNU Autoconf 2.69 for NetworkManager 1.10.2.
#
# Report bugs to .
#
@@ -591,8 +591,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='NetworkManager'
PACKAGE_TARNAME='NetworkManager'
-PACKAGE_VERSION='1.10.0'
-PACKAGE_STRING='NetworkManager 1.10.0'
+PACKAGE_VERSION='1.10.2'
+PACKAGE_STRING='NetworkManager 1.10.2'
PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=NetworkManager'
PACKAGE_URL=''
@@ -1723,7 +1723,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.10.0 to adapt to many kinds of systems.
+\`configure' configures NetworkManager 1.10.2 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1793,7 +1793,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of NetworkManager 1.10.0:";;
+ short | recursive ) echo "Configuration of NetworkManager 1.10.2:";;
esac
cat <<\_ACEOF
@@ -2140,7 +2140,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-NetworkManager configure 1.10.0
+NetworkManager configure 1.10.2
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2913,7 +2913,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.10.0, which was
+It was created by NetworkManager $as_me 1.10.2, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -3783,7 +3783,7 @@ fi
# Define the identity of the package.
PACKAGE='NetworkManager'
- VERSION='1.10.0'
+ VERSION='1.10.2'
cat >>confdefs.h <<_ACEOF
@@ -17967,8 +17967,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
NM_MAJOR_VERSION=1
NM_MINOR_VERSION=10
-NM_MICRO_VERSION=0
-NM_VERSION=1.10.0
+NM_MICRO_VERSION=2
+NM_VERSION=1.10.2
@@ -17976,7 +17976,7 @@ NM_VERSION=1.10.0
-NM_GIT_SHA=1193fb1b08fe45ce8713220132184581c4669362
+NM_GIT_SHA=7ebc9258452623679b9f1c27aee94c528c14b273
if test """" != "no-config-h" ; then
@@ -27431,6 +27431,60 @@ fi
SANITIZERS=$sanitizers
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking CC support C11 _Generic()" >&5
+$as_echo_n "checking CC support C11 _Generic()... " >&6; }
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+int foo(void); int foo() { int a = 0; int b = _Generic (a, int: 4); return b + a; }
+int
+main ()
+{
+foo();
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ cc_support_generic=1
+else
+ cc_support_generic=0
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cc_support_generic" >&5
+$as_echo "$cc_support_generic" >&6; }
+
+cat >>confdefs.h <<_ACEOF
+#define _NM_CC_SUPPORT_GENERIC $cc_support_generic
+_ACEOF
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking CC support gcc __auto_type" >&5
+$as_echo_n "checking CC support gcc __auto_type... " >&6; }
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+int foo(void); int foo() { int a = 0; __auto_type b = a; return b + a; }
+int
+main ()
+{
+foo();
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ cc_support_auto_type=1
+else
+ cc_support_auto_type=0
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cc_support_auto_type" >&5
+$as_echo "$cc_support_auto_type" >&6; }
+
+cat >>confdefs.h <<_ACEOF
+#define _NM_CC_SUPPORT_AUTO_TYPE $cc_support_auto_type
+_ACEOF
+
+
@@ -27797,7 +27851,7 @@ NM_LOG_COMPILER='LOG_COMPILER = "$(top_srcdir)/tools/run-nm-test.sh" --called-fr
# Find any Python interpreter.
if test -z "$PYTHON"; then
- for ac_prog in python python2 python3 python3.3 python3.2 python3.1 python3.0 python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0
+ for ac_prog in python python2 python3 python3.5 python3.4 python3.3 python3.2 python3.1 python3.0 python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
@@ -29225,7 +29279,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.10.0, which was
+This file was extended by NetworkManager $as_me 1.10.2, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -29291,7 +29345,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.10.0
+NetworkManager config.status 1.10.2
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff --git a/configure.ac b/configure.ac
index f8dcd13f..a4d7c24f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,7 @@ AC_PREREQ([2.63])
dnl The NM version number
m4_define([nm_major_version], [1])
m4_define([nm_minor_version], [10])
-m4_define([nm_micro_version], [0])
+m4_define([nm_micro_version], [2])
m4_define([nm_version],
[nm_major_version.nm_minor_version.nm_micro_version])
@@ -1213,6 +1213,22 @@ fi
AC_SUBST(SANITIZERS, [$sanitizers])
+AC_MSG_CHECKING([CC support C11 _Generic()])
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[int foo(void); int foo() { int a = 0; int b = _Generic (a, int: 4); return b + a; }]],
+ [[foo();]])],
+ [cc_support_generic=1],
+ [cc_support_generic=0])
+AC_MSG_RESULT($cc_support_generic)
+AC_DEFINE_UNQUOTED(_NM_CC_SUPPORT_GENERIC, $cc_support_generic, [Define whether the compiler supports C11 _Generic()])
+
+AC_MSG_CHECKING([CC support gcc __auto_type])
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[int foo(void); int foo() { int a = 0; __auto_type b = a; return b + a; }]],
+ [[foo();]])],
+ [cc_support_auto_type=1],
+ [cc_support_auto_type=0])
+AC_MSG_RESULT($cc_support_auto_type)
+AC_DEFINE_UNQUOTED(_NM_CC_SUPPORT_AUTO_TYPE, $cc_support_auto_type, [Define whether the compiler support gcc __auto_type])
+
dnl -------------------------
dnl Vala bindings
dnl -------------------------
diff --git a/docs/api/Makefile.in b/docs/api/Makefile.in
index 7b4fd654..0ec24a5a 100644
--- a/docs/api/Makefile.in
+++ b/docs/api/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.15 from Makefile.am.
+# Makefile.in generated by automake 1.15.1 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+# Copyright (C) 1994-2017 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -551,34 +551,34 @@ CLEANFILES = $(SCANOBJ_FILES) $(REPORT_FILES) $(DOC_STAMPS) \
@GTK_DOC_BUILD_PDF_TRUE@PDF_BUILD_STAMP = pdf-build.stamp
#### setup ####
-GTK_DOC_V_SETUP = $(GTK_DOC_V_SETUP_$(V))
-GTK_DOC_V_SETUP_ = $(GTK_DOC_V_SETUP_$(AM_DEFAULT_VERBOSITY))
+GTK_DOC_V_SETUP = $(GTK_DOC_V_SETUP_@AM_V@)
+GTK_DOC_V_SETUP_ = $(GTK_DOC_V_SETUP_@AM_DEFAULT_V@)
GTK_DOC_V_SETUP_0 = @echo " DOC Preparing build";
#### scan ####
-GTK_DOC_V_SCAN = $(GTK_DOC_V_SCAN_$(V))
-GTK_DOC_V_SCAN_ = $(GTK_DOC_V_SCAN_$(AM_DEFAULT_VERBOSITY))
+GTK_DOC_V_SCAN = $(GTK_DOC_V_SCAN_@AM_V@)
+GTK_DOC_V_SCAN_ = $(GTK_DOC_V_SCAN_@AM_DEFAULT_V@)
GTK_DOC_V_SCAN_0 = @echo " DOC Scanning header files";
-GTK_DOC_V_INTROSPECT = $(GTK_DOC_V_INTROSPECT_$(V))
-GTK_DOC_V_INTROSPECT_ = $(GTK_DOC_V_INTROSPECT_$(AM_DEFAULT_VERBOSITY))
+GTK_DOC_V_INTROSPECT = $(GTK_DOC_V_INTROSPECT_@AM_V@)
+GTK_DOC_V_INTROSPECT_ = $(GTK_DOC_V_INTROSPECT_@AM_DEFAULT_V@)
GTK_DOC_V_INTROSPECT_0 = @echo " DOC Introspecting gobjects";
#### xml ####
-GTK_DOC_V_XML = $(GTK_DOC_V_XML_$(V))
-GTK_DOC_V_XML_ = $(GTK_DOC_V_XML_$(AM_DEFAULT_VERBOSITY))
+GTK_DOC_V_XML = $(GTK_DOC_V_XML_@AM_V@)
+GTK_DOC_V_XML_ = $(GTK_DOC_V_XML_@AM_DEFAULT_V@)
GTK_DOC_V_XML_0 = @echo " DOC Building XML";
#### html ####
-GTK_DOC_V_HTML = $(GTK_DOC_V_HTML_$(V))
-GTK_DOC_V_HTML_ = $(GTK_DOC_V_HTML_$(AM_DEFAULT_VERBOSITY))
+GTK_DOC_V_HTML = $(GTK_DOC_V_HTML_@AM_V@)
+GTK_DOC_V_HTML_ = $(GTK_DOC_V_HTML_@AM_DEFAULT_V@)
GTK_DOC_V_HTML_0 = @echo " DOC Building HTML";
-GTK_DOC_V_XREF = $(GTK_DOC_V_XREF_$(V))
-GTK_DOC_V_XREF_ = $(GTK_DOC_V_XREF_$(AM_DEFAULT_VERBOSITY))
+GTK_DOC_V_XREF = $(GTK_DOC_V_XREF_@AM_V@)
+GTK_DOC_V_XREF_ = $(GTK_DOC_V_XREF_@AM_DEFAULT_V@)
GTK_DOC_V_XREF_0 = @echo " DOC Fixing cross-references";
#### pdf ####
-GTK_DOC_V_PDF = $(GTK_DOC_V_PDF_$(V))
-GTK_DOC_V_PDF_ = $(GTK_DOC_V_PDF_$(AM_DEFAULT_VERBOSITY))
+GTK_DOC_V_PDF = $(GTK_DOC_V_PDF_@AM_V@)
+GTK_DOC_V_PDF_ = $(GTK_DOC_V_PDF_@AM_DEFAULT_V@)
GTK_DOC_V_PDF_0 = @echo " DOC Building PDF";
all: all-am
@@ -807,38 +807,38 @@ $(REPORT_FILES): sgml-build.stamp
setup-build.stamp:
-$(GTK_DOC_V_SETUP)if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \
- files=`echo $(SETUP_FILES) $(DOC_MODULE).types`; \
- if test "x$$files" != "x" ; then \
- for file in $$files ; do \
- destdir=`dirname $(abs_builddir)/$$file`; \
- test -d "$$destdir" || mkdir -p "$$destdir"; \
- test -f $(abs_srcdir)/$$file && \
- cp -pf $(abs_srcdir)/$$file $(abs_builddir)/$$file || true; \
- done; \
- fi; \
+ files=`echo $(SETUP_FILES) $(DOC_MODULE).types`; \
+ if test "x$$files" != "x" ; then \
+ for file in $$files ; do \
+ destdir=`dirname $(abs_builddir)/$$file`; \
+ test -d "$$destdir" || mkdir -p "$$destdir"; \
+ test -f $(abs_srcdir)/$$file && \
+ cp -pf $(abs_srcdir)/$$file $(abs_builddir)/$$file || true; \
+ done; \
+ fi; \
fi
$(AM_V_at)touch setup-build.stamp
scan-build.stamp: setup-build.stamp $(HFILE_GLOB) $(CFILE_GLOB)
$(GTK_DOC_V_SCAN)_source_dir='' ; \
for i in $(DOC_SOURCE_DIR) ; do \
- _source_dir="$${_source_dir} --source-dir=$$i" ; \
+ _source_dir="$${_source_dir} --source-dir=$$i" ; \
done ; \
gtkdoc-scan --module=$(DOC_MODULE) --ignore-headers="$(IGNORE_HFILES)" $${_source_dir} $(SCAN_OPTIONS) $(EXTRA_HFILES)
$(GTK_DOC_V_INTROSPECT)if grep -l '^..*$$' $(DOC_MODULE).types > /dev/null 2>&1 ; then \
- scanobj_options=""; \
- gtkdoc-scangobj 2>&1 --help | grep >/dev/null "\-\-verbose"; \
- if test "$$?" = "0"; then \
- if test "x$(V)" = "x1"; then \
- scanobj_options="--verbose"; \
- fi; \
+ scanobj_options=""; \
+ gtkdoc-scangobj 2>&1 --help | grep >/dev/null "\-\-verbose"; \
+ if test "$$?" = "0"; then \
+ if test "x$(V)" = "x1"; then \
+ scanobj_options="--verbose"; \
fi; \
- CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" RUN="$(GTKDOC_RUN)" CFLAGS="$(GTKDOC_CFLAGS) $(CFLAGS)" LDFLAGS="$(GTKDOC_LIBS) $(LDFLAGS)" \
- gtkdoc-scangobj $(SCANGOBJ_OPTIONS) $$scanobj_options --module=$(DOC_MODULE); \
+ fi; \
+ CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" RUN="$(GTKDOC_RUN)" CFLAGS="$(GTKDOC_CFLAGS) $(CFLAGS)" LDFLAGS="$(GTKDOC_LIBS) $(LDFLAGS)" \
+ gtkdoc-scangobj $(SCANGOBJ_OPTIONS) $$scanobj_options --module=$(DOC_MODULE); \
else \
- for i in $(SCANOBJ_FILES) ; do \
- test -f $$i || touch $$i ; \
- done \
+ for i in $(SCANOBJ_FILES) ; do \
+ test -f $$i || touch $$i ; \
+ done \
fi
$(AM_V_at)touch scan-build.stamp
@@ -848,7 +848,7 @@ $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)
sgml-build.stamp: setup-build.stamp $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(HFILE_GLOB) $(CFILE_GLOB) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt $(expand_content_files) xml/gtkdocentities.ent
$(GTK_DOC_V_XML)_source_dir='' ; \
for i in $(DOC_SOURCE_DIR) ; do \
- _source_dir="$${_source_dir} --source-dir=$$i" ; \
+ _source_dir="$${_source_dir} --source-dir=$$i" ; \
done ; \
gtkdoc-mkdb --module=$(DOC_MODULE) --output-format=xml --expand-content-files="$(expand_content_files)" --main-sgml-file=$(DOC_MAIN_SGML_FILE) $${_source_dir} $(MKDB_OPTIONS)
$(AM_V_at)touch sgml-build.stamp
@@ -883,12 +883,8 @@ html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) $(expand_con
cd html && gtkdoc-mkhtml $$mkhtml_options $(MKHTML_OPTIONS) $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE)
-@test "x$(HTML_IMAGES)" = "x" || \
for file in $(HTML_IMAGES) ; do \
- if test -f $(abs_srcdir)/$$file ; then \
- cp $(abs_srcdir)/$$file $(abs_builddir)/html; \
- fi; \
- if test -f $(abs_builddir)/$$file ; then \
- cp $(abs_builddir)/$$file $(abs_builddir)/html; \
- fi; \
+ test -f $(abs_srcdir)/$$file && cp $(abs_srcdir)/$$file $(abs_builddir)/html; \
+ test -f $(abs_builddir)/$$file && cp $(abs_builddir)/$$file $(abs_builddir)/html; \
done;
$(GTK_DOC_V_XREF)gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
$(AM_V_at)touch html-build.stamp
diff --git a/docs/api/NetworkManager.types b/docs/api/NetworkManager.types
deleted file mode 100644
index e69de29b..00000000
diff --git a/docs/api/dbus-org.freedesktop.NetworkManager.Settings.Connection.xml b/docs/api/dbus-org.freedesktop.NetworkManager.Settings.Connection.xml
index c5938c0a..2ca567e8 100644
--- a/docs/api/dbus-org.freedesktop.NetworkManager.Settings.Connection.xml
+++ b/docs/api/dbus-org.freedesktop.NetworkManager.Settings.Connection.xml
@@ -16,6 +16,10 @@
OUT a{sa{sv}} secrets);
ClearSecrets ();
Save ();
+Update2 (IN a{sa{sv}} settings,
+ IN u flags,
+ IN a{sv} args,
+ OUT a{sv} result);
@@ -149,6 +153,59 @@ Save ();
UpdateUnsaved) to persistent storage.
+
+ The Update2() method
+ org.freedesktop.NetworkManager.Settings.Connection.Update2()
+
+Update2 (IN a{sa{sv}} settings,
+ IN u flags,
+ IN a{sv} args,
+ OUT a{sv} result);
+
+ Provide an empty array, to use the current settings.
+ flags: optional flags argument. Currently supported flags are:
+ "0x1" (to-disk),
+ "0x2" (in-memory),
+ "0x4" (in-memory-detached),
+ "0x8" (in-memory-only),
+ "0x10" (volatile),
+ "0x20" (block-autoconnect).
+ Unknown flags cause the call to fail.
+ args: optional arguments dictionary, for extensibility. Currently no
+ arguments are accepted. Specifying unknown keys causes the call
+ to fail.
+ result: output argument, currently no results are returned.
+ Update the connection with new settings and properties (replacing all
+ previous settings and properties). If the flag 0x1 is present,
+ the connection is persisted to disk. If the flag 0x2 is present,
+ the change is only made in memory (without touching an eventual
+ profile on disk). If neither 0x1 nor 0x2 is set, the change is made
+ in memory only, if the connection is already in memory only.
+ Secrets may be part of the update request, and will be either stored in persistent
+ storage or sent to a Secret Agent for storage, depending on the flags
+ associated with each secret.
+ Update2 is a extensible alternative to Update, UpdateUnsaved and Save.
+ Since: 1.10.2
+
+
+
+ IN a{sa{sv}} settings:
+ New connection settings, properties, and (optionally) secrets.
+
+
+ IN u flags:
+
+
+
+ IN a{sv} args:
+
+
+
+ OUT a{sv} result:
+
+
+
+Signal Details
diff --git a/docs/api/html/NetworkManager.conf.html b/docs/api/html/NetworkManager.conf.html
index 39597511..ec32a39c 100644
--- a/docs/api/html/NetworkManager.conf.html
+++ b/docs/api/html/NetworkManager.conf.html
@@ -8,7 +8,7 @@
-
+
@@ -842,6 +842,22 @@ managed=1
+
carrier-wait-timeout
+
+ Specify the timeout for waiting for carrier in milliseconds.
+ When the device loses carrier, NetworkManager does not react
+ immediately. Instead, it waits for this timeout before considering
+ the link lost. Also, on startup, NetworkManager considers the
+ device as busy for this time, as long as the device has no carrier.
+ This delays startup-complete signal and NetworkManager-wait-online.
+ Configuring this too high means to block NetworkManager-wait-online
+ longer then necessary. Configuring it too low, means that NetworkManager
+ will declare startup-complete, although carrier is about to come
+ and auto-activation to kick in.
+ The default is 5000 milliseconds.
+